feat: toml config file

Author: AlexandrMov

packages/services/package.json

@@ -19,6 +19,7 @@
     "@devnet/utils": "workspace:*",
     "@fastify/swagger": "^9.4.2",
     "@fastify/swagger-ui": "^5.2.1",
+    "@iarna/toml": "^2.2.5",
     "@oclif/core": "^4.0.37",
     "@oclif/plugin-help": "^6.2.19",
     "@types/node": "^22.10.5",

packages/services/src/devnet-service.ts

@@ -22,6 +22,7 @@ import {
 } from "node:fs/promises";
 import path from "node:path";
 import * as YAML from "yaml";
+import * as toml from "@iarna/toml";
 
 import { DevnetServiceArtifact } from "./devnet-service-artifact.js";
 import { serviceConfigs } from "./embedded/index.js";
@@ -192,6 +193,10 @@ export class DevNetService<Name extends keyof DevNetServicesConfigs> {
     return JSON.parse(await this.readFile(relativePath));
   }
 
+  public async readToml(relativePath: string) {
+    return toml.parse(await this.readFile(relativePath));
+  }
+
   public async readYaml(relativePath: string) {
     return YAML.parse(await this.readFile(relativePath), { intAsBigInt: true });
   }
@@ -226,6 +231,10 @@ export class DevNetService<Name extends keyof DevNetServicesConfigs> {
     return await this.writeFile(relativePath, json);
   }
 
+  public async writeToml(relativePath: string, fileContent: toml.JsonMap) {
+    return await this.writeFile(relativePath, toml.stringify(fileContent));
+  }
+
   public async writeYaml(relativePath: string, fileContent: unknown) {
     return await this.writeFile(relativePath, YAML.stringify(fileContent));
   }

packages/services/src/embedded/lido-cli.ts

