From 39f07ad8b459b8b25bc7007a9e3dc6310c7aaf7e Mon Sep 17 00:00:00 2001 From: David Salami Date: Thu, 14 Sep 2023 12:37:19 +0100 Subject: [PATCH] fix node --- Cargo.lock | 88 +++++++-------------------------------- parachain/node/Cargo.toml | 4 +- 2 files changed, 18 insertions(+), 74 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 28271685f..9ae334488 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4524,7 +4524,7 @@ dependencies = [ "hyperbridge-runtime", "ismp-parachain-inherent", "ismp-rpc", - "ismp-runtime-api 0.1.0 (git+https://github.com/polytope-labs/substrate-ismp.git?branch=main)", + "ismp-runtime-api", "jsonrpsee", "log", "pallet-transaction-payment-rpc", @@ -4593,15 +4593,15 @@ dependencies = [ "ismp-demo", "ismp-parachain", "ismp-parachain-runtime-api", - "ismp-primitives 0.1.0 (git+https://github.com/polytope-labs/substrate-ismp.git?branch=dispatch-to-evm)", - "ismp-runtime-api 0.1.0 (git+https://github.com/polytope-labs/substrate-ismp.git?branch=dispatch-to-evm)", + "ismp-primitives", + "ismp-runtime-api", "ismp-sync-committee", "log", "pallet-aura", "pallet-authorship", "pallet-balances", "pallet-collator-selection", - "pallet-ismp 0.1.0 (git+https://github.com/polytope-labs/substrate-ismp.git?branch=dispatch-to-evm)", + "pallet-ismp", "pallet-session", "pallet-sudo", "pallet-timestamp", @@ -4908,7 +4908,7 @@ dependencies = [ "frame-system", "ismp", "pallet-balances", - "pallet-ismp 0.1.0 (git+https://github.com/polytope-labs/substrate-ismp.git?branch=dispatch-to-evm)", + "pallet-ismp", "parity-scale-codec", "scale-info", "sp-core 7.0.0", @@ -4925,8 +4925,8 @@ dependencies = [ "frame-system", "hex-literal 0.4.1", "ismp", - "ismp-primitives 0.1.0 (git+https://github.com/polytope-labs/substrate-ismp.git?branch=dispatch-to-evm)", - "pallet-ismp 0.1.0 (git+https://github.com/polytope-labs/substrate-ismp.git?branch=dispatch-to-evm)", + "ismp-primitives", + "pallet-ismp", "parity-scale-codec", "primitive-types", "scale-info", @@ -4982,36 +4982,18 @@ dependencies = [ "sp-runtime", ] -[[package]] -name = "ismp-primitives" -version = "0.1.0" -source = "git+https://github.com/polytope-labs/substrate-ismp.git?branch=main#5fd88d277cffa50f0ca21dc71ad09ccb09a3467e" -dependencies = [ - "ckb-merkle-mountain-range", - "frame-support", - "frame-system", - "ismp", - "parity-scale-codec", - "primitive-types", - "scale-info", - "serde", - "sp-consensus-aura", - "sp-core 7.0.0", - "sp-runtime", -] - [[package]] name = "ismp-rpc" version = "0.1.0" -source = "git+https://github.com/polytope-labs/substrate-ismp.git?branch=main#5fd88d277cffa50f0ca21dc71ad09ccb09a3467e" +source = "git+https://github.com/polytope-labs/substrate-ismp.git?branch=dispatch-to-evm#cb76d72cc1172fd433c8e465f7f51c11815fa938" dependencies = [ "frame-system", "hex-literal 0.3.4", "ismp", - "ismp-primitives 0.1.0 (git+https://github.com/polytope-labs/substrate-ismp.git?branch=main)", - "ismp-runtime-api 0.1.0 (git+https://github.com/polytope-labs/substrate-ismp.git?branch=main)", + "ismp-primitives", + "ismp-runtime-api", "jsonrpsee", - "pallet-ismp 0.1.0 (git+https://github.com/polytope-labs/substrate-ismp.git?branch=main)", + "pallet-ismp", "parity-scale-codec", "sc-client-api", "serde", @@ -5028,22 +5010,8 @@ version = "0.1.0" source = "git+https://github.com/polytope-labs/substrate-ismp.git?branch=dispatch-to-evm#cb76d72cc1172fd433c8e465f7f51c11815fa938" dependencies = [ "ismp", - "ismp-primitives 0.1.0 (git+https://github.com/polytope-labs/substrate-ismp.git?branch=dispatch-to-evm)", - "pallet-ismp 0.1.0 (git+https://github.com/polytope-labs/substrate-ismp.git?branch=dispatch-to-evm)", - "parity-scale-codec", - "serde", - "sp-api", - "sp-std 5.0.0", -] - -[[package]] -name = "ismp-runtime-api" -version = "0.1.0" -source = "git+https://github.com/polytope-labs/substrate-ismp.git?branch=main#5fd88d277cffa50f0ca21dc71ad09ccb09a3467e" -dependencies = [ - "ismp", - "ismp-primitives 0.1.0 (git+https://github.com/polytope-labs/substrate-ismp.git?branch=main)", - "pallet-ismp 0.1.0 (git+https://github.com/polytope-labs/substrate-ismp.git?branch=main)", + "ismp-primitives", + "pallet-ismp", "parity-scale-codec", "serde", "sp-api", @@ -7347,31 +7315,7 @@ dependencies = [ "frame-support", "frame-system", "ismp", - "ismp-primitives 0.1.0 (git+https://github.com/polytope-labs/substrate-ismp.git?branch=dispatch-to-evm)", - "log", - "parity-scale-codec", - "scale-info", - "serde", - "sp-api", - "sp-core 7.0.0", - "sp-io", - "sp-runtime", - "sp-std 5.0.0", -] - -[[package]] -name = "pallet-ismp" -version = "0.1.0" -source = "git+https://github.com/polytope-labs/substrate-ismp.git?branch=main#5fd88d277cffa50f0ca21dc71ad09ccb09a3467e" -dependencies = [ - "ckb-merkle-mountain-range", - "derive_more", - "enum-as-inner", - "frame-benchmarking", - "frame-support", - "frame-system", - "ismp", - "ismp-primitives 0.1.0 (git+https://github.com/polytope-labs/substrate-ismp.git?branch=main)", + "ismp-primitives", "log", "parity-scale-codec", "scale-info", @@ -13597,8 +13541,8 @@ dependencies = [ "frame-system", "hash-db 0.16.0", "ismp", - "ismp-primitives 0.1.0 (git+https://github.com/polytope-labs/substrate-ismp.git?branch=dispatch-to-evm)", - "pallet-ismp 0.1.0 (git+https://github.com/polytope-labs/substrate-ismp.git?branch=dispatch-to-evm)", + "ismp-primitives", + "pallet-ismp", "parity-scale-codec", "primitive-types", "scale-info", diff --git a/parachain/node/Cargo.toml b/parachain/node/Cargo.toml index a717a1249..ab41fef32 100644 --- a/parachain/node/Cargo.toml +++ b/parachain/node/Cargo.toml @@ -69,8 +69,8 @@ cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/c cumulus-relay-chain-interface = { git = "https://github.com/paritytech/cumulus.git", branch = "release-v0.9.420" } # polytope-labs -ismp-rpc = { git = "https://github.com/polytope-labs/substrate-ismp.git", branch = "main" } -ismp-runtime-api = { git = "https://github.com/polytope-labs/substrate-ismp.git", branch = "main" } +ismp-rpc = { git = "https://github.com/polytope-labs/substrate-ismp.git", branch = "dispatch-to-evm" } +ismp-runtime-api = { git = "https://github.com/polytope-labs/substrate-ismp.git", branch = "dispatch-to-evm" } # local ismp-parachain-inherent = { path = "../modules/consensus/parachain/inherent" }