Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions contracts/stream/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -812,6 +812,13 @@ impl DripStream {
math::streamed_amount(&env, &info)
}

/// Read-only alias for [`streamed_total`] (#461): cumulative streamed
/// amount at the current ledger time, matching the on-chain
/// `streamed_amount` math.
pub fn total_streamed(env: Env) -> Result<i128, Error> {
Self::streamed_total(env)
}

/// Read-only: full stream state.
pub fn info(env: Env) -> StreamInfo {
state::load(&env)
Expand Down
8 changes: 8 additions & 0 deletions contracts/stream/src/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,14 @@ fn withdraw_correct_after_elapsed() {
assert_eq!(s.token.balance(&s.recipient), 10_000);
}

#[test]
fn total_streamed_matches_streamed_total() {
let s = Setup::new(1_000, 3_600, false);
s.advance_secs(100);
assert_eq!(s.client.total_streamed(), 100_000);
assert_eq!(s.client.total_streamed(), s.client.streamed_total());
}

#[test]
fn withdraw_capped_at_available() {
let s = Setup::new(100, 3600, false);
Expand Down
7 changes: 6 additions & 1 deletion frontend/src/streams.ts
Original file line number Diff line number Diff line change
Expand Up @@ -251,12 +251,17 @@ export class StreamSDK {
async getStreamedTotal(streamId: string): Promise<string> {
const result = await this.server.getContractData(
streamId,
xdr.ScVal.scvSymbol('streamed_total')
xdr.ScVal.scvSymbol('total_streamed')
);

if (result && result.val().i128) {
return result.val().i128().toString();
}
return '0';
}

/** Alias matching the on-chain `total_streamed()` view method. */
async getTotalStreamed(streamId: string): Promise<string> {
return this.getStreamedTotal(streamId);
}
}