From b908f8146c16ca3157e8d56ae5e6e1bc7e4cacf8 Mon Sep 17 00:00:00 2001 From: colinlyguo Date: Tue, 10 Jun 2025 14:39:50 +0800 Subject: [PATCH 1/3] fix(gas-oracle & rollup-relayer): blob fee calculation based on excessBlobGas --- common/version/version.go | 2 +- rollup/go.mod | 2 +- rollup/go.sum | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/common/version/version.go b/common/version/version.go index 7f2043871f..a3ad5efcd6 100644 --- a/common/version/version.go +++ b/common/version/version.go @@ -5,7 +5,7 @@ import ( "runtime/debug" ) -var tag = "v4.5.21" +var tag = "v4.5.22" var commit = func() string { if info, ok := debug.ReadBuildInfo(); ok { diff --git a/rollup/go.mod b/rollup/go.mod index 27d7956dc2..2db4f2f101 100644 --- a/rollup/go.mod +++ b/rollup/go.mod @@ -12,7 +12,7 @@ require ( github.com/mitchellh/mapstructure v1.5.0 github.com/prometheus/client_golang v1.16.0 github.com/scroll-tech/da-codec v0.1.3-0.20250519114140-bfa7133d4ad1 - github.com/scroll-tech/go-ethereum v1.10.14-0.20250305151038-478940e79601 + github.com/scroll-tech/go-ethereum v1.10.14-0.20250610063104-56376082ea19 github.com/smartystreets/goconvey v1.8.0 github.com/spf13/viper v1.19.0 github.com/stretchr/testify v1.10.0 diff --git a/rollup/go.sum b/rollup/go.sum index fa250a522d..a3187c68b8 100644 --- a/rollup/go.sum +++ b/rollup/go.sum @@ -251,8 +251,8 @@ github.com/sagikazarmark/slog-shim v0.1.0 h1:diDBnUNK9N/354PgrxMywXnAwEr1QZcOr6g github.com/sagikazarmark/slog-shim v0.1.0/go.mod h1:SrcSrq8aKtyuqEI1uvTDTK1arOWRIczQRv+GVI1AkeQ= github.com/scroll-tech/da-codec v0.1.3-0.20250519114140-bfa7133d4ad1 h1:6aKqJSal+QVdB5HMWMs0JTbAIZ6/iAHJx9qizz0w9dU= github.com/scroll-tech/da-codec v0.1.3-0.20250519114140-bfa7133d4ad1/go.mod h1:yhTS9OVC0xQGhg7DN5iV5KZJvnSIlFWAxDdp+6jxQtY= -github.com/scroll-tech/go-ethereum v1.10.14-0.20250305151038-478940e79601 h1:NEsjCG6uSvLRBlsP3+x6PL1kM+Ojs3g8UGotIPgJSz8= -github.com/scroll-tech/go-ethereum v1.10.14-0.20250305151038-478940e79601/go.mod h1:OblWe1+QrZwdpwO0j/LY3BSGuKT3YPUFBDQQgvvfStQ= +github.com/scroll-tech/go-ethereum v1.10.14-0.20250610063104-56376082ea19 h1:TVpUV/bFr9oBUujVmcXYVXVKiMN19Mmd8S9gVdXGSEM= +github.com/scroll-tech/go-ethereum v1.10.14-0.20250610063104-56376082ea19/go.mod h1:756YMENiSfx/5pCwKq3+uSTWjXuHTbiCB+TirJjsQT8= github.com/scroll-tech/zktrie v0.8.4 h1:UagmnZ4Z3ITCk+aUq9NQZJNAwnWl4gSxsLb2Nl7IgRE= github.com/scroll-tech/zktrie v0.8.4/go.mod h1:XvNo7vAk8yxNyTjBDj5WIiFzYW4bx/gJ78+NK6Zn6Uk= github.com/shirou/gopsutil v3.21.11+incompatible h1:+1+c1VGhc88SSonWP6foOcLhvnKlUeu/erjjvaPEYiI= From 877f4c8dc6d092b3c9fa1a1bf8c652c5e6d1d5a4 Mon Sep 17 00:00:00 2001 From: colinlyguo Date: Tue, 10 Jun 2025 17:19:52 +0800 Subject: [PATCH 2/3] update commit hash to develop branch --- rollup/go.mod | 2 +- rollup/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/rollup/go.mod b/rollup/go.mod index 2db4f2f101..ad550d25dc 100644 --- a/rollup/go.mod +++ b/rollup/go.mod @@ -12,7 +12,7 @@ require ( github.com/mitchellh/mapstructure v1.5.0 github.com/prometheus/client_golang v1.16.0 github.com/scroll-tech/da-codec v0.1.3-0.20250519114140-bfa7133d4ad1 - github.com/scroll-tech/go-ethereum v1.10.14-0.20250610063104-56376082ea19 + github.com/scroll-tech/go-ethereum v1.10.14-0.20250610090337-00c5c2bd3e65 github.com/smartystreets/goconvey v1.8.0 github.com/spf13/viper v1.19.0 github.com/stretchr/testify v1.10.0 diff --git a/rollup/go.sum b/rollup/go.sum index a3187c68b8..2d8fcd49e2 100644 --- a/rollup/go.sum +++ b/rollup/go.sum @@ -251,8 +251,8 @@ github.com/sagikazarmark/slog-shim v0.1.0 h1:diDBnUNK9N/354PgrxMywXnAwEr1QZcOr6g github.com/sagikazarmark/slog-shim v0.1.0/go.mod h1:SrcSrq8aKtyuqEI1uvTDTK1arOWRIczQRv+GVI1AkeQ= github.com/scroll-tech/da-codec v0.1.3-0.20250519114140-bfa7133d4ad1 h1:6aKqJSal+QVdB5HMWMs0JTbAIZ6/iAHJx9qizz0w9dU= github.com/scroll-tech/da-codec v0.1.3-0.20250519114140-bfa7133d4ad1/go.mod h1:yhTS9OVC0xQGhg7DN5iV5KZJvnSIlFWAxDdp+6jxQtY= -github.com/scroll-tech/go-ethereum v1.10.14-0.20250610063104-56376082ea19 h1:TVpUV/bFr9oBUujVmcXYVXVKiMN19Mmd8S9gVdXGSEM= -github.com/scroll-tech/go-ethereum v1.10.14-0.20250610063104-56376082ea19/go.mod h1:756YMENiSfx/5pCwKq3+uSTWjXuHTbiCB+TirJjsQT8= +github.com/scroll-tech/go-ethereum v1.10.14-0.20250610090337-00c5c2bd3e65 h1:idsnkl5rwVr7eNUB0HxdkKI0L3zbTm8XSGwMTB5ndws= +github.com/scroll-tech/go-ethereum v1.10.14-0.20250610090337-00c5c2bd3e65/go.mod h1:756YMENiSfx/5pCwKq3+uSTWjXuHTbiCB+TirJjsQT8= github.com/scroll-tech/zktrie v0.8.4 h1:UagmnZ4Z3ITCk+aUq9NQZJNAwnWl4gSxsLb2Nl7IgRE= github.com/scroll-tech/zktrie v0.8.4/go.mod h1:XvNo7vAk8yxNyTjBDj5WIiFzYW4bx/gJ78+NK6Zn6Uk= github.com/shirou/gopsutil v3.21.11+incompatible h1:+1+c1VGhc88SSonWP6foOcLhvnKlUeu/erjjvaPEYiI= From 8a8fd9cfd0021fde6dcc984884709b2eed366263 Mon Sep 17 00:00:00 2001 From: colinlyguo Date: Tue, 10 Jun 2025 09:20:33 +0000 Subject: [PATCH 3/3] =?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 a3ad5efcd6..3ab70685f6 100644 --- a/common/version/version.go +++ b/common/version/version.go @@ -5,7 +5,7 @@ import ( "runtime/debug" ) -var tag = "v4.5.22" +var tag = "v4.5.23" var commit = func() string { if info, ok := debug.ReadBuildInfo(); ok {