From 314c9cd8f723c25208404da3efbc5e6687cbb168 Mon Sep 17 00:00:00 2001
From: Luke Parker <lukeparker5132@gmail.com>
Date: Sat, 16 Jul 2022 20:53:28 -0400
Subject: [PATCH] Clean Substrate Cargo.tomls

---
 substrate/consensus/Cargo.toml | 32 ++++++++++----------
 substrate/node/Cargo.toml      | 54 +++++++++++++++++-----------------
 substrate/runtime/Cargo.toml   | 53 +++++++++++++++++----------------
 3 files changed, 70 insertions(+), 69 deletions(-)

diff --git a/substrate/consensus/Cargo.toml b/substrate/consensus/Cargo.toml
index 0e2e7178..f8af1917 100644
--- a/substrate/consensus/Cargo.toml
+++ b/substrate/consensus/Cargo.toml
@@ -8,25 +8,25 @@ edition = "2021"
 publish = false
 
 [dependencies]
-sp-core = { version = "6.0.0", git = "https://github.com/serai-dex/substrate.git", branch = "serai" }
-sp-trie = { version = "6.0.0", git = "https://github.com/serai-dex/substrate.git", branch = "serai" }
-sp-timestamp = { version = "4.0.0-dev", git = "https://github.com/serai-dex/substrate.git", branch = "serai" }
-sc-consensus = { version = "0.10.0-dev", git = "https://github.com/serai-dex/substrate.git", branch = "serai" }
-sp-consensus = { version = "0.10.0-dev", git = "https://github.com/serai-dex/substrate.git", branch = "serai" }
-sc-transaction-pool = { version = "4.0.0-dev", git = "https://github.com/serai-dex/substrate.git", branch = "serai" }
-sc-basic-authorship = { version = "0.10.0-dev", git = "https://github.com/serai-dex/substrate.git", branch = "serai" }
-sc-consensus-pow = { version = "0.10.0-dev", git = "https://github.com/serai-dex/substrate.git", branch = "serai" }
-sp-consensus-pow = { version = "0.10.0-dev", git = "https://github.com/serai-dex/substrate.git", branch = "serai" }
+sp-core = { git = "https://github.com/serai-dex/substrate" }
+sp-trie = { git = "https://github.com/serai-dex/substrate" }
+sp-timestamp = { git = "https://github.com/serai-dex/substrate" }
+sc-consensus = { git = "https://github.com/serai-dex/substrate" }
+sp-consensus = { git = "https://github.com/serai-dex/substrate" }
+sc-transaction-pool = { git = "https://github.com/serai-dex/substrate" }
+sc-basic-authorship = { git = "https://github.com/serai-dex/substrate" }
+sc-consensus-pow = { git = "https://github.com/serai-dex/substrate" }
+sp-consensus-pow = { git = "https://github.com/serai-dex/substrate" }
 
-sc-network = { version = "0.10.0-dev", git = "https://github.com/serai-dex/substrate.git", branch = "serai"  }
-sc-service = { version = "0.10.0-dev", git = "https://github.com/serai-dex/substrate.git", branch = "serai", features = ["wasmtime"]  }
-sc-executor = { version = "0.10.0-dev", git = "https://github.com/serai-dex/substrate.git", branch = "serai", features = ["wasmtime"]  }
-sp-runtime = { version = "6.0.0", git = "https://github.com/serai-dex/substrate.git", branch = "serai" }
+sc-network = { git = "https://github.com/serai-dex/substrate" }
+sc-service = { git = "https://github.com/serai-dex/substrate", features = ["wasmtime"] }
+sc-executor = { git = "https://github.com/serai-dex/substrate", features = ["wasmtime"] }
+sp-runtime = { git = "https://github.com/serai-dex/substrate" }
 
-substrate-prometheus-endpoint = { version = "0.10.0-dev", git = "https://github.com/serai-dex/substrate.git", branch = "serai" }
+substrate-prometheus-endpoint = { git = "https://github.com/serai-dex/substrate" }
 
-sc-client-api = { version = "4.0.0-dev", git = "https://github.com/serai-dex/substrate.git", branch = "serai" }
-sp-api = { version = "4.0.0-dev", git = "https://github.com/serai-dex/substrate.git", branch = "serai" }
+sc-client-api = { git = "https://github.com/serai-dex/substrate" }
+sp-api = { git = "https://github.com/serai-dex/substrate" }
 
 serai-runtime = { path = "../runtime" }
 
