Skip to content

Commit f02bf6c

Browse files
Smartdevs17Smartdevs17
authored
Merge pull request #134 from Calebux/feat/gas-budget-tracking
feat: add gas budget tracking per subscription (#96)
2 parents 428ab92 + f697167 commit f02bf6c

10 files changed

Lines changed: 177 additions & 69 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88

99
env:
1010
NODE_VERSION: '20'
11-
RUST_VERSION: 'stable'
11+
RUST_VERSION: '1.85'
1212

1313
jobs:
1414
commitlint:

‎contracts/src/lib.rs‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,8 @@ pub struct Subscription {
6161
pub last_charged_at: u64,
6262
pub next_charge_at: u64,
6363
pub total_paid: i128,
64+
pub total_gas_spent: u64,
65+
pub charge_count: u32,
6466
pub paused_at: u64,
6567
pub pause_duration: u64,
6668
pub refund_requested_amount: i128,
@@ -213,6 +215,8 @@ impl SubTrackrContract {
213215
last_charged_at: now,
214216
next_charge_at: now + plan.interval.seconds(),
215217
total_paid: 0,
218+
total_gas_spent: 0,
219+
charge_count: 0,
216220
paused_at: 0,
217221
pause_duration: 0,
218222
refund_requested_amount: 0,
@@ -404,15 +408,18 @@ impl SubTrackrContract {
404408
sub.last_charged_at = now;
405409
sub.next_charge_at = now + plan.interval.seconds();
406410
sub.total_paid += plan.price;
411+
sub.total_gas_spent += 100_000; // Simulated gas cost (0.01 XLM)
412+
sub.charge_count += 1;
407413

408414
env.storage()
409415
.persistent()
410416
.set(&DataKey::Subscription(subscription_id), &sub);
411417

412-
// TODO: Execute actual token transfer from subscriber to merchant
413-
// token::Client::new(&env, &plan.token).transfer(
414-
// &sub.subscriber, &plan.merchant, &plan.price
415-
// );
418+
// Publish event
419+
env.events().publish(
420+
(String::from_str(&env, "subscription_charged"), subscription_id),
421+
(sub.subscriber.clone(), plan.price, 100_000u64, now),
422+
);
416423
}
417424

418425
/// Request a refund for a subscription (can only be called by the subscriber)

‎src/hooks/__tests__/useFilteredSubscriptions.test.ts‎

Lines changed: 25 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -51,17 +51,17 @@ describe('useFilteredSubscriptions', () => {
5151

5252
it('should return all subscriptions when no filters are applied', () => {
5353
const { result } = renderHook(() => useFilteredSubscriptions(mockSubscriptions));
54-
54+
5555
expect(result.current.filteredAndSorted).toHaveLength(3);
5656
expect(result.current.hasActiveFilters).toBe(false);
5757
expect(result.current.activeFilterCount).toBe(0);
5858
});
5959

6060
it('should filter by search query', () => {
6161
const { result } = renderHook(() => useFilteredSubscriptions(mockSubscriptions));
62-
62+
6363
result.current.filters.setSearchQuery('Netflix');
64-
64+
6565
expect(result.current.filteredAndSorted).toHaveLength(1);
6666
expect(result.current.filteredAndSorted[0].name).toBe('Netflix');
6767
expect(result.current.hasActiveFilters).toBe(true);
@@ -70,56 +70,60 @@ describe('useFilteredSubscriptions', () => {
7070

7171
it('should filter by category', () => {
7272
const { result } = renderHook(() => useFilteredSubscriptions(mockSubscriptions));
73-
73+
7474
result.current.filters.setSelectedCategories([SubscriptionCategory.STREAMING]);
75-
75+
7676
expect(result.current.filteredAndSorted).toHaveLength(2);
77-
expect(result.current.filteredAndSorted.every(sub => sub.category === SubscriptionCategory.STREAMING)).toBe(true);
77+
expect(
78+
result.current.filteredAndSorted.every(
79+
(sub) => sub.category === SubscriptionCategory.STREAMING
80+
)
81+
).toBe(true);
7882
expect(result.current.hasActiveFilters).toBe(true);
7983
});
8084

8185
it('should filter by active status', () => {
8286
const { result } = renderHook(() => useFilteredSubscriptions(mockSubscriptions));
83-
87+
8488
result.current.filters.setShowActiveOnly(true);
85-
89+
8690
expect(result.current.filteredAndSorted).toHaveLength(2);
87-
expect(result.current.filteredAndSorted.every(sub => sub.isActive)).toBe(true);
91+
expect(result.current.filteredAndSorted.every((sub) => sub.isActive)).toBe(true);
8892
});
8993

9094
it('should sort by name', () => {
9195
const { result } = renderHook(() => useFilteredSubscriptions(mockSubscriptions));
92-
96+
9397
result.current.filters.setSortBy('name');
9498
result.current.filters.setSortOrder('asc');
95-
96-
const names = result.current.filteredAndSorted.map(sub => sub.name);
99+
100+
const names = result.current.filteredAndSorted.map((sub) => sub.name);
97101
expect(names).toEqual(['Adobe Creative Cloud', 'Netflix', 'Spotify']);
98102
});
99103

100104
it('should sort by price', () => {
101105
const { result } = renderHook(() => useFilteredSubscriptions(mockSubscriptions));
102-
106+
103107
result.current.filters.setSortBy('price');
104108
result.current.filters.setSortOrder('asc');
105-
106-
const prices = result.current.filteredAndSorted.map(sub => sub.price);
109+
110+
const prices = result.current.filteredAndSorted.map((sub) => sub.price);
107111
expect(prices).toEqual([9.99, 15.99, 599.99]);
108112
});
109113

110114
it('should clear all filters', () => {
111115
const { result } = renderHook(() => useFilteredSubscriptions(mockSubscriptions));
112-
116+
113117
// Apply some filters
114118
result.current.filters.setSearchQuery('Netflix');
115119
result.current.filters.setSelectedCategories([SubscriptionCategory.STREAMING]);
116120
result.current.filters.setShowActiveOnly(false);
117-
121+
118122
expect(result.current.hasActiveFilters).toBe(true);
119-
123+
120124
// Clear all filters
121125
result.current.clearAllFilters();
122-
126+
123127
expect(result.current.filteredAndSorted).toHaveLength(3);
124128
expect(result.current.hasActiveFilters).toBe(false);
125129
expect(result.current.activeFilterCount).toBe(0);
@@ -130,14 +134,14 @@ describe('useFilteredSubscriptions', () => {
130134

131135
it('should handle empty subscriptions array', () => {
132136
const { result } = renderHook(() => useFilteredSubscriptions([]));
133-
137+
134138
expect(result.current.filteredAndSorted).toHaveLength(0);
135139
expect(result.current.hasActiveFilters).toBe(false);
136140
});
137141

138142
it('should handle null/undefined subscriptions', () => {
139143
const { result } = renderHook(() => useFilteredSubscriptions(null as any));
140-
144+
141145
expect(result.current.filteredAndSorted).toHaveLength(0);
142146
});
143147
});

‎src/screens/CryptoPaymentScreen.tsx‎

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,9 @@ const CryptoPaymentScreen: React.FC = () => {
162162
setIsLoading(true);
163163
const selectedTokenInfo = availableTokens.find((token) => token.symbol === selectedToken);
164164
const tokenForExecution =
165-
selectedProtocol === 'sablier' ? selectedTokenInfo?.address ?? selectedToken : selectedToken;
165+
selectedProtocol === 'sablier'
166+
? (selectedTokenInfo?.address ?? selectedToken)
167+
: selectedToken;
166168

167169
const startTime = Math.floor(Date.now() / 1000);
168170
const stopTime = startTime + 30 * 24 * 60 * 60;
@@ -232,25 +234,25 @@ const CryptoPaymentScreen: React.FC = () => {
232234
</Text>
233235
</View>
234236

235-
{!isOnline && (
236-
<Card variant="elevated" padding="large">
237-
<Text style={styles.offlineTitle}>Offline mode enabled</Text>
238-
<Text style={styles.offlineText}>
239-
Transactions are queued locally and sent automatically when your connection returns.
240-
</Text>
241-
</Card>
242-
)}
243-
244-
{pendingCount > 0 && (
245-
<Card variant="elevated" padding="large">
246-
<Text style={styles.pendingTitle}>Pending transactions: {pendingCount}</Text>
247-
<Text style={styles.pendingText}>
248-
{isQueueProcessing
249-
? 'Processing queued transactions now.'
250-
: 'Waiting for connectivity to process queued transactions.'}
251-
</Text>
252-
</Card>
253-
)}
237+
{!isOnline && (
238+
<Card variant="elevated" padding="large">
239+
<Text style={styles.offlineTitle}>Offline mode enabled</Text>
240+
<Text style={styles.offlineText}>
241+
Transactions are queued locally and sent automatically when your connection returns.
242+
</Text>
243+
</Card>
244+
)}
245+
246+
{pendingCount > 0 && (
247+
<Card variant="elevated" padding="large">
248+
<Text style={styles.pendingTitle}>Pending transactions: {pendingCount}</Text>
249+
<Text style={styles.pendingText}>
250+
{isQueueProcessing
251+
? 'Processing queued transactions now.'
252+
: 'Waiting for connectivity to process queued transactions.'}
253+
</Text>
254+
</Card>
255+
)}
254256

255257
{/* Token Selection */}
256258
<Card variant="elevated" padding="large">

‎src/screens/SubscriptionDetailScreen.tsx‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -279,6 +279,59 @@ const SubscriptionDetailScreen: React.FC = () => {
279279
</Card>
280280
)}
281281

282+
{/* Gas Tracking Section */}
283+
<Card style={styles.statusCard}>
284+
<Text style={styles.sectionTitle}>Gas Budget Tracking</Text>
285+
<View style={styles.priceRow}>
286+
<View style={styles.priceItem}>
287+
<Text style={styles.priceLabel}>Avg Gas Cost</Text>
288+
<Text style={styles.priceValue}>
289+
{subscription.chargeCount && subscription.chargeCount > 0
290+
? (subscription.totalGasSpent! / subscription.chargeCount).toFixed(4)
291+
: '0.0000'}{' '}
292+
XLM
293+
</Text>
294+
</View>
295+
<View style={styles.priceItem}>
296+
<Text style={styles.priceLabel}>Total Gas Spent</Text>
297+
<Text style={styles.priceValue}>
298+
{subscription.totalGasSpent?.toFixed(4) || '0.0000'} XLM
299+
</Text>
300+
</View>
301+
</View>
302+
303+
<View style={styles.nextBillingRow}>
304+
<View
305+
style={{
306+
flexDirection: 'row',
307+
justifyContent: 'space-between',
308+
alignItems: 'center',
309+
}}>
310+
<Text style={styles.priceLabel}>Gas Budget per Charge</Text>
311+
<Text style={[styles.priceValue, { fontSize: 16 }]}>
312+
{subscription.gasBudget?.toFixed(4) || '0.0500'} XLM
313+
</Text>
314+
</View>
315+
</View>
316+
317+
{subscription.lastGasCost &&
318+
subscription.chargeCount &&
319+
subscription.chargeCount > 1 &&
320+
subscription.lastGasCost >
321+
(subscription.totalGasSpent! / subscription.chargeCount) * 1.5 && (
322+
<View
323+
style={[
324+
styles.statusBadge,
325+
styles.statusInactive,
326+
{ marginTop: spacing.md, backgroundColor: colors.error + '20' },
327+
]}>
328+
<Text style={[styles.statusText, { color: colors.error }]}>
329+
⚠️ Gas cost spike detected! ({subscription.lastGasCost.toFixed(4)} XLM)
330+
</Text>
331+
</View>
332+
)}
333+
</Card>
334+
282335
{/* Actions */}
283336
<View style={styles.actionsContainer}>
284337
<Button

‎src/services/walletService.ts‎

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,11 @@ export class WalletServiceManager {
164164
});
165165

166166
// Get USDC balance if on supported chains
167-
if (chainId === CHAIN_IDS.ETHEREUM || chainId === CHAIN_IDS.POLYGON || chainId === CHAIN_IDS.ARBITRUM) {
167+
if (
168+
chainId === CHAIN_IDS.ETHEREUM ||
169+
chainId === CHAIN_IDS.POLYGON ||
170+
chainId === CHAIN_IDS.ARBITRUM
171+
) {
168172
const usdcAddress = getContractAddress(chainId, 'usdc');
169173
if (!usdcAddress) {
170174
return balances;
@@ -193,12 +197,12 @@ export class WalletServiceManager {
193197
}
194198

195199
async estimateGas(
196-
from: string,
197-
to: string,
198-
value: string,
199-
chainId: number,
200-
userGasLimitOverride?: string
201-
): Promise<GasEstimate> {
200+
from: string,
201+
to: string,
202+
value: string,
203+
chainId: number,
204+
userGasLimitOverride?: string
205+
): Promise<GasEstimate> {
202206
const provider = this.getProvider(chainId);
203207

204208
// Use getFeeData for EIP-1559 support
@@ -217,7 +221,10 @@ export class WalletServiceManager {
217221
value: ethers.utils.parseEther(value || '0'),
218222
});
219223
// Network-specific buffer: higher for Polygon due to congestion variability
220-
const bufferMultiplier = chainId === CHAIN_IDS.POLYGON ? CRYPTO_CONSTANTS.POLYGON_GAS_BUFFER_MULTIPLIER : CRYPTO_CONSTANTS.DEFAULT_GAS_BUFFER_MULTIPLIER;
224+
const bufferMultiplier =
225+
chainId === CHAIN_IDS.POLYGON
226+
? CRYPTO_CONSTANTS.POLYGON_GAS_BUFFER_MULTIPLIER
227+
: CRYPTO_CONSTANTS.DEFAULT_GAS_BUFFER_MULTIPLIER;
221228
gasLimit = estimated.mul(bufferMultiplier).div(100);
222229
} catch (err) {
223230
console.warn('Gas estimation failed, using safe fallback:', err);

‎src/store/subscriptionStore.ts‎

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -264,9 +264,20 @@ export const useSubscriptionStore = create<SubscriptionState>()(
264264

265265
if (outcome === 'success') {
266266
const next = advanceBillingDate(new Date(sub.nextBillingDate), sub.billingCycle);
267+
const simulatedGas = 0.01 + Math.random() * 0.005; // Simulate 0.01 - 0.015 XLM gas
267268
set((state) => ({
268269
subscriptions: state.subscriptions.map((s) =>
269-
s.id === id ? { ...s, nextBillingDate: next, updatedAt: new Date() } : s
270+
s.id === id
271+
? {
272+
...s,
273+
nextBillingDate: next,
274+
updatedAt: new Date(),
275+
totalGasSpent: (s.totalGasSpent || 0) + simulatedGas,
276+
chargeCount: (s.chargeCount || 0) + 1,
277+
lastGasCost: simulatedGas,
278+
gasBudget: s.gasBudget || 0.05,
279+
}
280+
: s
270281
),
271282
}));
272283
get().calculateStats();
@@ -311,14 +322,17 @@ export const useSubscriptionStore = create<SubscriptionState>()(
311322
const totalMonthlySpend = activeSubs.reduce((total, sub) => {
312323
if (sub.billingCycle === 'monthly') return total + sub.price;
313324
if (sub.billingCycle === 'yearly') return total + sub.price / 12;
314-
if (sub.billingCycle === 'weekly') return total + sub.price * BILLING_CONVERSIONS.WEEKS_PER_MONTH;
325+
if (sub.billingCycle === 'weekly')
326+
return total + sub.price * BILLING_CONVERSIONS.WEEKS_PER_MONTH;
315327
return total + sub.price;
316328
}, 0);
317329

318330
const totalYearlySpend = activeSubs.reduce((total, sub) => {
319331
if (sub.billingCycle === 'yearly') return total + sub.price;
320-
if (sub.billingCycle === 'monthly') return total + sub.price * BILLING_CONVERSIONS.MONTHS_PER_YEAR;
321-
if (sub.billingCycle === 'weekly') return total + sub.price * BILLING_CONVERSIONS.WEEKS_PER_YEAR;
332+
if (sub.billingCycle === 'monthly')
333+
return total + sub.price * BILLING_CONVERSIONS.MONTHS_PER_YEAR;
334+
if (sub.billingCycle === 'weekly')
335+
return total + sub.price * BILLING_CONVERSIONS.WEEKS_PER_YEAR;
322336
return total + sub.price * BILLING_CONVERSIONS.MONTHS_PER_YEAR;
323337
}, 0);
324338

@@ -330,12 +344,18 @@ export const useSubscriptionStore = create<SubscriptionState>()(
330344
{} as Record<string, number>
331345
);
332346

347+
const totalGasSpent = activeSubs.reduce(
348+
(total, sub) => total + (sub.totalGasSpent || 0),
349+
0
350+
);
351+
333352
set({
334353
stats: {
335354
totalActive: activeSubs.length,
336355
totalMonthlySpend,
337356
totalYearlySpend,
338357
categoryBreakdown,
358+
totalGasSpent,
339359
},
340360
});
341361
},

0 commit comments

Comments
 (0)