Merge pull request #1264 from opentensor/nonclaim

add moving price to metagraph

Author: unconst

pallets/subtensor/src/rpc_info/dynamic_info.rs

@@ -2,9 +2,10 @@ use super::*;
 extern crate alloc;
 use codec::Compact;
 use frame_support::pallet_prelude::{Decode, Encode};
+use substrate_fixed::types::I96F32;
 use subtensor_macros::freeze_struct;
 
-#[freeze_struct("f728ab9f6ffbf7f2")]
+#[freeze_struct("7fbd2013e8262885")]
 #[derive(Decode, Encode, PartialEq, Eq, Clone, Debug, TypeInfo)]
 pub struct DynamicInfo<AccountId: TypeInfo + Encode + Decode> {
     netuid: Compact<u16>,
@@ -27,6 +28,8 @@ pub struct DynamicInfo<AccountId: TypeInfo + Encode + Decode> {
     subnet_volume: Compact<u128>,
     network_registered_at: Compact<u64>,
     subnet_identity: Option<SubnetIdentityV2>,
+    moving_price: I96F32,
+
 }
 
 impl<T: Config> Pallet<T> {
@@ -64,6 +67,7 @@ impl<T: Config> Pallet<T> {
             subnet_volume: SubnetVolume::<T>::get(netuid).into(),
             network_registered_at: NetworkRegisteredAt::<T>::get(netuid).into(),
             subnet_identity: SubnetIdentitiesV2::<T>::get(netuid),
+            moving_price: SubnetMovingPrice::<T>::get( netuid ).into(),
         })
     }
     pub fn get_all_dynamic_info() -> Vec<Option<DynamicInfo<T::AccountId>>> {

pallets/subtensor/src/rpc_info/metagraph.rs

@@ -4,9 +4,10 @@ use crate::epoch::math::*;
 use codec::Compact;
 use frame_support::pallet_prelude::{Decode, Encode};
 use substrate_fixed::types::I64F64;
+use substrate_fixed::types::I96F32;
 use subtensor_macros::freeze_struct;
 
-#[freeze_struct("4fc6eea3706b9c0c")]
+#[freeze_struct("cb3ff125c0c35c9e")]
 #[derive(Decode, Encode, PartialEq, Eq, Clone, Debug, TypeInfo)]
 pub struct Metagraph<AccountId: TypeInfo + Encode + Decode> {
     // Subnet index
@@ -39,6 +40,7 @@ pub struct Metagraph<AccountId: TypeInfo + Encode + Decode> {
     pending_alpha_emission: Compact<u64>, // pending alpha to be distributed
     pending_root_emission: Compact<u64>,  // panding tao for root divs to be distributed
     subnet_volume: Compact<u128>,         // volume of the subnet in TAO
+    moving_price: I96F32,        // subnet moving price.
 
     // Hparams for epoch
     rho: Compact<u16>,   // subnet rho param
@@ -181,6 +183,7 @@ impl<T: Config> Pallet<T> {
             pending_alpha_emission: PendingEmission::<T>::get(netuid).into(), // pending alpha to be distributed
             pending_root_emission: PendingRootDivs::<T>::get(netuid).into(), // panding tao for root divs to be distributed
             subnet_volume: subnet_volume.into(),
+            moving_price: SubnetMovingPrice::<T>::get(netuid).into(),
 
             // Hparams for epoch
             rho: Self::get_rho(netuid).into(), // subnet rho param

pallets/subtensor/src/tests/coinbase.rs

@@ -1251,3 +1251,101 @@ fn test_get_root_children_drain_with_half_take() {
         );
     });
 }
+
+// // SKIP_WASM_BUILD=1 RUST_LOG=debug cargo test --package pallet-subtensor --lib -- tests::coinbase::test_get_root_children_with_weights --exact --show-output --nocapture
+// #[test]
+// fn test_get_root_children_with_weights() {
+//     new_test_ext(1).execute_with(|| {
+//         // Init netuid 1
+//         let root: u16 = 0;
+//         let alpha: u16 = 1;
+//         add_network(root, 1, 0);
+//         add_network(alpha, 1, 0);
+//         // Set TAO weight to 1.
+//         SubtensorModule::set_tao_weight(u64::MAX); // Set TAO weight to 1.
+//                                                    // Create keys.
+//         let cold = U256::from(0);
+//         let alice = U256::from(1);
+//         let bob = U256::from(2);
+//         // Register Alice and Bob to the root network and alpha subnet.
+//         register_ok_neuron(alpha, alice, cold, 0);
+//         register_ok_neuron(alpha, bob, cold, 0);
+//         assert_ok!(SubtensorModule::root_register(
+//             RuntimeOrigin::signed(cold).clone(),
+//             alice,
+//         ));
+//         assert_ok!(SubtensorModule::root_register(
+//             RuntimeOrigin::signed(cold).clone(),
+//             bob,
+//         ));
+//         // Add stake for Alice and Bob on root.
+//         let alice_root_stake: u64 = 1_000_000_000;
+//         SubtensorModule::increase_stake_for_hotkey_and_coldkey_on_subnet(
+//             &alice,
+//             &cold,
+//             root,
+//             alice_root_stake,
+//         );
+//         let bob_root_stake: u64 = 1_000_000_000;
+//         SubtensorModule::increase_stake_for_hotkey_and_coldkey_on_subnet(
+//             &bob,
+//             &cold,
+//             root,
+//             alice_root_stake,
+//         );
+//         // Add stake for Alice and Bob on netuid.
+//         let alice_alpha_stake: u64 = 1_000_000_000;
+//         SubtensorModule::increase_stake_for_hotkey_and_coldkey_on_subnet(
+//             &alice,
+//             &cold,
+//             alpha,
+//             alice_alpha_stake,
+//         );
+//         let bob_alpha_stake: u64 = 1_000_000_000;
+//         SubtensorModule::increase_stake_for_hotkey_and_coldkey_on_subnet(
+//             &bob,
+//             &cold,
+//             alpha,
+//             bob_alpha_stake,
+//         );
+//         // Set Bob as 100% child of Alice on root.
+//         mock_set_children_no_epochs(alpha, &alice, &[(u64::MAX, bob)]);
+
+//         // Set Bob childkey take to zero.
+//         ChildkeyTake::<Test>::insert(bob, alpha, 0);
+//         Delegates::<Test>::insert(alice, 0);
+//         Delegates::<Test>::insert(bob, 0);
+
+//         // Set weights on the subnet.
+//         assert_ok!(SubtensorModule::set_weights(
+//             RuntimeOrigin::signed(alice),
+//             alpha,
+//             vec![0, 1],
+//             vec![1, 1],
+//             0,
+//         ));
+//         assert_ok!(SubtensorModule::set_weights(
+//             RuntimeOrigin::signed(bob),
+//             alpha,
+//             vec![0, 1],
+//             vec![1, 1],
+//             0,
+//         ));
+
+//         // Lets drain!
+//         let pending_alpha: u64 = 1_000_000_000;
+//         SubtensorModule::drain_pending_emission(alpha, pending_alpha, 0, 0, 0);
+
+//         // Alice and Bob make the same amount.
+//         close(
+//             AlphaDividendsPerSubnet::<Test>::get(alpha, alice),
+//             pending_alpha / 2,
+//             10,
+//         );
+//         close(
+//             AlphaDividendsPerSubnet::<Test>::get(alpha, bob),
+//             pending_alpha / 2,
+//             10,
+//         );
+//     });
+// }