diff --git a/src/apps/pool-together/avalanche/pool-together.balance-fetcher.ts b/src/apps/pool-together/avalanche/pool-together.balance-fetcher.ts index cf6aa22b1..d7ed0a026 100644 --- a/src/apps/pool-together/avalanche/pool-together.balance-fetcher.ts +++ b/src/apps/pool-together/avalanche/pool-together.balance-fetcher.ts @@ -6,8 +6,8 @@ import { presentBalanceFetcherResponse } from '~app-toolkit/helpers/presentation import { BalanceFetcher } from '~balance/balance-fetcher.interface'; import { Network } from '~types/network.interface'; -import { PoolTogetherAirdropTokenBalancesHelper } from '../helpers/pool-together.airdrop.balance-helper'; 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) diff --git a/src/apps/pool-together/avalanche/pool-together.tvl-fetcher.ts b/src/apps/pool-together/avalanche/pool-together.tvl-fetcher.ts index c9e7fab75..75344edd7 100644 --- a/src/apps/pool-together/avalanche/pool-together.tvl-fetcher.ts +++ b/src/apps/pool-together/avalanche/pool-together.tvl-fetcher.ts @@ -1,14 +1,13 @@ import { Inject } from '@nestjs/common'; -import { BigNumber } from 'ethers'; import { sum } from 'lodash'; import { Register } from '~app-toolkit/decorators'; import { APP_TOOLKIT, IAppToolkit } from '~lib'; import { TvlFetcher } from '~stats/tvl/tvl-fetcher.interface'; import { Network } from '~types/network.interface'; + import { PoolTogetherContractFactory } from '../contracts'; import { PoolTogetherApiPrizePoolRegistry } from '../helpers/pool-together.api.prize-pool-registry'; - import { POOL_TOGETHER_DEFINITION } from '../pool-together.definition'; const appId = POOL_TOGETHER_DEFINITION.id; diff --git a/src/apps/pool-together/celo/pool-together.tvl-fetcher.ts b/src/apps/pool-together/celo/pool-together.tvl-fetcher.ts index 3f1631982..8b4bb81b3 100644 --- a/src/apps/pool-together/celo/pool-together.tvl-fetcher.ts +++ b/src/apps/pool-together/celo/pool-together.tvl-fetcher.ts @@ -1,14 +1,13 @@ import { Inject } from '@nestjs/common'; -import { BigNumber } from 'ethers'; import { sum } from 'lodash'; import { Register } from '~app-toolkit/decorators'; import { APP_TOOLKIT, IAppToolkit } from '~lib'; import { TvlFetcher } from '~stats/tvl/tvl-fetcher.interface'; import { Network } from '~types/network.interface'; + import { PoolTogetherContractFactory } from '../contracts'; import { PoolTogetherApiPrizePoolRegistry } from '../helpers/pool-together.api.prize-pool-registry'; - import { POOL_TOGETHER_DEFINITION } from '../pool-together.definition'; const appId = POOL_TOGETHER_DEFINITION.id; diff --git a/src/apps/pool-together/ethereum/pool-together.balance-fetcher.ts b/src/apps/pool-together/ethereum/pool-together.balance-fetcher.ts index 1ebcfcbae..f55382df3 100644 --- a/src/apps/pool-together/ethereum/pool-together.balance-fetcher.ts +++ b/src/apps/pool-together/ethereum/pool-together.balance-fetcher.ts @@ -7,8 +7,8 @@ import { presentBalanceFetcherResponse } from '~app-toolkit/helpers/presentation import { BalanceFetcher } from '~balance/balance-fetcher.interface'; import { Network } from '~types/network.interface'; -import { PoolTogetherAirdropTokenBalancesHelper } from '../helpers/pool-together.airdrop.balance-helper'; 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.ETHEREUM_MAINNET) diff --git a/src/apps/pool-together/ethereum/pool-together.tvl-fetcher.ts b/src/apps/pool-together/ethereum/pool-together.tvl-fetcher.ts index 3d108f66a..0ae84eee5 100644 --- a/src/apps/pool-together/ethereum/pool-together.tvl-fetcher.ts +++ b/src/apps/pool-together/ethereum/pool-together.tvl-fetcher.ts @@ -1,14 +1,13 @@ import { Inject } from '@nestjs/common'; -import { BigNumber } from 'ethers'; import { sum } from 'lodash'; import { Register } from '~app-toolkit/decorators'; import { APP_TOOLKIT, IAppToolkit } from '~lib'; import { TvlFetcher } from '~stats/tvl/tvl-fetcher.interface'; import { Network } from '~types/network.interface'; + import { PoolTogetherContractFactory } from '../contracts'; import { PoolTogetherApiPrizePoolRegistry } from '../helpers/pool-together.api.prize-pool-registry'; - import { POOL_TOGETHER_DEFINITION } from '../pool-together.definition'; const appId = POOL_TOGETHER_DEFINITION.id; diff --git a/src/apps/pool-together/helpers/pool-together-v3.prize-pool.token-helper.ts b/src/apps/pool-together/helpers/pool-together-v3.prize-pool.token-helper.ts index dd4413b79..98bbc2dd0 100644 --- a/src/apps/pool-together/helpers/pool-together-v3.prize-pool.token-helper.ts +++ b/src/apps/pool-together/helpers/pool-together-v3.prize-pool.token-helper.ts @@ -8,8 +8,8 @@ import { ContractType } from '~position/contract.interface'; import { AppTokenPosition } from '~position/position.interface'; import { AppGroupsDefinition } from '~position/position.service'; import { Network } from '~types/network.interface'; -import { PoolTogetherContractFactory } from '../contracts'; +import { PoolTogetherContractFactory } from '../contracts'; import { POOL_TOGETHER_DEFINITION } from '../pool-together.definition'; import { V3PrizePool } from './pool-together.api.prize-pool-registry'; diff --git a/src/apps/pool-together/helpers/pool-together.api.prize-pool-registry.ts b/src/apps/pool-together/helpers/pool-together.api.prize-pool-registry.ts index e551c569c..784668eb5 100644 --- a/src/apps/pool-together/helpers/pool-together.api.prize-pool-registry.ts +++ b/src/apps/pool-together/helpers/pool-together.api.prize-pool-registry.ts @@ -1,5 +1,6 @@ import { Injectable } from '@nestjs/common'; import Axios from 'axios'; + import { Network, NETWORK_IDS } from '~types/network.interface'; export type V4PrizePool = { diff --git a/src/apps/pool-together/polygon/pool-together.tvl-fetcher.ts b/src/apps/pool-together/polygon/pool-together.tvl-fetcher.ts index d08ccfae9..c0062af7b 100644 --- a/src/apps/pool-together/polygon/pool-together.tvl-fetcher.ts +++ b/src/apps/pool-together/polygon/pool-together.tvl-fetcher.ts @@ -1,14 +1,13 @@ import { Inject } from '@nestjs/common'; -import { BigNumber } from 'ethers'; import { sum } from 'lodash'; import { Register } from '~app-toolkit/decorators'; import { APP_TOOLKIT, IAppToolkit } from '~lib'; import { TvlFetcher } from '~stats/tvl/tvl-fetcher.interface'; import { Network } from '~types/network.interface'; + import { PoolTogetherContractFactory } from '../contracts'; import { PoolTogetherApiPrizePoolRegistry } from '../helpers/pool-together.api.prize-pool-registry'; - import { POOL_TOGETHER_DEFINITION } from '../pool-together.definition'; const appId = POOL_TOGETHER_DEFINITION.id; diff --git a/src/apps/pool-together/pool-together.module.ts b/src/apps/pool-together/pool-together.module.ts index 97570cf4a..10ead330b 100644 --- a/src/apps/pool-together/pool-together.module.ts +++ b/src/apps/pool-together/pool-together.module.ts @@ -1,29 +1,29 @@ import { Register } from '~app-toolkit/decorators'; import { AbstractApp } from '~app/app.dynamic-module'; -import { AvalanchePoolTogetherV4TicketTokenFetcher } from './avalanche/pool-together.v4-ticket.token-fetcher'; import { AvalanchePoolTogetherBalanceFetcher } from './avalanche/pool-together.balance-fetcher'; +import { AvalanchePoolTogetherTvlFetcher } from './avalanche/pool-together.tvl-fetcher'; +import { AvalanchePoolTogetherV4TicketTokenFetcher } from './avalanche/pool-together.v4-ticket.token-fetcher'; import { CeloPoolTogetherBalanceFetcher } from './celo/pool-together.balance-fetcher'; +import { CeloPoolTogetherTvlFetcher } from './celo/pool-together.tvl-fetcher'; import { CeloPoolTogetherV3TicketTokenFetcher } from './celo/pool-together.v3-ticket.token-fetcher'; import { PoolTogetherContractFactory } from './contracts'; -import { EthereumPoolTogetherV4TicketTokenFetcher } from './ethereum/pool-together.v4-ticket.token-fetcher'; import { EthereumPoolTogetherBalanceFetcher } from './ethereum/pool-together.balance-fetcher'; +import { EthereumPoolTogetherTvlFetcher } from './ethereum/pool-together.tvl-fetcher'; import { EthereumPoolTogetherPodTokenFetcher } from './ethereum/pool-together.v3-pod.token-fetcher'; import { EthereumPoolTogetherV3TicketTokenFetcher } from './ethereum/pool-together.v3-ticket.token-fetcher'; -import { PoolTogetherV4PrizePoolTokenHelper } from './helpers/pool-together-v4.prize-pool.token-helper'; -import { PoolTogetherAirdropTokenBalancesHelper } from './helpers/pool-together.airdrop.balance-helper'; +import { EthereumPoolTogetherV4TicketTokenFetcher } from './ethereum/pool-together.v4-ticket.token-fetcher'; import { PoolTogetherClaimableTokenBalancesHelper } from './helpers/pool-together-v3.claimable.balance-helper'; import { PoolTogetherFaucetAddressHelper } from './helpers/pool-together-v3.faucet.address-helper'; import { PoolTogetherV3PodTokenHelper } from './helpers/pool-together-v3.pod.token-helper'; import { PoolTogetherV3PrizePoolTokenHelper } from './helpers/pool-together-v3.prize-pool.token-helper'; -import { PolygonPoolTogetherV4TicketTokenFetcher } from './polygon/pool-together.v4-ticket.token-fetcher'; -import { PolygonPoolTogetherBalanceFetcher } from './polygon/pool-together.balance-fetcher'; -import { PolygonPoolTogetherV3TicketTokenFetcher } from './polygon/pool-together.v3-ticket.token-fetcher'; +import { PoolTogetherV4PrizePoolTokenHelper } from './helpers/pool-together-v4.prize-pool.token-helper'; +import { PoolTogetherAirdropTokenBalancesHelper } from './helpers/pool-together.airdrop.balance-helper'; import { PoolTogetherApiPrizePoolRegistry } from './helpers/pool-together.api.prize-pool-registry'; +import { PolygonPoolTogetherBalanceFetcher } from './polygon/pool-together.balance-fetcher'; import { PolygonPoolTogetherTvlFetcher } from './polygon/pool-together.tvl-fetcher'; -import { EthereumPoolTogetherTvlFetcher } from './ethereum/pool-together.tvl-fetcher'; -import { CeloPoolTogetherTvlFetcher } from './celo/pool-together.tvl-fetcher'; -import { AvalanchePoolTogetherTvlFetcher } from './avalanche/pool-together.tvl-fetcher'; +import { PolygonPoolTogetherV3TicketTokenFetcher } from './polygon/pool-together.v3-ticket.token-fetcher'; +import { PolygonPoolTogetherV4TicketTokenFetcher } from './polygon/pool-together.v4-ticket.token-fetcher'; import POOL_TOGETHER_DEFINITION, { PoolTogetherAppDefinition } from './pool-together.definition'; @Register.AppModule({ diff --git a/src/cache/cache-on-interval.service.ts b/src/cache/cache-on-interval.service.ts index 934edfef3..b98d9b4b6 100644 --- a/src/cache/cache-on-interval.service.ts +++ b/src/cache/cache-on-interval.service.ts @@ -24,9 +24,7 @@ export class CacheOnIntervalService implements OnModuleInit, OnModuleDestroy { @Inject(Reflector) private readonly reflector: Reflector, ) {} - async onModuleInit() { - await this.cacheManager.load(); - + onModuleInit() { const instanceWrappers = this.discoveryService.getProviders(); instanceWrappers .filter(wrapper => wrapper.isDependencyTreeStatic() && !!wrapper.instance) diff --git a/src/cache/cache.service.ts b/src/cache/cache.service.ts index 50e5619be..dcf1bd565 100644 --- a/src/cache/cache.service.ts +++ b/src/cache/cache.service.ts @@ -19,9 +19,7 @@ export class CacheService implements OnModuleInit { @Inject(Reflector) private readonly reflector: Reflector, ) {} - async onModuleInit() { - await this.cacheManager.load(); - + onModuleInit() { const instanceWrappers = this.discoveryService.getProviders(); instanceWrappers .filter(wrapper => wrapper.isDependencyTreeStatic() && !!wrapper.instance)