From 6d18ffdd72490ab9b6bdf04926b0cffcaa6bdf7a Mon Sep 17 00:00:00 2001 From: pcw109550 Date: Wed, 3 May 2023 21:30:48 +0900 Subject: [PATCH 1/3] Remove ethash verification cache --- clients/go-ethereum/Dockerfile | 5 ----- 1 file changed, 5 deletions(-) diff --git a/clients/go-ethereum/Dockerfile b/clients/go-ethereum/Dockerfile index 27564e7d18..1e5422874b 100644 --- a/clients/go-ethereum/Dockerfile +++ b/clients/go-ethereum/Dockerfile @@ -45,9 +45,4 @@ ADD genesis.json /genesis.json # Export the usual networking ports to allow outside access to the node EXPOSE 8545 8546 8547 8551 30303 30303/udp -# Generate the ethash verification caches -RUN \ - /usr/local/bin/geth makecache 1 ~/.ethereum/geth/ethash && \ - /usr/local/bin/geth makecache 30001 ~/.ethereum/geth/ethash - ENTRYPOINT ["/geth.sh"] From 93acc3d7f4a2b4f432f7af614ca57ad6b1761180 Mon Sep 17 00:00:00 2001 From: pcw109550 Date: Wed, 3 May 2023 21:39:00 +0900 Subject: [PATCH 2/3] Remove miner.threads flag --- clients/go-ethereum/geth.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clients/go-ethereum/geth.sh b/clients/go-ethereum/geth.sh index 536d9cf79b..1f69f311e0 100644 --- a/clients/go-ethereum/geth.sh +++ b/clients/go-ethereum/geth.sh @@ -141,7 +141,7 @@ fi # Configure any mining operation if [ "$HIVE_MINER" != "" ] && [ "$HIVE_NODETYPE" != "light" ]; then - FLAGS="$FLAGS --mine --miner.threads 1 --miner.etherbase $HIVE_MINER" + FLAGS="$FLAGS --mine --miner.etherbase $HIVE_MINER" fi if [ "$HIVE_MINER_EXTRA" != "" ]; then FLAGS="$FLAGS --miner.extradata $HIVE_MINER_EXTRA" From 292365fae0d098004be7076eccad70e589ec1756 Mon Sep 17 00:00:00 2001 From: Joshua Gutow Date: Wed, 17 May 2023 13:42:24 -0700 Subject: [PATCH 3/3] CI: Pin geth to v1.11.6 --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 636ff9c393..f856a387c0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -42,7 +42,7 @@ jobs: -sim=<> \ -sim.loglevel=5 \ -docker.pull=true \ - -client=go-ethereum,op-geth_optimism,op-proposer_develop,op-batcher_develop,op-node_develop |& tee /tmp/build/hive.log + -client=go-ethereum_v1.11.6,op-geth_optimism,op-proposer_develop,op-batcher_develop,op-node_develop |& tee /tmp/build/hive.log - run: command: | tar -cvf /tmp/workspace.tgz -C /home/circleci/project /home/circleci/project/workspace