feat(badger): Fix claimable DIGG amount (Zapper-fi#1208)

0xrmvdao · Aug 18, 2022 · 3813eb3 · 3813eb3
1 parent b771e81
commit 3813eb3
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 55 deletions.
diff --git a/src/apps/badger/arbitrum/badger.claimable.contract-position-fetcher.ts b/src/apps/badger/arbitrum/badger.claimable.contract-position-fetcher.ts
@@ -1,16 +1,11 @@
-import { Inject } from '@nestjs/common';
-
-import { APP_TOOLKIT, IAppToolkit } from '~app-toolkit/app-toolkit.interface';
 import { Register } from '~app-toolkit/decorators';
 import { Network } from '~types/network.interface';
 
 import { BADGER_DEFINITION } from '../badger.definition';
-import { BadgerContractFactory } from '../contracts';
 import {
   BadgerClaimableContractPositionFetcher,
   BadgerClaimableDescriptor,
-} from '../helpers/badger.claimable.contract-position.helper';
-import { BadgerClaimableRewardsResolver } from '../helpers/badger.claimable.rewards-resolver';
+} from '../helpers/badger.claimable.contract-position-fetcher';
 
 const appId = BADGER_DEFINITION.id;
 const groupId = BADGER_DEFINITION.groups.claimable.id;
@@ -21,16 +16,6 @@ export class ArbitrumBadgerClaimableContractPositionFetcher extends BadgerClaima
   appId = appId;
   groupId = groupId;
   network = network;
