Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Daisy chain tests #14

Merged
merged 7 commits into from
Jul 14, 2023
Merged

Daisy chain tests #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3fae70b
feat: Daisy chain tests (#79)
clabby Mar 21, 2023
b0a5237
Merge commit '3fae70b32844b9b1d27678a8d931ebae962269fd' into pcw10955…
pcw109550 Jul 7, 2023
581892e
Support op-erigon client for daisy chain tests
pcw109550 Jul 7, 2023
84374fc
Use op-erigon flags for database init
pcw109550 Jul 7, 2023
e554a09
Adjust client timeout for daisy tests
pcw109550 Jul 7, 2023
724b6b4
Use empty interface to compare everything
pcw109550 Jul 11, 2023
5888b1b
Fix slack context for circleci
pcw109550 Jul 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,11 @@ workflows:
requires: [ "build" ]
context: slack-hive
sim: optimism/rpc
- run-hive-sim:
name: hive-test-daisy-chain
requires: [ "build" ]
context: slack-hive
sim: optimism/daisy-chain
scheduled:
triggers:
- schedule:
Expand Down
2 changes: 1 addition & 1 deletion clients/op-erigon/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ FROM testinprod/op-erigon:latest
USER root

# socat for routing websocket requests
RUN apk add --update bash curl jq socat
RUN apk add --update bash curl jq socat tar
RUN apk add --no-cache ca-certificates
RUN /usr/local/bin/erigon --version | sed -e 's/erigon version \(.*\)/\1/' > /version.txt

Expand Down
9 changes: 9 additions & 0 deletions clients/op-erigon/entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,15 @@ fi
if [ "$HIVE_OP_GETH_SEQUENCER_HTTP" != "" ]; then
EXTRA_FLAGS="$EXTRA_FLAGS --rollup.sequencerhttp $HIVE_OP_GETH_SEQUENCER_HTTP"
fi
if [ "$HIVE_OP_GETH_HISTORICAL_RPC" != "" ]; then
EXTRA_FLAGS="$EXTRA_FLAGS --rollup.historicalrpc=$HIVE_OP_GETH_HISTORICAL_RPC"
fi
if [ "$HIVE_OP_ERIGON_USE_GOERLI_DATADIR" != "" ]; then
wget -c -O "/backup.tar.gz" https://op-erigon-backup.goerli.testinprod.io
mkdir /goerli-bedrock
tar -zxvf "/backup.tar.gz" -C /goerli-bedrock
ERIGON_DATA_DIR="/goerli-bedrock"
fi
set -u

/usr/local/bin/erigon \
Expand Down
2 changes: 1 addition & 1 deletion clients/op-geth/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ARG branch=optimism
FROM us-docker.pkg.dev/oplabs-tools-artifacts/images/op-geth:$branch

RUN apk add curl jq bash
RUN apk add curl jq bash tar
RUN apk add --no-cache ca-certificates
RUN geth console --exec 'console.log(admin.nodeInfo.name)' --maxpeers=0 --nodiscover --dev 2>/dev/null | head -1 > /version.txt

Expand Down
11 changes: 10 additions & 1 deletion clients/op-geth/entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,16 @@ EXTRA_FLAGS="--rollup.disabletxpoolgossip=true"
# We check for env variables that may not be bound so we need to disable `set -u` for this section.
set +u
if [ "$HIVE_OP_GETH_SEQUENCER_HTTP" != "" ]; then
EXTRA_FLAGS="$EXTRA_FLAGS --rollup.sequencerhttp $HIVE_OP_GETH_SEQUENCER_HTTP"
EXTRA_FLAGS="$EXTRA_FLAGS --rollup.sequencerhttp=$HIVE_OP_GETH_SEQUENCER_HTTP"
fi
if [ "$HIVE_OP_GETH_HISTORICAL_RPC" != "" ]; then
EXTRA_FLAGS="$EXTRA_FLAGS --rollup.historicalrpc=$HIVE_OP_GETH_HISTORICAL_RPC"
fi
if [ "$HIVE_OP_GETH_USE_GOERLI_DATADIR" != "" ]; then
curl -L -o /goerli-bedrock.tar https://storage.googleapis.com/oplabs-goerli-data/goerli-bedrock.tar
mkdir /goerli-bedrock
tar -xvf /goerli-bedrock.tar -C /goerli-bedrock
GETH_DATA_DIR="/goerli-bedrock"
fi
set -u

Expand Down
18 changes: 12 additions & 6 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,10 @@ require (
github.com/Microsoft/go-winio v0.5.2 // indirect
github.com/Microsoft/hcsshim v0.9.3 // indirect
github.com/StackExchange/wmi v0.0.0-20210224194228-fe8f1750fd46 // indirect
github.com/VictoriaMetrics/fastcache v1.6.0 // indirect
github.com/VictoriaMetrics/fastcache v1.9.0 // indirect
github.com/allegro/bigcache v1.2.1 // indirect
github.com/aristanetworks/goarista v0.0.0-20170210015632-ea17b1a17847 // indirect
github.com/btcsuite/btcd v0.22.1 // indirect
github.com/btcsuite/btcd/btcec/v2 v2.2.0 // indirect
github.com/cespare/xxhash/v2 v2.1.2 // indirect
github.com/containerd/cgroups v1.0.3 // indirect
Expand All @@ -28,21 +30,23 @@ require (
github.com/docker/docker v20.10.17+incompatible // indirect
github.com/docker/go-connections v0.4.0 // indirect
github.com/docker/go-units v0.4.0 // indirect
github.com/edsrzf/mmap-go v1.0.0 // indirect
github.com/edsrzf/mmap-go v1.1.0 // indirect
github.com/elastic/gosigar v0.12.0 // indirect
github.com/ethereum-optimism/optimism/l2geth v0.0.0-20230315192826-cc1066301d20 // indirect
github.com/go-logfmt/logfmt v0.5.0 // indirect
github.com/go-ole/go-ole v1.2.5 // indirect
github.com/go-stack/stack v1.8.1 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/snappy v0.0.4 // indirect
github.com/gorilla/websocket v1.4.2 // indirect
github.com/gorilla/websocket v1.5.0 // indirect
github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d // indirect
github.com/hashicorp/yamux v0.0.0-20211028200310-0bc27b27de87 // indirect
github.com/holiman/bloomfilter/v2 v2.0.3 // indirect
github.com/holiman/uint256 v1.2.0 // indirect
github.com/mattn/go-colorable v0.1.12 // indirect
github.com/mattn/go-isatty v0.0.14 // indirect
github.com/mattn/go-runewidth v0.0.9 // indirect
github.com/mattn/go-runewidth v0.0.13 // indirect
github.com/moby/sys/mount v0.3.3 // indirect
github.com/moby/sys/mountinfo v0.6.2 // indirect
github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 // indirect
Expand All @@ -52,14 +56,16 @@ require (
github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799 // indirect
github.com/opencontainers/runc v1.1.2 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/prometheus/tsdb v0.7.1 // indirect
github.com/prometheus/tsdb v0.10.0 // indirect
github.com/shirou/gopsutil v3.21.4-0.20210419000835-c7a38de76ee5+incompatible // indirect
github.com/sirupsen/logrus v1.8.1 // indirect
github.com/steakknife/bloomfilter v0.0.0-20180922174646-6819c0d2a570 // indirect
github.com/steakknife/hamming v0.0.0-20180906055917-c99c65617cd3 // indirect
github.com/syndtr/goleveldb v1.0.1-0.20220614013038-64ee5596c38a // indirect
github.com/tklauser/go-sysconf v0.3.5 // indirect
github.com/tklauser/numcpus v0.2.2 // indirect
go.opencensus.io v0.23.0 // indirect
golang.org/x/crypto v0.0.0-20211202192323-5770296d904e // indirect
golang.org/x/crypto v0.0.0-20220307211146-efcb8507fb70 // indirect
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a // indirect
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect
Expand Down
Loading