Merge pull request #501 from temitope-007/fix-duplicate-contributor-count

Fix #195: Add contributor_count increment guard to prevent duplicate counting

Author: ritik4ever

contracts/src/lib.rs

@@ -51,6 +51,7 @@ pub enum DataKey {
     MinContribution,
     ExtensionRequest(u64),
     ExtensionVote(u64, Address),
+    HasContributed(u64, Address), // (campaign_id, contributor)
     /// Tracks which (old_contract_id, campaign_id) pairs have already been migrated.
     MigratedId(Address, u64),
 }
@@ -372,12 +373,16 @@ impl StellarGoalVaultContract {
         campaign.pledged_amount += amount;
 
         // Only increment contributor_count on first-time pledge
-        let contribution_key = DataKey::Contribution(campaign_id, contributor.clone(), token.clone());
-        let current_contribution: i128 = env.storage().persistent().get(&contribution_key).unwrap_or(0);
-        if current_contribution == 0 {
+        let has_contributed_key = DataKey::HasContributed(campaign_id, contributor.clone());
+        let has_contributed: bool = env.storage().persistent().get(&has_contributed_key).unwrap_or(false);
+        if !has_contributed {
             campaign.contributor_count += 1;
+            env.storage().persistent().set(&has_contributed_key, &true);
         }
 
+        let contribution_key = DataKey::Contribution(campaign_id, contributor.clone(), token.clone());
+        let current_contribution: i128 = env.storage().persistent().get(&contribution_key).unwrap_or(0);
+
         // Write updated campaign back to storage
         env.storage()
             .persistent()

contracts/src/test.rs

@@ -725,6 +725,38 @@ mod tests {
         assert_eq!(client.get_contributor_count(&campaign_id), 1);
     }
 
+
+    #[test]
+    fn test_contributor_count_no_double_count_multiple_tokens() {
+        let env = Env::default();
+        env.mock_all_auths();
+
+        let creator = Address::generate(&env);
+        let contributor = Address::generate(&env);
+        let admin = Address::generate(&env);
+
+        let token1 = deploy_token(&env, &admin, &contributor, 1_000);
+        let token2 = deploy_token(&env, &admin, &contributor, 1_000);
+        let client = deploy_contract(&env);
+
+        let campaign_id = client.create_campaign(
+            &creator,
+            &soroban_sdk::vec![&env, token1.clone(), token2.clone()],
+            &1_000_i128,
+            &(env.ledger().timestamp() + 1_000),
+            &String::from_str(&env, "multiple tokens pledge test"),
+            &0_i128,
+        );
+
+        // Contributor pledges with token1
+        client.contribute(&campaign_id, &contributor, &token1, &400);
+        assert_eq!(client.get_contributor_count(&campaign_id), 1);
+
+        // Contributor pledges with token2 - count should remain 1
+        client.contribute(&campaign_id, &contributor, &token2, &300);
+        assert_eq!(client.get_contributor_count(&campaign_id), 1);
+    }
+
     // ── #184: minimum contribution tests ──────────────────────────────────────
 
     #[test]