Merge pull request #345 from timilehin01010-byte/fix/issue-334-reset-guardian-votes-reset-guardian-cancel

fix: clear stale guardian votes when guardians are removed

Author: icentedward76-sketch

contracts/will/src/regression_test.rs

@@ -211,3 +211,43 @@ fn issue_193_paginate_with_remove_readd_beneficiary() {
         assert_eq!(ids_in_pages.len(), page1.len(), "Should retrieve all beneficiary wills without gaps");
     }
 }
+
+/// Regression test for stale guardian votes after a guardian is removed and re-added.
+#[test]
+fn stale_guardian_vote_cleared_when_guardian_removed() {
+    let (env, client, owner, _token, token_address) = setup();
+    let guardian = Address::generate(&env);
+    let replacement_guardian = Address::generate(&env);
+    let beneficiary = Address::generate(&env);
+
+    let beneficiaries: SorobanVec<Beneficiary> = vec![
+        &env,
+        Beneficiary {
+            address: beneficiary.clone(),
+            allocation: Allocation::Percentage(10_000),
+        },
+    ];
+    let tokens: SorobanVec<(Address, i128)> = vec![&env, (token_address, 100_000_i128)];
+    let will_id = client.create_will(
+        &owner,
+        &tokens,
+        &beneficiaries,
+        &90,
+        &7,
+        &vec![&env, guardian.clone()],
+        &1,
+        &None,
+        &0,
+    );
+
+    client.submit_guardian_vote(&will_id, &guardian);
+    assert!(client.has_guardian_voted(&will_id, &guardian));
+
+    client.update_guardians(&will_id, &owner, &vec![&env, replacement_guardian.clone()]);
+    client.update_guardians(&will_id, &owner, &vec![&env, guardian.clone()]);
+
+    assert!(
+        !client.has_guardian_voted(&will_id, &guardian),
+        "re-added guardian should not retain a vote from before removal"
+    );
+}

contracts/will/src/storage.rs

@@ -206,6 +206,26 @@ pub fn adjust_locked_value(env: &Env, token: &Address, delta: i128) {
 /// it just stops being renewed.
 pub fn save_will(env: &Env, will: &Will) {
     let key = DataKey::Will(will.id);
+    if let Some(previous) = env.storage().persistent().get::<_, Will>(&key) {
+        for guardian in previous.guardians.iter() {
+            let address = guardian.address.clone();
+            let mut still_guardian = false;
+            for current in will.guardians.iter() {
+                if current.address == address {
+                    still_guardian = true;
+                    break;
+                }
+            }
+            if !still_guardian {
+                env.storage()
+                    .persistent()
+                    .remove(&DataKey::GuardianVote(will.id, address.clone()));
+                env.storage()
+                    .persistent()
+                    .remove(&DataKey::GuardianCancelVote(will.id, address));
+            }
+        }
+    }
     env.storage().persistent().set(&key, will);
     if !matches!(will.status, WillStatus::Released | WillStatus::Cancelled) {
         env.storage()