From d32b385dcab7337ac890046bedaa8f99c425d36a Mon Sep 17 00:00:00 2001 From: PanaW Date: Tue, 1 Mar 2022 11:48:04 +0800 Subject: [PATCH 01/26] feat: integrate Conflux eSpace --- .../mask/src/plugins/EVM/assets/conflux.png | Bin 0 -> 15481 bytes packages/mask/src/plugins/EVM/constants.ts | 10 +++++++ packages/web3-shared/evm/assets/chains.json | 26 ++++++++++++++++++ packages/web3-shared/evm/types/index.ts | 5 ++++ 4 files changed, 41 insertions(+) create mode 100644 packages/mask/src/plugins/EVM/assets/conflux.png diff --git a/packages/mask/src/plugins/EVM/assets/conflux.png b/packages/mask/src/plugins/EVM/assets/conflux.png new file mode 100644 index 0000000000000000000000000000000000000000..b9d9a1cb520d901c289cc8c8c2e2350a2afa5a89 GIT binary patch literal 15481 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 NYpCcbmn&L_{tv$jWRL&= literal 0 HcmV?d00001 diff --git a/packages/mask/src/plugins/EVM/constants.ts b/packages/mask/src/plugins/EVM/constants.ts index c49be1afb4b8..fd7165fc022f 100644 --- a/packages/mask/src/plugins/EVM/constants.ts +++ b/packages/mask/src/plugins/EVM/constants.ts @@ -167,6 +167,16 @@ export const PLUGIN_NETWORKS: Web3Plugin.NetworkDescriptor[] = [ iconColor: 'rgb(112, 212, 74)', isMainnet: true, }, + { + ID: `${PLUGIN_ID}_conflux`, + networkSupporterPluginID: PLUGIN_ID, + chainId: ChainId.Conflux, + type: NetworkType.Conflux, + name: 'Conflux', + icon: new URL('./assets/conflux.png', import.meta.url), + iconColor: 'rgb(112, 212, 74)', + isMainnet: true, + }, ] export const PLUGIN_PROVIDERS: Web3Plugin.ProviderDescriptor[] = [ { diff --git a/packages/web3-shared/evm/assets/chains.json b/packages/web3-shared/evm/assets/chains.json index 23f44392849e..90fd2a420682 100644 --- a/packages/web3-shared/evm/assets/chains.json +++ b/packages/web3-shared/evm/assets/chains.json @@ -2826,5 +2826,31 @@ "shortName": "palm", "chainId": 11297108109, "networkId": 11297108109 + }, + { + "name": "Conflux eSpace Testnet", + "chain": "Conflux", + "network": "testnet", + "rpc": ["https://evmtestnet.confluxrpc.com"], + "faucets": [], + "features": [], + "nativeCurrency": { "name": "CFX", "symbol": "CFX", "decimals": 18 }, + "infoURL": "https://confluxnetwork.org", + "shortName": "Conflux", + "chainId": 71, + "networkId": 71 + }, + { + "name": "Conflux eSpace", + "chain": "Conflux", + "network": "mainnet", + "rpc": ["https://evm.confluxrpc.com"], + "faucets": [], + "features": [], + "nativeCurrency": { "name": "CFX", "symbol": "CFX", "decimals": 18 }, + "infoURL": "https://confluxnetwork.org", + "shortName": "Conflux", + "chainId": 1030, + "networkId": 1030 } ] diff --git a/packages/web3-shared/evm/types/index.ts b/packages/web3-shared/evm/types/index.ts index a9fa573f9b0b..49d4a111024d 100644 --- a/packages/web3-shared/evm/types/index.ts +++ b/packages/web3-shared/evm/types/index.ts @@ -79,6 +79,10 @@ export enum ChainId { // Optimistic Optimistic = 10, + + // Conflux + Conflux = 1030, + Conflux_Testnet = 71, } export enum ProviderType { @@ -114,6 +118,7 @@ export enum NetworkType { Fuse = 'Fuse', Metis = 'Metis', Optimistic = 'Optimistic', + Conflux = 'Conflux', } export interface Wallet { From 5bdd564972563b7d59953fc9a1e0c2af062a1d4d Mon Sep 17 00:00:00 2001 From: PanaW Date: Tue, 1 Mar 2022 14:49:48 +0800 Subject: [PATCH 02/26] feat: update token logo --- .../mask/src/plugins/EVM/assets/conflux.png | Bin 15481 -> 4956 bytes .../web3-shared/evm/utils/chainDetailed.ts | 1 + 2 files changed, 1 insertion(+) diff --git a/packages/mask/src/plugins/EVM/assets/conflux.png b/packages/mask/src/plugins/EVM/assets/conflux.png index b9d9a1cb520d901c289cc8c8c2e2350a2afa5a89..15a63b95827c01614da95c140f707b671878e132 100644 GIT binary patch literal 4956 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 NYpCcbmn&L_{tv$jWRL&= diff --git a/packages/web3-shared/evm/utils/chainDetailed.ts b/packages/web3-shared/evm/utils/chainDetailed.ts index 1cceb01fa697..153c89ef2bd7 100644 --- a/packages/web3-shared/evm/utils/chainDetailed.ts +++ b/packages/web3-shared/evm/utils/chainDetailed.ts @@ -114,6 +114,7 @@ const chainNameMap: Record = { [NetworkType.Fuse]: 'Fuse', [NetworkType.Metis]: 'Metis', [NetworkType.Optimistic]: 'Optimistic', + [NetworkType.Conflux]: 'Conflux', } export function getNetworkTypeFromChainId(chainId: ChainId, value?: boolean) { const chainDetailed = getChainDetailed(chainId) From 6cd8ba694eec554d9ab568b8a6f6e8fb6157a28b Mon Sep 17 00:00:00 2001 From: PanaW Date: Tue, 1 Mar 2022 15:13:23 +0800 Subject: [PATCH 03/26] feat: fix lint --- packages/mask/src/plugins/Trader/constants/0x.ts | 1 + packages/mask/src/plugins/Trader/constants/dodo.ts | 1 + packages/mask/src/plugins/Trader/pipes.ts | 2 ++ 3 files changed, 4 insertions(+) diff --git a/packages/mask/src/plugins/Trader/constants/0x.ts b/packages/mask/src/plugins/Trader/constants/0x.ts index 06be52d5c29f..c1e3a34a1da7 100644 --- a/packages/mask/src/plugins/Trader/constants/0x.ts +++ b/packages/mask/src/plugins/Trader/constants/0x.ts @@ -14,6 +14,7 @@ export const ZRX_BASE_URL: Record = { [NetworkType.Fuse]: '', [NetworkType.Metis]: '', [NetworkType.Optimistic]: '', + [NetworkType.Conflux]: '', } export const ZRX_AFFILIATE_ADDRESS = '0x934B510D4C9103E6a87AEf13b816fb080286D649' diff --git a/packages/mask/src/plugins/Trader/constants/dodo.ts b/packages/mask/src/plugins/Trader/constants/dodo.ts index 7996fe13525e..912c4af0615d 100644 --- a/packages/mask/src/plugins/Trader/constants/dodo.ts +++ b/packages/mask/src/plugins/Trader/constants/dodo.ts @@ -16,4 +16,5 @@ export const networkNames: Record = { [NetworkType.Fuse]: '', [NetworkType.Metis]: '', [NetworkType.Optimistic]: '', + [NetworkType.Conflux]: '', } diff --git a/packages/mask/src/plugins/Trader/pipes.ts b/packages/mask/src/plugins/Trader/pipes.ts index ea9434a4858a..8739a17e1356 100644 --- a/packages/mask/src/plugins/Trader/pipes.ts +++ b/packages/mask/src/plugins/Trader/pipes.ts @@ -98,6 +98,7 @@ export function resolveTradeProviderLink(tradeProvider: TradeProvider, networkTy case NetworkType.Metis: case NetworkType.Avalanche: case NetworkType.Optimistic: + case NetworkType.Conflux: console.error('To be implement network: ', networkType) return '' default: @@ -176,6 +177,7 @@ export function resolveTradePairLink(tradeProvider: TradeProvider, address: stri case NetworkType.Fuse: case NetworkType.Metis: case NetworkType.Optimistic: + case NetworkType.Conflux: console.error('To be implement network: ', networkType) return '' default: From 447dde5ba31a10147de58f22bbb483e9604bef28 Mon Sep 17 00:00:00 2001 From: PanaW Date: Tue, 1 Mar 2022 15:20:08 +0800 Subject: [PATCH 04/26] feat: fix lint --- packages/mask/src/plugins/Trader/apis/trader/index.ts | 1 + packages/mask/src/plugins/Trader/constants/openocean.ts | 1 + packages/mask/src/plugins/Trader/trader/0x/useTrade.ts | 1 + packages/public-api/src/web.ts | 1 + packages/web3-shared/evm/utils/chainDetailed.ts | 1 + 5 files changed, 5 insertions(+) diff --git a/packages/mask/src/plugins/Trader/apis/trader/index.ts b/packages/mask/src/plugins/Trader/apis/trader/index.ts index 3e562ea63401..2e41472dbe9c 100644 --- a/packages/mask/src/plugins/Trader/apis/trader/index.ts +++ b/packages/mask/src/plugins/Trader/apis/trader/index.ts @@ -54,6 +54,7 @@ export async function getAvailableTraderProviders(chainId: ChainId) { case NetworkType.Fuse: case NetworkType.Metis: case NetworkType.Optimistic: + case NetworkType.Conflux: console.error('To be implement network: ', networkType) return [] default: diff --git a/packages/mask/src/plugins/Trader/constants/openocean.ts b/packages/mask/src/plugins/Trader/constants/openocean.ts index 862e158999b1..5749ad41b6e6 100644 --- a/packages/mask/src/plugins/Trader/constants/openocean.ts +++ b/packages/mask/src/plugins/Trader/constants/openocean.ts @@ -16,4 +16,5 @@ export const networkNames: Record = { [NetworkType.Fuse]: '', [NetworkType.Metis]: '', [NetworkType.Optimistic]: '', + [NetworkType.Conflux]: '', } diff --git a/packages/mask/src/plugins/Trader/trader/0x/useTrade.ts b/packages/mask/src/plugins/Trader/trader/0x/useTrade.ts index 8476309e06ed..97d1fded9a1f 100644 --- a/packages/mask/src/plugins/Trader/trader/0x/useTrade.ts +++ b/packages/mask/src/plugins/Trader/trader/0x/useTrade.ts @@ -36,6 +36,7 @@ export function getNativeTokenLabel(networkType: NetworkType) { case NetworkType.Metis: case NetworkType.Avalanche: case NetworkType.Optimistic: + case NetworkType.Conflux: return NATIVE_TOKEN_ADDRESS default: safeUnreachable(networkType) diff --git a/packages/public-api/src/web.ts b/packages/public-api/src/web.ts index d507b9b8c2b6..e8f7b18599fc 100644 --- a/packages/public-api/src/web.ts +++ b/packages/public-api/src/web.ts @@ -193,6 +193,7 @@ export enum NetworkType { Fuse = 'Fuse', Metis = 'Metis', Optimistic = 'Optimistic', + Conflux = 'Conflux', } export enum DataProvider { diff --git a/packages/web3-shared/evm/utils/chainDetailed.ts b/packages/web3-shared/evm/utils/chainDetailed.ts index 153c89ef2bd7..0cb782712087 100644 --- a/packages/web3-shared/evm/utils/chainDetailed.ts +++ b/packages/web3-shared/evm/utils/chainDetailed.ts @@ -95,6 +95,7 @@ export const getChainIdFromNetworkType = createLookupTableResolver Date: Tue, 8 Mar 2022 17:13:46 +0800 Subject: [PATCH 05/26] feat(wip): add smart contract redpacket ito --- packages/mask/src/plugins/EVM/constants.ts | 10 ++++++++++ packages/mask/src/plugins/ITO/base.ts | 2 ++ packages/mask/src/plugins/NextID/base.ts | 2 ++ .../RedPacket/SNSAdaptor/RedPacketCreateNew.tsx | 8 +++++++- packages/mask/src/plugins/RedPacket/base.ts | 2 ++ packages/mask/src/plugins/Trader/apis/trader/index.ts | 1 + packages/mask/src/plugins/Trader/constants/0x.ts | 1 + packages/mask/src/plugins/Trader/constants/dodo.ts | 1 + .../mask/src/plugins/Trader/constants/openocean.ts | 1 + packages/mask/src/plugins/Trader/pipes.ts | 2 ++ packages/mask/src/plugins/Trader/trader/0x/useTrade.ts | 1 + packages/web3-shared/evm/types/index.ts | 1 + packages/web3-shared/evm/utils/chainDetailed.ts | 2 ++ 13 files changed, 33 insertions(+), 1 deletion(-) diff --git a/packages/mask/src/plugins/EVM/constants.ts b/packages/mask/src/plugins/EVM/constants.ts index fd7165fc022f..0b4178fe04e2 100644 --- a/packages/mask/src/plugins/EVM/constants.ts +++ b/packages/mask/src/plugins/EVM/constants.ts @@ -177,6 +177,16 @@ export const PLUGIN_NETWORKS: Web3Plugin.NetworkDescriptor[] = [ iconColor: 'rgb(112, 212, 74)', isMainnet: true, }, + { + ID: `${PLUGIN_ID}_conflux_Testnet`, + networkSupporterPluginID: PLUGIN_ID, + chainId: ChainId.Conflux_Testnet, + type: NetworkType.Conflux_Testnet, + name: 'Conflux_Testnet', + icon: new URL('./assets/conflux.png', import.meta.url), + iconColor: 'rgb(112, 212, 74)', + isMainnet: true, + }, ] export const PLUGIN_PROVIDERS: Web3Plugin.ProviderDescriptor[] = [ { diff --git a/packages/mask/src/plugins/ITO/base.ts b/packages/mask/src/plugins/ITO/base.ts index eceee4b13b46..b618de701f29 100644 --- a/packages/mask/src/plugins/ITO/base.ts +++ b/packages/mask/src/plugins/ITO/base.ts @@ -25,6 +25,8 @@ export const base: Plugin.Shared.Definition = { ChainId.Aurora, ChainId.Avalanche, ChainId.Fantom, + ChainId.Conflux, + ChainId.Conflux_Testnet, ], }, }, diff --git a/packages/mask/src/plugins/NextID/base.ts b/packages/mask/src/plugins/NextID/base.ts index 459ddf09c267..9b0a27dd9553 100644 --- a/packages/mask/src/plugins/NextID/base.ts +++ b/packages/mask/src/plugins/NextID/base.ts @@ -28,6 +28,8 @@ export const base: Plugin.Shared.Definition = { ChainId.Aurora, ChainId.Avalanche, ChainId.Fantom, + ChainId.Conflux, + ChainId.Conflux_Testnet, ], }, }, diff --git a/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketCreateNew.tsx b/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketCreateNew.tsx index d79032bd5129..5ca11546c9c4 100644 --- a/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketCreateNew.tsx +++ b/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketCreateNew.tsx @@ -83,7 +83,13 @@ export function RedPacketCreateNew(props: RedPacketFormProps & { state: readonly ), children: , sx: { p: 0 }, - disabled: ![ChainId.Mainnet, ChainId.Matic, ChainId.BSC].includes(chainId), + disabled: ![ + ChainId.Mainnet, + ChainId.Matic, + ChainId.BSC, + ChainId.Conflux, + ChainId.Conflux_Testnet, + ].includes(chainId), }, ], state, diff --git a/packages/mask/src/plugins/RedPacket/base.ts b/packages/mask/src/plugins/RedPacket/base.ts index 5be12ed3fc1b..ea9b03f82ef2 100644 --- a/packages/mask/src/plugins/RedPacket/base.ts +++ b/packages/mask/src/plugins/RedPacket/base.ts @@ -26,6 +26,8 @@ export const base: Plugin.Shared.Definition = { ChainId.Fantom, ChainId.Avalanche, ChainId.Aurora, + ChainId.Conflux, + ChainId.Conflux_Testnet, ], }, }, diff --git a/packages/mask/src/plugins/Trader/apis/trader/index.ts b/packages/mask/src/plugins/Trader/apis/trader/index.ts index 2e41472dbe9c..0d870a5b52a9 100644 --- a/packages/mask/src/plugins/Trader/apis/trader/index.ts +++ b/packages/mask/src/plugins/Trader/apis/trader/index.ts @@ -55,6 +55,7 @@ export async function getAvailableTraderProviders(chainId: ChainId) { case NetworkType.Metis: case NetworkType.Optimistic: case NetworkType.Conflux: + case NetworkType.Conflux_Testnet: console.error('To be implement network: ', networkType) return [] default: diff --git a/packages/mask/src/plugins/Trader/constants/0x.ts b/packages/mask/src/plugins/Trader/constants/0x.ts index c1e3a34a1da7..ea0e3d640acc 100644 --- a/packages/mask/src/plugins/Trader/constants/0x.ts +++ b/packages/mask/src/plugins/Trader/constants/0x.ts @@ -15,6 +15,7 @@ export const ZRX_BASE_URL: Record = { [NetworkType.Metis]: '', [NetworkType.Optimistic]: '', [NetworkType.Conflux]: '', + [NetworkType.Conflux_Testnet]: '', } export const ZRX_AFFILIATE_ADDRESS = '0x934B510D4C9103E6a87AEf13b816fb080286D649' diff --git a/packages/mask/src/plugins/Trader/constants/dodo.ts b/packages/mask/src/plugins/Trader/constants/dodo.ts index 912c4af0615d..2fa91a75d2fc 100644 --- a/packages/mask/src/plugins/Trader/constants/dodo.ts +++ b/packages/mask/src/plugins/Trader/constants/dodo.ts @@ -17,4 +17,5 @@ export const networkNames: Record = { [NetworkType.Metis]: '', [NetworkType.Optimistic]: '', [NetworkType.Conflux]: '', + [NetworkType.Conflux_Testnet]: '', } diff --git a/packages/mask/src/plugins/Trader/constants/openocean.ts b/packages/mask/src/plugins/Trader/constants/openocean.ts index 5749ad41b6e6..999a751ca3be 100644 --- a/packages/mask/src/plugins/Trader/constants/openocean.ts +++ b/packages/mask/src/plugins/Trader/constants/openocean.ts @@ -17,4 +17,5 @@ export const networkNames: Record = { [NetworkType.Metis]: '', [NetworkType.Optimistic]: '', [NetworkType.Conflux]: '', + [NetworkType.Conflux_Testnet]: '', } diff --git a/packages/mask/src/plugins/Trader/pipes.ts b/packages/mask/src/plugins/Trader/pipes.ts index 8739a17e1356..13be20e66c8c 100644 --- a/packages/mask/src/plugins/Trader/pipes.ts +++ b/packages/mask/src/plugins/Trader/pipes.ts @@ -99,6 +99,7 @@ export function resolveTradeProviderLink(tradeProvider: TradeProvider, networkTy case NetworkType.Avalanche: case NetworkType.Optimistic: case NetworkType.Conflux: + case NetworkType.Conflux_Testnet: console.error('To be implement network: ', networkType) return '' default: @@ -178,6 +179,7 @@ export function resolveTradePairLink(tradeProvider: TradeProvider, address: stri case NetworkType.Metis: case NetworkType.Optimistic: case NetworkType.Conflux: + case NetworkType.Conflux_Testnet: console.error('To be implement network: ', networkType) return '' default: diff --git a/packages/mask/src/plugins/Trader/trader/0x/useTrade.ts b/packages/mask/src/plugins/Trader/trader/0x/useTrade.ts index 97d1fded9a1f..8557be87a2c4 100644 --- a/packages/mask/src/plugins/Trader/trader/0x/useTrade.ts +++ b/packages/mask/src/plugins/Trader/trader/0x/useTrade.ts @@ -37,6 +37,7 @@ export function getNativeTokenLabel(networkType: NetworkType) { case NetworkType.Avalanche: case NetworkType.Optimistic: case NetworkType.Conflux: + case NetworkType.Conflux_Testnet: return NATIVE_TOKEN_ADDRESS default: safeUnreachable(networkType) diff --git a/packages/web3-shared/evm/types/index.ts b/packages/web3-shared/evm/types/index.ts index 49d4a111024d..bea1305ccd5a 100644 --- a/packages/web3-shared/evm/types/index.ts +++ b/packages/web3-shared/evm/types/index.ts @@ -119,6 +119,7 @@ export enum NetworkType { Metis = 'Metis', Optimistic = 'Optimistic', Conflux = 'Conflux', + Conflux_Testnet = 'Conflux_Testnet', } export interface Wallet { diff --git a/packages/web3-shared/evm/utils/chainDetailed.ts b/packages/web3-shared/evm/utils/chainDetailed.ts index 0cb782712087..2d3bf5263b18 100644 --- a/packages/web3-shared/evm/utils/chainDetailed.ts +++ b/packages/web3-shared/evm/utils/chainDetailed.ts @@ -96,6 +96,7 @@ export const getChainIdFromNetworkType = createLookupTableResolver = { [NetworkType.Metis]: 'Metis', [NetworkType.Optimistic]: 'Optimistic', [NetworkType.Conflux]: 'Conflux', + [NetworkType.Conflux_Testnet]: 'Conflux_Testnet', } export function getNetworkTypeFromChainId(chainId: ChainId, value?: boolean) { const chainDetailed = getChainDetailed(chainId) From 62640cb70800f2bcf9b98cedf9fa45ed58f48ed4 Mon Sep 17 00:00:00 2001 From: zhouhanseng Date: Wed, 16 Mar 2022 12:30:51 +0800 Subject: [PATCH 06/26] feat: integrate smart contract --- .../mask/src/components/shared/ApplicationBoard.tsx | 9 +++++++-- packages/mask/src/plugins/EVM/constants.ts | 10 ---------- .../src/plugins/ITO/SNSAdaptor/CompositionDialog.tsx | 2 +- packages/mask/src/plugins/ITO/base.ts | 2 -- packages/mask/src/plugins/NextID/base.ts | 1 - .../RedPacket/SNSAdaptor/RedPacketCreateNew.tsx | 8 +------- .../plugins/RedPacket/SNSAdaptor/RedPacketDialog.tsx | 2 +- .../src/plugins/RedPacket/SNSAdaptor/RedPacketNft.tsx | 2 +- .../mask/src/plugins/RedPacket/Worker/apis/chain.ts | 2 +- packages/mask/src/plugins/RedPacket/base.ts | 1 - packages/mask/src/plugins/Trader/apis/trader/index.ts | 1 - packages/mask/src/plugins/Trader/constants/0x.ts | 1 - packages/mask/src/plugins/Trader/constants/dodo.ts | 1 - .../mask/src/plugins/Trader/constants/openocean.ts | 1 - packages/mask/src/plugins/Trader/trader/0x/useTrade.ts | 1 - packages/web3-shared/evm/assets/chains.json | 7 ++++++- packages/web3-shared/evm/types/index.ts | 2 -- packages/web3-shared/evm/utils/chainDetailed.ts | 2 -- 18 files changed, 18 insertions(+), 37 deletions(-) diff --git a/packages/mask/src/components/shared/ApplicationBoard.tsx b/packages/mask/src/components/shared/ApplicationBoard.tsx index d30e2849a02f..880bbf6e6af7 100644 --- a/packages/mask/src/components/shared/ApplicationBoard.tsx +++ b/packages/mask/src/components/shared/ApplicationBoard.tsx @@ -8,6 +8,7 @@ import { MaskMessages } from '../../utils/messages' import { useControlledDialog } from '../../utils/hooks/useControlledDialog' import { RedPacketPluginID } from '../../plugins/RedPacket/constants' import { ITO_PluginID } from '../../plugins/ITO/constants' +import { base as ITO_Definition } from '../../plugins/ITO/base' import { PluginTransakMessages } from '../../plugins/Transak/messages' import { PluginPetMessages } from '../../plugins/Pets/messages' import { ClaimAllDialog } from '../../plugins/ITO/SNSAdaptor/ClaimAllDialog' @@ -229,6 +230,10 @@ export function ApplicationBoard({ secondEntries, secondEntryChainTabs }: MaskAp } } + // Todo: remove this after refactor applicationBoard + const isITOSupportedChain = + ITO_Definition.enableRequirement.web3![NetworkPluginID.PLUGIN_EVM]?.supportedChainIds?.includes(currentChainId) + const firstLevelEntries: MaskAppEntry[] = [ createEntry( 'Lucky Drop', @@ -250,14 +255,14 @@ export function ApplicationBoard({ secondEntries, secondEntryChainTabs }: MaskAp new URL('./assets/token.png', import.meta.url).toString(), () => openEncryptedMessage(ITO_PluginID), undefined, - isNotEvm, + !isITOSupportedChain, ), createEntry( 'Claim', new URL('./assets/gift.png', import.meta.url).toString(), onClaimAllDialogOpen, undefined, - isNotEvm, + !isITOSupportedChain, ), createEntry( 'Mask Bridge', diff --git a/packages/mask/src/plugins/EVM/constants.ts b/packages/mask/src/plugins/EVM/constants.ts index bc24c1818d62..2c17f3d96cbf 100644 --- a/packages/mask/src/plugins/EVM/constants.ts +++ b/packages/mask/src/plugins/EVM/constants.ts @@ -177,16 +177,6 @@ export const PLUGIN_NETWORKS: Web3Plugin.NetworkDescriptor[] = [ iconColor: 'rgb(112, 212, 74)', isMainnet: true, }, - { - ID: `${PLUGIN_ID}_conflux_Testnet`, - networkSupporterPluginID: PLUGIN_ID, - chainId: ChainId.Conflux_Testnet, - type: NetworkType.Conflux_Testnet, - name: 'Conflux_Testnet', - icon: new URL('./assets/conflux.png', import.meta.url), - iconColor: 'rgb(112, 212, 74)', - isMainnet: true, - }, ] export const PLUGIN_PROVIDERS: Web3Plugin.ProviderDescriptor[] = [ { diff --git a/packages/mask/src/plugins/ITO/SNSAdaptor/CompositionDialog.tsx b/packages/mask/src/plugins/ITO/SNSAdaptor/CompositionDialog.tsx index 70e36f80b125..67e16f0c9179 100644 --- a/packages/mask/src/plugins/ITO/SNSAdaptor/CompositionDialog.tsx +++ b/packages/mask/src/plugins/ITO/SNSAdaptor/CompositionDialog.tsx @@ -59,7 +59,7 @@ export function CompositionDialog(props: CompositionDialogProps) { const { attachMetadata, dropMetadata } = useCompositionContext() const { ITO2_CONTRACT_ADDRESS } = useITOConstants() - + console.log({ ITO2_CONTRACT_ADDRESS }) // #region step const [step, setStep] = useState(ITOCreateFormPageStep.NewItoPage) diff --git a/packages/mask/src/plugins/ITO/base.ts b/packages/mask/src/plugins/ITO/base.ts index b618de701f29..eceee4b13b46 100644 --- a/packages/mask/src/plugins/ITO/base.ts +++ b/packages/mask/src/plugins/ITO/base.ts @@ -25,8 +25,6 @@ export const base: Plugin.Shared.Definition = { ChainId.Aurora, ChainId.Avalanche, ChainId.Fantom, - ChainId.Conflux, - ChainId.Conflux_Testnet, ], }, }, diff --git a/packages/mask/src/plugins/NextID/base.ts b/packages/mask/src/plugins/NextID/base.ts index 9b0a27dd9553..14d2791bcfce 100644 --- a/packages/mask/src/plugins/NextID/base.ts +++ b/packages/mask/src/plugins/NextID/base.ts @@ -29,7 +29,6 @@ export const base: Plugin.Shared.Definition = { ChainId.Avalanche, ChainId.Fantom, ChainId.Conflux, - ChainId.Conflux_Testnet, ], }, }, diff --git a/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketCreateNew.tsx b/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketCreateNew.tsx index 5ca11546c9c4..2c1107f5b84f 100644 --- a/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketCreateNew.tsx +++ b/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketCreateNew.tsx @@ -83,13 +83,7 @@ export function RedPacketCreateNew(props: RedPacketFormProps & { state: readonly ), children: , sx: { p: 0 }, - disabled: ![ - ChainId.Mainnet, - ChainId.Matic, - ChainId.BSC, - ChainId.Conflux, - ChainId.Conflux_Testnet, - ].includes(chainId), + disabled: ![ChainId.Mainnet, ChainId.Matic, ChainId.BSC, ChainId.Conflux].includes(chainId), }, ], state, diff --git a/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketDialog.tsx b/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketDialog.tsx index e0cba531074b..52d5eff8d6f4 100644 --- a/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketDialog.tsx +++ b/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketDialog.tsx @@ -75,7 +75,7 @@ export default function RedPacketDialog(props: RedPacketDialogProps) { const { classes } = useStyles() const { HAPPY_RED_PACKET_ADDRESS_V4 } = useRedPacketConstants() const { attachMetadata, dropMetadata } = useCompositionContext() - + console.log({ HAPPY_RED_PACKET_ADDRESS_V4 }) const state = useState(DialogTabs.create) const networkType = useNetworkType() diff --git a/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketNft.tsx b/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketNft.tsx index e86274a905a1..04c5842e296f 100644 --- a/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketNft.tsx +++ b/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketNft.tsx @@ -252,7 +252,7 @@ export function RedPacketNft({ payload }: RedPacketNftProps) { retry: retryAvailability, error: availabilityError, } = useAvailabilityNftRedPacket(payload.id, account) - + console.log({ availability }) const [claimState, claimCallback, resetCallback] = useClaimNftRedpacketCallback( payload.id, availability?.totalAmount, diff --git a/packages/mask/src/plugins/RedPacket/Worker/apis/chain.ts b/packages/mask/src/plugins/RedPacket/Worker/apis/chain.ts index 3fc498f6c076..20033c8ce9ef 100644 --- a/packages/mask/src/plugins/RedPacket/Worker/apis/chain.ts +++ b/packages/mask/src/plugins/RedPacket/Worker/apis/chain.ts @@ -65,7 +65,7 @@ export async function getRedPacketHistory( } const { result } = await response.json() - + console.log({ result }) if (!result.length) return [] const payloadList: RedPacketJSONPayloadFromChain[] = result.reduce( diff --git a/packages/mask/src/plugins/RedPacket/base.ts b/packages/mask/src/plugins/RedPacket/base.ts index ea9b03f82ef2..25fc85ada510 100644 --- a/packages/mask/src/plugins/RedPacket/base.ts +++ b/packages/mask/src/plugins/RedPacket/base.ts @@ -27,7 +27,6 @@ export const base: Plugin.Shared.Definition = { ChainId.Avalanche, ChainId.Aurora, ChainId.Conflux, - ChainId.Conflux_Testnet, ], }, }, diff --git a/packages/mask/src/plugins/Trader/apis/trader/index.ts b/packages/mask/src/plugins/Trader/apis/trader/index.ts index 0d870a5b52a9..2e41472dbe9c 100644 --- a/packages/mask/src/plugins/Trader/apis/trader/index.ts +++ b/packages/mask/src/plugins/Trader/apis/trader/index.ts @@ -55,7 +55,6 @@ export async function getAvailableTraderProviders(chainId: ChainId) { case NetworkType.Metis: case NetworkType.Optimistic: case NetworkType.Conflux: - case NetworkType.Conflux_Testnet: console.error('To be implement network: ', networkType) return [] default: diff --git a/packages/mask/src/plugins/Trader/constants/0x.ts b/packages/mask/src/plugins/Trader/constants/0x.ts index ea0e3d640acc..c1e3a34a1da7 100644 --- a/packages/mask/src/plugins/Trader/constants/0x.ts +++ b/packages/mask/src/plugins/Trader/constants/0x.ts @@ -15,7 +15,6 @@ export const ZRX_BASE_URL: Record = { [NetworkType.Metis]: '', [NetworkType.Optimistic]: '', [NetworkType.Conflux]: '', - [NetworkType.Conflux_Testnet]: '', } export const ZRX_AFFILIATE_ADDRESS = '0x934B510D4C9103E6a87AEf13b816fb080286D649' diff --git a/packages/mask/src/plugins/Trader/constants/dodo.ts b/packages/mask/src/plugins/Trader/constants/dodo.ts index 2fa91a75d2fc..912c4af0615d 100644 --- a/packages/mask/src/plugins/Trader/constants/dodo.ts +++ b/packages/mask/src/plugins/Trader/constants/dodo.ts @@ -17,5 +17,4 @@ export const networkNames: Record = { [NetworkType.Metis]: '', [NetworkType.Optimistic]: '', [NetworkType.Conflux]: '', - [NetworkType.Conflux_Testnet]: '', } diff --git a/packages/mask/src/plugins/Trader/constants/openocean.ts b/packages/mask/src/plugins/Trader/constants/openocean.ts index 999a751ca3be..5749ad41b6e6 100644 --- a/packages/mask/src/plugins/Trader/constants/openocean.ts +++ b/packages/mask/src/plugins/Trader/constants/openocean.ts @@ -17,5 +17,4 @@ export const networkNames: Record = { [NetworkType.Metis]: '', [NetworkType.Optimistic]: '', [NetworkType.Conflux]: '', - [NetworkType.Conflux_Testnet]: '', } diff --git a/packages/mask/src/plugins/Trader/trader/0x/useTrade.ts b/packages/mask/src/plugins/Trader/trader/0x/useTrade.ts index fb6e7e7b0bb5..b51d22ef5348 100644 --- a/packages/mask/src/plugins/Trader/trader/0x/useTrade.ts +++ b/packages/mask/src/plugins/Trader/trader/0x/useTrade.ts @@ -35,7 +35,6 @@ export function getNativeTokenLabel(networkType: NetworkType) { case NetworkType.Avalanche: case NetworkType.Optimistic: case NetworkType.Conflux: - case NetworkType.Conflux_Testnet: return NATIVE_TOKEN_ADDRESS default: safeUnreachable(networkType) diff --git a/packages/web3-shared/evm/assets/chains.json b/packages/web3-shared/evm/assets/chains.json index f8490f7cca75..6ae9e8574d17 100644 --- a/packages/web3-shared/evm/assets/chains.json +++ b/packages/web3-shared/evm/assets/chains.json @@ -2847,7 +2847,12 @@ "rpc": ["https://evm.confluxrpc.com"], "faucets": [], "features": [], - "nativeCurrency": { "name": "CFX", "symbol": "CFX", "decimals": 18 }, + "nativeCurrency": { + "name": "CFX", + "symbol": "CFX", + "decimals": 18, + "logoURI": "https://raw.githubusercontent.com/DimensionDev/Maskbook/e434014b17bd4622e28e21c9d4cd9ffec875889e/packages/mask/src/plugins/EVM/assets/conflux.png" + }, "infoURL": "https://confluxnetwork.org", "shortName": "Conflux", "chainId": 1030, diff --git a/packages/web3-shared/evm/types/index.ts b/packages/web3-shared/evm/types/index.ts index 67b47738569c..71d6223b9b67 100644 --- a/packages/web3-shared/evm/types/index.ts +++ b/packages/web3-shared/evm/types/index.ts @@ -81,7 +81,6 @@ export enum ChainId { // Conflux Conflux = 1030, - Conflux_Testnet = 71, } export enum ProviderType { @@ -118,7 +117,6 @@ export enum NetworkType { Metis = 'Metis', Optimistic = 'Optimistic', Conflux = 'Conflux', - Conflux_Testnet = 'Conflux_Testnet', } export interface Wallet { diff --git a/packages/web3-shared/evm/utils/chainDetailed.ts b/packages/web3-shared/evm/utils/chainDetailed.ts index 3aad1355da9b..9c0ca1669814 100644 --- a/packages/web3-shared/evm/utils/chainDetailed.ts +++ b/packages/web3-shared/evm/utils/chainDetailed.ts @@ -96,7 +96,6 @@ export const getChainIdFromNetworkType = createLookupTableResolver = { [NetworkType.Metis]: 'Metis', [NetworkType.Optimistic]: 'Optimistic', [NetworkType.Conflux]: 'Conflux', - [NetworkType.Conflux_Testnet]: 'Conflux_Testnet', } export function getNetworkTypeFromChainId(chainId: ChainId, value?: boolean) { const chainDetailed = getChainDetailed(chainId) From b1602f181de8cec5012b7bbc52b53d963e2079f2 Mon Sep 17 00:00:00 2001 From: zhouhanseng Date: Wed, 16 Mar 2022 12:41:33 +0800 Subject: [PATCH 07/26] chore: remove debug code --- .../mask/src/plugins/RedPacket/SNSAdaptor/RedPacketDialog.tsx | 1 - packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketNft.tsx | 1 - packages/mask/src/plugins/RedPacket/Worker/apis/chain.ts | 1 - 3 files changed, 3 deletions(-) diff --git a/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketDialog.tsx b/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketDialog.tsx index 52d5eff8d6f4..e62bab82f6ad 100644 --- a/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketDialog.tsx +++ b/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketDialog.tsx @@ -75,7 +75,6 @@ export default function RedPacketDialog(props: RedPacketDialogProps) { const { classes } = useStyles() const { HAPPY_RED_PACKET_ADDRESS_V4 } = useRedPacketConstants() const { attachMetadata, dropMetadata } = useCompositionContext() - console.log({ HAPPY_RED_PACKET_ADDRESS_V4 }) const state = useState(DialogTabs.create) const networkType = useNetworkType() diff --git a/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketNft.tsx b/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketNft.tsx index 04c5842e296f..d4f0ed426cb7 100644 --- a/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketNft.tsx +++ b/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketNft.tsx @@ -252,7 +252,6 @@ export function RedPacketNft({ payload }: RedPacketNftProps) { retry: retryAvailability, error: availabilityError, } = useAvailabilityNftRedPacket(payload.id, account) - console.log({ availability }) const [claimState, claimCallback, resetCallback] = useClaimNftRedpacketCallback( payload.id, availability?.totalAmount, diff --git a/packages/mask/src/plugins/RedPacket/Worker/apis/chain.ts b/packages/mask/src/plugins/RedPacket/Worker/apis/chain.ts index 20033c8ce9ef..6fda5d4d7125 100644 --- a/packages/mask/src/plugins/RedPacket/Worker/apis/chain.ts +++ b/packages/mask/src/plugins/RedPacket/Worker/apis/chain.ts @@ -65,7 +65,6 @@ export async function getRedPacketHistory( } const { result } = await response.json() - console.log({ result }) if (!result.length) return [] const payloadList: RedPacketJSONPayloadFromChain[] = result.reduce( From 890f25a4520efa8c5936be4ec5bf88153c79b309 Mon Sep 17 00:00:00 2001 From: zhouhanseng Date: Wed, 16 Mar 2022 16:54:02 +0800 Subject: [PATCH 08/26] chore: add contract address --- .../UI/Web3State/createGetLatestBalance.ts | 10 ++ .../plugins/EVM/UI/Web3State/getAssetsFn.ts | 43 +++--- .../src/plugins/EVM/UI/Web3State/index.ts | 10 +- packages/web3-constants/evm/ethereum.json | 6 +- packages/web3-constants/evm/ito.json | 9 +- .../web3-constants/evm/nft-red-packet.json | 6 +- packages/web3-constants/evm/red-packet.json | 6 +- packages/web3-constants/evm/token.json | 141 ++++++++++++------ packages/web3-shared/evm/hooks/useBalance.ts | 4 +- 9 files changed, 154 insertions(+), 81 deletions(-) create mode 100644 packages/mask/src/plugins/EVM/UI/Web3State/createGetLatestBalance.ts diff --git a/packages/mask/src/plugins/EVM/UI/Web3State/createGetLatestBalance.ts b/packages/mask/src/plugins/EVM/UI/Web3State/createGetLatestBalance.ts new file mode 100644 index 000000000000..44e8a0cb8449 --- /dev/null +++ b/packages/mask/src/plugins/EVM/UI/Web3State/createGetLatestBalance.ts @@ -0,0 +1,10 @@ +import { ChainId, Web3ProviderType, createWeb3 } from '@masknet/web3-shared-evm' + +export function createGetLatestBalance(context: Web3ProviderType) { + return (chainId: ChainId, account: string) => { + const web3 = createWeb3(context.request, () => ({ + chainId, + })) + return web3.eth.getBalance(account) + } +} diff --git a/packages/mask/src/plugins/EVM/UI/Web3State/getAssetsFn.ts b/packages/mask/src/plugins/EVM/UI/Web3State/getAssetsFn.ts index ec83ca1a34d5..217a0497abd7 100644 --- a/packages/mask/src/plugins/EVM/UI/Web3State/getAssetsFn.ts +++ b/packages/mask/src/plugins/EVM/UI/Web3State/getAssetsFn.ts @@ -21,6 +21,8 @@ import { PLUGIN_NETWORKS } from '../../constants' import { makeSortAssertWithoutChainFn } from '../../utils/token' import type { ERC721 } from '@masknet/web3-contracts/types/ERC721' +import { createGetLatestBalance } from './createGetLatestBalance' + export const getFungibleAssetsFn = (context: Web3ProviderType) => async (address: string, providerType: string, network: Web3Plugin.NetworkDescriptor, pagination?: Pagination) => { @@ -66,22 +68,28 @@ export const getFungibleAssetsFn = }, })) - if (!BALANCE_CHECKER_ADDRESS) return assetsFromProvider - const balanceCheckerContract = createContract(web3, BALANCE_CHECKER_ADDRESS, BalanceCheckerABI as AbiItem[]) - if (!balanceCheckerContract) return assetsFromProvider - let balanceList: string[] - try { - balanceList = await balanceCheckerContract?.methods - .balances( - [address], - trustedTokens.map((x) => x.address), - ) - .call({ - from: undefined, - }) - if (balanceList.length !== trustedTokens?.length) return assetsFromProvider - } catch { - balanceList = [] + const balanceCheckerContract = createContract( + web3, + BALANCE_CHECKER_ADDRESS ?? '', + BalanceCheckerABI as AbiItem[], + ) + + let balanceList: string[] = [] + + if (BALANCE_CHECKER_ADDRESS && balanceCheckerContract) { + try { + balanceList = await balanceCheckerContract?.methods + .balances( + [address], + trustedTokens.map((x) => x.address), + ) + .call({ + from: address, + }) + if (balanceList.length !== trustedTokens?.length) return assetsFromProvider + } catch { + balanceList = [] + } } const assetFromChain = balanceList.map( @@ -98,7 +106,8 @@ export const getFungibleAssetsFn = balance, }), ) - + const b = await createGetLatestBalance(context)(1030, address) + console.log({ b }) const allTokens = [...assetsFromProvider, ...assetFromChain] const nativeTokens: Web3Plugin.Asset[] = networks diff --git a/packages/mask/src/plugins/EVM/UI/Web3State/index.ts b/packages/mask/src/plugins/EVM/UI/Web3State/index.ts index 9c8ef00107ca..576402fdf9c1 100644 --- a/packages/mask/src/plugins/EVM/UI/Web3State/index.ts +++ b/packages/mask/src/plugins/EVM/UI/Web3State/index.ts @@ -27,8 +27,9 @@ import { createExternalProvider, } from '@masknet/web3-shared-evm' import { getStorage } from '../../storage' -import { getFungibleAssetsFn, getNonFungibleTokenFn } from './getAssetsFn' +import { getFungibleAssetsFn, getNonFungibleTokenFn } from './getAssetsFn' +import { createGetLatestBalance } from './createGetLatestBalance' const ZERO_X_ERROR_ADDRESS = '0x' export function fixWeb3State(state?: Web3Plugin.ObjectCapabilities.Capabilities, context?: Web3ProviderType) { @@ -114,12 +115,7 @@ export function fixWeb3State(state?: Web3Plugin.ObjectCapabilities.Capabilities, }, } state.Utils = state.Utils ?? { - getLatestBalance: (chainId: ChainId, account: string) => { - const web3 = createWeb3(context.request, () => ({ - chainId, - })) - return web3.eth.getBalance(account) - }, + getLatestBalance: createGetLatestBalance(context), getLatestBlockNumber: (chainId: ChainId) => { const web3 = createWeb3(context.request, () => ({ chainId, diff --git a/packages/web3-constants/evm/ethereum.json b/packages/web3-constants/evm/ethereum.json index f4ca94106031..4e4fefb89d3b 100644 --- a/packages/web3-constants/evm/ethereum.json +++ b/packages/web3-constants/evm/ethereum.json @@ -17,7 +17,8 @@ "Celo": "0x8e28F1d64ceD52b9A09aB1AA3071Aa3c05802d1F", "Fantom": "0xc119574d5fb333f5ac018658d4d8b5035e16bf39", "Aurora": "0xC119574D5Fb333F5AC018658D4d8b5035E16bf39", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "MULTICALL_ADDRESS": { "Mainnet": "0x1F98415757620B543A52E61c46B32eB19261F984", @@ -37,7 +38,8 @@ "Celo": "0x072453AdEC16cFC7FB6Af1517c3f25407180cccC", "Fantom": "0x913975af2Bb8a6Be4100D7dc5e9765B77F6A5d6c", "Aurora": "0x6cc1b1058F9153358278C35E0b2D382f1585854B", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "0x19f179d7e0d7d9f9d5386afff64271d98a91615b" }, "ENS_REGISTRAR_ADDRESS": { "Mainnet": "0x00000000000C2E074eC69A0dFb2997BA6C7d2e1e", diff --git a/packages/web3-constants/evm/ito.json b/packages/web3-constants/evm/ito.json index f0cbea49edfb..f15c7c3a47e6 100644 --- a/packages/web3-constants/evm/ito.json +++ b/packages/web3-constants/evm/ito.json @@ -57,7 +57,8 @@ "Celo": "0xaA5bfd7355637eA7405CB194a55303e821c4c569", "Fantom": "0x981be454a930479d92C91a0092D204b64845A5D6", "Aurora": "0x2cf91AD8C175305EBe6970Bd8f81231585EFbd77", - "Aurora_Testnet": "0xdcA6F476EebCDE8FE8b072e3fC80dBC28dC209b3" + "Aurora_Testnet": "0xdcA6F476EebCDE8FE8b072e3fC80dBC28dC209b3", + "Conflux": "0x066804d9123bf2609ed4a4a40b1177a9c5a9ed51" }, "ITO2_CONTRACT_CREATION_BLOCK_HEIGHT": { "Mainnet": 12766513, @@ -77,7 +78,8 @@ "Celo": 10278776, "Fantom": 25071597, "Aurora": 57350598, - "Aurora_Testnet": 77919102 + "Aurora_Testnet": 77919102, + "Conflux": 37722805 }, "DEFAULT_QUALIFICATION_ADDRESS": { "Mainnet": "0x81b6ae377e360dcad63611846a2516f4ba8c88ac", @@ -117,7 +119,8 @@ "Celo": "0x2cB220F925E603A04BEE05F210252120deBA29d7", "Fantom": "0x83D6b366f21e413f214EB077D5378478e71a5eD2", "Aurora": "0x578a7Fee5f0D8CEc7d00578Bf37374C5b95C4b98", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "0x05ee315e407c21a594f807d61d6cc11306d1f149" }, "SUBGRAPH_URL": { "Mainnet": "https://api.thegraph.com/subgraphs/name/dimensiondev/mask-ito-mainnet", diff --git a/packages/web3-constants/evm/nft-red-packet.json b/packages/web3-constants/evm/nft-red-packet.json index 14f892ec49c5..b0457542eee0 100644 --- a/packages/web3-constants/evm/nft-red-packet.json +++ b/packages/web3-constants/evm/nft-red-packet.json @@ -17,7 +17,8 @@ "Celo": "", "Fantom": "", "Aurora": "0x05ee315E407C21a594f807D61d6CC11306D1F149", - "Aurora_Testnet": "0x97369fEE7db34E0BfE47861f2ec44b4378d13eB4" + "Aurora_Testnet": "0x97369fEE7db34E0BfE47861f2ec44b4378d13eB4", + "Conflux": "0x5b966f3a32db9c180843bcb40267a66b73e4f022" }, "SUBGRAPH_URL": { "Mainnet": "https://api.thegraph.com/subgraphs/name/dimensiondev/mask-nft-red-packet-mainnet", @@ -37,6 +38,7 @@ "Celo": "", "Fantom": "", "Aurora": "https://api.thegraph.com/subgraphs/name/dimensiondev/mask-nft-red-packet-aurora", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" } } diff --git a/packages/web3-constants/evm/red-packet.json b/packages/web3-constants/evm/red-packet.json index d587717e2cd6..f88e4a77a16d 100644 --- a/packages/web3-constants/evm/red-packet.json +++ b/packages/web3-constants/evm/red-packet.json @@ -77,7 +77,8 @@ "Celo": "0xAb7B1bE4233A04e5C43a810E75657ECED8E5463B", "Fantom": "0x578a7Fee5f0D8CEc7d00578Bf37374C5b95C4b98", "Aurora": "0x19f179D7e0D7d9F9d5386afFF64271D98A91615B", - "Aurora_Testnet": "0xdB93cCd481012bB5D1E2c8d0aF7C5f2940c00fdC" + "Aurora_Testnet": "0xdB93cCd481012bB5D1E2c8d0aF7C5f2940c00fdC", + "Conflux": "0x96c7d011cdfd467f551605f0f5fce279f86f4186" }, "HAPPY_RED_PACKET_ADDRESS_V4_BLOCK_HEIGHT": { "Mainnet": 12939427, @@ -97,7 +98,8 @@ "Celo": 10413552, "Fantom": 25112473, "Aurora": 57552338, - "Aurora_Testnet": 77918765 + "Aurora_Testnet": 77918765, + "Conflux": 37670572 }, "SUBGRAPH_URL": { "Mainnet": "https://api.thegraph.com/subgraphs/name/dimensiondev/mask-red-packet-mainnet", diff --git a/packages/web3-constants/evm/token.json b/packages/web3-constants/evm/token.json index f6fe2360d0d4..df67190f8364 100644 --- a/packages/web3-constants/evm/token.json +++ b/packages/web3-constants/evm/token.json @@ -17,7 +17,8 @@ "Celo": "0x471EcE3750Da237f93B8E339c536989b8978a438", "Fantom": "0x21be370d5312f44cb42ce377bc9b8a0cef1a4c83", "Aurora": "0xC9BdeEd33CD01541e1eeD10f90519d2C06Fe3feB", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "USDC_ADDRESS": { "Mainnet": "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48", @@ -37,7 +38,8 @@ "Celo": "0x2A3684e9Dc20B857375EA04235F2F7edBe818FA7", "Fantom": "0x04068da6c83afcfa0e13ba15a6696662335d5b75", "Aurora": "0xb12bfca5a55806aaf64e99521918a4bf0fc40802", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "USDT_ADDRESS": { "Mainnet": "0xdAC17F958D2ee523a2206206994597C13D831ec7", @@ -57,7 +59,8 @@ "Celo": "0xb020d981420744f6b0fedd22bb67cd37ce18a1d5", "Fantom": "", "Aurora": "0x4988a896b1227218e4a686fde5eabdcabd91571f", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "HUSD_ADDRESS": { "Mainnet": "0xdf574c24545e5ffecb9a659c229253d4111d87e1", @@ -77,7 +80,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "BUSD_ADDRESS": { "Mainnet": "0x4fabb145d64652a948d72533023f6e7a623c7c53", @@ -97,7 +101,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "COMP_ADDRESS": { "Mainnet": "0xc00e94Cb662C3520282E6f5717214004A7f26888", @@ -117,7 +122,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "EASY_ADDRESS": { "Mainnet": "", @@ -137,7 +143,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "MKR_ADDRESS": { "Mainnet": "0x9f8F72aA9304c8B593d555F12eF6589cC3A579A2", @@ -157,7 +164,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "MASK_ADDRESS": { "Mainnet": "0x69af81e73A73B40adF4f3d4223Cd9b1ECE623074", @@ -177,7 +185,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "MSKA_ADDRESS": { "Mainnet": "", @@ -197,7 +206,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "MSKB_ADDRESS": { "Mainnet": "", @@ -217,7 +227,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "MSKC_ADDRESS": { "Mainnet": "", @@ -237,7 +248,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "MSKD_ADDRESS": { "Mainnet": "", @@ -257,7 +269,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "MSKE_ADDRESS": { "Mainnet": "", @@ -277,7 +290,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "DAI_ADDRESS": { "Mainnet": "0x6B175474E89094C44Da98b954EedeAC495271d0F", @@ -297,7 +311,8 @@ "Celo": "", "Fantom": "0x8D11eC38a3EB5E956B052f67Da8Bdc9bef8Abf3E", "Aurora": "0xe3520349f477a5f6eb06107066048508498a291b", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "AMPL_ADDRESS": { "Mainnet": "0xD46bA6D942050d489DBd938a2C909A5d5039A161", @@ -317,7 +332,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "OKB_ADDRESS": { "Mainnet": "0x75231F58b43240C9718Dd58B4967c5114342a86c", @@ -337,7 +353,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "UST_ADDRESS": { "Mainnet": "0xa47c8bf37f92aBed4A126BDA807A7b7498661acD", @@ -357,7 +374,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "eUSDC_ADDRESS": { "Mainnet": "", @@ -377,7 +395,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "eUSDT_ADDRESS": { "Mainnet": "", @@ -397,7 +416,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "fUSDT_ADDRESS": { "Mainnet": "", @@ -417,7 +437,8 @@ "Celo": "", "Fantom": "0x049d68029688eAbF473097a2fC38ef61633A3C7A", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "eDAI_ADDRESS": { "Mainnet": "", @@ -437,7 +458,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "UNITOKEN_ADDRESS": { "Mainnet": "", @@ -457,7 +479,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "TT01_ADDRESS": { "Mainnet": "", @@ -477,7 +500,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "TT02_ADDRESS": { "Mainnet": "", @@ -497,7 +521,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "QUICK_ADDRESS": { "Mainnet": "", @@ -517,7 +542,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "WANNA_ADDRESS": { "Mainnet": "", @@ -537,7 +563,8 @@ "Celo": "", "Fantom": "", "Aurora": "0x7faA64Faf54750a2E3eE621166635fEAF406Ab22", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "WBTC_ADDRESS": { "Mainnet": "0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599", @@ -557,7 +584,8 @@ "Celo": "0xBe50a3013A1c94768A1ABb78c3cB79AB28fc1aCE", "Fantom": "0x321162Cd933E2Be498Cd2267a90534A804051b11", "Aurora": "0xf4eb217ba2454613b15dbdea6e5f22276410e89e", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "IGG_ADDRESS": { "Mainnet": "", @@ -577,7 +605,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "OM_ADDRESS": { "Mainnet": "", @@ -597,7 +626,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "SUSHI_ADDRESS": { "Mainnet": "0x6B3595068778DD592e39A122f4f5a5cF09C90fE2", @@ -617,7 +647,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "YAM_ADDRESS": { "Mainnet": "0x0e2298E3B3390e3b945a5456fBf59eCc3f55DA16", @@ -637,7 +668,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "RUNE_ADDRESS": { "Mainnet": "0x3155BA85D5F96b2d030a4966AF206230e46849cb", @@ -657,7 +689,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "YFI_ADDRESS": { "Mainnet": "0x0bc529c00C6401aEF6D220BE8C6Ea1667F6Ad93e", @@ -677,7 +710,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "sUSD_ADDRESS": { "Mainnet": "0x57ab1ec28d129707052df4df418d58a2d46d5f51", @@ -697,7 +731,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "BTCB_ADDRESS": { "Mainnet": "", @@ -717,7 +752,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "CAKE_ADDRESS": { "Mainnet": "", @@ -737,7 +773,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "maUSDC_ADDRESS": { "Mainnet": "", @@ -757,7 +794,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "stETH_ADDRESS": { "Mainnet": "0xDFe66B14D37C77F4E9b180cEb433d1b164f0281D", @@ -777,7 +815,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "NFTX_ADDRESS": { "Mainnet": "0x87d73E916D7057945c9BcD8cdd94e42A6F47f776", @@ -797,7 +836,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "cUSD_ADDRESS": { "Mainnet": "", @@ -817,7 +857,8 @@ "Celo": "0x765de816845861e75a25fca122bb6898b8b1282a", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "cEUR_ADDRESS": { "Mainnet": "", @@ -837,7 +878,8 @@ "Celo": "0x765de816845861e75a25fca122bb6898b8b1282a", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "xTRI_ADDRESS": { "Mainnet": "", @@ -857,7 +899,8 @@ "Celo": "", "Fantom": "", "Aurora": "0x802119e4e253D5C19aA06A5d567C5a41596D6803", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "JOE_ADDRESS": { "Mainnet": "", @@ -877,7 +920,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "PNG_ADDRESS": { "Mainnet": "", @@ -897,7 +941,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "ETHER_ADDRESS": { "Mainnet": "", @@ -917,7 +962,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "NATIVE_TOKEN_ADDRESS": { "Mainnet": "0x0000000000000000000000000000000000000000", @@ -937,6 +983,7 @@ "Celo": "0x471ece3750da237f93b8e339c536989b8978a438", "Fantom": "0x0000000000000000000000000000000000000000", "Aurora": "0x0000000000000000000000000000000000000000", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "0x0000000000000000000000000000000000000000" } } diff --git a/packages/web3-shared/evm/hooks/useBalance.ts b/packages/web3-shared/evm/hooks/useBalance.ts index 0dd53e4b6e4a..35fb2c290cb4 100644 --- a/packages/web3-shared/evm/hooks/useBalance.ts +++ b/packages/web3-shared/evm/hooks/useBalance.ts @@ -13,6 +13,8 @@ export function useBalance(expectedChainId?: ChainId, expectedAccount?: string) const web3 = useWeb3({ chainId }) return useAsyncRetry(async () => { - return web3.eth.getBalance(account) + const b = await web3.eth.getBalance(account) + console.log({ b }) + return b }, [web3, account]) } From ad9d446c228d9bacff18ff5794a76560c3f9bcee Mon Sep 17 00:00:00 2001 From: zhouhanseng Date: Wed, 16 Mar 2022 17:01:43 +0800 Subject: [PATCH 09/26] chore: rpc address --- packages/web3-constants/evm/rpc.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/web3-constants/evm/rpc.json b/packages/web3-constants/evm/rpc.json index 54cfb9185c13..5bd061c414bb 100644 --- a/packages/web3-constants/evm/rpc.json +++ b/packages/web3-constants/evm/rpc.json @@ -59,7 +59,8 @@ "Celo": ["https://forno.celo.org"], "Fantom": ["https://rpc.ftm.tools/"], "Aurora": ["https://mainnet.aurora.dev"], - "Aurora_Testnet": ["https://testnet.aurora.dev"] + "Aurora_Testnet": ["https://testnet.aurora.dev"], + "Conflux": ["https://evm.confluxrpc.com"] }, "RPC_WEIGHTS": { "Mainnet": [0, 1, 2, 3, 4], @@ -79,6 +80,7 @@ "Celo": [0, 0, 0, 0, 0], "Fantom": [0, 0, 0, 0, 0], "Aurora": [0, 0, 0, 0, 0], - "Aurora_Testnet": [0, 0, 0, 0, 0] + "Aurora_Testnet": [0, 0, 0, 0, 0], + "Conflux": [0, 0, 0, 0, 0] } } From b8095005c284c6cf38d6774e26a549309810bf8d Mon Sep 17 00:00:00 2001 From: zhouhanseng Date: Wed, 16 Mar 2022 17:36:29 +0800 Subject: [PATCH 10/26] chore: send conflux popup dashboard --- .../plugins/EVM/UI/Web3State/getAssetsFn.ts | 26 ++++++++++++++++--- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/packages/mask/src/plugins/EVM/UI/Web3State/getAssetsFn.ts b/packages/mask/src/plugins/EVM/UI/Web3State/getAssetsFn.ts index 217a0497abd7..ff0ff0c1b4c4 100644 --- a/packages/mask/src/plugins/EVM/UI/Web3State/getAssetsFn.ts +++ b/packages/mask/src/plugins/EVM/UI/Web3State/getAssetsFn.ts @@ -11,6 +11,7 @@ import { Web3ProviderType, FungibleAssetProvider, createExternalProvider, + ChainId, } from '@masknet/web3-shared-evm' import { Pageable, Pagination, TokenType, Web3Plugin } from '@masknet/plugin-infra' import BalanceCheckerABI from '@masknet/web3-contracts/abis/BalanceChecker.json' @@ -19,9 +20,11 @@ import type { AbiItem } from 'web3-utils' import { uniqBy } from 'lodash-unified' import { PLUGIN_NETWORKS } from '../../constants' import { makeSortAssertWithoutChainFn } from '../../utils/token' +import * as EthereumService from '../../../../extension/background-script/EthereumService' import type { ERC721 } from '@masknet/web3-contracts/types/ERC721' -import { createGetLatestBalance } from './createGetLatestBalance' +// native token unavailable neither from api or balance checker. +const TokenUnavailableList = [ChainId.Conflux] export const getFungibleAssetsFn = (context: Web3ProviderType) => @@ -106,10 +109,24 @@ export const getFungibleAssetsFn = balance, }), ) - const b = await createGetLatestBalance(context)(1030, address) - console.log({ b }) + const allTokens = [...assetsFromProvider, ...assetFromChain] + const allRequest = TokenUnavailableList.map(async (x) => { + const b = await EthereumService.getBalance(address, { chainId: x }) + return { + chainId: x, + balance: String(Number.parseInt(b, 16)), + } + }) + + const balanceResults = (await Promise.allSettled(allRequest)) + .map((x) => (x.status === 'fulfilled' ? x.value : null)) + .filter((x) => Boolean(x)) as { + chainId: ChainId + balance: string + }[] + const nativeTokens: Web3Plugin.Asset[] = networks .filter( (t) => @@ -122,11 +139,12 @@ export const getFungibleAssetsFn = ) .map((x) => { const nativeToken = createNativeToken(x.chainId) + const balance = balanceResults.find((y) => y.chainId === x.chainId)?.balance ?? '0' return { id: nativeToken.address, chainId: x.chainId, token: { ...nativeToken, id: nativeToken.address!, type: TokenType.Fungible }, - balance: '0', + balance, } }) From 126d880815cdf97ef9d574fb1625ba794ddc5cae Mon Sep 17 00:00:00 2001 From: zhouhanseng Date: Wed, 16 Mar 2022 18:12:45 +0800 Subject: [PATCH 11/26] chore: add token list --- packages/web3-constants/evm/token-list.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/web3-constants/evm/token-list.json b/packages/web3-constants/evm/token-list.json index 76b7b8870aee..49b417c9ff04 100644 --- a/packages/web3-constants/evm/token-list.json +++ b/packages/web3-constants/evm/token-list.json @@ -17,6 +17,7 @@ "Celo": ["https://tokens.r2d2.to/latest/42220/tokens.json"], "Fantom": ["https://tokens.r2d2.to/latest/250/tokens.json"], "Aurora": ["https://tokens.r2d2.to/latest/1313161554/tokens.json"], - "Aurora_Testnet": [] + "Aurora_Testnet": [], + "Conflux": ["https://tokens.r2d2.to/1030/1313161554/tokens.json"] } } From 23c0489027511db23577f7ed6f35078939d43130 Mon Sep 17 00:00:00 2001 From: zhouhanseng Date: Wed, 16 Mar 2022 18:18:09 +0800 Subject: [PATCH 12/26] chore: remove debug code --- packages/mask/src/plugins/ITO/SNSAdaptor/CompositionDialog.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/mask/src/plugins/ITO/SNSAdaptor/CompositionDialog.tsx b/packages/mask/src/plugins/ITO/SNSAdaptor/CompositionDialog.tsx index 67e16f0c9179..70e36f80b125 100644 --- a/packages/mask/src/plugins/ITO/SNSAdaptor/CompositionDialog.tsx +++ b/packages/mask/src/plugins/ITO/SNSAdaptor/CompositionDialog.tsx @@ -59,7 +59,7 @@ export function CompositionDialog(props: CompositionDialogProps) { const { attachMetadata, dropMetadata } = useCompositionContext() const { ITO2_CONTRACT_ADDRESS } = useITOConstants() - console.log({ ITO2_CONTRACT_ADDRESS }) + // #region step const [step, setStep] = useState(ITOCreateFormPageStep.NewItoPage) From 02dea0646e081514fdac6eb96dd425b3b0dee652 Mon Sep 17 00:00:00 2001 From: zhouhanseng Date: Wed, 16 Mar 2022 18:20:26 +0800 Subject: [PATCH 13/26] chore: modify comment --- packages/mask/src/plugins/EVM/UI/Web3State/getAssetsFn.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/mask/src/plugins/EVM/UI/Web3State/getAssetsFn.ts b/packages/mask/src/plugins/EVM/UI/Web3State/getAssetsFn.ts index ff0ff0c1b4c4..6252dfbdd925 100644 --- a/packages/mask/src/plugins/EVM/UI/Web3State/getAssetsFn.ts +++ b/packages/mask/src/plugins/EVM/UI/Web3State/getAssetsFn.ts @@ -23,7 +23,8 @@ import { makeSortAssertWithoutChainFn } from '../../utils/token' import * as EthereumService from '../../../../extension/background-script/EthereumService' import type { ERC721 } from '@masknet/web3-contracts/types/ERC721' -// native token unavailable neither from api or balance checker. +// tokens unavailable neither from api or balance checker. +// https://forum.conflux.fun/t/how-to-upvote-debank-proposal-for-conflux-espace-integration/13935 const TokenUnavailableList = [ChainId.Conflux] export const getFungibleAssetsFn = From f3578ecf7a8f5abe04d9a462109399d17780315a Mon Sep 17 00:00:00 2001 From: zhouhanseng Date: Wed, 16 Mar 2022 18:36:27 +0800 Subject: [PATCH 14/26] chore: add empty config --- packages/web3-constants/evm/coingecko.json | 6 +- .../web3-constants/evm/coinmarketcap.json | 3 +- packages/web3-constants/evm/debank.json | 3 +- .../evm/token-asset-base-url.json | 3 +- packages/web3-constants/evm/trader.json | 153 ++++++++++++------ packages/web3-constants/evm/zerion.json | 6 +- 6 files changed, 116 insertions(+), 58 deletions(-) diff --git a/packages/web3-constants/evm/coingecko.json b/packages/web3-constants/evm/coingecko.json index 6f3add83afa9..06c01af3edc2 100644 --- a/packages/web3-constants/evm/coingecko.json +++ b/packages/web3-constants/evm/coingecko.json @@ -17,7 +17,8 @@ "Celo": "celo", "Fantom": "fantom", "Aurora": "aurora", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "COIN_ID": { "Mainnet": "ethereum", @@ -37,6 +38,7 @@ "Celo": "celo", "Fantom": "fantom", "Aurora": "ethereum", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" } } diff --git a/packages/web3-constants/evm/coinmarketcap.json b/packages/web3-constants/evm/coinmarketcap.json index ffd32861a9a2..44f07aaa4b88 100644 --- a/packages/web3-constants/evm/coinmarketcap.json +++ b/packages/web3-constants/evm/coinmarketcap.json @@ -17,6 +17,7 @@ "Celo": "5567", "Fantom": "3513", "Aurora": "1313161554", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" } } diff --git a/packages/web3-constants/evm/debank.json b/packages/web3-constants/evm/debank.json index 070df0c683df..f4ba365239c1 100644 --- a/packages/web3-constants/evm/debank.json +++ b/packages/web3-constants/evm/debank.json @@ -17,6 +17,7 @@ "Celo": "celo", "Fantom": "ftm", "Aurora": "aurora", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" } } diff --git a/packages/web3-constants/evm/token-asset-base-url.json b/packages/web3-constants/evm/token-asset-base-url.json index 994c1a1189ae..79acb11afe4d 100644 --- a/packages/web3-constants/evm/token-asset-base-url.json +++ b/packages/web3-constants/evm/token-asset-base-url.json @@ -47,6 +47,7 @@ "Celo": [], "Fantom": [], "Aurora": [], - "Aurora_Testnet": [] + "Aurora_Testnet": [], + "Conflux": [] } } diff --git a/packages/web3-constants/evm/trader.json b/packages/web3-constants/evm/trader.json index b656354c3839..996fa76642f8 100644 --- a/packages/web3-constants/evm/trader.json +++ b/packages/web3-constants/evm/trader.json @@ -17,7 +17,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "UNISWAP_V2_FACTORY_ADDRESS": { "Mainnet": "0x5C69bEe701ef814a2B6a3EDD4B1652CB9cc5aA6f", @@ -37,7 +38,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "UNISWAP_V2_THEGRAPH": { "Mainnet": "https://api.thegraph.com/subgraphs/name/uniswap/uniswap-v2", @@ -57,7 +59,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "UNISWAP_V2_INIT_CODE_HASH": { "Mainnet": "0x96e8ac4277198ff8b6f785478aa9a39f403cb768dd02cbee326c3e7da348845f", @@ -77,7 +80,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "UNISWAP_SWAP_ROUTER_ADDRESS": { "Mainnet": "0xe592427a0aece92de3edee1f18e0157c05861564", @@ -97,7 +101,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "UNISWAP_V3_FACTORY_ADDRESS": { "Mainnet": "0x1F98431c8aD98523631AE4a59f267346ea31F984", @@ -117,7 +122,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "UNISWAP_V3_QUOTER_ADDRESS": { "Mainnet": "0xb27308f9F90D607463bb33eA1BeBb41C27CE5AB6", @@ -137,7 +143,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "UNISWAP_V3_THEGRAPH": { "Mainnet": "https://api.thegraph.com/subgraphs/name/uniswap/uniswap-v3", @@ -157,7 +164,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "UNISWAP_V3_INIT_CODE_HASH": { "Mainnet": "0xe34f199b19b2b4f47f68442619d555527d244f78a3297ea89325f843f87b8b54", @@ -177,7 +185,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "SUSHISWAP_ROUTER_ADDRESS": { "Mainnet": "0xd9e1cE17f2641f24aE83637ab66a2cca9C378B9F", @@ -197,7 +206,8 @@ "Celo": "0x1421bDe4B10e8dd459b3BCb598810B1337D56842", "Fantom": "0x1b02dA8Cb0d097eB8D57A175b88c7D8b47997506", "Aurora": "0x1b02dA8Cb0d097eB8D57A175b88c7D8b47997506", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "SUSHISWAP_FACTORY_ADDRESS": { "Mainnet": "0xC0AEe478e3658e2610c5F7A4A2E1777cE9e4f2Ac", @@ -217,7 +227,8 @@ "Celo": "0xc35DADB65012eC5796536bD9864eD8773aBc74C4", "Fantom": "0xc35DADB65012eC5796536bD9864eD8773aBc74C4", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "SUSHISWAP_THEGRAPH": { "Mainnet": "https://api.thegraph.com/subgraphs/name/zippoxer/sushiswap-subgraph-fork", @@ -237,7 +248,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "SUSHISWAP_INIT_CODE_HASH": { "Mainnet": "0xe18a34eb0e04b04f7a0ac29a6e80748dca96319b42c54d679cb821dca90c6303", @@ -257,7 +269,8 @@ "Celo": "0xe18a34eb0e04b04f7a0ac29a6e80748dca96319b42c54d679cb821dca90c6303", "Fantom": "0xe18a34eb0e04b04f7a0ac29a6e80748dca96319b42c54d679cb821dca90c6303", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "SASHIMISWAP_ROUTER_ADDRESS": { "Mainnet": "0xe4fe6a45f354e845f954cddee6084603cedb9410", @@ -277,7 +290,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "SASHIMISWAP_FACTORY_ADDRESS": { "Mainnet": "0xF028F723ED1D0fE01cC59973C49298AA95c57472", @@ -297,7 +311,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "SASHIMISWAP_THEGRAPH": { "Mainnet": "https://api.thegraph.com/subgraphs/name/sashimiproject/sashimi", @@ -317,7 +332,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "SASHIMISWAP_INIT_CODE_HASH": { "Mainnet": "0xb465bbe4edb8c9b0da8ff0b2b36ce0065de9fcd5a33f32c6856ea821779c8b72", @@ -337,7 +353,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "QUICKSWAP_ROUTER_ADDRESS": { "Mainnet": "", @@ -357,7 +374,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "QUICKSWAP_FACTORY_ADDRESS": { "Mainnet": "", @@ -377,7 +395,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "QUICKSWAP_THEGRAPH": { "Mainnet": "", @@ -397,7 +416,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "QUICKSWAP_INIT_CODE_HASH": { "Mainnet": "", @@ -417,7 +437,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "PANCAKESWAP_ROUTER_ADDRESS": { "Mainnet": "", @@ -437,7 +458,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "PANCAKESWAP_FACTORY_ADDRESS": { "Mainnet": "", @@ -457,7 +479,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "PANCAKESWAP_THEGRAPH": { "Mainnet": "", @@ -477,7 +500,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "PANCAKESWAP_INIT_CODE_HASH": { "Mainnet": "", @@ -497,7 +521,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "BALANCER_ETH_ADDRESS": { "Mainnet": "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE", @@ -517,7 +542,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "BALANCER_EXCHANGE_PROXY_ADDRESS": { "Mainnet": "0x3E66B66Fd1d0b02fDa6C811Da9E0547970DB2f21", @@ -537,7 +563,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "BALANCER_POOLS_URL": { "Mainnet": "https://ipfs.fleek.co/ipns/balancer-bucket.storage.fleek.co/balancer-exchange/pools", @@ -557,7 +584,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "DODO_ETH_ADDRESS": { "Mainnet": "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE", @@ -577,7 +605,8 @@ "Celo": "", "Fantom": "", "Aurora": "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "DODO_EXCHANGE_PROXY_ADDRESS": { "Mainnet": "0xCB859eA579b28e02B87A1FDE08d087ab9dbE5149", @@ -597,7 +626,8 @@ "Celo": "", "Fantom": "", "Aurora": "0x335aC99bb3E51BDbF22025f092Ebc1Cf2c5cC619", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "BANCOR_ETH_ADDRESS": { "Mainnet": "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE", @@ -617,7 +647,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "BANCOR_EXCHANGE_PROXY_ADDRESS": { "Mainnet": "0x2F9EC37d6CcFFf1caB21733BdaDEdE11c823cCB0", @@ -637,7 +668,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "TRADERJOE_ROUTER_ADDRESS": { "Mainnet": "", @@ -657,7 +689,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "TRADERJOE_FACTORY_ADDRESS": { "Mainnet": "", @@ -677,7 +710,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "TRADERJOE_THEGRAPH": { "Mainnet": "https://api.thegraph.com/subgraphs/name/traderjoe-xyz/exchange", @@ -697,7 +731,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "TRADERJOE_INIT_CODE_HASH": { "Mainnet": "", @@ -717,7 +752,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "OPENOCEAN_ETH_ADDRESS": { "Mainnet": "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE", @@ -737,7 +773,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "OPENOCEAN_EXCHANGE_PROXY_ADDRESS": { "Mainnet": "0x6352a56caadC4F1E25CD6c75970Fa768A3304e64", @@ -757,7 +794,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "PANGOLIN_ROUTER_ADDRESS": { "Mainnet": "", @@ -777,7 +815,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "PANGOLIN_FACTORY_ADDRESS": { "Mainnet": "", @@ -797,7 +836,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "PANGOLIN_THEGRAPH": { "Mainnet": "", @@ -817,7 +857,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "PANGOLIN_INIT_CODE_HASH": { "Mainnet": "", @@ -837,7 +878,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "WANNASWAP_ROUTER_V2_ADDRESS": { "Mainnet": "", @@ -857,7 +899,8 @@ "Celo": "", "Fantom": "", "Aurora": "0xa3a1eF5Ae6561572023363862e238aFA84C72ef5", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "WANNASWAP_ROUTER_ADDRESS": { "Mainnet": "", @@ -877,7 +920,8 @@ "Celo": "", "Fantom": "", "Aurora": "0x8f1E0Cf0f9f269Bc977C38635E560aa5b0E63323", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "WANNASWAP_FACTORY_ADDRESS": { "Mainnet": "", @@ -897,7 +941,8 @@ "Celo": "", "Fantom": "", "Aurora": "0x7928D4FeA7b2c90C732c10aFF59cf403f0C38246", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "WANNASWAP_THEGRAPH": { "Mainnet": "", @@ -917,7 +962,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "WANNASWAP_INIT_CODE_HASH": { "Mainnet": "", @@ -937,7 +983,8 @@ "Celo": "", "Fantom": "", "Aurora": "0xa06b8b0642cf6a9298322d0c8ac3c68c291ca24dc66245cf23aa2abc33b57e21", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "TRISOLARIS_ROUTER_ADDRESS": { "Mainnet": "", @@ -957,7 +1004,8 @@ "Celo": "", "Fantom": "", "Aurora": "0x2CB45Edb4517d5947aFdE3BEAbF95A582506858B", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "TRISOLARIS_FACTORY_ADDRESS": { "Mainnet": "", @@ -977,7 +1025,8 @@ "Celo": "", "Fantom": "", "Aurora": "0xc66F594268041dB60507F00703b152492fb176E7", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "TRISOLARIS_THEGRAPH": { "Mainnet": "", @@ -997,7 +1046,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "TRISOLARIS_INIT_CODE_HASH": { "Mainnet": "", @@ -1017,6 +1067,7 @@ "Celo": "", "Fantom": "", "Aurora": "0x754e1d90e536e4c1df81b7f030f47b4ca80c87120e145c294f098c83a6cb5ace", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" } } diff --git a/packages/web3-constants/evm/zerion.json b/packages/web3-constants/evm/zerion.json index e0d70150b37f..7ccce157682d 100644 --- a/packages/web3-constants/evm/zerion.json +++ b/packages/web3-constants/evm/zerion.json @@ -17,7 +17,8 @@ "Celo": "celo-assets", "Fantom": "fantom-assets", "Aurora": "aurora-assets", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "TRANSACTIONS_SCOPE_NAME": { "Mainnet": "transactions", @@ -37,6 +38,7 @@ "Celo": "celo-transactions", "Fantom": "fantom-transactions", "Aurora": "aurora-transactions", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" } } From 1934c733f242ef9015b2d2156c490f5e4c873849 Mon Sep 17 00:00:00 2001 From: zhouhanseng Date: Mon, 21 Mar 2022 12:32:04 +0800 Subject: [PATCH 15/26] chore: solve conflict --- packages/web3-constants/evm/trader.json | 165 ++++++++++++++++-------- 1 file changed, 110 insertions(+), 55 deletions(-) diff --git a/packages/web3-constants/evm/trader.json b/packages/web3-constants/evm/trader.json index be8dcb28d3fb..e8cac04eca46 100644 --- a/packages/web3-constants/evm/trader.json +++ b/packages/web3-constants/evm/trader.json @@ -17,7 +17,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "UNISWAP_V2_FACTORY_ADDRESS": { "Mainnet": "0x5C69bEe701ef814a2B6a3EDD4B1652CB9cc5aA6f", @@ -37,7 +38,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "UNISWAP_V2_THEGRAPH": { "Mainnet": "https://api.thegraph.com/subgraphs/name/uniswap/uniswap-v2", @@ -57,7 +59,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "UNISWAP_V2_INIT_CODE_HASH": { "Mainnet": "0x96e8ac4277198ff8b6f785478aa9a39f403cb768dd02cbee326c3e7da348845f", @@ -77,7 +80,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "UNISWAP_SWAP_ROUTER_ADDRESS": { "Mainnet": "0xe592427a0aece92de3edee1f18e0157c05861564", @@ -97,7 +101,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "UNISWAP_V3_FACTORY_ADDRESS": { "Mainnet": "0x1F98431c8aD98523631AE4a59f267346ea31F984", @@ -117,7 +122,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "UNISWAP_V3_QUOTER_ADDRESS": { "Mainnet": "0xb27308f9F90D607463bb33eA1BeBb41C27CE5AB6", @@ -137,7 +143,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "UNISWAP_V3_THEGRAPH": { "Mainnet": "https://api.thegraph.com/subgraphs/name/uniswap/uniswap-v3", @@ -157,7 +164,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "UNISWAP_V3_INIT_CODE_HASH": { "Mainnet": "0xe34f199b19b2b4f47f68442619d555527d244f78a3297ea89325f843f87b8b54", @@ -177,7 +185,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "SUSHISWAP_ROUTER_ADDRESS": { "Mainnet": "0xd9e1cE17f2641f24aE83637ab66a2cca9C378B9F", @@ -197,7 +206,8 @@ "Celo": "0x1421bDe4B10e8dd459b3BCb598810B1337D56842", "Fantom": "0x1b02dA8Cb0d097eB8D57A175b88c7D8b47997506", "Aurora": "0x1b02dA8Cb0d097eB8D57A175b88c7D8b47997506", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "SUSHISWAP_FACTORY_ADDRESS": { "Mainnet": "0xC0AEe478e3658e2610c5F7A4A2E1777cE9e4f2Ac", @@ -217,7 +227,8 @@ "Celo": "0xc35DADB65012eC5796536bD9864eD8773aBc74C4", "Fantom": "0xc35DADB65012eC5796536bD9864eD8773aBc74C4", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "SUSHISWAP_THEGRAPH": { "Mainnet": "https://api.thegraph.com/subgraphs/name/zippoxer/sushiswap-subgraph-fork", @@ -237,7 +248,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "SUSHISWAP_INIT_CODE_HASH": { "Mainnet": "0xe18a34eb0e04b04f7a0ac29a6e80748dca96319b42c54d679cb821dca90c6303", @@ -257,7 +269,8 @@ "Celo": "0xe18a34eb0e04b04f7a0ac29a6e80748dca96319b42c54d679cb821dca90c6303", "Fantom": "0xe18a34eb0e04b04f7a0ac29a6e80748dca96319b42c54d679cb821dca90c6303", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "SASHIMISWAP_ROUTER_ADDRESS": { "Mainnet": "0xe4fe6a45f354e845f954cddee6084603cedb9410", @@ -277,7 +290,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "SASHIMISWAP_FACTORY_ADDRESS": { "Mainnet": "0xF028F723ED1D0fE01cC59973C49298AA95c57472", @@ -297,7 +311,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "SASHIMISWAP_THEGRAPH": { "Mainnet": "https://api.thegraph.com/subgraphs/name/sashimiproject/sashimi", @@ -317,7 +332,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "SASHIMISWAP_INIT_CODE_HASH": { "Mainnet": "0xb465bbe4edb8c9b0da8ff0b2b36ce0065de9fcd5a33f32c6856ea821779c8b72", @@ -337,7 +353,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "QUICKSWAP_ROUTER_ADDRESS": { "Mainnet": "", @@ -357,7 +374,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "QUICKSWAP_FACTORY_ADDRESS": { "Mainnet": "", @@ -377,7 +395,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "QUICKSWAP_THEGRAPH": { "Mainnet": "", @@ -397,7 +416,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "QUICKSWAP_INIT_CODE_HASH": { "Mainnet": "", @@ -417,7 +437,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "PANCAKESWAP_ROUTER_ADDRESS": { "Mainnet": "", @@ -437,7 +458,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "PANCAKESWAP_FACTORY_ADDRESS": { "Mainnet": "", @@ -457,7 +479,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "PANCAKESWAP_THEGRAPH": { "Mainnet": "", @@ -477,7 +500,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "PANCAKESWAP_INIT_CODE_HASH": { "Mainnet": "", @@ -497,7 +521,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "BALANCER_ETH_ADDRESS": { "Mainnet": "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE", @@ -517,7 +542,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "BALANCER_EXCHANGE_PROXY_ADDRESS": { "Mainnet": "0x3E66B66Fd1d0b02fDa6C811Da9E0547970DB2f21", @@ -537,7 +563,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "BALANCER_POOLS_URL": { "Mainnet": "https://ipfs.fleek.co/ipns/balancer-bucket.storage.fleek.co/balancer-exchange/pools", @@ -557,7 +584,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "DODO_ETH_ADDRESS": { "Mainnet": "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE", @@ -577,7 +605,8 @@ "Celo": "", "Fantom": "", "Aurora": "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "DODO_EXCHANGE_PROXY_ADDRESS": { "Mainnet": "0xCB859eA579b28e02B87A1FDE08d087ab9dbE5149", @@ -597,7 +626,8 @@ "Celo": "", "Fantom": "", "Aurora": "0x335aC99bb3E51BDbF22025f092Ebc1Cf2c5cC619", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "BANCOR_ETH_ADDRESS": { "Mainnet": "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE", @@ -617,7 +647,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "BANCOR_EXCHANGE_PROXY_ADDRESS": { "Mainnet": "0x2F9EC37d6CcFFf1caB21733BdaDEdE11c823cCB0", @@ -637,7 +668,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "TRADERJOE_ROUTER_ADDRESS": { "Mainnet": "", @@ -657,7 +689,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "TRADERJOE_FACTORY_ADDRESS": { "Mainnet": "", @@ -677,7 +710,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "TRADERJOE_THEGRAPH": { "Mainnet": "https://api.thegraph.com/subgraphs/name/traderjoe-xyz/exchange", @@ -697,7 +731,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "TRADERJOE_INIT_CODE_HASH": { "Mainnet": "", @@ -717,7 +752,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "OPENOCEAN_ETH_ADDRESS": { "Mainnet": "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE", @@ -737,7 +773,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "OPENOCEAN_EXCHANGE_PROXY_ADDRESS": { "Mainnet": "0x6352a56caadC4F1E25CD6c75970Fa768A3304e64", @@ -757,7 +794,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "PANGOLIN_ROUTER_ADDRESS": { "Mainnet": "", @@ -777,7 +815,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "PANGOLIN_FACTORY_ADDRESS": { "Mainnet": "", @@ -797,7 +836,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "PANGOLIN_THEGRAPH": { "Mainnet": "", @@ -817,7 +857,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "PANGOLIN_INIT_CODE_HASH": { "Mainnet": "", @@ -837,7 +878,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "WANNASWAP_ROUTER_V2_ADDRESS": { "Mainnet": "", @@ -857,7 +899,8 @@ "Celo": "", "Fantom": "", "Aurora": "0xa3a1eF5Ae6561572023363862e238aFA84C72ef5", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "WANNASWAP_ROUTER_ADDRESS": { "Mainnet": "", @@ -877,7 +920,8 @@ "Celo": "", "Fantom": "", "Aurora": "0x8f1E0Cf0f9f269Bc977C38635E560aa5b0E63323", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "WANNASWAP_FACTORY_ADDRESS": { "Mainnet": "", @@ -897,7 +941,8 @@ "Celo": "", "Fantom": "", "Aurora": "0x7928D4FeA7b2c90C732c10aFF59cf403f0C38246", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "WANNASWAP_THEGRAPH": { "Mainnet": "", @@ -917,7 +962,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "WANNASWAP_INIT_CODE_HASH": { "Mainnet": "", @@ -937,7 +983,8 @@ "Celo": "", "Fantom": "", "Aurora": "0xa06b8b0642cf6a9298322d0c8ac3c68c291ca24dc66245cf23aa2abc33b57e21", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "TRISOLARIS_ROUTER_ADDRESS": { "Mainnet": "", @@ -957,7 +1004,8 @@ "Celo": "", "Fantom": "", "Aurora": "0x2CB45Edb4517d5947aFdE3BEAbF95A582506858B", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "TRISOLARIS_FACTORY_ADDRESS": { "Mainnet": "", @@ -977,7 +1025,8 @@ "Celo": "", "Fantom": "", "Aurora": "0xc66F594268041dB60507F00703b152492fb176E7", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "TRISOLARIS_THEGRAPH": { "Mainnet": "", @@ -997,7 +1046,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "TRISOLARIS_INIT_CODE_HASH": { "Mainnet": "", @@ -1017,7 +1067,8 @@ "Celo": "", "Fantom": "", "Aurora": "0x754e1d90e536e4c1df81b7f030f47b4ca80c87120e145c294f098c83a6cb5ace", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "MDEX_ROUTER_ADDRESS": { "Mainnet": "0x74119c3bca85bEA0538A62319a79b4a372590B47", @@ -1037,7 +1088,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "MDEX_FACTORY_ADDRESS": { "Mainnet": "0x7DAe51BD3E3376B8c7c4900E9107f12Be3AF1bA8", @@ -1057,7 +1109,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "MDEX_THEGRAPH": { "Mainnet": "", @@ -1077,7 +1130,8 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" }, "MDEX_INIT_CODE_HASH": { "Mainnet": "0x8ecc069c645df696f2ca5116ab459c5c2889f299e73c1b208aaa3cdd7d110b16", @@ -1097,6 +1151,7 @@ "Celo": "", "Fantom": "", "Aurora": "", - "Aurora_Testnet": "" + "Aurora_Testnet": "", + "Conflux": "" } } From 5ec95149c068464aed616c21dcd306f40a0b2853 Mon Sep 17 00:00:00 2001 From: zhouhanseng Date: Mon, 21 Mar 2022 13:21:32 +0800 Subject: [PATCH 16/26] chore: hiden gas option --- .../Wallet/GasSetting/Prior1559GasSetting.tsx | 76 +++++++++-------- .../GasSettingDialog/Prior1559GasSetting.tsx | 83 ++++++++++--------- 2 files changed, 86 insertions(+), 73 deletions(-) diff --git a/packages/mask/src/extension/popups/pages/Wallet/GasSetting/Prior1559GasSetting.tsx b/packages/mask/src/extension/popups/pages/Wallet/GasSetting/Prior1559GasSetting.tsx index 1399b1d08445..9eca5b216787 100644 --- a/packages/mask/src/extension/popups/pages/Wallet/GasSetting/Prior1559GasSetting.tsx +++ b/packages/mask/src/extension/popups/pages/Wallet/GasSetting/Prior1559GasSetting.tsx @@ -111,7 +111,8 @@ export const Prior1559GasSetting = memo(() => { // #region Get gas options from debank const { value: gasOptions } = useAsync(async () => { const response = await WalletRPC.getGasPriceDictFromDeBank(chainId) - if (!response) return { slow: 0, standard: 0, fast: 0 } + + if (!response) return null return { slow: response.data.slow.price, @@ -122,20 +123,23 @@ export const Prior1559GasSetting = memo(() => { // #endregion const options = useMemo( - () => [ - { - title: t('popups_wallet_gas_fee_settings_low'), - gasPrice: gasOptions?.slow ?? 0, - }, - { - title: t('popups_wallet_gas_fee_settings_medium'), - gasPrice: gasOptions?.standard ?? 0, - }, - { - title: t('popups_wallet_gas_fee_settings_high'), - gasPrice: gasOptions?.fast ?? 0, - }, - ], + () => + gasOptions + ? [ + { + title: t('popups_wallet_gas_fee_settings_low'), + gasPrice: gasOptions?.slow ?? 0, + }, + { + title: t('popups_wallet_gas_fee_settings_medium'), + gasPrice: gasOptions?.standard ?? 0, + }, + { + title: t('popups_wallet_gas_fee_settings_high'), + gasPrice: gasOptions?.fast ?? 0, + }, + ] + : null, [gasOptions], ) @@ -222,7 +226,7 @@ export const Prior1559GasSetting = memo(() => { }, [minGasLimit, gas, setValue]) useEffect(() => { - if (selected !== null) setValue('gasPrice', formatWeiToGwei(options[selected].gasPrice).toString()) + if (selected !== null && options) setValue('gasPrice', formatWeiToGwei(options[selected].gasPrice).toString()) }, [selected, setValue, options]) const [{ loading }, handleConfirm] = useAsyncFn( @@ -257,25 +261,27 @@ export const Prior1559GasSetting = memo(() => { return ( <> -
- {options.map(({ title, gasPrice }, index) => ( -
setOption(index)} - className={selected === index ? classes.selected : undefined}> - {title} - {formatWeiToGwei(gasPrice ?? 0).toString()} Gwei - - {t('popups_wallet_gas_fee_settings_usd', { - usd: formatWeiToEther(gasPrice) - .times(nativeTokenPrice) - .times(minGasLimit || 21000) - .toPrecision(3), - })} - -
- ))} -
+ {options ? ( +
+ {options.map(({ title, gasPrice }, index) => ( +
setOption(index)} + className={selected === index ? classes.selected : undefined}> + {title} + {formatWeiToGwei(gasPrice ?? 0).toString()} Gwei + + {t('popups_wallet_gas_fee_settings_usd', { + usd: formatWeiToEther(gasPrice) + .times(nativeTokenPrice) + .times(minGasLimit || 21000) + .toPrecision(3), + })} + +
+ ))} +
+ ) : null}
{t('popups_wallet_gas_fee_settings_gas_limit')} = memo( // #region Get gas options from debank const { value: gasOptions, loading: getGasOptionsLoading } = useAsync(async () => { const response = await WalletRPC.getGasPriceDictFromDeBank(chainId) - if (!response) return { slow: 0, standard: 0, fast: 0 } + + if (!response) return null + return { slow: response.data.slow.price, standard: response.data.normal.price, @@ -45,26 +47,29 @@ export const Prior1559GasSetting: FC = memo( // #endregion const options = useMemo( - () => [ - { - title: t('popups_wallet_gas_fee_settings_low'), - gasOption: GasOption.Low, - gasPrice: gasOptions?.slow ?? 0, - }, - { - title: t('popups_wallet_gas_fee_settings_medium'), - gasOption: GasOption.Medium, - gasPrice: gasOptions?.standard ?? 0, - }, - { - title: t('popups_wallet_gas_fee_settings_high'), - gasOption: GasOption.High, - gasPrice: gasOptions?.fast ?? 0, - }, - ], + () => + gasOptions + ? [ + { + title: t('popups_wallet_gas_fee_settings_low'), + gasOption: GasOption.Low, + gasPrice: gasOptions?.slow ?? 0, + }, + { + title: t('popups_wallet_gas_fee_settings_medium'), + gasOption: GasOption.Medium, + gasPrice: gasOptions?.standard ?? 0, + }, + { + title: t('popups_wallet_gas_fee_settings_high'), + gasOption: GasOption.High, + gasPrice: gasOptions?.fast ?? 0, + }, + ] + : null, [gasOptions], ) - const currentGasOption = options.find((opt) => opt.gasOption === selectedGasOption) + const currentGasOption = options ? options.find((opt) => opt.gasOption === selectedGasOption) : null const schema = useMemo(() => { return zod.object({ @@ -124,25 +129,27 @@ export const Prior1559GasSetting: FC = memo( return ( <> -
- {options.map(({ title, gasPrice, gasOption }, index) => ( -
setGasOption(gasOption)} - className={selectedGasOption === gasOption ? classes.selected : undefined}> - {title} - {formatWeiToGwei(gasPrice ?? 0).toString()} Gwei - - {t('popups_wallet_gas_fee_settings_usd', { - usd: formatWeiToEther(gasPrice) - .times(nativeTokenPrice) - .times(inputGasLimit || '1') - .toPrecision(3), - })} - -
- ))} -
+ {options ? ( +
+ {options.map(({ title, gasPrice, gasOption }, index) => ( +
setGasOption(gasOption)} + className={selectedGasOption === gasOption ? classes.selected : undefined}> + {title} + {formatWeiToGwei(gasPrice ?? 0).toString()} Gwei + + {t('popups_wallet_gas_fee_settings_usd', { + usd: formatWeiToEther(gasPrice) + .times(nativeTokenPrice) + .times(inputGasLimit || '1') + .toPrecision(3), + })} + +
+ ))} +
+ ) : null} {t('popups_wallet_gas_fee_settings_gas_limit')} Date: Mon, 21 Mar 2022 13:31:49 +0800 Subject: [PATCH 17/26] fix: explorer url --- packages/web3-shared/evm/assets/chains.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/web3-shared/evm/assets/chains.json b/packages/web3-shared/evm/assets/chains.json index 6ae9e8574d17..4f3e7530cc3a 100644 --- a/packages/web3-shared/evm/assets/chains.json +++ b/packages/web3-shared/evm/assets/chains.json @@ -2853,7 +2853,7 @@ "decimals": 18, "logoURI": "https://raw.githubusercontent.com/DimensionDev/Maskbook/e434014b17bd4622e28e21c9d4cd9ffec875889e/packages/mask/src/plugins/EVM/assets/conflux.png" }, - "infoURL": "https://confluxnetwork.org", + "infoURL": "https://evm.confluxscan.net", "shortName": "Conflux", "chainId": 1030, "networkId": 1030 From 6c847525808c37c7529cbf1281f37557f0530a5d Mon Sep 17 00:00:00 2001 From: zhouhanseng Date: Mon, 21 Mar 2022 15:52:14 +0800 Subject: [PATCH 18/26] chore: conflux usd price --- .../plugins/EVM/UI/Web3State/getAssetsFn.ts | 40 ++++++++++++++++--- packages/web3-constants/evm/coingecko.json | 2 +- 2 files changed, 35 insertions(+), 7 deletions(-) diff --git a/packages/mask/src/plugins/EVM/UI/Web3State/getAssetsFn.ts b/packages/mask/src/plugins/EVM/UI/Web3State/getAssetsFn.ts index 6252dfbdd925..50ec9d40d712 100644 --- a/packages/mask/src/plugins/EVM/UI/Web3State/getAssetsFn.ts +++ b/packages/mask/src/plugins/EVM/UI/Web3State/getAssetsFn.ts @@ -11,8 +11,13 @@ import { Web3ProviderType, FungibleAssetProvider, createExternalProvider, + getCoinGeckoCoinId, + CurrencyType, + CryptoPrice, + PriceRecord, ChainId, } from '@masknet/web3-shared-evm' +import BigNumber from 'bignumber.js' import { Pageable, Pagination, TokenType, Web3Plugin } from '@masknet/plugin-infra' import BalanceCheckerABI from '@masknet/web3-contracts/abis/BalanceChecker.json' import ERC721ABI from '@masknet/web3-contracts/abis/ERC721.json' @@ -22,10 +27,19 @@ import { PLUGIN_NETWORKS } from '../../constants' import { makeSortAssertWithoutChainFn } from '../../utils/token' import * as EthereumService from '../../../../extension/background-script/EthereumService' import type { ERC721 } from '@masknet/web3-contracts/types/ERC721' +import { pow10 } from '@masknet/web3-shared-base' // tokens unavailable neither from api or balance checker. // https://forum.conflux.fun/t/how-to-upvote-debank-proposal-for-conflux-espace-integration/13935 -const TokenUnavailableList = [ChainId.Conflux] +const TokenUnavailableFromDebankList = [ChainId.Conflux] + +const TOKEN_PRICE_COINGECKO_URL_BASE = 'https://api.coingecko.com/api/v3' + +async function getNativeTokenPrice(tokenId: string) { + const requestPath = `${TOKEN_PRICE_COINGECKO_URL_BASE}/simple/price?ids=${tokenId}&vs_currencies=${CurrencyType.USD}` + const prices = await fetch(requestPath).then((r) => r.json() as Promise) + return prices +} export const getFungibleAssetsFn = (context: Web3ProviderType) => @@ -113,19 +127,26 @@ export const getFungibleAssetsFn = const allTokens = [...assetsFromProvider, ...assetFromChain] - const allRequest = TokenUnavailableList.map(async (x) => { + const allRequest = TokenUnavailableFromDebankList.map(async (x) => { const b = await EthereumService.getBalance(address, { chainId: x }) + const coinId = getCoinGeckoCoinId(x) + const price = (await getNativeTokenPrice(coinId))[coinId] + const balance = String(Number.parseInt(b, 16)) + return { chainId: x, - balance: String(Number.parseInt(b, 16)), + price: price, + balance, + value: new BigNumber(balance), } }) - const balanceResults = (await Promise.allSettled(allRequest)) + const tokenUnavailableFromDebankResults = (await Promise.allSettled(allRequest)) .map((x) => (x.status === 'fulfilled' ? x.value : null)) .filter((x) => Boolean(x)) as { chainId: ChainId balance: string + price: PriceRecord }[] const nativeTokens: Web3Plugin.Asset[] = networks @@ -140,12 +161,19 @@ export const getFungibleAssetsFn = ) .map((x) => { const nativeToken = createNativeToken(x.chainId) - const balance = balanceResults.find((y) => y.chainId === x.chainId)?.balance ?? '0' + const result = tokenUnavailableFromDebankResults.find((y) => y.chainId === x.chainId) return { id: nativeToken.address, chainId: x.chainId, token: { ...nativeToken, id: nativeToken.address!, type: TokenType.Fungible }, - balance, + balance: result?.balance ?? '0', + price: result?.price, + value: { + [CurrencyType.USD]: new BigNumber(result?.balance ?? '0') + .dividedBy(pow10(nativeToken.decimals)) + .multipliedBy(result ? result.price[CurrencyType.USD] : '0') + .toFixed(), + }, } }) diff --git a/packages/web3-constants/evm/coingecko.json b/packages/web3-constants/evm/coingecko.json index 06c01af3edc2..20dbb8910035 100644 --- a/packages/web3-constants/evm/coingecko.json +++ b/packages/web3-constants/evm/coingecko.json @@ -39,6 +39,6 @@ "Fantom": "fantom", "Aurora": "ethereum", "Aurora_Testnet": "", - "Conflux": "" + "Conflux": "conflux-token" } } From 510e8d8004bae7174c7b7dd93a15c99eb453ded3 Mon Sep 17 00:00:00 2001 From: zhouhanseng Date: Mon, 21 Mar 2022 15:54:13 +0800 Subject: [PATCH 19/26] chore: conflux price --- packages/mask/src/plugins/EVM/UI/Web3State/getAssetsFn.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/mask/src/plugins/EVM/UI/Web3State/getAssetsFn.ts b/packages/mask/src/plugins/EVM/UI/Web3State/getAssetsFn.ts index 50ec9d40d712..e7d192b03c2a 100644 --- a/packages/mask/src/plugins/EVM/UI/Web3State/getAssetsFn.ts +++ b/packages/mask/src/plugins/EVM/UI/Web3State/getAssetsFn.ts @@ -137,7 +137,6 @@ export const getFungibleAssetsFn = chainId: x, price: price, balance, - value: new BigNumber(balance), } }) From 92185d543ff1c1075dcd3d064afb128222462f22 Mon Sep 17 00:00:00 2001 From: zhouhanseng Date: Tue, 22 Mar 2022 17:11:09 +0800 Subject: [PATCH 20/26] chore: miss config --- packages/web3-shared/evm/pipes/index.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/web3-shared/evm/pipes/index.ts b/packages/web3-shared/evm/pipes/index.ts index 818cfb540e1f..4125068846c5 100644 --- a/packages/web3-shared/evm/pipes/index.ts +++ b/packages/web3-shared/evm/pipes/index.ts @@ -96,6 +96,7 @@ export const resolveNetworkAddressPrefix = createLookupTableResolver [NetworkType.Celo]: 'Celo', [NetworkType.Fantom]: 'Fantom', [NetworkType.Aurora]: 'Aurora', + [NetworkType.Conflux]: 'Conflux', }, 'Unknown', ) @@ -144,6 +146,7 @@ export const resolveChainColor = createLookupTableResolver( [ChainId.Celo]: 'rgb(53, 208, 127)', [ChainId.Fantom]: 'rgb(19, 181, 236)', [ChainId.Aurora]: 'rgb(112, 212, 74)', + [ChainId.Conflux]: 'rgb(24, 163, 138)', [ChainId.Aurora_Testnet]: 'rgb(112, 212, 74)', }, 'rgb(214, 217, 220)', From a0627326dff65b10881261384d7a1adef21f7771 Mon Sep 17 00:00:00 2001 From: zhouhanseng Date: Wed, 23 Mar 2022 10:59:05 +0800 Subject: [PATCH 21/26] fix: conflux default gas price --- .../Wallet/GasSetting/Prior1559GasSetting.tsx | 1 + .../GasSettingDialog/Prior1559GasSetting.tsx | 15 ++++++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/packages/mask/src/extension/popups/pages/Wallet/GasSetting/Prior1559GasSetting.tsx b/packages/mask/src/extension/popups/pages/Wallet/GasSetting/Prior1559GasSetting.tsx index 9eca5b216787..db858eb37368 100644 --- a/packages/mask/src/extension/popups/pages/Wallet/GasSetting/Prior1559GasSetting.tsx +++ b/packages/mask/src/extension/popups/pages/Wallet/GasSetting/Prior1559GasSetting.tsx @@ -92,6 +92,7 @@ const useStyles = makeStyles()((theme) => ({ const minGasPriceOfChain: ChainIdOptionalRecord = { [ChainId.BSC]: '0x12a05f200', // 5 + [ChainId.Conflux]: '0x12a05f200', // 5 [ChainId.Matic]: '0x6fc23ac00', // 30 } diff --git a/packages/mask/src/plugins/Wallet/SNSAdaptor/GasSettingDialog/Prior1559GasSetting.tsx b/packages/mask/src/plugins/Wallet/SNSAdaptor/GasSettingDialog/Prior1559GasSetting.tsx index acc124642bf7..1666b8b1073d 100644 --- a/packages/mask/src/plugins/Wallet/SNSAdaptor/GasSettingDialog/Prior1559GasSetting.tsx +++ b/packages/mask/src/plugins/Wallet/SNSAdaptor/GasSettingDialog/Prior1559GasSetting.tsx @@ -5,6 +5,8 @@ import { GasOption, useChainId, useNativeTokenDetailed, + ChainIdOptionalRecord, + ChainId, } from '@masknet/web3-shared-evm' import { Typography } from '@mui/material' import { LoadingButton } from '@mui/lab' @@ -22,6 +24,12 @@ import { useNativeTokenPrice } from '../../hooks/useTokenPrice' import type { GasSettingProps } from './types' import { useGasSettingStyles } from './useGasSettingStyles' +const minGasPriceOfChain: ChainIdOptionalRecord = { + [ChainId.BSC]: '0x12a05f200', // 5 + [ChainId.Conflux]: '0x12a05f200', // 5 + [ChainId.Matic]: '0x6fc23ac00', // 30 +} + export const Prior1559GasSetting: FC = memo( ({ gasLimit, minGasLimit = 0, gasOption = GasOption.Medium, onConfirm = noop }) => { const { classes } = useGasSettingStyles() @@ -109,10 +117,11 @@ export const Prior1559GasSetting: FC = memo( }, [gasLimit, setValue]) useEffect(() => { - if (currentGasOption) { - setValue('gasPrice', formatWeiToGwei(currentGasOption.gasPrice).toString()) + const minGasPrice = minGasPriceOfChain[chainId] + if (currentGasOption || minGasPrice) { + setValue('gasPrice', formatWeiToGwei(currentGasOption?.gasPrice ?? minGasPrice ?? 0).toString()) } - }, [currentGasOption, setValue]) + }, [currentGasOption, setValue, chainId]) const handleConfirm = useCallback( (data: zod.infer) => { From 598b9ab332ed93d09fdca7b735b0d5e967c6a5eb Mon Sep 17 00:00:00 2001 From: zhouhanseng Date: Wed, 23 Mar 2022 12:36:34 +0800 Subject: [PATCH 22/26] chore: conflux disable swap --- .../components/FungibleTokenTableRow/index.tsx | 11 ++++++++--- .../mask/src/components/shared/ApplicationBoard.tsx | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/packages/dashboard/src/pages/Wallets/components/FungibleTokenTableRow/index.tsx b/packages/dashboard/src/pages/Wallets/components/FungibleTokenTableRow/index.tsx index d12d21c19e26..e241e78fb8e2 100644 --- a/packages/dashboard/src/pages/Wallets/components/FungibleTokenTableRow/index.tsx +++ b/packages/dashboard/src/pages/Wallets/components/FungibleTokenTableRow/index.tsx @@ -12,6 +12,7 @@ import { useWeb3State, Web3Plugin, } from '@masknet/plugin-infra' +import { ChainId } from '@masknet/web3-shared-evm' import { useDashboardI18N } from '../../../../locales' import { ChangeNetworkTip } from './ChangeNetworkTip' import { getTokenUSDValue } from '../../utils/getTokenUSDValue' @@ -151,7 +152,7 @@ export const FungibleTokenTableRow = memo(({ asset, onSend, } placement="top" @@ -160,8 +161,12 @@ export const FungibleTokenTableRow = memo(({ asset, onSend,