Skip to content

Refund Unused Extrinsic Weight (fee) #2997

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

Open
UnArbosSix wants to merge 17 commits into
base: main
Choose a base branch
from
Open

Refund Unused Extrinsic Weight (fee) #2997

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
2261b7c
refund unused extrinsic weight
UnArbosSix Jul 27, 2026
d849f19
bump spec
UnArbosSix Jul 27, 2026
ffed1e5
address lints & refund on failure
UnArbosSix Jul 27, 2026
202270d
add tests
UnArbosSix Jul 27, 2026
4530a3a
fix evm
UnArbosSix Jul 28, 2026
822738f
reduce benchmark time
UnArbosSix Jul 28, 2026
5d647c9
speed up benchmarks
UnArbosSix Jul 28, 2026
0b5296a
speed up more benchmarks
UnArbosSix Jul 28, 2026
7bee06f
fix bench
UnArbosSix Jul 28, 2026
1bdfc70
auto-update benchmark weights
github-actions[bot] Jul 29, 2026
e941271
preserve actual weight through reserve refunds
UnArbosSix Jul 29, 2026
1feca1c
auto-update benchmark weights
github-actions[bot] Jul 29, 2026
38b87f7
don't measure on_idle in bench
UnArbosSix Jul 29, 2026
c2b5bb1
auto-update benchmark weights
github-actions[bot] Jul 29, 2026
c2a7fb0
fix lints
UnArbosSix Jul 29, 2026
15b4dcf
auto-update benchmark weights
github-actions[bot] Jul 30, 2026
ef5c11e
fix extension
UnArbosSix Jul 30, 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
171 changes: 73 additions & 98 deletions chain-extensions/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,14 @@ pub mod types;

use crate::types::{ColdkeyLock, FunctionId, Output, StakeAvailability, SubnetRegistrationState};
use codec::{Decode, Encode, MaxEncodedLen};
use frame_support::{DebugNoBound, traits::Get};
use frame_support::{
DebugNoBound,
dispatch::{DispatchResult, DispatchResultWithPostInfo},
traits::Get,
};
use frame_system::RawOrigin;
use pallet_contracts::chain_extension::{
BufInBufOutState, ChainExtension, Environment, Ext, InitState, RetVal, SysConfig,
BufInBufOutState, ChainExtension, ChargedAmount, Environment, Ext, InitState, RetVal, SysConfig,
};
use pallet_subtensor::weights::WeightInfo as SubtensorWeightInfo;
use pallet_subtensor_proxy as pallet_proxy;
Expand All @@ -32,6 +36,43 @@ impl<T> Default for SubtensorChainExtension<T> {
}
}

fn finish_subtensor_call<T, Env>(
env: &mut Env,
charged: Env::ChargedAmount,
declared_weight: Weight,
call_result: DispatchResultWithPostInfo,
) -> Result<RetVal, DispatchError>
where
T: pallet_contracts::Config,
Env: SubtensorExtensionEnv<T>,
{
match call_result {
Ok(post_info) => {
env.adjust_weight(charged, post_info.actual_weight.unwrap_or(declared_weight));
Ok(RetVal::Converging(Output::Success as u32))
}
Err(error_with_post_info) => {
env.adjust_weight(
charged,
error_with_post_info
.post_info
.actual_weight
.unwrap_or(declared_weight),
);
Ok(RetVal::Converging(
Output::from(error_with_post_info.error) as u32
))
}
}
}

fn finish_fixed_subtensor_call(call_result: DispatchResult) -> Result<RetVal, DispatchError> {
match call_result {
Ok(()) => Ok(RetVal::Converging(Output::Success as u32)),
Err(error) => Ok(RetVal::Converging(Output::from(error) as u32)),
}
}

impl<T> ChainExtension<T> for SubtensorChainExtension<T>
where
T: pallet_subtensor::Config
Expand Down Expand Up @@ -82,13 +123,7 @@ where
let call_result =
pallet_subtensor::Pallet::<T>::add_stake(origin.into(), hotkey, netuid, amount_staked);

