Skip to content

Commit 263e803

Browse files
cheatfatecheatfate
authored
Add spamoor integration into finalization test. (#7721)
* Initial commit. * Fix added option. * Some more fixes to spamoor starter script. * Add SPAMOOR to JOBS. Adjust seconds per slot for spamoor. * Update Makefile. * Adopt some parameters from blobs scenario. * Add some debug information for block sends. * Add more debugging metrics. * One more debugging metrics step. * Disable blobs validation. * Remove debugging statements from message_router. * Fix message_router mistype. * Remove debugging statements from state_transition_block. * Enable more spamoor parameters and disable builder in Makefile. * Add spamoor for mainnet preset test too. * Recover original state_transition_block. * Add moments around blob validation. * Add blob validation metrics. * Disable KZG lazy loading to avoid 2.seconds delays on first sidecar verification. * Restore gossip_validation. * Restore eth2_processor. * Update log statement. * Update Jenkinsfile to not include spamoor distribution archive. * Update two more Jenkins files.
1 parent 1c55749 commit 263e803

File tree

10 files changed

+172
-23
lines changed

10 files changed

+172
-23
lines changed

‎Makefile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,6 @@ local-testnet-minimal:
238238
--fulu-fork-epoch 100000 \
239239
--stop-at-epoch 6 \
240240
--disable-htop \
241-
--enable-payload-builder \
242241
--base-port $$(( $(MINIMAL_TESTNET_BASE_PORT) + EXECUTOR_NUMBER * 400 + 0 )) \
243242
--base-rest-port $$(( $(MINIMAL_TESTNET_BASE_PORT) + EXECUTOR_NUMBER * 400 + 30 )) \
244243
--base-metrics-port $$(( $(MINIMAL_TESTNET_BASE_PORT) + EXECUTOR_NUMBER * 400 + 60 )) \
@@ -254,6 +253,7 @@ local-testnet-minimal:
254253
--timeout 648 \
255254
--kill-old-processes \
256255
--run-geth --dl-geth \
256+
--run-spamoor \
257257
-- \
258258
--verify-finalization \
259259
--discv5:no \
@@ -282,6 +282,7 @@ local-testnet-mainnet:
282282
--timeout 2784 \
283283
--kill-old-processes \
284284
--run-geth --dl-geth \
285+
--run-spamoor \
285286
-- \
286287
--verify-finalization \
287288
--discv5:no

‎beacon_chain/nimbus_beacon_node.nim‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2828,6 +2828,10 @@ proc doRunBeaconNode(
28282828
kzg.loadTrustedSetup(config.trustedSetupFile.get(), 0).isOkOr:
28292829
fatal "Cannot load KZG trusted setup from file", msg = error
28302830
quit(QuitFailure)
2831+
else:
2832+
kzg.loadTrustedSetupFromString(kzg.trustedSetup, 0).isOkOr:
2833+
fatal "Cannot load KZG trusted setup using default data", msg = error
2834+
quit(QuitFailure)
28312835

28322836
if ProcessState.stopIt(notice("Shutting down", reason = it)):
28332837
return

‎beacon_chain/validators/message_router.nim‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -112,24 +112,6 @@ proc routeSignedBeaconBlock*(
112112
signature = shortLog(blck.signature), error = res.error()
113113
return err($(res.error()[1]))
114114

115-
when typeof(blck).kind in [ConsensusFork.Deneb, ConsensusFork.Electra]:
116-
if blobsOpt.isSome:
117-
let blobs = blobsOpt.get()
118-
let kzgCommits = blck.message.body.blob_kzg_commitments.asSeq
119-
if blobs.len > 0 or kzgCommits.len > 0:
120-
let res = validate_blobs(
121-
kzgCommits,
122-
blobs.mapIt(KzgBlob(bytes: it.blob)),
123-
blobs.mapIt(it.kzg_proof))
124-
if res.isErr():
125-
warn "blobs failed validation",
126-
blockRoot = shortLog(blck.root),
127-
blobs = shortLog(blobs),
128-
blck = shortLog(blck.message),
129-
signature = shortLog(blck.signature),
130-
msg = res.error()
131-
return err(res.error())
132-
133115
let
134116
sendTime = router[].getCurrentBeaconTime()
135117
delay = sendTime - blck.message.slot.block_deadline(router[].dag.timeParams)

‎ci/Jenkinsfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ pipeline {
151151
sh 'ls -hl *.tar.gz'
152152
archiveArtifacts(
153153
artifacts: '*.tar.gz',
154-
excludes: '**/geth-*.tar.gz', /* `scripts/geth_binaries.sh` */
154+
excludes: '**/geth-*.tar.gz,**/spamoor_*.tar.gz', /* `scripts/geth_binaries.sh`, `scripts/spamoor_binaries.sh` */
155155
allowEmptyArchive: true
156156
)
157157
} }

‎ci/Jenkinsfile.linux‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ pipeline {
161161
sh 'ls -hl *.tar.gz'
162162
archiveArtifacts(
163163
artifacts: '*.tar.gz',
164-
excludes: '**/geth-*.tar.gz', /* `scripts/geth_binaries.sh` */
164+
excludes: '**/geth-*.tar.gz,**/spamoor_*.tar.gz', /* `scripts/geth_binaries.sh`, `scripts/spamoor_binaries.sh` */
165165
allowEmptyArchive: true
166166
)
167167
} }

‎ci/Jenkinsfile.macos‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ pipeline {
145145
sh 'ls -hl *.tar.gz'
146146
archiveArtifacts(
147147
artifacts: '*.tar.gz',
148-
excludes: '**/geth-*.tar.gz', /* `scripts/geth_binaries.sh` */
148+
excludes: '**/geth-*.tar.gz,**/spamoor_*.tar.gz', /* `scripts/geth_binaries.sh`, `scripts/spamoor_binaries.sh` */
149149
allowEmptyArchive: true
150150
)
151151
} }

