chore(suite): refactor environment configs

Author: marekrjpolak

packages/suite/src/actions/wallet/__tests__/coinjoinClientActions.test.ts

@@ -205,7 +205,7 @@ describe('coinjoinClientActions', () => {
                     },
                 ],
                 debug: {
-                    coinjoinServerEnvironment: { btc: 'staging' },
+                    coinjoinServerEnvironment: { btc: 'public' },
                 },
             },
         } as any); // partial required state
@@ -214,8 +214,7 @@ describe('coinjoinClientActions', () => {
         const cli1 = await store.dispatch(initCoinjoinService('btc'));
         const cli2 = await store.dispatch(initCoinjoinService('btc'));
         expect(cli1).toEqual(cli2);
-        expect(spy.mock.calls[0][0]).toEqual({
-            environment: 'staging',
+        expect(spy.mock.calls[0][0]).toMatchObject({
             network: 'btc',
             prison: [
                 {

packages/suite/src/actions/wallet/coinjoinClientActions.ts

@@ -22,7 +22,7 @@ import {
     getSessionDeadline,
     getEstimatedTimePerRound,
 } from 'src/utils/wallet/coinjoinUtils';
-import { CoinjoinService } from 'src/services/coinjoin';
+import { CoinjoinService, getCoinjoinConfig } from 'src/services/coinjoin';
 import { Dispatch, GetState } from 'src/types/suite';
 import { CoinjoinAccount, EndRoundState, CoinjoinDebugSettings } from 'src/types/wallet/coinjoin';
 import { onCancel as closeModal, openModal } from 'src/actions/suite/modalActions';
@@ -646,6 +646,7 @@ const signCoinjoinTx =
                             useEmptyPassphrase: device?.useEmptyPassphrase,
                             inputs: tx.inputs,
                             outputs: tx.outputs,
+                            // @ts-expect-error wait for fw protobuf update
                             coinjoinRequest: tx.coinjoinRequest,
                             coin: network,
                             preauthorized: true,
@@ -747,8 +748,7 @@ export const initCoinjoinService =
             return knownService;
         }
 
-        const environment =
-            debug?.coinjoinServerEnvironment && debug?.coinjoinServerEnvironment[symbol];
+        const environment = debug?.coinjoinServerEnvironment?.[symbol];
 
         // or start new instance
         dispatch(clientEnable(symbol));
@@ -788,10 +788,11 @@ export const initCoinjoinService =
             });
 
         try {
+            const settings = getCoinjoinConfig(symbol, environment);
             const service = await CoinjoinService.createInstance({
                 network: symbol,
                 prison,
-                environment,
+                settings,
             });
             if (isCoinjoinDisabledByFeatureFlag) {
                 dispatch(clientEnableFailed(symbol));

packages/suite/src/services/coinjoin/coinjoinService.ts

@@ -2,9 +2,8 @@ import { CoinjoinBackend, CoinjoinClient, CoinjoinPrisonInmate } from '@trezor/c
 import { createIpcProxy } from '@trezor/ipc-proxy';
 import { PartialRecord } from '@trezor/type-utils';
 import { isDesktop } from '@trezor/env-utils';
-import { CoinjoinServerEnvironment } from 'src/types/wallet/coinjoin';
 import { NetworkSymbol } from 'src/types/wallet';
-import { getCoinjoinConfig } from './config';
+import { CoinjoinNetworksConfig, getCoinjoinConfig } from './config';
 
 const loadInstance = (settings: ReturnType<typeof getCoinjoinConfig>) => {
     if (isDesktop()) {
@@ -30,15 +29,15 @@ export class CoinjoinService {
     static async createInstance({
         network,
         prison,
-        environment,
+        settings,
     }: {
         network: NetworkSymbol;
         prison?: CoinjoinPrisonInmate[];
-        environment?: CoinjoinServerEnvironment;
+        settings?: CoinjoinNetworksConfig;
     }) {
         if (this.instances[network]) return this.instances[network] as CoinjoinServiceInstance;
-        const settings = getCoinjoinConfig(network, environment);
-        const [backend, client] = await loadInstance({ ...settings, prison });
+        const config = settings ?? getCoinjoinConfig(network);
+        const [backend, client] = await loadInstance({ ...config, prison });
         const instance = { backend, client };
         if (!isDesktop()) {
             // display client log directly in console

packages/suite/src/services/coinjoin/config.ts

@@ -9,7 +9,7 @@ import type { PartialRecord } from '@trezor/type-utils';
 import type { CoinjoinServerEnvironment } from 'src/types/wallet/coinjoin';
 import type { NetworkSymbol } from '@suite-common/wallet-config';
 
-type CoinjoinNetworksConfig = CoinjoinBackendSettings & CoinjoinClientSettings;
+export type CoinjoinNetworksConfig = CoinjoinBackendSettings & CoinjoinClientSettings;
 
 type ServerEnvironment = PartialRecord<CoinjoinServerEnvironment, CoinjoinNetworksConfig>;