Begin work on the new RPC for the new node

.github/actions/bitcoin/action.yml

@@ -5,7 +5,7 @@ inputs:
   version:
     description: "Version to download and run"
     required: false
-    default: "29.1"
+    default: "30.0"
 
 runs:
   using: "composite"

.github/actions/build-dependencies/action.yml

@@ -52,9 +52,9 @@ runs:
     - name: Install solc
       shell: bash
       run: |
-        cargo +1.90 install svm-rs --version =0.5.19
+        cargo +1.91 install svm-rs --version =0.5.19
-        svm install 0.8.26
+        svm install 0.8.29
-        svm use 0.8.26
+        svm use 0.8.29
 
     - name: Remove preinstalled Docker
       shell: bash

.github/actions/monero-wallet-rpc/action.yml

@@ -5,7 +5,7 @@ inputs:
   version:
     description: "Version to download and run"
     required: false
-    default: v0.18.3.4
+    default: v0.18.4.3
 
 runs:
   using: "composite"

.github/actions/monero/action.yml

@@ -5,7 +5,7 @@ inputs:
   version:
     description: "Version to download and run"
     required: false
-    default: v0.18.3.4
+    default: v0.18.4.3
 
 runs:
   using: "composite"

.github/actions/test-dependencies/action.yml

@@ -5,12 +5,12 @@ inputs:
   monero-version:
     description: "Monero version to download and run as a regtest node"
     required: false
-    default: v0.18.3.4
+    default: v0.18.4.3
 
   bitcoin-version:
     description: "Bitcoin version to download and run as a regtest node"
     required: false
-    default: "29.1"
+    default: "30.0"
 
 runs:
   using: "composite"

.github/workflows/daily-deny.yml

@@ -18,7 +18,7 @@ jobs:
           key: rust-advisory-db
 
       - name: Install cargo deny
-        run: cargo +1.90 install cargo-deny --version =0.18.4
+        run: cargo +1.91 install cargo-deny --version =0.18.5
 
       - name: Run cargo deny
         run: cargo deny -L error --all-features check --hide-inclusion-graph

.github/workflows/lint.yml

@@ -52,7 +52,7 @@ jobs:
           key: rust-advisory-db
 
       - name: Install cargo deny
-        run: cargo +1.90 install cargo-deny --version =0.18.4
+        run: cargo +1.91 install cargo-deny --version =0.18.5
 
       - name: Run cargo deny
         run: cargo deny -L error --all-features check --hide-inclusion-graph
@@ -88,8 +88,8 @@ jobs:
       - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac
       - name: Verify all dependencies are in use
         run: |
-          cargo +1.90 install cargo-machete --version =0.9.1
+          cargo +1.91 install cargo-machete --version =0.9.1
-          cargo +1.90 machete
+          cargo +1.91 machete
 
   msrv:
     runs-on: ubuntu-latest
@@ -98,7 +98,7 @@ jobs:
       - name: Verify claimed `rust-version`
         shell: bash
         run: |
