Skip to content
Merged
Show file tree
Hide file tree
Changes from 8 commits
Commits
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
261 changes: 0 additions & 261 deletions .yarn/patches/@metamask-controller-utils-npm-11.14.1-15745fecdc.patch

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
import { CurrencyRateController } from '@metamask/assets-controllers';
import {
CodefiTokenPricesServiceV2,
CurrencyRateController,
} from '@metamask/assets-controllers';
import { getRootMessenger } from '../lib/messenger';
import { ControllerInitRequest } from './types';
import { buildControllerInitRequestMock } from './test/utils';
Expand All @@ -15,6 +18,15 @@ jest.mock('@metamask/assets-controllers', () => ({
// This is needed since the controller init tries to override this function.
fetchMultiExchangeRate = jest.fn();
},
CodefiTokenPricesServiceV2: class {
fetchTokenPrices = jest.fn();

fetchExchangeRates = jest.fn();

validateChainIdSupported = jest.fn();

validateCurrencySupported = jest.fn();
},
}));

function getInitRequestMock(): jest.Mocked<
Expand All @@ -29,6 +41,7 @@ function getInitRequestMock(): jest.Mocked<
...buildControllerInitRequestMock(),
controllerMessenger: getCurrencyRateControllerMessenger(baseMessenger),
initMessenger: getCurrencyRateControllerInitMessenger(baseMessenger),
tokenPricesService: new CodefiTokenPricesServiceV2(),
};

return requestMock;
Expand Down
6 changes: 5 additions & 1 deletion app/scripts/controller-init/currency-rate-controller-init.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
import { CurrencyRateController } from '@metamask/assets-controllers';
import {
CodefiTokenPricesServiceV2,
CurrencyRateController,
} from '@metamask/assets-controllers';
import {
CurrencyRateControllerInitMessenger,
CurrencyRateControllerMessenger,
Expand Down Expand Up @@ -28,6 +31,7 @@ export const CurrencyRateControllerInit: ControllerInitFunction<
includeUsdRate: true,
useExternalServices: () =>
initMessenger.call('PreferencesController:getState').useExternalServices,
tokenPricesService: new CodefiTokenPricesServiceV2(),
});

// TODO: This logic should be ported to `CurrencyRateController` directly.
Expand Down
14 changes: 3 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -241,15 +241,7 @@
"@endo/env-options@npm:^1.1.11": "patch:@endo/env-options@npm%3A1.1.11#~/.yarn/patches/@endo-env-options-npm-1.1.11-1b7fae374a.patch",
"@endo/env-options@npm:^1.1.7": "patch:@endo/env-options@npm%3A1.1.11#~/.yarn/patches/@endo-env-options-npm-1.1.11-1b7fae374a.patch",
"@endo/env-options@npm:^1.1.8": "patch:@endo/env-options@npm%3A1.1.11#~/.yarn/patches/@endo-env-options-npm-1.1.11-1b7fae374a.patch",
"@metamask/jazzicon@npm:^2.0.0": "patch:@metamask/jazzicon@npm%3A2.0.0#~/.yarn/patches/@metamask-jazzicon-npm-2.0.0-36957be38d.patch",
"@metamask/controller-utils@npm:^11.14.1": "patch:@metamask/controller-utils@npm%3A11.14.1#~/.yarn/patches/@metamask-controller-utils-npm-11.14.1-15745fecdc.patch",
"@metamask/controller-utils@npm:^11.9.0": "patch:@metamask/controller-utils@npm%3A11.14.1#~/.yarn/patches/@metamask-controller-utils-npm-11.14.1-15745fecdc.patch",
"@metamask/controller-utils@npm:^11.5.0": "patch:@metamask/controller-utils@npm%3A11.14.1#~/.yarn/patches/@metamask-controller-utils-npm-11.14.1-15745fecdc.patch",
"@metamask/controller-utils@npm:^11.11.0": "patch:@metamask/controller-utils@npm%3A11.14.1#~/.yarn/patches/@metamask-controller-utils-npm-11.14.1-15745fecdc.patch",
"@metamask/controller-utils@npm:^11.14.0": "patch:@metamask/controller-utils@npm%3A11.14.1#~/.yarn/patches/@metamask-controller-utils-npm-11.14.1-15745fecdc.patch",
"@metamask/controller-utils@npm:^11.12.0": "patch:@metamask/controller-utils@npm%3A11.14.1#~/.yarn/patches/@metamask-controller-utils-npm-11.14.1-15745fecdc.patch",
"@metamask/controller-utils@npm:^11.3.0": "patch:@metamask/controller-utils@npm%3A11.14.1#~/.yarn/patches/@metamask-controller-utils-npm-11.14.1-15745fecdc.patch",
"@metamask/controller-utils@npm:^11.0.0": "patch:@metamask/controller-utils@npm%3A11.14.1#~/.yarn/patches/@metamask-controller-utils-npm-11.14.1-15745fecdc.patch"
"@metamask/jazzicon@npm:^2.0.0": "patch:@metamask/jazzicon@npm%3A2.0.0#~/.yarn/patches/@metamask-jazzicon-npm-2.0.0-36957be38d.patch"
},
"dependencies": {
"@babel/runtime": "patch:@babel/runtime@npm%3A7.25.9#~/.yarn/patches/@babel-runtime-npm-7.25.9-fe8c62510a.patch",
Expand Down Expand Up @@ -277,15 +269,15 @@
"@metamask/address-book-controller": "^7.0.0",
"@metamask/announcement-controller": "^8.0.0",
"@metamask/approval-controller": "^8.0.0",
"@metamask/assets-controllers": "^84.0.0",
"@metamask/assets-controllers": "^85.0.0",
"@metamask/base-controller": "^9.0.0",
"@metamask/bitcoin-wallet-snap": "^1.3.0",
"@metamask/bridge-controller": "^56.0.0",
"@metamask/bridge-status-controller": "^56.0.0",
"@metamask/browser-passworder": "^4.3.0",
"@metamask/chain-agnostic-permission": "^1.2.2",
"@metamask/contract-metadata": "^2.5.0",
"@metamask/controller-utils": "patch:@metamask/controller-utils@npm%3A11.14.1#~/.yarn/patches/@metamask-controller-utils-npm-11.14.1-15745fecdc.patch",
"@metamask/controller-utils": "^11.15.0",
"@metamask/core-backend": "^4.0.0",
"@metamask/delegation-controller": "^1.0.0",
"@metamask/delegation-core": "^0.2.0-rc.1",
Expand Down
Loading
Loading