From 699243f8ae870fa2ddbc5cb919fda85313e4684a Mon Sep 17 00:00:00 2001
From: Guillaume Ballet <3272758+gballet@users.noreply.github.com>
Date: Thu, 22 Jun 2023 14:52:52 +0200
Subject: [PATCH] core/state, light, trie: add UpdateContractCode to the Trie
 interface (#27476)

Verkle trees store the code inside the trie. This PR changes the interface to pass the code, as well as the dirty flag to tell the trie package if the code is dirty and needs to be updated. This is a no-op for the MPT and the odr trie.
---
 core/state/database.go | 4 ++++
 core/state/statedb.go  | 1 +
 light/trie.go          | 4 ++++
 trie/secure_trie.go    | 4 ++++
 4 files changed, 13 insertions(+)

diff --git a/core/state/database.go b/core/state/database.go
index 2c8a7afee..b16536fff 100644
--- a/core/state/database.go
+++ b/core/state/database.go
@@ -93,6 +93,10 @@ type Trie interface {
 	// in the trie with provided address.
 	UpdateAccount(address common.Address, account *types.StateAccount) error
 
+	// UpdateContractCode abstracts code write to the trie. It is expected
+	// to be moved to the stateWriter interface when the latter is ready.
+	UpdateContractCode(address common.Address, codeHash common.Hash, code []byte) error
+
 	// DeleteStorage removes any existing value for key from the trie. If a node
 	// was not found in the database, a trie.MissingNodeError is returned.
 	DeleteStorage(addr common.Address, key []byte) error
diff --git a/core/state/statedb.go b/core/state/statedb.go
index f8457c6de..9ea6afc40 100644
--- a/core/state/statedb.go
+++ b/core/state/statedb.go
@@ -1012,6 +1012,7 @@ func (s *StateDB) Commit(deleteEmptyObjects bool) (common.Hash, error) {
 		if obj := s.stateObjects[addr]; !obj.deleted {
 			// Write any contract code associated with the state object
 			if obj.code != nil && obj.dirtyCode {
+				s.trie.UpdateContractCode(obj.Address(), common.BytesToHash(obj.CodeHash()), obj.code)
 				rawdb.WriteCode(codeWriter, common.BytesToHash(obj.CodeHash()), obj.code)
 				obj.dirtyCode = false
 			}
diff --git a/light/trie.go b/light/trie.go
index e0675f98c..b90b43c1d 100644
--- a/light/trie.go
+++ b/light/trie.go
@@ -147,6 +147,10 @@ func (t *odrTrie) UpdateAccount(address common.Address, acc *types.StateAccount)
 	})
 }
 
+func (t *odrTrie) UpdateContractCode(_ common.Address, _ common.Hash, _ []byte) error {
+	return nil
+}
+
 func (t *odrTrie) UpdateStorage(_ common.Address, key, value []byte) error {
 	key = crypto.Keccak256(key)
 	v, _ := rlp.EncodeToBytes(value)
diff --git a/trie/secure_trie.go b/trie/secure_trie.go
index a6d567619..1df0b6a8f 100644
--- a/trie/secure_trie.go
+++ b/trie/secure_trie.go
@@ -176,6 +176,10 @@ func (t *StateTrie) UpdateAccount(address common.Address, acc *types.StateAccoun
 	return nil
 }
 
+func (t *StateTrie) UpdateContractCode(_ common.Address, _ common.Hash, _ []byte) error {
+	return nil
+}
+
 // MustDelete removes any existing value for key from the trie. This function
 // will omit any encountered error but just print out an error message.
 func (t *StateTrie) MustDelete(key []byte) {