fix: tx params prefix 0x (RabbyHub#1919)

* fix: tx params prefix 0x * fix: personal_sign message prefix 0x
Gakunt · Dec 15, 2023 · b6705aa · b6705aa
1 parent 5ff2212
commit b6705aa
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/src/background/controller/provider/rpcFlow.ts b/src/background/controller/provider/rpcFlow.ts
@@ -12,6 +12,7 @@ import { resemblesETHAddress } from '@/utils';
 import { ProviderRequest } from './type';
 import * as Sentry from '@sentry/browser';
 import stats from '@/stats';
+import { addHexPrefix, stripHexPrefix } from 'ethereumjs-util';
 
 const isSignApproval = (type: string) => {
   const SIGN_APPROVALS = ['SignText', 'SignTypedData', 'SignTx'];
@@ -174,6 +175,11 @@ const flowContext = flow
         from = second;
         message = first;
       }
+      const hexReg = /^[0-9A-Fa-f]+$/gu;
+      const stripped = stripHexPrefix(message);
+      if (stripped.match(hexReg)) {
+        message = addHexPrefix(stripped);
+      }
       ctx.request.data.params[0] = message;
       ctx.request.data.params[1] = from;
     }

diff --git a/src/ui/views/Approval/components/SignTx.tsx b/src/ui/views/Approval/components/SignTx.tsx
@@ -99,6 +99,7 @@ const normalizeHex = (value: string | number) => {
 
 const normalizeTxParams = (tx) => {
   const copy = tx;
+  console.log('copy', tx);
   try {
     if ('nonce' in copy && isStringOrNumber(copy.nonce)) {
       copy.nonce = normalizeHex(copy.nonce);
@@ -112,6 +113,15 @@ const normalizeTxParams = (tx) => {
     if ('gasPrice' in copy && isStringOrNumber(copy.gasPrice)) {
       copy.gasPrice = normalizeHex(copy.gasPrice);
     }
+    if ('maxFeePerGas' in copy && isStringOrNumber(copy.maxFeePerGas)) {
+      copy.maxFeePerGas = normalizeHex(copy.maxFeePerGas);
+    }
+    if (
+      'maxPriorityFeePerGas' in copy &&
+      isStringOrNumber(copy.maxPriorityFeePerGas)
+    ) {
+      copy.maxPriorityFeePerGas = normalizeHex(copy.maxPriorityFeePerGas);
+    }
     if ('value' in copy) {
       if (!isStringOrNumber(copy.value)) {
         copy.value = '0x0';