Merge pull request #108 from invariant-labs/extend-utils

Added missing utils functions

clamm-wasm/math.rs

@@ -1,7 +1,6 @@
 use crate::consts::MAX_TICK;
 use crate::types::{liquidity::*, sqrt_price::*, token_amount::*};
 use decimal::*;
-use js_sys::BigInt;
 use odra::types::{U256, U512};
 use serde::{Deserialize, Serialize};
 use traceable_result::*;

clamm-wasm/storage/fee_tier.rs

@@ -1,6 +1,5 @@
 use crate::errors::InvariantError;
 use crate::percentage::Percentage;
-use crate::{convert, resolve};
 use decimal::*;
 use odra::types::U128;
 use odra::OdraType;
@@ -43,8 +42,5 @@ impl FeeTier {
 
 #[wasm_wrapper]
 pub fn new_fee_tier(fee: Percentage, tick_spacing: u32) -> Result<FeeTier, InvariantError> {
-    // let fee: Percentage = convert!(js_fee)?;
-    // let tick_spacing: u32 = convert!(js_tick_spacing)?;
-    // resolve!(FeeTier::new(fee, tick_spacing))
     Ok(FeeTier::new(fee, tick_spacing)?)
 }

clamm-wasm/storage/pool_key.rs

@@ -1,7 +1,6 @@
 use super::fee_tier::FeeTier;
 use crate::errors::InvariantError;
 use crate::is_token_x;
-use crate::{convert, resolve};
 use odra::OdraType;
 use serde::{Deserialize, Serialize};
 use tsify::Tsify;

clamm-wasm/types/mod.rs

@@ -2,6 +2,7 @@ pub mod fee_growth;
 pub mod fixed_point;
 pub mod liquidity;
 pub mod percentage;
+pub mod price;
 pub mod seconds_per_liquidity;
 pub mod sqrt_price;
 pub mod token_amount;

clamm-wasm/types/price.rs

@@ -0,0 +1,27 @@
+use crate::uints::U384T;
+use crate::{convert, decimal_ops};
+use decimal::*;
+use js_sys::BigInt;
+use odra::{types::U128, OdraType};
+use wasm_bindgen::prelude::*;
+
+#[decimal(24, U384T)]
+#[derive(
+    Default,
+    OdraType,
+    Debug,
+    Copy,
+    PartialEq,
+    Eq,
+    PartialOrd,
+    serde::Serialize,
+    serde::Deserialize,
+    tsify::Tsify,
+)]
+#[tsify(into_wasm_abi, from_wasm_abi)]
+pub struct Price {
+    #[tsify(type = "bigint")]
+    pub v: U128,
+}
+
+decimal_ops!(Price);