From fe0dc07080c554f86e0ba60e7a604d107ea8d52d Mon Sep 17 00:00:00 2001 From: John Reed <87283488+JohnReedV@users.noreply.github.com> Date: Tue, 9 Sep 2025 12:31:13 -0700 Subject: [PATCH 1/4] IncentiveAlphaEmittedToMiners --- pallets/subtensor/src/coinbase/run_coinbase.rs | 7 +++++++ pallets/subtensor/src/epoch/run_epoch.rs | 5 +++++ pallets/subtensor/src/macros/events.rs | 8 ++++++++ 3 files changed, 20 insertions(+) diff --git a/pallets/subtensor/src/coinbase/run_coinbase.rs b/pallets/subtensor/src/coinbase/run_coinbase.rs index c76e6941e3..989fd9b36e 100644 --- a/pallets/subtensor/src/coinbase/run_coinbase.rs +++ b/pallets/subtensor/src/coinbase/run_coinbase.rs @@ -513,6 +513,13 @@ impl Pallet { let owner: T::AccountId = Owner::::get(&hotkey); let destination = AutoStakeDestination::::get(&owner).unwrap_or(hotkey.clone()); + + Self::deposit_event(Event::::AutoStakeAdded( + netuid, + destination, + owner, + incentive, + )); Self::increase_stake_for_hotkey_and_coldkey_on_subnet( &destination, &owner, diff --git a/pallets/subtensor/src/epoch/run_epoch.rs b/pallets/subtensor/src/epoch/run_epoch.rs index 2f302c2a5e..7906064780 100644 --- a/pallets/subtensor/src/epoch/run_epoch.rs +++ b/pallets/subtensor/src/epoch/run_epoch.rs @@ -920,6 +920,11 @@ impl Pallet { } }); + Self::deposit_event(Event::IncentiveAlphaEmittedToMiners { + netuid, + emissions: server_emission.clone(), + }); + // Emission tuples ( hotkeys, server_emission, validator_emission ) hotkeys .into_iter() diff --git a/pallets/subtensor/src/macros/events.rs b/pallets/subtensor/src/macros/events.rs index 2fab5ecdb4..bb108560d8 100644 --- a/pallets/subtensor/src/macros/events.rs +++ b/pallets/subtensor/src/macros/events.rs @@ -413,5 +413,13 @@ mod events { /// - **netuid**: The network identifier. /// - **who**: The account ID of the user revealing the weights. TimelockedWeightsRevealed(NetUid, T::AccountId), + + /// Auto-staking hotkey received stake + AutoStakeAdded(NetUid, T::AccountId, T::AccountId, AlphaCurrency), + /// EpochIncentives + IncentiveAlphaEmittedToMiners { + netuid: NetUid, + emissions: Vec, + }, } } From 4af68a59abda539811cb5ed0424779f3db66e7c2 Mon Sep 17 00:00:00 2001 From: John Reed <87283488+JohnReedV@users.noreply.github.com> Date: Tue, 9 Sep 2025 12:49:15 -0700 Subject: [PATCH 2/4] fix compile --- pallets/subtensor/src/coinbase/run_coinbase.rs | 5 +++-- pallets/subtensor/src/macros/events.rs | 8 +++++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/pallets/subtensor/src/coinbase/run_coinbase.rs b/pallets/subtensor/src/coinbase/run_coinbase.rs index 989fd9b36e..93cc811b54 100644 --- a/pallets/subtensor/src/coinbase/run_coinbase.rs +++ b/pallets/subtensor/src/coinbase/run_coinbase.rs @@ -516,8 +516,9 @@ impl Pallet { Self::deposit_event(Event::::AutoStakeAdded( netuid, - destination, - owner, + destination.clone(), + hotkey, + owner.clone(), incentive, )); Self::increase_stake_for_hotkey_and_coldkey_on_subnet( diff --git a/pallets/subtensor/src/macros/events.rs b/pallets/subtensor/src/macros/events.rs index bb108560d8..e9a0e770f2 100644 --- a/pallets/subtensor/src/macros/events.rs +++ b/pallets/subtensor/src/macros/events.rs @@ -415,7 +415,13 @@ mod events { TimelockedWeightsRevealed(NetUid, T::AccountId), /// Auto-staking hotkey received stake - AutoStakeAdded(NetUid, T::AccountId, T::AccountId, AlphaCurrency), + AutoStakeAdded( + NetUid, + T::AccountId, + T::AccountId, + T::AccountId, + AlphaCurrency, + ), /// EpochIncentives IncentiveAlphaEmittedToMiners { netuid: NetUid, From 7e46b95f62cc0ca8d51187fd78cb118a78284ca8 Mon Sep 17 00:00:00 2001 From: John Reed <87283488+JohnReedV@users.noreply.github.com> Date: Tue, 9 Sep 2025 13:03:47 -0700 Subject: [PATCH 3/4] improve & clippy --- .../subtensor/src/coinbase/run_coinbase.rs | 8 +++--- pallets/subtensor/src/macros/events.rs | 25 +++++++++++++------ 2 files changed, 21 insertions(+), 12 deletions(-) diff --git a/pallets/subtensor/src/coinbase/run_coinbase.rs b/pallets/subtensor/src/coinbase/run_coinbase.rs index 93cc811b54..d525a65638 100644 --- a/pallets/subtensor/src/coinbase/run_coinbase.rs +++ b/pallets/subtensor/src/coinbase/run_coinbase.rs @@ -514,13 +514,13 @@ impl Pallet { let owner: T::AccountId = Owner::::get(&hotkey); let destination = AutoStakeDestination::::get(&owner).unwrap_or(hotkey.clone()); - Self::deposit_event(Event::::AutoStakeAdded( + Self::deposit_event(Event::::AutoStakeAdded { netuid, - destination.clone(), + destination: destination.clone(), hotkey, - owner.clone(), + owner: owner.clone(), incentive, - )); + }); Self::increase_stake_for_hotkey_and_coldkey_on_subnet( &destination, &owner, diff --git a/pallets/subtensor/src/macros/events.rs b/pallets/subtensor/src/macros/events.rs index e9a0e770f2..5d2de3b6c6 100644 --- a/pallets/subtensor/src/macros/events.rs +++ b/pallets/subtensor/src/macros/events.rs @@ -415,16 +415,25 @@ mod events { TimelockedWeightsRevealed(NetUid, T::AccountId), /// Auto-staking hotkey received stake - AutoStakeAdded( - NetUid, - T::AccountId, - T::AccountId, - T::AccountId, - AlphaCurrency, - ), - /// EpochIncentives + AutoStakeAdded { + /// Subnet identifier. + netuid: NetUid, + /// Destination account that received the auto-staked funds. + destination: T::AccountId, + /// Hotkey account whose stake was auto-staked. + hotkey: T::AccountId, + /// Owner (coldkey) account associated with the hotkey. + owner: T::AccountId, + /// Amount of alpha auto-staked. + incentive: AlphaCurrency, + }, + + /// End-of-epoch miner incentive alpha by UID (server emission). + /// `emissions[uid]` = alpha emitted to that UID (0..n-1). IncentiveAlphaEmittedToMiners { + /// Subnet identifier. netuid: NetUid, + /// UID-indexed array of miner incentive alpha; index equals UID. emissions: Vec, }, } From 7a7ab9789a7807c21ed29ba51d4aa4dd1445c6c7 Mon Sep 17 00:00:00 2001 From: John Reed <87283488+JohnReedV@users.noreply.github.com> Date: Tue, 9 Sep 2025 13:04:53 -0700 Subject: [PATCH 4/4] comment --- pallets/subtensor/src/macros/events.rs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pallets/subtensor/src/macros/events.rs b/pallets/subtensor/src/macros/events.rs index 5d2de3b6c6..25bf93b730 100644 --- a/pallets/subtensor/src/macros/events.rs +++ b/pallets/subtensor/src/macros/events.rs @@ -428,8 +428,7 @@ mod events { incentive: AlphaCurrency, }, - /// End-of-epoch miner incentive alpha by UID (server emission). - /// `emissions[uid]` = alpha emitted to that UID (0..n-1). + /// End-of-epoch miner incentive alpha by UID IncentiveAlphaEmittedToMiners { /// Subnet identifier. netuid: NetUid,