add external transient_storage to pallet_revive::ExecConfig

cumulus/parachains/runtimes/assets/common/src/erc20_transactor.rs

@@ -131,7 +131,7 @@ where
 					deposit_limit: StorageDepositLimit::get(),
 				},
 				data,
-				ExecConfig::new_substrate_tx(),
+				&ExecConfig::new_substrate_tx(),
 			);
 		// We need to return this surplus for the executor to allow refunding it.
 		let surplus = weight_limit.saturating_sub(weight_consumed);
@@ -192,7 +192,7 @@ where
 					deposit_limit: StorageDepositLimit::get(),
 				},
 				data,
-				ExecConfig::new_substrate_tx(),
+				&ExecConfig::new_substrate_tx(),
 			);
 		// We need to return this surplus for the executor to allow refunding it.
 		let surplus = weight_limit.saturating_sub(weight_consumed);

polkadot/xcm/pallet-xcm/precompiles/src/tests.rs

@@ -80,7 +80,7 @@ fn test_xcm_send_precompile_works() {
 				deposit_limit: u128::MAX,
 			},
 			encoded_call,
-			ExecConfig::new_substrate_tx(),
+			&ExecConfig::new_substrate_tx(),
 		);
 		assert!(result.result.is_ok());
 		let sent_message = Xcm(Some(DescendOrigin(sender.clone().try_into().unwrap()))
@@ -131,7 +131,7 @@ fn test_xcm_send_precompile_to_parachain() {
 				deposit_limit: u128::MAX,
 			},
 			encoded_call,
-			ExecConfig::new_substrate_tx(),
+			&ExecConfig::new_substrate_tx(),
 		);
 
 		assert!(result.result.is_ok());
@@ -182,7 +182,7 @@ fn test_xcm_send_precompile_fails() {
 				deposit_limit: u128::MAX,
 			},
 			encoded_call,
-			ExecConfig::new_substrate_tx(),
+			&ExecConfig::new_substrate_tx(),
 		);
 		let return_value = match result.result {
 			Ok(value) => value,
@@ -234,7 +234,7 @@ fn send_fails_on_old_location_version() {
 				deposit_limit: u128::MAX,
 			},
 			encoded_call,
-			ExecConfig::new_substrate_tx(),
+			&ExecConfig::new_substrate_tx(),
 		);
 		let return_value = match result.result {
 			Ok(value) => value,
@@ -263,7 +263,7 @@ fn send_fails_on_old_location_version() {
 				deposit_limit: u128::MAX,
 			},
 			encoded_call,
-			ExecConfig::new_substrate_tx(),
+			&ExecConfig::new_substrate_tx(),
 		);
 		let return_value = match result.result {
 			Ok(value) => value,
@@ -315,7 +315,7 @@ fn send_fails_on_old_xcm_version() {
 				deposit_limit: u128::MAX,
 			},
 			encoded_call,
-			ExecConfig::new_substrate_tx(),
+			&ExecConfig::new_substrate_tx(),
 		);
 		let return_value = match result.result {
 			Ok(value) => value,
@@ -345,7 +345,7 @@ fn send_fails_on_old_xcm_version() {
 				deposit_limit: u128::MAX,
 			},
 			encoded_call,
-			ExecConfig::new_substrate_tx(),
+			&ExecConfig::new_substrate_tx(),
 		);
 		let return_value = match result.result {
 			Ok(value) => value,
@@ -390,7 +390,7 @@ fn test_xcm_execute_precompile_works() {
 				deposit_limit: u128::MAX,
 			},
 			encoded_weight_call,
-			ExecConfig::new_substrate_tx(),
+			&ExecConfig::new_substrate_tx(),
 		);
 
 		let weight_result = match xcm_weight_results.result {
@@ -414,7 +414,7 @@ fn test_xcm_execute_precompile_works() {
 				deposit_limit: u128::MAX,
 			},
 			encoded_call,
-			ExecConfig::new_substrate_tx(),
+			&ExecConfig::new_substrate_tx(),
 		);
 
 		assert!(result.result.is_ok());
@@ -455,7 +455,7 @@ fn test_xcm_execute_precompile_different_beneficiary() {
 				deposit_limit: u128::MAX,
 			},
 			encoded_weight_call,
