contracts: Multi block migrations

frame/contracts/primitives/src/lib.rs

@@ -109,14 +109,17 @@ pub enum ContractAccessError {
 	MigrationInProgress,
 }
 
-impl<T, B: Zero> From<DispatchError> for ContractResult<Result<T, DispatchError>, B> {
+impl<T, B: Zero, EventRecord> From<DispatchError>
+	for ContractResult<Result<T, DispatchError>, B, EventRecord>
+{
 	fn from(error: DispatchError) -> Self {
 		ContractResult {
 			gas_consumed: Zero::zero(),
 			gas_required: Zero::zero(),
 			storage_deposit: Default::default(),
 			debug_message: Vec::new(),
 			result: Err(error),
+			events: None,
 		}
 	}
 }

frame/contracts/src/lib.rs

@@ -107,7 +107,10 @@ use crate::{
 use codec::{Codec, Decode, Encode, HasCompact};
 use environmental::*;
 use frame_support::{
-	dispatch::{DispatchError, Dispatchable, GetDispatchInfo, Pays, PostDispatchInfo, RawOrigin},
+	dispatch::{
+		DispatchError, Dispatchable, GetDispatchInfo, Pays, PostDispatchInfo, RawOrigin,
+		WithPostDispatchInfo,
+	},
 	ensure,
 	error::BadOrigin,
 	traits::{
@@ -605,9 +608,6 @@ pub mod pallet {
 			data: Vec<u8>,
 		) -> DispatchResultWithPostInfo {
 			Migration::<T>::ensure_migrated()?;
-			let gas_limit: Weight = gas_limit.into();
-			let origin = ensure_signed(origin)?;
-			let dest = T::Lookup::lookup(dest)?;
 			let common = CommonInput {
 				origin: Origin::from_runtime_origin(origin)?,
 				value,
@@ -668,7 +668,6 @@ pub mod pallet {
 			salt: Vec<u8>,
 		) -> DispatchResultWithPostInfo {
 			Migration::<T>::ensure_migrated()?;
-			let origin = ensure_signed(origin)?;
 			let code_len = code.len() as u32;
 			let data_len = data.len() as u32;
 			let salt_len = salt.len() as u32;
@@ -712,7 +711,6 @@ pub mod pallet {
 			salt: Vec<u8>,
 		) -> DispatchResultWithPostInfo {
 			Migration::<T>::ensure_migrated()?;
-			let origin = ensure_signed(origin)?;
 			let data_len = data.len() as u32;
 			let salt_len = salt.len() as u32;
 			let common = CommonInput {