Skip to content

Commit

Permalink
Check for Shanghai in test node rather than Canyon
Browse files Browse the repository at this point in the history
The test op-geth code adds withdrawals only if Canyon has been enabled.
This worked upstream because Shanghai and Canyon were enabled
concurrently, but it's not actually the right behavior.
  • Loading branch information
jyellick committed Jan 17, 2024
1 parent 4355a21 commit 6d0eff6
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion op-e2e/op_geth.go
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ func (d *OpGeth) CreatePayloadAttributes(txs ...*types.Transaction) (*eth.Payloa
}

var withdrawals *types.Withdrawals
if d.L2ChainConfig.IsCanyon(uint64(timestamp)) {
if d.L2ChainConfig.IsShanghai(new(big.Int).SetUint64(uint64(d.L2Head.BlockNumber)), uint64(timestamp)) {
withdrawals = &types.Withdrawals{}
}

Expand Down

0 comments on commit 6d0eff6

Please sign in to comment.