impl original_storage in SubstrateStackState

frame/evm/src/runner/stack.rs

@@ -31,7 +31,13 @@ use fp_evm::{CallInfo, CreateInfo, ExecutionInfo, Log, Vicinity};
 use frame_support::traits::{Currency, ExistenceRequirement, Get};
 use sp_core::{H160, H256, U256};
 use sp_runtime::traits::UniqueSaturatedInto;
-use sp_std::{boxed::Box, collections::btree_set::BTreeSet, marker::PhantomData, mem, vec::Vec};
+use sp_std::{
+	boxed::Box,
+	collections::{btree_map::BTreeMap, btree_set::BTreeSet},
+	marker::PhantomData,
+	mem,
+	vec::Vec,
+};
 
 #[derive(Default)]
 pub struct Runner<T: Config> {
@@ -494,6 +500,7 @@ impl<'config> SubstrateStackSubstate<'config> {
 pub struct SubstrateStackState<'vicinity, 'config, T> {
 	vicinity: &'vicinity Vicinity,
 	substate: SubstrateStackSubstate<'config>,
+	original_storage: BTreeMap<(H160, H256), H256>,
 	_marker: PhantomData<T>,
 }
 
@@ -509,6 +516,7 @@ impl<'vicinity, 'config, T: Config> SubstrateStackState<'vicinity, 'config, T> {
 				parent: None,
 			},
 			_marker: PhantomData,
+			original_storage: BTreeMap::new(),
 		}
 	}
 }
@@ -576,8 +584,15 @@ impl<'vicinity, 'config, T: Config> BackendT for SubstrateStackState<'vicinity,
 		<AccountStorages<T>>::get(address, index)
 	}
 
-	fn original_storage(&self, _address: H160, _index: H256) -> Option<H256> {
-		None
+	fn original_storage(&self, address: H160, index: H256) -> Option<H256> {
+		// Not being cached means that it was never changed, which means we
+		// can fetch it from storage.
+		Some(
+			self.original_storage
+				.get(&(address, index))
+				.cloned()
+				.unwrap_or_else(|| self.storage(address, index)),
+		)
 	}
 
 	fn block_base_fee_per_gas(&self) -> sp_core::U256 {
@@ -629,6 +644,18 @@ where
 	}
 
 	fn set_storage(&mut self, address: H160, index: H256, value: H256) {
+		// We cache the current value if this is the first time we modify it
+		// in the transaction.
+		use sp_std::collections::btree_map::Entry::Vacant;
+		if let Vacant(e) = self.original_storage.entry((address, index)) {
+			let original = <AccountStorages<T>>::get(address, index);
+			// No need to cache if same value.
+			if original != value {
+				e.insert(original);
+			}
+		}
+
+		// Then we insert or remove the entry based on the value.
 		if value == H256::default() {
 			log::debug!(
 				target: "evm",
@@ -693,7 +720,7 @@ where
 		//
 		// This function exists in EVM because a design issue
 		// (arguably a bug) in SELFDESTRUCT that can cause total
-		// issurance to be reduced. We do not need to replicate this.
+		// issuance to be reduced. We do not need to replicate this.
 	}
 
 	fn touch(&mut self, _address: H160) {

ts-tests/tests/test-contract-storage.ts

@@ -2,7 +2,7 @@ import { expect } from "chai";
 import { AbiItem } from "web3-utils";
 
 import Test from "../build/contracts/Storage.json";
-import { GENESIS_ACCOUNT, GENESIS_ACCOUNT_PRIVATE_KEY } from "./config";
+import { GENESIS_ACCOUNT, GENESIS_ACCOUNT_PRIVATE_KEY, FIRST_CONTRACT_ADDRESS } from "./config";
 import { createAndFinalizeBlock, customRequest, describeWithFrontier } from "./util";
 
 describeWithFrontier("Frontier RPC (Contract)", (context) => {
@@ -80,4 +80,48 @@ describeWithFrontier("Frontier RPC (Contract)", (context) => {
 
 		expect(getStorage1.result).to.be.eq(expectedStorage);
 	});
+
+	it("SSTORE cost should properly take into account transaction initial value", async function () {
+		this.timeout(5000);
+
+		let nonce = await context.web3.eth.getTransactionCount(GENESIS_ACCOUNT);
+
+		await context.web3.eth.accounts.wallet.add(GENESIS_ACCOUNT_PRIVATE_KEY);
+		const contract = new context.web3.eth.Contract(TEST_CONTRACT_ABI, FIRST_CONTRACT_ADDRESS, {
+			from: GENESIS_ACCOUNT,
+			gasPrice: "0x3B9ACA00",
+		});
+
+		const promisify = (inner) => new Promise((resolve, reject) => inner(resolve, reject));
+
+		let tx1 = contract.methods
+			.setStorage("0x2A", "0x1")
+			.send({ from: GENESIS_ACCOUNT, gas: "0x100000", nonce: nonce++ });
+
+		let tx2 = contract.methods
+			.setStorage("0x2A", "0x1")
+			.send({ from: GENESIS_ACCOUNT, gas: "0x100000", nonce: nonce++ });
+
+		let tx3 = contract.methods
+			.setStorage("0x2A", "0x2")
+			.send(
+				{ from: GENESIS_ACCOUNT, gas: "0x100000", nonce: nonce++ },
+				async (hash) => await createAndFinalizeBlock(context.web3)
+			);
+
+		tx1 = await tx1;
+		tx2 = await tx2;
+		tx3 = await tx3;
+
+		// cost minus SSTORE
+		const baseCost = 24029;
+
+		// going from unset storage to some value (original = 0)
+		expect(tx1.gasUsed - baseCost).to.be.eq(20000);
+		// in London config, setting back the same value have cost of warm read
+		expect(tx2.gasUsed - baseCost).to.be.eq(100);
+		// - the original storage didn't change in the current transaction
+		// - the original storage is not zero (otherwise tx1)
+		expect(tx3.gasUsed - baseCost).to.be.eq(2900);
+	});
 });