diff --git a/app/util/transactions/__snapshots__/delegation.test.ts.snap b/app/util/transactions/__snapshots__/delegation.test.ts.snap index c9beff25db67..18bca59e1b40 100644 --- a/app/util/transactions/__snapshots__/delegation.test.ts.snap +++ b/app/util/transactions/__snapshots__/delegation.test.ts.snap @@ -1,6 +1,6 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Transaction Delegation Utils returns delegation data 1`] = ` +exports[`Transaction Delegation Utils getDelegationTransaction returns delegation data 1`] = ` { "authorizationList": [ { diff --git a/app/util/transactions/delegation.test.ts b/app/util/transactions/delegation.test.ts index a211a53136fb..e021e77b4c13 100644 --- a/app/util/transactions/delegation.test.ts +++ b/app/util/transactions/delegation.test.ts @@ -73,7 +73,7 @@ describe('Transaction Delegation Utils', () => { mockIsAtomicBatchSupported.mockResolvedValue([ { chainId: TRANSACTION_META_MOCK.chainId, - isSupported: true, + isSupported: false, upgradeContractAddress: UPGRADE_CONTRACT_ADDRESS_MOCK, }, ]); @@ -84,21 +84,92 @@ describe('Transaction Delegation Utils', () => { }); }); - it('returns delegation data', async () => { - const result = await getDelegationTransaction( - messengerMock, - TRANSACTION_META_MOCK, - ); + describe('getDelegationTransaction', () => { + it('returns delegation data', async () => { + const result = await getDelegationTransaction( + messengerMock, + TRANSACTION_META_MOCK, + ); - expect(result).toMatchSnapshot(); - }); + expect(result).toMatchSnapshot(); + }); + + it('does not include authorization if already upgraded', async () => { + mockIsAtomicBatchSupported.mockResolvedValue([ + { + chainId: TRANSACTION_META_MOCK.chainId, + delegationAddress: UPGRADE_CONTRACT_ADDRESS_MOCK, + isSupported: true, + upgradeContractAddress: UPGRADE_CONTRACT_ADDRESS_MOCK, + }, + ]); + + const result = await getDelegationTransaction(messengerMock, { + ...TRANSACTION_META_MOCK, + delegationAddress: UPGRADE_CONTRACT_ADDRESS_MOCK, + }); + + expect(result.authorizationList).toBeUndefined(); + }); + + it('includes authorization if upgraded to different contract', async () => { + mockIsAtomicBatchSupported.mockResolvedValue([ + { + chainId: TRANSACTION_META_MOCK.chainId, + delegationAddress: UPGRADE_CONTRACT_ADDRESS_MOCK, + isSupported: false, + upgradeContractAddress: '0x789' as Hex, + }, + ]); + + const result = await getDelegationTransaction(messengerMock, { + ...TRANSACTION_META_MOCK, + delegationAddress: UPGRADE_CONTRACT_ADDRESS_MOCK, + }); + + expect(result.authorizationList).toHaveLength(1); + }); + + it('calls DelegationController to sign delegation', async () => { + await getDelegationTransaction(messengerMock, TRANSACTION_META_MOCK); - it('does not include authorization if already upgraded', async () => { - const result = await getDelegationTransaction(messengerMock, { - ...TRANSACTION_META_MOCK, - delegationAddress: UPGRADE_CONTRACT_ADDRESS_MOCK, + expect(signDelegationMock).toHaveBeenCalledWith({ + chainId: TRANSACTION_META_MOCK.chainId, + delegation: expect.any(Object), + }); + }); + + it('calls KeyringController to sign authorization', async () => { + await getDelegationTransaction(messengerMock, TRANSACTION_META_MOCK); + + expect(sign7702Mock).toHaveBeenCalledWith({ + chainId: 1, + contractAddress: UPGRADE_CONTRACT_ADDRESS_MOCK, + from: TRANSACTION_META_MOCK.txParams.from, + nonce: NONCE_MOCK, + }); }); - expect(result.authorizationList).toBeUndefined(); + it('throws if chain does not support EIP-7702', async () => { + mockIsAtomicBatchSupported.mockResolvedValue([]); + + await expect( + getDelegationTransaction(messengerMock, TRANSACTION_META_MOCK), + ).rejects.toThrow('Chain does not support EIP-7702'); + }); + + it('throws if upgrade contract address is not found', async () => { + mockIsAtomicBatchSupported.mockResolvedValue([ + { + chainId: TRANSACTION_META_MOCK.chainId, + isSupported: false, + upgradeContractAddress: undefined, + }, + ]); + + await expect( + getDelegationTransaction(messengerMock, TRANSACTION_META_MOCK), + ).rejects.toThrow('Upgrade contract address not found'); + }); }); }); diff --git a/app/util/transactions/delegation.ts b/app/util/transactions/delegation.ts index 259f04e03665..47b8388c0c39 100644 --- a/app/util/transactions/delegation.ts +++ b/app/util/transactions/delegation.ts @@ -95,27 +95,39 @@ async function buildAuthorizationList( messenger: MessengerType, ): Promise { const { TransactionController } = Engine.context; - - const { chainId, delegationAddress, networkClientId, txParams } = - transactionMeta; - + const { chainId, networkClientId, txParams } = transactionMeta; const { from } = txParams; - if (delegationAddress) { - log('Skipping authorization list as already upgraded'); - return undefined; - } - - log('Including authorization as not upgraded'); - const atomicBatchResult = await TransactionController.isAtomicBatchSupported({ address: from as Hex, chainIds: [chainId], }); - const upgradeContractAddress = atomicBatchResult.find( + const chainResult = atomicBatchResult.find( (r) => r.chainId.toLowerCase() === chainId.toLowerCase(), - )?.upgradeContractAddress; + ); + + if (!chainResult) { + throw new Error('Chain does not support EIP-7702'); + } + + const { delegationAddress, isSupported, upgradeContractAddress } = + chainResult; + + if (isSupported) { + log('Skipping authorization as already upgraded'); + return undefined; + } + + if (!delegationAddress) { + log('Upgrading account to EIP-7702', { from, upgradeContractAddress }); + } else { + log('Overwriting authorization as already upgraded', { + from, + current: delegationAddress, + new: upgradeContractAddress, + }); + } if (!upgradeContractAddress) { throw new Error('Upgrade contract address not found'); diff --git a/package.json b/package.json index 0dac89feeee0..82d5938ef8d9 100644 --- a/package.json +++ b/package.json @@ -175,7 +175,7 @@ "@scure/bip32": "1.7.0", "@metamask/snaps-sdk": "^10.0.0", "react-native@0.76.9": "patch:react-native@npm%3A0.76.9#./.yarn/patches/react-native-npm-0.76.9-1c25352097.patch", - "@metamask/transaction-controller@npm:^62.3.1": "patch:@metamask/transaction-controller@npm%3A62.3.1#~/.yarn/patches/@metamask-transaction-controller-npm-61.0.0-cccac388c7.patch" + "@metamask/transaction-controller@npm:^62.4.0": "patch:@metamask/transaction-controller@npm%3A62.4.0#~/.yarn/patches/@metamask-transaction-controller-npm-61.0.0-cccac388c7.patch" }, "dependencies": { "@config-plugins/detox": "^9.0.0", @@ -285,8 +285,8 @@ "@metamask/swappable-obj-proxy": "^2.1.0", "@metamask/swaps-controller": "^15.0.0", "@metamask/token-search-discovery-controller": "^4.0.0", - "@metamask/transaction-controller": "patch:@metamask/transaction-controller@npm%3A62.3.1#~/.yarn/patches/@metamask-transaction-controller-npm-61.0.0-cccac388c7.patch", - "@metamask/transaction-pay-controller": "^10.2.0", + "@metamask/transaction-controller": "patch:@metamask/transaction-controller@npm%3A62.4.0#~/.yarn/patches/@metamask-transaction-controller-npm-61.0.0-cccac388c7.patch", + "@metamask/transaction-pay-controller": "^10.3.0", "@metamask/tron-wallet-snap": "^1.13.0", "@metamask/utils": "^11.8.1", "@ngraveio/bc-ur": "^1.1.6", diff --git a/yarn.lock b/yarn.lock index 0fd4f514adb3..b5812fe1f629 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8556,6 +8556,34 @@ __metadata: languageName: node linkType: hard +"@metamask/network-controller@npm:^27.0.0": + version: 27.0.0 + resolution: "@metamask/network-controller@npm:27.0.0" + dependencies: + "@metamask/base-controller": "npm:^9.0.0" + "@metamask/controller-utils": "npm:^11.16.0" + "@metamask/error-reporting-service": "npm:^3.0.0" + "@metamask/eth-block-tracker": "npm:^15.0.0" + "@metamask/eth-json-rpc-infura": "npm:^10.3.0" + "@metamask/eth-json-rpc-middleware": "npm:^22.0.0" + "@metamask/eth-json-rpc-provider": "npm:^6.0.0" + "@metamask/eth-query": "npm:^4.0.0" + "@metamask/json-rpc-engine": "npm:^10.2.0" + "@metamask/messenger": "npm:^0.3.0" + "@metamask/rpc-errors": "npm:^7.0.2" + "@metamask/swappable-obj-proxy": "npm:^2.3.0" + "@metamask/utils": "npm:^11.8.1" + async-mutex: "npm:^0.5.0" + fast-deep-equal: "npm:^3.1.3" + immer: "npm:^9.0.6" + loglevel: "npm:^1.8.1" + reselect: "npm:^5.1.1" + uri-js: "npm:^4.4.1" + uuid: "npm:^8.3.2" + checksum: 10/74b6583fbf02d62ac0882df2554bcfa1fe46fda83c9002130d28868c749d33ab9951378b84ec4b67986aece92a50d55f800e30892a4ecf85d7718dd778518355 + languageName: node + linkType: hard + "@metamask/network-enablement-controller@npm:3.1.0": version: 3.1.0 resolution: "@metamask/network-enablement-controller@npm:3.1.0" @@ -9493,9 +9521,9 @@ __metadata: languageName: node linkType: hard -"@metamask/transaction-controller@npm:62.3.1, @metamask/transaction-controller@npm:^62.3.0": - version: 62.3.1 - resolution: "@metamask/transaction-controller@npm:62.3.1" +"@metamask/transaction-controller@npm:62.4.0, @metamask/transaction-controller@npm:^62.3.0": + version: 62.4.0 + resolution: "@metamask/transaction-controller@npm:62.4.0" dependencies: "@ethereumjs/common": "npm:^4.4.0" "@ethereumjs/tx": "npm:^5.4.0" @@ -9512,7 +9540,7 @@ __metadata: "@metamask/gas-fee-controller": "npm:^26.0.0" "@metamask/messenger": "npm:^0.3.0" "@metamask/metamask-eth-abis": "npm:^3.1.1" - "@metamask/network-controller": "npm:^26.0.0" + "@metamask/network-controller": "npm:^27.0.0" "@metamask/nonce-tracker": "npm:^6.0.0" "@metamask/remote-feature-flag-controller": "npm:^2.0.1" "@metamask/rpc-errors": "npm:^7.0.2" @@ -9527,7 +9555,7 @@ __metadata: peerDependencies: "@babel/runtime": ^7.0.0 "@metamask/eth-block-tracker": ">=9" - checksum: 10/bf1fc4b305fcdf295fdc75ff5ebc21014cbd00c7b7fb29d4b34deb3e95c4b621c3139e1426980bc2ca6fa6855b0b47046471d62b527841fe8309f8467133fd7f + checksum: 10/36a816c881babf7b71542857be50045cb25b1a5cf7fa5444c0ad0c101da3c6718cfd83942ad5f868b53088aa2601c234dcf47e324173014ee5037c084f783438 languageName: node linkType: hard @@ -9569,9 +9597,9 @@ __metadata: languageName: node linkType: hard -"@metamask/transaction-controller@patch:@metamask/transaction-controller@npm%3A62.3.1#~/.yarn/patches/@metamask-transaction-controller-npm-61.0.0-cccac388c7.patch": - version: 62.3.1 - resolution: "@metamask/transaction-controller@patch:@metamask/transaction-controller@npm%3A62.3.1#~/.yarn/patches/@metamask-transaction-controller-npm-61.0.0-cccac388c7.patch::version=62.3.1&hash=1a3342" +"@metamask/transaction-controller@patch:@metamask/transaction-controller@npm%3A62.4.0#~/.yarn/patches/@metamask-transaction-controller-npm-61.0.0-cccac388c7.patch": + version: 62.4.0 + resolution: "@metamask/transaction-controller@patch:@metamask/transaction-controller@npm%3A62.4.0#~/.yarn/patches/@metamask-transaction-controller-npm-61.0.0-cccac388c7.patch::version=62.4.0&hash=1a3342" dependencies: "@ethereumjs/common": "npm:^4.4.0" "@ethereumjs/tx": "npm:^5.4.0" @@ -9588,7 +9616,7 @@ __metadata: "@metamask/gas-fee-controller": "npm:^26.0.0" "@metamask/messenger": "npm:^0.3.0" "@metamask/metamask-eth-abis": "npm:^3.1.1" - "@metamask/network-controller": "npm:^26.0.0" + "@metamask/network-controller": "npm:^27.0.0" "@metamask/nonce-tracker": "npm:^6.0.0" "@metamask/remote-feature-flag-controller": "npm:^2.0.1" "@metamask/rpc-errors": "npm:^7.0.2" @@ -9603,13 +9631,13 @@ __metadata: peerDependencies: "@babel/runtime": ^7.0.0 "@metamask/eth-block-tracker": ">=9" - checksum: 10/2413d51478ee4af037b0eff190fb89747c9bea61087087b3d00ee82e0dd0ffeb27a941da1a7b86293ba6129e5b660e58aea36e1a478e3b6f09235b238a293b5e + checksum: 10/de9c227ae3d846e60b7f4860c65d8ea75fe6c399cf51750a2baf96fe361b3453e22ab614b8f937a71ffa7dc60d86f17b408a2d23f38baf59919f307ea60ac7d2 languageName: node linkType: hard -"@metamask/transaction-pay-controller@npm:^10.2.0": - version: 10.2.0 - resolution: "@metamask/transaction-pay-controller@npm:10.2.0" +"@metamask/transaction-pay-controller@npm:^10.3.0": + version: 10.3.0 + resolution: "@metamask/transaction-pay-controller@npm:10.3.0" dependencies: "@ethersproject/abi": "npm:^5.7.0" "@ethersproject/contracts": "npm:^5.7.0" @@ -9621,15 +9649,15 @@ __metadata: "@metamask/gas-fee-controller": "npm:^26.0.0" "@metamask/messenger": "npm:^0.3.0" "@metamask/metamask-eth-abis": "npm:^3.1.1" - "@metamask/network-controller": "npm:^26.0.0" + "@metamask/network-controller": "npm:^27.0.0" "@metamask/remote-feature-flag-controller": "npm:^2.0.1" - "@metamask/transaction-controller": "npm:^62.3.1" + "@metamask/transaction-controller": "npm:^62.4.0" "@metamask/utils": "npm:^11.8.1" bignumber.js: "npm:^9.1.2" bn.js: "npm:^5.2.1" immer: "npm:^9.0.6" lodash: "npm:^4.17.21" - checksum: 10/20b251ae57cf48f1ed4da018c638b0b380a6a1c1fc051a976fc5e37ee5ebbb755c03d3d261418b63f9f926a602be6614160f860102b8628d69d5f744ce57cf8e + checksum: 10/511f7f58791b31a752e80229e35749fc86a5b1333aa3dc956b6b294f0680d0881464548eaf9b7e659a85977a2dae00928e80a5bcf84638cefb9b408ed3336701 languageName: node linkType: hard @@ -35107,8 +35135,8 @@ __metadata: "@metamask/test-dapp-multichain": "npm:^0.17.1" "@metamask/test-dapp-solana": "npm:^0.3.0" "@metamask/token-search-discovery-controller": "npm:^4.0.0" - "@metamask/transaction-controller": "patch:@metamask/transaction-controller@npm%3A62.3.1#~/.yarn/patches/@metamask-transaction-controller-npm-61.0.0-cccac388c7.patch" - "@metamask/transaction-pay-controller": "npm:^10.2.0" + "@metamask/transaction-controller": "patch:@metamask/transaction-controller@npm%3A62.4.0#~/.yarn/patches/@metamask-transaction-controller-npm-61.0.0-cccac388c7.patch" + "@metamask/transaction-pay-controller": "npm:^10.3.0" "@metamask/tron-wallet-snap": "npm:^1.13.0" "@metamask/utils": "npm:^11.8.1" "@ngraveio/bc-ur": "npm:^1.1.6"