chore(server): return network to /settings api and add tests (#657)

* chore(server): return network to /settings api

* chore(test): add tests to /settings api

apps/server/src/settings/SettingsController.ts

@@ -16,6 +16,7 @@ export class SettingsController {
       defichain: {
         transferFee: this.configService.getOrThrow('defichain.transferFee') as `${number}`,
         supportedTokens: supportedDfcTokens.split(',') as Array<keyof typeof SupportedDFCTokenSymbols>,
+        network: this.configService.getOrThrow('defichain.network'),
       },
       ethereum: {
         transferFee: this.configService.getOrThrow('ethereum.transferFee') as `${number}`,

apps/server/src/settings/SettingsInterface.ts

@@ -3,6 +3,7 @@ import { SupportedDFCTokenSymbols, SupportedEVMTokenSymbols } from 'src/AppConfi
 interface Settings {
   transferFee: `${number}` | number;
   supportedTokens: Array<keyof typeof SupportedEVMTokenSymbols | keyof typeof SupportedDFCTokenSymbols>;
+  network?: string;
 }
 
 export interface SettingsModel {

apps/server/test-i9n/testing/SettingsController.i9n.ts

@@ -0,0 +1,54 @@
+import { PostgreSqlContainer, StartedPostgreSqlContainer } from '@birthdayresearch/sticky-testcontainers';
+import { ConfigService } from '@nestjs/config';
+
+import { BridgeServerTestingApp } from './BridgeServerTestingApp';
+import { buildTestConfig, TestingModule } from './TestingModule';
+
+describe.only('Settings Controller Test', () => {
+  let testing: BridgeServerTestingApp;
+  let startedPostgresContainer: StartedPostgreSqlContainer;
+  let config: ConfigService;
+
+  beforeAll(async () => {
+    startedPostgresContainer = await new PostgreSqlContainer().start();
+
+    testing = new BridgeServerTestingApp(
+      TestingModule.register(
+        buildTestConfig({
+          defichain: { transferFee: '0.003', supportedTokens: 'BTC,ETH' },
+          ethereum: { transferFee: '0', supportedTokens: 'WBTC,ETH' },
+          startedPostgresContainer,
+        }),
+      ),
+    );
+
+    const app = await testing.start();
+    config = app.get(ConfigService);
+  });
+
+  afterAll(async () => {
+    await testing.stop();
+  });
+
+  it('Settings service should return the correct app settings for both DeFiChain and Ethereum', async () => {
+    const response = await testing.inject({
+      method: 'GET',
+      url: `/settings`,
+    });
+    const settings = JSON.parse(response.payload);
+    const dfcSupportedTokens = config.get('SUPPORTED_DFC_TOKENS')?.split(',');
+    const evmSupportedTokens = config.get('SUPPORTED_EVM_TOKENS')?.split(',');
+
+    expect(settings).toMatchObject({
+      defichain: {
+        transferFee: config.get('DFC_FEE_PERCENTAGE'),
+        supportedTokens: dfcSupportedTokens,
+        network: 'Local',
+      },
+      ethereum: {
+        transferFee: config.get('ETH_FEE_PERCENTAGE'),
+        supportedTokens: evmSupportedTokens,
+      },
+    });
+  });
+});

apps/server/test-i9n/testing/TestingModule.ts

@@ -46,6 +46,7 @@ export function buildTestConfig({
     ethereum: {
       rpcUrl: startedHardhatContainer?.rpcUrl ?? '',
       transferFee: ethereum?.transferFee,
+      supportedTokens: ethereum?.supportedTokens,
       contracts: {
         bridgeProxy: {
           address: testnet?.bridgeContractAddress ?? '',
@@ -81,6 +82,7 @@ type OptionalBuildTestConfigParams = {
   };
   ethereum: {
     transferFee: string;
+    supportedTokens: string;
   };
   startedHardhatContainer: StartedHardhatNetworkContainer;
   testnet: {

apps/web/src/types.ts

@@ -29,6 +29,7 @@ export interface BridgeVersion {
 interface Settings {
   transferFee: `${number}` | number;
   supportedTokens: string[];
+  network?: string;
 }
 
 export interface BridgeSettings {