From d6d66978638bea1ddd6a6424471eb86974d98699 Mon Sep 17 00:00:00 2001 From: orion Date: Tue, 15 Nov 2022 10:14:11 +0100 Subject: [PATCH] fixup! revert branches --- Cargo.lock | 45 +++++---------------------------- app-libs/sgx-runtime/Cargo.toml | 2 +- app-libs/stf/Cargo.toml | 2 +- cli/Cargo.toml | 2 +- enclave-runtime/Cargo.lock | 2 +- service/Cargo.toml | 2 +- 6 files changed, 12 insertions(+), 43 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 907b0737c4..936abb932d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2277,23 +2277,6 @@ dependencies = [ "cxx-build", ] -[[package]] -name = "ias-verify" -version = "0.1.4" -source = "git+https://github.com/integritee-network/pallets.git?branch=develop-polkadot-v0.9.29#2ac380ce82bc1fd8da3bf7419480d04f700c1d08" -dependencies = [ - "base64 0.13.1", - "chrono 0.4.23", - "frame-support", - "parity-scale-codec", - "scale-info", - "serde_json 1.0.87", - "sp-core", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", - "webpki 0.21.0", -] - [[package]] name = "ias-verify" version = "0.1.4" @@ -2436,7 +2419,7 @@ dependencies = [ "sp-runtime", "substrate-api-client", "substrate-client-keystore", - "teerex-primitives 0.1.0 (git+https://github.com/integritee-network/pallets.git?branch=develop-polkadot-v0.9.29)", + "teerex-primitives", "ws", ] @@ -2537,7 +2520,7 @@ dependencies = [ "sp-keyring", "sp-runtime", "substrate-api-client", - "teerex-primitives 0.1.0 (git+https://github.com/integritee-network/pallets.git?branch=develop-polkadot-v0.9.29)", + "teerex-primitives", "thiserror 1.0.37", "tokio", "warp", @@ -4961,7 +4944,7 @@ dependencies = [ [[package]] name = "pallet-parentchain" version = "0.9.0" -source = "git+https://github.com/integritee-network/pallets.git?branch=develop-polkadot-v0.9.29#2ac380ce82bc1fd8da3bf7419480d04f700c1d08" +source = "git+https://github.com/integritee-network/pallets.git?branch=master#2e55172af5249b1569617eaa080dfcd8fd9e54aa" dependencies = [ "frame-support", "frame-system", @@ -5058,7 +5041,7 @@ dependencies = [ "sp-io 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", "sp-runtime", "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", - "teerex-primitives 0.1.0 (git+https://github.com/integritee-network/pallets.git?branch=master)", + "teerex-primitives", ] [[package]] @@ -5101,7 +5084,7 @@ source = "git+https://github.com/integritee-network/pallets.git?branch=master#2e dependencies = [ "frame-support", "frame-system", - "ias-verify 0.1.4 (git+https://github.com/integritee-network/pallets.git?branch=master)", + "ias-verify", "log 0.4.17", "pallet-timestamp", "parity-scale-codec", @@ -5111,7 +5094,7 @@ dependencies = [ "sp-io 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", "sp-runtime", "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", - "teerex-primitives 0.1.0 (git+https://github.com/integritee-network/pallets.git?branch=master)", + "teerex-primitives", ] [[package]] @@ -7660,26 +7643,12 @@ dependencies = [ "substrate-fixed", ] -[[package]] -name = "teerex-primitives" -version = "0.1.0" -source = "git+https://github.com/integritee-network/pallets.git?branch=develop-polkadot-v0.9.29#2ac380ce82bc1fd8da3bf7419480d04f700c1d08" -dependencies = [ - "ias-verify 0.1.4 (git+https://github.com/integritee-network/pallets.git?branch=develop-polkadot-v0.9.29)", - "parity-scale-codec", - "scale-info", - "serde 1.0.147", - "sp-core", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", -] - [[package]] name = "teerex-primitives" version = "0.1.0" source = "git+https://github.com/integritee-network/pallets.git?branch=master#2e55172af5249b1569617eaa080dfcd8fd9e54aa" dependencies = [ - "ias-verify 0.1.4 (git+https://github.com/integritee-network/pallets.git?branch=master)", + "ias-verify", "parity-scale-codec", "scale-info", "serde 1.0.147", diff --git a/app-libs/sgx-runtime/Cargo.toml b/app-libs/sgx-runtime/Cargo.toml index 686da20f94..07c6544ab3 100644 --- a/app-libs/sgx-runtime/Cargo.toml +++ b/app-libs/sgx-runtime/Cargo.toml @@ -46,7 +46,7 @@ sp-version = { default-features = false, git = "https://github.com/paritytech/su # Integritee dependencies pallet-evm = { default-features = false, optional = true, git = "https://github.com/integritee-network/frontier.git", branch = "polkadot-v0.9.29" } -pallet-parentchain = { default-features = false, git = "https://github.com/integritee-network/pallets.git", branch = "develop-polkadot-v0.9.29" } +pallet-parentchain = { default-features = false, git = "https://github.com/integritee-network/pallets.git", branch = "master" } [features] default = ["std"] diff --git a/app-libs/stf/Cargo.toml b/app-libs/stf/Cargo.toml index 967e90f9f5..9e0b315b23 100644 --- a/app-libs/stf/Cargo.toml +++ b/app-libs/stf/Cargo.toml @@ -36,7 +36,7 @@ sp-runtime = { default-features = false, git = "https://github.com/paritytech/su # scs / integritee my-node-runtime = { package = "integritee-node-runtime", optional = true, git = "https://github.com/integritee-network/integritee-node.git", branch = "master" } -pallet-parentchain = { default-features = false, git = "https://github.com/integritee-network/pallets.git", branch = "develop-polkadot-v0.9.29" } +pallet-parentchain = { default-features = false, git = "https://github.com/integritee-network/pallets.git", branch = "master" } [dev-dependencies] diff --git a/cli/Cargo.toml b/cli/Cargo.toml index f53e284df3..e895637493 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -27,7 +27,7 @@ my-node-runtime = { package = "integritee-node-runtime", git = "https://github.c pallet-evm = { optional = true, git = "https://github.com/integritee-network/frontier.git", branch = "polkadot-v0.9.29" } substrate-api-client = { features = ["ws-client"], git = "https://github.com/scs/substrate-api-client.git", branch = "polkadot-v0.9.29" } substrate-client-keystore = { git = "https://github.com/scs/substrate-api-client.git", branch = "polkadot-v0.9.29" } -teerex-primitives = { git = "https://github.com/integritee-network/pallets.git", branch = "develop-polkadot-v0.9.29" } +teerex-primitives = { git = "https://github.com/integritee-network/pallets.git", branch = "master" } # substrate dependencies frame-system = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.29" } diff --git a/enclave-runtime/Cargo.lock b/enclave-runtime/Cargo.lock index 95fb1da484..5fb3ce737d 100644 --- a/enclave-runtime/Cargo.lock +++ b/enclave-runtime/Cargo.lock @@ -2789,7 +2789,7 @@ dependencies = [ [[package]] name = "pallet-parentchain" version = "0.9.0" -source = "git+https://github.com/integritee-network/pallets.git?branch=develop-polkadot-v0.9.29#2ac380ce82bc1fd8da3bf7419480d04f700c1d08" +source = "git+https://github.com/integritee-network/pallets.git?branch=master#2e55172af5249b1569617eaa080dfcd8fd9e54aa" dependencies = [ "frame-support", "frame-system", diff --git a/service/Cargo.toml b/service/Cargo.toml index 195bbd2778..3f07e3cd19 100644 --- a/service/Cargo.toml +++ b/service/Cargo.toml @@ -56,7 +56,7 @@ its-storage = { path = "../sidechain/storage" } # scs / integritee my-node-runtime = { package = "integritee-node-runtime", git = "https://github.com/integritee-network/integritee-node.git", branch = "master" } substrate-api-client = { git = "https://github.com/scs/substrate-api-client.git", branch = "polkadot-v0.9.29" } -teerex-primitives = { git = "https://github.com/integritee-network/pallets.git", branch = "develop-polkadot-v0.9.29" } +teerex-primitives = { git = "https://github.com/integritee-network/pallets.git", branch = "master" } # Substrate dependencies frame-support = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.29" }