Merge branch 'x' into fix/native-check-btn

OneKeyHQ · Dec 26, 2024 · 520ca52 · 520ca52
2 parents 21439c7 + 3aac6c4
commit 520ca52
Show file tree

Hide file tree

Showing 7 changed files with 662 additions and 5 deletions.
diff --git a/packages/kit-bg/src/services/ServiceSend.ts b/packages/kit-bg/src/services/ServiceSend.ts
@@ -158,6 +158,19 @@ class ServiceSend extends ServiceBase {
         ...params,
         customRpcInfo,
       });
+
+      try {
+        const verified = await vault.verifyTxId({
+          txid: result.txid,
+          signedTx: result,
+        });
+        if (!verified) {
+          throw new Error('Invalid txid');
+        }
+      } catch (error) {
+        throw new Error('Invalid txid');
+      }
+
       txid = result.txid;
     }
 

diff --git a/packages/kit-bg/src/vaults/base/VaultBase.ts b/packages/kit-bg/src/vaults/base/VaultBase.ts
@@ -1419,4 +1419,11 @@ export abstract class VaultBase extends VaultBaseChainOnly {
   ): Promise<IEncodedTx> {
     throw new NotImplemented();
   }
+
+  async verifyTxId(params: {
+    txid: string;
+    signedTx: ISignedTxPro;
+  }): Promise<boolean> {
+    return Promise.resolve(true);
+  }
 }
diff --git a/packages/kit-bg/src/vaults/impls/evm/Vault.ts b/packages/kit-bg/src/vaults/impls/evm/Vault.ts
@@ -1232,13 +1232,29 @@ export default class Vault extends VaultBase {
     }
     const client = new ClientEvm(rpcUrl);
     const txid = await client.broadcastTransaction(signedTx.rawTx);
+
     return {
       ...signedTx,
       txid,
       encodedTx: signedTx.encodedTx,
     };
   }
 
+  override async verifyTxId(params: {
+    txid: string;
+    signedTx: ISignedTxPro;
+  }): Promise<boolean> {
+    const { signedTx, txid } = params;
+
+    if (typeof txid !== 'string') {
+      return false;
+    }
+
+    const recoveredTxid = ethers.utils.keccak256(signedTx.rawTx);
+
+    return recoveredTxid.toLowerCase() === txid.toLowerCase();
+  }
+
   // RPC Client
   async getRpcClient() {
     const rpcInfo =