Skip to content

chore: bump @metamask/core-backend and set up ApiPlatformClient #40262

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
n3ps merged 7 commits into from
Feb 23, 2026
+299 −183
Merged

chore: bump @metamask/core-backend and set up ApiPlatformClient #40262

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
02460df
refactor: use api client
n3ps Feb 20, 2026
ce4be31
lavamoat
n3ps Feb 20, 2026
dddfe40
lint
n3ps Feb 20, 2026
8265865
queryclient
n3ps Feb 20, 2026
870c57a
mock
n3ps Feb 20, 2026
6a5dd10
type
n3ps Feb 20, 2026
e998768
Merge branch 'main' into n3ps/api-client
n3ps Feb 23, 2026
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
11 changes: 4 additions & 7 deletions app/scripts/controller-init/assets/assets-controller-init.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,7 @@ import {
type AssetsControllerOptions,
} from '@metamask/assets-controller';
import type { PreferencesState } from '@metamask/preferences-controller';
import {
createApiPlatformClient,
type ApiPlatformClient,
} from '@metamask/core-backend';
import { createApiPlatformClient } from '@metamask/core-backend';
import {
isAssetsUnifyStateFeatureEnabled,
ASSETS_UNIFY_STATE_VERSION_1,
Expand All @@ -28,7 +25,7 @@ const ASSETS_UNIFY_STATE_FLAG = 'assetsUnifyState';
/**
* Cached API client instance.
*/
let apiClient: ApiPlatformClient | null = null;
let apiClient: AssetsControllerOptions['queryApiClient'] | null = null;
Copy link
Contributor Author

@n3ps n3ps Feb 20, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Interim since asset-controller needs a version bump of core-backend


/**
* Safely retrieves the bearer token for API authentication.
Expand Down Expand Up @@ -95,12 +92,12 @@ function getIsBasicFunctionality(
*/
function getApiClient(
initMessenger: AssetsControllerInitMessenger,
): ApiPlatformClient {
): AssetsControllerOptions['queryApiClient'] {
if (!apiClient) {
apiClient = createApiPlatformClient({
clientProduct: 'metamask-extension',
getBearerToken: () => safeGetBearerToken(initMessenger),
});
}) as unknown as AssetsControllerOptions['queryApiClient'];
}
return apiClient;
}
Expand Down
17 changes: 16 additions & 1 deletion lavamoat/browserify/beta/policy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -883,7 +883,7 @@
"@ethersproject/providers": true,
"@metamask/base-controller": true,
"@metamask/controller-utils": true,
"@metamask/core-backend": true,
"@metamask/assets-controller>@metamask/core-backend": true,
"@metamask/keyring-snap-client": true,
"@metamask/polling-controller": true,
"@metamask/assets-controller>@metamask/snaps-utils": true,
Expand Down Expand Up @@ -1120,6 +1120,21 @@
"uuid": true
}
},
"@metamask/assets-controller>@metamask/core-backend": {
"globals": {
"URL": true,
"WebSocket": true,
"clearTimeout": true,
"fetch": true,
"setTimeout": true
},
"packages": {
"@metamask/controller-utils": true,
"@metamask/utils": true,
"@metamask/core-backend>@tanstack/query-core": true,
"uuid": true
}
},
"@metamask/delegation-controller": {
"packages": {
"@metamask/base-controller": true,
Expand Down
17 changes: 16 additions & 1 deletion lavamoat/browserify/experimental/policy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -883,7 +883,7 @@
"@ethersproject/providers": true,
"@metamask/base-controller": true,
"@metamask/controller-utils": true,
"@metamask/core-backend": true,
"@metamask/assets-controller>@metamask/core-backend": true,
"@metamask/keyring-snap-client": true,
"@metamask/polling-controller": true,
"@metamask/assets-controller>@metamask/snaps-utils": true,
Expand Down Expand Up @@ -1120,6 +1120,21 @@
"uuid": true
}
},
"@metamask/assets-controller>@metamask/core-backend": {
"globals": {
"URL": true,
"WebSocket": true,
"clearTimeout": true,
"fetch": true,
"setTimeout": true
},
"packages": {
"@metamask/controller-utils": true,
"@metamask/utils": true,
"@metamask/core-backend>@tanstack/query-core": true,
"uuid": true
}
},
"@metamask/delegation-controller": {
"packages": {
"@metamask/base-controller": true,
Expand Down
17 changes: 16 additions & 1 deletion lavamoat/browserify/flask/policy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -883,7 +883,7 @@
"@ethersproject/providers": true,
"@metamask/base-controller": true,
"@metamask/controller-utils": true,
"@metamask/core-backend": true,
"@metamask/assets-controller>@metamask/core-backend": true,
"@metamask/keyring-snap-client": true,
"@metamask/polling-controller": true,
"@metamask/assets-controller>@metamask/snaps-utils": true,
Expand Down Expand Up @@ -1120,6 +1120,21 @@
"uuid": true
}
},
"@metamask/assets-controller>@metamask/core-backend": {
"globals": {
"URL": true,
"WebSocket": true,
"clearTimeout": true,
"fetch": true,
"setTimeout": true
},
"packages": {
"@metamask/controller-utils": true,
"@metamask/utils": true,
"@metamask/core-backend>@tanstack/query-core": true,
"uuid": true
}
},
"@metamask/delegation-controller": {
"packages": {
"@metamask/base-controller": true,
Expand Down
17 changes: 16 additions & 1 deletion lavamoat/browserify/main/policy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -883,7 +883,7 @@
"@ethersproject/providers": true,
"@metamask/base-controller": true,
"@metamask/controller-utils": true,
"@metamask/core-backend": true,
"@metamask/assets-controller>@metamask/core-backend": true,
"@metamask/keyring-snap-client": true,
"@metamask/polling-controller": true,
"@metamask/assets-controller>@metamask/snaps-utils": true,
Expand Down Expand Up @@ -1120,6 +1120,21 @@
"uuid": true
}
},
"@metamask/assets-controller>@metamask/core-backend": {
"globals": {
"URL": true,
"WebSocket": true,
"clearTimeout": true,
"fetch": true,
"setTimeout": true
},
Comment on lines +1123 to +1130
Copy link
Contributor

@MajorLift MajorLift Feb 20, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Safe:

  • Internal packages.
  • Required for key functionality as data service.

"packages": {
"@metamask/controller-utils": true,
"@metamask/utils": true,
"@metamask/core-backend>@tanstack/query-core": true,
"uuid": true
}
},
"@metamask/delegation-controller": {
"packages": {
"@metamask/base-controller": true,
Expand Down
2 changes: 1 addition & 1 deletion lavamoat/webpack/mv2/beta/policy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -886,7 +886,7 @@
"@ethersproject/providers": true,
"@metamask/base-controller": true,
"@metamask/controller-utils": true,
"@metamask/core-backend": true,
"@metamask/assets-controller>@metamask/core-backend": true,
"@metamask/keyring-snap-client": true,
"@metamask/polling-controller": true,
"@metamask/assets-controller>@metamask/snaps-utils": true,
Expand Down
2 changes: 1 addition & 1 deletion lavamoat/webpack/mv2/experimental/policy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -886,7 +886,7 @@
"@ethersproject/providers": true,
"@metamask/base-controller": true,
"@metamask/controller-utils": true,
"@metamask/core-backend": true,
"@metamask/assets-controller>@metamask/core-backend": true,
"@metamask/keyring-snap-client": true,
"@metamask/polling-controller": true,
"@metamask/assets-controller>@metamask/snaps-utils": true,
Expand Down
2 changes: 1 addition & 1 deletion lavamoat/webpack/mv2/flask/policy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -886,7 +886,7 @@
"@ethersproject/providers": true,
"@metamask/base-controller": true,
"@metamask/controller-utils": true,
"@metamask/core-backend": true,
"@metamask/assets-controller>@metamask/core-backend": true,
"@metamask/keyring-snap-client": true,
"@metamask/polling-controller": true,
"@metamask/assets-controller>@metamask/snaps-utils": true,
Expand Down
2 changes: 1 addition & 1 deletion lavamoat/webpack/mv2/main/policy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -886,7 +886,7 @@
"@ethersproject/providers": true,
"@metamask/base-controller": true,
"@metamask/controller-utils": true,
"@metamask/core-backend": true,
"@metamask/assets-controller>@metamask/core-backend": true,
"@metamask/keyring-snap-client": true,
"@metamask/polling-controller": true,
"@metamask/assets-controller>@metamask/snaps-utils": true,
Expand Down
25 changes: 25 additions & 0 deletions lavamoat/webpack/mv3/beta/policy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -739,6 +739,15 @@
"lodash": true
}
},
"@metamask/core-backend": {
"globals": {
"URL": true,
"fetch": true
},
"packages": {
"@metamask/core-backend>@tanstack/query-core": true
}
},
"@metamask/delegation-core": {
"packages": {
"@metamask/abi-utils": true,
Expand Down Expand Up @@ -1851,6 +1860,22 @@
"@metamask/controller-utils>@spruceid/siwe-parser>apg-js": true
}
},
"@metamask/core-backend>@tanstack/query-core": {
"globals": {
"AbortController": true,
"addEventListener": true,
"clearInterval": true,
"clearTimeout": true,
"console.error": true,
"document": true,
"removeEventListener": true,
"setInterval": true,
"setTimeout": true
},
"packages": {
"@swc/helpers": true
}
},
"@tanstack/react-query>@tanstack/query-core": {
"globals": {
"AbortController": true,
Expand Down
25 changes: 25 additions & 0 deletions lavamoat/webpack/mv3/experimental/policy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -739,6 +739,15 @@
"lodash": true
}
},
"@metamask/core-backend": {
"globals": {
"URL": true,
"fetch": true
},
"packages": {
"@metamask/core-backend>@tanstack/query-core": true
}
},
"@metamask/delegation-core": {
"packages": {
"@metamask/abi-utils": true,
Expand Down Expand Up @@ -1851,6 +1860,22 @@
"@metamask/controller-utils>@spruceid/siwe-parser>apg-js": true
}
},
"@metamask/core-backend>@tanstack/query-core": {
"globals": {
"AbortController": true,
"addEventListener": true,
"clearInterval": true,
"clearTimeout": true,
"console.error": true,
"document": true,
"removeEventListener": true,
"setInterval": true,
"setTimeout": true
},
"packages": {
"@swc/helpers": true
}
},
"@tanstack/react-query>@tanstack/query-core": {
"globals": {
"AbortController": true,
Expand Down
25 changes: 25 additions & 0 deletions lavamoat/webpack/mv3/flask/policy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -739,6 +739,15 @@
"lodash": true
}
},
"@metamask/core-backend": {
"globals": {
"URL": true,
"fetch": true
},
"packages": {
"@metamask/core-backend>@tanstack/query-core": true
}
},
"@metamask/delegation-core": {
"packages": {
"@metamask/abi-utils": true,
Expand Down Expand Up @@ -1851,6 +1860,22 @@
"@metamask/controller-utils>@spruceid/siwe-parser>apg-js": true
}
},
"@metamask/core-backend>@tanstack/query-core": {
"globals": {
"AbortController": true,
"addEventListener": true,
"clearInterval": true,
"clearTimeout": true,
"console.error": true,
"document": true,
"removeEventListener": true,
"setInterval": true,
"setTimeout": true
},
"packages": {
"@swc/helpers": true
}
},
"@tanstack/react-query>@tanstack/query-core": {
"globals": {
"AbortController": true,
Expand Down
25 changes: 25 additions & 0 deletions lavamoat/webpack/mv3/main/policy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -739,6 +739,15 @@
"lodash": true
}
},
"@metamask/core-backend": {
"globals": {
"URL": true,
"fetch": true
},
Comment on lines +742 to +746
Copy link
Contributor

@MajorLift MajorLift Feb 20, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Safe:

  • Internal packages.
  • Required for key functionality as data service.

"packages": {
"@metamask/core-backend>@tanstack/query-core": true
}
},
"@metamask/delegation-core": {
"packages": {
"@metamask/abi-utils": true,
Expand Down Expand Up @@ -1851,6 +1860,22 @@
"@metamask/controller-utils>@spruceid/siwe-parser>apg-js": true
}
},
"@metamask/core-backend>@tanstack/query-core": {
"globals": {
"AbortController": true,
"addEventListener": true,
"clearInterval": true,
"clearTimeout": true,
"console.error": true,
"document": true,
"removeEventListener": true,
"setInterval": true,
"setTimeout": true
},
Comment on lines +1863 to +1874
Copy link
Contributor

@MajorLift MajorLift Feb 20, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Overrides for @tanstack/query-core v5 already applied in main for all builds (search results):

    "@metamask/core-backend>@tanstack/query-core": {
      "globals": {
        "document": false,
        "document.visibilityState": true,
        "addEventListener": false
      }
    },

https://github.com/MetaMask/metamask-extension/blob/main/lavamoat/webpack/mv3/main/policy-override.json#L234-L240

"packages": {
"@swc/helpers": true
}
},
"@tanstack/react-query>@tanstack/query-core": {
"globals": {
"AbortController": true,
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 @@ -296,7 +296,7 @@
"@metamask/connectivity-controller": "^0.1.0",
"@metamask/contract-metadata": "^2.5.0",
"@metamask/controller-utils": "^11.18.0",
"@metamask/core-backend": "^5.0.0",
"@metamask/core-backend": "^6.0.0",
Copy link
Contributor Author

@n3ps n3ps Feb 20, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Main point of interest

"@metamask/delegation-controller": "^1.0.0",
"@metamask/delegation-core": "^0.2.0-rc.1",
"@metamask/delegation-deployments": "^0.15.0",
Expand Down
Loading
Loading