-  // No DIGG token yet on arb
-  diggTokenAddress = '';
-
-  constructor(
-    @Inject(APP_TOOLKIT) protected readonly appToolkit: IAppToolkit,
-    @Inject(BadgerContractFactory) protected readonly contractFactory: BadgerContractFactory,
-    @Inject(BadgerClaimableRewardsResolver) protected badgerClaimableRewardsResolver: BadgerClaimableRewardsResolver,
-  ) {
-    super(appToolkit, contractFactory, badgerClaimableRewardsResolver);
-  }
 
   async getDescriptors(): Promise<BadgerClaimableDescriptor[]> {
     return [

diff --git a/src/apps/badger/arbitrum/badger.vault.token-fetcher.ts b/src/apps/badger/arbitrum/badger.vault.token-fetcher.ts
@@ -7,14 +7,14 @@ import { Network } from '~types/network.interface';
 import { BADGER_DEFINITION } from '../badger.definition';
 import { BadgerContractFactory, BadgerSett } from '../contracts';
 import { BadgerVaultTokenDefinitionsResolver } from '../helpers/badger.vault.token-definition-resolver';
-import { BadgerVaultTokenHelper } from '../helpers/badger.vault.token-helper';
+import { BadgerVaultTokenFetcher } from '../helpers/badger.vault.token-fetcher';
 
 const appId = BADGER_DEFINITION.id;
 const groupId = BADGER_DEFINITION.groups.vault.id;
 const network = Network.ARBITRUM_MAINNET;
 
 @Register.TokenPositionFetcher({ appId, groupId, network })
-export class ArbitrumBadgerVaultTokenFetcher extends BadgerVaultTokenHelper<BadgerSett> {
+export class ArbitrumBadgerVaultTokenFetcher extends BadgerVaultTokenFetcher<BadgerSett> {
   appId = appId;
   groupId = groupId;
   network = network;

diff --git a/src/apps/badger/ethereum/badger.claimable.contract-position-fetcher.ts b/src/apps/badger/ethereum/badger.claimable.contract-position-fetcher.ts
@@ -1,16 +1,11 @@
-import { Inject } from '@nestjs/common';
-
-import { APP_TOOLKIT, IAppToolkit } from '~app-toolkit/app-toolkit.interface';
 import { Register } from '~app-toolkit/decorators';
 import { Network } from '~types/network.interface';
 
 import { BADGER_DEFINITION } from '../badger.definition';
-import { BadgerContractFactory } from '../contracts';
 import {
   BadgerClaimableContractPositionFetcher,
   BadgerClaimableDescriptor,
-} from '../helpers/badger.claimable.contract-position.helper';
-import { BadgerClaimableRewardsResolver } from '../helpers/badger.claimable.rewards-resolver';
+} from '../helpers/badger.claimable.contract-position-fetcher';
 
 const appId = BADGER_DEFINITION.id;
 const groupId = BADGER_DEFINITION.groups.claimable.id;
@@ -23,14 +18,6 @@ export class EthereumBadgerClaimableContractPositionFetcher extends BadgerClaima
   network = network;
   diggTokenAddress = '0x798d1be841a82a273720ce31c822c61a67a601c3';
 
-  constructor(
-    @Inject(APP_TOOLKIT) protected readonly appToolkit: IAppToolkit,
-    @Inject(BadgerContractFactory) protected readonly contractFactory: BadgerContractFactory,
-    @Inject(BadgerClaimableRewardsResolver) protected badgerClaimableRewardsResolver: BadgerClaimableRewardsResolver,
-  ) {
-    super(appToolkit, contractFactory, badgerClaimableRewardsResolver);
-  }
-
   async getDescriptors(): Promise<BadgerClaimableDescriptor[]> {
     return [
       {

diff --git a/src/apps/badger/ethereum/badger.vault.token-fetcher.ts b/src/apps/badger/ethereum/badger.vault.token-fetcher.ts
@@ -7,14 +7,14 @@ import { Network } from '~types/network.interface';
 import { BADGER_DEFINITION } from '../badger.definition';
 import { BadgerContractFactory, BadgerSett } from '../contracts';
 import { BadgerVaultTokenDefinitionsResolver } from '../helpers/badger.vault.token-definition-resolver';
-import { BadgerVaultTokenHelper } from '../helpers/badger.vault.token-helper';
+import { BadgerVaultTokenFetcher } from '../helpers/badger.vault.token-fetcher';
 
 const appId = BADGER_DEFINITION.id;
 const groupId = BADGER_DEFINITION.groups.vault.id;
 const network = Network.ETHEREUM_MAINNET;
 
 @Register.TokenPositionFetcher({ appId, groupId, network })
-export class EthereumBadgerVaultTokenFetcher extends BadgerVaultTokenHelper<BadgerSett> {
+export class EthereumBadgerVaultTokenFetcher extends BadgerVaultTokenFetcher<BadgerSett> {
   appId = appId;
   groupId = groupId;
   network = network;

diff --git a/...ger.claimable.contract-position.helper.ts → ...er.claimable.contract-position-fetcher.ts b/...ger.claimable.contract-position.helper.ts → ...er.claimable.contract-position-fetcher.ts
@@ -28,7 +28,7 @@ export abstract class BadgerClaimableContractPositionFetcher extends ContractPos
   DefaultDataProps,
   BadgerClaimableDescriptor
 > {
-  abstract diggTokenAddress: string;
+  diggTokenAddress: string;
 
   constructor(
     @Inject(APP_TOOLKIT) protected readonly appToolkit: IAppToolkit,
@@ -71,7 +71,8 @@ export abstract class BadgerClaimableContractPositionFetcher extends ContractPos
     let cumulativeAmount = match.rewardTokenBalanceRaw;
 
     let claimed = await contract.claimed(address, rewardToken.address).then(v => v.toString());
-    if (rewardToken.symbol === this.diggTokenAddress) {
+
+    if (rewardToken.address === this.diggTokenAddress) {
       const diggTokenContract = this.contractFactory.badgerDiggToken(rewardToken);
       const sharesPerFragment = await multicall.wrap(diggTokenContract)._sharesPerFragment();
       cumulativeAmount = new BigNumber(cumulativeAmount)

diff --git a/...dger/helpers/badger.vault.token-helper.ts → ...ger/helpers/badger.vault.token-fetcher.ts b/...dger/helpers/badger.vault.token-helper.ts → ...ger/helpers/badger.vault.token-fetcher.ts
@@ -19,7 +19,7 @@ export type BadgerVaultTokenDataProps = {
   liquidity: number;
 };
 
-export abstract class BadgerVaultTokenHelper<T extends Contract> extends AppTokenTemplatePositionFetcher<
+export abstract class BadgerVaultTokenFetcher<T extends Contract> extends AppTokenTemplatePositionFetcher<
   T,
   BadgerVaultTokenDataProps
 > {

diff --git a/src/apps/badger/polygon/badger.claimable.contract-position-fetcher.ts b/src/apps/badger/polygon/badger.claimable.contract-position-fetcher.ts
@@ -1,16 +1,11 @@
-import { Inject } from '@nestjs/common';
-
-import { APP_TOOLKIT, IAppToolkit } from '~app-toolkit/app-toolkit.interface';
 import { Register } from '~app-toolkit/decorators';
 import { Network } from '~types/network.interface';
 
 import { BADGER_DEFINITION } from '../badger.definition';
-import { BadgerContractFactory } from '../contracts';
 import {
   BadgerClaimableContractPositionFetcher,
   BadgerClaimableDescriptor,
-} from '../helpers/badger.claimable.contract-position.helper';
-import { BadgerClaimableRewardsResolver } from '../helpers/badger.claimable.rewards-resolver';
+} from '../helpers/badger.claimable.contract-position-fetcher';
 
 const appId = BADGER_DEFINITION.id;
 const groupId = BADGER_DEFINITION.groups.claimable.id;
@@ -21,16 +16,6 @@ export class PolygonBadgerClaimableContractPositionFetcher extends BadgerClaimab
   appId = appId;
   groupId = groupId;
   network = network;
-  // No DIGG token yet on arb
-  diggTokenAddress = '';
-
-  constructor(
-    @Inject(APP_TOOLKIT) protected readonly appToolkit: IAppToolkit,
-    @Inject(BadgerContractFactory) protected readonly contractFactory: BadgerContractFactory,
-    @Inject(BadgerClaimableRewardsResolver) protected badgerClaimableRewardsResolver: BadgerClaimableRewardsResolver,
-  ) {
-    super(appToolkit, contractFactory, badgerClaimableRewardsResolver);
-  }
 
   async getDescriptors(): Promise<BadgerClaimableDescriptor[]> {
     return [

diff --git a/src/apps/badger/polygon/badger.vault.token-fetcher.ts b/src/apps/badger/polygon/badger.vault.token-fetcher.ts
@@ -7,14 +7,14 @@ import { Network } from '~types/network.interface';
 import { BADGER_DEFINITION } from '../badger.definition';
 import { BadgerContractFactory, BadgerSett } from '../contracts';
 import { BadgerVaultTokenDefinitionsResolver } from '../helpers/badger.vault.token-definition-resolver';
-import { BadgerVaultTokenHelper } from '../helpers/badger.vault.token-helper';
+import { BadgerVaultTokenFetcher } from '../helpers/badger.vault.token-fetcher';
 
 const appId = BADGER_DEFINITION.id;
 const groupId = BADGER_DEFINITION.groups.vault.id;
 const network = Network.POLYGON_MAINNET;
 
 @Register.TokenPositionFetcher({ appId, groupId, network })
-export class PolygonBadgerVaultTokenFetcher extends BadgerVaultTokenHelper<BadgerSett> {
+export class PolygonBadgerVaultTokenFetcher extends BadgerVaultTokenFetcher<BadgerSett> {
   appId = appId;
   groupId = groupId;
   network = network;