Skip to content

extend subtensor extension #2569

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sam0x17 merged 18 commits into from
May 19, 2026
Merged

extend subtensor extension #2569

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
2a31546
extend subtensor extension
open-junius Apr 7, 2026
d1572de
fix all extension
open-junius Apr 7, 2026
9729f19
fix clippy
open-junius Apr 7, 2026
75697ee
remove unnessary check
open-junius Apr 8, 2026
51e4a93
more unit tests
open-junius Apr 8, 2026
c3c261c
remove unnecessary error mapping
open-junius Apr 8, 2026
d704889
clean up code
open-junius Apr 8, 2026
56455fd
Merge branch 'devnet-ready' into subtensor-dispatch
open-junius Apr 15, 2026
94338a9
remove redundant code
open-junius Apr 18, 2026
d33b245
Merge branch 'devnet-ready' into subtensor-dispatch
open-junius Apr 18, 2026
78ce740
merge with denvet-ready
open-junius May 13, 2026
9cd028e
fix unit tests
open-junius May 13, 2026
1660bb2
fix clippy
open-junius May 13, 2026
b69a78f
bump version
open-junius May 13, 2026
2e454cf
Merge branch 'devnet-ready' into subtensor-dispatch
open-junius May 14, 2026
16a9853
fix reveal_mechanism_weights extension check
open-junius May 15, 2026
d009b0b
minor upate according to comments
open-junius May 15, 2026
6487465
fix unit tests
open-junius May 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions common/src/transaction_error.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ pub enum CustomTransactionError {
InvalidRealAccount,
FailedShieldedTxParsing,
InvalidShieldedTxPubKeyHash,
NonAssociatedColdKey,
DelegateTakeTooLow,
DelegateTakeTooHigh,
}

impl From<CustomTransactionError> for u8 {
Expand Down Expand Up @@ -62,6 +65,9 @@ impl From<CustomTransactionError> for u8 {
CustomTransactionError::InvalidRealAccount => 22,
CustomTransactionError::FailedShieldedTxParsing => 23,
CustomTransactionError::InvalidShieldedTxPubKeyHash => 24,
CustomTransactionError::NonAssociatedColdKey => 25,
CustomTransactionError::DelegateTakeTooLow => 26,
CustomTransactionError::DelegateTakeTooHigh => 27,
}
}
}
Expand Down
255 changes: 194 additions & 61 deletions pallets/subtensor/src/extensions/subtensor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,12 @@ where
}

pub fn result_to_validity(result: Result<(), Error<T>>, priority: u64) -> TransactionValidity {
if let Err(err) = result {
Err(match err {
match result {
Ok(()) => Ok(ValidTransaction {
priority,
..Default::default()
}),
Err(err) => Err(match err {
Error::<T>::AmountTooLow => CustomTransactionError::StakeAmountTooLow,
Error::<T>::SubnetNotExists => CustomTransactionError::SubnetNotExists,
Error::<T>::NotEnoughBalanceToStake => CustomTransactionError::BalanceTooLow,
Expand All @@ -70,14 +74,10 @@ where
CustomTransactionError::ServingRateLimitExceeded
}
Error::<T>::InvalidPort => CustomTransactionError::InvalidPort,
Error::<T>::NonAssociatedColdKey => CustomTransactionError::NonAssociatedColdKey,
_ => CustomTransactionError::BadRequest,
}
.into())
} else {
Ok(ValidTransaction {
priority,
..Default::default()
})
.into()),
}
}
}
Expand Down Expand Up @@ -112,41 +112,86 @@ where
};