@@ -3,7 +3,7 @@ import { DevnetServiceConfig } from "../devnet-service-config.js";
 export const lidoCLI = new DevnetServiceConfig({
   repository: {
     url: "https://github.com/lidofinance/lido-cli.git",
-    branch: "fix/vroom-306-temp-fix-fusaka-1",
+    branch: "feature/sr-66-devnet0-1",
   },
   name: "lidoCLI" as const,
   constants: {

packages/services/src/embedded/lido-core.ts

@@ -16,6 +16,7 @@ export const lidoCore = new DevnetServiceConfig({
       "scripts/defaults/local-devnet-defaults.json",
     NETWORK_STATE_FILE: `deployed-local-devnet.json`,
     SLOTS_PER_EPOCH: "32",
+    SCRATCH_DEPLOY_CONFIG: "scripts/scratch/deploy-params-testnet.toml",
   },
   hooks: {
     install: "lido-core:install",

src/commands/lido-core/deploy.ts

@@ -8,6 +8,7 @@ import { LidoCoreVerify } from "./verify.js";
 type DeployEnvRequired = {
   DEPLOYER: string;
   DEPOSIT_CONTRACT: string;
+  GAS_LIMIT?: string;
   GAS_MAX_FEE: string;
   GAS_PRIORITY_FEE: string;
   GENESIS_TIME: string;
@@ -16,8 +17,8 @@ type DeployEnvRequired = {
   NETWORK_STATE_DEFAULTS_FILE: string;
   NETWORK_STATE_FILE: string;
   RPC_URL: string;
+  SCRATCH_DEPLOY_CONFIG?: string;
   SLOTS_PER_EPOCH: string;
-  GAS_LIMIT?: string;
 };
 
 export const DeployLidoContracts = command.cli({
@@ -72,6 +73,7 @@ export const DeployLidoContracts = command.cli({
       NETWORK: constants.NETWORK,
       NETWORK_STATE_DEFAULTS_FILE: constants.NETWORK_STATE_DEFAULTS_FILE,
       NETWORK_STATE_FILE: constants.NETWORK_STATE_FILE,
+      SCRATCH_DEPLOY_CONFIG: constants.SCRATCH_DEPLOY_CONFIG,
       GENESIS_TIME: genesis_time,
       RPC_URL: elPublic,
       SLOTS_PER_EPOCH: constants.SLOTS_PER_EPOCH,

src/commands/lido-core/prepare-repository.ts

@@ -29,72 +29,68 @@ export const PrepareLidoCore = command.cli({
     const { constants } = lidoCore.config;
     const { deployer, secondDeployer } = await state.getNamedWallet();
 
-    const filePath = constants.NETWORK_STATE_DEFAULTS_FILE;
-    const networkStateDefaults = await lidoCore.readJson(filePath);
+    const filePath = constants.SCRATCH_DEPLOY_CONFIG;
+    const tomlObj: any = await lidoCore.readToml(filePath);
 
-    const {
-      vestingParams,
-      daoInitialSettings,
-      oracleDaemonConfig,
-      hashConsensusForAccountingOracle,
-      hashConsensusForValidatorsExitBusOracle,
-    } = networkStateDefaults;
-    assert(vestingParams?.holders, "Missing vestingParams.holders");
-    assert(daoInitialSettings?.voting, "Missing daoInitialSettings.voting");
-    assert(oracleDaemonConfig, "Missing oracleDaemonConfig");
-    assert(
-      hashConsensusForAccountingOracle,
-      "Missing hashConsensusForAccountingOracle",
-    );
-    assert(
-      hashConsensusForValidatorsExitBusOracle,
-      "Missing hashConsensusForValidatorsExitBusOracle",
-    );
+    const vestingParams = tomlObj.vesting || {};
+    const daoObj = tomlObj.dao || {};
+    const initialSettings = daoObj.initialSettings || {};
+    const daoVoting = initialSettings.voting || {};
+    const oracleDaemonConfig = tomlObj.oracleDaemonConfig || {};
+    const hashConsensusAO = tomlObj.hashConsensusForAccountingOracle || {};
+    const hashConsensusVEBO = tomlObj.hashConsensusForValidatorsExitBusOracle || {};
+
+    assert(vestingParams.holders !== undefined, "Missing vestingParams.holders");
+    assert(initialSettings.voting !== undefined, "Missing initialSettings.voting");
+    assert(oracleDaemonConfig !== undefined, "Missing oracleDaemonConfig");
+    assert(oracleDaemonConfig.hashConsensusForAccountingOracle !== undefined, "Missing oracleDaemonConfig.hashConsensusForAccountingOracle");
+    assert(oracleDaemonConfig.hashConsensusForValidatorsExitBusOracle !== undefined, "Missing oracleDaemonConfig.hashConsensusForValidatorsExitBusOracle");
 
-    Object.assign(vestingParams.holders, {
+    vestingParams.holders = {
+      ...vestingParams.holders,
       [deployer.publicKey]: vesting,
       [secondDeployer.publicKey]: vesting,
-    });
+    };
 
-    Object.assign(daoInitialSettings.voting, {
-      voteDuration,
-      objectionPhaseDuration,
-    });
+    daoVoting.voteDuration = voteDuration;
+    daoVoting.objectionPhaseDuration = objectionPhaseDuration;
 
-    Object.assign(oracleDaemonConfig, {
-      deployParameters: {
-        NORMALIZED_CL_REWARD_PER_EPOCH: 64,
-        NORMALIZED_CL_REWARD_MISTAKE_RATE_BP: 1000,
-        REBASE_CHECK_NEAREST_EPOCH_DISTANCE: 1,
-        REBASE_CHECK_DISTANT_EPOCH_DISTANCE: 2,
-        VALIDATOR_DELAYED_TIMEOUT_IN_SLOTS: 7200,
-        VALIDATOR_DELINQUENT_TIMEOUT_IN_SLOTS: 28_800,
-        NODE_OPERATOR_NETWORK_PENETRATION_THRESHOLD_BP: 100,
-        PREDICTION_DURATION_IN_SLOTS: 50_400,
-        FINALIZATION_MAX_NEGATIVE_REBASE_EPOCH_SHIFT: 1350,
-        EXIT_EVENTS_LOOKBACK_WINDOW_IN_SLOTS: 100_800
-      },
-    });
+    oracleDaemonConfig.deployParameters = {
+      NORMALIZED_CL_REWARD_PER_EPOCH: 64,
+      NORMALIZED_CL_REWARD_MISTAKE_RATE_BP: 1000,
+      REBASE_CHECK_NEAREST_EPOCH_DISTANCE: 1,
+      REBASE_CHECK_DISTANT_EPOCH_DISTANCE: 2,
+      VALIDATOR_DELAYED_TIMEOUT_IN_SLOTS: 7200,
+      VALIDATOR_DELINQUENT_TIMEOUT_IN_SLOTS: 28_800,
+      NODE_OPERATOR_NETWORK_PENETRATION_THRESHOLD_BP: 100,
+      PREDICTION_DURATION_IN_SLOTS: 50_400,
+      FINALIZATION_MAX_NEGATIVE_REBASE_EPOCH_SHIFT: 1350,
+      EXIT_EVENTS_LOOKBACK_WINDOW_IN_SLOTS: 100_800,
+    };
 
     const {
       HASH_CONSENSUS_AO_EPOCHS_PER_FRAME,
       HASH_CONSENSUS_VEBO_EPOCHS_PER_FRAME,
     } = oracle.config.constants;
 
-    Object.assign(hashConsensusForAccountingOracle, {
-      deployParameters: {
-        fastLaneLengthSlots: 10,
-        epochsPerFrame: HASH_CONSENSUS_AO_EPOCHS_PER_FRAME,
-      },
-    });
+    hashConsensusAO.deployParameters = {
+      fastLaneLengthSlots: 10,
+      epochsPerFrame: HASH_CONSENSUS_AO_EPOCHS_PER_FRAME,
+    };
+
+    hashConsensusVEBO.deployParameters = {
+      fastLaneLengthSlots: 10,
+      epochsPerFrame: HASH_CONSENSUS_VEBO_EPOCHS_PER_FRAME,
+    };
 
-    Object.assign(hashConsensusForValidatorsExitBusOracle, {
-      deployParameters: {
-        fastLaneLengthSlots: 10,
-        epochsPerFrame: HASH_CONSENSUS_VEBO_EPOCHS_PER_FRAME,
-      },
-    });
+    tomlObj.vesting = vestingParams;
+    tomlObj.dao = daoObj;
+    tomlObj.dao.initialSettings = initialSettings;
+    tomlObj.dao.initialSettings.voting = daoVoting;
+    tomlObj.oracleDaemonConfig = oracleDaemonConfig;
+    tomlObj.hashConsensusForAccountingOracle = hashConsensusAO;
+    tomlObj.hashConsensusForValidatorsExitBusOracle = hashConsensusVEBO;
 
-    await lidoCore.writeJson(filePath, networkStateDefaults, true);
+    await lidoCore.writeToml(filePath, tomlObj);
   },
 });

src/commands/stands/fusaka-srv3-devnet0.ts

@@ -71,13 +71,13 @@ export const FusakaSRV3DevNetUp = command.cli({
     await dre.runCommand(ActivateLidoProtocol, {});
     logger.log("✅ Lido Core protocol activated.");
 
-    logger.log("🚀 Activating CSM protocol...");
-    await dre.runCommand(ActivateCSM, {
-      stakeShareLimitBP: 2000,
-      priorityExitShareThresholdBP: 2500,
-      maxDepositsPerBlock: 30,
-    });
-    logger.log("✅ CSM protocol activated.");
+    // logger.log("🚀 Activating CSM protocol...");
+    // await dre.runCommand(ActivateCSM, {
+    //   stakeShareLimitBP: 2000,
+    //   priorityExitShareThresholdBP: 2500,
+    //   maxDepositsPerBlock: 30,
+    // });
+    // logger.log("✅ CSM protocol activated.");
 
     if (!params.dsm) {
       logger.log("🚀 Replacing DSM with an EOA...");
@@ -86,17 +86,17 @@ export const FusakaSRV3DevNetUp = command.cli({
     }
 
     const NOR_DEVNET_OPERATOR = "devnet_nor_1";
-    const CSM_DEVNET_OPERATOR = "devnet_csm_1";
+    // const CSM_DEVNET_OPERATOR = "devnet_csm_1";
 
     logger.log("🚀 Generating and allocating keys for NOR Module...");
     await dre.runCommand(GenerateLidoDevNetKeys, { validators: 30 });
     await dre.runCommand(UseLidoDevNetKeys, { name: NOR_DEVNET_OPERATOR });
     logger.log("✅ NOR Module keys generated and allocated.");
 
-    logger.log("🚀 Generating and allocating keys for CSM Module...");
-    await dre.runCommand(GenerateLidoDevNetKeys, { validators: 30 });
-    await dre.runCommand(UseLidoDevNetKeys, { name: CSM_DEVNET_OPERATOR });
-    logger.log("✅ CSM Module keys generated and allocated.");
+    // logger.log("🚀 Generating and allocating keys for CSM Module...");
+    // await dre.runCommand(GenerateLidoDevNetKeys, { validators: 30 });
+    // await dre.runCommand(UseLidoDevNetKeys, { name: CSM_DEVNET_OPERATOR });
+    // logger.log("✅ CSM Module keys generated and allocated.");
 
     logger.log("🚀 Adding NOR operator...");
     await dre.runCommand(LidoAddOperator, { name: NOR_DEVNET_OPERATOR });
@@ -110,11 +110,11 @@ export const FusakaSRV3DevNetUp = command.cli({
     await dre.runCommand(LidoSetStakingLimit, { operatorId: 0, limit: 30 });
     logger.log("✅ Staking limit for NOR increased.");
 
-    logger.log("🚀 Adding CSM operator with keys...");
-    await dre.runCommand(LidoAddCSMOperatorWithKeys, {
-      name: CSM_DEVNET_OPERATOR,
-    });
-    logger.log(`✅ Keys for operator ${CSM_DEVNET_OPERATOR} added.`);
+    // logger.log("🚀 Adding CSM operator with keys...");
+    // await dre.runCommand(LidoAddCSMOperatorWithKeys, {
+    //   name: CSM_DEVNET_OPERATOR,
+    // });
+    // logger.log(`✅ Keys for operator ${CSM_DEVNET_OPERATOR} added.`);
 
     logger.log("🚀 Run KAPI service in K8s.");
     await dre.runCommand(KapiK8sUp, {});
@@ -140,9 +140,9 @@ export const FusakaSRV3DevNetUp = command.cli({
     await dre.runCommand(LidoDeposit, { id: 1, deposits: 30, ...depositArgs });
     logger.log("✅ Deposit to NOR completed.");
 
-    logger.log("🚀 Making deposit to CSM...");
-    await dre.runCommand(LidoDeposit, { id: 3, deposits: 30, ...depositArgs });
-    logger.log("✅ Deposit to CSM completed.");
+    // logger.log("🚀 Making deposit to CSM...");
+    // await dre.runCommand(LidoDeposit, { id: 3, deposits: 30, ...depositArgs });
+    // logger.log("✅ Deposit to CSM completed.");
 
     logger.log("🚀 Adding keys to the validator...");
     await dre.runCommand(ValidatorAdd, {});