-          cargo +1.90 install cargo-msrv --version =0.18.4
+          cargo +1.91 install cargo-msrv --version =0.18.4
 
           function check_msrv {
             # We `cd` into the directory passed as the first argument, but will return to the
@@ -190,12 +190,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac
+
+      - name: Build Dependencies
+        uses: ./.github/actions/build-dependencies
+
       - name: Slither
         run: |
-          python3 -m pip install solc-select
-          solc-select install 0.8.26
-          solc-select use 0.8.26
-
           python3 -m pip install slither-analyzer
 
           slither --include-paths ./networks/ethereum/schnorr/contracts/Schnorr.sol

.github/workflows/tests.yml

@@ -109,4 +109,5 @@ jobs:
           GITHUB_CI=true RUST_BACKTRACE=1 cargo test --all-features -p serai-client-bitcoin
           GITHUB_CI=true RUST_BACKTRACE=1 cargo test --all-features -p serai-client-ethereum
           GITHUB_CI=true RUST_BACKTRACE=1 cargo test --all-features -p serai-client-monero
+          GITHUB_CI=true RUST_BACKTRACE=1 cargo test --all-features -p serai-client-serai
           GITHUB_CI=true RUST_BACKTRACE=1 cargo test --all-features -p serai-client

Cargo.toml

@@ -96,6 +96,7 @@ members = [
   "substrate/client/bitcoin",
   "substrate/client/ethereum",
   "substrate/client/monero",
+  "substrate/client/serai",
   "substrate/client",
 
   "orchestration",

networks/ethereum/build-contracts/src/lib.rs

@@ -6,7 +6,7 @@ use std::{path::PathBuf, fs, process::Command};
 
 /// Build contracts from the specified path, outputting the artifacts to the specified path.
 ///
-/// Requires solc 0.8.26.
+/// Requires solc 0.8.29.
 pub fn build(
   include_paths: &[&str],
   contracts_path: &str,
@@ -35,8 +35,8 @@ pub fn build(
     if let Some(version) = line.strip_prefix("Version: ") {
       let version =
         version.split('+').next().ok_or_else(|| "no value present on line".to_string())?;
-      if version != "0.8.26" {
+      if version != "0.8.29" {
-        Err(format!("version was {version}, 0.8.26 required"))?
+        Err(format!("version was {version}, 0.8.29 required"))?
       }
     }
   }

networks/ethereum/schnorr/contracts/Schnorr.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: AGPL-3.0-only
-pragma solidity ^0.8.26;
+pragma solidity ^0.8.29;
 
 /// @title A library for verifying Schnorr signatures
 /// @author Luke Parker <lukeparker@serai.exchange>

networks/ethereum/schnorr/contracts/tests/Schnorr.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: AGPL-3.0-only
-pragma solidity ^0.8.26;
+pragma solidity ^0.8.29;
 
 import "../Schnorr.sol";
 

orchestration/dev/networks/monero/hashes-v0.18.4.2.txt

@@ -1,50 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-# This GPG-signed message exists to confirm the SHA256 sums of Monero binaries.
-#
-# Please verify the signature against the key for binaryFate in the
-# source code repository (/utils/gpg_keys).
-#
-#
-## CLI
-6122f0bcaca12d5badd92002338847d16032f6d52d86155c203bcb67d4fe1518  monero-android-armv7-v0.18.4.2.tar.bz2
-3b248c3201f028205915403b4b2f173df0dd8bf47eeb268fd67a4661251469d3  monero-android-armv8-v0.18.4.2.tar.bz2
-b4e2b7de80107a1b4613b878d8e2114244b3fb16397821d69baa72d9b0f8c8d5  monero-freebsd-x64-v0.18.4.2.tar.bz2
-ecb2577499a3b0901d731e11d462d3fadcd70095f3ab0def0c27ee64dc56b061  monero-linux-armv7-v0.18.4.2.tar.bz2
-a39530054dac348b219f1048a24ca629da26990f72cf9c1f6b6853e3d8c39a79  monero-linux-armv8-v0.18.4.2.tar.bz2
-18492ace80bf8ef2f44aa9a99b4f20adf00fd59c675a6a496211a720088d5d1a  monero-linux-riscv64-v0.18.4.2.tar.bz2
-41d023f2357244ea43ee0a74796f5705ce75ce7373a5865d4959fefa13ecab06  monero-linux-x64-v0.18.4.2.tar.bz2
-03e77a4836861a47430664fa703dd149a355b3b214bc400b04ed38eb064a3ef0  monero-linux-x86-v0.18.4.2.tar.bz2
-9b98da6911b4769abef229c20e21f29d919b11db156965d6f139d2e1ad6625c2  monero-mac-armv8-v0.18.4.2.tar.bz2
-b1b1b580320118d3b6eaa5575fdbd73cf4db90fcc025b7abf875c5e5b4e335c1  monero-mac-x64-v0.18.4.2.tar.bz2
-14dd5aa11308f106183dd7834aa200e74ce6f3497103973696b556e893a4fef2  monero-win-x64-v0.18.4.2.zip
-934d9dbeb06ff5610d2c96ebe34fa480e74f78eaeb3fa3e47d89b7961c9bc5e0  monero-win-x86-v0.18.4.2.zip
-e9ec2062b3547db58f00102e6905621116ab7f56a331e0bc9b9e892607b87d24  monero-source-v0.18.4.2.tar.bz2
-#
-## GUI
-9d6e87add7e3ac006ee34c13c4f629252595395f54421db768f72dc233e94ea8  monero-gui-install-win-x64-v0.18.4.2.exe
-e4fcdea3f0ff27c3616a8a75545f42a4e4866ea374fa2eeaa9c87027573358ea  monero-gui-linux-x64-v0.18.4.2.tar.bz2
-3dfee5c5d8e000c72eb3755bf0eb03ca7c5928b69c3a241e147ad22d144e00a7  monero-gui-mac-armv8-v0.18.4.2.dmg
-16abadcbd608d4f7ba20d17a297f2aa2c9066d33f6f22bf3fcdca679ab603990  monero-gui-mac-x64-v0.18.4.2.dmg
-4daff8850280173d46464ba9a9de7f712228ad1ef76a1c4954531e4fd2b86d86  monero-gui-win-x64-v0.18.4.2.zip
-691085e61ece6c56738431f3cfd395536ca0675214e5991e0dbfab85025e82d7  monero-gui-source-v0.18.4.2.tar.bz2
-#
-#
-# ~binaryFate
------BEGIN PGP SIGNATURE-----
-
-iQIzBAEBCAAdFiEEgaxZH+nEtlxYBq/D8K9NRioL35IFAmitx+kACgkQ8K9NRioL
-35J6cQ/7ByvGstg/a5lIYbB+Lz5bNiPozCILD9/offvC7GgOvna9rkHuofuLS+pX
-qhYEMrjFjmp03XMY+i68M83qkBEZ+yU5iNDbwRuHUNMMWaaGlhnhm3nyUVtDpjjr
-4xwVsee+dzi0JZhVQG7HJFURiP2Ub5Ua6bSaATDoT/aUYdhmrOnQiH2+VxogiCv3
-JStDqXq6LpFjzw7UkAfxxu1PW+AQFNBzi3L0qWfzb5WWL7xuK63wXGmEkYBlvult
-qt3LUhDUzMrfZ5GiiOYDEw44Y2atD4ibOYtBnllCX9CKNb0o2KKU6Qkj+CYqqtnE
-uGNOt1oT09VPOtE7OUkBLVkALjef7ZXRibE7tN4wSnsrG39DP795/52L6CGJbl4n
-UDnHzLCUbuvhnoAu5U+rUP5nUEDYS9ANNyj610ogNCo7YjfzLH641WSQ/UnuXKkA
-RmK8xIiKoOnUeOanX99zqeXqV7gQdQMlfwLUr3pQzCI2YjdvxdRoedSEi5nX5KvO
-Snf3BcCYMBemGYqVMdo95tc0Gmsw12/O8WwrBbTea+PeAXJuLaBxrLNn+RNZLfF/
-UJYq2VcEwxG6vXb3cJ5lDKmRDDRI8Fxu6Amdab+6ponhM8Zy3eAynVIO952pLA7N
-dtl72RsimM+sgHXP4ERYL4c6WARSHE5sAiog43dr56l3PPmM8pE=
-=SoHG
------END PGP SIGNATURE-----

orchestration/dev/networks/monero/hashes-v0.18.4.3.txt

@@ -0,0 +1,50 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+# This GPG-signed message exists to confirm the SHA256 sums of Monero binaries.
+#
+# Please verify the signature against the key for binaryFate in the
+# source code repository (/utils/gpg_keys).
+#
+#
+## CLI
+4e1481835824b9233f204553d4a19645274824f3f6185d8a4b50198470752f54  monero-android-armv7-v0.18.4.3.tar.bz2
+1aebd24aaaec3d1e87a64163f2e30ab2cd45f3902a7a859413f6870944775c21  monero-android-armv8-v0.18.4.3.tar.bz2
+ff7b9c5cf2cb3d602c3dff1902ac0bc3394768cefc260b6003a9ad4bcfb7c6a4  monero-freebsd-x64-v0.18.4.3.tar.bz2
+3ac83049bc565fb5238501f0fa629cdd473bbe94d5fb815088af8e6ff1d761cd  monero-linux-armv7-v0.18.4.3.tar.bz2
+b1cc5f135de3ba8512d56deb4b536b38c41addde922b2a53bf443aeaf2a5a800  monero-linux-armv8-v0.18.4.3.tar.bz2
+95baaa6e8957b92caeaed7fb19b5c2659373df8dd5f4de2601ed3dae7b17ce2f  monero-linux-riscv64-v0.18.4.3.tar.bz2
+3a7b36ae4da831a4e9913e0a891728f4c43cd320f9b136cdb6686b1d0a33fafa  monero-linux-x64-v0.18.4.3.tar.bz2
+e0b51ca71934c33cb83cfa8535ffffebf431a2fc9efe3acf2baad96fb6ce21ec  monero-linux-x86-v0.18.4.3.tar.bz2
+bab9a6d3c2ca519386cff5ff0b5601642a495ed1a209736acaf354468cba1145  monero-mac-armv8-v0.18.4.3.tar.bz2
+a8d8273b14f31569f5b7aa3063fbd322e3caec3d63f9f51e287dfc539c7f7d61  monero-mac-x64-v0.18.4.3.tar.bz2
+bd9f615657c35d2d7dd9a5168ad54f1547dbf9a335dee7f12fab115f6f394e36  monero-win-x64-v0.18.4.3.zip
+e642ed7bbfa34c30b185387fa553aa9c3ea608db1f3fc0e9332afa9b522c9c1a  monero-win-x86-v0.18.4.3.zip
+6ba5e082c8fa25216aba7aea8198f3e23d4b138df15c512457081e1eb3d03ff6  monero-source-v0.18.4.3.tar.bz2
+#
+## GUI
+7b9255c696a462a00a810d9c8f94e60400a9e7d6438e8d6a8b693e9c13dca9ab  monero-gui-install-win-x64-v0.18.4.3.exe
+0bd84de0a7c18b2a3ea8e8eff2194ae000cf1060045badfd4ab48674bc1b9325  monero-gui-linux-x64-v0.18.4.3.tar.bz2
+68ea30db32efb4a0671ec723297b6629d932fa188edf76edb38a37adaa3528e6  monero-gui-mac-armv8-v0.18.4.3.dmg
+27243b01f030fdae68c59cae1daf21f530bbadeaf10579d2908db9a834191cee  monero-gui-mac-x64-v0.18.4.3.dmg
+dc9531cb4319b37b2c2dea4126e44a0fe6e7b6f34d278ccf5dd9ba693e3031e0  monero-gui-win-x64-v0.18.4.3.zip
+0d44687644db9b1824f324416e98f4a46b3bb0a5ed09af54b2835b6facaa0cdd  monero-gui-source-v0.18.4.3.tar.bz2
+#
+#
+# ~binaryFate
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAEBCAAdFiEEgaxZH+nEtlxYBq/D8K9NRioL35IFAmjntxwACgkQ8K9NRioL
+35J57g//dUOY1KAoLNaV7XLJyGbNk1lT6c2+A8h1wkK6iNQhXsmnc6rcigsHXrG0
+LQyVUuZJ6ELhNb6BnH5V0zbcB72t8XjkSEqlYhStUfMnaUvj1VdXtL/OnSs3fEvt
+Zwz6QBTxIKDDYEYyXrvCK96cYaYlIOgK3IVn/zoHdrHRUqTXqRJkFoTHum5l783y
+vr9BwMFFWYePUrilphjIiLyJDl+eB5al8PaJkqK2whxBUHoA2jF1edJOSq2mZajI
++L2fBYClePS8oqwoKGquqCh2RVcmdtXtQTVzRIoNx14qFzP8ymqa+6z1Ygkri7bV
+qMCJk7KQ8ND7uU9NShpaCIqrZpr5GZ4Al6SRkcpK/7mipQcy2QpKJR3iOpcfiTX1
+YmYGVmLB3zmHu2kiS0kogZv6Ob7+tVFzOQ8NZX4FVnpB0N0phqMfNFOfHzdQZrsZ
+qg29HNc9sHlUmsOVmE5w+7Oq+s79yvQB3034XXi/9wQu+f8fKRhqZboe0fe77FLf
+QXoAYrZZ7LnGz0Z75Q9O4RB7uxM0Ug5imvyEFus4iuBVyBWjgcfyLnbkKJtbXmfn
+BZBbTProhPJfVa/VffBxW9HZB27W7O14oGWVpUkGWnVMZfVY/78XTUHwxaScQsPO
+SGawjobQsB3pTMNr/kra1XTjkti70si8Fcs5ueYWGB3yfc6r3hU=
+=5HRY
+-----END PGP SIGNATURE-----

orchestration/runtime/Dockerfile

@@ -1,10 +1,10 @@
-# rust:1.89.0-slim-bookworm as of August 1st, 2025 (GMT)
+# rust:1.91.0-slim-bookworm as of November 5th, 2025 (GMT)
-FROM --platform=linux/amd64 rust@sha256:703cfb0f80db8eb8a3452bf5151162472039c1b37fe4fb2957b495a6f0104ae7 AS deterministic
+FROM --platform=linux/amd64 rust@sha256:91f3c97d542bff86d69b027d60f52bbafd7b60cc02321a56dbc1a9e6bfef1c55 AS deterministic
 
 # Move to a Debian package snapshot
 RUN rm -rf /etc/apt/sources.list.d/debian.sources && \
   rm -rf /var/lib/apt/lists/* && \
-  echo "deb [arch=amd64] http://snapshot.debian.org/archive/debian/20250801T000000Z bookworm main" > /etc/apt/sources.list && \
+  echo "deb [arch=amd64] http://snapshot.debian.org/archive/debian/20251105T000000Z bookworm main" > /etc/apt/sources.list && \
   apt update
 
 # Install dependencies

orchestration/src/networks/bitcoin.rs

@@ -7,7 +7,7 @@ pub fn bitcoin(orchestration_path: &Path, network: Network) {
   const DOWNLOAD_BITCOIN: &str = r#"
 FROM alpine:latest AS bitcoin
 
-ENV BITCOIN_VERSION=29.1
+ENV BITCOIN_VERSION=30.0
 
 RUN apk --no-cache add wget git gnupg
 

orchestration/src/networks/monero.rs

@@ -10,7 +10,7 @@ fn monero_internal(
   monero_binary: &str,
   ports: &str,
 ) {
-  const MONERO_VERSION: &str = "0.18.4.2";
+  const MONERO_VERSION: &str = "0.18.4.3";
 
   let arch = match std::env::consts::ARCH {
     // We probably would run this without issues yet it's not worth needing to provide support for

orchestration/src/processor.rs

@@ -22,8 +22,8 @@ pub fn processor(
       if coin == "ethereum" {
         r#"
 RUN cargo install svm-rs
-RUN svm install 0.8.26
+RUN svm install 0.8.29
-RUN svm use 0.8.26
+RUN svm use 0.8.29
 "#
       } else {
         ""

processor/ethereum/deployer/contracts/Deployer.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: AGPL-3.0-only
-pragma solidity ^0.8.26;
+pragma solidity ^0.8.29;
 
 /*
   The expected deployment process of Serai's Router is as follows:

processor/ethereum/erc20/contracts/IERC20.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: CC0
-pragma solidity ^0.8.26;
+pragma solidity ^0.8.29;
 
 interface IERC20 {
   event Transfer(address indexed from, address indexed to, uint256 value);

processor/ethereum/router/contracts/IRouter.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.26;
+pragma solidity ^0.8.29;
 
 /// @title Serai Router (without functions overriden by selector collisions)
 /// @author Luke Parker <lukeparker@serai.exchange>

processor/ethereum/router/contracts/Router.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: AGPL-3.0-only
-pragma solidity ^0.8.26;
+pragma solidity ^0.8.29;
 
 import "IERC20.sol";
 
@@ -223,7 +223,7 @@ contract Router is IRouterWithoutCollisions {
     /*
       Advance the message past the function selector, enabling decoding the arguments. Ideally, we'd
       also advance past the signature (to simplify decoding arguments and save some memory). This
-      would transfrom message from:
+      would transform message from:
 
         message (pointer)
                v

processor/ethereum/router/contracts/tests/CreateAddress.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: AGPL-3.0-only
-pragma solidity ^0.8.26;
+pragma solidity ^0.8.29;
 
 import "Router.sol";
 

processor/ethereum/router/contracts/tests/ERC20.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: AGPL-3.0-only
-pragma solidity ^0.8.26;
+pragma solidity ^0.8.29;
 
 contract TestERC20 {
   event Transfer(address indexed from, address indexed to, uint256 value);

processor/ethereum/router/contracts/tests/Reentrancy.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: AGPL-3.0-only
-pragma solidity ^0.8.26;
+pragma solidity ^0.8.29;
 
 import "Router.sol";
 

rust-toolchain.toml

@@ -1,5 +1,5 @@
 [toolchain]
-channel = "1.90"
+channel = "1.91"
 targets = ["wasm32v1-none"]
 profile = "minimal"
 components = ["rust-src", "rustfmt", "clippy"]

spec/Getting Started.md

@@ -36,8 +36,8 @@ rustup target add wasm32v1-none --toolchain nightly
 
 ```
 cargo install svm-rs
-svm install 0.8.26
+svm install 0.8.29
-svm use 0.8.26
+svm use 0.8.29
 ```
 
 ### Install foundry (for tests)

substrate/abi/Cargo.toml

@@ -22,12 +22,12 @@ workspace = true
 borsh = { version = "1", default-features = false, features = ["derive", "de_strict_order"] }
 
 bitvec = { version = "1", default-features = false, features = ["alloc"] }
-sp-core = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "dd8f2ab6c80c609f15714f554194529116b717ef", default-features = false }
+sp-core = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "b48efb12bf49a0dba1b3633403f716010b99dc56", default-features = false }
 
 serde = { version = "1", default-features = false, features = ["derive"], optional = true }
 scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"], optional = true }
-sp-runtime = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "dd8f2ab6c80c609f15714f554194529116b717ef", default-features = false, features = ["serde"], optional = true }
+sp-runtime = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "b48efb12bf49a0dba1b3633403f716010b99dc56", default-features = false, features = ["serde"], optional = true }
-frame-support = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "dd8f2ab6c80c609f15714f554194529116b717ef", default-features = false, optional = true }
+frame-support = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "b48efb12bf49a0dba1b3633403f716010b99dc56", default-features = false, optional = true }
 
 serai-primitives = { path = "../primitives", version = "0.1", default-features = false }
 

substrate/client/Cargo.toml

@@ -31,9 +31,9 @@ serde_json = { version = "1", optional = true }
 serai-abi = { path = "../abi", version = "0.1" }
 
 multiaddr = { version = "0.18", optional = true }
-sp-core = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "dd8f2ab6c80c609f15714f554194529116b717ef", optional = true }
+sp-core = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "b48efb12bf49a0dba1b3633403f716010b99dc56", optional = true }
-sp-runtime = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "dd8f2ab6c80c609f15714f554194529116b717ef", optional = true }
+sp-runtime = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "b48efb12bf49a0dba1b3633403f716010b99dc56", optional = true }
-frame-system = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "dd8f2ab6c80c609f15714f554194529116b717ef", optional = true }
+frame-system = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "b48efb12bf49a0dba1b3633403f716010b99dc56", optional = true }
 
 async-lock = "3"
 

substrate/client/bitcoin/Cargo.toml

@@ -1,11 +1,11 @@
 [package]
 name = "serai-client-bitcoin"
 version = "0.1.0"
-description = "Bitcoin client library for the Serai network"
+description = "A client for the Serai network's Bitcoin functionality"
 license = "MIT"
 repository = "https://github.com/serai-dex/serai/tree/develop/substrate/client/bitcoin"
 authors = ["Luke Parker <lukeparker5132@gmail.com>"]
-keywords = ["serai"]
+keywords = ["serai", "bitcoin"]
 edition = "2021"
 rust-version = "1.85"
 

substrate/client/bitcoin/README.md

@@ -0,0 +1,3 @@
+# serai-client Bitcoin
+
+A client for the Serai network's Bitcoin functionality.

substrate/client/bitcoin/src/lib.rs

@@ -1,4 +1,7 @@
-#![no_std]
+#![cfg_attr(docsrs, feature(doc_auto_cfg))]
+#![doc = include_str!("../README.md")]
+#![deny(missing_docs)]
+#![cfg_attr(not(feature = "std"), no_std)]
 
 use core::{str::FromStr, fmt};
 

substrate/client/ethereum/Cargo.toml

@@ -1,11 +1,11 @@
 [package]
 name = "serai-client-ethereum"
 version = "0.1.0"
-description = "Ethereum client library for the Serai network"
+description = "A client for the Serai network's Ethereum functionality"
 license = "MIT"
 repository = "https://github.com/serai-dex/serai/tree/develop/substrate/client/ethereum"
 authors = ["Luke Parker <lukeparker5132@gmail.com>"]
-keywords = ["serai"]
+keywords = ["serai", "ethereum"]
 edition = "2021"
 rust-version = "1.85"
 

substrate/client/ethereum/README.md

@@ -0,0 +1,3 @@
+# serai-client Ethereum
+
+A client for the Serai network's Ethereum functionality.

substrate/client/ethereum/src/lib.rs

@@ -1,4 +1,7 @@
-#![no_std]
+#![cfg_attr(docsrs, feature(doc_auto_cfg))]
+#![doc = include_str!("../README.md")]
+#![deny(missing_docs)]
+#![cfg_attr(not(feature = "std"), no_std)]
 
 use core::str::FromStr;
 use std_shims::{vec::Vec, io::Read};
@@ -12,6 +15,7 @@ use serai_primitives::address::ExternalAddress;
 /// Payments to an address with a gas limit which exceed this value will be dropped entirely.
 pub const ADDRESS_GAS_LIMIT: u32 = 950_000;
 
+/// A contract to deploy, enabling executing arbitrary code.
 #[derive(Clone, PartialEq, Eq, Debug, BorshSerialize, BorshDeserialize)]
 pub struct ContractDeployment {
   /// The gas limit to use for this contract's execution.
@@ -26,8 +30,8 @@ pub struct ContractDeployment {
   code: Vec<u8>,
 }
 
-/// A contract to deploy, enabling executing arbitrary code.
 impl ContractDeployment {
+  /// Create a new `ContractDeployment`.
   pub fn new(gas_limit: u32, code: Vec<u8>) -> Option<Self> {
     // Check the gas limit is less the address gas limit
     if gas_limit > ADDRESS_GAS_LIMIT {
@@ -44,9 +48,11 @@ impl ContractDeployment {
     Some(Self { gas_limit, code })
   }
 
+  /// The gas limit to use when deploying (and executing) this contract.
   pub fn gas_limit(&self) -> u32 {
     self.gas_limit
   }
+  /// The code for the contract to deploy.
   pub fn code(&self) -> &[u8] {
     &self.code
   }

substrate/client/monero/Cargo.toml

@@ -1,11 +1,11 @@
 [package]
 name = "serai-client-monero"
 version = "0.1.0"
-description = "Monero client library for the Serai network"
+description = "A client for the Serai network's Monero functionality"
 license = "MIT"
 repository = "https://github.com/serai-dex/serai/tree/develop/substrate/client/monero"
 authors = ["Luke Parker <lukeparker5132@gmail.com>"]
-keywords = ["serai"]
+keywords = ["serai", "monero"]
 edition = "2021"
 rust-version = "1.85"
 

substrate/client/monero/README.md

@@ -0,0 +1,3 @@
+# serai-client Monero
+
+A client for the Serai network's Monero functionality.

substrate/client/monero/src/lib.rs

@@ -1,3 +1,7 @@
+#![cfg_attr(docsrs, feature(doc_auto_cfg))]
+#![doc = include_str!("../README.md")]
+#![deny(missing_docs)]
+
 use core::{str::FromStr, fmt};
 
 use dalek_ff_group::{EdwardsPoint, Ed25519};

substrate/client/serai/Cargo.toml

@@ -0,0 +1,29 @@
+[package]
+name = "serai-client-serai"
+version = "0.1.0"
+description = "A client for the Serai network itself"
+license = "MIT"
+repository = "https://github.com/serai-dex/serai/tree/develop/substrate/client/serai"
+authors = ["Luke Parker <lukeparker5132@gmail.com>"]
+keywords = ["serai"]
+edition = "2021"
+rust-version = "1.85"
+
+[package.metadata.docs.rs]
+all-features = true
+rustdoc-args = ["--cfg", "docsrs"]
+
+[lints]
+workspace = true
+
+[dependencies]
+thiserror = { version = "2", default-features = false, features = ["std"] }
+core-json-traits = { version = "0.4", default-features = false, features = ["alloc"] }
+core-json-derive = { version = "0.4", default-features = false }
+simple-request = { path = "../../../common/request", version = "0.3" }
+
+hex = { version = "0.4", default-features = false, features = ["alloc"] }
+borsh = { version = "1", default-features = false, features = ["std"] }
+serai-abi = { path = "../../abi", version = "0.1" }
+
+async-lock = "3"

substrate/client/serai/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2022-2025 Luke Parker
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

substrate/client/serai/README.md

@@ -0,0 +1,3 @@
+# serai-client Serai
+
+A client for the Serai network itself.

substrate/client/serai/src/lib.rs

@@ -0,0 +1,140 @@
+#![cfg_attr(docsrs, feature(doc_auto_cfg))]
+#![doc = include_str!("../README.md")]
+#![deny(missing_docs)]
+
+use std::io::Read;
+
+use thiserror::Error;
+use core_json_traits::{JsonDeserialize, JsonStructure};
+use core_json_derive::JsonDeserialize;
+use simple_request::{hyper, Request, TokioClient};
+
+use borsh::BorshDeserialize;
+pub use serai_abi as abi;
+use abi::{primitives::network_id::ExternalNetworkId, Event};
+
+use async_lock::RwLock;
+
+/// An error from the RPC.
+#[derive(Debug, Error)]
+pub enum RpcError {
+  /// An internal error occured.
+  #[error("internal error: {0}")]
+  InternalError(String),
+  /// A failure with the connection occurred.
+  #[error("failed to communicate with serai")]
+  ConnectionError,
+  /// The node provided an invalid response.
+  #[error("node is faulty: {0}")]
+  InvalidNode(String),
+  /// The response contained an error.
+  #[error("error in response: {0}")]
+  ErrorInResponse(String),
+}
+
+/// An RPC client to a Serai node.
+#[derive(Clone)]
+pub struct Serai {
+  url: String,
+  client: TokioClient,
+}
+
+/// An RPC client to a Serai node, scoped to a specific block.
+pub struct TemporalSerai<'a> {
+  serai: &'a Serai,
+  block: [u8; 32],
+  events: RwLock<Option<Vec<Event>>>,
+}
+impl Clone for TemporalSerai<'_> {
+  fn clone(&self) -> Self {
+    Self { serai: self.serai, block: self.block, events: RwLock::new(None) }
+  }
+}
+
+impl Serai {
+  async fn call<ResponseValue: Default + JsonDeserialize>(
+    &self,
+    method: &str,
+    params: &str,
+  ) -> Result<ResponseValue, RpcError> {
+    let request =
+      format!(r#"{{ "jsonrpc": "2.0", "id": 0, "method": {method}, "params": {params} }}"#);
+    let request = hyper::Request::post(&self.url)
+      .header("Content-Type", "application/json")
+      .body(request.as_bytes().to_vec().into())
+      .map_err(|e| RpcError::InternalError(format!("{e:?}")))?;
+
+    #[derive(Default, JsonDeserialize)]
+    pub struct Error {
+      message: String,
+    }
+    #[derive(Default, JsonDeserialize)]
+    struct Response<ResponseValue: Default + JsonDeserialize> {
+      result: Option<ResponseValue>,
+      error: Option<Error>,
+    }
+
+    let mut response_reader = self
+      .client
+      .request(request)
+      .await
+      .map_err(|_| RpcError::ConnectionError)?
+      .body()
+      .await
+      .map_err(|_| RpcError::ConnectionError)?;
+    let mut response_vec = Vec::with_capacity(1024);
+    response_reader.read_to_end(&mut response_vec).map_err(|_| {
+      RpcError::InternalError("couldn't read response from `simple-request` into `Vec`".to_string())
+    })?;
+
+    // TODO: Map `std::io::Read` into `core_json::Read` with an adapter
+    let response = Response::<ResponseValue>::deserialize_structure::<
+      _,
+      core_json_traits::ConstStack<32>,
+    >(response_vec.as_slice())
+    .map_err(|e| RpcError::InvalidNode(format!("{e:?}")))?;
+    match response {
+      Response { result: Some(result), error: None } => Ok(result),
+      Response { result: None, error: Some(error) } => {
+        Err(RpcError::ErrorInResponse(error.message))
+      }
+      Response { result: Some(_), error: Some(_) } | Response { result: None, error: None } => {
+        Err(RpcError::InvalidNode(
+          "node didn't exclusively provide either `result` or `error`".to_string(),
+        ))
+      }
+    }
+  }
+
+  /// Create a new RPC client.
+  pub fn new(url: String) -> Result<Self, RpcError> {
+    let client = TokioClient::with_connection_pool().map_err(|_| RpcError::ConnectionError)?;
+    Ok(Serai { url, client })
+  }
+
+  /// Fetch a block from the Serai blockchain.
+  pub async fn block(&self, hash: [u8; 32]) -> Result<serai_abi::Block, RpcError> {
+    let bin: String = self.call("serai_block", &format!("[{}]", hex::encode(hash))).await?;
+    serai_abi::Block::deserialize(
+      &mut hex::decode(&bin)
+        .map_err(|_| RpcError::InvalidNode("node returned non-hex-encoded block".to_string()))?
+        .as_slice(),
+    )
+    .map_err(|_| RpcError::InvalidNode("node returned invalid block".to_string()))
+  }
+
+  /// Return the P2P addresses for the validators of the specified network.
+  pub async fn p2p_validators(&self, network: ExternalNetworkId) -> Result<Vec<String>, RpcError> {
+    self
+      .call(
+        "p2p_validators",
+        match network {
+          ExternalNetworkId::Bitcoin => "[bitcoin]",
+          ExternalNetworkId::Ethereum => "[ethereum]",
+          ExternalNetworkId::Monero => "[monero]",
+          _ => Err(RpcError::InternalError("unrecognized external network ID".to_string()))?,
+        },
+      )
+      .await
+  }
+}

substrate/client/src/lib.rs

@@ -1,13 +1,12 @@
-#[cfg(feature = "networks")]
+#[cfg(feature = "bitcoin")]
-pub mod networks;
+pub use serai_client_bitcoin as bitcoin;
+#[cfg(feature = "ethereum")]
+pub mod serai_client_ethereum as ethereum;
+#[cfg(feature = "monero")]
+pub mod serai_client_monero as monero;
 
 #[cfg(feature = "serai")]
-mod serai;
+pub use serai_client_serai as serai;
-#[cfg(feature = "serai")]
-pub use serai::*;
-
-#[cfg(not(feature = "serai"))]
-pub use serai_abi::primitives;
 
 #[cfg(test)]
 mod tests;

substrate/client/src/networks.rs

@@ -1,8 +0,0 @@
-#[cfg(feature = "bitcoin")]
-pub use serai_client_bitcoin;
-
-#[cfg(feature = "ethereum")]
-pub mod serai_client_ethereum;
-
-#[cfg(feature = "monero")]
-pub mod serai_client_monero;

substrate/coins/Cargo.toml

@@ -18,10 +18,10 @@ workspace = true
 [dependencies]
 scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] }
 
-sp-core = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "dd8f2ab6c80c609f15714f554194529116b717ef", default-features = false }
+sp-core = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "b48efb12bf49a0dba1b3633403f716010b99dc56", default-features = false }
 
-frame-system = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "dd8f2ab6c80c609f15714f554194529116b717ef", default-features = false }
+frame-system = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "b48efb12bf49a0dba1b3633403f716010b99dc56", default-features = false }
-frame-support = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "dd8f2ab6c80c609f15714f554194529116b717ef", default-features = false }
+frame-support = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "b48efb12bf49a0dba1b3633403f716010b99dc56", default-features = false }
 
 serai-abi = { path = "../abi", default-features = false, features = ["substrate"] }
 serai-core-pallet = { path = "../core", default-features = false }
@@ -29,7 +29,7 @@ serai-core-pallet = { path = "../core", default-features = false }
 [dev-dependencies]
 borsh = { version = "1", default-features = false, features = ["std", "derive", "de_strict_order"] }
 
-sp-io = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "dd8f2ab6c80c609f15714f554194529116b717ef", default-features = false, features = ["std"] }
+sp-io = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "b48efb12bf49a0dba1b3633403f716010b99dc56", default-features = false, features = ["std"] }
 
 [features]
 std = [

substrate/core/Cargo.toml

@@ -20,10 +20,10 @@ borsh = { version = "1", default-features = false, features = ["derive", "de_str
 
 scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] }
 
-sp-core = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "dd8f2ab6c80c609f15714f554194529116b717ef", default-features = false }
+sp-core = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "b48efb12bf49a0dba1b3633403f716010b99dc56", default-features = false }
 
-frame-system = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "dd8f2ab6c80c609f15714f554194529116b717ef", default-features = false }
+frame-system = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "b48efb12bf49a0dba1b3633403f716010b99dc56", default-features = false }
-frame-support = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "dd8f2ab6c80c609f15714f554194529116b717ef", default-features = false }
+frame-support = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "b48efb12bf49a0dba1b3633403f716010b99dc56", default-features = false }
 
 serai-abi = { path = "../abi", default-features = false, features = ["substrate"] }
 

substrate/dex/Cargo.toml

@@ -21,15 +21,15 @@ workspace = true
 [dependencies]
 scale = { package = "parity-scale-codec", version = "3.6.1", default-features = false }
 
-sp-std = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "dd8f2ab6c80c609f15714f554194529116b717ef", default-features = false }
+sp-std = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "b48efb12bf49a0dba1b3633403f716010b99dc56", default-features = false }
-sp-io = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "dd8f2ab6c80c609f15714f554194529116b717ef", default-features = false }
+sp-io = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "b48efb12bf49a0dba1b3633403f716010b99dc56", default-features = false }
-sp-api = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "dd8f2ab6c80c609f15714f554194529116b717ef", default-features = false }
+sp-api = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "b48efb12bf49a0dba1b3633403f716010b99dc56", default-features = false }
-sp-runtime = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "dd8f2ab6c80c609f15714f554194529116b717ef", default-features = false }
+sp-runtime = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "b48efb12bf49a0dba1b3633403f716010b99dc56", default-features = false }
-sp-core = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "dd8f2ab6c80c609f15714f554194529116b717ef", default-features = false }
+sp-core = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "b48efb12bf49a0dba1b3633403f716010b99dc56", default-features = false }
 
-frame-system = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "dd8f2ab6c80c609f15714f554194529116b717ef", default-features = false }
+frame-system = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "b48efb12bf49a0dba1b3633403f716010b99dc56", default-features = false }
-frame-support = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "dd8f2ab6c80c609f15714f554194529116b717ef", default-features = false }
+frame-support = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "b48efb12bf49a0dba1b3633403f716010b99dc56", default-features = false }
-frame-benchmarking = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "dd8f2ab6c80c609f15714f554194529116b717ef", default-features = false, optional = true }
+frame-benchmarking = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "b48efb12bf49a0dba1b3633403f716010b99dc56", default-features = false, optional = true }
 
 coins-pallet = { package = "serai-coins-pallet", path = "../coins", default-features = false }
 

substrate/economic-security/Cargo.toml

@@ -21,8 +21,8 @@ workspace = true
 [dependencies]
 scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] }
 
-frame-system = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "dd8f2ab6c80c609f15714f554194529116b717ef", default-features = false }
+frame-system = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "b48efb12bf49a0dba1b3633403f716010b99dc56", default-features = false }
-frame-support = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "dd8f2ab6c80c609f15714f554194529116b717ef", default-features = false }
+frame-support = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "b48efb12bf49a0dba1b3633403f716010b99dc56", default-features = false }
 
 dex-pallet = { package = "serai-dex-pallet", path = "../dex", default-features = false }
 coins-pallet = { package = "serai-coins-pallet", path = "../coins", default-features = false }
@@ -30,16 +30,16 @@ coins-pallet = { package = "serai-coins-pallet", path = "../coins", default-feat
 serai-primitives = { path = "../primitives", default-features = false }
 
 [dev-dependencies]
-pallet-babe = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "dd8f2ab6c80c609f15714f554194529116b717ef", default-features = false }
+pallet-babe = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "b48efb12bf49a0dba1b3633403f716010b99dc56", default-features = false }
-pallet-grandpa = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "dd8f2ab6c80c609f15714f554194529116b717ef", default-features = false }
+pallet-grandpa = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "b48efb12bf49a0dba1b3633403f716010b99dc56", default-features = false }
-pallet-timestamp = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "dd8f2ab6c80c609f15714f554194529116b717ef", default-features = false }
+pallet-timestamp = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "b48efb12bf49a0dba1b3633403f716010b99dc56", default-features = false }
 
 validator-sets-pallet = { package = "serai-validator-sets-pallet", path = "../validator-sets", default-features = false }
 
-sp-io = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "dd8f2ab6c80c609f15714f554194529116b717ef", default-features = false }
+sp-io = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "b48efb12bf49a0dba1b3633403f716010b99dc56", default-features = false }
-sp-runtime = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "dd8f2ab6c80c609f15714f554194529116b717ef", default-features = false }
+sp-runtime = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "b48efb12bf49a0dba1b3633403f716010b99dc56", default-features = false }
-sp-core = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "dd8f2ab6c80c609f15714f554194529116b717ef", default-features = false }
+sp-core = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "b48efb12bf49a0dba1b3633403f716010b99dc56", default-features = false }
-sp-consensus-babe = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "dd8f2ab6c80c609f15714f554194529116b717ef", default-features = false }
+sp-consensus-babe = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "b48efb12bf49a0dba1b3633403f716010b99dc56", default-features = false }
 
 [features]
 std = [

substrate/emissions/Cargo.toml

@@ -21,11 +21,11 @@ workspace = true
 [dependencies]
 scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] }
 
-frame-system = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "dd8f2ab6c80c609f15714f554194529116b717ef", default-features = false }
+frame-system = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "b48efb12bf49a0dba1b3633403f716010b99dc56", default-features = false }
-frame-support = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "dd8f2ab6c80c609f15714f554194529116b717ef", default-features = false }
+frame-support = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "b48efb12bf49a0dba1b3633403f716010b99dc56", default-features = false }
 
-sp-std = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "dd8f2ab6c80c609f15714f554194529116b717ef", default-features = false }
+sp-std = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "b48efb12bf49a0dba1b3633403f716010b99dc56", default-features = false }
-sp-runtime = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "dd8f2ab6c80c609f15714f554194529116b717ef", default-features = false }
+sp-runtime = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "b48efb12bf49a0dba1b3633403f716010b99dc56", default-features = false }
 
 coins-pallet = { package = "serai-coins-pallet", path = "../coins", default-features = false }
 validator-sets-pallet = { package = "serai-validator-sets-pallet", path = "../validator-sets", default-features = false }

substrate/genesis-liquidity/Cargo.toml

@@ -21,12 +21,12 @@ workspace = true
 [dependencies]
 scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] }
 
-frame-system = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "dd8f2ab6c80c609f15714f554194529116b717ef", default-features = false }
+frame-system = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "b48efb12bf49a0dba1b3633403f716010b99dc56", default-features = false }
-frame-support = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "dd8f2ab6c80c609f15714f554194529116b717ef", default-features = false }
+frame-support = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "b48efb12bf49a0dba1b3633403f716010b99dc56", default-features = false }
 
-sp-std = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "dd8f2ab6c80c609f15714f554194529116b717ef", default-features = false }
+sp-std = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "b48efb12bf49a0dba1b3633403f716010b99dc56", default-features = false }
-sp-core = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "dd8f2ab6c80c609f15714f554194529116b717ef", default-features = false }
+sp-core = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "b48efb12bf49a0dba1b3633403f716010b99dc56", default-features = false }
-sp-application-crypto = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "dd8f2ab6c80c609f15714f554194529116b717ef", default-features = false }
+sp-application-crypto = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "b48efb12bf49a0dba1b3633403f716010b99dc56", default-features = false }
 
 dex-pallet = { package = "serai-dex-pallet", path = "../dex", default-features = false }
 coins-pallet = { package = "serai-coins-pallet", path = "../coins", default-features = false }

substrate/in-instructions/Cargo.toml

@@ -24,14 +24,14 @@ bitvec = { version = "1", default-features = false, features = ["alloc"] }
 
 scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive", "max-encoded-len"] }
 
-sp-std = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "dd8f2ab6c80c609f15714f554194529116b717ef", default-features = false }
+sp-std = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "b48efb12bf49a0dba1b3633403f716010b99dc56", default-features = false }
-sp-application-crypto = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "dd8f2ab6c80c609f15714f554194529116b717ef", default-features = false }
+sp-application-crypto = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "b48efb12bf49a0dba1b3633403f716010b99dc56", default-features = false }
-sp-io = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "dd8f2ab6c80c609f15714f554194529116b717ef", default-features = false }
+sp-io = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "b48efb12bf49a0dba1b3633403f716010b99dc56", default-features = false }
-sp-runtime = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "dd8f2ab6c80c609f15714f554194529116b717ef", default-features = false }
+sp-runtime = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "b48efb12bf49a0dba1b3633403f716010b99dc56", default-features = false }
-sp-core = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "dd8f2ab6c80c609f15714f554194529116b717ef", default-features = false }
+sp-core = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "b48efb12bf49a0dba1b3633403f716010b99dc56", default-features = false }
 
-frame-system = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "dd8f2ab6c80c609f15714f554194529116b717ef", default-features = false }
+frame-system = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "b48efb12bf49a0dba1b3633403f716010b99dc56", default-features = false }
-frame-support = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "dd8f2ab6c80c609f15714f554194529116b717ef", default-features = false }
+frame-support = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "b48efb12bf49a0dba1b3633403f716010b99dc56", default-features = false }
 
 serai-primitives = { path = "../primitives", default-features = false }
 
@@ -42,9 +42,9 @@ genesis-liquidity-pallet = { package = "serai-genesis-liquidity-pallet", path =
 emissions-pallet = { package = "serai-emissions-pallet", path = "../emissions", default-features = false }
 
 [dev-dependencies]
-pallet-babe = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "dd8f2ab6c80c609f15714f554194529116b717ef", default-features = false }
+pallet-babe = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "b48efb12bf49a0dba1b3633403f716010b99dc56", default-features = false }
-pallet-grandpa = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "dd8f2ab6c80c609f15714f554194529116b717ef", default-features = false }
+pallet-grandpa = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "b48efb12bf49a0dba1b3633403f716010b99dc56", default-features = false }
-pallet-timestamp = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "dd8f2ab6c80c609f15714f554194529116b717ef", default-features = false }
+pallet-timestamp = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "b48efb12bf49a0dba1b3633403f716010b99dc56", default-features = false }
 
 economic-security-pallet = { package = "serai-economic-security-pallet", path = "../economic-security", default-features = false }
 

substrate/node/Cargo.toml

@@ -34,18 +34,19 @@ secq256k1 = { path = "../../crypto/secq256k1" }
 
 libp2p = "0.56"
 
-sp-core = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev =  "dd8f2ab6c80c609f15714f554194529116b717ef" }
+sp-core = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "b48efb12bf49a0dba1b3633403f716010b99dc56" }
-sp-keystore = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev =  "dd8f2ab6c80c609f15714f554194529116b717ef" }
+sp-inherents = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "b48efb12bf49a0dba1b3633403f716010b99dc56" }
-sp-timestamp = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev =  "dd8f2ab6c80c609f15714f554194529116b717ef" }
+sp-timestamp = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "b48efb12bf49a0dba1b3633403f716010b99dc56" }
-sp-state-machine = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev =  "dd8f2ab6c80c609f15714f554194529116b717ef" }
+sp-blockchain = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "b48efb12bf49a0dba1b3633403f716010b99dc56" }
-sp-io = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev =  "dd8f2ab6c80c609f15714f554194529116b717ef" }
+sp-state-machine = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "b48efb12bf49a0dba1b3633403f716010b99dc56" }
-sp-blockchain = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev =  "dd8f2ab6c80c609f15714f554194529116b717ef" }
+sp-api = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "b48efb12bf49a0dba1b3633403f716010b99dc56" }
-sp-runtime = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev =  "dd8f2ab6c80c609f15714f554194529116b717ef" }
+sp-keystore = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "b48efb12bf49a0dba1b3633403f716010b99dc56" }
-sp-api = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev =  "dd8f2ab6c80c609f15714f554194529116b717ef" }
+sp-io = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "b48efb12bf49a0dba1b3633403f716010b99dc56" }
-sp-block-builder = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev =  "dd8f2ab6c80c609f15714f554194529116b717ef" }
+sp-runtime = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "b48efb12bf49a0dba1b3633403f716010b99dc56" }
-sp-consensus-babe = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev =  "dd8f2ab6c80c609f15714f554194529116b717ef" }
+sp-block-builder = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "b48efb12bf49a0dba1b3633403f716010b99dc56" }
+sp-consensus-babe = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "b48efb12bf49a0dba1b3633403f716010b99dc56" }
 
-frame-benchmarking = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev =  "dd8f2ab6c80c609f15714f554194529116b717ef" }
+frame-benchmarking = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "b48efb12bf49a0dba1b3633403f716010b99dc56" }
 
 serai-abi = { path = "../abi", features = ["std", "substrate"] }
 serai-runtime = { path = "../runtime", features = ["std"] }
@@ -56,22 +57,23 @@ futures-util = "0.3"
 tokio = { version = "1", features = ["sync", "rt-multi-thread"] }
 jsonrpsee = { version = "0.24", features = ["server"] }
 
-sc-transaction-pool = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev =  "dd8f2ab6c80c609f15714f554194529116b717ef" }
+sc-transaction-pool = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "b48efb12bf49a0dba1b3633403f716010b99dc56" }
-sc-transaction-pool-api = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev =  "dd8f2ab6c80c609f15714f554194529116b717ef" }
+sc-transaction-pool-api = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "b48efb12bf49a0dba1b3633403f716010b99dc56" }
-sc-basic-authorship = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev =  "dd8f2ab6c80c609f15714f554194529116b717ef" }
+sc-basic-authorship = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "b48efb12bf49a0dba1b3633403f716010b99dc56" }
-sc-executor = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev =  "dd8f2ab6c80c609f15714f554194529116b717ef" }
+sc-executor = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "b48efb12bf49a0dba1b3633403f716010b99dc56" }
-sc-service = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev =  "dd8f2ab6c80c609f15714f554194529116b717ef" }
+sc-service = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "b48efb12bf49a0dba1b3633403f716010b99dc56" }
-sc-client-api = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev =  "dd8f2ab6c80c609f15714f554194529116b717ef" }
+sc-client-api = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "b48efb12bf49a0dba1b3633403f716010b99dc56" }
-sc-network = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev =  "dd8f2ab6c80c609f15714f554194529116b717ef" }
+sc-network = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "b48efb12bf49a0dba1b3633403f716010b99dc56" }
 
-sc-consensus = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev =  "dd8f2ab6c80c609f15714f554194529116b717ef" }
+sc-consensus = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "b48efb12bf49a0dba1b3633403f716010b99dc56" }
-sc-consensus-babe = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev =  "dd8f2ab6c80c609f15714f554194529116b717ef" }
+sc-consensus-slots = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "b48efb12bf49a0dba1b3633403f716010b99dc56" }
-sc-consensus-grandpa = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev =  "dd8f2ab6c80c609f15714f554194529116b717ef" }
+sc-consensus-babe = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "b48efb12bf49a0dba1b3633403f716010b99dc56" }
-sc-authority-discovery = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev =  "dd8f2ab6c80c609f15714f554194529116b717ef" }
+sc-consensus-grandpa = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "b48efb12bf49a0dba1b3633403f716010b99dc56" }
+sc-authority-discovery = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "b48efb12bf49a0dba1b3633403f716010b99dc56" }
 
-sc-telemetry = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev =  "dd8f2ab6c80c609f15714f554194529116b717ef" }
+sc-telemetry = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "b48efb12bf49a0dba1b3633403f716010b99dc56" }
-sc-chain-spec = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev =  "dd8f2ab6c80c609f15714f554194529116b717ef" }
+sc-chain-spec = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "b48efb12bf49a0dba1b3633403f716010b99dc56" }
-sc-cli = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev =  "dd8f2ab6c80c609f15714f554194529116b717ef" }
+sc-cli = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "b48efb12bf49a0dba1b3633403f716010b99dc56" }
 
 serai-env = { path = "../../common/env" }
 

substrate/node/src/rpc/blockchain.rs

@@ -0,0 +1,52 @@
+use std::{sync::Arc, ops::Deref, collections::HashSet};
+
+use rand_core::{RngCore, OsRng};
+
+use sp_core::Encode;
+use sp_blockchain::{Error as BlockchainError, HeaderMetadata, HeaderBackend};
+use sp_block_builder::BlockBuilder;
+use sp_api::ProvideRuntimeApi;
+
+use serai_abi::{primitives::prelude::*, SubstrateBlock as Block};
+use serai_runtime::*;
+
+use jsonrpsee::RpcModule;
+
+use sc_client_api::BlockBackend;
+
+pub(crate) fn module<
+  C: 'static
+    + Send
+    + Sync
+    + HeaderMetadata<Block, Error = BlockchainError>
+    + HeaderBackend<Block>
+    + BlockBackend<Block>
+    + ProvideRuntimeApi<Block>,
+>(
+  client: Arc<C>,
+) -> Result<RpcModule<impl 'static + Send + Sync>, Box<dyn std::error::Error + Send + Sync>> {
+  let mut module = RpcModule::new(client);
+  module.register_async_method("serai_block", |params, client, _ext| async move {
+    let [block_hash]: [String; 1] = params.parse()?;
+    let Some(block_hash) = hex::decode(&block_hash).ok().and_then(|bytes| {
+      <[u8; 32]>::try_from(bytes.as_slice())
+        .map(<Block as sp_runtime::traits::Block>::Hash::from)
+        .ok()
+    }) else {
+      return Err(jsonrpsee::types::error::ErrorObjectOwned::owned(
+        -1,
+        "requested block hash wasn't a valid hash",
+        Option::<()>::None,
+      ));
+    };
+    let Some(block) = client.block(block_hash).ok().flatten() else {
+      return Err(jsonrpsee::types::error::ErrorObjectOwned::owned(
+        -2,
+        "couldn't find requested block",
+        Option::<()>::None,
+      ));
+    };
+    Ok(hex::encode(block.block.encode()))
+  })?;
+  Ok(module)
+}

substrate/node/src/rpc/mod.rs

@@ -1,5 +1,3 @@
-#![expect(unused_imports)]
-
 use std::{sync::Arc, ops::Deref, collections::HashSet};
 
 use rand_core::{RngCore, OsRng};
@@ -19,6 +17,9 @@ use jsonrpsee::RpcModule;
 use sc_client_api::BlockBackend;
 use sc_transaction_pool_api::TransactionPool;
 
+mod blockchain;
+mod p2p_validators;
+
 pub struct FullDeps<C, P> {
   pub id: String,
   pub client: Arc<C>,
@@ -38,74 +39,14 @@ pub fn create_full<
 >(
   deps: FullDeps<C, P>,
 ) -> Result<RpcModule<()>, Box<dyn std::error::Error + Send + Sync>> {
-  let mut module = RpcModule::new(());
   let FullDeps { id, client, pool, authority_discovery } = deps;
 
+  let mut root = RpcModule::new(());
+  root.merge(blockchain::module(client.clone())?)?;
   if let Some(authority_discovery) = authority_discovery {
-    let mut authority_discovery_module =
+    root.merge(p2p_validators::module(id, client, authority_discovery)?)?;
-      RpcModule::new((id, client.clone(), RwLock::new(authority_discovery)));
-    authority_discovery_module.register_async_method(
-      "p2p_validators",
-      |params, context, _ext| async move {
-        let [network]: [String; 1] = params.parse()?;
-        let network = match network.to_lowercase().as_str() {
-          "serai" => NetworkId::Serai,
-          "bitcoin" => ExternalNetworkId::Bitcoin.into(),
-          "ethereum" => ExternalNetworkId::Ethereum.into(),
-          "monero" => ExternalNetworkId::Monero.into(),
-          _ => Err(jsonrpsee::types::error::ErrorObjectOwned::owned(
-            -1,
-            "network to fetch the `p2p_validators` of was unrecognized".to_string(),
-            Option::<()>::None,
-          ))?,
-        };
-        let (id, client, authority_discovery) = &*context;
-        let latest_block = client.info().best_hash;
-
-        let validators = client.runtime_api().validators(latest_block, network).map_err(|_| {
-          jsonrpsee::types::error::ErrorObjectOwned::owned(
-            -2,
-            format!(
-              "couldn't get validators from the latest block, which is likely a fatal bug. {}",
-              "please report this at https://github.com/serai-dex/serai",
-            ),
-            Option::<()>::None,
-          )
-        });
-        let validators = match validators {
-          Ok(validators) => validators,
-          Err(e) => return Err(e),
-        };
-        // Always return the protocol's bootnodes
-        let mut all_p2p_addresses = crate::chain_spec::bootnode_multiaddrs(id);
-        // Additionally returns validators found over the DHT
-        for validator in validators {
-          let mut returned_addresses = authority_discovery
-            .write()
-            .await
-            .get_addresses_by_authority_id(validator.into())
-            .await
-            .unwrap_or_else(HashSet::new)
-            .into_iter()
-            .collect::<Vec<_>>();
-          // Randomly select an address
-          // There should be one, there may be two if their IP address changed, and more should only
-          // occur if they have multiple proxies/an IP address changing frequently/some issue
-          // preventing consistent self-identification
-          // It isn't beneficial to use multiple addresses for a single peer here
-          if !returned_addresses.is_empty() {
-            all_p2p_addresses.push(
-              returned_addresses
-                .remove(usize::try_from(OsRng.next_u64() >> 32).unwrap() % returned_addresses.len())
-                .into(),
-            );
-          }
-        }
-        Ok(all_p2p_addresses)
-      },
-    )?;
-    module.merge(authority_discovery_module)?;
   }
+  Ok(root)
 
   /* TODO
   use ciphersuite::{GroupIo, WithPreferredHash};
@@ -205,31 +146,4 @@ pub fn create_full<
 
   module.merge(serai_json_module)?;
   */
-
-  let mut block_bin_module = RpcModule::new(client);
-  block_bin_module.register_async_method("serai_block", |params, client, _ext| async move {
-    let [block_hash]: [String; 1] = params.parse()?;
-    let Some(block_hash) = hex::decode(&block_hash).ok().and_then(|bytes| {
-      <[u8; 32]>::try_from(bytes.as_slice())
-        .map(<Block as sp_runtime::traits::Block>::Hash::from)
-        .ok()
-    }) else {
-      return Err(jsonrpsee::types::error::ErrorObjectOwned::owned(
-        -1,
-        "requested block hash wasn't a valid hash",
-        Option::<()>::None,
-      ));
-    };
-    let Some(block) = client.block(block_hash).ok().flatten() else {
-      return Err(jsonrpsee::types::error::ErrorObjectOwned::owned(
-        -1,
-        "couldn't find requested block",
-        Option::<()>::None,
-      ));
-    };
-    Ok(hex::encode(block.block.encode()))
-  })?;
-  module.merge(block_bin_module)?;
-
-  Ok(module)
 }

substrate/node/src/rpc/p2p_validators.rs

@@ -0,0 +1,86 @@
+use std::{sync::Arc, ops::Deref, collections::HashSet};
+
+use rand_core::{RngCore, OsRng};
+
+use sp_core::Encode;
+use sp_blockchain::{Error as BlockchainError, HeaderBackend};
+use sp_api::ProvideRuntimeApi;
+
+use serai_abi::{primitives::prelude::*, SubstrateBlock as Block};
+use serai_runtime::*;
+
+use tokio::sync::RwLock;
+
+use jsonrpsee::RpcModule;
+
+pub(crate) fn module<
+  C: 'static
+    + Send
+    + Sync
+    + HeaderBackend<Block>
+    + ProvideRuntimeApi<Block, Api: serai_runtime::SeraiApi<Block>>,
+>(
+  id: String,
+  client: Arc<C>,
+  authority_discovery: sc_authority_discovery::Service,
+) -> Result<RpcModule<impl 'static + Send + Sync>, Box<dyn std::error::Error + Send + Sync>> {
+  let mut module = RpcModule::new((id, client, RwLock::new(authority_discovery)));
+  module.register_async_method("p2p_validators", |params, context, _ext| async move {
+    let [network]: [String; 1] = params.parse()?;
+    let network = match network.to_lowercase().as_str() {
+      "serai" => NetworkId::Serai,
+      "bitcoin" => ExternalNetworkId::Bitcoin.into(),
+      "ethereum" => ExternalNetworkId::Ethereum.into(),
+      "monero" => ExternalNetworkId::Monero.into(),
+      _ => Err(jsonrpsee::types::error::ErrorObjectOwned::owned(
+        -1,
+        "network to fetch the `p2p_validators` of was unrecognized".to_string(),
+        Option::<()>::None,
+      ))?,
+    };
+    let (id, client, authority_discovery) = &*context;
+    let latest_block = client.info().best_hash;
+
+    let validators = client.runtime_api().validators(latest_block, network).map_err(|_| {
+      jsonrpsee::types::error::ErrorObjectOwned::owned(
+        -2,
+        format!(
+          "couldn't get validators from the latest block, which is likely a fatal bug. {}",
+          "please report this at https://github.com/serai-dex/serai",
+        ),
+        Option::<()>::None,
+      )
+    });
+    let validators = match validators {
+      Ok(validators) => validators,
+      Err(e) => return Err(e),
+    };
+    // Always return the protocol's bootnodes
+    let mut all_p2p_addresses = crate::chain_spec::bootnode_multiaddrs(id);
+    // Additionally returns validators found over the DHT
+    for validator in validators {
+      let mut returned_addresses = authority_discovery
+        .write()
+        .await
+        .get_addresses_by_authority_id(validator.into())
+        .await
+        .unwrap_or_else(HashSet::new)
+        .into_iter()
+        .collect::<Vec<_>>();
+      // Randomly select an address
+      // There should be one, there may be two if their IP address changed, and more should only
+      // occur if they have multiple proxies/an IP address changing frequently/some issue
+      // preventing consistent self-identification
+      // It isn't beneficial to use multiple addresses for a single peer here
+      if !returned_addresses.is_empty() {
+        all_p2p_addresses.push(
+          returned_addresses
+            .remove(usize::try_from(OsRng.next_u64() >> 32).unwrap() % returned_addresses.len())
+            .into(),
+        );
+      }
+    }
+    Ok(all_p2p_addresses)
+  })?;
+  Ok(module)
+}

substrate/node/src/service.rs

@@ -34,16 +34,17 @@ pub type FullClient = TFullClient<Block, RuntimeApi, Executor>;
 
 type SelectChain = sc_consensus::LongestChain<FullBackend, Block>;
 type GrandpaBlockImport = grandpa::GrandpaBlockImport<FullBackend, Block, FullClient, SelectChain>;
-type BabeBlockImport = sc_consensus_babe::BabeBlockImport<Block, FullClient, GrandpaBlockImport>;
+type BabeBlockImport<CIDP> =
+  sc_consensus_babe::BabeBlockImport<Block, FullClient, GrandpaBlockImport, CIDP, SelectChain>;
 
-type PartialComponents = sc_service::PartialComponents<
+type PartialComponents<CIDP> = sc_service::PartialComponents<
   FullClient,
   FullBackend,
   SelectChain,
   sc_consensus::DefaultImportQueue<Block>,
   sc_transaction_pool::TransactionPoolWrapper<Block, FullClient>,
   (
-    BabeBlockImport,
+    BabeBlockImport<CIDP>,
     sc_consensus_babe::BabeLink<Block>,
     grandpa::LinkHalf<Block, FullClient, SelectChain>,
     grandpa::SharedVoterState,
@@ -58,9 +59,22 @@ fn create_inherent_data_providers(
   (BabeInherent::from_timestamp_and_slot_duration(*timestamp, slot_duration), timestamp)
 }
 
+#[allow(clippy::type_complexity)]
 pub fn new_partial(
   config: &Configuration,
-) -> Result<(PartialComponents, Arc<dyn sp_keystore::Keystore>), ServiceError> {
+) -> Result<
+  (
+    PartialComponents<
+      impl sp_inherents::CreateInherentDataProviders<
+        Block,
+        (),
+        InherentDataProviders: sc_consensus_slots::InherentDataProviderExt,
+      >,
+    >,
+    Arc<dyn sp_keystore::Keystore>,
+  ),
+  ServiceError,
+> {
   let telemetry = config
     .telemetry_endpoints
     .clone()
@@ -117,6 +131,7 @@ pub fn new_partial(
   .with_prometheus(config.prometheus_registry())
   .build();
   let transaction_pool = Arc::new(transaction_pool);
+  let offchain_tx_pool_factory = OffchainTransactionPoolFactory::new(transaction_pool.clone());
 
   let (grandpa_block_import, grandpa_link) = grandpa::block_import(
     client.clone(),
@@ -127,27 +142,27 @@ pub fn new_partial(
   )?;
   let justification_import = grandpa_block_import.clone();
 
+  let babe_config = sc_consensus_babe::configuration(&*client)?;
+  let slot_duration = babe_config.slot_duration();
   let (block_import, babe_link) = sc_consensus_babe::block_import(
-    sc_consensus_babe::configuration(&*client)?,
+    babe_config,
     grandpa_block_import,
     client.clone(),
+    move |_, ()| async move { Ok(create_inherent_data_providers(slot_duration)) },
+    select_chain.clone(),
+    offchain_tx_pool_factory,
   )?;
 
-  let slot_duration = babe_link.config().slot_duration();
   let (import_queue, babe_handle) =
     sc_consensus_babe::import_queue(sc_consensus_babe::ImportQueueParams {
       link: babe_link.clone(),
       block_import: block_import.clone(),
       justification_import: Some(Box::new(justification_import)),
+      slot_duration,
       client: client.clone(),
-      select_chain: select_chain.clone(),
-      create_inherent_data_providers: move |_, ()| async move {
-        Ok(create_inherent_data_providers(slot_duration))
-      },
       spawner: &task_manager.spawn_essential_handle(),
       registry: config.prometheus_registry(),
       telemetry: telemetry.as_ref().map(Telemetry::handle),
-      offchain_tx_pool_factory: OffchainTransactionPoolFactory::new(transaction_pool.clone()),
     })?;
   // This can't be dropped, or BABE breaks
   // We don't have anything to do with it though

substrate/primitives/Cargo.toml

@@ -23,7 +23,7 @@ borsh = { version = "1", default-features = false, features = ["derive", "de_str
 
 bitvec = { version = "1", default-features = false, features = ["alloc"] }
 scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"], optional = true }
-sp-core = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "dd8f2ab6c80c609f15714f554194529116b717ef", default-features = false }
+sp-core = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "b48efb12bf49a0dba1b3633403f716010b99dc56", default-features = false }
 
 ciphersuite = { path = "../../crypto/ciphersuite", default-features = false, features = ["alloc"] }
 schnorr-signatures = { path = "../../crypto/schnorr", default-features = false }

substrate/runtime/Cargo.toml

@@ -20,28 +20,28 @@ workspace = true
 [dependencies]
 scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] }
 
-sp-core = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "dd8f2ab6c80c609f15714f554194529116b717ef", default-features = false }
+sp-core = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "b48efb12bf49a0dba1b3633403f716010b99dc56", default-features = false }
-sp-session = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "dd8f2ab6c80c609f15714f554194529116b717ef", default-features = false }
+sp-session = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "b48efb12bf49a0dba1b3633403f716010b99dc56", default-features = false }
-sp-inherents = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "dd8f2ab6c80c609f15714f554194529116b717ef", default-features = false }
+sp-inherents = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "b48efb12bf49a0dba1b3633403f716010b99dc56", default-features = false }
-sp-version = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "dd8f2ab6c80c609f15714f554194529116b717ef", default-features = false }
+sp-version = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "b48efb12bf49a0dba1b3633403f716010b99dc56", default-features = false }
-sp-runtime = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "dd8f2ab6c80c609f15714f554194529116b717ef", default-features = false }
+sp-runtime = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "b48efb12bf49a0dba1b3633403f716010b99dc56", default-features = false }
-sp-api = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "dd8f2ab6c80c609f15714f554194529116b717ef", default-features = false }
+sp-api = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "b48efb12bf49a0dba1b3633403f716010b99dc56", default-features = false }
-sp-consensus-babe = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev =  "dd8f2ab6c80c609f15714f554194529116b717ef", default-features = false }
+sp-consensus-babe = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "b48efb12bf49a0dba1b3633403f716010b99dc56", default-features = false }
-sp-consensus-grandpa = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev =  "dd8f2ab6c80c609f15714f554194529116b717ef", default-features = false }
+sp-consensus-grandpa = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "b48efb12bf49a0dba1b3633403f716010b99dc56", default-features = false }
-sp-block-builder = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "dd8f2ab6c80c609f15714f554194529116b717ef", default-features = false }
+sp-block-builder = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "b48efb12bf49a0dba1b3633403f716010b99dc56", default-features = false }
-sp-transaction-pool = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "dd8f2ab6c80c609f15714f554194529116b717ef", default-features = false }
+sp-transaction-pool = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "b48efb12bf49a0dba1b3633403f716010b99dc56", default-features = false }
-sp-authority-discovery = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev =  "dd8f2ab6c80c609f15714f554194529116b717ef", default-features = false }
+sp-authority-discovery = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "b48efb12bf49a0dba1b3633403f716010b99dc56", default-features = false }
 
 serai-abi = { path = "../abi", default-features = false, features = ["substrate"] }
 
