WIP stash for discussion.

op-e2e/actions/dencun_fork_test.go

@@ -39,7 +39,7 @@ func TestDencunL1Fork(gt *testing.T) {
 	miner.ActL1SetFeeRecipient(common.Address{'A', 0})
 	miner.ActEmptyBlock(t)
 	miner.ActL1SetFeeRecipient(common.Address{'A', 0})
-	miner.ActEmptyBlock(t) //// test fails here
+	miner.ActEmptyBlock(t) //// test fails here as cancun activates
 	/*
 		########## BAD BLOCK #########
 		Block: 2 (0xf227de28aae80d15e8a50c5639a9b31be65fdefe97e21eadd23b957bd3d6ee5a)
@@ -49,9 +49,7 @@ func TestDencunL1Fork(gt *testing.T) {
 		Receipts:
 		##############################
 	*/
-	return
 	miner.ActEmptyBlock(t)
-	return
 	// verify Cancun is active
 	l1Head = miner.l1Chain.CurrentBlock()
 	require.True(t, sd.L1Cfg.Config.IsCancun(l1Head.Number, l1Head.Time), "Cancun active")

op-service/eth/types.go

@@ -194,6 +194,7 @@ func (payload *ExecutionPayload) CheckBlockHash() (actual common.Hash, ok bool)
 		MixDigest:        common.Hash(payload.PrevRandao),
 		Nonce:            types.BlockNonce{}, // zeroed, proof-of-work legacy
 		BaseFee:          payload.BaseFeePerGas.ToBig(),
+		ParentBeaconRoot: &common.Hash{}, // zeroed, proof-of-stake legacy(?)
 	}
 
 	if payload.CanyonBlock() {