Fantom-foundation
diff --git a/‎ethapi/api.go‎
Lines changed: 1 addition & 1 deletion b/‎ethapi/api.go‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎evmcore/dummy_block.go‎
Lines changed: 2 additions & 2 deletions b/‎evmcore/dummy_block.go‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎inter/event.go‎
Lines changed: 1 addition & 1 deletion b/‎inter/event.go‎
Lines changed: 1 addition & 1 deletion
@@ -708,7 +708,7 @@ func (s *PublicBlockChainAPI) calculateExtBlockApi(ctx context.Context, blkNumbe
 			return ext
 		}
 		if receipts.Len() != 0 {
-			ext.receiptsRoot = types.DeriveSha(receipts, new(trie.Trie))
+			ext.receiptsRoot = types.DeriveSha(receipts, trie.NewStackTrie(nil))
 			ext.bloom = types.CreateBloom(receipts)
 		} else {
 			ext.receiptsRoot = types.EmptyRootHash
 
@@ -63,7 +63,7 @@ func NewEvmBlock(h *EvmHeader, txs types.Transactions) *EvmBlock {
 	if len(txs) == 0 {
 		b.EvmHeader.TxHash = types.EmptyRootHash
 	} else {
-		b.EvmHeader.TxHash = types.DeriveSha(txs, new(trie.Trie))
+		b.EvmHeader.TxHash = types.DeriveSha(txs, trie.NewStackTrie(nil))
 	}
 
 	return b
@@ -152,7 +152,7 @@ func (b *EvmBlock) EthBlock() *types.Block {
 	if b == nil {
 		return nil
 	}
-	return types.NewBlock(b.EvmHeader.EthHeader(), b.Transactions, nil, nil, new(trie.Trie))
+	return types.NewBlock(b.EvmHeader.EthHeader(), b.Transactions, nil, nil, trie.NewStackTrie(nil))
 }
 
 func (b *EvmBlock) EstimateSize() int {
 
@@ -204,7 +204,7 @@ func (e *payloadData) BlockVotes() LlrBlockVotes { return e.blockVotes }
 func (e *payloadData) EpochVote() LlrEpochVote { return e.epochVote }
 
 func CalcTxHash(txs types.Transactions) hash.Hash {
-	return hash.Hash(types.DeriveSha(txs, new(trie.Trie)))
+	return hash.Hash(types.DeriveSha(txs, trie.NewStackTrie(nil)))
 }
 
 func CalcReceiptsHash(receipts []*types.ReceiptForStorage) hash.Hash {
Original file line number	Diff line number	Diff line change
`@@ -708,7 +708,7 @@ func (s *PublicBlockChainAPI) calculateExtBlockApi(ctx context.Context, blkNumbe`
`708`	`708`	`return ext`
`709`	`709`	`}`
`710`	`710`	`if receipts.Len() != 0 {`
`711`		`- ext.receiptsRoot = types.DeriveSha(receipts, new(trie.Trie))`
	`711`	`+ ext.receiptsRoot = types.DeriveSha(receipts, trie.NewStackTrie(nil))`
`712`	`712`	`ext.bloom = types.CreateBloom(receipts)`
`713`	`713`	`} else {`
`714`	`714`	`ext.receiptsRoot = types.EmptyRootHash`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ func NewEvmBlock(h EvmHeader, txs types.Transactions) EvmBlock {`
`63`	`63`	`if len(txs) == 0 {`
`64`	`64`	`b.EvmHeader.TxHash = types.EmptyRootHash`
`65`	`65`	`} else {`
`66`		`- b.EvmHeader.TxHash = types.DeriveSha(txs, new(trie.Trie))`
	`66`	`+ b.EvmHeader.TxHash = types.DeriveSha(txs, trie.NewStackTrie(nil))`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`return b`
`@@ -152,7 +152,7 @@ func (b EvmBlock) EthBlock() types.Block {`
`152`	`152`	`if b == nil {`
`153`	`153`	`return nil`
`154`	`154`	`}`
`155`		`- return types.NewBlock(b.EvmHeader.EthHeader(), b.Transactions, nil, nil, new(trie.Trie))`
	`155`	`+ return types.NewBlock(b.EvmHeader.EthHeader(), b.Transactions, nil, nil, trie.NewStackTrie(nil))`
`156`	`156`	`}`
`157`	`157`
`158`	`158`	`func (b *EvmBlock) EstimateSize() int {`
Original file line number	Diff line number	Diff line change
`@@ -204,7 +204,7 @@ func (e *payloadData) BlockVotes() LlrBlockVotes { return e.blockVotes }`
`204`	`204`	`func (e *payloadData) EpochVote() LlrEpochVote { return e.epochVote }`
`205`	`205`
`206`	`206`	`func CalcTxHash(txs types.Transactions) hash.Hash {`
`207`		`- return hash.Hash(types.DeriveSha(txs, new(trie.Trie)))`
	`207`	`+ return hash.Hash(types.DeriveSha(txs, trie.NewStackTrie(nil)))`
`208`	`208`	`}`
`209`	`209`
`210`	`210`	`func CalcReceiptsHash(receipts []*types.ReceiptForStorage) hash.Hash {`