contracts: add generic Event to ContractResult

Author: juangirini

frame/contracts/primitives/src/lib.rs

@@ -33,7 +33,7 @@ use sp_weights::Weight;
 ///
 /// It contains the execution result together with some auxiliary information.
 #[derive(Eq, PartialEq, Encode, Decode, RuntimeDebug, TypeInfo)]
-pub struct ContractResult<R, Balance> {
+pub struct ContractResult<R, Balance, Event> {
 	/// How much weight was consumed during execution.
 	pub gas_consumed: Weight,
 	/// How much weight is required as gas limit in order to execute this call.
@@ -71,16 +71,16 @@ pub struct ContractResult<R, Balance> {
 	pub debug_message: Vec<u8>,
 	/// The execution result of the wasm code.
 	pub result: R,
-	pub events: Option<Vec<Vec<u8>>>,
+	pub events: Option<Vec<Event>>,
 }
 
 /// Result type of a `bare_call` call.
-pub type ContractExecResult<Balance> =
-	ContractResult<Result<ExecReturnValue, DispatchError>, Balance>;
+pub type ContractExecResult<Balance, Event> =
+	ContractResult<Result<ExecReturnValue, DispatchError>, Balance, Event>;
 
 /// Result type of a `bare_instantiate` call.
 pub type ContractInstantiateResult<AccountId, Balance> =
-	ContractResult<Result<InstantiateReturnValue<AccountId>, DispatchError>, Balance>;
+	ContractResult<Result<InstantiateReturnValue<AccountId>, DispatchError>, Balance, ()>;
 
 /// Result type of a `bare_code_upload` call.
 pub type CodeUploadResult<CodeHash, Balance> =

frame/contracts/src/lib.rs

@@ -1167,7 +1167,7 @@ impl<T: Config> Pallet<T> {
 		data: Vec<u8>,
 		debug: bool,
 		determinism: Determinism,
-	) -> ContractExecResult<BalanceOf<T>> {
+	) -> ContractExecResult<BalanceOf<T>, <T as frame_system::Config>::RuntimeEvent> {
 		let mut debug_message = if debug { Some(DebugBufferVec::<T>::default()) } else { None };
 		let common = CommonInput {
 			origin,
@@ -1181,8 +1181,7 @@ impl<T: Config> Pallet<T> {
 		// We are good to call System::events() from the runtime API (i.e offchain).
 		// Even though it says it should only be used in tests, it is actually not allowed to be
 		// read on-chain cause it will put all the Events emitted in the block so far into the PoV.
-		let events: Vec<Vec<u8>> =
-			System::<T>::events().iter().map(|e| e.clone().event.encode()).collect(); // todo: should determinism::Relaxed be checked here?
+		let events = System::<T>::events().iter().map(|e| e.clone().event).collect::<Vec<_>>(); // todo: should determinism::Relaxed be checked here?
 		ContractExecResult {
 			result: output.result.map_err(|r| r.error),
 			gas_consumed: output.gas_meter.gas_consumed(),
@@ -1342,11 +1341,12 @@ impl<T: Config> Pallet<T> {
 sp_api::decl_runtime_apis! {
 	/// The API used to dry-run contract interactions.
 	#[api_version(2)]
-	pub trait ContractsApi<AccountId, Balance, BlockNumber, Hash> where
+	pub trait ContractsApi<AccountId, Balance, BlockNumber, Hash, Event> where
 		AccountId: Codec,
 		Balance: Codec,
 		BlockNumber: Codec,
 		Hash: Codec,
+		Event: Codec,
 	{
 		/// Perform a call from a specified account to a given contract.
 		///
@@ -1358,7 +1358,7 @@ sp_api::decl_runtime_apis! {
 			gas_limit: Option<Weight>,
 			storage_deposit_limit: Option<Balance>,
 			input_data: Vec<u8>,
-		) -> ContractExecResult<Balance>;
+		) -> ContractExecResult<Balance, Event>;
 
 		/// Instantiate a new contract.
 		///

frame/contracts/src/tests.rs

@@ -458,7 +458,7 @@ fn compile_module<T>(fixture_name: &str) -> wat::Result<(Vec<u8>, <T::Hashing as
 where
 	T: frame_system::Config,
 {
-	let fixture_path = ["frame/contracts/fixtures/", fixture_name, ".wat"].concat();
+	let fixture_path = ["fixtures/", fixture_name, ".wat"].concat();
 	let wasm_binary = wat::parse_file(fixture_path)?;
 	let code_hash = T::Hashing::hash(&wasm_binary);
 	Ok((wasm_binary, code_hash))