fix: mf-6128 add XLayer Chain (#11564)

DimensionDev · Apr 15, 2024 · d90929e · d90929e
1 parent ec0f4be
commit d90929e
Show file tree

Hide file tree

Showing 13 changed files with 59 additions and 63 deletions.
diff --git a/cspell.json b/cspell.json
@@ -340,6 +340,7 @@
         "wmatic",
         "xdai",
         "xlarge",
+        "xlayer",
         "zerion",
         "zilliqa",
         "zksync",

diff --git a/packages/mask/popups/pages/Wallet/components/AssetsList/index.tsx b/packages/mask/popups/pages/Wallet/components/AssetsList/index.tsx
@@ -99,11 +99,7 @@ const AssetItem = memo(function AssetItem({ asset, onItemClick, ...rest }: Asset
     const providerURL = network?.isCustomized ? network.rpcUrl : undefined
     const [seen, ref] = useEverSeen<HTMLLIElement>()
     // Debank might not provide asset from current custom network
-    // TODO Temporarily get X1 Testnet balance via rpc
-    const tryRpc =
-        (!asset.balance || isZero(asset.balance)) &&
-        (network?.isCustomized || network?.chainId === ChainId.X1_Testnet) &&
-        seen
+    const tryRpc = (!asset.balance || isZero(asset.balance)) && network?.isCustomized && seen
     const { data: rpcBalance, isPending } = useFungibleTokenBalance(
         NetworkPluginID.PLUGIN_EVM,
         asset.address,

diff --git a/packages/web3-constants/evm/ethereum.json b/packages/web3-constants/evm/ethereum.json
@@ -22,8 +22,8 @@
         "Astar": "0xf5056B96ab242C566002852d0b98ce0BcDf1af51",
         "Scroll": "0xbC7d98985966f56A66B0cB5F23d865676dc2ac84",
         "Metis": "0xC119574D5Fb333F5AC018658D4d8b5035E16bf39",
-        "X1": "0x8A42F70047a99298822dD1dbA34b454fc49913F2",
-        "X1_Testnet": "0x8A42F70047a99298822dD1dbA34b454fc49913F2"
+        "XLayer": "0x8A42F70047a99298822dD1dbA34b454fc49913F2",
+        "XLayer_Testnet": "0x8A42F70047a99298822dD1dbA34b454fc49913F2"
     },
     "MULTICALL_ADDRESS": {
         "Mainnet": "0x1F98415757620B543A52E61c46B32eB19261F984",
@@ -50,8 +50,8 @@
         "Astar": "0x1410304B91a280ad083196B0B50e9d8df749d860",
         "Scroll": "0x20Ee232E34B87061fE3ba0DB738A3531A3e915BF",
         "Metis": "0x6cc1b1058F9153358278C35E0b2D382f1585854B",
-        "X1": "0xF8935Df67cAB7BfcA9532D1Ac2088C5c39b995b5",
-        "X1_Testnet": "0xF8935Df67cAB7BfcA9532D1Ac2088C5c39b995b5"
+        "XLayer": "0xF8935Df67cAB7BfcA9532D1Ac2088C5c39b995b5",
+        "XLayer_Testnet": "0xF8935Df67cAB7BfcA9532D1Ac2088C5c39b995b5"
     },
     "ENS_REGISTRAR_ADDRESS": {
         "Mainnet": "0x00000000000C2E074eC69A0dFb2997BA6C7d2e1e",

diff --git a/packages/web3-constants/evm/nft-red-packet.json b/packages/web3-constants/evm/nft-red-packet.json
@@ -15,8 +15,8 @@
         "Astar": "0xc3e62b2CC70439C32a381Bfc056aCEd1d7162cef",
         "Scroll": "0x727F8030964CCEC6B0E344399c8d8E2B4C837351",
         "Metis": "0x812463356F58fc8194645A1838ee6C52D8ca2D26",
-        "X1": "0xd81c16d71432d7df04575ffe9fed76f837fea0cc",
-        "X1_Testnet": "0xd81c16d71432d7df04575ffe9fed76f837fea0cc"
+        "XLayer": "0xd81c16d71432d7df04575ffe9fed76f837fea0cc",
+        "XLayer_Testnet": "0xd81c16d71432d7df04575ffe9fed76f837fea0cc"
     },
     "NFT_RED_PACKET_ADDRESS_BLOCK_HEIGHT": {
         "Mainnet": 13229711,
@@ -46,7 +46,7 @@
         "Astar": 0,
         "Scroll": 96705,
         "Metis": 1702933,
-        "X1": 0,
-        "X1_Testnet": 7319723
+        "XLayer": 0,
+        "XLayer_Testnet": 7319723
     }
 }
diff --git a/packages/web3-constants/evm/red-packet.json b/packages/web3-constants/evm/red-packet.json
@@ -38,8 +38,8 @@
         "Astar": "0x2cF46Db820e279c5fBF778367D49d9C931D54524",
         "Scroll": "0x16f61cb37169523635B6761f3C946892fb3c18fB",
         "Metis": "0x2cf91AD8C175305EBe6970Bd8f81231585EFbd77",
-        "X1": "0x977baB5f7e2cEd0C91fDA890Ed1DBDfD3Ee9AE81",
-        "X1_Testnet": "0x977baB5f7e2cEd0C91fDA890Ed1DBDfD3Ee9AE81"
+        "XLayer": "0x977baB5f7e2cEd0C91fDA890Ed1DBDfD3Ee9AE81",
+        "XLayer_Testnet": "0x977baB5f7e2cEd0C91fDA890Ed1DBDfD3Ee9AE81"
     },
     "HAPPY_RED_PACKET_ADDRESS_V4_BLOCK_HEIGHT": {
         "Mainnet": 12939427,
@@ -69,7 +69,7 @@
         "Astar": 910985,
         "Scroll": 96705,
         "Metis": 1702860,
-        "X1": 0,
-        "X1_Testnet": 7320220
+        "XLayer": 0,
+        "XLayer_Testnet": 7320220
     }
 }