-frame-system = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "dd8f2ab6c80c609f15714f554194529116b717ef", default-features = false }
+frame-system = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "b48efb12bf49a0dba1b3633403f716010b99dc56", default-features = false }
-frame-support = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "dd8f2ab6c80c609f15714f554194529116b717ef", default-features = false }
+frame-support = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "b48efb12bf49a0dba1b3633403f716010b99dc56", default-features = false }
-frame-executive = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "dd8f2ab6c80c609f15714f554194529116b717ef", default-features = false }
+frame-executive = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "b48efb12bf49a0dba1b3633403f716010b99dc56", default-features = false }
 
-pallet-timestamp = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "dd8f2ab6c80c609f15714f554194529116b717ef", default-features = false }
+pallet-timestamp = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "b48efb12bf49a0dba1b3633403f716010b99dc56", default-features = false }
-pallet-session = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "dd8f2ab6c80c609f15714f554194529116b717ef", default-features = false }
+pallet-session = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "b48efb12bf49a0dba1b3633403f716010b99dc56", default-features = false }
-pallet-babe = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "dd8f2ab6c80c609f15714f554194529116b717ef", default-features = false }
+pallet-babe = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "b48efb12bf49a0dba1b3633403f716010b99dc56", default-features = false }
-pallet-grandpa = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "dd8f2ab6c80c609f15714f554194529116b717ef", default-features = false }
+pallet-grandpa = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "b48efb12bf49a0dba1b3633403f716010b99dc56", default-features = false }
 
 serai-core-pallet = { path = "../core", default-features = false }
 serai-coins-pallet = { path = "../coins", default-features = false }
