Skip to content

chore(runway): cherry-pick chore: cp-7.47.0 upgrade assets-controller v62.0.0 #15289

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

Merged
NicolasMassart merged 3 commits into from
May 13, 2025
Merged

chore(runway): cherry-pick chore: cp-7.47.0 upgrade assets-controller v62.0.0 #15289

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
16e2d5f
chore(runway): cherry-pick chore: cp-7.47.0 upgrade assets-controller…
sahar-fehri May 13, 2025
ff6cd69
Merge branch 'release/7.47.0' into runway-cherry-pick-7.47.0-1747137681
NicolasMassart May 13, 2025
eb6b0c1
fix: fix yarn lockfile
sahar-fehri May 13, 2025
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 ...tichain-assets-rates-controller-messenger/multichain-assets-rates-controller-messenger.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export function getMultichainAssetsRatesControllerMessenger(
'KeyringController:lock',
'KeyringController:unlock',
'CurrencyRateController:stateChange',
'MultichainAssetsController:stateChange',
'MultichainAssetsController:accountAssetListUpdated',
],
allowedActions: [
'AccountsController:listMultichainAccounts',
Expand Down
4 changes: 2 additions & 2 deletions app/core/Engine/messengers/multichain-assets-rates-controller-messenger/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ import {
KeyringControllerUnlockEvent,
} from '@metamask/keyring-controller';
import {
MultichainAssetsControllerStateChangeEvent,
CurrencyRateStateChange,
GetCurrencyRateState,
MultichainAssetsControllerGetStateAction,
MultichainAssetsControllerAccountAssetListUpdatedEvent,
} from '@metamask/assets-controllers';
import {
AccountsControllerAccountAddedEvent,
Expand All @@ -25,4 +25,4 @@ export type MultichainAssetsRatesControllerMessengerEvents =
| KeyringControllerUnlockEvent
| AccountsControllerAccountAddedEvent
| CurrencyRateStateChange
| MultichainAssetsControllerStateChangeEvent;
| MultichainAssetsControllerAccountAssetListUpdatedEvent;
2 changes: 1 addition & 1 deletion ...gers/multichain-balances-controller-messenger/multichain-balances-controller-messenger.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export function getMultichainBalancesControllerMessenger(
'AccountsController:accountAdded',
'AccountsController:accountRemoved',
'AccountsController:accountBalancesUpdated',
'MultichainAssetsController:stateChange',
'MultichainAssetsController:accountAssetListUpdated',
],
allowedActions: [
'AccountsController:listMultichainAccounts',
Expand Down
4 changes: 2 additions & 2 deletions app/core/Engine/messengers/multichain-balances-controller-messenger/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {
import { HandleSnapRequest } from '@metamask/snaps-controllers';
import {
MultichainAssetsControllerGetStateAction,
MultichainAssetsControllerStateChangeEvent,
MultichainAssetsControllerAccountAssetListUpdatedEvent,
} from '@metamask/assets-controllers';

export type MultichainBalancesControllerActions =
Expand All @@ -19,4 +19,4 @@ export type MultichainBalancesControllerEvents =
| AccountsControllerAccountAddedEvent
| AccountsControllerAccountRemovedEvent
| AccountsControllerAccountBalancesUpdatesEvent
| MultichainAssetsControllerStateChangeEvent;
| MultichainAssetsControllerAccountAssetListUpdatedEvent;
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 @@ -163,7 +163,7 @@
"@metamask/address-book-controller": "^6.0.3",
"@metamask/app-metadata-controller": "^1.0.0",
"@metamask/approval-controller": "^7.1.3",
"@metamask/assets-controllers": "^61.0.0",
"@metamask/assets-controllers": "^62.0.0",
"@metamask/base-controller": "^8.0.0",
"@metamask/bitcoin-wallet-snap": "^0.9.0",
"@metamask/bridge-controller": "^21.0.0",
Expand Down
10 changes: 5 additions & 5 deletions ...@metamask+assets-controllers+60.0.0.patch → ...@metamask+assets-controllers+62.0.0.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/node_modules/@metamask/assets-controllers/dist/NftController.cjs b/node_modules/@metamask/assets-controllers/dist/NftController.cjs
index 0f15eb6..96e5a68 100644
index 0f15eb6..d814ed8 100644
--- a/node_modules/@metamask/assets-controllers/dist/NftController.cjs
+++ b/node_modules/@metamask/assets-controllers/dist/NftController.cjs
@@ -13,7 +13,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
Expand All @@ -16,7 +16,7 @@ index 0f15eb6..96e5a68 100644
* @param options.chainId - The chain ID of the current network.
* @param options.ipfsGateway - The configured IPFS gateway.
- * @param options.openSeaEnabled - Controls whether the OpenSea API is used.
+ * @param options.displayNftMedia - Controls whether the OpenSea API is used.
+ * @param options.displayNftMedia - Controls whether the NFT API is used.
* @param options.useIpfsSubdomains - Controls whether IPFS subdomains are used.
* @param options.isIpfsGatewayEnabled - Controls whether IPFS is enabled or not.
* @param options.onNftAdded - Callback that is called when an NFT is added. Currently used pass data
Expand Down Expand Up @@ -54,13 +54,13 @@ index 0f15eb6..96e5a68 100644
+_NftController_mutex = new WeakMap(), _NftController_selectedAccountId = new WeakMap(), _NftController_chainId = new WeakMap(), _NftController_ipfsGateway = new WeakMap(), _NftController_displayNftMedia = new WeakMap(), _NftController_useIpfsSubdomains = new WeakMap(), _NftController_isIpfsGatewayEnabled = new WeakMap(), _NftController_onNftAdded = new WeakMap(), _NftController_instances = new WeakSet(), _NftController_onNetworkControllerNetworkDidChange = function _NftController_onNetworkControllerNetworkDidChange({ selectedNetworkClientId, }) {
const { configuration: { chainId }, } = this.messagingSystem.call('NetworkController:getNetworkClientById', selectedNetworkClientId);
__classPrivateFieldSet(this, _NftController_chainId, chainId, "f");
}, _NftController_onPreferencesControllerStateChange =
}, _NftController_onPreferencesControllerStateChange =
@@ -605,20 +605,20 @@ _NftController_mutex = new WeakMap(), _NftController_selectedAccountId = new Wea
* Handles the state change of the preference controller.
* @param preferencesState - The new state of the preference controller.
* @param preferencesState.ipfsGateway - The configured IPFS gateway.
- * @param preferencesState.openSeaEnabled - Controls whether the OpenSea API is used.
+ * @param preferencesState.displayNftMedia - Controls whether the OpenSea API is used.
+ * @param preferencesState.displayNftMedia - Controls whether the NFT API is used.
* @param preferencesState.isIpfsGatewayEnabled - Controls whether IPFS is enabled or not.
*/
-async function _NftController_onPreferencesControllerStateChange({ ipfsGateway, openSeaEnabled, isIpfsGatewayEnabled, }) {
Expand Down Expand Up @@ -160,4 +160,4 @@ index 4384784..e35e71c 100644
+ error?: string;
collection?: Collection;
address?: string;
attributes?: Attributes[];
attributes?: Attributes[];
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 @@ -4716,10 +4716,10 @@
"@metamask/utils" "^11.1.0"
nanoid "^3.3.8"

"@metamask/assets-controllers@^61.0.0":
version "61.0.0"
resolved "https://registry.yarnpkg.com/@metamask/assets-controllers/-/assets-controllers-61.0.0.tgz#fe0f864d67e72618bfa364807da5e06f3997e0f5"
integrity sha512-DcsvdF7hls2KH9K8GkjtvwxX04sZqriD8Hb2NO+0JzOKDfLPZQqRDR1pYbrnTbQudkuBU8JJ+SuV8zwkBF3iVA==
"@metamask/assets-controllers@^62.0.0":
version "62.0.0"
resolved "https://registry.yarnpkg.com/@metamask/assets-controllers/-/assets-controllers-62.0.0.tgz#6fba18e4082f35624e0d22a2c903bc56dd5b9c77"
integrity sha512-yNH4ikXVBbAcaSsGNba/2tKK7bjq4IFqkVMR9oa6APCiwrQl7enulFKnyylsL89TvF1dv/kovNFG1uiieDMGtA==
dependencies:
"@ethereumjs/util" "^9.1.0"
"@ethersproject/abi" "^5.7.0"
Expand All @@ -4730,7 +4730,7 @@
"@metamask/abi-utils" "^2.0.3"
"@metamask/base-controller" "^8.0.1"
"@metamask/contract-metadata" "^2.4.0"
"@metamask/controller-utils" "^11.7.0"
"@metamask/controller-utils" "^11.8.0"
"@metamask/eth-query" "^4.0.0"
"@metamask/keyring-api" "^17.4.0"
"@metamask/metamask-eth-abis" "^3.1.1"
Expand Down Expand Up @@ -4866,10 +4866,10 @@
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.3.0", "@metamask/controller-utils@^11.5.0", "@metamask/controller-utils@^11.6.0", "@metamask/controller-utils@^11.7.0":
version "11.7.0"
resolved "https://registry.yarnpkg.com/@metamask/controller-utils/-/controller-utils-11.7.0.tgz#1186daecffff9dec6846f64f9da7a319dd9c9a83"
integrity sha512-Q2TPmTJT6L/ixBk5TEb+mJ1NRyFAGe+VjFuulNQMVu6AanEBeGSoxsuBnAzWQlIgbt3/EHGP7o31ep1H5gr5Gw==
"@metamask/controller-utils@^11.0.0", "@metamask/controller-utils@^11.3.0", "@metamask/controller-utils@^11.5.0", "@metamask/controller-utils@^11.6.0", "@metamask/controller-utils@^11.7.0", "@metamask/controller-utils@^11.8.0":
version "11.8.0"
resolved "https://registry.yarnpkg.com/@metamask/controller-utils/-/controller-utils-11.8.0.tgz#7d573db8a2ab0ce594f92753b0bda02d18330142"
integrity sha512-FqApJXW0mnHWwnKC4HOQwf2P9fPxfiQmlLJdGWwK6hAYKQ+t7ADDw9Wf8RwVquFPzJGQbXnOcbXVBY2zAyoU5w==
dependencies:
"@ethereumjs/util" "^9.1.0"
"@metamask/eth-query" "^4.0.0"
Expand Down
Loading