From d5a03ab9e917f1a049c7d3de6719c20576756ea0 Mon Sep 17 00:00:00 2001
From: Daniel Liu <139250065@qq.com>
Date: Fri, 14 Nov 2025 18:58:36 +0800
Subject: [PATCH] core, eth: fix overuse Of `log.Crit`, close XFN-102 (#1648)

* core: fix overuse Of `log.Crit`, close XFN-102

* eth: fix overuse Of `log.Crit`, close XFN-102
---
 core/blockchain.go | 18 +++++++++++-------
 eth/api_backend.go |  6 +++---
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/core/blockchain.go b/core/blockchain.go
index 93b4948204..47c9ccf5b2 100644
--- a/core/blockchain.go
+++ b/core/blockchain.go
@@ -2830,7 +2830,7 @@ func (bc *BlockChain) logExchangeData(block *types.Block) {
 	}
 	txMatchBatchData, err := ExtractTradingTransactions(block.Transactions())
 	if err != nil {
-		log.Crit("failed to extract matching transaction", "err", err)
+		log.Error("failed to extract matching transaction", "err", err)
 		return
 	}
 	if len(txMatchBatchData) == 0 {
@@ -2858,7 +2858,7 @@ func (bc *BlockChain) logExchangeData(block *types.Block) {
 			)
 
 			if takerOrderInTx, err = txMatch.DecodeOrder(); err != nil {
-				log.Crit("SDK node decode takerOrderInTx failed", "txDataMatch", txMatch)
+				log.Error("SDK node decode takerOrderInTx failed", "txDataMatch", txMatch)
 				return
 			}
 			cacheKey := crypto.Keccak256Hash(txMatchBatch.TxHash.Bytes(), tradingstate.GetMatchingResultCacheKey(takerOrderInTx).Bytes())
@@ -2876,7 +2876,7 @@ func (bc *BlockChain) logExchangeData(block *types.Block) {
 
 			txMatchTime := time.Unix(int64(block.Header().Time), 0).UTC()
 			if err := XDCXService.SyncDataToSDKNode(takerOrderInTx, txMatchBatch.TxHash, txMatchTime, currentState, trades, rejectedOrders, &dirtyOrderCount); err != nil {
-				log.Crit("failed to SyncDataToSDKNode ", "blockNumber", block.Number(), "err", err)
+				log.Error("failed to SyncDataToSDKNode ", "blockNumber", block.Number(), "err", err)
 				return
 			}
 		}
@@ -2898,7 +2898,8 @@ func (bc *BlockChain) logLendingData(block *types.Block) {
 	}
 	batches, err := ExtractLendingTransactions(block.Transactions())
 	if err != nil {
-		log.Crit("failed to extract lending transaction", "err", err)
+		log.Error("failed to extract lending transaction", "err", err)
+		return
 	}
 	start := time.Now()
 	defer func() {
@@ -2931,7 +2932,8 @@ func (bc *BlockChain) logLendingData(block *types.Block) {
 			statedb, _ := bc.State()
 
 			if err := lendingService.SyncDataToSDKNode(bc, statedb.Copy(), block, item, batch.TxHash, txMatchTime, trades, rejectedOrders, &dirtyOrderCount); err != nil {
-				log.Crit("lending: failed to SyncDataToSDKNode ", "blockNumber", block.Number(), "err", err)
+				log.Error("lending: failed to SyncDataToSDKNode ", "blockNumber", block.Number(), "err", err)
+				return
 			}
 		}
 	}
@@ -2940,7 +2942,8 @@ func (bc *BlockChain) logLendingData(block *types.Block) {
 	if block.Number().Uint64()%bc.chainConfig.XDPoS.Epoch == common.LiquidateLendingTradeBlock {
 		finalizedTx, err := ExtractLendingFinalizedTradeTransactions(block.Transactions())
 		if err != nil {
-			log.Crit("failed to extract finalizedTrades transaction", "err", err)
+			log.Error("failed to extract finalizedTrades transaction", "err", err)
+			return
 		}
 		finalizedTrades := map[common.Hash]*lendingstate.LendingTrade{}
 		finalizedData, ok := bc.finalizedTrade.Get(finalizedTx.TxHash)
@@ -2949,7 +2952,8 @@ func (bc *BlockChain) logLendingData(block *types.Block) {
 		}
 		if len(finalizedTrades) > 0 {
 			if err := lendingService.UpdateLiquidatedTrade(block.Time(), finalizedTx, finalizedTrades); err != nil {
-				log.Crit("lending: failed to UpdateLiquidatedTrade ", "blockNumber", block.Number(), "err", err)
+				log.Error("lending: failed to UpdateLiquidatedTrade ", "blockNumber", block.Number(), "err", err)
+				return
 			}
 		}
 	}
diff --git a/eth/api_backend.go b/eth/api_backend.go
index 97b7c5b1d3..8cbd6e705d 100644
--- a/eth/api_backend.go
+++ b/eth/api_backend.go
@@ -519,13 +519,13 @@ func (b *EthAPIBackend) GetVotersRewards(masternodeAddr common.Address) map[comm
 	signers, err := contracts.GetRewardForCheckpoint(engine, chain, lastCheckpointBlock.Header(), rCheckpoint, totalSigner)
 
 	if err != nil {
-		log.Crit("Fail to get signers for reward checkpoint", "error", err)
+		log.Error("Fail to get signers for reward checkpoint", "error", err)
 		return nil
 	}
 
 	rewardSigners, err := contracts.CalculateRewardForSigner(chainReward, signers, *totalSigner)
 	if err != nil {
-		log.Crit("Fail to calculate reward for signers", "error", err)
+		log.Error("Fail to calculate reward for signers", "error", err)
 		return nil
 	}
 
@@ -539,7 +539,7 @@ func (b *EthAPIBackend) GetVotersRewards(masternodeAddr common.Address) map[comm
 		if signer == masternodeAddr {
 			rewards, err := contracts.CalculateRewardForHolders(foundationWalletAddr, state, masternodeAddr, calcReward, number)
 			if err != nil {
-				log.Crit("Fail to calculate reward for holders.", "error", err)
+				log.Error("Fail to calculate reward for holders.", "error", err)
 				return nil
 			}
 			voterResults = rewards