Remove sp-crypto-ec-utils patch reintroduced in latest rebase

b892b0122e for reasoning.

.github/workflows/lint.yml

@@ -23,7 +23,7 @@ jobs:
           github-token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Install nightly rust
-        run: rustup toolchain install ${{ steps.nightly.outputs.version }} --profile minimal -t wasm32-unknown-unknown -c clippy
+        run: rustup toolchain install ${{ steps.nightly.outputs.version }} --profile minimal -t wasm32-unknown-unknown -c rust-src -c clippy
 
       - name: Run Clippy
         run: cargo +${{ steps.nightly.outputs.version }} clippy --all-features --all-targets -- -D warnings -A clippy::items_after_test_module

Cargo.toml

@@ -36,6 +36,12 @@ members = [
   "coordinator/tributary",
   "coordinator",
 
+  "substrate/tree-cleanup/is-terminal",
+  "substrate/tree-cleanup/option-ext",
+  "substrate/tree-cleanup/directories-next",
+  "substrate/tree-cleanup/bandersnatch_vrfs",
+  "substrate/tree-cleanup/w3f-bls",
+
   "substrate/primitives",
 
   "substrate/coins/primitives",
@@ -94,8 +100,34 @@ panic = "unwind"
 lazy_static = { git = "https://github.com/rust-lang-nursery/lazy-static.rs", rev = "5735630d46572f1e5377c8f2ba0f79d18f53b10c" }
 
 # subxt *can* pull these off crates.io yet there's no benefit to this
-sp-core-hashing = { git = "https://github.com/serai-dex/substrate" }
-sp-std = { git = "https://github.com/serai-dex/substrate" }
+sp-core-hashing = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental" }
+sp-std = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental" }
+
+# is-terminal now has an std-based solution with an equivalent API
+is-terminal = { path = "substrate/tree-cleanup/is-terminal" }
+# So does matches
+matches = { path = "substrate/tree-cleanup/matches" }
+
+# directories-next was created because directories was unmaintained
+# directories-next is now unmaintained while directories is maintained
+# The directories author pulls in ridiculously pointless crates and prefers
+# copyleft licenses
+# Serai's polkadot-sdk consolidated to directories-next, as directories-next is
+# acceptable and because we couldn't consolidate to directories without forking
+# wasmtime
+# The following two patches resolve everything
+option-ext = { path = "substrate/tree-cleanup/option-ext" }
+directories-next = { path = "substrate/tree-cleanup/directories-next" }
+
+# mach is unmaintained, so this wraps mach2 as mach
+mach = { path = "substrate/tree-cleanup/mach" }
+
+# cargo believes the following are in-tree despite no features activating them
+# We provide empty crates to not only prove they're unused, yet also clean up
+# our Cargo.lock
+w3f-bls = { path = "substrate/tree-cleanup/w3f-bls" }
+[patch."https://github.com/w3f/ring-vrf"]
+bandersnatch_vrfs = { path = "substrate/tree-cleanup/bandersnatch_vrfs" }
 
 [workspace.lints.clippy]
 unwrap_or_default = "allow"

coordinator/Cargo.toml

@@ -39,7 +39,7 @@ processor-messages = { package = "serai-processor-messages", path = "../processo
 message-queue = { package = "serai-message-queue", path = "../message-queue" }
 tributary = { package = "tributary-chain", path = "./tributary" }
 
-sp-application-crypto = { git = "https://github.com/serai-dex/substrate", default-features = false, features = ["std"] }
+sp-application-crypto = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false, features = ["std"] }
 serai-client = { path = "../substrate/client", default-features = false, features = ["serai", "borsh"] }
 
 hex = { version = "0.4", default-features = false, features = ["std"] }
@@ -54,8 +54,8 @@ libp2p = { version = "0.52", default-features = false, features = ["tokio", "tcp
 [dev-dependencies]
 futures-util = { version = "0.3", default-features = false, features = ["std"] }
 tributary = { package = "tributary-chain", path = "./tributary", features = ["tests"] }
-sp-application-crypto = { git = "https://github.com/serai-dex/substrate", default-features = false, features = ["std"] }
-sp-runtime = { git = "https://github.com/serai-dex/substrate", default-features = false, features = ["std"] }
+sp-application-crypto = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false, features = ["std"] }
+sp-runtime = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false, features = ["std"] }
 
 [features]
 parity-db = ["serai-db/parity-db"]

deny.toml

@@ -8,7 +8,6 @@ notice = "warn"
 unmaintained = "warn"
 
 ignore = [
-  "RUSTSEC-2021-0139", # https://github.com/serai-dex/serai/228
   "RUSTSEC-2022-0061", # https://github.com/serai-dex/serai/227
 ]
 
@@ -98,6 +97,6 @@ allow-registry = ["https://github.com/rust-lang/crates.io-index"]
 allow-git = [
   "https://github.com/rust-lang-nursery/lazy-static.rs",
   "https://github.com/serai-dex/substrate-bip39",
-  "https://github.com/serai-dex/substrate",
+  "https://github.com/serai-dex/polkadot-sdk",
   "https://github.com/monero-rs/base58-monero",
 ]

orchestration/Dockerfile.parts/Dockerfile.serai.build

@@ -11,7 +11,8 @@ RUN apt install -y pkg-config clang
 # Dependencies for the Serai node
 RUN apt install -y make protobuf-compiler
 
-# Add the wasm toolchain
+# Add the std src and wasm toolchain
+RUN rustup component add rust-src
 RUN rustup target add wasm32-unknown-unknown
 
 # Add files for build

orchestration/coordinator/Dockerfile

@@ -22,7 +22,8 @@ RUN apt install -y pkg-config clang
 # Dependencies for the Serai node
 RUN apt install -y make protobuf-compiler
 
-# Add the wasm toolchain
+# Add the std src and wasm toolchain
+RUN rustup component add rust-src
 RUN rustup target add wasm32-unknown-unknown
 
 # Add files for build

orchestration/message-queue/Dockerfile

@@ -22,7 +22,8 @@ RUN apt install -y pkg-config clang
 # Dependencies for the Serai node
 RUN apt install -y make protobuf-compiler
 
-# Add the wasm toolchain
+# Add the std src and wasm toolchain
+RUN rustup component add rust-src
 RUN rustup target add wasm32-unknown-unknown
 
 # Add files for build

orchestration/processor/bitcoin/Dockerfile

@@ -22,7 +22,8 @@ RUN apt install -y pkg-config clang
 # Dependencies for the Serai node
 RUN apt install -y make protobuf-compiler
 
-# Add the wasm toolchain
+# Add the std src and wasm toolchain
+RUN rustup component add rust-src
 RUN rustup target add wasm32-unknown-unknown
 
 # Add files for build

orchestration/processor/monero/Dockerfile

@@ -22,7 +22,8 @@ RUN apt install -y pkg-config clang
 # Dependencies for the Serai node
 RUN apt install -y make protobuf-compiler
 
-# Add the wasm toolchain
+# Add the std src and wasm toolchain
+RUN rustup component add rust-src
 RUN rustup target add wasm32-unknown-unknown
 
 # Add files for build

orchestration/runtime/Dockerfile

@@ -9,7 +9,8 @@ RUN rm -rf /etc/apt/sources.list.d/debian.sources && \
 # Install dependencies
 RUN apt install clang -y
 
-# Add the wasm toolchain
+# Add the std src and wasm toolchain
+RUN rustup component add rust-src
 RUN rustup target add wasm32-unknown-unknown
 
 # Add files for build

orchestration/serai/Dockerfile

@@ -22,7 +22,8 @@ RUN apt install -y pkg-config clang
 # Dependencies for the Serai node
 RUN apt install -y make protobuf-compiler
 
-# Add the wasm toolchain
+# Add the std src and wasm toolchain
+RUN rustup component add rust-src
 RUN rustup target add wasm32-unknown-unknown
 
 # Add files for build

processor/Cargo.toml

@@ -66,7 +66,7 @@ message-queue = { package = "serai-message-queue", path = "../message-queue", op
 [dev-dependencies]
 frost = { package = "modular-frost", path = "../crypto/frost", features = ["tests"] }
 
-sp-application-crypto = { git = "https://github.com/serai-dex/substrate", default-features = false, features = ["std"] }
+sp-application-crypto = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false, features = ["std"] }
 
 dockertest = "0.4"
 serai-docker-tests = { path = "../tests/docker" }

substrate/abi/Cargo.toml

@@ -22,11 +22,11 @@ scale-info = { version = "2", features = ["derive"] }
 borsh = { version = "1", features = ["derive", "de_strict_order"], optional = true }
 serde = { version = "1", features = ["derive", "alloc"], optional = true }
 
-sp-core = { git = "https://github.com/serai-dex/substrate" }
-sp-runtime = { git = "https://github.com/serai-dex/substrate" }
+sp-core = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental" }
+sp-runtime = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental" }
 
-sp-consensus-babe = { git = "https://github.com/serai-dex/substrate" }
-sp-consensus-grandpa = { git = "https://github.com/serai-dex/substrate" }
+sp-consensus-babe = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental" }
+sp-consensus-grandpa = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental" }
 
 serai-primitives = { path = "../primitives", version = "0.1" }
 serai-coins-primitives = { path = "../coins/primitives", version = "0.1" }
@@ -34,7 +34,7 @@ serai-validator-sets-primitives = { path = "../validator-sets/primitives", versi
 serai-in-instructions-primitives = { path = "../in-instructions/primitives", version = "0.1" }
 serai-signals-primitives = { path = "../signals/primitives", version = "0.1" }
 
-frame-support = { git = "https://github.com/serai-dex/substrate" }
+frame-support = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental" }
 
 [features]
 borsh = [

substrate/abi/src/lib.rs

@@ -41,7 +41,7 @@ pub enum TransactionPaymentEvent {
 pub enum Event {
   System(system::Event),
   Timestamp,
-  TransactionPayment(TransactionPaymentEvent),
+  TransactionPayment,
   Coins(coins::Event),
   LiquidityTokens(coins::Event),
   Dex(dex::Event),
@@ -65,7 +65,6 @@ pub struct Extra {
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 pub struct SignedPayloadExtra {
   pub spec_version: u32,
-  pub tx_version: u32,
   pub genesis: [u8; 32],
   pub mortality_checkpoint: [u8; 32],
 }

substrate/abi/src/system.rs

@@ -1,4 +1,5 @@
-use frame_support::dispatch::{DispatchInfo, DispatchError};
+use sp_runtime::DispatchError;
+use frame_support::dispatch::DispatchInfo;
 
 use serai_primitives::SeraiAddress;
 

substrate/client/Cargo.toml

@@ -27,9 +27,9 @@ serde_json = { version = "1", optional = true }
 
 serai-abi = { path = "../abi", version = "0.1" }
 
-sp-core = { git = "https://github.com/serai-dex/substrate", optional = true }
-sp-runtime = { git = "https://github.com/serai-dex/substrate", optional = true }
-frame-system = { git = "https://github.com/serai-dex/substrate", optional = true }
+sp-core = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", optional = true }
+sp-runtime = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", optional = true }
+frame-system = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", optional = true }
 
 async-lock = "3"
 

substrate/client/src/serai/mod.rs

@@ -167,7 +167,6 @@ impl Serai {
 
   pub fn sign(&self, signer: &Pair, call: Call, nonce: u32, tip: u64) -> Transaction {
     const SPEC_VERSION: u32 = 1;
-    const TX_VERSION: u32 = 1;
 
     let extra =
       Extra { era: sp_runtime::generic::Era::Immortal, nonce: Compact(nonce), tip: Compact(tip) };
@@ -176,7 +175,6 @@ impl Serai {
       &extra,
       SignedPayloadExtra {
         spec_version: SPEC_VERSION,
-        tx_version: TX_VERSION,
         genesis: self.genesis,
         mortality_checkpoint: self.genesis,
       },

substrate/coins/pallet/Cargo.toml

@@ -22,14 +22,14 @@ workspace = true
 scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] }
 scale-info = { version = "2", default-features = false, features = ["derive"] }
 
-frame-system = { git = "https://github.com/serai-dex/substrate", default-features = false }
-frame-support = { git = "https://github.com/serai-dex/substrate", default-features = false }
+frame-system = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false }
+frame-support = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false }
 
-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-runtime = { git = "https://github.com/serai-dex/substrate", default-features = false }
+sp-core = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false }
+sp-std = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false }
+sp-runtime = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false }
 
-pallet-transaction-payment = { git = "https://github.com/serai-dex/substrate", default-features = false }
+pallet-transaction-payment = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false }
 
 serai-primitives = { path = "../../primitives", default-features = false, features = ["serde"] }
 coins-primitives = { package = "serai-coins-primitives", path = "../primitives", default-features = false }

substrate/coins/primitives/Cargo.toml

@@ -26,7 +26,7 @@ scale-info = { version = "2", default-features = false, features = ["derive"] }
 serai-primitives = { path = "../../primitives", default-features = false }
 
 [dev-dependencies]
-sp-runtime = { git = "https://github.com/serai-dex/substrate", default-features = false }
+sp-runtime = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false }
 
 [features]
 std = ["zeroize", "borsh?/std", "serde?/std", "scale/std", "scale-info/std", "sp-runtime/std", "serai-primitives/std"]

