diff --git a/.github/workflows/taiko-client--hive_test.yml b/.github/workflows/taiko-client--hive_test.yml index 048fafd8ec..5afcbb9acd 100644 --- a/.github/workflows/taiko-client--hive_test.yml +++ b/.github/workflows/taiko-client--hive_test.yml @@ -2,11 +2,7 @@ name: "Taiko Client Hive Tests" on: push: - branches: [refactor/rm-tier-fee2] - paths: - - "packages/taiko-client/**" - pull_request: - branches: [ refactor/rm-tier-fee2 ] + branches: [main] paths: - "packages/taiko-client/**" - "go.mod" @@ -31,9 +27,24 @@ jobs: go-version: 1.21 cache: true + - name: Install Foundry + uses: foundry-rs/foundry-toolchain@v1 + + - name: Install pnpm dependencies + uses: ./.github/actions/install-pnpm-dependencies + - name: Clone taikoxyz/hive run: git clone https://github.com/taikoxyz/hive.git /tmp/hive - - name: hive tests + - name: Update taiko contract tx list + working-directory: . + run: | + export TAIKO_MONO_DIR=$PWD + cd /tmp/hive/simulators/taiko + sh scripts/deploy_l1_contract.sh + + - name: Hive tests working-directory: packages/taiko-client - run: export HIVE_BASE_DIR=/tmp/hive && go test -v -p=1 ./integration_test -timeout=600s + run: | + export HIVE_DIR=/tmp/hive + go test -v -p=1 ./integration_test -timeout=600s diff --git a/go.mod b/go.mod index 8f1767fc67..00cbcbacc6 100644 --- a/go.mod +++ b/go.mod @@ -13,7 +13,7 @@ require ( github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0 github.com/ethereum-optimism/optimism v1.7.4 github.com/ethereum/go-ethereum v1.13.15 - github.com/ethereum/hive v0.0.0-20240808014330-625b82294b46 + github.com/ethereum/hive v0.0.0-20240819211657-cf4f55c5d80c github.com/go-git/go-git/v5 v5.12.0 github.com/go-resty/resty/v2 v2.7.0 github.com/gomarkdown/markdown v0.0.0-20231222211730-1d6d20845b47 @@ -338,4 +338,4 @@ replace github.com/ethereum-optimism/optimism v1.7.4 => github.com/taikoxyz/opti replace github.com/uber/jaeger-client-go => github.com/uber/jaeger-client-go v2.25.0+incompatible -replace github.com/ethereum/hive v0.0.0-20240808014330-625b82294b46 => github.com/taikoxyz/hive v0.0.0-20240815122245-7e511f1afe7b +replace github.com/ethereum/hive v0.0.0-20240819211657-cf4f55c5d80c => github.com/taikoxyz/hive v0.0.0-20240820040114-cbd376215f38 diff --git a/go.sum b/go.sum index 829ab2bd52..325b537ad2 100644 --- a/go.sum +++ b/go.sum @@ -1175,8 +1175,8 @@ github.com/swaggo/swag v1.16.3/go.mod h1:DImHIuOFXKpMFAQjcC7FG4m3Dg4+QuUgUzJmKjI github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7/go.mod h1:q4W45IWZaF22tdD+VEXcAWRA037jwmWEB5VWYORlTpc= github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d h1:vfofYNRScrDdvS342BElfbETmL1Aiz3i2t0zfRj16Hs= github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d/go.mod h1:RRCYJbIwD5jmqPI9XoAFR0OcDxqUctll6zUj/+B4S48= -github.com/taikoxyz/hive v0.0.0-20240815122245-7e511f1afe7b h1:yk10A6jYSPWlKVG7ar/C4rOsojkb/vMpRtR/GNXUqHM= -github.com/taikoxyz/hive v0.0.0-20240815122245-7e511f1afe7b/go.mod h1:SRnVApayESg4JOlUIojO1nKNG8BLxdpZSkewWrj6rYU= +github.com/taikoxyz/hive v0.0.0-20240820040114-cbd376215f38 h1:7fAvFrUftT27NBvDwledwGaT0tStIpF6hq7vwoHuTFU= +github.com/taikoxyz/hive v0.0.0-20240820040114-cbd376215f38/go.mod h1:SRnVApayESg4JOlUIojO1nKNG8BLxdpZSkewWrj6rYU= github.com/taikoxyz/optimism v0.0.0-20240627102435-4845247ff00c h1:Hfhh/icxShwpLdX7RqYzZN1EU40MGWhvSXc2V+ZzTxw= github.com/taikoxyz/optimism v0.0.0-20240627102435-4845247ff00c/go.mod h1:jKn73pLX8eDIG0Y3XeuUSetepecM8OvRflyPHbi05B4= github.com/taikoxyz/taiko-geth v1.5.1-0.20240808041410-882a6cd3294c h1:XQDnwQfisAlFAGKqabDcLdg9B+pRwS3nxS+03yP1g9o= diff --git a/packages/taiko-client/integration_test/hive_test.go b/packages/taiko-client/integration_test/hive_test.go index 2d9258f6ca..8676a6977c 100644 --- a/packages/taiko-client/integration_test/hive_test.go +++ b/packages/taiko-client/integration_test/hive_test.go @@ -10,11 +10,12 @@ import ( ) func TestHiveHandler(t *testing.T) { - baseDir := os.Getenv("HIVE_BASE_DIR") + baseDir := os.Getenv("HIVE_DIR") if baseDir == "" { t.SkipNow() } handler, err := hivesim.NewHiveFramework(&hivesim.HiveConfig{ + DockerOutput: true, BaseDir: baseDir, SimPattern: "taiko", SimTestPattern: "taiko-deneb-testnet/test-deneb-genesis",