fix block trace

Author: curryxbo

consensus/ethash/consensus.go

@@ -590,7 +590,7 @@ func (ethash *Ethash) Prepare(chain consensus.ChainHeaderReader, header *types.H
 	return nil
 }
 
-func (ethash *Ethash) StartHook(chain consensus.ChainHeaderReader, header, preHeader *types.Header, state *state.StateDB) error {
+func (ethash *Ethash) StartHook(chain consensus.ChainHeaderReader, header, parentHeader *types.Header, state *state.StateDB) error {
 	return nil
 }
 

consensus/l2/consensus.go

@@ -219,7 +219,7 @@ func (l2 *Consensus) Prepare(chain consensus.ChainHeaderReader, header *types.He
 }
 
 // StartHook implements calling before start apply transactions of block
-func (l2 *Consensus) StartHook(chain consensus.ChainHeaderReader, header, preHeader *types.Header, state *state.StateDB) error {
+func (l2 *Consensus) StartHook(chain consensus.ChainHeaderReader, header, parentHeader *types.Header, state *state.StateDB) error {
 	cx := chainContext{Chain: chain, engine: l2.ethone}
 	blockContext := core.NewEVMBlockContext(header, cx, l2.config, nil)
 	// TODO tracer
@@ -228,7 +228,7 @@ func (l2 *Consensus) StartHook(chain consensus.ChainHeaderReader, header, preHea
 	if err != nil {
 		return err
 	}
-	data, err := stakingAbi.Pack("recordBlocks", preHeader.Coinbase)
+	data, err := stakingAbi.Pack("recordBlocks", parentHeader.Coinbase)
 	if err != nil {
 		return err
 	}

core/types/l2trace.go

@@ -20,6 +20,7 @@ type BlockTrace struct {
 	Bytecodes              []*BytecodeTrace   `json:"codes"`
 	TxStorageTraces        []*StorageTrace    `json:"txStorageTraces,omitempty"`
 	ExecutionResults       []*ExecutionResult `json:"executionResults"`
+	StartHookResult        *ExecutionResult   `json:"startHookResult,omitempty"`
 	WithdrawTrieRoot       common.Hash        `json:"withdraw_trie_root,omitempty"`
 	SequencerSetVerifyHash common.Hash        `json:"sequencer_set_verify_hash,omitempty"`
 	StartL1QueueIndex      uint64             `json:"startL1QueueIndex"`
@@ -115,75 +116,4 @@ type AccountWrapper struct {
 	Balance          *hexutil.Big   `json:"balance"`
 	KeccakCodeHash   common.Hash    `json:"keccakCodeHash,omitempty"`
 	PoseidonCodeHash common.Hash    `json:"poseidonCodeHash,omitempty"`
-	CodeSize         uint64         `json:"codeSize"`
-}
-
-// StorageWrapper while key & value can also be retrieved from StructLogRes.Storage,
-// we still stored in here for roller's processing convenience.
-type StorageWrapper struct {
-	Key   string `json:"key,omitempty"`
-	Value string `json:"value,omitempty"`
-}
-
-type TransactionData struct {
-	Type       uint8           `json:"type"`
-	Nonce      uint64          `json:"nonce"`
-	TxHash     string          `json:"txHash"`
-	Gas        uint64          `json:"gas"`
-	GasPrice   *hexutil.Big    `json:"gasPrice"`
-	GasTipCap  *hexutil.Big    `json:"gasTipCap"`
-	GasFeeCap  *hexutil.Big    `json:"gasFeeCap"`
-	From       common.Address  `json:"from"`
-	To         *common.Address `json:"to"`
-	ChainId    *hexutil.Big    `json:"chainId"`
-	Value      *hexutil.Big    `json:"value"`
-	Data       string          `json:"data"`
-	IsCreate   bool            `json:"isCreate"`
-	AccessList AccessList      `json:"accessList"`
-	V          *hexutil.Big    `json:"v"`
-	R          *hexutil.Big    `json:"r"`
-	S          *hexutil.Big    `json:"s"`
-}
-
-// NewTransactionData returns a transaction that will serialize to the trace
-// representation, with the given location metadata set (if available).
-func NewTransactionData(tx *Transaction, blockNumber uint64, config *params.ChainConfig) *TransactionData {
-	signer := MakeSigner(config, big.NewInt(0).SetUint64(blockNumber))
-	from, _ := Sender(signer, tx)
-	v, r, s := tx.RawSignatureValues()
-
-	nonce := tx.Nonce()
-	if tx.IsL1MessageTx() {
-		nonce = tx.L1MessageQueueIndex()
-	}
-
-	result := &TransactionData{
-		Type:       tx.Type(),
-		TxHash:     tx.Hash().String(),
-		Nonce:      nonce,
-		ChainId:    (*hexutil.Big)(tx.ChainId()),
-		From:       from,
-		Gas:        tx.Gas(),
-		GasPrice:   (*hexutil.Big)(tx.GasPrice()),
-		GasTipCap:  (*hexutil.Big)(tx.GasTipCap()),
-		GasFeeCap:  (*hexutil.Big)(tx.GasFeeCap()),
-		To:         tx.To(),
-		Value:      (*hexutil.Big)(tx.Value()),
-		Data:       hexutil.Encode(tx.Data()),
-		IsCreate:   tx.To() == nil,
-		AccessList: tx.AccessList(),
-		V:          (*hexutil.Big)(v),
-		R:          (*hexutil.Big)(r),
-		S:          (*hexutil.Big)(s),
-	}
-	return result
-}
-
-// WrapProof turn the bytes array into proof type (array of hexutil.Bytes)
-func WrapProof(proofBytes [][]byte) (wrappedProof []hexutil.Bytes) {
-	wrappedProof = make([]hexutil.Bytes, len(proofBytes))
-	for i, bt := range proofBytes {
-		wrappedProof[i] = bt
-	}
-	return
-}
+	CodeSize         uint64         `