fix: raw config merge fix, testnet -> dar for deal-ts-client fix (#1048)

* fix: raw config merge fix

* fix

* move

* fix

Author: shamsartem

cli/src/commands/chain/info.ts

@@ -42,7 +42,7 @@ export default class Info extends BaseCommand<typeof Info> {
 
     // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
     const { default: contracts }: { default: unknown } = await import(
-      `@fluencelabs/deal-ts-clients/dist/deployments/${chainEnv}.json`,
+      `@fluencelabs/deal-ts-clients/dist/deployments/${chainEnv === "testnet" ? "dar" : chainEnv}.json`,
       {
         assert: { type: "json" },
       }

cli/src/lib/configs/project/provider.ts

@@ -2005,7 +2005,14 @@ function resolveCCPConfigYAML(
   return mergeConfigYAMLWithRawConfig(config, computePeerCCPConfig);
 }
 
-// const ranges = ["1-2", "3-4", "5-6"];
+function getObjByKey(obj: Record<string, unknown>, key: string): object {
+  if (!(key in obj)) {
+    return {};
+  }
+
+  const value = obj[key];
+  return typeof value === "object" && value !== null ? value : {};
+}
 
 function noxConfigYAMLToConfigToml(
   {
@@ -2026,13 +2033,21 @@ function noxConfigYAMLToConfigToml(
     walletKey: walletPrivateKey,
     defaultBaseFee: chain.defaultBaseFee,
     defaultPriorityFee: chain.defaultPriorityFee,
+    ...getObjByKey(config, "chain_config"),
   };
 
   // Would be too hard to properly type this
   // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
   return camelCaseKeysToSnakeCase({
     ...config,
-    ...(listenIp === undefined ? {} : { listenConfig: { listenIp } }),
+    ...(listenIp === undefined
+      ? {}
+      : {
+          listenConfig: {
+            listenIp,
+            ...getObjByKey(config, "listen_config"),
+          },
+        }),
     chainConfig,
     ...(env === "local"
       ? {}
@@ -2047,6 +2062,7 @@ function noxConfigYAMLToConfigToml(
                 ccpConfig.rpcEndpoint?.port ?? DEFAULT_RPC_ENDPOINT_PORT,
               )}`,
             proofPollPeriod: ccp?.proofPollPeriod,
+            ...getObjByKey(config, "chain_listener_config"),
           },
         }),
     tokioMetricsEnabled: metrics?.tokioMetricsEnabled,
@@ -2124,7 +2140,10 @@ async function getDefaultNoxConfigYAML(): Promise<LatestNoxConfigYAML> {
   const env = await ensureChainEnv();
   const networkId = await getChainId();
   const { DealClient } = await import("@fluencelabs/deal-ts-clients");
-  const contractAddresses = DealClient.getContractAddresses(env);
+
+  const contractAddresses = DealClient.getContractAddresses(
+    env === "testnet" ? "dar" : env,
+  );
 
   return {
     aquavmPoolSize: DEFAULT_AQUAVM_POOL_SIZE,

cli/src/lib/dealClient.ts

@@ -121,7 +121,7 @@ export async function getDealMatcherClient() {
   if (dealMatcherClient === undefined) {
     const { DealMatcherClient } = await import("@fluencelabs/deal-ts-clients");
     const env = await ensureChainEnv();
-    dealMatcherClient = new DealMatcherClient(env);
+    dealMatcherClient = new DealMatcherClient(env === "testnet" ? "dar" : env);
   }
 
   return dealMatcherClient;
@@ -139,7 +139,7 @@ export async function getDealExplorerClient() {
     const env = await ensureChainEnv();
 
     dealExplorerClient = await DealExplorerClient.create(
-      env,
+      env === "testnet" ? "dar" : env,
       undefined,
       provider,
     );
@@ -162,8 +162,12 @@ export async function getDealCliClient() {
 
 async function createDealClient(signerOrProvider: Provider | Signer) {
   const { DealClient } = await import("@fluencelabs/deal-ts-clients");
-  const chainEnv = await ensureChainEnv();
-  const client = new DealClient(signerOrProvider, chainEnv);
+  const env = await ensureChainEnv();
+
+  const client = new DealClient(
+    signerOrProvider,
+    env === "testnet" ? "dar" : env,
+  );
 
   await setTryTimeout(
     "check if blockchain client is connected",