Merge pull request #385 from Phoenix-Protocol-Group/stake-every-day-d…

…istribution

Stake every day distribution - broken merge

contracts/factory/src/contract.rs

@@ -1,9 +1,10 @@
 use crate::{
     error::ContractError,
     storage::{
-        get_config, get_lp_vec, is_initialized, save_config, save_lp_vec,
-        save_lp_vec_with_tuple_as_key, set_initialized, Asset, Config, LiquidityPoolInfo,
-        LpPortfolio, PairTupleKey, StakePortfolio, StakedResponse, UserPortfolio,
+        get_config, get_lp_vec, get_stable_wasm_hash, is_initialized, save_config, save_lp_vec,
+        save_lp_vec_with_tuple_as_key, save_stable_wasm_hash, set_initialized, Asset, Config,
+        LiquidityPoolInfo, LpPortfolio, PairTupleKey, StakePortfolio, StakedResponse,
+        UserPortfolio,
     },
     utils::{deploy_and_initialize_multihop_contract, deploy_lp_contract},
 };
@@ -33,7 +34,6 @@ pub trait FactoryTrait {
         lp_wasm_hash: BytesN<32>,
         stable_wasm_hash: BytesN<32>,
         stake_wasm_hash: BytesN<32>,
-        stake_rewards_wasm_hash: BytesN<32>,
         token_wasm_hash: BytesN<32>,
         whitelisted_accounts: Vec<Address>,
         lp_token_decimals: u32,
@@ -91,7 +91,6 @@ impl FactoryTrait for Factory {
         lp_wasm_hash: BytesN<32>,
         stable_wasm_hash: BytesN<32>,
         stake_wasm_hash: BytesN<32>,
-        stake_rewards_wasm_hash: BytesN<32>,
         token_wasm_hash: BytesN<32>,
         whitelisted_accounts: Vec<Address>,
         lp_token_decimals: u32,
@@ -120,14 +119,13 @@ impl FactoryTrait for Factory {
                 admin: admin.clone(),
                 multihop_address,
                 lp_wasm_hash,
-                stable_wasm_hash,
                 stake_wasm_hash,
-                stake_rewards_wasm_hash,
                 token_wasm_hash,
                 whitelisted_accounts,
                 lp_token_decimals,
             },
         );
+        save_stable_wasm_hash(&env, stable_wasm_hash);
 
         save_lp_vec(&env, Vec::new(&env));
 
@@ -167,11 +165,10 @@ impl FactoryTrait for Factory {
         let config = get_config(&env);
         let stake_wasm_hash = config.stake_wasm_hash;
         let token_wasm_hash = config.token_wasm_hash;
-        let stake_rewards_wasm_hash = config.stake_rewards_wasm_hash;
 
         let pool_hash = match pool_type {
             PoolType::Xyk => config.lp_wasm_hash,
-            PoolType::Stable => config.stable_wasm_hash,
+            PoolType::Stable => get_stable_wasm_hash(&env),
         };
 
         let lp_contract_address = deploy_lp_contract(
@@ -195,7 +192,6 @@ impl FactoryTrait for Factory {
         let mut init_fn_args: Vec<Val> = (
             stake_wasm_hash,
             token_wasm_hash,
-            stake_rewards_wasm_hash,
             lp_init_info.clone(),
             factory_addr,
             config.lp_token_decimals,
@@ -464,11 +460,12 @@ impl FactoryTrait for Factory {
 #[contractimpl]
 impl Factory {
     #[allow(dead_code)]
-    pub fn update(env: Env, new_wasm_hash: BytesN<32>) {
+    pub fn update(env: Env, new_wasm_hash: BytesN<32>, new_stable_pool_hash: BytesN<32>) {
         let admin = get_config(&env).admin;
         admin.require_auth();
 
         env.deployer().update_current_contract_wasm(new_wasm_hash);
+        save_stable_wasm_hash(&env, new_stable_pool_hash);
     }
 }
 

contracts/factory/src/storage.rs

@@ -1,5 +1,7 @@
 use phoenix::ttl::{PERSISTENT_BUMP_AMOUNT, PERSISTENT_LIFETIME_THRESHOLD};
-use soroban_sdk::{contracttype, Address, BytesN, ConversionError, Env, TryFromVal, Val, Vec};
+use soroban_sdk::{
+    contracttype, symbol_short, Address, BytesN, ConversionError, Env, Symbol, TryFromVal, Val, Vec,
+};
 
 #[derive(Clone, Copy)]
 #[repr(u32)]
@@ -30,14 +32,39 @@ pub struct Config {
     pub admin: Address,
     pub multihop_address: Address,
     pub lp_wasm_hash: BytesN<32>,
-    pub stable_wasm_hash: BytesN<32>,
     pub stake_wasm_hash: BytesN<32>,
     pub token_wasm_hash: BytesN<32>,
-    pub stake_rewards_wasm_hash: BytesN<32>,
     pub whitelisted_accounts: Vec<Address>,
     pub lp_token_decimals: u32,
 }
 
+const STABLE_WASM_HASH: Symbol = symbol_short!("stabwasm");
+
+pub fn save_stable_wasm_hash(env: &Env, hash: BytesN<32>) {
+    env.storage().persistent().set(&STABLE_WASM_HASH, &hash);
+    env.storage().persistent().extend_ttl(
+        &STABLE_WASM_HASH,
+        PERSISTENT_LIFETIME_THRESHOLD,
+        PERSISTENT_BUMP_AMOUNT,
+    )
+}
+
+pub fn get_stable_wasm_hash(env: &Env) -> BytesN<32> {
+    let hash = env
+        .storage()
+        .persistent()
+        .get(&STABLE_WASM_HASH)
+        .expect("Stable wasm hash not set");
+
+    env.storage().persistent().extend_ttl(
+        &STABLE_WASM_HASH,
+        PERSISTENT_LIFETIME_THRESHOLD,
+        PERSISTENT_BUMP_AMOUNT,
+    );
+
+    hash
+}
+
 #[contracttype]
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub struct UserPortfolio {

contracts/factory/src/tests.rs

@@ -1,4 +1,3 @@
-use setup::install_stake_rewards_wasm;
 use soroban_sdk::{testutils::Address as _, vec, Address, Env};
 
 use self::setup::{
@@ -24,7 +23,6 @@ fn test_deploy_factory_twice_should_fail() {
     let lp_wasm_hash = install_lp_contract(&env);
     let stable_wasm_hash = install_stable_lp(&env);
     let stake_wasm_hash = install_stake_wasm(&env);
-    let stake_rewards_wasm_hash = install_stake_rewards_wasm(&env);
     let token_wasm_hash = install_token_wasm(&env);
 
     let factory = deploy_factory_contract(&env, admin.clone());
@@ -35,7 +33,6 @@ fn test_deploy_factory_twice_should_fail() {
         &lp_wasm_hash,
         &stable_wasm_hash,
         &stake_wasm_hash,
-        &stake_rewards_wasm_hash,
         &token_wasm_hash,
         &vec![&env, auth_user.clone()],
         &10u32,
@@ -46,7 +43,6 @@ fn test_deploy_factory_twice_should_fail() {
         &lp_wasm_hash,
         &stable_wasm_hash,
         &stake_wasm_hash,
-        &stake_rewards_wasm_hash,
         &token_wasm_hash,
         &vec![&env, auth_user.clone()],
         &10u32,

contracts/factory/src/tests/config.rs

@@ -1,6 +1,6 @@
 use super::setup::{
     deploy_factory_contract, install_lp_contract, install_multihop_wasm, install_stable_lp,
-    install_stake_rewards_wasm, install_stake_wasm, install_token_wasm, lp_contract,
+    install_stake_wasm, install_token_wasm, lp_contract,
 };
 use crate::{
     contract::{Factory, FactoryClient},
@@ -98,7 +98,6 @@ fn factory_successfully_inits_lp() {
             token_a: token1,
             token_b: token2,
             total_fee_bps: 0,
-            default_slippage_bps: 100,
         }
     );
 }
@@ -242,7 +241,6 @@ fn factory_fails_to_init_lp_when_no_whitelisted_accounts() {
     let lp_wasm_hash = install_lp_contract(&env);
     let stable_wasm_hash = install_stable_lp(&env);
     let stake_wasm_hash = install_stake_wasm(&env);
-    let stake_rewards_wasm_hash = install_stake_rewards_wasm(&env);
     let token_wasm_hash = install_token_wasm(&env);
 
     factory.initialize(
@@ -251,7 +249,6 @@ fn factory_fails_to_init_lp_when_no_whitelisted_accounts() {
         &lp_wasm_hash,
         &stable_wasm_hash,
         &stake_wasm_hash,
-        &stake_rewards_wasm_hash,
         &token_wasm_hash,
         &whitelisted_accounts,
         &10u32,
@@ -494,7 +491,6 @@ fn factory_create_xyk_pool_with_amp_parameter_should_still_succeed() {
             token_a: token1.address,
             token_b: token2.address,
             total_fee_bps: 0,
-            default_slippage_bps: 100,
         }
     );
 }

contracts/factory/src/tests/queries.rs

@@ -34,7 +34,6 @@ pub struct LiquidityPoolConfig {
     /// The maximum amount of spread (in bps) that is tolerated during swap
     pub max_allowed_spread_bps: i64,
     pub max_referral_bps: i64,
-    pub default_slippage_bps: i64,
 }
 
 #[test]

contracts/factory/src/tests/setup.rs

@@ -55,13 +55,6 @@ pub fn install_stake_wasm(env: &Env) -> BytesN<32> {
     env.deployer().upload_contract_wasm(WASM)
 }
 
-pub fn install_stake_rewards_wasm(env: &Env) -> BytesN<32> {
-    soroban_sdk::contractimport!(
-        file = "../../target/wasm32-unknown-unknown/release/phoenix_stake_rewards.wasm"
-    );
-    env.deployer().upload_contract_wasm(WASM)
-}
-
 pub fn deploy_factory_contract<'a>(
     env: &Env,
     admin: impl Into<Option<Address>>,
@@ -74,7 +67,6 @@ pub fn deploy_factory_contract<'a>(
     let lp_wasm_hash = install_lp_contract(env);
     let stable_wasm_hash = install_stable_lp(env);
     let stake_wasm_hash = install_stake_wasm(env);
-    let stake_rewards_wasm_hash = install_stake_rewards_wasm(env);
     let token_wasm_hash = install_token_wasm(env);
 
     factory.initialize(
@@ -83,7 +75,6 @@ pub fn deploy_factory_contract<'a>(
         &lp_wasm_hash,
         &stable_wasm_hash,
         &stake_wasm_hash,
-        &stake_rewards_wasm_hash,
         &token_wasm_hash,
         &whitelisted_accounts,
         &10u32,

contracts/multihop/src/tests/setup.rs

@@ -50,13 +50,6 @@ pub fn install_stake_wasm(env: &Env) -> BytesN<32> {
     env.deployer().upload_contract_wasm(WASM)
 }
 
-pub fn install_stake_rewards_wasm(env: &Env) -> BytesN<32> {
-    soroban_sdk::contractimport!(
-        file = "../../target/wasm32-unknown-unknown/release/phoenix_stake_rewards.wasm"
-    );
-    env.deployer().upload_contract_wasm(WASM)
-}
-
 #[allow(clippy::too_many_arguments)]
 pub fn install_multihop_wasm(env: &Env) -> BytesN<32> {
     soroban_sdk::contractimport!(
@@ -105,7 +98,6 @@ pub fn deploy_and_initialize_factory(env: &Env, admin: Address) -> factory_contr
     let lp_wasm_hash = install_lp_contract(env);
     let stable_wasm_hash = install_stable_lp_contract(env);
     let stake_wasm_hash = install_stake_wasm(env);
-    let stake_rewards_wasm_hash = install_stake_rewards_wasm(env);
     let token_wasm_hash = install_token_wasm(env);
 
     factory_client.initialize(
@@ -114,7 +106,6 @@ pub fn deploy_and_initialize_factory(env: &Env, admin: Address) -> factory_contr
         &lp_wasm_hash,
         &stable_wasm_hash,
         &stake_wasm_hash,
-        &stake_rewards_wasm_hash,
         &token_wasm_hash,
         &whitelisted_accounts,
         &10u32,

contracts/pool/src/contract.rs

@@ -9,7 +9,7 @@ use crate::{
     error::ContractError,
     stake_contract,
     storage::{
-        get_config, save_config,
+        get_config, get_default_slippage_bps, save_config, save_default_slippage_bps,
         utils::{self, get_admin, is_initialized, set_initialized},
         Asset, ComputeSwap, Config, LiquidityPoolInfo, PairType, PoolResponse,
         SimulateReverseSwapResponse, SimulateSwapResponse,
@@ -43,7 +43,6 @@ pub trait LiquidityPoolTrait {
         env: Env,
         stake_wasm_hash: BytesN<32>,
         token_wasm_hash: BytesN<32>,
-        stake_rewards_wasm_hash: BytesN<32>,
         lp_init_info: LiquidityPoolInitInfo,
         factory_addr: Address,
         share_token_decimals: u32,
@@ -113,7 +112,7 @@ pub trait LiquidityPoolTrait {
     );
 
     // Migration entrypoint
-    fn upgrade(e: Env, new_wasm_hash: BytesN<32>);
+    fn upgrade(e: Env, new_wasm_hash: BytesN<32>, new_default_slippage_bps: i64);
 
     // QUERIES
 
@@ -153,7 +152,6 @@ impl LiquidityPoolTrait for LiquidityPool {
         env: Env,
         stake_wasm_hash: BytesN<32>,
         token_wasm_hash: BytesN<32>,
-        stake_rewards_wasm_hash: BytesN<32>,
         lp_init_info: LiquidityPoolInitInfo,
         factory_addr: Address,
         share_token_decimals: u32,
@@ -234,7 +232,6 @@ impl LiquidityPoolTrait for LiquidityPool {
         stake_contract::Client::new(&env, &stake_contract_address).initialize(
             &admin,
             &share_token_address,
-            &stake_rewards_wasm_hash,
             &min_bond,
             &min_reward,
             &manager,
@@ -253,10 +250,10 @@ impl LiquidityPoolTrait for LiquidityPool {
             max_allowed_slippage_bps,
             max_allowed_spread_bps,
             max_referral_bps,
-            default_slippage_bps,
         };
 
         save_config(&env, config);
+        save_default_slippage_bps(&env, default_slippage_bps);
 
         utils::save_admin(&env, admin);
         utils::save_total_shares(&env, 0);
@@ -322,7 +319,7 @@ impl LiquidityPoolTrait for LiquidityPool {
                     min_b,
                     pool_balance_a,
                     pool_balance_b,
-                    Decimal::bps(custom_slippage_bps.unwrap_or(config.default_slippage_bps)),
+                    Decimal::bps(custom_slippage_bps.unwrap_or(get_default_slippage_bps(&env))),
                 )
             }
             // None or invalid amounts are provided
@@ -571,11 +568,12 @@ impl LiquidityPoolTrait for LiquidityPool {
         save_config(&env, config);
     }
 
-    fn upgrade(env: Env, new_wasm_hash: BytesN<32>) {
+    fn upgrade(env: Env, new_wasm_hash: BytesN<32>, new_default_slippage_bps: i64) {
         let admin: Address = utils::get_admin(&env);
         admin.require_auth();
 
         env.deployer().update_current_contract_wasm(new_wasm_hash);
+        save_default_slippage_bps(&env, new_default_slippage_bps);
     }
 
     // Queries
@@ -1365,7 +1363,6 @@ mod tests {
             max_allowed_slippage_bps: 100i64,
             max_allowed_spread_bps: 100i64,
             max_referral_bps: 1_000i64,
-            default_slippage_bps: 100i64,
         };
         split_deposit_based_on_pool_ratio(&env, config, 100, 100, 100, &Address::generate(&env));
     }