fix: Enabled pool together TVL (#752)

* chore: cleanup pool together app

* fix: enabled pool-together TVL

src/apps/pool-together/avalanche/pool-together.balance-fetcher.ts

@@ -7,68 +7,49 @@ import { BalanceFetcher } from '~balance/balance-fetcher.interface';
 import { Network } from '~types/network.interface';
 
 import { PoolTogetherClaimableTokenBalancesHelper } from '../helpers/pool-together-v3.claimable.balance-helper';
-import { PoolTogetherAirdropTokenBalancesHelper } from '../helpers/pool-together.airdrop.balance-helper';
 import { POOL_TOGETHER_DEFINITION } from '../pool-together.definition';
 
-@Register.BalanceFetcher(POOL_TOGETHER_DEFINITION.id, Network.AVALANCHE_MAINNET)
+const network = Network.AVALANCHE_MAINNET;
+
+@Register.BalanceFetcher(POOL_TOGETHER_DEFINITION.id, network)
 export class AvalanchePoolTogetherBalanceFetcher implements BalanceFetcher {
   constructor(
     @Inject(APP_TOOLKIT) private readonly appToolkit: IAppToolkit,
     @Inject(PoolTogetherClaimableTokenBalancesHelper)
     private readonly claimableTokenBalancesHelper: PoolTogetherClaimableTokenBalancesHelper,
-    @Inject(PoolTogetherAirdropTokenBalancesHelper)
-    private readonly airdropTokenBalancesHelper: PoolTogetherAirdropTokenBalancesHelper,
   ) {}
 
   async getV4TokenBalances(address: string) {
     return this.appToolkit.helpers.tokenBalanceHelper.getTokenBalances({
-      network: Network.AVALANCHE_MAINNET,
+      network,
       appId: POOL_TOGETHER_DEFINITION.id,
       groupId: POOL_TOGETHER_DEFINITION.groups.v4.id,
       address,
     });
   }
 
-  async getV3TokenBalances(address: string) {
-    return this.appToolkit.helpers.tokenBalanceHelper.getTokenBalances({
-      network: Network.AVALANCHE_MAINNET,
-      appId: POOL_TOGETHER_DEFINITION.id,
-      groupId: POOL_TOGETHER_DEFINITION.groups.v3.id,
-      address,
-    });
-  }
-
-  async getV3PodTokenBalances(address: string) {
-    return this.appToolkit.helpers.tokenBalanceHelper.getTokenBalances({
-      network: Network.AVALANCHE_MAINNET,
-      appId: POOL_TOGETHER_DEFINITION.id,
-      groupId: POOL_TOGETHER_DEFINITION.groups.v3Pod.id,
-      address,
-    });
-  }
-
   async getClaimableBalances(address: string) {
     return this.claimableTokenBalancesHelper.getBalances({
       address,
-      network: Network.AVALANCHE_MAINNET,
-    });
-  }
-
-  async getAirdropBalances(address: string) {
-    return this.airdropTokenBalancesHelper.getBalances({
-      address,
-      network: Network.AVALANCHE_MAINNET,
+      network,
     });
   }
 
   async getBalances(address: string) {
-    const [v4TokenBalance] = await Promise.all([this.getV4TokenBalances(address)]);
+    const [v4TokenBalance, claimableBalances] = await Promise.all([
+      this.getV4TokenBalances(address),
+      this.getClaimableBalances(address),
+    ]);
 
     return presentBalanceFetcherResponse([
       {
         label: 'PoolTogether',
         assets: v4TokenBalance,
       },
+      {
+        label: 'Rewards',
+        assets: claimableBalances,
+      },
     ]);
   }
 }

src/apps/pool-together/avalanche/pool-together.v4-ticket.token-fetcher.ts

@@ -13,7 +13,7 @@ const appId = POOL_TOGETHER_DEFINITION.id;
 const groupId = POOL_TOGETHER_DEFINITION.groups.v4.id;
 const network = Network.AVALANCHE_MAINNET;
 
-@Register.TokenPositionFetcher({ appId, groupId, network })
+@Register.TokenPositionFetcher({ appId, groupId, network, options: { includeInTvl: true } })
 export class AvalanchePoolTogetherV4TicketTokenFetcher implements PositionFetcher<AppTokenPosition> {
   constructor(
     @Inject(PoolTogetherV4PrizePoolTokenHelper)
@@ -25,7 +25,7 @@ export class AvalanchePoolTogetherV4TicketTokenFetcher implements PositionFetche
     const prizePools = await this.prizePoolRegistry.getV4PrizePools(network);
 
     return this.poolTogetherV4PrizePoolTokenHelper.getAppTokens({
-      network: Network.AVALANCHE_MAINNET,
+      network,
       prizePoolAddresses: prizePools?.map(prizePoolAddresses => prizePoolAddresses.prizePoolAddress) || [],
     });
   }

src/apps/pool-together/celo/pool-together.balance-fetcher.ts

@@ -1,5 +1,4 @@
 import { Inject } from '@nestjs/common';
-import { compact } from 'lodash';
 
 import { IAppToolkit, APP_TOOLKIT } from '~app-toolkit/app-toolkit.interface';
 import { Register } from '~app-toolkit/decorators';
@@ -10,7 +9,9 @@ import { Network } from '~types/network.interface';
 import { PoolTogetherClaimableTokenBalancesHelper } from '../helpers/pool-together-v3.claimable.balance-helper';
 import { POOL_TOGETHER_DEFINITION } from '../pool-together.definition';
 
-@Register.BalanceFetcher(POOL_TOGETHER_DEFINITION.id, Network.CELO_MAINNET)
+const network = Network.CELO_MAINNET;
+
+@Register.BalanceFetcher(POOL_TOGETHER_DEFINITION.id, network)
 export class CeloPoolTogetherBalanceFetcher implements BalanceFetcher {
   constructor(
     @Inject(APP_TOOLKIT) private readonly appToolkit: IAppToolkit,
@@ -20,7 +21,7 @@ export class CeloPoolTogetherBalanceFetcher implements BalanceFetcher {
 
   async getV3TokenBalances(address: string) {
     return this.appToolkit.helpers.tokenBalanceHelper.getTokenBalances({
-      network: Network.CELO_MAINNET,
+      network,
       appId: POOL_TOGETHER_DEFINITION.id,
       groupId: POOL_TOGETHER_DEFINITION.groups.v3.id,
       address,
@@ -30,7 +31,7 @@ export class CeloPoolTogetherBalanceFetcher implements BalanceFetcher {
   async getClaimableBalances(address: string) {
     return this.claimableTokenBalancesHelper.getBalances({
       address,
-      network: Network.CELO_MAINNET,
+      network,
     });
   }
 
@@ -47,7 +48,7 @@ export class CeloPoolTogetherBalanceFetcher implements BalanceFetcher {
       },
       {
         label: 'Rewards',
-        assets: compact(claimableBalances),
+        assets: claimableBalances,
       },
     ]);
   }

src/apps/pool-together/celo/pool-together.v3-ticket.token-fetcher.ts

@@ -9,13 +9,11 @@ import { PoolTogetherV3PrizePoolTokenHelper } from '../helpers/pool-together-v3.
 import { PoolTogetherApiPrizePoolRegistry } from '../helpers/pool-together.api.prize-pool-registry';
 import { POOL_TOGETHER_DEFINITION } from '../pool-together.definition';
 
+const appId = POOL_TOGETHER_DEFINITION.id;
+const groupId = POOL_TOGETHER_DEFINITION.groups.v3.id;
 const network = Network.CELO_MAINNET;
 
-@Register.TokenPositionFetcher({
-  appId: POOL_TOGETHER_DEFINITION.id,
-  groupId: POOL_TOGETHER_DEFINITION.groups.v3.id,
-  network,
-})
+@Register.TokenPositionFetcher({ appId, groupId, network, options: { includeInTvl: true } })
 export class CeloPoolTogetherV3TicketTokenFetcher implements PositionFetcher<AppTokenPosition> {
   constructor(
     @Inject(PoolTogetherV3PrizePoolTokenHelper)
@@ -27,9 +25,8 @@ export class CeloPoolTogetherV3TicketTokenFetcher implements PositionFetcher<App
     const prizePools = await this.prizePoolRegistry.getV3PrizePools(network);
 
     return this.poolTogetherV3PrizePoolTokenHelper.getTokens({
-      network: Network.CELO_MAINNET,
+      network,
       prizePools,
-      dependencies: [],
     });
   }
 }

src/apps/pool-together/ethereum/pool-together.balance-fetcher.ts

@@ -1,5 +1,4 @@
 import { Inject } from '@nestjs/common';
-import { compact } from 'lodash';
 
 import { IAppToolkit, APP_TOOLKIT } from '~app-toolkit/app-toolkit.interface';
 import { Register } from '~app-toolkit/decorators';
@@ -11,7 +10,9 @@ import { PoolTogetherClaimableTokenBalancesHelper } from '../helpers/pool-togeth
 import { PoolTogetherAirdropTokenBalancesHelper } from '../helpers/pool-together.airdrop.balance-helper';
 import { POOL_TOGETHER_DEFINITION } from '../pool-together.definition';
 
-@Register.BalanceFetcher(POOL_TOGETHER_DEFINITION.id, Network.ETHEREUM_MAINNET)
+const network = Network.ETHEREUM_MAINNET;
+
+@Register.BalanceFetcher(POOL_TOGETHER_DEFINITION.id, network)
 export class EthereumPoolTogetherBalanceFetcher implements BalanceFetcher {
   constructor(
     @Inject(APP_TOOLKIT) private readonly appToolkit: IAppToolkit,
@@ -23,7 +24,7 @@ export class EthereumPoolTogetherBalanceFetcher implements BalanceFetcher {
 
   async getV4TokenBalances(address: string) {
     return this.appToolkit.helpers.tokenBalanceHelper.getTokenBalances({
-      network: Network.ETHEREUM_MAINNET,
+      network,
       appId: POOL_TOGETHER_DEFINITION.id,
       groupId: POOL_TOGETHER_DEFINITION.groups.v4.id,
       address,
@@ -32,7 +33,7 @@ export class EthereumPoolTogetherBalanceFetcher implements BalanceFetcher {
 
   async getV3TokenBalances(address: string) {
     return this.appToolkit.helpers.tokenBalanceHelper.getTokenBalances({
-      network: Network.ETHEREUM_MAINNET,
+      network,
       appId: POOL_TOGETHER_DEFINITION.id,
       groupId: POOL_TOGETHER_DEFINITION.groups.v3.id,
       address,
@@ -41,7 +42,7 @@ export class EthereumPoolTogetherBalanceFetcher implements BalanceFetcher {
 
   async getV3PodTokenBalances(address: string) {
     return this.appToolkit.helpers.tokenBalanceHelper.getTokenBalances({
-      network: Network.ETHEREUM_MAINNET,
+      network,
       appId: POOL_TOGETHER_DEFINITION.id,
       groupId: POOL_TOGETHER_DEFINITION.groups.v3Pod.id,
       address,
@@ -51,14 +52,14 @@ export class EthereumPoolTogetherBalanceFetcher implements BalanceFetcher {
   async getClaimableBalances(address: string) {
     return this.claimableTokenBalancesHelper.getBalances({
       address,
-      network: Network.ETHEREUM_MAINNET,
+      network,
     });
   }
 
   async getAirdropBalances(address: string) {
     return this.airdropTokenBalancesHelper.getBalances({
       address,
-      network: Network.ETHEREUM_MAINNET,
+      network,
     });
   }
 
@@ -86,11 +87,11 @@ export class EthereumPoolTogetherBalanceFetcher implements BalanceFetcher {
       },
       {
         label: 'Rewards',
-        assets: compact(claimableBalances),
+        assets: claimableBalances,
       },
       {
         label: 'Airdrops',
-        assets: compact(airdropBalances),
+        assets: airdropBalances,
       },
     ]);
   }