diff --git a/packages/doc/src/stories/widgets/Pool.stories.tsx b/packages/doc/src/stories/widgets/Pool.stories.tsx index a38288ad..56f385f5 100644 --- a/packages/doc/src/stories/widgets/Pool.stories.tsx +++ b/packages/doc/src/stories/widgets/Pool.stories.tsx @@ -84,7 +84,7 @@ Primary.args = { supportAMMV3: true, supportChainIds: [ 1, 42161, 137, 56, 10, 43114, 1313161554, 1030, 8453, 59144, 534352, 169, - 5000, 200901, 48900, 196, 543210, 177, 43111, 988, 421614, 53457, + 5000, 200901, 48900, 196, 543210, 177, 43111, 988, 421614, 53457, 173 ], // onlyChainId: 688689, showSubmissionSubmittedDialog: true, diff --git a/packages/dodoex-api/package.json b/packages/dodoex-api/package.json index 9ea6b5e7..a2c0f9f1 100644 --- a/packages/dodoex-api/package.json +++ b/packages/dodoex-api/package.json @@ -1,6 +1,6 @@ { "name": "@dodoex/api", - "version": "3.6.0", + "version": "3.8.0", "description": "DODO API Kit", "source": "src/index.ts", "types": "dist/types/index.d.ts", diff --git a/packages/dodoex-api/src/chainConfig/basicToken.ts b/packages/dodoex-api/src/chainConfig/basicToken.ts index 1c07f9f0..66522e91 100644 --- a/packages/dodoex-api/src/chainConfig/basicToken.ts +++ b/packages/dodoex-api/src/chainConfig/basicToken.ts @@ -219,4 +219,12 @@ export const basicTokenMap: { wrappedTokenSymbol: 'USDT0', wrappedTokenAddress: '0x779Ded0c9e1022225f8E0630b35a9b54bE713736', }, + [ChainId.ENI]: { + ...DEFAULT_BASIC_TOKEN, + symbol: 'EGAS', + name: 'EGAS', + showDecimals: 6, + wrappedTokenSymbol: 'WEGAS', + wrappedTokenAddress: '0x6D1e851446F4D004AE2A72F9AfEd85e8829A205E', + }, }; diff --git a/packages/dodoex-api/src/chainConfig/chain.ts b/packages/dodoex-api/src/chainConfig/chain.ts index 462b2d79..7a1890ad 100644 --- a/packages/dodoex-api/src/chainConfig/chain.ts +++ b/packages/dodoex-api/src/chainConfig/chain.ts @@ -64,4 +64,6 @@ export enum ChainId { STABLE_TESTNET = 2201, STABLE = 988, + + ENI = 173, } diff --git a/packages/dodoex-api/src/chainConfig/contractConfig.ts b/packages/dodoex-api/src/chainConfig/contractConfig.ts index a3883646..d05f8433 100644 --- a/packages/dodoex-api/src/chainConfig/contractConfig.ts +++ b/packages/dodoex-api/src/chainConfig/contractConfig.ts @@ -16,6 +16,7 @@ import { pharosAtlanticTestnet, stableTestnet, stable, + eni } from '@dodoex/dodo-contract-request'; import { ChainId } from './chain'; @@ -543,6 +544,20 @@ const contractMap: { DODO_DPP_PROXY: stable.DODODppProxy, DODO_MINEV3_PROXY: stable.DODOMineV3Proxy, }, + [ChainId.ENI]: { + MULTI_CALL: eni.MulticallWithValid, + DODO_APPROVE: eni.DODOApprove, + ERC20_HELPER: eni.ERC20Helper, + + ROUTE_V2_DATA_FETCH: eni.DODOV2RouteHelper, + ROUTE_V1_DATA_FETCH: eni.DODOV1PmmHelper, + CALLEE_HELPER: eni.DODOCalleeHelper, + + DODO_PROXY: eni.DODOV2Proxy02, + DODO_DSP_PROXY: eni.DODODspProxy, + DODO_DPP_PROXY: eni.DODODppProxy, + DODO_MINEV3_PROXY: eni.DODOMineV3Proxy, + }, }; export default contractMap; diff --git a/packages/dodoex-api/src/chainConfig/platform.ts b/packages/dodoex-api/src/chainConfig/platform.ts index f75b4fa0..b45c657f 100644 --- a/packages/dodoex-api/src/chainConfig/platform.ts +++ b/packages/dodoex-api/src/chainConfig/platform.ts @@ -38,4 +38,5 @@ export const platformIdMap: { [ChainId.PHAROS_ATLANTIC_TESTNET]: 'pharos-atlantic-testnet', [ChainId.STABLE_TESTNET]: 'stable-testnet', [ChainId.STABLE]: 'stable', + [ChainId.ENI]: 'eni', }; diff --git a/packages/dodoex-widgets/package.json b/packages/dodoex-widgets/package.json index 8925c9da..dc9742a7 100644 --- a/packages/dodoex-widgets/package.json +++ b/packages/dodoex-widgets/package.json @@ -1,6 +1,6 @@ { "name": "@dodoex/widgets", - "version": "3.15.0", + "version": "3.19.0", "description": "DODO Widgets", "source": "src/index.tsx", "types": "dist/types/index.d.ts", @@ -58,10 +58,10 @@ }, "dependencies": { "@babel/runtime": "^7.17.0", - "@dodoex/api": "^3.6.0", + "@dodoex/api": "^3.7.0", "@dodoex/components": "^3.3.0", "@dodoex/contract-request": "^1.3.0", - "@dodoex/dodo-contract-request": "^1.32.0", + "@dodoex/dodo-contract-request": "^1.34.0", "@dodoex/icons": "^2.1.0", "@emotion/react": "^11.10.0", "@emotion/styled": "^11.10.0", diff --git a/packages/dodoex-widgets/src/assets/logo/networks/eni.svg b/packages/dodoex-widgets/src/assets/logo/networks/eni.svg new file mode 100644 index 00000000..ddaad043 --- /dev/null +++ b/packages/dodoex-widgets/src/assets/logo/networks/eni.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/packages/dodoex-widgets/src/constants/chainList.ts b/packages/dodoex-widgets/src/constants/chainList.ts index 0c164dc2..0a486ac8 100644 --- a/packages/dodoex-widgets/src/constants/chainList.ts +++ b/packages/dodoex-widgets/src/constants/chainList.ts @@ -7,6 +7,7 @@ import { ReactComponent as BitlayerLogo } from '../assets/logo/networks/bitlayer import { ReactComponent as BSCLogo } from '../assets/logo/networks/bsc.svg'; import { ReactComponent as CFXLogo } from '../assets/logo/networks/cfx.svg'; import { ReactComponent as DODOchainLogo } from '../assets/logo/networks/dodochain.svg'; +import { ReactComponent as ENILogo } from '../assets/logo/networks/eni.svg'; import { ReactComponent as ETHereumLogo } from '../assets/logo/networks/eth.svg'; import { ReactComponent as HashKeyLogo } from '../assets/logo/networks/haskey.svg'; import { ReactComponent as HemiLogo } from '../assets/logo/networks/hemi.svg'; @@ -322,6 +323,14 @@ export const chainListMap: Map = new Map([ name: 'Stable', }, ], + [ + ChainId.ENI, + { + chainId: ChainId.ENI, + logo: ENILogo, + name: 'ENI Mainnet', + }, + ], ]); export const isTestNet = (chainId: ChainId) => { diff --git a/packages/dodoex-widgets/src/constants/chains.ts b/packages/dodoex-widgets/src/constants/chains.ts index 32e1f9f7..000bc848 100644 --- a/packages/dodoex-widgets/src/constants/chains.ts +++ b/packages/dodoex-widgets/src/constants/chains.ts @@ -73,6 +73,11 @@ export const rpcServerMap: { [ChainId.STABLE]: [ 'https://partners-rpc.stable.xyz/dodo.88b3272adaac2ddaa08f13c049824412d7bffe24a2c760089f6c480115ac00e1', ], + [ChainId.ENI]: [ + 'https://rpc.eniac.network', + 'https://rpc1.eniac.network', + 'https://rpc2.eniac.network', + ], }; export const getRpcSingleUrlMap = (newRpcServerMap?: { @@ -132,6 +137,7 @@ export const scanUrlDomainMap: { [ChainId.PHAROS_ATLANTIC_TESTNET]: 'atlantic.pharosscan.xyz', [ChainId.STABLE_TESTNET]: 'testnet.stablescan.xyz', [ChainId.STABLE]: 'stablescan.xyz', + [ChainId.ENI]: 'scan.eniac.network', }; export const ThegraphKeyMap: { @@ -172,6 +178,7 @@ export const ThegraphKeyMap: { [ChainId.PHAROS_ATLANTIC_TESTNET]: 'pharos-atlantic-testnet', [ChainId.STABLE_TESTNET]: 'stable-testnet', [ChainId.STABLE]: 'stable', + [ChainId.ENI]: 'eni', }; export const blockTimeMap: { @@ -212,6 +219,7 @@ export const blockTimeMap: { [ChainId.PHAROS_ATLANTIC_TESTNET]: 2777, [ChainId.STABLE_TESTNET]: 700, [ChainId.STABLE]: 988, + [ChainId.ENI]: 1000, }; export const dexKeysMap: { @@ -252,4 +260,5 @@ export const dexKeysMap: { [ChainId.PHAROS_ATLANTIC_TESTNET]: [], [ChainId.STABLE_TESTNET]: [], [ChainId.STABLE]: [], + [ChainId.ENI]: [], }; diff --git a/yarn.lock b/yarn.lock index 0d9cb42a..baf5c56b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1409,10 +1409,10 @@ ethers "^6.13.2" https-proxy-agent "^7.0.5" -"@dodoex/dodo-contract-request@^1.32.0": - version "1.32.0" - resolved "https://registry.yarnpkg.com/@dodoex/dodo-contract-request/-/dodo-contract-request-1.32.0.tgz#71fc5627d658946f75cb2f00849d7f9d618a997e" - integrity sha512-gWOdBIiHGWmZzryoV781qKqz3z6eFUfjaTe62VcO0xiBLM51aCpiXTX44jqpYvHbURdFCGgeDO9Br49ac68jUA== +"@dodoex/dodo-contract-request@^1.34.0": + version "1.34.0" + resolved "https://registry.yarnpkg.com/@dodoex/dodo-contract-request/-/dodo-contract-request-1.34.0.tgz#eec8675678aa43eccd38b5744970e4aaaf52f4dd" + integrity sha512-/vsLhH7upXPpTI97pK2Zr9sNR+FVV5nNSDSe4qnEjFWp9IJNa0YFwjoBMR2QnqDHLH7PTt5B0Q1jzFZ/8MbDEA== dependencies: typescript "^5" @@ -20398,7 +20398,7 @@ string-length@^4.0.1: char-regex "^1.0.2" strip-ansi "^6.0.0" -"string-width-cjs@npm:string-width@^4.2.0": +"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3: version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -20416,15 +20416,6 @@ string-width@^1.0.1: is-fullwidth-code-point "^1.0.0" strip-ansi "^3.0.0" -"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3: - version "4.2.3" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" - integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== - dependencies: - emoji-regex "^8.0.0" - is-fullwidth-code-point "^3.0.0" - strip-ansi "^6.0.1" - string-width@^2.1.0, string-width@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e" @@ -20524,7 +20515,7 @@ string_decoder@~1.1.1: dependencies: safe-buffer "~5.1.0" -"strip-ansi-cjs@npm:strip-ansi@^6.0.1": +"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== @@ -20552,13 +20543,6 @@ strip-ansi@^5.1.0: dependencies: ansi-regex "^4.1.0" -strip-ansi@^6.0.0, strip-ansi@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" - integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== - dependencies: - ansi-regex "^5.0.1" - strip-ansi@^7.0.1, strip-ansi@^7.1.0: version "7.1.2" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.2.tgz#132875abde678c7ea8d691533f2e7e22bb744dba" @@ -22122,7 +22106,7 @@ workerpool@^6.5.1: resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.5.1.tgz#060f73b39d0caf97c6db64da004cd01b4c099544" integrity sha512-Fs4dNYcsdpYSAfVxhnl1L5zTksjvOJxtC5hzMNl+1t9B8hTJTdKDyZ5ju7ztgPy+ft9tBFXoOlDNiOT9WUXZlA== -"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0": +"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== @@ -22148,15 +22132,6 @@ wrap-ansi@^6.0.1, wrap-ansi@^6.2.0: string-width "^4.1.0" strip-ansi "^6.0.0" -wrap-ansi@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" - integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== - dependencies: - ansi-styles "^4.0.0" - string-width "^4.1.0" - strip-ansi "^6.0.0" - wrap-ansi@^8.1.0: version "8.1.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"