Merge pull request #375 from Phoenix-Protocol-Group/stake-rewards/sta…

…ke-calls-stake-rewards-v2

Stake rewards/stake calls stake rewards v2

contracts/factory/src/contract.rs

@@ -30,6 +30,7 @@ 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,
@@ -87,6 +88,7 @@ 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,
@@ -117,6 +119,7 @@ impl FactoryTrait for Factory {
                 lp_wasm_hash,
                 stable_wasm_hash,
                 stake_wasm_hash,
+                stake_rewards_wasm_hash,
                 token_wasm_hash,
                 whitelisted_accounts,
                 lp_token_decimals,
@@ -161,6 +164,7 @@ 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,
@@ -188,6 +192,7 @@ 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,

contracts/factory/src/storage.rs

@@ -32,6 +32,7 @@ pub struct Config {
     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,
 }

contracts/factory/src/tests.rs

@@ -1,3 +1,4 @@
+use setup::install_stake_rewards_wasm;
 use soroban_sdk::{testutils::Address as _, vec, Address, Env};
 
 use self::setup::{
@@ -23,6 +24,7 @@ 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());
@@ -33,6 +35,7 @@ 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,
@@ -43,6 +46,7 @@ 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_wasm, install_token_wasm, lp_contract,
+    install_stake_rewards_wasm, install_stake_wasm, install_token_wasm, lp_contract,
 };
 use crate::{
     contract::{Factory, FactoryClient},
@@ -240,6 +240,7 @@ 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(
@@ -248,6 +249,7 @@ 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,

contracts/factory/src/tests/setup.rs

@@ -55,6 +55,13 @@ 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>>,
@@ -67,6 +74,7 @@ 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(
@@ -75,6 +83,7 @@ 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

@@ -46,6 +46,13 @@ 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!(
@@ -94,6 +101,7 @@ 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(
@@ -102,6 +110,7 @@ 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

@@ -43,6 +43,7 @@ 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,
@@ -152,6 +153,7 @@ 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,
@@ -232,6 +234,7 @@ 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,

contracts/pool/src/tests/config.rs

@@ -3,8 +3,8 @@ use phoenix::utils::{LiquidityPoolInitInfo, StakeInitInfo, TokenInitInfo};
 use soroban_sdk::{testutils::Address as _, Address, Env, String};
 
 use super::setup::{
-    deploy_liquidity_pool_contract, deploy_token_contract, install_new_lp_wasm, install_stake_wasm,
-    install_token_wasm,
+    deploy_liquidity_pool_contract, deploy_token_contract, install_new_lp_wasm,
+    install_stake_rewards_wasm, install_stake_wasm, install_token_wasm,
 };
 use crate::{
     contract::{LiquidityPool, LiquidityPoolClient},
@@ -42,6 +42,7 @@ fn test_initialize_with_bigger_first_token_should_fail() {
     };
     let stake_wasm_hash = install_stake_wasm(&env);
     let token_wasm_hash = install_token_wasm(&env);
+    let stake_reward_wasm_hash = install_stake_rewards_wasm(&env);
 
     let lp_init_info = LiquidityPoolInitInfo {
         admin,
@@ -58,6 +59,7 @@ fn test_initialize_with_bigger_first_token_should_fail() {
     pool.initialize(
         &stake_wasm_hash,
         &token_wasm_hash,
+        &stake_reward_wasm_hash,
         &lp_init_info,
         &Address::generate(&env),
         &10u32,
@@ -475,6 +477,7 @@ fn test_initialize_with_maximum_allowed_swap_fee_bps_over_the_cap_should_fail()
     };
     let stake_wasm_hash = install_stake_wasm(&env);
     let token_wasm_hash = install_token_wasm(&env);
+    let stake_reward_wasm_hash = install_stake_rewards_wasm(&env);
 
     let lp_init_info = LiquidityPoolInitInfo {
         admin,
@@ -491,6 +494,7 @@ fn test_initialize_with_maximum_allowed_swap_fee_bps_over_the_cap_should_fail()
     pool.initialize(
         &stake_wasm_hash,
         &token_wasm_hash,
+        &stake_reward_wasm_hash,
         &lp_init_info,
         &Address::generate(&env),
         &10u32,

contracts/pool/src/tests/setup.rs

@@ -26,6 +26,13 @@ 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_new_lp_wasm(env: &Env) -> BytesN<32> {
     soroban_sdk::contractimport!(
@@ -64,6 +71,7 @@ pub fn deploy_liquidity_pool_contract<'a>(
     };
     let stake_wasm_hash = install_stake_wasm(env);
     let token_wasm_hash = install_token_wasm(env);
+    let stake_reward_wasm_hash = install_stake_rewards_wasm(env);
 
     let lp_init_info = LiquidityPoolInitInfo {
         admin,
@@ -80,6 +88,7 @@ pub fn deploy_liquidity_pool_contract<'a>(
     pool.initialize(
         &stake_wasm_hash,
         &token_wasm_hash,
+        &stake_reward_wasm_hash,
         &lp_init_info,
         &stake_owner,
         &10u32,

contracts/pool/src/tests/stake_deployment.rs

@@ -2,7 +2,9 @@ extern crate std;
 use phoenix::utils::{LiquidityPoolInitInfo, StakeInitInfo, TokenInitInfo};
 use soroban_sdk::{testutils::Address as _, Address, Env, String};
 
-use super::setup::{deploy_liquidity_pool_contract, deploy_token_contract};
+use super::setup::{
+    deploy_liquidity_pool_contract, deploy_token_contract, install_stake_rewards_wasm,
+};
 use crate::{
     stake_contract,
     storage::{Config, PairType},
@@ -101,6 +103,7 @@ fn second_pool_deployment_should_fail() {
 
     let token_wasm_hash = install_token_wasm(&env);
     let stake_wasm_hash = install_stake_wasm(&env);
+    let stake_reward_wasm_hash = install_stake_rewards_wasm(&env);
     let fee_recipient = user;
     let max_allowed_slippage = 5_000i64; // 50% if not specified
     let max_allowed_spread = 500i64; // 5% if not specified
@@ -131,6 +134,7 @@ fn second_pool_deployment_should_fail() {
     pool.initialize(
         &stake_wasm_hash,
         &token_wasm_hash,
+        &stake_reward_wasm_hash,
         &lp_init_info,
         &Address::generate(&env),
         &10u32,
@@ -143,6 +147,7 @@ fn second_pool_deployment_should_fail() {
     pool.initialize(
         &stake_wasm_hash,
         &token_wasm_hash,
+        &stake_reward_wasm_hash,
         &lp_init_info,
         &Address::generate(&env),
         &10u32,

contracts/pool_stable/src/contract.rs

@@ -42,6 +42,7 @@ pub trait StableLiquidityPoolTrait {
         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_decimal: u32,
@@ -145,6 +146,7 @@ impl StableLiquidityPoolTrait for StableLiquidityPool {
         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_decimal: u32,
@@ -226,6 +228,7 @@ impl StableLiquidityPoolTrait for StableLiquidityPool {
         stake_contract::Client::new(&env, &stake_contract_address).initialize(
             &admin,
             &share_token_address,
+            &stake_rewards_wasm_hash,
             &min_bond,
             &min_reward,
             &manager,

contracts/pool_stable/src/tests/setup.rs

@@ -26,6 +26,13 @@ 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 deploy_stable_liquidity_pool_contract<'a>(
     env: &Env,
@@ -59,6 +66,7 @@ pub fn deploy_stable_liquidity_pool_contract<'a>(
 
     let token_wasm_hash = install_token_wasm(env);
     let stake_wasm_hash = install_stake_wasm(env);
+    let stake_rewards_wasm_hash = install_stake_rewards_wasm(env);
 
     let lp_init_info = LiquidityPoolInitInfo {
         admin,
@@ -75,6 +83,7 @@ pub fn deploy_stable_liquidity_pool_contract<'a>(
     pool.initialize(
         &stake_wasm_hash,
         &token_wasm_hash,
+        &stake_rewards_wasm_hash,
         &lp_init_info,
         &factory,
         &10, // LP share decimals, unused

contracts/pool_stable/src/tests/stake_deployment.rs

@@ -2,7 +2,9 @@ extern crate std;
 use phoenix::utils::{LiquidityPoolInitInfo, StakeInitInfo, TokenInitInfo};
 use soroban_sdk::{testutils::Address as _, Address, Env, String};
 
-use super::setup::{deploy_stable_liquidity_pool_contract, deploy_token_contract};
+use super::setup::{
+    deploy_stable_liquidity_pool_contract, deploy_token_contract, install_stake_rewards_wasm,
+};
 use crate::contract::{StableLiquidityPool, StableLiquidityPoolClient};
 use crate::tests::setup::{install_stake_wasm, install_token_wasm};
 use crate::{
@@ -100,6 +102,7 @@ fn second_pool_stable_deployment_should_fail() {
 
     let token_wasm_hash = install_token_wasm(&env);
     let stake_wasm_hash = install_stake_wasm(&env);
+    let stake_reward_wasm_hash = install_stake_rewards_wasm(&env);
     let fee_recipient = user;
     let max_allowed_slippage = 5_000i64; // 50% if not specified
     let max_allowed_spread = 500i64; // 5% if not specified
@@ -133,6 +136,7 @@ fn second_pool_stable_deployment_should_fail() {
     pool.initialize(
         &stake_wasm_hash,
         &token_wasm_hash,
+        &stake_reward_wasm_hash,
         &lp_init_info,
         &factory,
         &10, // LP share decimals, unused
@@ -144,6 +148,7 @@ fn second_pool_stable_deployment_should_fail() {
     pool.initialize(
         &stake_wasm_hash,
         &token_wasm_hash,
+        &stake_reward_wasm_hash,
         &lp_init_info,
         &factory,
         &10, // LP share decimals, unused
@@ -179,6 +184,7 @@ fn pool_stable_initialization_should_fail_with_token_a_bigger_than_token_b() {
 
     let token_wasm_hash = install_token_wasm(&env);
     let stake_wasm_hash = install_stake_wasm(&env);
+    let stake_reward_wasm_hash = install_stake_rewards_wasm(&env);
     let fee_recipient = user;
     let max_allowed_slippage = 5_000i64; // 50% if not specified
     let max_allowed_spread = 500i64; // 5% if not specified
@@ -212,6 +218,7 @@ fn pool_stable_initialization_should_fail_with_token_a_bigger_than_token_b() {
     pool.initialize(
         &stake_wasm_hash,
         &token_wasm_hash,
+        &stake_reward_wasm_hash,
         &lp_init_info,
         &factory,
         &10, // LP share decimals, unused