Merge branch 'devnet-ready' into remove-gov-done-migrations

Author: l0r1s

Cargo.lock

@@ -285,6 +285,9 @@ sha2 = { version = "0.10.8", default-features = false }
 rand_chacha = { version = "0.3.1", default-features = false }
 tle = { git = "https://github.com/ideal-lab5/timelock", rev = "5416406cfd32799e31e1795393d4916894de4468", default-features = false }
 
+pallet-shield = { path = "pallets/shield", default-features = false }
+ml-kem = { version = "0.2.0", default-features = true }
+
 # Primitives
 
 [profile.release]

Cargo.toml

@@ -19,7 +19,7 @@ if [ "$i" -eq 1000 ]; then
     exit 1
 fi
 
-sleep 5
+sleep 10
 
 if ! nc -z localhost 9944; then
     echo "node subtensor exit, port not available"

evm-tests/run-ci.sh

@@ -114,13 +114,29 @@ fc-aura.workspace = true
 fp-consensus.workspace = true
 num-traits = { workspace = true, features = ["std"] }
 
+# Mev Shield
+pallet-shield.workspace = true
+tokio = { version = "1.38", features = ["time"] }
+x25519-dalek = "2"
+hkdf = "0.12"
+chacha20poly1305 = { version = "0.10", features = ["std"] }
+codec.workspace = true
+rand.workspace = true
+sha2.workspace = true
+anyhow.workspace = true
+pallet-subtensor.workspace = true
+ml-kem.workspace = true
+rand_core = "0.9.3"
+blake2 = "0.10.6"
+
 # Local Dependencies
 node-subtensor-runtime = { workspace = true, features = ["std"] }
 subtensor-runtime-common = { workspace = true, features = ["std"] }
 subtensor-custom-rpc = { workspace = true, features = ["std"] }
 subtensor-custom-rpc-runtime-api = { workspace = true, features = ["std"] }
 pallet-subtensor-swap-rpc = { workspace = true, features = ["std"] }
 pallet-subtensor-swap-runtime-api = { workspace = true, features = ["std"] }
+subtensor-macros.workspace = true
 
 [build-dependencies]
 substrate-build-script-utils.workspace = true
@@ -138,6 +154,7 @@ default = ["rocksdb", "sql", "txpool"]
 fast-runtime = [
 	"node-subtensor-runtime/fast-runtime",
 	"subtensor-runtime-common/fast-runtime",
+	"pallet-subtensor/fast-runtime",
 ]
 sql = ["fc-db/sql", "fc-mapping-sync/sql"]
 txpool = ["fc-rpc/txpool", "fc-rpc-core/txpool"]
@@ -154,7 +171,10 @@ runtime-benchmarks = [
 	"pallet-drand/runtime-benchmarks",
 	"pallet-transaction-payment/runtime-benchmarks",
 	"polkadot-sdk/runtime-benchmarks",
+	"pallet-subtensor/runtime-benchmarks",
+	"pallet-shield/runtime-benchmarks",
 ]
+
 pow-faucet = []
 
 # Enable features that allow the runtime to be tried and debugged. Name might be subject to change
@@ -167,6 +187,8 @@ try-runtime = [
 	"pallet-commitments/try-runtime",
 	"pallet-drand/try-runtime",
 	"polkadot-sdk/try-runtime",
+	"pallet-shield/try-runtime",
+	"pallet-subtensor/try-runtime",
 ]
 
 metadata-hash = ["node-subtensor-runtime/metadata-hash"]

node/Cargo.toml

@@ -34,11 +34,11 @@ pub fn localnet_config(single_authority: bool) -> Result<ChainSpec, String> {
         // aura | grandpa
         if single_authority {
             // single authority allows you to run the network using a single node
-            vec![authority_keys_from_seed("Alice")]
+            vec![authority_keys_from_seed("One")]
         } else {
             vec![
-                authority_keys_from_seed("Alice"),
-                authority_keys_from_seed("Bob"),
+                authority_keys_from_seed("One"),
+                authority_keys_from_seed("Two"),
             ]
         },
         // Pre-funded accounts
@@ -77,6 +77,14 @@ fn localnet_genesis(
             get_account_id_from_seed::<sr25519::Public>("Ferdie"),
             2000000000000u128,
         ),
+        (
+            get_account_id_from_seed::<sr25519::Public>("One"),
+            2000000000000u128,
+        ),
+        (
+            get_account_id_from_seed::<sr25519::Public>("Two"),
+            2000000000000u128,
+        ),
         // ETH
         (
             // Alith - 0xf24FF3a9CF04c71Dbc94D0b566f7A27B94566cac

node/src/chain_spec/localnet.rs

@@ -4,5 +4,6 @@ pub mod client;
 pub mod conditional_evm_block_import;
 pub mod consensus;
 pub mod ethereum;
+pub mod mev_shield;
 pub mod rpc;
 pub mod service;

node/src/lib.rs

@@ -10,6 +10,7 @@ mod command;
 mod conditional_evm_block_import;
 mod consensus;
 mod ethereum;
+mod mev_shield;
 mod rpc;
 mod service;