Support withdrawal objects #265

Merged
roysc merged 13 commits from withdrawal-support into v5 2024-08-05 15:50:54 +00:00
3 changed files with 30 additions and 47 deletions
Showing only changes of commit 81c9e05b44 - Show all commits

View File

@ -13,6 +13,7 @@ on:
env: env:
SO_VERSION: v1.1.0-87fffca-202404110321 SO_VERSION: v1.1.0-87fffca-202404110321
FIXTURENET_ETH_STACKS_REF: main
jobs: jobs:
test: test:
@ -60,11 +61,18 @@ jobs:
ref: ${{ env.SO_VERSION }} ref: ${{ env.SO_VERSION }}
path: ./stack-orchestrator path: ./stack-orchestrator
- run: pip install ./stack-orchestrator - run: pip install ./stack-orchestrator
- name: Clone fixturenet stack repo
uses: actions/checkout@v4
with:
repository: cerc-io/fixturenet-eth-stacks
ref: ${{ env.FIXTURENET_ETH_STACKS_REF }}
path: ./fixturenet-eth-stacks
progress: false
- name: Run testnet stack - name: Run testnet stack
env: env:
CERC_GO_AUTH_TOKEN: ${{ secrets.CICD_REPO_TOKEN }} CERC_GO_AUTH_TOKEN: ${{ secrets.CICD_REPO_TOKEN }}
run: ./scripts/integration-setup.sh run: ./scripts/run-test-stack.sh ./fixturenet-eth-stacks/stack-orchestrator/stacks/fixturenet-plugeth
- name: Run server - name: Run server
env: env:
ETH_FORWARD_ETH_CALLS: false ETH_FORWARD_ETH_CALLS: false

View File

@ -1,39 +1,37 @@
#!/bin/bash #!/bin/bash
# Builds and deploys a stack with only what we need.
# This script assumes we are running in the project root.
set -e set -ex
laconic_so="${LACONIC_SO:-laconic-so} --stack $(readlink -f test) --verbose" stack_dir=$(readlink -f "$1")
[[ -d "$stack_dir" ]]
CONFIG_DIR=$(readlink -f "${CONFIG_DIR:-$(mktemp -d)}") CONFIG_DIR=$(readlink -f "${CONFIG_DIR:-$(mktemp -d)}")
# By default assume we are running in the project root.
export CERC_REPO_BASE_DIR="${CERC_REPO_BASE_DIR:-$(git rev-parse --show-toplevel)/..}"
# Prevent conflicting tty output laconic_so="laconic-so --verbose --stack $stack_dir"
export BUILDKIT_PROGRESS=plain
# By default assume we are running in the project root # Don't run geth/plugeth in the debugger, it will swallow error backtraces
export CERC_REPO_BASE_DIR="${CERC_REPO_BASE_DIR:-..}"
echo CERC_STATEDIFF_DB_GOOSE_MIN_VER=21 >> $CONFIG_DIR/stack.env
# Pass this in so we can run eth_call forwarding tests, which expect no IPLD DB
echo CERC_RUN_STATEDIFF=${CERC_RUN_STATEDIFF:-true} >> $CONFIG_DIR/stack.env
# Don't run the debugger
echo CERC_REMOTE_DEBUG=false >> $CONFIG_DIR/stack.env echo CERC_REMOTE_DEBUG=false >> $CONFIG_DIR/stack.env
# Passing this lets us run eth_call forwarding tests without running ipld-eth-db
echo CERC_RUN_STATEDIFF=${CERC_RUN_STATEDIFF:-true} >> $CONFIG_DIR/stack.env
set -x
if [[ -z $SKIP_BUILD ]]; then if [[ -z $SKIP_BUILD ]]; then
$laconic_so setup-repositories \ # Prevent conflicting tty output
--exclude git.vdb.to/cerc-io/ipld-eth-server export BUILDKIT_PROGRESS=plain
# Assume the tested image has been built separately
$laconic_so build-containers \ $laconic_so setup-repositories
--exclude cerc/ipld-eth-server $laconic_so build-containers
fi fi
$laconic_so deploy \ if ! $laconic_so deploy \
--exclude ipld-eth-server \ --env-file $CONFIG_DIR/stack.env \
--env-file $CONFIG_DIR/stack.env \ --cluster test up
--cluster test up then
$laconic_so deploy --cluster test logs
exit 1
fi
set +x set +x

View File

@ -1,23 +0,0 @@
version: "1.2"
name: fixturenet-plugeth-tx
description: "Plugeth Ethereum Fixturenet for testing ipld-eth-server"
repos:
- git.vdb.to/cerc-io/plugeth@v1.13.14-cerc-2
- git.vdb.to/cerc-io/plugeth-statediff@index-withdrawals # todo: dev
- git.vdb.to/cerc-io/lighthouse
- git.vdb.to/cerc-io/ipld-eth-db@add-withdrawals # todo: dev
- git.vdb.to/cerc-io/ipld-eth-server
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
- cerc/ipld-eth-server
pods:
- fixturenet-plugeth
- ipld-eth-db
- ipld-eth-server