private field and comments

Signed-off-by: Cyrill Leutwiler <bigcyrill@hotmail.com>

substrate/frame/revive/src/exec.rs

@@ -1073,11 +1073,11 @@ where
 					let frame = self.top_frame_mut();
 					let contract = frame.contract_info.as_contract().inspect(|info| {
 						// Charge for immutable data stored during constructor execution.
-						if info.immutable_bytes == 0 {
+						if info.immutable_bytes() == 0 {
 							return;
 						};
 						let amount = StorageDeposit::Charge(
-							T::DepositPerByte::get().saturating_mul(info.immutable_bytes.into()),
+							T::DepositPerByte::get().saturating_mul(info.immutable_bytes().into()),
 						);
 						frame.nested_storage.charge_deposit(frame.account_id.clone(), amount);
 					});
@@ -1566,7 +1566,7 @@ where
 		}
 
 		let account_id = self.account_id().clone();
-		self.top_frame_mut().contract_info.get(&account_id).immutable_bytes = data.len() as u32;
+		self.top_frame_mut().contract_info.get(&account_id).set_immutable_bytes(data.len() as u32);
 		<ImmutableDataOf<T>>::insert(T::AddressMapper::to_address(&account_id), &data);
 
 		Ok(())
@@ -1691,6 +1691,8 @@ where
 	///
 	/// After running the constructor, the new immutable data is already stored in
 	/// `self.immutable_data` at the address of the (reverted) contract instantiation.
+	///
+	/// The `set_code_hash` contract API stays disabled until this change is implemented.
 	fn set_code_hash(&mut self, hash: H256) -> DispatchResult {
 		let frame = top_frame_mut!(self);
 

substrate/frame/revive/src/storage.rs

@@ -76,7 +76,7 @@ pub struct ContractInfo<T: Config> {
 	/// calls.
 	delegate_dependencies: DelegateDependencyMap<T>,
 	/// The size of the immutable data of this contract.
-	pub immutable_bytes: u32,
+	immutable_bytes: u32,
 }
 
 impl<T: Config> ContractInfo<T> {
@@ -365,6 +365,19 @@ impl<T: Config> ContractInfo<T> {
 	pub fn load_code_hash(account: &AccountIdOf<T>) -> Option<sp_core::H256> {
 		<ContractInfoOf<T>>::get(&T::AddressMapper::to_address(account)).map(|i| i.code_hash)
 	}
+
+	/// Returns the amount of immutable bytes of this contract.
+	pub fn immutable_bytes(&self) -> u32 {
+		self.immutable_bytes
+	}
+
+	/// Set the number of immutable bytes of this contract.
+	///
+	/// Note: Changing the immutable bytes of a contract requires updating
+	/// the base deposit during the same transaction!
+	pub fn set_immutable_bytes(&mut self, immutable_bytes: u32) {
+		self.immutable_bytes = immutable_bytes
+	}
 }
 
 /// Information about what happened to the pre-existing value when calling [`ContractInfo::write`].

substrate/frame/revive/src/wasm/runtime.rs

@@ -1965,6 +1965,9 @@ pub mod env {
 
 	/// Replace the contract code at the specified address with new code.
 	/// See [`pallet_revive_uapi::HostFn::set_code_hash`].
+	///
+	/// Disabled until the internal implementation takes care of collecting
+	/// the immutable data of the new code hash.
 	#[mutating]
 	fn set_code_hash(
 		&mut self,