Geth 1.13 (Cancun) update #8

Merged
roysc merged 18 commits from update-geth-1.13 into v5 2024-08-06 21:06:38 +00:00
7 changed files with 37 additions and 35 deletions
Showing only changes of commit 9c3d8b353e - Show all commits

View File

@ -12,9 +12,7 @@ on:
- ci-test - ci-test
env: env:
# Needed until we can incorporate docker startup into the executor container SO_VERSION: v1.1.0-87fffca-202404110321
DOCKER_HOST: unix:///var/run/dind.sock
SO_VERSION: v1.1.0-e0b5318-202309201927 # contains fixes for plugeth stack
jobs: jobs:
unit-tests: unit-tests:
@ -26,18 +24,9 @@ jobs:
with: with:
go-version-file: 'go.mod' go-version-file: 'go.mod'
check-latest: true check-latest: true
- name: Run dockerd
run: |
dockerd -H $DOCKER_HOST --userland-proxy=false &
sleep 5
- name: Run DB container - name: Run DB container
run: | run: |
docker compose -f test/compose-db.yml up --wait --quiet-pull docker compose -f test/compose-db.yml up --wait --quiet-pull
- name: Set access token
env:
TOKEN: ${{ secrets.CICD_REPO_TOKEN }}
run: |
git config --global url."https://$TOKEN:@git.vdb.to/".insteadOf https://git.vdb.to/
- name: Run tests - name: Run tests
run: go test -p 1 -v ./pkg/... run: go test -p 1 -v ./pkg/...
@ -50,15 +39,6 @@ jobs:
with: with:
go-version-file: 'go.mod' go-version-file: 'go.mod'
check-latest: true check-latest: true
- name: Run dockerd
run: |
dockerd -H $DOCKER_HOST --userland-proxy=false &
sleep 5
- name: Set Gitea access token
env:
TOKEN: ${{ secrets.CICD_REPO_TOKEN }}
run: |
git config --global url."https://$TOKEN:@git.vdb.to/".insteadOf https://git.vdb.to/
- name: Install jq - name: Install jq
env: env:

View File

@ -6,7 +6,7 @@ import (
"testing" "testing"
"time" "time"
helpers "github.com/cerc-io/plugeth-statediff/test_helpers" "github.com/cerc-io/plugeth-statediff/indexer/database/sql/postgres"
"github.com/onsi/gomega" "github.com/onsi/gomega"
. "github.com/onsi/gomega" . "github.com/onsi/gomega"
@ -50,7 +50,7 @@ func setup(t *testing.T, progressChan chan uint64) {
t.Fatal(err) t.Fatal(err)
} }
// set the default DB config to the testing defaults // set the default DB config to the testing defaults
cfg.DBConfig, _ = helpers.TestDBConfig.WithEnv() cfg.DBConfig, _ = postgres.TestConfig.WithEnv()
// update the start block if we have already validated past it // update the start block if we have already validated past it
if lastValidated > cfg.FromBlock { if lastValidated > cfg.FromBlock {
cfg.FromBlock = lastValidated cfg.FromBlock = lastValidated

View File

@ -2,7 +2,7 @@
set -eu set -eu
geth_endpoint="$1" geth_endpoint="${1:-$ETH_HTTP_PATH}"
latest_block_hex=$(curl -s $geth_endpoint -X POST -H "Content-Type: application/json" \ latest_block_hex=$(curl -s $geth_endpoint -X POST -H "Content-Type: application/json" \
--data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":42}' | \ --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":42}' | \

View File

@ -4,24 +4,28 @@
set -e set -e
laconic_so="${LACONIC_SO:-laconic-so} --stack $(readlink -f test) --verbose"
CONFIG_DIR=$(readlink -f "${CONFIG_DIR:-$(mktemp -d)}") CONFIG_DIR=$(readlink -f "${CONFIG_DIR:-$(mktemp -d)}")
# Prevent conflicting tty output
export BUILDKIT_PROGRESS=plain
# Point stack-orchestrator to the multi-project root # Point stack-orchestrator to the multi-project root
export CERC_REPO_BASE_DIR="${CERC_REPO_BASE_DIR:-..}" export CERC_REPO_BASE_DIR="${CERC_REPO_BASE_DIR:-..}"
# v5 migrations only go up to version 18 # v5 migrations only go up to version 20
echo CERC_STATEDIFF_DB_GOOSE_MIN_VER=18 >> $CONFIG_DIR/stack.env echo CERC_STATEDIFF_DB_GOOSE_MIN_VER=20 >> $CONFIG_DIR/stack.env
# don't run plugeth in the debugger
laconic_so="${LACONIC_SO:-laconic-so} --stack fixturenet-plugeth-tx --verbose" echo CERC_REMOTE_DEBUG=false >> $CONFIG_DIR/stack.env
set -x set -x
if [[ -z $SKIP_BUILD ]]; then if [[ -z $SKIP_BUILD ]]; then
$laconic_so setup-repositories \ $laconic_so setup-repositories \
--exclude github.com/cerc-io/ipld-eth-server,github.com/cerc-io/tx-spammer,github.com/dboreham/foundry \ --exclude git.vdb.to/cerc-io/ipld-eth-server
--branches-file ./test/stack-refs.txt # Assume the tested image has been built separately
$laconic_so build-containers \ $laconic_so build-containers \
--exclude cerc/ipld-eth-server,cerc/keycloak,cerc/tx-spammer,cerc/foundry --exclude cerc/ipld-eth-server
fi fi
$laconic_so deploy \ $laconic_so deploy \

View File

@ -3,7 +3,7 @@
services: services:
contract-deployer: contract-deployer:
restart: on-failure restart: on-failure
image: cerc/ipld-eth-db-validator/contract-deployer:local image: cerc/ipld-eth-db-validator/test-contract-deployer:local
build: ./contract build: ./contract
networks: networks:
- test_default - test_default

View File

@ -1,2 +0,0 @@
github.com/cerc-io/ipld-eth-db v5.0.5-alpha
git.vdb.to/cerc-io/plugeth-statediff v0.1.1

20
test/stack.yml Normal file
View File

@ -0,0 +1,20 @@
version: "1.2"
name: fixturenet-plugeth-tx
description: "Plugeth Ethereum Fixturenet for testing ipld-eth-db-validator"
repos:
- git.vdb.to/cerc-io/plugeth@statediff-patches # todo: dev
- git.vdb.to/cerc-io/plugeth-statediff@update-czkg4844 # todo: dev
- git.vdb.to/cerc-io/lighthouse
- git.vdb.to/cerc-io/ipld-eth-db@v5.2.1-alpha
containers:
- cerc/plugeth-statediff
- cerc/plugeth
- cerc/fixturenet-eth-genesis
- cerc/fixturenet-plugeth-plugeth
- cerc/lighthouse
- cerc/lighthouse-cli
- cerc/fixturenet-eth-lighthouse
- cerc/ipld-eth-db
pods:
- fixturenet-plugeth
- ipld-eth-db