Merge branch 'main' into update-velodrome-pool-group-id

Author: wpoulin

CHANGELOG.md

@@ -4,6 +4,15 @@
 
 [1]: https://www.npmjs.com/package/@zapper-fi/studio?activeTab=versions
 
+## [0.575.2](https://github.com/Zapper-fi/studio/compare/v0.575.1...v0.575.2) (2024-01-09)
+
+
+### Bug Fixes
+
+* **app-tokens:** Migration to ATI ([#3176](https://github.com/Zapper-fi/studio/issues/3176)) ([14744e6](https://github.com/Zapper-fi/studio/commit/14744e642a1213e03092fc75a44791c59dd080de))
+* **apps:** App token migration to ATI ([#3179](https://github.com/Zapper-fi/studio/issues/3179)) ([efe6f5a](https://github.com/Zapper-fi/studio/commit/efe6f5aa4df251ac7d8f4af2b9d6203739a8a025))
+* **banano:** Fix farms on Ethereum ([#3178](https://github.com/Zapper-fi/studio/issues/3178)) ([9c08233](https://github.com/Zapper-fi/studio/commit/9c08233501d15f8d4f06f9ee87b712844c1b5a87))
+
 ## [0.575.1](https://github.com/Zapper-fi/studio/compare/v0.575.0...v0.575.1) (2024-01-04)
 
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zapper-fi/studio",
-  "version": "0.575.1",
+  "version": "0.575.2",
   "description": "Community build apps for Zapper.fi",
   "license": "MIT",
   "main": "./index.js",

src/apps/abracadabra/abracadabra.module.ts

@@ -6,20 +6,16 @@ import { ArbitrumAbracadabraCauldronContractPositionFetcher } from './arbitrum/a
 import { ArbitrumAbracadabraFarmBoostedContractPositionFetcher } from './arbitrum/abracadabra.farm-boosted.contract-position-fetcher';
 import { ArbitrumAbracadabraFarmContractPositionFetcher } from './arbitrum/abracadabra.farm.contract-position-fetcher';
 import { ArbitrumAbracadabraMspellContractPositionFetcher } from './arbitrum/abracadabra.m-spell.contract-position-fetcher';
-import { ArbitrumAbracadabraMagicGlpTokenFetcher } from './arbitrum/abracadabra.magic-glp.token-fetcher';
 import { ArbitrumAbracadabraStakedSpellTokenFetcher } from './arbitrum/abracadabra.staked-spell.token-fetcher';
 import { AvalancheAbracadabraCauldronContractPositionFetcher } from './avalanche/abracadabra.cauldron.contract-position-fetcher';
 import { AvalancheAbracadabraFarmContractPositionFetcher } from './avalanche/abracadabra.farm.contract-position-fetcher';
 import { AvalancheAbracadabraMspellContractPositionFetcher } from './avalanche/abracadabra.m-spell.contract-position-fetcher';
-import { AvalancheAbracadabraMagicGlpTokenFetcher } from './avalanche/abracadabra.magic-glp.token-fetcher';
 import { AvalancheAbracadabraStakedSpellTokenFetcher } from './avalanche/abracadabra.staked-spell.token-fetcher';
 import { BinanceSmartChainAbracadabraCauldronContractPositionFetcher } from './binance-smart-chain/abracadabra.cauldron.contract-position-fetcher';
 import { AbracadabraViemContractFactory } from './contracts';
 import { EthereumAbracadabraCauldronContractPositionFetcher } from './ethereum/abracadabra.cauldron.contract-position-fetcher';
 import { EthereumAbracadabraFarmContractPositionFetcher } from './ethereum/abracadabra.farm.contract-position-fetcher';
 import { EthereumAbracadabraMspellContractPositionFetcher } from './ethereum/abracadabra.m-spell.contract-position-fetcher';
-import { EthereumAbracadabraMagicApeTokenFetcher } from './ethereum/abracadabra.magic-ape.token-fetcher';
-import { EthereumAbracadabraStakedSpellTokenFetcher } from './ethereum/abracadabra.staked-spell.token-fetcher';
 import { FantomAbracadabraCauldronContractPositionFetcher } from './fantom/abracadabra.cauldron.contract-position-fetcher';
 import { FantomAbracadabraFarmContractPositionFetcher } from './fantom/abracadabra.farm.contract-position-fetcher';
 import { FantomAbracadabraMspellContractPositionFetcher } from './fantom/abracadabra.m-spell.contract-position-fetcher';
@@ -33,24 +29,20 @@ import { OptimismAbracadabraErc20VaultsTokenFetcher } from './optimism/abracadab
     // Arbitrum
     ArbitrumAbracadabraCauldronContractPositionFetcher,
     ArbitrumAbracadabraFarmContractPositionFetcher,
-    ArbitrumAbracadabraMagicGlpTokenFetcher,
     ArbitrumAbracadabraMspellContractPositionFetcher,
     ArbitrumAbracadabraStakedSpellTokenFetcher,
     ArbitrumAbracadabraFarmBoostedContractPositionFetcher,
     // Avalanche
     AvalancheAbracadabraCauldronContractPositionFetcher,
     AvalancheAbracadabraFarmContractPositionFetcher,
-    AvalancheAbracadabraMagicGlpTokenFetcher,
     AvalancheAbracadabraMspellContractPositionFetcher,
     AvalancheAbracadabraStakedSpellTokenFetcher,
     // Binance-smart-chain
     BinanceSmartChainAbracadabraCauldronContractPositionFetcher,
     // Ethereum
     EthereumAbracadabraCauldronContractPositionFetcher,
     EthereumAbracadabraFarmContractPositionFetcher,
-    EthereumAbracadabraMagicApeTokenFetcher,
     EthereumAbracadabraMspellContractPositionFetcher,
-    EthereumAbracadabraStakedSpellTokenFetcher,
     // Fantom
     FantomAbracadabraCauldronContractPositionFetcher,
     FantomAbracadabraFarmContractPositionFetcher,

src/apps/abracadabra/arbitrum/abracadabra.arbitrum.constants.ts

@@ -12,19 +12,10 @@ export const ARBITRUM_CAULDRONS: AbracadabraCauldronContractPositionDefinition[]
   { version: 'V4', type: 'REGULAR', address: '0x66805f6e719d7e67d46e8b2501c1237980996c6a' }, // gmLINK
 ];
 
-export const ARBITRUM_GLP_TOKEN_ADDRESS = '0x4277f8f2c384827b5273592ff7cebd9f2c1ac258';
-export const AVALANCHE_GLP_TOKEN_ADDRESS = '0x01234181085565ed162a948b6a5e88758cd7c7b8';
-
 export const CURVE_MIM_3POOL_FARM = '0x839de324a1ab773f76a53900d70ac1b913d2b387';
 
 export const M_SPELL_ADDRESS = '0x1df188958a8674b5177f77667b8d173c3cdd9e51';
 export const S_SPELL_ADDRESS = '0xf7428ffcb2581a2804998efbb036a43255c8a8d3';
 export const SPELL_ADDRESS = '0xf7428ffcb2581a2804998efbb036a43255c8a8d3';
 
-export const MAGIC_GLP_ADDRESS = '0x85667409a723684fe1e57dd1abde8d88c2f54214';
-export const GLP_REWARD_TRACKER_ADDRESSES = [
-  '0x4e971a87900b931ff39d1aad67697f49835400b6',
-  '0x1addd80e6039594ee970e5872d247bf0414c8903',
-];
-export const MAGIC_GLP_HARVESTOR_ADDRESS = '0xc99a4863173ef52ccb7ea05440da0e37ba39c139';
 export const MAGIC_GLP_ANNUAL_HARVESTS = HOURS_PER_YEAR;

src/apps/abracadabra/arbitrum/abracadabra.magic-glp.token-fetcher.ts

@@ -6,7 +6,6 @@ import { AelinViemContractFactory } from './contracts';
 import { EthereumAelinPoolTokenFetcher } from './ethereum/aelin.pool.token-fetcher';
 import { OptimismAelinFarmContractPositionFetcher } from './optimism/aelin.farm.contract-position-fetcher';
 import { OptimismAelinPoolTokenFetcher } from './optimism/aelin.pool.token-fetcher';
-import { OptimismAelinVAelinTokenFetcher } from './optimism/aelin.v-aelin.token-fetcher';
 
 @Module({
   providers: [
@@ -15,7 +14,6 @@ import { OptimismAelinVAelinTokenFetcher } from './optimism/aelin.v-aelin.token-
     EthereumAelinPoolTokenFetcher,
     // Optimism
     OptimismAelinPoolTokenFetcher,
-    OptimismAelinVAelinTokenFetcher,
     OptimismAelinFarmContractPositionFetcher,
   ],
 })

src/apps/abracadabra/avalanche/abracadabra.magic-glp.token-fetcher.ts

@@ -44,7 +44,9 @@ export abstract class BananoFarmContractPositionFetcher extends MasterChefTempla
   }
 
   async getTotalRewardRate({ contract }: GetMasterChefDataPropsParams<Benis>): Promise<BigNumberish> {
-    return contract.read.wbanPerSecond();
+    const now = Date.now();
+    const endTime = (await contract.read.endTime()) * 1_000;
+    return endTime < now ? 0 : contract.read.wbanPerSecond();
   }
 
   async getPoolAllocPoints({ contract, definition }: GetMasterChefDataPropsParams<Benis>): Promise<BigNumberish> {

src/apps/abracadabra/common/abracadabra.magic-ape.token-fetcher.ts

@@ -5,7 +5,6 @@ import { BalancerV2ViemContractFactory } from '~apps/balancer-v2/contracts';
 
 import { BeethovenXViemContractFactory } from './contracts';
 import { FantomBeethovenXChefContractPositionFetcher } from './fantom/beethoven-x.chef.contract-position-fetcher';
-import { FantomBeethovenXFBeetsTokenFetcher } from './fantom/beethoven-x.f-beets.token-fetcher';
 import { FantomBeethovenXPoolTokenFetcher } from './fantom/beethoven-x.pool.token-fetcher';
 import { OptimismBeethovenXFarmContractPositionFetcher } from './optimism/beethoven-x.farm.contract-position-fetcher';
 import { OptimismBeethovenXPoolTokenFetcher } from './optimism/beethoven-x.pool.token-fetcher';
@@ -17,7 +16,6 @@ import { OptimismBeethovenXPoolTokenFetcher } from './optimism/beethoven-x.pool.
     // Fantom
     FantomBeethovenXChefContractPositionFetcher,
     FantomBeethovenXPoolTokenFetcher,
-    FantomBeethovenXFBeetsTokenFetcher,
     // Optimism
     OptimismBeethovenXFarmContractPositionFetcher,
     OptimismBeethovenXPoolTokenFetcher,