Feature/plmc-377-update-to-polkadot-100

Dockerfile

@@ -6,11 +6,11 @@ COPY . /polimec
 RUN cargo build --locked --release -p $PACKAGE 
 
 # This is the 2nd stage: a very small image where we copy the Polkadot binary."
-FROM gcr.io/distroless/cc
+FROM debian:bookworm-slim
 ARG PACKAGE
 COPY --from=builder /polimec/target/release/$PACKAGE /usr/local/bin/polimec
 
 EXPOSE 30333 9933 9944 9615
 VOLUME ["/data"]
 
-ENTRYPOINT ["/usr/local/bin/polimec"]
+ENTRYPOINT ["/usr/bin/bash"]

README.md

@@ -13,7 +13,7 @@
 ### Step 1: Compile the relay chain and add it to $PATH
 
 - Clone the [Polkadot Repository](https://github.com/paritytech/polkadot)
-- Checkout the `release-v0.9.43` branch
+- Checkout the `release-v1.0.0` branch
 - Compile it using `cargo b -r -p polkadot`
 - Add the binary to your $PATH, e.g.
   `cp target/release/polkadot ~/.local/bin/polkadot`
@@ -42,7 +42,7 @@ $ cargo run --release -- --dev
 
 You can use [srtool](https://github.com/paritytech/srtool) to compile the
 runtime and generate the WASM blob.
-> TODO: Rust 1.69.0 broke `srtool` and `polkadot-v0.9.43` - we need to wait `polkadot-v0.9.43`. [src](https://github.com/paritytech/srtool/issues/62)
+> TODO: Rust 1.69.0 broke `srtool` and `polkadot-v1.0.0` - we need to wait `polkadot-v1.0.0`. [src](https://github.com/paritytech/srtool/issues/62)
 
 ```
 == Compact

chain-specs/rococo/rolimec-3344.state

@@ -0,0 +1 @@
+0x00000000000000000000000000000000000000000000000000000000000000000048cf7e50ba3cfb63c155ec38da34bd43ab020b5492f737deed5a9fc96c4b50bd03170a2e7597b7b7e3d84c05391d139a62b157e78786d8c082f29dcf4c11131400

integration-tests/Cargo.toml

@@ -20,6 +20,7 @@ scale-info = { workspace = true, features = ["derive"] }
 # Local
 polimec-receiver.workspace = true
 macros.workspace = true
+polimec-traits.workspace = true
 
 sp-arithmetic.workspace = true
 frame-system.workspace = true
@@ -62,20 +63,22 @@ pallet-vesting.workspace = true
 
 # Runtimes
 polkadot-runtime.workspace = true
-statemint-runtime.workspace = true
+asset-hub-polkadot-runtime.workspace = true
 polimec-parachain-runtime.workspace = true
 penpal-runtime = { path = "./penpal", default-features = false }
-itertools = "0.10.5"
+itertools.workspace = true
 
 [features]
 default = [ "std" ]
 
 std = [
+	"asset-hub-polkadot-runtime/std",
 	"cumulus-pallet-xcm/std",
 	"cumulus-pallet-xcmp-queue/std",
 	"cumulus-primitives-core/std",
 	"frame-support/std",
 	"frame-system/std",
+	"itertools/use_std",
 	"orml-oracle/std",
 	"pallet-assets/std",
 	"pallet-balances/std",
@@ -92,6 +95,7 @@ std = [
 	"penpal-runtime/std",
 	"polimec-parachain-runtime/std",
 	"polimec-receiver/std",
+	"polimec-traits/std",
 	"polkadot-core-primitives/std",
 	"polkadot-parachain/std",
 	"polkadot-primitives/std",
@@ -106,16 +110,17 @@ std = [
 	"sp-io/std",
 	"sp-runtime/std",
 	"sp-std/std",
-	"statemint-runtime/std",
 	"xcm-builder/std",
 	"xcm-executor/std",
 	"xcm/std",
 ]
 
 runtime-benchmarks = [
+	"asset-hub-polkadot-runtime/runtime-benchmarks",
 	"cumulus-pallet-xcmp-queue/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
+	"itertools/use_alloc",
 	"pallet-assets/runtime-benchmarks",
 	"pallet-balances/runtime-benchmarks",
 	"pallet-funding/runtime-benchmarks",
@@ -128,21 +133,26 @@ runtime-benchmarks = [
 	"penpal-runtime/runtime-benchmarks",
 	"polimec-parachain-runtime/runtime-benchmarks",
 	"polimec-receiver/runtime-benchmarks",
+	"polimec-traits/runtime-benchmarks",
 	"polkadot-parachain/runtime-benchmarks",
 	"polkadot-primitives/runtime-benchmarks",
 	"polkadot-runtime-parachains/runtime-benchmarks",
 	"polkadot-runtime/runtime-benchmarks",
 	"polkadot-service/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
-	"statemint-runtime/runtime-benchmarks",
 	"xcm-builder/runtime-benchmarks",
 	"xcm-executor/runtime-benchmarks",
-	"pallet-xcm/runtime-benchmarks"
 ]
 testing-node = [
 	"pallet-funding/testing-node",
 	"polimec-parachain-runtime/testing-node",
 ]
-try-runtime = []
+try-runtime = [
+	"pallet-funding/try-runtime",
+	"penpal-runtime/try-runtime",
+	"polimec-parachain-runtime/try-runtime",
+	"polimec-receiver/try-runtime",
+	"polimec-traits/try-runtime",
+]
 fast-gov = [ "polimec-parachain-runtime/fast-gov" ]
 

integration-tests/penpal/Cargo.toml

@@ -12,7 +12,7 @@ edition = "2021"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [build-dependencies]
-substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", optional = true , branch = "polkadot-v0.9.43" }
+substrate-wasm-builder = { optional = true , workspace = true}
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] }
@@ -23,6 +23,7 @@ smallvec = "1.10.0"
 
 # Local
 polimec-receiver.workspace = true
+polimec-traits.workspace = true
 
 # Substrate
 frame-benchmarking = { workspace = true, optional = true }
@@ -116,6 +117,7 @@ std = [
 	"parachain-info/std",
 	"parachains-common/std",
 	"polimec-receiver/std",
+	"polimec-traits/std",
 	"polkadot-parachain/std",
 	"polkadot-primitives/std",
 	"polkadot-runtime-common/std",
@@ -156,6 +158,7 @@ runtime-benchmarks = [
 	"pallet-vesting/runtime-benchmarks",
 	"pallet-xcm/runtime-benchmarks",
 	"polimec-receiver/runtime-benchmarks",
+	"polimec-traits/runtime-benchmarks",
 	"polkadot-parachain/runtime-benchmarks",
 	"polkadot-primitives/runtime-benchmarks",
 	"polkadot-runtime-common/runtime-benchmarks",
@@ -189,6 +192,7 @@ try-runtime = [
 	"pallet-xcm/try-runtime",
 	"parachain-info/try-runtime",
 	"polimec-receiver/try-runtime",
+	"polimec-traits/try-runtime",
 	"polkadot-runtime-common/try-runtime",
 	"polkadot-runtime-parachains/try-runtime",
 	"sp-runtime/try-runtime",

integration-tests/penpal/src/lib.rs

@@ -48,6 +48,7 @@ use frame_system::{
 	limits::{BlockLength, BlockWeights},
 	EnsureRoot, EnsureSigned,
 };
+use polimec_traits::migration_types::MigrationInfo;
 use smallvec::smallvec;
 use sp_api::impl_runtime_apis;
 pub use sp_consensus_aura::sr25519::AuthorityId as AuraId;
@@ -56,7 +57,7 @@ use sp_runtime::{
 	create_runtime_str, generic, impl_opaque_keys,
 	traits::{AccountIdLookup, BlakeTwo256, Block as BlockT},
 	transaction_validity::{TransactionSource, TransactionValidity},
-	ApplyExtrinsicResult,
+	ApplyExtrinsicResult, FixedU128,
 };
 pub use sp_runtime::{traits::ConvertInto, MultiAddress, Perbill, Permill};
 use sp_std::prelude::*;
@@ -76,7 +77,6 @@ use weights::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight};
 // XCM Imports
 use frame_support::traits::WithdrawReasons;
 use parachains_common::{AccountId, Signature};
-use polimec_receiver::MigrationInfo;
 use sp_runtime::traits::Convert;
 use xcm::latest::prelude::BodyId;
 use xcm_executor::XcmExecutor;
@@ -85,7 +85,7 @@ use xcm_executor::XcmExecutor;
 pub type Balance = u128;
 
 /// Index of a transaction in the chain.
-pub type Index = u32;
+pub type Nonce = u32;
 
 /// A hash of some data used by the chain.
 pub type Hash = sp_core::H256;
@@ -316,12 +316,12 @@ impl frame_system::Config for Runtime {
 	type AccountId = AccountId;
 	/// The basic call filter to use in dispatchable.
 	type BaseCallFilter = Everything;
+	/// The block type.
+	type Block = Block;
 	/// Maximum number of block number to block hash mappings to keep (oldest pruned first).
 	type BlockHashCount = BlockHashCount;
 	/// The maximum length of a block (in bytes).
 	type BlockLength = RuntimeBlockLength;
-	/// The index type for blocks.
-	type BlockNumber = BlockNumber;
 	/// Block & extrinsics weights: base values and limits.
 	type BlockWeights = RuntimeBlockWeights;
 	/// The weight of database operations that the runtime can invoke.
@@ -330,13 +330,11 @@ impl frame_system::Config for Runtime {
 	type Hash = Hash;
 	/// The hashing algorithm used.
 	type Hashing = BlakeTwo256;
-	/// The header type.
-	type Header = generic::Header<BlockNumber, BlakeTwo256>;
-	/// The index type for storing how many extrinsics an account has signed.
-	type Index = Index;
 	/// The lookup mechanism to get account ID from whatever is passed in dispatchers.
 	type Lookup = AccountIdLookup<AccountId, ()>;
 	type MaxConsumers = frame_support::traits::ConstU32<16>;
+	/// The index type for storing how many extrinsics an account has signed.
+	type Nonce = Nonce;
 	/// What to do if an account is fully reaped from the system.
 	type OnKilledAccount = ();
 	/// What to do if a new account is created.
@@ -383,14 +381,14 @@ impl pallet_balances::Config for Runtime {
 	type DustRemoval = ();
 	type ExistentialDeposit = ExistentialDeposit;
 	type FreezeIdentifier = ();
-	type HoldIdentifier = ();
 	type MaxFreezes = ConstU32<0>;
 	type MaxHolds = ConstU32<0>;
 	type MaxLocks = ConstU32<50>;
 	type MaxReserves = ConstU32<50>;
 	type ReserveIdentifier = [u8; 8];
 	/// The ubiquitous event type.
 	type RuntimeEvent = RuntimeEvent;
+	type RuntimeHoldReason = ();
 	type WeightInfo = pallet_balances::weights::SubstrateWeight<Runtime>;
 }
 
@@ -503,6 +501,7 @@ impl pallet_session::Config for Runtime {
 }
 
 impl pallet_aura::Config for Runtime {
+	type AllowMultipleBlocksPerSlot = frame_support::traits::ConstBool<false>;
 	type AuthorityId = AuraId;
 	type DisabledValidators = ();
 	type MaxAuthorities = ConstU32<100_000>;
@@ -511,7 +510,6 @@ impl pallet_aura::Config for Runtime {
 parameter_types! {
 	pub const PotId: PalletId = PalletId(*b"PotStake");
 	pub const MaxCandidates: u32 = 1000;
-	pub const MinCandidates: u32 = 5;
 	pub const SessionLength: BlockNumber = 6 * HOURS;
 	pub const MaxInvulnerables: u32 = 100;
 	pub const ExecutiveBody: BodyId = BodyId::Executive;
@@ -526,7 +524,7 @@ impl pallet_collator_selection::Config for Runtime {
 	type KickThreshold = Period;
 	type MaxCandidates = MaxCandidates;
 	type MaxInvulnerables = MaxInvulnerables;
-	type MinCandidates = MinCandidates;
+	type MinEligibleCollators = frame_support::traits::ConstU32<1>;
 	type PotId = PotId;
 	type RuntimeEvent = RuntimeEvent;
 	type UpdateOrigin = CollatorSelectionUpdateOrigin;
@@ -584,11 +582,13 @@ impl Convert<MigrationInfo, Balance> for DivideBalanceByBlocks {
 parameter_types! {
 	pub PolimecParaId: ParaId = 3344u32.into();
 	pub GenesisMoment: BlockNumber = 0u32;
+	pub const MaxMigrations: u128 = 100000;
 }
 impl polimec_receiver::Config for Runtime {
 	type Balance = Balance;
 	type Balances = Balances;
 	type GenesisMoment = GenesisMoment;
+	type MaxMigrations = MaxMigrations;
 	type MigrationInfoToPerBlockBalance = DivideBalanceByBlocks;
 	type PolimecParaId = PolimecParaId;
 	type RuntimeEvent = RuntimeEvent;
@@ -600,18 +600,15 @@ impl polkadot_runtime_parachains::origin::Config for Runtime {}
 
 // Create the runtime by composing the FRAME pallets that were previously configured.
 construct_runtime!(
-	pub enum Runtime where
-		Block = Block,
-		NodeBlock = opaque::Block,
-		UncheckedExtrinsic = UncheckedExtrinsic,
+	pub enum Runtime
 	{
 		// System support stuff.
-		System: frame_system::{Pallet, Call, Config, Storage, Event<T>} = 0,
+		System: frame_system::{Pallet, Call, Config<T>, Storage, Event<T>} = 0,
 		ParachainSystem: cumulus_pallet_parachain_system::{
-			Pallet, Call, Config, Storage, Inherent, Event<T>, ValidateUnsigned,
+			Pallet, Call, Config<T>, Storage, Inherent, Event<T>, ValidateUnsigned,
 		} = 1,
 		Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent} = 2,
-		ParachainInfo: parachain_info::{Pallet, Storage, Config} = 3,
+		ParachainInfo: parachain_info::{Pallet, Storage, Config<T>} = 3,
 		ParachainOrigin: polkadot_runtime_parachains::origin = 4,
 
 		// Monetary stuff.
@@ -624,11 +621,11 @@ construct_runtime!(
 		CollatorSelection: pallet_collator_selection::{Pallet, Call, Storage, Event<T>, Config<T>} = 21,
 		Session: pallet_session::{Pallet, Call, Storage, Event, Config<T>} = 22,
 		Aura: pallet_aura::{Pallet, Storage, Config<T>} = 23,
-		AuraExt: cumulus_pallet_aura_ext::{Pallet, Storage, Config} = 24,
+		AuraExt: cumulus_pallet_aura_ext::{Pallet, Storage, Config<T>} = 24,
 
 		// XCM helpers.
 		XcmpQueue: cumulus_pallet_xcmp_queue::{Pallet, Call, Storage, Event<T>} = 30,
-		PolkadotXcm: pallet_xcm::{Pallet, Call, Event<T>, Origin, Config} = 31,
+		PolkadotXcm: pallet_xcm::{Pallet, Call, Event<T>, Origin, Config<T>} = 31,
 		CumulusXcm: cumulus_pallet_xcm::{Pallet, Event<T>, Origin} = 32,
 		DmpQueue: cumulus_pallet_dmp_queue::{Pallet, Call, Storage, Event<T>} = 33,
 
@@ -746,8 +743,8 @@ impl_runtime_apis! {
 		}
 	}
 
-	impl frame_system_rpc_runtime_api::AccountNonceApi<Block, AccountId, Index> for Runtime {
-		fn account_nonce(account: AccountId) -> Index {
+	impl frame_system_rpc_runtime_api::AccountNonceApi<Block, AccountId, Nonce> for Runtime {
+		fn account_nonce(account: AccountId) -> Nonce {
 			System::account_nonce(account)
 		}
 	}

integration-tests/penpal/src/xcm_config.rs

@@ -37,17 +37,17 @@ use frame_support::{
 use frame_system::EnsureRoot;
 use pallet_asset_tx_payment::HandleCredit;
 use pallet_xcm::XcmPassthrough;
-use parachains_common::xcm_config::{DenyReserveTransferToRelayChain, DenyThenTry};
 use polkadot_parachain::primitives::Sibling;
 use polkadot_runtime_common::impls::ToAuthor;
 use sp_runtime::traits::Zero;
 use xcm::latest::prelude::*;
 use xcm_builder::{
 	AccountId32Aliases, AllowExplicitUnpaidExecutionFrom, AllowKnownQueryResponses, AllowSubscriptionsFrom,
-	AllowTopLevelPaidExecutionFrom, AsPrefixedGeneralIndex, ConvertedConcreteId, CurrencyAdapter, EnsureXcmOrigin,
-	FixedWeightBounds, FungiblesAdapter, IsConcrete, LocalMint, NativeAsset, ParentIsPreset, RelayChainAsNative,
-	SiblingParachainAsNative, SiblingParachainConvertsVia, SignedAccountId32AsNative, SignedToAccountId32,
-	SovereignSignedViaLocation, TakeWeightCredit, UsingComponents, WithComputedOrigin,
+	AllowTopLevelPaidExecutionFrom, AsPrefixedGeneralIndex, ConvertedConcreteId, CurrencyAdapter,
+	DenyReserveTransferToRelayChain, DenyThenTry, EnsureXcmOrigin, FixedWeightBounds, FungiblesAdapter, IsConcrete,
+	LocalMint, NativeAsset, ParentIsPreset, RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia,
+	SignedAccountId32AsNative, SignedToAccountId32, SovereignSignedViaLocation, TakeWeightCredit, UsingComponents,
+	WithComputedOrigin,
 };
 use xcm_executor::{traits::JustTry, XcmExecutor};
 
@@ -269,6 +269,7 @@ pub type Reserves = (NativeAsset, AssetsFrom<CommonGoodAssetsLocation>);
 
 pub struct XcmConfig;
 impl xcm_executor::Config for XcmConfig {
+	type Aliasers = Nothing;
 	type AssetClaims = PolkadotXcm;
 	type AssetExchanger = ();
 	type AssetLocker = ();