feat: change network url

.env.development

@@ -1,2 +1,2 @@
 # shared development environment variable
-# the build tool will load this file when NODE_ENV is development
+# the build tool will load this file when NODE_ENV is development

.gitignore

@@ -267,3 +267,7 @@ cljs-runtime
 /.cpcache/
 /bg-report.txt
 /popup-report.txt
+
+# calva
+out/
+.calva/

.yarn/versions/b14c2309.yml

@@ -0,0 +1,27 @@
+releases:
+  "@fluent-wallet/cfx_gas-price": patch
+  "@fluent-wallet/consts": patch
+  "@fluent-wallet/db": patch
+  "@fluent-wallet/jazz-icon": patch
+  "@fluent-wallet/wallet_after-unlock": patch
+  helios-background: patch
+
+declined:
+  - "@fluent-wallet/account"
+  - "@fluent-wallet/addr-by-network"
+  - "@fluent-wallet/base32-address"
+  - browser-extension
+  - "@fluent-wallet/contract-method-name"
+  - "@fluent-wallet/estimate-tx"
+  - helios-popup
+  - "@fluent-wallet/rpc-engine"
+  - "@fluent-wallet/eth_sign-transaction"
+  - "@fluent-wallet/wallet_add-network"
+  - "@fluent-wallet/wallet_add-vault"
+  - "@fluent-wallet/wallet_export-account-group"
+  - "@fluent-wallet/wallet_get-network"
+  - "@fluent-wallet/wallet_refetch-tx-list"
+  - "@fluent-wallet/wallet_send-transaction"
+  - "@fluent-wallet/spec"
+  - "@fluent-wallet/tx-history-checker"
+  - "@fluent-wallet/shorten-address"

examples/basic-dapp/index.js

@@ -632,7 +632,9 @@ async function walletInitialized() {
               symbol: 'CFX',
               decimals: 18,
             },
-            rpcUrls: ['https://evmtestnet.confluxrpc.com'],
+            rpcUrls: [
+              'https://evmtestnet.confluxrpc.com/1BvViQet4km8KPALkc6Pa9',
+            ],
             blockExplorerUrls: ['https://evmtestnet.confluxscan.io'],
           },
         ],

packages/background/src/index.js

@@ -1,11 +1,7 @@
 // # imports
 import 'regenerator-runtime/runtime'
 
-import {
-  IS_PROD_MODE,
-  IS_DEV_MODE,
-  IS_TEST_MODE,
-} from '@fluent-wallet/inner-utils'
+import {IS_PROD_MODE, IS_TEST_MODE} from '@fluent-wallet/inner-utils'
 import {EXT_STORAGE} from '@fluent-wallet/consts'
 
 import {defRpcEngine} from '@fluent-wallet/rpc-engine'
@@ -155,21 +151,20 @@ export const initBG = async ({
       1000 * 60 * 60,
     )
   }
-
   // ## Dev/Test
-  if (!IS_TEST_MODE) {
-    if (IS_DEV_MODE) {
-      // ### load dev script on ext startup
-      if (import.meta.env.SNOWPACK_PUBLIC_DEV_INIT_SCRIPT_PATH) {
-        try {
-          const localDevModule = await import(
-            import.meta.env.SNOWPACK_PUBLIC_DEV_INIT_SCRIPT_PATH
-          )
-          await localDevModule.run({request, db})
-        } catch (err) {
-          console.log('local dev error', err)
-        }
-      }
-    }
-  }
+  // if (!IS_TEST_MODE) {
+  //   if (IS_DEV_MODE) {
+  //     // ### load dev script on ext startup
+  //     if (import.meta.env.SNOWPACK_PUBLIC_DEV_INIT_SCRIPT_PATH) {
+  //       try {
+  //         const localDevModule = await import(
+  //           import.meta.env.SNOWPACK_PUBLIC_DEV_INIT_SCRIPT_PATH
+  //         )
+  //         await localDevModule.run({request, db})
+  //       } catch (err) {
+  //         console.log('local dev error', err)
+  //       }
+  //     }
+  //   }
+  // }
 })()

packages/background/src/init-db.js

