From bb6428848f63427ddafb176267e55000c2d4a366 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A9ter=20Garamv=C3=B6lgyi?= Date: Thu, 29 Jun 2023 17:18:54 +0200 Subject: [PATCH] fix: improve import genesis logs (#601) --- bridge/internal/controller/relayer/l2_relayer.go | 8 ++++---- common/version/version.go | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bridge/internal/controller/relayer/l2_relayer.go b/bridge/internal/controller/relayer/l2_relayer.go index 51e26bb3a..46f55309b 100644 --- a/bridge/internal/controller/relayer/l2_relayer.go +++ b/bridge/internal/controller/relayer/l2_relayer.go @@ -236,7 +236,7 @@ func (r *Layer2Relayer) commitGenesisBatch(batchHash string, batchHeader []byte, if err != nil { return fmt.Errorf("failed to send import genesis batch tx to L1, error: %v", err) } - log.Info("importGenesisBatch transaction sent", "contract", r.cfg.RollupContractAddress, "txHash", txHash, "batchHash", batchHash) + log.Info("importGenesisBatch transaction sent", "contract", r.cfg.RollupContractAddress, "txHash", txHash.String(), "batchHash", batchHash) // wait for confirmation // we assume that no other transactions are sent before initializeGenesis completes @@ -247,11 +247,11 @@ func (r *Layer2Relayer) commitGenesisBatch(batchHash string, batchHeader []byte, select { // print progress case <-ticker.C: - log.Info("Waiting for confirmation, pending count: %d", r.rollupSender.PendingCount()) + log.Info("Waiting for confirmation", "pending count", r.rollupSender.PendingCount()) // timeout case <-time.After(5 * time.Minute): - return fmt.Errorf("import genesis timeout after 5 minutes, original txHash: %v", txHash) + return fmt.Errorf("import genesis timeout after 5 minutes, original txHash: %v", txHash.String()) // handle confirmation case confirmation := <-r.rollupSender.ConfirmChan(): @@ -261,7 +261,7 @@ func (r *Layer2Relayer) commitGenesisBatch(batchHash string, batchHeader []byte, if !confirmation.IsSuccessful { return fmt.Errorf("import genesis batch tx failed") } - log.Info("Successfully committed genesis batch on L1", "txHash", confirmation.TxHash) + log.Info("Successfully committed genesis batch on L1", "txHash", confirmation.TxHash.String()) return nil } } diff --git a/common/version/version.go b/common/version/version.go index 7c0205466..b4e02b79e 100644 --- a/common/version/version.go +++ b/common/version/version.go @@ -5,7 +5,7 @@ import ( "runtime/debug" ) -var tag = "v4.0.2" +var tag = "v4.0.3" var commit = func() string { if info, ok := debug.ReadBuildInfo(); ok {