Skip to content

Commit 9f73108

Browse files
Fix NewBlock panic
1 parent 14dd973 commit 9f73108

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

state/genesis.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,8 @@ func (s *State) SetGenesis(ctx context.Context, block Block, genesis Genesis, db
174174
log.Info("Genesis root ", rootHex)
175175

176176
receipts := []*types.Receipt{}
177-
l2Block := types.NewBlock(header, []*types.Transaction{}, []*types.Header{}, receipts, &trie.StackTrie{})
177+
st := trie.NewStackTrie(nil)
178+
l2Block := types.NewBlock(header, []*types.Transaction{}, []*types.Header{}, receipts, st)
178179
l2Block.ReceivedAt = block.ReceivedAt
179180

180181
return newRoot, s.AddL2Block(ctx, batch.BatchNumber, l2Block, receipts, MaxEffectivePercentage, dbTx)

state/transaction.go

+4-2
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,8 @@ func (s *State) StoreTransactions(ctx context.Context, batchNumber uint64, proce
180180
receipts := []*types.Receipt{receipt}
181181

182182
// Create block to be able to calculate its hash
183-
block := types.NewBlock(header, transactions, []*types.Header{}, receipts, &trie.StackTrie{})
183+
st := trie.NewStackTrie(nil)
184+
block := types.NewBlock(header, transactions, []*types.Header{}, receipts, st)
184185
block.ReceivedAt = processingContext.Timestamp
185186

186187
receipt.BlockHash = block.Hash()
@@ -930,7 +931,8 @@ func (s *State) StoreTransaction(ctx context.Context, batchNumber uint64, proces
930931
receipts := []*types.Receipt{receipt}
931932

932933
// Create block to be able to calculate its hash
933-
block := types.NewBlock(header, transactions, []*types.Header{}, receipts, &trie.StackTrie{})
934+
st := trie.NewStackTrie(nil)
935+
block := types.NewBlock(header, transactions, []*types.Header{}, receipts, st)
934936
block.ReceivedAt = time.Unix(int64(timestamp), 0)
935937

936938
receipt.BlockHash = block.Hash()

0 commit comments

Comments
 (0)