Fix compilation

opentensor · Dec 2, 2024 · 6642454 · 6642454
1 parent f505fc8
commit 6642454
Show file tree

Hide file tree

Showing 9 changed files with 12,222 additions and 34 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -55,7 +55,6 @@ rayon = "1"
 build-print = "0.1"
 cargo-husky = { version = "1", default-features = false }
 clap = "4.5.4"
-codec = { version = "3.2.2", default-features = false }
 ed25519-dalek = { version = "2.1.0", default-features = false, features = [
 	"alloc",
 ] }
@@ -69,7 +68,7 @@ memmap2 = "0.9.4"
 ndarray = { version = "0.15.6", default-features = false }
 parity-util-mem = "0.12.0"
 rand = "0.8.5"
-scale-codec = { package = "parity-scale-codec", version = "3.6.12", default-features = false, features = [
+codec = { package = "parity-scale-codec", version = "3.6.12", default-features = false, features = [
 	"derive",
 ] }
 scale-info = { version = "2.11.2", default-features = false }

diff --git a/node/Cargo.toml b/node/Cargo.toml
@@ -23,7 +23,6 @@ name = "node-subtensor"
 async-trait = { workspace = true }
 clap = { workspace = true, features = ["derive"] }
 futures = { workspace = true, features = ["thread-pool"] }
-scale-codec = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
 
 # Storage import
@@ -45,7 +44,6 @@ sp-consensus-aura = { workspace = true }
 sp-consensus = { workspace = true }
 sc-consensus = { workspace = true }
 sc-consensus-grandpa = { workspace = true }
-sc-consensus-grandpa-rpc = { workspace = true }
 sp-consensus-grandpa = { workspace = true }
 sc-chain-spec-derive = { workspace = true }
 sc-chain-spec = { workspace = true }

diff --git a/pallets/admin-utils/Cargo.toml b/pallets/admin-utils/Cargo.toml
@@ -17,9 +17,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 subtensor-macros.workspace = true
-codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = [
-	"derive",
-] }
+codec = { workspace = true }
 scale-info = { workspace = true, features = ["derive"] }
 frame-benchmarking = { workspace = true, optional = true }
 frame-support = { workspace = true }

diff --git a/pallets/collective/Cargo.toml b/pallets/collective/Cargo.toml
@@ -17,9 +17,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 subtensor-macros.workspace = true
-codec = { package = "parity-scale-codec", version = "3.2.2", default-features = false, features = [
-	"derive",
-] }
+codec = { workspace = true }
 log = { workspace = true }
 scale-info = { workspace = true, features = ["derive"] }
 frame-benchmarking = { workspace = true, optional = true }
@@ -56,5 +54,5 @@ runtime-benchmarks = [
 try-runtime = [
 	"frame-support/try-runtime",
 	"frame-system/try-runtime",
-	"sp-runtime/try-runtime"
+	"sp-runtime/try-runtime",
 ]
diff --git a/pallets/commitments/Cargo.toml b/pallets/commitments/Cargo.toml
@@ -17,10 +17,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 subtensor-macros.workspace = true
-codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = [
-	"derive",
-	"max-encoded-len",
-] }
+codec = { workspace = true, features = ["derive", "max-encoded-len"] }
 scale-info = { workspace = true, features = ["derive"] }
 frame-benchmarking = { workspace = true, optional = true }
 frame-support = { workspace = true }
@@ -50,18 +47,18 @@ std = [
 	"enumflags2/std",
 	"pallet-balances/std",
 	"sp-core/std",
-	"sp-io/std"
+	"sp-io/std",
 ]
 runtime-benchmarks = [
 	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
-	"pallet-balances/runtime-benchmarks"
+	"pallet-balances/runtime-benchmarks",
 ]
 try-runtime = [
 	"frame-support/try-runtime",
 	"frame-system/try-runtime",
 	"pallet-balances/try-runtime",
-	"sp-runtime/try-runtime"
+	"sp-runtime/try-runtime",
 ]
diff --git a/pallets/registry/Cargo.toml b/pallets/registry/Cargo.toml
@@ -17,10 +17,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 subtensor-macros.workspace = true
-codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = [
-	"derive",
-	"max-encoded-len",
-] }
+codec = { workspace = true, features = ["derive", "max-encoded-len"] }
 scale-info = { workspace = true, features = ["derive"] }
 frame-benchmarking = { workspace = true, optional = true }
 frame-support = { workspace = true }
@@ -48,7 +45,7 @@ std = [
 	"sp-runtime/std",
 	"enumflags2/std",
 	"sp-core/std",
-	"sp-io/std"
+	"sp-io/std",
 ]
 runtime-benchmarks = [
 	"frame-benchmarking/runtime-benchmarks",
@@ -59,5 +56,5 @@ runtime-benchmarks = [
 try-runtime = [
 	"frame-support/try-runtime",
 	"frame-system/try-runtime",
-	"sp-runtime/try-runtime"
+	"sp-runtime/try-runtime",
 ]
diff --git a/pallets/subtensor/Cargo.toml b/pallets/subtensor/Cargo.toml
@@ -17,9 +17,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 subtensor-macros.workspace = true
-codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = [
-	"derive",
-] }
+codec = { workspace = true }
 sp-core = { workspace = true }
 pallet-balances = { workspace = true }
 scale-info = { workspace = true, features = ["derive"] }

diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml
@@ -25,9 +25,7 @@ subtensor-macros.workspace = true
 subtensor-custom-rpc-runtime-api = { workspace = true }
 smallvec = { workspace = true }
 log = { workspace = true }
-codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = [
-	"derive",
-] }
+codec = { workspace = true }
 scale-info = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true, features = ["alloc"] }
 pallet-aura = { workspace = true }
@@ -108,7 +106,6 @@ pallet-evm-chain-id = { workspace = true }
 pallet-evm-precompile-modexp = { workspace = true }
 pallet-evm-precompile-sha3fips = { workspace = true }
 pallet-evm-precompile-simple = { workspace = true }
-pallet-hotfix-sufficients = { workspace = true }
 fp-account = { workspace = true }
 
 [dev-dependencies]
@@ -191,7 +188,6 @@ std = [
 	"pallet-evm-precompile-modexp/std",
 	"pallet-evm-precompile-sha3fips/std",
 	"pallet-evm-precompile-simple/std",
-	"pallet-hotfix-sufficients/std",
 	"fp-account/std",
 ]
 runtime-benchmarks = [
@@ -220,7 +216,6 @@ runtime-benchmarks = [
 	# EVM + Frontier
 	"pallet-ethereum/runtime-benchmarks",
 	"pallet-evm/runtime-benchmarks",
-    "pallet-hotfix-sufficients/runtime-benchmarks",
 ]
 try-runtime = [
 	"frame-try-runtime/try-runtime",
@@ -231,7 +226,6 @@ try-runtime = [
 	"pallet-sudo/try-runtime",
 	"pallet-balances/try-runtime",
 	"pallet-grandpa/try-runtime",
-	"pallet-hotfix-sufficients/try-runtime",
 	"pallet-insecure-randomness-collective-flip/try-runtime",
 	"pallet-timestamp/try-runtime",
 	"pallet-transaction-payment/try-runtime",