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

feat: Update transaction controller to v7.1.0 #8628

Merged
merged 9 commits into from
Mar 7, 2024
Merged

feat: Update transaction controller to v7.1.0 #8628

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1b49f2e
Update transaction controller to v7.1.0
tommasini Feb 19, 2024
612cd49
replace cancel transaction to processApproval on Ledger confirmation
tommasini Feb 20, 2024
5199c9d
Merge branch 'main' into feat/1538-transaction-controller-v7.1
tommasini Feb 20, 2024
d1661d8
rever processTransaction method to cancelTransaction for now
tommasini Feb 22, 2024
a1da8c6
update transaction controller patch with new gas features
tommasini Mar 4, 2024
d07c78f
merge main and solve conflicts
tommasini Mar 4, 2024
fcc3cb0
merge main and solve conflicts
tommasini Mar 6, 2024
4be6a89
update with the latest work of linea gas feature and optimism sepolia…
tommasini Mar 6, 2024
a3a5646
merge main and solve conflicts
tommasini Mar 7, 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
2 changes: 1 addition & 1 deletion app/components/Views/confirmations/SendFlow/Confirm/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -753,7 +753,7 @@ class Confirm extends PureComponent {
TransactionController.hub.removeAllListeners(
`${transactionMeta.id}:finished`,
);
TransactionController.cancelTransaction(transactionMeta.id);
TransactionController.processApproval(transactionMeta.id);
} else {
await new Promise((resolve) => resolve(result));

Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@
"@metamask/snaps-utils": "^3.2.0",
"@metamask/swappable-obj-proxy": "^2.1.0",
"@metamask/swaps-controller": "^6.9.3",
"@metamask/transaction-controller": "^6.1.0",
"@metamask/transaction-controller": "7.1.0",
"@metamask/utils": "^8.1.0",
"@ngraveio/bc-ur": "^1.1.6",
"@react-native-async-storage/async-storage": "1.17.10",
Expand Down
748 changes: 352 additions & 396 deletions ...tamask+transaction-controller+6.1.0.patch → ...tamask+transaction-controller+7.1.0.patch
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion scripts/patch-transaction-controller.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ COMMENT_LINE_COUNT=7
COMMENT='+PATCH GENERATED FROM MetaMask/core branch: refactor/transaction-controller-patch-mobile-5\
+This patch backports various transaction controller features from the main branch of MetaMask/core\
+Steps to update patch:\
+* Create a new core branch from: patch/mobile-transaction-controller-6-1-0\
+* Create a new core branch from: patch/mobile-transaction-controller-7-1-0\
+* Run "yarn build" in the core monorepo\
+* Run "yarn patch:tx <core-directory>" in the mobile repo\
+* Once the new patch is merged, add your changes to: patch/mobile-transaction-controller-6-1-0'
Expand Down
18 changes: 9 additions & 9 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4052,7 +4052,7 @@
resolved "https://registry.yarnpkg.com/@metamask/mobile-provider/-/mobile-provider-3.0.0.tgz#8a6a5a0874c8cbe4b468f63dfc57117d207f9595"
integrity sha512-XwFJk0rd9lAZR5xS3VC7ypEhD7DvZR2gi2Ch6PHnODIqeS9Te3OdVKK5+jHI4his8v/zs6LWdFdlRtx5/jL96w==

"@metamask/network-controller@^10.0.0", "@metamask/network-controller@^10.2.0":
"@metamask/network-controller@^10.0.0", "@metamask/network-controller@^10.2.0", "@metamask/network-controller@^10.3.1":
version "10.3.1"
resolved "https://registry.yarnpkg.com/@metamask/network-controller/-/network-controller-10.3.1.tgz#ca0e9134b2600bd834c5193ce0f06e973ec3b152"
integrity sha512-ohx9DnVI0a07yrYqxtMD460oBlXqsy+fcORRI5foiTLk3LudM4fdjLUG8u5JvYHUeEoIl8bkMZuwWxOFrqHB2g==
Expand Down Expand Up @@ -4434,17 +4434,17 @@
resolved "https://registry.yarnpkg.com/@metamask/test-dapp/-/test-dapp-8.0.0.tgz#72f64b18a6157400ef3a3901c35819883524a048"
integrity sha512-yy1eZ9fZfJSEJIUjqcigBehFv6vdPGmDkVnzpBpEJqxiMPZGnbR5dypMfo0XsPdp5Lvmawx47Kamuy4Ocsy+iw==

"@metamask/transaction-controller@^6.1.0":
version "6.1.0"
resolved "https://registry.yarnpkg.com/@metamask/transaction-controller/-/transaction-controller-6.1.0.tgz#19739cddc8326d4eb2ea49bc64525c3215d4d5dd"
integrity sha512-sIsMPscpcurQr/faX9Ax7kecsJEegy/zaE/e2V+d6zS9TuqpbW9V2jgn9uSp9LBMqigC7mW59KFrpsPcK0ePJA==
"@metamask/transaction-controller@7.1.0":
version "7.1.0"
resolved "https://registry.yarnpkg.com/@metamask/transaction-controller/-/transaction-controller-7.1.0.tgz#0f6e0c4188df200e17d75d13e4a6af409673e488"
integrity sha512-VS/SX2pnt8nHMJoB0J0jlnkTbYqliK365wrV6oAAxhDGmsgAIT+DBPlh/594Xc5KanZzOl6/K6LGff7Q9lk2vw==
dependencies:
"@ethereumjs/common" "^2.6.1"
"@ethereumjs/tx" "^3.5.2"
"@metamask/approval-controller" "^3.3.0"
"@metamask/base-controller" "^3.0.0"
"@metamask/controller-utils" "^4.0.1"
"@metamask/network-controller" "^10.2.0"
"@metamask/approval-controller" "^3.4.0"
"@metamask/base-controller" "^3.1.0"
"@metamask/controller-utils" "^4.2.0"
"@metamask/network-controller" "^10.3.1"
"@metamask/utils" "^5.0.2"
async-mutex "^0.2.6"
babel-runtime "^6.26.0"
Expand Down
Loading