Merge pull request #87 from Samaro1/feat/free-to-paid-tier-event

feat(events): emit free-to-paid tier transition event

Author: elizabetheonoja-art

contracts/substream_contracts/src/lib.rs

@@ -1,6 +1,6 @@
 #![no_std]
 use soroban_sdk::token::Client as TokenClient;
-use soroban_sdk::{contract, contractevent, contractimpl, contracttype, vec, Address, Bytes, Env, Vec};
+use soroban_sdk::{contract, contractevent, contractimpl, contracttype, vec, Address, Env, Vec};
 
 // --- Constants ---
 const MINIMUM_FLOW_DURATION: u64 = 86400;
@@ -72,6 +72,7 @@ pub struct Subscription {
     pub last_collected: u64,
     pub start_time: u64,
     pub last_funds_exhausted: u64,
+    pub free_to_paid_emitted: bool,
     pub creators: Vec<Address>,
     pub percentages: Vec<u32>,
     pub payer: Address,
@@ -94,6 +95,14 @@ pub struct TierChanged {
     pub new_rate: i128,
 }
 
+#[contractevent]
+pub struct FreeToPaidTierActivated {
+    #[topic] pub subscriber: Address,
+    #[topic] pub creator: Address,
+    pub rate_per_second: i128,
+    pub activated_at: u64,
+}
+
 #[contractevent]
 pub struct Subscribed {
     #[topic] pub subscriber: Address,
@@ -330,6 +339,19 @@ fn distribute_and_collect(env: &Env, beneficiary: &Address, stream_id: &Address,
     let now = env.ledger().timestamp();
 
     if now <= sub.last_collected { return 0; }
+
+    let trial_end = sub.start_time.saturating_add(sub.tier.trial_duration);
+    if !sub.free_to_paid_emitted && sub.tier.rate_per_second > 0 && now > trial_end {
+        FreeToPaidTierActivated {
+            subscriber: beneficiary.clone(),
+            creator: stream_id.clone(),
+            rate_per_second: sub.tier.rate_per_second,
+            activated_at: now,
+        }
+        .publish(env);
+        sub.free_to_paid_emitted = true;
+    }
+
     if let Some(creator) = total_streamed_creator {
         if is_creator_paused(env, creator) {
             sub.last_collected = now;
@@ -338,11 +360,10 @@ fn distribute_and_collect(env: &Env, beneficiary: &Address, stream_id: &Address,
         }
     }
 
-    let trial_end = sub.start_time.saturating_add(sub.tier.trial_duration);
     let charge_start = if sub.last_collected > trial_end { sub.last_collected } else { trial_end };
     if now <= charge_start { return 0; }
 
-    let mut amount_to_collect = calculate_discounted_charge(sub.start_time, charge_start, now, sub.tier.rate_per_second);
+    let amount_to_collect = calculate_discounted_charge(sub.start_time, charge_start, now, sub.tier.rate_per_second);
 
     // Check if grace period is active or expired
     if sub.balance <= 0 && sub.last_funds_exhausted > 0 {
@@ -436,6 +457,7 @@ fn subscribe_core(env: &Env, payer: &Address, beneficiary: &Address, stream_id:
         last_collected: now,
         start_time: now,
         last_funds_exhausted: 0,
+        free_to_paid_emitted: false,
         creators,
         percentages,
         payer: payer.clone(),

contracts/substream_contracts/src/test.rs

@@ -3,6 +3,7 @@
 use super::*;
 use soroban_sdk::{
     testutils::{Address as _, Ledger},
+    testutils::Events as _,
     token, vec, Address, Env,
 };
 
@@ -14,6 +15,11 @@ fn create_token_contract<'a>(env: &Env, admin: &Address) -> token::Client<'a> {
     token::Client::new(env, &sac.address())
 }
 
+fn last_call_contract_event_count(env: &Env, contract_id: &Address) -> usize {
+    let events = env.events().all().filter_by_contract(contract_id);
+    events.events().len()
+}
+
 // ---------------------------------------------------------------------------
 // is_subscribed
 // ---------------------------------------------------------------------------
@@ -111,6 +117,35 @@ fn test_free_trial_ignores_claims_within_first_week() {
     assert_eq!(token.balance(&creator), 27);
 }
 
+#[test]
+fn test_free_to_paid_transition_event_emitted_once() {
+    let env = Env::default();
+    env.mock_all_auths();
+
+    let subscriber = Address::generate(&env);
+    let creator = Address::generate(&env);
+    let admin = Address::generate(&env);
+
+    let token = create_token_contract(&env, &admin);
+    let token_admin = token::StellarAssetClient::new(&env, &token.address);
+    token_admin.mint(&subscriber, &1000);
+
+    let contract_id = env.register(SubStreamContract, ());
+    let client = SubStreamContractClient::new(&env, &contract_id);
+
+    let start = 100u64;
+    env.ledger().set_timestamp(start);
+    client.subscribe(&subscriber, &creator, &token.address, &300, &1);
+
+    env.ledger().set_timestamp(start + WEEK + 1);
+    client.collect(&subscriber, &creator);
+    assert_eq!(last_call_contract_event_count(&env, &contract_id), 1);
+
+    env.ledger().set_timestamp(start + WEEK + 10);
+    client.collect(&subscriber, &creator);
+    assert_eq!(last_call_contract_event_count(&env, &contract_id), 0);
+}
+
 // ---------------------------------------------------------------------------
 // Cancel
 // ---------------------------------------------------------------------------