match call.is_sub_type() {
Some(Call::commit_weights { netuid, .. }) => {
Some(Call::commit_weights { netuid, .. })
| Some(Call::commit_mechanism_weights { netuid, .. }) => {
if Self::check_weights_min_stake(who, *netuid) {
Ok((Default::default(), (), origin))
} else {
Err(CustomTransactionError::StakeAmountTooLow.into())
}
}
Some(Call::batch_commit_weights {
netuids,
commit_hashes,
}) => {
if netuids.len() != commit_hashes.len() {
return Err(CustomTransactionError::InputLengthsUnequal.into());
}
for netuid in netuids.iter() {
let netuid: NetUid = (*netuid).into();
if !Self::check_weights_min_stake(who, netuid) {
return Err(CustomTransactionError::StakeAmountTooLow.into());
}
}
Ok((Default::default(), (), origin))
}
Some(Call::reveal_weights {
netuid,
uids,
values,
salt,
version_key,
}) => {
if Self::check_weights_min_stake(who, *netuid) {
let provided_hash = Pallet::<T>::get_commit_hash(
who,
NetUidStorageIndex::from(*netuid),
uids,
values,
salt,
*version_key,
);
match Pallet::<T>::find_commit_block_via_hash(provided_hash) {
Some(commit_block) => {
if Pallet::<T>::is_reveal_block_range(*netuid, commit_block) {
Ok((Default::default(), (), origin))
} else {
Err(CustomTransactionError::CommitBlockNotInRevealRange.into())
}
if !Self::check_weights_min_stake(who, *netuid) {
return Err(CustomTransactionError::StakeAmountTooLow.into());
}
let provided_hash = Pallet::<T>::get_commit_hash(
who,
NetUidStorageIndex::from(*netuid),
uids,
values,
salt,
*version_key,
);
match Pallet::<T>::find_commit_block_via_hash(provided_hash) {
Some(commit_block) => {
if Pallet::<T>::is_reveal_block_range(*netuid, commit_block) {
Ok((Default::default(), (), origin))
} else {
Err(CustomTransactionError::CommitBlockNotInRevealRange.into())
}
None => Err(CustomTransactionError::CommitNotFound.into()),
}
} else {
Err(CustomTransactionError::StakeAmountTooLow.into())
None => Err(CustomTransactionError::CommitNotFound.into()),
}
}
Some(Call::reveal_mechanism_weights {
netuid,
mecid,
uids,
values,
salt,
version_key,
}) => {
if !Self::check_weights_min_stake(who, *netuid) {
return Err(CustomTransactionError::StakeAmountTooLow.into());
}
let provided_hash = Pallet::<T>::get_commit_hash(
who,
Pallet::<T>::get_mechanism_storage_index(*netuid, *mecid),
uids,
values,
salt,
*version_key,
);
match Pallet::<T>::find_commit_block_via_hash(provided_hash) {
Some(commit_block) => {
if Pallet::<T>::is_reveal_block_range(*netuid, commit_block) {
Ok((Default::default(), (), origin))
} else {
Err(CustomTransactionError::CommitBlockNotInRevealRange.into())
}
}
None => Err(CustomTransactionError::CommitNotFound.into()),
}
}
Comment on lines +167 to +196
Copy link
Copy Markdown
Contributor

@thewhaleking thewhaleking May 14, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

.

Copy link
Copy Markdown
Contributor Author

@open-junius open-junius May 15, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you! will fix it.

Some(Call::batch_reveal_weights {
Expand All @@ -156,54 +201,70 @@ where
salts_list,
version_keys,
}) => {
if Self::check_weights_min_stake(who, *netuid) {
let num_reveals = uids_list.len();
if num_reveals == values_list.len()
&& num_reveals == salts_list.len()
&& num_reveals == version_keys.len()
{
let provided_hashes = (0..num_reveals)
.map(|i| {
Pallet::<T>::get_commit_hash(
who,
NetUidStorageIndex::from(*netuid),
uids_list.get(i).unwrap_or(&Vec::new()),
values_list.get(i).unwrap_or(&Vec::new()),
salts_list.get(i).unwrap_or(&Vec::new()),
*version_keys.get(i).unwrap_or(&0_u64),
)
})
.collect::<Vec<_>>();
if !Self::check_weights_min_stake(who, *netuid) {
return Err(CustomTransactionError::StakeAmountTooLow.into());
}

let num_reveals = uids_list.len();
if num_reveals == values_list.len()
&& num_reveals == salts_list.len()
&& num_reveals == version_keys.len()
{
let provided_hashes = (0..num_reveals)
.map(|i| {
Pallet::<T>::get_commit_hash(
who,
NetUidStorageIndex::from(*netuid),
uids_list.get(i).unwrap_or(&Vec::new()),
values_list.get(i).unwrap_or(&Vec::new()),
salts_list.get(i).unwrap_or(&Vec::new()),
*version_keys.get(i).unwrap_or(&0_u64),
)
})
.collect::<Vec<_>>();

let batch_reveal_block = provided_hashes
.iter()
.filter_map(|hash| Pallet::<T>::find_commit_block_via_hash(*hash))
.collect::<Vec<_>>();
let batch_reveal_block = provided_hashes
.iter()
.filter_map(|hash| Pallet::<T>::find_commit_block_via_hash(*hash))
.collect::<Vec<_>>();

if provided_hashes.len() == batch_reveal_block.len() {
if Pallet::<T>::is_batch_reveal_block_range(*netuid, batch_reveal_block)
{
Ok((Default::default(), (), origin))
} else {
Err(CustomTransactionError::CommitBlockNotInRevealRange.into())
}
if provided_hashes.len() == batch_reveal_block.len() {
if Pallet::<T>::is_batch_reveal_block_range(*netuid, batch_reveal_block) {
Ok((Default::default(), (), origin))
} else {
Err(CustomTransactionError::CommitNotFound.into())
Err(CustomTransactionError::CommitBlockNotInRevealRange.into())
}
} else {
Err(CustomTransactionError::InputLengthsUnequal.into())
Err(CustomTransactionError::CommitNotFound.into())
}
} else {
Err(CustomTransactionError::StakeAmountTooLow.into())
Err(CustomTransactionError::InputLengthsUnequal.into())
}
}
Some(Call::set_weights { netuid, .. }) => {
Some(Call::set_weights { netuid, .. })
| Some(Call::set_mechanism_weights { netuid, .. }) => {
if Self::check_weights_min_stake(who, *netuid) {
Ok((Default::default(), (), origin))
} else {
Err(CustomTransactionError::StakeAmountTooLow.into())
}
}
Some(Call::batch_set_weights {
netuids,
weights,
version_keys,
}) => {
if netuids.len() != weights.len() || netuids.len() != version_keys.len() {
return Err(CustomTransactionError::InputLengthsUnequal.into());
}
for netuid in netuids.iter() {
let netuid: NetUid = (*netuid).into();
if !Self::check_weights_min_stake(who, netuid) {
return Err(CustomTransactionError::StakeAmountTooLow.into());
}
}
Ok((Default::default(), (), origin))
}
Some(Call::commit_timelocked_weights {
netuid,
reveal_round,
Expand All @@ -218,6 +279,39 @@ where
Err(CustomTransactionError::StakeAmountTooLow.into())
}
}
Some(Call::commit_timelocked_mechanism_weights {
netuid,
mecid: _,
reveal_round,
..
})
| Some(Call::commit_crv3_mechanism_weights {
netuid,
mecid: _,
reveal_round,
..
}) => {
if Self::check_weights_min_stake(who, *netuid) {
if *reveal_round < pallet_drand::LastStoredRound::<T>::get() {
return Err(CustomTransactionError::InvalidRevealRound.into());
}
Ok((Default::default(), (), origin))
} else {
Err(CustomTransactionError::StakeAmountTooLow.into())
}
}
Some(Call::increase_take { hotkey, take })
| Some(Call::decrease_take { hotkey, take }) => {
if *take < Pallet::<T>::get_min_delegate_take() {
return Err(CustomTransactionError::DelegateTakeTooLow.into());
}
if *take > Pallet::<T>::get_max_delegate_take() {
return Err(CustomTransactionError::DelegateTakeTooHigh.into());
}
Self::result_to_validity(Pallet::<T>::do_take_checks(who, hotkey), 0u64)
.map(|validity| (validity, (), origin.clone()))
}

Some(Call::serve_axon {
netuid,
version,
Expand Down Expand Up @@ -245,6 +339,45 @@ where
)
.map(|validity| (validity, (), origin.clone()))
}
Some(Call::serve_axon_tls {
netuid,
version,
ip,
port,
ip_type,
protocol,
placeholder1,
placeholder2,
certificate: _,
}) => Self::result_to_validity(
Pallet::<T>::validate_serve_axon(
who,
*netuid,
*version,
*ip,
*port,
*ip_type,
*protocol,
*placeholder1,
*placeholder2,
),
0u64,
)
.map(|validity| (validity, (), origin.clone())),
Some(Call::serve_prometheus {
netuid,
version,
ip,
port,
ip_type,
}) => Self::result_to_validity(
Pallet::<T>::validate_serve_prometheus(
who, *netuid, *version, *ip, *port, *ip_type,
)
.map(|_| ()),
0u64,
)
.map(|validity| (validity, (), origin.clone())),
Some(Call::register_network { .. }) => {
if !TransactionType::RegisterNetwork.passes_rate_limit::<T>(who) {
return Err(CustomTransactionError::RateLimitExceeded.into());
Expand Down
Loading
Loading