From 94428e37a8d33150dc048d8c1d83c7a339c8bacc Mon Sep 17 00:00:00 2001
From: cong_wang <congwang@blocksec.com>
Date: Thu, 12 Oct 2023 16:19:13 +0800
Subject: [PATCH] fix: Fix domain issues, ABI parsing problems, and auto-fetch
 gasPrice for Simulation

---
 CHANGELOG.md                                  |  6 ++++++
 manifest.config.ts                            |  2 +-
 package.json                                  |  2 +-
 .../components/DrawerSimulation/index.tsx     | 19 ++++++++++++++++---
 src/common/config/allowlist.ts                |  3 +++
 src/common/constants/support.ts               |  8 ++++----
 .../feat-scripts/transaction-simulator.tsx    |  3 +++
 .../feat-scripts/transaction-simulator.tsx    |  3 +++
 8 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6d6f981..eece704 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+### v4.0.1
+
+- [fix] Resolve domain matching issues
+- [fix] Fix issue with ABI parameter parsing affecting Simulation functionality
+- [feat] Auto-fetch gasPrice for Simulation
+
 ### v4.0.0
 
 - [feat] Add support for multiple new chains including Base, Linea, Polygon zkEVM
diff --git a/manifest.config.ts b/manifest.config.ts
index c4be8c0..575f6c5 100644
--- a/manifest.config.ts
+++ b/manifest.config.ts
@@ -24,7 +24,7 @@ export default defineManifest((env: ConfigEnv) => {
         matches: isDev
           ? [
               '*://*.etherscan.io/*',
-              '*://cn.etherscan.com/*',
+              '*://*.etherscan.com/*',
               '*://*.bscscan.com/*',
               '*://*.polygonscan.com/*',
               '*://*.snowtrace.io/*',
diff --git a/package.json b/package.json
index 47c9625..f97bb4c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "metadock",
-  "version": "4.0.0",
+  "version": "4.0.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/blocksecteam/metadock.git"
diff --git a/src/common/components/DrawerSimulation/index.tsx b/src/common/components/DrawerSimulation/index.tsx
index 0393f49..3b082ee 100644
--- a/src/common/components/DrawerSimulation/index.tsx
+++ b/src/common/components/DrawerSimulation/index.tsx
@@ -54,6 +54,7 @@ interface Props {
   receiver: string
   isProxy: boolean
   signature?: string
+  gasPrice: string
   readableInputs?: ReadableInputData[]
 }
 
@@ -62,6 +63,7 @@ const DrawerSimulation: FC<Props> = ({
   receiver,
   sender,
   isProxy,
+  gasPrice,
   readableInputs = [],
   signature
 }) => {
@@ -91,6 +93,10 @@ const DrawerSimulation: FC<Props> = ({
       }
     })
 
+  const estimatedGas = Number.isNaN(gasPrice)
+    ? '100'
+    : Math.ceil(Number(gasPrice) * (1 + 0.2)).toString()
+
   const handleOk = debounce(() => {
     form.validateFields().then(values => {
       const params: SimulateTxParams = {
@@ -100,7 +106,7 @@ const DrawerSimulation: FC<Props> = ({
         inputData: values.inputData,
         value: values.value || '0',
         gasLimit: Number(values.gasLimit) || 1000000,
-        gasPrice: values.gasPrice || '100',
+        gasPrice: values.gasPrice || estimatedGas,
         receiver: values.receiver || ''
       }
       if (!values.isPrerun) {
@@ -207,8 +213,15 @@ const DrawerSimulation: FC<Props> = ({
           form.setFieldValue('useABI', true)
           form.setFieldValue('function', functionValue)
           const parameters: Record<string, any> = {}
+
+          const funcName = signature.replace(/\([^)]*\)/g, '')
+
           readableInputs.forEach(item => {
-            parameters[`${functionValue}_${item.argumentName}`] = item.value
+            if (funcName === item.argumentName) {
+              form.setFieldValue('value', item.value)
+            } else {
+              parameters[`${functionValue}_${item.argumentName}`] = item.value
+            }
           })
           form.setFieldValue('parameters', parameters)
         }
@@ -762,7 +775,7 @@ const DrawerSimulation: FC<Props> = ({
               return value.replace(/[^\d{1,}\\.\d{1,}|\d{1,}]/g, '')
             }}
           >
-            <Input suffix="Gwei" placeholder="Default is 100" />
+            <Input suffix="Gwei" placeholder={`Default is ${estimatedGas}`} />
           </Form.Item>
         </Form>
         <Button
diff --git a/src/common/config/allowlist.ts b/src/common/config/allowlist.ts
index 84f6cbc..b87d68b 100644
--- a/src/common/config/allowlist.ts
+++ b/src/common/config/allowlist.ts
@@ -19,11 +19,14 @@ export default {
   ],
   ETHERSCAN_V2_MATCHES: [
     '*://cn.etherscan.com/*',
+    '*://goto.etherscan.com/*',
     '*://sepolia.etherscan.io/*',
     '*://goerli.etherscan.io/*',
     '*://cn.etherscan.com/*',
     '*://etherscan.io/*',
     '*://bscscan.com/*',
+    '*://goto.bscscan.com/*',
+    '*://www.bscscan.com/*',
     '*://testnet.bscscan.com/*'
   ],
   BTC_EXPLORER_MATCHES: ['*://explorer.btc.com/*'],
diff --git a/src/common/constants/support.ts b/src/common/constants/support.ts
index 5b9df0a..b4bd620 100644
--- a/src/common/constants/support.ts
+++ b/src/common/constants/support.ts
@@ -17,7 +17,7 @@ export interface ExtSupportWebsite {
 export const EXT_SUPPORT_WEB_LIST: ExtSupportWebsite[] = [
   {
     name: 'BTC',
-    domains: ['btc.com', 'explorer.btc.com'],
+    domains: ['explorer.btc.com'],
     href: 'https://explorer.btc.com/btc',
     chain: 'btc',
     siteName: 'SCAN',
@@ -25,7 +25,7 @@ export const EXT_SUPPORT_WEB_LIST: ExtSupportWebsite[] = [
   },
   {
     name: 'ETH',
-    domains: ['etherscan.io', 'cn.etherscan.com'],
+    domains: ['etherscan.io', 'cn.etherscan.com', 'goto.etherscan.com'],
     chainID: 1,
     chain: 'eth',
     siteName: 'SCAN',
@@ -52,7 +52,7 @@ export const EXT_SUPPORT_WEB_LIST: ExtSupportWebsite[] = [
   {
     name: 'BSC',
     chainID: 56,
-    domains: ['bscscan.com', 'www.bscscan.com'],
+    domains: ['bscscan.com', 'www.bscscan.com', 'goto.bscscan.com'],
     chain: 'bsc',
     siteName: 'SCAN',
     logo: 'https://assets.blocksec.com/image/1671685360787-4.png',
@@ -309,7 +309,7 @@ export const EXT_SUPPORT_WEB_LIST: ExtSupportWebsite[] = [
     name: 'WEMIX',
     chainID: 1111,
     chain: 'wemix',
-    domains: ['wemixscan.com'],
+    domains: ['wemixscan.com', 'www.wemixscan.com'],
     siteName: 'SCAN',
     logo: 'https://assets.blocksec.com/image/1695197286815-6.png',
     testNets: [
diff --git a/src/content/etherscan/feat-scripts/transaction-simulator.tsx b/src/content/etherscan/feat-scripts/transaction-simulator.tsx
index 9cf26ba..be790d2 100644
--- a/src/content/etherscan/feat-scripts/transaction-simulator.tsx
+++ b/src/content/etherscan/feat-scripts/transaction-simulator.tsx
@@ -120,12 +120,15 @@ const renderDrawer = ({
   const func = $(`#${id}`).contents().find('#connectStatus').attr('onclick')
   const sender = func ? pickAddress(func) : undefined
 
+  const gasPrice = $('#spanGasTooltip .gasPricePlaceHolder').text().trim()
+
   const readableInputs = setupInputData(container)
 
   const rootEl = $('<div></div>')
   createRoot(rootEl[0]).render(
     <DrawerSimulation
       chain={chain}
+      gasPrice={gasPrice}
       receiver={address}
       sender={sender}
       isProxy={isProxy}
diff --git a/src/content/scans/feat-scripts/transaction-simulator.tsx b/src/content/scans/feat-scripts/transaction-simulator.tsx
index 3a3c32e..d4186c3 100644
--- a/src/content/scans/feat-scripts/transaction-simulator.tsx
+++ b/src/content/scans/feat-scripts/transaction-simulator.tsx
@@ -121,12 +121,15 @@ const renderDrawer = ({
   const text = connectStatus.attr('onclick') || connectStatus.text()
   const sender = text ? pickAddress(text) : undefined
 
+  const gasPrice = $('#spanGasTooltip .gasPricePlaceHolder').text().trim()
+
   const readableInputs = setupInputData(container)
 
   const rootEl = $('<div></div>')
   createRoot(rootEl[0]).render(
     <DrawerSimulation
       chain={chain}
+      gasPrice={gasPrice}
       receiver={address}
       sender={sender}
       isProxy={isProxy}