substrate/dex/pallet/Cargo.toml

@@ -22,15 +22,15 @@ workspace = true
 scale = { package = "parity-scale-codec", version = "3.6.1", default-features = false }
 scale-info = { version = "2.5.0", default-features = false, features = ["derive"] }
 
-sp-std = { git = "https://github.com/serai-dex/substrate", default-features = false }
-sp-io = { git = "https://github.com/serai-dex/substrate", default-features = false }
-sp-api = { git = "https://github.com/serai-dex/substrate", default-features = false }
-sp-runtime = { git = "https://github.com/serai-dex/substrate", default-features = false }
-sp-core = { git = "https://github.com/serai-dex/substrate", default-features = false }
+sp-std = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false }
+sp-io = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false }
+sp-api = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false }
+sp-runtime = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false }
+sp-core = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false }
 
-frame-system = { git = "https://github.com/serai-dex/substrate", default-features = false }
-frame-support = { git = "https://github.com/serai-dex/substrate", default-features = false }
-frame-benchmarking = { git = "https://github.com/serai-dex/substrate", default-features = false, optional = true }
+frame-system = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false }
+frame-support = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false }
+frame-benchmarking = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false, optional = true }
 
 coins-pallet = { package = "serai-coins-pallet", path = "../../coins/pallet", default-features = false }
 

