fix tx unit error in bsc&heco

consenlabs · Apr 2, 2021 · efdf53b · efdf53b
1 parent 297c7de
commit efdf53b
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 31 deletions.
diff --git a/src/api/ethereumdapp_imkey_web3.js b/src/api/ethereumdapp_imkey_web3.js
@@ -10,32 +10,23 @@ const MAINNET_CHAIN_ID = 1
 
 contextBridge.exposeInMainWorld('imKeyManager', {
   accounts: () => {
-    const res = ipcRenderer.sendSync('message-from-get-address')
-    const allAccounts = res.result
-    const ethAccounts = allAccounts
-      .filter((x) => x.chain === 'Ethereum')
-      .map((x) => x.address)
-    const ethchainId = allAccounts
-      .filter((x) => x.chain === 'Ethereum')
-      .map((x) => x.chainId)
-    const ethrpcUrl = allAccounts
-      .filter((x) => x.chain === 'Ethereum')
-      .map((x) => x.rpcUrl)
+    let account = allAccounts.find((x) => x.chain === 'Ethereum')
     return {
-      accounts: ethAccounts,
-      chainId: ethchainId[0],
-      rpcUrl: ethrpcUrl[0],
+      accounts: [account.address],
+      chainId: account.chainId,
+      rpcUrl: account.rpcUrl,
       headers: {
         agent: 'ios:2.4.2:2'
-      }
+      },
+      symbol: account.symbol
     }
   },
   callNativeApi: async (data) => {
     const ret = ipcRenderer.sendSync('showMessageBoxSync', JSON.stringify(data))
     if (ret === 0) {
       return await ipcRenderer.sendSync('message-from-get-api', data)
     } else {
-
+      
     }
   }
 })

diff --git a/src/api/imkey_web3_provider.js b/src/api/imkey_web3_provider.js
diff --git a/src/main/index.js b/src/main/index.js
@@ -784,6 +784,7 @@ function renderDeviceManagerHandler () {
       if (WalletAddress.result[i].chain === 'Ethereum') {
         WalletAddress.result[i].chainId = args.chainId
         WalletAddress.result[i].rpcUrl = args.rpcUrl
+        WalletAddress.result[i].symbol = args.symbol
       }
     }
     event.returnValue = WalletAddress

diff --git a/src/renderer/store/dapps.js b/src/renderer/store/dapps.js
@@ -276,18 +276,22 @@ export const DAPPS_Polkadot = [
 export const DAPPS_Config = {
   ETH: {
     chainId: 1,
-    rpcUrl: 'https://mainnet-eth.token.im'
+    rpcUrl: 'https://mainnet-eth.token.im',
+    symbol: 'ETH'
   },
   BSC: {
     chainId: 56,
-    rpcUrl: 'https://bsc-dataseed1.ninicoin.io'
+    rpcUrl: 'https://bsc-dataseed1.ninicoin.io',
+    symbol: 'BNB'
   },
   HECO: {
     chainId: 128,
-    rpcUrl: 'https://http-mainnet.Hecochain.com'
+    rpcUrl: 'https://http-mainnet.Hecochain.com',
+    symbol: 'HT'
   },
   Polkadot: {
     chainId: '',
-    rpcUrl: ''
+    rpcUrl: '',
+    symbol: ''
   }
 }
diff --git a/src/worker/worker.js b/src/worker/worker.js
@@ -207,29 +207,29 @@ ipcRenderer.on('message-from-main', (event, arg) => {
               path: "m/44'/60'/0'/0/0"
             })
             if (!response.isSuccess) {
-              coinAddressArray.push({ chain: 'Ethereum', address: '', chainId: 1, rpcUrl: 'https://mainnet-eth.token.im' })
+              coinAddressArray.push({ chain: 'Ethereum', address: '', chainId: 1, rpcUrl: 'https://mainnet-eth.token.im', symbol:'ETH'})
             } else {
-              coinAddressArray.push({ chain: 'Ethereum', address: response.result.address, chainId: 1, rpcUrl: 'https://mainnet-eth.token.im' })
+              coinAddressArray.push({ chain: 'Ethereum', address: response.result.address, chainId: 1, rpcUrl: 'https://mainnet-eth.token.im', symbol:'ETH' })
             }
           }
           if (coinNameArr[i] === 'Polkadot') {
             response = walletApi.getDOTAddress({
               path: "m/44'/354'/0'/0'/0'"
             })
             if (!response.isSuccess) {
-              coinAddressArray.push({ chain: 'Polkadot', address: '', chainId: 'Polkadot', rpcUrl: '' })
+              coinAddressArray.push({ chain: 'Polkadot', address: '', chainId: 'Polkadot', rpcUrl: '', symbol:'' })
             } else {
-              coinAddressArray.push({ chain: 'Polkadot', address: response.result.address, chainId: 'Polkadot', rpcUrl: '' })
+              coinAddressArray.push({ chain: 'Polkadot', address: response.result.address, chainId: 'Polkadot', rpcUrl: '', symbol:''})
             }
           }
           if (coinNameArr[i] === 'Kusama') {
             response = walletApi.getKSMAddress({
               path: "m/44'/434'/0'/0'/0'"
             })
             if (!response.isSuccess) {
-              coinAddressArray.push({ chain: 'Kusama', address: '', chainId: 'Kusama', rpcUrl: '' })
+              coinAddressArray.push({ chain: 'Kusama', address: '', chainId: 'Kusama', rpcUrl: '', symbol:'' })
             } else {
-              coinAddressArray.push({ chain: 'Kusama', address: response.result.address, chainId: 'Kusama', rpcUrl: '' })
+              coinAddressArray.push({ chain: 'Kusama', address: response.result.address, chainId: 'Kusama', rpcUrl: '', symbol:'' })
             }
           }
         }