erc20: prevent deposit reuse

golemfactory · Jul 9, 2024 · 30556e4 · 30556e4
1 parent 2ff6edd
commit 30556e4
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 5 deletions.
diff --git a/core/model/src/driver.rs b/core/model/src/driver.rs
@@ -407,6 +407,7 @@ pub enum ValidateAllocationResult {
     TimeoutExceedsDeposit,
     MalformedDepositContract,
     MalformedDepositId,
+    DepositReused,
     Valid,
 }
 

diff --git a/core/payment-driver/erc20/src/driver.rs b/core/payment-driver/erc20/src/driver.rs
@@ -420,6 +420,15 @@ impl Erc20Driver {
             return Ok(ValidateAllocationResult::MalformedDepositId);
         };
 
+        let deposit_reused = msg
+            .existing_allocations
+            .iter()
+            .any(|allocation| allocation.deposit.as_ref() == Some(&deposit));
+
+        if deposit_reused {
+            return Ok(ValidateAllocationResult::DepositReused);
+        }
+
         let deposit_details = self
             .payment_runtime
             .deposit_details(network.to_string(), deposit_id, deposit_contract)

diff --git a/core/payment/src/api/allocations.rs b/core/payment/src/api/allocations.rs
@@ -348,7 +348,7 @@ async fn create_allocation(
         Ok(ValidateAllocationResult::Valid) => {}
         Ok(ValidateAllocationResult::InsufficientFunds) => {
             return bad_req_and_log(format!("Insufficient funds to make allocation for payment platform {payment_triple}. \
-             Top up your account or release all existing allocations to unlock the funds via `yagna payment release-allocations`"));
+                Top up your account or release all existing allocations to unlock the funds via `yagna payment release-allocations`"));
         }
         Ok(ValidateAllocationResult::TimeoutExceedsDeposit) => {
             return bad_req_and_log(
@@ -357,10 +357,14 @@ async fn create_allocation(
             );
         }
         Ok(ValidateAllocationResult::MalformedDepositContract) => {
-            return bad_req_and_log("Invalid deposit contract address".to_string());
+            return bad_req_and_log("Invalid deposit contract address.".to_string());
         }
         Ok(ValidateAllocationResult::MalformedDepositId) => {
-            return bad_req_and_log("Invalid deposit id".to_string());
+            return bad_req_and_log("Invalid deposit id.".to_string());
+        }
+        Ok(ValidateAllocationResult::DepositReused) => {
+            return bad_req_and_log("Submitted deposit already has a corresponding allocation. Consider amending the allocation \
+                if the deposit has been extended".to_string());
         }
         Err(Error::Rpc(RpcMessageError::ValidateAllocation(
             ValidateAllocationError::AccountNotRegistered,
@@ -517,7 +521,7 @@ async fn amend_allocation(
         Ok(ValidateAllocationResult::Valid) => {}
         Ok(ValidateAllocationResult::InsufficientFunds) => {
             return bad_req_and_log(format!("Insufficient funds to make allocation for payment platform {payment_triple}. \
-             Top up your account or release all existing allocations to unlock the funds via `yagna payment release-allocations`"));
+                Top up your account or release all existing allocations to unlock the funds via `yagna payment release-allocations`"));
         }
         Ok(ValidateAllocationResult::TimeoutExceedsDeposit) => {
             return bad_req_and_log(
@@ -529,7 +533,11 @@ async fn amend_allocation(
             return bad_req_and_log("Invalid deposit contract address".to_string());
         }
         Ok(ValidateAllocationResult::MalformedDepositId) => {
-            return bad_req_and_log("Invalid deposit id".to_string());
+            return bad_req_and_log("Invalid deposit id.".to_string());
+        }
+        Ok(ValidateAllocationResult::DepositReused) => {
+            return bad_req_and_log("Submitted deposit already has a corresponding allocation. Consider amending the allocation \
+                if the deposit has been extended".to_string());
         }
         Err(Error::Rpc(RpcMessageError::ValidateAllocation(
             ValidateAllocationError::AccountNotRegistered,