match call_result {
Ok(_) => Ok(RetVal::Converging(Output::Success as u32)),
Err(e) => {
let error_code = Output::from(e) as u32;
Ok(RetVal::Converging(error_code))
}
}
finish_fixed_subtensor_call(call_result)
}

fn dispatch_remove_stake_v1<Env>(
Expand Down Expand Up @@ -116,13 +151,7 @@ where
amount_unstaked,
);

match call_result {
Ok(_) => Ok(RetVal::Converging(Output::Success as u32)),
Err(e) => {
let error_code = Output::from(e) as u32;
Ok(RetVal::Converging(error_code))
}
}
finish_fixed_subtensor_call(call_result)
}

fn dispatch_unstake_all_v1<Env>(
Expand All @@ -137,20 +166,13 @@ where
.read_as()
.map_err(|_| DispatchError::Other("Failed to decode input parameters"))?;

let weight =
<<T as pallet_subtensor::Config>::WeightInfo as SubtensorWeightInfo>::unstake_all();
let weight = pallet_subtensor::Pallet::<T>::max_normal_dispatch_weight();

env.charge_weight(weight)?;
let charged = env.charge_weight(weight)?;

let call_result = pallet_subtensor::Pallet::<T>::unstake_all(origin.into(), hotkey);

match call_result {
Ok(_) => Ok(RetVal::Converging(Output::Success as u32)),
Err(e) => {
let error_code = Output::from(e) as u32;
Ok(RetVal::Converging(error_code))
}
}
finish_subtensor_call::<T, Env>(env, charged, weight, call_result)
}

fn dispatch_unstake_all_alpha_v1<Env>(
Expand All @@ -165,21 +187,13 @@ where
.read_as()
.map_err(|_| DispatchError::Other("Failed to decode input parameters"))?;

let weight =
<<T as pallet_subtensor::Config>::WeightInfo as SubtensorWeightInfo>::unstake_all_alpha(
);
let weight = pallet_subtensor::Pallet::<T>::max_normal_dispatch_weight();

env.charge_weight(weight)?;
let charged = env.charge_weight(weight)?;

let call_result = pallet_subtensor::Pallet::<T>::unstake_all_alpha(origin.into(), hotkey);

match call_result {
Ok(_) => Ok(RetVal::Converging(Output::Success as u32)),
Err(e) => {
let error_code = Output::from(e) as u32;
Ok(RetVal::Converging(error_code))
}
}
finish_subtensor_call::<T, Env>(env, charged, weight, call_result)
}

fn dispatch_move_stake_v1<Env>(
Expand Down Expand Up @@ -214,13 +228,7 @@ where
alpha_amount,
);

match call_result {
Ok(_) => Ok(RetVal::Converging(Output::Success as u32)),
Err(e) => {
let error_code = Output::from(e) as u32;
Ok(RetVal::Converging(error_code))
}
}
finish_fixed_subtensor_call(call_result)
}

fn dispatch_transfer_stake_v1<Env>(
Expand Down Expand Up @@ -255,13 +263,7 @@ where
alpha_amount,
);

match call_result {
Ok(_) => Ok(RetVal::Converging(Output::Success as u32)),
Err(e) => {
let error_code = Output::from(e) as u32;
Ok(RetVal::Converging(error_code))
}
}
finish_fixed_subtensor_call(call_result)
}

fn dispatch_swap_stake_v1<Env>(
Expand Down Expand Up @@ -294,13 +296,7 @@ where
alpha_amount,
);

match call_result {
Ok(_) => Ok(RetVal::Converging(Output::Success as u32)),
Err(e) => {
let error_code = Output::from(e) as u32;
Ok(RetVal::Converging(error_code))
}
}
finish_fixed_subtensor_call(call_result)
}

fn dispatch_add_stake_limit_v1<Env>(
Expand Down Expand Up @@ -335,13 +331,7 @@ where
allow_partial,
);

match call_result {
Ok(_) => Ok(RetVal::Converging(Output::Success as u32)),
Err(e) => {
let error_code = Output::from(e) as u32;
Ok(RetVal::Converging(error_code))
}
}
finish_fixed_subtensor_call(call_result)
}

fn dispatch_remove_stake_limit_v1<Env>(
Expand Down Expand Up @@ -376,13 +366,7 @@ where
allow_partial,
);

