Merge pull request #702 from maticnetwork/jerryc/temp-bor-sync

Jerryc/temp bor sync

core/blockchain.go

@@ -2059,7 +2059,7 @@ func (bc *BlockChain) collectLogs(hash common.Hash, removed bool) []*types.Log {
  receipts := rawdb.ReadReceipts(bc.db, hash, *number, bc.chainConfig)
 
  // Append bor receipt
- borReceipt := rawdb.ReadBorReceipt(bc.db, hash, *number)
+ borReceipt := rawdb.ReadBorReceipt(bc.db, hash, *number, bc.chainConfig)
  if borReceipt != nil {
  receipts = append(receipts, borReceipt)
  }

core/bor_blockchain.go

@@ -19,7 +19,7 @@ func (bc *BlockChain) GetBorReceiptByHash(hash common.Hash) *types.Receipt {
  }
 
  // read bor reciept by hash and number
- receipt := rawdb.ReadBorReceipt(bc.db, hash, *number)
+ receipt := rawdb.ReadBorReceipt(bc.db, hash, *number, bc.chainConfig)
  if receipt == nil {
  return nil
  }

core/rawdb/bor_receipt.go

@@ -7,6 +7,7 @@ import (
  "github.com/ethereum/go-ethereum/core/types"
  "github.com/ethereum/go-ethereum/ethdb"
  "github.com/ethereum/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/params"
  "github.com/ethereum/go-ethereum/rlp"
 )
 
@@ -59,7 +60,8 @@ func ReadBorReceiptRLP(db ethdb.Reader, hash common.Hash, number uint64) rlp.Raw
  return data
  }
  }
