Merge remote-tracking branch 'origin/main' into rename-codec

Cargo.toml

@@ -136,12 +136,12 @@ orml-asset-registry = { version = "0.7.0", default-features = false }
 orml-traits = { version = "0.7.0", default-features = false }
 
 # Polytope Labs
-ismp = { git="https://github.com/Szegoo/hyperbridge.git", branch="fix-try-runtime", default-features = false }
-pallet-ismp = { git="https://github.com/Szegoo/hyperbridge.git", branch="fix-try-runtime", default-features = false }
-ismp-parachain = { git="https://github.com/Szegoo/hyperbridge.git", branch="fix-try-runtime", default-features = false }
-ismp-parachain-inherent = { git="https://github.com/Szegoo/hyperbridge.git", branch="fix-try-runtime", default-features = false }
-ismp-runtime-api = { git="https://github.com/Szegoo/hyperbridge.git", branch="fix-try-runtime", default-features = false }
-ismp-parachain-runtime-api = { git="https://github.com/Szegoo/hyperbridge.git", branch="fix-try-runtime", default-features = false }
+ismp = { git="https://github.com/polytope-labs/hyperbridge.git", branch="main", default-features = false }
+pallet-ismp = { git="https://github.com/polytope-labs/hyperbridge.git", branch="main", default-features = false }
+ismp-parachain = { git="https://github.com/polytope-labs/hyperbridge.git", branch="main", default-features = false }
+ismp-parachain-inherent = { git="https://github.com/polytope-labs/hyperbridge.git", branch="main", default-features = false }
+pallet-ismp-runtime-api = { git="https://github.com/polytope-labs/hyperbridge.git", branch="main", default-features = false }
+ismp-parachain-runtime-api = { git="https://github.com/polytope-labs/hyperbridge.git", branch="main", default-features = false }
 
 # Local
 regionx-primitives = { path = "./runtime/primitives", default-features = false }

README.md

@@ -1,22 +1,26 @@
-# Substrate Cumulus Parachain Template
+# RegionX parachain
 
-A new [Cumulus](https://github.com/paritytech/cumulus/)-based Substrate node, ready for hacking ☁️..
+### Running zombienet tests
 
-This project is originally a fork of the
-[Substrate Node Template](https://github.com/substrate-developer-hub/substrate-node-template)
-modified to include dependencies required for registering this node as a **parathread** or
-**parachain** to a **relay chain**.
+1. Install the latest zombienet release from the [Zombienet release page](https://github.com/paritytech/zombienet/releases).
 
-The stand-alone version of this template is hosted on the
-[Substrate Devhub Parachain Template](https://github.com/substrate-developer-hub/substrate-parachain-template/)
-for each release of Polkadot. It is generated directly to the upstream
-[Parachain Template in Cumulus](https://github.com/paritytech/cumulus/tree/master/parachain-template)
-at each release branch using the
-[Substrate Template Generator](https://github.com/paritytech/substrate-template-generator/).
+2. Build the `regionx-node` by running:
 
-👉 Learn more about parachains [here](https://wiki.polkadot.network/docs/learn-parachains), and
-parathreads [here](https://wiki.polkadot.network/docs/learn-parathreads).
+    ```
+    cargo build --release
+    ```
 
+3. Get the polkadot binary:
 
-🧙 Learn about how to use this template and run your own parachain testnet for it in the
-[Devhub Cumulus Tutorial](https://docs.substrate.io/tutorials/v3/cumulus/start-relay/).
+    ```sh
+    zombienet-linux setup polkadot 
+
+    Please add the dir to your $PATH by running the command:
+    export PATH=/home/<username>/zombienet/dist:$PATH
+    ```
+
+4. Run the test:
+
+    ```
+    zombienet-linux -p native test ./zombienet_tests/0001-smoke-test.zndsl
+    ```

runtime/regionx/Cargo.toml

@@ -26,7 +26,7 @@ regionx-primitives = { workspace = true }
 ismp = { workspace = true, default-features = false }
 pallet-ismp = { workspace = true, default-features = false }
 ismp-parachain = { workspace = true, default-features = false }
-ismp-runtime-api = { workspace = true, default-features = false }
+pallet-ismp-runtime-api = { workspace = true, default-features = false }
 ismp-parachain-runtime-api = { workspace = true, default-features = false }
 
 # Orml
@@ -103,7 +103,7 @@ std = [
 	"cumulus-primitives-utility/std",
 	"ismp/std",
 	"pallet-ismp/std",
-	"ismp-runtime-api/std",
+	"pallet-ismp-runtime-api/std",
 	"ismp-parachain/std",
 	"ismp-parachain-runtime-api/std",
 	"frame-benchmarking?/std",

runtime/regionx/src/ismp.rs

@@ -56,7 +56,6 @@ impl pallet_ismp::Config for Runtime {
 	type TimeProvider = Timestamp;
 	type Router = Router;
 	type ConsensusClients = (ParachainConsensusClient<Runtime, IsmpParachain>,);
-	type WeightInfo = ();
 	type WeightProvider = ();
 }
 

runtime/regionx/src/lib.rs

@@ -74,7 +74,7 @@ use frame_system::{
 	EnsureRoot, EnsureSigned, Phase,
 };
 use pallet_ismp::{
-	mmr_primitives::{Leaf, LeafIndex},
+	mmr::primitives::{Leaf, LeafIndex},
 	primitives::Proof,
 	ProofKeys,
 };
@@ -809,7 +809,7 @@ impl_runtime_apis! {
 		}
 	}
 
-	impl ismp_runtime_api::IsmpRuntimeApi<Block, <Block as BlockT>::Hash> for Runtime {
+	impl pallet_ismp_runtime_api::IsmpRuntimeApi<Block, <Block as BlockT>::Hash> for Runtime {
 		/// Return the number of MMR leaves.
 		fn mmr_leaf_count() -> Result<LeafIndex, pallet_ismp::primitives::Error> {
 			Ok(Ismp::mmr_leaf_count())