Merge pull request #35 from osmosis-labs/fix-asset-group-decimal-error

[FIX] Asset group decimal error
osmosis-labs · Oct 30, 2024 · 21d909a · 21d909a
2 parents 2a3d4cc + f3ba51e
commit 21d909a
Show file tree

Hide file tree

Showing 7 changed files with 449 additions and 203 deletions.
diff --git a/contracts/transmuter/src/contract.rs b/contracts/transmuter/src/contract.rs
@@ -233,6 +233,7 @@ impl Transmuter {
             .map(|(denom, weight)| (Scope::denom(&denom).key(), weight));
         let asset_group_weights_iter = pool
             .asset_group_weights()?
+            .unwrap_or_default()
             .into_iter()
             .map(|(label, weight)| (Scope::asset_group(&label).key(), weight));
 

diff --git a/contracts/transmuter/src/error.rs b/contracts/transmuter/src/error.rs
@@ -1,6 +1,6 @@
 use cosmwasm_std::{
     CheckedFromRatioError, CheckedMultiplyRatioError, Coin, ConversionOverflowError, Decimal,
-    DivideByZeroError, OverflowError, StdError, Timestamp, Uint128, Uint64,
+    DecimalRangeExceeded, DivideByZeroError, OverflowError, StdError, Timestamp, Uint128, Uint64,
 };
 use thiserror::Error;
 
@@ -209,6 +209,8 @@ pub enum ContractError {
     #[error("{0}")]
     ConversionOverflowError(#[from] ConversionOverflowError),
 
+    #[error("{0}")]
+    DecimalRangeExceeded(#[from] DecimalRangeExceeded),
     #[error("{0}")]
     MathError(#[from] MathError),
 

diff --git a/contracts/transmuter/src/limiter.rs b/contracts/transmuter/src/limiter.rs
@@ -627,7 +627,7 @@ macro_rules! assert_reset_change_limiters_by_scope {
             .into_iter()
             .collect::<std::collections::HashMap<_, _>>();
 
-        let asset_group_weights = pool.asset_group_weights().unwrap();
+        let asset_group_weights = pool.asset_group_weights().unwrap().unwrap_or_default();
 
         let limiters = $transmuter
             .limiters