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

chore: upgrade assets-controllers v37 #11988

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
+208 −231
Draft

chore: upgrade assets-controllers v37 #11988

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
70 changes: 29 additions & 41 deletions app/core/Engine.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -492,19 +492,6 @@ class Engine {
) {
this.controllerMessenger = new ExtendedControllerMessenger();

/**
* Subscribes a listener to the state change events of Preferences Controller.
*
* @param listener - The callback function to execute when the state changes.
*/
const onPreferencesStateChange = (
listener: (preferencesState: PreferencesState) => void,
) => {
const eventName = `PreferencesController:stateChange`;

this.controllerMessenger.subscribe(eventName, listener);
};

const approvalController = new ApprovalController({
messenger: this.controllerMessenger.getRestricted({
name: 'ApprovalController',
Expand Down Expand Up @@ -560,18 +547,32 @@ class Engine {
networkController.initializeProvider();

const assetsContractController = new AssetsContractController({
onPreferencesStateChange,
// @ts-expect-error TODO: Resolve mismatch between base-controller versions.
messenger: this.controllerMessenger.getRestricted({
name: 'AssetsContractController',
allowedActions: [
'NetworkController:getNetworkClientById',
'NetworkController:getNetworkConfigurationByNetworkClientId',
'NetworkController:getSelectedNetworkClient',
'NetworkController:getState',
],
allowedEvents: [
'PreferencesController:stateChange',
'NetworkController:networkDidChange',
],
}),
/* onPreferencesStateChange,
onNetworkDidChange: (listener) =>
this.controllerMessenger.subscribe(
AppConstants.NETWORK_DID_CHANGE_EVENT,
// @ts-expect-error TODO: Resolve bump the assets controller version.
listener,
),
), */
chainId: networkController.getNetworkClientById(
networkController?.state.selectedNetworkClientId,
).configuration.chainId,
getNetworkClientById:
networkController.getNetworkClientById.bind(networkController),
/* getNetworkClientById:
networkController.getNetworkClientById.bind(networkController), */
});
const accountsControllerMessenger: AccountsControllerMessenger =
this.controllerMessenger.getRestricted({
Expand Down Expand Up @@ -613,32 +614,19 @@ class Engine {
`${networkController.name}:getNetworkClientById`,
'AccountsController:getAccount',
'AccountsController:getSelectedAccount',
'AssetsContractController:getERC721AssetName',
'AssetsContractController:getERC721AssetSymbol',
'AssetsContractController:getERC721TokenURI',
'AssetsContractController:getERC721OwnerOf',
'AssetsContractController:getERC1155BalanceOf',
'AssetsContractController:getERC1155TokenURI ',
],
allowedEvents: [
'PreferencesController:stateChange',
'NetworkController:networkDidChange',
'AccountsController:selectedEvmAccountChange',
],
}),

getERC721AssetName: assetsContractController.getERC721AssetName.bind(
assetsContractController,
),
getERC721AssetSymbol: assetsContractController.getERC721AssetSymbol.bind(
assetsContractController,
),
getERC721TokenURI: assetsContractController.getERC721TokenURI.bind(
assetsContractController,
),
getERC721OwnerOf: assetsContractController.getERC721OwnerOf.bind(
assetsContractController,
),
getERC1155BalanceOf: assetsContractController.getERC1155BalanceOf.bind(
assetsContractController,
),
getERC1155TokenURI: assetsContractController.getERC1155TokenURI.bind(
assetsContractController,
),
});

const loggingController = new LoggingController({
Expand Down Expand Up @@ -1513,12 +1501,12 @@ class Engine {
// @ts-expect-error TODO: Resolve mismatch between base-controller versions.
messenger: this.controllerMessenger.getRestricted({
name: 'TokenBalancesController',
allowedActions: ['AccountsController:getSelectedAccount'],
allowedActions: [
'AccountsController:getSelectedAccount',
'AssetsContractController:getERC20BalanceOf',
],
allowedEvents: ['TokensController:stateChange'],
}),
getERC20BalanceOf: assetsContractController.getERC20BalanceOf.bind(
assetsContractController,
),
interval: 180000,
}),
new TokenRatesController({
Expand Down Expand Up @@ -1788,7 +1776,7 @@ class Engine {
return;
}
provider.sendAsync = provider.sendAsync.bind(provider);
AssetsContractController.configure({ provider });
AssetsContractController.setProvider(provider);

SwapsController.configure({
provider,
Expand Down
5 changes: 4 additions & 1 deletion app/core/EngineService/EngineService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,10 @@ class EngineService {
name: 'AddressBookController',
key: `${engine.context.AddressBookController.name}:stateChange`,
},
{ name: 'AssetsContractController' },
{
name: 'AssetsContractController',
key: 'AssetsContractController:stateChange',
},
{ name: 'NftController', key: 'NftController:stateChange' },
{
name: 'TokensController',
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 @@ -142,7 +142,7 @@
"@metamask/accounts-controller": "^18.2.1",
"@metamask/address-book-controller": "^6.0.1",
"@metamask/approval-controller": "^7.1.0",
"@metamask/assets-controllers": "^36.0.0",
"@metamask/assets-controllers": "^37.0.0",
"@metamask/base-controller": "^7.0.1",
"@metamask/composable-controller": "^3.0.0",
"@metamask/contract-metadata": "^2.1.0",
Expand Down
Loading
Loading