2023-06-05 21:54:22 +00:00
10 changed files with 36 additions and 5 deletions
--- a/app/data/container-build/cerc-fixturenet-eth-geth/Dockerfile
+++ b/app/data/container-build/cerc-fixturenet-eth-geth/Dockerfile
@ -22,6 +22,18 @@ COPY run-el.sh /opt/testnet/run.sh
 RUN cd /opt/testnet && make genesis-el

 COPY --from=geth  /usr/local/bin/geth /usr/local/bin/
+
+# Snag the genesis block info.
 RUN geth --datadir ~/ethdata init /opt/testnet/build/el/geth.json && rm -f ~/ethdata/geth/nodekey
+RUN cp -rp ~/ethdata ~/tmpeth && \
+    geth --datadir ~/tmpeth init /opt/testnet/build/el/geth.json && \
+    geth --datadir ~/tmpeth --http & \
+    sleep 5 && \
+    curl -q --location 'localhost:8545' \
+        --header 'Content-Type: application/json' \
+        --data '{ "jsonrpc": "2.0", "id": 14, "method": "eth_getBlockByNumber", "params": ["0x0", false] }' \
+        -o /opt/testnet/build/el/genesis_block.json && \
+    killall -9 geth && \
+    rm -rf ~/tmpeth

 ENTRYPOINT ["/opt/testnet/run.sh"]
--- a/app/data/container-build/cerc-fixturenet-eth-lighthouse/Dockerfile
+++ b/app/data/container-build/cerc-fixturenet-eth-lighthouse/Dockerfile
@ -1,4 +1,4 @@
-FROM sigp/lcli:v4.1.0 AS lcli
+FROM cerc/lighthouse-cli:local AS lcli
 FROM skylenet/ethereum-genesis-generator@sha256:210353ce7c898686bc5092f16c61220a76d357f51eff9c451e9ad1b9ad03d4d3 AS ethgen
 FROM cerc/fixturenet-eth-geth:local AS fnetgeth

--- a/app/data/container-build/cerc-fixturenet-eth-lighthouse/genesis/cl/build_cl.sh
+++ b/app/data/container-build/cerc-fixturenet-eth-lighthouse/genesis/cl/build_cl.sh
@ -27,12 +27,14 @@ lcli \
  --deposit-contract-address $ETH1_DEPOSIT_CONTRACT_ADDRESS \
  --testnet-dir $TESTNET_DIR \
  --min-genesis-active-validator-count $GENESIS_VALIDATOR_COUNT \
+  --validator-count $VALIDATOR_COUNT \
  --min-genesis-time $GENESIS_TIME \
  --genesis-delay $GENESIS_DELAY \
  --genesis-fork-version $GENESIS_FORK_VERSION \
  --altair-fork-epoch $ALTAIR_FORK_EPOCH \
-  --merge-fork-epoch $MERGE_FORK_EPOCH \
+  --bellatrix-fork-epoch $MERGE_FORK_EPOCH \
  --eth1-id $ETH1_CHAIN_ID \
+  --eth1-block-hash $ETH1_BLOCK_HASH \
  --eth1-follow-distance 1 \
  --seconds-per-slot $SECONDS_PER_SLOT \
  --seconds-per-eth1-block $SECONDS_PER_ETH1_BLOCK \