substrate/dex/pallet/src/mock.rs

@@ -68,11 +68,7 @@ impl frame_system::Config for Test {
   type Version = ();
   type PalletInfo = PalletInfo;
   type AccountData = ();
-  type OnNewAccount = ();
-  type OnKilledAccount = ();
   type SystemWeightInfo = ();
-  type SS58Prefix = ();
-  type OnSetCode = ();
   type MaxConsumers = ConstU32<16>;
 }
 

substrate/in-instructions/pallet/Cargo.toml

@@ -22,14 +22,14 @@ workspace = true
 scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive", "max-encoded-len"] }
 scale-info = { version = "2", default-features = false, features = ["derive"] }
 
-sp-std = { git = "https://github.com/serai-dex/substrate", default-features = false }
-sp-application-crypto = { git = "https://github.com/serai-dex/substrate", default-features = false }
-sp-io = { git = "https://github.com/serai-dex/substrate", default-features = false }
-sp-runtime = { git = "https://github.com/serai-dex/substrate", default-features = false }
-sp-core = { git = "https://github.com/serai-dex/substrate", default-features = false }
+sp-std = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false }
+sp-application-crypto = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false }
+sp-io = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false }
+sp-runtime = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false }
+sp-core = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false }
 
-frame-system = { git = "https://github.com/serai-dex/substrate", default-features = false }
-frame-support = { git = "https://github.com/serai-dex/substrate", default-features = false }
+frame-system = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false }
+frame-support = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false }
 
 serai-primitives = { path = "../../primitives", default-features = false }
 in-instructions-primitives = { package = "serai-in-instructions-primitives", path = "../primitives", default-features = false }