‎scripts/execution_genesis.json.template‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@
5656
"0xd41c057fd1c78805aac12b0a94a405c0461a6fbb":{"balance":"0x6d6172697573766477000000"},
5757
"0xf1f6619b38a98d6de0800f1defc0a6399eb6d30c":{"balance":"0x6d6172697573766477000000"},
5858
"0xf7edc8fa1ecc32967f827c9043fcae6ba73afa5c":{"balance":"0x6d6172697573766477000000"},
59+
"0xc9d2daa6dd812745b5732afd0b367dbcb2c38d88":{"balance":"0x6d6172697573766477000000"},
5960
"0x4242424242424242424242424242424242424242": {
6061
"balance": "0",
6162
"code": "0x60806040526004361061003f5760003560e01c806301ffc9a71461004457806322895118146100a4578063621fd130146101ba578063c5f2892f14610244575b600080fd5b34801561005057600080fd5b506100906004803603602081101561006757600080fd5b50357fffffffff000000000000000000000000000000000000000000000000000000001661026b565b604080519115158252519081900360200190f35b6101b8600480360360808110156100ba57600080fd5b8101906020810181356401000000008111156100d557600080fd5b8201836020820111156100e757600080fd5b8035906020019184600183028401116401000000008311171561010957600080fd5b91939092909160208101903564010000000081111561012757600080fd5b82018360208201111561013957600080fd5b8035906020019184600183028401116401000000008311171561015b57600080fd5b91939092909160208101903564010000000081111561017957600080fd5b82018360208201111561018b57600080fd5b803590602001918460018302840111640100000000831117156101ad57600080fd5b919350915035610304565b005b3480156101c657600080fd5b506101cf6110b5565b6040805160208082528351818301528351919283929083019185019080838360005b838110156102095781810151838201526020016101f1565b50505050905090810190601f1680156102365780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b34801561025057600080fd5b506102596110c7565b60408051918252519081900360200190f35b60007fffffffff0000000000000000000000000000000000000000000000000000000082167f01ffc9a70000000000000000000000000000000000000000000000000000000014806102fe57507fffffffff0000000000000000000000000000000000000000000000000000000082167f8564090700000000000000000000000000000000000000000000000000000000145b92915050565b6030861461035d576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260268152602001806118056026913960400191505060405180910390fd5b602084146103b6576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252603681526020018061179c6036913960400191505060405180910390fd5b6060821461040f576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260298152602001806118786029913960400191505060405180910390fd5b670de0b6b3a7640000341015610470576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260268152602001806118526026913960400191505060405180910390fd5b633b9aca003406156104cd576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260338152602001806117d26033913960400191505060405180910390fd5b633b9aca00340467ffffffffffffffff811115610535576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252602781526020018061182b6027913960400191505060405180910390fd5b6060610540826114ba565b90507f649bbc62d0e31342afea4e5cd82d4049e7e1ee912fc0889aa790803be39038c589898989858a8a6105756020546114ba565b6040805160a0808252810189905290819060208201908201606083016080840160c085018e8e80828437600083820152601f017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe01690910187810386528c815260200190508c8c808284376000838201819052601f9091017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe01690920188810386528c5181528c51602091820193918e019250908190849084905b83811015610648578181015183820152602001610630565b50505050905090810190601f1680156106755780820380516001836020036101000a031916815260200191505b5086810383528881526020018989808284376000838201819052601f9091017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0169092018881038452895181528951602091820193918b019250908190849084905b838110156106ef5781810151838201526020016106d7565b50505050905090810190601f16801561071c5780820380516001836020036101000a031916815260200191505b509d505050505050505050505050505060405180910390a1600060028a8a600060801b604051602001808484808284377fffffffffffffffffffffffffffffffff0000000000000000000000000000000090941691909301908152604080517ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0818403018152601090920190819052815191955093508392506020850191508083835b602083106107fc57805182527fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe090920191602091820191016107bf565b51815160209384036101000a7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff01801990921691161790526040519190930194509192505080830381855afa158015610859573d6000803e3d6000fd5b5050506040513d602081101561086e57600080fd5b5051905060006002806108846040848a8c6116fe565b6040516020018083838082843780830192505050925050506040516020818303038152906040526040518082805190602001908083835b602083106108f857805182527fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe090920191602091820191016108bb565b51815160209384036101000a7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff01801990921691161790526040519190930194509192505080830381855afa158015610955573d6000803e3d6000fd5b5050506040513d602081101561096a57600080fd5b5051600261097b896040818d6116fe565b60405160009060200180848480828437919091019283525050604080518083038152602092830191829052805190945090925082918401908083835b602083106109f457805182527fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe090920191602091820191016109b7565b51815160209384036101000a7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff01801990921691161790526040519190930194509192505080830381855afa158015610a51573d6000803e3d6000fd5b5050506040513d6020811015610a6657600080fd5b5051604080516020818101949094528082019290925280518083038201815260609092019081905281519192909182918401908083835b60208310610ada57805182527fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe09092019160209182019101610a9d565b51815160209384036101000a7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff01801990921691161790526040519190930194509192505080830381855afa158015610b37573d6000803e3d6000fd5b5050506040513d6020811015610b4c57600080fd5b50516040805160208101858152929350600092600292839287928f928f92018383808284378083019250505093505050506040516020818303038152906040526040518082805190602001908083835b60208310610bd957805182527fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe09092019160209182019101610b9c565b51815160209384036101000a7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff01801990921691161790526040519190930194509192505080830381855afa158015610c36573d6000803e3d6000fd5b5050506040513d6020811015610c4b57600080fd5b50516040518651600291889160009188916020918201918291908601908083835b60208310610ca957805182527fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe09092019160209182019101610c6c565b6001836020036101000a0380198251168184511680821785525050505050509050018367ffffffffffffffff191667ffffffffffffffff1916815260180182815260200193505050506040516020818303038152906040526040518082805190602001908083835b60208310610d4e57805182527fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe09092019160209182019101610d11565b51815160209384036101000a7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff01801990921691161790526040519190930194509192505080830381855afa158015610dab573d6000803e3d6000fd5b5050506040513d6020811015610dc057600080fd5b5051604080516020818101949094528082019290925280518083038201815260609092019081905281519192909182918401908083835b60208310610e3457805182527fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe09092019160209182019101610df7565b51815160209384036101000a7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff01801990921691161790526040519190930194509192505080830381855afa158015610e91573d6000803e3d6000fd5b5050506040513d6020811015610ea657600080fd5b50519050858114610f02576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260548152602001806117486054913960600191505060405180910390fd5b60205463ffffffff11610f60576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260218152602001806117276021913960400191505060405180910390fd5b602080546001019081905560005b60208110156110a9578160011660011415610fa0578260008260208110610f9157fe5b0155506110ac95505050505050565b600260008260208110610faf57fe5b01548460405160200180838152602001828152602001925050506040516020818303038152906040526040518082805190602001908083835b6020831061102557805182527fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe09092019160209182019101610fe8565b51815160209384036101000a7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff01801990921691161790526040519190930194509192505080830381855afa158015611082573d6000803e3d6000fd5b5050506040513d602081101561109757600080fd5b50519250600282049150600101610f6e565b50fe5b50505050505050565b60606110c26020546114ba565b905090565b6020546000908190815b60208110156112f05781600116600114156111e6576002600082602081106110f557fe5b01548460405160200180838152602001828152602001925050506040516020818303038152906040526040518082805190602001908083835b6020831061116b57805182527fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0909201916020918201910161112e565b51815160209384036101000a7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff01801990921691161790526040519190930194509192505080830381855afa1580156111c8573d6000803e3d6000fd5b5050506040513d60208110156111dd57600080fd5b505192506112e2565b600283602183602081106111f657fe5b015460405160200180838152602001828152602001925050506040516020818303038152906040526040518082805190602001908083835b6020831061126b57805182527fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0909201916020918201910161122e565b51815160209384036101000a7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff01801990921691161790526040519190930194509192505080830381855afa1580156112c8573d6000803e3d6000fd5b5050506040513d60208110156112dd57600080fd5b505192505b6002820491506001016110d1565b506002826112ff6020546114ba565b600060401b6040516020018084815260200183805190602001908083835b6020831061135a57805182527fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0909201916020918201910161131d565b51815160209384036101000a7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff01801990921691161790527fffffffffffffffffffffffffffffffffffffffffffffffff000000000000000095909516920191825250604080518083037ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8018152601890920190819052815191955093508392850191508083835b6020831061143f57805182527fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe09092019160209182019101611402565b51815160209384036101000a7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff01801990921691161790526040519190930194509192505080830381855afa15801561149c573d6000803e3d6000fd5b5050506040513d60208110156114b157600080fd5b50519250505090565b60408051600880825281830190925260609160208201818036833701905050905060c082901b8060071a60f81b826000815181106114f457fe5b60200101907effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916908160001a9053508060061a60f81b8260018151811061153757fe5b60200101907effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916908160001a9053508060051a60f81b8260028151811061157a57fe5b60200101907effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916908160001a9053508060041a60f81b826003815181106115bd57fe5b60200101907effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916908160001a9053508060031a60f81b8260048151811061160057fe5b60200101907effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916908160001a9053508060021a60f81b8260058151811061164357fe5b60200101907effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916908160001a9053508060011a60f81b8260068151811061168657fe5b60200101907effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916908160001a9053508060001a60f81b826007815181106116c957fe5b60200101907effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916908160001a90535050919050565b6000808585111561170d578182fd5b83861115611719578182fd5b505082019391909203915056fe4465706f736974436f6e74726163743a206d65726b6c6520747265652066756c6c4465706f736974436f6e74726163743a207265636f6e7374727563746564204465706f7369744461746120646f6573206e6f74206d6174636820737570706c696564206465706f7369745f646174615f726f6f744465706f736974436f6e74726163743a20696e76616c6964207769746864726177616c5f63726564656e7469616c73206c656e6774684465706f736974436f6e74726163743a206465706f7369742076616c7565206e6f74206d756c7469706c65206f6620677765694465706f736974436f6e74726163743a20696e76616c6964207075626b6579206c656e6774684465706f736974436f6e74726163743a206465706f7369742076616c756520746f6f20686967684465706f736974436f6e74726163743a206465706f7369742076616c756520746f6f206c6f774465706f736974436f6e74726163743a20696e76616c6964207369676e6174757265206c656e677468a26469706673582212201dd26f37a621703009abf16e77e69c93dc50c79db7f6cc37543e3e0e3decdc9764736f6c634300060b0033",

‎scripts/launch_local_testnet.sh‎

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ CURL_BINARY="$(command -v curl)" || { echo "Curl not installed. Aborting."; exit
4949
JQ_BINARY="$(command -v jq)" || { echo "jq not installed. Aborting."; exit 1; }
5050

5151
OPTS="ht:n:d:g"
52-
LONGOPTS="help,preset:,nodes:,data-dir:,remote-validators-count:,threshold:,signer-nodes:,signer-type:,with-ganache,stop-at-epoch:,disable-htop,use-vc:,disable-vc,enable-payload-builder,log-level:,base-port:,base-rest-port:,base-metrics-port:,base-vc-metrics-port:,base-vc-keymanager-port:,base-remote-signer-port:,base-remote-signer-metrics-port:,base-el-net-port:,base-el-rpc-port:,base-el-ws-port:,base-el-auth-rpc-port:,el-port-offset:,reuse-existing-data-dir,reuse-binaries,timeout:,kill-old-processes,eth2-docker-image:,lighthouse-vc-nodes:,run-geth,dl-geth,dl-nimbus-eth1,dl-nimbus-eth2,light-clients:,run-nimbus-eth1,verbose,electra-fork-epoch:,fulu-fork-epoch:"
52+
LONGOPTS="help,preset:,nodes:,data-dir:,remote-validators-count:,threshold:,signer-nodes:,signer-type:,with-ganache,stop-at-epoch:,disable-htop,use-vc:,disable-vc,enable-payload-builder,log-level:,base-port:,base-rest-port:,base-metrics-port:,base-vc-metrics-port:,base-vc-keymanager-port:,base-remote-signer-port:,base-remote-signer-metrics-port:,base-el-net-port:,base-el-rpc-port:,base-el-ws-port:,base-el-auth-rpc-port:,el-port-offset:,reuse-existing-data-dir,reuse-binaries,timeout:,kill-old-processes,eth2-docker-image:,lighthouse-vc-nodes:,run-geth,dl-geth,dl-nimbus-eth1,dl-nimbus-eth2,run-spamoor,light-clients:,run-nimbus-eth1,verbose,electra-fork-epoch:,fulu-fork-epoch:"
5353

5454
# default values
5555
BINARIES=""
@@ -91,6 +91,7 @@ LC_NODES=1
9191
ACCOUNT_PASSWORD="nimbus"
9292
RUN_GETH="0"
9393
DL_GETH="0"
94+
RUN_SPAMOOR="0"
9495
: ${DL_NIMBUS_ETH1:="0"}
9596
: ${DL_NIMBUS_ETH2:="0"}
9697

@@ -159,6 +160,7 @@ CI run: $(basename "$0") --disable-htop -- --verify-finalization
159160
--light-clients number of light clients
160161
--run-nimbus-eth1 Run nimbush-eth1 as EL
161162
--run-geth Run geth EL clients
163+
--run-spamoor Run spamoor for EL clients
162164
--dl-geth Download geth binary if not found
163165
--dl-nimbus-eth2 Download Nimbus CL binary
164166
--verbose Verbose output
@@ -341,6 +343,10 @@ while true; do
341343
DL_NIMBUS_ETH1="1"
342344
shift
343345
;;
346+
--run-spamoor)
347+
RUN_SPAMOOR="1"
348+
shift
349+
;;
344350
--verbose)
345351
VERBOSE="1"
346352
shift
@@ -453,6 +459,13 @@ if [[ "${RUN_NIMBUS_ETH1}" == "1" ]]; then
453459
. ./scripts/nimbus_el_vars.sh
454460
fi
455461

