feat(platform)!: withdrawal limits (#2182)

Author: QuantumExplorer

Cargo.lock

@@ -8,6 +8,6 @@ license = "MIT"
 
 [dependencies]
 platform-version = { path = "../rs-platform-version" }
-thiserror = "1.0.58"
+thiserror = "1.0.64"
 serde_json = { version = "1.0" }
 platform-value = { path = "../rs-platform-value" }

packages/dashpay-contract/Cargo.toml

@@ -7,7 +7,7 @@ rust-version.workspace = true
 license = "MIT"
 
 [dependencies]
-thiserror = "1.0.58"
+thiserror = "1.0.64"
 platform-version = { path = "../rs-platform-version" }
 serde_json = { version = "1.0" }
 withdrawals-contract = { path = "../withdrawals-contract" }

packages/data-contracts/Cargo.toml

@@ -7,7 +7,7 @@ rust-version.workspace = true
 license = "MIT"
 
 [dependencies]
-thiserror = "1.0.58"
+thiserror = "1.0.64"
 platform-version = { path = "../rs-platform-version" }
 serde_json = { version = "1.0" }
 platform-value = { path = "../rs-platform-value" }

packages/dpns-contract/Cargo.toml

@@ -7,7 +7,7 @@ rust-version.workspace = true
 license = "MIT"
 
 [dependencies]
-thiserror = "1.0.58"
+thiserror = "1.0.64"
 platform-version = { path = "../rs-platform-version" }
 serde_json = { version = "1.0" }
 platform-value = { path = "../rs-platform-value" }

packages/feature-flags-contract/Cargo.toml

@@ -7,7 +7,7 @@ rust-version.workspace = true
 license = "MIT"
 
 [dependencies]
-thiserror = "1.0.58"
+thiserror = "1.0.64"
 platform-version = { path = "../rs-platform-version" }
 serde_json = { version = "1.0" }
 platform-value = { path = "../rs-platform-value" }

packages/masternode-reward-shares-contract/Cargo.toml

@@ -25,7 +25,7 @@ dapi-grpc = { path = "../dapi-grpc" }
 futures = "0.3.28"
 http-serde = { version = "1.1.3", optional = true }
 rand = { version = "0.8.5", features = ["small_rng"] }
-thiserror = "1.0.58"
+thiserror = "1.0.64"
 tracing = "0.1.40"
 tokio = { version = "1.32.0", default-features = false }
 sha2 = { version = "0.10", optional = true }

packages/rs-dapi-client/Cargo.toml

@@ -10,7 +10,7 @@ use bincode::{Decode, Encode};
 #[derive(
     Error, Debug, Clone, PartialEq, Eq, Encode, Decode, PlatformSerialize, PlatformDeserialize,
 )]
-#[error("Credit withdrawal amount {amount} must be greater or equal to {min_amount}")]
+#[error("Credit withdrawal amount {amount} must be greater or equal to {min_amount} and less than {max_amount}")]
 #[platform_serialize(unversioned)]
 pub struct InvalidIdentityCreditWithdrawalTransitionAmountError {
     /*
@@ -20,11 +20,16 @@ pub struct InvalidIdentityCreditWithdrawalTransitionAmountError {
     */
     pub amount: u64,
     pub min_amount: u64,
+    pub max_amount: u64,
 }
 
 impl InvalidIdentityCreditWithdrawalTransitionAmountError {
-    pub fn new(amount: u64, min_amount: u64) -> Self {
-        Self { amount, min_amount }
+    pub fn new(amount: u64, min_amount: u64, max_amount: u64) -> Self {
+        Self {
+            amount,
+            min_amount,
+            max_amount,
+        }
     }
 
     pub fn amount(&self) -> u64 {
@@ -34,6 +39,10 @@ impl InvalidIdentityCreditWithdrawalTransitionAmountError {
     pub fn min_amount(&self) -> u64 {
         self.min_amount
     }
+
+    pub fn max_amount(&self) -> u64 {
+        self.max_amount
+    }
 }
 
 impl From<InvalidIdentityCreditWithdrawalTransitionAmountError> for ConsensusError {

packages/rs-dpp/src/errors/consensus/basic/identity/invalid_identity_credit_withdrawal_transition_amount_error.rs

@@ -51,19 +51,23 @@ impl CoreScript {
         Self::from_bytes(bytes)
     }
 
-    pub fn random_p2pkh(rng: &mut StdRng) -> Self {
-        Self::new_p2pkh(rng.gen::<[u8; 20]>())
-    }
-
-    pub fn random_p2sh(rng: &mut StdRng) -> Self {
+    pub fn new_p2sh(script_hash: [u8; 20]) -> Self {
         let mut bytes = vec![
             opcodes::all::OP_HASH160.to_u8(),
             opcodes::all::OP_PUSHBYTES_20.to_u8(),
         ];
-        bytes.append(&mut rng.gen::<[u8; 20]>().to_vec());
+        bytes.extend_from_slice(&script_hash);
         bytes.push(opcodes::all::OP_EQUAL.to_u8());
         Self::from_bytes(bytes)
     }
+
+    pub fn random_p2sh(rng: &mut StdRng) -> Self {
+        Self::new_p2sh(rng.gen())
+    }
+
+    pub fn random_p2pkh(rng: &mut StdRng) -> Self {
+        Self::new_p2pkh(rng.gen())
+    }
 }
 
 impl From<Vec<u8>> for CoreScript {

packages/rs-dpp/src/identity/core_script.rs

@@ -27,3 +27,33 @@ macro_rules! dash_to_credits {
         credits as u64
     }};
 }
+
+#[macro_export]
+macro_rules! dash_to_duffs {
+    // The macro takes a string literal representing the Dash amount.
+    ($dash:expr) => {{
+        let dash_str = stringify!($dash);
+
+        // Parsing the input string to separate the whole and fractional parts.
+        let parts: Vec<&str> = dash_str.split('.').collect();
+        let mut credits: u128 = 0;
+
+        // Process the whole number part if it exists.
+        if let Some(whole) = parts.get(0) {
+            if let Ok(whole_number) = whole.parse::<u128>() {
+                credits += whole_number * 100_000_000; // Whole Dash amount to credits
+            }
+        }
+
+        // Process the fractional part if it exists.
+        if let Some(fraction) = parts.get(1) {
+            let fraction_length = fraction.len();
+            let fraction_number = fraction.parse::<u128>().unwrap_or(0);
+            // Calculate the multiplier based on the number of digits in the fraction.
+            let multiplier = 10u128.pow(8 - fraction_length as u32);
+            credits += fraction_number * multiplier; // Fractional Dash to credits
+        }
+
+        credits as u64
+    }};
+}