substrate/in-instructions/primitives/Cargo.toml

@@ -23,9 +23,9 @@ serde = { version = "1", default-features = false, features = ["derive", "alloc"
 scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] }
 scale-info = { version = "2", default-features = false, features = ["derive"] }
 
-sp-std = { git = "https://github.com/serai-dex/substrate", default-features = false }
-sp-application-crypto = { git = "https://github.com/serai-dex/substrate", default-features = false }
-sp-runtime = { git = "https://github.com/serai-dex/substrate", default-features = false }
+sp-std = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false }
+sp-application-crypto = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false }
+sp-runtime = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false }
 
 serai-primitives = { path = "../../primitives", default-features = false }
 coins-primitives = { package = "serai-coins-primitives", path = "../../coins/primitives", default-features = false }

substrate/node/Cargo.toml

@@ -23,45 +23,45 @@ name = "serai-node"
 clap = { version = "4", features = ["derive"] }
 
 futures = "0.3"
-jsonrpsee = { version = "0.16", features = ["server"] }
+jsonrpsee = { version = "0.20", features = ["server"] }
 
-sp-core = { git = "https://github.com/serai-dex/substrate" }
-sp-timestamp = { git = "https://github.com/serai-dex/substrate" }
-sp-io = { git = "https://github.com/serai-dex/substrate" }
-sp-blockchain = { git = "https://github.com/serai-dex/substrate" }
-sp-api = { git = "https://github.com/serai-dex/substrate" }
-sp-block-builder = { git = "https://github.com/serai-dex/substrate" }
-sp-consensus-babe = { git = "https://github.com/serai-dex/substrate" }
+sp-core = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental" }
+sp-timestamp = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental" }
+sp-io = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental" }
+sp-blockchain = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental" }
+sp-api = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental" }
+sp-block-builder = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental" }
+sp-consensus-babe = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental" }
 
-frame-benchmarking = { git = "https://github.com/serai-dex/substrate" }
+frame-benchmarking = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental" }
 
 serai-runtime = { path = "../runtime", features = ["std"] }
 
