fix: remove reliance on transaction decode in confirmations (#29341)

MetaMask · Dec 20, 2024 · 52fc5fc · 52fc5fc
1 parent a2f4ee5
commit 52fc5fc
Show file tree

Hide file tree

Showing 52 changed files with 1,542 additions and 671 deletions.
diff --git a/app/_locales/de/messages.json b/app/_locales/de/messages.json
diff --git a/app/_locales/el/messages.json b/app/_locales/el/messages.json
diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
diff --git a/app/_locales/es/messages.json b/app/_locales/es/messages.json
diff --git a/app/_locales/fr/messages.json b/app/_locales/fr/messages.json
diff --git a/app/_locales/hi/messages.json b/app/_locales/hi/messages.json
diff --git a/app/_locales/id/messages.json b/app/_locales/id/messages.json
diff --git a/app/_locales/ja/messages.json b/app/_locales/ja/messages.json
diff --git a/app/_locales/ko/messages.json b/app/_locales/ko/messages.json
diff --git a/app/_locales/pt/messages.json b/app/_locales/pt/messages.json
diff --git a/app/_locales/ru/messages.json b/app/_locales/ru/messages.json
diff --git a/app/_locales/tl/messages.json b/app/_locales/tl/messages.json
diff --git a/app/_locales/tr/messages.json b/app/_locales/tr/messages.json
diff --git a/app/_locales/vi/messages.json b/app/_locales/vi/messages.json
diff --git a/app/_locales/zh_CN/messages.json b/app/_locales/zh_CN/messages.json
diff --git a/test/data/confirmations/set-approval-for-all.ts b/test/data/confirmations/set-approval-for-all.ts
@@ -6,6 +6,9 @@ import {
   genUnapprovedContractInteractionConfirmation,
 } from './contract-interaction';
 
+export const INCREASE_ALLOWANCE_TRANSACTION_DATA =
+  '0x395093510000000000000000000000002e0d7e8c45221fca00d74a3609a0f7097035d09b0000000000000000000000000000000000000000000000000000000000000123';
+
 export const genUnapprovedSetApprovalForAllConfirmation = ({
   address = CONTRACT_INTERACTION_SENDER_ADDRESS,
   chainId = CHAIN_ID,
@@ -16,7 +19,7 @@ export const genUnapprovedSetApprovalForAllConfirmation = ({
   ...genUnapprovedContractInteractionConfirmation({ chainId }),
   txParams: {
     from: address,
-    data: '0x095ea7b30000000000000000000000002e0d7e8c45221fca00d74a3609a0f7097035d09b0000000000000000000000000000000000000000000000000000000000000001',
+    data: '0xa22cb4650000000000000000000000002e0d7e8c45221fca00d74a3609a0f7097035d09b0000000000000000000000000000000000000000000000000000000000000001',
     gas: '0x16a92',
     to: '0x076146c765189d51be3160a2140cf80bfc73ad68',
     value: '0x0',

diff --git a/test/data/confirmations/token-approve.ts b/test/data/confirmations/token-approve.ts
@@ -9,14 +9,16 @@ import {
 export const genUnapprovedApproveConfirmation = ({
   address = CONTRACT_INTERACTION_SENDER_ADDRESS,
   chainId = CHAIN_ID,
+  amountHex = '0000000000000000000000000000000000000000000000000000000000000001',
 }: {
   address?: Hex;
   chainId?: string;
+  amountHex?: string;
 } = {}) => ({
   ...genUnapprovedContractInteractionConfirmation({ chainId }),
   txParams: {
     from: address,
-    data: '0x095ea7b30000000000000000000000002e0d7e8c45221fca00d74a3609a0f7097035d09b0000000000000000000000000000000000000000000000000000000000000001',
+    data: `0x095ea7b30000000000000000000000002e0d7e8c45221fca00d74a3609a0f7097035d09b${amountHex}`,
     gas: '0x16a92',
     to: '0x076146c765189d51be3160a2140cf80bfc73ad68',
     value: '0x0',

diff --git a/test/data/confirmations/token-transfer.ts b/test/data/confirmations/token-transfer.ts
@@ -6,19 +6,24 @@ import {
   genUnapprovedContractInteractionConfirmation,
 } from './contract-interaction';
 
+export const TRANSFER_FROM_TRANSACTION_DATA =
+  '0x23b872dd0000000000000000000000002e0D7E8c45221FcA00d74a3609A0f7097035d09B0000000000000000000000002e0D7E8c45221FcA00d74a3609A0f7097035d09C0000000000000000000000000000000000000000000000000000000000000123';
+
 export const genUnapprovedTokenTransferConfirmation = ({
   address = CONTRACT_INTERACTION_SENDER_ADDRESS,
   chainId = CHAIN_ID,
   isWalletInitiatedConfirmation = false,
+  amountHex = '0000000000000000000000000000000000000000000000000000000000000001',
 }: {
   address?: Hex;
   chainId?: string;
   isWalletInitiatedConfirmation?: boolean;
+  amountHex?: string;
 } = {}) => ({
   ...genUnapprovedContractInteractionConfirmation({ chainId }),
   txParams: {
     from: address,
-    data: '0x095ea7b30000000000000000000000002e0d7e8c45221fca00d74a3609a0f7097035d09b0000000000000000000000000000000000000000000000000000000000000001',
+    data: `0xa9059cbb0000000000000000000000002e0d7e8c45221fca00d74a3609a0f7097035d09b${amountHex}`,
     gas: '0x16a92',
     to: '0x076146c765189d51be3160a2140cf80bfc73ad68',
     value: '0x0',

diff --git a/test/integration/confirmations/transactions/increase-allowance.test.tsx b/test/integration/confirmations/transactions/increase-allowance.test.tsx
@@ -198,7 +198,7 @@ describe('ERC20 increaseAllowance Confirmation', () => {
       'simulation-token-value',
     );
     expect(simulationSection).toContainElement(spendingCapValue);
-    expect(spendingCapValue).toHaveTextContent('1');
+    expect(spendingCapValue).toHaveTextContent('3');
     expect(simulationSection).toHaveTextContent('0x07614...3ad68');
   });
 
@@ -225,7 +225,7 @@ describe('ERC20 increaseAllowance Confirmation', () => {
 
     expect(approveDetails).toContainElement(approveDetailsSpender);
     expect(approveDetailsSpender).toHaveTextContent(tEn('spender') as string);
-    expect(approveDetailsSpender).toHaveTextContent('0x2e0D7...5d09B');
+    expect(approveDetailsSpender).toHaveTextContent('0x9bc5b...AfEF4');
     const spenderTooltip = await screen.findByTestId(
       'confirmation__approve-spender-tooltip',
     );
@@ -286,7 +286,7 @@ describe('ERC20 increaseAllowance Confirmation', () => {
     );
     expect(spendingCapSection).toContainElement(spendingCapGroup);
     expect(spendingCapGroup).toHaveTextContent(tEn('spendingCap') as string);
-    expect(spendingCapGroup).toHaveTextContent('1');
+    expect(spendingCapGroup).toHaveTextContent('3');
 
     const spendingCapGroupTooltip = await screen.findByTestId(
       'confirmation__approve-spending-cap-group-tooltip',

diff --git a/test/integration/confirmations/transactions/set-approval-for-all.test.tsx b/test/integration/confirmations/transactions/set-approval-for-all.test.tsx
@@ -231,7 +231,7 @@ describe('ERC721 setApprovalForAll Confirmation', () => {
     expect(approveDetailsSpender).toHaveTextContent(
       tEn('permissionFor') as string,
     );
-    expect(approveDetailsSpender).toHaveTextContent('0x2e0D7...5d09B');
+    expect(approveDetailsSpender).toHaveTextContent('0x9bc5b...AfEF4');
     const spenderTooltip = await screen.findByTestId(
       'confirmation__approve-spender-tooltip',
     );

diff --git a/ui/helpers/constants/settings.js b/ui/helpers/constants/settings.js
@@ -212,7 +212,7 @@ const SETTINGS_CONSTANTS = [
   {
     tabMessage: (t) => t('securityAndPrivacy'),
     sectionMessage: (t) => t('use4ByteResolution'),
-    descriptionMessage: (t) => t('use4ByteResolutionDescription'),
+    descriptionMessage: (t) => t('toggleDecodeDescription'),
     route: `${SECURITY_ROUTE}#decode-smart-contracts`,
     icon: 'fa fa-lock',
   },