move from CodeStorage&PrefabWasmModule to PristineCode&WasmBlob

frame/contracts/src/exec.rs

@@ -362,11 +362,12 @@ pub trait Executable<T: Config>: Sized {
 		ext: &mut E,
 		function: &ExportedFunction,
 		input_data: Vec<u8>,
+		schedule: &Schedule<T>,
 		reftime_limit: u64,
 	) -> ExecResult;
 
 	/// The code hash of the executable.
-	fn code_hash(&self) -> &CodeHash<T>;
+	fn code_hash(&self) -> CodeHash<T>;
 
 	/// Size of the conract code in bytes.
 	fn code_len(&self) -> u32;
@@ -765,11 +766,11 @@ where
 				FrameArgs::Instantiate { sender, nonce, executable, salt, input_data } => {
 					let account_id = Contracts::<T>::contract_address(
 						&sender,
-						executable.code_hash(),
+						&executable.code_hash(),
 						input_data,
 						salt,
 					);
-					let contract = ContractInfo::new(&account_id, nonce, *executable.code_hash())?;
+					let contract = ContractInfo::new(&account_id, nonce, executable.code_hash())?;
 					(
 						account_id,
 						contract,
@@ -851,7 +852,7 @@ where
 		let frame = self.top_frame();
 		let entry_point = frame.entry_point;
 		let delegated_code_hash =
-			if frame.delegate_caller.is_some() { Some(*executable.code_hash()) } else { None };
+			if frame.delegate_caller.is_some() { Some(executable.code_hash()) } else { None };
 		let do_transaction = || {
 			// We need to charge the storage deposit before the initial transfer so that
 			// it can create the account in case the initial transfer is < ed.
@@ -873,11 +874,12 @@ where
 			// Take the ref_time part of the gas_left from the current frame.
 			let frame = self.top_frame();
 			let reftime_left = frame.nested_gas.gas_left().ref_time();
+			let schedule = &self.schedule().clone();
 
 			// Call into the Wasm blob.
 			// We pass `reftime_left` into the execution engine to initialize its gas metering.
 			let output = executable
-				.execute(self, &entry_point, input_data, reftime_left)
+				.execute(self, &entry_point, input_data, schedule, reftime_left)
 				.map_err(|e| ExecError { error: e.error, origin: ErrorOrigin::Callee })?;
 
 			// Sync this frame's gas meter with the engine's one.

frame/contracts/src/lib.rs

@@ -101,7 +101,7 @@ use crate::{
 	exec::{AccountIdOf, ErrorOrigin, ExecError, Executable, Key, Stack as ExecStack},
 	gas::GasMeter,
 	storage::{meter::Meter as StorageMeter, ContractInfo, DeletionQueueManager},
-	wasm::{OwnerInfo, PrefabWasmModule, TryInstantiate, WasmBlob},
+	wasm::{OwnerInfo, TryInstantiate, WasmBlob},
 	weights::WeightInfo,
 };
 use codec::{Codec, Decode, Encode, HasCompact};
@@ -929,12 +929,6 @@ pub mod pallet {
 	#[pallet::storage]
 	pub(crate) type PristineCode<T: Config> = StorageMap<_, Identity, CodeHash<T>, CodeVec<T>>;
 
-	/// A mapping between an original code hash and Wasm code, ready for execution.
-	/// TODO: delete
-	#[pallet::storage]
-	pub(crate) type CodeStorage<T: Config> =
-		StorageMap<_, Identity, CodeHash<T>, PrefabWasmModule<T>>;
-
 	/// A mapping between an original code hash and its owner information.
 	#[pallet::storage]
 	pub(crate) type OwnerInfoOf<T: Config> = StorageMap<_, Identity, CodeHash<T>, OwnerInfo<T>>;
@@ -1217,7 +1211,7 @@ impl<T: Config> Invokable<T> for InstantiateInput<T> {
 			let origin = contract_origin.account_id()?;
 			let (extra_deposit, executable) = match &self.code {
 				Code::Upload(binary) => {
-					let (executable, owner_info) = WasmBlob::from_code(
+					let executable = WasmBlob::from_code(
 						binary.clone(),
 						&schedule,
 						origin.clone(),
@@ -1231,6 +1225,7 @@ impl<T: Config> Invokable<T> for InstantiateInput<T> {
 							.map(|buffer| buffer.try_extend(&mut msg.bytes()));
 						err
 					})?;
+					let owner_info = executable.owner_info.clone();
 					// The open deposit will be charged during execution when the
 					// uploaded module does not already exist. This deposit is not part of the
 					// storage meter because it is not transferred to the contract but
@@ -1422,11 +1417,11 @@ impl<T: Config> Pallet<T> {
 		let module =
 			WasmBlob::from_code(code, &schedule, origin, determinism, TryInstantiate::Instantiate)
 				.map_err(|(err, _)| err)?;
-		let deposit = module.open_deposit();
+		let deposit = module.open_deposit(module.owner_info.clone());
 		if let Some(storage_deposit_limit) = storage_deposit_limit {
 			ensure!(storage_deposit_limit >= deposit, <Error<T>>::StorageDepositLimitExhausted);
 		}
-		let result = CodeUploadReturnValue { code_hash: *module.code_hash(), deposit };
+		let result = CodeUploadReturnValue { code_hash: module.code_hash(), deposit };
 		module.store()?;
 		Ok(result)
 	}