Soroban sdk upgrade to stable

Cargo.toml

@@ -15,8 +15,8 @@ phoenix = { path = "./packages/phoenix" }
 num-integer = { version = "0.1.45", default-features = false, features = [
     "i128",
 ] }
-soroban-sdk = "21.6.0"
-soroban-token-sdk = "21.6.0"
+soroban-sdk = "21.7.7"
+soroban-token-sdk = "21.7.7"
 test-case = "3.3"
 pretty_assertions = "1.4.0"
 

contracts/factory/src/contract.rs

@@ -1,12 +1,13 @@
 use crate::{
     error::ContractError,
+    stake_contract::StakedResponse,
     storage::{
         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,
+        LiquidityPoolInfo, LpPortfolio, PairTupleKey, StakePortfolio, UserPortfolio,
     },
     utils::{deploy_and_initialize_multihop_contract, deploy_lp_contract},
+    ConvertVec,
 };
 use phoenix::{
     ttl::{INSTANCE_BUMP_AMOUNT, INSTANCE_LIFETIME_THRESHOLD},
@@ -477,7 +478,7 @@ impl FactoryTrait for Factory {
                 if !stake_response.stakes.is_empty() {
                     stake_portfolio.push_back(StakePortfolio {
                         staking_contract: response.pool_response.stake_address,
-                        stakes: stake_response.stakes,
+                        stakes: stake_response.stakes.convert_vec(),
                     })
                 }
             }

contracts/factory/src/lib.rs

@@ -15,3 +15,30 @@ pub mod token_contract {
         file = "../../target/wasm32-unknown-unknown/release/soroban_token_contract.wasm"
     );
 }
+
+#[allow(clippy::too_many_arguments)]
+pub mod stake_contract {
+    soroban_sdk::contractimport!(
+        file = "../../target/wasm32-unknown-unknown/release/phoenix_stake.wasm"
+    );
+}
+
+pub trait ConvertVec<T, U> {
+    fn convert_vec(&self) -> soroban_sdk::Vec<U>;
+}
+
+impl ConvertVec<stake_contract::Stake, storage::Stake> for soroban_sdk::Vec<stake_contract::Stake> {
+    fn convert_vec(&self) -> soroban_sdk::Vec<storage::Stake> {
+        let env = self.env(); // Get the environment
+        let mut result = soroban_sdk::Vec::new(env);
+
+        for stake in self.iter() {
+            result.push_back(storage::Stake {
+                stake: stake.stake,
+                stake_timestamp: stake.stake_timestamp,
+            });
+        }
+
+        result
+    }
+}

contracts/stake/src/tests/bond.rs

@@ -4,14 +4,14 @@ use pretty_assertions::assert_eq;
 use soroban_sdk::{
     symbol_short,
     testutils::{Address as _, AuthorizedFunction, AuthorizedInvocation, Ledger},
-    vec, Address, Env, IntoVal, Symbol,
+    vec, Address, Env, IntoVal, Symbol, Vec,
 };
 
 use super::setup::{deploy_staking_contract, deploy_token_contract};
 
 use crate::{
     contract::{Staking, StakingClient},
-    msg::ConfigResponse,
+    msg::{ConfigResponse, StakedResponse},
     storage::{Config, Stake},
     tests::setup::{ONE_DAY, ONE_WEEK},
 };
@@ -380,9 +380,25 @@ fn pay_rewards_during_unbond() {
         20_000
     );
     assert_eq!(reward_token.balance(&user), 0);
+
+    // we first have to withdraw_rewards _before_ unbonding
+    // as this messes up with the reward calculation
+    // if we unbond first then we get no rewards
+    staking.withdraw_rewards(&user);
+    assert_eq!(reward_token.balance(&user), 20_000);
+
     // user bonded at timestamp 0
     staking.unbond(&user, &staked, &0);
-    assert_eq!(reward_token.balance(&user), 20_000);
+    assert_eq!(lp_token.balance(&staking.address), 0);
+    assert_eq!(lp_token.balance(&user), 9000 + staked);
+    assert_eq!(
+        staking.query_staked(&user),
+        StakedResponse {
+            stakes: Vec::new(&env),
+            total_stake: 0i128,
+            last_reward_time: 6_912_000
+        }
+    );
 }
 
 #[should_panic(

contracts/vesting/Makefile

@@ -7,7 +7,7 @@ test: build
 
 build:
 	$(MAKE) -C ../token build || break;
-	cargo build --target wasm32-unknown-unknown --release
+	cargo build --all-features --target wasm32-unknown-unknown --release
 
 lint: fmt clippy