Optimize the reward update process by requiring the AllowedConversions be precomputed.

Author: murisi

crates/shielded_token/src/conversion.rs

@@ -27,17 +27,20 @@ use namada_core::masp::MaspEpoch;
 use namada_core::token::MaspDigitPos;
 use namada_core::token::{Amount, DenominatedAmount, Denomination};
 use namada_core::uint::Uint;
+#[cfg(any(feature = "multicore", test))]
 use namada_state::iter_prefix_with_filter_map;
 use namada_systems::{parameters, trans_token};
 
+#[cfg(any(feature = "multicore", test))]
 use crate::storage_key::{
-    is_masp_conversion_key, masp_conversion_key_prefix, masp_kd_gain_key,
-    masp_kp_gain_key, masp_last_inflation_key, masp_last_locked_amount_key,
-    masp_locked_amount_target_key, masp_max_reward_rate_key,
-    masp_reward_precision_key,
+    is_masp_conversion_key, masp_assets_hash_key, masp_conversion_key_prefix,
+    masp_token_map_key,
+};
+use crate::storage_key::{
+    masp_kd_gain_key, masp_kp_gain_key, masp_last_inflation_key,
+    masp_last_locked_amount_key, masp_locked_amount_target_key,
+    masp_max_reward_rate_key, masp_reward_precision_key,
 };
-#[cfg(any(feature = "multicore", test))]
-use crate::storage_key::{masp_assets_hash_key, masp_token_map_key};
 #[cfg(any(feature = "multicore", test))]
 use crate::{ConversionLeaf, Error, OptionExt, ResultExt};
 use crate::{Result, StorageRead, StorageWrite, WithConversionState};
@@ -525,8 +528,6 @@ fn apply_stored_conversion_updates<S>(storage: &mut S) -> Result<()>
 where
     S: StorageWrite + StorageRead + WithConversionState,
 {
-    use masp_primitives::transaction::components::I128Sum;
-
     let conversion_key_prefix = masp_conversion_key_prefix();
     let mut conversion_updates = BTreeMap::new();
     // Read conversion updates from storage and store them in a map
@@ -555,8 +556,7 @@ where
             );
             continue;
         };
-        // This operation will be expensive for large conversions
-        leaf.conversion = From::<I128Sum>::from(conv);
+        leaf.conversion = conv;
     }
     // Delete the updates now that they have been applied
     storage.delete_prefix(&conversion_key_prefix)?;

crates/tests/src/integration/masp.rs

@@ -4,6 +4,7 @@ use std::str::FromStr;
 
 use color_eyre::eyre::Result;
 use color_eyre::owo_colors::OwoColorize;
+use masp_primitives::convert::AllowedConversion;
 use masp_primitives::transaction::components::I128Sum;
 use namada_apps_lib::wallet::defaults::{
     get_unencrypted_keypair, is_use_device,
@@ -1767,7 +1768,10 @@ fn reset_conversions() -> Result<()> {
         precision_btcs
             .entry((epoch, digit))
             .or_insert_with(|| {
-                I128Sum::from_pair(asset_type(epoch, digit), PRECISION)
+                AllowedConversion::from(I128Sum::from_pair(
+                    asset_type(epoch, digit),
+                    PRECISION,
+                ))
             })
             .clone()
     };
@@ -1784,7 +1788,7 @@ fn reset_conversions() -> Result<()> {
     // Write the new BTC conversions to memory
     for digit in token::MaspDigitPos::iter() {
         // -PRECISION BTC[ep, digit] + PRECISION BTC[current_ep, digit]
-        let mut reward = I128Sum::zero();
+        let mut reward: AllowedConversion = I128Sum::zero().into();
         for epoch in MaspEpoch::iter_bounds_inclusive(
             MaspEpoch::zero(),
             node.current_masp_epoch().prev().unwrap(),