From e1b14908f460b308200e9608ec1bd71d890a219d Mon Sep 17 00:00:00 2001 From: colinlyguo Date: Wed, 26 Feb 2025 16:39:50 +0800 Subject: [PATCH 1/6] fix go.work.sum --- go.work.sum | 1 + 1 file changed, 1 insertion(+) diff --git a/go.work.sum b/go.work.sum index 38540cadea..789439df5e 100644 --- a/go.work.sum +++ b/go.work.sum @@ -629,6 +629,7 @@ github.com/dave/jennifer v1.2.0 h1:S15ZkFMRoJ36mGAQgWL1tnr0NQJh9rZ8qatseX/VbBc= github.com/dave/jennifer v1.2.0/go.mod h1:fIb+770HOpJ2fmN9EPPKOqm1vMGhB+TwXKMZhrIygKg= github.com/dchest/blake512 v1.0.0 h1:oDFEQFIqFSeuA34xLtXZ/rWxCXdSjirjzPhey5EUvmA= github.com/dchest/blake512 v1.0.0/go.mod h1:FV1x7xPPLWukZlpDpWQ88rF/SFwZ5qbskrzhLMB92JI= +github.com/deckarep/golang-set v1.8.0 h1:sk9/l/KqpunDwP7pSjUg0keiOOLEnOBHzykLrsPppp4= github.com/deckarep/golang-set v1.8.0/go.mod h1:5nI87KwE7wgsBU1F4GKAw2Qod7p5kyS383rP6+o6qqo= github.com/deepmap/oapi-codegen v1.6.0 h1:w/d1ntwh91XI0b/8ja7+u5SvA4IFfM0UNNLmiDR1gg0= github.com/deepmap/oapi-codegen v1.6.0/go.mod h1:ryDa9AgbELGeB+YEXE1dR53yAjHwFvE9iAUlWl9Al3M= From 625863444e17f3fa5f2dad3dc7724a5a0c9c114b Mon Sep 17 00:00:00 2001 From: colinlyguo Date: Wed, 26 Feb 2025 12:35:18 +0000 Subject: [PATCH 2/6] =?UTF-8?q?chore:=20auto=20version=20bump=E2=80=89[bot?= =?UTF-8?q?]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/version/version.go b/common/version/version.go index f41be38c9e..bbdef889fb 100644 --- a/common/version/version.go +++ b/common/version/version.go @@ -5,7 +5,7 @@ import ( "runtime/debug" ) -var tag = "v4.4.88" +var tag = "v4.4.89" var commit = func() string { if info, ok := debug.ReadBuildInfo(); ok { From b55ccc04a50127729b3df607e989c2ea5536745b Mon Sep 17 00:00:00 2001 From: colinlyguo Date: Wed, 26 Feb 2025 20:41:37 +0800 Subject: [PATCH 3/6] fix compile error and image build error --- build/dockerfiles/bridgehistoryapi-db-cli.Dockerfile | 7 ++++--- build/dockerfiles/db_cli.Dockerfile | 7 ++++--- rollup/internal/controller/sender/sender.go | 4 ++-- rollup/internal/controller/watcher/l1_watcher.go | 4 ++-- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/build/dockerfiles/bridgehistoryapi-db-cli.Dockerfile b/build/dockerfiles/bridgehistoryapi-db-cli.Dockerfile index 6797d9e92c..41817f663b 100644 --- a/build/dockerfiles/bridgehistoryapi-db-cli.Dockerfile +++ b/build/dockerfiles/bridgehistoryapi-db-cli.Dockerfile @@ -10,10 +10,11 @@ FROM base as builder RUN --mount=target=. \ --mount=type=cache,target=/root/.cache/go-build \ - cd /src/bridge-history-api/cmd/db_cli && go build -v -p 4 -o /bin/db_cli + cd /src/bridge-history-api/cmd/db_cli && CGO_LDFLAGS="-ldl" go build -v -p 4 -o /bin/db_cli -# Pull db_cli into a second stage deploy alpine container -FROM alpine:latest +# Pull db_cli into a second stage deploy ubuntu container +FROM ubuntu:20.04 +ENV CGO_LDFLAGS="-ldl" COPY --from=builder /bin/db_cli /bin/ WORKDIR /app ENTRYPOINT ["db_cli"] \ No newline at end of file diff --git a/build/dockerfiles/db_cli.Dockerfile b/build/dockerfiles/db_cli.Dockerfile index e8bd26212b..e1603e0251 100644 --- a/build/dockerfiles/db_cli.Dockerfile +++ b/build/dockerfiles/db_cli.Dockerfile @@ -16,10 +16,11 @@ FROM base as builder RUN --mount=target=. \ --mount=type=cache,target=/root/.cache/go-build \ - cd /src/database/cmd && go build -v -p 4 -o /bin/db_cli + cd /src/database/cmd && CGO_LDFLAGS="-ldl" go build -v -p 4 -o /bin/db_cli -# Pull db_cli into a second stage deploy alpine container -FROM alpine:latest +# Pull db_cli into a second stage deploy ubuntu container +FROM ubuntu:20.04 +ENV CGO_LDFLAGS="-ldl" COPY --from=builder /bin/db_cli /bin/ WORKDIR /app ENTRYPOINT ["db_cli"] diff --git a/rollup/internal/controller/sender/sender.go b/rollup/internal/controller/sender/sender.go index daf4e7b54d..657e02238c 100644 --- a/rollup/internal/controller/sender/sender.go +++ b/rollup/internal/controller/sender/sender.go @@ -12,7 +12,7 @@ import ( "github.com/holiman/uint256" "github.com/prometheus/client_golang/prometheus" "github.com/scroll-tech/go-ethereum/common" - "github.com/scroll-tech/go-ethereum/consensus/misc/eip4844" + "github.com/scroll-tech/go-ethereum/consensus/misc" gethTypes "github.com/scroll-tech/go-ethereum/core/types" "github.com/scroll-tech/go-ethereum/crypto/kzg4844" "github.com/scroll-tech/go-ethereum/ethclient" @@ -675,7 +675,7 @@ func (s *Sender) getBlockNumberAndBaseFeeAndBlobFee(ctx context.Context) (uint64 var blobBaseFee uint64 if excess := header.ExcessBlobGas; excess != nil { - blobBaseFee = eip4844.CalcBlobFee(*excess).Uint64() + blobBaseFee = misc.CalcBlobFee(*excess).Uint64() } // header.Number.Uint64() returns the pendingBlockNumber, so we minus 1 to get the latestBlockNumber. return header.Number.Uint64() - 1, baseFee, blobBaseFee, nil diff --git a/rollup/internal/controller/watcher/l1_watcher.go b/rollup/internal/controller/watcher/l1_watcher.go index 724a70354d..1b67089a3a 100644 --- a/rollup/internal/controller/watcher/l1_watcher.go +++ b/rollup/internal/controller/watcher/l1_watcher.go @@ -6,7 +6,7 @@ import ( "math/big" "github.com/prometheus/client_golang/prometheus" - "github.com/scroll-tech/go-ethereum/consensus/misc/eip4844" + "github.com/scroll-tech/go-ethereum/consensus/misc" gethTypes "github.com/scroll-tech/go-ethereum/core/types" "github.com/scroll-tech/go-ethereum/ethclient" "github.com/scroll-tech/go-ethereum/log" @@ -80,7 +80,7 @@ func (w *L1WatcherClient) FetchBlockHeader(blockHeight uint64) error { var blobBaseFee uint64 if excess := block.ExcessBlobGas; excess != nil { - blobBaseFee = eip4844.CalcBlobFee(*excess).Uint64() + blobBaseFee = misc.CalcBlobFee(*excess).Uint64() } l1Block := orm.L1Block{ From 0918cddda5c6db469e064bf2403cb935bfcc857f Mon Sep 17 00:00:00 2001 From: colinlyguo Date: Wed, 26 Feb 2025 20:48:13 +0800 Subject: [PATCH 4/6] change another base image --- build/dockerfiles/bridgehistoryapi-db-cli.Dockerfile | 2 +- build/dockerfiles/db_cli.Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/dockerfiles/bridgehistoryapi-db-cli.Dockerfile b/build/dockerfiles/bridgehistoryapi-db-cli.Dockerfile index 41817f663b..16384c2a2a 100644 --- a/build/dockerfiles/bridgehistoryapi-db-cli.Dockerfile +++ b/build/dockerfiles/bridgehistoryapi-db-cli.Dockerfile @@ -1,5 +1,5 @@ # Download Go dependencies -FROM golang:1.21-alpine3.19 as base +FROM scrolltech/go-rust-builder:go-1.21-rust-nightly-2023-12-03 as base WORKDIR /src COPY ./bridge-history-api/go.* ./ diff --git a/build/dockerfiles/db_cli.Dockerfile b/build/dockerfiles/db_cli.Dockerfile index e1603e0251..6d99eb3a5e 100644 --- a/build/dockerfiles/db_cli.Dockerfile +++ b/build/dockerfiles/db_cli.Dockerfile @@ -1,5 +1,5 @@ # Download Go dependencies -FROM scrolltech/go-alpine-builder:1.21 as base +FROM scrolltech/go-rust-builder:go-1.21-rust-nightly-2023-12-03 as base WORKDIR /src COPY go.work* ./ From 1b63cc5dd32a0280a14cfc49b83d84c3c28d777f Mon Sep 17 00:00:00 2001 From: colinlyguo Date: Wed, 26 Feb 2025 20:52:30 +0800 Subject: [PATCH 5/6] fix CGO_LDFLAGS --- build/dockerfiles/bridgehistoryapi-db-cli.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/dockerfiles/bridgehistoryapi-db-cli.Dockerfile b/build/dockerfiles/bridgehistoryapi-db-cli.Dockerfile index 16384c2a2a..7d28745d85 100644 --- a/build/dockerfiles/bridgehistoryapi-db-cli.Dockerfile +++ b/build/dockerfiles/bridgehistoryapi-db-cli.Dockerfile @@ -10,7 +10,7 @@ FROM base as builder RUN --mount=target=. \ --mount=type=cache,target=/root/.cache/go-build \ - cd /src/bridge-history-api/cmd/db_cli && CGO_LDFLAGS="-ldl" go build -v -p 4 -o /bin/db_cli + cd /src/bridge-history-api/cmd/db_cli && CGO_LDFLAGS="-Wl,--no-as-needed -ldl" go build -v -p 4 -o /bin/db_cli # Pull db_cli into a second stage deploy ubuntu container FROM ubuntu:20.04 From ec9f65f0ea14764c6c76b872430ad24b93b72e56 Mon Sep 17 00:00:00 2001 From: colinlyguo Date: Wed, 26 Feb 2025 20:53:41 +0800 Subject: [PATCH 6/6] fix CGO_LDFLAGS --- build/dockerfiles/db_cli.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/dockerfiles/db_cli.Dockerfile b/build/dockerfiles/db_cli.Dockerfile index 6d99eb3a5e..328a4de283 100644 --- a/build/dockerfiles/db_cli.Dockerfile +++ b/build/dockerfiles/db_cli.Dockerfile @@ -16,7 +16,7 @@ FROM base as builder RUN --mount=target=. \ --mount=type=cache,target=/root/.cache/go-build \ - cd /src/database/cmd && CGO_LDFLAGS="-ldl" go build -v -p 4 -o /bin/db_cli + cd /src/database/cmd && CGO_LDFLAGS="-Wl,--no-as-needed -ldl" go build -v -p 4 -o /bin/db_cli # Pull db_cli into a second stage deploy ubuntu container FROM ubuntu:20.04