diff --git a/apps/extension/src/background/index.ts b/apps/extension/src/background/index.ts index b204fa73d40..d51807f53c5 100644 --- a/apps/extension/src/background/index.ts +++ b/apps/extension/src/background/index.ts @@ -82,8 +82,8 @@ const init = new Promise(async (resolve) => { cryptoMemory, broadcaster ); - const sdkService = new SdkService(chainStore); const chainsService = new ChainsService(chainStore, broadcaster); + const sdkService = new SdkService(chainsService); const keyRingService = new KeyRingService( vaultService, sdkService, diff --git a/apps/extension/src/background/sdk/service.ts b/apps/extension/src/background/sdk/service.ts index 78d47e68f82..1e1a0fffc70 100644 --- a/apps/extension/src/background/sdk/service.ts +++ b/apps/extension/src/background/sdk/service.ts @@ -1,14 +1,12 @@ import { Query, Sdk } from "@namada/shared"; -import { KVStore } from "@namada/storage"; -import { Chain } from "@namada/types"; -import { CHAINS_KEY } from "background/chains"; +import { ChainsService } from "background/chains"; export class SdkService { - constructor(protected readonly chainStore: KVStore) { } + constructor(protected readonly chainsService: ChainsService) {} private async _getRpc(): Promise { // Pull chain config from store, as the RPC value may have changed: - const chain = await this.chainStore.get(CHAINS_KEY); + const chain = await this.chainsService.getChain(); if (!chain) { throw new Error("No chain found!"); diff --git a/apps/extension/src/test/init.ts b/apps/extension/src/test/init.ts index 964b306b20e..5275d102b09 100644 --- a/apps/extension/src/test/init.ts +++ b/apps/extension/src/test/init.ts @@ -31,6 +31,7 @@ import { init as initApprovals, } from "../background/approvals"; +import { ChainsService } from "background/chains"; import { LedgerService } from "background/ledger"; import { SdkService } from "background/sdk"; import { Namada } from "provider"; @@ -42,7 +43,7 @@ const cryptoMemory = require("@namada/crypto").__wasm.memory; export class KVStoreMock implements KVStore { private storage: { [key: string]: T | null } = {}; - constructor(readonly _prefix: string) { } + constructor(readonly _prefix: string) {} get(key: string): Promise { return new Promise((resolve) => { @@ -106,7 +107,8 @@ export const init = async (): Promise<{ sessionStore, cryptoMemory ); - const sdkService = new SdkService(chainStore); + const chainsService = new ChainsService(chainStore, broadcaster); + const sdkService = new SdkService(chainsService); const keyRingService = new KeyRingService( vaultService,