@@ -49,7 +49,7 @@ serai-validator-sets-pallet = { path = "../validator-sets", default-features = f
 serai-signals-pallet = { path = "../signals", default-features = false }
 
 [build-dependencies]
-substrate-wasm-builder = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "dd8f2ab6c80c609f15714f554194529116b717ef" }
+substrate-wasm-builder = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "b48efb12bf49a0dba1b3633403f716010b99dc56" }
 
 [features]
 std = [

substrate/signals/Cargo.toml

@@ -21,10 +21,10 @@ workspace = true
 [dependencies]
 scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] }
 
-sp-core = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "dd8f2ab6c80c609f15714f554194529116b717ef", default-features = false }
+sp-core = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "b48efb12bf49a0dba1b3633403f716010b99dc56", default-features = false }
 
-frame-system = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "dd8f2ab6c80c609f15714f554194529116b717ef", default-features = false }
+frame-system = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "b48efb12bf49a0dba1b3633403f716010b99dc56", default-features = false }
-frame-support = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "dd8f2ab6c80c609f15714f554194529116b717ef", default-features = false }
+frame-support = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "b48efb12bf49a0dba1b3633403f716010b99dc56", default-features = false }
 
 serai-abi = { path = "../abi", default-features = false, features = ["substrate"] }
 