-			ExecConfig::new_substrate_tx(),
+			&ExecConfig::new_substrate_tx(),
 		);
 
 		let weight_result = match xcm_weight_results.result {
@@ -479,7 +479,7 @@ fn test_xcm_execute_precompile_different_beneficiary() {
 				deposit_limit: u128::MAX,
 			},
 			encoded_call,
-			ExecConfig::new_substrate_tx(),
+			&ExecConfig::new_substrate_tx(),
 		);
 
 		let return_value = match result.result {
@@ -528,7 +528,7 @@ fn test_xcm_execute_precompile_fails() {
 				deposit_limit: u128::MAX,
 			},
 			encoded_weight_call,
-			ExecConfig::new_substrate_tx(),
+			&ExecConfig::new_substrate_tx(),
 		);
 
 		let weight_result = match xcm_weight_results.result {
@@ -552,7 +552,7 @@ fn test_xcm_execute_precompile_fails() {
 				deposit_limit: u128::MAX,
 			},
 			encoded_call,
-			ExecConfig::new_substrate_tx(),
+			&ExecConfig::new_substrate_tx(),
 		);
 		let return_value = match result.result {
 			Ok(value) => value,
@@ -600,7 +600,7 @@ fn execute_fails_on_old_version() {
 				deposit_limit: u128::MAX,
 			},
 			encoded_weight_call,
-			ExecConfig::new_substrate_tx(),
+			&ExecConfig::new_substrate_tx(),
 		);
 
 		let weight_result = match xcm_weight_results.result {
@@ -631,7 +631,7 @@ fn execute_fails_on_old_version() {
 				deposit_limit: u128::MAX,
 			},
 			encoded_call,
-			ExecConfig::new_substrate_tx(),
+			&ExecConfig::new_substrate_tx(),
 		);
 
 		let return_value = match result.result {
@@ -660,7 +660,7 @@ fn execute_fails_on_old_version() {
 				deposit_limit: u128::MAX,
 			},
 			encoded_call,
-			ExecConfig::new_substrate_tx(),
+			&ExecConfig::new_substrate_tx(),
 		);
 
 		let return_value = match result.result {
@@ -711,7 +711,7 @@ fn weight_fails_on_old_version() {
 				deposit_limit: u128::MAX,
 			},
 			encoded_weight_call,
-			ExecConfig::new_substrate_tx(),
+			&ExecConfig::new_substrate_tx(),
 		);
 
 		let result = match xcm_weight_results.result {
@@ -737,7 +737,7 @@ fn weight_fails_on_old_version() {
 				deposit_limit: u128::MAX,
 			},
 			encoded_weight_call,
-			ExecConfig::new_substrate_tx(),
+			&ExecConfig::new_substrate_tx(),
 		);
 
 		let result = match xcm_weight_results.result {

prdoc/pr_10493.prdoc

@@ -0,0 +1,18 @@
+title: add external transient_storage to pallet_revive::ExecConfig
+doc:
+- audience: Node Dev
+  description: |-
+    # Description
+
+    This PR adds the ability to supply external copy of `TransientStorage` to `pallet_revive::ExecConfig` to be used during execution.
+    This is required by testing in foundry as we only enter `pallet_revive` during a `CALL` or `CREATE` instruction and we need to carryover 
+    the transient storage to other following calls as they happen within an external tx
+crates:
+- name: pallet-revive
+  bump: major
+- name: pallet-xcm-precompiles
+  bump: minor
+- name: pallet-assets-precompiles
+  bump: minor 
+- name: assets-common
+  bump: minor

substrate/frame/assets/precompiles/src/tests.rs

@@ -81,7 +81,7 @@ fn precompile_transfer_works() {
 				deposit_limit: u64::MAX,
 			},
 			data,
-			ExecConfig::new_substrate_tx(),
+			&ExecConfig::new_substrate_tx(),
 		);
 
 		assert_contract_event(
@@ -122,7 +122,7 @@ fn total_supply_works() {
 				deposit_limit: u64::MAX,
 			},
 			data,
-			ExecConfig::new_substrate_tx(),
+			&ExecConfig::new_substrate_tx(),
 		)
 		.result
 		.unwrap()
@@ -157,7 +157,7 @@ fn balance_of_works() {
 				deposit_limit: u64::MAX,
 			},
 			data,
-			ExecConfig::new_substrate_tx(),
+			&ExecConfig::new_substrate_tx(),
 		)
 		.result
 		.unwrap()
@@ -205,7 +205,7 @@ fn approval_works() {
 				deposit_limit: u64::MAX,
 			},
 			data,
-			ExecConfig::new_substrate_tx(),
+			&ExecConfig::new_substrate_tx(),
 		);
 
 		assert_contract_event(
@@ -230,7 +230,7 @@ fn approval_works() {
 				deposit_limit: u64::MAX,
 			},
 			data,
-			ExecConfig::new_substrate_tx(),
+			&ExecConfig::new_substrate_tx(),
 		)
 		.result
 		.unwrap()
