contracts: Remove state rent (#9669)

* Remove storage rent * Add storage migration * cargo run --quiet --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_contracts --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/contracts/src/weights.rs --template=./.maintain/frame-weight-template.hbs * cargo run --quiet --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_contracts --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/contracts/src/weights.rs --template=./.maintain/frame-weight-template.hbs * cargo run --quiet --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_contracts --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/contracts/src/weights.rs --template=./.maintain/frame-weight-template.hbs * Add migration for deletetion queue * Fix compilation * Increase gas supplied to out_of_gas to be sure that it won't deplete too early * cargo run --quiet --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_contracts --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/contracts/src/weights.rs --template=./.maintain/frame-weight-template.hbs Co-authored-by: Parity Bot <admin@parity.io>
2026-04-29 12:37:57 +00:00 · 2021-09-06 18:40:58 +02:00
parent 13f3e25ebb
commit 522e77e243
20 changed files with 1158 additions and 4641 deletions
@@ -18,18 +18,104 @@
 use crate::{Config, Pallet, Weight};
 use frame_support::{
 	storage::migration,
-	traits::{Get, PalletInfoAccess, StorageVersion},
+	traits::{Get, PalletInfoAccess},
 };
+use sp_std::prelude::*;

 pub fn migrate<T: Config>() -> Weight {
+	use frame_support::traits::StorageVersion;
+
+	let version = StorageVersion::get::<Pallet<T>>();
 	let mut weight: Weight = 0;

-	if StorageVersion::get::<Pallet<T>>() == 3 {
-		weight = weight.saturating_add(T::DbWeight::get().writes(1));
-		migration::remove_storage_prefix(<Pallet<T>>::name().as_bytes(), b"CurrentSchedule", b"");
-
+	if version < 4 {
+		weight = weight.saturating_add(v4::migrate::<T>());
 		StorageVersion::new(4).put::<Pallet<T>>();
 	}

+	if version < 5 {
+		weight = weight.saturating_add(v5::migrate::<T>());
+		StorageVersion::new(5).put::<Pallet<T>>();
+	}
+
 	weight
 }
+
+/// V4: `Schedule` is changed to be a config item rather than an in-storage value.
+mod v4 {
+	use super::*;
+
+	pub fn migrate<T: Config>() -> Weight {
+		migration::remove_storage_prefix(<Pallet<T>>::name().as_bytes(), b"CurrentSchedule", b"");
+		T::DbWeight::get().writes(1)
+	}
+}
+
+/// V5: State rent is removed which obsoletes some fields in `ContractInfo`.
+mod v5 {
+	use super::*;
+	use crate::{
+		BalanceOf, CodeHash, ContractInfo, ContractInfoOf, DeletedContract, DeletionQueue, TrieId,
+	};
+	use codec::Decode;
+	use sp_std::marker::PhantomData;
+
+	type AliveContractInfo<T> =
+		RawAliveContractInfo<CodeHash<T>, BalanceOf<T>, <T as frame_system::Config>::BlockNumber>;
+	type TombstoneContractInfo<T> = RawTombstoneContractInfo<
+		<T as frame_system::Config>::Hash,
+		<T as frame_system::Config>::Hashing,
+	>;
+
+	#[derive(Decode)]
+	enum OldContractInfo<T: Config> {
+		Alive(AliveContractInfo<T>),
+		Tombstone(TombstoneContractInfo<T>),
+	}
+
+	#[derive(Decode)]
+	struct RawAliveContractInfo<CodeHash, Balance, BlockNumber> {
+		trie_id: TrieId,
+		_storage_size: u32,
+		_pair_count: u32,
+		code_hash: CodeHash,
+		_rent_allowance: Balance,
+		_rent_paid: Balance,
+		_deduct_block: BlockNumber,
+		_last_write: Option<BlockNumber>,
+		_reserved: Option<()>,
+	}
+
+	#[derive(Decode)]
+	struct RawTombstoneContractInfo<H, Hasher>(H, PhantomData<Hasher>);
+
+	#[derive(Decode)]
+	struct OldDeletedContract {
+		_pair_count: u32,
+		trie_id: TrieId,
+	}
+
+	pub fn migrate<T: Config>() -> Weight {
+		let mut weight: Weight = 0;
+
+		<ContractInfoOf<T>>::translate(|_key, old: OldContractInfo<T>| {
+			weight = weight.saturating_add(T::DbWeight::get().reads_writes(1, 1));
+			match old {
+				OldContractInfo::Alive(old) => Some(ContractInfo::<T> {
+					trie_id: old.trie_id,
+					code_hash: old.code_hash,
+					_reserved: old._reserved,
+				}),
+				OldContractInfo::Tombstone(_) => None,
+			}
+		});
+
+		<DeletionQueue<T>>::translate(|old: Option<Vec<OldDeletedContract>>| {
+			weight = weight.saturating_add(T::DbWeight::get().reads_writes(1, 1));
+			old.map(|old| old.into_iter().map(|o| DeletedContract { trie_id: o.trie_id }).collect())
+		})
+		.ok();
+
+		weight
+	}
+}