diff --git a/packages/web3-constants/evm/rpc.json b/packages/web3-constants/evm/rpc.json
@@ -72,8 +72,8 @@
         "Astar": ["https://astar.api.onfinality.io/public"],
         "Scroll": ["https://rpc.scroll.io"],
         "Metis": ["https://andromeda.metis.io/?owner=1088"],
-        "X1": ["https://rpc.x1.tech"],
-        "X1_Testnet": ["https://testrpc.x1.tech"]
+        "XLayer": ["https://rpc.xlayer.tech"],
+        "XLayer_Testnet": ["https://testrpc.xlayer.tech"]
     },
     "RPC_URLS_OFFICIAL": {
         "Mainnet": ["https://mainnet.infura.io/v3/d65858b010d249419cf8687eca12b094"],
@@ -103,8 +103,8 @@
         "Astar": ["https://rpc.astar.network:8545"],
         "Scroll": ["https://rpc.scroll.io"],
         "Metis": ["https://andromeda.metis.io/?owner=1088"],
-        "X1": ["https://rpc.x1.tech"],
-        "X1_Testnet": ["https://testrpc.x1.tech"]
+        "XLayer": ["https://rpc.xlayer.tech"],
+        "XLayer_Testnet": ["https://testrpc.xlayer.tech"]
     },
     "RPC_WEIGHTS": {
         "Mainnet": [0, 1, 2, 3, 4],
@@ -134,7 +134,7 @@
         "Astar": [0, 0, 0, 0, 0],
         "Scroll": [0, 0, 0, 0, 0],
         "Metis": [0, 0, 0, 0, 0],
-        "X1": [0, 0, 0, 0, 0],
-        "X1_Testnet": [0, 0, 0, 0, 0]
+        "XLayer": [0, 0, 0, 0, 0],
+        "XLayer_Testnet": [0, 0, 0, 0, 0]
     }
 }
diff --git a/packages/web3-constants/evm/token-list.json b/packages/web3-constants/evm/token-list.json
@@ -27,7 +27,7 @@
         "Astar": ["https://tokens.r2d2.to/latest/592/tokens.json"],
         "Scroll": ["https://tokens.r2d2.to/latest/534352/tokens.json"],
         "Metis": ["https://tokens.r2d2.to/latest/1088/tokens.json"],
-        "X1": ["https://tokens.r2d2.to/latest/196/tokens.json"],
-        "X1_Testnet": ["https://tokens.r2d2.to/latest/195/tokens.json"]
+        "XLayer": ["https://tokens.r2d2.to/latest/196/tokens.json"],
+        "XLayer_Testnet": ["https://tokens.r2d2.to/latest/195/tokens.json"]
     }
 }
