Adjust decimal places

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "bitmask-core"
-version = "0.7.0-beta.8"
+version = "0.7.0-beta.9"
 authors = [
     "Jose Diego Robles <jose@diba.io>",
     "Hunter Trujillo <hunter@diba.io>",

lib/web/rgb.ts

@@ -205,6 +205,22 @@ export const importUdaData = async (request: MediaRequest): Promise<boolean> =>
 export const getMedia = async (mediaId: string): Promise<MediaMetadata> =>
   JSON.parse(await BMC.get_media_metadata(mediaId));
 
+export const contractAmount = (amount: bigint, precision: number): bigint =>
+  JSON.parse(BMC.contract_amount(amount, precision).toString());
+
+export const contractAmountStr = (amount: bigint, precision: number): String =>
+  JSON.parse(BMC.contract_amount_str(amount, precision));
+
+export const contractAmountParseStr = (amount: string, precision: number): String =>
+  JSON.parse(BMC.contract_amount_parse_str(amount, precision).toString());
+
+export const contractAmountParseValue = (amount: string, precision: number): bigint =>
+  JSON.parse(BMC.contract_amount_parse_value(amount, precision).toString());
+
+export const contractDecimalParseValue = (amount: string): bigint =>
+  JSON.parse(BMC.contract_amount_parse_decimal_value(amount).toString());
+
+
 // Core type interfaces based on structs defined within the bitmask-core Rust crate:
 // https://github.com/diba-io/bitmask-core/blob/development/src/structs.rs
 
@@ -368,7 +384,7 @@ export interface ImportResponse {
   /// The user contract balance
   balance: bigint;
   /// The user contract balance
-  balance_normalized: number;
+  balanceNormalized: number;
   /// The contract allocations
   allocations: AllocationDetail[];
   /// The contract state (multiple formats)

src/rgb.rs

@@ -197,7 +197,7 @@ pub async fn issue_contract(sk: &str, request: IssueRequest) -> Result<IssueResp
         _ => None,
     };
 
-    let contract_amount = ContractAmount::with(supply, precision);
+    let contract_amount = ContractAmount::new(supply, precision);
     let contract = create_contract(
         &ticker,
         &name,
@@ -470,7 +470,7 @@ async fn internal_create_invoice(
 
     let contr_id = ContractId::from_str(&contract_id).map_err(|_| InvoiceError::NoContract)?;
     let boilerplate = export_boilerplate(contr_id, stock).map_err(|_| InvoiceError::NoContract)?;
-    let invoice_amount = ContractAmount::from_raw(amount.to_string());
+    let invoice_amount = ContractAmount::from_decimal_str(amount.to_string());
     if invoice_amount.precision != boilerplate.precision {
         return Err(InvoiceError::WrongPrecision(
             boilerplate.precision,
@@ -986,7 +986,7 @@ pub async fn create_seller_offer(
         expire_at,
     );
 
-    let contract_amount = ContractAmount::from_raw(contract_amount).to_string();
+    let contract_amount = ContractAmount::from_decimal_str(contract_amount).to_string();
     let contract_amount =
         f64::from_str(&contract_amount).map_err(|_| RgbSwapError::WrongValue(contract_amount))?;
 
@@ -1197,7 +1197,7 @@ pub async fn create_buyer_bid(
         }
     }
 
-    let invoice_amount = ContractAmount::with(asset_amount, asset_precision);
+    let invoice_amount = ContractAmount::new(asset_amount, asset_precision);
     let invoice_req = InvoiceRequest {
         iface,
         contract_id: contract_id.to_string(),

src/rgb/contract.rs

@@ -225,9 +225,9 @@ where
             .sum();
     }
 
-    let balance_normalised = ContractAmount::with(balance, specs.precision.into()).to_string();
-    let balance_normalised = f64::from_str(&balance_normalised)
-        .map_err(|_| ExportContractError::WrongValue(contr_id.clone(), balance_normalised))?;
+    let balance_normalized = ContractAmount::new(balance, specs.precision.into()).to_string();
+    let balance_normalized = f64::from_str(&balance_normalized)
+        .map_err(|_| ExportContractError::WrongValue(contr_id.clone(), balance_normalized))?;
 
     let mut supply = 0;
     for (index, (_, global_assign)) in contract_bindle.genesis.assignments.iter().enumerate() {
@@ -336,7 +336,7 @@ where
         precision: specs.precision.into(),
         supply,
         balance,
-        balance_normalised,
+        balance_normalized,
         allocations,
         created: created.into(),
         contract: ContractFormats {

src/rgb/structs.rs

@@ -5,6 +5,7 @@ use bp::Txid;
 use core::fmt::Display;
 use rgb::{RgbWallet, TerminalPath};
 use std::{
+    cmp::Ordering,
     collections::{BTreeMap, HashMap},
     str::FromStr,
 };
@@ -45,6 +46,7 @@ impl FromStr for AddressAmount {
     }
 }
 
+#[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash, Debug)]
 pub struct ContractAmount {
     pub int: u64,
     pub fract: u64,
@@ -66,18 +68,57 @@ impl ContractAmount {
     ///
     /// ```
     /// // Define the initial value
-    /// let amount = CoinAmount::with(5, 2);
+    /// use bitmask_core::rgb::structs::ContractAmount;
+    /// let amount = ContractAmount::new(100, 2);
     ///
-    /// assert_eq!(amount.int, 5);
+    /// assert_eq!(amount.int, 100);
     /// assert_eq!(amount.fract, 0);
-    /// assert_eq!(amount.to_value(), 500);
-    /// assert_eq!(amount.to_string(), "5");
+    /// assert_eq!(amount.clone().to_value(), 10000);
+    /// assert_eq!(amount.to_string(), "100.00");
     /// ```
     pub fn new(value: u64, precision: u8) -> Self {
         let pow = 10_u64.pow(precision as u32);
+        let int = match precision.cmp(&0) {
+            Ordering::Less | Ordering::Equal => value,
+            Ordering::Greater => value / pow,
+        };
 
-        let int = if value < pow { value } else { value / pow };
-        let fract = if value < pow { 0 } else { value - int * pow };
+        let fract = match value.cmp(&pow) {
+            Ordering::Less | Ordering::Equal => 0,
+            Ordering::Greater => value - int * pow,
+        };
+
+        ContractAmount {
+            int,
+            fract,
+            precision,
+        }
+    }
+
+    /// Define a contract value.
+    ///
+    /// A value ([`u64`]) combine with precision ([`u8`]), load
+    /// a contract value, compabitle with rgb contract value.
+    ///
+    /// Remeber: All contract amounts are represents in [`u64`].
+    /// The [`ContractAmount`] abstract the calculation.
+    ///
+    /// # Examples
+    ///
+    /// Basic usage:
+    ///
+    /// ```
+    /// // Define the initial value
+    /// use bitmask_core::rgb::structs::ContractAmount;
+    /// let amount = ContractAmount::with(2, 50, 2);
+    ///
+    /// assert_eq!(amount.int, 2);
+    /// assert_eq!(amount.fract, 50);
+    /// assert_eq!(amount.clone().to_value(), 250);
+    /// assert_eq!(amount.to_string(), "2.50");
+    /// ```
+    pub fn with(value: u64, fract: u64, precision: u8) -> Self {
+        let int = value;
         ContractAmount {
             int,
             fract,
@@ -99,14 +140,15 @@ impl ContractAmount {
     ///
     /// ```
     /// // Define the initial value
-    /// let amount = ContractAmount::with(1100, 3);
+    /// use bitmask_core::rgb::structs::ContractAmount;
+    /// let amount = ContractAmount::new(1100, 3);
     ///
     /// assert_eq!(amount.int, 1);
     /// assert_eq!(amount.fract, 100);
-    /// assert_eq!(amount.to_value(), 1100);
+    /// assert_eq!(amount.clone().to_value(), 1100);
     /// assert_eq!(amount.to_string(), "1.100");
     /// ```
-    pub fn with(value: u64, precision: u8) -> Self {
+    pub fn load(value: u64, precision: u8) -> Self {
         let pow = 10_u64.pow(precision as u32);
         let int = value / pow;
         let fract = value - int * pow;
@@ -117,7 +159,7 @@ impl ContractAmount {
         }
     }
 
-    /// Convert a raw string representation of the
+    /// Convert a raw u64 representation of the
     /// number in Contract Amount.
     ///
     /// A value ([`String`]) return a contract value,
@@ -129,17 +171,19 @@ impl ContractAmount {
     ///
     /// ```
     /// // Define the initial value
-    /// let amount = ContractAmount::from("1.100");
+    /// use bitmask_core::rgb::structs::ContractAmount;
+    /// let amount = ContractAmount::from("1".to_string(), 3);
     ///
-    /// assert_eq!(amount.int, 1);
-    /// assert_eq!(amount.fract, 100);
-    /// assert_eq!(amount.to_value(), 1100);
-    /// assert_eq!(amount.to_string(), "1.100");
+    /// assert_eq!(amount.int.clone(), 1);
+    /// assert_eq!(amount.fract, 0);
+    /// assert_eq!(amount.clone().to_value(), 1000);
+    /// assert_eq!(amount.to_string().clone(), "1.000");
     /// ```
     pub fn from(value: String, precision: u8) -> Self {
-        let mut fract = 0;
+        let int;
+        let mut fract;
 
-        let int = if value.contains('.') {
+        if value.contains('.') {
             let parts = value.split('.');
             let collection: Vec<&str> = parts.collect();
 
@@ -150,9 +194,11 @@ impl ContractAmount {
                 fract *= pow;
             }
 
-            collection[0].parse().unwrap()
+            int = collection[0].parse().unwrap();
         } else {
-            value.parse().unwrap()
+            let unsafe_contract_amount = Self::load(value.parse().unwrap(), precision);
+            fract = unsafe_contract_amount.fract;
+            int = unsafe_contract_amount.int
         };
 
         ContractAmount {
@@ -162,7 +208,7 @@ impl ContractAmount {
         }
     }
 
-    /// Convert a raw string representation of the
+    /// Convert a decimal string representation of the
     /// number in Contract Amount.
     ///
     /// A value ([`String`]) return a contract value,
@@ -174,14 +220,15 @@ impl ContractAmount {
     ///
     /// ```
     /// // Define the initial value
-    /// let amount = ContractAmount::from_raw("1.100");
+    /// use bitmask_core::rgb::structs::ContractAmount;
+    /// let amount = ContractAmount::from_decimal_str("1.100".to_string());
     ///
     /// assert_eq!(amount.int, 1);
     /// assert_eq!(amount.fract, 100);
-    /// assert_eq!(amount.to_value(), 1100);
+    /// assert_eq!(amount.clone().to_value(), 1100);
     /// assert_eq!(amount.to_string(), "1.100");
     /// ```
-    pub fn from_raw(value: String) -> Self {
+    pub fn from_decimal_str(value: String) -> Self {
         let mut fract = 0;
         let mut precision = 0;
 

src/structs.rs

@@ -442,7 +442,7 @@ pub struct ContractResponse {
     /// Current balance
     pub balance: u64,
     /// Current balance (Humanized)
-    pub balance_normalised: f64,
+    pub balance_normalized: f64,
     /// The contract allocations
     pub allocations: Vec<AllocationDetail>,
     /// The contract state (multiple formats)

src/web.rs

@@ -5,6 +5,7 @@ use serde::de::DeserializeOwned;
 use wasm_bindgen::prelude::*;
 use wasm_bindgen_futures::{future_to_promise, JsFuture};
 
+use crate::rgb::structs::ContractAmount;
 use crate::structs::{
     AcceptRequest, FullRgbTransferRequest, ImportRequest, InvoiceRequest, IssueRequest,
     MediaRequest, PsbtRequest, PublishPsbtRequest, ReIssueRequest, RgbBidRequest, RgbOfferRequest,
@@ -995,6 +996,36 @@ pub mod rgb {
             }
         })
     }
+
+    #[wasm_bindgen]
+    pub fn contract_amount(amount: u64, precision: u8) -> u64 {
+        set_panic_hook();
+        ContractAmount::new(amount, precision).to_value()
+    }
+
+    #[wasm_bindgen]
+    pub fn contract_amount_str(amount: u64, precision: u8) -> String {
+        set_panic_hook();
+        ContractAmount::new(amount, precision).to_string()
+    }
+
+    #[wasm_bindgen]
+    pub fn contract_amount_parse_str(amount: String, precision: u8) -> String {
+        set_panic_hook();
+        ContractAmount::from(amount, precision).to_string()
+    }
+
+    #[wasm_bindgen]
+    pub fn contract_amount_parse_value(amount: String, precision: u8) -> u64 {
+        set_panic_hook();
+        ContractAmount::from(amount, precision).to_value()
+    }
+
+    #[wasm_bindgen]
+    pub fn contract_amount_parse_decimal_value(amount: String) -> u64 {
+        set_panic_hook();
+        ContractAmount::from_decimal_str(amount).to_value()
+    }
 }
 
 pub mod lightning {

tests/rgb.rs

@@ -1,6 +1,7 @@
 mod rgb {
 
     mod unit {
+        mod amount;
         mod invoice;
         mod issue;
         mod psbt;
@@ -36,7 +37,7 @@ mod rgb {
     mod web {
         mod contracts;
         mod imports;
-        // mod inspect;
+        mod inspect;
         mod proxy;
         mod stl_ids;
         mod stl_load;

tests/rgb/integration/accept.rs

@@ -53,7 +53,7 @@ pub async fn allow_save_read_remove_transfers() -> Result<()> {
     let issuer_resp = issuer_issue_contract_v2(
         1,
         "RGB20",
-        ContractAmount::new(5, 2).to_value(),
+        ContractAmount::with(5, 0, 2).to_value(),
         false,
         true,
         None,
@@ -68,7 +68,7 @@ pub async fn allow_save_read_remove_transfers() -> Result<()> {
     let owner_invoice = &create_new_invoice(
         &issuer_resp.contract_id,
         &issuer_resp.iface,
-        2.00,
+        ContractAmount::with(2, 0, issuer_resp.precision),
         owner_keys.clone(),
         None,
         Some(issuer_resp.clone().contract.strict),
@@ -214,7 +214,7 @@ pub async fn accept_all_transfers() -> Result<()> {
     let issuer_resp = issuer_issue_contract_v2(
         1,
         "RGB20",
-        ContractAmount::new(5, 2).to_value(),
+        ContractAmount::with(5, 0, 2).to_value(),
         false,
         true,
         None,
@@ -229,7 +229,7 @@ pub async fn accept_all_transfers() -> Result<()> {
     let owner_invoice = &create_new_invoice(
         &issuer_resp.contract_id,
         &issuer_resp.iface,
-        2.00,
+        ContractAmount::with(2, 0, issuer_resp.precision),
         owner_keys.clone(),
         None,
         Some(issuer_resp.clone().contract.strict),