@@ -255,7 +255,7 @@ fn approval_works() {
 				deposit_limit: u64::MAX,
 			},
 			data,
-			ExecConfig::new_substrate_tx(),
+			&ExecConfig::new_substrate_tx(),
 		);
 		assert_eq!(Assets::balance(asset_id, owner), 90);
 		assert_eq!(Assets::allowance(asset_id, &owner, &spender), 15);

substrate/frame/revive/src/call_builder.rs

@@ -268,7 +268,7 @@ where
 			Code::Upload(module.code),
 			data,
 			salt,
-			ExecConfig::new_substrate_tx(),
+			&ExecConfig::new_substrate_tx(),
 		);
 
 		let address = outcome.result?.addr;

substrate/frame/revive/src/debug.rs

@@ -48,18 +48,21 @@ pub struct DebugSettings {
 }
 
 impl DebugSettings {
-	#[cfg(test)]
 	pub fn set_bypass_eip_3607(mut self, value: bool) -> Self {
 		self.bypass_eip_3607 = value;
 		self
 	}
 
-	#[cfg(test)]
 	pub fn set_allow_unlimited_contract_size(mut self, value: bool) -> Self {
 		self.allow_unlimited_contract_size = value;
 		self
 	}
 
+	pub fn set_enable_pvm_logs(mut self, value: bool) -> Self {
+		self.pvm_logs = value;
+		self
+	}
+
 	pub fn is_execution_tracing_enabled<T: Config>() -> bool {
 		T::DebugEnabled::get() && !DebugSettingsOf::<T>::get().disable_execution_tracing
 	}

substrate/frame/revive/src/exec.rs

@@ -1270,7 +1270,9 @@ where
 			*caller_frame = Default::default();
 		}
 
-		self.transient_storage.start_transaction();
+		self.with_transient_storage_mut(|transient_storage| {
+			transient_storage.start_transaction();
+		});
 		let is_first_frame = self.frames.is_empty();
 
 		let do_transaction = || -> ExecResult {
@@ -1499,12 +1501,13 @@ where
 				(false, Err(error.into()))
 			},
 		};
-
-		if success {
-			self.transient_storage.commit_transaction();
-		} else {
-			self.transient_storage.rollback_transaction();
-		}
+		self.with_transient_storage_mut(|transient_storage| {
+			if success {
+				transient_storage.commit_transaction();
+			} else {
+				transient_storage.rollback_transaction();
+			}
+		});
 		log::trace!(target: LOG_TARGET, "frame finished with: {output:?}");
 
 		self.pop_frame(success);
@@ -1844,6 +1847,24 @@ where
 		}
 		true
 	}
+
+	fn with_transient_storage_mut<R, F: FnOnce(&mut TransientStorage<T>) -> R>(
+		&mut self,
+		f: F,
+	) -> R {
+		if let Some(transient) = &self.exec_config.transient_storage {
+			f(&mut transient.borrow_mut())
+		} else {
+			f(&mut self.transient_storage)
+		}
+	}
+	fn with_transient_storage<R, F: FnOnce(&TransientStorage<T>) -> R>(&self, f: F) -> R {
+		if let Some(transient) = &self.exec_config.transient_storage {
+			f(&transient.borrow())
+		} else {
+			f(&self.transient_storage)
+		}
+	}
 }
 
 impl<'a, T, E> Ext for Stack<'a, T, E>
@@ -2142,13 +2163,15 @@ where
 	}
 
 	fn get_transient_storage(&self, key: &Key) -> Option<Vec<u8>> {
-		self.transient_storage.read(self.account_id(), key)
+		self.with_transient_storage(|transient_storage| {
+			transient_storage.read(self.account_id(), key)
+		})
 	}
 
 	fn get_transient_storage_size(&self, key: &Key) -> Option<u32> {
-		self.transient_storage
-			.read(self.account_id(), key)
-			.map(|value| value.len() as _)
+		self.with_transient_storage(|transient_storage| {
+			transient_storage.read(self.account_id(), key).map(|value| value.len() as _)
+		})
 	}
 
 	fn set_transient_storage(
@@ -2158,7 +2181,9 @@ where
 		take_old: bool,
 	) -> Result<WriteOutcome, DispatchError> {
 		let account_id = self.account_id().clone();
-		self.transient_storage.write(&account_id, key, value, take_old)
+		self.with_transient_storage_mut(|transient_storage| {
+			transient_storage.write(&account_id, key, value, take_old)
+		})
 	}
 
 	fn account_id(&self) -> &T::AccountId {