Sload cache item

darwinia-network · Nov 3, 2023 · 0fe2e9e · 0fe2e9e
1 parent 6db59d1
commit 0fe2e9e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/frame/evm/src/runner/stack.rs b/frame/evm/src/runner/stack.rs
@@ -1102,7 +1102,12 @@ where
 					}
 				}
 				Opcode::SLOAD => {
-					weight_info.try_record_proof_size_or_fail(ACCOUNT_STORAGE_PROOF_SIZE)?;
+					if let Some(AccessedStorage::AccountStorages((address, index))) =
+						accessed_storage
+					{
+						weight_info.try_record_proof_size_or_fail(ACCOUNT_STORAGE_PROOF_SIZE)?;
+						recorded.account_storages.insert((address, index), true);
+					}
 				}
 				Opcode::SSTORE => {
 					if let Some(AccessedStorage::AccountStorages((address, index))) =

diff --git a/frame/evm/src/tests.rs b/frame/evm/src/tests.rs
@@ -344,7 +344,7 @@ mod proof_size_test {
 			let reading_main_contract_len =
 				AccountCodes::<Test>::get(call_contract_address).len() as u64;
 			let expected_proof_size = reading_main_contract_len
-				+ ACCOUNT_STORAGE_PROOF_SIZE * 2
+				+ ACCOUNT_STORAGE_PROOF_SIZE
 				+ ACCOUNT_CODES_METADATA_PROOF_SIZE
 				+ IS_EMPTY_CHECK_PROOF_SIZE
 				+ (ACCOUNT_BASIC_PROOF_SIZE * 2);