Merge branch 'devnet-ready' into spiigot/fix-commit-onexact-epoch

Author: JohnReedV

Cargo.lock

@@ -166,32 +166,32 @@ sc-network-sync = { git = "https://github.com/paritytech/polkadot-sdk.git", tag
 substrate-prometheus-endpoint = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2409", default-features = false }
 
 # Frontier
-fp-evm = { git = "https://github.com/gztensor/frontier", rev = "b8e3025", default-features = false }
-fp-rpc = { git = "https://github.com/gztensor/frontier", rev = "b8e3025", default-features = false }
-fp-self-contained = { git = "https://github.com/gztensor/frontier", rev = "b8e3025", default-features = false, features = [
+fp-evm = { git = "https://github.com/gztensor/frontier", rev = "b9c606f9", default-features = false }
+fp-rpc = { git = "https://github.com/gztensor/frontier", rev = "b9c606f9", default-features = false }
+fp-self-contained = { git = "https://github.com/gztensor/frontier", rev = "b9c606f9", default-features = false, features = [
 	"serde",
 ] }
-fp-account = { git = "https://github.com/gztensor/frontier", rev = "b8e3025", default-features = false }
-fc-storage = { git = "https://github.com/gztensor/frontier", rev = "b8e3025", default-features = false }
-fc-db = { git = "https://github.com/gztensor/frontier", rev = "b8e3025", default-features = false }
-fc-consensus = { git = "https://github.com/gztensor/frontier", rev = "b8e3025", default-features = false }
-fp-consensus = { git = "https://github.com/gztensor/frontier", rev = "b8e3025", default-features = false }
-fp-dynamic-fee = { git = "https://github.com/gztensor/frontier", rev = "b8e3025", default-features = false }
-fc-api = { git = "https://github.com/gztensor/frontier", rev = "b8e3025", default-features = false }
-fc-rpc = { git = "https://github.com/gztensor/frontier", rev = "b8e3025", default-features = false }
-fc-rpc-core = { git = "https://github.com/gztensor/frontier", rev = "b8e3025", default-features = false }
-fc-mapping-sync = { git = "https://github.com/gztensor/frontier", rev = "b8e3025", default-features = false }
+fp-account = { git = "https://github.com/gztensor/frontier", rev = "b9c606f9", default-features = false }
+fc-storage = { git = "https://github.com/gztensor/frontier", rev = "b9c606f9", default-features = false }
+fc-db = { git = "https://github.com/gztensor/frontier", rev = "b9c606f9", default-features = false }
+fc-consensus = { git = "https://github.com/gztensor/frontier", rev = "b9c606f9", default-features = false }
+fp-consensus = { git = "https://github.com/gztensor/frontier", rev = "b9c606f9", default-features = false }
+fp-dynamic-fee = { git = "https://github.com/gztensor/frontier", rev = "b9c606f9", default-features = false }
+fc-api = { git = "https://github.com/gztensor/frontier", rev = "b9c606f9", default-features = false }
+fc-rpc = { git = "https://github.com/gztensor/frontier", rev = "b9c606f9", default-features = false }
+fc-rpc-core = { git = "https://github.com/gztensor/frontier", rev = "b9c606f9", default-features = false }
+fc-mapping-sync = { git = "https://github.com/gztensor/frontier", rev = "b9c606f9", default-features = false }
 
 # Frontier FRAME
-pallet-base-fee = { git = "https://github.com/gztensor/frontier", rev = "b8e3025", default-features = false }
-pallet-dynamic-fee = { git = "https://github.com/gztensor/frontier", rev = "b8e3025", default-features = false }
-pallet-ethereum = { git = "https://github.com/gztensor/frontier", rev = "b8e3025", default-features = false }
-pallet-evm = { git = "https://github.com/gztensor/frontier", rev = "b8e3025", default-features = false }
-pallet-evm-chain-id = { git = "https://github.com/gztensor/frontier", rev = "b8e3025", default-features = false }
-pallet-evm-precompile-modexp = { git = "https://github.com/gztensor/frontier", rev = "b8e3025", default-features = false }
-pallet-evm-precompile-sha3fips = { git = "https://github.com/gztensor/frontier", rev = "b8e3025", default-features = false }
-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 }
+pallet-base-fee = { git = "https://github.com/gztensor/frontier", rev = "b9c606f9", default-features = false }
+pallet-dynamic-fee = { git = "https://github.com/gztensor/frontier", rev = "b9c606f9", default-features = false }
+pallet-ethereum = { git = "https://github.com/gztensor/frontier", rev = "b9c606f9", default-features = false }
+pallet-evm = { git = "https://github.com/gztensor/frontier", rev = "b9c606f9", default-features = false }
+pallet-evm-chain-id = { git = "https://github.com/gztensor/frontier", rev = "b9c606f9", default-features = false }
+pallet-evm-precompile-modexp = { git = "https://github.com/gztensor/frontier", rev = "b9c606f9", default-features = false }
+pallet-evm-precompile-sha3fips = { git = "https://github.com/gztensor/frontier", rev = "b9c606f9", default-features = false }
+pallet-evm-precompile-simple = { git = "https://github.com/gztensor/frontier", rev = "b9c606f9", default-features = false }
+pallet-hotfix-sufficients = { git = "https://github.com/gztensor/frontier", rev = "b9c606f9", default-features = false }
 
 #DRAND
 pallet-drand = { path = "pallets/drand", default-features = false }

Cargo.toml

@@ -25,6 +25,7 @@ clap = { workspace = true, features = ["derive"] }
 futures = { workspace = true, features = ["thread-pool"] }
 scale-codec = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
+hex = { workspace = true }
 
 # Storage import
 memmap2 = { workspace = true }

chainspecs/plain_spec_finney.json

@@ -2,6 +2,7 @@
 #![allow(clippy::unwrap_used)]
 
 use super::*;
+use hex::FromHex;
 
 pub fn finney_mainnet_config() -> Result<ChainSpec, String> {
     let path: PathBuf = std::path::PathBuf::from("./snapshot.json");
@@ -69,7 +70,7 @@ pub fn finney_mainnet_config() -> Result<ChainSpec, String> {
     properties.insert("tokenDecimals".into(), 9.into());
     properties.insert("ss58Format".into(), 42.into());
 
-    Ok(ChainSpec::builder(
+    let chain_spec = ChainSpec::builder(
         wasm_binary,
         Extensions {
             bad_blocks: Some(HashSet::new()),
@@ -181,7 +182,25 @@ pub fn finney_mainnet_config() -> Result<ChainSpec, String> {
         balances_issuance,
     ))
     .with_properties(properties)
-    .build())
+    .build();
+
+    // Load and set the code substitute to avoid archive node sync panic
+    // See <https://github.com/opentensor/subtensor/pull/1051>
+    //
+    // Need to do it in this hacky way because the ChainSpec builder doesn't support setting it
+    let code_substitute_2585476_hex = include_bytes!("code_substitute_2585476.txt");
+    let chain_spec_json = chain_spec.as_json(false).unwrap();
+    let mut chain_spec_json = serde_json::from_str(&chain_spec_json).unwrap();
+    sc_chain_spec::set_code_substitute_in_json_chain_spec(
+        &mut chain_spec_json,
+        Vec::from_hex(code_substitute_2585476_hex)
+            .unwrap()
+            .as_slice(),
+        2585476,
+    );
+    let chain_spec_bytes = chain_spec_json.to_string().into_bytes();
+    let chain_spec = ChainSpec::from_json_bytes(chain_spec_bytes).unwrap();
+    Ok(chain_spec)
 }
 
 // Configure initial storage state for FRAME modules.

chainspecs/raw_spec_finney.json

@@ -1,7 +1,9 @@
 //! Benchmarking setup
 #![cfg(feature = "runtime-benchmarks")]
 #![allow(clippy::arithmetic_side_effects)]
-use super::*;
+
+extern crate alloc;
+use alloc::vec::Vec;
 
 #[allow(unused)]
 use crate::Pallet as AdminUtils;
@@ -10,6 +12,8 @@ use frame_benchmarking::v2::*;
 use frame_support::BoundedVec;
 use frame_system::RawOrigin;
 
+use super::*;
+
 #[benchmarks]
 mod benchmarks {
     use super::*;

nakamoto_gen.json

@@ -65,7 +65,7 @@ impl<T: Config> Pallet<T> {
         // --- 3. Drain the subnet block emission and accumulate it as subnet emission, which increases until the tempo is reached in #4.
         // subnet_blockwise_emission -> subnet_pending_emission
         for netuid in subnets.clone().iter() {
-            if *netuid == 0 || !Self::is_registration_allowed(*netuid) {
+            if *netuid == 0 || !Self::get_network_registration_allowed(*netuid) {
                 continue;
             }
             // --- 3.1 Get the network's block-wise emission amount.
@@ -105,7 +105,10 @@ impl<T: Config> Pallet<T> {
                     };
                 }
 
-                // --- 4.3 Drain the subnet emission.
+                // 4.3 Apply pending childkeys of this subnet for the next epoch
+                Self::do_set_pending_children(*netuid);
+
+                // --- 4.4 Drain the subnet emission.
                 let mut subnet_emission: u64 = PendingEmission::<T>::get(*netuid);
                 PendingEmission::<T>::insert(*netuid, 0);
                 log::debug!(
@@ -114,39 +117,39 @@ impl<T: Config> Pallet<T> {
                     subnet_emission
                 );
 
-                // --- 4.4 Set last step counter.
+                // --- 4.5 Set last step counter.
                 Self::set_blocks_since_last_step(*netuid, 0);
                 Self::set_last_mechanism_step_block(*netuid, current_block);
 
-                if *netuid == 0 || !Self::is_registration_allowed(*netuid) {
+                if *netuid == 0 || !Self::get_network_registration_allowed(*netuid) {
                     // Skip netuid 0 payouts
                     continue;
                 }
 
-                // --- 4.5 Distribute owner take.
+                // --- 4.6 Distribute owner take.
                 if SubnetOwner::<T>::contains_key(netuid) {
                     // Does the subnet have an owner?
 
-                    // --- 4.5.1 Compute the subnet owner cut.
+                    // --- 4.6.1 Compute the subnet owner cut.
                     let owner_cut: I96F32 = I96F32::from_num(subnet_emission).saturating_mul(
                         I96F32::from_num(Self::get_subnet_owner_cut())
                             .saturating_div(I96F32::from_num(u16::MAX)),
                     );
 
-                    // --- 4.5.2 Remove the cut from the subnet emission
+                    // --- 4.6.2 Remove the cut from the subnet emission
                     subnet_emission = subnet_emission.saturating_sub(owner_cut.to_num::<u64>());
 
-                    // --- 4.5.3 Add the cut to the balance of the owner
+                    // --- 4.6.3 Add the cut to the balance of the owner
                     Self::add_balance_to_coldkey_account(
                         &Self::get_subnet_owner(*netuid),
                         owner_cut.to_num::<u64>(),
                     );
 
-                    // --- 4.5.4 Increase total issuance on the chain.
+                    // --- 4.6.4 Increase total issuance on the chain.
                     Self::coinbase(owner_cut.to_num::<u64>());
                 }
 
-                // 4.6 Pass emission through epoch() --> hotkey emission.
+                // 4.7 Pass emission through epoch() --> hotkey emission.
                 let hotkey_emission: Vec<(T::AccountId, u64, u64)> =
                     Self::epoch(*netuid, subnet_emission);
                 log::debug!(
@@ -155,7 +158,7 @@ impl<T: Config> Pallet<T> {
                     hotkey_emission
                 );
 
-                // 4.7 Accumulate the tuples on hotkeys:
+                // 4.8 Accumulate the tuples on hotkeys:
                 for (hotkey, mining_emission, validator_emission) in hotkey_emission {
                     // 4.8 Accumulate the emission on the hotkey and parent hotkeys.
                     Self::accumulate_hotkey_emission(
@@ -166,9 +169,6 @@ impl<T: Config> Pallet<T> {
                     );
                     log::debug!("Accumulated emissions on hotkey {:?} for netuid {:?}: mining {:?}, validator {:?}", hotkey, *netuid, mining_emission, validator_emission);
                 }
-
-                // 4.5 Apply pending childkeys of this subnet for the next epoch
-                Self::do_set_pending_children(*netuid);
             } else {
                 // No epoch, increase blocks since last step and continue
                 Self::set_blocks_since_last_step(