Skip to content

fix(globe-wallet): remove SpendLimit/DailySpent when removing asset (#89) #109

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ZacLou wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(globe-wallet): remove SpendLimit/DailySpent when removing asset (#89) #109

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
40 changes: 40 additions & 0 deletions contracts/globe-wallet/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1133,6 +1133,14 @@ impl GlobeWallet {
env.storage()
.persistent()
.set(&DataKey::UserAssets(user.clone()), &new_assets);
// Clean up the per-asset spend-limit state so re-adding the asset later
// starts fresh and persistent storage does not grow unbounded.
env.storage()
.persistent()
.remove(&DataKey::SpendLimit(user.clone(), asset_code.clone()));
env.storage()
.persistent()
.remove(&DataKey::DailySpent(user.clone(), asset_code.clone()));
env.storage().persistent().extend_ttl(
&DataKey::UserAssets(user.clone()),
PERSISTENT_TTL_THRESHOLD,
Expand Down Expand Up @@ -1775,6 +1783,38 @@ mod tests {
assert_eq!(assets.get(0).unwrap().code, String::from_str(&env, "USDC"));
}

#[test]
fn test_remove_asset_clears_spend_limit_and_daily_spent() {
let (env, _cid, _admin, client) = setup();
let user = Address::generate(&env);
let code = String::from_str(&env, "USDC");
client.add_asset(&user, &usdc(&env));
client.set_spend_limit(&user, &code, &500_i128);
client.record_spend(&user, &code, &200_i128);
client.remove_asset(&user, &code);
assert_eq!(client.get_assets(&user).len(), 0);
// Spend limit should reset to default (0 = unlimited).
assert_eq!(client.get_spend_limit(&user, &code), 0);
// Re-adding the same asset should start with a fresh, unconfigured limit.
client.add_asset(&user, &usdc(&env));
assert_eq!(client.get_spend_limit(&user, &code), 0);
}

#[test]
fn test_remove_asset_keeps_other_asset_limits_intact() {
let (env, _cid, _admin, client) = setup();
let user = Address::generate(&env);
let usdc_code = String::from_str(&env, "USDC");
let xlm_code = String::from_str(&env, "XLM");
client.add_asset(&user, &usdc(&env));
client.add_asset(&user, &xlm(&env));
client.set_spend_limit(&user, &usdc_code, &500_i128);
client.set_spend_limit(&user, &xlm_code, &1_000_i128);
client.remove_asset(&user, &usdc_code);
assert_eq!(client.get_spend_limit(&user, &usdc_code), 0);
assert_eq!(client.get_spend_limit(&user, &xlm_code), 1_000);
}

#[test]
fn test_remove_nonexistent_asset_fails() {
let (env, _cid, _admin, client) = setup();
Expand Down