substrate/validator-sets/Cargo.toml

@@ -20,17 +20,17 @@ bitvec = { version = "1", default-features = false, features = ["alloc", "serde"
 
 scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive", "bit-vec"] }
 
-sp-core = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "dd8f2ab6c80c609f15714f554194529116b717ef", default-features = false }
+sp-core = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "b48efb12bf49a0dba1b3633403f716010b99dc56", default-features = false }
-sp-application-crypto = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "dd8f2ab6c80c609f15714f554194529116b717ef", default-features = false }
+sp-application-crypto = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "b48efb12bf49a0dba1b3633403f716010b99dc56", default-features = false }
-sp-io = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "dd8f2ab6c80c609f15714f554194529116b717ef", default-features = false }
+sp-io = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "b48efb12bf49a0dba1b3633403f716010b99dc56", default-features = false }
-sp-api = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "dd8f2ab6c80c609f15714f554194529116b717ef", default-features = false }
+sp-api = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "b48efb12bf49a0dba1b3633403f716010b99dc56", default-features = false }
 
-frame-system = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "dd8f2ab6c80c609f15714f554194529116b717ef", default-features = false }
+frame-system = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "b48efb12bf49a0dba1b3633403f716010b99dc56", default-features = false }
-frame-support = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "dd8f2ab6c80c609f15714f554194529116b717ef", default-features = false }
+frame-support = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "b48efb12bf49a0dba1b3633403f716010b99dc56", default-features = false }
 
-pallet-session = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "dd8f2ab6c80c609f15714f554194529116b717ef", default-features = false }
+pallet-session = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "b48efb12bf49a0dba1b3633403f716010b99dc56", default-features = false }
-pallet-babe = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "dd8f2ab6c80c609f15714f554194529116b717ef", default-features = false }
+pallet-babe = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "b48efb12bf49a0dba1b3633403f716010b99dc56", default-features = false }
-pallet-grandpa = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "dd8f2ab6c80c609f15714f554194529116b717ef", default-features = false }
+pallet-grandpa = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "b48efb12bf49a0dba1b3633403f716010b99dc56", default-features = false }
 
 serai-abi = { path = "../abi", default-features = false, features = ["substrate"] }