core: faster block insertion post merge

Author: MariusVanDerWijden

core/blockchain.go

@@ -1359,29 +1359,6 @@ func (bc *BlockChain) InsertChain(chain types.Blocks) (int, error) {
 				prev.Hash().Bytes()[:4], i, block.NumberU64(), block.Hash().Bytes()[:4], block.ParentHash().Bytes()[:4])
 		}
 	}
-	if chain[len(chain)-1].Difficulty().Cmp(common.Big0) == 0 {
-		start := 0
-		for i := 0; i < len(chain); i++ {
-			if chain[i].Difficulty().Cmp(common.Big0) != 0 {
-				start++
-			}
-		}
-		if start != 0 {
-			newChain := types.Blocks(chain[0:start])
-			if in, err := bc.insertChain(newChain, true, true); err != nil {
-				return in, err
-			}
-		}
-		for i := start; i < len(chain); i++ {
-			conf := bc.GetVMConfig()
-			conf.RandomOpcode = true
-			bc.SetVMConfig(*conf)
-			if err := bc.InsertBlockWithoutSetHead(chain[i]); err != nil {
-				return len(chain), err
-			}
-		}
-		return len(chain), nil
-	}
 	// Pre-checks passed, start the full block imports
 	if !bc.chainmu.TryLock() {
 		return 0, errChainStopped

eth/catalyst/api.go

@@ -260,6 +260,10 @@ func (api *ConsensusAPI) ExecutePayloadV1(params ExecutableDataV1) (ExecutePaylo
 		}
 		return ExecutePayloadResponse{Status: VALID.Status, LatestValidHash: block.Hash()}, nil
 	}
+	if api.eth.BlockChain().GetBlockByHash(params.BlockHash) != nil {
+		log.Info("Ignoring already processed block", "number", params.Number, "hash", params.BlockHash)
+		return ExecutePayloadResponse{Status: VALID.Status, LatestValidHash: block.Hash()}, nil
+	}
 	if !api.eth.BlockChain().HasBlock(block.ParentHash(), block.NumberU64()-1) {
 
 		//TODO (MariusVanDerWijden) reenable once sync is merged
@@ -437,6 +441,8 @@ func ExecutableDataToBlock(params ExecutableDataV1) (*types.Block, error) {
 	}
 	block := types.NewBlockWithHeader(header).WithBody(txs, nil /* uncles */)
 	if block.Hash() != params.BlockHash {
+		log.Warn("Invalid Payload", "ParentHash", header.ParentHash, "UncleHash", header.UncleHash, "Coinbase", header.Coinbase, "Root", header.Root, "TxHash", header.TxHash, "ReceiptHash", header.ReceiptHash, "Bloom", header.Bloom, "Difficulty", header.Difficulty, "Number", header.Number, "GasLimit", header.GasLimit, "GasUsed", header.GasUsed, "Time", header.Time, "BaseFee", header.BaseFee, "Extra", header.Extra, "MixDigest", header.MixDigest)
+		log.Warn("PayloadParams", "ParentHash", params.ParentHash, "Coinbase", params.FeeRecipient, "Root", params.StateRoot, "ReceiptHash", params.ReceiptsRoot, "Bloom", params.LogsBloom, "Number", params.Number, "GasLimit", params.GasLimit, "GasUsed", params.GasUsed, "Time", params.Timestamp, "BaseFee", params.BaseFeePerGas, "Extra", params.ExtraData, "MixDigest", params.Random)
 		return nil, fmt.Errorf("blockhash mismatch, want %x, got %x", params.BlockHash, block.Hash())
 	}
 	return block, nil