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

Version v12.6.1 RC #28404

Merged
merged 3 commits into from
Nov 13, 2024
Merged

Version v12.6.1 RC #28404

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
91a4ec4
Version v12.6.1
metamaskbot Nov 11, 2024
f2865d1
fix (cherry-pick): gas limit estimation (#28327) (#28405)
matthewwalsh0 Nov 11, 2024
bf078ad
chore: update changelog (#28410)
matthewwalsh0 Nov 11, 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
7 changes: 6 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [12.6.1]
### Fixed
- Fixed gas limit estimation on Base and BNB chains ([#28327](https://github.com/MetaMask/metamask-extension/pull/28327))

## [12.6.0]
### Added
- Added the APE network icon ([#27841](https://github.com/MetaMask/metamask-extension/pull/27841))
Expand Down Expand Up @@ -5303,7 +5307,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.6.0...HEAD
[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v12.6.1...HEAD
[12.6.1]: https://github.com/MetaMask/metamask-extension/compare/v12.6.0...v12.6.1
[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
Expand Down
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "metamask-crx",
"version": "12.6.0",
"version": "12.6.1",
"private": true,
"repository": {
"type": "git",
Expand Down Expand Up @@ -362,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": "^38.1.0",
"@metamask/transaction-controller": "^38.3.0",
"@metamask/user-operation-controller": "^13.0.0",
"@metamask/utils": "^9.3.0",
"@ngraveio/bc-ur": "^1.1.12",
Expand Down
6 changes: 4 additions & 2 deletions test/e2e/flask/user-operations.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,8 @@ describe('User Operations', function () {
from: ERC_4337_ACCOUNT,
to: GANACHE_ACCOUNT,
value: convertETHToHexGwei(1),
data: '0x',
maxFeePerGas: '0x0',
maxPriorityFeePerGas: '0x0',
});

await confirmTransaction(driver);
Expand Down Expand Up @@ -294,7 +295,8 @@ describe('User Operations', function () {
from: ERC_4337_ACCOUNT,
to: GANACHE_ACCOUNT,
value: convertETHToHexGwei(1),
data: '0x',
maxFeePerGas: '0x0',
maxPriorityFeePerGas: '0x0',
});

await confirmTransaction(driver);
Expand Down
16 changes: 7 additions & 9 deletions test/e2e/tests/transaction/edit-gas-fee.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
const { strict: assert } = require('assert');
const {
createInternalTransaction,
createDappTransaction,
} = require('../../page-objects/flows/transaction');

const {
withFixtures,
openDapp,
unlockWallet,
generateGanacheOptions,
WINDOW_TITLES,
Expand Down Expand Up @@ -172,11 +172,9 @@ describe('Editing Confirm Transaction', function () {
// login to extension
await unlockWallet(driver);

// open dapp and connect
await openDapp(driver);
await driver.clickElement({
text: 'Send EIP 1559 Transaction',
tag: 'button',
await createDappTransaction(driver, {
maxFeePerGas: '0x2000000000',
maxPriorityFeePerGas: '0x1000000000',
});

// check transaction in extension popup
Expand All @@ -198,12 +196,12 @@ describe('Editing Confirm Transaction', function () {
'.currency-display-component__text',
);
const transactionAmount = transactionAmounts[0];
assert.equal(await transactionAmount.getText(), '0');
assert.equal(await transactionAmount.getText(), '0.001');

// has correct updated value on the confirm screen the transaction
await driver.waitForSelector({
css: '.currency-display-component__text',
text: '0.00021',
text: '0.00185144',
});

// confirms the transaction
Expand All @@ -227,7 +225,7 @@ describe('Editing Confirm Transaction', function () {
'[data-testid="transaction-list-item-primary-currency"]',
);
assert.equal(txValues.length, 1);
assert.ok(/-0\s*ETH/u.test(await txValues[0].getText()));
assert.ok(/-0.001\s*ETH/u.test(await txValues[0].getText()));
},
);
});
Expand Down
27 changes: 11 additions & 16 deletions test/e2e/tests/transaction/multiple-transactions.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,19 +26,13 @@ describe('Multiple transactions', function () {
// initiates a transaction from the dapp
await openDapp(driver);
// creates first transaction
await driver.clickElement({
text: 'Send EIP 1559 Transaction',
tag: 'button',
});
await createDappTransaction(driver);
await driver.waitUntilXWindowHandles(3);

await driver.switchToWindowWithTitle(WINDOW_TITLES.TestDApp);

// creates second transaction
await driver.clickElement({
text: 'Send EIP 1559 Transaction',
tag: 'button',
});
await createDappTransaction(driver);
await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);

// confirms second transaction
Expand Down Expand Up @@ -94,19 +88,13 @@ describe('Multiple transactions', function () {
// initiates a transaction from the dapp
await openDapp(driver);
// creates first transaction
await driver.clickElement({
text: 'Send EIP 1559 Transaction',
tag: 'button',
});
await createDappTransaction(driver);
await driver.waitUntilXWindowHandles(3);

await driver.switchToWindowWithTitle(WINDOW_TITLES.TestDApp);

// creates second transaction
await driver.clickElement({
text: 'Send EIP 1559 Transaction',
tag: 'button',
});
await createDappTransaction(driver);
await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);

// rejects second transaction
Expand Down Expand Up @@ -141,3 +129,10 @@ describe('Multiple transactions', function () {
);
});
});

async function createDappTransaction(driver) {
await driver.clickElement({
text: 'Send EIP 1559 Without Gas',
tag: 'button',
});
}
14 changes: 7 additions & 7 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5015,7 +5015,7 @@ __metadata:
languageName: node
linkType: hard

"@metamask/controller-utils@npm:^11.0.0, @metamask/controller-utils@npm:^11.0.2, @metamask/controller-utils@npm:^11.1.0, @metamask/controller-utils@npm:^11.2.0, @metamask/controller-utils@npm:^11.3.0, @metamask/controller-utils@npm:^11.4.0, @metamask/controller-utils@npm:^11.4.1":
"@metamask/controller-utils@npm:^11.0.0, @metamask/controller-utils@npm:^11.0.2, @metamask/controller-utils@npm:^11.1.0, @metamask/controller-utils@npm:^11.2.0, @metamask/controller-utils@npm:^11.3.0, @metamask/controller-utils@npm:^11.4.0, @metamask/controller-utils@npm:^11.4.1, @metamask/controller-utils@npm:^11.4.2":
version: 11.4.2
resolution: "@metamask/controller-utils@npm:11.4.2"
dependencies:
Expand Down Expand Up @@ -6521,9 +6521,9 @@ __metadata:
languageName: node
linkType: hard

"@metamask/transaction-controller@npm:^38.1.0":
version: 38.1.0
resolution: "@metamask/transaction-controller@npm:38.1.0"
"@metamask/transaction-controller@npm:^38.3.0":
version: 38.3.0
resolution: "@metamask/transaction-controller@npm:38.3.0"
dependencies:
"@ethereumjs/common": "npm:^3.2.0"
"@ethereumjs/tx": "npm:^4.2.0"
Expand All @@ -6532,7 +6532,7 @@ __metadata:
"@ethersproject/contracts": "npm:^5.7.0"
"@ethersproject/providers": "npm:^5.7.0"
"@metamask/base-controller": "npm:^7.0.2"
"@metamask/controller-utils": "npm:^11.4.1"
"@metamask/controller-utils": "npm:^11.4.2"
"@metamask/eth-query": "npm:^4.0.0"
"@metamask/metamask-eth-abis": "npm:^3.1.1"
"@metamask/nonce-tracker": "npm:^6.0.0"
Expand All @@ -6550,7 +6550,7 @@ __metadata:
"@metamask/approval-controller": ^7.0.0
"@metamask/gas-fee-controller": ^22.0.0
"@metamask/network-controller": ^22.0.0
checksum: 10/c1bdca52bbbce42a76ec9c640197534ec6c223b0f5d5815acfa53490dc1175850ea9aeeb6ae3c5ec34218f0bdbbbeb3e8731e2552aa9411e3ed7798a5dea8ab5
checksum: 10/f4e8e3a1a31e3e62b0d1a59bbe15ebfa4dc3e4cf077fb95c1815c00661c60ef4676046c49f57eab9749cd31d3e55ac3fed7bc247e3f5a3d459f2dcb03998633d
languageName: node
linkType: hard

Expand Down Expand Up @@ -26183,7 +26183,7 @@ __metadata:
"@metamask/snaps-utils": "npm:^8.4.1"
"@metamask/test-bundler": "npm:^1.0.0"
"@metamask/test-dapp": "npm:8.7.0"
"@metamask/transaction-controller": "npm:^38.1.0"
"@metamask/transaction-controller": "npm:^38.3.0"
"@metamask/user-operation-controller": "npm:^13.0.0"
"@metamask/utils": "npm:^9.3.0"
"@ngraveio/bc-ur": "npm:^1.1.12"
Expand Down