- // Then try to look up the data in leveldb.
+
+ // Look up the data in leveldb.
  data, _ = db.Get(borReceiptKey(number, hash))
  if len(data) > 0 {
  return data
@@ -101,7 +103,11 @@ func ReadRawBorReceipt(db ethdb.Reader, hash common.Hash, number uint64) *types.
 // ReadBorReceipt retrieves all the bor block receipts belonging to a block, including
 // its correspoinding metadata fields. If it is unable to populate these metadata
 // fields then nil is returned.
-func ReadBorReceipt(db ethdb.Reader, hash common.Hash, number uint64) *types.Receipt {
+func ReadBorReceipt(db ethdb.Reader, hash common.Hash, number uint64, config *params.ChainConfig) *types.Receipt {
+ if config != nil && config.Bor != nil && config.Bor.Sprint != nil && !config.Bor.IsSprintStart(number) {
+ return nil
+ }
+
  // We're deriving many fields from the block body, retrieve beside the receipt
  borReceipt := ReadRawBorReceipt(db, hash, number)
  if borReceipt == nil {
@@ -114,8 +120,8 @@ func ReadBorReceipt(db ethdb.Reader, hash common.Hash, number uint64) *types.Rec
  return nil
  }
 
- body := ReadBody(db, hash, number)
- if body == nil {
+ body := HasBody(db, hash, number)
+ if !body {
  log.Error("Missing body but have bor receipt", "hash", hash, "number", number)
  return nil
  }

eth/filters/test_backend.go

@@ -38,7 +38,7 @@ func (b *TestBackend) GetBorBlockReceipt(ctx context.Context, hash common.Hash)
  return &types.Receipt{}, nil
  }
 
- receipt := rawdb.ReadBorReceipt(b.DB, hash, *number)
+ receipt := rawdb.ReadBorReceipt(b.DB, hash, *number, nil)
  if receipt == nil {
  return &types.Receipt{}, nil
  }

eth/tracers/api.go

@@ -177,7 +177,7 @@ func (api *API) getAllBlockTransactions(ctx context.Context, block *types.Block)
 
  stateSyncPresent := false
 
- borReceipt := rawdb.ReadBorReceipt(api.backend.ChainDb(), block.Hash(), block.NumberU64())
+ borReceipt := rawdb.ReadBorReceipt(api.backend.ChainDb(), block.Hash(), block.NumberU64(), api.backend.ChainConfig())
  if borReceipt != nil {
  txHash := types.GetDerivedBorTxHash(types.BorReceiptKey(block.Number().Uint64(), block.Hash()))
  if txHash != (common.Hash{}) {

internal/ethapi/api.go

@@ -636,7 +636,7 @@ func (s *PublicBlockChainAPI) GetTransactionReceiptsByBlock(ctx context.Context,
 
  var txHash common.Hash
 
- borReceipt := rawdb.ReadBorReceipt(s.b.ChainDb(), block.Hash(), block.NumberU64())
+ borReceipt := rawdb.ReadBorReceipt(s.b.ChainDb(), block.Hash(), block.NumberU64(), s.b.ChainConfig())
  if borReceipt != nil {
  receipts = append(receipts, borReceipt)
  txHash = types.GetDerivedBorTxHash(types.BorReceiptKey(block.Number().Uint64(), block.Hash()))
@@ -1448,15 +1448,23 @@ func newRPCPendingTransaction(tx *types.Transaction, current *types.Header, conf
 func newRPCTransactionFromBlockIndex(b *types.Block, index uint64, config *params.ChainConfig, db ethdb.Database) *RPCTransaction {
  txs := b.Transactions()
 
- borReceipt := rawdb.ReadBorReceipt(db, b.Hash(), b.NumberU64())
- if borReceipt != nil {
-  tx, _, _, _ := rawdb.ReadBorTransaction(db, borReceipt.TxHash)
+ if index >= uint64(len(txs)+1) {
+  return nil
+ }
 
- if tx != nil {
- txs = append(txs, tx)
+ // If the index out of the range of transactions defined in block body, it means that the transaction is a bor state sync transaction, and we need to fetch it from the database
+ if index == uint64(len(txs)) {
+ borReceipt := rawdb.ReadBorReceipt(db, b.Hash(), b.NumberU64(), config)
+ if borReceipt != nil {
+ tx, _, _, _ := rawdb.ReadBorTransaction(db, borReceipt.TxHash)
+
+ if tx != nil {
+ txs = append(txs, tx)
+ }
  }
  }
 
+ // If the index is still out of the range after checking bor state sync transaction, it means that the transaction index is invalid
  if index >= uint64(len(txs)) {
  return nil
  }
@@ -1597,7 +1605,7 @@ func (api *PublicTransactionPoolAPI) getAllBlockTransactions(ctx context.Context
 
  stateSyncPresent := false
 
- borReceipt := rawdb.ReadBorReceipt(api.b.ChainDb(), block.Hash(), block.NumberU64())
+ borReceipt := rawdb.ReadBorReceipt(api.b.ChainDb(), block.Hash(), block.NumberU64(), api.b.ChainConfig())
  if borReceipt != nil {
  txHash := types.GetDerivedBorTxHash(types.BorReceiptKey(block.Number().Uint64(), block.Hash()))
  if txHash != (common.Hash{}) {
@@ -1767,7 +1775,7 @@ func (s *PublicTransactionPoolAPI) GetTransactionReceipt(ctx context.Context, ha
 
  if borTx {
  // Fetch bor block receipt
- receipt = rawdb.ReadBorReceipt(s.b.ChainDb(), blockHash, blockNumber)
+ receipt = rawdb.ReadBorReceipt(s.b.ChainDb(), blockHash, blockNumber, s.b.ChainConfig())
  } else {
  receipts, err := s.b.GetReceipts(ctx, blockHash)
  if err != nil {

params/config.go

@@ -617,6 +617,10 @@ func (c *BorConfig) IsDelhi(number *big.Int) bool {
  return isForked(c.DelhiBlock, number)
 }
 
+func (c *BorConfig) IsSprintStart(number uint64) bool {
+ return number%c.CalculateSprint(number) == 0
+}
+
 func (c *BorConfig) calculateBorConfigHelper(field map[string]uint64, number uint64) uint64 {
  keys := make([]string, 0, len(field))
  for k := range field {