Skip to content

Commit

Permalink
merge release/7.12.4-2
Browse files Browse the repository at this point in the history
  • Loading branch information
bergeron committed Dec 19, 2023
2 parents 527e877 + 296d6d5 commit c1b80d1
Show file tree
Hide file tree
Showing 6 changed files with 1,172 additions and 457 deletions.
2 changes: 2 additions & 0 deletions .depcheckrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
ignores:
- '@metamask/oss-attribution-generator'
- 'webpack-cli'
# This is used on the patch for TokenRatesController of Assets controllers, for we to be able to use the last version of it
- cockatiel

# Note: Everything below this line should be removed after investigation
# TODO: Investigate each dependency to see whether it's used
Expand Down
6 changes: 5 additions & 1 deletion app/core/Engine.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import {
TokenRatesState,
TokensController,
TokensState,
CodefiTokenPricesServiceV2,
} from '@metamask/assets-controllers';
import {
AddressBookController,
Expand Down Expand Up @@ -450,6 +451,8 @@ class Engine {
keyringBuilders: [qrKeyringBuilder],
});

const codefiTokenApiV2 = new CodefiTokenPricesServiceV2();

const controllers = [
keyringController,
new AccountTrackerController({
Expand Down Expand Up @@ -544,7 +547,8 @@ class Engine {
chainId: networkController.state.providerConfig.chainId,
ticker: networkController.state.providerConfig.ticker ?? 'ETH',
selectedAddress: preferencesController.state.selectedAddress,
coinGeckoHeader: process.env.COIN_GECKO_HEADER as string,
tokenPricesService: codefiTokenApiV2,
interval: 30 * 60 * 1000,
}),
new TransactionController({
blockTracker:
Expand Down
3 changes: 2 additions & 1 deletion app/util/test/initial-background-state.json
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,8 @@
"contractBalances": {}
},
"TokenRatesController": {
"contractExchangeRates": {}
"contractExchangeRates": {},
"contractExchangeRatesByChainId": {}
},
"TransactionController": {
"lastFetchedBlockNumbers": {},
Expand Down
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,8 @@
"uuid": "^8.3.2",
"valid-url": "1.0.9",
"vm-browserify": "1.1.2",
"zxcvbn": "4.4.2"
"zxcvbn": "4.4.2",
"cockatiel": "^3.1.1"
},
"devDependencies": {
"@actions/core": "^1.10.0",
Expand Down
Loading

0 comments on commit c1b80d1

Please sign in to comment.