From 03eadd0dfe788105e3ee33e8cae0e8a41b801593 Mon Sep 17 00:00:00 2001 From: colinlyguo Date: Wed, 16 Apr 2025 17:07:31 +0800 Subject: [PATCH 1/4] feat(gas-oracle): add a warn log when entering fallback mode --- common/version/version.go | 2 +- rollup/internal/controller/relayer/l1_relayer.go | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/common/version/version.go b/common/version/version.go index 60bc144895..7eeb26db3d 100644 --- a/common/version/version.go +++ b/common/version/version.go @@ -5,7 +5,7 @@ import ( "runtime/debug" ) -var tag = "v4.5.4" +var tag = "v4.5.5" var commit = func() string { if info, ok := debug.ReadBuildInfo(); ok { diff --git a/rollup/internal/controller/relayer/l1_relayer.go b/rollup/internal/controller/relayer/l1_relayer.go index 2c498da502..1f0f6614d9 100644 --- a/rollup/internal/controller/relayer/l1_relayer.go +++ b/rollup/internal/controller/relayer/l1_relayer.go @@ -167,6 +167,7 @@ func (r *Layer1Relayer) ProcessGasPriceOracle() { if r.lastBaseFee == r.cfg.GasOracleConfig.L1BaseFeeDefault && r.lastBlobBaseFee == r.cfg.GasOracleConfig.L1BlobBaseFeeDefault { return } + log.Warn("The committing batch has been stuck for a long time, it's likely that the L1 gas fee spiked, set fees to default values", "baseFee", baseFee, "blobBaseFee", blobBaseFee) baseFee = r.cfg.GasOracleConfig.L1BaseFeeDefault blobBaseFee = r.cfg.GasOracleConfig.L1BlobBaseFeeDefault } else if err != nil { From 7f43c22736773bdca7110c6a11a26508fdb847b6 Mon Sep 17 00:00:00 2001 From: colinlyguo Date: Wed, 16 Apr 2025 17:15:36 +0800 Subject: [PATCH 2/4] tweak --- rollup/internal/controller/relayer/l1_relayer.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rollup/internal/controller/relayer/l1_relayer.go b/rollup/internal/controller/relayer/l1_relayer.go index 1f0f6614d9..40b4654684 100644 --- a/rollup/internal/controller/relayer/l1_relayer.go +++ b/rollup/internal/controller/relayer/l1_relayer.go @@ -167,7 +167,7 @@ func (r *Layer1Relayer) ProcessGasPriceOracle() { if r.lastBaseFee == r.cfg.GasOracleConfig.L1BaseFeeDefault && r.lastBlobBaseFee == r.cfg.GasOracleConfig.L1BlobBaseFeeDefault { return } - log.Warn("The committing batch has been stuck for a long time, it's likely that the L1 gas fee spiked, set fees to default values", "baseFee", baseFee, "blobBaseFee", blobBaseFee) + log.Warn("The committing batch has been stuck for a long time, it's likely that the L1 gas fee spiked, set fees to default values", "baseFee", baseFee, "blobBaseFee", blobBaseFee, "threshold (min)", r.cfg.GasOracleConfig.L1BlobBaseFeeThreshold, "default base fee", r.cfg.GasOracleConfig.L1BaseFeeDefault, "default blob base fee", r.cfg.GasOracleConfig.L1BlobBaseFeeDefault) baseFee = r.cfg.GasOracleConfig.L1BaseFeeDefault blobBaseFee = r.cfg.GasOracleConfig.L1BlobBaseFeeDefault } else if err != nil { From 6a416249400d56a38b93fa3ca6b87516cdb19bbc Mon Sep 17 00:00:00 2001 From: colinlyguo Date: Wed, 16 Apr 2025 17:25:39 +0800 Subject: [PATCH 3/4] tweak --- rollup/internal/controller/relayer/l1_relayer.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rollup/internal/controller/relayer/l1_relayer.go b/rollup/internal/controller/relayer/l1_relayer.go index 40b4654684..def342aafe 100644 --- a/rollup/internal/controller/relayer/l1_relayer.go +++ b/rollup/internal/controller/relayer/l1_relayer.go @@ -167,7 +167,7 @@ func (r *Layer1Relayer) ProcessGasPriceOracle() { if r.lastBaseFee == r.cfg.GasOracleConfig.L1BaseFeeDefault && r.lastBlobBaseFee == r.cfg.GasOracleConfig.L1BlobBaseFeeDefault { return } - log.Warn("The committing batch has been stuck for a long time, it's likely that the L1 gas fee spiked, set fees to default values", "baseFee", baseFee, "blobBaseFee", blobBaseFee, "threshold (min)", r.cfg.GasOracleConfig.L1BlobBaseFeeThreshold, "default base fee", r.cfg.GasOracleConfig.L1BaseFeeDefault, "default blob base fee", r.cfg.GasOracleConfig.L1BlobBaseFeeDefault) + log.Warn("The committing batch has been stuck for a long time, it's likely that the L1 gas fee spiked, set fees to default values", "currentBaseFee", baseFee, "currentBlobBaseFee", blobBaseFee,"threshold (min)", r.cfg.GasOracleConfig.L1BlobBaseFeeThreshold, "defaultBaseFee", r.cfg.GasOracleConfig.L1BaseFeeDefault, "defaultBlobBaseFee", r.cfg.GasOracleConfig.L1BlobBaseFeeDefault) baseFee = r.cfg.GasOracleConfig.L1BaseFeeDefault blobBaseFee = r.cfg.GasOracleConfig.L1BlobBaseFeeDefault } else if err != nil { From 230d10bf909d531ecbc53cf814f8ca9e1add3833 Mon Sep 17 00:00:00 2001 From: colinlyguo Date: Wed, 16 Apr 2025 17:41:06 +0800 Subject: [PATCH 4/4] fix CI --- rollup/internal/controller/relayer/l1_relayer.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rollup/internal/controller/relayer/l1_relayer.go b/rollup/internal/controller/relayer/l1_relayer.go index def342aafe..4c8400a783 100644 --- a/rollup/internal/controller/relayer/l1_relayer.go +++ b/rollup/internal/controller/relayer/l1_relayer.go @@ -167,7 +167,7 @@ func (r *Layer1Relayer) ProcessGasPriceOracle() { if r.lastBaseFee == r.cfg.GasOracleConfig.L1BaseFeeDefault && r.lastBlobBaseFee == r.cfg.GasOracleConfig.L1BlobBaseFeeDefault { return } - log.Warn("The committing batch has been stuck for a long time, it's likely that the L1 gas fee spiked, set fees to default values", "currentBaseFee", baseFee, "currentBlobBaseFee", blobBaseFee,"threshold (min)", r.cfg.GasOracleConfig.L1BlobBaseFeeThreshold, "defaultBaseFee", r.cfg.GasOracleConfig.L1BaseFeeDefault, "defaultBlobBaseFee", r.cfg.GasOracleConfig.L1BlobBaseFeeDefault) + log.Warn("The committing batch has been stuck for a long time, it's likely that the L1 gas fee spiked, set fees to default values", "currentBaseFee", baseFee, "currentBlobBaseFee", blobBaseFee, "threshold (min)", r.cfg.GasOracleConfig.L1BlobBaseFeeThreshold, "defaultBaseFee", r.cfg.GasOracleConfig.L1BaseFeeDefault, "defaultBlobBaseFee", r.cfg.GasOracleConfig.L1BlobBaseFeeDefault) baseFee = r.cfg.GasOracleConfig.L1BaseFeeDefault blobBaseFee = r.cfg.GasOracleConfig.L1BlobBaseFeeDefault } else if err != nil {