diff --git a/src/commands/kurtosis/run-package.ts b/src/commands/kurtosis/run-package.ts index 0fc628bc..10b630f3 100644 --- a/src/commands/kurtosis/run-package.ts +++ b/src/commands/kurtosis/run-package.ts @@ -49,7 +49,7 @@ export const KurtosisRunPackage = command.isomorphic({ await kurtosis.sh`kurtosis run --enclave ${dre.network.name} - github.com/ethpandaops/ethereum-package + github.com/lidofinance/ethereum-package --production --args-file ${configFileName}`; diff --git a/src/commands/stands/fusaka-zk-test.ts b/src/commands/stands/fusaka-zk-test.ts index ed4d6181..d4e82c3d 100644 --- a/src/commands/stands/fusaka-zk-test.ts +++ b/src/commands/stands/fusaka-zk-test.ts @@ -1,43 +1,11 @@ import { Params, command } from "@devnet/command"; -import { ChainGetInfo } from "../chain/info.js"; import { ChainUp } from "../chain/up.js"; -import { CouncilK8sUp } from "../council-k8s/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 { DSMBotsK8sUp } from "../dsm-bots-k8s/up.js"; -import { GitCheckout } from "../git/checkout.js"; -import { KapiK8sUp } from "../kapi-k8s/up.js"; -import { ActivateLidoProtocol } from "../lido-core/activate.js"; -import { LidoAddKeys } from "../lido-core/add-keys.js"; -import { LidoAddOperator } from "../lido-core/add-operator.js"; -import { DeployLidoContracts } from "../lido-core/deploy.js"; -import { LidoDeposit } from "../lido-core/deposit.js"; -import { GenerateLidoDevNetKeys } from "../lido-core/keys/generate.js"; -import { UseLidoDevNetKeys } from "../lido-core/keys/use.js"; -import { ReplaceDSM } from "../lido-core/replace-dsm.js"; -import { LidoSetStakingLimit } from "../lido-core/set-staking-limit.js"; -import { NoWidgetUp } from "../no-widget/up.js"; -import { NoWidgetBackendUp } from "../no-widget-backend/up.js"; -import { OracleK8sUp } from "../oracles-k8s/up.js"; -import { ValidatorAdd } from "../validator/add.js"; export const FusakaZkTestDevNetUp = command.cli({ description: "Fusaka ZK Test test stand.", params: {}, async handler({ params, dre, dre: { logger } }) { - await dre.runCommand(GitCheckout, { - service: "lidoCore", - ref: "fix/scratch-deploy-tw", - }); - - await dre.runCommand(GitCheckout, { - service: "csm", - ref: "main", - }); await dre.runCommand(ChainUp, { preset: 'fusaka-zk-test' }); logger.log("✅ Network initialized."); diff --git a/workspaces/kurtosis/fusaka-zk-test.yml b/workspaces/kurtosis/fusaka-zk-test.yml index a3982ff5..5abea2bc 100644 --- a/workspaces/kurtosis/fusaka-zk-test.yml +++ b/workspaces/kurtosis/fusaka-zk-test.yml @@ -2,7 +2,8 @@ participants: - el_type: geth el_image: ethereum/client-go:v1.16.4 - el_extra_params: [ --syncmode=full --rpc.allow-unprotected-txs --gcmode=archive ] + el_extra_params: [ --state.scheme=hash --syncmode=full --rpc.allow-unprotected-txs --gcmode=archive ] + el_init_extra_params: [--state.scheme=hash ] # a new state scheme is required for zk-test (with the fork of ethereum-package) el_min_cpu: 0 el_max_cpu: 0 el_min_mem: 0 @@ -23,10 +24,25 @@ participants: cl_volume_size: 51200 count: 1 + - el_type: reth + el_image: ghcr.io/paradigmxyz/reth:v1.8.1 + el_init_extra_params: [] + el_min_cpu: 0 + el_max_cpu: 0 + el_min_mem: 0 + el_max_mem: 0 + el_volume_size: 51200 + # CL + cl_type: prysm + cl_image: gcr.io/offchainlabs/prysm/beacon-chain:v6.1.1 + supernode: true + cl_volume_size: 51200 + count: 1 + network_params: network_id: "32382" - fulu_fork_epoch: 1 + fulu_fork_epoch: 2 bpo_1_epoch: 32 bpo_1_max_blobs: 12 bpo_1_target_blobs: 9 @@ -44,6 +60,7 @@ network_params: bpo_5_target_blobs: 6 withdrawal_type: "0x02" preset: mainnet + min_epochs_for_block_requests: 33024 persistent: true @@ -53,6 +70,11 @@ additional_services: keymanager_enabled: true +ethereum_genesis_generator_params: + # The image to use for ethereum genesis generator + image: ethpandaops/ethereum-genesis-generator:5.0.8 + + spamoor_params: image: ethpandaops/spamoor:master max_mem: 8000