fix(types): fix some withdrawRoot related issues (taikoxyz#69)

* fix(types): fix some `withdrawRoot` related issues * chore: update workflow * chore: update workflow configs * feat: update `ExecutableDataToBlock` * chore: update workflow configs
simcoeforever · May 11, 2023 · edb10f7 · edb10f7
1 parent e6412c5
commit edb10f7
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 3 deletions.
diff --git a/beacon/engine/types.go b/beacon/engine/types.go
@@ -91,6 +91,7 @@ type ExecutableData struct {
 	Transactions  [][]byte            `json:"transactions"  gencodec:"required"`
 	Withdrawals   []*types.Withdrawal `json:"withdrawals"`
 	TxHash        common.Hash         `json:"txHash"` // CHANGE(taiko): allow passing txHash directly instead of transactions list
+	TaikoBlock    bool                // CHANGE(taiko): whether this is a Taiko L2 block, only used by ExecutableDataToBlock
 }
 
 // JSON type overrides for executableData.
@@ -209,7 +210,12 @@ func ExecutableDataToBlock(params ExecutableData) (*types.Block, error) {
 	// Withdrawals as the json null value.
 	var withdrawalsRoot *common.Hash
 	if params.Withdrawals != nil {
-		h := types.DeriveSha(types.Withdrawals(params.Withdrawals), trie.NewStackTrie(nil))
+		var h common.Hash
+		if params.TaikoBlock {
+			h = types.CalcWithdrawalsRootTaiko(params.Withdrawals)
+		} else {
+			h = types.DeriveSha(types.Withdrawals(params.Withdrawals), trie.NewStackTrie(nil))
+		}
 		withdrawalsRoot = &h
 	}
 

diff --git a/consensus/taiko/consensus.go b/consensus/taiko/consensus.go
@@ -214,7 +214,6 @@ func (t *Taiko) Prepare(chain consensus.ChainHeaderReader, header *types.Header)
 // consensus rules that happen at finalization (e.g. block rewards).
 func (t *Taiko) Finalize(chain consensus.ChainHeaderReader, header *types.Header, state *state.StateDB, txs []*types.Transaction, uncles []*types.Header, withdrawals []*types.Withdrawal) {
 	// no block rewards in l2
-	header.Root = state.IntermediateRoot(true)
 	header.UncleHash = types.CalcUncleHash(nil)
 	header.Difficulty = common.Big0
 	// Withdrawals processing.
@@ -224,6 +223,7 @@ func (t *Taiko) Finalize(chain consensus.ChainHeaderReader, header *types.Header
 		amount = amount.Mul(amount, big.NewInt(params.GWei))
 		state.AddBalance(w.Address, amount)
 	}
+	header.Root = state.IntermediateRoot(true)
 }
 
 // FinalizeAndAssemble runs any post-transaction state modifications (e.g. block

diff --git a/core/block_validator.go b/core/block_validator.go
@@ -19,6 +19,7 @@ package core
 import (
 	"fmt"
 
+	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/consensus"
 	"github.com/ethereum/go-ethereum/core/state"
 	"github.com/ethereum/go-ethereum/core/types"
@@ -73,7 +74,14 @@ func (v *BlockValidator) ValidateBody(block *types.Block) error {
 		if block.Withdrawals() == nil {
 			return fmt.Errorf("missing withdrawals in block body")
 		}
-		if hash := types.DeriveSha(block.Withdrawals(), trie.NewStackTrie(nil)); hash != *header.WithdrawalsHash {
+
+		var hash common.Hash
+		if v.config.Taiko {
+			hash = types.CalcWithdrawalsRootTaiko(block.Withdrawals())
+		} else {
+			hash = types.DeriveSha(block.Withdrawals(), trie.NewStackTrie(nil))
+		}
+		if hash != *header.WithdrawalsHash {
 			return fmt.Errorf("withdrawals root hash mismatch (header value %x, calculated %x)", *header.WithdrawalsHash, hash)
 		}
 	} else if block.Withdrawals() != nil {

diff --git a/eth/catalyst/api.go b/eth/catalyst/api.go
@@ -518,6 +518,7 @@ func (api *ConsensusAPI) newPayload(params engine.ExecutableData) (engine.Payloa
 		block *types.Block
 		err   error
 	)
+	params.TaikoBlock = api.eth.BlockChain().Config().Taiko
 	if api.eth.BlockChain().Config().Taiko && params.Transactions == nil {
 		h := types.CalcWithdrawalsRootTaiko(params.Withdrawals)
 		block = types.NewBlockWithHeader(&types.Header{