Merge branch 'devnet-ready' into feat/pending-childkeys

Author: gztensor

Cargo.lock

@@ -34,6 +34,7 @@ members = [
     "support/macros",
     "support/linting",
     "support/procedural-fork",
+    "pallets/drand",
 ]
 exclude = ["support/procedural-fork"]
 resolver = "2"
@@ -49,7 +50,7 @@ manual_inspect = "allow"
 async-trait = "0.1"
 cargo-husky = { version = "1", default-features = false }
 clap = "4.5.4"
-codec = { version = "3.2.2", default-features = false }
+codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
 ed25519-dalek = { version = "2.1.0", default-features = false, features = ["alloc"] }
 enumflags2 = "0.7.9"
 futures = "0.3.30"
@@ -63,14 +64,14 @@ parity-util-mem = "0.12.0"
 rand = "0.8.5"
 scale-codec = { package = "parity-scale-codec", version = "3.6.12", default-features = false, features = ["derive"] }
 scale-info = { version = "2.11.2", default-features = false }
-serde = { version = "1.0.199", default-features = false }
+serde = { version = "1.0.214", default-features = false }
 serde-tuple-vec-map = { version = "1.0.1", default-features = false }
 serde_bytes = { version = "0.11.14", default-features = false }
 serde_json = { version = "1.0.121", default-features = false }
 serde_with = { version = "=2.0.0", default-features = false }
 smallvec = "1.13.2"
 litep2p = { git = "https://github.com/paritytech/litep2p", tag = "v0.7.0" }