match call_result {
Ok(_) => Ok(RetVal::Converging(Output::Success as u32)),
Err(e) => {
let error_code = Output::from(e) as u32;
Ok(RetVal::Converging(error_code))
}
}
finish_fixed_subtensor_call(call_result)
}

fn dispatch_swap_stake_limit_v1<Env>(
Expand Down Expand Up @@ -420,13 +404,7 @@ where
allow_partial,
);

match call_result {
Ok(_) => Ok(RetVal::Converging(Output::Success as u32)),
Err(e) => {
let error_code = Output::from(e) as u32;
Ok(RetVal::Converging(error_code))
}
}
finish_fixed_subtensor_call(call_result)
}

fn dispatch_remove_stake_full_limit_v1<Env>(
Expand All @@ -452,13 +430,7 @@ where
limit_price,
);

match call_result {
Ok(_) => Ok(RetVal::Converging(Output::Success as u32)),
Err(e) => {
let error_code = Output::from(e) as u32;
Ok(RetVal::Converging(error_code))
}
}
finish_fixed_subtensor_call(call_result)
}

fn dispatch_set_coldkey_auto_stake_hotkey_v1<Env>(
Expand All @@ -473,23 +445,17 @@ where
.read_as()
.map_err(|_| DispatchError::Other("Failed to decode input parameters"))?;

let weight = <<T as pallet_subtensor::Config>::WeightInfo as SubtensorWeightInfo>::set_coldkey_auto_stake_hotkey();
let weight = pallet_subtensor::Pallet::<T>::max_normal_dispatch_weight();

env.charge_weight(weight)?;
let charged = env.charge_weight(weight)?;

let call_result = pallet_subtensor::Pallet::<T>::set_coldkey_auto_stake_hotkey(
origin.into(),
netuid,
hotkey,
);

match call_result {
Ok(_) => Ok(RetVal::Converging(Output::Success as u32)),
Err(e) => {
let error_code = Output::from(e) as u32;
Ok(RetVal::Converging(error_code))
}
}
finish_subtensor_call::<T, Env>(env, charged, weight, call_result)
}

fn dispatch_add_proxy_v1<Env>(
Expand Down Expand Up @@ -925,8 +891,11 @@ trait SubtensorExtensionEnv<T>
where
T: pallet_contracts::Config,
{
type ChargedAmount;

fn func_id(&self) -> u16;
fn charge_weight(&mut self, weight: Weight) -> Result<(), DispatchError>;
fn charge_weight(&mut self, weight: Weight) -> Result<Self::ChargedAmount, DispatchError>;
fn adjust_weight(&mut self, charged: Self::ChargedAmount, actual_weight: Weight);
fn read_as<U: Decode + MaxEncodedLen>(&mut self) -> Result<U, DispatchError>;
fn write_output(&mut self, data: &[u8]) -> Result<(), DispatchError>;
fn caller(&mut self) -> T::AccountId;
Expand Down Expand Up @@ -963,12 +932,18 @@ where
T::AccountId: Clone,
E: Ext<T = T>,
{
type ChargedAmount = ChargedAmount;

fn func_id(&self) -> u16 {
self.env.func_id()
}

fn charge_weight(&mut self, weight: Weight) -> Result<(), DispatchError> {
self.env.charge_weight(weight).map(|_| ())
fn charge_weight(&mut self, weight: Weight) -> Result<Self::ChargedAmount, DispatchError> {
self.env.charge_weight(weight)
}

fn adjust_weight(&mut self, charged: Self::ChargedAmount, actual_weight: Weight) {
self.env.adjust_weight(charged, actual_weight);
}

fn read_as<U: Decode + MaxEncodedLen>(&mut self) -> Result<U, DispatchError> {
Expand Down
1 change: 1 addition & 0 deletions chain-extensions/src/mock.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -444,6 +444,7 @@ impl pallet_subtensor::Config for Test {
type BurnAccountId = BurnAccountId;
type InitialMaxEpochsPerBlock = MaxEpochsPerBlock;
type WeightInfo = ();
type MaxTransactionExtensionWeight = ();
}

// Swap-related parameter types
Expand Down
Loading
Loading