Bor: GetTransactionReceipt (#4209)

cmd/rpcdaemon/commands/eth_receipts.go

@@ -255,8 +255,12 @@ func (api *APIImpl) GetTransactionReceipt(ctx context.Context, hash common.Hash)
 		return nil, err
 	}
 
+	blockNum, ok, err = api.txnLookup(ctx, tx, hash)
+	if err != nil {
+		return nil, err
+	}
+	if !ok {
 		if chainConfig.Bor != nil {
-		if blockNum == 0 {
 			var blocN uint64
 			borTx, blockHash, blocN, _, err = rawdb.ReadBorTransaction(tx, hash)
 			if err != nil {
@@ -266,13 +270,7 @@ func (api *APIImpl) GetTransactionReceipt(ctx context.Context, hash common.Hash)
 				return nil, nil // not error, see https://github.com/ledgerwatch/erigon/issues/1645
 			}
 			blockNum = blocN
-		}
 		} else {
-		blockNum, ok, err = api.txnLookup(ctx, tx, hash)
-		if err != nil {
-			return nil, err
-		}
-		if !ok {
 			return nil, nil // not error, see https://github.com/ledgerwatch/erigon/issues/1645
 		}
 	}