From 3a75e120c0075b9d9bf03b78d9b19fd39a9c7c2c Mon Sep 17 00:00:00 2001 From: David Date: Tue, 7 Jan 2025 16:30:26 +0800 Subject: [PATCH 1/2] chore(taiko-client): bump `taiko-geth` dep --- go.mod | 2 +- go.sum | 8 ++++---- .../taiko-client/internal/docker/nodes/docker-compose.yml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 40eb12ac0f..75e4ee698c 100644 --- a/go.mod +++ b/go.mod @@ -234,7 +234,7 @@ require ( sigs.k8s.io/yaml v1.3.0 // indirect ) -replace github.com/ethereum/go-ethereum v1.14.11 => github.com/taikoxyz/taiko-geth v1.11.2-0.20241117065921-51d42ec9f39f +replace github.com/ethereum/go-ethereum v1.14.11 => github.com/taikoxyz/taiko-geth v1.11.2-0.20250107082544-a2cbf904eaae replace github.com/ethereum-optimism/optimism v1.7.4 => github.com/taikoxyz/optimism v0.0.0-20241003061504-cdf8af288f39 diff --git a/go.sum b/go.sum index 968b63e00d..4a38217b1a 100644 --- a/go.sum +++ b/go.sum @@ -375,10 +375,10 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= -github.com/labstack/echo-jwt/v4 v4.3.0 h1:8JcvVCrK9dRkPx/aWY3ZempZLO336Bebh4oAtBcxAv4= -github.com/labstack/echo-jwt/v4 v4.3.0/go.mod h1:OlWm3wqfnq3Ma8DLmmH7GiEAz2S7Bj23im2iPMEAR+Q= github.com/labstack/echo-contrib v0.17.2 h1:K1zivqmtcC70X9VdBFdLomjPDEVHlrcAObqmuFj1c6w= github.com/labstack/echo-contrib v0.17.2/go.mod h1:NeDh3PX7j/u+jR4iuDt1zHmWZSCz9c/p9mxXcDpyS8E= +github.com/labstack/echo-jwt/v4 v4.3.0 h1:8JcvVCrK9dRkPx/aWY3ZempZLO336Bebh4oAtBcxAv4= +github.com/labstack/echo-jwt/v4 v4.3.0/go.mod h1:OlWm3wqfnq3Ma8DLmmH7GiEAz2S7Bj23im2iPMEAR+Q= github.com/labstack/echo/v4 v4.0.0/go.mod h1:tZv7nai5buKSg5h/8E6zz4LsD/Dqh9/91Mvs7Z5Zyno= github.com/labstack/echo/v4 v4.1.15/go.mod h1:GWO5IBVzI371K8XJe50CSvHjQCafK6cw8R/moLhEU6o= github.com/labstack/echo/v4 v4.13.3 h1:pwhpCPrTl5qry5HRdM5FwdXnhXSLSY+WE+YQSeCaafY= @@ -603,8 +603,8 @@ github.com/taikoxyz/hive v0.0.0-20240827015317-405b241dd082 h1:ymZR+Y88LOnA8i3Ke github.com/taikoxyz/hive v0.0.0-20240827015317-405b241dd082/go.mod h1:RHnIu3EFehrWX3JhFAMQSXD5uz7l0xaNroTzXrap7EQ= github.com/taikoxyz/optimism v0.0.0-20241003061504-cdf8af288f39 h1:JssMxaDmORjQ9RPZNulVJhAD8zSPd6LZFq5wsr6Nwz8= github.com/taikoxyz/optimism v0.0.0-20241003061504-cdf8af288f39/go.mod h1:ym7scR7ZHvEmwx1DLGVDzFlAdR+uhP1+Z4XCiFuSD5s= -github.com/taikoxyz/taiko-geth v1.11.2-0.20241117065921-51d42ec9f39f h1:Jccr7lSc98y4YeXRT0Tb601nMDxFYUFm4wrVKZILcmA= -github.com/taikoxyz/taiko-geth v1.11.2-0.20241117065921-51d42ec9f39f/go.mod h1:+l/fr42Mma+xBnhefL/+z11/hcmJ2egl+ScIVPjhc7E= +github.com/taikoxyz/taiko-geth v1.11.2-0.20250107082544-a2cbf904eaae h1:exc3MDRDbpNahMwIA+yGFLJb8Umtqs4JLOBpa8hh4Us= +github.com/taikoxyz/taiko-geth v1.11.2-0.20250107082544-a2cbf904eaae/go.mod h1:+l/fr42Mma+xBnhefL/+z11/hcmJ2egl+ScIVPjhc7E= github.com/testcontainers/testcontainers-go v0.34.0 h1:5fbgF0vIN5u+nD3IWabQwRybuB4GY8G2HHgCkbMzMHo= github.com/testcontainers/testcontainers-go v0.34.0/go.mod h1:6P/kMkQe8yqPHfPWNulFGdFHTD8HB2vLq/231xY2iPQ= github.com/thomaso-mirodin/intmath v0.0.0-20160323211736-5dc6d854e46e h1:cR8/SYRgyQCt5cNCMniB/ZScMkhI9nk8U5C7SbISXjo= diff --git a/packages/taiko-client/internal/docker/nodes/docker-compose.yml b/packages/taiko-client/internal/docker/nodes/docker-compose.yml index 3da01faf1c..944f857cad 100644 --- a/packages/taiko-client/internal/docker/nodes/docker-compose.yml +++ b/packages/taiko-client/internal/docker/nodes/docker-compose.yml @@ -16,7 +16,7 @@ services: l2_geth: container_name: l2_geth - image: us-docker.pkg.dev/evmchain/images/taiko-geth:softblock + image: us-docker.pkg.dev/evmchain/images/taiko-geth:taiko restart: unless-stopped pull_policy: always volumes: From 85cfd920ed234c59c3c6523d7c1fbee51fd3ada7 Mon Sep 17 00:00:00 2001 From: David Date: Tue, 7 Jan 2025 16:34:41 +0800 Subject: [PATCH 2/2] chore(taiko-client): bump `taiko-geth` dep --- packages/taiko-client/driver/soft_blocks/api.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/taiko-client/driver/soft_blocks/api.go b/packages/taiko-client/driver/soft_blocks/api.go index f5b687fb60..a51bcd7b0b 100644 --- a/packages/taiko-client/driver/soft_blocks/api.go +++ b/packages/taiko-client/driver/soft_blocks/api.go @@ -87,6 +87,7 @@ type BuildSoftBlockResponseBody struct { // if the soft block transactions batch in request are valid, it will insert or reorg the correspoinding the soft // block to the backend L2 execution engine and return a success response. // +// @Summary Insert a soft block with a batch of given transactions for preconfirmation. // @Description Insert a batch of transactions into a soft block for preconfirmation. If the batch is the // @Description first for a block, a new soft block will be created. Otherwise, the transactions will // @Description be appended to the existing soft block. The API will fail if: @@ -227,6 +228,7 @@ type RemoveSoftBlocksResponseBody struct { // RemoveSoftBlocks removes the backend L2 execution engine soft head. // +// @Summary Remove the soft blocks beyond the specified block height. // @Description Remove all soft blocks from the blockchain beyond the specified block height, // @Description ensuring the latest block ID does not exceed the given height. This method will fail if // @Description the block with an ID one greater than the specified height is not a soft block. If the