fix merge conflict

scroll-tech · Jul 28, 2023 · 0909cff · 0909cff
1 parent 126fa52
commit 0909cff
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/bridge/internal/orm/l2_block.go b/bridge/internal/orm/l2_block.go
@@ -25,6 +25,7 @@ type L2Block struct {
 	Header         string `json:"header" gorm:"header"`
 	Transactions   string `json:"transactions" gorm:"transactions"`
 	WithdrawRoot   string `json:"withdraw_root" gorm:"withdraw_root"`
+	StateRoot      string `json:"state_root" gorm:"state_root"`
 	TxNum          uint32 `json:"tx_num" gorm:"tx_num"`
 	GasUsed        uint64 `json:"gas_used" gorm:"gas_used"`
 	BlockTimestamp uint64 `json:"block_timestamp" gorm:"block_timestamp"`
@@ -206,6 +207,7 @@ func (o *L2Block) InsertL2Blocks(ctx context.Context, blocks []*types.WrappedBlo
 			ParentHash:     block.Header.ParentHash.String(),
 			Transactions:   string(txs),
 			WithdrawRoot:   block.WithdrawRoot.Hex(),
+			StateRoot:      block.Header.Root.Hex(),
 			TxNum:          uint32(len(block.Transactions)),
 			GasUsed:        block.Header.GasUsed,
 			BlockTimestamp: block.Header.Time,

diff --git a/common/types/block.go b/common/types/block.go
@@ -13,7 +13,7 @@ import (
 const nonZeroByteGas uint64 = 16
 const zeroByteGas uint64 = 4
 
-// WrappedBlock contains the block's Header, Transactions, WithdrawTrieRoot hash and RowConsumption.
+// WrappedBlock contains the block's Header, Transactions, WithdrawRoot hash and RowConsumption.
 type WrappedBlock struct {
 	Header *types.Header `json:"header"`
 	// Transactions is only used for recover types.Transactions, the from of types.TransactionData field is missing.

diff --git a/coordinator/internal/orm/l2_block.go b/coordinator/internal/orm/l2_block.go
@@ -25,6 +25,7 @@ type L2Block struct {
 	Header         string `json:"header" gorm:"header"`
 	Transactions   string `json:"transactions" gorm:"transactions"`
 	WithdrawRoot   string `json:"withdraw_root" gorm:"withdraw_root"`
+	StateRoot      string `json:"state_root" gorm:"state_root"`
 	TxNum          uint32 `json:"tx_num" gorm:"tx_num"`
 	GasUsed        uint64 `json:"gas_used" gorm:"gas_used"`
 	BlockTimestamp uint64 `json:"block_timestamp" gorm:"block_timestamp"`
@@ -116,6 +117,7 @@ func (o *L2Block) InsertL2Blocks(ctx context.Context, blocks []*types.WrappedBlo
 			ParentHash:     block.Header.ParentHash.String(),
 			Transactions:   string(txs),
 			WithdrawRoot:   block.WithdrawRoot.Hex(),
+			StateRoot:      block.Header.Root.Hex(),
 			TxNum:          uint32(len(block.Transactions)),
 			GasUsed:        block.Header.GasUsed,
 			BlockTimestamp: block.Header.Time,