From d356269d71ca9bc2aaf53a7eb9e5572bf564f3f8 Mon Sep 17 00:00:00 2001 From: colinlyguo Date: Thu, 10 Apr 2025 13:38:33 +0800 Subject: [PATCH 1/4] fix(txpool): tx journey executed status tracing --- core/tx_pool.go | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/core/tx_pool.go b/core/tx_pool.go index 0b27de7a086..eab6085f831 100644 --- a/core/tx_pool.go +++ b/core/tx_pool.go @@ -434,6 +434,9 @@ func (pool *TxPool) loop() { if ev.Block != nil { pool.requestReset(head.Header(), ev.Block.Header()) head = ev.Block + for _, tx := range head.Transactions() { + log.Debug("tx added in the chain", "hash", tx.Hash().Hex()) + } } // System shutdown. @@ -1536,11 +1539,6 @@ func (pool *TxPool) reset(oldHead, newHead *types.Header) { for _, tx := range discarded { log.Debug("TXPOOL_REORG: TX removed from old chain", "hash", tx.Hash().Hex()) } - - for _, tx := range included { - log.Debug("TXPOOL_REORG: TX added in the chain", "hash", tx.Hash().Hex()) - } - } } } From 26a08455522227c58f5d93f07bde23efdf328106 Mon Sep 17 00:00:00 2001 From: colinlyguo Date: Thu, 10 Apr 2025 13:41:36 +0800 Subject: [PATCH 2/4] fix --- core/tx_pool.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/tx_pool.go b/core/tx_pool.go index eab6085f831..4e5d7b8c835 100644 --- a/core/tx_pool.go +++ b/core/tx_pool.go @@ -1536,8 +1536,8 @@ func (pool *TxPool) reset(oldHead, newHead *types.Header) { } reinject = types.TxDifference(discarded, included) - for _, tx := range discarded { - log.Debug("TXPOOL_REORG: TX removed from old chain", "hash", tx.Hash().Hex()) + for _, tx := range reinject { + log.Debug("tx removed from old chain due to reorg", "hash", tx.Hash().Hex()) } } } From a86f3ed58391dbd0f69b407ef73d851c647b4b90 Mon Sep 17 00:00:00 2001 From: colinlyguo Date: Thu, 10 Apr 2025 14:30:55 +0800 Subject: [PATCH 3/4] bump version --- params/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/params/version.go b/params/version.go index 23f63113920..94e8f3fe028 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 = 8 // Minor version component of the current release - VersionPatch = 37 // Patch version component of the current release + VersionPatch = 38 // Patch version component of the current release VersionMeta = "mainnet" // Version metadata to append to the version string ) From c4b3696c1654d22625dd22bd7b99258f7e59c612 Mon Sep 17 00:00:00 2001 From: colinlyguo Date: Thu, 10 Apr 2025 14:48:38 +0800 Subject: [PATCH 4/4] tweak --- core/tx_pool.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/tx_pool.go b/core/tx_pool.go index 4e5d7b8c835..bf36bf281af 100644 --- a/core/tx_pool.go +++ b/core/tx_pool.go @@ -435,7 +435,7 @@ func (pool *TxPool) loop() { pool.requestReset(head.Header(), ev.Block.Header()) head = ev.Block for _, tx := range head.Transactions() { - log.Debug("tx added in the chain", "hash", tx.Hash().Hex()) + log.Debug("TX is included in a block", "hash", tx.Hash().Hex()) } } @@ -1537,7 +1537,7 @@ func (pool *TxPool) reset(oldHead, newHead *types.Header) { reinject = types.TxDifference(discarded, included) for _, tx := range reinject { - log.Debug("tx removed from old chain due to reorg", "hash", tx.Hash().Hex()) + log.Debug("TX is removed from old chain due to reorg", "hash", tx.Hash().Hex()) } } }