diff --git a/substrate/node/Cargo.toml b/substrate/node/Cargo.toml
index 9b8206ee..253ca724 100644
--- a/substrate/node/Cargo.toml
+++ b/substrate/node/Cargo.toml
@@ -13,46 +13,46 @@ name = "serai-node"
 [dependencies]
 clap = { version = "3.1.18", features = ["derive"] }
 
-sc-cli = { version = "0.10.0-dev", git = "https://github.com/serai-dex/substrate.git", branch = "serai", features = ["wasmtime"] }
-sp-core = { version = "6.0.0", git = "https://github.com/serai-dex/substrate.git", branch = "serai" }
-sc-executor = { version = "0.10.0-dev", git = "https://github.com/serai-dex/substrate.git", branch = "serai", features = ["wasmtime"]  }
-sc-service = { version = "0.10.0-dev", git = "https://github.com/serai-dex/substrate.git", branch = "serai", features = ["wasmtime"]  }
-sc-telemetry = { version = "4.0.0-dev", git = "https://github.com/serai-dex/substrate.git", branch = "serai" }
-sc-keystore = { version = "4.0.0-dev", git = "https://github.com/serai-dex/substrate.git", branch = "serai" }
-sc-transaction-pool = { version = "4.0.0-dev", git = "https://github.com/serai-dex/substrate.git", branch = "serai" }
-sc-transaction-pool-api = { version = "4.0.0-dev", git = "https://github.com/serai-dex/substrate.git", branch = "serai" }
-sc-consensus = { version = "0.10.0-dev", git = "https://github.com/serai-dex/substrate.git", branch = "serai" }
-sc-client-api = { version = "4.0.0-dev", git = "https://github.com/serai-dex/substrate.git", branch = "serai" }
-sp-runtime = { version = "6.0.0", git = "https://github.com/serai-dex/substrate.git", branch = "serai" }
-sp-timestamp = { version = "4.0.0-dev", git = "https://github.com/serai-dex/substrate.git", branch = "serai" }
-sp-inherents = { version = "4.0.0-dev", git = "https://github.com/serai-dex/substrate.git", branch = "serai" }
-sp-keyring = { version = "6.0.0", git = "https://github.com/serai-dex/substrate.git", branch = "serai" }
-frame-system = { version = "4.0.0-dev", git = "https://github.com/serai-dex/substrate.git", branch = "serai" }
-pallet-transaction-payment = { version = "4.0.0-dev", default-features = false, git = "https://github.com/serai-dex/substrate.git", branch = "serai" }
+sc-cli = { git = "https://github.com/serai-dex/substrate", features = ["wasmtime"] }
+sp-core = { git = "https://github.com/serai-dex/substrate" }
+sc-executor = { git = "https://github.com/serai-dex/substrate", features = ["wasmtime"] }
+sc-service = { git = "https://github.com/serai-dex/substrate", features = ["wasmtime"] }
+sc-telemetry = { git = "https://github.com/serai-dex/substrate" }
+sc-keystore = { git = "https://github.com/serai-dex/substrate" }
+sc-transaction-pool = { git = "https://github.com/serai-dex/substrate" }
+sc-transaction-pool-api = { git = "https://github.com/serai-dex/substrate" }
+sc-consensus = { git = "https://github.com/serai-dex/substrate" }
+sc-client-api = { git = "https://github.com/serai-dex/substrate" }
+sp-runtime = { git = "https://github.com/serai-dex/substrate" }
+sp-timestamp = { git = "https://github.com/serai-dex/substrate" }
+sp-inherents = { git = "https://github.com/serai-dex/substrate" }
+sp-keyring = { git = "https://github.com/serai-dex/substrate" }
+frame-system = { git = "https://github.com/serai-dex/substrate" }
+pallet-transaction-payment = { git = "https://github.com/serai-dex/substrate", default-features = false }
 
 # These dependencies are used for the node template's RPCs
 jsonrpsee = { version = "0.14.0", features = ["server"] }
