Merge pull request #3 from halotrade-zone/add-lp_token_decimals

Update instantiation of LP token's decimals
halotrade-zone · Apr 18, 2023 · e26a032 · e26a032
2 parents c3ae8e4 + 00d6144
commit e26a032
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 5 deletions.
diff --git a/contracts/halo-factory/src/contract.rs b/contracts/halo-factory/src/contract.rs
@@ -186,6 +186,7 @@ pub fn execute_create_pair(
                     lp_token_info: LPTokenInfo {
                         lp_token_name: lp_token_info.lp_token_name,
                         lp_token_symbol: lp_token_info.lp_token_symbol,
+                        lp_token_decimals: lp_token_info.lp_token_decimals,
                     },
                 })?,
             }),

diff --git a/contracts/halo-factory/src/tests/test.rs b/contracts/halo-factory/src/tests/test.rs
@@ -159,6 +159,7 @@ fn create_pair() {
         lp_token_info: LPTokenInfo {
             lp_token_name: "uusd_mAAPL_LP".to_string(),
             lp_token_symbol: "uusd_mAAPL_LP".to_string(),
+            lp_token_decimals: None,
         },
     };
 
@@ -191,7 +192,8 @@ fn create_pair() {
                     commission_rate: Decimal256::from_str("0.003").unwrap(),
                     lp_token_info: LPTokenInfo {
                         lp_token_name: "uusd_mAAPL_LP".to_string(),
-                        lp_token_symbol: "uusd_mAAPL_LP".to_string()
+                        lp_token_symbol: "uusd_mAAPL_LP".to_string(),
+                        lp_token_decimals: None,
                     },
                 })
                 .unwrap(),
@@ -239,6 +241,7 @@ fn create_pair() {
         lp_token_info: LPTokenInfo {
             lp_token_name: "uusd_mAAPL_LP".to_string(),
             lp_token_symbol: "uusd_mAAPL_LP".to_string(),
+            lp_token_decimals: None,
         },
     };
 
@@ -283,6 +286,7 @@ fn create_pair_native_token_and_ibc_token() {
         lp_token_info: LPTokenInfo {
             lp_token_name: "uusd_ibc/HASH_LP".to_string(),
             lp_token_symbol: "uusd_ibc/HASH_LP".to_string(),
+            lp_token_decimals: None,
         },
     };
 
@@ -312,7 +316,8 @@ fn create_pair_native_token_and_ibc_token() {
                     commission_rate: Decimal256::from_str("0.003").unwrap(),
                     lp_token_info: LPTokenInfo {
                         lp_token_name: "uusd_ibc/HASH_LP".to_string(),
-                        lp_token_symbol: "uusd_ibc/HASH_LP".to_string()
+                        lp_token_symbol: "uusd_ibc/HASH_LP".to_string(),
+                        lp_token_decimals: None,
                     },
                 })
                 .unwrap(),
@@ -367,6 +372,7 @@ fn fail_to_create_same_pair() {
         lp_token_info: LPTokenInfo {
             lp_token_name: "uusd_uusd_LP".to_string(),
             lp_token_symbol: "uusd_uusd_LP".to_string(),
+            lp_token_decimals: None,
         },
     };
 
@@ -402,6 +408,7 @@ fn fail_to_create_pair_with_unactive_denoms() {
         lp_token_info: LPTokenInfo {
             lp_token_name: "uusd_uxxx_LP".to_string(),
             lp_token_symbol: "uusd_uxxx_LP".to_string(),
+            lp_token_decimals: None,
         },
     };
 
@@ -437,6 +444,7 @@ fn fail_to_create_pair_with_invalid_denom() {
         lp_token_info: LPTokenInfo {
             lp_token_name: "uluna_xxx_LP".to_string(),
             lp_token_symbol: "uluna_xxx_LP".to_string(),
+            lp_token_decimals: None,
         },
     };
 
@@ -482,6 +490,7 @@ fn fail_to_create_pair_with_unknown_token() {
         lp_token_info: LPTokenInfo {
             lp_token_name: "uluna_xxx_LP".to_string(),
             lp_token_symbol: "uluna_xxx_LP".to_string(),
+            lp_token_decimals: None,
         },
     };
 
