From 395a0b7fe276f35f42998be1b87e677aef5cd68f Mon Sep 17 00:00:00 2001 From: colin <102356659+colinlyguo@users.noreply.github.com> Date: Thu, 14 Mar 2024 19:00:35 +0800 Subject: [PATCH] fix(chunk & batch proposer): metrics (#1195) Co-authored-by: colinlyguo --- common/version/version.go | 2 +- rollup/internal/controller/watcher/batch_proposer.go | 8 ++++---- rollup/internal/controller/watcher/chunk_proposer.go | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/common/version/version.go b/common/version/version.go index e891c94f0a..e98f398645 100644 --- a/common/version/version.go +++ b/common/version/version.go @@ -5,7 +5,7 @@ import ( "runtime/debug" ) -var tag = "v4.3.70" +var tag = "v4.3.71" var commit = func() string { if info, ok := debug.ReadBuildInfo(); ok { diff --git a/rollup/internal/controller/watcher/batch_proposer.go b/rollup/internal/controller/watcher/batch_proposer.go index 2e4c47b3fc..1c12cce01e 100644 --- a/rollup/internal/controller/watcher/batch_proposer.go +++ b/rollup/internal/controller/watcher/batch_proposer.go @@ -249,8 +249,8 @@ func (p *BatchProposer) proposeBatch() (*encoding.Batch, error) { return nil, err } - p.totalL1CommitGas.Set(float64(totalL1CommitCalldataSize)) - p.totalL1CommitCalldataSize.Set(float64(totalL1CommitGas)) + p.totalL1CommitCalldataSize.Set(float64(totalL1CommitCalldataSize)) + p.totalL1CommitGas.Set(float64(totalL1CommitGas)) p.batchChunksNum.Set(float64(batch.NumChunks())) return &batch, nil } @@ -282,8 +282,8 @@ func (p *BatchProposer) proposeBatch() (*encoding.Batch, error) { } p.batchFirstBlockTimeoutReached.Inc() - p.totalL1CommitGas.Set(float64(totalL1CommitCalldataSize)) - p.totalL1CommitCalldataSize.Set(float64(totalL1CommitGas)) + p.totalL1CommitCalldataSize.Set(float64(totalL1CommitCalldataSize)) + p.totalL1CommitGas.Set(float64(totalL1CommitGas)) p.batchChunksNum.Set(float64(batch.NumChunks())) batch.StartChunkIndex = dbChunks[0].Index diff --git a/rollup/internal/controller/watcher/chunk_proposer.go b/rollup/internal/controller/watcher/chunk_proposer.go index a51ebb6870..cff55371ad 100644 --- a/rollup/internal/controller/watcher/chunk_proposer.go +++ b/rollup/internal/controller/watcher/chunk_proposer.go @@ -276,8 +276,8 @@ func (p *ChunkProposer) proposeChunk() (*encoding.Chunk, error) { } p.chunkTxNum.Set(float64(chunk.NumTransactions())) - p.chunkEstimateL1CommitGas.Set(float64(totalL1CommitCalldataSize)) - p.totalL1CommitCalldataSize.Set(float64(totalL1CommitGas)) + p.totalL1CommitCalldataSize.Set(float64(totalL1CommitCalldataSize)) + p.chunkEstimateL1CommitGas.Set(float64(totalL1CommitGas)) p.maxTxConsumption.Set(float64(crcMax)) p.chunkBlocksNum.Set(float64(len(chunk.Blocks))) return &chunk, nil @@ -317,8 +317,8 @@ func (p *ChunkProposer) proposeChunk() (*encoding.Chunk, error) { p.chunkFirstBlockTimeoutReached.Inc() p.chunkTxNum.Set(float64(chunk.NumTransactions())) - p.chunkEstimateL1CommitGas.Set(float64(totalL1CommitCalldataSize)) - p.totalL1CommitCalldataSize.Set(float64(totalL1CommitGas)) + p.totalL1CommitCalldataSize.Set(float64(totalL1CommitCalldataSize)) + p.chunkEstimateL1CommitGas.Set(float64(totalL1CommitGas)) p.maxTxConsumption.Set(float64(crcMax)) p.chunkBlocksNum.Set(float64(len(chunk.Blocks))) return &chunk, nil