From 8e52488c085bf7bb72367860d3221e5930b00897 Mon Sep 17 00:00:00 2001 From: ffmcgee Date: Tue, 16 Sep 2025 13:13:10 +0200 Subject: [PATCH 1/4] feat: add auxiliaryFunds support --- app/core/BackgroundBridge/BackgroundBridge.js | 3 ++ package.json | 2 +- yarn.lock | 31 ++++++++++++++----- 3 files changed, 28 insertions(+), 8 deletions(-) diff --git a/app/core/BackgroundBridge/BackgroundBridge.js b/app/core/BackgroundBridge/BackgroundBridge.js index d0e8c433f078..3a6d70aea203 100644 --- a/app/core/BackgroundBridge/BackgroundBridge.js +++ b/app/core/BackgroundBridge/BackgroundBridge.js @@ -71,6 +71,7 @@ import { getSessionScopes, KnownSessionProperties, } from '@metamask/chain-agnostic-permission'; +import { ALLOWED_BRIDGE_CHAIN_IDS } from '@metamask/bridge-controller'; import { makeMethodMiddlewareMaker, UNSUPPORTED_RPC_METHODS, @@ -843,6 +844,8 @@ export class BackgroundBridge extends EventEmitter { {}, ); }, + isAuxiliaryFundsSupported: (chainId) => + ALLOWED_BRIDGE_CHAIN_IDS.includes(chainId), }, Engine.controllerMessenger, ), diff --git a/package.json b/package.json index a6a6889950fd..64912d02b11b 100644 --- a/package.json +++ b/package.json @@ -237,7 +237,7 @@ "@metamask/design-system-twrnc-preset": "^0.2.1", "@metamask/design-tokens": "^8.1.1", "@metamask/earn-controller": "^7.0.0", - "@metamask/eip-5792-middleware": "^1.1.0", + "@metamask/eip-5792-middleware": "npm:@metamask-previews/eip-5792-middleware@1.1.0-preview-e85a6854", "@metamask/eip1193-permission-middleware": "^1.0.0", "@metamask/error-reporting-service": "^2.0.0", "@metamask/eth-hd-keyring": "^12.1.0", diff --git a/yarn.lock b/yarn.lock index 2a2156d58c73..805b677b5086 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5171,15 +5171,15 @@ "@metamask/stake-sdk" "^3.2.1" reselect "^5.1.1" -"@metamask/eip-5792-middleware@^1.1.0": - version "1.1.0" - resolved "https://registry.yarnpkg.com/@metamask/eip-5792-middleware/-/eip-5792-middleware-1.1.0.tgz#3dc25e31711f0045766da9d473ae9306de75d2df" - integrity sha512-zgI9uLSwi+U2x2fkIFMViI/RFJQFGp2B38YoWSgIQ1L7kshy0p0eNYrkOXnNX5Y+oDfbZLTSJeeAYBQ+suSNcA== +"@metamask/eip-5792-middleware@npm:@metamask-previews/eip-5792-middleware@1.1.0-preview-e85a6854": + version "1.1.0-preview-e85a6854" + resolved "https://registry.yarnpkg.com/@metamask-previews/eip-5792-middleware/-/eip-5792-middleware-1.1.0-preview-e85a6854.tgz#1510b89bded61cd52ab1a411c1e14e3f2f39b911" + integrity sha512-GIOEV8rU25PwWqQZFbVqbCxRBrSWjMiiylY52gOALOUQRSJ3IfAn8X9tWO+jk4lYR4UaksQHxDh1RDNuPda7uw== dependencies: "@metamask/eth-json-rpc-middleware" "^17.0.1" "@metamask/superstruct" "^3.1.0" - "@metamask/transaction-controller" "^60.2.0" - "@metamask/utils" "^11.4.2" + "@metamask/transaction-controller" "^60.3.0" + "@metamask/utils" "^11.8.0" uuid "^8.3.2" "@metamask/eip1193-permission-middleware@^1.0.0": @@ -6370,7 +6370,7 @@ "@toruslabs/http-helpers" "^8.1.1" bn.js "^5.2.1" -"@metamask/transaction-controller@^60.2.0", "@metamask/transaction-controller@^60.3.0": +"@metamask/transaction-controller@^60.3.0": version "60.3.0" resolved "https://registry.yarnpkg.com/@metamask/transaction-controller/-/transaction-controller-60.3.0.tgz#acb1f8bfae954e484c494bd631cb93db1e4dc067" integrity sha512-dFgK72ckx98PkmxWQx+j3ODCB06uY0lj4hZxtW1Hx3szW0mmDb+tuqdY0Z+vbv8vyf0S1ZSFDD5CDxz7CMM69A== @@ -6428,6 +6428,23 @@ semver "^7.5.4" uuid "^9.0.1" +"@metamask/utils@^11.8.0": + version "11.8.0" + resolved "https://registry.yarnpkg.com/@metamask/utils/-/utils-11.8.0.tgz#0d1f1b4097fa3645258cb397a9256e2c54b5c164" + integrity sha512-EJqiuvVBAjV1vd1kBhmVmRtGfadrBfY3ImcAMjl+8MSSByTB3VNwvlIBLQdp+TwdAomUdenJCx2BvOSQykm8Hg== + dependencies: + "@ethereumjs/tx" "^4.2.0" + "@metamask/superstruct" "^3.1.0" + "@noble/hashes" "^1.3.1" + "@scure/base" "^1.1.3" + "@types/debug" "^4.1.7" + "@types/lodash" "^4.17.20" + debug "^4.3.4" + lodash "^4.17.21" + pony-cause "^2.1.10" + semver "^7.5.4" + uuid "^9.0.1" + "@metamask/utils@^8.2.0": version "8.5.0" resolved "https://registry.yarnpkg.com/@metamask/utils/-/utils-8.5.0.tgz#ddd0d4012d5191809404c97648a837ea9962cceb" From 0135aa050136d934cb66db26b4f53b842a2a52f5 Mon Sep 17 00:00:00 2001 From: ffmcgee Date: Wed, 17 Sep 2025 13:09:54 +0200 Subject: [PATCH 2/4] chore: update package --- app/core/BackgroundBridge/BackgroundBridge.js | 2 ++ package.json | 2 +- yarn.lock | 9 +++++---- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/app/core/BackgroundBridge/BackgroundBridge.js b/app/core/BackgroundBridge/BackgroundBridge.js index 3a6d70aea203..a68722b36b34 100644 --- a/app/core/BackgroundBridge/BackgroundBridge.js +++ b/app/core/BackgroundBridge/BackgroundBridge.js @@ -809,6 +809,8 @@ export class BackgroundBridge extends EventEmitter { transactionMeta: { chainId }, securityAlertId, }), + isAuxiliaryFundsSupported: (chainId) => + ALLOWED_BRIDGE_CHAIN_IDS.includes(chainId), }, Engine.controllerMessenger, ), diff --git a/package.json b/package.json index 64912d02b11b..2e1725467b96 100644 --- a/package.json +++ b/package.json @@ -237,7 +237,7 @@ "@metamask/design-system-twrnc-preset": "^0.2.1", "@metamask/design-tokens": "^8.1.1", "@metamask/earn-controller": "^7.0.0", - "@metamask/eip-5792-middleware": "npm:@metamask-previews/eip-5792-middleware@1.1.0-preview-e85a6854", + "@metamask/eip-5792-middleware": "npm:@metamask-previews/eip-5792-middleware@1.1.0-preview-0c2c1149", "@metamask/eip1193-permission-middleware": "^1.0.0", "@metamask/error-reporting-service": "^2.0.0", "@metamask/eth-hd-keyring": "^12.1.0", diff --git a/yarn.lock b/yarn.lock index 805b677b5086..7993e728e632 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5171,15 +5171,16 @@ "@metamask/stake-sdk" "^3.2.1" reselect "^5.1.1" -"@metamask/eip-5792-middleware@npm:@metamask-previews/eip-5792-middleware@1.1.0-preview-e85a6854": - version "1.1.0-preview-e85a6854" - resolved "https://registry.yarnpkg.com/@metamask-previews/eip-5792-middleware/-/eip-5792-middleware-1.1.0-preview-e85a6854.tgz#1510b89bded61cd52ab1a411c1e14e3f2f39b911" - integrity sha512-GIOEV8rU25PwWqQZFbVqbCxRBrSWjMiiylY52gOALOUQRSJ3IfAn8X9tWO+jk4lYR4UaksQHxDh1RDNuPda7uw== +"@metamask/eip-5792-middleware@npm:@metamask-previews/eip-5792-middleware@1.1.0-preview-0c2c1149": + version "1.1.0-preview-0c2c1149" + resolved "https://registry.yarnpkg.com/@metamask-previews/eip-5792-middleware/-/eip-5792-middleware-1.1.0-preview-0c2c1149.tgz#2353d15834328441296dcda3cdb7aed670163bcf" + integrity sha512-6n3lrOgNBOXQ3LjGI3Q7B7eCfTpLo2iGgkKwRqEYJ6DI8UgpU9R9oS4M4ohqtSbLKFakGa1nR7vfdF/R608gig== dependencies: "@metamask/eth-json-rpc-middleware" "^17.0.1" "@metamask/superstruct" "^3.1.0" "@metamask/transaction-controller" "^60.3.0" "@metamask/utils" "^11.8.0" + lodash "^4.17.21" uuid "^8.3.2" "@metamask/eip1193-permission-middleware@^1.0.0": From 291c94ec253c4784be3b477976f1614f600c6b37 Mon Sep 17 00:00:00 2001 From: ffmcgee Date: Thu, 18 Sep 2025 11:51:30 +0200 Subject: [PATCH 3/4] chore: update package --- package.json | 2 +- yarn.lock | 51 +++++++++++++++++---------------------------------- 2 files changed, 18 insertions(+), 35 deletions(-) diff --git a/package.json b/package.json index 26b7bc59fc3c..fdb2d15b42f4 100644 --- a/package.json +++ b/package.json @@ -237,7 +237,7 @@ "@metamask/design-system-twrnc-preset": "^0.2.1", "@metamask/design-tokens": "^8.1.1", "@metamask/earn-controller": "^7.0.0", - "@metamask/eip-5792-middleware": "npm:@metamask-previews/eip-5792-middleware@1.1.0-preview-0c2c1149", + "@metamask/eip-5792-middleware": "npm:@metamask-previews/eip-5792-middleware@1.1.0-preview-6b2341f8", "@metamask/eip1193-permission-middleware": "^1.0.0", "@metamask/error-reporting-service": "^2.0.0", "@metamask/eth-hd-keyring": "^12.1.0", diff --git a/yarn.lock b/yarn.lock index 5e60ceea6213..39ad63e842a3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5115,14 +5115,14 @@ resolved "https://registry.yarnpkg.com/@metamask/contract-metadata/-/contract-metadata-2.5.0.tgz#33921fa9c15eb1863f55dcd5f75467ae15614ebb" integrity sha512-+j7jEcp0P1OUMEpa/OIwfJs/ahBC/akwgWxaRTSWX2SWABvlUKBVRMtslfL94Qj2wN2xw8xjaUy5nSHqrznqDA== -"@metamask/controller-utils@^11.0.0", "@metamask/controller-utils@^11.10.0", "@metamask/controller-utils@^11.11.0", "@metamask/controller-utils@^11.12.0", "@metamask/controller-utils@^11.3.0", "@metamask/controller-utils@^11.5.0", "@metamask/controller-utils@^11.9.0": - version "11.12.0" - resolved "https://registry.yarnpkg.com/@metamask/controller-utils/-/controller-utils-11.12.0.tgz#18d1339ed684fe11d3626b5a5cafabba4ca64b3f" - integrity sha512-RrVWfMVV+CgiRMB7a/+pNHccQPHnafoV7naU92zbxgO5rCqsNx93TG/qR05atQVzwwXv6sBIpusrFMJb5hd3hQ== +"@metamask/controller-utils@^11.0.0", "@metamask/controller-utils@^11.10.0", "@metamask/controller-utils@^11.11.0", "@metamask/controller-utils@^11.12.0", "@metamask/controller-utils@^11.14.0", "@metamask/controller-utils@^11.3.0", "@metamask/controller-utils@^11.5.0", "@metamask/controller-utils@^11.9.0": + version "11.14.0" + resolved "https://registry.yarnpkg.com/@metamask/controller-utils/-/controller-utils-11.14.0.tgz#4efe7a5838b039db025d521a6b53905d8770bce4" + integrity sha512-QimQHW+kL2pI3EbueuiCG92Q0hKTKuG+6DKHDs7jlHJjU7/EM1Ohq5zLALTOK7iudnFoYkkHjMtO9pY83SSpkw== dependencies: "@metamask/eth-query" "^4.0.0" "@metamask/ethjs-unit" "^0.3.0" - "@metamask/utils" "^11.4.2" + "@metamask/utils" "^11.8.0" "@spruceid/siwe-parser" "2.1.0" "@types/bn.js" "^5.1.5" bignumber.js "^9.1.2" @@ -5173,14 +5173,14 @@ "@metamask/stake-sdk" "^3.2.1" reselect "^5.1.1" -"@metamask/eip-5792-middleware@npm:@metamask-previews/eip-5792-middleware@1.1.0-preview-0c2c1149": - version "1.1.0-preview-0c2c1149" - resolved "https://registry.yarnpkg.com/@metamask-previews/eip-5792-middleware/-/eip-5792-middleware-1.1.0-preview-0c2c1149.tgz#2353d15834328441296dcda3cdb7aed670163bcf" - integrity sha512-6n3lrOgNBOXQ3LjGI3Q7B7eCfTpLo2iGgkKwRqEYJ6DI8UgpU9R9oS4M4ohqtSbLKFakGa1nR7vfdF/R608gig== +"@metamask/eip-5792-middleware@npm:@metamask-previews/eip-5792-middleware@1.1.0-preview-6b2341f8": + version "1.1.0-preview-6b2341f8" + resolved "https://registry.yarnpkg.com/@metamask-previews/eip-5792-middleware/-/eip-5792-middleware-1.1.0-preview-6b2341f8.tgz#d7b6a17540096d71358e3129f753ac1dc52d8c51" + integrity sha512-TqQh54lGhzCwtAZcutlN1CfOV49nAxt27YakWFMPfZVbqP+/Lrs5Y/ObgYPcQsA81UQMsTnHbUWisif8BJLP/Q== dependencies: "@metamask/eth-json-rpc-middleware" "^17.0.1" "@metamask/superstruct" "^3.1.0" - "@metamask/transaction-controller" "^60.3.0" + "@metamask/transaction-controller" "^60.4.0" "@metamask/utils" "^11.8.0" lodash "^4.17.21" uuid "^8.3.2" @@ -6335,10 +6335,10 @@ "@toruslabs/http-helpers" "^8.1.1" bn.js "^5.2.1" -"@metamask/transaction-controller@^60.3.0": - version "60.3.0" - resolved "https://registry.yarnpkg.com/@metamask/transaction-controller/-/transaction-controller-60.3.0.tgz#acb1f8bfae954e484c494bd631cb93db1e4dc067" - integrity sha512-dFgK72ckx98PkmxWQx+j3ODCB06uY0lj4hZxtW1Hx3szW0mmDb+tuqdY0Z+vbv8vyf0S1ZSFDD5CDxz7CMM69A== +"@metamask/transaction-controller@^60.3.0", "@metamask/transaction-controller@^60.4.0": + version "60.4.0" + resolved "https://registry.yarnpkg.com/@metamask/transaction-controller/-/transaction-controller-60.4.0.tgz#15b30016c324ee7b6f403b59206b40f1fdd6d516" + integrity sha512-sIV5cnt4pqgX0i7C7s7su1QOVO1d30Ldb7O14P5tWCHlDGZ/+XRBe7h7gOd9XeMweF1HJpYnhKfZJEgJ/XX6Eg== dependencies: "@ethereumjs/common" "^4.4.0" "@ethereumjs/tx" "^5.4.0" @@ -6347,13 +6347,13 @@ "@ethersproject/contracts" "^5.7.0" "@ethersproject/providers" "^5.7.0" "@ethersproject/wallet" "^5.7.0" - "@metamask/base-controller" "^8.3.0" - "@metamask/controller-utils" "^11.12.0" + "@metamask/base-controller" "^8.4.0" + "@metamask/controller-utils" "^11.14.0" "@metamask/eth-query" "^4.0.0" "@metamask/metamask-eth-abis" "^3.1.1" "@metamask/nonce-tracker" "^6.0.0" "@metamask/rpc-errors" "^7.0.2" - "@metamask/utils" "^11.4.2" + "@metamask/utils" "^11.8.0" async-mutex "^0.5.0" bn.js "^5.2.1" eth-method-registry "^4.0.0" @@ -6393,23 +6393,6 @@ semver "^7.5.4" uuid "^9.0.1" -"@metamask/utils@^11.8.0": - version "11.8.0" - resolved "https://registry.yarnpkg.com/@metamask/utils/-/utils-11.8.0.tgz#0d1f1b4097fa3645258cb397a9256e2c54b5c164" - integrity sha512-EJqiuvVBAjV1vd1kBhmVmRtGfadrBfY3ImcAMjl+8MSSByTB3VNwvlIBLQdp+TwdAomUdenJCx2BvOSQykm8Hg== - dependencies: - "@ethereumjs/tx" "^4.2.0" - "@metamask/superstruct" "^3.1.0" - "@noble/hashes" "^1.3.1" - "@scure/base" "^1.1.3" - "@types/debug" "^4.1.7" - "@types/lodash" "^4.17.20" - debug "^4.3.4" - lodash "^4.17.21" - pony-cause "^2.1.10" - semver "^7.5.4" - uuid "^9.0.1" - "@metamask/utils@^8.2.0": version "8.5.0" resolved "https://registry.yarnpkg.com/@metamask/utils/-/utils-8.5.0.tgz#ddd0d4012d5191809404c97648a837ea9962cceb" From 6685aa17fe5d9d008a8103350e72aa3d3b11ecce Mon Sep 17 00:00:00 2001 From: ffmcgee Date: Fri, 19 Sep 2025 11:55:41 +0200 Subject: [PATCH 4/4] chore: update package --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index fdb2d15b42f4..9b02f305c7a5 100644 --- a/package.json +++ b/package.json @@ -237,7 +237,7 @@ "@metamask/design-system-twrnc-preset": "^0.2.1", "@metamask/design-tokens": "^8.1.1", "@metamask/earn-controller": "^7.0.0", - "@metamask/eip-5792-middleware": "npm:@metamask-previews/eip-5792-middleware@1.1.0-preview-6b2341f8", + "@metamask/eip-5792-middleware": "^1.2.0", "@metamask/eip1193-permission-middleware": "^1.0.0", "@metamask/error-reporting-service": "^2.0.0", "@metamask/eth-hd-keyring": "^12.1.0", diff --git a/yarn.lock b/yarn.lock index 39ad63e842a3..574e94e73ce0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5173,10 +5173,10 @@ "@metamask/stake-sdk" "^3.2.1" reselect "^5.1.1" -"@metamask/eip-5792-middleware@npm:@metamask-previews/eip-5792-middleware@1.1.0-preview-6b2341f8": - version "1.1.0-preview-6b2341f8" - resolved "https://registry.yarnpkg.com/@metamask-previews/eip-5792-middleware/-/eip-5792-middleware-1.1.0-preview-6b2341f8.tgz#d7b6a17540096d71358e3129f753ac1dc52d8c51" - integrity sha512-TqQh54lGhzCwtAZcutlN1CfOV49nAxt27YakWFMPfZVbqP+/Lrs5Y/ObgYPcQsA81UQMsTnHbUWisif8BJLP/Q== +"@metamask/eip-5792-middleware@^1.2.0": + version "1.2.0" + resolved "https://registry.yarnpkg.com/@metamask/eip-5792-middleware/-/eip-5792-middleware-1.2.0.tgz#c47d9e56caf103ae1c56f883b2e77b42826865cc" + integrity sha512-BWTxQlsZLNgCw8fgHH5AtSbNkwSnWSYQC5SndDpIp0byq0YXK8GK+0/DezbNRoAoPbf32QQ3bAYJPawMGcd0Bg== dependencies: "@metamask/eth-json-rpc-middleware" "^17.0.1" "@metamask/superstruct" "^3.1.0"