462+
if [[ "${RUN_SPAMOOR}" == "1" ]]; then
463+
source "${SCRIPTS_DIR}/spamoor_binaries.sh"
464+
465+
download_spamoor_stable
466+
SPAMOOR_BINARY="$STABLE_SPAMOOR_BINARY"
467+
fi
468+
456469
# kill lingering processes from a previous run
457470
if [[ "${OS}" != "windows" ]]; then
458471
which lsof &>/dev/null || \
@@ -866,6 +879,15 @@ fi
866879

867880
jq -r '.hash' "$EXECUTION_GENESIS_BLOCK_JSON" > "${DATA_DIR}/deposit_contract_block_hash.txt"
868881

882+
if [[ "${RUN_SPAMOOR}" == "1" ]]; then
883+
if [[ ! -e "${SPAMOOR_BINARY}" ]]; then
884+
echo "Missing spamoor executable"
885+
exit 1
886+
fi
887+
888+
source "./scripts/start_spamoor.sh"
889+
fi
890+
869891
for NUM_NODE in $(seq 1 "${NUM_NODES}"); do
870892
NODE_DATA_DIR="${DATA_DIR}/node${NUM_NODE}"
871893
rm -rf "${NODE_DATA_DIR}"
@@ -967,6 +989,10 @@ if [[ "${RUN_NIMBUS_ETH1}" == "1" ]]; then
967989
NUM_JOBS=$(( NUM_JOBS + NIMBUS_ETH1_NUM_NODES ))
968990
fi
969991

992+
if [[ "${RUN_SPAMOOR}" == "1" ]]; then
993+
NUM_JOBS=$(( NUM_JOBS + 1 ))
994+
fi
995+
970996
VALIDATORS_PER_VALIDATOR=$(( (SYSTEM_VALIDATORS / NODES_WITH_VALIDATORS) / 2 ))
971997
VALIDATOR_OFFSET=$(( SYSTEM_VALIDATORS / 2 ))
972998

0 commit comments

Comments
 (0)