Skip to content

N
nebula
Commit 11319443 authored by EvanJRichard's avatar EvanJRichard
Browse files
Options

WIP stash for discussion.

parent 79932ba5
Show whitespace changes
Inline Side-by-side
Showing with 19 additions and 20 deletions
op-e2e/actions/dencun_fork_test.go
View file @ 11319443
...@@ -39,7 +39,7 @@ func TestDencunL1Fork(gt *testing.T) { ...@@ -39,7 +39,7 @@ func TestDencunL1Fork(gt *testing.T) {
miner.ActL1SetFeeRecipient(common.Address{'A', 0}) miner.ActL1SetFeeRecipient(common.Address{'A', 0})
miner.ActEmptyBlock(t) miner.ActEmptyBlock(t)
miner.ActL1SetFeeRecipient(common.Address{'A', 0}) miner.ActL1SetFeeRecipient(common.Address{'A', 0})
miner.ActEmptyBlock(t) //// test fails here miner.ActEmptyBlock(t) //// test fails here as cancun activates
/* /*
########## BAD BLOCK ######### ########## BAD BLOCK #########
Block: 2 (0xf227de28aae80d15e8a50c5639a9b31be65fdefe97e21eadd23b957bd3d6ee5a) Block: 2 (0xf227de28aae80d15e8a50c5639a9b31be65fdefe97e21eadd23b957bd3d6ee5a)
...@@ -49,9 +49,7 @@ func TestDencunL1Fork(gt *testing.T) { ...@@ -49,9 +49,7 @@ func TestDencunL1Fork(gt *testing.T) {
Receipts: Receipts:
############################## ##############################
*/ */
return
miner.ActEmptyBlock(t) miner.ActEmptyBlock(t)
return
// verify Cancun is active // verify Cancun is active
l1Head = miner.l1Chain.CurrentBlock() l1Head = miner.l1Chain.CurrentBlock()
require.True(t, sd.L1Cfg.Config.IsCancun(l1Head.Number, l1Head.Time), "Cancun active") require.True(t, sd.L1Cfg.Config.IsCancun(l1Head.Number, l1Head.Time), "Cancun active")
......
op-service/eth/types.go
View file @ 11319443
...@@ -194,6 +194,7 @@ func (payload *ExecutionPayload) CheckBlockHash() (actual common.Hash, ok bool) ...@@ -194,6 +194,7 @@ func (payload *ExecutionPayload) CheckBlockHash() (actual common.Hash, ok bool)
MixDigest: common.Hash(payload.PrevRandao), MixDigest: common.Hash(payload.PrevRandao),
Nonce: types.BlockNonce{}, // zeroed, proof-of-work legacy Nonce: types.BlockNonce{}, // zeroed, proof-of-work legacy
BaseFee: payload.BaseFeePerGas.ToBig(), BaseFee: payload.BaseFeePerGas.ToBig(),
ParentBeaconRoot: &common.Hash{}, // zeroed, proof-of-stake legacy(?)
} }
if payload.CanyonBlock() { if payload.CanyonBlock() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment