cleanup upgrade

polytope-labs · Sep 21, 2023 · 2ba2ca1 · 2ba2ca1
1 parent 2e2ac71
commit 2ba2ca1
Show file tree

Hide file tree

Showing 7 changed files with 123 additions and 138 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/parachain/modules/consensus/sync-committee/src/pallet.rs b/parachain/modules/consensus/sync-committee/src/pallet.rs
@@ -17,7 +17,7 @@ pub mod pallet {
     #[pallet::config]
     pub trait Config: frame_system::Config + pallet_ismp::Config {
         /// Origin allowed to add or remove parachains in Consensus State
-        type AdminOrigin: EnsureOrigin<Self::RuntimeOrigin>;
+        type AdminOrigin: EnsureOrigin<<Self as frame_system::Config>::RuntimeOrigin>;
     }
 
     #[pallet::error]

diff --git a/parachain/node/Cargo.toml b/parachain/node/Cargo.toml
@@ -69,6 +69,8 @@ cumulus-client-service = { git = "https://github.com/paritytech/polkadot-sdk", b
 cumulus-primitives-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
 cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
 cumulus-relay-chain-interface = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
+cumulus-client-consensus-proposer = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
+cumulus-client-collator = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
 
 # polytope-labs
 ismp-rpc = { git = "https://github.com/polytope-labs/substrate-ismp.git", branch = "main" }

diff --git a/parachain/node/src/chain_spec.rs b/parachain/node/src/chain_spec.rs
@@ -7,7 +7,8 @@ use sp_core::{sr25519, Pair, Public};
 use sp_runtime::traits::{IdentifyAccount, Verify};
 
 /// Specialized `ChainSpec` for the normal parachain runtime.
-pub type ChainSpec = sc_service::GenericChainSpec<hyperbridge_runtime::GenesisConfig, Extensions>;
+pub type ChainSpec =
+    sc_service::GenericChainSpec<hyperbridge_runtime::RuntimeGenesisConfig, Extensions>;
 
 /// The default XCM version to set in genesis config.
 const SAFE_XCM_VERSION: u32 = staging_xcm::prelude::XCM_VERSION;
@@ -183,13 +184,13 @@ fn testnet_genesis(
     endowed_accounts: Vec<AccountId>,
     id: ParaId,
     sudo: AccountId,
-) -> hyperbridge_runtime::GenesisConfig {
+) -> hyperbridge_runtime::RuntimeGenesisConfig {
     // let sibling = match id.into() {
     //     2000u32 => 2001,
     //     2001u32 => 2000,
     //     _ => unimplemented!(),
     // };
-    hyperbridge_runtime::GenesisConfig {
+    hyperbridge_runtime::RuntimeGenesisConfig {
         system: hyperbridge_runtime::SystemConfig {
             code: hyperbridge_runtime::WASM_BINARY
                 .expect("WASM binary was not build, please build it!")

diff --git a/parachain/node/src/command.rs b/parachain/node/src/command.rs
@@ -1,23 +1,20 @@
-use std::{net::SocketAddr, str::FromStr};
+use std::str::FromStr;
 
-use codec::Encode;
-use cumulus_client_cli::generate_genesis_block;
 use cumulus_primitives_core::ParaId;
 use frame_benchmarking_cli::{BenchmarkCmd, SUBSTRATE_REFERENCE_HARDWARE};
 use hyperbridge_runtime::Block;
-use log::{info, warn};
+use log::info;
 use sc_cli::{
     ChainSpec, CliConfiguration, DefaultConfigurationValues, ImportParams, KeystoreParams,
-    NetworkParams, Result, RuntimeVersion, SharedParams, SubstrateCli,
+    NetworkParams, Result, SharedParams, SubstrateCli,
 };
 use sc_service::config::{BasePath, PrometheusConfig};
-use sp_core::hexdisplay::HexDisplay;
-use sp_runtime::traits::{AccountIdConversion, Block as BlockT};
+use sp_runtime::traits::AccountIdConversion;
 
 use crate::{
     chain_spec,
     cli::{Cli, RelayChainCli, Subcommand},
-    service::{new_partial, ParachainNativeExecutor},
+    service::new_partial,
 };
 
 fn load_spec(id: &str) -> std::result::Result<Box<dyn ChainSpec>, String> {