From 5f7c9692d7e819743df24a9432e64ed7bc023091 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A9ter=20Garamv=C3=B6lgyi?= Date: Fri, 8 Sep 2023 15:09:17 +0200 Subject: [PATCH 1/3] fix(ccc): unit64 --> uint64 and other fixes --- rollup/circuitcapacitychecker/impl.go | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/rollup/circuitcapacitychecker/impl.go b/rollup/circuitcapacitychecker/impl.go index 55aab9e0fdc4..f817473224bc 100644 --- a/rollup/circuitcapacitychecker/impl.go +++ b/rollup/circuitcapacitychecker/impl.go @@ -11,6 +11,7 @@ import "C" //nolint:typecheck import ( "encoding/json" + "fmt" "sync" "unsafe" @@ -147,7 +148,7 @@ func (ccc *CircuitCapacityChecker) ApplyBlock(traces *types.BlockTrace) (*types. } // CheckTxNum compares whether the tx_count in ccc match the expected -func (ccc *CircuitCapacityChecker) CheckTxNum(expected int) (bool, unit64, error) { +func (ccc *CircuitCapacityChecker) CheckTxNum(expected int) (bool, uint64, error) { ccc.Lock() defer ccc.Unlock() @@ -159,13 +160,11 @@ func (ccc *CircuitCapacityChecker) CheckTxNum(expected int) (bool, unit64, error log.Debug("ccc get_tx_num end", "id", ccc.ID) result := &WrappedTxNum{} - if err = json.Unmarshal([]byte(C.GoString(rawResult)), result); err != nil { - log.Error("fail to json unmarshal get_tx_num result", "id", ccc.ID, "err", err) - return false, 0, ErrUnknown + if err := json.Unmarshal([]byte(C.GoString(rawResult)), result); err != nil { + return false, 0, fmt.Errorf("fail to json unmarshal get_tx_num result, id: %d, err: %w", ccc.ID, err) } if result.Error != "" { - log.Error("fail to get_tx_num in CircuitCapacityChecker", "id", ccc.ID, "err", result.Error) - return false, 0, ErrUnknown + return false, 0, fmt.Errorf("fail to get_tx_num in CircuitCapacityChecker, id: %d, err: %w", ccc.ID, result.Error) } return result.TxNum == unit64(expected), result.TxNum, nil From 34b674d24b9a60f596e19a5ec47d7481a80c25c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A9ter=20Garamv=C3=B6lgyi?= Date: Fri, 8 Sep 2023 15:29:14 +0200 Subject: [PATCH 2/3] fix --- rollup/circuitcapacitychecker/impl.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rollup/circuitcapacitychecker/impl.go b/rollup/circuitcapacitychecker/impl.go index f817473224bc..212396bccb87 100644 --- a/rollup/circuitcapacitychecker/impl.go +++ b/rollup/circuitcapacitychecker/impl.go @@ -167,5 +167,5 @@ func (ccc *CircuitCapacityChecker) CheckTxNum(expected int) (bool, uint64, error return false, 0, fmt.Errorf("fail to get_tx_num in CircuitCapacityChecker, id: %d, err: %w", ccc.ID, result.Error) } - return result.TxNum == unit64(expected), result.TxNum, nil + return result.TxNum == uint64(expected), result.TxNum, nil } From 7c7229735b5c1214b38492b8a3a24f13dc5d318c Mon Sep 17 00:00:00 2001 From: HAOYUatHZ <37070449+HAOYUatHZ@users.noreply.github.com> Date: Fri, 8 Sep 2023 21:53:33 +0800 Subject: [PATCH 3/3] Update version.go --- params/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/params/version.go b/params/version.go index 5c9d96b77f5b..bb00b789f90d 100644 --- a/params/version.go +++ b/params/version.go @@ -24,7 +24,7 @@ import ( const ( VersionMajor = 4 // Major version component of the current release VersionMinor = 4 // Minor version component of the current release - VersionPatch = 3 // Patch version component of the current release + VersionPatch = 4 // Patch version component of the current release VersionMeta = "sepolia" // Version metadata to append to the version string )