fix: uniswap v3 on arbitrum (DimensionDev#4372)

dmrazzy · Sep 16, 2021 · f5a5fa9 · f5a5fa9
1 parent fc824ee
commit f5a5fa9
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/packages/maskbook/src/extension/background-script/EthereumServices/send.ts b/packages/maskbook/src/extension/background-script/EthereumServices/send.ts
@@ -94,7 +94,10 @@ async function handleNonce(account: string, error: Error | null, response: JsonR
     const error_ = (error ?? response?.error) as { message: string } | undefined
     const message = error_?.message ?? ''
     if (!EthereumAddress.isValid(account)) return
-    if (/\bnonce\b/im.test(message) && /\b(low|high)\b/im.test(message)) resetNonce(account)
+    // nonce too low
+    // nonce too high
+    // transaction too old
+    if (/\bnonce|transaction\b/im.test(message) && /\b(low|high|old)\b/im.test(message)) resetNonce(account)
     else commitNonce(account)
 }
 

diff --git a/packages/maskbook/src/plugins/Trader/trader/uniswap/useTradeCallback.ts b/packages/maskbook/src/plugins/Trader/trader/uniswap/useTradeCallback.ts
@@ -56,7 +56,9 @@ export function useTradeCallback(trade: TradeComputed<Trade> | null, allowedSlip
                     from: account,
                     to: address,
                     data: calldata,
-                    ...(!value || /^0x0*$/.test(value) ? {} : { value }),
+                    ...(!value || /^0x0*$/.test(value)
+                        ? {}
+                        : { value: `0x${Number.parseInt(value, 16).toString(16)}` }),
                 }
 
                 return Services.Ethereum.estimateGas(config)

diff --git a/packages/web3-constants/data/token.json b/packages/web3-constants/data/token.json
@@ -37,7 +37,7 @@
         "BSCT": "",
         "Matic": "0xc2132D05D31c914a87C6611C10748AEb04B58e8F",
         "Mumbai": "",
-        "Arbitrum": "",
+        "Arbitrum": "0xFd086bC7CD5C481DCC9C85ebE478A1C0b69FCbb9",
         "Arbitrum_Rinkeby": "",
         "xDai": "0x4ECaBa5870353805a9F068101A40E0f32ed605C6"
     },

diff --git a/packages/web3-shared/src/assets/chains.json b/packages/web3-shared/src/assets/chains.json
@@ -237,7 +237,7 @@
         "explorers": [
             {
                 "name": "arbitrum",
-                "url": "https://explorer.arbitrum.io",
+                "url": "https://arbiscan.io",
                 "standard": "EIP3091"
             }
         ],