diff --git a/Cargo.toml b/Cargo.toml index 2c6f8b59d9..780daeb3ce 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -106,7 +106,7 @@ cumulus-relay-chain-inprocess-interface = { git = "https://github.com/paritytech cumulus-relay-chain-interface = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.7.2" } pallet-collator-selection = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.7.2" } -parachain-info = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.7.2" } +staging-parachain-info = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.7.2" } # Polkadot pallet-xcm = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.7.2" } @@ -379,7 +379,6 @@ sp-inherents = { git = "https://github.com/paritytech/polkadot-sdk", branch = "r substrate-prometheus-endpoint = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" } -#sp-crypto-ec-utils = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.7.2" } # Check issue: https://github.com/paritytech/arkworks-substrate/issues/9 [patch."https://github.com/paritytech/polkadot-sdk"] sp-crypto-ec-utils = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.7.2" } diff --git a/node/src/chain_spec.rs b/node/src/chain_spec.rs index edcf584c96..f27285e111 100644 --- a/node/src/chain_spec.rs +++ b/node/src/chain_spec.rs @@ -391,7 +391,7 @@ fn centrifuge_genesis( )], }, vesting: Default::default(), - parachain_info: centrifuge_runtime::ParachainInfoConfig { + staging_parachain_info: centrifuge_runtime::ParachainInfoConfig { parachain_id: id, ..Default::default() }, @@ -532,7 +532,7 @@ fn altair_genesis( )], }, vesting: Default::default(), - parachain_info: altair_runtime::ParachainInfoConfig { + staging_parachain_info: altair_runtime::ParachainInfoConfig { parachain_id: id, ..Default::default() }, @@ -685,7 +685,7 @@ fn development_genesis( sudo: development_runtime::SudoConfig { key: Some(root_key), }, - parachain_info: development_runtime::ParachainInfoConfig { + staging_parachain_info: development_runtime::ParachainInfoConfig { parachain_id: id, ..Default::default() }, diff --git a/pallets/liquidity-pools/src/contract.rs b/pallets/liquidity-pools/src/contract.rs index 08206057db..852b6e1fc8 100644 --- a/pallets/liquidity-pools/src/contract.rs +++ b/pallets/liquidity-pools/src/contract.rs @@ -47,7 +47,7 @@ pub fn xcm_router_contract() -> Contract { internal_type: None, }], outputs: vec![], - constant: false, + constant: Some(false), state_mutability: Default::default(), }], ); diff --git a/runtime/altair/src/lib.rs b/runtime/altair/src/lib.rs index 0a3e278011..1033814b80 100644 --- a/runtime/altair/src/lib.rs +++ b/runtime/altair/src/lib.rs @@ -289,11 +289,11 @@ impl cumulus_pallet_parachain_system::Config for Runtime { type ReservedDmpWeight = ReservedDmpWeight; type ReservedXcmpWeight = ReservedXcmpWeight; type RuntimeEvent = RuntimeEvent; - type SelfParaId = parachain_info::Pallet; + type SelfParaId = staging_parachain_info::Pallet; type XcmpMessageHandler = XcmpQueue; } -impl parachain_info::Config for Runtime {} +impl staging_parachain_info::Config for Runtime {} parameter_types! { pub const MinimumPeriod: Millis = SLOT_DURATION / 2; @@ -1915,7 +1915,7 @@ construct_runtime!( System: frame_system::{Pallet, Call, Config, Storage, Event} = 0, ParachainSystem: cumulus_pallet_parachain_system::{Pallet, Call, Config, Storage, Inherent, Event} = 1, Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent} = 3, - ParachainInfo: parachain_info::{Pallet, Storage, Config} = 4, + ParachainInfo: staging_parachain_info::{Pallet, Storage, Config} = 4, // money stuff Balances: pallet_balances::{Pallet, Call, Storage, Config, Event} = 20, diff --git a/runtime/centrifuge/src/lib.rs b/runtime/centrifuge/src/lib.rs index 5b81a46983..f6193db3e4 100644 --- a/runtime/centrifuge/src/lib.rs +++ b/runtime/centrifuge/src/lib.rs @@ -290,7 +290,7 @@ impl cumulus_pallet_parachain_system::Config for Runtime { type ReservedDmpWeight = ReservedDmpWeight; type ReservedXcmpWeight = ReservedXcmpWeight; type RuntimeEvent = RuntimeEvent; - type SelfParaId = parachain_info::Pallet; + type SelfParaId = staging_parachain_info::Pallet; type XcmpMessageHandler = XcmpQueue; } @@ -426,7 +426,7 @@ impl orml_asset_registry::Config for Runtime { // case, pallet-pools and democracy type WeightInfo = (); } -impl parachain_info::Config for Runtime {} +impl staging_parachain_info::Config for Runtime {} parameter_types! { pub const MinimumPeriod: Millis = SLOT_DURATION / 2; @@ -2028,7 +2028,7 @@ construct_runtime!( System: frame_system::{Pallet, Call, Config, Storage, Event} = 0, ParachainSystem: cumulus_pallet_parachain_system::{Pallet, Call, Config, Storage, Inherent, Event} = 1, Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent} = 3, - ParachainInfo: parachain_info::{Pallet, Storage, Config} = 4, + ParachainInfo: staging_parachain_info::{Pallet, Storage, Config} = 4, // money stuff Balances: pallet_balances::{Pallet, Call, Storage, Config, Event} = 20, diff --git a/runtime/common/Cargo.toml b/runtime/common/Cargo.toml index 88050be173..2e244f2a36 100644 --- a/runtime/common/Cargo.toml +++ b/runtime/common/Cargo.toml @@ -116,7 +116,7 @@ pallet-utility = { workspace = true } pallet-vesting = { workspace = true } pallet-xcm = { workspace = true } pallet-xcm-transactor = { workspace = true } -parachain-info = { workspace = true } +staging-parachain-info = { workspace = true } # Optionals for benchmarking frame-benchmarking = { workspace = true, optional = true } @@ -150,15 +150,6 @@ std = [ "pallet-evm-precompile-sha3fips/std", "pallet-evm-precompile-simple/std", "precompile-utils/std", - "pallet-evm/std", - "pallet-investments/std", - "pallet-liquidity-pools-gateway/std", - "pallet-liquidity-pools/std", - "pallet-loans/std", - "pallet-pool-system/std", - "pallet-restricted-tokens/std", - "pallet-treasury/std", - "parachain-info/std", "polkadot-parachain-primitives/std", "scale-info/std", "serde/std", @@ -246,7 +237,7 @@ std = [ "pallet-vesting/std", "pallet-xcm/std", "pallet-xcm-transactor/std", - "parachain-info/std", + "staging-parachain-info/std", ] runtime-benchmarks = [ # Substrate related @@ -397,7 +388,7 @@ try-runtime = [ "pallet-vesting/try-runtime", "pallet-xcm/try-runtime", "pallet-xcm-transactor/try-runtime", - "parachain-info/try-runtime", + "staging-parachain-info/try-runtime", ] on-chain-release-build = [ "sp-api/disable-logging", diff --git a/runtime/common/src/gateway.rs b/runtime/common/src/gateway.rs index b46a87f27d..4129eec96c 100644 --- a/runtime/common/src/gateway.rs +++ b/runtime/common/src/gateway.rs @@ -17,9 +17,10 @@ use sp_runtime::traits::AccountIdConversion; use crate::account_conversion::AccountConverter; -pub fn get_gateway_account() -> AccountId { +pub fn get_gateway_account( +) -> AccountId { let sender_account: AccountId = - Sibling::from(parachain_info::Pallet::::get()).into_account_truncating(); + Sibling::from(staging_parachain_info::Pallet::::get()).into_account_truncating(); let truncated_sender_account = H160::from_slice(&>::as_ref(&sender_account)[0..20]); diff --git a/runtime/common/src/xcm.rs b/runtime/common/src/xcm.rs index dd838647b6..acddef4ff9 100644 --- a/runtime/common/src/xcm.rs +++ b/runtime/common/src/xcm.rs @@ -157,10 +157,10 @@ pub struct CurrencyIdConvert(PhantomData); impl MaybeEquivalence for CurrencyIdConvert where T: orml_asset_registry::Config - + parachain_info::Config, + + staging_parachain_info::Config, { fn convert(location: &MultiLocation) -> Option { - let para_id = parachain_info::Pallet::::parachain_id(); + let para_id = staging_parachain_info::Pallet::::parachain_id(); let unanchored_location = match location { MultiLocation { parents: 0, @@ -191,7 +191,7 @@ where impl Convert> for CurrencyIdConvert where T: orml_asset_registry::Config - + parachain_info::Config, + + staging_parachain_info::Config, { fn convert(id: CurrencyId) -> Option { >::convert_back(&id) @@ -205,7 +205,7 @@ where impl Convert> for CurrencyIdConvert where T: orml_asset_registry::Config - + parachain_info::Config, + + staging_parachain_info::Config, { fn convert(location: MultiLocation) -> Option { >::convert(&location) @@ -215,7 +215,7 @@ where impl Convert> for CurrencyIdConvert where T: orml_asset_registry::Config - + parachain_info::Config, + + staging_parachain_info::Config, { fn convert(asset: MultiAsset) -> Option { if let MultiAsset { @@ -234,7 +234,7 @@ pub struct ToTreasury(PhantomData); impl TakeRevenue for ToTreasury where T: orml_asset_registry::Config - + parachain_info::Config + + staging_parachain_info::Config + pallet_restricted_tokens::Config, { fn take_revenue(revenue: MultiAsset) { diff --git a/runtime/development/src/lib.rs b/runtime/development/src/lib.rs index 72d939c146..53e6886b76 100644 --- a/runtime/development/src/lib.rs +++ b/runtime/development/src/lib.rs @@ -295,11 +295,11 @@ impl cumulus_pallet_parachain_system::Config for Runtime { type ReservedDmpWeight = ReservedDmpWeight; type ReservedXcmpWeight = ReservedXcmpWeight; type RuntimeEvent = RuntimeEvent; - type SelfParaId = parachain_info::Pallet; + type SelfParaId = staging_parachain_info::Pallet; type XcmpMessageHandler = XcmpQueue; } -impl parachain_info::Config for Runtime {} +impl staging_parachain_info::Config for Runtime {} parameter_types! { pub const MinimumPeriod: Millis = SLOT_DURATION / 2; @@ -2006,7 +2006,7 @@ construct_runtime!( System: frame_system::{Pallet, Call, Config, Storage, Event} = 0, ParachainSystem: cumulus_pallet_parachain_system::{Pallet, Call, Config, Storage, Inherent, Event} = 1, Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent} = 3, - ParachainInfo: parachain_info::{Pallet, Storage, Config} = 4, + ParachainInfo: staging_parachain_info::{Pallet, Storage, Config} = 4, // money stuff Balances: pallet_balances::{Pallet, Call, Storage, Config, Event} = 20, diff --git a/runtime/integration-tests/src/generic/cases/account_derivation.rs b/runtime/integration-tests/src/generic/cases/account_derivation.rs index d25222df4a..c9afd08695 100644 --- a/runtime/integration-tests/src/generic/cases/account_derivation.rs +++ b/runtime/integration-tests/src/generic/cases/account_derivation.rs @@ -189,7 +189,7 @@ fn remote_account_on_relay() { T::Api::conversion_of(MultiLocation::new( 0, X2( - Parachain(parachain_info::Pallet::::get().into()), + Parachain(staging_parachain_info::Pallet::::get().into()), AccountId32 { id: KEY_32, network: Some(NetworkId::ByGenesis( @@ -218,7 +218,7 @@ fn remote_account_on_sibling() { T::Api::conversion_of(MultiLocation::new( 1, X2( - Parachain(parachain_info::Pallet::::get().into()), + Parachain(staging_parachain_info::Pallet::::get().into()), AccountId32 { id: KEY_32, network: Some(NetworkId::ByGenesis( diff --git a/runtime/integration-tests/src/generic/config.rs b/runtime/integration-tests/src/generic/config.rs index ffc587c207..5f48ff1634 100644 --- a/runtime/integration-tests/src/generic/config.rs +++ b/runtime/integration-tests/src/generic/config.rs @@ -110,7 +110,7 @@ pub trait Runtime: Balance = Balance, NativeFungible = pallet_balances::Pallet, > + cumulus_pallet_parachain_system::Config - + parachain_info::Config + + staging_parachain_info::Config + pallet_oracle_feed::Config + pallet_oracle_collection::Config< OracleKey = OracleKey, diff --git a/runtime/integration-tests/src/generic/envs/fudge_env/handle.rs b/runtime/integration-tests/src/generic/envs/fudge_env/handle.rs index 573cb5bc1b..6cae6da32c 100644 --- a/runtime/integration-tests/src/generic/envs/fudge_env/handle.rs +++ b/runtime/integration-tests/src/generic/envs/fudge_env/handle.rs @@ -287,7 +287,7 @@ pub trait FudgeHandle { .expect("ESSENTIAL: Storage can be inserted"); state .insert_storage( - parachain_info::GenesisConfig:: { + staging_parachain_info::GenesisConfig:: { _config: Default::default(), parachain_id: para_id, }