-sc-rpc = { version = "4.0.0-dev", git = "https://github.com/serai-dex/substrate.git", branch = "serai" }
-sp-api = { version = "4.0.0-dev", git = "https://github.com/serai-dex/substrate.git", branch = "serai" }
-sc-rpc-api = { version = "0.10.0-dev", git = "https://github.com/serai-dex/substrate.git", branch = "serai" }
-sp-blockchain = { version = "4.0.0-dev", git = "https://github.com/serai-dex/substrate.git", branch = "serai" }
-sp-block-builder = { version = "4.0.0-dev", git = "https://github.com/serai-dex/substrate.git", branch = "serai" }
-substrate-frame-rpc-system = { version = "4.0.0-dev", git = "https://github.com/serai-dex/substrate.git", branch = "serai" }
-pallet-transaction-payment-rpc = { version = "4.0.0-dev", git = "https://github.com/serai-dex/substrate.git", branch = "serai" }
+sc-rpc = { git = "https://github.com/serai-dex/substrate" }
+sp-api = { git = "https://github.com/serai-dex/substrate" }
+sc-rpc-api = { git = "https://github.com/serai-dex/substrate" }
+sp-blockchain = { git = "https://github.com/serai-dex/substrate" }
+sp-block-builder = { git = "https://github.com/serai-dex/substrate" }
+substrate-frame-rpc-system = { git = "https://github.com/serai-dex/substrate" }
+pallet-transaction-payment-rpc = { git = "https://github.com/serai-dex/substrate" }
 
 # These dependencies are used for runtime benchmarking
-frame-benchmarking = { version = "4.0.0-dev", git = "https://github.com/serai-dex/substrate.git", branch = "serai" }
-frame-benchmarking-cli = { version = "4.0.0-dev", git = "https://github.com/serai-dex/substrate.git", branch = "serai" }
+frame-benchmarking = { git = "https://github.com/serai-dex/substrate" }
+frame-benchmarking-cli = { git = "https://github.com/serai-dex/substrate" }
 
 # Local dependencies
 serai-consensus = { path = "../consensus" }
 serai-runtime = { path = "../runtime" }
 
 # CLI-specific dependencies
-try-runtime-cli = { version = "0.10.0-dev", optional = true, git = "https://github.com/serai-dex/substrate.git", branch = "serai" }
+try-runtime-cli = { git = "https://github.com/serai-dex/substrate", optional = true }
 
 [build-dependencies]
-substrate-build-script-utils = { version = "3.0.0", git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.25" }
+substrate-build-script-utils = { git = "https://github.com/serai-dex/substrate.git" }
 
 [features]
 default = []
diff --git a/substrate/runtime/Cargo.toml b/substrate/runtime/Cargo.toml
index 05107c0c..543ee011 100644
--- a/substrate/runtime/Cargo.toml
+++ b/substrate/runtime/Cargo.toml
@@ -8,40 +8,41 @@ edition = "2021"
 publish = false
 
 [dependencies]
+hex-literal = { version = "0.3.4", optional = true }
+
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] }
 scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
 
-sp-core = { version = "6.0.0", default-features = false, git = "https://github.com/serai-dex/substrate.git", branch = "serai" }
-sp-std = { version = "4.0.0-dev", default-features = false, git = "https://github.com/serai-dex/substrate.git", branch = "serai" }
-sp-version = { version = "5.0.0", default-features = false, git = "https://github.com/serai-dex/substrate.git", branch = "serai" }
-sp-inherents = { version = "4.0.0-dev", default-features = false, git = "https://github.com/serai-dex/substrate.git", branch = "serai"}
-sp-offchain = { version = "4.0.0-dev", default-features = false, git = "https://github.com/serai-dex/substrate.git", branch = "serai" }
-sp-session = { version = "4.0.0-dev", default-features = false, git = "https://github.com/serai-dex/substrate.git", branch = "serai" }
-sp-transaction-pool = { version = "4.0.0-dev", default-features = false, git = "https://github.com/serai-dex/substrate.git", branch = "serai" }
-sp-block-builder = {  version = "4.0.0-dev", default-features = false, git = "https://github.com/serai-dex/substrate.git", branch = "serai"}
-sp-runtime = { version = "6.0.0", default-features = false, git = "https://github.com/serai-dex/substrate.git", branch = "serai" }
-sp-api = { version = "4.0.0-dev", default-features = false, git = "https://github.com/serai-dex/substrate.git", branch = "serai" }
+sp-core = { git = "https://github.com/serai-dex/substrate", default-features = false }
+sp-std = { git = "https://github.com/serai-dex/substrate", default-features = false }
+sp-version = { git = "https://github.com/serai-dex/substrate", default-features = false }
+sp-inherents = { git = "https://github.com/serai-dex/substrate", default-features = false }
+sp-offchain = { git = "https://github.com/serai-dex/substrate", default-features = false }
+sp-session = { git = "https://github.com/serai-dex/substrate", default-features = false }
+sp-transaction-pool = { git = "https://github.com/serai-dex/substrate", default-features = false }
+sp-block-builder = { git = "https://github.com/serai-dex/substrate", default-features = false}
+sp-runtime = { git = "https://github.com/serai-dex/substrate", default-features = false }
+sp-api = { git = "https://github.com/serai-dex/substrate", default-features = false }
 
