diff --git a/Cargo.lock b/Cargo.lock index f4e20e9..11d0b9a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1122,20 +1122,6 @@ dependencies = [ "sp-std", ] -[[package]] -name = "bp-kusama" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c37ed284f7648ca888de72da69873ead9672b56436b08eae2e196c11d0847626" -dependencies = [ - "bp-header-chain", - "bp-polkadot-core", - "bp-runtime", - "frame-support", - "sp-api", - "sp-std", -] - [[package]] name = "bp-messages" version = "0.8.0" @@ -1357,7 +1343,6 @@ dependencies = [ "bp-asset-hub-paseo", "bp-bridge-hub-paseo", "bp-header-chain", - "bp-kusama", "bp-messages", "bp-parachains", "bp-polkadot", diff --git a/Cargo.toml b/Cargo.toml index ac56c9f..ce10f71 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -26,7 +26,6 @@ beefy-primitives = { version = "14.0.0", default-features = false, package = "sp binary-merkle-tree = { version = "14.0.0", default-features = false } bp-bridge-hub-cumulus = { version = "0.8.0", default-features = false } bp-header-chain = { version = "0.8.1", default-features = false } -bp-kusama = { version = "0.6.0", default-features = false } bp-messages = { version = "0.8.0", default-features = false } bp-parachains = { version = "0.8.0", default-features = false } bp-polkadot = { version = "0.6.0", default-features = false } @@ -89,16 +88,6 @@ 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-encointer-balances = { version = "~6.1.0", default-features = false } -pallet-encointer-bazaar = { version = "~6.1.0", default-features = false } -pallet-encointer-bazaar-rpc-runtime-api = { version = "~6.1.0", default-features = false } -pallet-encointer-ceremonies = { version = "~6.1.0", default-features = false } -pallet-encointer-ceremonies-rpc-runtime-api = { version = "~6.1.0", default-features = false } -pallet-encointer-communities = { version = "~6.1.0", default-features = false } -pallet-encointer-communities-rpc-runtime-api = { version = "~6.1.0", default-features = false } -pallet-encointer-faucet = { version = "~6.2.0", default-features = false } -pallet-encointer-reputation-commitments = { version = "~6.1.0", default-features = false } -pallet-encointer-scheduler = { version = "~6.1.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 } diff --git a/chain-spec-generator/src/system_parachains_specs.rs b/chain-spec-generator/src/system_parachains_specs.rs index 6d29a5c..d304ad3 100644 --- a/chain-spec-generator/src/system_parachains_specs.rs +++ b/chain-spec-generator/src/system_parachains_specs.rs @@ -17,7 +17,7 @@ use crate::common::{get_account_id_from_seed, get_from_seed, testnet_accounts}; use cumulus_primitives_core::ParaId; -use parachains_common::{AccountId, AssetHubPolkadotAuraId, AuraId, Balance}; +use parachains_common::{AccountId, AuraId, Balance}; use sc_chain_spec::{ChainSpec, ChainSpecExtension, ChainSpecGroup, ChainType}; use serde::{Deserialize, Serialize}; use sp_core::{crypto::UncheckedInto, sr25519}; @@ -56,16 +56,10 @@ pub fn invulnerables() -> Vec<(AccountId, AuraId)> { } /// Invulnerable Collators for the particular case of AssetHubPolkadot -pub fn invulnerables_asset_hub_paseo() -> Vec<(AccountId, AssetHubPolkadotAuraId)> { +pub fn invulnerables_asset_hub_paseo() -> Vec<(AccountId, AuraId)> { vec![ - ( - get_account_id_from_seed::("Alice"), - get_from_seed::("Alice"), - ), - ( - get_account_id_from_seed::("Bob"), - get_from_seed::("Bob"), - ), + (get_account_id_from_seed::("Alice"), get_from_seed::("Alice")), + (get_account_id_from_seed::("Bob"), get_from_seed::("Bob")), ] } @@ -94,9 +88,7 @@ pub fn invulnerables_people_chain() -> Vec<(AccountId, AuraId)> { /// Generate the session keys from individual elements. /// /// The input must be a tuple of individual keys (a single arg for now since we have just one key). -pub fn asset_hub_paseo_session_keys( - keys: AssetHubPolkadotAuraId, -) -> asset_hub_paseo_runtime::SessionKeys { +pub fn asset_hub_paseo_session_keys(keys: AuraId) -> asset_hub_paseo_runtime::SessionKeys { asset_hub_paseo_runtime::SessionKeys { aura: keys } } @@ -116,7 +108,7 @@ pub fn people_paseo_session_keys(keys: AuraId) -> people_paseo_runtime::SessionK // AssetHubPaseo fn asset_hub_paseo_genesis( - invulnerables: Vec<(AccountId, AssetHubPolkadotAuraId)>, + invulnerables: Vec<(AccountId, AuraId)>, endowed_accounts: Vec, id: ParaId, ) -> serde_json::Value { diff --git a/integration-tests/emulated/chains/parachains/assets/asset-hub-paseo/src/genesis.rs b/integration-tests/emulated/chains/parachains/assets/asset-hub-paseo/src/genesis.rs index 0935003..91acf58 100644 --- a/integration-tests/emulated/chains/parachains/assets/asset-hub-paseo/src/genesis.rs +++ b/integration-tests/emulated/chains/parachains/assets/asset-hub-paseo/src/genesis.rs @@ -20,22 +20,16 @@ use sp_core::storage::Storage; use emulated_integration_tests_common::{ accounts, build_genesis_storage, get_account_id_from_seed, get_from_seed, SAFE_XCM_VERSION, }; -use parachains_common::{AccountId, AssetHubPolkadotAuraId, Balance}; +use parachains_common::{AccountId, AuraId, Balance}; use sp_core::sr25519; pub const PARA_ID: u32 = 1000; pub const ED: Balance = asset_hub_paseo_runtime::ExistentialDeposit::get(); -fn invulnerables_asset_hub_paseo() -> Vec<(AccountId, AssetHubPolkadotAuraId)> { +fn invulnerables_asset_hub_paseo() -> Vec<(AccountId, AuraId)> { vec![ - ( - get_account_id_from_seed::("Alice"), - get_from_seed::("Alice"), - ), - ( - get_account_id_from_seed::("Bob"), - get_from_seed::("Bob"), - ), + (get_account_id_from_seed::("Alice"), get_from_seed::("Alice")), + (get_account_id_from_seed::("Bob"), get_from_seed::("Bob")), ] } @@ -63,8 +57,8 @@ pub fn genesis() -> Storage { .into_iter() .map(|(acc, aura)| { ( - acc.clone(), // account id - acc, // validator id + acc.clone(), // account id + acc, // validator id asset_hub_paseo_runtime::SessionKeys { aura }, // session keys ) }) @@ -79,7 +73,6 @@ pub fn genesis() -> Storage { build_genesis_storage( &genesis_config, - asset_hub_paseo_runtime::WASM_BINARY - .expect("WASM binary was not built, please build it!"), + asset_hub_paseo_runtime::WASM_BINARY.expect("WASM binary was not built, please build it!"), ) } diff --git a/system-parachains/asset-hub-paseo/src/lib.rs b/system-parachains/asset-hub-paseo/src/lib.rs index 965c137..1192556 100644 --- a/system-parachains/asset-hub-paseo/src/lib.rs +++ b/system-parachains/asset-hub-paseo/src/lib.rs @@ -106,8 +106,8 @@ use frame_system::{ }; use pallet_nfts::PalletFeatures; use parachains_common::{ - message_queue::*, AccountId, AssetHubPolkadotAuraId as AuraId, AssetIdForTrustBackedAssets, - Balance, BlockNumber, Hash, Header, Nonce, Signature, + message_queue::*, AccountId, AssetIdForTrustBackedAssets, AuraId, Balance, BlockNumber, Hash, + Header, Nonce, Signature, }; use sp_runtime::RuntimeDebug; diff --git a/system-parachains/asset-hub-paseo/tests/tests.rs b/system-parachains/asset-hub-paseo/tests/tests.rs index 6ff7283..fdb8b4b 100644 --- a/system-parachains/asset-hub-paseo/tests/tests.rs +++ b/system-parachains/asset-hub-paseo/tests/tests.rs @@ -35,7 +35,7 @@ use asset_test_utils::{ use codec::{Decode, Encode}; use frame_support::{assert_ok, traits::fungibles::InspectEnumerable}; use parachains_common::{ - AccountId, AssetHubPolkadotAuraId as AuraId, AssetIdForTrustBackedAssets, Balance, + AccountId, AuraId, AssetIdForTrustBackedAssets, Balance, }; use parachains_runtimes_test_utils::SlotDurations; use sp_consensus_aura::SlotDuration; @@ -60,7 +60,7 @@ fn collator_session_key(account: [u8; 32]) -> CollatorSessionKey { CollatorSessionKey::new( AccountId::from(account), AccountId::from(account), - SessionKeys { aura: AuraId::from(sp_core::ed25519::Public::from_raw(account)) }, + SessionKeys { aura: AuraId::from(sp_core::sr25519::Public::from_raw(account)) }, ) } @@ -128,7 +128,7 @@ fn test_ed_is_one_hundredth_of_relay() { .with_session_keys(vec![( AccountId::from(ALICE), AccountId::from(ALICE), - SessionKeys { aura: AuraId::from(sp_core::ed25519::Public::from_raw(ALICE)) }, + SessionKeys { aura: AuraId::from(sp_core::sr25519::Public::from_raw(ALICE)) }, )]) .build() .execute_with(|| { @@ -147,7 +147,7 @@ fn test_assets_balances_api_works() { .with_session_keys(vec![( AccountId::from(ALICE), AccountId::from(ALICE), - SessionKeys { aura: AuraId::from(sp_core::ed25519::Public::from_raw(ALICE)) }, + SessionKeys { aura: AuraId::from(sp_core::sr25519::Public::from_raw(ALICE)) }, )]) .build() .execute_with(|| { diff --git a/system-parachains/bridge-hub-paseo/Cargo.toml b/system-parachains/bridge-hub-paseo/Cargo.toml index f1bc34a..9f198c8 100644 --- a/system-parachains/bridge-hub-paseo/Cargo.toml +++ b/system-parachains/bridge-hub-paseo/Cargo.toml @@ -90,7 +90,6 @@ bp-parachains = { workspace = true } bp-polkadot-core = { workspace = true } bp-relayers = { workspace = true } bp-runtime = { workspace = true } -bp-kusama = { workspace = true } bp-polkadot = { workspace = true } bridge-hub-common = { workspace = true } bridge-runtime-common = { workspace = true } @@ -130,7 +129,6 @@ std = [ "bp-asset-hub-paseo/std", "bp-bridge-hub-paseo/std", "bp-header-chain/std", - "bp-kusama/std", "bp-messages/std", "bp-parachains/std", "bp-polkadot-core/std",