--- a/app/data/container-build/cerc-fixturenet-eth-lighthouse/genesis/cl/vars.env
+++ b/app/data/container-build/cerc-fixturenet-eth-lighthouse/genesis/cl/vars.env
@ -42,7 +42,9 @@ VC_ARGS=${VC_ARGS:-""}
 EXECUTION_ENDPOINT=${EXECUTION_ENDPOINT:-http://localhost:8551}

 ETH1_GENESIS_JSON=${ETH1_GENESIS_JSON:-"../build/el/geth.json"}
+ETH1_GENESIS_BLOCK_JSON=${ETH1_GENESIS_BLOCK_JSON:-"../build/el/genesis_block.json"}
 ETH1_CONFIG_YAML=${ETH1_CONFIG_YAML:-"../el/el-config.yaml"}
+ETH1_BLOCK_HASH=${ETH1_BLOCK_HASH:-`cat $ETH1_GENESIS_BLOCK_JSON | jq -r '.result.hash' | cut -d'x' -f2`}

 ETH1_CHAIN_ID=${ETH1_CHAIN_ID:-`cat $ETH1_GENESIS_JSON | jq -r '.config.chainId'`}
 ETH1_TTD=${ETH1_TTD:-`cat $ETH1_GENESIS_JSON | jq -r '.config.terminalTotalDifficulty'`}
--- a/app/data/container-build/cerc-fixturenet-plugeth-lighthouse/Dockerfile
+++ b/app/data/container-build/cerc-fixturenet-plugeth-lighthouse/Dockerfile
@ -1,4 +1,4 @@
-FROM sigp/lcli:v4.1.0 AS lcli
+FROM cerc/lighthouse-cli:local AS lcli
 FROM skylenet/ethereum-genesis-generator@sha256:210353ce7c898686bc5092f16c61220a76d357f51eff9c451e9ad1b9ad03d4d3 AS ethgen
 FROM cerc/fixturenet-plugeth-plugeth:local AS fnetgeth

--- a/app/data/container-build/cerc-lighthouse-cli/build.sh
+++ b/app/data/container-build/cerc-lighthouse-cli/build.sh
@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+# Build cerc/lighthouse-cli
+
+source ${CERC_CONTAINER_BASE_DIR}/build-base.sh
+
+project_dir=${CERC_REPO_BASE_DIR}/lighthouse
+docker build -t cerc/lighthouse-cli:local --build-arg PORTABLE=true -f ${project_dir}/lcli/Dockerfile ${build_command_args} ${project_dir}
--- a/app/data/stacks/fixturenet-eth-loaded/stack.yml
+++ b/app/data/stacks/fixturenet-eth-loaded/stack.yml
@ -6,9 +6,11 @@ repos:
  - github.com/cerc-io/tx-spammer
  - github.com/cerc-io/ipld-eth-server
  - github.com/cerc-io/ipld-eth-db
+  - github.com/cerc-io/lighthouse
 containers:
  - cerc/go-ethereum
  - cerc/lighthouse
+  - cerc/lighthouse-cli
  - cerc/fixturenet-eth-geth
  - cerc/fixturenet-eth-lighthouse
  - cerc/ipld-eth-server
--- a/app/data/stacks/fixturenet-eth-tx/stack.yml
+++ b/app/data/stacks/fixturenet-eth-tx/stack.yml
@ -4,10 +4,12 @@ decription: "Ethereum Fixturenet w/ tx-spammer"
 repos:
  - github.com/cerc-io/go-ethereum
  - github.com/cerc-io/tx-spammer
-  - dboreham/foundry
+  - github.com/dboreham/foundry
+  - github.com/cerc-io/lighthouse
 containers:
  - cerc/go-ethereum
  - cerc/lighthouse
+  - cerc/lighthouse-cli
  - cerc/fixturenet-eth-geth
  - cerc/fixturenet-eth-lighthouse
  - cerc/tx-spammer
--- a/app/data/stacks/fixturenet-eth/stack.yml
+++ b/app/data/stacks/fixturenet-eth/stack.yml
@ -3,10 +3,12 @@ name: fixturenet-eth
 decription: "Ethereum Fixturenet"
 repos:
  - github.com/cerc-io/go-ethereum
+  - github.com/cerc-io/lighthouse
  - github.com/dboreham/foundry
 containers:
  - cerc/go-ethereum
  - cerc/lighthouse
+  - cerc/lighthouse-cli
  - cerc/fixturenet-eth-geth
  - cerc/fixturenet-eth-lighthouse
  - cerc/foundry
--- a/app/data/stacks/fixturenet-plugeth-tx/stack.yml
+++ b/app/data/stacks/fixturenet-plugeth-tx/stack.yml
@ -3,9 +3,11 @@ name: fixturenet-plugeth-tx
 decription: "plugeth Ethereum Fixturenet w/ tx-spammer"
 repos:
  - github.com/cerc-io/tx-spammer
-  - dboreham/foundry
+  - github.com/dboreham/foundry
+  - github.com/cerc-io/lighthouse
 containers:
  - cerc/lighthouse
+  - cerc/lighthouse-cli
  - cerc/fixturenet-plugeth-plugeth
  - cerc/fixturenet-plugeth-lighthouse
  - cerc/tx-spammer