diff --git a/.gitea/workflows/triggers/publish-fixturenet-eth-images b/.gitea/workflows/triggers/publish-fixturenet-eth-images index 4648289..9e4c9aa 100644 --- a/.gitea/workflows/triggers/publish-fixturenet-eth-images +++ b/.gitea/workflows/triggers/publish-fixturenet-eth-images @@ -1,4 +1,2 @@ # Change this file to trigger the job publish-fixturenet-eth-images.yml -Trigger -Trigger -Trigger +4 \ No newline at end of file diff --git a/stack-orchestrator/compose/docker-compose-fixturenet-plugeth.yml b/stack-orchestrator/compose/docker-compose-fixturenet-plugeth.yml index 88cc25c..ffdc01c 100644 --- a/stack-orchestrator/compose/docker-compose-fixturenet-plugeth.yml +++ b/stack-orchestrator/compose/docker-compose-fixturenet-plugeth.yml @@ -27,7 +27,7 @@ services: CERC_ALLOW_UNPROTECTED_TXS: ${CERC_ALLOW_UNPROTECTED_TXS:-false} env_file: - ../config/fixturenet-eth/fixturenet-eth.env - - ../config/fixturenet-eth/statediff.env + - ../config/fixturenet-plugeth/statediff.env image: cerc/fixturenet-plugeth-plugeth:local volumes: - fixturenet_plugeth_geth_1_data:/root/ethdata diff --git a/stack-orchestrator/config/fixturenet-eth/fixturenet-eth.env b/stack-orchestrator/config/fixturenet-eth/fixturenet-eth.env index 9943882..156e5c2 100644 --- a/stack-orchestrator/config/fixturenet-eth/fixturenet-eth.env +++ b/stack-orchestrator/config/fixturenet-eth/fixturenet-eth.env @@ -14,5 +14,5 @@ ENR_URL="http://fixturenet-eth-bootnode-lighthouse:3000/bootnode/enr.dat" CERC_GETH_VMODULE="rpc/*=5" CERC_GETH_VERBOSITY=${CERC_GETH_VERBOSITY:-3} -# Used by Lighthouse -SECONDS_PER_ETH1_BLOCK=${SECONDS_PER_ETH1_BLOCK:-3} +# --debug-level +DEBUG_LEVEL=${LIGHTHOUSE_DEBUG_LEVEL:-info} diff --git a/stack-orchestrator/config/fixturenet-eth/statediff.env b/stack-orchestrator/config/fixturenet-plugeth/statediff.env similarity index 100% rename from stack-orchestrator/config/fixturenet-eth/statediff.env rename to stack-orchestrator/config/fixturenet-plugeth/statediff.env diff --git a/stack-orchestrator/container-build/cerc-fixturenet-eth-lighthouse/genesis/cl/build_cl.sh b/stack-orchestrator/container-build/cerc-fixturenet-eth-lighthouse/genesis/cl/build_cl.sh index 5157b38..1130cb7 100755 --- a/stack-orchestrator/container-build/cerc-fixturenet-eth-lighthouse/genesis/cl/build_cl.sh +++ b/stack-orchestrator/container-build/cerc-fixturenet-eth-lighthouse/genesis/cl/build_cl.sh @@ -44,6 +44,11 @@ lcli \ --interop-genesis-state \ --force +# Patch the spec with settings not supported by lcli +sed -i "/^SHARD_COMMITTEE_PERIOD:/s/:.*/: $SHARD_COMMITTEE_PERIOD/" $TESTNET_DIR/config.yaml +sed -i "/^MIN_VALIDATOR_WITHDRAWABILITY_DELAY:/s/:.*/: $MIN_VALIDATOR_WITHDRAWABILITY_DELAY/" $TESTNET_DIR/config.yaml +sed -i "/^MAX_SEED_LOOKAHEAD:/s/:.*/: $MAX_SEED_LOOKAHEAD/" $TESTNET_DIR/config.yaml + echo Specification and genesis.ssz generated at $TESTNET_DIR. echo "Generating $VALIDATOR_COUNT validators concurrently... (this may take a while)" diff --git a/stack-orchestrator/container-build/cerc-fixturenet-eth-lighthouse/genesis/cl/vars.env b/stack-orchestrator/container-build/cerc-fixturenet-eth-lighthouse/genesis/cl/vars.env index d7eda59..f790e4c 100644 --- a/stack-orchestrator/container-build/cerc-fixturenet-eth-lighthouse/genesis/cl/vars.env +++ b/stack-orchestrator/container-build/cerc-fixturenet-eth-lighthouse/genesis/cl/vars.env @@ -38,6 +38,13 @@ SECONDS_PER_SLOT=${SECONDS_PER_SLOT:-3} # Seconds per Eth1 block SECONDS_PER_ETH1_BLOCK=${SECONDS_PER_ETH1_BLOCK:-1} +# Min epochs between validator activation and exit +SHARD_COMMITTEE_PERIOD=2 +# Min epochs between validator exit and withdrawal +MIN_VALIDATOR_WITHDRAWABILITY_DELAY=1 +# Delay for validator activation/exit +MAX_SEED_LOOKAHEAD=1 + # Command line arguments for validator client VC_ARGS=${VC_ARGS:-""} @@ -53,6 +60,3 @@ ETH1_TTD=${ETH1_TTD:-`cat $ETH1_GENESIS_JSON | jq -r '.config.terminalTotalDiffi ETH1_DEPOSIT_CONTRACT_ADDRESS=${ETH1_DEPOSIT_CONTRACT_ADDRESS:-`cat $ETH1_CONFIG_YAML | grep 'deposit_contract_address' | awk '{ print $2 }' | sed 's/"//g'`} ETH1_DEPOSIT_CONTRACT_BLOCK=${ETH1_DEPOSIT_CONTRACT_BLOCK:-0x0} SUGGESTED_FEE_RECIPIENT=`cat ../build/el/accounts.csv | head -1 | cut -d',' -f2` - -# --debug-level -DEBUG_LEVEL=${LIGHTHOUSE_DEBUG_LEVEL:-info}