payment: fix deposit allocation validation

golemfactory · Jul 9, 2024 · 29715d6 · 29715d6
1 parent bdd5bb2
commit 29715d6
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 8 deletions.
diff --git a/core/model/src/payment.rs b/core/model/src/payment.rs
@@ -30,7 +30,7 @@ pub mod local {
     use strum::{EnumProperty, IntoEnumIterator, VariantNames};
     use strum_macros::{Display, EnumIter, EnumString, EnumVariantNames, IntoStaticStr};
 
-    use ya_client_model::NodeId;
+    use ya_client_model::{payment::allocation::Deposit, NodeId};
 
     pub const BUS_ID: &str = "/local/payment";
     pub const DEFAULT_PAYMENT_DRIVER: &str = "erc20";
@@ -426,6 +426,7 @@ pub mod local {
         pub address: String,
         pub amount: BigDecimal,
         pub timeout: Option<DateTime<Utc>>,
+        pub deposit: Option<Deposit>,
     }
 
     impl RpcMessage for ValidateAllocation {

diff --git a/core/payment-driver/erc20/src/driver.rs b/core/payment-driver/erc20/src/driver.rs
@@ -419,6 +419,7 @@ impl Erc20Driver {
             .map_err(GenericError::new)?;
         let deposit_balance =
             BigDecimal::new(BigInt::from_str(&deposit_details.amount).unwrap(), 18);
+        let deposit_timeout = deposit_details.valid_to;
 
         log::info!(
             "Allocation validation with deposit: \
@@ -431,14 +432,38 @@ impl Erc20Driver {
             msg.timeout
                 .map(|tm| tm.to_string())
                 .unwrap_or(String::from("never")),
-            deposit_details.valid_to,
+            deposit_timeout,
         );
 
         let valid_amount = msg.amount <= deposit_balance;
-        let valid_timeout = msg
-            .timeout
-            .map(|timeout| timeout <= deposit_details.valid_to)
-            .unwrap_or(false);
+
+        if !valid_amount {
+            log::info!(
+                "Deposit validation failed: requested amount [{}] > deposit balance [{}]",
+                msg.amount,
+                deposit_balance
+            );
+        }
+
+        let valid_timeout = if let Some(timeout) = msg.timeout {
+            let valid_timeout = timeout <= deposit_details.valid_to;
+
+            if !valid_timeout {
+                log::info!(
+                    "Deposit validation failed: requested timeout [{}] > deposit timeout [{}]",
+                    timeout,
+                    deposit_timeout
+                );
+            }
+            valid_timeout
+        } else {
+            log::info!(
+                "Deposit validation failed: allocations with deposits must have a timeout. Deposit timeout: {}",
+                deposit_timeout
+            );
+
+            false
+        };
 
         Ok(valid_amount && valid_timeout)
     }

diff --git a/core/payment/src/processor.rs b/core/payment/src/processor.rs
@@ -20,6 +20,7 @@ use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::Arc;
 use std::time::Duration;
 use tokio::sync::{Mutex, RwLock};
+use ya_client_model::payment::allocation::Deposit;
 use ya_client_model::payment::{
     Account, ActivityPayment, AgreementPayment, DriverDetails, Network, Payment,
 };
@@ -802,6 +803,7 @@ impl PaymentProcessor {
         address: String,
         amount: BigDecimal,
         timeout: Option<DateTime<Utc>>,
+        deposit: Option<Deposit>,
     ) -> Result<bool, ValidateAllocationError> {
         if self.in_shutdown.load(Ordering::SeqCst) {
             return Err(ValidateAllocationError::Shutdown);
@@ -823,7 +825,7 @@ impl PaymentProcessor {
             platform,
             amount,
             timeout,
-            deposit: None,
+            deposit,
             existing_allocations,
         };
         let result = driver_endpoint(&driver).send(msg).await??;

diff --git a/core/payment/src/service.rs b/core/payment/src/service.rs
@@ -415,7 +415,13 @@ mod local {
         msg: ValidateAllocation,
     ) -> Result<bool, ValidateAllocationError> {
         Ok(processor
-            .validate_allocation(msg.platform, msg.address, msg.amount, msg.timeout)
+            .validate_allocation(
+                msg.platform,
+                msg.address,
+                msg.amount,
+                msg.timeout,
+                msg.deposit,
+            )
             .await?)
     }