fix(paseo-runtime): resolve conflicts

paseo-network · Jun 6, 2024 · 1e856fd · 1e856fd
1 parent 30af342
commit 1e856fd
Show file tree

Hide file tree

Showing 8 changed files with 657 additions and 720 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -75,6 +75,8 @@ pallet-collator-selection = { version = "10.0.2", default-features = false }
 pallet-collective = { version = "29.0.0", default-features = false }
 pallet-conviction-voting = { version = "29.0.0", default-features = false }
 pallet-core-fellowship = { version = "13.0.0", default-features = false }
+pallet-election-provider-multi-phase = { version = "28.0.0", default-features = false }
+pallet-election-provider-support-benchmarking = { version = "28.0.0", default-features = false }
 pallet-fast-unstake = { version = "28.0.0", default-features = false }
 pallet-glutton = { version = "15.0.0", default-features = false }
 pallet-grandpa = { version = "29.0.0", default-features = false }
@@ -171,6 +173,10 @@ xcm-builder = { version = "8.0.1", default-features = false, package = "staging-
 xcm-emulator = { version = "0.6.0" }
 xcm-executor = { version = "8.0.1", default-features = false, package = "staging-xcm-executor" }
 
+# Local dependencies
+
+paseo-runtime-constants = { package = "paseo-runtime-constants", path = "relay/paseo/constants", default-features = false }
+
 [workspace]
 resolver = "2"
 

diff --git a/chain-spec-generator/Cargo.toml b/chain-spec-generator/Cargo.toml
@@ -15,15 +15,15 @@ paseo-runtime = { path = "../relay/paseo" }
 paseo-runtime-constants = { path = "../relay/paseo/constants", default-features = true }
 
 sc-chain-spec = { workspace = true }
-polkadot-runtime-parachains = { workspace = true, default-features = true }
+runtime-parachains = { workspace = true, default-features = true }
 polkadot-primitives = { workspace = true, default-features = true }
-sp-consensus-babe = { workspace = true, default-features = true }
-sp-authority-discovery = { workspace = true, default-features = true }
+babe-primitives = { workspace = true, default-features = true }
+authority-discovery-primitives = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
 pallet-staking = { workspace = true, default-features = true }
-sc-consensus-grandpa = { workspace = true }
+grandpa = { workspace = true }
 sp-runtime = { workspace = true, default-features = true }
-sp-consensus-beefy = { workspace = true, default-features = true }
+beefy-primitives = { workspace = true, default-features = true }
 xcm = { package = "staging-xcm", version = "8.0.1" }
 parachains-common = { workspace = true, default-features = true }
 cumulus-primitives-core = { workspace = true, default-features = true }
@@ -38,6 +38,6 @@ runtime-benchmarks = [
 	"pallet-staking/runtime-benchmarks",
 	"parachains-common/runtime-benchmarks",
 	"polkadot-primitives/runtime-benchmarks",
-	"polkadot-runtime-parachains/runtime-benchmarks",
+	"runtime-parachains/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks"
 ]
diff --git a/chain-spec-generator/src/relay_chain_specs.rs b/chain-spec-generator/src/relay_chain_specs.rs
@@ -18,12 +18,12 @@
 use pallet_staking::Forcing;
 use paseo_runtime_constants::currency::UNITS as DOT;
 use polkadot_primitives::{AccountId, AccountPublic, AssignmentId, ValidatorId};
-use polkadot_runtime_parachains::configuration::HostConfiguration;
+use runtime_parachains::configuration::HostConfiguration;
 use sc_chain_spec::{ChainSpec, ChainType, NoExtension};
-use sc_consensus_grandpa::AuthorityId as GrandpaId;
-use sp_authority_discovery::AuthorityId as AuthorityDiscoveryId;
-use sp_consensus_babe::AuthorityId as BabeId;
-use sp_consensus_beefy::ecdsa_crypto::AuthorityId as BeefyId;
+use grandpa::AuthorityId as GrandpaId;
+use authority_discovery_primitives::AuthorityId as AuthorityDiscoveryId;
+use babe_primitives::AuthorityId as BabeId;
+use beefy_primitives::ecdsa_crypto::AuthorityId as BeefyId;
 use sp_core::{sr25519, Pair, Public};
 use sp_runtime::{traits::IdentifyAccount, Perbill};
 

diff --git a/chain-spec-generator/src/system_parachains_specs.rs b/chain-spec-generator/src/system_parachains_specs.rs
@@ -401,7 +401,7 @@ fn bridge_hub_polkadot_genesis(
 		},
 		"ethereumSystem": bridge_hub_polkadot_runtime::EthereumSystemConfig {
 			para_id: id,
-			asset_hub_para_id: polkadot_runtime_constants::system_parachain::ASSET_HUB_ID.into(),
+			asset_hub_para_id: paseo_runtime_constants::system_parachain::ASSET_HUB_ID.into(),
 			..Default::default()
 		},
 		// no need to pass anything to aura, in fact it will panic if we do. Session will take care

diff --git a/relay/paseo/Cargo.toml b/relay/paseo/Cargo.toml
@@ -177,10 +177,10 @@ std = [
 	"pallet-whitelist/std",
 	"pallet-xcm-benchmarks?/std",
 	"pallet-xcm/std",
-	"parity-scale-codec/std",
+	"codec/std",
 	"paseo-runtime-constants/std",
-	"primitives/std",
-	"runtime-common/std",
+	"polkadot-primitives/std",
+	"polkadot-runtime-common/std",
 	"runtime-parachains/std",
 	"scale-info/std",
 	"sp-api/std",

diff --git a/relay/paseo/src/xcm_config.rs b/relay/paseo/src/xcm_config.rs
@@ -27,14 +27,11 @@ use frame_support::{
 };
 use frame_system::EnsureRoot;
 use pallet_xcm::XcmPassthrough;
-use paseo_runtime_constants::{
-	currency::CENTS, system_parachain::*, xcm::body::FELLOWSHIP_ADMIN_INDEX,
-};
-use runtime_common::{
+use polkadot_runtime_common::{
 	xcm_sender::{ChildParachainRouter, ExponentialPrice},
 	ToAuthor,
 };
-use polkadot_runtime_constants::{
+use paseo_runtime_constants::{
 	currency::CENTS, system_parachain::*, xcm::body::FELLOWSHIP_ADMIN_INDEX,
 };
 use sp_core::ConstU32;

diff --git a/system-parachains/asset-hub-paseo/tests/tests.rs b/system-parachains/asset-hub-paseo/tests/tests.rs
@@ -82,7 +82,7 @@ fn test_ed_is_one_hundredth_of_relay() {
 		)])
 		.build()
 		.execute_with(|| {
-			let relay_ed = polkadot_runtime_constants::currency::EXISTENTIAL_DEPOSIT;
+			let relay_ed = paseo_runtime_constants::currency::EXISTENTIAL_DEPOSIT;
 			let asset_hub_ed = ExistentialDeposit::get();
 			assert_eq!(relay_ed / 100, asset_hub_ed);
 		});