diff --git a/packages/web3-constants/evm/token.json b/packages/web3-constants/evm/token.json
@@ -25,8 +25,8 @@
         "Astar": "0xaeaaf0e2c81af264101b9129c00f4440ccf0f720",
         "Scroll": "0x5300000000000000000000000000000000000004",
         "Metis": "0x420000000000000000000000000000000000000A",
-        "X1": "0x049a970485cf54904a6da1e1cea2ac18c9b8fb9f",
-        "X1_Testnet": "0x049a970485cf54904a6da1e1cea2ac18c9b8fb9f"
+        "XLayer": "0x5a77f1443d16ee5761d310e38b62f77f726bc71c",
+        "XLayer_Testnet": "0x049a970485cf54904a6da1e1cea2ac18c9b8fb9f"
     },
     "LDO_stETH_ADDRESS": {
         "Mainnet": "0xae7ab96520DE3A18E5e111B5EaAb095312D7fE84",
@@ -57,8 +57,8 @@
         "Aurora": "0xb12bfca5a55806aaf64e99521918a4bf0fc40802",
         "Astar": "0x6a2d262D56735DbA19Dd70682B39F6bE9a931D98",
         "Scroll": "0x06eFdBFf2a14a7c8E15944D1F4A48F9F95F663A4",
-        "X1": "0x2e1cba4a9f6e69d27e65046fc93b873b05f79a39",
-        "X1_Testnet": "0x2e1cba4a9f6e69d27e65046fc93b873b05f79a39"
+        "XLayer": "0x74b7f16337b8972027f6196a17a631ac6de26d22",
+        "XLayer_Testnet": "0x2e1cba4a9f6e69d27e65046fc93b873b05f79a39"
     },
     "USDT_ADDRESS": {
         "Mainnet": "0xdAC17F958D2ee523a2206206994597C13D831ec7",
@@ -74,8 +74,8 @@
         "Aurora": "0x4988a896b1227218e4a686fde5eabdcabd91571f",
         "Astar": "0x3795C36e7D12A8c252A20C5a7B455f7c57b60283",
         "Scroll": "0xf55BEC9cafDbE8730f096Aa55dad6D22d44099Df",
-        "X1": "0xb81fe42de28e7452088b77f3eb9685487734e088",
-        "X1_Testnet": "0xb81fe42de28e7452088b77f3eb9685487734e088"
+        "XLayer": "0x1e4a5963abfd975d8c9021ce480b42188849d41d",
+        "XLayer_Testnet": "0xb81fe42de28e7452088b77f3eb9685487734e088"
     },
     "aUSDT_ADDRESS": {
         "Mainnet": "0x71fc860F7D3A592A4a98740e39dB31d25db65ae8",
@@ -318,8 +318,8 @@
         "Astar": "0x0000000000000000000000000000000000000000",
         "Scroll": "0x0000000000000000000000000000000000000000",
         "Metis": "0x0000000000000000000000000000000000000000",
-        "X1": "0x0000000000000000000000000000000000000000",
-        "X1_Testnet": "0x0000000000000000000000000000000000000000"
+        "XLayer": "0x0000000000000000000000000000000000000000",
+        "XLayer_Testnet": "0x0000000000000000000000000000000000000000"
     },
     "WETH_ADDRESS": {
         "Mainnet": "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2",

diff --git a/packages/web3-shared/evm/src/assets/x1.png → ...ges/web3-shared/evm/src/assets/xlayer.png b/packages/web3-shared/evm/src/assets/x1.png → ...ges/web3-shared/evm/src/assets/xlayer.png
diff --git a/packages/web3-shared/evm/src/constants/chains.json b/packages/web3-shared/evm/src/constants/chains.json
@@ -713,11 +713,11 @@
     },
     {
         "chainId": 196,
-        "type": "X1",
-        "name": "X1",
-        "fullName": "X1",
+        "type": "XLayer",
+        "name": "XLayer",
+        "fullName": "XLayer",
         "network": "testnet",
-        "shortName": "x1",
+        "shortName": "xlayer",
         "features": [],
         "nativeCurrency": {
             "chainId": 196,
@@ -729,19 +729,19 @@
         "infoURL": "https://www.okx.com/web3",
         "explorers": [
             {
-                "name": "X1 explorer",
-                "url": "https://www.okx.com/explorer/x1",
+                "name": "XLayer explorer",
+                "url": "https://www.okx.com/explorer/xlayer",
                 "standard": "EIP3091"
             }
         ]
     },
     {
         "chainId": 195,
-        "type": "X1",
-        "name": "X1 Testnet",
-        "fullName": "X1 Testnet",
+        "type": "XLayer",
+        "name": "XLayer Testnet",
+        "fullName": "XLayer Testnet",
         "network": "mainnet",
-        "shortName": "x1",
+        "shortName": "xlayer",
         "features": [],
         "nativeCurrency": {
             "chainId": 195,
@@ -753,8 +753,8 @@
         "infoURL": "https://www.okx.com/web3",
         "explorers": [
             {
-                "name": "X1 explorer",
-                "url": "https://www.okx.com/explorer/x1-test",
+                "name": "XLayer explorer",
+                "url": "https://www.okx.com/explorer/xlayer-test",
                 "standard": "EIP3091"
             }
         ]

diff --git a/packages/web3-shared/evm/src/constants/descriptors.ts b/packages/web3-shared/evm/src/constants/descriptors.ts
@@ -318,25 +318,25 @@ export const NETWORK_DESCRIPTORS: ReadonlyArray<NetworkDescriptor<ChainId, Netwo
         averageBlockDelay: 10,
     },
     {
-        ID: `${PLUGIN_ID}_x1_testnet`,
+        ID: `${PLUGIN_ID}_xlayer_testnet`,
         networkSupporterPluginID: PLUGIN_ID,
-        chainId: ChainId.X1_Testnet,
-        type: NetworkType.X1_Testnet,
-        icon: new URL('../assets/x1.png', import.meta.url).href,
+        chainId: ChainId.XLayer_Testnet,
+        type: NetworkType.XLayer_Testnet,
+        icon: new URL('../assets/xlayer.png', import.meta.url).href,
         iconColor: 'rgb(255, 255, 255)',
-        name: 'X1 Testnet',
-        isMainnet: true,
+        name: 'XLayer Testnet',
+        isMainnet: false,
         averageBlockDelay: 10,
     },
     {
-        ID: `${PLUGIN_ID}_x1`,
+        ID: `${PLUGIN_ID}_xlayer`,
         networkSupporterPluginID: PLUGIN_ID,
-        chainId: ChainId.X1,
-        type: NetworkType.X1_Testnet,
-        icon: new URL('../assets/x1.png', import.meta.url).href,
+        chainId: ChainId.XLayer,
+        type: NetworkType.XLayer_Testnet,
+        icon: new URL('../assets/xlayer.png', import.meta.url).href,
         iconColor: 'rgb(255, 255, 255)',
-        name: 'X1',
-        isMainnet: false,
+        name: 'XLayer',
+        isMainnet: true,
         averageBlockDelay: 10,
     },
 ]

diff --git a/packages/web3-shared/evm/src/constants/tokens.ts b/packages/web3-shared/evm/src/constants/tokens.ts
@@ -91,6 +91,6 @@ export const WNATIVE_ONLY: ERC20AgainstToken = {
     [ChainId.Optimism_Goerli]: [WNATIVE[ChainId.Optimism_Goerli]],
     [ChainId.Astar]: [WNATIVE[ChainId.Astar]],
     [ChainId.Scroll]: [WNATIVE[ChainId.Scroll]],
-    [ChainId.X1]: [WNATIVE[ChainId.X1]],
-    [ChainId.X1_Testnet]: [WNATIVE[ChainId.X1_Testnet]],
+    [ChainId.XLayer]: [WNATIVE[ChainId.XLayer]],
+    [ChainId.XLayer_Testnet]: [WNATIVE[ChainId.XLayer_Testnet]],
 }
diff --git a/packages/web3-shared/evm/src/types/index.ts b/packages/web3-shared/evm/src/types/index.ts
@@ -140,8 +140,8 @@ export enum ChainId {
 
     Wanchain = 888,
 
-    X1 = 196,
-    X1_Testnet = 195,
+    XLayer = 196,
+    XLayer_Testnet = 195,
 
     /** BitTorrent Chain Mainnet */
     BitTorrent = 199,
@@ -300,8 +300,7 @@ export enum NetworkType {
     Astar = 'Astar',
     Scroll = 'Scroll',
     Moonbeam = 'Moonbeam',
-    X1 = 'X1',
-    X1_Testnet = 'X1_Testnet',
+    XLayer = 'XLayer',
     CustomNetwork = 'CustomNetwork',
 }