Skip to content
This repository has been archived by the owner on Jan 24, 2024. It is now read-only.

Commit

Permalink
fix: removed uniswap pool-token helper prefix on label (#650)
Browse files Browse the repository at this point in the history
  • Loading branch information
wpoulin committed Jun 15, 2022
1 parent 17cdfea commit 46ba164
Show file tree
Hide file tree
Showing 25 changed files with 74 additions and 101 deletions.
Expand Up @@ -24,9 +24,9 @@ export class ArbitrumJonesDaoMillinerV2ContractPositionFetcher implements Positi
async getPositions() {
return this.appToolkit.helpers.masterChefContractPositionHelper.getContractPositions<JonesMillinerV2>({
address: '0xb94d1959084081c5a11c460012ab522f5a0fd756',
appId: JONES_DAO_DEFINITION.id,
groupId: JONES_DAO_DEFINITION.groups.millinerV2.id,
network: Network.ARBITRUM_MAINNET,
appId,
groupId,
network,
dependencies: [{ appId: 'sushiswap', groupIds: ['pool'], network }],
resolveContract: ({ address, network }) => this.contractFactory.jonesMillinerV2({ address, network }),
resolvePoolLength: ({ multicall, contract }) => multicall.wrap(contract).poolLength(),
Expand Down
8 changes: 4 additions & 4 deletions src/apps/klima/polygon/klima.bond.contract-position.ts
Expand Up @@ -35,12 +35,12 @@ export class PolygonKlimaBondContractPositionFetcher implements PositionFetcher<

const depositories = [
{
depositoryAddress: '0x7De627C56D26529145a5f9D85948ecBeAF9a4b34',
depositoryAddress: '0x7de627c56d26529145a5f9d85948ecbeaf9a4b34',
symbol: 'BCT LP',
images: [getTokenImg(BCT_ADDRESS, network)],
},
{
depositoryAddress: '0x27217c3F5bEc4c12Fa506A101bC4bd15417AEAa8',
depositoryAddress: '0x27217c3f5bec4c12fa506a101bc4bd15417aeaa8',
symbol: 'MC02 LP',
images: [getTokenImg(MC02_ADDRESS, network)],
},
Expand All @@ -55,12 +55,12 @@ export class PolygonKlimaBondContractPositionFetcher implements PositionFetcher<
images: [getTokenImg(BCT_ADDRESS, network), getTokenImg(USDC_ADDRESS, network)],
},
{
depositoryAddress: '0xb5aF101742EcAe095944F60C384d09453006bFde',
depositoryAddress: '0xb5af101742ecae095944f60c384d09453006bfde',
symbol: 'KLIMA-USDC LP',
images: [getAppImg(appId), getTokenImg(USDC_ADDRESS, network)],
},
{
depositoryAddress: '0xf9c3FC299dE5f86d9CD6a724e6B44933720f5e6D',
depositoryAddress: '0xf9c3fc299de5f86d9cd6a724e6b44933720f5e6d',
symbol: 'KLIMA-MC02 LP',
images: [getAppImg(appId), getTokenImg(MC02_ADDRESS, network)],
},
Expand Down
Expand Up @@ -14,11 +14,11 @@ import { LLAMA_AIRFORCE_DEFINITION } from '../llama-airforce.definition';

import { EthereumLlamaAirforceMerkleCache } from './llama-airforce.merkle-cache';

@Register.ContractPositionBalanceFetcher({
appId: LLAMA_AIRFORCE_DEFINITION.id,
groupId: LLAMA_AIRFORCE_DEFINITION.groups.airdrop.id,
network: Network.ETHEREUM_MAINNET,
})
const appId = LLAMA_AIRFORCE_DEFINITION.id;
const groupId = LLAMA_AIRFORCE_DEFINITION.groups.airdrop.id;
const network = Network.ETHEREUM_MAINNET;

@Register.ContractPositionBalanceFetcher({ appId, groupId, network })
export class EthereumLlamaAirforceAirdropContractPositionBalanceFetcher
implements PositionBalanceFetcher<ContractPositionBalance>
{
Expand All @@ -33,9 +33,9 @@ export class EthereumLlamaAirforceAirdropContractPositionBalanceFetcher
async getBalances(address: string) {
return this.appToolkit.helpers.contractPositionBalanceHelper.getContractPositionBalances({
address,
appId: LLAMA_AIRFORCE_DEFINITION.id,
groupId: LLAMA_AIRFORCE_DEFINITION.groups.airdrop.id,
network: Network.ETHEREUM_MAINNET,
appId,
groupId,
network,
resolveBalances: async ({ contractPosition, multicall }) => {
const contract = this.contractFactory.llamaAirforceMerkleDistributor(contractPosition);
const rewardToken = contractPosition.tokens.find(isClaimable)!;
Expand Down
Expand Up @@ -15,15 +15,15 @@ const appId = LLAMA_AIRFORCE_DEFINITION.id;
const groupId = LLAMA_AIRFORCE_DEFINITION.groups.vault.id;
const network = Network.ETHEREUM_MAINNET;

@Register.TokenPositionFetcher({ appId, groupId, network })
@Register.TokenPositionFetcher({ appId, groupId, network, options: { includeInTvl: true } })
export class EthereumLlamaAirforceVaultTokenFetcher implements PositionFetcher<AppTokenPosition> {
constructor(
@Inject(APP_TOOLKIT) private readonly appToolkit: IAppToolkit,
@Inject(LlamaAirforceContractFactory) private readonly llamaAirforceContractFactory: LlamaAirforceContractFactory,
) {}

async getPositions() {
return this.appToolkit.helpers.vaultTokenHelper.getTokens<LlamaAirforceUnionVault>({
return await this.appToolkit.helpers.vaultTokenHelper.getTokens<LlamaAirforceUnionVault>({
appId,
groupId,
network,
Expand Down
5 changes: 4 additions & 1 deletion src/apps/lyra-avalon/lyra-avalon.definition.ts
Expand Up @@ -34,7 +34,10 @@ export const LYRA_AVALON_DEFINITION = appDefinition({

tags: [AppTag.OPTIONS],
keywords: [],
links: {},
links: {
discord: 'https://discord.com/invite/P49mj6UbmC',
github: 'https://github.com/lyra-finance',
},

supportedNetworks: {
[Network.OPTIMISM_MAINNET]: [AppAction.VIEW],
Expand Down
2 changes: 1 addition & 1 deletion src/apps/lyra-avalon/optimism/helpers/consts.ts
Expand Up @@ -6,4 +6,4 @@ export const OPTION_TYPES = {
4: 'Short Put Quote',
};

export const REGISTRY_ADDRESS = '0x7c7AbDdbCb6c731237f7546d3e4c5165531fb0c1'.toLowerCase();
export const REGISTRY_ADDRESS = '0x7c7abddbcb6c731237f7546d3e4c5165531fb0c1';
Expand Up @@ -15,9 +15,9 @@ const groupId = LYRA_AVALON_DEFINITION.groups.staking.id;
const network = Network.OPTIMISM_MAINNET;

const FARM = {
address: '0xb02e538a08cFA00E9900cf94e33B161323d8D162'.toLowerCase(),
stakedTokenAddress: '0x70535c46ce04181adf749f34b65b6365164d6b6e'.toLowerCase(),
rewardTokenAddresses: ['0x50c5725949a6f0c72e6c4a641f24049a917db0cb'.toLowerCase()],
address: '0xb02e538a08cfa00e9900cf94e33b161323d8d162',
stakedTokenAddress: '0x70535c46ce04181adf749f34b65b6365164d6b6e',
rewardTokenAddresses: ['0x50c5725949a6f0c72e6c4a641f24049a917db0cb'],
};

@Register.ContractPositionFetcher({ appId, groupId, network })
Expand All @@ -32,21 +32,19 @@ export class OptimismLyraAvalonStakingContractPositionFetcher implements Positio
) {}

async getPositions() {
const result =
await this.appToolkit.helpers.singleStakingFarmContractPositionHelper.getContractPositions<StakingRewards>({
network,
appId,
groupId,
dependencies: [{ appId: 'sorbet', groupIds: ['pool'], network }],
resolveFarmContract: ({ network, address }) => this.lyraContractFactory.stakingRewards({ network, address }),
resolveIsActive: this.synthetixSingleStakingIsActiveStrategy.build({
resolvePeriodFinish: ({ contract, multicall }) => multicall.wrap(contract).periodFinish(),
}),
resolveRois: this.synthetixSingleStakingRoiStrategy.build({
resolveRewardRates: ({ contract, multicall }) => multicall.wrap(contract).rewardRate(),
}),
resolveFarmDefinitions: async () => [FARM],
});
return result;
return await this.appToolkit.helpers.singleStakingFarmContractPositionHelper.getContractPositions<StakingRewards>({
network,
appId,
groupId,
dependencies: [{ appId: 'sorbet', groupIds: ['pool'], network }],
resolveFarmContract: ({ network, address }) => this.lyraContractFactory.stakingRewards({ network, address }),
resolveIsActive: this.synthetixSingleStakingIsActiveStrategy.build({
resolvePeriodFinish: ({ contract, multicall }) => multicall.wrap(contract).periodFinish(),
}),
resolveRois: this.synthetixSingleStakingRoiStrategy.build({
resolveRewardRates: ({ contract, multicall }) => multicall.wrap(contract).rewardRate(),
}),
resolveFarmDefinitions: async () => [FARM],
});
}
}
2 changes: 1 addition & 1 deletion src/apps/maker/ethereum/maker.balance-fetcher.ts
Expand Up @@ -39,7 +39,7 @@ export class EthereumMakerBalanceFetcher implements BalanceFetcher {
address,
appId: MAKER_DEFINITION.id,
groupId: MAKER_DEFINITION.groups.governance.id,
network: Network.ETHEREUM_MAINNET,
network,
resolveContract: ({ address, network }) => this.makerContractFactory.makerGovernance({ address, network }),
resolveStakedTokenBalance: ({ contract, address, multicall }) => multicall.wrap(contract).deposits(address),
resolveRewardTokenBalances: () => 0, // Autocompounds
Expand Down
Expand Up @@ -33,9 +33,9 @@ export class EthereumMakerGovernanceContractPositionFetcher implements PositionF

async getPositions() {
return this.appToolkit.helpers.singleStakingFarmContractPositionHelper.getContractPositions<MakerGovernance>({
network: Network.ETHEREUM_MAINNET,
appId: MAKER_DEFINITION.id,
groupId: MAKER_DEFINITION.groups.governance.id,
network,
appId,
groupId,
resolveFarmDefinitions: async () => FARMS,
resolveFarmContract: ({ network, address }) => this.makerContractFactory.makerGovernance({ network, address }),
resolveIsActive: () => true,
Expand Down
12 changes: 8 additions & 4 deletions src/apps/maker/ethereum/maker.vault.contract-position-fetcher.ts
@@ -1,5 +1,6 @@
import { Inject } from '@nestjs/common';
import { compact, range } from 'lodash';
import _ from 'lodash';
import { range } from 'lodash';
import Web3 from 'web3';

import { APP_TOOLKIT, IAppToolkit } from '~app-toolkit/app-toolkit.interface';
Expand Down Expand Up @@ -51,9 +52,12 @@ export class EthereumMakerVaultContractPositionFetcher implements PositionFetche
const contractPositions = await Promise.all(
range(0, Number(numIlks)).map(async ilkIndex => {
const ilk = await multicall.wrap(ilkRegContract).get(ilkIndex);
const [gem, join] = await Promise.all([
multicall.wrap(ilkRegContract).gem(ilk),
multicall.wrap(ilkRegContract).join(ilk),
]);

const ilkName = Web3.utils.hexToAscii(ilk).replace(/\0/g, '');
const gem = await multicall.wrap(ilkRegContract).gem(ilk);
const join = await multicall.wrap(ilkRegContract).join(ilk);

const contractAddress = join.toLowerCase();
const collateralTokenAddress = gem.toLowerCase();
Expand Down Expand Up @@ -91,6 +95,6 @@ export class EthereumMakerVaultContractPositionFetcher implements PositionFetche
}),
);

return compact(contractPositions);
return _.compact(contractPositions);
}
}
Expand Up @@ -9,11 +9,11 @@ import { Network } from '~types/network.interface';
import { MapleContractFactory, MapleRewards } from '../contracts';
import { MAPLE_DEFINITION } from '../maple.definition';

@Register.ContractPositionBalanceFetcher({
appId: MAPLE_DEFINITION.id,
groupId: MAPLE_DEFINITION.groups.farm.id,
network: Network.ETHEREUM_MAINNET,
})
const appId = MAPLE_DEFINITION.id;
const groupId = MAPLE_DEFINITION.groups.farm.id;
const network = Network.ETHEREUM_MAINNET;

@Register.ContractPositionBalanceFetcher({ appId, groupId, network })
export class EthereumMapleFarmContractPositionBalanceFetcher
implements PositionBalanceFetcher<ContractPositionBalance>
{
Expand All @@ -27,9 +27,9 @@ export class EthereumMapleFarmContractPositionBalanceFetcher
async getBalances(address: string) {
return this.appToolkit.helpers.singleStakingContractPositionBalanceHelper.getBalances<MapleRewards>({
address,
appId: MAPLE_DEFINITION.id,
groupId: MAPLE_DEFINITION.groups.farm.id,
network: Network.ETHEREUM_MAINNET,
appId,
groupId,
network,
resolveContract: ({ address, network }) => this.mapleContractFactory.mapleRewards({ address, network }),
resolveStakedTokenBalance: ({ contract, address, multicall }) => multicall.wrap(contract).balanceOf(address),
resolveRewardTokenBalances: ({ contract, address, multicall }) => multicall.wrap(contract).earned(address),
Expand Down
6 changes: 3 additions & 3 deletions src/apps/maple/ethereum/maple.x-mpl.token-fetcher.ts
Expand Up @@ -23,9 +23,9 @@ export class EthereumMapleXMplTokenFetcher implements PositionFetcher<AppTokenPo

async getPositions() {
return this.appToolkit.helpers.vaultTokenHelper.getTokens<MapleXMpl>({
appId: MAPLE_DEFINITION.id,
groupId: MAPLE_DEFINITION.groups.xMpl.id,
network: Network.ETHEREUM_MAINNET,
appId,
groupId,
network,
resolveContract: ({ address, network }) => this.mapleContractFactory.mapleXMpl({ address, network }),
resolveVaultAddresses: () => ['0x4937a209d4cdbd3ecd48857277cfd4da4d82914c'],
resolveUnderlyingTokenAddress: ({ contract, multicall }) => multicall.wrap(contract).asset(),
Expand Down
Expand Up @@ -28,7 +28,7 @@ export class AvalancheMarketXyzBalanceFetcher implements BalanceFetcher {
supplyGroupId: MARKET_XYZ_DEFINITION.groups.supply.id,
borrowGroupId: MARKET_XYZ_DEFINITION.groups.borrow.id,
network: Network.AVALANCHE_MAINNET,
fuseLensAddress: '0x56563aB1740539983Ff4D487Ea3a3e47e23A19F9',
fuseLensAddress: '0x56563ab1740539983ff4d487ea3a3e47e23a19f9',
getTokenContract: ({ address, network }) => this.compoundContractFactory.compoundCToken({ address, network }),
getBalanceRaw: ({ contract, address, multicall }) => multicall.wrap(contract).balanceOf(address),
getBorrowBalanceRaw: ({ contract, address, multicall }) =>
Expand Down
Expand Up @@ -26,8 +26,7 @@ export class AvalancheMarketXyzSupplyTokenFetcher implements PositionFetcher<App
) {}

async getPositions() {
const network = Network.AVALANCHE_MAINNET;
const poolDirectoryAddress = '0x1c4D63bDA492d69f2D6b02Fb622fb6c49cc401d2';
const poolDirectoryAddress = '0x1c4d63bda492d69f2d6b02fb622fb6c49cc401d2';
const controllerContract = this.marketXyzContractFactory.poolDirectory({ address: poolDirectoryAddress, network });
const pools = await controllerContract.getAllPools();

Expand Down
2 changes: 1 addition & 1 deletion src/apps/market-xyz/fantom/market-xyz.balance-fetcher.ts
Expand Up @@ -28,7 +28,7 @@ export class FantomMarketXyzBalanceFetcher implements BalanceFetcher {
supplyGroupId: MARKET_XYZ_DEFINITION.groups.supply.id,
borrowGroupId: MARKET_XYZ_DEFINITION.groups.borrow.id,
network: Network.FANTOM_OPERA_MAINNET,
fuseLensAddress: '0x5aB6215AB8344C28B899efdE93BEe47B124200Fb',
fuseLensAddress: '0x5ab6215ab8344c28b899efde93bee47b124200fb',
getTokenContract: ({ address, network }) => this.compoundContractFactory.compoundCToken({ address, network }),
getBalanceRaw: ({ contract, address, multicall }) => multicall.wrap(contract).balanceOf(address),
getBorrowBalanceRaw: ({ contract, address, multicall }) =>
Expand Down
Expand Up @@ -25,8 +25,7 @@ export class FantomMarketXyzSupplyTokenFetcher implements PositionFetcher<AppTok
) {}

async getPositions() {
const network = Network.FANTOM_OPERA_MAINNET;
const poolDirectoryAddress = '0x0E7d754A8d1a82220432148C10715497a0569BD7';
const poolDirectoryAddress = '0x0e7d754a8d1a82220432148c10715497a0569bd7';
const controllerContract = this.marketXyzContractFactory.poolDirectory({ address: poolDirectoryAddress, network });
const pools = await controllerContract.getAllPools();

Expand Down
2 changes: 1 addition & 1 deletion src/apps/market-xyz/polygon/market-xyz.balance-fetcher.ts
Expand Up @@ -28,7 +28,7 @@ export class PolygonMarketXyzBalanceFetcher implements BalanceFetcher {
supplyGroupId: MARKET_XYZ_DEFINITION.groups.supply.id,
borrowGroupId: MARKET_XYZ_DEFINITION.groups.borrow.id,
network: Network.POLYGON_MAINNET,
fuseLensAddress: '0xe4D84b252308645098846312286E6c6D2846DbB0',
fuseLensAddress: '0xe4d84b252308645098846312286e6c6d2846dbb0',
getTokenContract: ({ address, network }) => this.compoundContractFactory.compoundCToken({ address, network }),
getBalanceRaw: ({ contract, address, multicall }) => multicall.wrap(contract).balanceOf(address),
getBorrowBalanceRaw: ({ contract, address, multicall }) =>
Expand Down
Expand Up @@ -25,8 +25,7 @@ export class PolygonMarketXyzSupplyTokenFetcher implements PositionFetcher<AppTo
) {}

async getPositions() {
const network = Network.POLYGON_MAINNET;
const poolDirectoryAddress = '0xA2a1cb88D86A939A37770FE5E9530E8700DEe56b';
const poolDirectoryAddress = '0xa2a1cb88d86a939a37770fe5e9530e8700dee56b';
const controllerContract = this.marketXyzContractFactory.poolDirectory({ address: poolDirectoryAddress, network });
const pools = await controllerContract.getAllPools();

Expand Down
3 changes: 2 additions & 1 deletion src/apps/naos/ethereum/naos.balance-fetcher.ts
Expand Up @@ -9,6 +9,8 @@ import { Network } from '~types/network.interface';
import { NaosStakingPools, NaosContractFactory } from '../contracts';
import { NAOS_DEFINITION } from '../naos.definition';

const network = Network.ETHEREUM_MAINNET;

@Register.BalanceFetcher(NAOS_DEFINITION.id, Network.ETHEREUM_MAINNET)
export class EthereumNaosBalanceFetcher implements BalanceFetcher {
constructor(
Expand All @@ -18,7 +20,6 @@ export class EthereumNaosBalanceFetcher implements BalanceFetcher {
) {}

async getStakedBalances(address: string) {
const network = Network.ETHEREUM_MAINNET;
return this.appToolkit.helpers.masterChefContractPositionBalanceHelper.getBalances<NaosStakingPools>({
address,
appId: NAOS_DEFINITION.id,
Expand Down
Expand Up @@ -10,6 +10,7 @@ import { PancakeswapContractFactory, PancakeswapChef } from '../contracts';
import { PANCAKESWAP_DEFINITION } from '../pancakeswap.definition';

import { BinanceSmartChainPancakeswapPoolAddressCacheManager } from './pancakeswap.pool.cache-manager';

const appId = PANCAKESWAP_DEFINITION.id;
const groupId = PANCAKESWAP_DEFINITION.groups.pool.id;
const network = Network.BINANCE_SMART_CHAIN_MAINNET;
Expand Down
Expand Up @@ -16,7 +16,7 @@ const appId = UNISWAP_V2_DEFINITION.id;
const groupId = UNISWAP_V2_DEFINITION.groups.pool.id;
const network = Network.ETHEREUM_MAINNET;

@Register.TokenPositionFetcher({ appId, groupId, network })
@Register.TokenPositionFetcher({ appId, groupId, network, options: { includeInTvl: true } })
export class EthereumUniswapV2PoolTokenFetcher implements PositionFetcher<AppTokenPosition> {
constructor(
@Inject(UniswapV2ContractFactory)
Expand Down
27 changes: 0 additions & 27 deletions src/apps/uniswap-v2/ethereum/uniswap-v2.tvl-fetcher.ts

This file was deleted.

4 changes: 1 addition & 3 deletions src/apps/uniswap-v2/helpers/uniswap-v2.pool.token-helper.ts
Expand Up @@ -97,7 +97,6 @@ export class UniswapV2PoolTokenHelper {
resolvePoolTokenSupply,
resolvePoolUnderlyingTokenAddresses,
resolvePoolReserves,
resolveTokenDisplayPrefix = symbol => symbol,
resolveTokenDisplaySymbol = token => token.symbol,
resolvePoolVolumes = async () => [],
}: UniswapV2PoolTokenHelperParams<T, V>) {
Expand Down Expand Up @@ -181,8 +180,7 @@ export class UniswapV2PoolTokenHelper {
const isBlocked = blockedPools.includes(address);

// Display Props
const prefix = resolveTokenDisplayPrefix(symbol);
const label = `${prefix} ${resolveTokenDisplaySymbol(tokens[0])} / ${resolveTokenDisplaySymbol(tokens[1])}`;
const label = `${resolveTokenDisplaySymbol(tokens[0])} / ${resolveTokenDisplaySymbol(tokens[1])}`;
const secondaryLabel = reservePercentages.map(p => `${Math.round(p * 100)}%`).join(' / ');
const images = tokens.map(v => getImagesFromToken(v)).flat();
const statsItems = [
Expand Down
Expand Up @@ -165,7 +165,7 @@ export class UniswapV2TheGraphPoolTokenBalanceHelper {
const isBlocked = false;

// Display Props
const label = `${symbolPrefix} ${tokens[0].symbol} / ${tokens[1].symbol}`;
const label = `${tokens[0].symbol} / ${tokens[1].symbol}`;
const secondaryLabel = reservePercentages.map(p => `${Math.round(p * 100)}%`).join(' / ');
const images = [getTokenImg(tokens[0].address, network), getTokenImg(tokens[1].address, network)];
const statsItems = [
Expand Down

0 comments on commit 46ba164

Please sign in to comment.