Add stack for system tests.

Fix typo
Add missing lighthouse-cli container to pocket stack (#424 )
2023-06-13 11:32:45 -05:00 · 2023-06-05 21:59:42 -06:00 · 2023-06-05 21:08:05 -06:00 · 2023-06-05 21:10:17 -05:00 · 2023-06-05 18:16:42 -05:00 · 2023-06-05 16:54:22 -05:00
16 changed files with 78 additions and 7 deletions
@@ -17,7 +17,8 @@ CERC_STATEDIFF_DB_PORT=5432
 CERC_STATEDIFF_DB_NAME="cerc_testing"
 CERC_STATEDIFF_DB_USER="vdbm"
 CERC_STATEDIFF_DB_PASSWORD="password"
-CERC_STATEDIFF_DB_GOOSE_MIN_VER=${CERC_STATEDIFF_DB_GOOSE_MIN_VER:-23}
+CERC_STATEDIFF_DB_GOOSE_MIN_VER=${CERC_STATEDIFF_DB_GOOSE_MIN_VER:-18}
 CERC_STATEDIFF_DB_LOG_STATEMENTS="false"
+CERC_STATEDIFF_WORKERS=2

 CERC_GETH_VMODULE="statediff/*=5,rpc/*=5"
@@ -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"]
@@ -92,6 +92,7 @@ else
      --statediff.db.logstatements=${CERC_STATEDIFF_DB_LOG_STATEMENTS:-false} \
      --statediff.db.copyfrom=${CERC_STATEDIFF_DB_COPY_FROM:-true} \
      --statediff.waitforsync=true \
+      --statediff.workers=${CERC_STATEDIFF_WORKERS:-1} \
      --statediff.writing=true"
    fi

@@ -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

@@ -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 \
@@ -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'`}
@@ -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

@@ -6,7 +6,7 @@ RUN go install github.com/go-delve/delve/cmd/dlv@latest
 FROM ubuntu:22.04
 RUN apt-get update && \
      apt-get install -y --no-install-recommends \
-        python3 python3-dev python3-pip curl wget jq gettext gettext-base openssl bash dnsutils postgresql-client make iproute2 netcat && \
+        python3 python3-dev python3-pip curl wget jq gettext gettext-base openssl bash dnsutils postgresql-client make iproute2 netcat psmisc && \
      rm -rf /var/lib/apt/lists/*

 COPY --from=delve  /go/bin/dlv /usr/local/bin/
@@ -24,4 +24,17 @@ RUN cd /opt/testnet && make genesis-el

 RUN geth --datadir ~/ethdata init /opt/testnet/build/el/geth.json && rm -f ~/ethdata/geth/nodekey

+# 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"]
@@ -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}
@@ -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
@@ -0,0 +1,3 @@
+# fixturenet-eth-system-tests
+
+A version of fixturenet-eth for use with https://git.vdb.to/cerc-io/system-tests
@@ -0,0 +1,20 @@
+version: "1.0"
+name: fixturenet-eth-system-tests
+decription: "fixturenet-eth-system-tests"
+repos:
+  - github.com/cerc-io/go-ethereum
+  - 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
+  - cerc/ipld-eth-db
+pods:
+  - fixturenet-eth
+  - ipld-eth-server
+  - ipld-eth-db
@@ -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
@@ -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
@@ -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
@@ -3,11 +3,13 @@ name: fixturenet-pocket
 description: "A single node pocket chain that can serve relays from the geth-1 node in eth-fixturenet"
 repos:
  - github.com/cerc-io/go-ethereum
+  - github.com/cerc-io/lighthouse
  - github.com/pokt-network/pocket-core
  - github.com/pokt-network/pocket-core-deployments # contains the dockerfile
 containers:
  - cerc/go-ethereum
  - cerc/lighthouse
+  - cerc/lighthouse-cli
  - cerc/fixturenet-eth-geth
  - cerc/fixturenet-eth-lighthouse
  - cerc/pocket
Author	SHA1	Message	Date
telackey	9e9a68dec3	Add stack for system tests.	2023-06-13 11:32:45 -05:00
David Boreham	d19b9a65b9	Fix typo	2023-06-05 21:59:42 -06:00
dborehamandDavid Boreham	98e1d120cc	Add missing lighthouse-cli container to pocket stack (#424 ) Co-authored-by: David Boreham <david@bozemanpas.com>	2023-06-05 21:08:05 -06:00
telackey	26ff7a969c	Fix plugeth build. (#423 )	2023-06-05 21:10:17 -05:00
telackey	a8e198ad55	Allow configuring the number of statediff workers. (#422 ) * Allow configuring the number of statediff workers. * Leave logging alone	2023-06-05 18:16:42 -05:00
dboreham David Boreham telackey	f1a626ddf5	build local lighthouse cli (#420 ) * Build lcli locally * Pull lighthouse repo * Enable portable lcli build * Update ldcli options * Add lcli container to fixturenet-eth stack * Include --eth1-block-hash --------- Co-authored-by: David Boreham <david@bozemanpas.com> Co-authored-by: Thomas E Lackey <telackey@bozemanpass.com>	2023-06-05 16:54:22 -05:00