-sc-offchain = { 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-basic-authorship = { git = "https://github.com/serai-dex/substrate" }
-sc-executor = { git = "https://github.com/serai-dex/substrate" }
-sc-service = { git = "https://github.com/serai-dex/substrate" }
-sc-client-api = { git = "https://github.com/serai-dex/substrate" }
-sc-network-common = { git = "https://github.com/serai-dex/substrate" }
-sc-network = { git = "https://github.com/serai-dex/substrate" }
+sc-offchain = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental" }
+sc-transaction-pool = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental" }
+sc-transaction-pool-api = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental" }
+sc-basic-authorship = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental" }
+sc-executor = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental" }
+sc-service = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental" }
+sc-client-api = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental" }
+sc-network-sync = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental" }
+sc-network = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental" }
 
-sc-consensus = { git = "https://github.com/serai-dex/substrate" }
-sc-consensus-babe = { git = "https://github.com/serai-dex/substrate" }
-sc-consensus-grandpa = { git = "https://github.com/serai-dex/substrate" }
-sc-authority-discovery = { git = "https://github.com/serai-dex/substrate" }
+sc-consensus = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental" }
+sc-consensus-babe = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental" }
+sc-consensus-grandpa = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental" }
+sc-authority-discovery = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental" }
 
-sc-telemetry = { git = "https://github.com/serai-dex/substrate" }
-sc-cli = { git = "https://github.com/serai-dex/substrate" }
+sc-telemetry = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental" }
+sc-cli = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental" }
 
-sc-rpc-api = { git = "https://github.com/serai-dex/substrate" }
+sc-rpc-api = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental" }
 
-substrate-frame-rpc-system = { git = "https://github.com/serai-dex/substrate" }
-pallet-transaction-payment-rpc = { git = "https://github.com/serai-dex/substrate" }
+substrate-frame-rpc-system = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental" }
+pallet-transaction-payment-rpc = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental" }
 
 [build-dependencies]
-substrate-build-script-utils = { git = "https://github.com/serai-dex/substrate" }
+substrate-build-script-utils = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental" }
 
 [features]
 default = []

substrate/node/src/chain_spec.rs

@@ -16,13 +16,12 @@ fn account_from_name(name: &'static str) -> PublicKey {
 }
 
 fn testnet_genesis(
-  wasm_binary: &[u8],
   validators: &[&'static str],
   endowed_accounts: Vec<PublicKey>,
 ) -> RuntimeGenesisConfig {
   let validators = validators.iter().map(|name| account_from_name(name)).collect::<Vec<_>>();
   RuntimeGenesisConfig {
-    system: SystemConfig { code: wasm_binary.to_vec(), _config: PhantomData },
+    system: SystemConfig { _config: PhantomData },
 
     transaction_payment: Default::default(),
 
@@ -67,6 +66,7 @@ fn testnet_genesis(
 pub fn development_config() -> Result<ChainSpec, &'static str> {
   let wasm_binary = WASM_BINARY.ok_or("Development wasm not available")?;
 
+  #[allow(deprecated)]
   Ok(ChainSpec::from_genesis(
     // Name
     "Development Network",
@@ -75,7 +75,6 @@ pub fn development_config() -> Result<ChainSpec, &'static str> {
     ChainType::Development,
     || {
       testnet_genesis(
-        wasm_binary,
         &["Alice"],
         vec![
           account_from_name("Alice"),
@@ -99,12 +98,15 @@ pub fn development_config() -> Result<ChainSpec, &'static str> {
     None,
     // Extensions
     None,
+    // Code
+    wasm_binary,
   ))
 }
 
 pub fn testnet_config() -> Result<ChainSpec, &'static str> {
   let wasm_binary = WASM_BINARY.ok_or("Testnet wasm not available")?;
 
+  #[allow(deprecated)]
   Ok(ChainSpec::from_genesis(
     // Name
     "Local Test Network",
@@ -113,7 +115,6 @@ pub fn testnet_config() -> Result<ChainSpec, &'static str> {
     ChainType::Local,
     || {
       testnet_genesis(
-        wasm_binary,
         &["Alice", "Bob", "Charlie", "Dave"],
         vec![
           account_from_name("Alice"),
@@ -137,5 +138,7 @@ pub fn testnet_config() -> Result<ChainSpec, &'static str> {
     None,
     // Extensions
     None,
+    // Code
+    wasm_binary,
   ))
 }

substrate/node/src/service.rs

@@ -8,7 +8,7 @@ use sp_consensus_babe::{SlotDuration, inherents::InherentDataProvider as BabeInh
 use sp_io::SubstrateHostFunctions;
 use sc_executor::{sp_wasm_interface::ExtendedHostFunctions, WasmExecutor};
 
-use sc_network_common::sync::warp::WarpSyncParams;
+use sc_network_sync::warp::WarpSyncParams;
 use sc_network::{Event, NetworkEventStream};
 use sc_service::{error::Error as ServiceError, Configuration, TaskManager, TFullClient};
 
@@ -40,7 +40,7 @@ type PartialComponents = sc_service::PartialComponents<
   FullClient,
   FullBackend,
   SelectChain,
-  sc_consensus::DefaultImportQueue<Block, FullClient>,
+  sc_consensus::DefaultImportQueue<Block>,
   sc_transaction_pool::FullPool<Block, FullClient>,
   (
     BabeBlockImport,
@@ -104,6 +104,7 @@ pub fn new_partial(config: &Configuration) -> Result<PartialComponents, ServiceE
 
   let (grandpa_block_import, grandpa_link) = grandpa::block_import(
     client.clone(),
+    512,
     &client,
     select_chain.clone(),
     telemetry.as_ref().map(Telemetry::handle),
@@ -186,6 +187,8 @@ pub fn new_full(config: Configuration) -> Result<TaskManager, ServiceError> {
       import_queue,
       block_announce_validator_builder: None,
       warp_sync_params: Some(WarpSyncParams::WithProvider(warp_sync)),
+      // TODO: Add a BlockRequestHandler here
+      block_relay: None,
     })?;
 
   if config.offchain_worker.enabled {
@@ -199,7 +202,6 @@ pub fn new_full(config: Configuration) -> Result<TaskManager, ServiceError> {
         offchain_db: backend.offchain_storage(),
         transaction_pool: Some(OffchainTransactionPoolFactory::new(transaction_pool.clone())),
         network_provider: network.clone(),
-        enable_http_requests: true,
         custom_extensions: |_| vec![],
       })
       .run(client.clone(), task_manager.spawn_handle()),
@@ -311,7 +313,9 @@ pub fn new_full(config: Configuration) -> Result<TaskManager, ServiceError> {
       grandpa::run_grandpa_voter(grandpa::GrandpaParams {
         config: grandpa::Config {
           gossip_duration: std::time::Duration::from_millis(333),
-          justification_period: 512,
+          // This is the delay between generating justifications for blocks
+          // We attemopt to generate a justification for every block
+          justification_generation_period: 1,
           name: Some(name),
           observer_enabled: false,
           keystore: if role.is_authority() { Some(keystore) } else { None },

substrate/primitives/Cargo.toml

@@ -24,11 +24,11 @@ scale-info = { version = "2", default-features = false, features = ["derive"] }
 borsh = { version = "1", default-features = false, features = ["derive", "de_strict_order"], optional = true }
 serde = { version = "1", default-features = false, features = ["derive", "alloc"], optional = true }
 
-sp-application-crypto = { git = "https://github.com/serai-dex/substrate", default-features = false }
-sp-core = { git = "https://github.com/serai-dex/substrate", default-features = false }
-sp-runtime = { git = "https://github.com/serai-dex/substrate", default-features = false }
+sp-application-crypto = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false }
+sp-core = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false }
+sp-runtime = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false }
 
-frame-support = { git = "https://github.com/serai-dex/substrate", default-features = false }
+frame-support = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false }
 
 [features]
 std = ["zeroize", "scale/std", "borsh?/std", "serde?/std", "scale-info/std", "sp-core/std", "sp-runtime/std", "frame-support/std"]

substrate/runtime/Cargo.toml

@@ -22,36 +22,36 @@ workspace = true
 scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] }
 scale-info = { version = "2", default-features = false, features = ["derive"] }
 
-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-core = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false }
+sp-std = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false }
 
-sp-offchain = { 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/polkadot-sdk", branch = "experimental", default-features = false }
+sp-version = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false }
+sp-inherents = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false }
 
-sp-session = { git = "https://github.com/serai-dex/substrate", default-features = false }
-sp-consensus-babe = { git = "https://github.com/serai-dex/substrate", default-features = false }
-sp-consensus-grandpa = { git = "https://github.com/serai-dex/substrate", default-features = false }
+sp-session = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false }
+sp-consensus-babe = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false }
+sp-consensus-grandpa = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false }
 
-sp-authority-discovery = { git = "https://github.com/serai-dex/substrate", default-features = false }
+sp-authority-discovery = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", 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-transaction-pool = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false }
+sp-block-builder = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", 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 }
+sp-runtime = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false }
+sp-api = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false }
 
-frame-system = { git = "https://github.com/serai-dex/substrate", default-features = false }
-frame-support = { git = "https://github.com/serai-dex/substrate", default-features = false }
-frame-executive = { git = "https://github.com/serai-dex/substrate", default-features = false }
-frame-benchmarking = { git = "https://github.com/serai-dex/substrate", default-features = false, optional = true }
+frame-system = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false }
+frame-support = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false }
+frame-executive = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false }
+frame-benchmarking = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false, optional = true }
 
 serai-primitives = { path = "../primitives", default-features = false }
 
