From f81608d55a24323f5d1d2b4ecdde3dffd40db9c1 Mon Sep 17 00:00:00 2001 From: Cameron Fairchild Date: Mon, 27 Jan 2025 13:13:25 -0500 Subject: [PATCH 1/3] use rem root alpha --- pallets/subtensor/src/coinbase/run_coinbase.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pallets/subtensor/src/coinbase/run_coinbase.rs b/pallets/subtensor/src/coinbase/run_coinbase.rs index 2e9fe44b48..d1e17f5e5b 100644 --- a/pallets/subtensor/src/coinbase/run_coinbase.rs +++ b/pallets/subtensor/src/coinbase/run_coinbase.rs @@ -446,12 +446,12 @@ impl Pallet { // 2.5.1 --- Store the root divs under hotkey_j root_alpha_divs .entry(hotkey_j.clone()) - .and_modify(|e| *e = e.saturating_add(root_alpha_divs_j.to_num::())) - .or_insert(root_alpha_divs_j.to_num::()); + .and_modify(|e| *e = e.saturating_add(rem_root_alpha_divs_j.to_num::())) + .or_insert(rem_root_alpha_divs_j.to_num::()); log::debug!( "Stored root alpha dividends for hotkey {:?}: {:?}", hotkey_j, - root_alpha_divs_j.to_num::() + rem_root_alpha_divs_j.to_num::() ); // 2.5.2 --- Store the alpha dividends From 13bd30b1cec464d57cdca7f5fcf359ff1a48676e Mon Sep 17 00:00:00 2001 From: Cameron Fairchild Date: Mon, 27 Jan 2025 13:45:12 -0500 Subject: [PATCH 2/3] fix test involving alpha out emission --- pallets/subtensor/src/tests/coinbase.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pallets/subtensor/src/tests/coinbase.rs b/pallets/subtensor/src/tests/coinbase.rs index f62f23e867..08f1eb3b3a 100644 --- a/pallets/subtensor/src/tests/coinbase.rs +++ b/pallets/subtensor/src/tests/coinbase.rs @@ -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"); } From f7e9566ced61f0abe4e0ae428285556b8cb7b436 Mon Sep 17 00:00:00 2001 From: Cameron Fairchild Date: Mon, 27 Jan 2025 13:49:51 -0500 Subject: [PATCH 3/3] fix alpha out expectation --- pallets/subtensor/src/tests/coinbase.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pallets/subtensor/src/tests/coinbase.rs b/pallets/subtensor/src/tests/coinbase.rs index 08f1eb3b3a..ff4908172e 100644 --- a/pallets/subtensor/src/tests/coinbase.rs +++ b/pallets/subtensor/src/tests/coinbase.rs @@ -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); }); }