commit

erigontech · Mar 5, 2025 · 200ddf7 · 200ddf7
1 parent 81148fa
commit 200ddf7
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 62 deletions.
diff --git a/turbo/jsonrpc/debug_api.go b/turbo/jsonrpc/debug_api.go
@@ -512,23 +512,19 @@ func (api *PrivateDebugAPIImpl) GetRawTransaction(ctx context.Context, txnHash c
 	txNumsReader := rawdbv3.TxNums.WithCustomReadTxNumFunc(freezeblocks.ReadTxNumFuncFromBlockReader(ctx, api._blockReader))
 
 	// Private API returns 0 if transaction is not found.
+	isBorStateSyncTx := false
 	if blockNum == 0 && chainConfig.Bor != nil {
 		if api.useBridgeReader {
 			blockNum, ok, err = api.bridgeReader.EventTxnLookup(ctx, txnHash)
-			if ok {
-				txNumNextBlock, err := txNumsReader.Min(tx, blockNum+1)
-				if err != nil {
-					return nil, err
-				}
-				txNum = txNumNextBlock
-			}
 		} else {
 			blockNum, ok, err = api._blockReader.EventLookup(ctx, tx, txnHash)
 		}
 
 		if err != nil {
 			return nil, err
 		}
+
+		isBorStateSyncTx = true
 	}
 
 	if !ok {
@@ -540,11 +536,11 @@ func (api *PrivateDebugAPIImpl) GetRawTransaction(ctx context.Context, txnHash c
 		return nil, err
 	}
 
-	if txNumMin+2 > txNum {
+	if txNumMin+2 > txNum && !isBorStateSyncTx {
 		return nil, fmt.Errorf("uint underflow txnums error txNum: %d, txNumMin: %d, blockNum: %d", txNum, txNumMin, blockNum)
 	}
 
-	var txnIndex uint64 = txNum - txNumMin - 2
+	var txnIndex = txNum - txNumMin - 2
 
 	txn, err := api._txnReader.TxnByIdxInBlock(ctx, tx, blockNum, int(txnIndex))
 	if err != nil {

diff --git a/turbo/jsonrpc/eth_receipts.go b/turbo/jsonrpc/eth_receipts.go
@@ -470,19 +470,14 @@ func (api *APIImpl) GetTransactionReceipt(ctx context.Context, txnHash common.Ha
 	}
 
 	// Private API returns 0 if transaction is not found.
-	if blockNum == 0 && chainConfig.Bor != nil {
+	isStateSync := blockNum == 0 && chainConfig.Bor != nil
+
+	if isStateSync {
 		if api.useBridgeReader {
 			blockNum, ok, err = api.bridgeReader.EventTxnLookup(ctx, txnHash)
 			if err != nil {
 				return nil, err
 			}
-			if ok {
-				txNumNextBlock, err := txNumsReader.Min(tx, blockNum+1)
-				if err != nil {
-					return nil, err
-				}
-				txNum = txNumNextBlock
-			}
 		} else {
 			blockNum, ok, err = api._blockReader.EventLookup(ctx, tx, txnHash)
 		}
@@ -495,7 +490,7 @@ func (api *APIImpl) GetTransactionReceipt(ctx context.Context, txnHash common.Ha
 		return nil, nil
 	}
 
-	if txNumMin+2 > txNum { //TODO: what a magic is this "2" and how to avoid it
+	if txNumMin+2 > txNum && !isStateSync { //TODO: what a magic is this "2" and how to avoid it
 		return nil, fmt.Errorf("uint underflow txnums error txNum: %d, txNumMin: %d, blockNum: %d", txNum, txNumMin, blockNum)
 	}
 
@@ -504,14 +499,7 @@ func (api *APIImpl) GetTransactionReceipt(ctx context.Context, txnHash common.Ha
 		return nil, err
 	}
 
-	var txnIndex = int(txNum - txNumMin - 2)
-
-	txn, err := api._blockReader.TxnByIdxInBlock(ctx, tx, header.Number.Uint64(), txnIndex)
-	if err != nil {
-		return nil, err
-	}
-
-	if txn == nil && chainConfig.Bor != nil {
+	if isStateSync {
 		block, err := api.blockByNumberWithSenders(ctx, tx, blockNum)
 		if err != nil {
 			return nil, err
@@ -537,6 +525,13 @@ func (api *APIImpl) GetTransactionReceipt(ctx context.Context, txnHash common.Ha
 		return ethutils.MarshalReceipt(borReceipt, bortypes.NewBorTransaction(), chainConfig, block.HeaderNoCopy(), txnHash, false), nil
 	}
 
+	var txnIndex = int(txNum - txNumMin - 2)
+
+	txn, err := api._blockReader.TxnByIdxInBlock(ctx, tx, header.Number.Uint64(), txnIndex)
+	if err != nil {
+		return nil, err
+	}
+
 	receipt, err := api.getReceipt(ctx, chainConfig, tx, header, txn, txnIndex, txNum)
 	if err != nil {
 		return nil, fmt.Errorf("getReceipt error: %w", err)

diff --git a/turbo/jsonrpc/eth_txs.go b/turbo/jsonrpc/eth_txs.go
@@ -58,16 +58,10 @@ func (api *APIImpl) GetTransactionByHash(ctx context.Context, txnHash common.Has
 	txNumsReader := rawdbv3.TxNums.WithCustomReadTxNumFunc(freezeblocks.ReadTxNumFuncFromBlockReader(ctx, api._blockReader))
 
 	// Private API returns 0 if transaction is not found.
-	if blockNum == 0 && chainConfig.Bor != nil {
+	isStateSyncTx := blockNum == 0 && chainConfig.Bor != nil
+	if isStateSyncTx {
 		if api.useBridgeReader {
 			blockNum, ok, err = api.bridgeReader.EventTxnLookup(ctx, txnHash)
-			if ok {
-				txNumNextBlock, err := txNumsReader.Min(tx, blockNum+1)
-				if err != nil {
-					return nil, err
-				}
-				txNum = txNumNextBlock
-			}
 		} else {
 			blockNum, ok, err = api._blockReader.EventLookup(ctx, tx, txnHash)
 		}
@@ -82,17 +76,10 @@ func (api *APIImpl) GetTransactionByHash(ctx context.Context, txnHash common.Has
 			return nil, err
 		}
 
-		if txNumMin+2 > txNum { //TODO: what a magic is this "2" and how to avoid it
+		if txNumMin+2 > txNum && !isStateSyncTx { //TODO: what a magic is this "2" and how to avoid it
 			return nil, fmt.Errorf("uint underflow txnums error txNum: %d, txNumMin: %d, blockNum: %d", txNum, txNumMin, blockNum)
 		}
 
-		var txnIndex uint64 = txNum - txNumMin - 2
-
-		txn, err := api._txnReader.TxnByIdxInBlock(ctx, tx, blockNum, int(txnIndex))
-		if err != nil {
-			return nil, err
-		}
-
 		header, err := api._blockReader.HeaderByNumber(ctx, tx, blockNum)
 		if err != nil {
 			return nil, err
@@ -110,10 +97,7 @@ func (api *APIImpl) GetTransactionByHash(ctx context.Context, txnHash common.Has
 		}
 
 		// if no transaction was found then we return nil
-		if txn == nil {
-			if chainConfig.Bor == nil {
-				return nil, nil
-			}
+		if isStateSyncTx {
 			borTx := bortypes.NewBorTransaction()
 			_, txCount, err := api._blockReader.Body(ctx, tx, blockHash, blockNum)
 			if err != nil {
@@ -122,6 +106,13 @@ func (api *APIImpl) GetTransactionByHash(ctx context.Context, txnHash common.Has
 			return ethapi.NewRPCBorTransaction(borTx, txnHash, blockHash, blockNum, uint64(txCount), chainConfig.ChainID), nil
 		}
 
+		var txnIndex = txNum - txNumMin - 2
+
+		txn, err := api._txnReader.TxnByIdxInBlock(ctx, tx, blockNum, int(txnIndex))
+		if err != nil {
+			return nil, err
+		}
+
 		return ethapi.NewRPCTransaction(txn, blockHash, blockNum, txnIndex, baseFee), nil
 	}
 

diff --git a/turbo/jsonrpc/trace_adhoc.go b/turbo/jsonrpc/trace_adhoc.go
@@ -833,13 +833,6 @@ func (api *TraceAPIImpl) ReplayTransaction(ctx context.Context, txHash libcommon
 		// otherwise this may be a bor state sync transaction - check
 		if api.useBridgeReader {
 			blockNum, ok, err = api.bridgeReader.EventTxnLookup(ctx, txHash)
-			if ok {
-				txNumNextBlock, err := txNumsReader.Min(tx, blockNum+1)
-				if err != nil {
-					return nil, err
-				}
-				txNum = txNumNextBlock
-			}
 		} else {
 			blockNum, ok, err = api._blockReader.EventLookup(ctx, tx, txHash)
 		}
@@ -864,7 +857,7 @@ func (api *TraceAPIImpl) ReplayTransaction(ctx context.Context, txHash libcommon
 		return nil, err
 	}
 
-	if txNumMin+2 > txNum {
+	if txNumMin+2 > txNum && !isBorStateSyncTxn {
 		return nil, fmt.Errorf("uint underflow txnums error txNum: %d, txNumMin: %d, blockNum: %d", txNum, txNumMin, blockNum)
 	}
 

diff --git a/turbo/jsonrpc/trace_filtering.go b/turbo/jsonrpc/trace_filtering.go
@@ -82,13 +82,6 @@ func (api *TraceAPIImpl) Transaction(ctx context.Context, txHash common.Hash, ga
 		// otherwise this may be a bor state sync transaction - check
 		if api.useBridgeReader {
 			blockNumber, ok, err = api.bridgeReader.EventTxnLookup(ctx, txHash)
-			if ok {
-				txNumNextBlock, err := txNumsReader.Min(tx, blockNumber+1)
-				if err != nil {
-					return nil, err
-				}
-				txNum = txNumNextBlock
-			}
 		} else {
 			blockNumber, ok, err = api._blockReader.EventLookup(ctx, tx, txHash)
 		}
@@ -115,7 +108,7 @@ func (api *TraceAPIImpl) Transaction(ctx context.Context, txHash common.Hash, ga
 		return nil, err
 	}
 
-	if txNumMin+2 > txNum {
+	if txNumMin+2 > txNum && !isBorStateSyncTxn {
 		return nil, fmt.Errorf("uint underflow txnums error txNum: %d, txNumMin: %d, blockNum: %d", txNum, txNumMin, blockNumber)
 	}