-pallet-timestamp = { git = "https://github.com/serai-dex/substrate", default-features = false }
-pallet-authorship = { git = "https://github.com/serai-dex/substrate", default-features = false }
+pallet-timestamp = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false }
+pallet-authorship = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false }
 
-pallet-transaction-payment = { git = "https://github.com/serai-dex/substrate", default-features = false }
+pallet-transaction-payment = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false }
 
 coins-pallet = { package = "serai-coins-pallet", path = "../coins/pallet", default-features = false }
 dex-pallet = { package = "serai-dex-pallet", path = "../dex/pallet", default-features = false }
@@ -62,14 +62,14 @@ in-instructions-pallet = { package = "serai-in-instructions-pallet", path = "../
 
 signals-pallet = { package = "serai-signals-pallet", path = "../signals/pallet", default-features = false }
 
-pallet-babe = { git = "https://github.com/serai-dex/substrate", default-features = false }
-pallet-grandpa = { git = "https://github.com/serai-dex/substrate", default-features = false }
+pallet-babe = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false }
+pallet-grandpa = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false }
 
-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 }
+frame-system-rpc-runtime-api = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false }
+pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false }
 
 [build-dependencies]
-substrate-wasm-builder = { git = "https://github.com/serai-dex/substrate" }
+substrate-wasm-builder = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental" }
 
 [features]
 std = [

substrate/runtime/src/lib.rs

@@ -36,8 +36,6 @@ use sp_core::OpaqueMetadata;
 use sp_std::prelude::*;
 
 use sp_version::RuntimeVersion;
-#[cfg(feature = "std")]
-use sp_version::NativeVersion;
 
 use sp_runtime::{
   create_runtime_str, generic, impl_opaque_keys, KeyTypeId,
@@ -72,7 +70,6 @@ pub type Hash = sp_core::H256;
 pub type SignedExtra = (
   system::CheckNonZeroSender<Runtime>,
   system::CheckSpecVersion<Runtime>,
-  system::CheckTxVersion<Runtime>,
   system::CheckGenesis<Runtime>,
   system::CheckEra<Runtime>,
   system::CheckNonce<Runtime>,
@@ -100,17 +97,10 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
   spec_name: create_runtime_str!("serai"),
   impl_name: create_runtime_str!("core"),
   spec_version: 1,
-  impl_version: 1,
   apis: RUNTIME_API_VERSIONS,
-  transaction_version: 1,
   state_version: 1,
 };
 
-#[cfg(feature = "std")]
-pub fn native_version() -> NativeVersion {
-  NativeVersion { runtime_version: VERSION, can_author_with: Default::default() }
-}
-
 // 1 MB
 pub const BLOCK_SIZE: u32 = 1024 * 1024;
 // 6 seconds
@@ -170,13 +160,13 @@ impl Contains<RuntimeCall> for CallFilter {
       RuntimeCall::Babe(call) => match call {
         babe::Call::report_equivocation { .. } |
         babe::Call::report_equivocation_unsigned { .. } => true,
-        babe::Call::plan_config_change { .. } | babe::Call::__Ignore(_, _) => false,
+        babe::Call::__Ignore(_, _) => false,
       },
 
       RuntimeCall::Grandpa(call) => match call {
         grandpa::Call::report_equivocation { .. } |
         grandpa::Call::report_equivocation_unsigned { .. } => true,
-        grandpa::Call::note_stalled { .. } | grandpa::Call::__Ignore(_, _) => false,
+        grandpa::Call::__Ignore(_, _) => false,
       },
     }
   }
@@ -200,13 +190,8 @@ impl system::Config for Runtime {
   type Version = Version;
   type PalletInfo = PalletInfo;
 
-  type OnNewAccount = ();
-  type OnKilledAccount = ();
-  type OnSetCode = ();
-
   type AccountData = ();
   type SystemWeightInfo = ();
-  type SS58Prefix = SS58Prefix; // TODO: Remove for Bech32m
 
   type MaxConsumers = support::traits::ConstU32<16>;
 }
@@ -219,7 +204,6 @@ impl timestamp::Config for Runtime {
 }
 
 impl transaction_payment::Config for Runtime {
-  type RuntimeEvent = RuntimeEvent;
   type OnChargeTransaction = Coins;
   type OperationalFeeMultiplier = ConstU8<5>;
   type WeightToFee = IdentityFee<SubstrateAmount>;
@@ -308,6 +292,7 @@ impl babe::Config for Runtime {
 
   type WeightInfo = ();
   type MaxAuthorities = MaxAuthorities;
+  type MaxNominators = ConstU32<1>;
 
   type KeyOwnerProof = MembershipProof<Self>;
   type EquivocationReportSystem =
@@ -318,7 +303,9 @@ impl grandpa::Config for Runtime {
   type RuntimeEvent = RuntimeEvent;
 
   type WeightInfo = ();
+
   type MaxAuthorities = MaxAuthorities;
+  type MaxNominators = ConstU32<1>;
 
   type MaxSetIdSessionEntries = ConstU64<0>;
   type KeyOwnerProof = MembershipProof<Self>;

substrate/signals/pallet/Cargo.toml

@@ -22,11 +22,11 @@ workspace = true
 scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] }
 scale-info = { version = "2", default-features = false, features = ["derive"] }
 
-sp-core = { git = "https://github.com/serai-dex/substrate", default-features = false }
-sp-io = { git = "https://github.com/serai-dex/substrate", default-features = false }
+sp-core = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false }
+sp-io = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false }
 