-frame-support = { version = "4.0.0-dev", default-features = false, git = "https://github.com/serai-dex/substrate.git", branch = "serai" }
-frame-system = { version = "4.0.0-dev", default-features = false, git = "https://github.com/serai-dex/substrate.git", branch = "serai" }
-frame-executive = { version = "4.0.0-dev", default-features = false, git = "https://github.com/serai-dex/substrate.git", branch = "serai" }
-frame-try-runtime = { version = "0.10.0-dev", default-features = false, git = "https://github.com/serai-dex/substrate.git", branch = "serai", optional = true }
+frame-support = { git = "https://github.com/serai-dex/substrate", default-features = false }
+frame-system = { git = "https://github.com/serai-dex/substrate", default-features = false }
+frame-executive = { git = "https://github.com/serai-dex/substrate", default-features = false }
+frame-try-runtime = { git = "https://github.com/serai-dex/substrate", default-features = false, optional = true }
 
-pallet-timestamp = { version = "4.0.0-dev", default-features = false, git = "https://github.com/serai-dex/substrate.git", branch = "serai" }
-pallet-balances = { version = "4.0.0-dev", default-features = false, git = "https://github.com/serai-dex/substrate.git", branch = "serai" }
-pallet-transaction-payment = { version = "4.0.0-dev", default-features = false, git = "https://github.com/serai-dex/substrate.git", branch = "serai" }
+pallet-timestamp = { git = "https://github.com/serai-dex/substrate", default-features = false }
+pallet-balances = { git = "https://github.com/serai-dex/substrate", default-features = false }
+pallet-transaction-payment = { git = "https://github.com/serai-dex/substrate", default-features = false }
 
 # Used for the node template's RPCs
-frame-system-rpc-runtime-api = { version = "4.0.0-dev", default-features = false, git = "https://github.com/serai-dex/substrate.git", branch = "serai" }
-pallet-transaction-payment-rpc-runtime-api = { version = "4.0.0-dev", default-features = false, git = "https://github.com/serai-dex/substrate.git", branch = "serai" }
+frame-system-rpc-runtime-api = { git = "https://github.com/serai-dex/substrate", default-features = false }
+pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/serai-dex/substrate", default-features = false }
 
 # Used for runtime benchmarking
-frame-benchmarking = { version = "4.0.0-dev", default-features = false, git = "https://github.com/serai-dex/substrate.git", branch = "serai", optional = true }
-frame-system-benchmarking = { version = "4.0.0-dev", default-features = false, git = "https://github.com/serai-dex/substrate.git", branch = "serai", optional = true }
-hex-literal = { version = "0.3.4", optional = true }
+frame-benchmarking = { git = "https://github.com/serai-dex/substrate", default-features = false, optional = true }
+frame-system-benchmarking = { git = "https://github.com/serai-dex/substrate", default-features = false, optional = true }
 
 [build-dependencies]
-substrate-wasm-builder = { version = "5.0.0-dev", git = "https://github.com/serai-dex/substrate.git", branch = "serai" }
+substrate-wasm-builder = { git = "https://github.com/serai-dex/substrate" }
 
 [features]
 std = [
@@ -67,7 +68,7 @@ std = [
   "pallet-timestamp/std",
   "pallet-balances/std",
   "pallet-transaction-payment/std",
-  "pallet-transaction-payment-rpc-runtime-api/std"
+  "pallet-transaction-payment-rpc-runtime-api/std",
 ]
 
 runtime-benchmarks = [
@@ -78,7 +79,7 @@ runtime-benchmarks = [
   "frame-system-benchmarking",
   "frame-system/runtime-benchmarks",
   "pallet-timestamp/runtime-benchmarks",
-  "pallet-balances/runtime-benchmarks"
+  "pallet-balances/runtime-benchmarks",
 ]
 
 try-runtime = [
@@ -88,7 +89,7 @@ try-runtime = [
 
   "pallet-timestamp/try-runtime",
   "pallet-balances/try-runtime",
-  "pallet-transaction-payment/try-runtime"
+  "pallet-transaction-payment/try-runtime",
 ]
 
 default = ["std"]