-syn = { version = "2", features = [
+syn = { version = "2.0.87", features = [
     "full",
     "visit-mut",
     "visit",
@@ -142,7 +143,7 @@ sp-genesis-builder = { git = "https://github.com/paritytech/polkadot-sdk.git", t
 sp-core = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2409", default-features = false }
 sp-inherents = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2409", default-features = false }
 sp-io = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2409", default-features = false }
-sp-keyring = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2409" }
+sp-keyring = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2409", default-features = false }
 sp-offchain = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2409", default-features = false }
 sp-rpc = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2409", default-features = false }
 sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2409", default-features = false }
@@ -192,6 +193,25 @@ pallet-evm-precompile-sha3fips = { git = "https://github.com/gztensor/frontier",
 pallet-evm-precompile-simple = { git = "https://github.com/gztensor/frontier", rev = "b8e3025", default-features = false }
 pallet-hotfix-sufficients = { git = "https://github.com/gztensor/frontier", rev = "b8e3025", default-features = false }
 
+#DRAND
+pallet-drand = { path = "pallets/drand", default-features = false }
+sp-crypto-ec-utils = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2409", features = ["bls12-381"] }
+getrandom = { version = "0.2.15", features = ["custom"], default-features = false }
+sp-keystore = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2409",  default-features = false }
+w3f-bls = { version = "=0.1.3", default-features = false }
+ark-crypto-primitives = { version = "0.4.0", default-features = false, features = [ "r1cs", "snark" ] }
+ark-scale = { version = "0.0.11", default-features = false, features = ["hazmat"] }
+sp-ark-bls12-381 = { git = "https://github.com/paritytech/substrate-curves", default-features = false }
+ark-bls12-381 = { version = "0.4.0", features = ["curve"], default-features = false }
+ark-serialize = { version = "0.4.0", features = [ "derive" ], default-features = false }
+ark-ff = { version = "0.4.0", default-features = false }
+ark-ec = { version = "0.4.0", default-features = false }
+ark-std = { version = "0.4.0", default-features = false }
+anyhow = "1.0.81"
+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 }
+
 frame-metadata = "16"
 
 [profile.release]

Cargo.toml

@@ -63,6 +63,10 @@ frame-metadata-hash-extension = { workspace = true }
 frame-system = { workspace = true }
 pallet-transaction-payment = { workspace = true }
 pallet-commitments = { path = "../pallets/commitments" }
+pallet-drand = { workspace = true }
+sp-crypto-ec-utils = { workspace = true }
+sp-keystore = { workspace = true,  default-features = false }
+
 
 # These dependencies are used for the subtensor's RPCs
 jsonrpsee = { workspace = true, features = ["server"] }
@@ -128,6 +132,7 @@ runtime-benchmarks = [
 	"sc-service/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
 	"pallet-commitments/runtime-benchmarks",
+	"pallet-drand/runtime-benchmarks"
 ]
 pow-faucet = []
 
@@ -139,6 +144,7 @@ try-runtime = [
 	"pallet-transaction-payment/try-runtime",
 	"sp-runtime/try-runtime",
 	"pallet-commitments/try-runtime",
+	"pallet-drand/try-runtime"
 ]
 
 metadata-hash = ["node-subtensor-runtime/metadata-hash"]

node/Cargo.toml

@@ -4,13 +4,15 @@ use sc_executor::WasmExecutor;
 /// Full backend.
 pub type FullBackend = sc_service::TFullBackend<Block>;
 /// Full client.
-pub type FullClient = sc_service::TFullClient<Block, RuntimeApi, WasmExecutor<HostFunctions>>;
+pub type FullClient = sc_service::TFullClient<Block, RuntimeApi, RuntimeExecutor>;
 /// Always enable runtime benchmark host functions, the genesis state
 /// was built with them so we're stuck with them forever.
 ///
 /// They're just a noop, never actually get used if the runtime was not compiled with
 /// `runtime-benchmarks`.
-type HostFunctions = (
+pub type HostFunctions = (
     sp_io::SubstrateHostFunctions,
     frame_benchmarking::benchmarking::HostFunctions,
+    sp_crypto_ec_utils::bls12_381::host_calls::HostFunctions,
 );
+pub type RuntimeExecutor = WasmExecutor<HostFunctions>;

node/src/client.rs

@@ -26,7 +26,7 @@ use std::{marker::PhantomData, sync::Arc, time::Duration};
 use substrate_prometheus_endpoint::Registry;
 
 use crate::cli::Sealing;
-use crate::client::{FullBackend, FullClient};
+use crate::client::{FullBackend, FullClient, HostFunctions, RuntimeExecutor};
 use crate::ethereum::{
     db_config_dir, new_frontier_partial, spawn_frontier_tasks, BackendType, EthConfiguration,
     FrontierBackend, FrontierBlockImport, FrontierPartialComponents, StorageOverride,
@@ -84,13 +84,14 @@ where
         })
         .transpose()?;
 
-    let executor = sc_service::new_wasm_executor(&config.executor);
+    let executor = sc_service::new_wasm_executor::<HostFunctions>(&config.executor);
     let (client, backend, keystore_container, task_manager) =
-        sc_service::new_full_parts::<Block, RuntimeApi, _>(
+        sc_service::new_full_parts::<Block, RuntimeApi, RuntimeExecutor>(
             config,
             telemetry.as_ref().map(|(_, telemetry)| telemetry.handle()),
             executor,
         )?;
+
     let client = Arc::new(client);
 
     let telemetry = telemetry.map(|(worker, telemetry)| {
@@ -427,10 +428,31 @@ where
             metrics,
         })?;
 
-    if config.offchain_worker.enabled {
-        task_manager.spawn_handle().spawn(
+    if config.offchain_worker.enabled && config.role.is_authority() {
+        let public_keys = keystore_container
+            .keystore()
+            .sr25519_public_keys(pallet_drand::KEY_TYPE);
+
+        if public_keys.is_empty() {
+            match sp_keystore::Keystore::sr25519_generate_new(
+                &*keystore_container.keystore(),
+                pallet_drand::KEY_TYPE,
+                None,
+            ) {
+                Ok(_) => {
+                    log::debug!("Offchain worker key generated");
+                }
+                Err(e) => {
+                    log::error!("Failed to create SR25519 key for offchain worker: {:?}", e);
+                }
+            }
+        } else {
+            log::debug!("Offchain worker key already exists");
+        }
+
+        task_manager.spawn_essential_handle().spawn(
             "offchain-workers-runner",
-            "offchain-worker",
+            None,
             sc_offchain::OffchainWorkers::new(sc_offchain::OffchainWorkerOptions {
                 runtime_api_provider: client.clone(),
                 is_validator: config.role.is_authority(),

node/src/service.rs

@@ -29,6 +29,7 @@ log = { workspace = true }
 pallet-subtensor = { version = "4.0.0-dev", default-features = false, path = "../subtensor" }
 sp-weights = { workspace = true }
 substrate-fixed = { workspace = true }
+pallet-drand = { workspace = true, default-features = false }
 
 
 [dev-dependencies]
@@ -60,6 +61,7 @@ std = [
 	"sp-io/std",
 	"sp-std/std",
 	"substrate-fixed/std",
+	"pallet-drand/std"
 ]
 runtime-benchmarks = [
 	"frame-benchmarking/runtime-benchmarks",
@@ -69,12 +71,14 @@ runtime-benchmarks = [
 	"sp-runtime/runtime-benchmarks",
 	"pallet-subtensor/runtime-benchmarks",
 	"pallet-scheduler/runtime-benchmarks",
+	"pallet-drand/runtime-benchmarks"
 ]
 try-runtime = [
 	"frame-support/try-runtime",
 	"frame-system/try-runtime",
 	"pallet-balances/try-runtime",
 	"pallet-scheduler/try-runtime",
 	"sp-runtime/try-runtime",
-	"pallet-subtensor/try-runtime"
+	"pallet-subtensor/try-runtime",
+	"pallet-drand/try-runtime"
 ]