-frame-system = { git = "https://github.com/serai-dex/substrate", default-features = false }
-frame-support = { git = "https://github.com/serai-dex/substrate", default-features = false }
+frame-system = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false }
+frame-support = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false }
 
 serai-primitives = { path = "../../primitives", default-features = false }
 serai-signals-primitives = { path = "../primitives", default-features = false }

substrate/signals/pallet/src/lib.rs

@@ -14,7 +14,7 @@ pub mod pallet {
   use sp_io::hashing::blake2_256;
 
   use frame_system::pallet_prelude::*;
-  use frame_support::{pallet_prelude::*, sp_runtime};
+  use frame_support::pallet_prelude::*;
 
   use serai_primitives::*;
   use serai_signals_primitives::SignalId;

substrate/tree-cleanup/bandersnatch_vrfs/Cargo.toml

@@ -0,0 +1,18 @@
+[package]
+name = "bandersnatch_vrfs"
+version = "0.0.4"
+description = "Empty library to remove the unused bandersnatch_vrfs from the Cargo.lock"
+license = "MIT"
+repository = "https://github.com/serai-dex/serai/tree/develop/substrate/tree-cleanup/bandersnatch_vrfs"
+authors = ["Luke Parker <lukeparker5132@gmail.com>"]
+keywords = []
+edition = "2021"
+rust-version = "1.74"
+
+[package.metadata.docs.rs]
+all-features = true
+rustdoc-args = ["--cfg", "docsrs"]
+
+[features]
+std = []
+substrate-curves = []

substrate/tree-cleanup/bandersnatch_vrfs/src/lib.rs

@@ -0,0 +1 @@
+

substrate/tree-cleanup/directories-next/Cargo.toml

@@ -0,0 +1,17 @@
+[package]
+name = "directories-next"
+version = "2.0.0"
+description = "Patch from directories-next back to directories"
+license = "MIT"
+repository = "https://github.com/serai-dex/serai/tree/develop/substrate/tree-cleanup/directories-next"
+authors = ["Luke Parker <lukeparker5132@gmail.com>"]
+keywords = []
+edition = "2021"
+rust-version = "1.74"
+
+[package.metadata.docs.rs]
+all-features = true
+rustdoc-args = ["--cfg", "docsrs"]
+
+[dependencies]
+directories = "5"

substrate/tree-cleanup/directories-next/src/lib.rs

@@ -0,0 +1 @@
+pub use directories::*;

substrate/tree-cleanup/is-terminal/Cargo.toml

@@ -0,0 +1,14 @@
+[package]
+name = "is-terminal"
+version = "0.4.9"
+description = "is-termiunal written around std::io::IsTerminal"
+license = "MIT"
+repository = "https://github.com/serai-dex/serai/tree/develop/substrate/tree-cleanup/is-terminal"
+authors = ["Luke Parker <lukeparker5132@gmail.com>"]
+keywords = []
+edition = "2021"
+rust-version = "1.70"
+
+[package.metadata.docs.rs]
+all-features = true
+rustdoc-args = ["--cfg", "docsrs"]

substrate/tree-cleanup/is-terminal/src/lib.rs

@@ -0,0 +1 @@
+pub use std::io::IsTerminal;

substrate/tree-cleanup/mach/Cargo.toml

@@ -0,0 +1,17 @@
+[package]
+name = "mach"
+version = "0.3.2"
+description = "Replacement for mach which uses the mach2 implementation"
+license = "MIT"
+repository = "https://github.com/serai-dex/serai/tree/develop/substrate/tree-cleanup/mach"
+authors = ["Luke Parker <lukeparker5132@gmail.com>"]
+keywords = []
+edition = "2021"
+rust-version = "1.242"
+
+[package.metadata.docs.rs]
+all-features = true
+rustdoc-args = ["--cfg", "docsrs"]
+
+[dependencies]
+mach2 = "0.4"

substrate/tree-cleanup/mach/src/lib.rs

@@ -0,0 +1 @@
+pub use mach2::*;

substrate/tree-cleanup/matches/Cargo.toml

@@ -0,0 +1,14 @@
+[package]
+name = "matches"
+version = "0.1.10"
+description = "Replacement for the matches polyfill which uses the std impl"
+license = "MIT"
+repository = "https://github.com/serai-dex/serai/tree/develop/substrate/tree-cleanup/matches"
+authors = ["Luke Parker <lukeparker5132@gmail.com>"]
+keywords = []
+edition = "2021"
+rust-version = "1.56"
+
+[package.metadata.docs.rs]
+all-features = true
+rustdoc-args = ["--cfg", "docsrs"]

substrate/tree-cleanup/matches/src/lib.rs

@@ -0,0 +1 @@
+pub use std::matches;

substrate/tree-cleanup/option-ext/Cargo.toml

@@ -0,0 +1,14 @@
+[package]
+name = "option-ext"
+version = "0.2.0"
+description = "Non-MPL option-ext with the exactly needed API for directories"
+license = "MIT"
+repository = "https://github.com/serai-dex/serai/tree/develop/substrate/tree-cleanup/option-ext"
+authors = ["Luke Parker <lukeparker5132@gmail.com>"]
+keywords = []
+edition = "2021"
+rust-version = "1.74"
+
+[package.metadata.docs.rs]
+all-features = true
+rustdoc-args = ["--cfg", "docsrs"]

substrate/tree-cleanup/option-ext/src/lib.rs

@@ -0,0 +1,8 @@
+pub trait OptionExt<T: PartialEq> {
+  fn contains(&self, x: &T) -> bool;
+}
+impl<T: PartialEq> OptionExt<T> for Option<T> {
+  fn contains(&self, x: &T) -> bool {
+    self.as_ref() == Some(x)
+  }
+}

substrate/tree-cleanup/w3f-bls/Cargo.toml

@@ -0,0 +1,17 @@
+[package]
+name = "w3f-bls"
+version = "0.1.3"
+description = "Empty library to remove the unused w3f-bls from the Cargo.lock"
+license = "MIT"
+repository = "https://github.com/serai-dex/serai/tree/develop/substrate/tree-cleanup/w3f-bls"
+authors = ["Luke Parker <lukeparker5132@gmail.com>"]
+keywords = []
+edition = "2021"
+rust-version = "1.74"
+
+[package.metadata.docs.rs]
+all-features = true
+rustdoc-args = ["--cfg", "docsrs"]
+
+[features]
+std = []

substrate/tree-cleanup/w3f-bls/src/lib.rs

@@ -0,0 +1 @@
+

substrate/validator-sets/pallet/Cargo.toml

@@ -24,19 +24,19 @@ hashbrown = { version = "0.14", default-features = false, features = ["ahash", "
 scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] }
 scale-info = { version = "2", default-features = false, features = ["derive"] }
 
-sp-core = { git = "https://github.com/serai-dex/substrate", default-features = false }
-sp-io = { git = "https://github.com/serai-dex/substrate", default-features = false }
-sp-std = { git = "https://github.com/serai-dex/substrate", default-features = false }
-sp-application-crypto = { git = "https://github.com/serai-dex/substrate", default-features = false }
-sp-runtime = { git = "https://github.com/serai-dex/substrate", default-features = false }
-sp-session = { git = "https://github.com/serai-dex/substrate", default-features = false }
-sp-staking = { git = "https://github.com/serai-dex/substrate", default-features = false }
+sp-core = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false }
+sp-io = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false }
+sp-std = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false }
+sp-application-crypto = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false }
+sp-runtime = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false }
+sp-session = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false }
+sp-staking = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false }
 
-frame-system = { git = "https://github.com/serai-dex/substrate", default-features = false }
-frame-support = { git = "https://github.com/serai-dex/substrate", default-features = false }
+frame-system = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false }
+frame-support = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false }
 
-pallet-babe = { git = "https://github.com/serai-dex/substrate", default-features = false }
-pallet-grandpa = { git = "https://github.com/serai-dex/substrate", default-features = false }
+pallet-babe = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false }
+pallet-grandpa = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false }
 
 serai-primitives = { path = "../../primitives", default-features = false }
 validator-sets-primitives = { package = "serai-validator-sets-primitives", path = "../primitives", default-features = false }

substrate/validator-sets/primitives/Cargo.toml

@@ -27,8 +27,8 @@ serde = { version = "1", default-features = false, features = ["derive", "alloc"
 scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive", "max-encoded-len"] }
 scale-info = { version = "2", default-features = false, features = ["derive"] }
 
-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-core = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false }
+sp-std = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false }
 
 serai-primitives = { path = "../../primitives", default-features = false }