Skip to content

Commit

Permalink
removes balance_* from ttl and storages
Browse files Browse the repository at this point in the history
  • Loading branch information
@gangov
gangov committed Oct 29, 2024
1 parent 6f62036 commit ada7f8b
Show file tree
Hide file tree
Showing 5 changed files with 47 additions and 53 deletions.
26 changes: 12 additions & 14 deletions contracts/pool/src/storage.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,8 +180,6 @@ pub struct SimulateReverseSwapResponse {
}

pub mod utils {
use phoenix::ttl::{BALANCE_BUMP_AMOUNT, BALANCE_LIFETIME_THRESHOLD};

use super::*;

pub fn deploy_token_contract(
Expand Down Expand Up @@ -221,26 +219,26 @@ pub mod utils {
e.storage().persistent().set(&DataKey::TotalShares, &amount);
e.storage().persistent().extend_ttl(
&DataKey::TotalShares,
BALANCE_LIFETIME_THRESHOLD,
BALANCE_BUMP_AMOUNT,
PERSISTENT_LIFETIME_THRESHOLD,
PERSISTENT_BUMP_AMOUNT,
);
}

pub fn save_pool_balance_a(e: &Env, amount: i128) {
e.storage().persistent().set(&DataKey::ReserveA, &amount);
e.storage().persistent().extend_ttl(
&DataKey::ReserveA,
BALANCE_LIFETIME_THRESHOLD,
BALANCE_BUMP_AMOUNT,
PERSISTENT_LIFETIME_THRESHOLD,
PERSISTENT_BUMP_AMOUNT,
);
}

pub fn save_pool_balance_b(e: &Env, amount: i128) {
e.storage().persistent().set(&DataKey::ReserveB, &amount);
e.storage().persistent().extend_ttl(
&DataKey::ReserveB,
BALANCE_LIFETIME_THRESHOLD,
BALANCE_BUMP_AMOUNT,
PERSISTENT_LIFETIME_THRESHOLD,
PERSISTENT_BUMP_AMOUNT,
);
}

Expand Down Expand Up @@ -276,8 +274,8 @@ pub mod utils {
let total_shares = e.storage().persistent().get(&DataKey::TotalShares).unwrap();
e.storage().persistent().extend_ttl(
&DataKey::TotalShares,
BALANCE_LIFETIME_THRESHOLD,
BALANCE_BUMP_AMOUNT,
PERSISTENT_LIFETIME_THRESHOLD,
PERSISTENT_BUMP_AMOUNT,
);

total_shares
Expand All @@ -286,8 +284,8 @@ pub mod utils {
let balance_a = e.storage().persistent().get(&DataKey::ReserveA).unwrap();
e.storage().persistent().extend_ttl(
&DataKey::ReserveA,
BALANCE_LIFETIME_THRESHOLD,
BALANCE_BUMP_AMOUNT,
PERSISTENT_LIFETIME_THRESHOLD,
PERSISTENT_BUMP_AMOUNT,
);

balance_a
Expand All @@ -297,8 +295,8 @@ pub mod utils {
let balance_b = e.storage().persistent().get(&DataKey::ReserveB).unwrap();
e.storage().persistent().extend_ttl(
&DataKey::ReserveB,
BALANCE_LIFETIME_THRESHOLD,
BALANCE_BUMP_AMOUNT,
PERSISTENT_LIFETIME_THRESHOLD,
PERSISTENT_BUMP_AMOUNT,
);

balance_b
Expand Down
13 changes: 7 additions & 6 deletions contracts/pool_stable/src/storage.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,8 @@ pub struct SimulateReverseSwapResponse {
}

pub mod utils {
use phoenix::ttl::{BALANCE_BUMP_AMOUNT, BALANCE_LIFETIME_THRESHOLD};

use phoenix::ttl::{INSTANCE_BUMP_AMOUNT, INSTANCE_LIFETIME_THRESHOLD};

use super::*;

Expand Down Expand Up @@ -252,21 +253,21 @@ pub mod utils {
e.storage().instance().set(&DataKey::TotalShares, &amount);
e.storage()
.instance()
.extend_ttl(BALANCE_LIFETIME_THRESHOLD, BALANCE_BUMP_AMOUNT);
.extend_ttl(INSTANCE_LIFETIME_THRESHOLD, INSTANCE_BUMP_AMOUNT);
}

pub fn save_pool_balance_a(e: &Env, amount: i128) {
e.storage().instance().set(&DataKey::ReserveA, &amount);
e.storage()
.instance()
.extend_ttl(BALANCE_LIFETIME_THRESHOLD, BALANCE_BUMP_AMOUNT);
.extend_ttl(INSTANCE_LIFETIME_THRESHOLD, INSTANCE_BUMP_AMOUNT);
}

pub fn save_pool_balance_b(e: &Env, amount: i128) {
e.storage().instance().set(&DataKey::ReserveB, &amount);
e.storage()
.instance()
.extend_ttl(BALANCE_LIFETIME_THRESHOLD, BALANCE_BUMP_AMOUNT);
.extend_ttl(INSTANCE_LIFETIME_THRESHOLD, INSTANCE_BUMP_AMOUNT);
}

pub fn mint_shares(e: &Env, share_token: &Address, to: &Address, amount: i128) {
Expand Down Expand Up @@ -299,15 +300,15 @@ pub mod utils {
let total_shares = e.storage().instance().get(&DataKey::TotalShares).unwrap();
e.storage()
.instance()
.extend_ttl(BALANCE_LIFETIME_THRESHOLD, BALANCE_BUMP_AMOUNT);
.extend_ttl(INSTANCE_LIFETIME_THRESHOLD, INSTANCE_BUMP_AMOUNT);

total_shares
}
pub fn get_pool_balance_a(e: &Env) -> i128 {
let balance_a = e.storage().instance().get(&DataKey::ReserveA).unwrap();
e.storage()
.instance()
.extend_ttl(BALANCE_LIFETIME_THRESHOLD, BALANCE_BUMP_AMOUNT);
.extend_ttl(INSTANCE_LIFETIME_THRESHOLD, INSTANCE_BUMP_AMOUNT);

balance_a
}
Expand Down
33 changes: 16 additions & 17 deletions contracts/stake/src/storage.rs
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
use phoenix::ttl::{
BALANCE_BUMP_AMOUNT, BALANCE_LIFETIME_THRESHOLD, PERSISTENT_BUMP_AMOUNT,
PERSISTENT_LIFETIME_THRESHOLD,
};
use phoenix::ttl::{PERSISTENT_BUMP_AMOUNT, PERSISTENT_LIFETIME_THRESHOLD};
use soroban_sdk::{contracttype, symbol_short, Address, Env, Symbol, Vec};

use crate::stake_rewards_contract;
Expand Down Expand Up @@ -83,8 +80,8 @@ pub fn get_stakes(env: &Env, key: &Address) -> BondingInfo {
env.storage().persistent().has(&key).then(|| {
env.storage().persistent().extend_ttl(
&key,
BALANCE_LIFETIME_THRESHOLD,
BALANCE_BUMP_AMOUNT,
PERSISTENT_LIFETIME_THRESHOLD,
PERSISTENT_BUMP_AMOUNT,
);
});

Expand All @@ -93,9 +90,11 @@ pub fn get_stakes(env: &Env, key: &Address) -> BondingInfo {

pub fn save_stakes(env: &Env, key: &Address, bonding_info: &BondingInfo) {
env.storage().persistent().set(key, bonding_info);
env.storage()
.persistent()
.extend_ttl(&key, BALANCE_LIFETIME_THRESHOLD, BALANCE_BUMP_AMOUNT);
env.storage().persistent().extend_ttl(
&key,
PERSISTENT_LIFETIME_THRESHOLD,
PERSISTENT_BUMP_AMOUNT,
);
}

pub mod utils {
Expand Down Expand Up @@ -161,8 +160,8 @@ pub mod utils {
e.storage().persistent().set(&DataKey::TotalStaked, &0i128);
e.storage().persistent().extend_ttl(
&DataKey::TotalStaked,
BALANCE_LIFETIME_THRESHOLD,
BALANCE_BUMP_AMOUNT,
PERSISTENT_LIFETIME_THRESHOLD,
PERSISTENT_BUMP_AMOUNT,
);
}

Expand All @@ -174,8 +173,8 @@ pub mod utils {

e.storage().persistent().extend_ttl(
&DataKey::TotalStaked,
BALANCE_LIFETIME_THRESHOLD,
BALANCE_BUMP_AMOUNT,
PERSISTENT_LIFETIME_THRESHOLD,
PERSISTENT_BUMP_AMOUNT,
);
}

Expand All @@ -187,8 +186,8 @@ pub mod utils {

e.storage().persistent().extend_ttl(
&DataKey::TotalStaked,
BALANCE_LIFETIME_THRESHOLD,
BALANCE_BUMP_AMOUNT,
PERSISTENT_LIFETIME_THRESHOLD,
PERSISTENT_BUMP_AMOUNT,
);
}

Expand All @@ -200,8 +199,8 @@ pub mod utils {
.unwrap();
env.storage().persistent().extend_ttl(
&DataKey::TotalStaked,
BALANCE_LIFETIME_THRESHOLD,
BALANCE_BUMP_AMOUNT,
PERSISTENT_LIFETIME_THRESHOLD,
PERSISTENT_BUMP_AMOUNT,
);

total_staked
Expand Down
25 changes: 12 additions & 13 deletions contracts/vesting/src/storage.rs
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
use curve::Curve;
use phoenix::ttl::{
BALANCE_BUMP_AMOUNT, BALANCE_LIFETIME_THRESHOLD, PERSISTENT_BUMP_AMOUNT,
PERSISTENT_LIFETIME_THRESHOLD,
};
use phoenix::ttl::{PERSISTENT_BUMP_AMOUNT, PERSISTENT_LIFETIME_THRESHOLD};
use soroban_sdk::{
contracttype, log, panic_with_error, vec, Address, ConversionError, Env, String, TryFromVal,
Val, Vec,
Expand Down Expand Up @@ -125,8 +122,8 @@ pub fn save_vesting(env: &Env, address: &Address, vesting_info: &VestingInfo) {
env.storage().persistent().set(&vesting_key, vesting_info);
env.storage().persistent().extend_ttl(
&vesting_key,
BALANCE_LIFETIME_THRESHOLD,
BALANCE_BUMP_AMOUNT,
PERSISTENT_LIFETIME_THRESHOLD,
PERSISTENT_BUMP_AMOUNT,
);
}

Expand All @@ -138,8 +135,8 @@ pub fn update_vesting(env: &Env, address: &Address, index: u64, vesting_info: &V
env.storage().persistent().set(&vesting_key, vesting_info);
env.storage().persistent().extend_ttl(
&vesting_key,
BALANCE_LIFETIME_THRESHOLD,
BALANCE_BUMP_AMOUNT,
PERSISTENT_LIFETIME_THRESHOLD,
PERSISTENT_BUMP_AMOUNT,
);
}

Expand All @@ -154,8 +151,8 @@ pub fn get_vesting(env: &Env, recipient: &Address, index: u64) -> VestingInfo {
});
env.storage().persistent().extend_ttl(
&vesting_key,
BALANCE_LIFETIME_THRESHOLD,
BALANCE_BUMP_AMOUNT,
PERSISTENT_LIFETIME_THRESHOLD,
PERSISTENT_BUMP_AMOUNT,
);

vesting_info
Expand All @@ -176,8 +173,8 @@ pub fn get_all_vestings(env: &Env, address: &Address) -> Vec<VestingInfo> {
index += 1;
env.storage().persistent().extend_ttl(
&vesting_key,
BALANCE_LIFETIME_THRESHOLD,
BALANCE_BUMP_AMOUNT,
PERSISTENT_LIFETIME_THRESHOLD,
PERSISTENT_BUMP_AMOUNT,
);
} else {
break;
Expand All @@ -197,10 +194,12 @@ pub fn save_minter(env: &Env, minter: &MinterInfo) {

#[cfg(feature = "minter")]
pub fn get_minter(env: &Env) -> Option<MinterInfo> {
use phoenix::ttl::{INSTANCE_BUMP_AMOUNT, INSTANCE_LIFETIME_THRESHOLD};

let minter_info = env.storage().instance().get(&DataKey::Minter);
env.storage()
.instance()
.extend_ttl(BALANCE_LIFETIME_THRESHOLD, BALANCE_BUMP_AMOUNT);
.extend_ttl(INSTANCE_LIFETIME_THRESHOLD, INSTANCE_BUMP_AMOUNT);

minter_info
}
Expand Down
3 changes: 0 additions & 3 deletions packages/phoenix/src/ttl.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,3 @@ pub const INSTANCE_LIFETIME_THRESHOLD: u32 = INSTANCE_BUMP_AMOUNT - DAY_IN_LEDGE

pub const PERSISTENT_BUMP_AMOUNT: u32 = 30 * DAY_IN_LEDGERS;
pub const PERSISTENT_LIFETIME_THRESHOLD: u32 = PERSISTENT_BUMP_AMOUNT - DAY_IN_LEDGERS;

pub const BALANCE_BUMP_AMOUNT: u32 = 30 * DAY_IN_LEDGERS;
pub const BALANCE_LIFETIME_THRESHOLD: u32 = BALANCE_BUMP_AMOUNT - DAY_IN_LEDGERS;

0 comments on commit ada7f8b

Please sign in to comment.