Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge master to v12.6.0 after the merge of 12.5.1 to master #28217

Merged
merged 9 commits into from
Oct 31, 2024
Merged

Merge master to v12.6.0 after the merge of 12.5.1 to master #28217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
40febb6
Version v12.5.1
metamaskbot Oct 24, 2024
d7108ed
fix (cherry-pick): 0 token balance in send flow (#28136) (#28151)
danjm Oct 29, 2024
7706431
fix (cherry-pick): Fix audit failures v12.5.1 (#28187)
danjm Oct 31, 2024
5dbbda3
chore: Cherry-pick resimulate into `V12.5.1` (#28178)
OGPoyraz Oct 31, 2024
82a548c
V12.5.1 changelog (#28200)
danjm Oct 31, 2024
83bfd33
Merge pull request #28091 from MetaMask/Version-v12.5.1
danjm Oct 31, 2024
b42ff78
Merge remote-tracking branch 'origin/master' into v12.6.0-merge-maste…
danjm Oct 31, 2024
94dc115
Update LavaMoat policies
metamaskbot Oct 31, 2024
7d078b7
Merge branch 'Version-v12.6.0' into v12.6.0-merge-master-12.5.1
danjm Oct 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- fix: alert system and refine SIWE and contract interaction alerts ([#27205](https://github.com/MetaMask/metamask-extension/pull/27205))
- fix(NOTIFY-1166): rename account sync event names ([#27413](https://github.com/MetaMask/metamask-extension/pull/27413))
- feat: ERC20 Revoke Allowance ([#26906](https://github.com/MetaMask/metamask-extension/pull/26906))
## [12.5.1]
### Changed
- Improve accuracy of transaction simulation warnings in some scenarios ([#26845](https://github.com/MetaMask/metamask-extension/pull/26845))

### Fixed
- Fix bug that could cause token balances to appear as zero, and a balance error to be displayed, on the send screen ([#28136](https://github.com/MetaMask/metamask-extension/pull/28136))

## [12.5.0]
### Added
Expand Down Expand Up @@ -5437,7 +5443,8 @@ Update styles and spacing on the critical error page ([#20350](https://github.c


[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v12.6.0...HEAD
[12.6.0]: https://github.com/MetaMask/metamask-extension/compare/v12.5.0...v12.6.0
[12.6.0]: https://github.com/MetaMask/metamask-extension/compare/v12.5.1...v12.6.0
[12.5.1]: https://github.com/MetaMask/metamask-extension/compare/v12.5.0...v12.5.1
[12.5.0]: https://github.com/MetaMask/metamask-extension/compare/v12.4.2...v12.5.0
[12.4.2]: https://github.com/MetaMask/metamask-extension/compare/v12.4.1...v12.4.2
[12.4.1]: https://github.com/MetaMask/metamask-extension/compare/v12.4.0...v12.4.1
Expand Down
6 changes: 6 additions & 0 deletions app/_locales/en/messages.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion app/scripts/lib/transaction/smart-transactions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,9 @@ class SmartTransactionHook {
signedTransactions,
signedCanceledTransactions: [],
txParams: this.#txParams,
transactionMeta: this.#transactionMeta,
// TODO: Replace `any` with type - version mismatch between smart-transactions-controller and transaction-controller breaking type safety
// eslint-disable-next-line @typescript-eslint/no-explicit-any
transactionMeta: this.#transactionMeta as any,
});
}

Expand Down
37 changes: 15 additions & 22 deletions lavamoat/browserify/beta/policy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2971,9 +2971,9 @@
"@metamask/metamask-eth-abis": true,
"@metamask/name-controller>async-mutex": true,
"@metamask/network-controller": true,
"@metamask/rpc-errors": true,
"@metamask/transaction-controller>@metamask/nonce-tracker": true,
"@metamask/transaction-controller>@metamask/rpc-errors": true,
"@metamask/utils": true,
"@metamask/transaction-controller>@metamask/utils": true,
"bn.js": true,
"browserify>buffer": true,
"eth-method-registry": true,
Expand All @@ -2999,10 +2999,19 @@
"@swc/helpers>tslib": true
}
},
"@metamask/transaction-controller>@metamask/rpc-errors": {
"@metamask/transaction-controller>@metamask/utils": {
"globals": {
"TextDecoder": true,
"TextEncoder": true
},
"packages": {
"@metamask/rpc-errors>fast-safe-stringify": true,
"@metamask/utils": true
"@metamask/utils>@metamask/superstruct": true,
"@metamask/utils>@scure/base": true,
"@metamask/utils>pony-cause": true,
"@noble/hashes": true,
"browserify>buffer": true,
"nock>debug": true,
"semver": true
}
},
"@metamask/user-operation-controller": {
Expand Down Expand Up @@ -4151,10 +4160,10 @@
"eth-lattice-keyring>gridplus-sdk>elliptic": true,
"eth-lattice-keyring>gridplus-sdk>eth-eip712-util-browser": true,
"eth-lattice-keyring>gridplus-sdk>rlp": true,
"eth-lattice-keyring>gridplus-sdk>secp256k1": true,
"eth-lattice-keyring>gridplus-sdk>uuid": true,
"ethereumjs-util>ethereum-cryptography>bs58check": true,
"ethers>@ethersproject/sha2>hash.js": true,
"ganache>secp256k1": true,
"lodash": true
}
},
Expand Down Expand Up @@ -4267,22 +4276,6 @@
"TextEncoder": true
}
},
"eth-lattice-keyring>gridplus-sdk>secp256k1": {
"packages": {
"eth-lattice-keyring>gridplus-sdk>secp256k1>elliptic": true
}
},
"eth-lattice-keyring>gridplus-sdk>secp256k1>elliptic": {
"packages": {
"@metamask/ppom-validator>elliptic>brorand": true,
"@metamask/ppom-validator>elliptic>hmac-drbg": true,
"@metamask/ppom-validator>elliptic>minimalistic-assert": true,
"@metamask/ppom-validator>elliptic>minimalistic-crypto-utils": true,
"bn.js": true,
"ethers>@ethersproject/sha2>hash.js": true,
"pumpify>inherits": true
}
},
"eth-lattice-keyring>gridplus-sdk>uuid": {
"globals": {
"crypto": true
Expand Down
37 changes: 15 additions & 22 deletions lavamoat/browserify/flask/policy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2971,9 +2971,9 @@
"@metamask/metamask-eth-abis": true,
"@metamask/name-controller>async-mutex": true,
"@metamask/network-controller": true,
"@metamask/rpc-errors": true,
"@metamask/transaction-controller>@metamask/nonce-tracker": true,
"@metamask/transaction-controller>@metamask/rpc-errors": true,
"@metamask/utils": true,
"@metamask/transaction-controller>@metamask/utils": true,
"bn.js": true,
"browserify>buffer": true,
"eth-method-registry": true,
Expand All @@ -2999,10 +2999,19 @@
"@swc/helpers>tslib": true
}
},
"@metamask/transaction-controller>@metamask/rpc-errors": {
"@metamask/transaction-controller>@metamask/utils": {
"globals": {
"TextDecoder": true,
"TextEncoder": true
},
"packages": {
"@metamask/rpc-errors>fast-safe-stringify": true,
"@metamask/utils": true
"@metamask/utils>@metamask/superstruct": true,
"@metamask/utils>@scure/base": true,
"@metamask/utils>pony-cause": true,
"@noble/hashes": true,
"browserify>buffer": true,
"nock>debug": true,
"semver": true
}
},
"@metamask/user-operation-controller": {
Expand Down Expand Up @@ -4151,10 +4160,10 @@
"eth-lattice-keyring>gridplus-sdk>elliptic": true,
"eth-lattice-keyring>gridplus-sdk>eth-eip712-util-browser": true,
"eth-lattice-keyring>gridplus-sdk>rlp": true,
"eth-lattice-keyring>gridplus-sdk>secp256k1": true,
"eth-lattice-keyring>gridplus-sdk>uuid": true,
"ethereumjs-util>ethereum-cryptography>bs58check": true,
"ethers>@ethersproject/sha2>hash.js": true,
"ganache>secp256k1": true,
"lodash": true
}
},
Expand Down Expand Up @@ -4267,22 +4276,6 @@
"TextEncoder": true
}
},
"eth-lattice-keyring>gridplus-sdk>secp256k1": {
"packages": {
"eth-lattice-keyring>gridplus-sdk>secp256k1>elliptic": true
}
},
"eth-lattice-keyring>gridplus-sdk>secp256k1>elliptic": {
"packages": {
"@metamask/ppom-validator>elliptic>brorand": true,
"@metamask/ppom-validator>elliptic>hmac-drbg": true,
"@metamask/ppom-validator>elliptic>minimalistic-assert": true,
"@metamask/ppom-validator>elliptic>minimalistic-crypto-utils": true,
"bn.js": true,
"ethers>@ethersproject/sha2>hash.js": true,
"pumpify>inherits": true
}
},
"eth-lattice-keyring>gridplus-sdk>uuid": {
"globals": {
"crypto": true
Expand Down
37 changes: 15 additions & 22 deletions lavamoat/browserify/main/policy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2971,9 +2971,9 @@
"@metamask/metamask-eth-abis": true,
"@metamask/name-controller>async-mutex": true,
"@metamask/network-controller": true,
"@metamask/rpc-errors": true,
"@metamask/transaction-controller>@metamask/nonce-tracker": true,
"@metamask/transaction-controller>@metamask/rpc-errors": true,
"@metamask/utils": true,
"@metamask/transaction-controller>@metamask/utils": true,
"bn.js": true,
"browserify>buffer": true,
"eth-method-registry": true,
Expand All @@ -2999,10 +2999,19 @@
"@swc/helpers>tslib": true
}
},
"@metamask/transaction-controller>@metamask/rpc-errors": {
"@metamask/transaction-controller>@metamask/utils": {
"globals": {
"TextDecoder": true,
"TextEncoder": true
},
"packages": {
"@metamask/rpc-errors>fast-safe-stringify": true,
"@metamask/utils": true
"@metamask/utils>@metamask/superstruct": true,
"@metamask/utils>@scure/base": true,
"@metamask/utils>pony-cause": true,
"@noble/hashes": true,
"browserify>buffer": true,
"nock>debug": true,
"semver": true
}
},
"@metamask/user-operation-controller": {
Expand Down Expand Up @@ -4151,10 +4160,10 @@
"eth-lattice-keyring>gridplus-sdk>elliptic": true,
"eth-lattice-keyring>gridplus-sdk>eth-eip712-util-browser": true,
"eth-lattice-keyring>gridplus-sdk>rlp": true,
"eth-lattice-keyring>gridplus-sdk>secp256k1": true,
"eth-lattice-keyring>gridplus-sdk>uuid": true,
"ethereumjs-util>ethereum-cryptography>bs58check": true,
"ethers>@ethersproject/sha2>hash.js": true,
"ganache>secp256k1": true,
"lodash": true
}
},
Expand Down Expand Up @@ -4267,22 +4276,6 @@
"TextEncoder": true
}
},
"eth-lattice-keyring>gridplus-sdk>secp256k1": {
"packages": {
"eth-lattice-keyring>gridplus-sdk>secp256k1>elliptic": true
}
},
"eth-lattice-keyring>gridplus-sdk>secp256k1>elliptic": {
"packages": {
"@metamask/ppom-validator>elliptic>brorand": true,
"@metamask/ppom-validator>elliptic>hmac-drbg": true,
"@metamask/ppom-validator>elliptic>minimalistic-assert": true,
"@metamask/ppom-validator>elliptic>minimalistic-crypto-utils": true,
"bn.js": true,
"ethers>@ethersproject/sha2>hash.js": true,
"pumpify>inherits": true
}
},
"eth-lattice-keyring>gridplus-sdk>uuid": {
"globals": {
"crypto": true
Expand Down
37 changes: 15 additions & 22 deletions lavamoat/browserify/mmi/policy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3063,9 +3063,9 @@
"@metamask/metamask-eth-abis": true,
"@metamask/name-controller>async-mutex": true,
"@metamask/network-controller": true,
"@metamask/rpc-errors": true,
"@metamask/transaction-controller>@metamask/nonce-tracker": true,
"@metamask/transaction-controller>@metamask/rpc-errors": true,
"@metamask/utils": true,
"@metamask/transaction-controller>@metamask/utils": true,
"bn.js": true,
"browserify>buffer": true,
"eth-method-registry": true,
Expand All @@ -3091,10 +3091,19 @@
"@swc/helpers>tslib": true
}
},
"@metamask/transaction-controller>@metamask/rpc-errors": {
"@metamask/transaction-controller>@metamask/utils": {
"globals": {
"TextDecoder": true,
"TextEncoder": true
},
"packages": {
"@metamask/rpc-errors>fast-safe-stringify": true,
"@metamask/utils": true
"@metamask/utils>@metamask/superstruct": true,
"@metamask/utils>@scure/base": true,
"@metamask/utils>pony-cause": true,
"@noble/hashes": true,
"browserify>buffer": true,
"nock>debug": true,
"semver": true
}
},
"@metamask/user-operation-controller": {
Expand Down Expand Up @@ -4243,10 +4252,10 @@
"eth-lattice-keyring>gridplus-sdk>elliptic": true,
"eth-lattice-keyring>gridplus-sdk>eth-eip712-util-browser": true,
"eth-lattice-keyring>gridplus-sdk>rlp": true,
"eth-lattice-keyring>gridplus-sdk>secp256k1": true,
"eth-lattice-keyring>gridplus-sdk>uuid": true,
"ethereumjs-util>ethereum-cryptography>bs58check": true,
"ethers>@ethersproject/sha2>hash.js": true,
"ganache>secp256k1": true,
"lodash": true
}
},
Expand Down Expand Up @@ -4359,22 +4368,6 @@
"TextEncoder": true
}
},
"eth-lattice-keyring>gridplus-sdk>secp256k1": {
"packages": {
"eth-lattice-keyring>gridplus-sdk>secp256k1>elliptic": true
}
},
"eth-lattice-keyring>gridplus-sdk>secp256k1>elliptic": {
"packages": {
"@metamask/ppom-validator>elliptic>brorand": true,
"@metamask/ppom-validator>elliptic>hmac-drbg": true,
"@metamask/ppom-validator>elliptic>minimalistic-assert": true,
"@metamask/ppom-validator>elliptic>minimalistic-crypto-utils": true,
"bn.js": true,
"ethers>@ethersproject/sha2>hash.js": true,
"pumpify>inherits": true
}
},
"eth-lattice-keyring>gridplus-sdk>uuid": {
"globals": {
"crypto": true
Expand Down
8 changes: 6 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,11 @@
"@metamask/network-controller@npm:^17.0.0": "patch:@metamask/network-controller@npm%3A21.0.0#~/.yarn/patches/@metamask-network-controller-npm-21.0.0-559aa8e395.patch",
"@metamask/network-controller@npm:^19.0.0": "patch:@metamask/network-controller@npm%3A21.0.0#~/.yarn/patches/@metamask-network-controller-npm-21.0.0-559aa8e395.patch",
"@metamask/network-controller@npm:^20.0.0": "patch:@metamask/network-controller@npm%3A21.0.0#~/.yarn/patches/@metamask-network-controller-npm-21.0.0-559aa8e395.patch",
"path-to-regexp": "1.9.0"
"path-to-regexp": "1.9.0",
"secp256k1@npm:^4.0.0": "4.0.4",
"secp256k1@npm:^4.0.1": "4.0.4",
"secp256k1@npm:4.0.2": "4.0.4",
"secp256k1@npm:4.0.3": "4.0.4"
},
"dependencies": {
"@babel/runtime": "patch:@babel/runtime@npm%3A7.24.0#~/.yarn/patches/@babel-runtime-npm-7.24.0-7eb1dd11a2.patch",
Expand Down Expand Up @@ -358,7 +362,7 @@
"@metamask/snaps-rpc-methods": "^11.5.0",
"@metamask/snaps-sdk": "^6.9.0",
"@metamask/snaps-utils": "^8.4.1",
"@metamask/transaction-controller": "^37.2.0",
"@metamask/transaction-controller": "^38.1.0",
"@metamask/user-operation-controller": "^13.0.0",
"@metamask/utils": "^9.3.0",
"@ngraveio/bc-ur": "^1.1.12",
Expand Down
1 change: 1 addition & 0 deletions test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-ui-state.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,7 @@
"isSignedIn": "boolean",
"isProfileSyncingEnabled": null,
"isProfileSyncingUpdateLoading": "boolean",
"submitHistory": "object",
"subscriptionAccountsSeen": "object",
"isMetamaskNotificationsFeatureSeen": "boolean",
"isNotificationServicesEnabled": "boolean",
Expand Down
5 changes: 2 additions & 3 deletions test/e2e/tests/simulation-details/mock-request-buy-erc721.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,8 +269,7 @@ export const BUY_ERC721_REQUEST_2_MOCK: MockRequestResponse = {
result: {
transactions: [
{
return:
'0x0000000000000000000000000000000000000000000000000000000000000000',
return: `0x0000000000000000000000000000000000000000000000000000000000000000`,
status: '0x1',
gasUsed: '0x5f66',
gasLimit: '0x60b9',
Expand Down Expand Up @@ -388,7 +387,7 @@ export const BUY_ERC721_REQUEST_2_MOCK: MockRequestResponse = {
baseFeePerGas: 42103363836,
},
{
return: `0x00000000000000000000000000000000${SENDER_ADDRESS_NO_0X_MOCK}`,
return: `0x000000000000000000000000${SENDER_ADDRESS_NO_0X_MOCK}`,
status: '0x1',
gasUsed: '0x5f66',
gasLimit: '0x60b9',
Expand Down
3 changes: 2 additions & 1 deletion test/e2e/tests/simulation-details/mock-request-no-changes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ export const NO_CHANGES_TRANSACTION_MOCK = {
maxFeePerGas: '0x0',
maxPriorityFeePerGas: '0x0',
to: SENDER_ADDRESS_MOCK,
value: '0x38d7ea4c68000',
value: '0x0',
};

export const NO_CHANGES_REQUEST_MOCK: MockRequestResponse = {
Expand Down Expand Up @@ -42,6 +42,7 @@ export const NO_CHANGES_REQUEST_MOCK: MockRequestResponse = {
stateDiff: {
post: {
[SENDER_ADDRESS_MOCK]: {
balance: '0x3185e67a46d9066',
nonce: '0x3c0',
},
},
Expand Down
Loading