Skip to content

Commit 33a4192

Browse files
gztensorgztensor
committed
Merge branch 'devnet-ready' into feat/settable-max-mech-count
2 parents 7f1a809 + 7e4cf14 commit 33a4192

25 files changed

+1400
-308
lines changed

‎evm-tests/test/neuron.precompile.emission-check.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ describe("Test the Neuron precompile with emission", () => {
4545

4646
it("Burned register and check emission", async () => {
4747
let netuid = (await api.query.SubtensorModule.TotalNetworks.getValue()) - 1
48-
48+
4949
const uid = await api.query.SubtensorModule.SubnetworkN.getValue(netuid)
5050
const contract = new ethers.Contract(INEURON_ADDRESS, INeuronABI, wallet);
5151

@@ -63,7 +63,7 @@ describe("Test the Neuron precompile with emission", () => {
6363

6464
let i = 0;
6565
while (i < 10) {
66-
const emission = await api.query.SubtensorModule.PendingEmission.getValue(netuid)
66+
const emission = await api.query.SubtensorModule.Emission.getValue(netuid)
6767

6868
console.log("emission is ", emission);
6969
await new Promise((resolve) => setTimeout(resolve, 2000));

‎evm-tests/test/staking.precompile.reward.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,14 +74,14 @@ describe("Test neuron precompile reward", () => {
7474

7575
let index = 0;
7676
while (index < 60) {
77-
const pending = await api.query.SubtensorModule.PendingEmission.getValue(netuid);
77+
const pending = await api.query.SubtensorModule.ValidatorEmission.getValue(netuid);
7878
if (pending > 0) {
7979
console.log("pending amount is ", pending);
8080
break;
8181
}
8282

8383
await new Promise((resolve) => setTimeout(resolve, 1000));
84-
console.log("wait for the pendingEmission update");
84+
console.log("wait for the ValidatorEmission update");
8585
index += 1;
8686
}
8787

‎pallets/admin-utils/src/lib.rs‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,7 @@ pub mod pallet {
236236
netuid,
237237
&[Hyperparameter::ServingRateLimit.into()],
238238
)?;
239+
pallet_subtensor::Pallet::<T>::ensure_admin_window_open(netuid)?;
239240
pallet_subtensor::Pallet::<T>::set_serving_rate_limit(netuid, serving_rate_limit);
240241
log::debug!("ServingRateLimitSet( serving_rate_limit: {serving_rate_limit:?} ) ");
241242
pallet_subtensor::Pallet::<T>::record_owner_rl(
@@ -288,6 +289,7 @@ pub mod pallet {
288289
netuid,
289290
&[Hyperparameter::MaxDifficulty.into()],
290291
)?;
292+
pallet_subtensor::Pallet::<T>::ensure_admin_window_open(netuid)?;
291293

292294
ensure!(
293295
pallet_subtensor::Pallet::<T>::if_subnet_exist(netuid),
@@ -322,6 +324,7 @@ pub mod pallet {
322324
netuid,
323325
&[TransactionType::SetWeightsVersionKey],
324326
)?;
327+
pallet_subtensor::Pallet::<T>::ensure_admin_window_open(netuid)?;
325328

326329
ensure!(
327330
pallet_subtensor::Pallet::<T>::if_subnet_exist(netuid),
@@ -413,6 +416,7 @@ pub mod pallet {
413416
netuid,
414417
&[Hyperparameter::AdjustmentAlpha.into()],
415418
)?;
419+
pallet_subtensor::Pallet::<T>::ensure_admin_window_open(netuid)?;
416420

417421
ensure!(
418422
pallet_subtensor::Pallet::<T>::if_subnet_exist(netuid),
@@ -445,6 +449,7 @@ pub mod pallet {
445449
netuid,
446450
&[Hyperparameter::ImmunityPeriod.into()],
447451
)?;
452+
pallet_subtensor::Pallet::<T>::ensure_admin_window_open(netuid)?;
448453
ensure!(
449454
pallet_subtensor::Pallet::<T>::if_subnet_exist(netuid),
450455
Error::<T>::SubnetDoesNotExist
@@ -479,6 +484,7 @@ pub mod pallet {
479484
netuid,
480485
&[Hyperparameter::MinAllowedWeights.into()],
481486
)?;
487+
pallet_subtensor::Pallet::<T>::ensure_admin_window_open(netuid)?;
482488

483489
ensure!(
484490
pallet_subtensor::Pallet::<T>::if_subnet_exist(netuid),
@@ -513,6 +519,7 @@ pub mod pallet {
513519
netuid,
514520
&[Hyperparameter::MaxAllowedUids.into()],
515521
)?;
522+
pallet_subtensor::Pallet::<T>::ensure_admin_window_open(netuid)?;
516523
ensure!(
517524
pallet_subtensor::Pallet::<T>::if_subnet_exist(netuid),
518525
Error::<T>::SubnetDoesNotExist
@@ -572,6 +579,7 @@ pub mod pallet {
572579
netuid,
573580
&[Hyperparameter::Rho.into()],
574581
)?;
582+
pallet_subtensor::Pallet::<T>::ensure_admin_window_open(netuid)?;
575583

576584
ensure!(
577585
pallet_subtensor::Pallet::<T>::if_subnet_exist(netuid),
@@ -604,6 +612,7 @@ pub mod pallet {
604612
netuid,
605613
&[Hyperparameter::ActivityCutoff.into()],
606614
)?;
615+
pallet_subtensor::Pallet::<T>::ensure_admin_window_open(netuid)?;
607616

608617
ensure!(
609618
pallet_subtensor::Pallet::<T>::if_subnet_exist(netuid),
@@ -672,6 +681,7 @@ pub mod pallet {
672681
netuid,
673682
&[Hyperparameter::PowRegistrationAllowed.into()],
674683
)?;
684+
pallet_subtensor::Pallet::<T>::ensure_admin_window_open(netuid)?;
675685

676686
pallet_subtensor::Pallet::<T>::set_network_pow_registration_allowed(
677687
netuid,
@@ -733,6 +743,7 @@ pub mod pallet {
733743
netuid,
734744
&[Hyperparameter::MinBurn.into()],
735745
)?;
746+
pallet_subtensor::Pallet::<T>::ensure_admin_window_open(netuid)?;
736747
ensure!(
737748
pallet_subtensor::Pallet::<T>::if_subnet_exist(netuid),
738749
Error::<T>::SubnetDoesNotExist
@@ -773,6 +784,7 @@ pub mod pallet {
773784
netuid,
774785
&[Hyperparameter::MaxBurn.into()],
775786
)?;
787+
pallet_subtensor::Pallet::<T>::ensure_admin_window_open(netuid)?;
776788
ensure!(
777789
pallet_subtensor::Pallet::<T>::if_subnet_exist(netuid),
778790
Error::<T>::SubnetDoesNotExist
@@ -868,6 +880,7 @@ pub mod pallet {
868880
netuid,
869881
&[Hyperparameter::BondsMovingAverage.into()],
870882
)?;
883+
pallet_subtensor::Pallet::<T>::ensure_admin_window_open(netuid)?;
871884
if maybe_owner.is_some() {
872885
ensure!(
873886
bonds_moving_average <= 975000,
@@ -908,6 +921,7 @@ pub mod pallet {
908921
netuid,
909922
&[Hyperparameter::BondsPenalty.into()],
910923
)?;
924+
pallet_subtensor::Pallet::<T>::ensure_admin_window_open(netuid)?;
911925

912926
ensure!(
913927
pallet_subtensor::Pallet::<T>::if_subnet_exist(netuid),
@@ -1245,6 +1259,7 @@ pub mod pallet {
12451259
netuid,
12461260
&[Hyperparameter::CommitRevealEnabled.into()],
12471261
)?;
1262+
pallet_subtensor::Pallet::<T>::ensure_admin_window_open(netuid)?;
12481263

12491264
ensure!(
12501265
pallet_subtensor::Pallet::<T>::if_subnet_exist(netuid),
@@ -1288,6 +1303,7 @@ pub mod pallet {
12881303
netuid,
12891304
&[Hyperparameter::LiquidAlphaEnabled.into()],
12901305
)?;
1306+
pallet_subtensor::Pallet::<T>::ensure_admin_window_open(netuid)?;
12911307
pallet_subtensor::Pallet::<T>::set_liquid_alpha_enabled(netuid, enabled);
12921308
log::debug!("LiquidAlphaEnableToggled( netuid: {netuid:?}, Enabled: {enabled:?} ) ");
12931309
pallet_subtensor::Pallet::<T>::record_owner_rl(
@@ -1318,6 +1334,7 @@ pub mod pallet {
13181334
netuid,
13191335
&[Hyperparameter::AlphaValues.into()],
13201336
)?;
1337+
pallet_subtensor::Pallet::<T>::ensure_admin_window_open(netuid)?;
13211338
let res = pallet_subtensor::Pallet::<T>::do_set_alpha_values(
13221339
origin, netuid, alpha_low, alpha_high,
13231340
);
@@ -1437,6 +1454,7 @@ pub mod pallet {
14371454
netuid,
14381455
&[Hyperparameter::WeightCommitInterval.into()],
14391456
)?;
1457+
pallet_subtensor::Pallet::<T>::ensure_admin_window_open(netuid)?;
14401458

14411459
ensure!(
14421460
pallet_subtensor::Pallet::<T>::if_subnet_exist(netuid),
@@ -1535,6 +1553,7 @@ pub mod pallet {
15351553
netuid,
15361554
&[Hyperparameter::TransferEnabled.into()],
15371555
)?;
1556+
pallet_subtensor::Pallet::<T>::ensure_admin_window_open(netuid)?;
15381557
let res = pallet_subtensor::Pallet::<T>::toggle_transfer(netuid, toggle);
15391558
if res.is_ok() {
15401559
pallet_subtensor::Pallet::<T>::record_owner_rl(
@@ -1567,6 +1586,7 @@ pub mod pallet {
15671586
netuid,
15681587
&[Hyperparameter::RecycleOrBurn.into()],
15691588
)?;
1589+
pallet_subtensor::Pallet::<T>::ensure_admin_window_open(netuid)?;
15701590

15711591
pallet_subtensor::Pallet::<T>::set_recycle_or_burn(netuid, recycle_or_burn);
15721592
pallet_subtensor::Pallet::<T>::record_owner_rl(
@@ -1734,6 +1754,7 @@ pub mod pallet {
17341754
netuid,
17351755
&[Hyperparameter::AlphaSigmoidSteepness.into()],
17361756
)?;
1757+
pallet_subtensor::Pallet::<T>::ensure_admin_window_open(netuid)?;
17371758

17381759
ensure!(
17391760
pallet_subtensor::Pallet::<T>::if_subnet_exist(netuid),
@@ -1784,6 +1805,7 @@ pub mod pallet {
17841805
netuid,
17851806
&[Hyperparameter::Yuma3Enabled.into()],
17861807
)?;
1808+
pallet_subtensor::Pallet::<T>::ensure_admin_window_open(netuid)?;
17871809
pallet_subtensor::Pallet::<T>::set_yuma3_enabled(netuid, enabled);
17881810

17891811
Self::deposit_event(Event::Yuma3EnableToggled { netuid, enabled });
@@ -1823,6 +1845,7 @@ pub mod pallet {
18231845
netuid,
18241846
&[Hyperparameter::BondsResetEnabled.into()],
18251847
)?;
1848+
pallet_subtensor::Pallet::<T>::ensure_admin_window_open(netuid)?;
18261849
pallet_subtensor::Pallet::<T>::set_bonds_reset(netuid, enabled);
18271850

18281851
Self::deposit_event(Event::BondsResetToggled { netuid, enabled });
@@ -1948,6 +1971,7 @@ pub mod pallet {
19481971
netuid,
19491972
&[Hyperparameter::ImmuneNeuronLimit.into()],
19501973
)?;
1974+
pallet_subtensor::Pallet::<T>::ensure_admin_window_open(netuid)?;
19511975
pallet_subtensor::Pallet::<T>::set_owner_immune_neuron_limit(netuid, immune_neurons)?;
19521976
pallet_subtensor::Pallet::<T>::record_owner_rl(
19531977
maybe_owner,
@@ -2021,6 +2045,7 @@ pub mod pallet {
20212045
netuid,
20222046
&[TransactionType::MechanismCountUpdate],
20232047
)?;
2048+
pallet_subtensor::Pallet::<T>::ensure_admin_window_open(netuid)?;
20242049

20252050
pallet_subtensor::Pallet::<T>::do_set_mechanism_count(netuid, mechanism_count)?;
20262051

@@ -2047,6 +2072,7 @@ pub mod pallet {
20472072
netuid,
20482073
&[TransactionType::MechanismEmission],
20492074
)?;
2075+
pallet_subtensor::Pallet::<T>::ensure_admin_window_open(netuid)?;
20502076

20512077
pallet_subtensor::Pallet::<T>::do_set_emission_split(netuid, maybe_split)?;
20522078

@@ -2077,6 +2103,7 @@ pub mod pallet {
20772103
netuid,
20782104
&[TransactionType::MaxUidsTrimming],
20792105
)?;
2106+
pallet_subtensor::Pallet::<T>::ensure_admin_window_open(netuid)?;
20802107

20812108
pallet_subtensor::Pallet::<T>::trim_to_max_allowed_uids(netuid, max_n)?;
20822109

‎pallets/subtensor/src/benchmarks.rs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1615,10 +1615,11 @@ mod pallet_benchmarks {
16151615
);
16161616

16171617
let pending_root_alpha = 10_000_000u64;
1618-
Subtensor::<T>::drain_pending_emission(
1618+
Subtensor::<T>::distribute_emission(
16191619
netuid,
16201620
AlphaCurrency::ZERO,
16211621
pending_root_alpha.into(),
1622+
pending_root_alpha.into(),
16221623
AlphaCurrency::ZERO,
16231624
);
16241625

‎pallets/subtensor/src/coinbase/root.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,8 @@ impl<T: Config> Pallet<T> {
314314

315315
// --- 15. Mechanism step / emissions bookkeeping.
316316
FirstEmissionBlockNumber::<T>::remove(netuid);
317-
PendingEmission::<T>::remove(netuid);
317+
PendingValidatorEmission::<T>::remove(netuid);
318+
PendingServerEmission::<T>::remove(netuid);
318319
PendingRootAlphaDivs::<T>::remove(netuid);
319320
PendingOwnerCut::<T>::remove(netuid);
320321
BlocksSinceLastStep::<T>::remove(netuid);
@@ -348,7 +349,6 @@ impl<T: Config> Pallet<T> {
348349
RAORecycledForRegistration::<T>::remove(netuid);
349350
MaxRegistrationsPerBlock::<T>::remove(netuid);
350351
WeightsVersionKey::<T>::remove(netuid);
351-
PendingRootAlphaDivs::<T>::remove(netuid);
352352

353353
// --- 17. Subtoken / feature flags.
354354
LiquidAlphaOn::<T>::remove(netuid);

0 commit comments

Comments
 (0)