Fix donate_to_project

Add amount of current payment to previous payment
multiversx · Jul 31, 2024 · c01041d · c01041d
1 parent 324f598
commit c01041d
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 20 deletions.
diff --git a/contracts/potlock/src/potlock_interactions.rs b/contracts/potlock/src/potlock_interactions.rs
@@ -57,7 +57,22 @@ pub trait PotlockInteractions:
         self.require_project_is_active(project_id);
         let payment = self.call_value().single_esdt();
         let caller = self.blockchain().get_caller();
-        self.require_donation_same_token_id(project_id, &caller, payment.token_identifier.clone());
-        self.project_donations(project_id).insert(caller, payment);
+
+        let mut donation_mapper = self.project_donations(project_id);
+        if donation_mapper.contains_key(&caller) {
+            let opt_payment = donation_mapper.remove(&caller);
+            if opt_payment.is_some() {
+                let mut previous_payment = opt_payment.unwrap();
+                require!(
+                    previous_payment.token_identifier == payment.token_identifier.clone(),
+                    "Already made a payment with a different TokenID"
+                );
+                previous_payment.amount += payment.amount;
+                self.project_donations(project_id)
+                    .insert(caller, previous_payment);
+            }
+        } else {
+            self.project_donations(project_id).insert(caller, payment);
+        }
     }
 }
diff --git a/contracts/potlock/src/potlock_storage.rs b/contracts/potlock/src/potlock_storage.rs
@@ -126,24 +126,6 @@ pub trait PotlockStorage {
         );
     }
 
-    fn require_donation_same_token_id(
-        &self,
-        project_id: ProjectId,
-        user: &ManagedAddress,
-        token_id: TokenIdentifier,
-    ) {
-        let donation_mapper = self.project_donations(project_id);
-        if donation_mapper.contains_key(user) {
-            let payment = donation_mapper.get(user);
-            if payment.is_some() {
-                require!(
-                    payment.unwrap().token_identifier == token_id,
-                    "Already made a payment with a different TokenID"
-                );
-            }
-        }
-    }
-
     #[view(getFeeTokenIdentifier)]
     #[storage_mapper("feeTokenIdentifier")]
     fn fee_token_identifier(&self) -> SingleValueMapper<TokenIdentifier>;