From 55f49d325146b3e18252a3e651da8fcdf5707faf Mon Sep 17 00:00:00 2001
From: Alain Brenzikofer <alain@integritee.network>
Date: Wed, 13 Mar 2024 09:22:13 +0100
Subject: [PATCH] add tilde version to pallets. depend on encointer fork of
 runtimes

---
 Cargo.lock | 10 +++++-----
 Cargo.toml | 40 ++++++++++++++++++++--------------------
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 471eabe..86e46a1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2927,7 +2927,7 @@ dependencies = [
 [[package]]
 name = "encointer-kusama-runtime"
 version = "1.0.0"
-source = "git+https://github.com/encointer/runtimes.git?branch=bkontur/bko-bump-to-1.7#817f944fbf3ffb9fe582e57aa897c3b2dcd4f616"
+source = "git+https://github.com/encointer/runtimes.git?branch=polkadot-v1.7.0#956696788dcb3a8afcaceaf3c3440d781ce2bc82"
 dependencies = [
  "cumulus-pallet-aura-ext",
  "cumulus-pallet-dmp-queue",
@@ -7579,9 +7579,9 @@ dependencies = [
 
 [[package]]
 name = "pallet-xcm"
-version = "8.0.1"
+version = "8.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b0bade2eb6ce40af35a5af150692b4e150638f7f68c15735ab9cdf79650d68e"
+checksum = "d32aa4911002f03a8aebd897e094980e7a9fb25d092e0f8db38e76e1e4f643ee"
 dependencies = [
  "bounded-collections",
  "frame-benchmarking",
@@ -12822,9 +12822,9 @@ dependencies = [
 
 [[package]]
 name = "staging-xcm"
-version = "8.0.0"
+version = "8.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ccecaeae5eca8453760e96fcf65481b19898459971842004732e88cd3570741"
+checksum = "48fa328b87de3466bc38cc9a07244c42c647b7755b81115e1dfeb47cc13fc6e6"
 dependencies = [
  "array-bytes 6.1.0",
  "bounded-collections",
diff --git a/Cargo.toml b/Cargo.toml
index 0f259e1..4c57550 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -25,27 +25,27 @@ smallvec = "1.11.2"
 tempfile = "3.8.1"
 
 # encointer deps
-encointer-balances-tx-payment = { default-features = false, version = "6.0.0" }
-encointer-balances-tx-payment-rpc-runtime-api = { default-features = false, version = "6.0.0" }
-encointer-primitives = { default-features = false, version = "6.0.1" }
-pallet-encointer-balances = { default-features = false, version = "6.0.0" }
-pallet-encointer-bazaar = { default-features = false, version = "6.0.0" }
-pallet-encointer-bazaar-rpc-runtime-api = { default-features = false, version = "6.0.0" }
-pallet-encointer-ceremonies = { default-features = false, version = "6.0.0" }
-pallet-encointer-ceremonies-rpc-runtime-api = { default-features = false, version = "6.0.0" }
-pallet-encointer-communities = { default-features = false, version = "6.0.0" }
-pallet-encointer-communities-rpc-runtime-api = { default-features = false, version = "6.0.0" }
-pallet-encointer-faucet = { default-features = false, version = "6.0.0" }
-pallet-encointer-reputation-commitments = { default-features = false, version = "6.0.0" }
-pallet-encointer-scheduler = { default-features = false, version = "6.0.0" }
+encointer-balances-tx-payment = { default-features = false, version = "~6.0.0" }
+encointer-balances-tx-payment-rpc-runtime-api = { default-features = false, version = "~6.0.0" }
+encointer-primitives = { default-features = false, version = "~6.0.2" }
+pallet-encointer-balances = { default-features = false, version = "~6.0.0" }
+pallet-encointer-bazaar = { default-features = false, version = "~6.0.0" }
+pallet-encointer-bazaar-rpc-runtime-api = { default-features = false, version = "~6.0.0" }
+pallet-encointer-ceremonies = { default-features = false, version = "~6.0.0" }
+pallet-encointer-ceremonies-rpc-runtime-api = { default-features = false, version = "~6.0.0" }
+pallet-encointer-communities = { default-features = false, version = "~6.0.0" }
+pallet-encointer-communities-rpc-runtime-api = { default-features = false, version = "~6.0.0" }
+pallet-encointer-faucet = { default-features = false, version = "~6.0.0" }
+pallet-encointer-reputation-commitments = { default-features = false, version = "~6.0.0" }
+pallet-encointer-scheduler = { default-features = false, version = "~6.0.0" }
 # rpc [std]
-pallet-encointer-bazaar-rpc = "6.0.0"
-pallet-encointer-ceremonies-rpc = "6.0.0"
-pallet-encointer-communities-rpc = "6.0.0"
+pallet-encointer-bazaar-rpc = "~6.0.0"
+pallet-encointer-ceremonies-rpc = "~6.0.0"
+pallet-encointer-communities-rpc = "~6.0.0"
 
-# fellowship runtimes
-kusama-runtime-constants = { default-features = false, git = "https://github.com/encointer/runtimes.git", branch = "bkontur/bko-bump-to-1.7" }
-parachain-runtime = { package = "encointer-kusama-runtime", git = "https://github.com/encointer/runtimes.git", branch = "bkontur/bko-bump-to-1.7" }
+# fellowship runtimes. do not depend on fellow-runtimes directly, so we can upgrade at our own pace
+kusama-runtime-constants = { default-features = false, git = "https://github.com/encointer/runtimes.git", branch = "polkadot-v1.7.0" }
+parachain-runtime = { package = "encointer-kusama-runtime", git = "https://github.com/encointer/runtimes.git", branch = "polkadot-v1.7.0" }
 
 # polkadot-sdk [no_std]
 cumulus-pallet-aura-ext = { default-features = false, version = "0.8.0" }
@@ -96,7 +96,7 @@ sp-std = { default-features = false, version = "14.0.0" }
 sp-transaction-pool = { default-features = false, version = "27.0.0" }
 sp-version = { default-features = false, version = "30.0.0" }
 substrate-wasm-builder = { version = "18.0.0" }
-xcm = { package = "staging-xcm", default-features = false, version = "8.0.0" }
+xcm = { package = "staging-xcm", default-features = false, version = "8.0.1" }
 xcm-builder = { package = "staging-xcm-builder", default-features = false, version = "8.0.0" }
 xcm-executor = { package = "staging-xcm-executor", default-features = false, version = "8.0.0" }