From bbdeecc4024aa20c020db206a194ca32be386b47 Mon Sep 17 00:00:00 2001 From: yrjkqq Date: Wed, 15 Jan 2025 14:50:35 +0800 Subject: [PATCH 1/3] feat: update contract configurations and addresses for Taiko support in AMM V3 --- .../src/chainConfig/contractConfig.ts | 3 ++- .../PoolWidget/AMMV3/sdks/sdk-core/addresses.ts | 17 +++++++++++++++-- .../PoolWidget/AMMV3/sdks/v3-sdk/constants.ts | 15 +++++++++++++-- 3 files changed, 30 insertions(+), 5 deletions(-) diff --git a/packages/dodoex-api/src/chainConfig/contractConfig.ts b/packages/dodoex-api/src/chainConfig/contractConfig.ts index c1f12020..94d1aaa3 100644 --- a/packages/dodoex-api/src/chainConfig/contractConfig.ts +++ b/packages/dodoex-api/src/chainConfig/contractConfig.ts @@ -8,6 +8,7 @@ import { ChainId } from './chain'; const contractMap: { [key in ChainId]: { + /** MulticallWithValid */ MULTI_CALL: string; DODO_APPROVE: string; /** ERC20Helper */ @@ -19,7 +20,7 @@ const contractMap: { ROUTE_V1_DATA_FETCH: string; /** DODOCalleeHelper */ CALLEE_HELPER: string; - + /** DODOV2Proxy02 */ DODO_PROXY: string; /** DODODspProxy */ DODO_DSP_PROXY: string; diff --git a/packages/dodoex-widgets/src/widgets/PoolWidget/AMMV3/sdks/sdk-core/addresses.ts b/packages/dodoex-widgets/src/widgets/PoolWidget/AMMV3/sdks/sdk-core/addresses.ts index aabc2e56..b2e122e7 100644 --- a/packages/dodoex-widgets/src/widgets/PoolWidget/AMMV3/sdks/sdk-core/addresses.ts +++ b/packages/dodoex-widgets/src/widgets/PoolWidget/AMMV3/sdks/sdk-core/addresses.ts @@ -3,7 +3,15 @@ import { ChainId, SUPPORTED_CHAINS, SupportedChainsType } from './chains'; type AddressMap = { [chainId: number]: string }; type ChainAddresses = { + /** + * UniswapV3Factory + * @see https://taikoscan.io/address/0x78172691DD3B8ADa7aEbd9bFfB487FB11D735DB2?tab=contract#code + */ v3CoreFactoryAddress: string; + /** + * NonfungiblePositionManager + * @see https://taikoscan.io/address/0x2623281DdcC34A73a9e8898f2c57A32A860903f1?tab=contract#code + */ nonfungiblePositionManagerAddress?: string; }; @@ -28,6 +36,12 @@ const SEPOLIA_ADDRESSES: ChainAddresses = { '0x483E5c0f309577f79b0a19cE65E332DD388aD7A8', }; +const TAIKO_ADDRESSES: ChainAddresses = { + v3CoreFactoryAddress: '0x78172691DD3B8ADa7aEbd9bFfB487FB11D735DB2', + nonfungiblePositionManagerAddress: + '0x2623281DdcC34A73a9e8898f2c57A32A860903f1', +}; + export const CHAIN_TO_ADDRESSES_MAP: Record< SupportedChainsType, ChainAddresses @@ -35,8 +49,7 @@ export const CHAIN_TO_ADDRESSES_MAP: Record< [ChainId.MAINNET]: MAINNET_ADDRESSES, [ChainId.ARBITRUM_ONE]: ARBITRUM_ONE_ADDRESSES, [ChainId.SEPOLIA]: SEPOLIA_ADDRESSES, - // TODO - [ChainId.TAIKO]: SEPOLIA_ADDRESSES, + [ChainId.TAIKO]: TAIKO_ADDRESSES, }; /* V3 Contract Addresses */ diff --git a/packages/dodoex-widgets/src/widgets/PoolWidget/AMMV3/sdks/v3-sdk/constants.ts b/packages/dodoex-widgets/src/widgets/PoolWidget/AMMV3/sdks/v3-sdk/constants.ts index 969d627c..08e17db2 100644 --- a/packages/dodoex-widgets/src/widgets/PoolWidget/AMMV3/sdks/v3-sdk/constants.ts +++ b/packages/dodoex-widgets/src/widgets/PoolWidget/AMMV3/sdks/v3-sdk/constants.ts @@ -1,15 +1,26 @@ import { ChainId } from '../sdk-core'; -export const FACTORY_ADDRESS = '0x1F98431c8aD98523631AE4a59f267346ea31F984'; +/** + * Taiko UniswapV3Factory + * @see https://taikoscan.io/address/0x78172691DD3B8ADa7aEbd9bFfB487FB11D735DB2?tab=contract#code + */ +export const FACTORY_ADDRESS = '0x78172691DD3B8ADa7aEbd9bFfB487FB11D735DB2'; export const ADDRESS_ZERO = '0x0000000000000000000000000000000000000000'; // @deprecated please use poolInitCodeHash(chainId: ChainId) export const POOL_INIT_CODE_HASH = - '0x4509fa1e2d1989ac1632a56fe87c53e8d1e9d05847694e00f62b23e28cec98c4'; + '0x5ccd5621c1bb9e44ce98cef8b90d31eb2423dec3793b6239232cefae976936ea'; +/** + * Taiko POOL_INIT_CODE_HASH + * @see PoolAddress.sol + * @see https://taikoscan.io/address/0x202bEE65B164aEcBb6A2318438bf46bEF14E1072?tab=contract#code#F12#L6 + */ export function poolInitCodeHash(chainId?: ChainId): string { switch (chainId) { + case ChainId.TAIKO: + return '0x5ccd5621c1bb9e44ce98cef8b90d31eb2423dec3793b6239232cefae976936ea'; default: return POOL_INIT_CODE_HASH; } From 0d25a6cb918896211eb975b7f74cf4d8367ef71a Mon Sep 17 00:00:00 2001 From: yrjkqq Date: Wed, 15 Jan 2025 15:27:43 +0800 Subject: [PATCH 2/3] chore: bump package versions for @dodoex/api and @dodoex/widgets to 3.0.3-morph.6 and 3.0.2-beta.5 respectively --- packages/dodoex-api/package.json | 2 +- packages/dodoex-widgets/package.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/dodoex-api/package.json b/packages/dodoex-api/package.json index d60fa9e1..85f0a1a2 100644 --- a/packages/dodoex-api/package.json +++ b/packages/dodoex-api/package.json @@ -1,6 +1,6 @@ { "name": "@dodoex/api", - "version": "3.0.3-morph.5", + "version": "3.0.3-morph.6", "description": "DODO API Kit", "source": "src/index.ts", "types": "dist/types/index.d.ts", diff --git a/packages/dodoex-widgets/package.json b/packages/dodoex-widgets/package.json index 8cc7e4ef..5b5ace7e 100644 --- a/packages/dodoex-widgets/package.json +++ b/packages/dodoex-widgets/package.json @@ -1,6 +1,6 @@ { "name": "@dodoex/widgets", - "version": "3.0.2-beta.4", + "version": "3.0.2-beta.5", "description": "DODO Widgets", "source": "src/index.tsx", "types": "dist/types/index.d.ts", @@ -58,7 +58,7 @@ }, "dependencies": { "@babel/runtime": "^7.17.0", - "@dodoex/api": "3.0.3-morph.5", + "@dodoex/api": "3.0.3-morph.6", "@dodoex/components": "3.0.1", "@dodoex/contract-request": "^1.3.0", "@dodoex/dodo-contract-request": "^1.9.0-alpha.3", From c770671bd4dba330e8e4c815d3d99239e1af59f1 Mon Sep 17 00:00:00 2001 From: yrjkqq Date: Wed, 15 Jan 2025 17:46:23 +0800 Subject: [PATCH 3/3] feat: enhance GraphQL queries and types to support metrom mining APY calculations across liquidity and pool data --- packages/doc/package.json | 4 +- packages/dodoex-api/package.json | 2 +- packages/dodoex-api/src/gql/gql.ts | 12 +-- packages/dodoex-api/src/gql/graphql.ts | 24 +++++ .../src/services/pool/graphqlQuery.ts | 3 + packages/dodoex-components/package.json | 4 +- packages/dodoex-widgets/package.json | 6 +- packages/dodoex-widgets/src/locales/en-US.po | 89 ++++++++++--------- packages/dodoex-widgets/src/locales/zh-CN.po | 89 ++++++++++--------- .../PoolWidget/PoolList/AddLiquidity.tsx | 9 +- .../PoolWidget/PoolList/MyLiquidity.tsx | 9 +- .../PoolList/components/PoolApyTooltip.tsx | 22 +++++ 12 files changed, 167 insertions(+), 106 deletions(-) diff --git a/packages/doc/package.json b/packages/doc/package.json index 3ba01aed..8ae872b2 100644 --- a/packages/doc/package.json +++ b/packages/doc/package.json @@ -8,7 +8,7 @@ }, "dependencies": { "@babel/runtime": "^7.17.0", - "@dodoex/components": "^3.0.0-beta.0", + "@dodoex/components": "^3.0.2", "@emotion/styled": "^11.10.0", "@storybook/addon-docs": "^8.3.5", "@web3modal/ethers5": "^3.5.5", @@ -48,4 +48,4 @@ "typescript": "^5.6.3", "webpack": "5" } -} +} \ No newline at end of file diff --git a/packages/dodoex-api/package.json b/packages/dodoex-api/package.json index 85f0a1a2..5df8bbca 100644 --- a/packages/dodoex-api/package.json +++ b/packages/dodoex-api/package.json @@ -1,6 +1,6 @@ { "name": "@dodoex/api", - "version": "3.0.3-morph.6", + "version": "3.0.3-morph.7", "description": "DODO API Kit", "source": "src/index.ts", "types": "dist/types/index.d.ts", diff --git a/packages/dodoex-api/src/gql/gql.ts b/packages/dodoex-api/src/gql/gql.ts index 3520ec18..8eb8d6c8 100644 --- a/packages/dodoex-api/src/gql/gql.ts +++ b/packages/dodoex-api/src/gql/gql.ts @@ -26,13 +26,13 @@ const documents = { types.MyCreatedMiningListDocument, '\n query FetchPoolList(\n $first: Int\n $where: Pair_filter\n $orderBy: Pair_orderBy\n ) {\n pairs(\n first: $first\n where: $where\n orderBy: $orderBy\n orderDirection: desc\n ) {\n id\n type\n creator\n owner\n lpFeeRate\n i\n k\n baseReserve\n quoteReserve\n lastTradePrice\n feeBase\n feeQuote\n baseToken {\n id\n symbol\n name\n decimals\n }\n quoteToken {\n id\n symbol\n name\n decimals\n }\n baseLpToken {\n id\n decimals\n }\n quoteLpToken {\n id\n decimals\n }\n }\n }\n ': types.FetchPoolListDocument, - '\n query FetchLiquidityList($where: Liquiditylist_filter) {\n liquidity_list(where: $where) {\n currentPage\n pageSize\n totalCount\n lqList {\n id\n pair {\n id\n chainId\n type\n lpFeeRate\n mtFeeRate\n creator\n baseLpToken {\n id\n decimals\n }\n quoteLpToken {\n id\n decimals\n }\n baseToken {\n id\n symbol\n name\n decimals\n logoImg\n }\n quoteToken {\n id\n symbol\n name\n decimals\n logoImg\n }\n tvl\n apy {\n miningBaseApy\n miningQuoteApy\n transactionBaseApy\n transactionQuoteApy\n }\n miningAddress\n volume24H\n }\n }\n }\n }\n ': + '\n query FetchLiquidityList($where: Liquiditylist_filter) {\n liquidity_list(where: $where) {\n currentPage\n pageSize\n totalCount\n lqList {\n id\n pair {\n id\n chainId\n type\n lpFeeRate\n mtFeeRate\n creator\n baseLpToken {\n id\n decimals\n }\n quoteLpToken {\n id\n decimals\n }\n baseToken {\n id\n symbol\n name\n decimals\n logoImg\n }\n quoteToken {\n id\n symbol\n name\n decimals\n logoImg\n }\n tvl\n apy {\n miningBaseApy\n miningQuoteApy\n transactionBaseApy\n transactionQuoteApy\n metromMiningApy\n }\n miningAddress\n volume24H\n }\n }\n }\n }\n ': types.FetchLiquidityListDocument, - '\n query FetchMyLiquidityList($where: Liquiditylist_filter) {\n liquidity_list(where: $where) {\n lqList {\n id\n liquidityPositions {\n id\n liquidityTokenBalance\n liquidityTokenInMining\n poolShare\n liquidityUSD\n tokenId\n outOfRange\n priceRange {\n token0LowerPrice\n token0UpperPrice\n token1LowerPrice\n token1UpperPrice\n }\n tickLower {\n id\n tickIdx\n liquidityGross\n liquidityNet\n price0\n price1\n }\n tickUpper {\n id\n tickIdx\n liquidityGross\n liquidityNet\n price0\n price1\n }\n }\n pair {\n id\n chainId\n type\n lpFeeRate\n mtFeeRate\n creator\n baseLpToken {\n id\n decimals\n }\n quoteLpToken {\n id\n decimals\n }\n baseToken {\n id\n symbol\n name\n decimals\n logoImg\n }\n quoteToken {\n id\n symbol\n name\n decimals\n logoImg\n }\n tvl\n apy {\n miningBaseApy\n miningQuoteApy\n transactionBaseApy\n transactionQuoteApy\n }\n miningAddress\n volume24H\n }\n }\n }\n }\n ': + '\n query FetchMyLiquidityList($where: Liquiditylist_filter) {\n liquidity_list(where: $where) {\n lqList {\n id\n liquidityPositions {\n id\n liquidityTokenBalance\n liquidityTokenInMining\n poolShare\n liquidityUSD\n tokenId\n outOfRange\n priceRange {\n token0LowerPrice\n token0UpperPrice\n token1LowerPrice\n token1UpperPrice\n }\n tickLower {\n id\n tickIdx\n liquidityGross\n liquidityNet\n price0\n price1\n }\n tickUpper {\n id\n tickIdx\n liquidityGross\n liquidityNet\n price0\n price1\n }\n }\n pair {\n id\n chainId\n type\n lpFeeRate\n mtFeeRate\n creator\n baseLpToken {\n id\n decimals\n }\n quoteLpToken {\n id\n decimals\n }\n baseToken {\n id\n symbol\n name\n decimals\n logoImg\n }\n quoteToken {\n id\n symbol\n name\n decimals\n logoImg\n }\n tvl\n apy {\n miningBaseApy\n miningQuoteApy\n transactionBaseApy\n transactionQuoteApy\n metromMiningApy\n }\n miningAddress\n volume24H\n }\n }\n }\n }\n ': types.FetchMyLiquidityListDocument, '\n query FetchDashboardPairList($where: Dashboardtype_list_filter) {\n dashboard_pairs_list(where: $where) {\n list {\n chainId\n pairAddress\n poolType\n baseReserve\n quoteReserve\n totalFee\n baseAddress\n quoteAddress\n baseSymbol\n quoteSymbol\n tvl\n baseTvl\n quoteTvl\n baseTvlRate\n quoteTvlRate\n }\n }\n }\n ': types.FetchDashboardPairListDocument, - '\n query FetchPool(\n $id: ID!\n $where: Pair_filter\n $liquidityWhere: Liquiditylist_filter\n ) {\n pair(id: $id, where: $where) {\n id\n type\n creator\n owner\n traderCount\n volumeBaseToken\n volumeQuoteToken\n volumeUSD\n feeBase\n feeQuote\n mtFeeRate\n lpFeeRate\n i\n k\n baseReserve\n quoteReserve\n createdAtTimestamp\n lastTradePrice\n baseToken {\n id\n symbol\n name\n decimals\n }\n quoteToken {\n id\n symbol\n name\n decimals\n usdPrice\n }\n baseLpToken {\n id\n symbol\n name\n decimals\n }\n quoteLpToken {\n id\n symbol\n name\n decimals\n }\n }\n liquidity_list(where: $liquidityWhere) {\n lqList {\n pair {\n apy {\n miningBaseApy\n miningQuoteApy\n transactionBaseApy\n transactionQuoteApy\n }\n miningAddress\n }\n }\n }\n }\n ': + '\n query FetchPool(\n $id: ID!\n $where: Pair_filter\n $liquidityWhere: Liquiditylist_filter\n ) {\n pair(id: $id, where: $where) {\n id\n type\n creator\n owner\n traderCount\n volumeBaseToken\n volumeQuoteToken\n volumeUSD\n feeBase\n feeQuote\n mtFeeRate\n lpFeeRate\n i\n k\n baseReserve\n quoteReserve\n createdAtTimestamp\n lastTradePrice\n baseToken {\n id\n symbol\n name\n decimals\n }\n quoteToken {\n id\n symbol\n name\n decimals\n usdPrice\n }\n baseLpToken {\n id\n symbol\n name\n decimals\n }\n quoteLpToken {\n id\n symbol\n name\n decimals\n }\n }\n liquidity_list(where: $liquidityWhere) {\n lqList {\n pair {\n apy {\n miningBaseApy\n miningQuoteApy\n transactionBaseApy\n transactionQuoteApy\n metromMiningApy\n }\n miningAddress\n }\n }\n }\n }\n ': types.FetchPoolDocument, '\n query FetchPoolDayData($where: Dashboardday_filter) {\n dashboard_pairs_day_data(where: $where) {\n timestamp\n date\n volumeUsd\n feeUsd\n mtFeeUsd\n tvlUsd\n addresses\n }\n }\n ': types.FetchPoolDayDataDocument, @@ -100,13 +100,13 @@ export function graphql( * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients. */ export function graphql( - source: '\n query FetchLiquidityList($where: Liquiditylist_filter) {\n liquidity_list(where: $where) {\n currentPage\n pageSize\n totalCount\n lqList {\n id\n pair {\n id\n chainId\n type\n lpFeeRate\n mtFeeRate\n creator\n baseLpToken {\n id\n decimals\n }\n quoteLpToken {\n id\n decimals\n }\n baseToken {\n id\n symbol\n name\n decimals\n logoImg\n }\n quoteToken {\n id\n symbol\n name\n decimals\n logoImg\n }\n tvl\n apy {\n miningBaseApy\n miningQuoteApy\n transactionBaseApy\n transactionQuoteApy\n }\n miningAddress\n volume24H\n }\n }\n }\n }\n ', + source: '\n query FetchLiquidityList($where: Liquiditylist_filter) {\n liquidity_list(where: $where) {\n currentPage\n pageSize\n totalCount\n lqList {\n id\n pair {\n id\n chainId\n type\n lpFeeRate\n mtFeeRate\n creator\n baseLpToken {\n id\n decimals\n }\n quoteLpToken {\n id\n decimals\n }\n baseToken {\n id\n symbol\n name\n decimals\n logoImg\n }\n quoteToken {\n id\n symbol\n name\n decimals\n logoImg\n }\n tvl\n apy {\n miningBaseApy\n miningQuoteApy\n transactionBaseApy\n transactionQuoteApy\n metromMiningApy\n }\n miningAddress\n volume24H\n }\n }\n }\n }\n ', ): typeof import('./graphql').FetchLiquidityListDocument; /** * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients. */ export function graphql( - source: '\n query FetchMyLiquidityList($where: Liquiditylist_filter) {\n liquidity_list(where: $where) {\n lqList {\n id\n liquidityPositions {\n id\n liquidityTokenBalance\n liquidityTokenInMining\n poolShare\n liquidityUSD\n tokenId\n outOfRange\n priceRange {\n token0LowerPrice\n token0UpperPrice\n token1LowerPrice\n token1UpperPrice\n }\n tickLower {\n id\n tickIdx\n liquidityGross\n liquidityNet\n price0\n price1\n }\n tickUpper {\n id\n tickIdx\n liquidityGross\n liquidityNet\n price0\n price1\n }\n }\n pair {\n id\n chainId\n type\n lpFeeRate\n mtFeeRate\n creator\n baseLpToken {\n id\n decimals\n }\n quoteLpToken {\n id\n decimals\n }\n baseToken {\n id\n symbol\n name\n decimals\n logoImg\n }\n quoteToken {\n id\n symbol\n name\n decimals\n logoImg\n }\n tvl\n apy {\n miningBaseApy\n miningQuoteApy\n transactionBaseApy\n transactionQuoteApy\n }\n miningAddress\n volume24H\n }\n }\n }\n }\n ', + source: '\n query FetchMyLiquidityList($where: Liquiditylist_filter) {\n liquidity_list(where: $where) {\n lqList {\n id\n liquidityPositions {\n id\n liquidityTokenBalance\n liquidityTokenInMining\n poolShare\n liquidityUSD\n tokenId\n outOfRange\n priceRange {\n token0LowerPrice\n token0UpperPrice\n token1LowerPrice\n token1UpperPrice\n }\n tickLower {\n id\n tickIdx\n liquidityGross\n liquidityNet\n price0\n price1\n }\n tickUpper {\n id\n tickIdx\n liquidityGross\n liquidityNet\n price0\n price1\n }\n }\n pair {\n id\n chainId\n type\n lpFeeRate\n mtFeeRate\n creator\n baseLpToken {\n id\n decimals\n }\n quoteLpToken {\n id\n decimals\n }\n baseToken {\n id\n symbol\n name\n decimals\n logoImg\n }\n quoteToken {\n id\n symbol\n name\n decimals\n logoImg\n }\n tvl\n apy {\n miningBaseApy\n miningQuoteApy\n transactionBaseApy\n transactionQuoteApy\n metromMiningApy\n }\n miningAddress\n volume24H\n }\n }\n }\n }\n ', ): typeof import('./graphql').FetchMyLiquidityListDocument; /** * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients. @@ -118,7 +118,7 @@ export function graphql( * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients. */ export function graphql( - source: '\n query FetchPool(\n $id: ID!\n $where: Pair_filter\n $liquidityWhere: Liquiditylist_filter\n ) {\n pair(id: $id, where: $where) {\n id\n type\n creator\n owner\n traderCount\n volumeBaseToken\n volumeQuoteToken\n volumeUSD\n feeBase\n feeQuote\n mtFeeRate\n lpFeeRate\n i\n k\n baseReserve\n quoteReserve\n createdAtTimestamp\n lastTradePrice\n baseToken {\n id\n symbol\n name\n decimals\n }\n quoteToken {\n id\n symbol\n name\n decimals\n usdPrice\n }\n baseLpToken {\n id\n symbol\n name\n decimals\n }\n quoteLpToken {\n id\n symbol\n name\n decimals\n }\n }\n liquidity_list(where: $liquidityWhere) {\n lqList {\n pair {\n apy {\n miningBaseApy\n miningQuoteApy\n transactionBaseApy\n transactionQuoteApy\n }\n miningAddress\n }\n }\n }\n }\n ', + source: '\n query FetchPool(\n $id: ID!\n $where: Pair_filter\n $liquidityWhere: Liquiditylist_filter\n ) {\n pair(id: $id, where: $where) {\n id\n type\n creator\n owner\n traderCount\n volumeBaseToken\n volumeQuoteToken\n volumeUSD\n feeBase\n feeQuote\n mtFeeRate\n lpFeeRate\n i\n k\n baseReserve\n quoteReserve\n createdAtTimestamp\n lastTradePrice\n baseToken {\n id\n symbol\n name\n decimals\n }\n quoteToken {\n id\n symbol\n name\n decimals\n usdPrice\n }\n baseLpToken {\n id\n symbol\n name\n decimals\n }\n quoteLpToken {\n id\n symbol\n name\n decimals\n }\n }\n liquidity_list(where: $liquidityWhere) {\n lqList {\n pair {\n apy {\n miningBaseApy\n miningQuoteApy\n transactionBaseApy\n transactionQuoteApy\n metromMiningApy\n }\n miningAddress\n }\n }\n }\n }\n ', ): typeof import('./graphql').FetchPoolDocument; /** * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients. diff --git a/packages/dodoex-api/src/gql/graphql.ts b/packages/dodoex-api/src/gql/graphql.ts index 7637c233..0f8ac08e 100644 --- a/packages/dodoex-api/src/gql/graphql.ts +++ b/packages/dodoex-api/src/gql/graphql.ts @@ -6644,6 +6644,7 @@ export type Liquidator_OrderBy = | 'updatedAt'; export type LiquidityApyData = { + metromMiningApy?: Maybe; miningBaseApy?: Maybe; miningQuoteApy?: Maybe; transactionBaseApy?: Maybe; @@ -8123,6 +8124,17 @@ export type Market_Maker_Pool_ApplypoolApplyData = { name?: InputMaybe; }; +export type MetromChainInput = { + chainId: Scalars['BigDecimal']['input']; +}; + +export type MetromPool = { + apr: Scalars['BigDecimal']['output']; + apy: Scalars['BigDecimal']['output']; + chainId: Scalars['BigDecimal']['output']; + pool: Scalars['String']['output']; +}; + export type MinePool = { chain: Scalars['String']['output']; /** creator */ @@ -12380,6 +12392,8 @@ export type Query = { /** data url:post(https://host:port/manage/slippage_tolerance_list).data */ manage_slippage_tolerance_list?: Maybe>>; market_maker_pool_apply_create?: Maybe; + /** 获取Metrom的池子列表 */ + metrom_getPools: Array>; minePool?: Maybe; minePools: Array; miningPool?: Maybe; @@ -13756,6 +13770,10 @@ export type QueryMarket_Maker_Pool_Apply_CreateArgs = { data?: InputMaybe; }; +export type QueryMetrom_GetPoolsArgs = { + where?: InputMaybe; +}; + export type QueryMinePoolArgs = { block?: InputMaybe; id: Scalars['ID']['input']; @@ -20926,6 +20944,7 @@ export type FetchLiquidityListQuery = { miningQuoteApy?: any | null; transactionBaseApy?: any | null; transactionQuoteApy?: any | null; + metromMiningApy?: any | null; } | null; } | null; } | null> | null; @@ -21002,6 +21021,7 @@ export type FetchMyLiquidityListQuery = { miningQuoteApy?: any | null; transactionBaseApy?: any | null; transactionQuoteApy?: any | null; + metromMiningApy?: any | null; } | null; } | null; } | null> | null; @@ -21090,6 +21110,7 @@ export type FetchPoolQuery = { miningQuoteApy?: any | null; transactionBaseApy?: any | null; transactionQuoteApy?: any | null; + metromMiningApy?: any | null; } | null; } | null; } | null> | null; @@ -21775,6 +21796,7 @@ export const FetchLiquidityListDocument = new TypedDocumentString(` miningQuoteApy transactionBaseApy transactionQuoteApy + metromMiningApy } miningAddress volume24H @@ -21857,6 +21879,7 @@ export const FetchMyLiquidityListDocument = new TypedDocumentString(` miningQuoteApy transactionBaseApy transactionQuoteApy + metromMiningApy } miningAddress volume24H @@ -21949,6 +21972,7 @@ export const FetchPoolDocument = new TypedDocumentString(` miningQuoteApy transactionBaseApy transactionQuoteApy + metromMiningApy } miningAddress } diff --git a/packages/dodoex-api/src/services/pool/graphqlQuery.ts b/packages/dodoex-api/src/services/pool/graphqlQuery.ts index 09d9f77b..52d0dd93 100644 --- a/packages/dodoex-api/src/services/pool/graphqlQuery.ts +++ b/packages/dodoex-api/src/services/pool/graphqlQuery.ts @@ -91,6 +91,7 @@ export const poolGraphqlQuery = { miningQuoteApy transactionBaseApy transactionQuoteApy + metromMiningApy } miningAddress volume24H @@ -170,6 +171,7 @@ export const poolGraphqlQuery = { miningQuoteApy transactionBaseApy transactionQuoteApy + metromMiningApy } miningAddress volume24H @@ -260,6 +262,7 @@ export const poolGraphqlQuery = { miningQuoteApy transactionBaseApy transactionQuoteApy + metromMiningApy } miningAddress } diff --git a/packages/dodoex-components/package.json b/packages/dodoex-components/package.json index f2d4e599..d3a67bae 100644 --- a/packages/dodoex-components/package.json +++ b/packages/dodoex-components/package.json @@ -1,6 +1,6 @@ { "name": "@dodoex/components", - "version": "3.0.1", + "version": "3.0.2", "description": "UI component library", "source": "src/index.ts", "types": "dist/types/index.d.ts", @@ -40,7 +40,7 @@ "license": "GPL-3.0-or-later", "dependencies": { "@babel/runtime": "^7.17.0", - "@dodoex/icons": "^2.0.1", + "@dodoex/icons": "^2.0.2", "@emotion/react": "^11.10.0", "@emotion/styled": "^11.10.0", "@mui/base": "5.0.0-beta.58", diff --git a/packages/dodoex-widgets/package.json b/packages/dodoex-widgets/package.json index 5b5ace7e..ef0a85e3 100644 --- a/packages/dodoex-widgets/package.json +++ b/packages/dodoex-widgets/package.json @@ -1,6 +1,6 @@ { "name": "@dodoex/widgets", - "version": "3.0.2-beta.5", + "version": "3.0.2-beta.6", "description": "DODO Widgets", "source": "src/index.tsx", "types": "dist/types/index.d.ts", @@ -58,8 +58,8 @@ }, "dependencies": { "@babel/runtime": "^7.17.0", - "@dodoex/api": "3.0.3-morph.6", - "@dodoex/components": "3.0.1", + "@dodoex/api": "3.0.3-morph.7", + "@dodoex/components": "3.0.2", "@dodoex/contract-request": "^1.3.0", "@dodoex/dodo-contract-request": "^1.9.0-alpha.3", "@dodoex/icons": "^2.0.2", diff --git a/packages/dodoex-widgets/src/locales/en-US.po b/packages/dodoex-widgets/src/locales/en-US.po index 811982f2..782c049e 100644 --- a/packages/dodoex-widgets/src/locales/en-US.po +++ b/packages/dodoex-widgets/src/locales/en-US.po @@ -62,9 +62,9 @@ msgstr "Receive {0}" msgid "{0} pending" msgstr "{0} pending" -#: src/widgets/PoolWidget/PoolList/AddLiquidity.tsx:447 +#: src/widgets/PoolWidget/PoolList/AddLiquidity.tsx:449 #: src/widgets/PoolWidget/PoolList/MyCreated.tsx:343 -#: src/widgets/PoolWidget/PoolList/MyLiquidity.tsx:711 +#: src/widgets/PoolWidget/PoolList/MyLiquidity.tsx:713 msgid "Removing" msgstr "Removing" @@ -127,10 +127,10 @@ msgstr "Start Time" msgid "Dismiss" msgstr "Dismiss" -#: src/widgets/PoolWidget/PoolList/AddLiquidity.tsx:248 -#: src/widgets/PoolWidget/PoolList/AddLiquidity.tsx:390 -#: src/widgets/PoolWidget/PoolList/MyLiquidity.tsx:288 -#: src/widgets/PoolWidget/PoolList/MyLiquidity.tsx:597 +#: src/widgets/PoolWidget/PoolList/AddLiquidity.tsx:250 +#: src/widgets/PoolWidget/PoolList/AddLiquidity.tsx:392 +#: src/widgets/PoolWidget/PoolList/MyLiquidity.tsx:290 +#: src/widgets/PoolWidget/PoolList/MyLiquidity.tsx:599 msgid "Pool Type" msgstr "Pool Type" @@ -139,9 +139,9 @@ msgstr "Pool Type" msgid "Unstaking" msgstr "Unstaking" -#: src/widgets/PoolWidget/PoolList/AddLiquidity.tsx:450 +#: src/widgets/PoolWidget/PoolList/AddLiquidity.tsx:452 #: src/widgets/PoolWidget/PoolList/MyCreated.tsx:346 -#: src/widgets/PoolWidget/PoolList/MyLiquidity.tsx:714 +#: src/widgets/PoolWidget/PoolList/MyLiquidity.tsx:716 msgid "Adding" msgstr "Adding" @@ -455,9 +455,9 @@ msgstr "Amount of token rewards" msgid "No results found" msgstr "No results found" -#: src/widgets/PoolWidget/PoolList/AddLiquidity.tsx:386 +#: src/widgets/PoolWidget/PoolList/AddLiquidity.tsx:388 #: src/widgets/PoolWidget/PoolList/MyCreated.tsx:297 -#: src/widgets/PoolWidget/PoolList/MyLiquidity.tsx:593 +#: src/widgets/PoolWidget/PoolList/MyLiquidity.tsx:595 msgid "Pair" msgstr "Pair" @@ -670,13 +670,13 @@ msgstr "More trade settings" msgid "Insufficient cross-chain fees, need at least {0} {1}" msgstr "Insufficient cross-chain fees, need at least {0} {1}" -#: src/widgets/PoolWidget/PoolList/AddLiquidity.tsx:301 -#: src/widgets/PoolWidget/PoolList/AddLiquidity.tsx:394 +#: src/widgets/PoolWidget/PoolList/AddLiquidity.tsx:303 +#: src/widgets/PoolWidget/PoolList/AddLiquidity.tsx:396 #: src/widgets/PoolWidget/PoolList/components/LoadingCard.tsx:77 #: src/widgets/PoolWidget/PoolList/MyCreated.tsx:199 #: src/widgets/PoolWidget/PoolList/MyCreated.tsx:300 -#: src/widgets/PoolWidget/PoolList/MyLiquidity.tsx:343 -#: src/widgets/PoolWidget/PoolList/MyLiquidity.tsx:602 +#: src/widgets/PoolWidget/PoolList/MyLiquidity.tsx:345 +#: src/widgets/PoolWidget/PoolList/MyLiquidity.tsx:604 msgid "TVL" msgstr "TVL" @@ -776,7 +776,7 @@ msgstr "Invite" msgid "The price of this pool is outside of your selected range. Your position is not currently earning fees." msgstr "The price of this pool is outside of your selected range. Your position is not currently earning fees." -#: src/widgets/PoolWidget/PoolList/MyLiquidity.tsx:559 +#: src/widgets/PoolWidget/PoolList/MyLiquidity.tsx:561 msgid "{0}" msgstr "{0}" @@ -977,7 +977,7 @@ msgstr "The setting has been switched to swap mode" msgid "Quote not available" msgstr "Quote not available" -#: src/widgets/PoolWidget/PoolList/MyLiquidity.tsx:980 +#: src/widgets/PoolWidget/PoolList/MyLiquidity.tsx:985 msgid "My pool share" msgstr "My pool share" @@ -999,10 +999,10 @@ msgstr "Stake LP tokens and receive mining rewards." msgid "No LP pools match your criteria" msgstr "No LP pools match your criteria" -#: src/widgets/PoolWidget/PoolList/AddLiquidity.tsx:218 -#: src/widgets/PoolWidget/PoolList/AddLiquidity.tsx:555 -#: src/widgets/PoolWidget/PoolList/MyLiquidity.tsx:258 -#: src/widgets/PoolWidget/PoolList/MyLiquidity.tsx:814 +#: src/widgets/PoolWidget/PoolList/AddLiquidity.tsx:220 +#: src/widgets/PoolWidget/PoolList/AddLiquidity.tsx:560 +#: src/widgets/PoolWidget/PoolList/MyLiquidity.tsx:260 +#: src/widgets/PoolWidget/PoolList/MyLiquidity.tsx:819 msgid "Fee rate" msgstr "Fee rate" @@ -1054,7 +1054,7 @@ msgid "Fresh Mining" msgstr "Fresh Mining" #: src/widgets/PoolWidget/PoolDetail/components/Overview.tsx:98 -#: src/widgets/PoolWidget/PoolList/components/PoolApyTooltip.tsx:148 +#: src/widgets/PoolWidget/PoolList/components/PoolApyTooltip.tsx:151 msgid "LP Fee" msgstr "LP Fee" @@ -1098,8 +1098,8 @@ msgstr "Confirm Cross Chain" msgid "Price impact reaches <0>{priceImpact}%, accept the quote" msgstr "Price impact reaches <0>{priceImpact}%, accept the quote" -#: src/widgets/PoolWidget/PoolList/AddLiquidity.tsx:322 -#: src/widgets/PoolWidget/PoolList/AddLiquidity.tsx:401 +#: src/widgets/PoolWidget/PoolList/AddLiquidity.tsx:324 +#: src/widgets/PoolWidget/PoolList/AddLiquidity.tsx:403 msgid "Volume (1D)" msgstr "Volume (1D)" @@ -1196,10 +1196,11 @@ msgstr "Staked" msgid "Start Time" msgstr "Start Time" -#: src/widgets/PoolWidget/PoolList/AddLiquidity.tsx:174 -#: src/widgets/PoolWidget/PoolList/AddLiquidity.tsx:605 -#: src/widgets/PoolWidget/PoolList/MyLiquidity.tsx:214 -#: src/widgets/PoolWidget/PoolList/MyLiquidity.tsx:868 +#: src/widgets/PoolWidget/PoolList/AddLiquidity.tsx:176 +#: src/widgets/PoolWidget/PoolList/AddLiquidity.tsx:610 +#: src/widgets/PoolWidget/PoolList/components/PoolApyTooltip.tsx:190 +#: src/widgets/PoolWidget/PoolList/MyLiquidity.tsx:216 +#: src/widgets/PoolWidget/PoolList/MyLiquidity.tsx:873 #: src/widgets/PoolWidget/PoolOperate/hooks/usePoolOrMiningTabs.ts:20 msgid "Mining" msgstr "Mining" @@ -1376,8 +1377,8 @@ msgstr "Fee Rate" msgid "You are making changes to the liquidity of a private pool. This is a highly discretionary operation that may cause substantial inflows/outflows of funds and changes in market prices. Please make sure you are fully aware of the implications of each parameter modification." msgstr "You are making changes to the liquidity of a private pool. This is a highly discretionary operation that may cause substantial inflows/outflows of funds and changes in market prices. Please make sure you are fully aware of the implications of each parameter modification." -#: src/widgets/PoolWidget/PoolList/MyLiquidity.tsx:515 -#: src/widgets/PoolWidget/PoolList/MyLiquidity.tsx:616 +#: src/widgets/PoolWidget/PoolList/MyLiquidity.tsx:517 +#: src/widgets/PoolWidget/PoolList/MyLiquidity.tsx:618 msgid "Price Range" msgstr "Price Range" @@ -1389,8 +1390,8 @@ msgstr "{0} deposited" #: src/widgets/PoolWidget/AMMV2Create/MyLiqidity.tsx:64 #: src/widgets/PoolWidget/AMMV3/components/PositionAmountPreview.tsx:222 #: src/widgets/PoolWidget/PoolList/hooks/usePoolListTabs.ts:28 -#: src/widgets/PoolWidget/PoolList/MyLiquidity.tsx:452 -#: src/widgets/PoolWidget/PoolList/MyLiquidity.tsx:611 +#: src/widgets/PoolWidget/PoolList/MyLiquidity.tsx:454 +#: src/widgets/PoolWidget/PoolList/MyLiquidity.tsx:613 #: src/widgets/PoolWidget/PoolOperate/components/LiquidityInfo.tsx:430 msgid "My Liquidity" msgstr "My Liquidity" @@ -1695,7 +1696,7 @@ msgstr "Service update, please wait and try again" msgid "Gas price is too low, please adjust in your wallet and try again" msgstr "Gas price is too low, please adjust in your wallet and try again" -#: src/widgets/PoolWidget/PoolList/MyLiquidity.tsx:366 +#: src/widgets/PoolWidget/PoolList/MyLiquidity.tsx:368 msgid "My Pool Share" msgstr "My Pool Share" @@ -1878,11 +1879,11 @@ msgstr "My Staked" #: src/widgets/MiningWidget/MiningCreate/operate-widgets/RewardForm.tsx:478 #: src/widgets/PoolWidget/AMMV3/components/ReviewModal.tsx:79 #: src/widgets/PoolWidget/PoolDetail/index.tsx:207 -#: src/widgets/PoolWidget/PoolList/AddLiquidity.tsx:346 -#: src/widgets/PoolWidget/PoolList/AddLiquidity.tsx:677 +#: src/widgets/PoolWidget/PoolList/AddLiquidity.tsx:348 +#: src/widgets/PoolWidget/PoolList/AddLiquidity.tsx:682 #: src/widgets/PoolWidget/PoolList/MyCreated.tsx:269 #: src/widgets/PoolWidget/PoolList/MyCreated.tsx:563 -#: src/widgets/PoolWidget/PoolList/MyLiquidity.tsx:1105 +#: src/widgets/PoolWidget/PoolList/MyLiquidity.tsx:1110 #: src/widgets/PoolWidget/PoolOperate/AddPoolOperate.tsx:118 #: src/widgets/PoolWidget/PoolOperate/hooks/usePoolOperateTabs.ts:15 msgid "Add" @@ -1958,7 +1959,7 @@ msgstr "Do not select non-standard ERC20 tokens as this may lead to unknown erro msgid "Create Pool" msgstr "Create Pool" -#: src/widgets/PoolWidget/PoolList/MyLiquidity.tsx:702 +#: src/widgets/PoolWidget/PoolList/MyLiquidity.tsx:704 msgid "Managing" msgstr "Managing" @@ -1980,7 +1981,7 @@ msgid "The closer the provided asset ratio is to the recommended ratio ({recomme msgstr "The closer the provided asset ratio is to the recommended ratio ({recommendRatioText}), the smaller the portion burned." #: src/widgets/PoolWidget/PoolDetail/components/Overview.tsx:112 -#: src/widgets/PoolWidget/PoolList/components/PoolApyTooltip.tsx:166 +#: src/widgets/PoolWidget/PoolList/components/PoolApyTooltip.tsx:169 msgid "MT Fee" msgstr "MT Fee" @@ -2055,12 +2056,12 @@ msgid "Detail" msgstr "Detail" #: src/widgets/PoolWidget/PoolDetail/components/TitleInfo.tsx:225 -#: src/widgets/PoolWidget/PoolList/AddLiquidity.tsx:271 -#: src/widgets/PoolWidget/PoolList/AddLiquidity.tsx:397 +#: src/widgets/PoolWidget/PoolList/AddLiquidity.tsx:273 +#: src/widgets/PoolWidget/PoolList/AddLiquidity.tsx:399 #: src/widgets/PoolWidget/PoolList/components/LoadingCard.tsx:57 #: src/widgets/PoolWidget/PoolList/components/TokenListPoolItem.tsx:102 -#: src/widgets/PoolWidget/PoolList/MyLiquidity.tsx:313 -#: src/widgets/PoolWidget/PoolList/MyLiquidity.tsx:607 +#: src/widgets/PoolWidget/PoolList/MyLiquidity.tsx:315 +#: src/widgets/PoolWidget/PoolList/MyLiquidity.tsx:609 msgid "APY" msgstr "APY" @@ -2122,8 +2123,8 @@ msgstr "Initial Price Alert" #: src/widgets/PoolWidget/PoolDetail/index.tsx:200 #: src/widgets/PoolWidget/PoolList/MyCreated.tsx:254 #: src/widgets/PoolWidget/PoolList/MyCreated.tsx:551 -#: src/widgets/PoolWidget/PoolList/MyLiquidity.tsx:544 -#: src/widgets/PoolWidget/PoolList/MyLiquidity.tsx:1093 +#: src/widgets/PoolWidget/PoolList/MyLiquidity.tsx:546 +#: src/widgets/PoolWidget/PoolList/MyLiquidity.tsx:1098 #: src/widgets/PoolWidget/PoolOperate/hooks/usePoolOperateTabs.ts:16 #: src/widgets/PoolWidget/PoolOperate/RemovePoolOperate.tsx:228 msgid "Remove" @@ -2229,7 +2230,7 @@ msgid "This trading pair does not have enough historical data and has used the d msgstr "This trading pair does not have enough historical data and has used the default dynamic slippage." #: src/widgets/PoolWidget/AMMV3/components/PositionViewCard.tsx:248 -#: src/widgets/PoolWidget/PoolList/MyLiquidity.tsx:1105 +#: src/widgets/PoolWidget/PoolList/MyLiquidity.tsx:1110 msgid "Manage" msgstr "Manage" diff --git a/packages/dodoex-widgets/src/locales/zh-CN.po b/packages/dodoex-widgets/src/locales/zh-CN.po index 706642a4..541ff6e2 100644 --- a/packages/dodoex-widgets/src/locales/zh-CN.po +++ b/packages/dodoex-widgets/src/locales/zh-CN.po @@ -62,9 +62,9 @@ msgstr "" msgid "{0} pending" msgstr "{0} 等待中" -#: src/widgets/PoolWidget/PoolList/AddLiquidity.tsx:447 +#: src/widgets/PoolWidget/PoolList/AddLiquidity.tsx:449 #: src/widgets/PoolWidget/PoolList/MyCreated.tsx:343 -#: src/widgets/PoolWidget/PoolList/MyLiquidity.tsx:711 +#: src/widgets/PoolWidget/PoolList/MyLiquidity.tsx:713 msgid "Removing" msgstr "" @@ -127,10 +127,10 @@ msgstr "" msgid "Dismiss" msgstr "忽略" -#: src/widgets/PoolWidget/PoolList/AddLiquidity.tsx:248 -#: src/widgets/PoolWidget/PoolList/AddLiquidity.tsx:390 -#: src/widgets/PoolWidget/PoolList/MyLiquidity.tsx:288 -#: src/widgets/PoolWidget/PoolList/MyLiquidity.tsx:597 +#: src/widgets/PoolWidget/PoolList/AddLiquidity.tsx:250 +#: src/widgets/PoolWidget/PoolList/AddLiquidity.tsx:392 +#: src/widgets/PoolWidget/PoolList/MyLiquidity.tsx:290 +#: src/widgets/PoolWidget/PoolList/MyLiquidity.tsx:599 msgid "Pool Type" msgstr "" @@ -139,9 +139,9 @@ msgstr "" msgid "Unstaking" msgstr "" -#: src/widgets/PoolWidget/PoolList/AddLiquidity.tsx:450 +#: src/widgets/PoolWidget/PoolList/AddLiquidity.tsx:452 #: src/widgets/PoolWidget/PoolList/MyCreated.tsx:346 -#: src/widgets/PoolWidget/PoolList/MyLiquidity.tsx:714 +#: src/widgets/PoolWidget/PoolList/MyLiquidity.tsx:716 msgid "Adding" msgstr "" @@ -455,9 +455,9 @@ msgstr "" msgid "No results found" msgstr "" -#: src/widgets/PoolWidget/PoolList/AddLiquidity.tsx:386 +#: src/widgets/PoolWidget/PoolList/AddLiquidity.tsx:388 #: src/widgets/PoolWidget/PoolList/MyCreated.tsx:297 -#: src/widgets/PoolWidget/PoolList/MyLiquidity.tsx:593 +#: src/widgets/PoolWidget/PoolList/MyLiquidity.tsx:595 msgid "Pair" msgstr "" @@ -670,13 +670,13 @@ msgstr "" msgid "Insufficient cross-chain fees, need at least {0} {1}" msgstr "跨链费用不足，至少需要 {0} {1} " -#: src/widgets/PoolWidget/PoolList/AddLiquidity.tsx:301 -#: src/widgets/PoolWidget/PoolList/AddLiquidity.tsx:394 +#: src/widgets/PoolWidget/PoolList/AddLiquidity.tsx:303 +#: src/widgets/PoolWidget/PoolList/AddLiquidity.tsx:396 #: src/widgets/PoolWidget/PoolList/components/LoadingCard.tsx:77 #: src/widgets/PoolWidget/PoolList/MyCreated.tsx:199 #: src/widgets/PoolWidget/PoolList/MyCreated.tsx:300 -#: src/widgets/PoolWidget/PoolList/MyLiquidity.tsx:343 -#: src/widgets/PoolWidget/PoolList/MyLiquidity.tsx:602 +#: src/widgets/PoolWidget/PoolList/MyLiquidity.tsx:345 +#: src/widgets/PoolWidget/PoolList/MyLiquidity.tsx:604 msgid "TVL" msgstr "" @@ -776,7 +776,7 @@ msgstr "" msgid "The price of this pool is outside of your selected range. Your position is not currently earning fees." msgstr "" -#: src/widgets/PoolWidget/PoolList/MyLiquidity.tsx:559 +#: src/widgets/PoolWidget/PoolList/MyLiquidity.tsx:561 msgid "{0}" msgstr "" @@ -977,7 +977,7 @@ msgstr "设置已切换至闪兑模式" msgid "Quote not available" msgstr "没有报价" -#: src/widgets/PoolWidget/PoolList/MyLiquidity.tsx:980 +#: src/widgets/PoolWidget/PoolList/MyLiquidity.tsx:985 msgid "My pool share" msgstr "" @@ -999,10 +999,10 @@ msgstr "" msgid "No LP pools match your criteria" msgstr "" -#: src/widgets/PoolWidget/PoolList/AddLiquidity.tsx:218 -#: src/widgets/PoolWidget/PoolList/AddLiquidity.tsx:555 -#: src/widgets/PoolWidget/PoolList/MyLiquidity.tsx:258 -#: src/widgets/PoolWidget/PoolList/MyLiquidity.tsx:814 +#: src/widgets/PoolWidget/PoolList/AddLiquidity.tsx:220 +#: src/widgets/PoolWidget/PoolList/AddLiquidity.tsx:560 +#: src/widgets/PoolWidget/PoolList/MyLiquidity.tsx:260 +#: src/widgets/PoolWidget/PoolList/MyLiquidity.tsx:819 msgid "Fee rate" msgstr "" @@ -1054,7 +1054,7 @@ msgid "Fresh Mining" msgstr "" #: src/widgets/PoolWidget/PoolDetail/components/Overview.tsx:98 -#: src/widgets/PoolWidget/PoolList/components/PoolApyTooltip.tsx:148 +#: src/widgets/PoolWidget/PoolList/components/PoolApyTooltip.tsx:151 msgid "LP Fee" msgstr "" @@ -1098,8 +1098,8 @@ msgstr "确认跨链交易" msgid "Price impact reaches <0>{priceImpact}%, accept the quote" msgstr "价格冲击为<0>{priceImpact}%, 仍接受此报价" -#: src/widgets/PoolWidget/PoolList/AddLiquidity.tsx:322 -#: src/widgets/PoolWidget/PoolList/AddLiquidity.tsx:401 +#: src/widgets/PoolWidget/PoolList/AddLiquidity.tsx:324 +#: src/widgets/PoolWidget/PoolList/AddLiquidity.tsx:403 msgid "Volume (1D)" msgstr "" @@ -1196,10 +1196,11 @@ msgstr "" msgid "Start Time" msgstr "" -#: src/widgets/PoolWidget/PoolList/AddLiquidity.tsx:174 -#: src/widgets/PoolWidget/PoolList/AddLiquidity.tsx:605 -#: src/widgets/PoolWidget/PoolList/MyLiquidity.tsx:214 -#: src/widgets/PoolWidget/PoolList/MyLiquidity.tsx:868 +#: src/widgets/PoolWidget/PoolList/AddLiquidity.tsx:176 +#: src/widgets/PoolWidget/PoolList/AddLiquidity.tsx:610 +#: src/widgets/PoolWidget/PoolList/components/PoolApyTooltip.tsx:190 +#: src/widgets/PoolWidget/PoolList/MyLiquidity.tsx:216 +#: src/widgets/PoolWidget/PoolList/MyLiquidity.tsx:873 #: src/widgets/PoolWidget/PoolOperate/hooks/usePoolOrMiningTabs.ts:20 msgid "Mining" msgstr "" @@ -1376,8 +1377,8 @@ msgstr "" msgid "You are making changes to the liquidity of a private pool. This is a highly discretionary operation that may cause substantial inflows/outflows of funds and changes in market prices. Please make sure you are fully aware of the implications of each parameter modification." msgstr "" -#: src/widgets/PoolWidget/PoolList/MyLiquidity.tsx:515 -#: src/widgets/PoolWidget/PoolList/MyLiquidity.tsx:616 +#: src/widgets/PoolWidget/PoolList/MyLiquidity.tsx:517 +#: src/widgets/PoolWidget/PoolList/MyLiquidity.tsx:618 msgid "Price Range" msgstr "" @@ -1389,8 +1390,8 @@ msgstr "" #: src/widgets/PoolWidget/AMMV2Create/MyLiqidity.tsx:64 #: src/widgets/PoolWidget/AMMV3/components/PositionAmountPreview.tsx:222 #: src/widgets/PoolWidget/PoolList/hooks/usePoolListTabs.ts:28 -#: src/widgets/PoolWidget/PoolList/MyLiquidity.tsx:452 -#: src/widgets/PoolWidget/PoolList/MyLiquidity.tsx:611 +#: src/widgets/PoolWidget/PoolList/MyLiquidity.tsx:454 +#: src/widgets/PoolWidget/PoolList/MyLiquidity.tsx:613 #: src/widgets/PoolWidget/PoolOperate/components/LiquidityInfo.tsx:430 msgid "My Liquidity" msgstr "" @@ -1695,7 +1696,7 @@ msgstr "服务升级中, 请等待或重试" msgid "Gas price is too low, please adjust in your wallet and try again" msgstr "Gas 价格过低, 请调整后重试" -#: src/widgets/PoolWidget/PoolList/MyLiquidity.tsx:366 +#: src/widgets/PoolWidget/PoolList/MyLiquidity.tsx:368 msgid "My Pool Share" msgstr "" @@ -1878,11 +1879,11 @@ msgstr "" #: src/widgets/MiningWidget/MiningCreate/operate-widgets/RewardForm.tsx:478 #: src/widgets/PoolWidget/AMMV3/components/ReviewModal.tsx:79 #: src/widgets/PoolWidget/PoolDetail/index.tsx:207 -#: src/widgets/PoolWidget/PoolList/AddLiquidity.tsx:346 -#: src/widgets/PoolWidget/PoolList/AddLiquidity.tsx:677 +#: src/widgets/PoolWidget/PoolList/AddLiquidity.tsx:348 +#: src/widgets/PoolWidget/PoolList/AddLiquidity.tsx:682 #: src/widgets/PoolWidget/PoolList/MyCreated.tsx:269 #: src/widgets/PoolWidget/PoolList/MyCreated.tsx:563 -#: src/widgets/PoolWidget/PoolList/MyLiquidity.tsx:1105 +#: src/widgets/PoolWidget/PoolList/MyLiquidity.tsx:1110 #: src/widgets/PoolWidget/PoolOperate/AddPoolOperate.tsx:118 #: src/widgets/PoolWidget/PoolOperate/hooks/usePoolOperateTabs.ts:15 msgid "Add" @@ -1958,7 +1959,7 @@ msgstr "" msgid "Create Pool" msgstr "" -#: src/widgets/PoolWidget/PoolList/MyLiquidity.tsx:702 +#: src/widgets/PoolWidget/PoolList/MyLiquidity.tsx:704 msgid "Managing" msgstr "" @@ -1980,7 +1981,7 @@ msgid "The closer the provided asset ratio is to the recommended ratio ({recomme msgstr "" #: src/widgets/PoolWidget/PoolDetail/components/Overview.tsx:112 -#: src/widgets/PoolWidget/PoolList/components/PoolApyTooltip.tsx:166 +#: src/widgets/PoolWidget/PoolList/components/PoolApyTooltip.tsx:169 msgid "MT Fee" msgstr "" @@ -2055,12 +2056,12 @@ msgid "Detail" msgstr "详情" #: src/widgets/PoolWidget/PoolDetail/components/TitleInfo.tsx:225 -#: src/widgets/PoolWidget/PoolList/AddLiquidity.tsx:271 -#: src/widgets/PoolWidget/PoolList/AddLiquidity.tsx:397 +#: src/widgets/PoolWidget/PoolList/AddLiquidity.tsx:273 +#: src/widgets/PoolWidget/PoolList/AddLiquidity.tsx:399 #: src/widgets/PoolWidget/PoolList/components/LoadingCard.tsx:57 #: src/widgets/PoolWidget/PoolList/components/TokenListPoolItem.tsx:102 -#: src/widgets/PoolWidget/PoolList/MyLiquidity.tsx:313 -#: src/widgets/PoolWidget/PoolList/MyLiquidity.tsx:607 +#: src/widgets/PoolWidget/PoolList/MyLiquidity.tsx:315 +#: src/widgets/PoolWidget/PoolList/MyLiquidity.tsx:609 msgid "APY" msgstr "" @@ -2122,8 +2123,8 @@ msgstr "" #: src/widgets/PoolWidget/PoolDetail/index.tsx:200 #: src/widgets/PoolWidget/PoolList/MyCreated.tsx:254 #: src/widgets/PoolWidget/PoolList/MyCreated.tsx:551 -#: src/widgets/PoolWidget/PoolList/MyLiquidity.tsx:544 -#: src/widgets/PoolWidget/PoolList/MyLiquidity.tsx:1093 +#: src/widgets/PoolWidget/PoolList/MyLiquidity.tsx:546 +#: src/widgets/PoolWidget/PoolList/MyLiquidity.tsx:1098 #: src/widgets/PoolWidget/PoolOperate/hooks/usePoolOperateTabs.ts:16 #: src/widgets/PoolWidget/PoolOperate/RemovePoolOperate.tsx:228 msgid "Remove" @@ -2229,7 +2230,7 @@ msgid "This trading pair does not have enough historical data and has used the d msgstr "" #: src/widgets/PoolWidget/AMMV3/components/PositionViewCard.tsx:248 -#: src/widgets/PoolWidget/PoolList/MyLiquidity.tsx:1105 +#: src/widgets/PoolWidget/PoolList/MyLiquidity.tsx:1110 msgid "Manage" msgstr "" diff --git a/packages/dodoex-widgets/src/widgets/PoolWidget/PoolList/AddLiquidity.tsx b/packages/dodoex-widgets/src/widgets/PoolWidget/PoolList/AddLiquidity.tsx index fc59d134..c4d40dc4 100644 --- a/packages/dodoex-widgets/src/widgets/PoolWidget/PoolList/AddLiquidity.tsx +++ b/packages/dodoex-widgets/src/widgets/PoolWidget/PoolList/AddLiquidity.tsx @@ -88,6 +88,8 @@ function CardList({ ) : undefined; const hasMining = !!item.miningAddress?.[0]; + const hasMetromMining = + !!item.apy?.metromMiningApy && Number(item.apy?.metromMiningApy) > 0; const type = item.type as PoolType; const poolType = getPoolAMMOrPMM(type); @@ -156,7 +158,7 @@ function CardList({ /> - {hasMining ? ( + {hasMining || hasMetromMining ? ( 0; const type = item.type as PoolType; const poolType = getPoolAMMOrPMM(type); @@ -601,7 +606,7 @@ function TableList({ alignItems: 'center', }} > - {hasMining ? ( + {hasMining || hasMetromMining ? ( 0; const position = lq.liquidityPositions?.[0]; @@ -196,7 +198,7 @@ function CardList({ /> - {hasMining ? ( + {hasMining || hasMetromMining ? ( 0; const hoverBg = theme.palette.background.tag; return ( @@ -864,7 +869,7 @@ function TableList({ alignItems: 'center', }} > - {hasMining ? ( + {hasMining || hasMetromMining ? ( = hasQuote ? [ { @@ -57,6 +59,7 @@ export default function PoolApyTooltip({ { transactionApy: apy?.transactionBaseApy, miningApy: apy?.miningBaseApy, + metromMiningApy: apy?.metromMiningApy, }, ]; return ( @@ -174,6 +177,25 @@ export default function PoolApyTooltip({ ) : ( '' )} + {item.metromMiningApy && Number(item.metromMiningApy) > 0 && ( + + + Mining + + + {item.metromMiningApy + ? formatApy(new BigNumber(item.metromMiningApy)) + : '-'} + + + )} ))}