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.

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

Version v12.5.1 RC #28091

Merged
merged 5 commits into from
Oct 31, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions .metamaskrc.dist
Original file line number Diff line number Diff line change
Expand Up @@ -45,3 +45,7 @@ BLOCKAID_PUBLIC_KEY=
; Enable/disable why did you render debug tool: https://github.com/welldone-software/why-did-you-render
; This should NEVER be enabled in production since it slows down react
; ENABLE_WHY_DID_YOU_RENDER=false

; API key used in Etherscan requests to prevent rate limiting.
; Only applies to Mainnet and Sepolia.
; ETHERSCAN_API_KEY=
3 changes: 2 additions & 1 deletion .yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,8 @@ npmAuditIgnoreAdvisories:
# Currently in use for the network list drag and drop functionality.
# Maintenance has stopped and the project will be archived in 2025.
- 'react-beautiful-dnd (deprecation)'

# New package name format for new versions: @ethereumjs/wallet.
- 'ethereumjs-wallet (deprecation)'
npmRegistries:
'https://npm.pkg.github.com':
npmAlwaysAuth: true
Expand Down
10 changes: 9 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [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
- New UI and functionality for adding and managing networks ([#26433](https://github.com/MetaMask/metamask-extension/pull/26433)), ([#27085](https://github.com/MetaMask/metamask-extension/pull/27085))
Expand Down Expand Up @@ -5223,7 +5230,8 @@ Update styles and spacing on the critical error page ([#20350](https://github.c
- Added the ability to restore accounts from seed words.


[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v12.5.0...HEAD
[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v12.5.1...HEAD
[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

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
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
4 changes: 4 additions & 0 deletions app/scripts/metamask-controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -1849,6 +1849,10 @@ export default class MetamaskController extends EventEmitter {
getCurrentChainId({ metamask: this.networkController.state })
],
incomingTransactions: {
etherscanApiKeysByChainId: {
[CHAIN_IDS.MAINNET]: process.env.ETHERSCAN_API_KEY,
[CHAIN_IDS.SEPOLIA]: process.env.ETHERSCAN_API_KEY,
},
includeTokenTransfers: false,
isEnabled: () =>
Boolean(
Expand Down
5 changes: 4 additions & 1 deletion builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -272,8 +272,10 @@ env:
- SECURITY_ALERTS_API_ENABLED: ''
# URL of security alerts API used to validate dApp requests
- SECURITY_ALERTS_API_URL: 'http://localhost:3000'
# API key to authenticate Etherscan requests to avoid rate limiting
- ETHERSCAN_API_KEY: ''

# Enables the notifications feature within the build:
# Enables the notifications feature within the build:
- NOTIFICATIONS: ''

- METAMASK_RAMP_API_CONTENT_BASE_URL: https://on-ramp-content.api.cx.metamask.io
Expand All @@ -290,6 +292,7 @@ env:
###

- EIP_4337_ENTRYPOINT: null

###
# Enable/disable why did you render debug tool: https://github.com/welldone-software/why-did-you-render
# This should NEVER be enabled in production since it slows down react
Expand Down
60 changes: 40 additions & 20 deletions lavamoat/browserify/beta/policy.json
Original file line number Diff line number Diff line change
Expand Up @@ -783,15 +783,30 @@
},
"packages": {
"@ethereumjs/tx>@ethereumjs/util": true,
"@metamask/controller-utils>@metamask/utils": true,
"@metamask/controller-utils>@spruceid/siwe-parser": true,
"@metamask/ethjs>@metamask/ethjs-unit": true,
"@metamask/utils": true,
"bn.js": true,
"browserify>buffer": true,
"eslint>fast-deep-equal": true,
"eth-ens-namehash": true
}
},
"@metamask/controller-utils>@metamask/utils": {
"globals": {
"TextDecoder": true,
"TextEncoder": true
},
"packages": {
"@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/controller-utils>@spruceid/siwe-parser": {
"globals": {
"console.error": true,
Expand Down Expand Up @@ -2726,9 +2741,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/utils": true,
"@metamask/transaction-controller>@metamask/rpc-errors": true,
"@metamask/transaction-controller>@metamask/utils": true,
"bn.js": true,
"browserify>buffer": true,
"eth-method-registry": true,
Expand All @@ -2754,6 +2769,27 @@
"@swc/helpers>tslib": true
}
},
"@metamask/transaction-controller>@metamask/rpc-errors": {
"packages": {
"@metamask/transaction-controller>@metamask/utils": true,
"eth-rpc-errors>fast-safe-stringify": true
}
},
"@metamask/transaction-controller>@metamask/utils": {
"globals": {
"TextDecoder": true,
"TextEncoder": true
},
"packages": {
"@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": {
"globals": {
"fetch": true
Expand Down Expand Up @@ -3879,10 +3915,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 @@ -3995,22 +4031,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
60 changes: 40 additions & 20 deletions lavamoat/browserify/flask/policy.json
Original file line number Diff line number Diff line change
Expand Up @@ -783,15 +783,30 @@
},
"packages": {
"@ethereumjs/tx>@ethereumjs/util": true,
"@metamask/controller-utils>@metamask/utils": true,
"@metamask/controller-utils>@spruceid/siwe-parser": true,
"@metamask/ethjs>@metamask/ethjs-unit": true,
"@metamask/utils": true,
"bn.js": true,
"browserify>buffer": true,
"eslint>fast-deep-equal": true,
"eth-ens-namehash": true
}
},
"@metamask/controller-utils>@metamask/utils": {
"globals": {
"TextDecoder": true,
"TextEncoder": true
},
"packages": {
"@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/controller-utils>@spruceid/siwe-parser": {
"globals": {
"console.error": true,
Expand Down Expand Up @@ -2726,9 +2741,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/utils": true,
"@metamask/transaction-controller>@metamask/rpc-errors": true,
"@metamask/transaction-controller>@metamask/utils": true,
"bn.js": true,
"browserify>buffer": true,
"eth-method-registry": true,
Expand All @@ -2754,6 +2769,27 @@
"@swc/helpers>tslib": true
}
},
"@metamask/transaction-controller>@metamask/rpc-errors": {
"packages": {
"@metamask/transaction-controller>@metamask/utils": true,
"eth-rpc-errors>fast-safe-stringify": true
}
},
"@metamask/transaction-controller>@metamask/utils": {
"globals": {
"TextDecoder": true,
"TextEncoder": true
},
"packages": {
"@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": {
"globals": {
"fetch": true
Expand Down Expand Up @@ -3879,10 +3915,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 @@ -3995,22 +4031,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
Loading
Loading