feat: stable devnet

Author: tamtamchik

packages/services/src/index.ts

@@ -109,15 +109,16 @@ const kapi = new DevNetServiceConfig({
 });
 
 const oracle = new DevNetServiceConfig({
-  repository: {
-    url: "git@github.com:lidofinance/lido-oracle.git",
-    branch: "feat/oracle-v5-devnet-config",
-  },
-  workspace: "workspaces/oracle-v5",
+  // TODO: revert when have stable branch
+  // repository: {
+  //   url: "git@github.com:lidofinance/lido-oracle.git",
+  //   branch: "feat/oracle-v5-devnet-config",
+  // },
+  workspace: "workspaces/oracle-v5-vaults",
   name: "oracle" as const,
   constants: {
     HASH_CONSENSUS_AO_EPOCHS_PER_FRAME: 8,
-    HASH_CONSENSUS_VEBO_EPOCHS_PER_FRAME: 8
+    HASH_CONSENSUS_VEBO_EPOCHS_PER_FRAME: 8,
   },
   labels: {},
 });

src/commands/kapi/up.ts

@@ -1,15 +1,24 @@
-import { command } from "@devnet/command";
+import { Params, command } from "@devnet/command";
 
 export const KapiUp = command.cli({
   description: "Start Kapi",
-  params: {},
-  async handler({ dre: { state, network, services } }) {
+  params: {
+    csm: Params.boolean({
+      description: "Use CSM module.",
+      default: true,
+    }),
+  },
+  async handler({ params, dre: { state, network, services } }) {
     const { elPrivate } = await state.getChain();
 
     const { kapi } = services;
 
     const { locator, stakingRouter, curatedModule } = await state.getLido();
-    const { module: csmModule } = await state.getCSM();
+
+    let csmModule = "";
+    if (params.csm) {
+      csmModule = (await state.getCSM()).module;
+    }
 
     const env = {
       ...kapi.config.constants,

src/commands/lido-core/activate.ts

@@ -36,7 +36,7 @@ export const ActivateLidoProtocol = command.cli({
     );
 
     const currentEpoch = await clClient.getHeadEpoch();
-    const initialEpoch = epochPerFrame + currentEpoch + 2;
+    const initialEpoch = epochPerFrame + currentEpoch;
 
     const activateCoreSh = lidoCLI.sh({ env: deployEnv });
 

src/commands/lido-core/deploy.ts

@@ -65,7 +65,7 @@ export const DeployLidoContracts = command.cli({
       SLOTS_PER_EPOCH: constants.SLOTS_PER_EPOCH,
     };
 
-    await lidoCore.sh({ env: deployEnv })`bash -c yarn install`;
+    await lidoCore.sh({ env: deployEnv })`bash -c yarn install`; // Fix for hardhat not found error
     await lidoCore.sh({ env: deployEnv })`bash -c scripts/dao-deploy.sh`;
 
     await dre.runCommand(LidoCoreUpdateState, {});

src/commands/oracles/up.ts

@@ -1,9 +1,14 @@
-import { command } from "@devnet/command";
+import { Params, command } from "@devnet/command";
 
 export const OracleUp = command.cli({
   description: "Start Oracle(s)",
-  params: {},
-  async handler({ dre: { state, network, services } }) {
+  params: {
+    csm: Params.boolean({
+      description: "Use CSM module.",
+      default: true,
+    }),
+  },
+  async handler({ params, dre: { state, network, services } }) {
     const { oracle } = services;
 
     const { elPrivate, clPrivate } = await state.getChain();
@@ -12,9 +17,13 @@ export const OracleUp = command.cli({
     // const name = state.getOrError("network.name");
 
     const { locator } = await state.getLido();
-    const { module: csmModule } = await state.getCSM();
     const { oracle1, oracle2, oracle3 } = await state.getNamedWallet();
 
+    let csmModule = "";
+    if (params.csm) {
+      csmModule = (await state.getCSM()).module;
+    }
+
     const env = {
       CHAIN_ID: "32382",
       EXECUTION_CLIENT_URI: elPrivate,

src/commands/stands/pectra-vaults.ts

@@ -4,10 +4,6 @@ import { BlockscoutUp } from "../blockscout/up.js";
 import { KurtosisGetInfo } from "../chain/info.js";
 import { KurtosisUp } from "../chain/up.js";
 import { CouncilUp } from "../council/up.js";
-import { ActivateCSM } from "../csm/activate.js";
-import { LidoAddCSMOperatorWithKeys } from "../csm/add-operator.js";
-import { DeployCSVerifier } from "../csm/add-verifier.js";
-import { DeployCSMContracts } from "../csm/deploy.js";
 import { DataBusDeploy } from "../data-bus/deploy.js";
 import { DSMBotsUp } from "../dsm-bots/up.js";
 import { GitCheckout } from "../git/checkout.js";
@@ -40,17 +36,12 @@ export const PectraVaultsDevNetUp = command.cli({
     }),
   },
   async handler({ params, dre, dre: { logger } }) {
-    await dre.runCommand(KurtosisUp, { preset: "pectra-devnet6-vaults" });
+    await dre.runCommand(KurtosisUp, { preset: "pectra-vaults" });
     logger.log("✅ Network initialized.");
 
     await dre.runCommand(BlockscoutUp, {});
     logger.log("✅ BlockScout launched for transaction visualization.");
 
-    if (!params.full) {
-      await dre.runCommand(KurtosisGetInfo, {});
-      return;
-    }
-
     await dre.runCommand(GitCheckout, {
       service: "lidoCore",
       ref: "feat/vaults",
@@ -62,37 +53,23 @@ export const PectraVaultsDevNetUp = command.cli({
     await dre.runCommand(DeployLidoContracts, deployArgs);
     logger.log("✅ Lido contracts deployed.");
 
-    logger.log("🚀 Deploying CSM contracts...");
-    await dre.runCommand(DeployCSMContracts, deployArgs);
-    logger.log("✅ CSM contracts deployed.");
-
     logger.log("🚀 Activating Lido Core protocol...");
     await dre.runCommand(ActivateLidoProtocol, {});
     logger.log("✅ Lido Core protocol activated.");
 
-    logger.log("🚀 Activating CSM protocol...");
-    await dre.runCommand(ActivateCSM, {});
-    logger.log("✅ CSM protocol activated.");
-
     if (!params.dsm) {
       logger.log("🚀 Replacing DSM with an EOA...");
       await dre.runCommand(ReplaceDSM, {});
       logger.log("✅ DSM replaced with an EOA.");
     }
 
     const NOR_DEVNET_OPERATOR = "devnet_nor_1";
-    const CSM_DEVNET_OPERATOR = "devnet_csm_1";
 
     logger.log("🚀 Generating and allocating keys for NOR Module...");
     await dre.runCommand(GenerateLidoDevNetKeys, {});
     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, {});
-    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 });
     logger.log(`✅ Operator ${NOR_DEVNET_OPERATOR} added.`);
@@ -105,18 +82,12 @@ export const PectraVaultsDevNetUp = 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("🚀 Run KAPI service.");
-    await dre.runCommand(KapiUp, {});
+    await dre.runCommand(KapiUp, { csm: false });
     logger.log("✅ KAPI service started.");
 
     logger.log("🚀 Run Oracle service.");
-    await dre.runCommand(OracleUp, {});
+    await dre.runCommand(OracleUp, { csm: false });
     logger.log("✅ Oracle service started.");
 
     if (params.dsm) {
@@ -139,18 +110,10 @@ export const PectraVaultsDevNetUp = 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("🚀 Adding keys to the validator...");
     await dre.runCommand(ValidatorAdd, {});
     logger.log("✅ Validator keys added.");
 
-    logger.log("🚀 Deploying new CSM Verifier...");
-    await dre.runCommand(DeployCSVerifier, deployArgs);
-    logger.log("✅ New CSM Verifier deployed.");
-
     await dre.runCommand(KurtosisGetInfo, {});
 
     logger.log("");

src/commands/stands/pectra.ts

@@ -25,8 +25,7 @@ import { OracleUp } from "../oracles/up.js";
 import { ValidatorAdd } from "../validator/add.js";
 
 export const PectraDevNetUp = command.cli({
-  description:
-    "Base Pectra test stand.",
+  description: "Base Pectra test stand.",
   params: {
     full: Params.boolean({
       description:
@@ -114,10 +113,10 @@ export const PectraDevNetUp = command.cli({
     logger.log(`✅ Keys for operator ${CSM_DEVNET_OPERATOR} added.`);
 
     logger.log("🚀 Run KAPI service.");
-    await dre.runCommand(KapiUp, {});
+    await dre.runCommand(KapiUp, { csm: true });
 
     logger.log("🚀 Run Oracle service.");
-    await dre.runCommand(OracleUp, {});
+    await dre.runCommand(OracleUp, { csm: true });
 
     if (params.dsm) {
       logger.log("🚀 Deploying Data-bus...");

tsconfig.tsbuildinfo

@@ -1 +1 @@
-{"root":["./src/commands/config.ts","./src/commands/down.ts","./src/commands/wallet.ts","./src/commands/assertoor/down.ts","./src/commands/assertoor/info.ts","./src/commands/assertoor/up.ts","./src/commands/blockscout/down.ts","./src/commands/blockscout/info.ts","./src/commands/blockscout/restart.ts","./src/commands/blockscout/up.ts","./src/commands/chain/artifacts.ts","./src/commands/chain/down.ts","./src/commands/chain/fork.ts","./src/commands/chain/info.ts","./src/commands/chain/up.ts","./src/commands/chain/update.ts","./src/commands/council/down.ts","./src/commands/council/logs.ts","./src/commands/council/up.ts","./src/commands/csm/activate.ts","./src/commands/csm/add-operator.ts","./src/commands/csm/add-verifier.ts","./src/commands/csm/deploy.ts","./src/commands/csm/install.ts","./src/commands/csm/update-state.ts","./src/commands/data-bus/deploy.ts","./src/commands/data-bus/install.ts","./src/commands/data-bus/update-state.ts","./src/commands/dsm-bots/down.ts","./src/commands/dsm-bots/logs.ts","./src/commands/dsm-bots/up.ts","./src/commands/git/checkout.ts","./src/commands/git/pull.ts","./src/commands/kapi/down.ts","./src/commands/kapi/logs.ts","./src/commands/kapi/up.ts","./src/commands/lido-cli/install.ts","./src/commands/lido-core/activate.ts","./src/commands/lido-core/add-keys.ts","./src/commands/lido-core/add-operator.ts","./src/commands/lido-core/deploy-tw.ts","./src/commands/lido-core/deploy.ts","./src/commands/lido-core/deposit.ts","./src/commands/lido-core/install.ts","./src/commands/lido-core/prepare-repository.ts","./src/commands/lido-core/replace-dsm.ts","./src/commands/lido-core/set-staking-limit.ts","./src/commands/lido-core/update-state.ts","./src/commands/lido-core/verify.ts","./src/commands/lido-core/keys/generate.ts","./src/commands/lido-core/keys/use.ts","./src/commands/oracles/down.ts","./src/commands/oracles/logs.ts","./src/commands/oracles/up.ts","./src/commands/stands/pectra-tw.ts","./src/commands/stands/pectra-vaults.ts","./src/commands/stands/pectra.ts","./src/commands/system/docs.ts","./src/commands/system/server.ts","./src/commands/validator/add.ts","./src/commands/validator/voluntary-exit.ts","./src/commands/validator/keys/generate.ts","./src/commands/validator/keys/test-generate.ts","./src/commands/voting/add-account.ts","./src/commands/voting/auto-vote.ts","./src/commands/voting/enact-after-pectra.ts","./src/commands/voting/enact-before-pectra.ts","./src/commands/voting/enact-tw.ts","./src/commands/voting/install.ts","./src/commands/voting/prepare-pectra.ts"],"version":"5.7.3"}
+{"root":["./src/commands/config.ts","./src/commands/down.ts","./src/commands/wallet.ts","./src/commands/assertoor/down.ts","./src/commands/assertoor/info.ts","./src/commands/assertoor/up.ts","./src/commands/blockscout/down.ts","./src/commands/blockscout/info.ts","./src/commands/blockscout/restart.ts","./src/commands/blockscout/up.ts","./src/commands/chain/artifacts.ts","./src/commands/chain/down.ts","./src/commands/chain/fork.ts","./src/commands/chain/info.ts","./src/commands/chain/up.ts","./src/commands/chain/update.ts","./src/commands/council/down.ts","./src/commands/council/logs.ts","./src/commands/council/up.ts","./src/commands/csm/activate.ts","./src/commands/csm/add-operator.ts","./src/commands/csm/add-verifier.ts","./src/commands/csm/deploy.ts","./src/commands/csm/install.ts","./src/commands/csm/update-state.ts","./src/commands/data-bus/deploy.ts","./src/commands/data-bus/install.ts","./src/commands/data-bus/update-state.ts","./src/commands/dsm-bots/down.ts","./src/commands/dsm-bots/logs.ts","./src/commands/dsm-bots/up.ts","./src/commands/git/checkout.ts","./src/commands/git/pull.ts","./src/commands/kapi/down.ts","./src/commands/kapi/logs.ts","./src/commands/kapi/up.ts","./src/commands/lido-cli/install.ts","./src/commands/lido-core/activate.ts","./src/commands/lido-core/add-keys.ts","./src/commands/lido-core/add-operator.ts","./src/commands/lido-core/deploy-tw.ts","./src/commands/lido-core/deploy.ts","./src/commands/lido-core/deposit.ts","./src/commands/lido-core/install.ts","./src/commands/lido-core/prepare-repository.ts","./src/commands/lido-core/replace-dsm.ts","./src/commands/lido-core/set-staking-limit.ts","./src/commands/lido-core/update-state.ts","./src/commands/lido-core/verify.ts","./src/commands/lido-core/keys/generate.ts","./src/commands/lido-core/keys/use.ts","./src/commands/oracles/down.ts","./src/commands/oracles/logs.ts","./src/commands/oracles/up.ts","./src/commands/stands/pectra-only-contracts.ts","./src/commands/stands/pectra-tw.ts","./src/commands/stands/pectra-vaults.ts","./src/commands/stands/pectra.ts","./src/commands/system/docs.ts","./src/commands/system/server.ts","./src/commands/validator/add.ts","./src/commands/validator/voluntary-exit.ts","./src/commands/validator/keys/generate.ts","./src/commands/validator/keys/test-generate.ts","./src/commands/voting/add-account.ts","./src/commands/voting/auto-vote.ts","./src/commands/voting/enact-after-pectra.ts","./src/commands/voting/enact-before-pectra.ts","./src/commands/voting/enact-tw.ts","./src/commands/voting/install.ts","./src/commands/voting/prepare-pectra.ts"],"version":"5.7.3"}

…paces/kurtosis/pectra-devnet6-vaults.yml workspaces/kurtosis/pectra-vaults.ymlworkspaces/kurtosis/pectra-devnet6-vaults.yml renamed to workspaces/kurtosis/pectra-vaults.yml workspaces/kurtosis/pectra-devnet6-vaults.yml renamed to workspaces/kurtosis/pectra-vaults.yml

@@ -1,18 +1,18 @@
 participants_matrix:
   el:
     - el_type: geth
-      el_image: ethpandaops/geth:prague-devnet-6-c070db6
+      el_image: docker.ethquokkaops.io/dh/ethereum/client-go:v1.15.2
       el_extra_params: [--gcmode=archive]
   cl:
     - cl_type: teku
-      cl_image: consensys/teku:develop
+      cl_image: docker.ethquokkaops.io/dh/consensys/teku:25.2.0
       use_separate_vc: true
       cl_extra_env_vars: { "JAVA_TOOL_OPTIONS": "-XX:UseSVE=0" }
       vc_extra_env_vars: { "JAVA_TOOL_OPTIONS": "-XX:UseSVE=0" }
 
-    - cl_type: lighthouse
-      cl_image: ethpandaops/lighthouse:unstable-95cec45
-      use_separate_vc: true
+    - cl_type: prysm
+      cl_image: docker.ethquokkaops.io/dh/prysmaticlabs/prysm-beacon-chain:v5.3.0
+      vc_image: docker.ethquokkaops.io/dh/prysmaticlabs/prysm-validator:v5.3.0
 
 network_params:
   network_id: "32382"

workspaces/oracle-v5-vaults

@@ -0,0 +1 @@
+../../lido-oracle