Skip to content
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

use rem root alpha #1200

Merged
merged 4 commits into from
Jan 27, 2025
Merged

use rem root alpha #1200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f81608d
use rem root alpha
camfairchild Jan 27, 2025
13bd30b
fix test involving alpha out emission
camfairchild Jan 27, 2025
f7e9566
fix alpha out expectation
camfairchild Jan 27, 2025
c084139
Merge branch 'devnet-ready' into fix/use-rem-root-alpha
camfairchild Jan 27, 2025
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: 3 additions & 3 deletions pallets/subtensor/src/coinbase/run_coinbase.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -464,13 +464,13 @@ impl<T: Config> Pallet<T> {
root_alpha_divs
.entry(hotkey_j.clone())
.and_modify(|e| {
*e = e.saturating_add(root_alpha_divs_j.saturating_to_num::<u64>())
*e = e.saturating_add(rem_root_alpha_divs_j.saturating_to_num::<u64>())
})
.or_insert(root_alpha_divs_j.saturating_to_num::<u64>());
.or_insert(rem_root_alpha_divs_j.saturating_to_num::<u64>());
log::debug!(
"Stored root alpha dividends for hotkey {:?}: {:?}",
hotkey_j,
root_alpha_divs_j.saturating_to_num::<u64>()
rem_root_alpha_divs_j.saturating_to_num::<u64>()
);

// 2.5.2 --- Store the alpha dividends
Expand Down
4 changes: 2 additions & 2 deletions pallets/subtensor/src/tests/coinbase.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ fn test_dynamic_function_various_values() {
assert!(alpha_in_emission <= alpha_emission, "alpha_in_emission is greater than alpha_emission");
assert!(alpha_out_emission <= 2 * alpha_emission, "alpha_out_emission is greater than 2 * alpha_emission");
assert!((alpha_in_emission + alpha_out_emission) <= 2 * alpha_emission, "Sum of alpha_in_emission and alpha_out_emission is less than or equal to. 2 * alpha_emission");
close( alpha_in_emission + alpha_out_emission, 2 * alpha_emission, 10 );
close( alpha_in_emission + alpha_out_emission, alpha_in_emission + alpha_emission, 10 );
if alpha_in_emission > 0 || tao_in_emission > 0 {
assert!((tao_in_emission as f64 / alpha_in_emission as f64 - price).abs() < 1e-1, "Ratio of tao_in_emission to alpha_in_emission is not equal to price");
}
Expand Down Expand Up @@ -70,7 +70,7 @@ fn test_dynamic_function_price_equal_emission() {
let expected_alpha_in: u64 =
(alpha_block_emission * tao_subnet_emission) / tao_block_emission;
close(alpha_in, expected_alpha_in, 10);
close(alpha_out, 2 * alpha_block_emission - expected_alpha_in, 10);
close(alpha_out, alpha_block_emission, 10);
});
}

Expand Down
Loading