core/state: supply origin-value when reverting storage change

Author: holiman

core/state/setjournal.go

@@ -47,6 +47,11 @@ type addrSlot struct {
 	slot common.Hash
 }
 
+type doubleHash struct {
+	origin common.Hash
+	prev   common.Hash
+}
+
 // scopedJournal represents all changes within a single callscope. These changes
 // are either all reverted, or all committed -- they cannot be partially applied.
 type scopedJournal struct {
@@ -57,7 +62,7 @@ type scopedJournal struct {
 	accessListAddresses []common.Address
 	accessListAddrSlots []addrSlot
 
-	storageChanges  map[common.Address]map[common.Hash]common.Hash
+	storageChanges  map[common.Address]map[common.Hash]doubleHash
 	tStorageChanges map[common.Address]map[common.Hash]common.Hash
 }
 
@@ -79,7 +84,7 @@ func (j *scopedJournal) deepCopy() *scopedJournal {
 		accessListAddrSlots: slices.Clone(j.accessListAddrSlots),
 	}
 	if j.storageChanges != nil {
-		cpy.storageChanges = make(map[common.Address]map[common.Hash]common.Hash)
+		cpy.storageChanges = make(map[common.Address]map[common.Hash]doubleHash)
 		for addr, changes := range j.storageChanges {
 			cpy.storageChanges[addr] = maps.Clone(changes)
 		}
@@ -147,18 +152,18 @@ func (j *scopedJournal) journalAccessListAddSlot(addr common.Address, slot commo
 	j.accessListAddrSlots = append(j.accessListAddrSlots, addrSlot{addr, slot})
 }
 
-func (j *scopedJournal) journalSetState(addr common.Address, key common.Hash, prev common.Hash) {
+func (j *scopedJournal) journalSetState(addr common.Address, key, prev, origin common.Hash) {
 	if j.storageChanges == nil {
-		j.storageChanges = make(map[common.Address]map[common.Hash]common.Hash)
+		j.storageChanges = make(map[common.Address]map[common.Hash]doubleHash)
 	}
 	changes, ok := j.storageChanges[addr]
 	if !ok {
-		changes = make(map[common.Hash]common.Hash)
+		changes = make(map[common.Hash]doubleHash)
 		j.storageChanges[addr] = changes
 	}
 	// Do not overwrite a previous value!
 	if _, ok := changes[key]; !ok {
-		changes[key] = prev
+		changes[key] = doubleHash{origin: origin, prev: prev}
 	}
 }
 
@@ -186,10 +191,7 @@ func (j *scopedJournal) revert(s *StateDB) {
 	for addr, changes := range j.storageChanges {
 		obj := s.getStateObject(addr)
 		for key, val := range changes {
-			// OBS!
-			// TODO @holiman, it's not correct to pass empty hash here!
-			// OBS!
-			obj.setState(key, val, common.Hash{})
+			obj.setState(key, val.prev, val.origin)
 		}
 	}
 	// Revert t-store changes
@@ -449,8 +451,8 @@ func (j *sparseJournal) accessListAddSlot(addr common.Address, slot common.Hash)
 	j.entries[len(j.entries)-1].journalAccessListAddSlot(addr, slot)
 }
 
-func (j *sparseJournal) storageChange(addr common.Address, key common.Hash, prev common.Hash, origin common.Hash) {
-	j.entries[len(j.entries)-1].journalSetState(addr, key, prev)
+func (j *sparseJournal) storageChange(addr common.Address, key, prev, origin common.Hash) {
+	j.entries[len(j.entries)-1].journalSetState(addr, key, prev, origin)
 }
 
 func (j *sparseJournal) transientStateChange(addr common.Address, key, prev common.Hash) {