core/state: re-enable verkle witness generation

ethereum · Oct 11, 2024 · bfb09e7 · bfb09e7
1 parent c2be92f
commit bfb09e7
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 7 deletions.
diff --git a/core/state/statedb_logger.go b/core/state/statedb_logger.go
@@ -239,6 +239,15 @@ func (s *stateDBLogger) IntermediateRoot(deleteEmptyObjects bool) common.Hash {
 	return s.inner.IntermediateRoot(deleteEmptyObjects)
 }
 
-func (s stateDBLogger) SetTxContext(txHash common.Hash, txIndex int) {
+func (s *stateDBLogger) SetTxContext(txHash common.Hash, txIndex int) {
 	s.inner.SetTxContext(txHash, txIndex)
 }
+
+// GetTrie returns the account trie.
+func (s *stateDBLogger) GetTrie() Trie {
+	return s.inner.GetTrie()
+}
+
+func (s *stateDBLogger) AccessEvents() *AccessEvents {
+	return s.inner.AccessEvents()
+}
diff --git a/core/state_processor.go b/core/state_processor.go
@@ -180,12 +180,9 @@ func MakeReceipt(evm *vm.EVM, result *ExecutionResult, statedb vm.StateDB, block
 
 	// Merge the tx-local access event into the "block-local" one, in order to collect
 	// all values, so that the witness can be built.
-	//
-	// TODO (@holiman): Add this back (but not necessarily _here_)
-	//
-	//if statedb.GetTrie().IsVerkle() {
-	//	statedb.AccessEvents().Merge(evm.AccessEvents)
-	//}
+	if statedb.GetTrie().IsVerkle() {
+		statedb.AccessEvents().Merge(evm.AccessEvents)
+	}
 
 	// Set the receipt logs and create the bloom filter.
 	receipt.Logs = statedb.GetLogs(tx.Hash(), blockNumber.Uint64(), blockHash)

diff --git a/core/vm/interface.go b/core/vm/interface.go
@@ -20,6 +20,7 @@ import (
 	"math/big"
 
 	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/core/state"
 	"github.com/ethereum/go-ethereum/core/stateless"
 	"github.com/ethereum/go-ethereum/core/tracing"
 	"github.com/ethereum/go-ethereum/core/types"
@@ -108,6 +109,11 @@ type StateDB interface {
 	// used when the EVM emits new state logs. It should be invoked before
 	// transaction execution.
 	SetTxContext(txHash common.Hash, txIndex int)
+
+	// GetTrie returns the account trie. Verkle-related
+	GetTrie() state.Trie
+	// AccessEvents returns the access-events collected for verkle-witness processing.
+	AccessEvents() *state.AccessEvents
 }
 
 // CallContext provides a basic interface for the EVM calling conventions. The EVM