Skip to content

Commit 6612cb3

Browse files
sam0x17sam0x17
authored
Merge pull request #1430 from opentensor/devnet-ready
Devnet deploy 3/18/2025 - 2
2 parents a763eca + 8f6e4e4 commit 6612cb3

File tree

8 files changed

+133
-41
lines changed

8 files changed

+133
-41
lines changed

‎.github/workflows/try-runtime.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050

5151
check-finney:
5252
name: check finney
53-
if: github.base_ref == 'testnet' || github.base_ref == 'devnet' || github.base_ref == 'main'
53+
# if: github.base_ref == 'testnet' || github.base_ref == 'devnet' || github.base_ref == 'main'
5454
runs-on: SubtensorCI
5555
steps:
5656
- name: Checkout sources

‎pallets/subtensor/src/migrations/migrate_dissolve_sn73.rs‎

Lines changed: 30 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,18 @@ pub fn migrate_dissolve_sn73<T: Config>() -> Weight {
3636
weight = weight.saturating_add(T::DbWeight::get().reads(1));
3737
log::debug!("Subnet TAO: {}", subnet_tao);
3838

39+
// Adjust total stake and total issuance
40+
TotalStake::<T>::mutate(|total| {
41+
*total = total.saturating_sub(subnet_tao.saturating_to_num::<u64>());
42+
});
43+
TotalIssuance::<T>::mutate(|total| {
44+
*total = total.saturating_sub(subnet_tao.saturating_to_num::<u64>());
45+
});
46+
weight = weight.saturating_add(T::DbWeight::get().reads_writes(2, 2));
47+
48+
// Record for total issuance tracking
49+
let mut total_swapped: u64 = 0;
50+
3951
let mut total_alpha: I96F32 = I96F32::from_num(0);
4052
// Iterate over every hotkey and sum up the total alpha
4153
let mut hotkeys_to_remove: Vec<T::AccountId> = Vec::new();
@@ -96,6 +108,7 @@ pub fn migrate_dissolve_sn73<T: Config>() -> Weight {
96108

97109
if as_tao > 0 {
98110
Pallet::<T>::add_balance_to_coldkey_account(&coldkey, as_tao);
111+
total_swapped = total_swapped.saturating_add(as_tao);
99112
weight = weight.saturating_add(T::DbWeight::get().reads_writes(1, 1));
100113

101114
// Emit event
@@ -115,6 +128,23 @@ pub fn migrate_dissolve_sn73<T: Config>() -> Weight {
115128
}
116129
}
117130

131+
// Update total issuance
132+
TotalIssuance::<T>::mutate(|v| *v = v.saturating_add(total_swapped));
133+
weight = weight.saturating_add(T::DbWeight::get().reads_writes(1, 1));
134+
135+
// Verify total issuance change is correct
136+
if subnet_tao
137+
.saturating_to_num::<u64>()
138+
.abs_diff(total_swapped)
139+
>= 100_000
140+
{
141+
log::info!(
142+
"Total issuance change is incorrect: {} != {}",
143+
subnet_tao.saturating_to_num::<u64>(),
144+
total_swapped
145+
);
146+
}
147+
118148
// === Clear storage entries ===
119149
// Clear subnet owner and hotkey
120150
SubnetOwner::<T>::remove(this_netuid);
@@ -154,12 +184,6 @@ pub fn migrate_dissolve_sn73<T: Config>() -> Weight {
154184
let clear_results_1 = TaoDividendsPerSubnet::<T>::clear_prefix(this_netuid, u32::MAX, None);
155185
weight = weight.saturating_add(T::DbWeight::get().writes(clear_results_1.unique.into()));
156186

157-
// Adjust total stake
158-
TotalStake::<T>::mutate(|total| {
159-
*total = total.saturating_sub(subnet_tao.saturating_to_num::<u64>());
160-
});
161-
weight = weight.saturating_add(T::DbWeight::get().reads_writes(1, 1));
162-
163187
// Clear subnet volume
164188
SubnetVolume::<T>::remove(this_netuid);
165189
weight = weight.saturating_add(T::DbWeight::get().writes(1));

‎pallets/subtensor/src/migrations/migrate_init_total_issuance.rs‎

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,26 +15,33 @@ pub mod deprecated_loaded_emission_format {
1515
}
1616

1717
pub(crate) fn migrate_init_total_issuance<T: Config>() -> Weight {
18-
// Calculate the total locked tokens across all subnets
1918
let subnets_len = crate::SubnetLocked::<T>::iter().count() as u64;
20-
let total_subnet_locked: u64 =
21-
crate::SubnetLocked::<T>::iter().fold(0, |acc, (_, v)| acc.saturating_add(v));
2219

2320
// Retrieve the total balance of all accounts
2421
let total_account_balances = <<T as crate::Config>::Currency as fungible::Inspect<
2522
<T as frame_system::Config>::AccountId,
2623
>>::total_issuance();
2724

2825
// Get the total stake from the system
29-
let total_stake = crate::TotalStake::<T>::get();
26+
let prev_total_stake = crate::TotalStake::<T>::get();
3027

28+
// Calculate new total stake using the sum of all subnet TAO
29+
let total_subnet_tao: u64 =
30+
crate::SubnetTAO::<T>::iter().fold(0, |acc, (_, v)| acc.saturating_add(v));
31+
32+
let total_stake = total_subnet_tao;
33+
// Update the total stake in storage
34+
crate::TotalStake::<T>::put(total_stake);
35+
log::info!(
36+
"Subtensor Pallet Total Stake Updated: previous: {:?}, new: {:?}",
37+
prev_total_stake,
38+
total_stake
39+
);
3140
// Retrieve the previous total issuance for logging purposes
3241
let prev_total_issuance = crate::TotalIssuance::<T>::get();
3342

3443
// Calculate the new total issuance
35-
let new_total_issuance = total_account_balances
36-
.saturating_add(total_stake)
37-
.saturating_add(total_subnet_locked);
44+
let new_total_issuance = total_account_balances.saturating_add(total_stake);
3845

3946
// Update the total issuance in storage
4047
crate::TotalIssuance::<T>::put(new_total_issuance);
@@ -48,7 +55,7 @@ pub(crate) fn migrate_init_total_issuance<T: Config>() -> Weight {
4855

4956
// Return the weight of the operation
5057
// We performed subnets_len + 5 reads and 1 write
51-
<T as frame_system::Config>::DbWeight::get().reads_writes(subnets_len.saturating_add(5), 1)
58+
<T as frame_system::Config>::DbWeight::get().reads_writes(subnets_len.saturating_add(5), 2)
5259
}
5360

5461
pub mod initialise_total_issuance {

‎pallets/subtensor/src/subnets/subnet.rs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -217,6 +217,11 @@ impl<T: Config> Pallet<T> {
217217
Self::burn_tokens(actual_tao_lock_amount_less_pool_tao);
218218
}
219219

220+
if actual_tao_lock_amount > 0 && pool_initial_tao > 0 {
221+
// Record in TotalStake the initial TAO in the pool.
222+
Self::increase_total_stake(pool_initial_tao);
223+
}
224+
220225
// --- 15. Add the identity if it exists
221226
if let Some(identity_value) = identity {
222227
ensure!(

‎pallets/subtensor/src/tests/migration.rs‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,20 +34,21 @@ fn test_initialise_ti() {
3434
use frame_support::traits::OnRuntimeUpgrade;
3535

3636
new_test_ext(1).execute_with(|| {
37-
crate::SubnetLocked::<Test>::insert(1, 100);
38-
crate::SubnetLocked::<Test>::insert(2, 5);
3937
pallet_balances::TotalIssuance::<Test>::put(1000);
40-
crate::TotalStake::<Test>::put(25);
38+
crate::SubnetTAO::<Test>::insert(1, 100);
39+
crate::SubnetTAO::<Test>::insert(2, 5);
4140

4241
// Ensure values are NOT initialized prior to running migration
4342
assert!(crate::TotalIssuance::<Test>::get() == 0);
43+
assert!(crate::TotalStake::<Test>::get() == 0);
4444

4545
crate::migrations::migrate_init_total_issuance::initialise_total_issuance::Migration::<Test>::on_runtime_upgrade();
4646

4747
// Ensure values were initialized correctly
48+
assert!(crate::TotalStake::<Test>::get() == 105);
4849
assert!(
4950
crate::TotalIssuance::<Test>::get()
50-
== 105u64.saturating_add(1000).saturating_add(25)
51+
== 105u64.saturating_add(1000)
5152
);
5253
});
5354
}

‎pallets/subtensor/src/tests/staking.rs‎

Lines changed: 75 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,11 @@ fn test_add_stake_ok_no_emission() {
5757
0
5858
);
5959

60-
// Also total stake should be zero
61-
assert_eq!(SubtensorModule::get_total_stake(), 0);
60+
// Also total stake should be equal to the network initial lock
61+
assert_eq!(
62+
SubtensorModule::get_total_stake(),
63+
SubtensorModule::get_network_min_lock()
64+
);
6265

6366
// Transfer to hotkey account, and check if the result is ok
6467
assert_ok!(SubtensorModule::add_stake(
@@ -79,7 +82,10 @@ fn test_add_stake_ok_no_emission() {
7982
assert_eq!(SubtensorModule::get_coldkey_balance(&coldkey_account_id), 1);
8083

8184
// Check if total stake has increased accordingly.
82-
assert_eq!(SubtensorModule::get_total_stake(), amount);
85+
assert_eq!(
86+
SubtensorModule::get_total_stake(),
87+
amount + SubtensorModule::get_network_min_lock()
88+
);
8389
});
8490
}
8591

@@ -353,12 +359,14 @@ fn test_remove_stake_ok_no_emission() {
353359
let coldkey_account_id = U256::from(4343);
354360
let hotkey_account_id = U256::from(4968585);
355361
let amount = DefaultMinStake::<Test>::get() * 10;
356-
let fee = DefaultStakingFee::<Test>::get();
357362
let netuid: u16 = add_dynamic_network(&subnet_owner_hotkey, &subnet_owner_coldkey);
358363
register_ok_neuron(netuid, hotkey_account_id, coldkey_account_id, 192213123);
359364

360365
// Some basic assertions
361-
assert_eq!(SubtensorModule::get_total_stake(), 0);
366+
assert_eq!(
367+
SubtensorModule::get_total_stake(),
368+
SubtensorModule::get_network_min_lock()
369+
);
362370
assert_eq!(
363371
SubtensorModule::get_total_stake_for_hotkey(&hotkey_account_id),
364372
0
@@ -372,6 +380,16 @@ fn test_remove_stake_ok_no_emission() {
372380
netuid,
373381
amount,
374382
);
383+
assert_eq!(
384+
SubtensorModule::get_total_stake_for_hotkey(&hotkey_account_id),
385+
amount
386+
);
387+
388+
// Add subnet TAO for the equivalent amount added at price
389+
let amount_tao =
390+
I96F32::saturating_from_num(amount) * SubtensorModule::get_alpha_price(netuid);
391+
SubnetTAO::<Test>::mutate(netuid, |v| *v += amount_tao.saturating_to_num::<u64>());
392+
TotalStake::<Test>::mutate(|v| *v += amount_tao.saturating_to_num::<u64>());
375393

376394
// Do the magic
377395
assert_ok!(SubtensorModule::remove_stake(
@@ -381,13 +399,24 @@ fn test_remove_stake_ok_no_emission() {
381399
amount
382400
));
383401

402+
let fee = SubtensorModule::calculate_staking_fee(
403+
Some((&hotkey_account_id, netuid)),
404+
&coldkey_account_id,
405+
None,
406+
&coldkey_account_id,
407+
I96F32::saturating_from_num(amount),
408+
);
409+
384410
// we do not expect the exact amount due to slippage
385411
assert!(SubtensorModule::get_coldkey_balance(&coldkey_account_id) > amount / 10 * 9 - fee);
386412
assert_eq!(
387413
SubtensorModule::get_total_stake_for_hotkey(&hotkey_account_id),
388414
0
389415
);
390-
assert_eq!(SubtensorModule::get_total_stake(), fee);
416+
assert_eq!(
417+
SubtensorModule::get_total_stake(),
418+
SubtensorModule::get_network_min_lock() + fee
419+
);
391420
});
392421
}
393422

@@ -403,7 +432,10 @@ fn test_remove_stake_amount_too_low() {
403432
register_ok_neuron(netuid, hotkey_account_id, coldkey_account_id, 192213123);
404433

405434
// Some basic assertions
406-
assert_eq!(SubtensorModule::get_total_stake(), 0);
435+
assert_eq!(
436+
SubtensorModule::get_total_stake(),
437+
SubtensorModule::get_network_min_lock()
438+
);
407439
assert_eq!(
408440
SubtensorModule::get_total_stake_for_hotkey(&hotkey_account_id),
409441
0
@@ -510,12 +542,14 @@ fn test_remove_stake_total_balance_no_change() {
510542
let hotkey_account_id = U256::from(571337);
511543
let coldkey_account_id = U256::from(71337);
512544
let amount = DefaultMinStake::<Test>::get() * 10;
513-
let fee = DefaultStakingFee::<Test>::get();
514545
let netuid: u16 = add_dynamic_network(&subnet_owner_hotkey, &subnet_owner_coldkey);
515546
register_ok_neuron(netuid, hotkey_account_id, coldkey_account_id, 192213123);
516547

517548
// Some basic assertions
518-
assert_eq!(SubtensorModule::get_total_stake(), 0);
549+
assert_eq!(
550+
SubtensorModule::get_total_stake(),
551+
SubtensorModule::get_network_min_lock()
552+
);
519553
assert_eq!(
520554
SubtensorModule::get_total_stake_for_hotkey(&hotkey_account_id),
521555
0
@@ -532,6 +566,12 @@ fn test_remove_stake_total_balance_no_change() {
532566
amount,
533567
);
534568

569+
// Add subnet TAO for the equivalent amount added at price
570+
let amount_tao =
571+
I96F32::saturating_from_num(amount) * SubtensorModule::get_alpha_price(netuid);
572+
SubnetTAO::<Test>::mutate(netuid, |v| *v += amount_tao.saturating_to_num::<u64>());
573+
TotalStake::<Test>::mutate(|v| *v += amount_tao.saturating_to_num::<u64>());
574+
535575
// Do the magic
536576
assert_ok!(SubtensorModule::remove_stake(
537577
RuntimeOrigin::signed(coldkey_account_id),
@@ -540,6 +580,13 @@ fn test_remove_stake_total_balance_no_change() {
540580
amount
541581
));
542582

583+
let fee = SubtensorModule::calculate_staking_fee(
584+
Some((&hotkey_account_id, netuid)),
585+
&coldkey_account_id,
586+
None,
587+
&coldkey_account_id,
588+
I96F32::saturating_from_num(amount),
589+
);
543590
assert_abs_diff_eq!(
544591
SubtensorModule::get_coldkey_balance(&coldkey_account_id),
545592
amount - fee,
@@ -549,7 +596,10 @@ fn test_remove_stake_total_balance_no_change() {
549596
SubtensorModule::get_total_stake_for_hotkey(&hotkey_account_id),
550597
0
551598
);
552-
assert_eq!(SubtensorModule::get_total_stake(), fee);
599+
assert_eq!(
600+
SubtensorModule::get_total_stake(),
601+
SubtensorModule::get_network_min_lock() + fee
602+
);
553603

554604
// Check total balance is equal to the added stake. Even after remove stake (no fee, includes reserved/locked balance)
555605
let total_balance = Balances::total_balance(&coldkey_account_id);
@@ -648,7 +698,10 @@ fn test_remove_stake_total_issuance_no_change() {
648698
SubtensorModule::add_balance_to_coldkey_account(&coldkey_account_id, amount);
649699

650700
// Some basic assertions
651-
assert_eq!(SubtensorModule::get_total_stake(), 0);
701+
assert_eq!(
702+
SubtensorModule::get_total_stake(),
703+
SubtensorModule::get_network_min_lock()
704+
);
652705
assert_eq!(
653706
SubtensorModule::get_total_stake_for_hotkey(&hotkey_account_id),
654707
0
@@ -697,7 +750,7 @@ fn test_remove_stake_total_issuance_no_change() {
697750
);
698751
assert_abs_diff_eq!(
699752
SubtensorModule::get_total_stake(),
700-
fee * 2,
753+
fee * 2 + SubtensorModule::get_network_min_lock(),
701754
epsilon = fee / 1000
702755
);
703756

@@ -762,8 +815,11 @@ fn test_add_stake_to_hotkey_account_ok() {
762815
let netuid: u16 = add_dynamic_network(&subnet_owner_hotkey, &subnet_owner_coldkey);
763816
register_ok_neuron(netuid, hotkey_id, coldkey_id, 192213123);
764817

765-
// There is not stake in the system at first, so result should be 0;
766-
assert_eq!(SubtensorModule::get_total_stake(), 0);
818+
// There is no stake in the system at first, other than the network initial lock so result;
819+
assert_eq!(
820+
SubtensorModule::get_total_stake(),
821+
SubtensorModule::get_network_min_lock()
822+
);
767823

768824
SubtensorModule::increase_stake_for_hotkey_and_coldkey_on_subnet(
769825
&hotkey_id,
@@ -2497,7 +2553,11 @@ fn test_stake_overflow() {
24972553
);
24982554

24992555
// Check if total stake has increased accordingly.
2500-
assert_abs_diff_eq!(SubtensorModule::get_total_stake(), amount, epsilon = 10);
2556+
assert_abs_diff_eq!(
2557+
SubtensorModule::get_total_stake(),
2558+
amount + SubtensorModule::get_network_min_lock(),
2559+
epsilon = 10
2560+
);
25012561
});
25022562
}
25032563

‎pallets/subtensor/src/utils/try_state.rs‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,11 @@ impl<T: Config> Pallet<T> {
66
/// Checks [`TotalIssuance`] equals the sum of currency issuance, total stake, and total subnet
77
/// locked.
88
pub(crate) fn check_total_issuance() -> Result<(), sp_runtime::TryRuntimeError> {
9-
// Get the total subnet locked amount
10-
let total_subnet_locked = Self::get_total_subnet_locked();
11-
129
// Get the total currency issuance
1310
let currency_issuance = T::Currency::total_issuance();
1411

1512
// Calculate the expected total issuance
16-
let expected_total_issuance = currency_issuance
17-
.saturating_add(TotalStake::<T>::get())
18-
.saturating_add(total_subnet_locked);
13+
let expected_total_issuance = currency_issuance.saturating_add(TotalStake::<T>::get());
1914

2015
// Verify the diff between calculated TI and actual TI is less than delta
2116
//

‎runtime/src/lib.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
205205
// `spec_version`, and `authoring_version` are the same between Wasm and native.
206206
// This value is set to 100 to notify Polkadot-JS App (https://polkadot.js.org/apps) to use
207207
// the compatible custom types.
208-
spec_version: 250,
208+
spec_version: 251,
209209
impl_version: 1,
210210
apis: RUNTIME_API_VERSIONS,
211211
transaction_version: 1,

0 commit comments

Comments
 (0)