@@ -36,6 +36,20 @@ import {
   ETH_MAINNET_CURRENCY_SYMBOL,
   ETH_MAINNET_CURRENCY_NAME,
   ETH_MAINNET_EXPLORER_URL,
+  ETH_GOERLI_RPC_ENDPOINT,
+  ETH_GOERLI_NAME,
+  ETH_GOERLI_CHAINID,
+  ETH_GOERLI_NETID,
+  ETH_GOERLI_CURRENCY_SYMBOL,
+  ETH_GOERLI_CURRENCY_NAME,
+  ETH_GOERLI_EXPLORER_URL,
+  ETH_SEPOLIA_RPC_ENDPOINT,
+  ETH_SEPOLIA_NAME,
+  ETH_SEPOLIA_CHAINID,
+  ETH_SEPOLIA_NETID,
+  ETH_SEPOLIA_CURRENCY_SYMBOL,
+  ETH_SEPOLIA_CURRENCY_NAME,
+  ETH_SEPOLIA_EXPLORER_URL,
   ETH_ROPSTEN_RPC_ENDPOINT,
   ETH_ROPSTEN_NAME,
   ETH_ROPSTEN_CHAINID,
@@ -50,13 +64,6 @@ import {
   ETH_RINKEBY_CURRENCY_SYMBOL,
   ETH_RINKEBY_CURRENCY_NAME,
   ETH_RINKEBY_EXPLORER_URL,
-  ETH_GOERLI_RPC_ENDPOINT,
-  ETH_GOERLI_NAME,
-  ETH_GOERLI_CHAINID,
-  ETH_GOERLI_NETID,
-  ETH_GOERLI_CURRENCY_SYMBOL,
-  ETH_GOERLI_CURRENCY_NAME,
-  ETH_GOERLI_EXPLORER_URL,
   ETH_KOVAN_RPC_ENDPOINT,
   ETH_KOVAN_NAME,
   ETH_KOVAN_CHAINID,
@@ -238,79 +245,108 @@ function initNetwork(d) {
     },
     {
       network: {
-        name: ETH_ROPSTEN_NAME,
-        endpoint: ETH_ROPSTEN_RPC_ENDPOINT,
+        name: ETH_GOERLI_NAME,
+        endpoint: ETH_GOERLI_RPC_ENDPOINT,
         type: 'eth',
-        chainId: ETH_ROPSTEN_CHAINID,
-        netId: ETH_ROPSTEN_NETID,
+        chainId: ETH_GOERLI_CHAINID,
+        netId: ETH_GOERLI_NETID,
         icon: 'https://cdn.jsdelivr.net/gh/Conflux-Chain/helios@dev/packages/built-in-network-icons/Ethereum.svg',
         cacheTime: 15000,
 
         ticker: {
-          name: ETH_ROPSTEN_CURRENCY_NAME,
-          symbol: ETH_ROPSTEN_CURRENCY_SYMBOL,
+          name: ETH_GOERLI_CURRENCY_NAME,
+          symbol: ETH_GOERLI_CURRENCY_SYMBOL,
           decimals: DEFAULT_CURRENCY_DECIMALS,
           iconUrls: [
             'https://cdn.jsdelivr.net/gh/Conflux-Chain/helios@dev/packages/built-in-network-icons/eth.svg',
           ],
         },
-        scanUrl: ETH_ROPSTEN_EXPLORER_URL,
+        scanUrl: ETH_GOERLI_EXPLORER_URL,
         hdPath: -2,
         builtin: true,
         isTestnet: true,
-        balanceChecker: '0x8d9708f3f514206486d7e988533f770a16d074a7',
+        balanceChecker: '0x9788c4e93f9002a7ad8e72633b11e8d1ecd51f9b',
         gasBuffer: 1.5,
       },
     },
     {
       network: {
-        name: ETH_RINKEBY_NAME,
-        endpoint: ETH_RINKEBY_RPC_ENDPOINT,
+        name: ETH_SEPOLIA_NAME,
+        endpoint: ETH_SEPOLIA_RPC_ENDPOINT,
         type: 'eth',
-        chainId: ETH_RINKEBY_CHAINID,
-        netId: ETH_RINKEBY_NETID,
+        chainId: ETH_SEPOLIA_CHAINID,
+        netId: ETH_SEPOLIA_NETID,
         icon: 'https://cdn.jsdelivr.net/gh/Conflux-Chain/helios@dev/packages/built-in-network-icons/Ethereum.svg',
         cacheTime: 15000,
 
         ticker: {
-          name: ETH_RINKEBY_CURRENCY_NAME,
-          symbol: ETH_RINKEBY_CURRENCY_SYMBOL,
+          name: ETH_SEPOLIA_CURRENCY_NAME,
+          symbol: ETH_SEPOLIA_CURRENCY_SYMBOL,
           decimals: DEFAULT_CURRENCY_DECIMALS,
           iconUrls: [
             'https://cdn.jsdelivr.net/gh/Conflux-Chain/helios@dev/packages/built-in-network-icons/eth.svg',
           ],
         },
-        scanUrl: ETH_RINKEBY_EXPLORER_URL,
+        scanUrl: ETH_SEPOLIA_EXPLORER_URL,
         hdPath: -2,
         builtin: true,
         isTestnet: true,
-        balanceChecker: '0x3183b673f4816c94bef53958baf93c671b7f8cf2',
+        // TODO(SEPOLIA) There is currently no balance call address for Sepolia
+        balanceChecker: '',
         gasBuffer: 1.5,
       },
     },
     {
       network: {
-        name: ETH_GOERLI_NAME,
-        endpoint: ETH_GOERLI_RPC_ENDPOINT,
+        name: ETH_ROPSTEN_NAME,
+        endpoint: ETH_ROPSTEN_RPC_ENDPOINT,
         type: 'eth',
-        chainId: ETH_GOERLI_CHAINID,
-        netId: ETH_GOERLI_NETID,
+        chainId: ETH_ROPSTEN_CHAINID,
+        netId: ETH_ROPSTEN_NETID,
         icon: 'https://cdn.jsdelivr.net/gh/Conflux-Chain/helios@dev/packages/built-in-network-icons/Ethereum.svg',
         cacheTime: 15000,
 
         ticker: {
-          name: ETH_GOERLI_CURRENCY_NAME,
-          symbol: ETH_GOERLI_CURRENCY_SYMBOL,
+          name: ETH_ROPSTEN_CURRENCY_NAME,
+          symbol: ETH_ROPSTEN_CURRENCY_SYMBOL,
           decimals: DEFAULT_CURRENCY_DECIMALS,
           iconUrls: [
             'https://cdn.jsdelivr.net/gh/Conflux-Chain/helios@dev/packages/built-in-network-icons/eth.svg',
           ],
         },
-        scanUrl: ETH_GOERLI_EXPLORER_URL,
+        scanUrl: ETH_ROPSTEN_EXPLORER_URL,
         hdPath: -2,
-        builtin: true,
+        builtin: false,
+        isCustom: true,
         isTestnet: true,
-        balanceChecker: '0x9788c4e93f9002a7ad8e72633b11e8d1ecd51f9b',
+        balanceChecker: '0x8d9708f3f514206486d7e988533f770a16d074a7',
+        gasBuffer: 1.5,
+      },
+    },
+    {
+      network: {
+        name: ETH_RINKEBY_NAME,
+        endpoint: ETH_RINKEBY_RPC_ENDPOINT,
+        type: 'eth',
+        chainId: ETH_RINKEBY_CHAINID,
+        netId: ETH_RINKEBY_NETID,
+        icon: 'https://cdn.jsdelivr.net/gh/Conflux-Chain/helios@dev/packages/built-in-network-icons/Ethereum.svg',
+        cacheTime: 15000,
+
+        ticker: {
+          name: ETH_RINKEBY_CURRENCY_NAME,
+          symbol: ETH_RINKEBY_CURRENCY_SYMBOL,
+          decimals: DEFAULT_CURRENCY_DECIMALS,
+          iconUrls: [
+            'https://cdn.jsdelivr.net/gh/Conflux-Chain/helios@dev/packages/built-in-network-icons/eth.svg',
+          ],
+        },
+        scanUrl: ETH_RINKEBY_EXPLORER_URL,
+        hdPath: -2,
+        builtin: false,
+        isCustom: true,
+        isTestnet: true,
+        balanceChecker: '0x3183b673f4816c94bef53958baf93c671b7f8cf2',
         gasBuffer: 1.5,
       },
     },
@@ -334,7 +370,8 @@ function initNetwork(d) {
         },
         scanUrl: ETH_KOVAN_EXPLORER_URL,
         hdPath: -2,
-        builtin: true,
+        builtin: false,
+        isCustom: true,
         isTestnet: true,
         balanceChecker: '0x55abba8d669d60a10c104cc493ec5ef389ec92bb',
         gasBuffer: 1.5,