Add the GetStateAndCommittedState method on StateDB type

Author: m-Peter

fvm/evm/emulator/state/stateDB.go

@@ -256,6 +256,17 @@ func (db *StateDB) GetCommittedState(addr gethCommon.Address, key gethCommon.Has
 	return value
 }
 
+// GetStateAndCommittedState returns the current value and the original value.
+func (db *StateDB) GetStateAndCommittedState(
+	addr gethCommon.Address,
+	key gethCommon.Hash,
+) (gethCommon.Hash, gethCommon.Hash) {
+	origin := db.GetCommittedState(addr, key)
+	value := db.GetState(addr, key)
+
+	return value, origin
+}
+
 // GetState returns the value for the given storage slot
 func (db *StateDB) GetState(addr gethCommon.Address, key gethCommon.Hash) gethCommon.Hash {
 	state, err := db.latestView().GetState(types.SlotAddress{Address: addr, Key: key})

fvm/evm/emulator/state/stateDB_test.go

@@ -88,13 +88,21 @@ func TestStateDB(t *testing.T) {
 		ret = db.GetCommittedState(addr1, key1)
 		require.Equal(t, gethCommon.Hash{}, ret)
 
+		currentState, originalState := db.GetStateAndCommittedState(addr1, key1)
+		require.Equal(t, value1, currentState)
+		require.Equal(t, gethCommon.Hash{}, originalState)
+
 		commit, err := db.Commit(true)
 		require.NoError(t, err)
 		require.NotEmpty(t, commit)
 
 		ret = db.GetCommittedState(addr1, key1)
 		require.Equal(t, value1, ret)
 
+		currentState, originalState = db.GetStateAndCommittedState(addr1, key1)
+		require.Equal(t, value1, currentState)
+		require.Equal(t, value1, originalState)
+
 		// create a new db
 		db, err = state.NewStateDB(ledger, rootAddr)
 		require.NoError(t, err)
@@ -106,6 +114,10 @@ func TestStateDB(t *testing.T) {
 		val := db.GetState(addr1, key1)
 		require.NoError(t, db.Error())
 		require.Equal(t, value1, val)
+
+		currentState, originalState = db.GetStateAndCommittedState(addr1, key1)
+		require.Equal(t, value1, currentState)
+		require.Equal(t, value1, originalState)
 	})
 
 	t.Run("test snapshot and revert functionality", func(t *testing.T) {