@@ -527,6 +536,7 @@ fn fail_to_create_pair_with_unknown_ibc_token() {
         lp_token_info: LPTokenInfo {
             lp_token_name: "uluna_ibc/HA_LP".to_string(),
             lp_token_symbol: "uluna_ibc/HA_LP".to_string(),
+            lp_token_decimals: None,
         },
     };
 

diff --git a/contracts/halo-pair/src/contract.rs b/contracts/halo-pair/src/contract.rs
@@ -58,7 +58,7 @@ pub fn instantiate(
             msg: to_binary(&TokenInstantiateMsg {
                 name: msg.lp_token_info.clone().lp_token_name,
                 symbol: msg.lp_token_info.lp_token_symbol,
-                decimals: 6,
+                decimals: msg.lp_token_info.lp_token_decimals.unwrap_or(6),
                 initial_balances: vec![],
                 mint: Some(MinterResponse {
                     minter: env.contract.address.to_string(),

diff --git a/contracts/halo-pair/src/tests/test.rs b/contracts/halo-pair/src/tests/test.rs
@@ -42,6 +42,7 @@ fn proper_initialization() {
         lp_token_info: LPTokenInfo {
             lp_token_name: "uusd_asset0000_lp".to_string(),
             lp_token_symbol: "uusd_asset0000_lp".to_string(),
+            lp_token_decimals: Some(18),
         },
     };
 
@@ -57,7 +58,7 @@ fn proper_initialization() {
                 msg: to_binary(&TokenInstantiateMsg {
                     name: "uusd_asset0000_lp".to_string(),
                     symbol: "uusd_asset0000_lp".to_string(),
-                    decimals: 6,
+                    decimals: 18,
                     initial_balances: vec![],
                     mint: Some(MinterResponse {
                         minter: MOCK_CONTRACT_ADDR.to_string(),
@@ -249,6 +250,7 @@ fn provide_liquidity() {
         lp_token_info: LPTokenInfo {
             lp_token_name: "uusd_asset0000_LP".to_string(),
             lp_token_symbol: "uusd_asset0000_LP".to_string(),
+            lp_token_decimals: None,
         },
     };
 
@@ -739,6 +741,7 @@ fn withdraw_liquidity() {
         lp_token_info: LPTokenInfo {
             lp_token_name: "uusd_asset0000_LP".to_string(),
             lp_token_symbol: "uusd_asset0000_LP".to_string(),
+            lp_token_decimals: None,
         },
     };
 
@@ -1066,6 +1069,7 @@ fn try_token_to_native() {
         lp_token_info: LPTokenInfo {
             lp_token_name: "uusd_asset0000_LP".to_string(),
             lp_token_symbol: "uusd_asset0000_LP".to_string(),
+            lp_token_decimals: None,
         },
     };
 
@@ -1508,6 +1512,7 @@ fn test_query_pool() {
         lp_token_info: LPTokenInfo {
             lp_token_name: "uusd_asset0000_LP".to_string(),
             lp_token_symbol: "uusd_asset0000_LP".to_string(),
+            lp_token_decimals: None,
         },
     };
 

diff --git a/contracts/halo-router/src/tests/integration_test.rs b/contracts/halo-router/src/tests/integration_test.rs
@@ -12,7 +12,6 @@ mod tests {
     use haloswap::factory::{
         ExecuteMsg as FactoryExecuteMsg, NativeTokenDecimalsResponse, QueryMsg as FactoryQueryMsg,
     };
-
     use haloswap::pair::Cw20HookMsg;
     // Mock information for CW20 token contract
     const MOCK_1000_HALO_TOKEN_AMOUNT: u128 = 1_000_000_000;
@@ -174,6 +173,7 @@ mod tests {
                 lp_token_info: LPTokenInfo {
                     lp_token_name: "aura-HALO".to_string(),
                     lp_token_symbol: "aura-HALO".to_string(),
+                    lp_token_decimals: None,
                 },
             };
 

diff --git a/packages/haloswap/src/asset.rs b/packages/haloswap/src/asset.rs
@@ -320,4 +320,5 @@ impl PairInfoRaw {
 pub struct LPTokenInfo {
     pub lp_token_name: String,
     pub lp_token_symbol: String,
+    pub lp_token_decimals: Option<u8>,
 }