fix: guard escrow time arithmetic, escrow approval states, role count, and segment member_count

contracts/audience-segments/src/lib.rs

@@ -123,7 +123,7 @@ impl AudienceSegmentsContract {
         admin.require_auth();
         let stored_admin: Address = env.storage().instance().get(&DataKey::Admin).unwrap();
 
-        let segment: Segment = env
+        let mut segment: Segment = env
             .storage()
             .persistent()
             .get(&DataKey::Segment(segment_id))
@@ -169,6 +169,17 @@ impl AudienceSegmentsContract {
             PERSISTENT_LIFETIME_THRESHOLD,
             PERSISTENT_BUMP_AMOUNT,
         );
+
+        // Keep the segment record's member_count in sync
+        segment.member_count = count + 1;
+        segment.last_updated = env.ledger().timestamp();
+        let _ttl_key = DataKey::Segment(segment_id);
+        env.storage().persistent().set(&_ttl_key, &segment);
+        env.storage().persistent().extend_ttl(
+            &_ttl_key,
+            PERSISTENT_LIFETIME_THRESHOLD,
+            PERSISTENT_BUMP_AMOUNT,
+        );
     }
 
     pub fn remove_member(env: Env, admin: Address, segment_id: u64, member: Address) {
@@ -182,7 +193,7 @@ impl AudienceSegmentsContract {
             panic!("address is not a member of this segment");
         }
 
-        let segment: Segment = env
+        let mut segment: Segment = env
             .storage()
             .persistent()
             .get(&DataKey::Segment(segment_id))
@@ -210,6 +221,17 @@ impl AudienceSegmentsContract {
                 PERSISTENT_BUMP_AMOUNT,
             );
         }
+
+        // Keep the segment record's member_count in sync
+        segment.member_count = count.saturating_sub(1);
+        segment.last_updated = env.ledger().timestamp();
+        let _ttl_key = DataKey::Segment(segment_id);
+        env.storage().persistent().set(&_ttl_key, &segment);
+        env.storage().persistent().extend_ttl(
+            &_ttl_key,
+            PERSISTENT_LIFETIME_THRESHOLD,
+            PERSISTENT_BUMP_AMOUNT,
+        );
     }
 
     pub fn is_member(env: Env, segment_id: u64, member: Address) -> bool {

contracts/audience-segments/src/test.rs

@@ -92,6 +92,35 @@ fn test_remove_member() {
     assert_eq!(c.get_member_count(&sid), 0);
 }
 
+#[test]
+fn test_segment_member_count_stays_in_sync() {
+    let env = Env::default();
+    env.mock_all_auths();
+    let (c, admin) = setup(&env);
+    let creator = Address::generate(&env);
+    let sid = c.create_segment(
+        &creator,
+        &s(&env, "Segment"),
+        &s(&env, "Desc"),
+        &s(&env, "QmC"),
+        &true,
+    );
+    assert_eq!(c.get_segment(&sid).unwrap().member_count, 0);
+
+    let m1 = Address::generate(&env);
+    let m2 = Address::generate(&env);
+    c.add_member(&admin, &sid, &m1, &75u32);
+    assert_eq!(c.get_segment(&sid).unwrap().member_count, 1);
+    c.add_member(&admin, &sid, &m2, &50u32);
+    assert_eq!(c.get_segment(&sid).unwrap().member_count, 2);
+    assert_eq!(c.get_member_count(&sid), 2);
+
+    c.remove_member(&admin, &sid, &m1);
+    let seg = c.get_segment(&sid).unwrap();
+    assert_eq!(seg.member_count, 1);
+    assert_eq!(c.get_member_count(&sid), seg.member_count);
+}
+
 #[test]
 fn test_is_member_false() {
     let env = Env::default();

contracts/audience-segments/test_snapshots/test/test_add_member.1.json

@@ -382,7 +382,7 @@
                         "symbol": "member_count"
                       },
                       "val": {
-                        "u64": 0
+                        "u64": 1
                       }
                     },
                     {