From 2da367bdaf9f39bee04322729a67303795692f79 Mon Sep 17 00:00:00 2001
From: Joshy Orndorff <admin@joshyorndorff.com>
Date: Wed, 13 Dec 2023 10:07:20 -0500
Subject: [PATCH] Work around
 https://github.com/paritytech/polkadot-sdk/issues/2551

---
 Cargo.lock                |  1 +
 Cargo.toml                | 13 ++++++-------
 parachain-node/Cargo.toml | 10 ++++++----
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 1486540ee..d8b5e6918 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -7548,6 +7548,7 @@ dependencies = [
  "parity-scale-codec",
  "polkadot-cli",
  "polkadot-primitives",
+ "polkadot-service",
  "sc-basic-authorship",
  "sc-chain-spec",
  "sc-cli",
diff --git a/Cargo.toml b/Cargo.toml
index 5e119d4a3..4bdbce8a5 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -27,6 +27,7 @@ resolver = "2"
 async-io = "2.0"
 async-trait = "0.1.73"
 clap = "4.3.0"
+color-print = "0.3.4"
 hex-literal = "0.4.1"
 jsonrpsee = "0.16.2"
 log = "0.4"
@@ -100,16 +101,10 @@ sp-storage = { branch = "tuxedo-no-rocks", default_features = false, git = "http
 sp-timestamp = { branch = "tuxedo-no-rocks", default_features = false, git = "https://github.com/off-narrative-labs/polkadot-sdk" }
 sp-transaction-pool = { branch = "tuxedo-no-rocks", default_features = false, git = "https://github.com/off-narrative-labs/polkadot-sdk" }
 sp-version = { branch = "tuxedo-no-rocks", default_features = false, git = "https://github.com/off-narrative-labs/polkadot-sdk" }
-
-# x
 substrate-prometheus-endpoint = { branch = "tuxedo-no-rocks", git = "https://github.com/off-narrative-labs/polkadot-sdk" }
 
-# Polkadot
-color-print = "0.3.4"
-# xcm = { package = "staging-xcm", path = "../../../polkadot/xcm", default-features = false}
-
 # Cumulus
-cumulus-client-cli = { branch = "tuxedo-no-rocks", git = "https://github.com/off-narrative-labs/polkadot-sdk", default_features = false }
+cumulus-client-cli = { branch = "tuxedo-no-rocks", default_features = false, git = "https://github.com/off-narrative-labs/polkadot-sdk" }
 cumulus-client-collator = { branch = "tuxedo-no-rocks", git = "https://github.com/off-narrative-labs/polkadot-sdk" }
 cumulus-client-consensus-aura = { branch = "tuxedo-no-rocks", git = "https://github.com/off-narrative-labs/polkadot-sdk" }
 cumulus-client-consensus-common = { branch = "tuxedo-no-rocks", git = "https://github.com/off-narrative-labs/polkadot-sdk" }
@@ -130,3 +125,7 @@ sp-state-machine = { branch = "tuxedo-no-rocks", default_features = false, git =
 sp-tracing = { branch = "tuxedo-no-rocks", default_features = false, git = "https://github.com/off-narrative-labs/polkadot-sdk" }
 sp-trie = { branch = "tuxedo-no-rocks", default_features = false, git = "https://github.com/off-narrative-labs/polkadot-sdk" }
 trie-db = { version = "0.28.0", default-features = false }
+
+# We need to depend on this explicitly so we can enable the "full-node" feature
+# See https://github.com/paritytech/polkadot-sdk/issues/2551 for more details
+polkadot-service = { features = [ "full-node" ], branch = "tuxedo-no-rocks", default_features = false, git = "https://github.com/off-narrative-labs/polkadot-sdk" }
diff --git a/parachain-node/Cargo.toml b/parachain-node/Cargo.toml
index 804c7f85c..2ae925e50 100644
--- a/parachain-node/Cargo.toml
+++ b/parachain-node/Cargo.toml
@@ -11,6 +11,7 @@ version = "0.1.0"
 [dependencies]
 async-io = { workspace = true }
 clap = { features = [ "derive" ], workspace = true }
+color-print = { workspace = true }
 futures = { workspace = true }
 jsonrpsee = { features = [ "server" ], workspace = true }
 log = { workspace = true }
@@ -49,10 +50,7 @@ sp-runtime = { workspace = true }
 sp-timestamp = { workspace = true }
 substrate-prometheus-endpoint = { workspace = true }
 
-# Polkadot
-color-print = { workspace = true }
-
-# Cumulus
+# Cumulus / Polkadot
 cumulus-client-cli = { default-features = false, workspace = true }
 cumulus-client-collator = { workspace = true }
 cumulus-client-consensus-aura = { workspace = true }
@@ -65,6 +63,10 @@ cumulus-relay-chain-interface = { workspace = true }
 polkadot-cli = { features = [ "rococo-native" ], default-features = false, workspace = true }
 polkadot-primitives = { workspace = true }
 
+# We need to depend on this explicitly so we can enable the "full-node" feature
+# See https://github.com/paritytech/polkadot-sdk/issues/2551 for more details
+polkadot-service = { workspace = true }
+
 [build-dependencies]
 substrate-build-script-utils = { workspace = true }