Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
47d40bd
prices v3 upgrade
bergarces Nov 12, 2025
2bc2dc4
update
bergarces Nov 12, 2025
5e1e68c
upgrade package
bergarces Nov 13, 2025
5415086
update
bergarces Nov 14, 2025
b136954
update package
bergarces Nov 14, 2025
51cef17
code not used
bergarces Nov 14, 2025
bfcc40a
Merge branch 'main' into prices-v3-upgrade
bergarces Nov 14, 2025
7ea12be
e2e fixes
bergarces Nov 14, 2025
f48f679
docs
bergarces Nov 14, 2025
14efbd0
Merge branch 'main' into prices-v3-upgrade
bergarces Nov 14, 2025
d784cd9
fix api mocks
bergarces Nov 16, 2025
85dbc1a
Merge branch 'main' into prices-v3-upgrade
bergarces Nov 16, 2025
79e59ca
fix test
bergarces Nov 16, 2025
04f693d
fix test mock
bergarces Nov 16, 2025
76bb5ef
revert change to mock
bergarces Nov 17, 2025
de8b20d
revert change
bergarces Nov 17, 2025
e4f2518
Merge branch 'main' into prices-v3-upgrade
bergarces Nov 17, 2025
10d085e
Merge branch 'main' into prices-v3-upgrade
bergarces Nov 18, 2025
8dff078
updated preview
bergarces Nov 18, 2025
3b468b4
Merge branch 'main' into prices-v3-upgrade
bergarces Nov 18, 2025
b77709b
remove code that breaks
bergarces Nov 18, 2025
d7efa5a
Merge branch 'main' into prices-v3-upgrade
bergarces Nov 18, 2025
6dc4e0a
Merge branch 'main' into prices-v3-upgrade
bergarces Nov 18, 2025
099cfa7
upgrade preview
bergarces Nov 19, 2025
69188a8
Merge branch 'main' into prices-v3-upgrade
bergarces Nov 19, 2025
671deb1
upgrade preview
bergarces Nov 19, 2025
91a77c6
upgrade package
bergarces Nov 19, 2025
e51ad33
Merge branch 'main' into prices-v3-upgrade
bergarces Nov 20, 2025
a9c0bac
Merge branch 'main' into prices-v3-upgrade
bergarces Nov 20, 2025
819739b
fixes
bergarces Nov 20, 2025
d563bb5
fix test
bergarces Nov 20, 2025
d25c844
more fixes
bergarces Nov 20, 2025
95fdf3f
remove .only
bergarces Nov 20, 2025
d30a473
fix integration test
bergarces Nov 20, 2025
b5e678c
Merge branch 'main' into prices-v3-upgrade
bergarces Nov 20, 2025
72877b1
Merge branch 'main' into prices-v3-upgrade
bergarces Nov 20, 2025
bcbfeba
Merge branch 'main' into prices-v3-upgrade
bergarces Nov 20, 2025
0e52615
package updated
bergarces Nov 20, 2025
6204d01
revert console.log
bergarces Nov 20, 2025
13dd55d
dedupe
bergarces Nov 20, 2025
6a387ca
Merge branch 'main' into prices-v3-upgrade
bergarces Nov 20, 2025
6d07c22
lavamoat
bergarces Nov 20, 2025
252fc5e
Merge branch 'main' into prices-v3-upgrade
bergarces Nov 20, 2025
831ebf2
webpack policies
bergarces Nov 20, 2025
245d9e7
Merge branch 'main' into prices-v3-upgrade
bergarces Nov 20, 2025
71e0bcf
Merge branch 'main' into prices-v3-upgrade
bergarces Nov 21, 2025
363b3dc
fix for tron
bergarces Nov 21, 2025
d6cc6a1
Merge branch 'main' into prices-v3-upgrade
bergarces Nov 21, 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
Original file line number Diff line number Diff line change
@@ -1,14 +1,8 @@
import { Messenger } from '@metamask/messenger';
import {
NetworkControllerGetStateAction,
NetworkControllerGetNetworkClientByIdAction,
NetworkControllerStateChangeEvent,
} from '@metamask/network-controller';
import {
AccountsControllerGetSelectedAccountAction,
AccountsControllerGetAccountAction,
AccountsControllerSelectedEvmAccountChangeEvent,
} from '@metamask/accounts-controller';
import {
TokensControllerGetStateAction,
TokensControllerStateChangeEvent,
Expand All @@ -19,18 +13,11 @@ import {
} from '../../../controllers/preferences-controller';
import { RootMessenger } from '../../../lib/messenger';

type Actions =
| TokensControllerGetStateAction
| NetworkControllerGetNetworkClientByIdAction
| NetworkControllerGetStateAction
| AccountsControllerGetAccountAction
| AccountsControllerGetSelectedAccountAction;
type Actions = TokensControllerGetStateAction | NetworkControllerGetStateAction;

type Events =
| NetworkControllerStateChangeEvent
| AccountsControllerSelectedEvmAccountChangeEvent
| PreferencesControllerStateChangeEvent
| TokensControllerStateChangeEvent;
| TokensControllerStateChangeEvent
| NetworkControllerStateChangeEvent;

export type TokenRatesControllerMessenger = ReturnType<
typeof getTokenRatesControllerMessenger
Expand All @@ -57,19 +44,8 @@ export function getTokenRatesControllerMessenger(
});
messenger.delegate({
messenger: controllerMessenger,
actions: [
'TokensController:getState',
'NetworkController:getNetworkClientById',
'NetworkController:getState',
'AccountsController:getAccount',
'AccountsController:getSelectedAccount',
],
events: [
'NetworkController:stateChange',
'AccountsController:selectedEvmAccountChange',
'PreferencesController:stateChange',
'TokensController:stateChange',
],
actions: ['TokensController:getState', 'NetworkController:getState'],
events: ['TokensController:stateChange', 'NetworkController:stateChange'],
});
return controllerMessenger;
}
Expand Down
14 changes: 13 additions & 1 deletion lavamoat/browserify/beta/policy.json
Original file line number Diff line number Diff line change
Expand Up @@ -842,7 +842,7 @@
"@metamask/keyring-snap-client": true,
"@metamask/metamask-eth-abis": true,
"@metamask/phishing-controller": true,
"@metamask/bridge-controller>@metamask/polling-controller": true,
"@metamask/assets-controllers>@metamask/polling-controller": true,
"@metamask/rpc-errors": true,
"@metamask/snaps-utils": true,
"@metamask/utils": true,
Expand Down Expand Up @@ -1682,6 +1682,18 @@
"punycode": true
}
},
"@metamask/assets-controllers>@metamask/polling-controller": {
"globals": {
"clearTimeout": true,
"console.error": true,
"setTimeout": true
},
"packages": {
"@metamask/base-controller": true,
"@metamask/snaps-utils>fast-json-stable-stringify": true,
"uuid": true
}
},
"@metamask/bridge-controller>@metamask/polling-controller": {
"globals": {
"clearTimeout": true,
Expand Down
14 changes: 13 additions & 1 deletion lavamoat/browserify/experimental/policy.json
Original file line number Diff line number Diff line change
Expand Up @@ -842,7 +842,7 @@
"@metamask/keyring-snap-client": true,
"@metamask/metamask-eth-abis": true,
"@metamask/phishing-controller": true,
"@metamask/bridge-controller>@metamask/polling-controller": true,
"@metamask/assets-controllers>@metamask/polling-controller": true,
"@metamask/rpc-errors": true,
"@metamask/snaps-utils": true,
"@metamask/utils": true,
Expand Down Expand Up @@ -1682,6 +1682,18 @@
"punycode": true
}
},
"@metamask/assets-controllers>@metamask/polling-controller": {
"globals": {
"clearTimeout": true,
"console.error": true,
"setTimeout": true
},
"packages": {
"@metamask/base-controller": true,
"@metamask/snaps-utils>fast-json-stable-stringify": true,
"uuid": true
}
},
"@metamask/bridge-controller>@metamask/polling-controller": {
"globals": {
"clearTimeout": true,
Expand Down
14 changes: 13 additions & 1 deletion lavamoat/browserify/flask/policy.json
Original file line number Diff line number Diff line change
Expand Up @@ -842,7 +842,7 @@
"@metamask/keyring-snap-client": true,
"@metamask/metamask-eth-abis": true,
"@metamask/phishing-controller": true,
"@metamask/bridge-controller>@metamask/polling-controller": true,
"@metamask/assets-controllers>@metamask/polling-controller": true,
"@metamask/rpc-errors": true,
"@metamask/snaps-utils": true,
"@metamask/utils": true,
Expand Down Expand Up @@ -1682,6 +1682,18 @@
"punycode": true
}
},
"@metamask/assets-controllers>@metamask/polling-controller": {
"globals": {
"clearTimeout": true,
"console.error": true,
"setTimeout": true
},
"packages": {
"@metamask/base-controller": true,
"@metamask/snaps-utils>fast-json-stable-stringify": true,
"uuid": true
}
},
"@metamask/bridge-controller>@metamask/polling-controller": {
"globals": {
"clearTimeout": true,
Expand Down
14 changes: 13 additions & 1 deletion lavamoat/browserify/main/policy.json
Original file line number Diff line number Diff line change
Expand Up @@ -842,7 +842,7 @@
"@metamask/keyring-snap-client": true,
"@metamask/metamask-eth-abis": true,
"@metamask/phishing-controller": true,
"@metamask/bridge-controller>@metamask/polling-controller": true,
"@metamask/assets-controllers>@metamask/polling-controller": true,
"@metamask/rpc-errors": true,
"@metamask/snaps-utils": true,
"@metamask/utils": true,
Expand Down Expand Up @@ -1682,6 +1682,18 @@
"punycode": true
}
},
"@metamask/assets-controllers>@metamask/polling-controller": {
"globals": {
"clearTimeout": true,
"console.error": true,
"setTimeout": true
},
"packages": {
"@metamask/base-controller": true,
"@metamask/snaps-utils>fast-json-stable-stringify": true,
"uuid": true
}
},
"@metamask/bridge-controller>@metamask/polling-controller": {
"globals": {
"clearTimeout": true,
Expand Down
14 changes: 13 additions & 1 deletion lavamoat/webpack/mv2/policy.json
Original file line number Diff line number Diff line change
Expand Up @@ -865,7 +865,7 @@
"@metamask/keyring-snap-client": true,
"@metamask/metamask-eth-abis": true,
"@metamask/phishing-controller": true,
"@metamask/bridge-controller>@metamask/polling-controller": true,
"@metamask/assets-controllers>@metamask/polling-controller": true,
"@metamask/rpc-errors": true,
"@metamask/snaps-utils": true,
"@metamask/utils": true,
Expand Down Expand Up @@ -1753,6 +1753,18 @@
"punycode": true
}
},
"@metamask/assets-controllers>@metamask/polling-controller": {
"globals": {
"clearTimeout": true,
"console.error": true,
"setTimeout": true
},
"packages": {
"@metamask/base-controller": true,
"@metamask/snaps-utils>fast-json-stable-stringify": true,
"uuid": true
}
},
"@metamask/bridge-controller>@metamask/polling-controller": {
"globals": {
"clearTimeout": true,
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@
"@metamask/address-book-controller": "^7.0.0",
"@metamask/announcement-controller": "^8.0.0",
"@metamask/approval-controller": "^8.0.0",
"@metamask/assets-controllers": "^89.0.1",
"@metamask/assets-controllers": "^91.0.0",
"@metamask/base-controller": "^9.0.0",
"@metamask/bitcoin-wallet-snap": "^1.6.0",
"@metamask/bridge-controller": "^61.0.0",
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/.cursor/rules/e2e-testing-guidelines.mdc
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,7 @@ async function mockTokenPriceApi(mockServer: Mockttp): Promise<MockedEndpoint[]>
return [
// Mock token price API to avoid external dependency
await mockServer
.forGet('https://price.api.cx.metamask.io/v2/chains/1/spot-prices')
.forGet('https://price.api.cx.metamask.io/v3/spot-prices')
.thenCallback(() => ({
statusCode: 200,
json: { ETH: { usd: 2500 }, BTC: { usd: 45000 } },
Expand Down
11 changes: 3 additions & 8 deletions test/e2e/mock-e2e.js
Original file line number Diff line number Diff line change
Expand Up @@ -916,22 +916,17 @@ async function setupMocking(
// Uses zero address (0x0000000000000000000000000000000000000000) to represent native token
// API format: v2/chains/{chainId}/spot-prices?tokenAddresses={address}&vsCurrency=usd&includeMarketData=true
await server
.forGet(
`https://price.api.cx.metamask.io/v2/chains/${parseInt(
chainId,
16,
)}/spot-prices`,
)
.forGet(`https://price.api.cx.metamask.io/v3/spot-prices`)
.withQuery({
tokenAddresses: '0x0000000000000000000000000000000000000000',
assetIds: 'eip155:1/slip44:60',
vsCurrency: 'usd',
includeMarketData: 'true',
})
.thenCallback(() => {
return {
statusCode: 200,
json: {
'0x0000000000000000000000000000000000000000': {
'eip155:1/slip44:60': {
id: 'ethereum',
price: ethConversionInUsd,
marketCap: 382623505141,
Expand Down
6 changes: 2 additions & 4 deletions test/e2e/tests/account/incremental-security.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,11 @@ import { handleSidepanelPostOnboarding } from '../../page-objects/flows/onboardi

async function mockSpotPrices(mockServer: Mockttp) {
return await mockServer
.forGet(
/^https:\/\/price\.api\.cx\.metamask\.io\/v2\/chains\/\d+\/spot-prices/u,
)
.forGet(/^https:\/\/price\.api\.cx\.metamask\.io\/v3\/spot-prices/u)
.thenCallback(() => ({
statusCode: 200,
json: {
'0x0000000000000000000000000000000000000000': {
'eip155:1/slip44:60': {
id: 'ethereum',
price: 1700,
marketCap: 382623505141,
Expand Down
6 changes: 2 additions & 4 deletions test/e2e/tests/account/snap-account-transfers.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,11 @@ async function mockSnapSimpleKeyringAndSiteWithSpotPrices(
) {
const snapMocks = await mockSnapSimpleKeyringAndSite(mockServer, port);
const spotPricesMock = await mockServer
.forGet(
/^https:\/\/price\.api\.cx\.metamask\.io\/v2\/chains\/\d+\/spot-prices/u,
)
.forGet(/^https:\/\/price\.api\.cx\.metamask\.io\/v3\/spot-prices/u)
.thenCallback(() => ({
statusCode: 200,
json: {
'0x0000000000000000000000000000000000000000': {
'eip155:1/slip44:60': {
id: 'ethereum',
price: 1700,
marketCap: 382623505141,
Expand Down
4 changes: 2 additions & 2 deletions test/e2e/tests/confirmations/helpers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -612,12 +612,12 @@ export async function mockDeFiPositionFeatureFlag(mockServer: Mockttp) {
};
}),
await mockServer
.forGet('https://price.api.cx.metamask.io/v2/chains/1/spot-prices')
.forGet('https://price.api.cx.metamask.io/v3/spot-prices')
.thenCallback(() => {
return {
statusCode: 200,
json: {
'0x0000000000000000000000000000000000000000': {
'eip155:1/slip44:60': {
price: 1700,
marketCap: 382623505141,
pricePercentChange1d: 0,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ describe('Gas Fee Tokens - EIP-7702 - Sponsored', function (this: Suite) {
mockTransactionRelaySubmit(mockServer);
mockTransactionRelayStatus(mockServer);
mockSmartTransactionFeatureFlags(mockServer);
mockSpotPrices(mockServer, CHAIN_IDS.MAINNET, {
'0x0000000000000000000000000000000000000000': {
mockSpotPrices(mockServer, {
'eip155:1/slip44:60': {
price: 1700,
marketCap: 382623505141,
pricePercentChange1d: 0,
Expand Down Expand Up @@ -107,8 +107,8 @@ describe('Gas Fee Tokens - EIP-7702 - Sponsored', function (this: Suite) {
mockTransactionRelaySubmit(mockServer);
mockTransactionRelayStatus(mockServer, { success: false });
mockSmartTransactionFeatureFlags(mockServer);
mockSpotPrices(mockServer, CHAIN_IDS.MAINNET, {
'0x0000000000000000000000000000000000000000': {
mockSpotPrices(mockServer, {
'eip155:1/slip44:60': {
price: 1700,
marketCap: 382623505141,
pricePercentChange1d: 0,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ describe.skip('Gas Fee Tokens - EIP-7702', function (this: Suite) {
mockTransactionRelaySubmit(mockServer);
mockTransactionRelayStatus(mockServer);
mockSmartTransactionFeatureFlags(mockServer);
mockSpotPrices(mockServer, CHAIN_IDS.MAINNET, {
'0x0000000000000000000000000000000000000000': {
mockSpotPrices(mockServer, {
'eip155:1/slip44:60': {
price: 1700,
marketCap: 382623505141,
pricePercentChange1d: 0,
Expand Down Expand Up @@ -117,8 +117,8 @@ describe.skip('Gas Fee Tokens - EIP-7702', function (this: Suite) {
mockTransactionRelaySubmit(mockServer);
mockTransactionRelayStatus(mockServer, { success: false });
mockSmartTransactionFeatureFlags(mockServer);
mockSpotPrices(mockServer, CHAIN_IDS.MAINNET, {
'0x0000000000000000000000000000000000000000': {
mockSpotPrices(mockServer, {
'eip155:1/slip44:60': {
price: 1700,
marketCap: 382623505141,
pricePercentChange1d: 0,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ describe('Gas Fee Tokens - Smart Transactions', function (this: Suite) {
transactionHashes: [TRANSACTION_HASH, TRANSACTION_HASH_2],
});
mockSentinelNetworks(mockServer);
mockSpotPrices(mockServer, CHAIN_IDS.MAINNET, {
'0x0000000000000000000000000000000000000000': {
mockSpotPrices(mockServer, {
'eip155:1/slip44:60': {
price: 1700,
marketCap: 382623505141,
pricePercentChange1d: 0,
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/tests/hardware-wallets/ledger/mocks.ts
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ async function mockSwapNetworkInfo(mockServer: MockttpServer) {
async function mockPriceAPIs(mockServer: MockttpServer) {
// Mock empty spot prices for mainnet
await mockServer
.forGet('https://price.api.cx.metamask.io/v2/chains/1/spot-prices')
.forGet('https://price.api.cx.metamask.io/v3/spot-prices')
.thenCallback(() => ({
statusCode: 200,
json: {},
Expand Down
Loading
Loading