From bd7b91e96ab2673484eade0f8454ae28e297841c Mon Sep 17 00:00:00 2001 From: colinlyguo Date: Thu, 5 Dec 2024 20:33:09 +0800 Subject: [PATCH 1/3] fix-async-ccc-print-whole-block-hash-and-tx-hash --- eth/backend.go | 2 +- rollup/pipeline/pipeline.go | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/eth/backend.go b/eth/backend.go index ae198bceefe8..4c7b024f4969 100644 --- a/eth/backend.go +++ b/eth/backend.go @@ -202,7 +202,7 @@ func New(stack *node.Node, config *ethconfig.Config, l1Client sync_service.EthCl if config.CheckCircuitCapacity { eth.asyncChecker = ccc.NewAsyncChecker(eth.blockchain, config.CCCMaxWorkers, false) eth.asyncChecker.WithOnFailingBlock(func(b *types.Block, err error) { - log.Warn("block failed CCC check, it will be reorged by the sequencer", "hash", b.Hash(), "err", err) + log.Warn("block failed CCC check, it will be reorged by the sequencer", "hash", b.Hash().Hex(), "err", err) }) eth.blockchain.Validator().WithAsyncValidator(eth.asyncChecker.Check) } diff --git a/rollup/pipeline/pipeline.go b/rollup/pipeline/pipeline.go index 12c34e2c96ff..90c6149b3858 100644 --- a/rollup/pipeline/pipeline.go +++ b/rollup/pipeline/pipeline.go @@ -439,6 +439,7 @@ func (p *Pipeline) cccStage(candidates <-chan *BlockCandidate, deadline time.Tim lastTxn := candidate.Txs[candidate.Txs.Len()-1] cccTimer.UpdateSince(cccStart) if err != nil { + log.Warn("failed to apply CCC", "txHash", lastTxn.Hash().Hex(), "err", err) resultCh <- &Result{ OverflowingTx: lastTxn, OverflowingTrace: candidate.LastTrace, From ebb932e690b7f4db649b9ce9e588555164c58d11 Mon Sep 17 00:00:00 2001 From: colinlyguo Date: Thu, 5 Dec 2024 12:36:26 +0000 Subject: [PATCH 2/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 --- params/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/params/version.go b/params/version.go index ede2684a34f7..76862a755adb 100644 --- a/params/version.go +++ b/params/version.go @@ -24,7 +24,7 @@ import ( const ( VersionMajor = 5 // Major version component of the current release VersionMinor = 7 // Minor version component of the current release - VersionPatch = 26 // Patch version component of the current release + VersionPatch = 27 // Patch version component of the current release VersionMeta = "mainnet" // Version metadata to append to the version string ) From 35a5d7f6afaef4c7e179780948c6cd494d8d466f Mon Sep 17 00:00:00 2001 From: colinlyguo Date: Fri, 6 Dec 2024 08:42:00 +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 --- params/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/params/version.go b/params/version.go index 76862a755adb..e38da258a232 100644 --- a/params/version.go +++ b/params/version.go @@ -24,7 +24,7 @@ import ( const ( VersionMajor = 5 // Major version component of the current release VersionMinor = 7 // Minor version component of the current release - VersionPatch = 27 // Patch version component of the current release + VersionPatch = 28 // Patch version component of the current release VersionMeta = "mainnet" // Version metadata to append to the version string )