feature(kreivo-runtime): update to stable2512-1

Author: pandres95

Cargo.lock

@@ -74,98 +74,98 @@ pass-webauthn = { git = "https://github.com/virto-network/pass-authenticators",
 pass-substrate-keys = { git = "https://github.com/virto-network/pass-authenticators", default-features = false, package = "pass-authenticators-substrate-keys" }
 
 # Substrate std
-pallet-transaction-payment-rpc = { version = "46.0.0" }
-sc-chain-spec = { version = "46.0.0" }
-sp-consensus = { version = "0.45.0" }
+pallet-transaction-payment-rpc = { version = "48.0.0" }
+sc-chain-spec = { version = "48.0.0" }
+sp-consensus = { version = "0.46.0" }
 
 # Substrate non-std
-frame-benchmarking = { version = "43.0.0", default-features = false }
-sp-api = { version = "39.0.0", default-features = false }
-sp-block-builder = { version = "39.0.0", default-features = false }
-sp-consensus-aura = { version = "0.45.0", default-features = false }
-sp-core = { version = "38.1.0", default-features = false }
-sp-io = { version = "43.0.0", default-features = false }
-sp-offchain = { version = "39.0.0", default-features = false }
-sp-session = { version = "41.0.0", default-features = false }
-sp-transaction-pool = { version = "39.0.0", default-features = false }
+frame-benchmarking = { version = "45.0.1", default-features = false }
+sp-api = { version = "40.0.0", default-features = false }
+sp-block-builder = { version = "40.0.0", default-features = false }
+sp-consensus-aura = { version = "0.46.0", default-features = false }
+sp-core = { version = "39.0.0", default-features = false }
+sp-io = { version = "44.0.0", default-features = false }
+sp-offchain = { version = "40.0.0", default-features = false }
+sp-session = { version = "42.0.0", default-features = false }
+sp-transaction-pool = { version = "40.0.0", default-features = false }
 
 # Substrate Runtime
-sp-genesis-builder = { version = "0.20.0", default-features = false }
-sp-inherents = { version = "39.0.0", default-features = false }
-sp-runtime = { version = "44.0.0", default-features = false }
-sp-version = { version = "42.0.0", default-features = false }
-sp-weights = { version = "33.1.0", default-features = false }
+sp-genesis-builder = { version = "0.21.0", default-features = false }
+sp-inherents = { version = "40.0.0", default-features = false }
+sp-runtime = { version = "45.0.0", default-features = false }
+sp-version = { version = "43.0.0", default-features = false }
+sp-weights = { version = "33.2.0", default-features = false }
 
 # Build Dependencies
-substrate-wasm-builder = { version = "29.0.0" }
+substrate-wasm-builder = { version = "31.1.0" }
 parity-wasm = { version = "0.45.0" }
 
 ## FRAME Dependencies
-frame-executive = { version = "43.0.1", default-features = false }
-frame-support = { version = "43.0.0", default-features = false }
-frame-system = { version = "43.0.1", default-features = false }
-frame-system-benchmarking = { version = "43.0.0", default-features = false }
-frame-system-rpc-runtime-api = { version = "39.0.0", default-features = false }
-frame-try-runtime = { version = "0.49.0", default-features = false }
+frame-executive = { version = "45.0.1", default-features = false }
+frame-support = { version = "45.1.0", default-features = false }
+frame-system = { version = "45.0.0", default-features = false }
+frame-system-benchmarking = { version = "45.0.0", default-features = false }
+frame-system-rpc-runtime-api = { version = "40.0.0", default-features = false }
+frame-try-runtime = { version = "0.51.0", default-features = false }
 
 ## FRAME Pallets
-pallet-asset-tx-payment = { version = "43.0.0", default-features = false }
-pallet-assets = { version = "46.1.0", default-features = false }
-pallet-assets-freezer = { version = "0.11.0", default-features = false }
-pallet-assets-holder = { version = "0.6.0", default-features = false }
-pallet-aura = { version = "42.0.0", default-features = false }
-pallet-authorship = { version = "43.0.0", default-features = false }
-pallet-balances = { version = "44.0.0", default-features = false }
-pallet-contracts = { version = "43.0.0", default-features = false }
+pallet-asset-tx-payment = { version = "45.0.0", default-features = false }
+pallet-assets = { version = "48.1.0", default-features = false }
+pallet-assets-freezer = { version = "0.13.0", default-features = false }
+pallet-assets-holder = { version = "0.8.0", default-features = false }
+pallet-aura = { version = "44.0.0", default-features = false }
+pallet-authorship = { version = "45.0.0", default-features = false }
+pallet-balances = { version = "46.0.0", default-features = false }
+pallet-contracts = { version = "45.0.1", default-features = false }
 pallet-contracts-fixtures = { path = "pallets/contracts-store/fixtures", default-features = false }
-pallet-multisig = { version = "43.0.0", default-features = false }
-pallet-nfts = { version = "37.0.0", default-features = false }
-pallet-preimage = { version = "43.0.0", default-features = false }
-pallet-proxy = { version = "43.1.0", default-features = false }
-pallet-ranked-collective = { version = "43.0.1", default-features = false }
-pallet-referenda = { version = "43.0.0", default-features = false }
-pallet-scheduler = { version = "44.0.0", default-features = false }
-pallet-session = { version = "43.0.0", default-features = false }
-pallet-skip-feeless-payment = { version = "18.0.0", default-features = false }
-pallet-sudo = { version = "43.0.0", default-features = false }
-pallet-timestamp = { version = "42.0.0", default-features = false }
-pallet-transaction-payment = { version = "43.0.0", default-features = false }
-pallet-transaction-payment-rpc-runtime-api = { version = "43.0.0", default-features = false }
-pallet-treasury = { version = "42.0.0", default-features = false }
-pallet-utility = { version = "43.0.0", default-features = false }
-pallet-vesting = { version = "43.0.0", default-features = false }
-pallet-revive = { version = "0.10.1", default-features = false }
+pallet-multisig = { version = "45.0.0", default-features = false }
+pallet-nfts = { version = "39.0.0", default-features = false }
+pallet-preimage = { version = "45.0.0", default-features = false }
+pallet-proxy = { version = "45.0.0", default-features = false }
+pallet-ranked-collective = { version = "45.0.0", default-features = false }
+pallet-referenda = { version = "45.0.0", default-features = false }
+pallet-scheduler = { version = "46.0.0", default-features = false }
+pallet-session = { version = "45.0.0", default-features = false }
+pallet-skip-feeless-payment = { version = "20.0.0", default-features = false }
+pallet-sudo = { version = "45.0.0", default-features = false }
+pallet-timestamp = { version = "44.0.0", default-features = false }
+pallet-transaction-payment = { version = "45.0.0", default-features = false }
+pallet-transaction-payment-rpc-runtime-api = { version = "45.0.0", default-features = false }
+pallet-treasury = { version = "44.0.0", default-features = false }
+pallet-utility = { version = "45.0.0", default-features = false }
+pallet-vesting = { version = "45.0.0", default-features = false }
+pallet-revive = { version = "0.12.2", default-features = false }
 
 # Cumulus client dependencies
-cumulus-primitives-aura = { version = "0.20.0", default-features = false }
+cumulus-primitives-aura = { version = "0.21.0", default-features = false }
 
 # Cumulus runtime dependencies
-assets-common = { version = "0.25.0", default-features = false }
-cumulus-pallet-aura-ext = { version = "0.23.0", default-features = false }
-cumulus-pallet-parachain-system = { version = "0.23.1", default-features = false }
-cumulus-pallet-session-benchmarking = { version = "24.0.0", default-features = false }
-cumulus-pallet-xcm = { version = "0.22.0", default-features = false }
-cumulus-pallet-xcmp-queue = { version = "0.23.0", default-features = false }
-cumulus-primitives-core = { version = "0.21.0", default-features = false }
-cumulus-primitives-timestamp = { version = "0.22.0", default-features = false }
-cumulus-primitives-utility = { version = "0.23.0", default-features = false }
-pallet-collator-selection = { version = "24.0.0", default-features = false }
-pallet-message-queue = { version = "46.0.0", default-features = false }
-parachain-info = { version = "0.23.0", package = "staging-parachain-info", default-features = false }
-parachains-common = { version = "25.0.0", default-features = false }
+assets-common = { version = "0.27.1", default-features = false }
+cumulus-pallet-aura-ext = { version = "0.25.0", default-features = false }
+cumulus-pallet-parachain-system = { version = "0.25.0", default-features = false }
+cumulus-pallet-session-benchmarking = { version = "26.0.0", default-features = false }
+cumulus-pallet-xcm = { version = "0.24.0", default-features = false }
+cumulus-pallet-xcmp-queue = { version = "0.25.0", default-features = false }
+cumulus-primitives-core = { version = "0.23.0", default-features = false }
+cumulus-primitives-timestamp = { version = "0.24.0", default-features = false }
+cumulus-primitives-utility = { version = "0.25.0", default-features = false }
+pallet-collator-selection = { version = "26.0.0", default-features = false }
+pallet-message-queue = { version = "48.0.0", default-features = false }
+parachain-info = { version = "0.25.0", package = "staging-parachain-info", default-features = false }
+parachains-common = { version = "27.1.0", default-features = false }
 
 # Polkadot
-polkadot-primitives = { version = "21.0.0", default-features = false }
+polkadot-primitives = { version = "22.0.0", default-features = false }
 
 # Polkadot Dependencies
-pallet-xcm = { version = "23.0.0", default-features = false }
-pallet-xcm-benchmarks = { version = "23.0.0", default-features = false }
-polkadot-core-primitives = { version = "20.0.0", default-features = false }
-polkadot-parachain-primitives = { version = "19.0.0", default-features = false }
-polkadot-runtime-common = { version = "22.0.0", default-features = false }
-xcm = { version = "19.0.0", package = "staging-xcm", default-features = false }
-xcm-builder = { version = "23.0.0", package = "staging-xcm-builder", default-features = false }
-xcm-executor = { version = "22.0.0", package = "staging-xcm-executor", default-features = false }
+pallet-xcm = { version = "25.0.0", default-features = false }
+pallet-xcm-benchmarks = { version = "25.0.0", default-features = false }
+polkadot-core-primitives = { version = "21.0.0", default-features = false }
+polkadot-parachain-primitives = { version = "20.0.0", default-features = false }
+polkadot-runtime-common = { version = "24.0.0", default-features = false }
+xcm = { version = "21.0.0", package = "staging-xcm", default-features = false }
+xcm-builder = { version = "25.0.0", package = "staging-xcm-builder", default-features = false }
+xcm-executor = { version = "24.0.0", package = "staging-xcm-executor", default-features = false }
 
 # ink!
 ink = { version = "5.1.1", default-features = false }

Cargo.toml

@@ -98,7 +98,7 @@ xcm-executor.workspace = true
 
 # Cumulus
 cumulus-pallet-aura-ext.workspace = true
-cumulus-pallet-parachain-system = { workspace = true, features = ["experimental-ump-signals"] }
+cumulus-pallet-parachain-system.workspace = true
 cumulus-pallet-session-benchmarking.workspace = true
 cumulus-pallet-xcm.workspace = true
 cumulus-pallet-xcmp-queue.workspace = true

runtime/kreivo/Cargo.toml

@@ -1,6 +1,7 @@
 use super::*;
 use pallet_contracts::{CollectEvents, DebugInfo, Determinism};
 use pallet_revive::evm::runtime::EthExtra;
+use pallet_revive::impl_runtime_apis_plus_revive_traits;
 use sp_api::impl_runtime_apis;
 use sp_core::OpaqueMetadata;
 use sp_runtime::{
@@ -43,10 +44,12 @@ impl EthExtra for EthExtraImpl {
 	}
 }
 
-pallet_revive::impl_runtime_apis_plus_revive! {
+impl_runtime_apis_plus_revive_traits! {
 	Runtime,
+	Revive,
 	Executive,
 	EthExtraImpl,
+
 	impl sp_consensus_aura::AuraApi<Block, AuraId> for Runtime {
 		fn slot_duration() -> sp_consensus_aura::SlotDuration {
 			sp_consensus_aura::SlotDuration::from_millis(RELAY_CHAIN_SLOT_DURATION_MILLIS)
@@ -71,7 +74,7 @@ pallet_revive::impl_runtime_apis_plus_revive! {
 			VERSION
 		}
 
-		fn execute_block(block: Block) {
+		fn execute_block(block: <Block as BlockT>::LazyBlock) {
 			Executive::execute_block(block)
 		}
 
@@ -108,7 +111,7 @@ pallet_revive::impl_runtime_apis_plus_revive! {
 		}
 
 		fn check_inherents(
-			block: Block,
+			block: <Block as BlockT>::LazyBlock,
 			data: sp_inherents::InherentData,
 		) -> sp_inherents::CheckInherentsResult {
 			data.check_extrinsics(&block)
@@ -322,7 +325,7 @@ pallet_revive::impl_runtime_apis_plus_revive! {
 		}
 
 		fn execute_block(
-			block: Block,
+			block: <Block as BlockT>::LazyBlock,
 			state_root_check: bool,
 			signature_check: bool,
 			select: frame_try_runtime::TryStateSelect,

runtime/kreivo/src/apis.rs

@@ -90,9 +90,10 @@ pub type KreivoAssetsCall = pallet_assets::Call<Runtime, KreivoAssetsInstance>;
 impl pallet_assets::Config<KreivoAssetsInstance> for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type Balance = Balance;
-	type RemoveItemsLimit = frame_support::traits::ConstU32<1000>;
+	type RemoveItemsLimit = ConstU32<1000>;
 	type AssetId = FungibleAssetLocation;
 	type AssetIdParameter = FungibleAssetLocation;
+	type ReserveData = (); // We abide by the rules of Asset Hub
 	type Currency = Balances;
 	/// Only root can create assets and force state changes.
 	#[cfg(not(feature = "runtime-benchmarks"))]

runtime/kreivo/src/config/currency.rs

@@ -8,37 +8,44 @@ use frame_system::EnsureSigned;
 parameter_types! {
 	pub const DepositPerItem: Balance = deposit(1, 0);
 	pub const DepositPerByte: Balance = deposit(0, 1);
+	pub const DepositPerChildTrieItem: Balance = deposit(1, 0) / 100;
 	pub CodeHashLockupDepositPercent: Perbill = Perbill::from_percent(30);
 	pub const ChainId: u64 = 2281;
 }
 
 impl pallet_revive::Config for Runtime {
 	type Time = Timestamp;
+	type Balance = Balance;
 	type Currency = Balances;
 	type RuntimeEvent = RuntimeEvent;
 	type RuntimeCall = RuntimeCall;
-	type DepositPerItem = DepositPerItem;
-	type DepositPerByte = DepositPerByte;
-	type WeightPrice = pallet_transaction_payment::Pallet<Self>;
+	type RuntimeOrigin = RuntimeOrigin;
+	type RuntimeHoldReason = RuntimeHoldReason;
 	type WeightInfo = pallet_revive::weights::SubstrateWeight<Self>;
 	type Precompiles = ();
+	// 10^(18 - 12) Eth is 10^18, Native is 10^12.
+	type FindAuthor = <Runtime as pallet_authorship::Config>::FindAuthor;
+	type DepositPerByte = DepositPerByte;
+	type DepositPerItem = DepositPerItem;
+	type DepositPerChildTrieItem = DepositPerChildTrieItem;
+	type CodeHashLockupDepositPercent = CodeHashLockupDepositPercent;
 	type AddressMapper = pallet_revive::AccountId32Mapper<Self>;
-	type RuntimeMemory = ConstU32<{ 128 * 1024 * 1024 }>;
-	type PVFMemory = ConstU32<{ 512 * 1024 * 1024 }>;
 	type UnsafeUnstableInterface = ConstBool<true>;
+	type AllowEVMBytecode = ConstBool<true>;
 	#[cfg(not(feature = "zombienet"))]
 	type UploadOrigin = EnsureRootWithSuccess<AccountId, TreasuryAccount>;
-	#[cfg(not(feature = "zombienet"))]
-	type InstantiateOrigin = EnsureRootWithSuccess<AccountId, TreasuryAccount>;
 	#[cfg(feature = "zombienet")]
 	type UploadOrigin = EnsureSigned<AccountId>;
+	#[cfg(not(feature = "zombienet"))]
+	type InstantiateOrigin = EnsureRootWithSuccess<AccountId, TreasuryAccount>;
 	#[cfg(feature = "zombienet")]
 	type InstantiateOrigin = EnsureSigned<AccountId>;
-	type RuntimeHoldReason = RuntimeHoldReason;
-	type CodeHashLockupDepositPercent = CodeHashLockupDepositPercent;
+	type RuntimeMemory = ConstU32<{ 128 * 1024 * 1024 }>;
+	type PVFMemory = ConstU32<{ 512 * 1024 * 1024 }>;
 	type ChainId = ChainId;
-	type NativeToEthRatio = ConstU32<1_000_000>; // 10^(18 - 12) Eth is 10^18, Native is 10^12.
-	type EthGasEncoder = ();
-	type FindAuthor = <Runtime as pallet_authorship::Config>::FindAuthor;
-	type AllowEVMBytecode = ConstBool<true>; // Virto accepts EVM Bytecode (?)
+	type NativeToEthRatio = ConstU32<1_000_000>;
+	type FeeInfo = pallet_revive::evm::fees::Info<Address, Signature, EthExtraImpl>;
+	type MaxEthExtrinsicWeight = ();
+	type DebugEnabled = ConstBool<false>;
+	type GasScale = (); // Virto accepts EVM Bytecode (?)
 }

runtime/kreivo/src/config/revive/mod.rs

@@ -33,77 +33,22 @@ pub mod currency {
 
 /// Fee-related.
 pub mod fee {
-	use frame_support::weights::{
-		constants::ExtrinsicBaseWeight, FeePolynomial, Weight, WeightToFeeCoefficient, WeightToFeeCoefficients,
-		WeightToFeePolynomial,
-	};
+	use frame_support::weights::{constants::ExtrinsicBaseWeight, WeightToFeePolynomial};
 	use polkadot_core_primitives::Balance;
-	use smallvec::smallvec;
 	pub use sp_runtime::Perbill;
 
-	/// Handles converting a weight scalar to a fee value, based on the scale
-	/// and granularity of the node's balance type.
+	/// `pallet_revive` requires this specific `WeightToFee` implementation.
 	///
-	/// This should typically create a mapping between the following ranges:
-	///   - [0, MAXIMUM_BLOCK_WEIGHT]
-	///   - [Balance::min, Balance::max]
-	///
-	/// Yet, it can be used for any other sort of change to weight-fee. Some
-	/// examples being:
-	///   - Setting it to `0` will essentially disable the weight fee.
-	///   - Setting it to `1` will cause the literal `#[weight = x]` values to
-	///     be charged.
-	pub struct WeightToFee;
-	impl frame_support::weights::WeightToFee for WeightToFee {
-		type Balance = Balance;
-
-		fn weight_to_fee(weight: &Weight) -> Self::Balance {
-			let time_poly: FeePolynomial<Balance> = RefTimeToFee::polynomial().into();
-			let proof_poly: FeePolynomial<Balance> = ProofSizeToFee::polynomial().into();
-
-			// Take the maximum instead of the sum to charge by the more scarce resource.
-			time_poly
-				.eval(weight.ref_time())
-				.max(proof_poly.eval(weight.proof_size()))
-		}
-	}
-
-	/// Maps the reference time component of `Weight` to a fee.
-	pub struct RefTimeToFee;
-	impl WeightToFeePolynomial for RefTimeToFee {
-		type Balance = Balance;
-		fn polynomial() -> WeightToFeeCoefficients<Self::Balance> {
-			// in Kusama, extrinsic base weight (smallest non-zero weight) is mapped to 1/10
-			// CENT: in Statemine, we map to 1/10 of that, or 1/100 CENT
-			let p = super::currency::CENTS;
-			let q = 100 * Balance::from(ExtrinsicBaseWeight::get().ref_time());
-
-			smallvec![WeightToFeeCoefficient {
-				degree: 1,
-				negative: false,
-				coeff_frac: Perbill::from_rational(p % q, q),
-				coeff_integer: p / q,
-			}]
-		}
-	}
-
-	/// Maps the proof size component of `Weight` to a fee.
-	pub struct ProofSizeToFee;
-	impl WeightToFeePolynomial for ProofSizeToFee {
-		type Balance = Balance;
-		fn polynomial() -> WeightToFeeCoefficients<Self::Balance> {
-			// Map 10kb proof to 1 CENT.
-			let p = super::currency::CENTS;
-			let q = 10_000;
-
-			smallvec![WeightToFeeCoefficient {
-				degree: 1,
-				negative: false,
-				coeff_frac: Perbill::from_rational(p % q, q),
-				coeff_integer: p / q,
-			}]
-		}
-	}
+	/// This is needed because we make certain assumptions about how weight
+	/// is mapped to fees. Enforced at compile time.
+	pub type WeightToFee = pallet_revive::evm::fees::BlockRatioFee<
+		// p
+		{ super::currency::CENTS },
+		// q
+		{ 100 * ExtrinsicBaseWeight::get().ref_time() as u128 },
+		crate::Runtime,
+		Balance,
+	>;
 }
 
 pub mod locations {

runtime/kreivo/src/constants.rs

@@ -82,6 +82,7 @@ mod local {
 				metadata: vec![(FungibleAssetLocation::Here(1), b"testUSD".to_vec(), b"tUSD".to_vec(), 3)],
 				accounts: vec![(FungibleAssetLocation::Here(1), alice(), 100_000_000_000)],
 				next_asset_id: None,
+				reserves: vec![],
 			},
 		});