Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ISMP dependency update #89

Merged
merged 1 commit into from
Apr 20, 2024
Merged

ISMP dependency update #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 21 additions & 21 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down
4 changes: 2 additions & 2 deletions runtime/regionx/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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",
Expand Down
1 change: 0 additions & 1 deletion runtime/regionx/src/ismp.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = ();
}

Expand Down
4 changes: 2 additions & 2 deletions runtime/regionx/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ use frame_system::{
EnsureRoot, EnsureSigned, Phase,
};
use pallet_ismp::{
mmr_primitives::{Leaf, LeafIndex},
mmr::primitives::{Leaf, LeafIndex},
primitives::Proof,
ProofKeys,
};
Expand Down Expand Up @@ -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())
Expand Down
Loading