From 4ef4360668a5c690220bbaf33fd33667c8aeca73 Mon Sep 17 00:00:00 2001
From: esteblock <estebaniglesiasmanriquez@gmail.com>
Date: Tue, 5 Nov 2024 11:34:06 -0300
Subject: [PATCH 01/39] minted shares formula

---
 .../02-contracts/01-vault-contract.md         | 94 ++++++++++++++++++-
 1 file changed, 89 insertions(+), 5 deletions(-)

diff --git a/apps/docs/10-whitepaper/03-the-defindex-approach/02-contracts/01-vault-contract.md b/apps/docs/10-whitepaper/03-the-defindex-approach/02-contracts/01-vault-contract.md
index 47992ad7..f08ec9ba 100644
--- a/apps/docs/10-whitepaper/03-the-defindex-approach/02-contracts/01-vault-contract.md
+++ b/apps/docs/10-whitepaper/03-the-defindex-approach/02-contracts/01-vault-contract.md
@@ -105,14 +105,98 @@ The Emergency Manager has the authority to withdraw assets from the DeFindex in
 ### Management
 Every DeFindex has a manager, who is responsible for managing the DeFindex. The Manager can ebalance the Vault, and invest IDLE funds in strategies. 
 
-### Fee Collection
-The revenues generated by the strategies are collected as shares of the DeFindex. These shares, or dfTokens, are minted whenever a deposit or withdrawal takes place.
+### Fees: Receivers, Structure and Collection
 
-The deployer can set a management fee, which can later be adjusted by the Fee Receiver. Additionally, **palta**labs charges a 0.5% APR on the vault shares.
+**Fee Receivers:** Every DeFindex user will pay a Management Fee for the total amount of funds managed by the DeFindex Vault. These fees will finally be received by two different fee receivers: 
 
-The recommended initial setup suggests a fee of **0.5%-2% APR on these shares**. For example, if a DeFindex has 100 shares and the fee is set at 0.5% APR, the fees collected annually would be 1 share, split as 0.5 for the Fee Receiver and 0.5 for **palta**labs. The **palta**labs fee is defined in the Factory contract.
+1. **DeFindex Protocol Fee Receiver**. For creating the protocol.
+2. **Vault Fee Receiver**. For creating the vault.
 
-These allocations are recalculated and minted whenever a user deposits, withdraws from the DeFindex, or when rebalancing occurs.
+**Fee Structure:**
+The Total Management fee is the sum of **DeFindex Fee** and the **Vault Fee**. This sum can be from 0.5% to 2.5%, and it is defined as follows:
+
+1. **The DeFindex Fee** is fixed for all DeFindex Vaults, and this fee is fixed to 0.5% APR. This fee is fixed in the DeFindex Factory Contract.
+2. **The Vault Fee** is set by the Vault Deployer. The recommended initial setup suggests a fee of **0.5% - 2% APR**. 
+
+**Fee Collection:**
+In order for a vault to collect fees, the DeFindex vault will mint and collect new shares (or dfTokens) whenever a deposit or withdrawal takes place.
+
+**Mathematical Explanation**
+Lets consider $V_0$, total value locked at $t_0$, total shares $s_0$ at $t_0$ and total management fee of $f$. 
+This fee $f$ its considered as APR. 
+
+After one period (one year), new shares  $s_f$ should be minted in order to pay this fee. 
+
+$s_1 = s_0 + s_f$
+
+$V_1 =V_0$ as we consider that no new funds where added
+
+$s_f$ should comply with:
+
+The value of the mited share $\frac{V_0}{s_1} * s_f$ should be equal of the fraction of the total value locked $V_0 * f$
+
+$\frac{V_0}{s_1} * s_f = V_0 * f$ 
+
+so this gets simplified
+
+$s_f = f \cdot s_1 = f \cdot (s_0 + s_f)$
+
+$s_f = \frac{f \cdot s_0}{(1-f)}$
+
+
+
+
+
+**Example:**
+For example, if a Vault has 100 shares and the Vault Fee is set at 0.5% APR, the annually collected fees would be 1 share, splited as 0.5 for the Fee Receiver and 0.5 for the DeFindex Protocol.
+
+total funds:100 (does not change)
+previous shares: 1
+Y≈1.0101
+
+100/(100+Y) *Y = 1 USDC
+total funds/(previous total shars+fee shares) *fee shares = fee rate of total funds
+
+
+
+
+t0 amount0
+t1 amount0 cobra fee por el tiempo (t1-t0) y se suma amount1
+t2 (amount0 y amount 1) cobra fee por el tiempo (t2-t1)
+
+100 shares, 100 USDC, price per share = 100/100 = 1
+
+despues de un año, deposito de 100.
+sin fee: se mintean 100 shares
+new shares: 200, new funds: 200 USDC
+
+con fee: se mintean X shares al depositor, Y shares al fee receiver
+total shares: (100 + X + Y)
+total funds: (200 USDC)
+value of fee shares (Y)
+200/(100+X+Y) *Y = 1 USDC
+200/(100+X+Y) *X = 100 USDC
+X=101.0101
+Y=1.0101
+
+si no se deposita nada
+100/(100+Y) *Y = 1 USDC
+100/(100+X+Y) *X = 100 USDC
+
+
+300/(100+X+Y) *Y = 1 USDC
+300/(100+X+Y) *X = 200 USDC
+
+
+
+
+mint x shares, total new shares = (100+x)
+my value of this is x/(100+x) = 1%
+
+
+101 shares, 1 share is equal to 1/101
+
+These allocations are recalculated and minted whenever a user deposits, withdraws from the DeFindex.
 
 For instance, let's say a DeFindex starts with an initial value of 1 USDC per share and 100 shares (dfTokens). These 100 USDC are invested in a lending protocol offering an 8% APY. The DeFindex also has a 0.5% APR fee. After one year, the investment grows to 108 USDC. Additionally, 1 dfToken is minted as a fee. This means the DeFindex now holds 101 dfTokens backed by 108 USDC, making the price per share approximately 1.07 USDC. As a result, a user holding 100 dfTokens will have a value equivalent to around 107 USDC, while the collected fee will be backed by about 1.07 USDC.
 

From feda583bf5f4ce52356f4697c80e5e28f57acafb Mon Sep 17 00:00:00 2001
From: Matias Poblete <86752543+MattPoblete@users.noreply.github.com>
Date: Tue, 5 Nov 2024 11:51:31 -0300
Subject: [PATCH 02/39] =?UTF-8?q?=E2=AC=86=EF=B8=8FUpdate=20jest=20config?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/dapp/jest.config.js | 4 ++++
 apps/dapp/package.json   | 3 ++-
 yarn.lock                | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/apps/dapp/jest.config.js b/apps/dapp/jest.config.js
index afde621b..b9d2cd1a 100644
--- a/apps/dapp/jest.config.js
+++ b/apps/dapp/jest.config.js
@@ -1,3 +1,4 @@
+/** @type {import('ts-jest').JestConfigWithTsJest} **/
 const nextJest = require("next/jest");
 
 const createJestConfig = nextJest({
@@ -9,6 +10,9 @@ const createJestConfig = nextJest({
 const customJestConfig = {
   setupFilesAfterEnv: ["<rootDir>/jest.setup.js"],
   testEnvironment: "jsdom",
+  transform: {
+    "^.+.tsx?$": ["ts-jest",{}],
+  }
 };
 
 // createJestConfig is exported this way to ensure that next/jest can load the Next.js config which is async
diff --git a/apps/dapp/package.json b/apps/dapp/package.json
index dfbdcd52..5e1f6f34 100644
--- a/apps/dapp/package.json
+++ b/apps/dapp/package.json
@@ -30,7 +30,8 @@
     "react": "19.0.0-rc-f994737d14-20240522",
     "react-dom": "19.0.0-rc-f994737d14-20240522",
     "react-icons": "^5.3.0",
-    "react-redux": "^9.1.2"
+    "react-redux": "^9.1.2",
+    "ts-jest": "^29.2.5"
   },
   "devDependencies": {
     "@chakra-ui/cli": "^3.0.0",
diff --git a/yarn.lock b/yarn.lock
index f39f2dcc..301d5c23 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -15909,7 +15909,7 @@ ts-jest@^25.3.1:
     semver "6.x"
     yargs-parser "18.x"
 
-ts-jest@^29.1.2:
+ts-jest@^29.1.2, ts-jest@^29.2.5:
   version "29.2.5"
   resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-29.2.5.tgz#591a3c108e1f5ebd013d3152142cb5472b399d63"
   integrity sha512-KD8zB2aAZrcKIdGk4OwpJggeLcH1FgrICqDSROWqlnJXGCXK4Mn6FcdK2B6670Xr73lHMG1kHw8R87A0ecZ+vA==

From e0d9ace2db3c6e5163368882328c545723d0d7f9 Mon Sep 17 00:00:00 2001
From: Matias Poblete <86752543+MattPoblete@users.noreply.github.com>
Date: Tue, 5 Nov 2024 11:52:05 -0300
Subject: [PATCH 03/39] =?UTF-8?q?=E2=9C=A8Add=20workflow=20to=20run=20test?=
 =?UTF-8?q?=20on=20pr?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/run-tests.yml | 58 +++++++++++++++++++++++++++++++++
 1 file changed, 58 insertions(+)
 create mode 100644 .github/workflows/run-tests.yml

diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
new file mode 100644
index 00000000..43c73b59
--- /dev/null
+++ b/.github/workflows/run-tests.yml
@@ -0,0 +1,58 @@
+name: Run dapp tests
+
+on:
+  pull_request:
+  workflow_dispatch:
+permissions:
+  contents: write
+  pull-requests: write
+  issues: read
+  packages: none
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4.1.1
+      - uses: actions/cache@v3
+        with:
+          path: |
+            node_modules
+          key: ${{ runner.os }}-node-${{ hashFiles('**/yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-node-${{ hashFiles('**/yarn.lock') }}
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v4.0.2
+        with:
+          node-version: '20.18.0'
+
+      - name: Install dependencies
+        run: yarn install
+
+      - name: Build app
+        run: yarn build --filter dapp
+
+  run-tests:
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - uses: actions/checkout@v4.1.1
+      - uses: actions/cache@v3
+        with:
+          path: |
+            node_modules
+          key: ${{ runner.os }}-node-${{ hashFiles('**/yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-node-${{ hashFiles('**/yarn.lock') }}
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v4.0.2
+        with:
+          node-version: '20.18.0'
+
+      - name: navigate to the dapp directory
+        run: cd apps/dapp
+
+      - name: Run jest tests
+        run: yarn exec jest
\ No newline at end of file

From b746908406db7b810364c6d0e5b48f8ec9b04cb9 Mon Sep 17 00:00:00 2001
From: Matias Poblete <86752543+MattPoblete@users.noreply.github.com>
Date: Tue, 5 Nov 2024 12:10:07 -0300
Subject: [PATCH 04/39] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Updated=20workflow?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/run-tests.yml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
index 43c73b59..7d17046f 100644
--- a/.github/workflows/run-tests.yml
+++ b/.github/workflows/run-tests.yml
@@ -51,8 +51,7 @@ jobs:
         with:
           node-version: '20.18.0'
 
-      - name: navigate to the dapp directory
-        run: cd apps/dapp
-
-      - name: Run jest tests
-        run: yarn exec jest
\ No newline at end of file
+      - name: Run jest tests in dapp directory
+        run: |
+          cd apps/dapp
+          yarn test

From e1e9d500ab69074f84389d737fda84e64d1f13a9 Mon Sep 17 00:00:00 2001
From: coderipper <hello@joaquinsoza.dev>
Date: Tue, 5 Nov 2024 13:09:57 -0300
Subject: [PATCH 05/39] separated fees for defindex and vault

---
 apps/contracts/defindex/src/fee.rs       | 40 +++++++++++--------
 apps/contracts/defindex/src/interface.rs |  4 +-
 apps/contracts/defindex/src/lib.rs       | 19 ++++-----
 apps/contracts/defindex/src/storage.rs   |  6 +--
 apps/contracts/defindex/src/utils.rs     |  2 +-
 apps/contracts/factory/src/events.rs     | 22 +++++------
 apps/contracts/factory/src/lib.rs        | 50 ++++++++++++------------
 apps/contracts/factory/src/storage.rs    |  2 +-
 apps/contracts/src/test.ts               |  2 +-
 9 files changed, 78 insertions(+), 69 deletions(-)

diff --git a/apps/contracts/defindex/src/fee.rs b/apps/contracts/defindex/src/fee.rs
index 3d2e765d..6fe55464 100644
--- a/apps/contracts/defindex/src/fee.rs
+++ b/apps/contracts/defindex/src/fee.rs
@@ -1,19 +1,20 @@
 use soroban_sdk::{Address, Env, Map, Symbol, Vec};
 
-use crate::{access::AccessControl, constants::{MAX_BPS, SECONDS_PER_YEAR}, events, funds::fetch_total_managed_funds, storage::{get_defindex_receiver, get_factory, get_last_fee_assesment, get_vault_share, set_last_fee_assesment}, token::internal_mint, utils::calculate_dftokens_from_asset_amounts, ContractError};
+use crate::{access::AccessControl, constants::{MAX_BPS, SECONDS_PER_YEAR}, events, funds::fetch_total_managed_funds, storage::{get_defindex_receiver, get_factory, get_last_fee_assesment, get_vault_fee, set_last_fee_assesment}, token::internal_mint, utils::calculate_dftokens_from_asset_amounts, ContractError};
 
 /// Fetches the current fee rate from the factory contract.
 /// The fee rate is expressed in basis points (BPS).
-fn fetch_fee_rate(e: &Env) -> u32 {
+fn fetch_defindex_fee(e: &Env) -> u32 {
   let factory_address = get_factory(e);
   // Interacts with the factory contract to get the fee rate.
   e.invoke_contract(
     &factory_address,
-    &Symbol::new(&e, "fee_rate"), 
+    &Symbol::new(&e, "defindex_fee"), 
     Vec::new(&e)
   )
 }
 
+/// Calculates the required fees in dfTokens based on the current APR fee rate.
 fn calculate_fees(e: &Env, time_elapsed: u64, fee_rate: u32) -> Result<i128, ContractError> {
 
     let total_managed_funds = fetch_total_managed_funds(e); // Get total managed funds per asset
@@ -34,27 +35,33 @@ fn calculate_fees(e: &Env, time_elapsed: u64, fee_rate: u32) -> Result<i128, Con
 
     }
 
-    let total_fees_in_dftokens = calculate_dftokens_from_asset_amounts(e, total_fees_per_asset)?;
+    let total_fees_in_dftokens = calculate_dftokens_from_asset_amounts(e, total_fees_per_asset, total_managed_funds)?;
 
     Ok(total_fees_in_dftokens)
 }
 
+/// Collects and mints fees in dfTokens, distributing them to the appropriate fee receivers.
 pub fn collect_fees(e: &Env) -> Result<(), ContractError> {
     let current_timestamp = e.ledger().timestamp();
-    let last_fee_assessment = get_last_fee_assesment(e); 
+    let last_fee_assessment = get_last_fee_assesment(e);
 
     let time_elapsed = current_timestamp.checked_sub(last_fee_assessment).unwrap();
 
+    // If no time has passed since the last fee assessment, no fees are collected
     if time_elapsed == 0 {
         return Ok(());
     }
 
-    let fee_rate = fetch_fee_rate(e);
+    // Fetch the individual fees for DeFindex and Vault, then calculate the total rate
+    let defindex_fee = fetch_defindex_fee(e);
+    let vault_fee = get_vault_fee(e);
+    let total_fee_rate = defindex_fee.checked_add(vault_fee).unwrap();
 
-    let total_fees = calculate_fees(e, time_elapsed, fee_rate)?;
+    // Calculate the total fees in dfTokens based on the combined fee rate
+    let total_fees = calculate_fees(e, time_elapsed, total_fee_rate)?;
 
-    // Mint the total fees as dfTokens
-    mint_fees(e, total_fees)?;
+    // Mint and distribute the fees proportionally
+    mint_fees(e, total_fees, defindex_fee, vault_fee)?;
 
     // Update the last fee assessment timestamp
     set_last_fee_assesment(e, &current_timestamp);
@@ -62,18 +69,19 @@ pub fn collect_fees(e: &Env) -> Result<(), ContractError> {
     Ok(())
 }
 
-fn mint_fees(e: &Env, total_fees: i128) -> Result<(), ContractError> {
+/// Mints dfTokens for fees and distributes them to the vault fee receiver and DeFindex receiver.
+fn mint_fees(e: &Env, total_fees: i128, defindex_fee: u32, vault_fee: u32) -> Result<(), ContractError> {
     let access_control = AccessControl::new(&e);
-    
+
     let vault_fee_receiver = access_control.get_fee_receiver()?;
     let defindex_receiver = get_defindex_receiver(e);
 
-    let vault_share_bps = get_vault_share(e);
-
-    let vault_shares = (total_fees * vault_share_bps as i128) / MAX_BPS;
-    
-    let defindex_shares = total_fees - vault_shares;
+    // Calculate shares for each receiver based on their fee proportion
+    let total_fee_bps = defindex_fee as i128 + vault_fee as i128;
+    let defindex_shares = (total_fees * defindex_fee as i128) / total_fee_bps;
+    let vault_shares = total_fees - defindex_shares;
 
+    // Mint shares for both receivers
     internal_mint(e.clone(), vault_fee_receiver.clone(), vault_shares);
     internal_mint(e.clone(), defindex_receiver.clone(), defindex_shares);
 
diff --git a/apps/contracts/defindex/src/interface.rs b/apps/contracts/defindex/src/interface.rs
index f3873a90..65538e17 100644
--- a/apps/contracts/defindex/src/interface.rs
+++ b/apps/contracts/defindex/src/interface.rs
@@ -18,7 +18,7 @@ pub trait VaultTrait {
     /// * `manager` - The address responsible for managing the vault.
     /// * `emergency_manager` - The address with emergency control over the vault.
     /// * `fee_receiver` - The address that will receive fees from the vault.
-    /// * `vault_share` - The percentage of the vault's fees that will be sent to the DeFindex receiver. in BPS.
+    /// * `vault_fee` - The percentage of the vault's fees that will be sent to the DeFindex receiver. in BPS.
     /// * `defindex_receiver` - The address that will receive fees for DeFindex from the vault.
     /// * `factory` - The address of the factory that deployed the vault.
     ///
@@ -30,7 +30,7 @@ pub trait VaultTrait {
         manager: Address,
         emergency_manager: Address,
         fee_receiver: Address,
-        vault_share: u32,
+        vault_fee: u32,
         defindex_receiver: Address,
         factory: Address,
         vault_name: String,
diff --git a/apps/contracts/defindex/src/lib.rs b/apps/contracts/defindex/src/lib.rs
index 044b1470..8f328d20 100755
--- a/apps/contracts/defindex/src/lib.rs
+++ b/apps/contracts/defindex/src/lib.rs
@@ -28,7 +28,7 @@ use funds::{fetch_current_idle_funds, fetch_current_invested_funds, fetch_total_
 use interface::{AdminInterfaceTrait, VaultTrait, VaultManagementTrait};
 use models::{ActionType, AssetAllocation, Instruction, Investment, OptionalSwapDetailsExactIn, OptionalSwapDetailsExactOut};
 use storage::{
-    get_assets, set_asset, set_defindex_receiver, set_factory, set_last_fee_assesment, set_total_assets, set_vault_share
+    get_assets, set_asset, set_defindex_receiver, set_factory, set_last_fee_assesment, set_total_assets, set_vault_fee
 };
 use strategies::{get_asset_allocation_from_address, get_strategy_asset, get_strategy_client, get_strategy_struct, invest_in_strategy, pause_strategy, unpause_strategy, withdraw_from_strategy};
 use token::{internal_mint, internal_burn, write_metadata, VaultToken};
@@ -54,7 +54,7 @@ impl VaultTrait for DeFindexVault {
     /// * `manager` - The address responsible for managing the vault.
     /// * `emergency_manager` - The address with emergency control over the vault.
     /// * `fee_receiver` - The address that will receive fees from the vault.
-    /// * `vault_share` - The percentage of the vault's fees that will be sent to the DeFindex receiver. in BPS.
+    /// * `vault_fee` - The percentage of the vault's fees that will be sent to the DeFindex receiver. in BPS.
     /// * `defindex_receiver` - The address that will receive fees for DeFindex from the vault.
     /// * `factory` - The address of the factory that deployed the vault.
     ///
@@ -66,7 +66,7 @@ impl VaultTrait for DeFindexVault {
         manager: Address,
         emergency_manager: Address,
         fee_receiver: Address,
-        vault_share: u32,
+        vault_fee: u32,
         defindex_receiver: Address,
         factory: Address,
         vault_name: String,
@@ -82,7 +82,7 @@ impl VaultTrait for DeFindexVault {
         access_control.set_role(&RolesDataKey::Manager, &manager);
 
         // Set Vault Share (in basis points)
-        set_vault_share(&e, &vault_share);
+        set_vault_fee(&e, &vault_fee);
 
         // Set Paltalabs Fee Receiver
         set_defindex_receiver(&e, &defindex_receiver);
@@ -152,6 +152,9 @@ impl VaultTrait for DeFindexVault {
             set_last_fee_assesment(&e, &e.ledger().timestamp());
         }
 
+        // fees assesment
+        collect_fees(&e)?;
+
         // get assets
         let assets = get_assets(&e);
         // assets lenght should be equal to amounts_desired and amounts_min length
@@ -204,8 +207,6 @@ impl VaultTrait for DeFindexVault {
 
         events::emit_deposit_event(&e, from, amounts, shares_to_mint);
 
-        // fees assesment
-        collect_fees(&e)?;
         // TODO return amounts and shares to mint
         Ok(())
     }
@@ -227,6 +228,9 @@ impl VaultTrait for DeFindexVault {
         check_initialized(&e)?;
         check_nonnegative_amount(df_amount)?;
         from.require_auth();
+
+        // fees assesment
+        collect_fees(&e)?;
     
         // Check if the user has enough dfTokens
         let df_user_balance = VaultToken::balance(e.clone(), from.clone());
@@ -292,9 +296,6 @@ impl VaultTrait for DeFindexVault {
         }
 
         events::emit_withdraw_event(&e, from, df_amount, amounts_withdrawn.clone());
-
-        // fees assesment
-        collect_fees(&e)?;
     
         Ok(amounts_withdrawn)
     }
diff --git a/apps/contracts/defindex/src/storage.rs b/apps/contracts/defindex/src/storage.rs
index 525e2b81..4f873b5b 100644
--- a/apps/contracts/defindex/src/storage.rs
+++ b/apps/contracts/defindex/src/storage.rs
@@ -82,13 +82,13 @@ pub fn get_last_fee_assesment(e: &Env) -> u64 {
 }
 
 // Vault Share
-pub fn set_vault_share(e: &Env, vault_share: &u32) {
+pub fn set_vault_fee(e: &Env, vault_fee: &u32) {
     e.storage()
         .instance()
-        .set(&DataKey::VaultShare, vault_share);
+        .set(&DataKey::VaultShare, vault_fee);
 }
 
-pub fn get_vault_share(e: &Env) -> u32 {
+pub fn get_vault_fee(e: &Env) -> u32 {
     e.storage()
         .instance()
         .get(&DataKey::VaultShare)
diff --git a/apps/contracts/defindex/src/utils.rs b/apps/contracts/defindex/src/utils.rs
index 3fab13cf..aa215ee3 100644
--- a/apps/contracts/defindex/src/utils.rs
+++ b/apps/contracts/defindex/src/utils.rs
@@ -79,9 +79,9 @@ pub fn calculate_asset_amounts_for_dftokens(
 pub fn calculate_dftokens_from_asset_amounts(
     env: &Env,
     asset_amounts: Map<Address, i128>, // The input asset amounts
+    total_managed_funds: Map<Address, i128>, // The total managed funds for each asset
 ) -> Result<i128, ContractError> {
     let total_supply = VaultToken::total_supply(env.clone()); // Total dfToken supply
-    let total_managed_funds = fetch_total_managed_funds(&env); // Fetch all managed assets
 
     // Initialize the minimum dfTokens corresponding to each asset
     let mut min_df_tokens: Option<i128> = None;
diff --git a/apps/contracts/factory/src/events.rs b/apps/contracts/factory/src/events.rs
index 479cc43a..c0c23b03 100644
--- a/apps/contracts/factory/src/events.rs
+++ b/apps/contracts/factory/src/events.rs
@@ -8,14 +8,14 @@ use crate::defindex::AssetAllocation;
 pub struct InitializedEvent {
     pub admin: Address,
     pub defindex_receiver: Address,
-    pub fee_rate: u32,
+    pub defindex_fee: u32,
 }
 
-pub(crate) fn emit_initialized(e: &Env, admin: Address, defindex_receiver: Address, fee_rate: u32) {
+pub(crate) fn emit_initialized(e: &Env, admin: Address, defindex_receiver: Address, defindex_fee: u32) {
     let event: InitializedEvent = InitializedEvent {
         admin,
         defindex_receiver,
-        fee_rate,
+        defindex_fee,
     };
     e.events()
         .publish(("DeFindexFactory", symbol_short!("init")), event);
@@ -28,7 +28,7 @@ pub struct CreateDeFindexEvent {
     pub emergency_manager: Address, 
     pub fee_receiver: Address, 
     pub manager: Address,
-    pub vault_share: u32,
+    pub vault_fee: u32,
     pub assets: Vec<AssetAllocation>
 }
 
@@ -38,14 +38,14 @@ pub(crate) fn emit_create_defindex_vault(
     emergency_manager: Address, 
     fee_receiver: Address, 
     manager: Address,
-    vault_share: u32,
+    vault_fee: u32,
     assets: Vec<AssetAllocation>,
 ) {
     let event = CreateDeFindexEvent { 
       emergency_manager,
       fee_receiver,
       manager,
-      vault_share,
+      vault_fee,
       assets,
     };
 
@@ -81,16 +81,16 @@ pub(crate) fn emit_new_defindex_receiver(e: &Env, new_defindex_receiver: Address
         .publish(("DeFindexFactory", symbol_short!("nreceiver")), event);
 }
 
-// NEW FEE RATE EVENT
+// NEW DEFINDEX FEE EVENT
 #[contracttype]
 #[derive(Clone, Debug, Eq, PartialEq)]
 pub struct NewFeeRateEvent {
-    pub new_fee_rate: u32,
+    pub new_defindex_fee: u32,
 }
 
-pub(crate) fn emit_new_fee_rate(e: &Env, new_fee_rate: u32) {
-    let event = NewFeeRateEvent { new_fee_rate };
+pub(crate) fn emit_new_defindex_fee(e: &Env, new_defindex_fee: u32) {
+    let event = NewFeeRateEvent { new_defindex_fee };
 
     e.events()
-        .publish(("DeFindexFactory", symbol_short!("nfee_rate")), event);
+        .publish(("DeFindexFactory", symbol_short!("n_fee")), event);
 }
\ No newline at end of file
diff --git a/apps/contracts/factory/src/lib.rs b/apps/contracts/factory/src/lib.rs
index f02aa883..f29d9b70 100644
--- a/apps/contracts/factory/src/lib.rs
+++ b/apps/contracts/factory/src/lib.rs
@@ -10,7 +10,7 @@ use soroban_sdk::{
 };
 use error::FactoryError;
 use defindex::{create_contract, AssetAllocation};
-use storage::{ add_new_defindex, extend_instance_ttl, get_admin, get_defi_wasm_hash, get_defindex_receiver, get_deployed_defindexes, get_fee_rate, has_admin, put_admin, put_defi_wasm_hash, put_defindex_receiver, put_fee_rate };
+use storage::{ add_new_defindex, extend_instance_ttl, get_admin, get_defi_wasm_hash, get_defindex_receiver, get_deployed_defindexes, get_fee_rate, has_admin, put_admin, put_defi_wasm_hash, put_defindex_receiver, put_defindex_fee };
 
 fn check_initialized(e: &Env) -> Result<(), FactoryError> {
     if !has_admin(e) {
@@ -26,7 +26,7 @@ pub trait FactoryTrait {
     /// * `e` - The environment in which the contract is running.
     /// * `admin` - The address of the contract administrator, who can manage settings.
     /// * `defindex_receiver` - The default address designated to receive a portion of fees.
-    /// * `fee_rate` - The initial annual fee rate (in basis points).
+    /// * `defindex_fee` - The initial annual fee rate (in basis points).
     /// * `defindex_wasm_hash` - The hash of the DeFindex Vault's WASM file for deploying new vaults.
     /// 
     /// # Returns
@@ -35,7 +35,7 @@ pub trait FactoryTrait {
         e: Env, 
         admin: Address,
         defindex_receiver: Address,
-        fee_rate: u32,
+        defindex_fee: u32,
         defindex_wasm_hash: BytesN<32>
     ) -> Result<(), FactoryError>;
 
@@ -45,7 +45,7 @@ pub trait FactoryTrait {
     /// * `e` - The environment in which the contract is running.
     /// * `emergency_manager` - The address assigned emergency control over the vault.
     /// * `fee_receiver` - The address designated to receive fees from the vault.
-    /// * `vault_share` - The percentage share of fees allocated to the vault's fee receiver.
+    /// * `vault_fee` - The percentage share of fees allocated to the vault's fee receiver.
     /// * `vault_name` - The name of the vault.
     /// * `vault_symbol` - The symbol of the vault.
     /// * `manager` - The address assigned as the vault manager.
@@ -58,7 +58,7 @@ pub trait FactoryTrait {
         e: Env, 
         emergency_manager: Address, 
         fee_receiver: Address, 
-        vault_share: u32,
+        vault_fee: u32,
         vault_name: String,
         vault_symbol: String,
         manager: Address,
@@ -72,7 +72,7 @@ pub trait FactoryTrait {
     /// * `e` - The environment in which the contract is running.
     /// * `emergency_manager` - The address assigned emergency control over the vault.
     /// * `fee_receiver` - The address designated to receive fees from the vault.
-    /// * `vault_share` - The percentage share of fees allocated to the vault's fee receiver.
+    /// * `vault_fee` - The percentage share of fees allocated to the vault's fee receiver.
     /// * `vault_name` - The name of the vault.
     /// * `vault_symbol` - The symbol of the vault.
     /// * `manager` - The address assigned as the vault manager.
@@ -87,7 +87,7 @@ pub trait FactoryTrait {
         caller: Address,
         emergency_manager: Address, 
         fee_receiver: Address, 
-        vault_share: u32,
+        vault_fee: u32,
         vault_name: String,
         vault_symbol: String,
         manager: Address,
@@ -126,7 +126,7 @@ pub trait FactoryTrait {
     ///
     /// # Returns
     /// * `Result<(), FactoryError>` - Returns Ok(()) if successful, or an error if not authorized.
-    fn set_fee_rate(e: Env, new_fee_rate: u32) -> Result<(), FactoryError>;
+    fn set_defindex_fee(e: Env, new_fee_rate: u32) -> Result<(), FactoryError>;
     
     // --- Read Methods ---
 
@@ -164,7 +164,7 @@ pub trait FactoryTrait {
     ///
     /// # Returns
     /// * `Result<u32, FactoryError>` - Returns the fee rate in basis points or an error if not found.
-    fn fee_rate(e: Env) -> Result<u32, FactoryError>;
+    fn defindex_fee(e: Env) -> Result<u32, FactoryError>;
 }
 
 #[contract]
@@ -179,7 +179,7 @@ impl FactoryTrait for DeFindexFactory {
     /// * `e` - The environment in which the contract is running.
     /// * `admin` - The address of the contract administrator, who can manage settings.
     /// * `defindex_receiver` - The default address designated to receive a portion of fees.
-    /// * `fee_rate` - The initial annual fee rate (in basis points).
+    /// * `defindex_fee` - The initial annual fee rate (in basis points).
     /// * `defindex_wasm_hash` - The hash of the DeFindex Vault's WASM file for deploying new vaults.
     /// 
     /// # Returns
@@ -188,7 +188,7 @@ impl FactoryTrait for DeFindexFactory {
         e: Env, 
         admin: Address, 
         defindex_receiver: Address,
-        fee_rate: u32,
+        defindex_fee: u32,
         defi_wasm_hash: BytesN<32>
     ) -> Result<(), FactoryError> {
         if has_admin(&e) {
@@ -198,9 +198,9 @@ impl FactoryTrait for DeFindexFactory {
         put_admin(&e, &admin);
         put_defindex_receiver(&e, &defindex_receiver);
         put_defi_wasm_hash(&e, defi_wasm_hash);
-        put_fee_rate(&e, &fee_rate);
+        put_defindex_fee(&e, &defindex_fee);
 
-        events::emit_initialized(&e, admin, defindex_receiver, fee_rate);
+        events::emit_initialized(&e, admin, defindex_receiver, defindex_fee);
         extend_instance_ttl(&e);
         Ok(())
     }
@@ -211,7 +211,7 @@ impl FactoryTrait for DeFindexFactory {
     /// * `e` - The environment in which the contract is running.
     /// * `emergency_manager` - The address assigned emergency control over the vault.
     /// * `fee_receiver` - The address designated to receive fees from the vault.
-    /// * `vault_share` - The percentage share of fees allocated to the vault's fee receiver.
+    /// * `vault_fee` - The percentage share of fees allocated to the vault's fee receiver.
     /// * `manager` - The address assigned as the vault manager.
     /// * `assets` - A vector of `AssetAllocation` structs that define the assets managed by the vault.
     /// * `salt` - A salt used for ensuring unique addresses for each deployed vault.
@@ -222,7 +222,7 @@ impl FactoryTrait for DeFindexFactory {
         e: Env, 
         emergency_manager: Address, 
         fee_receiver: Address, 
-        vault_share: u32,
+        vault_fee: u32,
         vault_name: String,
         vault_symbol: String,
         manager: Address,
@@ -243,7 +243,7 @@ impl FactoryTrait for DeFindexFactory {
             &manager,
             &emergency_manager,
             &fee_receiver,
-            &vault_share,
+            &vault_fee,
             &defindex_receiver,
             &current_contract,
             &vault_name,
@@ -251,7 +251,7 @@ impl FactoryTrait for DeFindexFactory {
         );
 
         add_new_defindex(&e, defindex_address.clone());
-        events::emit_create_defindex_vault(&e, emergency_manager, fee_receiver, manager, vault_share, assets);
+        events::emit_create_defindex_vault(&e, emergency_manager, fee_receiver, manager, vault_fee, assets);
         Ok(defindex_address)
     }
 
@@ -261,7 +261,7 @@ impl FactoryTrait for DeFindexFactory {
     /// * `e` - The environment in which the contract is running.
     /// * `emergency_manager` - The address assigned emergency control over the vault.
     /// * `fee_receiver` - The address designated to receive fees from the vault.
-    /// * `vault_share` - The percentage share of fees allocated to the vault's fee receiver.
+    /// * `vault_fee` - The percentage share of fees allocated to the vault's fee receiver.
     /// * `vault_name` - The name of the vault.
     /// * `vault_symbol` - The symbol of the vault.
     /// * `manager` - The address assigned as the vault manager.
@@ -276,7 +276,7 @@ impl FactoryTrait for DeFindexFactory {
         caller: Address,
         emergency_manager: Address, 
         fee_receiver: Address, 
-        vault_share: u32,
+        vault_fee: u32,
         vault_name: String,
         vault_symbol: String,
         manager: Address,
@@ -305,7 +305,7 @@ impl FactoryTrait for DeFindexFactory {
             &manager,
             &emergency_manager,
             &fee_receiver,
-            &vault_share,
+            &vault_fee,
             &defindex_receiver,
             &current_contract,
             &vault_name,
@@ -324,7 +324,7 @@ impl FactoryTrait for DeFindexFactory {
         );
 
         add_new_defindex(&e, defindex_address.clone());
-        events::emit_create_defindex_vault(&e, emergency_manager, fee_receiver, manager, vault_share, assets);
+        events::emit_create_defindex_vault(&e, emergency_manager, fee_receiver, manager, vault_fee, assets);
         Ok(defindex_address)
     }
 
@@ -376,14 +376,14 @@ impl FactoryTrait for DeFindexFactory {
     ///
     /// # Returns
     /// * `Result<(), FactoryError>` - Returns Ok(()) if successful, or an error if not authorized.
-    fn set_fee_rate(e: Env, fee_rate: u32) -> Result<(), FactoryError> {
+    fn set_defindex_fee(e: Env, defindex_fee: u32) -> Result<(), FactoryError> {
         check_initialized(&e)?;
         extend_instance_ttl(&e);
         let admin = get_admin(&e);
         admin.require_auth();
 
-        put_fee_rate(&e, &fee_rate);
-        events::emit_new_fee_rate(&e, fee_rate);
+        put_defindex_fee(&e, &defindex_fee);
+        events::emit_new_defindex_fee(&e, defindex_fee);
         Ok(())
     }
 
@@ -435,7 +435,7 @@ impl FactoryTrait for DeFindexFactory {
     ///
     /// # Returns
     /// * `Result<u32, FactoryError>` - Returns the fee rate in basis points or an error if not found.
-    fn fee_rate(e: Env) -> Result<u32, FactoryError> {
+    fn defindex_fee(e: Env) -> Result<u32, FactoryError> {
         check_initialized(&e)?;
         extend_instance_ttl(&e);
         Ok(get_fee_rate(&e))
diff --git a/apps/contracts/factory/src/storage.rs b/apps/contracts/factory/src/storage.rs
index 92589bb5..bde91cd0 100644
--- a/apps/contracts/factory/src/storage.rs
+++ b/apps/contracts/factory/src/storage.rs
@@ -99,7 +99,7 @@ pub fn get_defindex_receiver(e: &Env) -> Address {
 }
 
 // Fee Rate BPS (MAX BPS = 10000)
-pub fn put_fee_rate(e: &Env, value: &u32) {
+pub fn put_defindex_fee(e: &Env, value: &u32) {
     e.storage().instance().set(&DataKey::FeeRate, value);
 }
 
diff --git a/apps/contracts/src/test.ts b/apps/contracts/src/test.ts
index bb33af73..5abe8656 100644
--- a/apps/contracts/src/test.ts
+++ b/apps/contracts/src/test.ts
@@ -81,7 +81,7 @@ export async function test_factory(addressBook: AddressBook) {
   const createDeFindexParams: xdr.ScVal[] = [
     new Address(emergencyManager.publicKey()).toScVal(),
     new Address(feeReceiver.publicKey()).toScVal(),
-    nativeToScVal(100, { type: "u32" }),  // Setting vault_share as 100 bps for demonstration
+    nativeToScVal(100, { type: "u32" }),  // Setting vault_fee as 100 bps for demonstration
     nativeToScVal("Test Vault", { type: "string" }),
     nativeToScVal("DFT-Test-Vault", { type: "string" }),
     new Address(manager.publicKey()).toScVal(),

From 5def99f8a3328e3791cd7b9e864381054e480f14 Mon Sep 17 00:00:00 2001
From: coderipper <hello@joaquinsoza.dev>
Date: Tue, 5 Nov 2024 13:10:52 -0300
Subject: [PATCH 06/39] whitepaper fees

---
 .../02-contracts/01-vault-contract.md         | 66 +++++++++++++++++--
 1 file changed, 59 insertions(+), 7 deletions(-)

diff --git a/apps/docs/10-whitepaper/03-the-defindex-approach/02-contracts/01-vault-contract.md b/apps/docs/10-whitepaper/03-the-defindex-approach/02-contracts/01-vault-contract.md
index 47992ad7..e40955da 100644
--- a/apps/docs/10-whitepaper/03-the-defindex-approach/02-contracts/01-vault-contract.md
+++ b/apps/docs/10-whitepaper/03-the-defindex-approach/02-contracts/01-vault-contract.md
@@ -105,18 +105,70 @@ The Emergency Manager has the authority to withdraw assets from the DeFindex in
 ### Management
 Every DeFindex has a manager, who is responsible for managing the DeFindex. The Manager can ebalance the Vault, and invest IDLE funds in strategies. 
 
-### Fee Collection
-The revenues generated by the strategies are collected as shares of the DeFindex. These shares, or dfTokens, are minted whenever a deposit or withdrawal takes place.
+### Fee Structure, Collection, and Distribution
 
-The deployer can set a management fee, which can later be adjusted by the Fee Receiver. Additionally, **palta**labs charges a 0.5% APR on the vault shares.
+1. Fee Receivers
 
-The recommended initial setup suggests a fee of **0.5%-2% APR on these shares**. For example, if a DeFindex has 100 shares and the fee is set at 0.5% APR, the fees collected annually would be 1 share, split as 0.5 for the Fee Receiver and 0.5 for **palta**labs. The **palta**labs fee is defined in the Factory contract.
+The DeFindex protocol defines two distinct fee receivers to reward both the creators of the DeFindex Protocol and the deployers of individual vaults:
 
-These allocations are recalculated and minted whenever a user deposits, withdraws from the DeFindex, or when rebalancing occurs.
+1.	DeFindex Protocol Fee Receiver: Receives a fixed protocol fee of 0.5% APR.
+2.	Vault Fee Receiver: Receives a fee set by the vault deployer, typically recommended between 0.5% and 2% APR.
 
-For instance, let's say a DeFindex starts with an initial value of 1 USDC per share and 100 shares (dfTokens). These 100 USDC are invested in a lending protocol offering an 8% APY. The DeFindex also has a 0.5% APR fee. After one year, the investment grows to 108 USDC. Additionally, 1 dfToken is minted as a fee. This means the DeFindex now holds 101 dfTokens backed by 108 USDC, making the price per share approximately 1.07 USDC. As a result, a user holding 100 dfTokens will have a value equivalent to around 107 USDC, while the collected fee will be backed by about 1.07 USDC.
+The Total Management Fee is the sum of these two fees. Thus, each vault has a total APR fee rate $f_{\text{total}}$ such that:
 
-It is expected that the Fee Receiver is associated with the manager, allowing the entity managing the Vault to be compensated through the Fee Receiver. In other words, the Fee Receiver could be the manager using the same address, or it could be a different entity such as a streaming contract, a DAO, or another party.
+$f_{\text{total}} = f_{\text{DeFindex}} + f_{\text{Vault}}$
+
+
+where $f_{\text{DeFindex}} = 0.5\%$ (fixed) and $f_{\text{Vault}}$  is a variable APR, typically between 0.5% and 2%.
+
+2. Fee Collection Methodology
+
+The fee collection process mints new shares, or dfTokens, representing the management fees. These shares are calculated based on the elapsed time since the last fee assessment, ensuring fees are accrued in alignment with the actual period of asset management. The fee collection is triggered whenever there is a vault interaction, such as a deposit or withdrawal with calculations based on the time elapsed since the last fee assessment.
+
+Let:
+
+- $V_0$  be the Total Value Locked (TVL) at the last assessment,
+- $s_0$  be the Total Shares (dfTokens) at the last assessment,
+- $f_{\text{total}}$  be the Total Management Fee (APR).
+
+Over a time period  $\Delta t$ , the fees due for collection are derived by the value equivalent in shares.
+
+3. Mathematical Derivation of New Fees
+
+To mint new shares for fee distribution, we calculate the required number of new shares, $s_f$, that correspond to the management fee over the elapsed period.
+
+After a period  $\Delta t$ (expressed in seconds), the total shares $s_1$ should be:
+
+$s_1 = s_0 + s_f$
+
+The total value $V_1$ remains $V_0$, assuming no deposits or withdrawals during this period.
+
+We establish the following condition to ensure the minted shares represent the accrued fee:
+
+$\frac{V_0}{s_1} \times s_f = V_0 \times f_{\text{total}} \times \frac{\Delta t}{\text{SECONDS\_PER\_YEAR}}$
+
+Rearranging terms, we get:
+
+$$
+s_f = \frac{f_{\text{total}} \times s_0 \times \Delta t}{\text{SECONDS\_PER\_YEAR} - f_{\text{total}} \times \Delta t}
+$$
+
+This equation gives the precise share quantity $s_f$ to mint as dfTokens for the management fee over the period $\Delta t$.
+
+4. Distribution of Fees
+
+Once the total fees,  $s_f$ , are calculated, the shares are split proportionally between the DeFindex Protocol Fee Receiver and the Vault Fee Receiver. This is done by calculating the ratio of each fee receiver’s APR to the total APR:
+
+$s_{\text{DeFindex}} = \frac{s_f \times f_{\text{DeFindex}}}{f_{\text{total}}}$
+
+
+$s_{\text{Vault}} = s_f - s_{\text{DeFindex}}$
+
+This ensures that each fee receiver is allocated their respective share of dfTokens based on their fee contribution to $f_{\text{total}}$. The dfTokens are then minted to each receiver’s address as a direct representation of the fees collected.
+
+5. Fee Calculation Efficiency
+
+This calculation is performed only upon each vault interaction and considers only the time elapsed since the last assessment. This approach minimizes computational overhead and gas costs, ensuring that fee collection remains efficient.
 
 <!-- ### Multi-transaction Actions _(TODO)_
 

From a311c46919026bb5256552f7223a2d4962c62115 Mon Sep 17 00:00:00 2001
From: coderipper <hello@joaquinsoza.dev>
Date: Tue, 5 Nov 2024 13:12:50 -0300
Subject: [PATCH 07/39] fixed allowed only in math mode on github

---
 .../02-contracts/01-vault-contract.md                         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/docs/10-whitepaper/03-the-defindex-approach/02-contracts/01-vault-contract.md b/apps/docs/10-whitepaper/03-the-defindex-approach/02-contracts/01-vault-contract.md
index e40955da..0897544a 100644
--- a/apps/docs/10-whitepaper/03-the-defindex-approach/02-contracts/01-vault-contract.md
+++ b/apps/docs/10-whitepaper/03-the-defindex-approach/02-contracts/01-vault-contract.md
@@ -145,12 +145,12 @@ The total value $V_1$ remains $V_0$, assuming no deposits or withdrawals during
 
 We establish the following condition to ensure the minted shares represent the accrued fee:
 
-$\frac{V_0}{s_1} \times s_f = V_0 \times f_{\text{total}} \times \frac{\Delta t}{\text{SECONDS\_PER\_YEAR}}$
+$\frac{V_0}{s_1} \times s_f = V_0 \times f_{\text{total}} \times \frac{\Delta t}{\text{SECONDS PER YEAR}}$
 
 Rearranging terms, we get:
 
 $$
-s_f = \frac{f_{\text{total}} \times s_0 \times \Delta t}{\text{SECONDS\_PER\_YEAR} - f_{\text{total}} \times \Delta t}
+s_f = \frac{f_{\text{total}} \times s_0 \times \Delta t}{\text{SECONDS PER YEAR} - f_{\text{total}} \times \Delta t}
 $$
 
 This equation gives the precise share quantity $s_f$ to mint as dfTokens for the management fee over the period $\Delta t$.

From 278800153ba568362734a25abe25dc3182b7f80b Mon Sep 17 00:00:00 2001
From: chopan123 <chopancatrileo@gmail.com>
Date: Tue, 5 Nov 2024 13:53:19 -0300
Subject: [PATCH 08/39] improved docs

---
 .../02-contracts/01-vault-contract.md         | 24 ++++++++++++-------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/apps/docs/10-whitepaper/03-the-defindex-approach/02-contracts/01-vault-contract.md b/apps/docs/10-whitepaper/03-the-defindex-approach/02-contracts/01-vault-contract.md
index 0897544a..fd357bae 100644
--- a/apps/docs/10-whitepaper/03-the-defindex-approach/02-contracts/01-vault-contract.md
+++ b/apps/docs/10-whitepaper/03-the-defindex-approach/02-contracts/01-vault-contract.md
@@ -107,7 +107,7 @@ Every DeFindex has a manager, who is responsible for managing the DeFindex. The
 
 ### Fee Structure, Collection, and Distribution
 
-1. Fee Receivers
+#### Fee Receivers
 
 The DeFindex protocol defines two distinct fee receivers to reward both the creators of the DeFindex Protocol and the deployers of individual vaults:
 
@@ -121,31 +121,37 @@ $f_{\text{total}} = f_{\text{DeFindex}} + f_{\text{Vault}}$
 
 where $f_{\text{DeFindex}} = 0.5\%$ (fixed) and $f_{\text{Vault}}$  is a variable APR, typically between 0.5% and 2%.
 
-2. Fee Collection Methodology
+#### Fee Collection Methodology
 
 The fee collection process mints new shares, or dfTokens, representing the management fees. These shares are calculated based on the elapsed time since the last fee assessment, ensuring fees are accrued in alignment with the actual period of asset management. The fee collection is triggered whenever there is a vault interaction, such as a deposit or withdrawal with calculations based on the time elapsed since the last fee assessment.
 
+#### Mathematical Derivation of New Fees
+
 Let:
 
 - $V_0$  be the Total Value Locked (TVL) at the last assessment,
+- $V_1$ be the Total Value Locked (TVL) at the current assessment, just before any deposits or withdrawals,
 - $s_0$  be the Total Shares (dfTokens) at the last assessment,
+- $s_f$ be the Total Shares (dfTokens) minted for fee distribution,
 - $f_{\text{total}}$  be the Total Management Fee (APR).
+- $Pps_1$ be the Price per Share (dfToken) at the current assessment,
 
 Over a time period  $\Delta t$ , the fees due for collection are derived by the value equivalent in shares.
 
-3. Mathematical Derivation of New Fees
-
 To mint new shares for fee distribution, we calculate the required number of new shares, $s_f$, that correspond to the management fee over the elapsed period.
 
 After a period  $\Delta t$ (expressed in seconds), the total shares $s_1$ should be:
 
 $s_1 = s_0 + s_f$
 
-The total value $V_1$ remains $V_0$, assuming no deposits or withdrawals during this period.
-
 We establish the following condition to ensure the minted shares represent the accrued fee:
 
-$\frac{V_0}{s_1} \times s_f = V_0 \times f_{\text{total}} \times \frac{\Delta t}{\text{SECONDS PER YEAR}}$
+$$
+Pps_1 \times s_f = V_1 \times f_{\text{total}} \times \frac{\Delta t}{\text{SECONDS PER YEAR}}
+$$
+$$
+\frac{V_1}{s_1} \times s_f = V_1 \times f_{\text{total}} \times \frac{\Delta t}{\text{SECONDS PER YEAR}}
+$$
 
 Rearranging terms, we get:
 
@@ -155,7 +161,7 @@ $$
 
 This equation gives the precise share quantity $s_f$ to mint as dfTokens for the management fee over the period $\Delta t$.
 
-4. Distribution of Fees
+#### Distribution of Fees
 
 Once the total fees,  $s_f$ , are calculated, the shares are split proportionally between the DeFindex Protocol Fee Receiver and the Vault Fee Receiver. This is done by calculating the ratio of each fee receiver’s APR to the total APR:
 
@@ -166,7 +172,7 @@ $s_{\text{Vault}} = s_f - s_{\text{DeFindex}}$
 
 This ensures that each fee receiver is allocated their respective share of dfTokens based on their fee contribution to $f_{\text{total}}$. The dfTokens are then minted to each receiver’s address as a direct representation of the fees collected.
 
-5. Fee Calculation Efficiency
+#### Fee Calculation Efficiency
 
 This calculation is performed only upon each vault interaction and considers only the time elapsed since the last assessment. This approach minimizes computational overhead and gas costs, ensuring that fee collection remains efficient.
 

From 60d3f0b2e2336ef8115a4eb760ae009795dd6f3f Mon Sep 17 00:00:00 2001
From: esteblock <estebaniglesiasmanriquez@gmail.com>
Date: Tue, 5 Nov 2024 15:20:22 -0300
Subject: [PATCH 09/39] better doc

---
 .../02-contracts/01-vault-contract.md         | 161 +++++++++++-------
 1 file changed, 99 insertions(+), 62 deletions(-)

diff --git a/apps/docs/10-whitepaper/03-the-defindex-approach/02-contracts/01-vault-contract.md b/apps/docs/10-whitepaper/03-the-defindex-approach/02-contracts/01-vault-contract.md
index f08ec9ba..2b17ad36 100644
--- a/apps/docs/10-whitepaper/03-the-defindex-approach/02-contracts/01-vault-contract.md
+++ b/apps/docs/10-whitepaper/03-the-defindex-approach/02-contracts/01-vault-contract.md
@@ -6,14 +6,14 @@ While anyone can invest in a DeFindex, only the Manager and Emergency Manager ha
 
 The contract also holds funds not currently invested in any strategy, known as **IDLE funds**. These funds act as a safety buffer, allowing the Emergency Manager to withdraw assets from underperforming or unhealthy strategies and store them as IDLE funds. (also to enable fast small withdrawals)
 
-### Underlying Assets
+## Underlying Assets
 Each DeFindex Vault will use a defined set of underlying assets to be invested in one or more strategies. 
 
 Because Strategies are the only one that know exactly the current balance of the asset, the Vault relies on the strategies in order to know the exact total balance for each underlying asset.??
 
 Or if the Vault executes Strategies at its own name (auth), it should execute a speficic `get_assets_balance` function in the strategy contract to know exactely how many assets it has at a specific moment.
 
-### Initialization
+## Initialization
 The DeFindex Vault contract is structured with specific roles and strategies for managing assets effectively. The key roles include the **Fee Receiver**, **Manager**, and **Emergency Manager**, each responsible for different tasks in managing the Vault. Additionally, a predefined set of strategies determines how assets will be allocated within the Vault. A management fee is also established at the time of initialization, which can later be adjusted by the Fee Receiver. Further details on fee handling are explained later in the document.
 
 The allocation ratios for these strategies are not set during the deployment but are defined during the first deposit made into the Vault. For example, imagine a scenario where the Vault is set up to allocate 20% of its assets to a USDC lending pool (like Blend), 30% to another USDC lending pool (such as YieldBlox), and 50% to a USDC-XLM liquidity pool on an Automated Market Maker (AMM) platform (like Soroswap). 
@@ -32,7 +32,7 @@ In summary:
 
 
 
-### Investing: Deposit
+## Investing: Deposit
 When a user deposits assets into the DeFindex, they receive dfTokens that represent their proportional share of the DeFindex's assets. These dfTokens can later be burned to withdraw the corresponding assets.
 
 Upon calling the `deposit()` function, **the assets are transferred to the DeFindex in accordance with the current asset ratio**. For example, if the current ratio is 1 token A, 2 tokens B, and 3 tokens C for each dfToken, this ratio is maintained when assets are deposited. In return, the user receives dfTokens that represent their participation in the DeFindex Vault. 
@@ -43,7 +43,7 @@ Thus, the price per dfToken reflects a multi-asset price. For instance, using th
 
 
 
-### Withdrawals
+## Withdrawals
 When a user wishes to withdraw funds, they must burn a corresponding amount of dfTokens (shares) to receive their **assets at the ratio of the time of withdrawal**.
 
 If there are sufficient **IDLE funds** available, the withdrawal is fulfilled directly from these IDLE funds. If additional assets are needed beyond what is available in the IDLE funds, a liquidation process is triggered to release the required assets.
@@ -81,14 +81,14 @@ Where:
 - $a_{i, \text{IDLE}}$: Amount of asset $i$ to get from the IDLE funds
 - $a_{i, \text{Strategy}}$: Amount of asset $i$ to get from the strategies
 
-### Rebalancing
+## Rebalancing
 Rebalancing is overseen by the **Manager**, who adjusts the allocation of funds between different strategies to maintain or change the ratio of underlying assets. For example, a DeFindex might start with a ratio of 2 USDC to 1 XLM, as initially set by the Deployer. However, this ratio can be modified by the Manager based on strategy performance or market conditions.
 
 Upon deployment, the Deployer establishes the initial strategies and asset ratios for the DeFindex. The Manager has the authority to adjust these ratios as needed to respond to evolving conditions or to optimize performance.
 
 To ensure accurate representation of asset proportions, strategies are required to **report** the amount of each underlying asset they hold. This reporting ensures that when dfTokens are minted or redeemed, the DeFindex maintains the correct asset ratios in line with the current balance and strategy allocations.
 
-#### Functions
+### Functions
 - `assets()`: Returns the assets addresses and amount of each  of them in the DeFindex (and hence its current ratio).
 `[[adress0, amount0], [address1, amount1]]`. TODO: Separate in 2 functions.
 - `withdraw_from_strategies`: Allows the Manager to withdraw assets from one or more strategies, letting them as IDLE funds.
@@ -99,106 +99,143 @@ To ensure accurate representation of asset proportions, strategies are required
 Then, a rebalance execution will withdraw assets from the strategies, swap them, and invest them back in the strategies.
 - `emergency_withdraw`: Allows the Emergency Manager to withdraw all assets from a specific Strategy. As arguments, it receives the the address of a Strategy. It also turns off the strategy.
 
-### Emergency Management
+## Emergency Management
 The Emergency Manager has the authority to withdraw assets from the DeFindex in case of an emergency. This role is designed to protect users' assets in the event of a critical situation, such as a hack of a underlying protocol or a if a strategy gets unhealthy. The Emergency Manager can withdraw assets from the Strategy and store them as IDLE funds inside the Vault until the situation is resolved. 
 
-### Management
+## Management
 Every DeFindex has a manager, who is responsible for managing the DeFindex. The Manager can ebalance the Vault, and invest IDLE funds in strategies. 
+## Fees
 
-### Fees: Receivers, Structure and Collection
+### Fee Receivers
+The DeFindex protocol defines two distinct fee receivers to reward both the creators of the DeFindex Protocol and the deployers of individual Vaults:
 
-**Fee Receivers:** Every DeFindex user will pay a Management Fee for the total amount of funds managed by the DeFindex Vault. These fees will finally be received by two different fee receivers: 
+1. **DeFindex Protocol Fee Receiver**: Receives a fixed protocol fee of 0.5% APR.
+2. **Vault Fee Receiver**: Receives a fee set by the vault deployer, typically recommended between 0.5% and 2% APR.
 
-1. **DeFindex Protocol Fee Receiver**. For creating the protocol.
-2. **Vault Fee Receiver**. For creating the vault.
+The Total Management Fee consists of both the protocol fee and the vault fee. Thus, each Vault has a total APR fee rate $f_{\text{total}}$ such that:
 
-**Fee Structure:**
-The Total Management fee is the sum of **DeFindex Fee** and the **Vault Fee**. This sum can be from 0.5% to 2.5%, and it is defined as follows:
+$$
+f_{\text{total}} = f_{\text{DeFindex}} + f_{\text{Vault}}
+$$
+
+where $f_{\text{DeFindex}} = 0.5\%$ is a fixed fee that goes to the DeFindex Protocol Fee Receiver address, and $f_{\text{Vault}}$ is a variable APR, typically between 0.5% and 2%, that goes to the Vault Fee Receiver address.
 
-1. **The DeFindex Fee** is fixed for all DeFindex Vaults, and this fee is fixed to 0.5% APR. This fee is fixed in the DeFindex Factory Contract.
-2. **The Vault Fee** is set by the Vault Deployer. The recommended initial setup suggests a fee of **0.5% - 2% APR**. 
+### Fee Collection Methodology
 
-**Fee Collection:**
-In order for a vault to collect fees, the DeFindex vault will mint and collect new shares (or dfTokens) whenever a deposit or withdrawal takes place.
+The fee collection process mints new shares, or dfTokens, to cover the accrued management fees. These shares are calculated based on the elapsed time since the last fee assessment, ensuring fees are accrued based on the actual period of asset management. The fee collection is triggered whenever there is a vault interaction, such as a `deposit`, `withdrawal`, or even an explicit `fee_collection` call, with calculations based on the time elapsed since the last fee assessment.
 
-**Mathematical Explanation**
-Lets consider $V_0$, total value locked at $t_0$, total shares $s_0$ at $t_0$ and total management fee of $f$. 
-This fee $f$ its considered as APR. 
+### Mathematical Derivation of New Fees
 
-After one period (one year), new shares  $s_f$ should be minted in order to pay this fee. 
+Let:
 
-$s_1 = s_0 + s_f$
+- $V_0$  be the Total Value Locked (TVL) at the last assessment,
+- $s_0$  be the Total Shares (dfTokens) at the last assessment,
+- $f_{\text{total}}$  be the Total Management Fee (APR).
 
-$V_1 =V_0$ as we consider that no new funds where added
+Over a time period $\Delta t$, the fees due for collection are derived as a value represented by newly minted shares.
 
-$s_f$ should comply with:
+To mint new shares for fee distribution, we calculate the required number of new shares, $s_f$, that correspond to the total management fee over the elapsed period.
 
-The value of the mited share $\frac{V_0}{s_1} * s_f$ should be equal of the fraction of the total value locked $V_0 * f$
+After a period $\Delta t$ (expressed in seconds), and after the fee collection process the new total shares $s_1$ should be:
 
-$\frac{V_0}{s_1} * s_f = V_0 * f$ 
+$$
+s_1 = s_0 + s_f
+$$
 
-so this gets simplified
+Since `fee_collection` is always called before any `deposit` or `withdrawal`, we assume that the Total Value $V_1$ remains equal to $V_0$.
 
-$s_f = f \cdot s_1 = f \cdot (s_0 + s_f)$
+We establish the following condition to ensure the number of minted shares accurately reflects the management fee accrued over $\Delta t$. The value of the new minted shares $s_f$ should equal the prorated APR fee share of the total value of the vault. In mathematical terms:
 
-$s_f = \frac{f \cdot s_0}{(1-f)}$
+$$
+\frac{V_0}{s_1} \times s_f = V_0 \times f_{\text{total}} \times \frac{\Delta t}{\text{SECONDS PER YEAR}}
+$$
 
+Rearranging terms, we get:
 
+$$
+s_f = \frac{f_{\text{total}} \times s_0 \times \Delta t}{\text{SECONDS PER YEAR} - f_{\text{total}} \times \Delta t}
+$$
 
+This equation gives the precise quantity of new shares $s_f$ to mint as dfTokens for the management fee over the period $\Delta t$.
 
+### Distribution of Fees
 
-**Example:**
-For example, if a Vault has 100 shares and the Vault Fee is set at 0.5% APR, the annually collected fees would be 1 share, splited as 0.5 for the Fee Receiver and 0.5 for the DeFindex Protocol.
+Once the total fees, $s_f$, are calculated, the shares are split proportionally between the DeFindex Protocol Fee Receiver and the Vault Fee Receiver. This is done by calculating the ratio of each fee receiver’s APR to the total APR:
 
-total funds:100 (does not change)
-previous shares: 1
-Y≈1.0101
+$$
+s_{\text{DeFindex}} = \frac{s_f \times f_{\text{DeFindex}}}{f_{\text{total}}}
+$$
 
-100/(100+Y) *Y = 1 USDC
-total funds/(previous total shars+fee shares) *fee shares = fee rate of total funds
+$$
+s_{\text{Vault}} = s_f - s_{\text{DeFindex}}
+$$
+
+This ensures that each fee receiver is allocated their respective share of dfTokens based on their fee contribution to $f_{\text{total}}$. The dfTokens are then minted to each receiver’s address as a direct representation of the fees collected.
+
+
+### Example
+
+Suppose a DeFindex vault begins with an initial value of 1 USDC per share and a total of 100 shares (dfTokens), representing an investment of 100 USDC. This investment is placed in a lending protocol with an 8% APY. The DeFindex protocol has a total management fee of 1% APR, split between a 0.5% protocol fee and a 0.5% vault fee.
+
+After one year, the investment grows to 108 USDC due to the 8% APY.
+
+#### Step 1: Calculate the Shares to Mint for Fees
+
+Using the formula:
+
+$
+s_f = \frac{f_{\text{total}} \times s_0 \times \Delta t}{\text{SECONDS PER YEAR} - f_{\text{total}} \times \Delta t}
+$
+
+where:
+- \( f_{\text{total}} = 0.01 \) (1% APR management fee),
+- \( s_0 = 100 \) (initial shares),
+- \( \Delta t = \text{SECONDS PER YEAR} \) (since this example spans a full year),
 
+we calculate \( s_f \), the number of shares to mint for the fee collection.
 
+Substituting values:
 
+$
+s_f = \frac{0.01 \times 100 \times \text{SECONDS PER YEAR}}{\text{SECONDS PER YEAR} - (0.01 \times \text{SECONDS PER YEAR})}
+$
 
-t0 amount0
-t1 amount0 cobra fee por el tiempo (t1-t0) y se suma amount1
-t2 (amount0 y amount 1) cobra fee por el tiempo (t2-t1)
+Simplifying:
 
-100 shares, 100 USDC, price per share = 100/100 = 1
+$
+s_f = \frac{1 \times \text{SECONDS PER YEAR}}{0.99 \times \text{SECONDS PER YEAR}} \approx 1.0101
+$
 
-despues de un año, deposito de 100.
-sin fee: se mintean 100 shares
-new shares: 200, new funds: 200 USDC
+Thus, approximately 1.01 dfTokens are minted as fees.
 
-con fee: se mintean X shares al depositor, Y shares al fee receiver
-total shares: (100 + X + Y)
-total funds: (200 USDC)
-value of fee shares (Y)
-200/(100+X+Y) *Y = 1 USDC
-200/(100+X+Y) *X = 100 USDC
-X=101.0101
-Y=1.0101
+#### Step 2: Update Total Shares and Calculate Price per Share
 
-si no se deposita nada
-100/(100+Y) *Y = 1 USDC
-100/(100+X+Y) *X = 100 USDC
+With the fee tokens minted, the total dfTokens increase from 100 to 101.01.
 
+The vault now holds 108 USDC backing 101.01 dfTokens, so the new price per share is:
 
-300/(100+X+Y) *Y = 1 USDC
-300/(100+X+Y) *X = 200 USDC
+$
+\text{Price per Share} = \frac{108}{101.01} \approx 1.069 \, \text{USDC}
+$
 
+#### Step 3: Determine the Value for a User Holding 100 dfTokens
 
+For a user holding 100 dfTokens, the value of their holdings after one year is approximately:
 
+$
+100 \, \text{dfTokens} \times 1.069 \, \text{USDC per share} = 106.9 \, \text{USDC}
+$
 
-mint x shares, total new shares = (100+x)
-my value of this is x/(100+x) = 1%
+The remaining 1.01 dfTokens represent the collected fee, backed by around:
 
+$
+1.01 \, \text{dfTokens} \times 1.069 \, \text{USDC per share} \approx 1.08 \, \text{USDC}
+\]
 
-101 shares, 1 share is equal to 1/101
+---
 
-These allocations are recalculated and minted whenever a user deposits, withdraws from the DeFindex.
+This breakdown clarifies how the investment grows and the management fee is deducted by minting new dfTokens, resulting in a proportional share value for both users and fee recipients.
 
-For instance, let's say a DeFindex starts with an initial value of 1 USDC per share and 100 shares (dfTokens). These 100 USDC are invested in a lending protocol offering an 8% APY. The DeFindex also has a 0.5% APR fee. After one year, the investment grows to 108 USDC. Additionally, 1 dfToken is minted as a fee. This means the DeFindex now holds 101 dfTokens backed by 108 USDC, making the price per share approximately 1.07 USDC. As a result, a user holding 100 dfTokens will have a value equivalent to around 107 USDC, while the collected fee will be backed by about 1.07 USDC.
 
 It is expected that the Fee Receiver is associated with the manager, allowing the entity managing the Vault to be compensated through the Fee Receiver. In other words, the Fee Receiver could be the manager using the same address, or it could be a different entity such as a streaming contract, a DAO, or another party.
 

From 40f123f72291288707e44337333f9a597b96aaea Mon Sep 17 00:00:00 2001
From: esteblock <estebaniglesiasmanriquez@gmail.com>
Date: Tue, 5 Nov 2024 15:21:34 -0300
Subject: [PATCH 10/39] change folder name, from defindex to vault for
 DeFindexVault Contract

---
 apps/contracts/Cargo.toml                     |   2 +-
 apps/contracts/Makefile                       |   2 +-
 apps/contracts/defindex/src/constants.rs      |   2 -
 apps/contracts/defindex/src/investment.rs     |  43 ----
 apps/contracts/{defindex => vault}/Cargo.toml |   0
 apps/contracts/{defindex => vault}/Makefile   |   0
 .../{defindex => vault}/src/access.rs         |   0
 .../{defindex => vault}/src/aggregator.rs     |  48 +++--
 apps/contracts/vault/src/constants.rs         |   2 +
 .../{defindex => vault}/src/error.rs          |   2 +-
 .../{defindex => vault}/src/events.rs         |  13 +-
 apps/contracts/{defindex => vault}/src/fee.rs |  47 ++--
 .../{defindex => vault}/src/funds.rs          |  37 ++--
 .../{defindex => vault}/src/interface.rs      |  35 +--
 apps/contracts/vault/src/investment.rs        |  54 +++++
 apps/contracts/{defindex => vault}/src/lib.rs | 202 +++++++++++-------
 .../{defindex => vault}/src/models.rs         |   2 +-
 .../{defindex => vault}/src/storage.rs        |  27 ++-
 .../{defindex => vault}/src/strategies.rs     |  47 +++-
 .../contracts/{defindex => vault}/src/test.rs |  32 +--
 .../{defindex => vault}/src/test/admin.rs     |   3 +-
 .../{defindex => vault}/src/test/deposit.rs   |  25 +--
 .../src/test/emergency_withdraw.rs            |  35 ++-
 .../src/test/initialize.rs                    |   6 +-
 .../{defindex => vault}/src/test/rebalance.rs |  33 +--
 .../{defindex => vault}/src/test/withdraw.rs  |  66 +++---
 .../src/token/allowance.rs                    |   0
 .../{defindex => vault}/src/token/balance.rs  |   0
 .../{defindex => vault}/src/token/contract.rs |   0
 .../{defindex => vault}/src/token/metadata.rs |   0
 .../{defindex => vault}/src/token/mod.rs      |   0
 .../src/token/storage_types.rs                |   0
 .../src/token/total_supply.rs                 |   0
 .../{defindex => vault}/src/utils.rs          |  28 ++-
 scf-tracker.md                                |   2 +-
 35 files changed, 485 insertions(+), 310 deletions(-)
 delete mode 100644 apps/contracts/defindex/src/constants.rs
 delete mode 100644 apps/contracts/defindex/src/investment.rs
 rename apps/contracts/{defindex => vault}/Cargo.toml (100%)
 rename apps/contracts/{defindex => vault}/Makefile (100%)
 rename apps/contracts/{defindex => vault}/src/access.rs (100%)
 rename apps/contracts/{defindex => vault}/src/aggregator.rs (65%)
 create mode 100644 apps/contracts/vault/src/constants.rs
 rename apps/contracts/{defindex => vault}/src/error.rs (96%)
 rename apps/contracts/{defindex => vault}/src/events.rs (97%)
 rename apps/contracts/{defindex => vault}/src/fee.rs (72%)
 rename apps/contracts/{defindex => vault}/src/funds.rs (96%)
 rename apps/contracts/{defindex => vault}/src/interface.rs (95%)
 create mode 100644 apps/contracts/vault/src/investment.rs
 rename apps/contracts/{defindex => vault}/src/lib.rs (87%)
 rename apps/contracts/{defindex => vault}/src/models.rs (99%)
 rename apps/contracts/{defindex => vault}/src/storage.rs (81%)
 rename apps/contracts/{defindex => vault}/src/strategies.rs (80%)
 rename apps/contracts/{defindex => vault}/src/test.rs (87%)
 rename apps/contracts/{defindex => vault}/src/test/admin.rs (99%)
 rename apps/contracts/{defindex => vault}/src/test/deposit.rs (96%)
 rename apps/contracts/{defindex => vault}/src/test/emergency_withdraw.rs (79%)
 rename apps/contracts/{defindex => vault}/src/test/initialize.rs (97%)
 rename apps/contracts/{defindex => vault}/src/test/rebalance.rs (82%)
 rename apps/contracts/{defindex => vault}/src/test/withdraw.rs (84%)
 rename apps/contracts/{defindex => vault}/src/token/allowance.rs (100%)
 rename apps/contracts/{defindex => vault}/src/token/balance.rs (100%)
 rename apps/contracts/{defindex => vault}/src/token/contract.rs (100%)
 rename apps/contracts/{defindex => vault}/src/token/metadata.rs (100%)
 rename apps/contracts/{defindex => vault}/src/token/mod.rs (100%)
 rename apps/contracts/{defindex => vault}/src/token/storage_types.rs (100%)
 rename apps/contracts/{defindex => vault}/src/token/total_supply.rs (100%)
 rename apps/contracts/{defindex => vault}/src/utils.rs (93%)

diff --git a/apps/contracts/Cargo.toml b/apps/contracts/Cargo.toml
index dd4a992d..9dee20c8 100644
--- a/apps/contracts/Cargo.toml
+++ b/apps/contracts/Cargo.toml
@@ -1,5 +1,5 @@
 [workspace]
-members = ["strategies/*", "defindex", "factory"]
+members = ["strategies/*", "vault", "factory"]
 exclude = [
     "strategies/external_wasms",
 ]
diff --git a/apps/contracts/Makefile b/apps/contracts/Makefile
index 9c88fe8c..30807186 100644
--- a/apps/contracts/Makefile
+++ b/apps/contracts/Makefile
@@ -1,4 +1,4 @@
-SUBDIRS = strategies defindex factory
+SUBDIRS = strategies vault factory
 
 default: build
 
diff --git a/apps/contracts/defindex/src/constants.rs b/apps/contracts/defindex/src/constants.rs
deleted file mode 100644
index 772d4f54..00000000
--- a/apps/contracts/defindex/src/constants.rs
+++ /dev/null
@@ -1,2 +0,0 @@
-pub(crate) const MAX_BPS: i128 = 10_000;
-pub(crate) const SECONDS_PER_YEAR: i128 = 31_536_000;
\ No newline at end of file
diff --git a/apps/contracts/defindex/src/investment.rs b/apps/contracts/defindex/src/investment.rs
deleted file mode 100644
index adeb3930..00000000
--- a/apps/contracts/defindex/src/investment.rs
+++ /dev/null
@@ -1,43 +0,0 @@
-use soroban_sdk::{Address, Env, Map, Vec};
-
-use crate::{models::Investment, strategies::{get_strategy_asset, invest_in_strategy}, utils::check_nonnegative_amount, ContractError};
-
-pub fn prepare_investment(e: &Env, investments: Vec<Investment>, idle_funds: Map<Address, i128>) -> Result<Map<Address, i128>, ContractError> {
-  let mut total_investment_per_asset: Map<Address, i128> = Map::new(e);
-  
-  for investment in investments.iter() {
-      let strategy_address = &investment.strategy;
-      let amount_to_invest = investment.amount;
-      check_nonnegative_amount(amount_to_invest.clone())?;
-  
-      // Find the corresponding asset for the strategy
-      let asset = get_strategy_asset(&e, strategy_address)?;
-  
-      // Track investment per asset
-      let current_investment = total_investment_per_asset
-          .get(asset.address.clone())
-          .unwrap_or(0);
-      let updated_investment = current_investment.checked_add(amount_to_invest).ok_or(ContractError::Overflow)?;
-  
-      total_investment_per_asset.set(asset.address.clone(), updated_investment);
-  
-      // Check if total investment exceeds idle funds
-      let idle_balance = idle_funds.get(asset.address.clone()).unwrap_or(0);
-      if updated_investment > idle_balance {
-          return Err(ContractError::NotEnoughIdleFunds);
-      }
-  }
-  
-  Ok(total_investment_per_asset)
-}
-
-pub fn execute_investment(e: &Env, investments: Vec<Investment>) -> Result<(), ContractError> {
-  for investment in investments.iter() {
-      let strategy_address = &investment.strategy;
-      let amount_to_invest = &investment.amount;
-
-      invest_in_strategy(e, strategy_address, amount_to_invest)?
-  }
-
-  Ok(())
-}
\ No newline at end of file
diff --git a/apps/contracts/defindex/Cargo.toml b/apps/contracts/vault/Cargo.toml
similarity index 100%
rename from apps/contracts/defindex/Cargo.toml
rename to apps/contracts/vault/Cargo.toml
diff --git a/apps/contracts/defindex/Makefile b/apps/contracts/vault/Makefile
similarity index 100%
rename from apps/contracts/defindex/Makefile
rename to apps/contracts/vault/Makefile
diff --git a/apps/contracts/defindex/src/access.rs b/apps/contracts/vault/src/access.rs
similarity index 100%
rename from apps/contracts/defindex/src/access.rs
rename to apps/contracts/vault/src/access.rs
diff --git a/apps/contracts/defindex/src/aggregator.rs b/apps/contracts/vault/src/aggregator.rs
similarity index 65%
rename from apps/contracts/defindex/src/aggregator.rs
rename to apps/contracts/vault/src/aggregator.rs
index 70f5050c..c10e34db 100644
--- a/apps/contracts/defindex/src/aggregator.rs
+++ b/apps/contracts/vault/src/aggregator.rs
@@ -1,14 +1,18 @@
 use soroban_sdk::{vec, Address, Env, IntoVal, Symbol, Val, Vec};
 
-use crate::{models::DexDistribution, storage::{get_assets, get_factory}, ContractError};
+use crate::{
+    models::DexDistribution,
+    storage::{get_assets, get_factory},
+    ContractError,
+};
 
 fn fetch_aggregator_address(e: &Env) -> Address {
     let factory_address = get_factory(e);
 
     e.invoke_contract(
-      &factory_address,
-      &Symbol::new(&e, "aggregator"), 
-      Vec::new(&e)
+        &factory_address,
+        &Symbol::new(&e, "aggregator"),
+        Vec::new(&e),
     )
 }
 
@@ -16,8 +20,16 @@ fn is_supported_asset(e: &Env, token: &Address) -> bool {
     let assets = get_assets(e);
     assets.iter().any(|asset| &asset.address == token)
 }
-  
-pub fn internal_swap_exact_tokens_for_tokens(e: &Env, token_in: &Address, token_out: &Address, amount_in: &i128, amount_out_min: &i128, distribution: &Vec<DexDistribution>, deadline: &u64) -> Result<(), ContractError> {
+
+pub fn internal_swap_exact_tokens_for_tokens(
+    e: &Env,
+    token_in: &Address,
+    token_out: &Address,
+    amount_in: &i128,
+    amount_out_min: &i128,
+    distribution: &Vec<DexDistribution>,
+    deadline: &u64,
+) -> Result<(), ContractError> {
     let aggregator_address = fetch_aggregator_address(e);
 
     // Check if both tokens are supported by the vault
@@ -35,13 +47,21 @@ pub fn internal_swap_exact_tokens_for_tokens(e: &Env, token_in: &Address, token_
     init_args.push_back(deadline.into_val(e));
 
     e.invoke_contract(
-      &aggregator_address,
-      &Symbol::new(&e, "swap_exact_tokens_for_tokens"), 
-      Vec::new(&e)
+        &aggregator_address,
+        &Symbol::new(&e, "swap_exact_tokens_for_tokens"),
+        Vec::new(&e),
     )
 }
 
-pub fn internal_swap_tokens_for_exact_tokens(e: &Env, token_in: &Address, token_out: &Address, amount_out: &i128, amount_in_max: &i128, distribution: &Vec<DexDistribution>, deadline: &u64) -> Result<(), ContractError> {
+pub fn internal_swap_tokens_for_exact_tokens(
+    e: &Env,
+    token_in: &Address,
+    token_out: &Address,
+    amount_out: &i128,
+    amount_in_max: &i128,
+    distribution: &Vec<DexDistribution>,
+    deadline: &u64,
+) -> Result<(), ContractError> {
     let aggregator_address = fetch_aggregator_address(e);
 
     // Check if both tokens are supported by the vault
@@ -59,8 +79,8 @@ pub fn internal_swap_tokens_for_exact_tokens(e: &Env, token_in: &Address, token_
     init_args.push_back(deadline.into_val(e));
 
     e.invoke_contract(
-      &aggregator_address,
-      &Symbol::new(&e, "swap_tokens_for_exact_tokens"), 
-      Vec::new(&e)
+        &aggregator_address,
+        &Symbol::new(&e, "swap_tokens_for_exact_tokens"),
+        Vec::new(&e),
     )
-}
\ No newline at end of file
+}
diff --git a/apps/contracts/vault/src/constants.rs b/apps/contracts/vault/src/constants.rs
new file mode 100644
index 00000000..1428e1b8
--- /dev/null
+++ b/apps/contracts/vault/src/constants.rs
@@ -0,0 +1,2 @@
+pub(crate) const MAX_BPS: i128 = 10_000;
+pub(crate) const SECONDS_PER_YEAR: i128 = 31_536_000;
diff --git a/apps/contracts/defindex/src/error.rs b/apps/contracts/vault/src/error.rs
similarity index 96%
rename from apps/contracts/defindex/src/error.rs
rename to apps/contracts/vault/src/error.rs
index 24b4b6f0..7a2fec42 100644
--- a/apps/contracts/defindex/src/error.rs
+++ b/apps/contracts/vault/src/error.rs
@@ -8,7 +8,7 @@ pub enum ContractError {
     NotInitialized = 100,
     AlreadyInitialized = 101,
     InvalidRatio = 102,
-    StrategyDoesNotSupportAsset=103,
+    StrategyDoesNotSupportAsset = 103,
 
     // Validation Errors (11x)
     NegativeNotAllowed = 110,
diff --git a/apps/contracts/defindex/src/events.rs b/apps/contracts/vault/src/events.rs
similarity index 97%
rename from apps/contracts/defindex/src/events.rs
rename to apps/contracts/vault/src/events.rs
index deca5b5d..880b6a45 100644
--- a/apps/contracts/defindex/src/events.rs
+++ b/apps/contracts/vault/src/events.rs
@@ -1,6 +1,6 @@
 //! Definition of the Events used in the DeFindex Vault contract
-use soroban_sdk::{contracttype, symbol_short, Address, Env, Vec};
 use crate::models::AssetAllocation;
+use soroban_sdk::{contracttype, symbol_short, Address, Env, Vec};
 
 // INITIALIZED VAULT EVENT
 #[contracttype]
@@ -178,9 +178,7 @@ pub struct ManagerChangedEvent {
 
 /// Publishes a `ManagerChangedEvent` to the event stream.
 pub(crate) fn emit_manager_changed_event(e: &Env, new_manager: Address) {
-    let event = ManagerChangedEvent {
-        new_manager,
-    };
+    let event = ManagerChangedEvent { new_manager };
 
     e.events()
         .publish(("DeFindexVault", symbol_short!("nmanager")), event);
@@ -194,10 +192,7 @@ pub struct EmergencyManagerChangedEvent {
 }
 
 /// Publishes an `EmergencyManagerChangedEvent` to the event stream.
-pub(crate) fn emit_emergency_manager_changed_event(
-    e: &Env,
-    new_emergency_manager: Address,
-) {
+pub(crate) fn emit_emergency_manager_changed_event(e: &Env, new_emergency_manager: Address) {
     let event = EmergencyManagerChangedEvent {
         new_emergency_manager,
     };
@@ -233,4 +228,4 @@ pub(crate) fn emit_fees_minted_event(
 
     e.events()
         .publish(("DeFindexVault", symbol_short!("mfees")), event);
-}
\ No newline at end of file
+}
diff --git a/apps/contracts/defindex/src/fee.rs b/apps/contracts/vault/src/fee.rs
similarity index 72%
rename from apps/contracts/defindex/src/fee.rs
rename to apps/contracts/vault/src/fee.rs
index 3d2e765d..1cd57a06 100644
--- a/apps/contracts/defindex/src/fee.rs
+++ b/apps/contracts/vault/src/fee.rs
@@ -1,23 +1,30 @@
 use soroban_sdk::{Address, Env, Map, Symbol, Vec};
 
-use crate::{access::AccessControl, constants::{MAX_BPS, SECONDS_PER_YEAR}, events, funds::fetch_total_managed_funds, storage::{get_defindex_receiver, get_factory, get_last_fee_assesment, get_vault_share, set_last_fee_assesment}, token::internal_mint, utils::calculate_dftokens_from_asset_amounts, ContractError};
+use crate::{
+    access::AccessControl,
+    constants::{MAX_BPS, SECONDS_PER_YEAR},
+    events,
+    funds::fetch_total_managed_funds,
+    storage::{
+        get_defindex_receiver, get_factory, get_last_fee_assesment, get_vault_share,
+        set_last_fee_assesment,
+    },
+    token::internal_mint,
+    utils::calculate_dftokens_from_asset_amounts,
+    ContractError,
+};
 
 /// Fetches the current fee rate from the factory contract.
 /// The fee rate is expressed in basis points (BPS).
 fn fetch_fee_rate(e: &Env) -> u32 {
-  let factory_address = get_factory(e);
-  // Interacts with the factory contract to get the fee rate.
-  e.invoke_contract(
-    &factory_address,
-    &Symbol::new(&e, "fee_rate"), 
-    Vec::new(&e)
-  )
+    let factory_address = get_factory(e);
+    // Interacts with the factory contract to get the fee rate.
+    e.invoke_contract(&factory_address, &Symbol::new(&e, "fee_rate"), Vec::new(&e))
 }
 
 fn calculate_fees(e: &Env, time_elapsed: u64, fee_rate: u32) -> Result<i128, ContractError> {
-
     let total_managed_funds = fetch_total_managed_funds(e); // Get total managed funds per asset
-    
+
     let seconds_per_year = SECONDS_PER_YEAR; // 365 days in seconds
 
     let mut total_fees_per_asset: Map<Address, i128> = Map::new(&e);
@@ -28,10 +35,10 @@ fn calculate_fees(e: &Env, time_elapsed: u64, fee_rate: u32) -> Result<i128, Con
         let current_asset_value = amount;
 
         // Calculate the fee for this asset based on the fee rate and time elapsed
-        let asset_fee = (current_asset_value * fee_rate as i128 * time_elapsed as i128) / (seconds_per_year * MAX_BPS);
+        let asset_fee = (current_asset_value * fee_rate as i128 * time_elapsed as i128)
+            / (seconds_per_year * MAX_BPS);
 
         total_fees_per_asset.set(asset_address.clone(), asset_fee);
-
     }
 
     let total_fees_in_dftokens = calculate_dftokens_from_asset_amounts(e, total_fees_per_asset)?;
@@ -41,7 +48,7 @@ fn calculate_fees(e: &Env, time_elapsed: u64, fee_rate: u32) -> Result<i128, Con
 
 pub fn collect_fees(e: &Env) -> Result<(), ContractError> {
     let current_timestamp = e.ledger().timestamp();
-    let last_fee_assessment = get_last_fee_assesment(e); 
+    let last_fee_assessment = get_last_fee_assesment(e);
 
     let time_elapsed = current_timestamp.checked_sub(last_fee_assessment).unwrap();
 
@@ -64,19 +71,25 @@ pub fn collect_fees(e: &Env) -> Result<(), ContractError> {
 
 fn mint_fees(e: &Env, total_fees: i128) -> Result<(), ContractError> {
     let access_control = AccessControl::new(&e);
-    
+
     let vault_fee_receiver = access_control.get_fee_receiver()?;
     let defindex_receiver = get_defindex_receiver(e);
 
     let vault_share_bps = get_vault_share(e);
 
     let vault_shares = (total_fees * vault_share_bps as i128) / MAX_BPS;
-    
+
     let defindex_shares = total_fees - vault_shares;
 
     internal_mint(e.clone(), vault_fee_receiver.clone(), vault_shares);
     internal_mint(e.clone(), defindex_receiver.clone(), defindex_shares);
 
-    events::emit_fees_minted_event(e, defindex_receiver, defindex_shares, vault_fee_receiver, vault_shares);
+    events::emit_fees_minted_event(
+        e,
+        defindex_receiver,
+        defindex_shares,
+        vault_fee_receiver,
+        vault_shares,
+    );
     Ok(())
-}
\ No newline at end of file
+}
diff --git a/apps/contracts/defindex/src/funds.rs b/apps/contracts/vault/src/funds.rs
similarity index 96%
rename from apps/contracts/defindex/src/funds.rs
rename to apps/contracts/vault/src/funds.rs
index 830ffa13..f02d879b 100644
--- a/apps/contracts/defindex/src/funds.rs
+++ b/apps/contracts/vault/src/funds.rs
@@ -5,28 +5,28 @@ use crate::models::AssetAllocation;
 use crate::storage::get_assets;
 use crate::strategies::get_strategy_client;
 
-// Funds for AssetAllocation 
+// Funds for AssetAllocation
 
 /// Fetches the idle funds for a given asset. Idle funds refer to the balance of the asset
 /// that is currently not invested in any strategies.
-/// 
+///
 /// # Arguments
 /// * `e` - The current environment instance.
 /// * `asset` - The asset for which idle funds are being fetched.
-/// 
+///
 /// # Returns
 /// * The idle balance (i128) of the asset in the current contract address.
 fn fetch_idle_funds_for_asset(e: &Env, asset: &AssetAllocation) -> i128 {
     TokenClient::new(e, &asset.address).balance(&e.current_contract_address())
 }
 
-/// Fetches the total funds that are invested for a given asset. 
+/// Fetches the total funds that are invested for a given asset.
 /// It iterates through all the strategies associated with the asset and sums their balances.
-/// 
+///
 /// # Arguments
 /// * `e` - The current environment instance.
 /// * `asset` - The asset for which invested funds are being fetched.
-/// 
+///
 /// # Returns
 /// * The total invested balance (i128) of the asset across all strategies.
 pub fn fetch_invested_funds_for_strategy(e: &Env, strategy_address: &Address) -> i128 {
@@ -34,13 +34,13 @@ pub fn fetch_invested_funds_for_strategy(e: &Env, strategy_address: &Address) ->
     strategy_client.balance(&e.current_contract_address())
 }
 
-/// Fetches the total funds that are invested for a given asset. 
+/// Fetches the total funds that are invested for a given asset.
 /// It iterates through all the strategies associated with the asset and sums their balances.
-/// 
+///
 /// # Arguments
 /// * `e` - The current environment instance.
 /// * `asset` - The asset for which invested funds are being fetched.
-/// 
+///
 /// # Returns
 /// * The total invested balance (i128) of the asset across all strategies.
 pub fn fetch_invested_funds_for_asset(e: &Env, asset: &AssetAllocation) -> i128 {
@@ -51,15 +51,14 @@ pub fn fetch_invested_funds_for_asset(e: &Env, asset: &AssetAllocation) -> i128
     invested_funds
 }
 
-
 // Pub functions
 
-/// Fetches the current idle funds for all assets managed by the contract. 
+/// Fetches the current idle funds for all assets managed by the contract.
 /// It returns a map where the key is the asset's address and the value is the idle balance.
-/// 
+///
 /// # Arguments
 /// * `e` - The current environment instance.
-/// 
+///
 /// # Returns
 /// * A map where each entry represents an asset's address and its corresponding idle balance.
 pub fn fetch_current_idle_funds(e: &Env) -> Map<Address, i128> {
@@ -71,12 +70,12 @@ pub fn fetch_current_idle_funds(e: &Env) -> Map<Address, i128> {
     map
 }
 
-/// Fetches the current invested funds for all assets managed by the contract. 
+/// Fetches the current invested funds for all assets managed by the contract.
 /// It returns a map where the key is the asset's address and the value is the invested balance.
-/// 
+///
 /// # Arguments
 /// * `e` - The current environment instance.
-/// 
+///
 /// # Returns
 /// * A map where each entry represents an asset's address and its corresponding invested balance.
 pub fn fetch_current_invested_funds(e: &Env) -> Map<Address, i128> {
@@ -92,12 +91,12 @@ pub fn fetch_current_invested_funds(e: &Env) -> Map<Address, i128> {
 }
 
 /// Fetches the total managed funds for all assets. This includes both idle and invested funds.
-/// It returns a map where the key is the asset's address and the value is the total managed balance 
+/// It returns a map where the key is the asset's address and the value is the total managed balance
 /// (idle + invested). With this map we can calculate the current managed funds ratio.
-/// 
+///
 /// # Arguments
 /// * `e` - The current environment instance.
-/// 
+///
 /// # Returns
 /// * A map where each entry represents an asset's address and its total managed balance.
 pub fn fetch_total_managed_funds(e: &Env) -> Map<Address, i128> {
diff --git a/apps/contracts/defindex/src/interface.rs b/apps/contracts/vault/src/interface.rs
similarity index 95%
rename from apps/contracts/defindex/src/interface.rs
rename to apps/contracts/vault/src/interface.rs
index 9dc76739..dafdc998 100644
--- a/apps/contracts/defindex/src/interface.rs
+++ b/apps/contracts/vault/src/interface.rs
@@ -6,12 +6,11 @@ use crate::{
 };
 
 pub trait VaultTrait {
-
     /// Initializes the DeFindex Vault contract with the required parameters.
     ///
     /// This function sets the roles for emergency manager, fee receiver, and manager.
     /// It also stores the list of assets to be managed by the vault, including strategies for each asset.
-    /// 
+    ///
     /// # Arguments:
     /// * `e` - The environment.
     /// * `assets` - A vector of `AssetAllocation` structs representing the assets and their associated strategies.
@@ -86,7 +85,11 @@ pub trait VaultTrait {
     ///
     /// # Returns:
     /// * `Result<(), ContractError>` - Ok if successful, otherwise returns a ContractError.
-    fn emergency_withdraw(e: Env, strategy_address: Address, caller: Address) -> Result<(), ContractError>;
+    fn emergency_withdraw(
+        e: Env,
+        strategy_address: Address,
+        caller: Address,
+    ) -> Result<(), ContractError>;
 
     /// Pauses a strategy to prevent it from being used in the vault.
     ///
@@ -100,7 +103,11 @@ pub trait VaultTrait {
     ///
     /// # Returns:
     /// * `Result<(), ContractError>` - Ok if successful, otherwise returns a ContractError.
-    fn pause_strategy(e: Env, strategy_address: Address, caller: Address) -> Result<(), ContractError>;
+    fn pause_strategy(
+        e: Env,
+        strategy_address: Address,
+        caller: Address,
+    ) -> Result<(), ContractError>;
 
     /// Unpauses a previously paused strategy.
     ///
@@ -114,7 +121,11 @@ pub trait VaultTrait {
     ///
     /// # Returns:
     /// * `Result<(), ContractError>` - Ok if successful, otherwise returns a ContractError.
-    fn unpause_strategy(e: Env, strategy_address: Address, caller: Address) -> Result<(), ContractError>;
+    fn unpause_strategy(
+        e: Env,
+        strategy_address: Address,
+        caller: Address,
+    ) -> Result<(), ContractError>;
 
     /// Retrieves the list of assets managed by the DeFindex Vault.
     ///
@@ -136,7 +147,7 @@ pub trait VaultTrait {
     /// # Returns:
     /// * `Map<Address, i128>` - A map of asset addresses to their total managed amounts.
     fn fetch_total_managed_funds(e: &Env) -> Map<Address, i128>;
-    
+
     /// Returns the current invested funds, representing the total assets allocated to strategies.
     ///
     /// This function provides a map where the key is the asset address and the value is the total amount
@@ -164,7 +175,6 @@ pub trait VaultTrait {
     // TODO: DELETE THIS, USED FOR TESTING
     /// Temporary method for testing purposes.
     fn get_asset_amounts_for_dftokens(e: Env, df_token: i128) -> Map<Address, i128>;
-
 }
 
 pub trait AdminInterfaceTrait {
@@ -234,25 +244,24 @@ pub trait AdminInterfaceTrait {
 }
 
 pub trait VaultManagementTrait {
-
     /// Invests the vault's idle funds into the specified strategies.
-    /// 
+    ///
     /// # Arguments:
     /// * `e` - The environment.
     /// * `investment` - A vector of `Investment` structs representing the amount to invest in each strategy.
     /// * `caller` - The address of the caller.
-    /// 
+    ///
     /// # Returns:
     /// * `Result<(), ContractError>` - Ok if successful, otherwise returns a ContractError.
     fn invest(e: Env, investment: Vec<Investment>) -> Result<(), ContractError>;
 
     /// Rebalances the vault by executing a series of instructions.
-    /// 
+    ///
     /// # Arguments:
     /// * `e` - The environment.
     /// * `instructions` - A vector of `Instruction` structs representing actions (withdraw, invest, swap, zapper) to be taken.
-    /// 
+    ///
     /// # Returns:
     /// * `Result<(), ContractError>` - Ok if successful, otherwise returns a ContractError.
     fn rebalance(e: Env, instructions: Vec<Instruction>) -> Result<(), ContractError>;
-}
\ No newline at end of file
+}
diff --git a/apps/contracts/vault/src/investment.rs b/apps/contracts/vault/src/investment.rs
new file mode 100644
index 00000000..889a41e8
--- /dev/null
+++ b/apps/contracts/vault/src/investment.rs
@@ -0,0 +1,54 @@
+use soroban_sdk::{Address, Env, Map, Vec};
+
+use crate::{
+    models::Investment,
+    strategies::{get_strategy_asset, invest_in_strategy},
+    utils::check_nonnegative_amount,
+    ContractError,
+};
+
+pub fn prepare_investment(
+    e: &Env,
+    investments: Vec<Investment>,
+    idle_funds: Map<Address, i128>,
+) -> Result<Map<Address, i128>, ContractError> {
+    let mut total_investment_per_asset: Map<Address, i128> = Map::new(e);
+
+    for investment in investments.iter() {
+        let strategy_address = &investment.strategy;
+        let amount_to_invest = investment.amount;
+        check_nonnegative_amount(amount_to_invest.clone())?;
+
+        // Find the corresponding asset for the strategy
+        let asset = get_strategy_asset(&e, strategy_address)?;
+
+        // Track investment per asset
+        let current_investment = total_investment_per_asset
+            .get(asset.address.clone())
+            .unwrap_or(0);
+        let updated_investment = current_investment
+            .checked_add(amount_to_invest)
+            .ok_or(ContractError::Overflow)?;
+
+        total_investment_per_asset.set(asset.address.clone(), updated_investment);
+
+        // Check if total investment exceeds idle funds
+        let idle_balance = idle_funds.get(asset.address.clone()).unwrap_or(0);
+        if updated_investment > idle_balance {
+            return Err(ContractError::NotEnoughIdleFunds);
+        }
+    }
+
+    Ok(total_investment_per_asset)
+}
+
+pub fn execute_investment(e: &Env, investments: Vec<Investment>) -> Result<(), ContractError> {
+    for investment in investments.iter() {
+        let strategy_address = &investment.strategy;
+        let amount_to_invest = &investment.amount;
+
+        invest_in_strategy(e, strategy_address, amount_to_invest)?
+    }
+
+    Ok(())
+}
diff --git a/apps/contracts/defindex/src/lib.rs b/apps/contracts/vault/src/lib.rs
similarity index 87%
rename from apps/contracts/defindex/src/lib.rs
rename to apps/contracts/vault/src/lib.rs
index 044b1470..e2ea5c59 100755
--- a/apps/contracts/defindex/src/lib.rs
+++ b/apps/contracts/vault/src/lib.rs
@@ -1,9 +1,8 @@
 #![no_std]
-use aggregator::{internal_swap_exact_tokens_for_tokens, internal_swap_tokens_for_exact_tokens};
-use fee::collect_fees;
-use investment::{execute_investment, prepare_investment};
 use soroban_sdk::{
-    contract, contractimpl, panic_with_error, token::{TokenClient, TokenInterface}, Address, Env, Map, String, Vec
+    contract, contractimpl, panic_with_error,
+    token::{TokenClient, TokenInterface},
+    Address, Env, Map, String, Vec,
 };
 use soroban_token_sdk::metadata::TokenMetadata;
 
@@ -24,16 +23,28 @@ mod token;
 mod utils;
 
 use access::{AccessControl, AccessControlTrait, RolesDataKey};
+use aggregator::{internal_swap_exact_tokens_for_tokens, internal_swap_tokens_for_exact_tokens};
+use fee::collect_fees;
 use funds::{fetch_current_idle_funds, fetch_current_invested_funds, fetch_total_managed_funds};
-use interface::{AdminInterfaceTrait, VaultTrait, VaultManagementTrait};
-use models::{ActionType, AssetAllocation, Instruction, Investment, OptionalSwapDetailsExactIn, OptionalSwapDetailsExactOut};
+use interface::{AdminInterfaceTrait, VaultManagementTrait, VaultTrait};
+use investment::{execute_investment, prepare_investment};
+use models::{
+    ActionType, AssetAllocation, Instruction, Investment, OptionalSwapDetailsExactIn,
+    OptionalSwapDetailsExactOut,
+};
 use storage::{
-    get_assets, set_asset, set_defindex_receiver, set_factory, set_last_fee_assesment, set_total_assets, set_vault_share
+    get_assets, set_asset, set_defindex_receiver, set_factory, set_last_fee_assesment,
+    set_total_assets, set_vault_share,
+};
+use strategies::{
+    get_asset_allocation_from_address, get_strategy_asset, get_strategy_client,
+    get_strategy_struct, invest_in_strategy, pause_strategy, unpause_strategy,
+    withdraw_from_strategy,
 };
-use strategies::{get_asset_allocation_from_address, get_strategy_asset, get_strategy_client, get_strategy_struct, invest_in_strategy, pause_strategy, unpause_strategy, withdraw_from_strategy};
-use token::{internal_mint, internal_burn, write_metadata, VaultToken};
+use token::{internal_burn, internal_mint, write_metadata, VaultToken};
 use utils::{
-    calculate_asset_amounts_for_dftokens, calculate_deposit_amounts_and_shares_to_mint, calculate_withdrawal_amounts, check_initialized, check_nonnegative_amount
+    calculate_asset_amounts_for_dftokens, calculate_deposit_amounts_and_shares_to_mint,
+    calculate_withdrawal_amounts, check_initialized, check_nonnegative_amount,
 };
 
 pub use error::ContractError;
@@ -47,7 +58,7 @@ impl VaultTrait for DeFindexVault {
     ///
     /// This function sets the roles for emergency manager, fee receiver, and manager.
     /// It also stores the list of assets to be managed by the vault, including strategies for each asset.
-    /// 
+    ///
     /// # Arguments:
     /// * `e` - The environment.
     /// * `assets` - A vector of `AssetAllocation` structs representing the assets and their associated strategies.
@@ -92,10 +103,11 @@ impl VaultTrait for DeFindexVault {
 
         // Store Assets Objects
         let total_assets = assets.len();
+        // TODO Require minimum 1 asset
         set_total_assets(&e, total_assets as u32);
         for (i, asset) in assets.iter().enumerate() {
             // for every asset, we need to check that the list of strategyes indeed support this asset
-            
+
             // TODO Fix, currently failing
             // for strategy in asset.strategies.iter() {
             //     let strategy_client = DeFindexStrategyClient::new(&e, &strategy.address);
@@ -119,7 +131,14 @@ impl VaultTrait for DeFindexVault {
             },
         );
 
-        events::emit_initialized_vault(&e, emergency_manager, fee_receiver, manager, defindex_receiver, assets);
+        events::emit_initialized_vault(
+            &e,
+            emergency_manager,
+            fee_receiver,
+            manager,
+            defindex_receiver,
+            assets,
+        );
 
         Ok(())
     }
@@ -148,16 +167,20 @@ impl VaultTrait for DeFindexVault {
         from.require_auth();
 
         // Set LastFeeAssessment if it is the first deposit
-        if VaultToken::total_supply(e.clone())==0{
+        if VaultToken::total_supply(e.clone()) == 0 {
             set_last_fee_assesment(&e, &e.ledger().timestamp());
         }
 
         // get assets
         let assets = get_assets(&e);
-        // assets lenght should be equal to amounts_desired and amounts_min length
+        // lenght should be equal tolength
+        let assets_length = assets.len();
+        let asset = t_assets(&e);
         let assets_length = assets.len();
+
+        // assets lenght should be equal to amounts_desired and amounts_min length
         if assets_length != amounts_desired.len() || assets_length != amounts_min.len() {
-            panic_with_error!(&e, ContractError::WrongAmuntsLength);
+            panic_with_error!(&e, ContractError::WrongAmountsLength);
         }
 
         // for every amount desired, check non negative
@@ -167,20 +190,23 @@ impl VaultTrait for DeFindexVault {
         // for amount min is not necesary to check if it is negative
 
         let (amounts, shares_to_mint) = if assets_length == 1 {
-        // If Total Assets == 1
-            let shares = if VaultToken::total_supply(e.clone())==0{
+            // If Total Assets == 1
+            let shares = if VaultToken::total_supply(e.clone()) == 0 {
                 // TODO In this case we might also want to mint a MINIMUM LIQUIDITY to be locked forever in the contract
                 // this might be for security and practical reasons as well
                 // shares will be equal to the amount desired to deposit, just for simplicity
                 amounts_desired.get(0).unwrap() // here we have already check same lenght
-            } else{
+            } else {
                 // in this case we will mint a share proportional to the total managed funds
                 let total_managed_funds = fetch_total_managed_funds(&e);
-                VaultToken::total_supply(e.clone()) * amounts_desired.get(0).unwrap() / total_managed_funds.get(assets.get(0).unwrap().address.clone()).unwrap()
+                VaultToken::total_supply(e.clone()) * amounts_desired.get(0).unwrap()
+                    /   
+                        .get(assets.get(0).unwrap().address.clone())
+                        .unwrap()
             };
             (amounts_desired, shares)
         } else {
-        // If Total Assets > 1
+            // If Total Assets > 1
             calculate_deposit_amounts_and_shares_to_mint(
                 &e,
                 &assets,
@@ -227,59 +253,62 @@ impl VaultTrait for DeFindexVault {
         check_initialized(&e)?;
         check_nonnegative_amount(df_amount)?;
         from.require_auth();
-    
+
         // Check if the user has enough dfTokens
         let df_user_balance = VaultToken::balance(e.clone(), from.clone());
         if df_user_balance < df_amount {
             return Err(ContractError::InsufficientBalance);
         }
-    
+
         // Calculate the withdrawal amounts for each asset based on the dfToken amount
         let asset_amounts = calculate_asset_amounts_for_dftokens(&e, df_amount);
 
         // Burn the dfTokens after calculating the withdrawal amounts (so total supply is correct)
         internal_burn(e.clone(), from.clone(), df_amount);
-    
+
         // Create a map to store the total amounts to transfer for each asset address
         let mut total_amounts_to_transfer: Map<Address, i128> = Map::new(&e);
-    
+
         // Get idle funds for each asset (Map<Address, i128>)
         let idle_funds = fetch_current_idle_funds(&e);
-    
+
         // Loop through each asset and handle the withdrawal
         for (asset_address, required_amount) in asset_amounts.iter() {
             // Check idle funds for this asset
             let idle_balance = idle_funds.get(asset_address.clone()).unwrap_or(0);
 
             let mut remaining_amount = required_amount;
-    
+
             // Withdraw as much as possible from idle funds first
             if idle_balance > 0 {
                 if idle_balance >= required_amount {
                     // Idle funds cover the full amount
                     total_amounts_to_transfer.set(asset_address.clone(), required_amount);
-                    continue;  // No need to withdraw from the strategy
+                    continue; // No need to withdraw from the strategy
                 } else {
                     // Partial withdrawal from idle funds
                     total_amounts_to_transfer.set(asset_address.clone(), idle_balance);
-                    remaining_amount = required_amount - idle_balance;  // Update remaining amount
+                    remaining_amount = required_amount - idle_balance; // Update remaining amount
                 }
             }
-    
+
             // Find the corresponding asset address for this strategy
             let asset_allocation = get_asset_allocation_from_address(&e, asset_address.clone())?;
-            let withdrawal_amounts = calculate_withdrawal_amounts(&e, remaining_amount, asset_allocation);
+            let withdrawal_amounts =
+                calculate_withdrawal_amounts(&e, remaining_amount, asset_allocation);
 
             for (strategy_address, amount) in withdrawal_amounts.iter() {
                 // TODO: What if the withdraw method exceeds the instructions limit? since im trying to ithdraw from all strategies of all assets...
                 withdraw_from_strategy(&e, &strategy_address, &amount)?;
-    
+
                 // Update the total amounts to transfer map
-                let current_amount = total_amounts_to_transfer.get(strategy_address.clone()).unwrap_or(0);
+                let current_amount = total_amounts_to_transfer
+                    .get(strategy_address.clone())
+                    .unwrap_or(0);
                 total_amounts_to_transfer.set(asset_address.clone(), current_amount + amount);
             }
         }
-    
+
         // Perform the transfers for the total amounts
         let mut amounts_withdrawn: Vec<i128> = Vec::new(&e);
         for (asset_address, total_amount) in total_amounts_to_transfer.iter() {
@@ -295,7 +324,7 @@ impl VaultTrait for DeFindexVault {
 
         // fees assesment
         collect_fees(&e)?;
-    
+
         Ok(amounts_withdrawn)
     }
 
@@ -312,31 +341,38 @@ impl VaultTrait for DeFindexVault {
     ///
     /// # Returns:
     /// * `Result<(), ContractError>` - Ok if successful, otherwise returns a ContractError.
-    fn emergency_withdraw(e: Env, strategy_address: Address, caller: Address) -> Result<(), ContractError> {
+    fn emergency_withdraw(
+        e: Env,
+        strategy_address: Address,
+        caller: Address,
+    ) -> Result<(), ContractError> {
         check_initialized(&e)?;
-    
+
         // Ensure the caller is the Manager or Emergency Manager
         let access_control = AccessControl::new(&e);
-        access_control.require_any_role(&[RolesDataKey::EmergencyManager, RolesDataKey::Manager], &caller);
-    
+        access_control.require_any_role(
+            &[RolesDataKey::EmergencyManager, RolesDataKey::Manager],
+            &caller,
+        );
+
         // Find the strategy and its associated asset
         let asset = get_strategy_asset(&e, &strategy_address)?;
         // This ensures that the vault has this strategy in its list of assets
         let strategy = get_strategy_struct(&strategy_address, &asset)?;
-        
+
         // Withdraw all assets from the strategy
         let strategy_client = get_strategy_client(&e, strategy.address.clone());
         let strategy_balance = strategy_client.balance(&e.current_contract_address());
-    
+
         if strategy_balance > 0 {
             strategy_client.withdraw(&strategy_balance, &e.current_contract_address());
 
             //TODO: Should we check if the idle funds are corresponding to the strategy balance withdrawed?
         }
-        
+
         // Pause the strategy
         pause_strategy(&e, strategy_address.clone())?;
-    
+
         events::emit_emergency_withdraw_event(&e, caller, strategy_address, strategy_balance);
         Ok(())
     }
@@ -353,17 +389,24 @@ impl VaultTrait for DeFindexVault {
     ///
     /// # Returns:
     /// * `Result<(), ContractError>` - Ok if successful, otherwise returns a ContractError.
-    fn pause_strategy(e: Env, strategy_address: Address, caller: Address) -> Result<(), ContractError> {
+    fn pause_strategy(
+        e: Env,
+        strategy_address: Address,
+        caller: Address,
+    ) -> Result<(), ContractError> {
         // Ensure the caller is the Manager or Emergency Manager
         // TODO: Should check if the strategy has any amount invested on it, and return an error if it has, should we let the manager to pause a strategy with funds invested?
         let access_control = AccessControl::new(&e);
-        access_control.require_any_role(&[RolesDataKey::EmergencyManager, RolesDataKey::Manager], &caller);
+        access_control.require_any_role(
+            &[RolesDataKey::EmergencyManager, RolesDataKey::Manager],
+            &caller,
+        );
 
         pause_strategy(&e, strategy_address.clone())?;
         events::emit_strategy_paused_event(&e, strategy_address, caller);
         Ok(())
     }
-    
+
     /// Unpauses a previously paused strategy.
     ///
     /// This function unpauses a strategy by setting its `paused` field to `false`, allowing it to be used
@@ -376,10 +419,17 @@ impl VaultTrait for DeFindexVault {
     ///
     /// # Returns:
     /// * `Result<(), ContractError>` - Ok if successful, otherwise returns a ContractError.
-    fn unpause_strategy(e: Env, strategy_address: Address, caller: Address) -> Result<(), ContractError> {
+    fn unpause_strategy(
+        e: Env,
+        strategy_address: Address,
+        caller: Address,
+    ) -> Result<(), ContractError> {
         // Ensure the caller is the Manager or Emergency Manager
         let access_control = AccessControl::new(&e);
-        access_control.require_any_role(&[RolesDataKey::EmergencyManager, RolesDataKey::Manager], &caller);
+        access_control.require_any_role(
+            &[RolesDataKey::EmergencyManager, RolesDataKey::Manager],
+            &caller,
+        );
 
         unpause_strategy(&e, strategy_address.clone())?;
         events::emit_strategy_unpaused_event(&e, strategy_address, caller);
@@ -540,35 +590,35 @@ impl AdminInterfaceTrait for DeFindexVault {
 #[contractimpl]
 impl VaultManagementTrait for DeFindexVault {
     /// Invests the vault's idle funds into the specified strategies.
-    /// 
+    ///
     /// # Arguments:
     /// * `e` - The environment.
     /// * `investment` - A vector of `Investment` structs representing the amount to invest in each strategy.
     /// * `caller` - The address of the caller.
-    /// 
+    ///
     /// # Returns:
     /// * `Result<(), ContractError>` - Ok if successful, otherwise returns a ContractError.
     fn invest(e: Env, investments: Vec<Investment>) -> Result<(), ContractError> {
         check_initialized(&e)?;
-    
+
         let access_control = AccessControl::new(&e);
         access_control.require_role(&RolesDataKey::Manager);
         e.current_contract_address().require_auth();
-    
+
         // Get the current idle funds for all assets
         let idle_funds = fetch_current_idle_funds(&e);
-    
+
         // Prepare investments based on current idle funds
         // This checks if the total investment exceeds the idle funds
         prepare_investment(&e, investments.clone(), idle_funds)?;
-    
+
         // Now proceed with the actual investments if all checks passed
         execute_investment(&e, investments)?;
 
         // auto invest mockup
         // if auto_invest {
         //     let idle_funds = fetch_current_idle_funds(&e);
-            
+
         //     // Prepare investments based on current ratios of invested funds
         //     let investments = calculate_investments_based_on_ratios(&e);
         //     prepare_investment(&e, investments.clone(), idle_funds)?;
@@ -578,20 +628,20 @@ impl VaultManagementTrait for DeFindexVault {
     }
 
     /// Rebalances the vault by executing a series of instructions.
-    /// 
+    ///
     /// # Arguments:
     /// * `e` - The environment.
     /// * `instructions` - A vector of `Instruction` structs representing actions (withdraw, invest, swap, zapper) to be taken.
-    /// 
+    ///
     /// # Returns:
     /// * `Result<(), ContractError>` - Ok if successful, otherwise returns a ContractError.
     fn rebalance(e: Env, instructions: Vec<Instruction>) -> Result<(), ContractError> {
         check_initialized(&e)?;
-    
+
         let access_control = AccessControl::new(&e);
         access_control.require_role(&RolesDataKey::Manager);
         e.current_contract_address().require_auth();
-    
+
         for instruction in instructions.iter() {
             match instruction.action {
                 ActionType::Withdraw => match (&instruction.strategy, &instruction.amount) {
@@ -609,13 +659,13 @@ impl VaultManagementTrait for DeFindexVault {
                 ActionType::SwapExactIn => match &instruction.swap_details_exact_in {
                     OptionalSwapDetailsExactIn::Some(swap_details) => {
                         internal_swap_exact_tokens_for_tokens(
-                            &e, 
-                            &swap_details.token_in, 
-                            &swap_details.token_out, 
-                            &swap_details.amount_in, 
-                            &swap_details.amount_out_min, 
-                            &swap_details.distribution, 
-                            &swap_details.deadline
+                            &e,
+                            &swap_details.token_in,
+                            &swap_details.token_out,
+                            &swap_details.amount_in,
+                            &swap_details.amount_out_min,
+                            &swap_details.distribution,
+                            &swap_details.deadline,
                         )?;
                     }
                     _ => return Err(ContractError::MissingInstructionData),
@@ -623,23 +673,23 @@ impl VaultManagementTrait for DeFindexVault {
                 ActionType::SwapExactOut => match &instruction.swap_details_exact_out {
                     OptionalSwapDetailsExactOut::Some(swap_details) => {
                         internal_swap_tokens_for_exact_tokens(
-                            &e, 
-                            &swap_details.token_in, 
-                            &swap_details.token_out, 
-                            &swap_details.amount_out, 
-                            &swap_details.amount_in_max, 
-                            &swap_details.distribution, 
-                            &swap_details.deadline
+                            &e,
+                            &swap_details.token_in,
+                            &swap_details.token_out,
+                            &swap_details.amount_out,
+                            &swap_details.amount_in_max,
+                            &swap_details.distribution,
+                            &swap_details.deadline,
                         )?;
                     }
                     _ => return Err(ContractError::MissingInstructionData),
                 },
                 ActionType::Zapper => {
                     // TODO: Implement Zapper instructions
-                },
+                }
             }
         }
-    
+
         Ok(())
     }
-}
\ No newline at end of file
+}
diff --git a/apps/contracts/defindex/src/models.rs b/apps/contracts/vault/src/models.rs
similarity index 99%
rename from apps/contracts/defindex/src/models.rs
rename to apps/contracts/vault/src/models.rs
index e5c182bb..042ec976 100644
--- a/apps/contracts/defindex/src/models.rs
+++ b/apps/contracts/vault/src/models.rs
@@ -87,4 +87,4 @@ pub enum OptionalSwapDetailsExactIn {
 pub enum OptionalSwapDetailsExactOut {
     Some(SwapDetailsExactOut),
     None,
-}
\ No newline at end of file
+}
diff --git a/apps/contracts/defindex/src/storage.rs b/apps/contracts/vault/src/storage.rs
similarity index 81%
rename from apps/contracts/defindex/src/storage.rs
rename to apps/contracts/vault/src/storage.rs
index 525e2b81..3eaf9860 100644
--- a/apps/contracts/defindex/src/storage.rs
+++ b/apps/contracts/vault/src/storage.rs
@@ -5,8 +5,8 @@ use crate::models::AssetAllocation;
 #[derive(Clone)]
 #[contracttype]
 enum DataKey {
-    AssetAllocation(u32),      // AssetAllocation Addresse by index
-    TotalAssets,     // Total number of tokens
+    AssetAllocation(u32), // AssetAllocation Addresse by index
+    TotalAssets,          // Total number of tokens
     DeFindexReceiver,
     Factory,
     LastFeeAssessment,
@@ -15,11 +15,16 @@ enum DataKey {
 
 // Assets Management
 pub fn set_asset(e: &Env, index: u32, asset: &AssetAllocation) {
-    e.storage().instance().set(&DataKey::AssetAllocation(index), asset);
+    e.storage()
+        .instance()
+        .set(&DataKey::AssetAllocation(index), asset);
 }
 
 pub fn get_asset(e: &Env, index: u32) -> AssetAllocation {
-    e.storage().instance().get(&DataKey::AssetAllocation(index)).unwrap()
+    e.storage()
+        .instance()
+        .get(&DataKey::AssetAllocation(index))
+        .unwrap()
 }
 
 pub fn set_total_assets(e: &Env, n: u32) {
@@ -55,16 +60,11 @@ pub fn get_defindex_receiver(e: &Env) -> Address {
 
 // DeFindex Factory
 pub fn set_factory(e: &Env, address: &Address) {
-    e.storage()
-        .instance()
-        .set(&DataKey::Factory, address);
+    e.storage().instance().set(&DataKey::Factory, address);
 }
 
 pub fn get_factory(e: &Env) -> Address {
-    e.storage()
-        .instance()
-        .get(&DataKey::Factory)
-        .unwrap()
+    e.storage().instance().get(&DataKey::Factory).unwrap()
 }
 
 // Last Fee Assesment
@@ -89,8 +89,5 @@ pub fn set_vault_share(e: &Env, vault_share: &u32) {
 }
 
 pub fn get_vault_share(e: &Env) -> u32 {
-    e.storage()
-        .instance()
-        .get(&DataKey::VaultShare)
-        .unwrap()
+    e.storage().instance().get(&DataKey::VaultShare).unwrap()
 }
diff --git a/apps/contracts/defindex/src/strategies.rs b/apps/contracts/vault/src/strategies.rs
similarity index 80%
rename from apps/contracts/defindex/src/strategies.rs
rename to apps/contracts/vault/src/strategies.rs
index a1019745..cde32336 100644
--- a/apps/contracts/defindex/src/strategies.rs
+++ b/apps/contracts/vault/src/strategies.rs
@@ -1,18 +1,29 @@
 use defindex_strategy_core::DeFindexStrategyClient;
-use soroban_sdk::{Env, Address};
+use soroban_sdk::{Address, Env};
 
-use crate::{models::{AssetAllocation, Strategy}, storage::{get_asset, get_assets, get_total_assets, set_asset}, ContractError};
+use crate::{
+    models::{AssetAllocation, Strategy},
+    storage::{get_asset, get_assets, get_total_assets, set_asset},
+    ContractError,
+};
 
 pub fn get_strategy_client(e: &Env, address: Address) -> DeFindexStrategyClient {
     DeFindexStrategyClient::new(&e, &address)
 }
 
 /// Finds the asset corresponding to the given strategy address.
-pub fn get_strategy_asset(e: &Env, strategy_address: &Address) -> Result<AssetAllocation, ContractError> {
+pub fn get_strategy_asset(
+    e: &Env,
+    strategy_address: &Address,
+) -> Result<AssetAllocation, ContractError> {
     let assets = get_assets(e);
 
     for asset in assets.iter() {
-        if asset.strategies.iter().any(|strategy| &strategy.address == strategy_address) {
+        if asset
+            .strategies
+            .iter()
+            .any(|strategy| &strategy.address == strategy_address)
+        {
             return Ok(asset);
         }
     }
@@ -21,7 +32,10 @@ pub fn get_strategy_asset(e: &Env, strategy_address: &Address) -> Result<AssetAl
 }
 
 /// Finds the AssetAllocation corresponding to the given asset address.
-pub fn get_asset_allocation_from_address(e: &Env, asset_address: Address) -> Result<AssetAllocation, ContractError> {
+pub fn get_asset_allocation_from_address(
+    e: &Env,
+    asset_address: Address,
+) -> Result<AssetAllocation, ContractError> {
     let assets = get_assets(e);
 
     for asset in assets.iter() {
@@ -34,7 +48,10 @@ pub fn get_asset_allocation_from_address(e: &Env, asset_address: Address) -> Res
 }
 
 /// Finds the strategy struct corresponding to the given strategy address within the given asset.
-pub fn get_strategy_struct(strategy_address: &Address, asset: &AssetAllocation) -> Result<Strategy, ContractError> {
+pub fn get_strategy_struct(
+    strategy_address: &Address,
+    asset: &AssetAllocation,
+) -> Result<Strategy, ContractError> {
     asset
         .strategies
         .iter()
@@ -104,20 +121,28 @@ pub fn unpause_strategy(e: &Env, strategy_address: Address) -> Result<(), Contra
     Err(ContractError::StrategyNotFound)
 }
 
-pub fn withdraw_from_strategy(e: &Env, strategy_address: &Address, amount: &i128) -> Result<(), ContractError> {
+pub fn withdraw_from_strategy(
+    e: &Env,
+    strategy_address: &Address,
+    amount: &i128,
+) -> Result<(), ContractError> {
     let strategy_client = get_strategy_client(e, strategy_address.clone());
-    
+
     match strategy_client.try_withdraw(amount, &e.current_contract_address()) {
         Ok(Ok(_)) => Ok(()),
         Ok(Err(_)) | Err(_) => Err(ContractError::StrategyWithdrawError),
     }
 }
 
-pub fn invest_in_strategy(e: &Env, strategy_address: &Address, amount: &i128) -> Result<(), ContractError> {
+pub fn invest_in_strategy(
+    e: &Env,
+    strategy_address: &Address,
+    amount: &i128,
+) -> Result<(), ContractError> {
     let strategy_client = get_strategy_client(&e, strategy_address.clone());
-    
+
     match strategy_client.try_deposit(amount, &e.current_contract_address()) {
         Ok(Ok(_)) => Ok(()),
         Ok(Err(_)) | Err(_) => Err(ContractError::StrategyInvestError),
     }
-}
\ No newline at end of file
+}
diff --git a/apps/contracts/defindex/src/test.rs b/apps/contracts/vault/src/test.rs
similarity index 87%
rename from apps/contracts/defindex/src/test.rs
rename to apps/contracts/vault/src/test.rs
index b23401cd..4a9960a9 100755
--- a/apps/contracts/defindex/src/test.rs
+++ b/apps/contracts/vault/src/test.rs
@@ -8,28 +8,30 @@ use std::vec;
 
 // DeFindex Hodl Strategy Contract
 pub mod hodl_strategy {
-    soroban_sdk::contractimport!(file = "../target/wasm32-unknown-unknown/release/hodl_strategy.optimized.wasm");
+    soroban_sdk::contractimport!(
+        file = "../target/wasm32-unknown-unknown/release/hodl_strategy.optimized.wasm"
+    );
     pub type HodlStrategyClient<'a> = Client<'a>;
 }
-use hodl_strategy::{HodlStrategyClient};
+use hodl_strategy::HodlStrategyClient;
 
-fn create_hodl_strategy<'a>(e: & Env, asset: & Address) -> HodlStrategyClient<'a> {
+fn create_hodl_strategy<'a>(e: &Env, asset: &Address) -> HodlStrategyClient<'a> {
     let contract_address = &e.register_contract_wasm(None, hodl_strategy::WASM);
-    let hodl_strategy = HodlStrategyClient::new(e, contract_address); 
+    let hodl_strategy = HodlStrategyClient::new(e, contract_address);
     hodl_strategy.initialize(&asset, &sorobanvec![&e]);
     hodl_strategy
 }
 
-// DeFindex Vault Contract 
+// DeFindex Vault Contract
 pub mod defindex_vault {
-    soroban_sdk::contractimport!(file = "../target/wasm32-unknown-unknown/release/defindex_vault.optimized.wasm");
+    soroban_sdk::contractimport!(
+        file = "../target/wasm32-unknown-unknown/release/defindex_vault.optimized.wasm"
+    );
     pub type DeFindexVaultClient<'a> = Client<'a>;
 }
 use defindex_vault::{DeFindexVaultClient, Strategy};
 
-fn create_defindex_vault<'a>(
-    e: & Env
-) -> DeFindexVaultClient<'a> {
+fn create_defindex_vault<'a>(e: &Env) -> DeFindexVaultClient<'a> {
     let address = &e.register_contract_wasm(None, defindex_vault::WASM);
     let client = DeFindexVaultClient::new(e, address);
     client
@@ -52,7 +54,11 @@ fn create_defindex_vault<'a>(
 
 // Create Test Token
 pub(crate) fn create_token_contract<'a>(e: &Env, admin: &Address) -> SorobanTokenClient<'a> {
-    SorobanTokenClient::new(e, &e.register_stellar_asset_contract_v2(admin.clone()).address())
+    SorobanTokenClient::new(
+        e,
+        &e.register_stellar_asset_contract_v2(admin.clone())
+            .address(),
+    )
 }
 
 pub(crate) fn get_token_admin_client<'a>(
@@ -142,8 +148,8 @@ impl<'a> DeFindexVaultTest<'a> {
 }
 
 mod admin;
-mod initialize;
-mod withdraw;
 mod deposit;
 mod emergency_withdraw;
-mod rebalance;
\ No newline at end of file
+mod initialize;
+mod rebalance;
+mod withdraw;
diff --git a/apps/contracts/defindex/src/test/admin.rs b/apps/contracts/vault/src/test/admin.rs
similarity index 99%
rename from apps/contracts/defindex/src/test/admin.rs
rename to apps/contracts/vault/src/test/admin.rs
index 384694be..38fc84ef 100644
--- a/apps/contracts/defindex/src/test/admin.rs
+++ b/apps/contracts/vault/src/test/admin.rs
@@ -1,5 +1,6 @@
 use soroban_sdk::{
-    testutils::{AuthorizedFunction, AuthorizedInvocation, MockAuth, MockAuthInvoke}, vec as sorobanvec, IntoVal, String, Symbol, Vec
+    testutils::{AuthorizedFunction, AuthorizedInvocation, MockAuth, MockAuthInvoke},
+    vec as sorobanvec, IntoVal, String, Symbol, Vec,
 };
 
 use crate::test::{create_strategy_params, defindex_vault::AssetAllocation, DeFindexVaultTest};
diff --git a/apps/contracts/defindex/src/test/deposit.rs b/apps/contracts/vault/src/test/deposit.rs
similarity index 96%
rename from apps/contracts/defindex/src/test/deposit.rs
rename to apps/contracts/vault/src/test/deposit.rs
index b765e1d3..ccccf851 100644
--- a/apps/contracts/defindex/src/test/deposit.rs
+++ b/apps/contracts/vault/src/test/deposit.rs
@@ -1,15 +1,14 @@
 use soroban_sdk::{vec as sorobanvec, String, Vec};
 
-use crate::test::{create_strategy_params, DeFindexVaultTest};
 use crate::test::defindex_vault::{AssetAllocation, ContractError};
+use crate::test::{create_strategy_params, DeFindexVaultTest};
 
 #[test]
 fn deposit_amounts_desired_wrong_length() {
-    
     let test = DeFindexVaultTest::setup();
     test.env.mock_all_auths();
     let strategy_params = create_strategy_params(&test);
-    
+
     // initialize with 2 assets
     let assets: Vec<AssetAllocation> = sorobanvec![
         &test.env,
@@ -35,26 +34,23 @@ fn deposit_amounts_desired_wrong_length() {
         &String::from_str(&test.env, "DFT"),
     );
     let amount = 1000i128;
-    
+
     let users = DeFindexVaultTest::generate_random_users(&test.env, 1);
-    
 
     let response = test.defindex_contract.try_deposit(
         &sorobanvec![&test.env, amount], // wrong amount desired
-        &sorobanvec![&test.env, amount, amount], 
-        &users[0]);
+        &sorobanvec![&test.env, amount, amount],
+        &users[0],
+    );
 
     assert_eq!(response, Err(Ok(ContractError::WrongAmuntsLength)));
-
 }
 
-
 #[test]
 fn deposit_amounts_min_wrong_length() {
     todo!();
 }
 
-
 #[test]
 fn deposit_amounts_desired_negative() {
     todo!();
@@ -65,7 +61,6 @@ fn deposit_one_asset() {
     todo!();
 }
 
-
 #[test]
 fn deposit_several_assets() {
     todo!();
@@ -97,9 +92,9 @@ fn deposit_several_assets() {
 //         &test.defindex_receiver,
 //     );
 //     let amount = 1000i128;
-    
+
 //     let users = DeFindexVaultTest::generate_random_users(&test.env, 1);
-    
+
 //     test.token0_admin_client.mint(&users[0], &amount);
 //     let user_balance = test.token0.balance(&users[0]);
 //     assert_eq!(user_balance, amount);
@@ -114,10 +109,10 @@ fn deposit_several_assets() {
 //     assert_eq!(df_balance, amount);
 
 //     test.defindex_contract.withdraw(&df_balance, &users[0]);
-    
+
 //     let df_balance = test.defindex_contract.balance(&users[0]);
 //     assert_eq!(df_balance, 0i128);
 
 //     let user_balance = test.token0.balance(&users[0]);
 //     assert_eq!(user_balance, amount);
-// }
\ No newline at end of file
+// }
diff --git a/apps/contracts/defindex/src/test/emergency_withdraw.rs b/apps/contracts/vault/src/test/emergency_withdraw.rs
similarity index 79%
rename from apps/contracts/defindex/src/test/emergency_withdraw.rs
rename to apps/contracts/vault/src/test/emergency_withdraw.rs
index 1d2757f6..9df5992a 100644
--- a/apps/contracts/defindex/src/test/emergency_withdraw.rs
+++ b/apps/contracts/vault/src/test/emergency_withdraw.rs
@@ -1,6 +1,10 @@
 use soroban_sdk::{vec as sorobanvec, String, Vec};
 
-use crate::test::{create_strategy_params, defindex_vault::{AssetAllocation, Investment}, DeFindexVaultTest};
+use crate::test::{
+    create_strategy_params,
+    defindex_vault::{AssetAllocation, Investment},
+    DeFindexVaultTest,
+};
 
 #[test]
 fn test_emergency_withdraw_success() {
@@ -27,18 +31,22 @@ fn test_emergency_withdraw_success() {
         &String::from_str(&test.env, "DFT"),
     );
     let amount = 1000i128;
-    
+
     let users = DeFindexVaultTest::generate_random_users(&test.env, 1);
-    
+
     test.token0_admin_client.mint(&users[0], &amount);
     let user_balance = test.token0.balance(&users[0]);
     assert_eq!(user_balance, amount);
 
     let df_balance = test.defindex_contract.balance(&users[0]);
     assert_eq!(df_balance, 0i128);
-    
+
     // Deposit
-    test.defindex_contract.deposit(&sorobanvec![&test.env, amount], &sorobanvec![&test.env, amount], &users[0]);
+    test.defindex_contract.deposit(
+        &sorobanvec![&test.env, amount],
+        &sorobanvec![&test.env, amount],
+        &users[0],
+    );
 
     let df_balance = test.defindex_contract.balance(&users[0]);
     assert_eq!(df_balance, amount);
@@ -56,19 +64,26 @@ fn test_emergency_withdraw_success() {
         }
     ];
     test.defindex_contract.invest(&investments);
-    
+
     // Balance of the token0 on the vault should be 0
     let vault_balance_of_token = test.token0.balance(&test.defindex_contract.address);
     assert_eq!(vault_balance_of_token, 0);
 
     // Balance of the strategy should be `amount`
-    let strategy_balance = test.strategy_client.balance(&test.defindex_contract.address);
+    let strategy_balance = test
+        .strategy_client
+        .balance(&test.defindex_contract.address);
     assert_eq!(strategy_balance, amount);
 
-    test.defindex_contract.emergency_withdraw(&strategy_params.first().unwrap().address, &test.emergency_manager);
+    test.defindex_contract.emergency_withdraw(
+        &strategy_params.first().unwrap().address,
+        &test.emergency_manager,
+    );
 
     // Balance of the strategy should be 0
-    let strategy_balance = test.strategy_client.balance(&test.defindex_contract.address);
+    let strategy_balance = test
+        .strategy_client
+        .balance(&test.defindex_contract.address);
     assert_eq!(strategy_balance, 0);
 
     // Balance of the token0 on the vault should be `amount`
@@ -78,4 +93,4 @@ fn test_emergency_withdraw_success() {
     // check if strategy is paused
     let asset = test.defindex_contract.get_assets().first().unwrap();
     assert_eq!(asset.strategies.first().unwrap().paused, true);
-}
\ No newline at end of file
+}
diff --git a/apps/contracts/defindex/src/test/initialize.rs b/apps/contracts/vault/src/test/initialize.rs
similarity index 97%
rename from apps/contracts/defindex/src/test/initialize.rs
rename to apps/contracts/vault/src/test/initialize.rs
index 68075239..621c63d8 100644
--- a/apps/contracts/defindex/src/test/initialize.rs
+++ b/apps/contracts/vault/src/test/initialize.rs
@@ -1,6 +1,10 @@
 use soroban_sdk::{vec as sorobanvec, String, Vec};
 
-use crate::test::{create_strategy_params, defindex_vault::{AssetAllocation, ContractError}, DeFindexVaultTest};
+use crate::test::{
+    create_strategy_params,
+    defindex_vault::{AssetAllocation, ContractError},
+    DeFindexVaultTest,
+};
 
 #[test]
 fn test_initialize_and_get_roles() {
diff --git a/apps/contracts/defindex/src/test/rebalance.rs b/apps/contracts/vault/src/test/rebalance.rs
similarity index 82%
rename from apps/contracts/defindex/src/test/rebalance.rs
rename to apps/contracts/vault/src/test/rebalance.rs
index 49e7bbd3..0743b471 100644
--- a/apps/contracts/defindex/src/test/rebalance.rs
+++ b/apps/contracts/vault/src/test/rebalance.rs
@@ -1,6 +1,13 @@
 use soroban_sdk::{vec as sorobanvec, String, Vec};
 
-use crate::test::{create_strategy_params, defindex_vault::{ActionType, AssetAllocation, Instruction, Investment, OptionalSwapDetailsExactIn, OptionalSwapDetailsExactOut}, DeFindexVaultTest};
+use crate::test::{
+    create_strategy_params,
+    defindex_vault::{
+        ActionType, AssetAllocation, Instruction, Investment, OptionalSwapDetailsExactIn,
+        OptionalSwapDetailsExactOut,
+    },
+    DeFindexVaultTest,
+};
 
 #[test]
 fn rebalance() {
@@ -27,9 +34,9 @@ fn rebalance() {
         &String::from_str(&test.env, "DFT"),
     );
     let amount = 1000i128;
-    
+
     let users = DeFindexVaultTest::generate_random_users(&test.env, 1);
-    
+
     test.token0_admin_client.mint(&users[0], &amount);
     let user_balance = test.token0.balance(&users[0]);
     assert_eq!(user_balance, amount);
@@ -37,19 +44,23 @@ fn rebalance() {
     let df_balance = test.defindex_contract.balance(&users[0]);
     assert_eq!(df_balance, 0i128);
 
-    test.defindex_contract.deposit(&sorobanvec![&test.env, amount], &sorobanvec![&test.env, amount], &users[0]);
+    test.defindex_contract.deposit(
+        &sorobanvec![&test.env, amount],
+        &sorobanvec![&test.env, amount],
+        &users[0],
+    );
 
     let df_balance = test.defindex_contract.balance(&users[0]);
     assert_eq!(df_balance, amount);
 
     let investments = sorobanvec![
-        &test.env, 
+        &test.env,
         Investment {
-          amount: amount, 
-          strategy: test.strategy_client.address.clone()
+            amount: amount,
+            strategy: test.strategy_client.address.clone()
         }
     ];
-    
+
     test.defindex_contract.invest(&investments);
 
     let vault_balance = test.token0.balance(&test.defindex_contract.address);
@@ -60,9 +71,8 @@ fn rebalance() {
     let instruction_amount_0 = 200i128;
     let instruction_amount_1 = 100i128;
 
-    
     let instructions = sorobanvec![
-        &test.env, 
+        &test.env,
         Instruction {
             action: ActionType::Withdraw,
             strategy: Some(test.strategy_client.address.clone()),
@@ -83,5 +93,4 @@ fn rebalance() {
 
     let vault_balance = test.token0.balance(&test.defindex_contract.address);
     assert_eq!(vault_balance, instruction_amount_1);
-
-}
\ No newline at end of file
+}
diff --git a/apps/contracts/defindex/src/test/withdraw.rs b/apps/contracts/vault/src/test/withdraw.rs
similarity index 84%
rename from apps/contracts/defindex/src/test/withdraw.rs
rename to apps/contracts/vault/src/test/withdraw.rs
index 2079a843..a135d468 100644
--- a/apps/contracts/defindex/src/test/withdraw.rs
+++ b/apps/contracts/vault/src/test/withdraw.rs
@@ -1,7 +1,11 @@
 use soroban_sdk::{vec as sorobanvec, String, Vec};
 
-use crate::test::{create_strategy_params, defindex_vault::{AssetAllocation, Investment}, DeFindexVaultTest};
 use super::hodl_strategy::StrategyError;
+use crate::test::{
+    create_strategy_params,
+    defindex_vault::{AssetAllocation, Investment},
+    DeFindexVaultTest,
+};
 
 #[test]
 fn test_withdraw_from_idle_success() {
@@ -28,9 +32,9 @@ fn test_withdraw_from_idle_success() {
         &String::from_str(&test.env, "DFT"),
     );
     let amount = 1234567890i128;
-    
+
     let users = DeFindexVaultTest::generate_random_users(&test.env, 1);
-    
+
     test.token0_admin_client.mint(&users[0], &amount);
     let user_balance = test.token0.balance(&users[0]);
     assert_eq!(user_balance, amount);
@@ -41,14 +45,18 @@ fn test_withdraw_from_idle_success() {
 
     // Deposit
     let amount_to_deposit = 567890i128;
-    test.defindex_contract.deposit(&sorobanvec![&test.env, amount_to_deposit], &sorobanvec![&test.env, amount_to_deposit], &users[0]);
+    test.defindex_contract.deposit(
+        &sorobanvec![&test.env, amount_to_deposit],
+        &sorobanvec![&test.env, amount_to_deposit],
+        &users[0],
+    );
 
     // Check Balances after deposit
-    
+
     // Token balance of user
     let user_balance = test.token0.balance(&users[0]);
     assert_eq!(user_balance, amount - amount_to_deposit);
-    
+
     // Token balance of vault should be amount_to_deposit
     // Because balances are still in indle, balances are not in strategy, but in idle
 
@@ -65,13 +73,17 @@ fn test_withdraw_from_idle_success() {
 
     // user decides to withdraw a portion of deposited amount
     let amount_to_withdraw = 123456i128;
-    test.defindex_contract.withdraw(&amount_to_withdraw, &users[0]);
-    
+    test.defindex_contract
+        .withdraw(&amount_to_withdraw, &users[0]);
+
     // Check Balances after withdraw
 
     // Token balance of user should be amount - amount_to_deposit + amount_to_withdraw
     let user_balance = test.token0.balance(&users[0]);
-    assert_eq!(user_balance, amount - amount_to_deposit + amount_to_withdraw);
+    assert_eq!(
+        user_balance,
+        amount - amount_to_deposit + amount_to_withdraw
+    );
 
     // Token balance of vault should be amount_to_deposit - amount_to_withdraw
     let vault_balance = test.token0.balance(&test.defindex_contract.address);
@@ -85,17 +97,19 @@ fn test_withdraw_from_idle_success() {
     let df_balance = test.defindex_contract.balance(&users[0]);
     assert_eq!(df_balance, amount_to_deposit - amount_to_withdraw);
 
-
     // user tries to withdraw more than deposited amount
     let amount_to_withdraw_more = amount_to_deposit + 1;
-    let result = test.defindex_contract.try_withdraw(&amount_to_withdraw_more, &users[0]);
+    let result = test
+        .defindex_contract
+        .try_withdraw(&amount_to_withdraw_more, &users[0]);
     // just check if is error
     assert_eq!(result.is_err(), true);
-    
+
     // TODO test corresponding error
 
     // withdraw remaining balance
-    test.defindex_contract.withdraw(&(amount_to_deposit - amount_to_withdraw), &users[0]);
+    test.defindex_contract
+        .withdraw(&(amount_to_deposit - amount_to_withdraw), &users[0]);
 
     // // result is err
 
@@ -135,9 +149,9 @@ fn test_withdraw_from_strategy_success() {
         &String::from_str(&test.env, "DFT"),
     );
     let amount = 1000i128;
-    
+
     let users = DeFindexVaultTest::generate_random_users(&test.env, 1);
-    
+
     test.token0_admin_client.mint(&users[0], &amount);
     let user_balance = test.token0.balance(&users[0]);
     assert_eq!(user_balance, amount);
@@ -146,29 +160,33 @@ fn test_withdraw_from_strategy_success() {
     let df_balance = test.defindex_contract.balance(&users[0]);
     assert_eq!(df_balance, 0i128);
 
-    test.defindex_contract.deposit(&sorobanvec![&test.env, amount], &sorobanvec![&test.env, amount], &users[0]);
+    test.defindex_contract.deposit(
+        &sorobanvec![&test.env, amount],
+        &sorobanvec![&test.env, amount],
+        &users[0],
+    );
 
     let df_balance = test.defindex_contract.balance(&users[0]);
     assert_eq!(df_balance, amount);
 
     let investments = sorobanvec![
-        &test.env, 
+        &test.env,
         Investment {
-          amount: amount, 
-          strategy: test.strategy_client.address.clone()
-        }];
-    
-    
+            amount: amount,
+            strategy: test.strategy_client.address.clone()
+        }
+    ];
+
     test.defindex_contract.invest(&investments);
 
     let vault_balance = test.token0.balance(&test.defindex_contract.address);
     assert_eq!(vault_balance, 0);
 
     test.defindex_contract.withdraw(&df_balance, &users[0]);
-    
+
     let df_balance = test.defindex_contract.balance(&users[0]);
     assert_eq!(df_balance, 0i128);
 
     let user_balance = test.token0.balance(&users[0]);
     assert_eq!(user_balance, amount);
-}
\ No newline at end of file
+}
diff --git a/apps/contracts/defindex/src/token/allowance.rs b/apps/contracts/vault/src/token/allowance.rs
similarity index 100%
rename from apps/contracts/defindex/src/token/allowance.rs
rename to apps/contracts/vault/src/token/allowance.rs
diff --git a/apps/contracts/defindex/src/token/balance.rs b/apps/contracts/vault/src/token/balance.rs
similarity index 100%
rename from apps/contracts/defindex/src/token/balance.rs
rename to apps/contracts/vault/src/token/balance.rs
diff --git a/apps/contracts/defindex/src/token/contract.rs b/apps/contracts/vault/src/token/contract.rs
similarity index 100%
rename from apps/contracts/defindex/src/token/contract.rs
rename to apps/contracts/vault/src/token/contract.rs
diff --git a/apps/contracts/defindex/src/token/metadata.rs b/apps/contracts/vault/src/token/metadata.rs
similarity index 100%
rename from apps/contracts/defindex/src/token/metadata.rs
rename to apps/contracts/vault/src/token/metadata.rs
diff --git a/apps/contracts/defindex/src/token/mod.rs b/apps/contracts/vault/src/token/mod.rs
similarity index 100%
rename from apps/contracts/defindex/src/token/mod.rs
rename to apps/contracts/vault/src/token/mod.rs
diff --git a/apps/contracts/defindex/src/token/storage_types.rs b/apps/contracts/vault/src/token/storage_types.rs
similarity index 100%
rename from apps/contracts/defindex/src/token/storage_types.rs
rename to apps/contracts/vault/src/token/storage_types.rs
diff --git a/apps/contracts/defindex/src/token/total_supply.rs b/apps/contracts/vault/src/token/total_supply.rs
similarity index 100%
rename from apps/contracts/defindex/src/token/total_supply.rs
rename to apps/contracts/vault/src/token/total_supply.rs
diff --git a/apps/contracts/defindex/src/utils.rs b/apps/contracts/vault/src/utils.rs
similarity index 93%
rename from apps/contracts/defindex/src/utils.rs
rename to apps/contracts/vault/src/utils.rs
index 82bb5900..0d93e27d 100644
--- a/apps/contracts/defindex/src/utils.rs
+++ b/apps/contracts/vault/src/utils.rs
@@ -1,8 +1,14 @@
 use soroban_sdk::{panic_with_error, Address, Env, Map, Vec};
 
 use crate::{
-    access::{AccessControl, AccessControlTrait, RolesDataKey}, funds::{fetch_invested_funds_for_asset, fetch_invested_funds_for_strategy, fetch_total_managed_funds}, models::AssetAllocation, token::VaultToken, ContractError
-
+    access::{AccessControl, AccessControlTrait, RolesDataKey},
+    funds::{
+        fetch_invested_funds_for_asset, fetch_invested_funds_for_strategy,
+        fetch_total_managed_funds,
+    },
+    models::AssetAllocation,
+    token::VaultToken,
+    ContractError,
 };
 
 pub const DAY_IN_LEDGERS: u32 = 17280;
@@ -51,7 +57,8 @@ pub fn calculate_withdrawal_amounts(
 
         let strategy_invested_funds = fetch_invested_funds_for_strategy(e, &strategy.address);
 
-        let strategy_share_of_withdrawal = (amount * strategy_invested_funds) / total_invested_in_strategies;
+        let strategy_share_of_withdrawal =
+            (amount * strategy_invested_funds) / total_invested_in_strategies;
 
         withdrawal_amounts.set(strategy.address.clone(), strategy_share_of_withdrawal);
     }
@@ -131,7 +138,7 @@ pub fn calculate_optimal_amounts_and_shares_with_enforced_asset(
                                                                         // this might be the first deposit... in this case, the ratio will be enforced by the first depositor
                                                                         // TODO: might happen that the reserve_target is zero because everything is in one asset!?
                                                                         // in this case we ned to check the ratio
-        // TODO VERY DANGEROUS.
+                                                                        // TODO VERY DANGEROUS.
     }
     let amount_desired_target = amounts_desired.get(*i).unwrap(); // i128
 
@@ -148,22 +155,23 @@ pub fn calculate_optimal_amounts_and_shares_with_enforced_asset(
         }
     }
     //TODO: calculate the shares to mint = total_supply * amount_desired_target  / reserve_target
-    let shares_to_mint = VaultToken::total_supply(e.clone()) * amount_desired_target / reserve_target;
+    let shares_to_mint =
+        VaultToken::total_supply(e.clone()) * amount_desired_target / reserve_target;
     (optimal_amounts, shares_to_mint)
 }
 /// Calculates the optimal amounts to deposit for a set of assets, along with the shares to mint.
 /// This function iterates over a list of assets and checks if the desired deposit amounts
 /// match the optimal deposit strategy, based on current managed funds and asset ratios.
-/// 
+///
 /// If the desired amount for a given asset cannot be achieved due to constraints (e.g., it's below the minimum amount),
 /// the function attempts to find an optimal solution by adjusting the amounts of subsequent assets.
-/// 
+///
 /// # Arguments
 /// * `e` - The current environment.
 /// * `assets` - A vector of assets for which deposits are being calculated.
 /// * `amounts_desired` - A vector of desired amounts for each asset.
 /// * `amounts_min` - A vector of minimum amounts for each asset, below which deposits are not allowed.
-/// 
+///
 /// # Returns
 /// A tuple containing:
 /// * A vector of optimal amounts to deposit for each asset.
@@ -183,7 +191,7 @@ pub fn calculate_deposit_amounts_and_shares_to_mint(
     amounts_min: &Vec<i128>,
 ) -> (Vec<i128>, i128) {
     // Retrieve the total managed funds for each asset as a Map<Address, i128>.
-    let total_managed_funds = fetch_total_managed_funds(e); 
+    let total_managed_funds = fetch_total_managed_funds(e);
 
     // Iterate over each asset in the assets vector.
     for i in 0..assets.len() {
@@ -232,4 +240,4 @@ pub fn calculate_deposit_amounts_and_shares_to_mint(
 
     // If no solution was found after iterating through all assets, throw an error.
     panic!("didn't find optimal amounts");
-}
\ No newline at end of file
+}
diff --git a/scf-tracker.md b/scf-tracker.md
index f27416b6..68079a7b 100644
--- a/scf-tracker.md
+++ b/scf-tracker.md
@@ -19,7 +19,7 @@
   Contract will be available on [GitHub](https://github.com/paltalabs). Code is reviewed, tested, and successfully passes security audits.
 
 - **Result:**
-    - ✅ Code available on [GitHub](https://github.com/paltalabs/defindex/tree/main/apps/contracts/defindex)
+    - ✅ Code available on [GitHub](https://github.com/paltalabs/defindex/tree/main/apps/contracts/vault)
     - 🛠️ Security Audits
 
 ---

From b0423440052cb0a6df9a11ae1a849b4561ece5e8 Mon Sep 17 00:00:00 2001
From: esteblock <estebaniglesiasmanriquez@gmail.com>
Date: Tue, 5 Nov 2024 16:58:18 -0300
Subject: [PATCH 11/39] use new fee nomenclature

---
 apps/contracts/vault/src/access.rs            | 10 ++--
 apps/contracts/vault/src/error.rs             |  2 +-
 apps/contracts/vault/src/events.rs            | 18 +++---
 apps/contracts/vault/src/fee.rs               |  8 +--
 apps/contracts/vault/src/interface.rs         | 14 ++---
 apps/contracts/vault/src/lib.rs               | 58 ++++++++++---------
 apps/contracts/vault/src/storage.rs           | 14 ++---
 apps/contracts/vault/src/test.rs              | 12 ++--
 apps/contracts/vault/src/test/admin.rs        | 38 ++++++------
 apps/contracts/vault/src/test/deposit.rs      | 10 ++--
 .../vault/src/test/emergency_withdraw.rs      |  4 +-
 apps/contracts/vault/src/test/initialize.rs   | 14 ++---
 apps/contracts/vault/src/test/rebalance.rs    |  4 +-
 apps/contracts/vault/src/test/withdraw.rs     |  8 +--
 .../02-contracts/01-vault-contract.md         |  2 +-
 15 files changed, 110 insertions(+), 106 deletions(-)

diff --git a/apps/contracts/vault/src/access.rs b/apps/contracts/vault/src/access.rs
index c601242a..dba6db02 100644
--- a/apps/contracts/vault/src/access.rs
+++ b/apps/contracts/vault/src/access.rs
@@ -6,7 +6,7 @@ use soroban_sdk::{contracttype, panic_with_error, Address, Env};
 #[contracttype]
 pub enum RolesDataKey {
     EmergencyManager, // Role: Emergency Manager
-    FeeReceiver,      // Role: Fee Receiver
+    VaultFeeReceiver,      // Role: Fee Receiver
     Manager,          // Role: Manager
 }
 
@@ -82,13 +82,13 @@ impl AccessControlTrait for AccessControl {
 
 // Role-specific setters and getters
 impl AccessControl {
-    pub fn set_fee_receiver(&self, caller: &Address, fee_receiver: &Address) {
-        self.require_any_role(&[RolesDataKey::Manager, RolesDataKey::FeeReceiver], caller);
-        self.set_role(&RolesDataKey::FeeReceiver, fee_receiver);
+    pub fn set_fee_receiver(&self, caller: &Address, vault_fee_receiver: &Address) {
+        self.require_any_role(&[RolesDataKey::Manager, RolesDataKey::VaultFeeReceiver], caller);
+        self.set_role(&RolesDataKey::VaultFeeReceiver, vault_fee_receiver);
     }
 
     pub fn get_fee_receiver(&self) -> Result<Address, ContractError> {
-        self.check_role(&RolesDataKey::FeeReceiver)
+        self.check_role(&RolesDataKey::VaultFeeReceiver)
     }
 
     pub fn set_manager(&self, manager: &Address) {
diff --git a/apps/contracts/vault/src/error.rs b/apps/contracts/vault/src/error.rs
index 7a2fec42..66874708 100644
--- a/apps/contracts/vault/src/error.rs
+++ b/apps/contracts/vault/src/error.rs
@@ -13,7 +13,7 @@ pub enum ContractError {
     // Validation Errors (11x)
     NegativeNotAllowed = 110,
     InsufficientBalance = 111,
-    WrongAmuntsLength = 112,
+    WrongAmountsLength = 112,
     NotEnoughIdleFunds = 113,
     InsufficientManagedFunds = 114,
     MissingInstructionData = 115,
diff --git a/apps/contracts/vault/src/events.rs b/apps/contracts/vault/src/events.rs
index 880b6a45..c7d46eb7 100644
--- a/apps/contracts/vault/src/events.rs
+++ b/apps/contracts/vault/src/events.rs
@@ -7,9 +7,9 @@ use soroban_sdk::{contracttype, symbol_short, Address, Env, Vec};
 #[derive(Clone, Debug, Eq, PartialEq)]
 pub struct InitializedVaultEvent {
     pub emergency_manager: Address,
-    pub fee_receiver: Address,
+    pub vault_fee_receiver: Address,
     pub manager: Address,
-    pub defindex_receiver: Address,
+    pub defindex_protocol_receiver: Address,
     pub assets: Vec<AssetAllocation>,
 }
 
@@ -17,16 +17,16 @@ pub struct InitializedVaultEvent {
 pub(crate) fn emit_initialized_vault(
     e: &Env,
     emergency_manager: Address,
-    fee_receiver: Address,
+    vault_fee_receiver: Address,
     manager: Address,
-    defindex_receiver: Address,
+    defindex_protocol_receiver: Address,
     assets: Vec<AssetAllocation>,
 ) {
     let event = InitializedVaultEvent {
         emergency_manager,
-        fee_receiver,
+        vault_fee_receiver,
         manager,
-        defindex_receiver,
+        defindex_protocol_receiver,
         assets,
     };
 
@@ -205,7 +205,7 @@ pub(crate) fn emit_emergency_manager_changed_event(e: &Env, new_emergency_manage
 #[contracttype]
 #[derive(Clone, Debug, Eq, PartialEq)]
 pub struct FeesMintedEvent {
-    pub defindex_receiver: Address,
+    pub defindex_protocol_receiver: Address,
     pub defindex_shares: i128,
     pub vault_receiver: Address,
     pub vault_shares: i128,
@@ -214,13 +214,13 @@ pub struct FeesMintedEvent {
 /// Publishes an `EmergencyManagerChangedEvent` to the event stream.
 pub(crate) fn emit_fees_minted_event(
     e: &Env,
-    defindex_receiver: Address,
+    defindex_protocol_receiver: Address,
     defindex_shares: i128,
     vault_receiver: Address,
     vault_shares: i128,
 ) {
     let event = FeesMintedEvent {
-        defindex_receiver,
+        defindex_protocol_receiver,
         defindex_shares,
         vault_receiver,
         vault_shares,
diff --git a/apps/contracts/vault/src/fee.rs b/apps/contracts/vault/src/fee.rs
index 1cd57a06..7b0698d6 100644
--- a/apps/contracts/vault/src/fee.rs
+++ b/apps/contracts/vault/src/fee.rs
@@ -6,7 +6,7 @@ use crate::{
     events,
     funds::fetch_total_managed_funds,
     storage::{
-        get_defindex_receiver, get_factory, get_last_fee_assesment, get_vault_share,
+        get_defindex_protocol_fee_receiver, get_factory, get_last_fee_assesment, get_vault_share,
         set_last_fee_assesment,
     },
     token::internal_mint,
@@ -73,7 +73,7 @@ fn mint_fees(e: &Env, total_fees: i128) -> Result<(), ContractError> {
     let access_control = AccessControl::new(&e);
 
     let vault_fee_receiver = access_control.get_fee_receiver()?;
-    let defindex_receiver = get_defindex_receiver(e);
+    let defindex_protocol_receiver = get_defindex_protocol_fee_receiver(e);
 
     let vault_share_bps = get_vault_share(e);
 
@@ -82,11 +82,11 @@ fn mint_fees(e: &Env, total_fees: i128) -> Result<(), ContractError> {
     let defindex_shares = total_fees - vault_shares;
 
     internal_mint(e.clone(), vault_fee_receiver.clone(), vault_shares);
-    internal_mint(e.clone(), defindex_receiver.clone(), defindex_shares);
+    internal_mint(e.clone(), defindex_protocol_receiver.clone(), defindex_shares);
 
     events::emit_fees_minted_event(
         e,
-        defindex_receiver,
+        defindex_protocol_receiver,
         defindex_shares,
         vault_fee_receiver,
         vault_shares,
diff --git a/apps/contracts/vault/src/interface.rs b/apps/contracts/vault/src/interface.rs
index dafdc998..28bc7104 100644
--- a/apps/contracts/vault/src/interface.rs
+++ b/apps/contracts/vault/src/interface.rs
@@ -16,9 +16,9 @@ pub trait VaultTrait {
     /// * `assets` - A vector of `AssetAllocation` structs representing the assets and their associated strategies.
     /// * `manager` - The address responsible for managing the vault.
     /// * `emergency_manager` - The address with emergency control over the vault.
-    /// * `fee_receiver` - The address that will receive fees from the vault.
-    /// * `vault_share` - The percentage of the vault's fees that will be sent to the DeFindex receiver. in BPS.
-    /// * `defindex_receiver` - The address that will receive fees for DeFindex from the vault.
+    /// * `vault_fee_receiver` - The address that will receive fees from the vault.
+    /// * `vault_fee` - The percentage of the vault's fees that will be sent to the DeFindex receiver. in BPS.
+    /// * `defindex_protocol_receiver` - The address that will receive fees for DeFindex from the vault.
     /// * `factory` - The address of the factory that deployed the vault.
     ///
     /// # Returns:
@@ -28,9 +28,9 @@ pub trait VaultTrait {
         assets: Vec<AssetAllocation>,
         manager: Address,
         emergency_manager: Address,
-        fee_receiver: Address,
-        vault_share: u32,
-        defindex_receiver: Address,
+        vault_fee_receiver: Address,
+        vault_fee: u32,
+        defindex_protocol_receiver: Address,
         factory: Address,
         vault_name: String,
         vault_symbol: String,
@@ -185,7 +185,7 @@ pub trait AdminInterfaceTrait {
     /// # Arguments:
     /// * `e` - The environment.
     /// * `caller` - The address initiating the change (must be the manager or emergency manager).
-    /// * `fee_receiver` - The new fee receiver address.
+    /// * `vault_fee_receiver` - The new fee receiver address.
     ///
     /// # Returns:
     /// * `()` - No return value.
diff --git a/apps/contracts/vault/src/lib.rs b/apps/contracts/vault/src/lib.rs
index e2ea5c59..19f81b99 100755
--- a/apps/contracts/vault/src/lib.rs
+++ b/apps/contracts/vault/src/lib.rs
@@ -33,7 +33,7 @@ use models::{
     OptionalSwapDetailsExactOut,
 };
 use storage::{
-    get_assets, set_asset, set_defindex_receiver, set_factory, set_last_fee_assesment,
+    get_assets, set_asset, set_defindex_protocol_fee_receiver, set_factory, set_last_fee_assesment,
     set_total_assets, set_vault_share,
 };
 use strategies::{
@@ -53,32 +53,39 @@ pub use error::ContractError;
 pub struct DeFindexVault;
 
 #[contractimpl]
-impl VaultTrait for DeFindexVault {
+impl VaultTrait for DeFindexVault { 
     /// Initializes the DeFindex Vault contract with the required parameters.
     ///
-    /// This function sets the roles for emergency manager, fee receiver, and manager.
+    /// This function sets the roles for manager, emergency manager, vault fee receiver, and manager.
     /// It also stores the list of assets to be managed by the vault, including strategies for each asset.
     ///
-    /// # Arguments:
-    /// * `e` - The environment.
-    /// * `assets` - A vector of `AssetAllocation` structs representing the assets and their associated strategies.
-    /// * `manager` - The address responsible for managing the vault.
-    /// * `emergency_manager` - The address with emergency control over the vault.
-    /// * `fee_receiver` - The address that will receive fees from the vault.
-    /// * `vault_share` - The percentage of the vault's fees that will be sent to the DeFindex receiver. in BPS.
-    /// * `defindex_receiver` - The address that will receive fees for DeFindex from the vault.
-    /// * `factory` - The address of the factory that deployed the vault.
+    /// # Arguments
+    /// - `assets`: List of asset allocations for the vault, including strategies associated with each asset.
+    /// - `manager`: Primary vault manager with permissions for vault control.
+    /// - `emergency_manager`: Address with emergency access for emergency control over the vault.
+    /// - `vault_fee_receiver`: Address designated to receive the vault fee receiver's portion of management fees.
+    /// - `vault_fee`: Vault-specific fee percentage in basis points (typically set at 0-2% APR).
+    /// - `defindex_protocol_receiver`: Address receiving DeFindex’s protocol-wide fee in basis points (0.5% APR).
+    /// - `factory`: Factory contract address for deployment linkage.
+    /// - `vault_name`: Name of the vault token to be displayed in metadata.
+    /// - `vault_symbol`: Symbol representing the vault’s token.
+    ///
+    /// # Returns
+    /// - `Result<(), ContractError>`: Returns `Ok(())` if initialization succeeds, or a `ContractError` if 
+    ///   any setup fails (e.g., strategy mismatch with asset).
+    ///
+    /// # Errors
+    /// - `ContractError::AlreadyInitialized`: If the vault has already been initialized.
+    /// - `ContractError::StrategyDoesNotSupportAsset`: If a strategy within an asset does not support the asset’s contract.
     ///
-    /// # Returns:
-    /// * `Result<(), ContractError>` - Ok if successful, otherwise returns a ContractError.
     fn initialize(
         e: Env,
         assets: Vec<AssetAllocation>,
         manager: Address,
         emergency_manager: Address,
-        fee_receiver: Address,
-        vault_share: u32,
-        defindex_receiver: Address,
+        vault_fee_receiver: Address,
+        vault_fee: u32,
+        defindex_protocol_receiver: Address,
         factory: Address,
         vault_name: String,
         vault_symbol: String,
@@ -89,14 +96,14 @@ impl VaultTrait for DeFindexVault {
         }
 
         access_control.set_role(&RolesDataKey::EmergencyManager, &emergency_manager);
-        access_control.set_role(&RolesDataKey::FeeReceiver, &fee_receiver);
+        access_control.set_role(&RolesDataKey::VaultFeeReceiver, &vault_fee_receiver);
         access_control.set_role(&RolesDataKey::Manager, &manager);
 
         // Set Vault Share (in basis points)
-        set_vault_share(&e, &vault_share);
+        set_vault_share(&e, &vault_fee);
 
         // Set Paltalabs Fee Receiver
-        set_defindex_receiver(&e, &defindex_receiver);
+        set_defindex_protocol_fee_receiver(&e, &defindex_protocol_receiver);
 
         // Set the factory address
         set_factory(&e, &factory);
@@ -134,9 +141,9 @@ impl VaultTrait for DeFindexVault {
         events::emit_initialized_vault(
             &e,
             emergency_manager,
-            fee_receiver,
+            vault_fee_receiver,
             manager,
-            defindex_receiver,
+            defindex_protocol_receiver,
             assets,
         );
 
@@ -173,9 +180,6 @@ impl VaultTrait for DeFindexVault {
 
         // get assets
         let assets = get_assets(&e);
-        // lenght should be equal tolength
-        let assets_length = assets.len();
-        let asset = t_assets(&e);
         let assets_length = assets.len();
 
         // assets lenght should be equal to amounts_desired and amounts_min length
@@ -201,7 +205,7 @@ impl VaultTrait for DeFindexVault {
                 let total_managed_funds = fetch_total_managed_funds(&e);
                 VaultToken::total_supply(e.clone()) * amounts_desired.get(0).unwrap()
                     /   
-                        .get(assets.get(0).unwrap().address.clone())
+                    total_managed_funds.get(assets.get(0).unwrap().address.clone())
                         .unwrap()
             };
             (amounts_desired, shares)
@@ -505,7 +509,7 @@ impl AdminInterfaceTrait for DeFindexVault {
     /// # Arguments:
     /// * `e` - The environment.
     /// * `caller` - The address initiating the change (must be the manager or emergency manager).
-    /// * `fee_receiver` - The new fee receiver address.
+    /// * `vault_fee_receiver` - The new fee receiver address.
     ///
     /// # Returns:
     /// * `()` - No return value.
diff --git a/apps/contracts/vault/src/storage.rs b/apps/contracts/vault/src/storage.rs
index 3eaf9860..844dd5b4 100644
--- a/apps/contracts/vault/src/storage.rs
+++ b/apps/contracts/vault/src/storage.rs
@@ -7,7 +7,7 @@ use crate::models::AssetAllocation;
 enum DataKey {
     AssetAllocation(u32), // AssetAllocation Addresse by index
     TotalAssets,          // Total number of tokens
-    DeFindexReceiver,
+    DeFindexProtocolFeeReceiver,
     Factory,
     LastFeeAssessment,
     VaultShare,
@@ -45,16 +45,16 @@ pub fn get_assets(e: &Env) -> Vec<AssetAllocation> {
 }
 
 // DeFindex Fee Receiver
-pub fn set_defindex_receiver(e: &Env, address: &Address) {
+pub fn set_defindex_protocol_fee_receiver(e: &Env, address: &Address) {
     e.storage()
         .instance()
-        .set(&DataKey::DeFindexReceiver, address);
+        .set(&DataKey::DeFindexProtocolFeeReceiver, address);
 }
 
-pub fn get_defindex_receiver(e: &Env) -> Address {
+pub fn get_defindex_protocol_fee_receiver(e: &Env) -> Address {
     e.storage()
         .instance()
-        .get(&DataKey::DeFindexReceiver)
+        .get(&DataKey::DeFindexProtocolFeeReceiver)
         .unwrap()
 }
 
@@ -82,10 +82,10 @@ pub fn get_last_fee_assesment(e: &Env) -> u64 {
 }
 
 // Vault Share
-pub fn set_vault_share(e: &Env, vault_share: &u32) {
+pub fn set_vault_share(e: &Env, vault_fee: &u32) {
     e.storage()
         .instance()
-        .set(&DataKey::VaultShare, vault_share);
+        .set(&DataKey::VaultShare, vault_fee);
 }
 
 pub fn get_vault_share(e: &Env) -> u32 {
diff --git a/apps/contracts/vault/src/test.rs b/apps/contracts/vault/src/test.rs
index 4a9960a9..46bccd0c 100755
--- a/apps/contracts/vault/src/test.rs
+++ b/apps/contracts/vault/src/test.rs
@@ -88,8 +88,8 @@ pub struct DeFindexVaultTest<'a> {
     token1_admin_client: SorobanTokenAdminClient<'a>,
     token1: SorobanTokenClient<'a>,
     emergency_manager: Address,
-    fee_receiver: Address,
-    defindex_receiver: Address,
+    vault_fee_receiver: Address,
+    defindex_protocol_receiver: Address,
     manager: Address,
     strategy_client: HodlStrategyClient<'a>,
 }
@@ -105,8 +105,8 @@ impl<'a> DeFindexVaultTest<'a> {
         let defindex_contract = create_defindex_vault(&env);
 
         let emergency_manager = Address::generate(&env);
-        let fee_receiver = Address::generate(&env);
-        let defindex_receiver = Address::generate(&env);
+        let vault_fee_receiver = Address::generate(&env);
+        let defindex_protocol_receiver = Address::generate(&env);
         let manager = Address::generate(&env);
 
         let token0_admin = Address::generate(&env);
@@ -131,8 +131,8 @@ impl<'a> DeFindexVaultTest<'a> {
             token1_admin_client,
             token1,
             emergency_manager,
-            fee_receiver,
-            defindex_receiver,
+            vault_fee_receiver,
+            defindex_protocol_receiver,
             manager,
             strategy_client,
         }
diff --git a/apps/contracts/vault/src/test/admin.rs b/apps/contracts/vault/src/test/admin.rs
index 38fc84ef..50b70331 100644
--- a/apps/contracts/vault/src/test/admin.rs
+++ b/apps/contracts/vault/src/test/admin.rs
@@ -29,41 +29,41 @@ fn test_set_new_fee_receiver_by_fee_receiver() {
         &assets,
         &test.manager,
         &test.emergency_manager,
-        &test.fee_receiver,
+        &test.vault_fee_receiver,
         &2000u32,
-        &test.defindex_receiver,
+        &test.defindex_protocol_receiver,
         &test.defindex_factory,
         &String::from_str(&test.env, "dfToken"),
         &String::from_str(&test.env, "DFT"),
     );
 
     let fee_receiver_role = test.defindex_contract.get_fee_receiver();
-    assert_eq!(fee_receiver_role, test.fee_receiver);
+    assert_eq!(fee_receiver_role, test.vault_fee_receiver);
 
     let users = DeFindexVaultTest::generate_random_users(&test.env, 1);
     // Fee Receiver is setting the new fee receiver
     test.defindex_contract
         .mock_auths(&[MockAuth {
-            address: &test.fee_receiver,
+            address: &test.vault_fee_receiver,
             invoke: &MockAuthInvoke {
                 contract: &test.defindex_contract.address.clone(),
                 fn_name: "set_fee_receiver",
-                args: (&test.fee_receiver, &users[0]).into_val(&test.env),
+                args: (&test.vault_fee_receiver, &users[0]).into_val(&test.env),
                 sub_invokes: &[],
             },
         }])
-        .set_fee_receiver(&test.fee_receiver, &users[0]);
+        .set_fee_receiver(&test.vault_fee_receiver, &users[0]);
 
     let expected_auth = AuthorizedInvocation {
         // Top-level authorized function is `deploy` with all the arguments.
         function: AuthorizedFunction::Contract((
             test.defindex_contract.address.clone(),
             Symbol::new(&test.env, "set_fee_receiver"),
-            (&test.fee_receiver, users[0].clone()).into_val(&test.env),
+            (&test.vault_fee_receiver, users[0].clone()).into_val(&test.env),
         )),
         sub_invocations: vec![],
     };
-    assert_eq!(test.env.auths(), vec![(test.fee_receiver, expected_auth)]);
+    assert_eq!(test.env.auths(), vec![(test.vault_fee_receiver, expected_auth)]);
 
     let new_fee_receiver_role = test.defindex_contract.get_fee_receiver();
     assert_eq!(new_fee_receiver_role, users[0]);
@@ -92,16 +92,16 @@ fn test_set_new_fee_receiver_by_manager() {
         &assets,
         &test.manager,
         &test.emergency_manager,
-        &test.fee_receiver,
+        &test.vault_fee_receiver,
         &2000u32,
-        &test.defindex_receiver,
+        &test.defindex_protocol_receiver,
         &test.defindex_factory,
         &String::from_str(&test.env, "dfToken"),
         &String::from_str(&test.env, "DFT"),
     );
 
     let fee_receiver_role = test.defindex_contract.get_fee_receiver();
-    assert_eq!(fee_receiver_role, test.fee_receiver);
+    assert_eq!(fee_receiver_role, test.vault_fee_receiver);
 
     let users = DeFindexVaultTest::generate_random_users(&test.env, 1);
     // Now Manager is setting the new fee receiver
@@ -156,16 +156,16 @@ fn test_set_new_fee_receiver_by_emergency_manager() {
         &assets,
         &test.manager,
         &test.emergency_manager,
-        &test.fee_receiver,
+        &test.vault_fee_receiver,
         &2000u32,
-        &test.defindex_receiver,
+        &test.defindex_protocol_receiver,
         &test.defindex_factory,
         &String::from_str(&test.env, "dfToken"),
         &String::from_str(&test.env, "DFT"),
     );
 
     let fee_receiver_role = test.defindex_contract.get_fee_receiver();
-    assert_eq!(fee_receiver_role, test.fee_receiver);
+    assert_eq!(fee_receiver_role, test.vault_fee_receiver);
 
     let users = DeFindexVaultTest::generate_random_users(&test.env, 1);
     // Now Emergency Manager is setting the new fee receiver
@@ -195,16 +195,16 @@ fn test_set_new_fee_receiver_invalid_sender() {
         &assets,
         &test.manager,
         &test.emergency_manager,
-        &test.fee_receiver,
+        &test.vault_fee_receiver,
         &2000u32,
-        &test.defindex_receiver,
+        &test.defindex_protocol_receiver,
         &test.defindex_factory,
         &String::from_str(&test.env, "dfToken"),
         &String::from_str(&test.env, "DFT"),
     );
 
     let fee_receiver_role = test.defindex_contract.get_fee_receiver();
-    assert_eq!(fee_receiver_role, test.fee_receiver);
+    assert_eq!(fee_receiver_role, test.vault_fee_receiver);
 
     let users = DeFindexVaultTest::generate_random_users(&test.env, 1);
     // Trying to set the new fee receiver with an invalid sender
@@ -232,9 +232,9 @@ fn test_set_new_manager_by_manager() {
         &assets,
         &test.manager,
         &test.emergency_manager,
-        &test.fee_receiver,
+        &test.vault_fee_receiver,
         &2000u32,
-        &test.defindex_receiver,
+        &test.defindex_protocol_receiver,
         &test.defindex_factory,
         &String::from_str(&test.env, "dfToken"),
         &String::from_str(&test.env, "DFT"),
diff --git a/apps/contracts/vault/src/test/deposit.rs b/apps/contracts/vault/src/test/deposit.rs
index ccccf851..6568d6dd 100644
--- a/apps/contracts/vault/src/test/deposit.rs
+++ b/apps/contracts/vault/src/test/deposit.rs
@@ -26,9 +26,9 @@ fn deposit_amounts_desired_wrong_length() {
         &assets,
         &test.manager,
         &test.emergency_manager,
-        &test.fee_receiver,
+        &test.vault_fee_receiver,
         &2000u32,
-        &test.defindex_receiver,
+        &test.defindex_protocol_receiver,
         &test.defindex_factory,
         &String::from_str(&test.env, "dfToken"),
         &String::from_str(&test.env, "DFT"),
@@ -43,7 +43,7 @@ fn deposit_amounts_desired_wrong_length() {
         &users[0],
     );
 
-    assert_eq!(response, Err(Ok(ContractError::WrongAmuntsLength)));
+    assert_eq!(response, Err(Ok(ContractError::WrongAmountsLength)));
 }
 
 #[test]
@@ -88,8 +88,8 @@ fn deposit_several_assets() {
 //         &assets,
 //         &test.manager,
 //         &test.emergency_manager,
-//         &test.fee_receiver,
-//         &test.defindex_receiver,
+//         &test.vault_fee_receiver,
+//         &test.defindex_protocol_receiver,
 //     );
 //     let amount = 1000i128;
 
diff --git a/apps/contracts/vault/src/test/emergency_withdraw.rs b/apps/contracts/vault/src/test/emergency_withdraw.rs
index 9df5992a..742ac034 100644
--- a/apps/contracts/vault/src/test/emergency_withdraw.rs
+++ b/apps/contracts/vault/src/test/emergency_withdraw.rs
@@ -23,9 +23,9 @@ fn test_emergency_withdraw_success() {
         &assets,
         &test.manager,
         &test.emergency_manager,
-        &test.fee_receiver,
+        &test.vault_fee_receiver,
         &2000u32,
-        &test.defindex_receiver,
+        &test.defindex_protocol_receiver,
         &test.defindex_factory,
         &String::from_str(&test.env, "dfToken"),
         &String::from_str(&test.env, "DFT"),
diff --git a/apps/contracts/vault/src/test/initialize.rs b/apps/contracts/vault/src/test/initialize.rs
index 621c63d8..0d0b6e5e 100644
--- a/apps/contracts/vault/src/test/initialize.rs
+++ b/apps/contracts/vault/src/test/initialize.rs
@@ -26,9 +26,9 @@ fn test_initialize_and_get_roles() {
         &assets,
         &test.manager,
         &test.emergency_manager,
-        &test.fee_receiver,
+        &test.vault_fee_receiver,
         &2000u32,
-        &test.defindex_receiver,
+        &test.defindex_protocol_receiver,
         &test.defindex_factory,
         &String::from_str(&test.env, "dfToken"),
         &String::from_str(&test.env, "DFT"),
@@ -39,7 +39,7 @@ fn test_initialize_and_get_roles() {
     let emergency_manager_role = test.defindex_contract.get_emergency_manager();
 
     assert_eq!(manager_role, test.manager);
-    assert_eq!(fee_receiver_role, test.fee_receiver);
+    assert_eq!(fee_receiver_role, test.vault_fee_receiver);
     assert_eq!(emergency_manager_role, test.emergency_manager);
 }
 
@@ -76,9 +76,9 @@ fn test_initialize_twice() {
         &assets,
         &test.manager,
         &test.emergency_manager,
-        &test.fee_receiver,
+        &test.vault_fee_receiver,
         &2000u32,
-        &test.defindex_receiver,
+        &test.defindex_protocol_receiver,
         &test.defindex_factory,
         &String::from_str(&test.env, "dfToken"),
         &String::from_str(&test.env, "DFT"),
@@ -88,9 +88,9 @@ fn test_initialize_twice() {
         &assets,
         &test.manager,
         &test.emergency_manager,
-        &test.fee_receiver,
+        &test.vault_fee_receiver,
         &2000u32,
-        &test.defindex_receiver,
+        &test.defindex_protocol_receiver,
         &test.defindex_factory,
         &String::from_str(&test.env, "dfToken"),
         &String::from_str(&test.env, "DFT"),
diff --git a/apps/contracts/vault/src/test/rebalance.rs b/apps/contracts/vault/src/test/rebalance.rs
index 0743b471..e5f89bb9 100644
--- a/apps/contracts/vault/src/test/rebalance.rs
+++ b/apps/contracts/vault/src/test/rebalance.rs
@@ -26,9 +26,9 @@ fn rebalance() {
         &assets,
         &test.manager,
         &test.emergency_manager,
-        &test.fee_receiver,
+        &test.vault_fee_receiver,
         &2000u32,
-        &test.defindex_receiver,
+        &test.defindex_protocol_receiver,
         &test.defindex_factory,
         &String::from_str(&test.env, "dfToken"),
         &String::from_str(&test.env, "DFT"),
diff --git a/apps/contracts/vault/src/test/withdraw.rs b/apps/contracts/vault/src/test/withdraw.rs
index a135d468..fa1d5a8e 100644
--- a/apps/contracts/vault/src/test/withdraw.rs
+++ b/apps/contracts/vault/src/test/withdraw.rs
@@ -24,9 +24,9 @@ fn test_withdraw_from_idle_success() {
         &assets,
         &test.manager,
         &test.emergency_manager,
-        &test.fee_receiver,
+        &test.vault_fee_receiver,
         &2000u32,
-        &test.defindex_receiver,
+        &test.defindex_protocol_receiver,
         &test.defindex_factory,
         &String::from_str(&test.env, "dfToken"),
         &String::from_str(&test.env, "DFT"),
@@ -141,9 +141,9 @@ fn test_withdraw_from_strategy_success() {
         &assets,
         &test.manager,
         &test.emergency_manager,
-        &test.fee_receiver,
+        &test.vault_fee_receiver,
         &2000u32,
-        &test.defindex_receiver,
+        &test.defindex_protocol_receiver,
         &test.defindex_factory,
         &String::from_str(&test.env, "dfToken"),
         &String::from_str(&test.env, "DFT"),
diff --git a/apps/docs/10-whitepaper/03-the-defindex-approach/02-contracts/01-vault-contract.md b/apps/docs/10-whitepaper/03-the-defindex-approach/02-contracts/01-vault-contract.md
index 2b17ad36..e1144219 100644
--- a/apps/docs/10-whitepaper/03-the-defindex-approach/02-contracts/01-vault-contract.md
+++ b/apps/docs/10-whitepaper/03-the-defindex-approach/02-contracts/01-vault-contract.md
@@ -118,7 +118,7 @@ $$
 f_{\text{total}} = f_{\text{DeFindex}} + f_{\text{Vault}}
 $$
 
-where $f_{\text{DeFindex}} = 0.5\%$ is a fixed fee that goes to the DeFindex Protocol Fee Receiver address, and $f_{\text{Vault}}$ is a variable APR, typically between 0.5% and 2%, that goes to the Vault Fee Receiver address.
+where $f_{\text{DeFindex}} = 0.5\%$ is a fixed `defindex_fee` that goes to the DeFindex Protocol Fee Receiver address, and $f_{\text{Vault}}$ is a variable APR `vault_fee`, typically between 0.5% and 2%, that goes to the Vault Fee Receiver address.
 
 ### Fee Collection Methodology
 

From 3cdda1d4099b4426c611adca5dd0dc12b734ec3a Mon Sep 17 00:00:00 2001
From: Matias Poblete <86752543+MattPoblete@users.noreply.github.com>
Date: Wed, 6 Nov 2024 07:52:18 -0300
Subject: [PATCH 12/39] =?UTF-8?q?=E2=9C=A8Added=20new=20fields=20to=20matc?=
 =?UTF-8?q?h=20the=20new=20factory?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DeployVault/ConfirmDelpoyModal.tsx        |  33 +++-
 .../components/DeployVault/DeployVault.tsx    |  18 ++-
 .../components/DeployVault/VaultPreview.tsx   | 149 +++++++++++-------
 apps/dapp/src/components/ui/number-input.tsx  |  23 +++
 .../dapp/src/store/lib/features/vaultStore.ts |  21 ++-
 5 files changed, 178 insertions(+), 66 deletions(-)
 create mode 100644 apps/dapp/src/components/ui/number-input.tsx

diff --git a/apps/dapp/src/components/DeployVault/ConfirmDelpoyModal.tsx b/apps/dapp/src/components/DeployVault/ConfirmDelpoyModal.tsx
index d6372293..be5366c4 100644
--- a/apps/dapp/src/components/DeployVault/ConfirmDelpoyModal.tsx
+++ b/apps/dapp/src/components/DeployVault/ConfirmDelpoyModal.tsx
@@ -52,6 +52,8 @@ export const ConfirmDelpoyModal = ({ isOpen, onClose }: { isOpen: boolean, onClo
   const newVault: NewVaultState = useAppSelector(state => state.newVault);
   const strategies: Strategy[] = newVault.strategies;
   const indexName = useAppSelector(state => state.newVault.name)
+  const indexSymbol = useAppSelector(state => state.newVault.symbol)
+  const indexShare = useAppSelector(state => state.newVault.vaultShare)
   const managerString = useAppSelector(state => state.newVault.manager)
   const emergencyManagerString = useAppSelector(state => state.newVault.emergencyManager)
   const feeReceiverString = useAppSelector(state => state.newVault.feeReceiver)
@@ -105,6 +107,7 @@ export const ConfirmDelpoyModal = ({ isOpen, onClose }: { isOpen: boolean, onClo
           })
         );
         const assetsArray = await Promise.all(assetsPromises);
+        console.log(assetsArray)
         setAssets(assetsArray);
         setLoadingAssets(false);
       } catch (error) {
@@ -119,6 +122,14 @@ export const ConfirmDelpoyModal = ({ isOpen, onClose }: { isOpen: boolean, onClo
 
   const deployDefindex = async () => {
 
+    if (indexName === "" || indexName === undefined) {
+      console.log("Set index name please")
+      return
+    }
+    if (indexSymbol === "" || indexSymbol === undefined) {
+      console.log("Set index symbol please")
+      return
+    }
     if (managerString === "" || managerString === undefined) {
       console.log("Set manager please")
       return
@@ -131,7 +142,9 @@ export const ConfirmDelpoyModal = ({ isOpen, onClose }: { isOpen: boolean, onClo
       console.log("Set fee receiver please")
       return
     }
-
+    const vaultName = nativeToScVal(indexName, { type: "string" })
+    const vaultSymbol = nativeToScVal(indexSymbol, { type: "string" })
+    const vaultShare = nativeToScVal(indexShare, { type: "u32" })
     const emergencyManager = new Address(emergencyManagerString)
     const feeReceiver = new Address(feeReceiverString)
     const manager = new Address(managerString)
@@ -154,13 +167,27 @@ export const ConfirmDelpoyModal = ({ isOpen, onClose }: { isOpen: boolean, onClo
 
     const strategyParamsScValVec = xdr.ScVal.scvVec(strategyParamsScVal);
 
+    /* fn create_defindex_vault(
+        e: Env, 
+        emergency_manager: Address, 
+        fee_receiver: Address, 
+        vault_share: u32,
+        vault_name: String,
+        vault_symbol: String,
+        manager: Address,
+        assets: Vec<AssetAllocation>,
+        salt: BytesN<32>
+    ) -> Result<Address, FactoryError> */
     const createDefindexParams: xdr.ScVal[] = [
       emergencyManager.toScVal(),
       feeReceiver.toScVal(),
+      vaultShare,
+      strategyParamsScValVec,
+      vaultName,
+      vaultSymbol,
+      xdr.ScVal.scvVec(ratios.map((ratio) => nativeToScVal(ratio, { type: "u32" }))),
       manager.toScVal(),
       xdr.ScVal.scvVec(assets.map((token) => new Address(token).toScVal())),
-      xdr.ScVal.scvVec(ratios.map((ratio) => nativeToScVal(ratio, { type: "u32" }))),
-      strategyParamsScValVec,
       nativeToScVal(salt),
     ];
 
diff --git a/apps/dapp/src/components/DeployVault/DeployVault.tsx b/apps/dapp/src/components/DeployVault/DeployVault.tsx
index b698a579..558f3b07 100644
--- a/apps/dapp/src/components/DeployVault/DeployVault.tsx
+++ b/apps/dapp/src/components/DeployVault/DeployVault.tsx
@@ -13,7 +13,7 @@ import ItemSlider from './Slider'
 import AddNewStrategyButton from './AddNewStrategyButton'
 import { useAppDispatch, useAppSelector } from '@/store/lib/storeHooks'
 import { ConfirmDelpoyModal } from './ConfirmDelpoyModal'
-import { setName } from '@/store/lib/features/vaultStore'
+import { setName, setSymbol } from '@/store/lib/features/vaultStore'
 import { Strategy } from '@/store/lib/features/walletStore'
 import { DialogBody, DialogCloseTrigger, DialogContent, DialogFooter, DialogHeader, DialogRoot, DialogTitle } from '../ui/dialog'
 
@@ -21,6 +21,8 @@ export const DeployVault = () => {
   const dispatch = useAppDispatch()
   const strategies: Strategy[] = useAppSelector(state => state.newVault.strategies)
   const totalValues = useAppSelector(state => state.newVault.totalValues)
+  const vaultName = useAppSelector(state => state.newVault.name)
+  const vaultSymbol = useAppSelector(state => state.newVault.symbol)
   const [openConfirm, setOpenConfirm] = useState<boolean>(false)
 
   const handleClose = () => {
@@ -31,6 +33,10 @@ export const DeployVault = () => {
     await dispatch(setName(e.target.value))
   }
 
+  const setVaultSymbol = async (e: any) => {
+    await dispatch(setSymbol(e.target.value))
+  }
+
   return (
     <DialogContent>
       <DialogBody>
@@ -39,9 +45,13 @@ export const DeployVault = () => {
           alignSelf={'end'}
           alignContent={'center'}
           mb={4}
+          gap={6}
         >
-          <GridItem colStart={1} colSpan={[12, null, 3]} mb={{ base: 4, md: 0 }}>
-            <Input onChange={setVaultName} placeholder='Defindex name...'></Input>
+          <GridItem colStart={1} colSpan={[12, null, 5]} mb={{ base: 4, md: 0 }}>
+            <Input onChange={setVaultName} value={vaultName} w={'full'} placeholder='Defindex name...'></Input>
+          </GridItem>
+          <GridItem colStart={1} colSpan={[12, null, 4]} mb={{ base: 4, md: 0 }}>
+            <Input onChange={setVaultSymbol} value={vaultSymbol} w={'full'} placeholder='Defindex symbol...' maxLength={6} minLength={1}></Input>
           </GridItem>
           <GridItem colStart={[1, null, 12]} colSpan={[12, null, 1]} textAlign={['center', null, 'end']}>
             <AddNewStrategyButton />
@@ -62,7 +72,7 @@ export const DeployVault = () => {
         <DialogRoot open={openConfirm} onOpenChange={(e) => setOpenConfirm(e.open)}>
           <DialogTrigger>
             <Button
-              disabled={totalValues! > 100 || strategies.length == 0 || totalValues == 0}
+              disabled={totalValues! > 100 || strategies.length == 0 || totalValues == 0 || vaultName == '' || vaultName.length < 4}
               colorScheme="green"
               size="lg"
               mt={4}
diff --git a/apps/dapp/src/components/DeployVault/VaultPreview.tsx b/apps/dapp/src/components/DeployVault/VaultPreview.tsx
index 8b8a0b25..ecc7f745 100644
--- a/apps/dapp/src/components/DeployVault/VaultPreview.tsx
+++ b/apps/dapp/src/components/DeployVault/VaultPreview.tsx
@@ -13,15 +13,25 @@ import {
 import { shortenAddress } from '@/helpers/shortenAddress'
 
 import { ChartData } from './ConfirmDelpoyModal'
-import { setEmergencyManager, setFeeReceiver, setManager } from '@/store/lib/features/vaultStore'
-import { useAppDispatch } from '@/store/lib/storeHooks'
+import { setEmergencyManager, setFeeReceiver, setManager, setVaultShare } from '@/store/lib/features/vaultStore'
+import { useAppDispatch, useAppSelector } from '@/store/lib/storeHooks'
 import { StrKey } from '@stellar/stellar-sdk'
 import { FaRegPaste } from "react-icons/fa6";
 import { useSorobanReact } from '@soroban-react/core'
 import { InputGroup } from '../ui/input-group'
 import { Tooltip } from '../ui/tooltip'
+import {
+  AccordionItem,
+  AccordionItemContent,
+  AccordionItemTrigger,
+  AccordionRoot,
+} from "@chakra-ui/react"
 
-
+enum AccordionItems {
+  STRATEGY_DETAILS = 'strategy-details',
+  MANAGER_CONFIGS = 'manager-configs',
+  FEES_CONFIGS = 'fees-configs',
+}
 interface FormControlInterface {
   manager: {
     isValid: boolean | undefined;
@@ -35,11 +45,14 @@ interface FormControlInterface {
     isValid: boolean | undefined;
     value: string | undefined;
   },
+  vaultShare: number
 }
 export const VaultPreview = ({ data }: { data: ChartData[] }) => {
 
   const dispatch = useAppDispatch()
   const { address } = useSorobanReact()
+  const vaultShare = useAppSelector(state => state.newVault.vaultShare)
+  const [accordionValue, setAccordionValue] = useState<AccordionItems[]>([AccordionItems.STRATEGY_DETAILS])
   const [formControl, setFormControl] = useState<FormControlInterface>({
     manager: {
       isValid: undefined,
@@ -53,6 +66,7 @@ export const VaultPreview = ({ data }: { data: ChartData[] }) => {
       isValid: undefined,
       value: undefined
     },
+    vaultShare: 0
   })
   const isValidAddress = (address: string) => {
     if (StrKey.isValidEd25519PublicKey(address) || StrKey.isValidMed25519PublicKey(address) || StrKey.isValidContract(address)) {
@@ -134,6 +148,19 @@ export const VaultPreview = ({ data }: { data: ChartData[] }) => {
     })
     dispatch(setFeeReceiver(input))
   };
+  const handleVaultShareChange = (input: any) => {
+    console.log(input)
+    if (isNaN(input)) return
+    if (input < 0 || input > 100) return
+    const decimalRegex = /^(\d+)?(\.\d{0,2})?$/
+    if (!decimalRegex.test(input)) return
+    console.log(input * 100)
+    setFormControl({
+      ...formControl,
+      vaultShare: input
+    })
+    dispatch(setVaultShare(input * 100))
+  }
 
   return (
     <>
@@ -148,54 +175,59 @@ export const VaultPreview = ({ data }: { data: ChartData[] }) => {
           height={200}
         /> */}
       </Box>
-      <Text fontSize='lg' fontWeight='bold' mb={2}>
-        Strategies
-      </Text>
-      <Table.Root>
-        <Table.Header>
-          <Table.Row>
-            <Table.Cell>Name</Table.Cell>
-            <Table.Cell textAlign={'center'}>Address</Table.Cell>
-            <Table.Cell textAlign={'end'}>Percentage</Table.Cell>
-          </Table.Row>
-        </Table.Header>
-        <Table.Body>
-            {data.map((strategy: ChartData, index: number) => (
-              <Table.Row key={index}>
-                <Table.Cell>{strategy.label}</Table.Cell>
-                <Tooltip content={strategy.address}>
-                  <Table.Cell textAlign={'center'}>
-                  {strategy.address ? shortenAddress(strategy.address) : '-'}
-                  </Table.Cell>
-                </Tooltip>
-                <Table.Cell textAlign={'end'}>{strategy.value}%</Table.Cell>
-              </Table.Row>
-            ))}
-        </Table.Body>
-      </Table.Root>
-      <Box height="20px" />
-      <Grid
-        w={'100%'}
-        templateColumns={'repeat(4, 1fr)'}
-        templateRows={'repeat(3, 1fr)'}
-        alignSelf={'end'}
-        gap={6}
-      >
-        <GridItem colSpan={4} colStart={1} rowStart={1}>
+      <AccordionRoot value={accordionValue} onValueChange={(e: any) => setAccordionValue(e.value)}>
+        <AccordionItem value={AccordionItems.STRATEGY_DETAILS}>
+          <AccordionItemTrigger>
+            <Text fontSize='lg' fontWeight='bold' mb={2}>
+              Strategies
+            </Text>
+          </AccordionItemTrigger>
+          <AccordionItemContent>
+            <Table.Root>
+              <Table.Header>
+                <Table.Row>
+                  <Table.Cell>Name</Table.Cell>
+                  <Table.Cell>Address</Table.Cell>
+                  <Table.Cell >Percentage</Table.Cell>
+                </Table.Row>
+              </Table.Header>
+              <Table.Body>
+                {data.map((strategy: ChartData, index: number) => (
+                  <Table.Row key={index}>
+                    <Table.Cell>{strategy.label}</Table.Cell>
+                    <Tooltip content={strategy.address}>
+                      <Table.Cell w={1}>
+                        {strategy.address ? shortenAddress(strategy.address) : '-'}
+                      </Table.Cell>
+                    </Tooltip>
+                    <Table.Cell>{strategy.value}%</Table.Cell>
+                  </Table.Row>
+                ))}
+              </Table.Body>
+            </Table.Root>
+          </AccordionItemContent>
+        </AccordionItem>
+        <AccordionItem value={AccordionItems.MANAGER_CONFIGS}>
+          <AccordionItemTrigger>
+            <Text fontSize='lg' fontWeight='bold' mb={2}>
+              Manager settings
+            </Text>
+          </AccordionItemTrigger>
+          <AccordionItemContent>
           <Fieldset.Root
             invalid={formControl.manager.isValid === false}
           >
             <Fieldset.Legend>Manager</Fieldset.Legend>
-            <Stack>
+              <Stack mb={6}>
               <InputGroup endElement={
-                <Tooltip content='Use connected wallet'> 
+                  <Tooltip content='Use connected wallet'>
                   <IconButton
                     aria-label='Connected address'
                     size={'sm'}
                     onClick={() => handleManagerChange(address!)}
-                >
+                    >
                     <FaRegPaste />
-                </IconButton>
+                    </IconButton>
                 </Tooltip>
               }>
                 <Input
@@ -206,15 +238,12 @@ export const VaultPreview = ({ data }: { data: ChartData[] }) => {
               </InputGroup>
             </Stack>
             <Fieldset.ErrorText>A valid Stellar / Soroban address is required.</Fieldset.ErrorText>
-          </Fieldset.Root>
-        </GridItem>
-
-        <GridItem colSpan={4} colStart={1} rowStart={2}>
+            </Fieldset.Root>
           <Fieldset.Root
             invalid={formControl.emergencyManager.isValid === false}
           >
             <Fieldset.Legend>Emergency manager</Fieldset.Legend>
-            <Stack>
+              <Stack mb={6}>
               <InputGroup endElement={
                 <Tooltip content='Use connected wallet'>
                   <IconButton
@@ -235,9 +264,15 @@ export const VaultPreview = ({ data }: { data: ChartData[] }) => {
             </Stack>
             <Fieldset.ErrorText>A valid Stellar / Soroban address is required.</Fieldset.ErrorText>
           </Fieldset.Root>
-        </GridItem>
-
-        <GridItem colSpan={4} colStart={1} rowStart={3}>
+          </AccordionItemContent>
+        </AccordionItem>
+        <AccordionItem value={AccordionItems.FEES_CONFIGS}>
+          <AccordionItemTrigger>
+            <Text fontSize='lg' fontWeight='bold' mb={2}>
+              Fees settings
+            </Text>
+          </AccordionItemTrigger>
+          <AccordionItemContent>
           <Fieldset.Root
             invalid={formControl.feeReceiver.isValid === false}
           >
@@ -263,11 +298,17 @@ export const VaultPreview = ({ data }: { data: ChartData[] }) => {
             </Stack>
             <Fieldset.ErrorText>A valid Stellar / Soroban address is required.</Fieldset.ErrorText>
           </Fieldset.Root>
-        </GridItem>
-
-
-
-      </Grid>
+            <InputGroup
+              endElement={'%'}
+            >
+              <Input
+                value={formControl.vaultShare}
+                onChange={(e) => { handleVaultShareChange(e.target.value) }}
+              />
+            </InputGroup>
+          </AccordionItemContent>
+        </AccordionItem>
+      </AccordionRoot >
     </>
   )
 }
diff --git a/apps/dapp/src/components/ui/number-input.tsx b/apps/dapp/src/components/ui/number-input.tsx
new file mode 100644
index 00000000..b178664c
--- /dev/null
+++ b/apps/dapp/src/components/ui/number-input.tsx
@@ -0,0 +1,23 @@
+import { NumberInput as ChakraNumberInput } from "@chakra-ui/react"
+import { forwardRef } from "react"
+
+export interface NumberInputProps extends ChakraNumberInput.RootProps {}
+
+export const NumberInputRoot = forwardRef<HTMLDivElement, NumberInputProps>(
+  function NumberInput(props, ref) {
+    const { children, ...rest } = props
+    return (
+      <ChakraNumberInput.Root ref={ref} variant="outline" {...rest}>
+        {children}
+        <ChakraNumberInput.Control>
+          <ChakraNumberInput.IncrementTrigger />
+          <ChakraNumberInput.DecrementTrigger />
+        </ChakraNumberInput.Control>
+      </ChakraNumberInput.Root>
+    )
+  },
+)
+
+export const NumberInputField = ChakraNumberInput.Input
+export const NumberInputScruber = ChakraNumberInput.Scrubber
+export const NumberInputLabel = ChakraNumberInput.Label
diff --git a/apps/dapp/src/store/lib/features/vaultStore.ts b/apps/dapp/src/store/lib/features/vaultStore.ts
index 1aae364a..62e3c1e6 100644
--- a/apps/dapp/src/store/lib/features/vaultStore.ts
+++ b/apps/dapp/src/store/lib/features/vaultStore.ts
@@ -1,16 +1,17 @@
 import { createSlice, PayloadAction } from '@reduxjs/toolkit'
 import type { RootState } from '../store'
-import axios from 'axios'
 import { getRemoteConfig } from '@/helpers/getRemoteConfig';
 import { Strategy } from './walletStore';
 
 
 export interface NewVaultState {
   address: string;
-  emergencyManager?: string;
-  feeReceiver?: string;
-  manager?: string;
+  emergencyManager: string;
+  feeReceiver: string;
+  manager: string;
+  vaultShare: number;
   name: string;
+  symbol: string;
   strategies: Strategy[];
   totalValues?: number;
 }
@@ -22,6 +23,8 @@ const initialState: NewVaultState = {
   feeReceiver: "",
   manager: "",
   name: "",
+  symbol: "",
+  vaultShare: 0,
   strategies: [
     {
       address: "",
@@ -103,6 +106,9 @@ export const newVaultSlice = createSlice({
     setName: ((state, action: PayloadAction<string>) => {
       state.name = action.payload;
     }),
+    setSymbol: ((state, action: PayloadAction<string>) => {
+      state.symbol = action.payload;
+    }),
     setManager: ((state, action: PayloadAction<string>) => {
       state.manager = action.payload;
     }),
@@ -112,6 +118,9 @@ export const newVaultSlice = createSlice({
     setFeeReceiver: ((state, action: PayloadAction<string>) => {
       state.feeReceiver = action.payload;
     }),
+    setVaultShare: ((state, action: PayloadAction<number>) => {
+      state.vaultShare = action.payload;
+    }),
   }
 })
 
@@ -122,9 +131,11 @@ export const {
   setStrategyValue,
   resetStrategyValue,
   setName,
+  setSymbol,
   setManager,
   setEmergencyManager,
-  setFeeReceiver
+  setFeeReceiver,
+  setVaultShare
 } = newVaultSlice.actions
 
 // Other code such as selectors can use the imported `RootState` type

From 2d4422aefe5e1c9c1ca79165cf24fa9ea6aca622 Mon Sep 17 00:00:00 2001
From: Matias Poblete <86752543+MattPoblete@users.noreply.github.com>
Date: Wed, 6 Nov 2024 08:32:57 -0300
Subject: [PATCH 13/39] =?UTF-8?q?=F0=9F=9A=A7Testing=20new=20fields?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                                   | 2 +-
 apps/dapp/src/components/DeployVault/ConfirmDelpoyModal.tsx | 4 ++--
 apps/dapp/src/utils/factory.ts                              | 5 +++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index d2498b95..aca64660 100644
--- a/README.md
+++ b/README.md
@@ -72,7 +72,7 @@ To deploy the factory contract run:
 ```sh
 bash run.sh
 cd apps/contracts
-yarn deploy-factory
+yarn deploy-factory <network>
 ```
 ### Publish addresses
 Once you have deployed an instance of the factory contract. You can publish the addresses to be used by anyone on the network.
diff --git a/apps/dapp/src/components/DeployVault/ConfirmDelpoyModal.tsx b/apps/dapp/src/components/DeployVault/ConfirmDelpoyModal.tsx
index be5366c4..63bf8db4 100644
--- a/apps/dapp/src/components/DeployVault/ConfirmDelpoyModal.tsx
+++ b/apps/dapp/src/components/DeployVault/ConfirmDelpoyModal.tsx
@@ -182,12 +182,12 @@ export const ConfirmDelpoyModal = ({ isOpen, onClose }: { isOpen: boolean, onClo
       emergencyManager.toScVal(),
       feeReceiver.toScVal(),
       vaultShare,
-      strategyParamsScValVec,
       vaultName,
       vaultSymbol,
-      xdr.ScVal.scvVec(ratios.map((ratio) => nativeToScVal(ratio, { type: "u32" }))),
       manager.toScVal(),
       xdr.ScVal.scvVec(assets.map((token) => new Address(token).toScVal())),
+      //strategyParamsScValVec,
+      xdr.ScVal.scvVec(ratios.map((ratio) => nativeToScVal(ratio, { type: "u32" }))),
       nativeToScVal(salt),
     ];
 
diff --git a/apps/dapp/src/utils/factory.ts b/apps/dapp/src/utils/factory.ts
index 007987d5..b3868bc8 100644
--- a/apps/dapp/src/utils/factory.ts
+++ b/apps/dapp/src/utils/factory.ts
@@ -12,7 +12,8 @@ export async function fetchFactoryAddress(network: string): Promise<string> {
     if (network !== "testnet" && network !== "mainnet") {
         throw new Error(`Invalid network: ${network}. It should be testnet or mainnet`);
     }
-    const url = `https://raw.githubusercontent.com/paltalabs/defindex/refs/heads/main/public/${network}.contracts.json`;
+    return "CCNG7ZS2H22ED7E47E5S7RVDBOQIEKEUEARVNEKNONWQQVOTXBPRA3E6"
+   /*  const url = `https://raw.githubusercontent.com/paltalabs/defindex/refs/heads/main/public/${network}.contracts.json`;
     try {
         const response = await fetch(url);
         if (response.status === 404) {
@@ -31,5 +32,5 @@ export async function fetchFactoryAddress(network: string): Promise<string> {
             throw new Error(`Failed to fetch factory address: ${error}`);
         }
 
-    }
+    } */
 }

From 05e7df78e9f24855efa2f36c66d50bc4ae5ce05e Mon Sep 17 00:00:00 2001
From: esteblock <estebaniglesiasmanriquez@gmail.com>
Date: Wed, 6 Nov 2024 09:20:58 -0300
Subject: [PATCH 14/39] TEMP: Fix check that asset is supported by
 strategy.asset

---
 apps/contracts/vault/src/lib.rs             | 20 ++++++------
 apps/contracts/vault/src/storage.rs         |  2 +-
 apps/contracts/vault/src/test.rs            | 35 +++++++++++++++------
 apps/contracts/vault/src/test/initialize.rs | 22 +++++++------
 4 files changed, 50 insertions(+), 29 deletions(-)

diff --git a/apps/contracts/vault/src/lib.rs b/apps/contracts/vault/src/lib.rs
index 19f81b99..bdc4ad6e 100755
--- a/apps/contracts/vault/src/lib.rs
+++ b/apps/contracts/vault/src/lib.rs
@@ -34,7 +34,7 @@ use models::{
 };
 use storage::{
     get_assets, set_asset, set_defindex_protocol_fee_receiver, set_factory, set_last_fee_assesment,
-    set_total_assets, set_vault_share,
+    set_total_assets, set_vault_fee,
 };
 use strategies::{
     get_asset_allocation_from_address, get_strategy_asset, get_strategy_client,
@@ -47,6 +47,8 @@ use utils::{
     calculate_withdrawal_amounts, check_initialized, check_nonnegative_amount,
 };
 
+use defindex_strategy_core::DeFindexStrategyClient;
+
 pub use error::ContractError;
 
 #[contract]
@@ -99,8 +101,8 @@ impl VaultTrait for DeFindexVault {
         access_control.set_role(&RolesDataKey::VaultFeeReceiver, &vault_fee_receiver);
         access_control.set_role(&RolesDataKey::Manager, &manager);
 
-        // Set Vault Share (in basis points)
-        set_vault_share(&e, &vault_fee);
+        // Set Vault Fee (in basis points)
+        set_vault_fee(&e, &vault_fee);
 
         // Set Paltalabs Fee Receiver
         set_defindex_protocol_fee_receiver(&e, &defindex_protocol_receiver);
@@ -116,12 +118,12 @@ impl VaultTrait for DeFindexVault {
             // for every asset, we need to check that the list of strategyes indeed support this asset
 
             // TODO Fix, currently failing
-            // for strategy in asset.strategies.iter() {
-            //     let strategy_client = DeFindexStrategyClient::new(&e, &strategy.address);
-            //     if strategy_client.asset() != asset.address {
-            //         panic_with_error!(&e, ContractError::StrategyDoesNotSupportAsset);
-            //     }
-            // }
+            for strategy in asset.strategies.iter() {
+                let strategy_client = DeFindexStrategyClient::new(&e, &strategy.address);
+                if      strategy_client.asset() != asset.address {
+                    panic_with_error!(&e, ContractError::StrategyDoesNotSupportAsset);
+                }
+            }
             set_asset(&e, i as u32, &asset);
         }
 
diff --git a/apps/contracts/vault/src/storage.rs b/apps/contracts/vault/src/storage.rs
index 844dd5b4..4027ddc7 100644
--- a/apps/contracts/vault/src/storage.rs
+++ b/apps/contracts/vault/src/storage.rs
@@ -82,7 +82,7 @@ pub fn get_last_fee_assesment(e: &Env) -> u64 {
 }
 
 // Vault Share
-pub fn set_vault_share(e: &Env, vault_fee: &u32) {
+pub fn set_vault_fee(e: &Env, vault_fee: &u32) {
     e.storage()
         .instance()
         .set(&DataKey::VaultShare, vault_fee);
diff --git a/apps/contracts/vault/src/test.rs b/apps/contracts/vault/src/test.rs
index 46bccd0c..e5549da0 100755
--- a/apps/contracts/vault/src/test.rs
+++ b/apps/contracts/vault/src/test.rs
@@ -68,12 +68,24 @@ pub(crate) fn get_token_admin_client<'a>(
     SorobanTokenAdminClient::new(e, address)
 }
 
-pub(crate) fn create_strategy_params(test: &DeFindexVaultTest) -> Vec<Strategy> {
+pub(crate) fn create_strategy_params_token0(test: &DeFindexVaultTest) -> Vec<Strategy> {
     sorobanvec![
         &test.env,
         Strategy {
             name: String::from_str(&test.env, "Strategy 1"),
-            address: test.strategy_client.address.clone(),
+            address: test.strategy_client_token0.address.clone(),
+            paused: false,
+        }
+    ]
+}
+
+
+pub(crate) fn create_strategy_params_token1(test: &DeFindexVaultTest) -> Vec<Strategy> {
+    sorobanvec![
+        &test.env,
+        Strategy {
+            name: String::from_str(&test.env, "Strategy 1"),
+            address: test.strategy_client_token1.address.clone(),
             paused: false,
         }
     ]
@@ -91,7 +103,8 @@ pub struct DeFindexVaultTest<'a> {
     vault_fee_receiver: Address,
     defindex_protocol_receiver: Address,
     manager: Address,
-    strategy_client: HodlStrategyClient<'a>,
+    strategy_client_token0: HodlStrategyClient<'a>,
+    strategy_client_token1: HodlStrategyClient<'a>,
 }
 
 impl<'a> DeFindexVaultTest<'a> {
@@ -120,7 +133,8 @@ impl<'a> DeFindexVaultTest<'a> {
 
         // token1_admin_client.mint(to, amount);
 
-        let strategy_client = create_hodl_strategy(&env, &token0.address);
+        let strategy_client_token0 = create_hodl_strategy(&env, &token0.address);
+        let strategy_client_token1 = create_hodl_strategy(&env, &token1.address);
 
         DeFindexVaultTest {
             env,
@@ -134,7 +148,8 @@ impl<'a> DeFindexVaultTest<'a> {
             vault_fee_receiver,
             defindex_protocol_receiver,
             manager,
-            strategy_client,
+            strategy_client_token0,
+            strategy_client_token1,
         }
     }
 
@@ -147,9 +162,9 @@ impl<'a> DeFindexVaultTest<'a> {
     }
 }
 
-mod admin;
-mod deposit;
-mod emergency_withdraw;
 mod initialize;
-mod rebalance;
-mod withdraw;
+// mod admin;
+// mod deposit;
+// mod emergency_withdraw;
+// mod rebalance;
+// mod withdraw;
diff --git a/apps/contracts/vault/src/test/initialize.rs b/apps/contracts/vault/src/test/initialize.rs
index 0d0b6e5e..c515b45f 100644
--- a/apps/contracts/vault/src/test/initialize.rs
+++ b/apps/contracts/vault/src/test/initialize.rs
@@ -1,7 +1,8 @@
 use soroban_sdk::{vec as sorobanvec, String, Vec};
 
 use crate::test::{
-    create_strategy_params,
+    create_strategy_params_token0,
+    create_strategy_params_token1,
     defindex_vault::{AssetAllocation, ContractError},
     DeFindexVaultTest,
 };
@@ -9,16 +10,17 @@ use crate::test::{
 #[test]
 fn test_initialize_and_get_roles() {
     let test = DeFindexVaultTest::setup();
-    let strategy_params = create_strategy_params(&test);
+    let strategy_params_token0 = create_strategy_params_token0(&test);
+    let strategy_params_token1 = create_strategy_params_token1(&test);
     let assets: Vec<AssetAllocation> = sorobanvec![
         &test.env,
         AssetAllocation {
             address: test.token0.address.clone(),
-            strategies: strategy_params.clone()
+            strategies: strategy_params_token0.clone()
         },
         AssetAllocation {
             address: test.token1.address.clone(),
-            strategies: strategy_params.clone()
+            strategies: strategy_params_token1.clone()
         }
     ];
 
@@ -58,17 +60,18 @@ fn test_get_roles_not_yet_initialized() {
 #[test]
 fn test_initialize_twice() {
     let test = DeFindexVaultTest::setup();
-    let strategy_params = create_strategy_params(&test);
+    let strategy_params_token0 = create_strategy_params_token0(&test);
+    let strategy_params_token1 = create_strategy_params_token1(&test);
 
     let assets: Vec<AssetAllocation> = sorobanvec![
         &test.env,
         AssetAllocation {
             address: test.token0.address.clone(),
-            strategies: strategy_params.clone()
+            strategies: strategy_params_token0.clone()
         },
         AssetAllocation {
             address: test.token1.address.clone(),
-            strategies: strategy_params.clone()
+            strategies: strategy_params_token1.clone()
         }
     ];
 
@@ -127,10 +130,11 @@ fn test_emergency_withdraw_not_yet_initialized() {
     let test = DeFindexVaultTest::setup();
     let users = DeFindexVaultTest::generate_random_users(&test.env, 1);
 
-    let strategy_params = create_strategy_params(&test);
+    let strategy_params_token1 = create_strategy_params_token1(&test);
+    let strategy_params_token1 = create_strategy_params_token1(&test);
 
     let result = test
         .defindex_contract
-        .try_emergency_withdraw(&strategy_params.first().unwrap().address, &users[0]);
+        .try_emergency_withdraw(&strategy_params_token1.first().unwrap().address, &users[0]);
     assert_eq!(result, Err(Ok(ContractError::NotInitialized)));
 }

From 5f0b0de24e18bbfe21fb88dc94e46a3be1921096 Mon Sep 17 00:00:00 2001
From: esteblock <estebaniglesiasmanriquez@gmail.com>
Date: Wed, 6 Nov 2024 09:26:49 -0300
Subject: [PATCH 15/39] fix: check that asset is suported by strategy.asset

---
 apps/contracts/vault/src/access.rs            |  7 ++-
 apps/contracts/vault/src/fee.rs               |  6 ++-
 apps/contracts/vault/src/lib.rs               | 10 ++---
 apps/contracts/vault/src/storage.rs           |  4 +-
 apps/contracts/vault/src/test.rs              | 11 +++--
 apps/contracts/vault/src/test/admin.rs        | 45 ++++++++++++-------
 apps/contracts/vault/src/test/deposit.rs      | 14 +++---
 .../vault/src/test/emergency_withdraw.rs      | 14 +++---
 apps/contracts/vault/src/test/initialize.rs   |  3 +-
 apps/contracts/vault/src/test/rebalance.rs    | 12 ++---
 apps/contracts/vault/src/test/withdraw.rs     | 16 +++----
 11 files changed, 80 insertions(+), 62 deletions(-)

diff --git a/apps/contracts/vault/src/access.rs b/apps/contracts/vault/src/access.rs
index dba6db02..d4f00a96 100644
--- a/apps/contracts/vault/src/access.rs
+++ b/apps/contracts/vault/src/access.rs
@@ -6,7 +6,7 @@ use soroban_sdk::{contracttype, panic_with_error, Address, Env};
 #[contracttype]
 pub enum RolesDataKey {
     EmergencyManager, // Role: Emergency Manager
-    VaultFeeReceiver,      // Role: Fee Receiver
+    VaultFeeReceiver, // Role: Fee Receiver
     Manager,          // Role: Manager
 }
 
@@ -83,7 +83,10 @@ impl AccessControlTrait for AccessControl {
 // Role-specific setters and getters
 impl AccessControl {
     pub fn set_fee_receiver(&self, caller: &Address, vault_fee_receiver: &Address) {
-        self.require_any_role(&[RolesDataKey::Manager, RolesDataKey::VaultFeeReceiver], caller);
+        self.require_any_role(
+            &[RolesDataKey::Manager, RolesDataKey::VaultFeeReceiver],
+            caller,
+        );
         self.set_role(&RolesDataKey::VaultFeeReceiver, vault_fee_receiver);
     }
 
diff --git a/apps/contracts/vault/src/fee.rs b/apps/contracts/vault/src/fee.rs
index 7b0698d6..36d4cd3e 100644
--- a/apps/contracts/vault/src/fee.rs
+++ b/apps/contracts/vault/src/fee.rs
@@ -82,7 +82,11 @@ fn mint_fees(e: &Env, total_fees: i128) -> Result<(), ContractError> {
     let defindex_shares = total_fees - vault_shares;
 
     internal_mint(e.clone(), vault_fee_receiver.clone(), vault_shares);
-    internal_mint(e.clone(), defindex_protocol_receiver.clone(), defindex_shares);
+    internal_mint(
+        e.clone(),
+        defindex_protocol_receiver.clone(),
+        defindex_shares,
+    );
 
     events::emit_fees_minted_event(
         e,
diff --git a/apps/contracts/vault/src/lib.rs b/apps/contracts/vault/src/lib.rs
index bdc4ad6e..925c979d 100755
--- a/apps/contracts/vault/src/lib.rs
+++ b/apps/contracts/vault/src/lib.rs
@@ -55,7 +55,7 @@ pub use error::ContractError;
 pub struct DeFindexVault;
 
 #[contractimpl]
-impl VaultTrait for DeFindexVault { 
+impl VaultTrait for DeFindexVault {
     /// Initializes the DeFindex Vault contract with the required parameters.
     ///
     /// This function sets the roles for manager, emergency manager, vault fee receiver, and manager.
@@ -73,7 +73,7 @@ impl VaultTrait for DeFindexVault {
     /// - `vault_symbol`: Symbol representing the vault’s token.
     ///
     /// # Returns
-    /// - `Result<(), ContractError>`: Returns `Ok(())` if initialization succeeds, or a `ContractError` if 
+    /// - `Result<(), ContractError>`: Returns `Ok(())` if initialization succeeds, or a `ContractError` if
     ///   any setup fails (e.g., strategy mismatch with asset).
     ///
     /// # Errors
@@ -120,7 +120,7 @@ impl VaultTrait for DeFindexVault {
             // TODO Fix, currently failing
             for strategy in asset.strategies.iter() {
                 let strategy_client = DeFindexStrategyClient::new(&e, &strategy.address);
-                if      strategy_client.asset() != asset.address {
+                if strategy_client.asset() != asset.address {
                     panic_with_error!(&e, ContractError::StrategyDoesNotSupportAsset);
                 }
             }
@@ -206,8 +206,8 @@ impl VaultTrait for DeFindexVault {
                 // in this case we will mint a share proportional to the total managed funds
                 let total_managed_funds = fetch_total_managed_funds(&e);
                 VaultToken::total_supply(e.clone()) * amounts_desired.get(0).unwrap()
-                    /   
-                    total_managed_funds.get(assets.get(0).unwrap().address.clone())
+                    / total_managed_funds
+                        .get(assets.get(0).unwrap().address.clone())
                         .unwrap()
             };
             (amounts_desired, shares)
diff --git a/apps/contracts/vault/src/storage.rs b/apps/contracts/vault/src/storage.rs
index 4027ddc7..90df7c61 100644
--- a/apps/contracts/vault/src/storage.rs
+++ b/apps/contracts/vault/src/storage.rs
@@ -83,9 +83,7 @@ pub fn get_last_fee_assesment(e: &Env) -> u64 {
 
 // Vault Share
 pub fn set_vault_fee(e: &Env, vault_fee: &u32) {
-    e.storage()
-        .instance()
-        .set(&DataKey::VaultShare, vault_fee);
+    e.storage().instance().set(&DataKey::VaultShare, vault_fee);
 }
 
 pub fn get_vault_share(e: &Env) -> u32 {
diff --git a/apps/contracts/vault/src/test.rs b/apps/contracts/vault/src/test.rs
index e5549da0..bd168890 100755
--- a/apps/contracts/vault/src/test.rs
+++ b/apps/contracts/vault/src/test.rs
@@ -79,7 +79,6 @@ pub(crate) fn create_strategy_params_token0(test: &DeFindexVaultTest) -> Vec<Str
     ]
 }
 
-
 pub(crate) fn create_strategy_params_token1(test: &DeFindexVaultTest) -> Vec<Strategy> {
     sorobanvec![
         &test.env,
@@ -162,9 +161,9 @@ impl<'a> DeFindexVaultTest<'a> {
     }
 }
 
+mod admin;
+mod deposit;
+mod emergency_withdraw;
 mod initialize;
-// mod admin;
-// mod deposit;
-// mod emergency_withdraw;
-// mod rebalance;
-// mod withdraw;
+mod rebalance;
+mod withdraw;
diff --git a/apps/contracts/vault/src/test/admin.rs b/apps/contracts/vault/src/test/admin.rs
index 50b70331..c7b64d08 100644
--- a/apps/contracts/vault/src/test/admin.rs
+++ b/apps/contracts/vault/src/test/admin.rs
@@ -3,7 +3,10 @@ use soroban_sdk::{
     vec as sorobanvec, IntoVal, String, Symbol, Vec,
 };
 
-use crate::test::{create_strategy_params, defindex_vault::AssetAllocation, DeFindexVaultTest};
+use crate::test::{
+    create_strategy_params_token0, create_strategy_params_token1, defindex_vault::AssetAllocation,
+    DeFindexVaultTest,
+};
 
 extern crate alloc;
 use alloc::vec;
@@ -11,17 +14,18 @@ use alloc::vec;
 #[test]
 fn test_set_new_fee_receiver_by_fee_receiver() {
     let test = DeFindexVaultTest::setup();
-    let strategy_params = create_strategy_params(&test);
+    let strategy_params_token0 = create_strategy_params_token0(&test);
+    let strategy_params_token1 = create_strategy_params_token1(&test);
 
     let assets: Vec<AssetAllocation> = sorobanvec![
         &test.env,
         AssetAllocation {
             address: test.token0.address.clone(),
-            strategies: strategy_params.clone()
+            strategies: strategy_params_token0.clone()
         },
         AssetAllocation {
             address: test.token1.address.clone(),
-            strategies: strategy_params.clone()
+            strategies: strategy_params_token1.clone()
         }
     ];
 
@@ -63,7 +67,10 @@ fn test_set_new_fee_receiver_by_fee_receiver() {
         )),
         sub_invocations: vec![],
     };
-    assert_eq!(test.env.auths(), vec![(test.vault_fee_receiver, expected_auth)]);
+    assert_eq!(
+        test.env.auths(),
+        vec![(test.vault_fee_receiver, expected_auth)]
+    );
 
     let new_fee_receiver_role = test.defindex_contract.get_fee_receiver();
     assert_eq!(new_fee_receiver_role, users[0]);
@@ -72,7 +79,8 @@ fn test_set_new_fee_receiver_by_fee_receiver() {
 #[test]
 fn test_set_new_fee_receiver_by_manager() {
     let test = DeFindexVaultTest::setup();
-    let strategy_params = create_strategy_params(&test);
+    let strategy_params_token0 = create_strategy_params_token0(&test);
+    let strategy_params_token1 = create_strategy_params_token1(&test);
     // let tokens: Vec<Address> = sorobanvec![&test.env, test.token0.address.clone(), test.token1.address.clone()];
     // let ratios: Vec<u32> = sorobanvec![&test.env, 1, 1];
 
@@ -80,11 +88,11 @@ fn test_set_new_fee_receiver_by_manager() {
         &test.env,
         AssetAllocation {
             address: test.token0.address.clone(),
-            strategies: strategy_params.clone()
+            strategies: strategy_params_token0.clone()
         },
         AssetAllocation {
             address: test.token1.address.clone(),
-            strategies: strategy_params.clone()
+            strategies: strategy_params_token1.clone()
         }
     ];
 
@@ -136,7 +144,8 @@ fn test_set_new_fee_receiver_by_manager() {
 #[should_panic(expected = "HostError: Error(Contract, #130)")] // Unauthorized
 fn test_set_new_fee_receiver_by_emergency_manager() {
     let test = DeFindexVaultTest::setup();
-    let strategy_params = create_strategy_params(&test);
+    let strategy_params_token0 = create_strategy_params_token0(&test);
+    let strategy_params_token1 = create_strategy_params_token1(&test);
     // let tokens: Vec<Address> = sorobanvec![&test.env, test.token0.address.clone(), test.token1.address.clone()];
     // let ratios: Vec<u32> = sorobanvec![&test.env, 1, 1];
 
@@ -144,11 +153,11 @@ fn test_set_new_fee_receiver_by_emergency_manager() {
         &test.env,
         AssetAllocation {
             address: test.token0.address.clone(),
-            strategies: strategy_params.clone()
+            strategies: strategy_params_token0.clone()
         },
         AssetAllocation {
             address: test.token1.address.clone(),
-            strategies: strategy_params.clone()
+            strategies: strategy_params_token1.clone()
         }
     ];
 
@@ -177,17 +186,18 @@ fn test_set_new_fee_receiver_by_emergency_manager() {
 #[should_panic(expected = "HostError: Error(Contract, #130)")] // Unauthorized
 fn test_set_new_fee_receiver_invalid_sender() {
     let test = DeFindexVaultTest::setup();
-    let strategy_params = create_strategy_params(&test);
+    let strategy_params_token0 = create_strategy_params_token0(&test);
+    let strategy_params_token1 = create_strategy_params_token1(&test);
 
     let assets: Vec<AssetAllocation> = sorobanvec![
         &test.env,
         AssetAllocation {
             address: test.token0.address.clone(),
-            strategies: strategy_params.clone()
+            strategies: strategy_params_token0.clone()
         },
         AssetAllocation {
             address: test.token1.address.clone(),
-            strategies: strategy_params.clone()
+            strategies: strategy_params_token1.clone()
         }
     ];
 
@@ -215,16 +225,17 @@ fn test_set_new_fee_receiver_invalid_sender() {
 #[test]
 fn test_set_new_manager_by_manager() {
     let test = DeFindexVaultTest::setup();
-    let strategy_params = create_strategy_params(&test);
+    let strategy_params_token0 = create_strategy_params_token0(&test);
+    let strategy_params_token1 = create_strategy_params_token1(&test);
     let assets: Vec<AssetAllocation> = sorobanvec![
         &test.env,
         AssetAllocation {
             address: test.token0.address.clone(),
-            strategies: strategy_params.clone()
+            strategies: strategy_params_token0.clone()
         },
         AssetAllocation {
             address: test.token1.address.clone(),
-            strategies: strategy_params.clone()
+            strategies: strategy_params_token1.clone()
         }
     ];
 
diff --git a/apps/contracts/vault/src/test/deposit.rs b/apps/contracts/vault/src/test/deposit.rs
index 6568d6dd..30bb840d 100644
--- a/apps/contracts/vault/src/test/deposit.rs
+++ b/apps/contracts/vault/src/test/deposit.rs
@@ -1,24 +1,27 @@
 use soroban_sdk::{vec as sorobanvec, String, Vec};
 
 use crate::test::defindex_vault::{AssetAllocation, ContractError};
-use crate::test::{create_strategy_params, DeFindexVaultTest};
+use crate::test::{
+    create_strategy_params_token0, create_strategy_params_token1, DeFindexVaultTest,
+};
 
 #[test]
 fn deposit_amounts_desired_wrong_length() {
     let test = DeFindexVaultTest::setup();
     test.env.mock_all_auths();
-    let strategy_params = create_strategy_params(&test);
+    let strategy_params_token0 = create_strategy_params_token0(&test);
+    let strategy_params_token1 = create_strategy_params_token1(&test);
 
     // initialize with 2 assets
     let assets: Vec<AssetAllocation> = sorobanvec![
         &test.env,
         AssetAllocation {
             address: test.token0.address.clone(),
-            strategies: strategy_params.clone()
+            strategies: strategy_params_token0.clone()
         },
         AssetAllocation {
             address: test.token1.address.clone(),
-            strategies: strategy_params.clone()
+            strategies: strategy_params_token1.clone()
         }
     ];
 
@@ -74,7 +77,8 @@ fn deposit_several_assets() {
 // fn test_withdraw_success() {
 //     let test = DeFindexVaultTest::setup();
 //     test.env.mock_all_auths();
-//     let strategy_params = create_strategy_params(&test);
+//     let strategy_params_token0 = create_strategy_params_token0(&test);
+//     let strategy_params_token1 = create_strategy_params_token1(&test);
 //     let assets: Vec<AssetAllocation> = sorobanvec![
 //         &test.env,
 //         AssetAllocation {
diff --git a/apps/contracts/vault/src/test/emergency_withdraw.rs b/apps/contracts/vault/src/test/emergency_withdraw.rs
index 742ac034..fee60772 100644
--- a/apps/contracts/vault/src/test/emergency_withdraw.rs
+++ b/apps/contracts/vault/src/test/emergency_withdraw.rs
@@ -1,7 +1,7 @@
 use soroban_sdk::{vec as sorobanvec, String, Vec};
 
 use crate::test::{
-    create_strategy_params,
+    create_strategy_params_token0,
     defindex_vault::{AssetAllocation, Investment},
     DeFindexVaultTest,
 };
@@ -10,12 +10,12 @@ use crate::test::{
 fn test_emergency_withdraw_success() {
     let test = DeFindexVaultTest::setup();
     test.env.mock_all_auths();
-    let strategy_params = create_strategy_params(&test);
+    let strategy_params_token0 = create_strategy_params_token0(&test);
     let assets: Vec<AssetAllocation> = sorobanvec![
         &test.env,
         AssetAllocation {
             address: test.token0.address.clone(),
-            strategies: strategy_params.clone()
+            strategies: strategy_params_token0.clone()
         }
     ];
 
@@ -60,7 +60,7 @@ fn test_emergency_withdraw_success() {
         &test.env,
         Investment {
             amount: amount.clone(),
-            strategy: strategy_params.first().unwrap().address.clone()
+            strategy: strategy_params_token0.first().unwrap().address.clone()
         }
     ];
     test.defindex_contract.invest(&investments);
@@ -71,18 +71,18 @@ fn test_emergency_withdraw_success() {
 
     // Balance of the strategy should be `amount`
     let strategy_balance = test
-        .strategy_client
+        .strategy_client_token0
         .balance(&test.defindex_contract.address);
     assert_eq!(strategy_balance, amount);
 
     test.defindex_contract.emergency_withdraw(
-        &strategy_params.first().unwrap().address,
+        &strategy_params_token0.first().unwrap().address,
         &test.emergency_manager,
     );
 
     // Balance of the strategy should be 0
     let strategy_balance = test
-        .strategy_client
+        .strategy_client_token0
         .balance(&test.defindex_contract.address);
     assert_eq!(strategy_balance, 0);
 
diff --git a/apps/contracts/vault/src/test/initialize.rs b/apps/contracts/vault/src/test/initialize.rs
index c515b45f..df040047 100644
--- a/apps/contracts/vault/src/test/initialize.rs
+++ b/apps/contracts/vault/src/test/initialize.rs
@@ -1,8 +1,7 @@
 use soroban_sdk::{vec as sorobanvec, String, Vec};
 
 use crate::test::{
-    create_strategy_params_token0,
-    create_strategy_params_token1,
+    create_strategy_params_token0, create_strategy_params_token1,
     defindex_vault::{AssetAllocation, ContractError},
     DeFindexVaultTest,
 };
diff --git a/apps/contracts/vault/src/test/rebalance.rs b/apps/contracts/vault/src/test/rebalance.rs
index e5f89bb9..5a39c049 100644
--- a/apps/contracts/vault/src/test/rebalance.rs
+++ b/apps/contracts/vault/src/test/rebalance.rs
@@ -1,7 +1,7 @@
 use soroban_sdk::{vec as sorobanvec, String, Vec};
 
 use crate::test::{
-    create_strategy_params,
+    create_strategy_params_token0,
     defindex_vault::{
         ActionType, AssetAllocation, Instruction, Investment, OptionalSwapDetailsExactIn,
         OptionalSwapDetailsExactOut,
@@ -13,12 +13,12 @@ use crate::test::{
 fn rebalance() {
     let test = DeFindexVaultTest::setup();
     test.env.mock_all_auths();
-    let strategy_params = create_strategy_params(&test);
+    let strategy_params_token0 = create_strategy_params_token0(&test);
     let assets: Vec<AssetAllocation> = sorobanvec![
         &test.env,
         AssetAllocation {
             address: test.token0.address.clone(),
-            strategies: strategy_params.clone()
+            strategies: strategy_params_token0.clone()
         }
     ];
 
@@ -57,7 +57,7 @@ fn rebalance() {
         &test.env,
         Investment {
             amount: amount,
-            strategy: test.strategy_client.address.clone()
+            strategy: test.strategy_client_token0.address.clone()
         }
     ];
 
@@ -75,14 +75,14 @@ fn rebalance() {
         &test.env,
         Instruction {
             action: ActionType::Withdraw,
-            strategy: Some(test.strategy_client.address.clone()),
+            strategy: Some(test.strategy_client_token0.address.clone()),
             amount: Some(instruction_amount_0),
             swap_details_exact_in: OptionalSwapDetailsExactIn::None,
             swap_details_exact_out: OptionalSwapDetailsExactOut::None,
         },
         Instruction {
             action: ActionType::Invest,
-            strategy: Some(test.strategy_client.address.clone()),
+            strategy: Some(test.strategy_client_token0.address.clone()),
             amount: Some(instruction_amount_1),
             swap_details_exact_in: OptionalSwapDetailsExactIn::None,
             swap_details_exact_out: OptionalSwapDetailsExactOut::None,
diff --git a/apps/contracts/vault/src/test/withdraw.rs b/apps/contracts/vault/src/test/withdraw.rs
index fa1d5a8e..e28058a7 100644
--- a/apps/contracts/vault/src/test/withdraw.rs
+++ b/apps/contracts/vault/src/test/withdraw.rs
@@ -2,7 +2,7 @@ use soroban_sdk::{vec as sorobanvec, String, Vec};
 
 use super::hodl_strategy::StrategyError;
 use crate::test::{
-    create_strategy_params,
+    create_strategy_params_token0,
     defindex_vault::{AssetAllocation, Investment},
     DeFindexVaultTest,
 };
@@ -11,12 +11,12 @@ use crate::test::{
 fn test_withdraw_from_idle_success() {
     let test = DeFindexVaultTest::setup();
     test.env.mock_all_auths();
-    let strategy_params = create_strategy_params(&test);
+    let strategy_params_token0 = create_strategy_params_token0(&test);
     let assets: Vec<AssetAllocation> = sorobanvec![
         &test.env,
         AssetAllocation {
             address: test.token0.address.clone(),
-            strategies: strategy_params.clone()
+            strategies: strategy_params_token0.clone()
         }
     ];
 
@@ -64,7 +64,7 @@ fn test_withdraw_from_idle_success() {
     assert_eq!(vault_balance, amount_to_deposit);
 
     // Token balance of hodl strategy should be 0 (all in idle)
-    let strategy_balance = test.token0.balance(&test.strategy_client.address);
+    let strategy_balance = test.token0.balance(&test.strategy_client_token0.address);
     assert_eq!(strategy_balance, 0);
 
     // Df balance of user should be equal to deposited amount
@@ -90,7 +90,7 @@ fn test_withdraw_from_idle_success() {
     assert_eq!(vault_balance, amount_to_deposit - amount_to_withdraw);
 
     // Token balance of hodl strategy should be 0 (all in idle)
-    let strategy_balance = test.token0.balance(&test.strategy_client.address);
+    let strategy_balance = test.token0.balance(&test.strategy_client_token0.address);
     assert_eq!(strategy_balance, 0);
 
     // Df balance of user should be equal to deposited amount - amount_to_withdraw
@@ -128,12 +128,12 @@ fn test_withdraw_from_idle_success() {
 fn test_withdraw_from_strategy_success() {
     let test = DeFindexVaultTest::setup();
     test.env.mock_all_auths();
-    let strategy_params = create_strategy_params(&test);
+    let strategy_params_token0 = create_strategy_params_token0(&test);
     let assets: Vec<AssetAllocation> = sorobanvec![
         &test.env,
         AssetAllocation {
             address: test.token0.address.clone(),
-            strategies: strategy_params.clone()
+            strategies: strategy_params_token0.clone()
         }
     ];
 
@@ -173,7 +173,7 @@ fn test_withdraw_from_strategy_success() {
         &test.env,
         Investment {
             amount: amount,
-            strategy: test.strategy_client.address.clone()
+            strategy: test.strategy_client_token0.address.clone()
         }
     ];
 

From 79f120f4ced234b4f232bb986a3b0232488395d3 Mon Sep 17 00:00:00 2001
From: esteblock <estebaniglesiasmanriquez@gmail.com>
Date: Wed, 6 Nov 2024 09:42:05 -0300
Subject: [PATCH 16/39] test vault get initialized with strategy with
 unsupported asset

---
 apps/contracts/vault/src/test/initialize.rs | 39 ++++++++++++++++++++-
 apps/contracts/vault/src/test/withdraw.rs   |  2 +-
 2 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/apps/contracts/vault/src/test/initialize.rs b/apps/contracts/vault/src/test/initialize.rs
index df040047..e60d7f84 100644
--- a/apps/contracts/vault/src/test/initialize.rs
+++ b/apps/contracts/vault/src/test/initialize.rs
@@ -6,6 +6,7 @@ use crate::test::{
     DeFindexVaultTest,
 };
 
+
 #[test]
 fn test_initialize_and_get_roles() {
     let test = DeFindexVaultTest::setup();
@@ -44,6 +45,43 @@ fn test_initialize_and_get_roles() {
     assert_eq!(emergency_manager_role, test.emergency_manager);
 }
 
+
+// Test that if strategy does support other asset we get an error when initializing
+#[test]
+fn test_initialize_with_unsupported_strategy() {
+    let test = DeFindexVaultTest::setup();
+    let strategy_params_token0 = create_strategy_params_token0(&test);
+
+    let assets: Vec<AssetAllocation> = sorobanvec![
+        &test.env,
+        AssetAllocation {
+            address: test.token0.address.clone(),
+            strategies: strategy_params_token0.clone()
+        },
+        AssetAllocation {
+            address: test.token1.address.clone(),
+            strategies: strategy_params_token0.clone() // Here Strategy 0 supports token0
+        }
+    ];
+
+    let result = test.defindex_contract.try_initialize(
+        &assets,
+        &test.manager,
+        &test.emergency_manager,
+        &test.vault_fee_receiver,
+        &2000u32,
+        &test.defindex_protocol_receiver,
+        &test.defindex_factory,
+        &String::from_str(&test.env, "dfToken"),
+        &String::from_str(&test.env, "DFT"),
+    );
+
+    assert_eq!(
+        result,
+        Err(Ok(ContractError::StrategyDoesNotSupportAsset))
+    );
+}
+
 #[test]
 fn test_get_roles_not_yet_initialized() {
     let test = DeFindexVaultTest::setup();
@@ -129,7 +167,6 @@ fn test_emergency_withdraw_not_yet_initialized() {
     let test = DeFindexVaultTest::setup();
     let users = DeFindexVaultTest::generate_random_users(&test.env, 1);
 
-    let strategy_params_token1 = create_strategy_params_token1(&test);
     let strategy_params_token1 = create_strategy_params_token1(&test);
 
     let result = test
diff --git a/apps/contracts/vault/src/test/withdraw.rs b/apps/contracts/vault/src/test/withdraw.rs
index e28058a7..7080de89 100644
--- a/apps/contracts/vault/src/test/withdraw.rs
+++ b/apps/contracts/vault/src/test/withdraw.rs
@@ -1,6 +1,6 @@
 use soroban_sdk::{vec as sorobanvec, String, Vec};
 
-use super::hodl_strategy::StrategyError;
+// use super::hodl_strategy::StrategyError;
 use crate::test::{
     create_strategy_params_token0,
     defindex_vault::{AssetAllocation, Investment},

From 36981008b3cb2ff455b3d08d8681d7deaa1a399a Mon Sep 17 00:00:00 2001
From: esteblock <estebaniglesiasmanriquez@gmail.com>
Date: Wed, 6 Nov 2024 09:57:14 -0300
Subject: [PATCH 17/39] test empty asset allocation

---
 apps/contracts/vault/src/error.rs           |  1 +
 apps/contracts/vault/src/lib.rs             | 10 ++++++---
 apps/contracts/vault/src/test/initialize.rs | 23 +++++++++++++++++++++
 3 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/apps/contracts/vault/src/error.rs b/apps/contracts/vault/src/error.rs
index 66874708..e65375dc 100644
--- a/apps/contracts/vault/src/error.rs
+++ b/apps/contracts/vault/src/error.rs
@@ -9,6 +9,7 @@ pub enum ContractError {
     AlreadyInitialized = 101,
     InvalidRatio = 102,
     StrategyDoesNotSupportAsset = 103,
+    NoAssetAllocation = 104,
 
     // Validation Errors (11x)
     NegativeNotAllowed = 110,
diff --git a/apps/contracts/vault/src/lib.rs b/apps/contracts/vault/src/lib.rs
index 925c979d..bc019b8b 100755
--- a/apps/contracts/vault/src/lib.rs
+++ b/apps/contracts/vault/src/lib.rs
@@ -112,12 +112,16 @@ impl VaultTrait for DeFindexVault {
 
         // Store Assets Objects
         let total_assets = assets.len();
-        // TODO Require minimum 1 asset
+
+        // fails if the total assets is 0
+        if total_assets == 0 {
+            panic_with_error!(&e, ContractError::NoAssetAllocation);
+        }
+        
         set_total_assets(&e, total_assets as u32);
         for (i, asset) in assets.iter().enumerate() {
-            // for every asset, we need to check that the list of strategyes indeed support this asset
+            // for every asset, we need to check that the list of strategies indeed support this asset
 
-            // TODO Fix, currently failing
             for strategy in asset.strategies.iter() {
                 let strategy_client = DeFindexStrategyClient::new(&e, &strategy.address);
                 if strategy_client.asset() != asset.address {
diff --git a/apps/contracts/vault/src/test/initialize.rs b/apps/contracts/vault/src/test/initialize.rs
index e60d7f84..3a5cc8f0 100644
--- a/apps/contracts/vault/src/test/initialize.rs
+++ b/apps/contracts/vault/src/test/initialize.rs
@@ -82,6 +82,29 @@ fn test_initialize_with_unsupported_strategy() {
     );
 }
 
+// test that if we try to initialize with an empty asset allocation fails
+#[test]
+fn test_initialize_with_empty_asset_allocation() {
+    let test = DeFindexVaultTest::setup();
+    let strategy_params_token0 = create_strategy_params_token0(&test);
+
+    let assets: Vec<AssetAllocation> = sorobanvec![&test.env];
+
+    let result = test.defindex_contract.try_initialize(
+        &assets,
+        &test.manager,
+        &test.emergency_manager,
+        &test.vault_fee_receiver,
+        &2000u32,
+        &test.defindex_protocol_receiver,
+        &test.defindex_factory,
+        &String::from_str(&test.env, "dfToken"),
+        &String::from_str(&test.env, "DFT"),
+    );
+
+    assert_eq!(result, Err(Ok(ContractError::NoAssetAllocation)));
+}
+
 #[test]
 fn test_get_roles_not_yet_initialized() {
     let test = DeFindexVaultTest::setup();

From dcf89726225cef6c9acbaec0df72d3c016ff8b87 Mon Sep 17 00:00:00 2001
From: esteblock <estebaniglesiasmanriquez@gmail.com>
Date: Wed, 6 Nov 2024 10:12:45 -0300
Subject: [PATCH 18/39] extend initialize ttl

---
 apps/contracts/vault/src/lib.rs     | 25 ++++++++++++++++++++++---
 apps/contracts/vault/src/storage.rs | 13 +++++++++++++
 2 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/apps/contracts/vault/src/lib.rs b/apps/contracts/vault/src/lib.rs
index bc019b8b..8b9e8c10 100755
--- a/apps/contracts/vault/src/lib.rs
+++ b/apps/contracts/vault/src/lib.rs
@@ -34,7 +34,7 @@ use models::{
 };
 use storage::{
     get_assets, set_asset, set_defindex_protocol_fee_receiver, set_factory, set_last_fee_assesment,
-    set_total_assets, set_vault_fee,
+    set_total_assets, set_vault_fee, extend_instance_ttl
 };
 use strategies::{
     get_asset_allocation_from_address, get_strategy_asset, get_strategy_client,
@@ -92,6 +92,8 @@ impl VaultTrait for DeFindexVault {
         vault_name: String,
         vault_symbol: String,
     ) -> Result<(), ContractError> {
+        extend_instance_ttl(&e);
+
         let access_control = AccessControl::new(&e);
         if access_control.has_role(&RolesDataKey::Manager) {
             panic_with_error!(&e, ContractError::AlreadyInitialized);
@@ -158,9 +160,9 @@ impl VaultTrait for DeFindexVault {
 
     /// Handles deposits into the DeFindex Vault.
     ///
-    /// This function transfers the desired amounts of each asset into the vault, distributes the assets
+    /// This function transfers the desired amounts of each supported asset into the vault, distributes the assets
     /// across the strategies according to the vault's ratios, and mints dfTokens representing the user's
-    /// share in the vault.
+    /// share in the vault. The vector of amounts desired should be in the same order as the assets in the vault.
     ///
     /// # Arguments:
     /// * `e` - The environment.
@@ -176,6 +178,7 @@ impl VaultTrait for DeFindexVault {
         amounts_min: Vec<i128>,
         from: Address,
     ) -> Result<(), ContractError> {
+        extend_instance_ttl(&e);
         check_initialized(&e)?;
         from.require_auth();
 
@@ -260,6 +263,7 @@ impl VaultTrait for DeFindexVault {
     /// # Returns:
     /// * `Result<(), ContractError>` - Ok if successful, otherwise returns a ContractError.
     fn withdraw(e: Env, df_amount: i128, from: Address) -> Result<Vec<i128>, ContractError> {
+        extend_instance_ttl(&e);
         check_initialized(&e)?;
         check_nonnegative_amount(df_amount)?;
         from.require_auth();
@@ -356,6 +360,7 @@ impl VaultTrait for DeFindexVault {
         strategy_address: Address,
         caller: Address,
     ) -> Result<(), ContractError> {
+        extend_instance_ttl(&e);
         check_initialized(&e)?;
 
         // Ensure the caller is the Manager or Emergency Manager
@@ -404,6 +409,7 @@ impl VaultTrait for DeFindexVault {
         strategy_address: Address,
         caller: Address,
     ) -> Result<(), ContractError> {
+        extend_instance_ttl(&e);
         // Ensure the caller is the Manager or Emergency Manager
         // TODO: Should check if the strategy has any amount invested on it, and return an error if it has, should we let the manager to pause a strategy with funds invested?
         let access_control = AccessControl::new(&e);
@@ -434,6 +440,7 @@ impl VaultTrait for DeFindexVault {
         strategy_address: Address,
         caller: Address,
     ) -> Result<(), ContractError> {
+        extend_instance_ttl(&e);
         // Ensure the caller is the Manager or Emergency Manager
         let access_control = AccessControl::new(&e);
         access_control.require_any_role(
@@ -454,6 +461,7 @@ impl VaultTrait for DeFindexVault {
     /// # Returns:
     /// * `Vec<AssetAllocation>` - A vector of `AssetAllocation` structs representing the assets managed by the vault.
     fn get_assets(e: Env) -> Vec<AssetAllocation> {
+        extend_instance_ttl(&e);
         get_assets(&e)
     }
 
@@ -468,6 +476,7 @@ impl VaultTrait for DeFindexVault {
     /// # Returns:
     /// * `Map<Address, i128>` - A map of asset addresses to their total managed amounts.
     fn fetch_total_managed_funds(e: &Env) -> Map<Address, i128> {
+        extend_instance_ttl(&e);
         fetch_total_managed_funds(e)
     }
 
@@ -482,6 +491,7 @@ impl VaultTrait for DeFindexVault {
     /// # Returns:
     /// * `Map<Address, i128>` - A map of asset addresses to their total invested amounts.
     fn fetch_current_invested_funds(e: &Env) -> Map<Address, i128> {
+        extend_instance_ttl(&e);
         fetch_current_invested_funds(e)
     }
 
@@ -496,12 +506,14 @@ impl VaultTrait for DeFindexVault {
     /// # Returns:
     /// * `Map<Address, i128>` - A map of asset addresses to their total idle amounts.
     fn fetch_current_idle_funds(e: &Env) -> Map<Address, i128> {
+        extend_instance_ttl(&e);
         fetch_current_idle_funds(e)
     }
 
     // TODO: DELETE THIS, USED FOR TESTING
     /// Temporary method for testing purposes.
     fn get_asset_amounts_for_dftokens(e: Env, df_tokens: i128) -> Map<Address, i128> {
+        extend_instance_ttl(&e);
         calculate_asset_amounts_for_dftokens(&e, df_tokens)
     }
 }
@@ -520,6 +532,7 @@ impl AdminInterfaceTrait for DeFindexVault {
     /// # Returns:
     /// * `()` - No return value.
     fn set_fee_receiver(e: Env, caller: Address, new_fee_receiver: Address) {
+        extend_instance_ttl(&e);
         let access_control = AccessControl::new(&e);
         access_control.set_fee_receiver(&caller, &new_fee_receiver);
 
@@ -534,6 +547,7 @@ impl AdminInterfaceTrait for DeFindexVault {
     /// # Returns:
     /// * `Result<Address, ContractError>` - The fee receiver address if successful, otherwise returns a ContractError.
     fn get_fee_receiver(e: Env) -> Result<Address, ContractError> {
+        extend_instance_ttl(&e);
         let access_control = AccessControl::new(&e);
         access_control.get_fee_receiver()
     }
@@ -549,6 +563,7 @@ impl AdminInterfaceTrait for DeFindexVault {
     /// # Returns:
     /// * `()` - No return value.
     fn set_manager(e: Env, manager: Address) {
+        extend_instance_ttl(&e);
         let access_control = AccessControl::new(&e);
         access_control.set_manager(&manager);
 
@@ -563,6 +578,7 @@ impl AdminInterfaceTrait for DeFindexVault {
     /// # Returns:
     /// * `Result<Address, ContractError>` - The manager address if successful, otherwise returns a ContractError.
     fn get_manager(e: Env) -> Result<Address, ContractError> {
+        extend_instance_ttl(&e);
         let access_control = AccessControl::new(&e);
         access_control.get_manager()
     }
@@ -578,6 +594,7 @@ impl AdminInterfaceTrait for DeFindexVault {
     /// # Returns:
     /// * `()` - No return value.
     fn set_emergency_manager(e: Env, emergency_manager: Address) {
+        extend_instance_ttl(&e);
         let access_control = AccessControl::new(&e);
         access_control.set_emergency_manager(&emergency_manager);
 
@@ -609,6 +626,7 @@ impl VaultManagementTrait for DeFindexVault {
     /// # Returns:
     /// * `Result<(), ContractError>` - Ok if successful, otherwise returns a ContractError.
     fn invest(e: Env, investments: Vec<Investment>) -> Result<(), ContractError> {
+        extend_instance_ttl(&e);
         check_initialized(&e)?;
 
         let access_control = AccessControl::new(&e);
@@ -646,6 +664,7 @@ impl VaultManagementTrait for DeFindexVault {
     /// # Returns:
     /// * `Result<(), ContractError>` - Ok if successful, otherwise returns a ContractError.
     fn rebalance(e: Env, instructions: Vec<Instruction>) -> Result<(), ContractError> {
+        extend_instance_ttl(&e);
         check_initialized(&e)?;
 
         let access_control = AccessControl::new(&e);
diff --git a/apps/contracts/vault/src/storage.rs b/apps/contracts/vault/src/storage.rs
index 90df7c61..72a74795 100644
--- a/apps/contracts/vault/src/storage.rs
+++ b/apps/contracts/vault/src/storage.rs
@@ -2,6 +2,17 @@ use soroban_sdk::{contracttype, Address, Env, Vec};
 
 use crate::models::AssetAllocation;
 
+const DAY_IN_LEDGERS: u32 = 17280;
+const INSTANCE_BUMP_AMOUNT: u32 = 30 * DAY_IN_LEDGERS;
+const INSTANCE_LIFETIME_THRESHOLD: u32 = INSTANCE_BUMP_AMOUNT - DAY_IN_LEDGERS;
+
+pub fn extend_instance_ttl(e: &Env) {
+    e.storage()
+        .instance()
+        .extend_ttl(INSTANCE_LIFETIME_THRESHOLD, INSTANCE_BUMP_AMOUNT);
+}
+
+
 #[derive(Clone)]
 #[contracttype]
 enum DataKey {
@@ -13,6 +24,8 @@ enum DataKey {
     VaultShare,
 }
 
+
+
 // Assets Management
 pub fn set_asset(e: &Env, index: u32, asset: &AssetAllocation) {
     e.storage()

From 8ae9a780f42891e38763174871ed49754ceccd9b Mon Sep 17 00:00:00 2001
From: esteblock <estebaniglesiasmanriquez@gmail.com>
Date: Wed, 6 Nov 2024 10:35:02 -0300
Subject: [PATCH 19/39] improve rust comment on deposit function

---
 apps/contracts/vault/src/fee.rs       |  8 +++-
 apps/contracts/vault/src/interface.rs | 69 ++++++++++++++++++---------
 apps/contracts/vault/src/lib.rs       | 20 ++++----
 apps/contracts/vault/src/storage.rs   |  8 +++-
 4 files changed, 68 insertions(+), 37 deletions(-)

diff --git a/apps/contracts/vault/src/fee.rs b/apps/contracts/vault/src/fee.rs
index 36d4cd3e..84b5c245 100644
--- a/apps/contracts/vault/src/fee.rs
+++ b/apps/contracts/vault/src/fee.rs
@@ -48,14 +48,20 @@ fn calculate_fees(e: &Env, time_elapsed: u64, fee_rate: u32) -> Result<i128, Con
 
 pub fn collect_fees(e: &Env) -> Result<(), ContractError> {
     let current_timestamp = e.ledger().timestamp();
+    // If last_fee_assesment was not set yet, this will be set to the current timestamp
     let last_fee_assessment = get_last_fee_assesment(e);
 
+    // Update the last fee assessment timestamp
+    // Set it now to Avoid Reentrancy Attack
+    set_last_fee_assesment(e, &current_timestamp);
+
     let time_elapsed = current_timestamp.checked_sub(last_fee_assessment).unwrap();
 
     if time_elapsed == 0 {
         return Ok(());
     }
 
+
     let fee_rate = fetch_fee_rate(e);
 
     let total_fees = calculate_fees(e, time_elapsed, fee_rate)?;
@@ -63,8 +69,6 @@ pub fn collect_fees(e: &Env) -> Result<(), ContractError> {
     // Mint the total fees as dfTokens
     mint_fees(e, total_fees)?;
 
-    // Update the last fee assessment timestamp
-    set_last_fee_assesment(e, &current_timestamp);
 
     Ok(())
 }
diff --git a/apps/contracts/vault/src/interface.rs b/apps/contracts/vault/src/interface.rs
index 28bc7104..4e9a11c0 100644
--- a/apps/contracts/vault/src/interface.rs
+++ b/apps/contracts/vault/src/interface.rs
@@ -8,21 +8,28 @@ use crate::{
 pub trait VaultTrait {
     /// Initializes the DeFindex Vault contract with the required parameters.
     ///
-    /// This function sets the roles for emergency manager, fee receiver, and manager.
+    /// This function sets the roles for manager, emergency manager, vault fee receiver, and manager.
     /// It also stores the list of assets to be managed by the vault, including strategies for each asset.
     ///
-    /// # Arguments:
-    /// * `e` - The environment.
-    /// * `assets` - A vector of `AssetAllocation` structs representing the assets and their associated strategies.
-    /// * `manager` - The address responsible for managing the vault.
-    /// * `emergency_manager` - The address with emergency control over the vault.
-    /// * `vault_fee_receiver` - The address that will receive fees from the vault.
-    /// * `vault_fee` - The percentage of the vault's fees that will be sent to the DeFindex receiver. in BPS.
-    /// * `defindex_protocol_receiver` - The address that will receive fees for DeFindex from the vault.
-    /// * `factory` - The address of the factory that deployed the vault.
+    /// # Arguments
+    /// - `assets`: List of asset allocations for the vault, including strategies associated with each asset.
+    /// - `manager`: Primary vault manager with permissions for vault control.
+    /// - `emergency_manager`: Address with emergency access for emergency control over the vault.
+    /// - `vault_fee_receiver`: Address designated to receive the vault fee receiver's portion of management fees.
+    /// - `vault_fee`: Vault-specific fee percentage in basis points (typically set at 0-2% APR).
+    /// - `defindex_protocol_receiver`: Address receiving DeFindex’s protocol-wide fee in basis points (0.5% APR).
+    /// - `factory`: Factory contract address for deployment linkage.
+    /// - `vault_name`: Name of the vault token to be displayed in metadata.
+    /// - `vault_symbol`: Symbol representing the vault’s token.
+    ///
+    /// # Returns
+    /// - `Result<(), ContractError>`: Returns `Ok(())` if initialization succeeds, or a `ContractError` if
+    ///   any setup fails (e.g., strategy mismatch with asset).
+    ///
+    /// # Errors
+    /// - `ContractError::AlreadyInitialized`: If the vault has already been initialized.
+    /// - `ContractError::StrategyDoesNotSupportAsset`: If a strategy within an asset does not support the asset’s contract.
     ///
-    /// # Returns:
-    /// * `Result<(), ContractError>` - Ok if successful, otherwise returns a ContractError.
     fn initialize(
         e: Env,
         assets: Vec<AssetAllocation>,
@@ -36,26 +43,42 @@ pub trait VaultTrait {
         vault_symbol: String,
     ) -> Result<(), ContractError>;
 
-    /// Handles deposits into the DeFindex Vault.
+    /// Handles user deposits into the DeFindex Vault.
     ///
-    /// This function transfers the desired amounts of each asset into the vault, distributes the assets
-    /// across the strategies according to the vault's ratios, and mints dfTokens representing the user's
-    /// share in the vault.
+    /// This function processes a deposit by transferring each specified asset amount from the user's address to
+    /// the vault, allocating assets according to the vault's defined strategy ratios, and minting dfTokens that 
+    /// represent the user's proportional share in the vault. The `amounts_desired` and `amounts_min` vectors should 
+    /// align with the vault's asset order to ensure correct allocation.
     ///
-    /// # Arguments:
-    /// * `e` - The environment.
-    /// * `amounts_desired` - A vector of the amounts the user wishes to deposit for each asset.
-    /// * `amounts_min` - A vector of minimum amounts required for the deposit to proceed.
+    /// # Parameters
+    /// * `e` - The current environment reference (`Env`), for access to the contract state and utilities.
+    /// * `amounts_desired` - A vector specifying the user's intended deposit amounts for each asset.
+    /// * `amounts_min` - A vector of minimum deposit amounts required for the transaction to proceed.
     /// * `from` - The address of the user making the deposit.
     ///
-    /// # Returns:
-    /// * `Result<(), ContractError>` - Ok if successful, otherwise returns a ContractError.
+    /// # Returns
+    /// * `Result<(Vec<i128>, i128), ContractError>` - Returns the actual deposited `amounts` and `shares_to_mint` if successful,
+    ///   otherwise a `ContractError`.
+    ///
+    /// # Function Flow
+    /// 1. **Fee Collection**: Collects accrued fees before processing the deposit.
+    /// 2. **Validation**: Checks that the lengths of `amounts_desired` and `amounts_min` match the vault's assets.
+    /// 3. **Share Calculation**: Calculates `shares_to_mint` based on the vault's total managed funds and the deposit amount.
+    /// 4. **Asset Transfer**: Transfers each specified amount from the user’s address to the vault as idle funds.
+    /// 5. **dfToken Minting**: Mints new dfTokens for the user to represent their ownership in the vault.
+    ///
+    /// # Notes
+    /// - For the first deposit, if the vault has only one asset, shares are calculated directly based on the deposit amount.
+    /// - For multiple assets, the function delegates to `calculate_deposit_amounts_and_shares_to_mint`
+    ///   for precise share computation.
+    /// - An event is emitted to log the deposit, including the actual deposited amounts and minted shares.
+    ///
     fn deposit(
         e: Env,
         amounts_desired: Vec<i128>,
         amounts_min: Vec<i128>,
         from: Address,
-    ) -> Result<(), ContractError>;
+    ) -> Result<(Vec<i128>, i128), ContractError>;
 
     /// Withdraws assets from the DeFindex Vault by burning dfTokens.
     ///
diff --git a/apps/contracts/vault/src/lib.rs b/apps/contracts/vault/src/lib.rs
index 8b9e8c10..c1d26dd3 100755
--- a/apps/contracts/vault/src/lib.rs
+++ b/apps/contracts/vault/src/lib.rs
@@ -177,15 +177,14 @@ impl VaultTrait for DeFindexVault {
         amounts_desired: Vec<i128>,
         amounts_min: Vec<i128>,
         from: Address,
-    ) -> Result<(), ContractError> {
+    ) -> Result<(Vec<i128>, i128), ContractError> {
         extend_instance_ttl(&e);
         check_initialized(&e)?;
         from.require_auth();
 
-        // Set LastFeeAssessment if it is the first deposit
-        if VaultToken::total_supply(e.clone()) == 0 {
-            set_last_fee_assesment(&e, &e.ledger().timestamp());
-        }
+        // Collect Fees
+        // If this was not done before, last fee assesment will set to be current timestamp and this will return without action
+        collect_fees(&e)?; 
 
         // get assets
         let assets = get_assets(&e);
@@ -230,23 +229,22 @@ impl VaultTrait for DeFindexVault {
 
         // for every asset
         for (i, amount) in amounts.iter().enumerate() {
+            // its possible that some amounts are 0.
             if amount > 0 {
                 let asset = assets.get(i as u32).unwrap();
                 let asset_client = TokenClient::new(&e, &asset.address);
-                // send the current amount to this contract
+                // send the current amount to this contract. This will be held as idle funds.
                 asset_client.transfer(&from, &e.current_contract_address(), &amount);
             }
         }
 
-        // now we mint the corresponding dfTOkenb
+        // now we mint the corresponding dfToken
         internal_mint(e.clone(), from.clone(), shares_to_mint);
 
-        events::emit_deposit_event(&e, from, amounts, shares_to_mint);
+        events::emit_deposit_event(&e, from, amounts.clone(), shares_to_mint.clone());
 
-        // fees assesment
-        collect_fees(&e)?;
         // TODO return amounts and shares to mint
-        Ok(())
+        Ok((amounts, shares_to_mint))
     }
 
     /// Withdraws assets from the DeFindex Vault by burning dfTokens.
diff --git a/apps/contracts/vault/src/storage.rs b/apps/contracts/vault/src/storage.rs
index 72a74795..b6646c97 100644
--- a/apps/contracts/vault/src/storage.rs
+++ b/apps/contracts/vault/src/storage.rs
@@ -91,7 +91,13 @@ pub fn get_last_fee_assesment(e: &Env) -> u64 {
     e.storage()
         .instance()
         .get(&DataKey::LastFeeAssessment)
-        .unwrap()
+        .unwrap_or_else(|| {
+            let timestamp = &e.ledger().timestamp();
+            e.storage()
+                .instance()
+                .set(&DataKey::LastFeeAssessment, timestamp);
+            timestamp.clone()
+        })
 }
 
 // Vault Share

From 06a6bb6811f9c25309363de4db64c1b0c06551b3 Mon Sep 17 00:00:00 2001
From: esteblock <estebaniglesiasmanriquez@gmail.com>
Date: Wed, 6 Nov 2024 10:35:23 -0300
Subject: [PATCH 20/39] make fee assesment first in deposit

---
 apps/contracts/vault/src/lib.rs | 36 ++++++++++++++++++++++++---------
 1 file changed, 26 insertions(+), 10 deletions(-)

diff --git a/apps/contracts/vault/src/lib.rs b/apps/contracts/vault/src/lib.rs
index c1d26dd3..927dffcf 100755
--- a/apps/contracts/vault/src/lib.rs
+++ b/apps/contracts/vault/src/lib.rs
@@ -158,20 +158,36 @@ impl VaultTrait for DeFindexVault {
         Ok(())
     }
 
-    /// Handles deposits into the DeFindex Vault.
+    /// Handles user deposits into the DeFindex Vault.
     ///
-    /// This function transfers the desired amounts of each supported asset into the vault, distributes the assets
-    /// across the strategies according to the vault's ratios, and mints dfTokens representing the user's
-    /// share in the vault. The vector of amounts desired should be in the same order as the assets in the vault.
+    /// This function processes a deposit by transferring each specified asset amount from the user's address to
+    /// the vault, allocating assets according to the vault's defined strategy ratios, and minting dfTokens that 
+    /// represent the user's proportional share in the vault. The `amounts_desired` and `amounts_min` vectors should 
+    /// align with the vault's asset order to ensure correct allocation.
     ///
-    /// # Arguments:
-    /// * `e` - The environment.
-    /// * `amounts_desired` - A vector of the amounts the user wishes to deposit for each asset.
-    /// * `amounts_min` - A vector of minimum amounts required for the deposit to proceed.
+    /// # Parameters
+    /// * `e` - The current environment reference (`Env`), for access to the contract state and utilities.
+    /// * `amounts_desired` - A vector specifying the user's intended deposit amounts for each asset.
+    /// * `amounts_min` - A vector of minimum deposit amounts required for the transaction to proceed.
     /// * `from` - The address of the user making the deposit.
     ///
-    /// # Returns:
-    /// * `Result<(), ContractError>` - Ok if successful, otherwise returns a ContractError.
+    /// # Returns
+    /// * `Result<(Vec<i128>, i128), ContractError>` - Returns the actual deposited `amounts` and `shares_to_mint` if successful,
+    ///   otherwise a `ContractError`.
+    ///
+    /// # Function Flow
+    /// 1. **Fee Collection**: Collects accrued fees before processing the deposit.
+    /// 2. **Validation**: Checks that the lengths of `amounts_desired` and `amounts_min` match the vault's assets.
+    /// 3. **Share Calculation**: Calculates `shares_to_mint` based on the vault's total managed funds and the deposit amount.
+    /// 4. **Asset Transfer**: Transfers each specified amount from the user’s address to the vault as idle funds.
+    /// 5. **dfToken Minting**: Mints new dfTokens for the user to represent their ownership in the vault.
+    ///
+    /// # Notes
+    /// - For the first deposit, if the vault has only one asset, shares are calculated directly based on the deposit amount.
+    /// - For multiple assets, the function delegates to `calculate_deposit_amounts_and_shares_to_mint`
+    ///   for precise share computation.
+    /// - An event is emitted to log the deposit, including the actual deposited amounts and minted shares.
+    ///
     fn deposit(
         e: Env,
         amounts_desired: Vec<i128>,

From 5ea6119cee5f9cf302e541406d8ab3435a43270b Mon Sep 17 00:00:00 2001
From: esteblock <estebaniglesiasmanriquez@gmail.com>
Date: Wed, 6 Nov 2024 11:01:24 -0300
Subject: [PATCH 21/39] deposit when one asset in docs

---
 apps/contracts/vault/src/lib.rs               | 16 ++++----
 .../02-contracts/01-vault-contract.md         | 40 ++++++++++++++++---
 2 files changed, 44 insertions(+), 12 deletions(-)

diff --git a/apps/contracts/vault/src/lib.rs b/apps/contracts/vault/src/lib.rs
index 927dffcf..4007797e 100755
--- a/apps/contracts/vault/src/lib.rs
+++ b/apps/contracts/vault/src/lib.rs
@@ -199,7 +199,7 @@ impl VaultTrait for DeFindexVault {
         from.require_auth();
 
         // Collect Fees
-        // If this was not done before, last fee assesment will set to be current timestamp and this will return without action
+        // If this was not done before, last_fee_assesment will set to be current timestamp and this will return without action
         collect_fees(&e)?; 
 
         // get assets
@@ -218,19 +218,21 @@ impl VaultTrait for DeFindexVault {
         // for amount min is not necesary to check if it is negative
 
         let (amounts, shares_to_mint) = if assets_length == 1 {
-            // If Total Assets == 1
             let shares = if VaultToken::total_supply(e.clone()) == 0 {
+                // If we have only one asset, and this is the first deposit, we will mint a share proportional to the amount desired
                 // TODO In this case we might also want to mint a MINIMUM LIQUIDITY to be locked forever in the contract
                 // this might be for security and practical reasons as well
                 // shares will be equal to the amount desired to deposit, just for simplicity
                 amounts_desired.get(0).unwrap() // here we have already check same lenght
             } else {
-                // in this case we will mint a share proportional to the total managed funds
+                // If we have only one asset, but we already have some shares minted
+                // we will mint a share proportional to the total managed funds 
                 let total_managed_funds = fetch_total_managed_funds(&e);
-                VaultToken::total_supply(e.clone()) * amounts_desired.get(0).unwrap()
-                    / total_managed_funds
-                        .get(assets.get(0).unwrap().address.clone())
-                        .unwrap()
+                // if checked mul gives error, return ArithmeticError
+                VaultToken::total_supply(e.clone()).checked_mul(amounts_desired.get(0)
+                .unwrap()).unwrap_or_else(|| panic_with_error!(&e, ContractError::ArithmeticError))
+                .checked_div(total_managed_funds.get(assets.get(0).unwrap().address.clone())
+                .unwrap()).unwrap_or_else(|| panic_with_error!(&e, ContractError::ArithmeticError))
             };
             (amounts_desired, shares)
         } else {
diff --git a/apps/docs/10-whitepaper/03-the-defindex-approach/02-contracts/01-vault-contract.md b/apps/docs/10-whitepaper/03-the-defindex-approach/02-contracts/01-vault-contract.md
index e1144219..d08dce69 100644
--- a/apps/docs/10-whitepaper/03-the-defindex-approach/02-contracts/01-vault-contract.md
+++ b/apps/docs/10-whitepaper/03-the-defindex-approach/02-contracts/01-vault-contract.md
@@ -31,17 +31,47 @@ In summary:
 4. The **Manager** can adjust allocations but cannot add new strategies, ensuring security and stability.
 
 
-
 ## Investing: Deposit
-When a user deposits assets into the DeFindex, they receive dfTokens that represent their proportional share of the DeFindex's assets. These dfTokens can later be burned to withdraw the corresponding assets.
 
-Upon calling the `deposit()` function, **the assets are transferred to the DeFindex in accordance with the current asset ratio**. For example, if the current ratio is 1 token A, 2 tokens B, and 3 tokens C for each dfToken, this ratio is maintained when assets are deposited. In return, the user receives dfTokens that represent their participation in the DeFindex Vault. 
+When a user deposits assets into the DeFindex Vault, they receive dfTokens, representing their proportional share of the Vault’s total assets. These dfTokens can later be burned to redeem the user’s share of assets.
+
+Upon calling the `deposit()` function, assets are transferred to the DeFindex Vault and allocated based on the current asset ratios. For example, if the Vault maintains a 1:2:3 ratio for assets A, B, and C per dfToken, this ratio will be applied to new deposits. The user receives dfTokens reflecting their share of the Vault’s total assets.
+
+To withdraw assets, users call the `withdraw` function to burn their dfTokens, releasing assets according to the current asset ratio.
+
+Thus, the value per dfToken reflects a multi-asset backing. Using the above example, to mint 1 dfToken, a user would need to deposit 1 unit of asset A, 2 units of asset B, and 3 units of asset C. Therefore, the value of 1 dfToken can be represented as:
+
+$$
+p(\text{dfToken}) = (1 \text{A}, 2 \text{B}, 3 \text{C})
+$$
+
+### Depositing When Total Assets = 1    
 
-When the user wishes to withdraw their assets, they call the `withdraw` function to burn their dfTokens. The **withdrawn assets will be dispensed according to the asset ratio at the time of withdrawal**.
+When the Vault only holds one asset, the deposit process is straightforward: the amount deposited by the user will be directly used to mint shares proportional to the total funds in the Vault.
 
-Thus, the price per dfToken reflects a multi-asset price. For instance, using the earlier example, because in order to mint 1 dfToken, the user needs to deposit 1 token A, 2 tokens B, and 3 tokens C, the price per 1 dfToken will be `p(dfToken)=(1A, 2B, 3C)`.
+1. **First Deposit**:  
+   For the initial deposit, `shares_to_deposit` is set equal to the `amount` sent by the user, simplifying the initial setup.
 
+2. **When There Are Existing Funds**:  
+   If the Vault already holds funds, `shares_to_deposit` are calculated based on the current `total_managed_funds` and `total_supply` (i.e., the current number of shares), according to the following formula:
 
+Let’s denote the total supply at time 0 as $s_0$ and the total managed funds as $v_0$. At time 1, a user wants to deposit an additional amount $v'$, and new shares $s'$ are minted. The value of any share $val(s)$ at time $t$ is calculated as:
+
+$$
+val(s)_t = \frac{v_t}{s_t} \cdot s
+$$
+
+At time $t_1$, this must hold:
+
+$$
+val(s') = \frac{v_1}{s_1} \cdot s'
+$$
+
+Given that $v_1 = v_0 + v'$ and $s_1 = s_0 + s'$, we can rearrange terms to find the new shares:
+
+$$
+s' = \frac{v'}{v_0} \cdot s_0
+$$
 
 ## Withdrawals
 When a user wishes to withdraw funds, they must burn a corresponding amount of dfTokens (shares) to receive their **assets at the ratio of the time of withdrawal**.

From 04361cebd1f9ba81764672f25a1cc2f856a6fb71 Mon Sep 17 00:00:00 2001
From: esteblock <estebaniglesiasmanriquez@gmail.com>
Date: Wed, 6 Nov 2024 16:15:02 -0300
Subject: [PATCH 22/39] tests for deposit one asset without investment

---
 apps/contracts/vault/src/lib.rs             |   3 +-
 apps/contracts/vault/src/test.rs            |   2 +
 apps/contracts/vault/src/test/deposit.rs    | 323 +++++++++++++++++++-
 apps/contracts/vault/src/test/initialize.rs |  11 -
 4 files changed, 319 insertions(+), 20 deletions(-)

diff --git a/apps/contracts/vault/src/lib.rs b/apps/contracts/vault/src/lib.rs
index 4007797e..0120e6d4 100755
--- a/apps/contracts/vault/src/lib.rs
+++ b/apps/contracts/vault/src/lib.rs
@@ -227,6 +227,7 @@ impl VaultTrait for DeFindexVault {
             } else {
                 // If we have only one asset, but we already have some shares minted
                 // we will mint a share proportional to the total managed funds 
+                // read whitepaper!
                 let total_managed_funds = fetch_total_managed_funds(&e);
                 // if checked mul gives error, return ArithmeticError
                 VaultToken::total_supply(e.clone()).checked_mul(amounts_desired.get(0)
@@ -234,6 +235,7 @@ impl VaultTrait for DeFindexVault {
                 .checked_div(total_managed_funds.get(assets.get(0).unwrap().address.clone())
                 .unwrap()).unwrap_or_else(|| panic_with_error!(&e, ContractError::ArithmeticError))
             };
+            // TODO check that min amount is ok
             (amounts_desired, shares)
         } else {
             // If Total Assets > 1
@@ -261,7 +263,6 @@ impl VaultTrait for DeFindexVault {
 
         events::emit_deposit_event(&e, from, amounts.clone(), shares_to_mint.clone());
 
-        // TODO return amounts and shares to mint
         Ok((amounts, shares_to_mint))
     }
 
diff --git a/apps/contracts/vault/src/test.rs b/apps/contracts/vault/src/test.rs
index bd168890..77cc783f 100755
--- a/apps/contracts/vault/src/test.rs
+++ b/apps/contracts/vault/src/test.rs
@@ -135,6 +135,8 @@ impl<'a> DeFindexVaultTest<'a> {
         let strategy_client_token0 = create_hodl_strategy(&env, &token0.address);
         let strategy_client_token1 = create_hodl_strategy(&env, &token1.address);
 
+        env.budget().reset_unlimited();
+        
         DeFindexVaultTest {
             env,
             defindex_factory,
diff --git a/apps/contracts/vault/src/test/deposit.rs b/apps/contracts/vault/src/test/deposit.rs
index 30bb840d..09ac2ded 100644
--- a/apps/contracts/vault/src/test/deposit.rs
+++ b/apps/contracts/vault/src/test/deposit.rs
@@ -1,12 +1,28 @@
-use soroban_sdk::{vec as sorobanvec, String, Vec};
+use soroban_sdk::{vec as sorobanvec, String, Vec, Map};
 
 use crate::test::defindex_vault::{AssetAllocation, ContractError};
 use crate::test::{
     create_strategy_params_token0, create_strategy_params_token1, DeFindexVaultTest,
 };
 
+// Test deposit not yet initialized
 #[test]
-fn deposit_amounts_desired_wrong_length() {
+fn test_deposit_not_yet_initialized() {
+    let test = DeFindexVaultTest::setup();
+    let users = DeFindexVaultTest::generate_random_users(&test.env, 1);
+
+    let result = test.defindex_contract.try_deposit(
+        &sorobanvec![&test.env, 100i128],
+        &sorobanvec![&test.env, 100i128],
+        &users[0],
+    );
+
+    assert_eq!(result, Err(Ok(ContractError::NotInitialized)));
+}
+
+
+#[test]
+fn deposit_amounts_desired_less_length() {
     let test = DeFindexVaultTest::setup();
     test.env.mock_all_auths();
     let strategy_params_token0 = create_strategy_params_token0(&test);
@@ -49,23 +65,314 @@ fn deposit_amounts_desired_wrong_length() {
     assert_eq!(response, Err(Ok(ContractError::WrongAmountsLength)));
 }
 
+// test deposit amount desired more length
 #[test]
-fn deposit_amounts_min_wrong_length() {
-    todo!();
+fn deposit_amounts_desired_more_length() {
+    let test = DeFindexVaultTest::setup();
+    test.env.mock_all_auths();
+    let strategy_params_token0 = create_strategy_params_token0(&test);
+    let strategy_params_token1 = create_strategy_params_token1(&test);
+
+    // initialize with 2 assets
+    let assets: Vec<AssetAllocation> = sorobanvec![
+        &test.env,
+        AssetAllocation {
+            address: test.token0.address.clone(),
+            strategies: strategy_params_token0.clone()
+        }
+    ];
+
+    test.defindex_contract.initialize(
+        &assets,
+        &test.manager,
+        &test.emergency_manager,
+        &test.vault_fee_receiver,
+        &2000u32,
+        &test.defindex_protocol_receiver,
+        &test.defindex_factory,
+        &String::from_str(&test.env, "dfToken"),
+        &String::from_str(&test.env, "DFT"),
+    );
+    let amount = 1000i128;
+
+    let users = DeFindexVaultTest::generate_random_users(&test.env, 1);
+
+    let response = test.defindex_contract.try_deposit(
+        &sorobanvec![&test.env, amount, amount], // wrong amount desired
+        &sorobanvec![&test.env, amount],
+        &users[0],
+    );
+
+    assert_eq!(response, Err(Ok(ContractError::WrongAmountsLength)));
+}
+
+// test deposit amount min less length
+#[test]
+fn deposit_amounts_min_less_length() {
+    let test = DeFindexVaultTest::setup();
+    test.env.mock_all_auths();
+    let strategy_params_token0 = create_strategy_params_token0(&test);
+    let strategy_params_token1 = create_strategy_params_token1(&test);
+
+    // initialize with 2 assets
+    let assets: Vec<AssetAllocation> = sorobanvec![
+        &test.env,
+        AssetAllocation {
+            address: test.token0.address.clone(),
+            strategies: strategy_params_token0.clone()
+        },
+        AssetAllocation {
+            address: test.token1.address.clone(),
+            strategies: strategy_params_token1.clone()
+        }
+    ]; 
+
+    test.defindex_contract.initialize(
+        &assets,
+        &test.manager,
+        &test.emergency_manager,
+        &test.vault_fee_receiver,
+        &2000u32,
+        &test.defindex_protocol_receiver,
+        &test.defindex_factory,
+        &String::from_str(&test.env, "dfToken"),
+        &String::from_str(&test.env, "DFT"),
+    );
+    let amount = 1000i128;
+
+    let users = DeFindexVaultTest::generate_random_users(&test.env, 1);
+
+    let response = test.defindex_contract.try_deposit(
+        &sorobanvec![&test.env, amount, amount],
+        &sorobanvec![&test.env, amount], // wrong amount min
+        &users[0],
+    );
+
+    assert_eq!(response, Err(Ok(ContractError::WrongAmountsLength)));
+}
+
+
+// test deposit amount min more length
+#[test]
+fn deposit_amounts_min_more_length() {
+    let test = DeFindexVaultTest::setup();
+    test.env.mock_all_auths();
+    let strategy_params_token0 = create_strategy_params_token0(&test);
+    let strategy_params_token1 = create_strategy_params_token1(&test);
+
+    // initialize with 2 assets
+    let assets: Vec<AssetAllocation> = sorobanvec![
+        &test.env,
+        AssetAllocation {
+            address: test.token0.address.clone(),
+            strategies: strategy_params_token0.clone()
+        },
+        AssetAllocation {
+            address: test.token1.address.clone(),
+            strategies: strategy_params_token1.clone()
+        }
+    ];
+
+    test.defindex_contract.initialize(
+        &assets,
+        &test.manager,
+        &test.emergency_manager,
+        &test.vault_fee_receiver,
+        &2000u32,
+        &test.defindex_protocol_receiver,
+        &test.defindex_factory,
+        &String::from_str(&test.env, "dfToken"),
+        &String::from_str(&test.env, "DFT"),
+    );
+    let amount = 1000i128;
+
+    let users = DeFindexVaultTest::generate_random_users(&test.env, 1);
+
+    let response = test.defindex_contract.try_deposit(
+        &sorobanvec![&test.env, amount, amount],
+        &sorobanvec![&test.env, amount, amount, amount], // wrong amount min
+        &users[0],
+    );
+
+    assert_eq!(response, Err(Ok(ContractError::WrongAmountsLength)));
 }
 
+// test amount desired negative
 #[test]
 fn deposit_amounts_desired_negative() {
-    todo!();
+    let test = DeFindexVaultTest::setup();
+    test.env.mock_all_auths();
+    let strategy_params_token0 = create_strategy_params_token0(&test);
+    let strategy_params_token1 = create_strategy_params_token1(&test);
+
+    // initialize with 2 assets
+    let assets: Vec<AssetAllocation> = sorobanvec![
+        &test.env,
+        AssetAllocation {
+            address: test.token0.address.clone(),
+            strategies: strategy_params_token0.clone()
+        },
+        AssetAllocation {
+            address: test.token1.address.clone(),
+            strategies: strategy_params_token1.clone()
+        }
+    ];
+
+    test.defindex_contract.initialize(
+        &assets,
+        &test.manager,
+        &test.emergency_manager,
+        &test.vault_fee_receiver,
+        &2000u32,
+        &test.defindex_protocol_receiver,
+        &test.defindex_factory,
+        &String::from_str(&test.env, "dfToken"),
+        &String::from_str(&test.env, "DFT"),
+    );
+    let amount = 1000i128;
+
+    let users = DeFindexVaultTest::generate_random_users(&test.env, 1);
+
+    let response = test.defindex_contract.try_deposit(
+        &sorobanvec![&test.env, -amount, amount],
+        &sorobanvec![&test.env, amount, amount],
+        &users[0],
+    );
+
+    assert_eq!(response, Err(Ok(ContractError::NegativeNotAllowed)));
 }
 
+// test deposit one asset success 
 #[test]
-fn deposit_one_asset() {
-    todo!();
+fn deposit_one_asset_success() {
+    let test = DeFindexVaultTest::setup();
+    test.env.mock_all_auths();
+    let strategy_params_token0 = create_strategy_params_token0(&test);
+
+    // initialize with 1 assets
+    let assets: Vec<AssetAllocation> = sorobanvec![
+        &test.env,
+        AssetAllocation {
+            address: test.token0.address.clone(),
+            strategies: strategy_params_token0.clone()
+        }
+    ];
+
+    test.defindex_contract.initialize(
+        &assets,
+        &test.manager,
+        &test.emergency_manager,
+        &test.vault_fee_receiver,
+        &2000u32,
+        &test.defindex_protocol_receiver,
+        &test.defindex_factory,
+        &String::from_str(&test.env, "dfToken"),
+        &String::from_str(&test.env, "DFT"),
+    );
+    let amount = 123456789i128;
+
+    let users = DeFindexVaultTest::generate_random_users(&test.env, 1);
+
+    // Balances before deposit
+    test.token0_admin_client.mint(&users[0], &amount);
+    let user_balance = test.token0.balance(&users[0]);
+    assert_eq!(user_balance, amount);
+
+    let df_balance = test.defindex_contract.balance(&users[0]);
+    assert_eq!(df_balance, 0i128);
+
+    // deposit
+    test.defindex_contract.deposit(
+        &sorobanvec![&test.env, amount],
+        &sorobanvec![&test.env, amount],
+        &users[0],
+    );
+
+    // check balances after deposit
+    let df_balance = test.defindex_contract.balance(&users[0]);
+    assert_eq!(df_balance, amount);
+    
+    let user_balance = test.token0.balance(&users[0]);
+    assert_eq!(user_balance, 0i128);
+
+    //map shuould be map
+    let mut expected_map = Map::new(&test.env);
+    expected_map.set(test.token0.address.clone(), amount);
+
+    // check that all the assets are in the vault
+    let vault_balance = test.token0.balance(&test.defindex_contract.address);
+    assert_eq!(vault_balance, amount);
+
+    // check that fetch_total_managed_funds returns correct amount
+    let total_managed_funds = test.defindex_contract.fetch_total_managed_funds();
+    assert_eq!(total_managed_funds, expected_map);
+
+    // check current idle funds, 
+    let current_idle_funds = test.defindex_contract.fetch_current_idle_funds();
+    assert_eq!(current_idle_funds, expected_map);
+
+    //map shuould be map
+    let mut expected_map = Map::new(&test.env);
+    expected_map.set(test.token0.address.clone(), 0i128);
+
+    // check that current invested funds is now 0, funds still in idle funds
+    let current_invested_funds = test.defindex_contract.fetch_current_invested_funds();
+    assert_eq!(current_invested_funds, expected_map);
+
+    // Now user deposits for the second time
+    let amount2 = 987654321i128;
+    test.token0_admin_client.mint(&users[0], &amount2);
+    let user_balance = test.token0.balance(&users[0]);
+    assert_eq!(user_balance, amount2);
+
+    // deposit
+    test.defindex_contract.deposit(
+        &sorobanvec![&test.env, amount2],
+        &sorobanvec![&test.env, amount2],
+        &users[0],
+    );
+
+    //map shuould be map
+    let mut expected_map = Map::new(&test.env);
+    expected_map.set(test.token0.address.clone(), amount + amount2);
+
+    // check balances after deposit
+    let df_balance = test.defindex_contract.balance(&users[0]);
+    assert_eq!(df_balance, amount + amount2);
+
+    let user_balance = test.token0.balance(&users[0]);
+    assert_eq!(user_balance, 0i128);
+    
+    // check that all the assets are in the vault
+    let vault_balance = test.token0.balance(&test.defindex_contract.address);
+    assert_eq!(vault_balance, amount + amount2);
+    
+    // check that fetch_total_managed_funds returns correct amount
+    let total_managed_funds = test.defindex_contract.fetch_total_managed_funds();
+    assert_eq!(total_managed_funds, expected_map);
+    
+    // check current idle funds
+    let current_idle_funds = test.defindex_contract.fetch_current_idle_funds();
+    assert_eq!(current_idle_funds, expected_map);
+    
+
+    //map shuould be map
+    let mut expected_map = Map::new(&test.env);
+    expected_map.set(test.token0.address.clone(), 0i128);
+    
+    // check that current invested funds is now 0, funds still in idle funds
+    let current_invested_funds = test.defindex_contract.fetch_current_invested_funds();
+    assert_eq!(current_invested_funds, expected_map);
+
+
+
 }
 
+
+
+
 #[test]
-fn deposit_several_assets() {
+fn deposit_several_assets_success() {
     todo!();
 }
 
diff --git a/apps/contracts/vault/src/test/initialize.rs b/apps/contracts/vault/src/test/initialize.rs
index 3a5cc8f0..4c5faf24 100644
--- a/apps/contracts/vault/src/test/initialize.rs
+++ b/apps/contracts/vault/src/test/initialize.rs
@@ -165,17 +165,6 @@ fn test_initialize_twice() {
     );
 }
 
-// TODO finish DEPOSIT when ready
-// #[test]
-// fn test_deposit_not_yet_initialized() {
-//     let test = DeFindexVaultTest::setup();
-//     let users = DeFindexVaultTest::generate_random_users(&test.env, 1);
-
-//     let result = test.defindex_contract.try_deposit(&100i128, &users[0]);
-
-//     assert_eq!(result, Err(Ok(ContractError::NotInitialized)));
-// }
-
 #[test]
 fn test_withdraw_not_yet_initialized() {
     let test = DeFindexVaultTest::setup();

From 614c0fd943e0d5fc55e5b03c9d38d22196d8b77e Mon Sep 17 00:00:00 2001
From: esteblock <estebaniglesiasmanriquez@gmail.com>
Date: Wed, 6 Nov 2024 16:22:10 -0300
Subject: [PATCH 23/39] check validation of minimum amount for 1 asset

---
 apps/contracts/vault/src/error.rs        |   1 +
 apps/contracts/vault/src/lib.rs          |   4 +
 apps/contracts/vault/src/test/deposit.rs | 100 +++++++++++------------
 3 files changed, 53 insertions(+), 52 deletions(-)

diff --git a/apps/contracts/vault/src/error.rs b/apps/contracts/vault/src/error.rs
index e65375dc..3ca862cf 100644
--- a/apps/contracts/vault/src/error.rs
+++ b/apps/contracts/vault/src/error.rs
@@ -19,6 +19,7 @@ pub enum ContractError {
     InsufficientManagedFunds = 114,
     MissingInstructionData = 115,
     UnsupportedAsset = 116,
+    AmountLessThanMinimum = 117,
 
     // Arithmetic Errors (12x)
     ArithmeticError = 120,
diff --git a/apps/contracts/vault/src/lib.rs b/apps/contracts/vault/src/lib.rs
index 0120e6d4..bc1e4cd4 100755
--- a/apps/contracts/vault/src/lib.rs
+++ b/apps/contracts/vault/src/lib.rs
@@ -249,6 +249,10 @@ impl VaultTrait for DeFindexVault {
 
         // for every asset
         for (i, amount) in amounts.iter().enumerate() {
+            // if amount is less than minimum, return error AmountLessThanMinimum
+            if amount < amounts_min.get(i as u32).unwrap() {
+                panic_with_error!(&e, ContractError::AmountLessThanMinimum);
+            }
             // its possible that some amounts are 0.
             if amount > 0 {
                 let asset = assets.get(i as u32).unwrap();
diff --git a/apps/contracts/vault/src/test/deposit.rs b/apps/contracts/vault/src/test/deposit.rs
index 09ac2ded..869e9cc8 100644
--- a/apps/contracts/vault/src/test/deposit.rs
+++ b/apps/contracts/vault/src/test/deposit.rs
@@ -368,62 +368,58 @@ fn deposit_one_asset_success() {
 
 }
 
+// test deposit one asset with minimum more than desired
+#[test]
+fn deposit_one_asset_min_more_than_desired() {
+    let test = DeFindexVaultTest::setup();
+    test.env.mock_all_auths();
+    let strategy_params_token0 = create_strategy_params_token0(&test);
 
+    // initialize with 1 assets
+    let assets: Vec<AssetAllocation> = sorobanvec![
+        &test.env,
+        AssetAllocation {
+            address: test.token0.address.clone(),
+            strategies: strategy_params_token0.clone()
+        }
+    ];
+
+    test.defindex_contract.initialize(
+        &assets,
+        &test.manager,
+        &test.emergency_manager,
+        &test.vault_fee_receiver,
+        &2000u32,
+        &test.defindex_protocol_receiver,
+        &test.defindex_factory,
+        &String::from_str(&test.env, "dfToken"),
+        &String::from_str(&test.env, "DFT"),
+    );
+    let amount = 123456789i128;
+
+    let users = DeFindexVaultTest::generate_random_users(&test.env, 1);
+
+    // Balances before deposit
+    test.token0_admin_client.mint(&users[0], &amount);
+    let user_balance = test.token0.balance(&users[0]);
+    assert_eq!(user_balance, amount);
+
+    let df_balance = test.defindex_contract.balance(&users[0]);
+    assert_eq!(df_balance, 0i128);
+
+    // deposit
+    let result=test.defindex_contract.try_deposit(
+        &sorobanvec![&test.env, amount],
+        &sorobanvec![&test.env, amount + 1],
+        &users[0],
+    );
+    // this should fail
+    assert_eq!(result, Err(Ok(ContractError::AmountLessThanMinimum)));
+    
+}
 
 
 #[test]
 fn deposit_several_assets_success() {
     todo!();
 }
-
-// #[test]
-// fn test_deposit_success() {
-//     todo!();
-// }
-// #[test]
-// fn test_withdraw_success() {
-//     let test = DeFindexVaultTest::setup();
-//     test.env.mock_all_auths();
-//     let strategy_params_token0 = create_strategy_params_token0(&test);
-//     let strategy_params_token1 = create_strategy_params_token1(&test);
-//     let assets: Vec<AssetAllocation> = sorobanvec![
-//         &test.env,
-//         AssetAllocation {
-//             address: test.token0.address.clone(),
-//
-//             strategies: strategy_params.clone()
-//         }
-//     ];
-
-//     test.defindex_contract.initialize(
-//         &assets,
-//         &test.manager,
-//         &test.emergency_manager,
-//         &test.vault_fee_receiver,
-//         &test.defindex_protocol_receiver,
-//     );
-//     let amount = 1000i128;
-
-//     let users = DeFindexVaultTest::generate_random_users(&test.env, 1);
-
-//     test.token0_admin_client.mint(&users[0], &amount);
-//     let user_balance = test.token0.balance(&users[0]);
-//     assert_eq!(user_balance, amount);
-//     // here youll need to create a client for a token with the same address
-
-//     let df_balance = test.defindex_contract.balance(&users[0]);
-//     assert_eq!(df_balance, 0i128);
-
-//     test.defindex_contract.deposit(&sorobanvec![&test.env, amount], &sorobanvec![&test.env, amount], &users[0]);
-
-//     let df_balance = test.defindex_contract.balance(&users[0]);
-//     assert_eq!(df_balance, amount);
-
-//     test.defindex_contract.withdraw(&df_balance, &users[0]);
-
-//     let df_balance = test.defindex_contract.balance(&users[0]);
-//     assert_eq!(df_balance, 0i128);
-
-//     let user_balance = test.token0.balance(&users[0]);
-//     assert_eq!(user_balance, amount);
-// }

From c283e6ab5c3bf722a33254aa2a2e51c3557181da Mon Sep 17 00:00:00 2001
From: esteblock <estebaniglesiasmanriquez@gmail.com>
Date: Wed, 6 Nov 2024 16:36:35 -0300
Subject: [PATCH 24/39] adding test for several assets

---
 apps/contracts/vault/src/test/deposit.rs | 159 ++++++++++++++++++++++-
 1 file changed, 156 insertions(+), 3 deletions(-)

diff --git a/apps/contracts/vault/src/test/deposit.rs b/apps/contracts/vault/src/test/deposit.rs
index 869e9cc8..8d24bbaa 100644
--- a/apps/contracts/vault/src/test/deposit.rs
+++ b/apps/contracts/vault/src/test/deposit.rs
@@ -418,8 +418,161 @@ fn deposit_one_asset_min_more_than_desired() {
     
 }
 
-
+// test deposit of several asset, considering different proportion of assets
 #[test]
 fn deposit_several_assets_success() {
-    todo!();
-}
+    let test = DeFindexVaultTest::setup();
+    test.env.mock_all_auths();
+    let strategy_params_token0 = create_strategy_params_token0(&test);
+    let strategy_params_token1 = create_strategy_params_token1(&test);
+
+    // initialize with 2 assets
+    let assets: Vec<AssetAllocation> = sorobanvec![
+        &test.env,
+        AssetAllocation {
+            address: test.token0.address.clone(),
+            strategies: strategy_params_token0.clone()
+        },
+        AssetAllocation {
+            address: test.token1.address.clone(),
+            strategies: strategy_params_token1.clone()
+        }
+    ];
+
+    test.defindex_contract.initialize(
+        &assets,
+        &test.manager,
+        &test.emergency_manager,
+        &test.vault_fee_receiver,
+        &2000u32,
+        &test.defindex_protocol_receiver,
+        &test.defindex_factory,
+        &String::from_str(&test.env, "dfToken"),
+        &String::from_str(&test.env, "DFT"),
+    );
+    let amount0 = 123456789i128;
+    let amount1 = 987654321i128;
+
+    let users = DeFindexVaultTest::generate_random_users(&test.env, 2);
+
+    // Balances before deposit
+    test.token0_admin_client.mint(&users[0], &amount0);
+    test.token1_admin_client.mint(&users[0], &amount1);
+    let user_balance0 = test.token0.balance(&users[0]);
+    assert_eq!(user_balance0, amount0);
+    let user_balance1 = test.token1.balance(&users[0]);
+    assert_eq!(user_balance1, amount1);
+
+    let df_balance = test.defindex_contract.balance(&users[0]);
+    assert_eq!(df_balance, 0i128);
+
+    // deposit
+    test.defindex_contract.deposit(
+        &sorobanvec![&test.env, amount0, amount1],
+        &sorobanvec![&test.env, amount0, amount1],
+        &users[0],
+    );
+
+    // check balances after deposit
+    let df_balance = test.defindex_contract.balance(&users[0]);
+    assert_eq!(df_balance, amount0 + amount1);
+    
+    let user_balance0 = test.token0.balance(&users[0]);
+    assert_eq!(user_balance0,0i128);
+    let user_balance1 = test.token1.balance(&users[0]);
+    assert_eq!(user_balance1,0i128);
+
+    // check vault balance of asset 0
+    let vault_balance0 = test.token0.balance(&test.defindex_contract.address);
+    assert_eq!(vault_balance0, amount0);
+    // check vault balance of asset 1
+    let vault_balance1 = test.token1.balance(&test.defindex_contract.address);
+    assert_eq!(vault_balance1, amount1);
+
+    //map shuould be map
+    let mut expected_map = Map::new(&test.env);
+    expected_map.set(test.token0.address.clone(), amount0);
+    expected_map.set(test.token1.address.clone(), amount1);
+
+    // check that fetch_total_managed_funds returns correct amount
+    let total_managed_funds = test.defindex_contract.fetch_total_managed_funds();
+    assert_eq!(total_managed_funds, expected_map);
+
+    // check current idle funds
+    let current_idle_funds = test.defindex_contract.fetch_current_idle_funds();
+    assert_eq!(current_idle_funds, expected_map);
+    
+    //map shuould be map
+    let mut expected_map = Map::new(&test.env);
+    expected_map.set(test.token0.address.clone(), 0i128);
+    expected_map.set(test.token1.address.clone(), 0i128);
+
+    // check that current invested funds is now 0, funds still in idle funds
+    let current_invested_funds = test.defindex_contract.fetch_current_invested_funds();
+    assert_eq!(current_invested_funds, expected_map);
+
+
+    // new user wants to do a deposit with more assets 0 than the proportion, but with minium amount 0
+    // multiply amount0 by 2
+    let amount0_new =  amount0*2 +100 ;
+    let amount1_new = amount1*2;
+
+    // mint this to user 1
+    test.token0_admin_client.mint(&users[1], &amount0_new);
+    test.token1_admin_client.mint(&users[1], &amount1_new);
+
+    // check user balances
+    let user_balance0 = test.token0.balance(&users[1]);
+    assert_eq!(user_balance0, amount0_new);
+    let user_balance1 = test.token1.balance(&users[1]);
+    assert_eq!(user_balance1, amount1_new);
+
+
+    // user 1 deposits
+    test.defindex_contract.deposit(
+        &sorobanvec![&test.env, amount0_new, amount1_new],
+        &sorobanvec![&test.env, 0i128, 0i128],
+        &users[1],
+    );
+
+    // // check balances after deposit
+    // let df_balance = test.defindex_contract.balance(&users[1]);
+    // assert_eq!(df_balance, 2*(amount0 + amount1));
+
+    // let user_balance0 = test.token0.balance(&users[1]);
+    // assert_eq!(user_balance0, amount0_new - 2*amount0);
+    let user_balance1 = test.token1.balance(&users[1]);
+    assert_eq!(user_balance1, amount1_new - 2*amount1);
+
+    // check vault balance of asset 0
+    let vault_balance0 = test.token0.balance(&test.defindex_contract.address);
+    assert_eq!(vault_balance0, 3*amount0);
+    // check vault balance of asset 1
+    let vault_balance1 = test.token1.balance(&test.defindex_contract.address);
+    assert_eq!(vault_balance1, 3*amount1);
+
+    //map shuould be map
+    let mut expected_map = Map::new(&test.env);
+    expected_map.set(test.token0.address.clone(), 3*amount0);
+    expected_map.set(test.token1.address.clone(), 3*amount1);
+
+    // check that fetch_total_managed_funds returns correct amount
+    let total_managed_funds = test.defindex_contract.fetch_total_managed_funds();
+    assert_eq!(total_managed_funds, expected_map);
+
+    // check current idle funds
+    let current_idle_funds = test.defindex_contract.fetch_current_idle_funds();
+    assert_eq!(current_idle_funds, expected_map);
+
+    //map shuould be map
+    let mut expected_map = Map::new(&test.env);
+    expected_map.set(test.token0.address.clone(), 0i128);
+    expected_map.set(test.token1.address.clone(), 0i128);
+
+    // check that current invested funds is now 0, funds still in idle funds
+    let current_invested_funds = test.defindex_contract.fetch_current_invested_funds();
+    assert_eq!(current_invested_funds, expected_map);
+
+
+
+}
\ No newline at end of file

From d4018df9c3f3099a0a75944670f0751e07d253f6 Mon Sep 17 00:00:00 2001
From: Matias Poblete <86752543+MattPoblete@users.noreply.github.com>
Date: Wed, 6 Nov 2024 16:49:42 -0300
Subject: [PATCH 25/39] =?UTF-8?q?=F0=9F=A9=B9Fix=20transaciton=20params=20?=
 =?UTF-8?q?in=20deploy?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DeployVault/ConfirmDelpoyModal.tsx        | 56 ++++++++++++++-----
 .../components/DeployVault/VaultPreview.tsx   |  2 -
 2 files changed, 41 insertions(+), 17 deletions(-)

diff --git a/apps/dapp/src/components/DeployVault/ConfirmDelpoyModal.tsx b/apps/dapp/src/components/DeployVault/ConfirmDelpoyModal.tsx
index 63bf8db4..1f8d5b44 100644
--- a/apps/dapp/src/components/DeployVault/ConfirmDelpoyModal.tsx
+++ b/apps/dapp/src/components/DeployVault/ConfirmDelpoyModal.tsx
@@ -82,6 +82,7 @@ export const ConfirmDelpoyModal = ({ isOpen, onClose }: { isOpen: boolean, onClo
       && emergencyManagerString !== ""
       && feeReceiverString !== ""
       && assets.length > 0
+      && !indexShare 
       && loadingAssets === false
     ) {
       setDeployDisabled(false);
@@ -151,7 +152,17 @@ export const ConfirmDelpoyModal = ({ isOpen, onClose }: { isOpen: boolean, onClo
     const salt = randomBytes(32)
 
     const ratios = [1];
-
+    /*
+        pub struct AssetAllocation {
+          pub address: Address,
+          pub strategies: Vec<Strategy>,
+        } 
+        pub struct Strategy {
+          pub address: Address,
+          pub name: String,
+          pub paused: bool,
+        }
+    */
     const strategyParamsScVal = strategies.map((param) => {
       return xdr.ScVal.scvMap([
         new xdr.ScMapEntry({
@@ -162,22 +173,39 @@ export const ConfirmDelpoyModal = ({ isOpen, onClose }: { isOpen: boolean, onClo
           key: xdr.ScVal.scvSymbol('name'),
           val: nativeToScVal(param.name, { type: "string" }),
         }),
+        new xdr.ScMapEntry({
+          key: xdr.ScVal.scvSymbol('paused'),
+          val: nativeToScVal(false, { type: "bool" }),
+        }),
       ]);
     });
 
     const strategyParamsScValVec = xdr.ScVal.scvVec(strategyParamsScVal);
 
-    /* fn create_defindex_vault(
-        e: Env, 
-        emergency_manager: Address, 
-        fee_receiver: Address, 
-        vault_share: u32,
-        vault_name: String,
-        vault_symbol: String,
-        manager: Address,
-        assets: Vec<AssetAllocation>,
-        salt: BytesN<32>
-    ) -> Result<Address, FactoryError> */
+    const assetParamsScVal = assets.map((asset) => {
+      return xdr.ScVal.scvMap([
+        new xdr.ScMapEntry({
+          key: xdr.ScVal.scvSymbol('address'),
+          val: new Address(asset).toScVal(),
+        }),
+        new xdr.ScMapEntry({
+          key: xdr.ScVal.scvSymbol('strategies'),
+          val: strategyParamsScValVec,
+        }),
+      ]);
+    });
+
+
+     /*  fn create_defindex_vault(
+      emergency_manager: address, 
+      fee_receiver: address, 
+      vault_share: u32, 
+      vault_name: string, 
+      vault_symbol: string, 
+      manager: address, 
+      assets: vec<AssetAllocation>, 
+      salt: bytesn<32>) -> result<address,FactoryError>
+ */
     const createDefindexParams: xdr.ScVal[] = [
       emergencyManager.toScVal(),
       feeReceiver.toScVal(),
@@ -185,9 +213,7 @@ export const ConfirmDelpoyModal = ({ isOpen, onClose }: { isOpen: boolean, onClo
       vaultName,
       vaultSymbol,
       manager.toScVal(),
-      xdr.ScVal.scvVec(assets.map((token) => new Address(token).toScVal())),
-      //strategyParamsScValVec,
-      xdr.ScVal.scvVec(ratios.map((ratio) => nativeToScVal(ratio, { type: "u32" }))),
+      xdr.ScVal.scvVec(assetParamsScVal),
       nativeToScVal(salt),
     ];
 
diff --git a/apps/dapp/src/components/DeployVault/VaultPreview.tsx b/apps/dapp/src/components/DeployVault/VaultPreview.tsx
index ecc7f745..8b0ce9c6 100644
--- a/apps/dapp/src/components/DeployVault/VaultPreview.tsx
+++ b/apps/dapp/src/components/DeployVault/VaultPreview.tsx
@@ -149,12 +149,10 @@ export const VaultPreview = ({ data }: { data: ChartData[] }) => {
     dispatch(setFeeReceiver(input))
   };
   const handleVaultShareChange = (input: any) => {
-    console.log(input)
     if (isNaN(input)) return
     if (input < 0 || input > 100) return
     const decimalRegex = /^(\d+)?(\.\d{0,2})?$/
     if (!decimalRegex.test(input)) return
-    console.log(input * 100)
     setFormControl({
       ...formControl,
       vaultShare: input

From 4213f37fd7457ecfbddbd87cff6e4114bb378230 Mon Sep 17 00:00:00 2001
From: Matias Poblete <86752543+MattPoblete@users.noreply.github.com>
Date: Wed, 6 Nov 2024 16:50:24 -0300
Subject: [PATCH 26/39] =?UTF-8?q?=E2=9C=A8Restored=20factory?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/dapp/src/utils/factory.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/dapp/src/utils/factory.ts b/apps/dapp/src/utils/factory.ts
index b3868bc8..76619c28 100644
--- a/apps/dapp/src/utils/factory.ts
+++ b/apps/dapp/src/utils/factory.ts
@@ -12,8 +12,8 @@ export async function fetchFactoryAddress(network: string): Promise<string> {
     if (network !== "testnet" && network !== "mainnet") {
         throw new Error(`Invalid network: ${network}. It should be testnet or mainnet`);
     }
-    return "CCNG7ZS2H22ED7E47E5S7RVDBOQIEKEUEARVNEKNONWQQVOTXBPRA3E6"
-   /*  const url = `https://raw.githubusercontent.com/paltalabs/defindex/refs/heads/main/public/${network}.contracts.json`;
+  
+    const url = `https://raw.githubusercontent.com/paltalabs/defindex/refs/heads/main/public/${network}.contracts.json`;
     try {
         const response = await fetch(url);
         if (response.status === 404) {
@@ -32,5 +32,5 @@ export async function fetchFactoryAddress(network: string): Promise<string> {
             throw new Error(`Failed to fetch factory address: ${error}`);
         }
 
-    } */
+    }
 }

From 838ff09dee679d8e59bccb6da386c526be2b0e44 Mon Sep 17 00:00:00 2001
From: Matias Poblete <86752543+MattPoblete@users.noreply.github.com>
Date: Wed, 6 Nov 2024 16:50:55 -0300
Subject: [PATCH 27/39] =?UTF-8?q?=F0=9F=A9=B9Fix=20deposit=20function?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../InteractWithVault/InteractWithVault.tsx   | 33 +++++++------------
 1 file changed, 12 insertions(+), 21 deletions(-)

diff --git a/apps/dapp/src/components/InteractWithVault/InteractWithVault.tsx b/apps/dapp/src/components/InteractWithVault/InteractWithVault.tsx
index 20f4fcd9..c54896a8 100644
--- a/apps/dapp/src/components/InteractWithVault/InteractWithVault.tsx
+++ b/apps/dapp/src/components/InteractWithVault/InteractWithVault.tsx
@@ -27,33 +27,24 @@ export const InteractWithVault = () => {
 
   const vaultOperation = async () => {
     if (!address || !vaultMethod) return;
-    if (vaultMethod != VaultMethod.EMERGENCY_WITHDRAW) return;
+    if (!amount) throw new Error('Amount is required');
+    if (vaultMethod != VaultMethod.DEPOSIT) return;
+    const depositParams: xdr.ScVal[] = [
+      xdr.ScVal.scvVec([nativeToScVal((amount * Math.pow(10, 7)), { type: "i128" })]),
+      xdr.ScVal.scvVec([nativeToScVal(((amount * 0.9) * Math.pow(10, 7)), { type: "i128" })]),
+      new Address(address).toScVal(),
+    ]
     console.log('Vault method:', vaultMethod)
-    const args: xdr.ScVal[] = [
-      new Address(selectedVault.address).toScVal()
-    ];
-    if (vaultMethod === VaultMethod.EMERGENCY_WITHDRAW) {
-      if (!selectedVault?.totalValues) throw new Error('Total values is required');
-      args.unshift(nativeToScVal((0), { type: "i128" }),)
+    try {
       const result = await vault(
-        VaultMethod.EMERGENCY_WITHDRAW,
+        vaultMethod!,
         selectedVault?.address!,
-        [
-          new Address(selectedVault.address).toScVal()
-        ],
+        depositParams,
         true,
       )
-      return result
-    } else {
-      if (!amount) throw new Error('Amount is required');
-      args.unshift(nativeToScVal((amount * Math.pow(10, 7)), { type: "i128" }),)
+    } catch (error) {
+      console.error('Error:', error)
     }
-    const result = await vault(
-      vaultMethod!,
-      selectedVault?.address!,
-      args,
-      true,
-    )
   }
 
   const setAmount = (e: any) => {

From 1b0ca1f5070b3fa2e53e2b25b870908cca363b21 Mon Sep 17 00:00:00 2001
From: esteblock <estebaniglesiasmanriquez@gmail.com>
Date: Wed, 6 Nov 2024 17:43:51 -0300
Subject: [PATCH 28/39] fix
 calculate_optimal_amounts_and_shares_with_enforced_asset functions

---
 apps/contracts/vault/src/error.rs        |   3 +-
 apps/contracts/vault/src/lib.rs          |  30 ++++---
 apps/contracts/vault/src/test/deposit.rs |  28 ++++---
 apps/contracts/vault/src/utils.rs        | 101 +++++++++++------------
 4 files changed, 90 insertions(+), 72 deletions(-)

diff --git a/apps/contracts/vault/src/error.rs b/apps/contracts/vault/src/error.rs
index 3ca862cf..583d8592 100644
--- a/apps/contracts/vault/src/error.rs
+++ b/apps/contracts/vault/src/error.rs
@@ -19,7 +19,8 @@ pub enum ContractError {
     InsufficientManagedFunds = 114,
     MissingInstructionData = 115,
     UnsupportedAsset = 116,
-    AmountLessThanMinimum = 117,
+    InsufficientAmount = 117,
+    NoOptimalAmounts = 118, //this should not happen
 
     // Arithmetic Errors (12x)
     ArithmeticError = 120,
diff --git a/apps/contracts/vault/src/lib.rs b/apps/contracts/vault/src/lib.rs
index bc1e4cd4..15897207 100755
--- a/apps/contracts/vault/src/lib.rs
+++ b/apps/contracts/vault/src/lib.rs
@@ -217,8 +217,9 @@ impl VaultTrait for DeFindexVault {
         }
         // for amount min is not necesary to check if it is negative
 
+        let total_supply = VaultToken::total_supply(e.clone());
         let (amounts, shares_to_mint) = if assets_length == 1 {
-            let shares = if VaultToken::total_supply(e.clone()) == 0 {
+            let shares = if total_supply == 0 {
                 // If we have only one asset, and this is the first deposit, we will mint a share proportional to the amount desired
                 // TODO In this case we might also want to mint a MINIMUM LIQUIDITY to be locked forever in the contract
                 // this might be for security and practical reasons as well
@@ -238,20 +239,27 @@ impl VaultTrait for DeFindexVault {
             // TODO check that min amount is ok
             (amounts_desired, shares)
         } else {
-            // If Total Assets > 1
-            calculate_deposit_amounts_and_shares_to_mint(
-                &e,
-                &assets,
-                &amounts_desired,
-                &amounts_min,
-            )
+            if total_supply == 0 {
+                // for ths first supply, we will consider the amounts desired, and the shares to mint will just be the sum
+                // of the amounts desired
+                (amounts_desired.clone(), amounts_desired.iter().sum())
+            }
+            else {
+                // If Total Assets > 1
+                calculate_deposit_amounts_and_shares_to_mint(
+                    &e,
+                    &assets,
+                    &amounts_desired,
+                    &amounts_min,
+                )?
+            }
         };
 
         // for every asset
         for (i, amount) in amounts.iter().enumerate() {
-            // if amount is less than minimum, return error AmountLessThanMinimum
+            // if amount is less than minimum, return error InsufficientAmount
             if amount < amounts_min.get(i as u32).unwrap() {
-                panic_with_error!(&e, ContractError::AmountLessThanMinimum);
+                panic_with_error!(&e, ContractError::InsufficientAmount);
             }
             // its possible that some amounts are 0.
             if amount > 0 {
@@ -263,8 +271,10 @@ impl VaultTrait for DeFindexVault {
         }
 
         // now we mint the corresponding dfToken
+        // TODO. If total_sypply==0, mint minimum liquidity to be locked forever in the contract
         internal_mint(e.clone(), from.clone(), shares_to_mint);
 
+
         events::emit_deposit_event(&e, from, amounts.clone(), shares_to_mint.clone());
 
         Ok((amounts, shares_to_mint))
diff --git a/apps/contracts/vault/src/test/deposit.rs b/apps/contracts/vault/src/test/deposit.rs
index 8d24bbaa..2c1da7d8 100644
--- a/apps/contracts/vault/src/test/deposit.rs
+++ b/apps/contracts/vault/src/test/deposit.rs
@@ -414,7 +414,7 @@ fn deposit_one_asset_min_more_than_desired() {
         &users[0],
     );
     // this should fail
-    assert_eq!(result, Err(Ok(ContractError::AmountLessThanMinimum)));
+    assert_eq!(result, Err(Ok(ContractError::InsufficientAmount)));
     
 }
 
@@ -467,12 +467,15 @@ fn deposit_several_assets_success() {
     assert_eq!(df_balance, 0i128);
 
     // deposit
-    test.defindex_contract.deposit(
+    let deposit_result=test.defindex_contract.deposit(
         &sorobanvec![&test.env, amount0, amount1],
         &sorobanvec![&test.env, amount0, amount1],
         &users[0],
     );
 
+    // check deposit result
+    assert_eq!(deposit_result, (sorobanvec![&test.env, amount0, amount1], amount0 + amount1));
+
     // check balances after deposit
     let df_balance = test.defindex_contract.balance(&users[0]);
     assert_eq!(df_balance, amount0 + amount1);
@@ -529,18 +532,25 @@ fn deposit_several_assets_success() {
 
 
     // user 1 deposits
-    test.defindex_contract.deposit(
+    let deposit_result=test.defindex_contract.deposit(
         &sorobanvec![&test.env, amount0_new, amount1_new],
         &sorobanvec![&test.env, 0i128, 0i128],
         &users[1],
     );
 
-    // // check balances after deposit
-    // let df_balance = test.defindex_contract.balance(&users[1]);
-    // assert_eq!(df_balance, 2*(amount0 + amount1));
+    // check deposit result. Ok((amounts, shares_to_mint))
+    // Vec<i128>, i128
+
+    assert_eq!(deposit_result, (sorobanvec![&test.env, amount0*2, amount1*2], amount0*2 + amount1*2));
+
+
+    // check balances after deposit
+    let df_balance = test.defindex_contract.balance(&users[1]);
+    assert_eq!(df_balance, 2*(amount0 + amount1));
+
+    let user_balance0 = test.token0.balance(&users[1]);
+    assert_eq!(user_balance0, amount0_new - 2*amount0);
 
-    // let user_balance0 = test.token0.balance(&users[1]);
-    // assert_eq!(user_balance0, amount0_new - 2*amount0);
     let user_balance1 = test.token1.balance(&users[1]);
     assert_eq!(user_balance1, amount1_new - 2*amount1);
 
@@ -573,6 +583,4 @@ fn deposit_several_assets_success() {
     let current_invested_funds = test.defindex_contract.fetch_current_invested_funds();
     assert_eq!(current_invested_funds, expected_map);
 
-
-
 }
\ No newline at end of file
diff --git a/apps/contracts/vault/src/utils.rs b/apps/contracts/vault/src/utils.rs
index 0d93e27d..7ad00eb8 100644
--- a/apps/contracts/vault/src/utils.rs
+++ b/apps/contracts/vault/src/utils.rs
@@ -129,34 +129,39 @@ pub fn calculate_optimal_amounts_and_shares_with_enforced_asset(
     // we need the total amount managed by this vault in order for the deposit to be proportional
     // reserve (total manage funds) of the asset we are enforcing
     let reserve_target = total_managed_funds
-        .get(assets.get(*i).unwrap().address)
-        .unwrap(); // i128
+        .get(assets.get(*i).unwrap_or_else(|| panic_with_error!(&e, ContractError::WrongAmountsLength)).address)
+        .unwrap_or_else(|| panic_with_error!(&e, ContractError::WrongAmountsLength));
+
+    // If reserve target is zero, we cannot calculate the optimal amounts
     if reserve_target == 0 {
-        // return sum of amounts desired as shares
-        return (amounts_desired.clone(), amounts_desired.iter().sum()); // first shares will be equal to the first amounts_desired
-                                                                        // TODO, this amounts desired might be too little?
-                                                                        // this might be the first deposit... in this case, the ratio will be enforced by the first depositor
-                                                                        // TODO: might happen that the reserve_target is zero because everything is in one asset!?
-                                                                        // in this case we ned to check the ratio
-                                                                        // TODO VERY DANGEROUS.
+        panic_with_error!(&e, ContractError::InsufficientManagedFunds);
     }
-    let amount_desired_target = amounts_desired.get(*i).unwrap(); // i128
 
-    let mut optimal_amounts = Vec::new(e);
+    let amount_desired_target = amounts_desired.get(*i).unwrap_or_else(|| panic_with_error!(&e, ContractError::WrongAmountsLength));
 
-    for (j, (_asset_address, reserve)) in total_managed_funds.iter().enumerate() {
+    let mut optimal_amounts = Vec::new(e);
+    
+    for (j, asset) in assets.iter().enumerate() {
         if j == (*i as usize) {
             optimal_amounts.push_back(amount_desired_target);
         } else {
-            // amount = amount_desired_target * reserve[j] / reserve_target
-            // factor is (amount_desired_target  / reserve_target;)
-            let amount = reserve * amount_desired_target / reserve_target;
-            optimal_amounts.push_back(amount);
+            let reserve = total_managed_funds.get(asset.address).unwrap_or_else(|| panic_with_error!(&e, ContractError::WrongAmountsLength));
+            let amount = reserve.checked_mul(amount_desired_target)
+                .unwrap_or_else(|| panic_with_error!(&e, ContractError::ArithmeticError))
+                .checked_div(reserve_target)
+                .unwrap_or_else(|| panic_with_error!(&e, ContractError::ArithmeticError));
+            optimal_amounts.push_back(amount);  
         }
     }
+
     //TODO: calculate the shares to mint = total_supply * amount_desired_target  / reserve_target
     let shares_to_mint =
-        VaultToken::total_supply(e.clone()) * amount_desired_target / reserve_target;
+        VaultToken::total_supply(e.clone())
+        .checked_mul(amount_desired_target)
+        .unwrap_or_else(|| panic_with_error!(&e, ContractError::ArithmeticError))
+        .checked_div(reserve_target)
+        .unwrap_or_else(|| panic_with_error!(&e, ContractError::ArithmeticError));
+        
     (optimal_amounts, shares_to_mint)
 }
 /// Calculates the optimal amounts to deposit for a set of assets, along with the shares to mint.
@@ -189,55 +194,49 @@ pub fn calculate_deposit_amounts_and_shares_to_mint(
     assets: &Vec<AssetAllocation>,
     amounts_desired: &Vec<i128>,
     amounts_min: &Vec<i128>,
-) -> (Vec<i128>, i128) {
+) -> Result<(Vec<i128>, i128), ContractError> {
     // Retrieve the total managed funds for each asset as a Map<Address, i128>.
     let total_managed_funds = fetch_total_managed_funds(e);
 
-    // Iterate over each asset in the assets vector.
     for i in 0..assets.len() {
-        // Calculate the optimal amounts and the number of shares to mint for the given asset at index `i`.
-        let (optimal_amounts, shares_to_mint) =
-            calculate_optimal_amounts_and_shares_with_enforced_asset(
-                &e,
-                &total_managed_funds,
-                &assets,
-                &amounts_desired,
-                &i,
-            );
-
-        // Flag to skip the current asset if necessary.
+        // Calculate the optimal amounts and shares to mint for asset `i`.
+        let (optimal_amounts, shares_to_mint) = calculate_optimal_amounts_and_shares_with_enforced_asset(
+            &e,
+            &total_managed_funds,
+            &assets,
+            &amounts_desired,
+            &i,
+        );
+
         let mut should_skip = false;
 
-        // Check if the calculated optimal amounts meet the desired or minimum requirements.
         for j in i + 1..assets.len() {
-            // If the optimal amount for asset[j] is less than the desired amount,
-            // but at least greater than the minimum amount, it is acceptable.
-            if optimal_amounts.get(j).unwrap() <= amounts_desired.get(j).unwrap() {
-                // If the optimal amount is below the minimum, we cannot proceed with this asset.
-                if optimal_amounts.get(j).unwrap() < amounts_min.get(j).unwrap() {
-                    panic!("insufficient amount"); // TODO: Replace panic with an error return.
+            // Retrieve the desired and minimum amounts, returning an error if unavailable.
+            let desired_amount = amounts_desired.get(j).ok_or(ContractError::WrongAmountsLength)?;
+            let min_amount = amounts_min.get(j).ok_or(ContractError::WrongAmountsLength)?;
+            let optimal_amount = optimal_amounts.get(j).ok_or(ContractError::WrongAmountsLength)?;
+
+            // Check if optimal amount meets the desired or minimum requirements.
+            if optimal_amount <= desired_amount {
+                if optimal_amount < min_amount {
+                    return Err(ContractError::InsufficientAmount); // Insufficient amount error.
                 }
-            } else {
-                // If the optimal amount exceeds the desired amount, we skip the current asset {i}.
+            } else { // if not, we should try the next asset as enforced asset
                 should_skip = true;
-
-                // If we've reached the last asset and still don't find a solution, throw an error.
-                if j == assets.len() - 1 {
-                    panic!("didn't find optimal amounts"); // TODO: Replace panic with an error return.
+                // If we have already analized all assets as enforced (i), return an error.
+                if i == assets.len() - 1 {
+                    return Err(ContractError::NoOptimalAmounts); // probably enforcing 0? We should never reach this point
                 }
                 break;
             }
         }
 
-        // If we should skip this asset, continue to the next one.
-        if should_skip {
-            continue;
-        } else {
-            // Return the calculated optimal amounts and shares to mint.
-            return (optimal_amounts, shares_to_mint);
+        // If valid amounts found, return the results; otherwise, skip to the next asset.
+        if !should_skip {
+            return Ok((optimal_amounts, shares_to_mint));
         }
     }
 
-    // If no solution was found after iterating through all assets, throw an error.
-    panic!("didn't find optimal amounts");
+    // Return an error if no valid deposit configuration is found.
+    Err(ContractError::NoOptimalAmounts)
 }

From 4f5896fdb01f39bc899fe5ac23689177443b7d83 Mon Sep 17 00:00:00 2001
From: esteblock <estebaniglesiasmanriquez@gmail.com>
Date: Wed, 6 Nov 2024 17:55:23 -0300
Subject: [PATCH 29/39] test minimum and insufficient amount error

---
 apps/contracts/vault/src/test/deposit.rs | 115 +++++++++++++++++++++++
 1 file changed, 115 insertions(+)

diff --git a/apps/contracts/vault/src/test/deposit.rs b/apps/contracts/vault/src/test/deposit.rs
index 2c1da7d8..0da6e6a0 100644
--- a/apps/contracts/vault/src/test/deposit.rs
+++ b/apps/contracts/vault/src/test/deposit.rs
@@ -583,4 +583,119 @@ fn deposit_several_assets_success() {
     let current_invested_funds = test.defindex_contract.fetch_current_invested_funds();
     assert_eq!(current_invested_funds, expected_map);
 
+    // we will repeat one more time, now enforcing the first asset
+    let amount0_new =  amount0*2;
+    let amount1_new = amount1*2+100;
+
+    // mint this to user 1
+    test.token0_admin_client.mint(&users[1], &amount0_new);
+    test.token1_admin_client.mint(&users[1], &amount1_new);
+    
+    // check user balances
+    let user_balance0 = test.token0.balance(&users[1]);
+    assert_eq!(user_balance0, 100 + amount0_new); // we still have 100 from before
+    let user_balance1 = test.token1.balance(&users[1]);
+    assert_eq!(user_balance1, amount1_new);
+
+    // user 1 deposits
+    let deposit_result=test.defindex_contract.deposit(
+        &sorobanvec![&test.env, amount0_new, amount1_new],
+        &sorobanvec![&test.env, 0i128, 0i128],
+        &users[1],
+    );
+
+    // check deposit result. Ok((amounts, shares_to_mint))
+    // Vec<i128>, i128
+    assert_eq!(deposit_result, (sorobanvec![&test.env, amount0*2, amount1*2], amount0*2 + amount1*2));
+
+}
+
+// test deposit of several asset, imposing a minimum amount greater than optimal for asset 0
+#[test]
+fn deposit_several_assets_min_greater_than_optimal() {
+    let test = DeFindexVaultTest::setup();
+    test.env.mock_all_auths();
+    let strategy_params_token0 = create_strategy_params_token0(&test);
+    let strategy_params_token1 = create_strategy_params_token1(&test);
+
+    // initialize with 2 assets
+    let assets: Vec<AssetAllocation> = sorobanvec![
+        &test.env,
+        AssetAllocation {
+            address: test.token0.address.clone(),
+            strategies: strategy_params_token0.clone()
+        },
+        AssetAllocation {
+            address: test.token1.address.clone(),
+            strategies: strategy_params_token1.clone()
+        }
+    ];
+
+    test.defindex_contract.initialize(
+        &assets,
+        &test.manager,
+        &test.emergency_manager,
+        &test.vault_fee_receiver,
+        &2000u32,
+        &test.defindex_protocol_receiver,
+        &test.defindex_factory,
+        &String::from_str(&test.env, "dfToken"),
+        &String::from_str(&test.env, "DFT"),
+    );
+    let amount0 = 123456789i128;
+    let amount1 = 987654321i128;
+
+    let users = DeFindexVaultTest::generate_random_users(&test.env, 2);
+
+    // Balances before deposit
+    test.token0_admin_client.mint(&users[0], &amount0);
+    test.token1_admin_client.mint(&users[0], &amount1);
+    let user_balance0 = test.token0.balance(&users[0]);
+    assert_eq!(user_balance0, amount0);
+    let user_balance1 = test.token1.balance(&users[0]);
+    assert_eq!(user_balance1, amount1);
+
+    let df_balance = test.defindex_contract.balance(&users[0]);
+    assert_eq!(df_balance, 0i128);
+
+    // deposit
+    let deposit_result=test.defindex_contract.try_deposit(
+        &sorobanvec![&test.env, amount0, amount1],
+        &sorobanvec![&test.env, amount0 + 1, amount1],
+        &users[0],
+    );
+
+    // this should fail
+    assert_eq!(deposit_result, Err(Ok(ContractError::InsufficientAmount)));
+    
+    // now we manage to deposit
+    let deposit_result=test.defindex_contract.deposit(
+        &sorobanvec![&test.env, amount0, amount1],
+        &sorobanvec![&test.env, amount0, amount1],
+        &users[0],
+    );
+
+    // check deposit result
+    
+    // and now will try again with minimum more than optimal
+
+    // new user wants to do a deposit with more assets 0 than the proportion, but with minium amount 0
+    // multiply amount0 by 2
+    let amount0_new =  amount0*2 +100 ;
+    let amount1_new = amount1*2;
+
+    // mint this to user 
+    test.token0_admin_client.mint(&users[0], &amount0_new);
+    test.token1_admin_client.mint(&users[0], &amount1_new);
+
+    let deposit_result=test.defindex_contract.try_deposit(
+        &sorobanvec![&test.env, amount0_new, amount1_new],
+        &sorobanvec![&test.env, amount0*2+1, amount1*2],
+        &users[0],
+    );
+
+    // this should fail
+
+    assert_eq!(deposit_result, Err(Ok(ContractError::InsufficientAmount)));
+
 }
\ No newline at end of file

From 740dc1287ab70d4cfe59738ab72a2a6d956c97a4 Mon Sep 17 00:00:00 2001
From: Matias Poblete <86752543+MattPoblete@users.noreply.github.com>
Date: Wed, 6 Nov 2024 20:52:11 -0300
Subject: [PATCH 30/39] =?UTF-8?q?=E2=9C=A8Refactor=20DeployVault=20and=20A?=
 =?UTF-8?q?llVaults=20components=20for=20improved=20functionality=20and=20?=
 =?UTF-8?q?clarity?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/DeployVault/DeployVault.tsx  | 17 ++++++++---------
 .../src/components/ManageVaults/AllVaults.tsx   | 16 ++++++----------
 .../components/ManageVaults/ManageVaults.tsx    |  1 -
 apps/dapp/src/hooks/useVault.ts                 |  4 ++--
 4 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/apps/dapp/src/components/DeployVault/DeployVault.tsx b/apps/dapp/src/components/DeployVault/DeployVault.tsx
index 558f3b07..8d84f409 100644
--- a/apps/dapp/src/components/DeployVault/DeployVault.tsx
+++ b/apps/dapp/src/components/DeployVault/DeployVault.tsx
@@ -70,17 +70,16 @@ export const DeployVault = () => {
       </DialogBody>
       <DialogFooter>
         <DialogRoot open={openConfirm} onOpenChange={(e) => setOpenConfirm(e.open)}>
-          <DialogTrigger>
-            <Button
-              disabled={totalValues! > 100 || strategies.length == 0 || totalValues == 0 || vaultName == '' || vaultName.length < 4}
-              colorScheme="green"
-              size="lg"
-              mt={4}
-              w={['100%', null, 'auto']}
+          <Button
+            onClick={() => setOpenConfirm(true)}
+            disabled={totalValues! > 100 || strategies.length == 0 || totalValues == 0 || vaultName == '' || vaultName.length < 4}
+            colorScheme="green"
+            size="lg"
+            mt={4}
+            w={['100%', null, 'auto']}
             >
               Deploy Defindex
-            </Button>
-          </DialogTrigger>
+          </Button>
           <DialogContent>
             <DialogHeader>
               <DialogCloseTrigger />
diff --git a/apps/dapp/src/components/ManageVaults/AllVaults.tsx b/apps/dapp/src/components/ManageVaults/AllVaults.tsx
index 49b68b77..4e9c636f 100644
--- a/apps/dapp/src/components/ManageVaults/AllVaults.tsx
+++ b/apps/dapp/src/components/ManageVaults/AllVaults.tsx
@@ -71,17 +71,20 @@ export const AllVaults = ({
         vault(VaultMethod.GETEMERGENCYMANAGER, selectedVault, undefined, false).then((res: any) => scValToNative(res)),
         vault(VaultMethod.GETFEERECEIVER, selectedVault, undefined, false).then((res: any) => scValToNative(res)),
         vault(VaultMethod.GETNAME, selectedVault, undefined, false).then((res: any) => scValToNative(res)),
-        vault(VaultMethod.GETSTRATEGIES, selectedVault, undefined, false).then((res: any) => scValToNative(res)),
+        vault(VaultMethod.GETASSETS, selectedVault, undefined, false).then((res: any) => scValToNative(res)),
         vault(VaultMethod.GETTOTALVALUES, selectedVault, undefined, false).then((res: any) => scValToNative(res)),
       ]);
+      const TVValues = Object.values(totalValues)
+      const totalValuesArray = TVValues.map((value: any) => Number(value))
+      const accTotalValues = totalValuesArray.reduce((a: number, b: number) => a + b, 0)
       const newData: VaultData = {
         name: name || '',
         address: selectedVault,
         manager: manager,
         emergencyManager: emergencyManager,
         feeReceiver: feeReceiver,
-        strategies: strategies || [],
-        totalValues: totalValues || 0,
+        strategies: strategies[0].strategies || [],
+        totalValues: accTotalValues || 0,
       }
       return newData
     } catch (e: any) {
@@ -183,7 +186,6 @@ export const AllVaults = ({
                       <Tooltip content={'Deposit'}>
                         <IconButton
                           mx={1}
-                          colorScheme='blue'
                           aria-label='deposit'
                           size='sm'
                           onClick={() => handleOpenDeposit(VaultMethod.DEPOSIT, vault)}
@@ -194,10 +196,8 @@ export const AllVaults = ({
                       <Tooltip content={'Withdraw'}>
                         <IconButton
                           mx={1}
-                          colorScheme='orange'
                           aria-label='withdraw'
                           size='sm'
-
                           onClick={() => handleOpenDeposit(VaultMethod.WITHDRAW, vault)}
                         >
                           <PiHandWithdrawLight />
@@ -244,7 +244,6 @@ export const AllVaults = ({
                 <Stack direction="row" mt={2}>
                   <Tooltip content={'Deposit'}>
                     <IconButton
-                      colorScheme='blue'
                       aria-label={VaultMethod.DEPOSIT}
                       size='sm'
                       onClick={() => handleOpenDeposit(VaultMethod.DEPOSIT, vault)}
@@ -254,7 +253,6 @@ export const AllVaults = ({
                   </Tooltip>
                   <Tooltip content={'Withdraw'}>
                     <IconButton
-                      colorScheme='orange'
                       aria-label={VaultMethod.WITHDRAW}
                       size='sm'
                       onClick={() => handleOpenDeposit(VaultMethod.WITHDRAW, vault)}
@@ -265,7 +263,6 @@ export const AllVaults = ({
                   {(address == vault.manager) &&
                     <Tooltip content={'Rebalance'}>
                       <IconButton
-                        colorScheme='teal'
                         aria-label='rebalance'
                         size='sm'
                         onClick={() => handleOpenDeployVault('edit_vault', true, vault)}
@@ -276,7 +273,6 @@ export const AllVaults = ({
                   {(address == vault.emergencyManager || address == vault.manager) &&
                     <Tooltip content={'Emergency withdraw'}>
                       <IconButton
-                        colorScheme='yellow'
                         aria-label={VaultMethod.EMERGENCY_WITHDRAW}
                         size='sm'
                         onClick={() => handleOpenDeposit(VaultMethod.EMERGENCY_WITHDRAW, vault)}
diff --git a/apps/dapp/src/components/ManageVaults/ManageVaults.tsx b/apps/dapp/src/components/ManageVaults/ManageVaults.tsx
index 13d27620..d406b036 100644
--- a/apps/dapp/src/components/ManageVaults/ManageVaults.tsx
+++ b/apps/dapp/src/components/ManageVaults/ManageVaults.tsx
@@ -51,7 +51,6 @@ export const ManageVaults = () => {
         const selectedVault = vaults.find(vault => vault.address === args.address)
         if (!selectedVault) return;
         for (const item of selectedVault.strategies) {
-          console.log(item)
           const newStrategy: Strategy = { ...item, share: selectedVault.strategies.length > 1 ? 100 / selectedVault.strategies.length : 100 };
           await dispatch(pushStrategy(newStrategy))
         }
diff --git a/apps/dapp/src/hooks/useVault.ts b/apps/dapp/src/hooks/useVault.ts
index 37d76f95..4490a9d4 100644
--- a/apps/dapp/src/hooks/useVault.ts
+++ b/apps/dapp/src/hooks/useVault.ts
@@ -13,8 +13,8 @@ export enum VaultMethod {
     GETFEERECEIVER = "get_fee_receiver",
     EMERGENCY_WITHDRAW = "emergency_withdraw",
     GETNAME= "name",
-    GETTOTALVALUES = "current_invested_funds",
-    GETSTRATEGIES = "get_strategies",
+    GETTOTALVALUES = "fetch_current_invested_funds",
+    GETASSETS = "get_assets",
 }   
 
 const isObject = (val: unknown) => typeof val === 'object' && val !== null && !Array.isArray(val);

From 9fa063fc2b31408745cafcb9f035dcbf0902c9cb Mon Sep 17 00:00:00 2001
From: Matias Poblete <86752543+MattPoblete@users.noreply.github.com>
Date: Wed, 6 Nov 2024 21:40:00 -0300
Subject: [PATCH 31/39] =?UTF-8?q?=E2=9C=A8Enhance=20VaultPreview=20compone?=
 =?UTF-8?q?nt=20with=20custom=20accordion=20triggers=20and=20input=20field?=
 =?UTF-8?q?s=20for=20better=20user=20interaction?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/DeployVault/VaultPreview.tsx   | 226 ++++++++++--------
 1 file changed, 125 insertions(+), 101 deletions(-)

diff --git a/apps/dapp/src/components/DeployVault/VaultPreview.tsx b/apps/dapp/src/components/DeployVault/VaultPreview.tsx
index 8b0ce9c6..d93a71e5 100644
--- a/apps/dapp/src/components/DeployVault/VaultPreview.tsx
+++ b/apps/dapp/src/components/DeployVault/VaultPreview.tsx
@@ -9,6 +9,7 @@ import {
   IconButton,
   Fieldset,
   Stack,
+  Icon,
 } from '@chakra-ui/react'
 import { shortenAddress } from '@/helpers/shortenAddress'
 
@@ -26,6 +27,7 @@ import {
   AccordionItemTrigger,
   AccordionRoot,
 } from "@chakra-ui/react"
+import { IoIosArrowDown, IoIosArrowUp } from 'react-icons/io'
 
 enum AccordionItems {
   STRATEGY_DETAILS = 'strategy-details',
@@ -47,6 +49,80 @@ interface FormControlInterface {
   },
   vaultShare: number
 }
+const CustomAccordionTrigger = ({ title, type, accordionValue, setAccordionValue }: { title: string, type: AccordionItems, accordionValue: AccordionItems[], setAccordionValue: React.Dispatch<React.SetStateAction<AccordionItems[]>> }) => {
+  return (
+    <AccordionItemTrigger onClick={() => {
+      if (accordionValue[0] === type) {
+        setAccordionValue([])
+      }
+    }}>
+      <Grid templateColumns={'repeat(12, 1fr)'} width={'100%'}>
+        <GridItem colSpan={6} colStart={1}>
+          <Text fontSize='lg' textAlign={'left'} fontWeight='bold' mb={2}>
+            {title} settings
+          </Text>
+        </GridItem>
+        <GridItem colSpan={1} colStart={12}>
+          <Text fontSize='lg' fontWeight='bold' mb={2}>
+            {accordionValue[0] === type ?
+              <Icon>
+                <IoIosArrowUp />
+              </Icon>
+              :
+              <Icon>
+                <IoIosArrowDown />
+              </Icon>
+            }
+          </Text>
+        </GridItem>
+      </Grid>
+    </AccordionItemTrigger>
+  )
+}
+
+const CustomInputField = ({
+  label,
+  value,
+  onChange,
+  handleClick,
+  placeholder,
+  invalid
+}: {
+  label: string,
+  value: string,
+  onChange: (e: any) => void,
+  handleClick: (address: string) => void,
+  placeholder: string,
+  invalid: boolean
+}) => {
+  const { address } = useSorobanReact()
+  if (!address) return null
+  return (
+    <Fieldset.Root invalid={invalid}>
+      <Fieldset.Legend>{label}</Fieldset.Legend>
+      <Stack>
+        <InputGroup endElement={
+          <Tooltip content='Use connected wallet'>
+            <IconButton
+              aria-label='Connected address'
+              size={'sm'}
+              onClick={() => handleClick(address)}
+            >
+              <FaRegPaste />
+            </IconButton>
+          </Tooltip>
+        }>
+          <Input
+            value={value}
+            onChange={onChange}
+            placeholder={placeholder}
+          />
+        </InputGroup>
+      </Stack>
+      <Fieldset.ErrorText>A valid Stellar / Soroban address is required.</Fieldset.ErrorText>
+    </Fieldset.Root>
+  )
+}
 export const VaultPreview = ({ data }: { data: ChartData[] }) => {
 
   const dispatch = useAppDispatch()
@@ -175,30 +251,28 @@ export const VaultPreview = ({ data }: { data: ChartData[] }) => {
       </Box>
       <AccordionRoot value={accordionValue} onValueChange={(e: any) => setAccordionValue(e.value)}>
         <AccordionItem value={AccordionItems.STRATEGY_DETAILS}>
-          <AccordionItemTrigger>
-            <Text fontSize='lg' fontWeight='bold' mb={2}>
-              Strategies
-            </Text>
-          </AccordionItemTrigger>
+          <CustomAccordionTrigger
+            setAccordionValue={setAccordionValue}
+            title='Strategies'
+            type={AccordionItems.STRATEGY_DETAILS}
+            accordionValue={accordionValue} />
           <AccordionItemContent>
-            <Table.Root>
+            <Table.Root size={'lg'} w={'full'}>
               <Table.Header>
-                <Table.Row>
+                <Table.Row >
                   <Table.Cell>Name</Table.Cell>
-                  <Table.Cell>Address</Table.Cell>
-                  <Table.Cell >Percentage</Table.Cell>
+                  <Table.Cell textAlign={'center'}>Address</Table.Cell>
+                  <Table.Cell textAlign={'center'} >Percentage</Table.Cell>
                 </Table.Row>
               </Table.Header>
               <Table.Body>
                 {data.map((strategy: ChartData, index: number) => (
                   <Table.Row key={index}>
                     <Table.Cell>{strategy.label}</Table.Cell>
-                    <Tooltip content={strategy.address}>
-                      <Table.Cell w={1}>
-                        {strategy.address ? shortenAddress(strategy.address) : '-'}
-                      </Table.Cell>
-                    </Tooltip>
-                    <Table.Cell>{strategy.value}%</Table.Cell>
+                    <Table.Cell textAlign={'center'}>
+                      {strategy.address ? shortenAddress(strategy.address) : '-'}
+                    </Table.Cell>
+                    <Table.Cell textAlign={'center'}>{strategy.value}%</Table.Cell>
                   </Table.Row>
                 ))}
               </Table.Body>
@@ -206,96 +280,46 @@ export const VaultPreview = ({ data }: { data: ChartData[] }) => {
           </AccordionItemContent>
         </AccordionItem>
         <AccordionItem value={AccordionItems.MANAGER_CONFIGS}>
-          <AccordionItemTrigger>
-            <Text fontSize='lg' fontWeight='bold' mb={2}>
-              Manager settings
-            </Text>
-          </AccordionItemTrigger>
+          <CustomAccordionTrigger
+            setAccordionValue={setAccordionValue}
+            title='Manager'
+            type={AccordionItems.MANAGER_CONFIGS}
+            accordionValue={accordionValue}
+          />
           <AccordionItemContent>
-          <Fieldset.Root
-            invalid={formControl.manager.isValid === false}
-          >
-            <Fieldset.Legend>Manager</Fieldset.Legend>
-              <Stack mb={6}>
-              <InputGroup endElement={
-                  <Tooltip content='Use connected wallet'>
-                  <IconButton
-                    aria-label='Connected address'
-                    size={'sm'}
-                    onClick={() => handleManagerChange(address!)}
-                    >
-                    <FaRegPaste />
-                    </IconButton>
-                </Tooltip>
-              }>
-                <Input
-                  onChange={(event) => handleManagerChange(event?.target.value)}
-                  value={formControl.manager.value}
-                  placeholder='GAFS3TLVM...'
-                />
-              </InputGroup>
-            </Stack>
-            <Fieldset.ErrorText>A valid Stellar / Soroban address is required.</Fieldset.ErrorText>
-            </Fieldset.Root>
-          <Fieldset.Root
-            invalid={formControl.emergencyManager.isValid === false}
-          >
-            <Fieldset.Legend>Emergency manager</Fieldset.Legend>
-              <Stack mb={6}>
-              <InputGroup endElement={
-                <Tooltip content='Use connected wallet'>
-                  <IconButton
-                    aria-label='Connected address'
-                    size={'sm'}
-                    onClick={() => handleEmergencyManagerChange(address!)}
-                  >
-                    <FaRegPaste />
-                  </IconButton>
-                </Tooltip>
-              }>
-                <Input
-                  onChange={(event) => handleEmergencyManagerChange(event?.target.value)}
-                  value={formControl.emergencyManager.value}
-                  placeholder='GAFS3TLVM...'
-                />
-              </InputGroup>
-            </Stack>
-            <Fieldset.ErrorText>A valid Stellar / Soroban address is required.</Fieldset.ErrorText>
-          </Fieldset.Root>
+            <CustomInputField
+              label='Manager'
+              value={formControl.manager.value || ''}
+              onChange={(e) => handleManagerChange(e.target.value)}
+              handleClick={(address: string) => handleManagerChange(address)}
+              placeholder='GAFS3TLVM...'
+              invalid={formControl.manager.isValid === false}
+            />
+            <CustomInputField
+              label='Emergency manager'
+              value={formControl.emergencyManager.value || ''}
+              onChange={(e) => handleEmergencyManagerChange(e.target.value)}
+              handleClick={(address: string) => handleEmergencyManagerChange(address)}
+              placeholder='GAFS3TLVM...'
+              invalid={formControl.emergencyManager.isValid === false}
+            />
           </AccordionItemContent>
         </AccordionItem>
         <AccordionItem value={AccordionItems.FEES_CONFIGS}>
-          <AccordionItemTrigger>
-            <Text fontSize='lg' fontWeight='bold' mb={2}>
-              Fees settings
-            </Text>
-          </AccordionItemTrigger>
+          <CustomAccordionTrigger
+            setAccordionValue={setAccordionValue}
+            title='Fees'
+            type={AccordionItems.FEES_CONFIGS}
+            accordionValue={accordionValue} />
           <AccordionItemContent>
-          <Fieldset.Root
-            invalid={formControl.feeReceiver.isValid === false}
-          >
-            <Fieldset.Legend>Fee reciever</Fieldset.Legend>
-            <Stack>
-              <InputGroup endElement={
-                <Tooltip content='Use connected wallet'>
-                  <IconButton
-                    aria-label='Connected address'
-                    size={'sm'}
-                    onClick={() => handleFeeReceiverChange(address!)}
-                  >
-                    <FaRegPaste />
-                  </IconButton>
-                </Tooltip>
-              }>
-                <Input
-                  onChange={(event) => handleFeeReceiverChange(event?.target.value)}
-                  value={formControl.feeReceiver.value}
-                  placeholder='GAFS3TLVM...'
-                />
-              </InputGroup>
-            </Stack>
-            <Fieldset.ErrorText>A valid Stellar / Soroban address is required.</Fieldset.ErrorText>
-          </Fieldset.Root>
+            <CustomInputField
+              label='Fee receiver'
+              value={formControl.feeReceiver.value || ''}
+              onChange={(e) => handleFeeReceiverChange(e.target.value)}
+              handleClick={(address: string) => handleFeeReceiverChange(address)}
+              placeholder='GAFS3TLVM...'
+              invalid={formControl.feeReceiver.isValid === false}
+            />
             <InputGroup
               endElement={'%'}
             >
@@ -309,4 +333,4 @@ export const VaultPreview = ({ data }: { data: ChartData[] }) => {
       </AccordionRoot >
     </>
   )
-}
+}
\ No newline at end of file

From f82138ef4bb3bfd57ef42b3ac7b790e1d1646a50 Mon Sep 17 00:00:00 2001
From: chopan123 <chopancatrileo@gmail.com>
Date: Thu, 7 Nov 2024 09:09:45 -0300
Subject: [PATCH 32/39] updated factory

---
 public/testnet.contracts.json | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/public/testnet.contracts.json b/public/testnet.contracts.json
index 3ab38679..2e72700a 100644
--- a/public/testnet.contracts.json
+++ b/public/testnet.contracts.json
@@ -1,13 +1,11 @@
 {
   "ids": {
-    "defindex_factory": "CCBQ4WFNNWZWV7GCLUTRAQZXX34WSYNSCXMY4WEKV7BXRTYMM53JMGIS",
-    "hodl_strategy": "CDIBYFBYBV3D3DQNSUDMVQNWYCQPYKSOLKSEOF3WEQOIXB56K54Q4G6W",
-    "blend_strategy": "CDABYFBYBV3D3DQNSUDMVQNWYCQPYKSOLKSEOF3WEQOIXB56K54Q4G6W"
+    "defindex_factory": "CBBV4GTOEZD3HALMAKMFBUSFQZV6HFW6QTVKBF6EV3H4OPJO6NQEKCRL",
+    "hodl_strategy": "CDIBYFBYBV3D3DQNSUDMVQNWYCQPYKSOLKSEOF3WEQOIXB56K54Q4G6W"
   },
   "hashes": {
-    "defindex_vault": "6ac83e448a7a68b4e27fc9dd3c2d3e8cb423d88e2646137b7b32238e9df95980",
-    "defindex_factory": "552b67db3c57921fada99cfee520f18a649855a376c22e8cb5ee20b52632d497",
-    "hodl_strategy": "8b5f64742f6726b587b93d250653b13094e52adcb57bc6e7926c98d2b9cecd2e",
-    "blend_strategy": "8b5g64742f6726b587b93d250653b13094e52adcb57bc6e7926c98d2b9cecd2e"
+    "defindex_vault": "f4a339d8749fda772ac9fa7757e59ffee443dd240e7ee9581ef60ccbf148c0da",
+    "defindex_factory": "39111229dc8da070cc32f39c624152aa674e8b94c4a03f402e355293346417b8",
+    "hodl_strategy": "8b5f64742f6726b587b93d250653b13094e52adcb57bc6e7926c98d2b9cecd2e"
   }
 }
\ No newline at end of file

From 7f5cc7098c732ae7540dafd9dee986d4a64b2aaf Mon Sep 17 00:00:00 2001
From: coderipper <hello@joaquinsoza.dev>
Date: Thu, 7 Nov 2024 16:48:52 -0300
Subject: [PATCH 33/39] temp calculate_fees

---
 apps/contracts/vault/src/fee.rs | 36 +++++++++++++++++++--------------
 1 file changed, 21 insertions(+), 15 deletions(-)

diff --git a/apps/contracts/vault/src/fee.rs b/apps/contracts/vault/src/fee.rs
index 3a472e71..dc0c7112 100644
--- a/apps/contracts/vault/src/fee.rs
+++ b/apps/contracts/vault/src/fee.rs
@@ -9,7 +9,7 @@ use crate::{
         get_defindex_protocol_fee_receiver, get_factory, get_last_fee_assesment, get_vault_fee,
         set_last_fee_assesment,
     },
-    token::internal_mint,
+    token::{internal_mint, VaultToken},
     utils::calculate_dftokens_from_asset_amounts,
     ContractError,
 };
@@ -28,27 +28,33 @@ fn fetch_defindex_fee(e: &Env) -> u32 {
 
 /// Calculates the required fees in dfTokens based on the current APR fee rate.
 fn calculate_fees(e: &Env, time_elapsed: u64, fee_rate: u32) -> Result<i128, ContractError> {
-    let total_managed_funds = fetch_total_managed_funds(e); // Get total managed funds per asset
+    let total_supply = VaultToken::total_supply(e.clone());
 
-    let seconds_per_year = SECONDS_PER_YEAR; // 365 days in seconds
+    // (fee_rate as i128 * total_supply * time_elapsed) / ((SECONDS_PER_YEAR * MAX_BPS) - (fee_rate as i128 * time_elapsed));
+    let fees = (fee_rate as i128).checked_mul(total_supply).unwrap().checked_mul(time_elapsed as i128).unwrap().checked_div((SECONDS_PER_YEAR.checked_mul(MAX_BPS).unwrap().checked_sub((fee_rate as i128).checked_mul(time_elapsed as i128).unwrap()).unwrap())).unwrap();
+    
+    Ok(fees)
+    // let total_managed_funds = fetch_total_managed_funds(e); // Get total managed funds per asset
 
-    let mut total_fees_per_asset: Map<Address, i128> = Map::new(&e);
+    // let seconds_per_year = SECONDS_PER_YEAR; // 365 days in seconds
 
-    // Iterate over each asset in the vault
-    for (asset_address, amount) in total_managed_funds.iter() {
-        // Fetch current managed funds for each asset
-        let current_asset_value = amount;
+    // let mut total_fees_per_asset: Map<Address, i128> = Map::new(&e);
 
-        // Calculate the fee for this asset based on the fee rate and time elapsed
-        let asset_fee = (current_asset_value * fee_rate as i128 * time_elapsed as i128)
-            / (seconds_per_year * MAX_BPS);
+    // // Iterate over each asset in the vault
+    // for (asset_address, amount) in total_managed_funds.iter() {
+    //     // Fetch current managed funds for each asset
+    //     let current_asset_value = amount;
 
-        total_fees_per_asset.set(asset_address.clone(), asset_fee);
-    }
+    //     // Calculate the fee for this asset based on the fee rate and time elapsed
+    //     let asset_fee = (current_asset_value * fee_rate as i128 * time_elapsed as i128)
+    //         / (seconds_per_year * MAX_BPS);
+
+    //     total_fees_per_asset.set(asset_address.clone(), asset_fee);
+    // }
 
-    let total_fees_in_dftokens = calculate_dftokens_from_asset_amounts(e, total_fees_per_asset, total_managed_funds)?;
+    // let total_fees_in_dftokens = calculate_dftokens_from_asset_amounts(e, total_fees_per_asset, total_managed_funds)?;
 
-    Ok(total_fees_in_dftokens)
+    // Ok(total_fees_in_dftokens)
 }
 
 /// Collects and mints fees in dfTokens, distributing them to the appropriate fee receivers.

From fcd6386470733aa8bec7be48c339781ee9a942ca Mon Sep 17 00:00:00 2001
From: coderipper <hello@joaquinsoza.dev>
Date: Thu, 7 Nov 2024 18:26:42 -0300
Subject: [PATCH 34/39] cleaned fees

---
 apps/contracts/vault/src/fee.rs | 39 +++++++++++----------------------
 1 file changed, 13 insertions(+), 26 deletions(-)

diff --git a/apps/contracts/vault/src/fee.rs b/apps/contracts/vault/src/fee.rs
index dc0c7112..5a5169e4 100644
--- a/apps/contracts/vault/src/fee.rs
+++ b/apps/contracts/vault/src/fee.rs
@@ -1,16 +1,14 @@
-use soroban_sdk::{Address, Env, Map, Symbol, Vec};
+use soroban_sdk::{Env, Symbol, Vec};
 
 use crate::{
     access::AccessControl,
     constants::{MAX_BPS, SECONDS_PER_YEAR},
     events,
-    funds::fetch_total_managed_funds,
     storage::{
         get_defindex_protocol_fee_receiver, get_factory, get_last_fee_assesment, get_vault_fee,
         set_last_fee_assesment,
     },
     token::{internal_mint, VaultToken},
-    utils::calculate_dftokens_from_asset_amounts,
     ContractError,
 };
 
@@ -30,31 +28,20 @@ fn fetch_defindex_fee(e: &Env) -> u32 {
 fn calculate_fees(e: &Env, time_elapsed: u64, fee_rate: u32) -> Result<i128, ContractError> {
     let total_supply = VaultToken::total_supply(e.clone());
 
-    // (fee_rate as i128 * total_supply * time_elapsed) / ((SECONDS_PER_YEAR * MAX_BPS) - (fee_rate as i128 * time_elapsed));
-    let fees = (fee_rate as i128).checked_mul(total_supply).unwrap().checked_mul(time_elapsed as i128).unwrap().checked_div((SECONDS_PER_YEAR.checked_mul(MAX_BPS).unwrap().checked_sub((fee_rate as i128).checked_mul(time_elapsed as i128).unwrap()).unwrap())).unwrap();
+    // fee_rate as i128 * total_supply * time_elapsed / SECONDS_PER_YEAR * MAX_BPS - fee_rate as i128 * time_elapsed;
+    let numerator = (fee_rate as i128)
+        .checked_mul(total_supply)
+        .unwrap()
+        .checked_mul(time_elapsed as i128)
+        .unwrap();
+    let denominator = SECONDS_PER_YEAR
+        .checked_mul(MAX_BPS)
+        .unwrap()
+        .checked_sub((fee_rate as i128).checked_mul(time_elapsed as i128).unwrap())
+        .unwrap();
+    let fees = numerator.checked_div(denominator).unwrap();
     
     Ok(fees)
-    // let total_managed_funds = fetch_total_managed_funds(e); // Get total managed funds per asset
-
-    // let seconds_per_year = SECONDS_PER_YEAR; // 365 days in seconds
-
-    // let mut total_fees_per_asset: Map<Address, i128> = Map::new(&e);
-
-    // // Iterate over each asset in the vault
-    // for (asset_address, amount) in total_managed_funds.iter() {
-    //     // Fetch current managed funds for each asset
-    //     let current_asset_value = amount;
-
-    //     // Calculate the fee for this asset based on the fee rate and time elapsed
-    //     let asset_fee = (current_asset_value * fee_rate as i128 * time_elapsed as i128)
-    //         / (seconds_per_year * MAX_BPS);
-
-    //     total_fees_per_asset.set(asset_address.clone(), asset_fee);
-    // }
-
-    // let total_fees_in_dftokens = calculate_dftokens_from_asset_amounts(e, total_fees_per_asset, total_managed_funds)?;
-
-    // Ok(total_fees_in_dftokens)
 }
 
 /// Collects and mints fees in dfTokens, distributing them to the appropriate fee receivers.

From 7964b9f5b6aca2f2d9d40805bbf2564b4df45662 Mon Sep 17 00:00:00 2001
From: esteblock <estebaniglesiasmanriquez@gmail.com>
Date: Fri, 8 Nov 2024 09:55:07 -0300
Subject: [PATCH 35/39] write better comment

---
 apps/contracts/vault/src/lib.rs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/apps/contracts/vault/src/lib.rs b/apps/contracts/vault/src/lib.rs
index 15897207..84123e59 100755
--- a/apps/contracts/vault/src/lib.rs
+++ b/apps/contracts/vault/src/lib.rs
@@ -180,7 +180,7 @@ impl VaultTrait for DeFindexVault {
     /// 2. **Validation**: Checks that the lengths of `amounts_desired` and `amounts_min` match the vault's assets.
     /// 3. **Share Calculation**: Calculates `shares_to_mint` based on the vault's total managed funds and the deposit amount.
     /// 4. **Asset Transfer**: Transfers each specified amount from the user’s address to the vault as idle funds.
-    /// 5. **dfToken Minting**: Mints new dfTokens for the user to represent their ownership in the vault.
+    /// 5. **Vault shares Minting**: Mints vault shares for the user to represent their ownership in the vault.
     ///
     /// # Notes
     /// - For the first deposit, if the vault has only one asset, shares are calculated directly based on the deposit amount.
@@ -274,7 +274,6 @@ impl VaultTrait for DeFindexVault {
         // TODO. If total_sypply==0, mint minimum liquidity to be locked forever in the contract
         internal_mint(e.clone(), from.clone(), shares_to_mint);
 
-
         events::emit_deposit_event(&e, from, amounts.clone(), shares_to_mint.clone());
 
         Ok((amounts, shares_to_mint))

From b14981ca13b1a0e1bbe893d91f7479e449c7a17c Mon Sep 17 00:00:00 2001
From: coderipper <hello@joaquinsoza.dev>
Date: Fri, 8 Nov 2024 11:16:01 -0300
Subject: [PATCH 36/39] hodl to fixapr

---
 apps/contracts/Cargo.lock                     |   8 +
 .../contracts/strategies/fixed_apr/Cargo.toml |  18 +++
 apps/contracts/strategies/fixed_apr/Makefile  |  17 +++
 .../strategies/fixed_apr/src/balance.rs       |  43 ++++++
 .../contracts/strategies/fixed_apr/src/lib.rs | 140 ++++++++++++++++++
 .../strategies/fixed_apr/src/storage.rs       |  37 +++++
 .../strategies/fixed_apr/src/test.rs          |  63 ++++++++
 .../strategies/fixed_apr/src/test/deposit.rs  |  79 ++++++++++
 .../strategies/fixed_apr/src/test/events.rs   |   6 +
 .../fixed_apr/src/test/initialize.rs          |  21 +++
 .../strategies/fixed_apr/src/test/withdraw.rs |   5 +
 11 files changed, 437 insertions(+)
 create mode 100644 apps/contracts/strategies/fixed_apr/Cargo.toml
 create mode 100644 apps/contracts/strategies/fixed_apr/Makefile
 create mode 100644 apps/contracts/strategies/fixed_apr/src/balance.rs
 create mode 100644 apps/contracts/strategies/fixed_apr/src/lib.rs
 create mode 100644 apps/contracts/strategies/fixed_apr/src/storage.rs
 create mode 100644 apps/contracts/strategies/fixed_apr/src/test.rs
 create mode 100644 apps/contracts/strategies/fixed_apr/src/test/deposit.rs
 create mode 100644 apps/contracts/strategies/fixed_apr/src/test/events.rs
 create mode 100644 apps/contracts/strategies/fixed_apr/src/test/initialize.rs
 create mode 100644 apps/contracts/strategies/fixed_apr/src/test/withdraw.rs

diff --git a/apps/contracts/Cargo.lock b/apps/contracts/Cargo.lock
index 889ab1d3..c4c169b0 100644
--- a/apps/contracts/Cargo.lock
+++ b/apps/contracts/Cargo.lock
@@ -439,6 +439,14 @@ version = "0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d"
 
+[[package]]
+name = "fixed_apr_strategy"
+version = "1.0.0"
+dependencies = [
+ "defindex-strategy-core",
+ "soroban-sdk",
+]
+
 [[package]]
 name = "fnv"
 version = "1.0.7"
diff --git a/apps/contracts/strategies/fixed_apr/Cargo.toml b/apps/contracts/strategies/fixed_apr/Cargo.toml
new file mode 100644
index 00000000..add447c2
--- /dev/null
+++ b/apps/contracts/strategies/fixed_apr/Cargo.toml
@@ -0,0 +1,18 @@
+[package]
+name = "fixed_apr_strategy"
+version = { workspace = true }
+authors = ["coderipper <joaquin@paltalabs.io>"]
+license = { workspace = true }
+edition = { workspace = true }
+publish = false
+repository = { workspace = true }
+
+[lib]
+crate-type = ["cdylib"]
+ 
+[dependencies] 
+soroban-sdk = { workspace = true }
+defindex-strategy-core = { workspace = true }
+
+[dev-dependencies]
+soroban-sdk = { workspace = true, features = ["testutils"] }
diff --git a/apps/contracts/strategies/fixed_apr/Makefile b/apps/contracts/strategies/fixed_apr/Makefile
new file mode 100644
index 00000000..480ff124
--- /dev/null
+++ b/apps/contracts/strategies/fixed_apr/Makefile
@@ -0,0 +1,17 @@
+default: build
+
+all: test
+
+test: build
+	cargo test
+
+build:
+	cargo build --target wasm32-unknown-unknown --release
+	soroban contract optimize --wasm ../../target/wasm32-unknown-unknown/release/fixed_apr_strategy.wasm
+	@rm ../../target/wasm32-unknown-unknown/release/fixed_apr_strategy.wasm
+
+fmt:
+	cargo fmt --all --check
+
+clean:
+	cargo clean
\ No newline at end of file
diff --git a/apps/contracts/strategies/fixed_apr/src/balance.rs b/apps/contracts/strategies/fixed_apr/src/balance.rs
new file mode 100644
index 00000000..1f5751be
--- /dev/null
+++ b/apps/contracts/strategies/fixed_apr/src/balance.rs
@@ -0,0 +1,43 @@
+use soroban_sdk::{Address, Env};
+
+use crate::storage::{DataKey, INSTANCE_BUMP_AMOUNT, INSTANCE_LIFETIME_THRESHOLD};
+use crate::StrategyError;
+
+pub fn read_balance(e: &Env, addr: Address) -> i128 {
+    let key = DataKey::Balance(addr);
+    if let Some(balance) = e.storage().persistent().get::<DataKey, i128>(&key) {
+        e.storage()
+            .persistent()
+            .extend_ttl(&key, INSTANCE_LIFETIME_THRESHOLD, INSTANCE_BUMP_AMOUNT);
+        balance
+    } else {
+        0
+    }
+}
+
+fn write_balance(e: &Env, addr: Address, amount: i128) {
+    let key = DataKey::Balance(addr);
+    e.storage().persistent().set(&key, &amount);
+    e.storage()
+        .persistent()
+        .extend_ttl(&key, INSTANCE_LIFETIME_THRESHOLD, INSTANCE_BUMP_AMOUNT);
+}
+
+pub fn receive_balance(e: &Env, addr: Address, amount: i128) {
+    let balance = read_balance(e, addr.clone());
+
+    let new_balance = balance.checked_add(amount)
+        .expect("Integer overflow occurred while adding balance.");
+
+    write_balance(e, addr, new_balance);
+}
+
+pub fn spend_balance(e: &Env, addr: Address, amount: i128) -> Result<(), StrategyError> {
+    
+    let balance = read_balance(e, addr.clone());
+    if balance < amount {
+        return Err(StrategyError::InsufficientBalance);
+    }
+    write_balance(e, addr, balance - amount);
+    Ok(())
+}
diff --git a/apps/contracts/strategies/fixed_apr/src/lib.rs b/apps/contracts/strategies/fixed_apr/src/lib.rs
new file mode 100644
index 00000000..d0ba1719
--- /dev/null
+++ b/apps/contracts/strategies/fixed_apr/src/lib.rs
@@ -0,0 +1,140 @@
+#![no_std]
+use soroban_sdk::{
+    contract, 
+    contractimpl, 
+    Address, 
+    Env, 
+    String,
+    token::Client as TokenClient, 
+    Val, 
+    Vec};
+
+mod balance;
+mod storage;
+
+use balance::{
+    read_balance, 
+    receive_balance, 
+    spend_balance};
+
+use storage::{
+    extend_instance_ttl, 
+    get_underlying_asset, 
+    is_initialized, 
+    set_initialized, 
+    set_underlying_asset
+};
+
+pub use defindex_strategy_core::{
+    DeFindexStrategyTrait, 
+    StrategyError, 
+    event};
+
+pub fn check_nonnegative_amount(amount: i128) -> Result<(), StrategyError> {
+    if amount < 0 {
+        Err(StrategyError::NegativeNotAllowed)
+    } else {
+        Ok(())
+    }
+}
+
+fn check_initialized(e: &Env) -> Result<(), StrategyError> {
+    if is_initialized(e) {
+        Ok(())
+    } else {
+        Err(StrategyError::NotInitialized)
+    }
+}
+
+const STARETEGY_NAME: &str = "FixAprStrategy";
+
+#[contract]
+struct FixAprStrategy;
+
+#[contractimpl]
+impl DeFindexStrategyTrait for FixAprStrategy {
+    fn initialize(
+        e: Env,
+        asset: Address,
+        _init_args: Vec<Val>,
+    ) -> Result<(), StrategyError> {
+        if is_initialized(&e) {
+            return Err(StrategyError::AlreadyInitialized);
+        }
+
+        set_initialized(&e);
+        set_underlying_asset(&e, &asset);
+
+        event::emit_initialize(&e, String::from_str(&e, STARETEGY_NAME), asset);
+        extend_instance_ttl(&e);
+        Ok(())
+    }
+
+    fn asset(e: Env) -> Result<Address, StrategyError> {
+        check_initialized(&e)?;
+        extend_instance_ttl(&e);
+
+        Ok(get_underlying_asset(&e))
+    }
+
+    fn deposit(
+        e: Env,
+        amount: i128,
+        from: Address,
+    ) -> Result<(), StrategyError> {
+        check_initialized(&e)?;
+        check_nonnegative_amount(amount)?;
+        extend_instance_ttl(&e);
+        from.require_auth();
+
+        let contract_address = e.current_contract_address();
+        
+        let underlying_asset = get_underlying_asset(&e);
+        TokenClient::new(&e, &underlying_asset).transfer(&from, &contract_address, &amount);
+
+        receive_balance(&e, from.clone(), amount);
+        event::emit_deposit(&e, String::from_str(&e, STARETEGY_NAME), amount, from);
+
+        Ok(())
+    }
+
+    fn harvest(e: Env, from: Address) -> Result<(), StrategyError> {
+        check_initialized(&e)?;
+        extend_instance_ttl(&e);
+
+        event::emit_harvest(&e, String::from_str(&e, STARETEGY_NAME), 0i128, from);
+        Ok(())
+    }
+
+    fn withdraw(
+        e: Env,
+        amount: i128,
+        from: Address,
+    ) -> Result<i128, StrategyError> {
+        from.require_auth();
+        check_initialized(&e)?;
+        check_nonnegative_amount(amount)?;
+        extend_instance_ttl(&e);
+
+        spend_balance(&e, from.clone(), amount)?;
+        
+        let contract_address = e.current_contract_address();
+        let underlying_asset = get_underlying_asset(&e);
+        TokenClient::new(&e, &underlying_asset).transfer(&contract_address, &from, &amount);
+        event::emit_withdraw(&e, String::from_str(&e, STARETEGY_NAME), amount, from);
+
+        Ok(amount)
+    }
+
+    fn balance(
+        e: Env,
+        from: Address,
+    ) -> Result<i128, StrategyError> {
+        check_initialized(&e)?;
+        extend_instance_ttl(&e);
+
+        Ok(read_balance(&e, from))
+    }
+}
+
+mod test;
\ No newline at end of file
diff --git a/apps/contracts/strategies/fixed_apr/src/storage.rs b/apps/contracts/strategies/fixed_apr/src/storage.rs
new file mode 100644
index 00000000..6fd7b39f
--- /dev/null
+++ b/apps/contracts/strategies/fixed_apr/src/storage.rs
@@ -0,0 +1,37 @@
+use soroban_sdk::{contracttype, Env, Address};
+
+#[derive(Clone)]
+#[contracttype]
+
+pub enum DataKey {
+    Initialized,
+    UnderlyingAsset,
+    Balance(Address)
+}
+
+const DAY_IN_LEDGERS: u32 = 17280;
+pub const INSTANCE_BUMP_AMOUNT: u32 = 30 * DAY_IN_LEDGERS;
+pub const INSTANCE_LIFETIME_THRESHOLD: u32 = INSTANCE_BUMP_AMOUNT - DAY_IN_LEDGERS;
+
+pub fn extend_instance_ttl(e: &Env) {
+    e.storage()
+        .instance()
+        .extend_ttl(INSTANCE_LIFETIME_THRESHOLD, INSTANCE_BUMP_AMOUNT);
+}
+
+pub fn set_initialized(e: &Env) {
+    e.storage().instance().set(&DataKey::Initialized, &true);
+}
+
+pub fn is_initialized(e: &Env) -> bool {
+    e.storage().instance().has(&DataKey::Initialized)
+}
+
+// Underlying asset
+pub fn set_underlying_asset(e: &Env, address: &Address) {
+    e.storage().instance().set(&DataKey::UnderlyingAsset, &address);
+}
+
+pub fn get_underlying_asset(e: &Env) -> Address {
+    e.storage().instance().get(&DataKey::UnderlyingAsset).unwrap()
+}
\ No newline at end of file
diff --git a/apps/contracts/strategies/fixed_apr/src/test.rs b/apps/contracts/strategies/fixed_apr/src/test.rs
new file mode 100644
index 00000000..6b759712
--- /dev/null
+++ b/apps/contracts/strategies/fixed_apr/src/test.rs
@@ -0,0 +1,63 @@
+#![cfg(test)]
+use crate::{FixAprStrategy, FixAprStrategyClient, StrategyError};
+
+use soroban_sdk::token::{TokenClient, StellarAssetClient};
+
+use soroban_sdk::{
+    Env, 
+    Address, 
+    testutils::Address as _,
+};
+
+// Base Strategy Contract
+fn create_fixapr_strategy<'a>(e: &Env) -> FixAprStrategyClient<'a> {
+    FixAprStrategyClient::new(e, &e.register_contract(None, FixAprStrategy {}))
+}
+
+// Create Test Token
+pub(crate) fn create_token_contract<'a>(e: &Env, admin: &Address) -> TokenClient<'a> {
+    TokenClient::new(e, &e.register_stellar_asset_contract_v2(admin.clone()).address())
+}
+
+pub struct FixAprStrategyTest<'a> {
+    env: Env,
+    strategy: FixAprStrategyClient<'a>,
+    token: TokenClient<'a>,
+    user: Address,
+}
+
+impl<'a> FixAprStrategyTest<'a> {
+    fn setup() -> Self {
+
+        let env = Env::default();
+        env.mock_all_auths();
+
+        let strategy = create_fixapr_strategy(&env);
+        let admin = Address::generate(&env);
+        let token = create_token_contract(&env, &admin);
+        let user = Address::generate(&env);
+
+        // Mint 1,000,000,000 to user
+        StellarAssetClient::new(&env, &token.address).mint(&user, &1_000_000_000);
+
+        FixAprStrategyTest {
+            env,
+            strategy,
+            token,
+            user
+        }
+    }
+    
+    // pub(crate) fn generate_random_users(e: &Env, users_count: u32) -> vec::Vec<Address> {
+    //     let mut users = vec![];
+    //     for _c in 0..users_count {
+    //         users.push(Address::generate(e));
+    //     }
+    //     users
+    // }
+}
+
+mod initialize;
+mod deposit;
+mod events;
+mod withdraw;
\ No newline at end of file
diff --git a/apps/contracts/strategies/fixed_apr/src/test/deposit.rs b/apps/contracts/strategies/fixed_apr/src/test/deposit.rs
new file mode 100644
index 00000000..3267f974
--- /dev/null
+++ b/apps/contracts/strategies/fixed_apr/src/test/deposit.rs
@@ -0,0 +1,79 @@
+use crate::test::HodlStrategyTest;
+use crate::test::StrategyError;
+use soroban_sdk::{IntoVal, Vec, Val};
+
+// test deposit with negative amount
+#[test]
+fn deposit_with_negative_amount() {
+    let test = HodlStrategyTest::setup();
+    let init_fn_args: Vec<Val> = (0,).into_val(&test.env);
+    test.strategy.initialize(&test.token.address, &init_fn_args);
+
+    let amount = -123456;
+
+    let result = test.strategy.try_deposit(&amount, &test.user);
+    assert_eq!(result, Err(Ok(StrategyError::NegativeNotAllowed)));
+}
+
+// check auth
+#[test]
+fn deposit_mock_auths() {
+    todo!()
+}
+
+#[test]
+fn deposit_and_withdrawal_flow() {
+    let test = HodlStrategyTest::setup();
+    // let users = HodlStrategyTest::generate_random_users(&test.env, 1);
+
+    // try deposit should return NotInitialized error before being initialize
+
+    let result = test.strategy.try_deposit(&10_000_000, &test.user);
+    assert_eq!(result, Err(Ok(StrategyError::NotInitialized)));
+
+    // initialize
+    let init_fn_args: Vec<Val> = (0,).into_val(&test.env);
+    test.strategy.initialize(&test.token.address, &init_fn_args);   
+
+    // Initial user token balance
+    let balance = test.token.balance(&test.user);
+
+    let amount = 123456;
+
+    // Deposit amount of token from the user to the strategy
+    test.strategy.deposit(&amount, &test.user);
+
+    let balance_after_deposit = test.token.balance(&test.user);
+    assert_eq!(balance_after_deposit, balance - amount);
+
+    // Reading strategy balance
+    let strategy_balance_after_deposit = test.token.balance(&test.strategy.address);
+    assert_eq!(strategy_balance_after_deposit, amount);
+
+    // Reading user balance on strategy contract
+    let user_balance_on_strategy = test.strategy.balance(&test.user);
+    assert_eq!(user_balance_on_strategy, amount);
+
+
+    let amount_to_withdraw = 100_000;
+    // Withdrawing token from the strategy to user
+    test.strategy.withdraw(&amount_to_withdraw, &test.user);
+
+    // Reading user balance in token
+    let balance = test.token.balance(&test.user);
+    assert_eq!(balance, balance_after_deposit + amount_to_withdraw);
+
+    // Reading strategy balance in token
+    let balance = test.token.balance(&test.strategy.address);
+    assert_eq!(balance, amount - amount_to_withdraw);
+
+    // Reading user balance on strategy contract
+    let user_balance = test.strategy.balance(&test.user);
+    assert_eq!(user_balance, amount - amount_to_withdraw);
+
+    // now we will want to withdraw more of the remaining balance
+    let amount_to_withdraw = 200_000;
+    let result = test.strategy.try_withdraw(&amount_to_withdraw, &test.user);
+    assert_eq!(result, Err(Ok(StrategyError::InsufficientBalance)));
+
+}
\ No newline at end of file
diff --git a/apps/contracts/strategies/fixed_apr/src/test/events.rs b/apps/contracts/strategies/fixed_apr/src/test/events.rs
new file mode 100644
index 00000000..239a9bd1
--- /dev/null
+++ b/apps/contracts/strategies/fixed_apr/src/test/events.rs
@@ -0,0 +1,6 @@
+// TODO: Write tests for events
+
+#[test]
+fn test_events() {
+    todo!()
+}
\ No newline at end of file
diff --git a/apps/contracts/strategies/fixed_apr/src/test/initialize.rs b/apps/contracts/strategies/fixed_apr/src/test/initialize.rs
new file mode 100644
index 00000000..41037473
--- /dev/null
+++ b/apps/contracts/strategies/fixed_apr/src/test/initialize.rs
@@ -0,0 +1,21 @@
+// Cannot Initialize twice
+extern crate std;
+use soroban_sdk::{IntoVal, Vec, Val};
+use crate::test::HodlStrategyTest;
+use crate::test::StrategyError;
+
+#[test]
+fn cannot_initialize_twice() {
+    let test = HodlStrategyTest::setup();
+
+    let init_fn_args: Vec<Val> = (0,).into_val(&test.env);
+
+    test.strategy.initialize(&test.token.address, &init_fn_args);
+    let result = test.strategy.try_initialize(&test.token.address , &init_fn_args);
+    assert_eq!(result, Err(Ok(StrategyError::AlreadyInitialized)));
+
+    // get asset should return underlying asset
+
+    let underlying_asset = test.strategy.asset();
+    assert_eq!(underlying_asset, test.token.address);
+}
\ No newline at end of file
diff --git a/apps/contracts/strategies/fixed_apr/src/test/withdraw.rs b/apps/contracts/strategies/fixed_apr/src/test/withdraw.rs
new file mode 100644
index 00000000..dd8aa9d5
--- /dev/null
+++ b/apps/contracts/strategies/fixed_apr/src/test/withdraw.rs
@@ -0,0 +1,5 @@
+
+#[test]
+fn withdraw() {
+    todo!()
+}
\ No newline at end of file

From 7fb3aaf11153c781b38603d38124974526392fd8 Mon Sep 17 00:00:00 2001
From: coderipper <hello@joaquinsoza.dev>
Date: Fri, 8 Nov 2024 14:33:04 -0300
Subject: [PATCH 37/39] apr strategy tested

---
 .../strategies/fixed_apr/src/constants.rs     |   2 +
 .../contracts/strategies/fixed_apr/src/lib.rs | 103 +++++++++----
 .../strategies/fixed_apr/src/storage.rs       |  26 +++-
 .../strategies/fixed_apr/src/test.rs          |  29 ++--
 .../strategies/fixed_apr/src/test/deposit.rs  | 126 +++++++++-------
 .../strategies/fixed_apr/src/test/events.rs   |   6 -
 .../strategies/fixed_apr/src/test/harvest.rs  |  72 +++++++++
 .../fixed_apr/src/test/initialize.rs          |  42 +++++-
 .../strategies/fixed_apr/src/test/withdraw.rs | 140 +++++++++++++++++-
 .../strategies/fixed_apr/src/yield_balance.rs |  43 ++++++
 10 files changed, 479 insertions(+), 110 deletions(-)
 create mode 100644 apps/contracts/strategies/fixed_apr/src/constants.rs
 delete mode 100644 apps/contracts/strategies/fixed_apr/src/test/events.rs
 create mode 100644 apps/contracts/strategies/fixed_apr/src/test/harvest.rs
 create mode 100644 apps/contracts/strategies/fixed_apr/src/yield_balance.rs

diff --git a/apps/contracts/strategies/fixed_apr/src/constants.rs b/apps/contracts/strategies/fixed_apr/src/constants.rs
new file mode 100644
index 00000000..1428e1b8
--- /dev/null
+++ b/apps/contracts/strategies/fixed_apr/src/constants.rs
@@ -0,0 +1,2 @@
+pub(crate) const MAX_BPS: i128 = 10_000;
+pub(crate) const SECONDS_PER_YEAR: i128 = 31_536_000;
diff --git a/apps/contracts/strategies/fixed_apr/src/lib.rs b/apps/contracts/strategies/fixed_apr/src/lib.rs
index d0ba1719..a5474972 100644
--- a/apps/contracts/strategies/fixed_apr/src/lib.rs
+++ b/apps/contracts/strategies/fixed_apr/src/lib.rs
@@ -1,34 +1,22 @@
 #![no_std]
+use constants::{MAX_BPS, SECONDS_PER_YEAR};
 use soroban_sdk::{
-    contract, 
-    contractimpl, 
-    Address, 
-    Env, 
-    String,
-    token::Client as TokenClient, 
-    Val, 
-    Vec};
+    contract, contractimpl, token::Client as TokenClient, Address, Env, IntoVal, String, Val, Vec
+};
 
 mod balance;
+mod constants;
 mod storage;
+mod yield_balance;
 
-use balance::{
-    read_balance, 
-    receive_balance, 
-    spend_balance};
-
+use balance::{read_balance, receive_balance, spend_balance};
 use storage::{
-    extend_instance_ttl, 
-    get_underlying_asset, 
-    is_initialized, 
-    set_initialized, 
-    set_underlying_asset
+    extend_instance_ttl, get_underlying_asset, is_initialized, set_initialized, 
+    set_underlying_asset, set_apr, get_apr, set_last_harvest_time, get_last_harvest_time,
 };
 
-pub use defindex_strategy_core::{
-    DeFindexStrategyTrait, 
-    StrategyError, 
-    event};
+pub use defindex_strategy_core::{DeFindexStrategyTrait, StrategyError, event};
+use yield_balance::{read_yield, receive_yield, spend_yield};
 
 pub fn check_nonnegative_amount(amount: i128) -> Result<(), StrategyError> {
     if amount < 0 {
@@ -46,7 +34,7 @@ fn check_initialized(e: &Env) -> Result<(), StrategyError> {
     }
 }
 
-const STARETEGY_NAME: &str = "FixAprStrategy";
+const STRATEGY_NAME: &str = "FixAprStrategy";
 
 #[contract]
 struct FixAprStrategy;
@@ -56,16 +44,26 @@ impl DeFindexStrategyTrait for FixAprStrategy {
     fn initialize(
         e: Env,
         asset: Address,
-        _init_args: Vec<Val>,
+        init_args: Vec<Val>,
     ) -> Result<(), StrategyError> {
         if is_initialized(&e) {
             return Err(StrategyError::AlreadyInitialized);
         }
 
+        // Extract APR from `init_args`, assumed to be the first argument
+        let apr_bps: u32 = init_args.get(0).ok_or(StrategyError::InvalidArgument)?.into_val(&e);
+        let caller: Address = init_args.get(1).ok_or(StrategyError::InvalidArgument)?.into_val(&e);
+        let amount: i128 = init_args.get(2).ok_or(StrategyError::InvalidArgument)?.into_val(&e);
+        
         set_initialized(&e);
         set_underlying_asset(&e, &asset);
+        set_apr(&e, apr_bps);
 
-        event::emit_initialize(&e, String::from_str(&e, STARETEGY_NAME), asset);
+        // Should transfer tokens from the caller to the contract
+        caller.require_auth();
+        TokenClient::new(&e, &asset).transfer(&caller, &e.current_contract_address(), &amount);
+
+        event::emit_initialize(&e, String::from_str(&e, STRATEGY_NAME), asset);
         extend_instance_ttl(&e);
         Ok(())
     }
@@ -73,7 +71,6 @@ impl DeFindexStrategyTrait for FixAprStrategy {
     fn asset(e: Env) -> Result<Address, StrategyError> {
         check_initialized(&e)?;
         extend_instance_ttl(&e);
-
         Ok(get_underlying_asset(&e))
     }
 
@@ -87,13 +84,16 @@ impl DeFindexStrategyTrait for FixAprStrategy {
         extend_instance_ttl(&e);
         from.require_auth();
 
+        update_yield_balance(&e, &from);
+
         let contract_address = e.current_contract_address();
-        
         let underlying_asset = get_underlying_asset(&e);
         TokenClient::new(&e, &underlying_asset).transfer(&from, &contract_address, &amount);
 
         receive_balance(&e, from.clone(), amount);
-        event::emit_deposit(&e, String::from_str(&e, STARETEGY_NAME), amount, from);
+
+        set_last_harvest_time(&e, e.ledger().timestamp(), from.clone());
+        event::emit_deposit(&e, String::from_str(&e, STRATEGY_NAME), amount, from);
 
         Ok(())
     }
@@ -101,8 +101,19 @@ impl DeFindexStrategyTrait for FixAprStrategy {
     fn harvest(e: Env, from: Address) -> Result<(), StrategyError> {
         check_initialized(&e)?;
         extend_instance_ttl(&e);
+    
+        let yield_balance = update_yield_balance(&e, &from);
+
+        if yield_balance == 0 {
+            return Ok(());
+        }
+    
+        // Transfer the reward tokens to the user's balance
+        spend_yield(&e, from.clone(), yield_balance)?;
+        receive_balance(&e, from.clone(), yield_balance);
 
-        event::emit_harvest(&e, String::from_str(&e, STARETEGY_NAME), 0i128, from);
+        event::emit_harvest(&e, String::from_str(&e, STRATEGY_NAME), yield_balance, from);
+    
         Ok(())
     }
 
@@ -121,7 +132,7 @@ impl DeFindexStrategyTrait for FixAprStrategy {
         let contract_address = e.current_contract_address();
         let underlying_asset = get_underlying_asset(&e);
         TokenClient::new(&e, &underlying_asset).transfer(&contract_address, &from, &amount);
-        event::emit_withdraw(&e, String::from_str(&e, STARETEGY_NAME), amount, from);
+        event::emit_withdraw(&e, String::from_str(&e, STRATEGY_NAME), amount, from);
 
         Ok(amount)
     }
@@ -132,9 +143,39 @@ impl DeFindexStrategyTrait for FixAprStrategy {
     ) -> Result<i128, StrategyError> {
         check_initialized(&e)?;
         extend_instance_ttl(&e);
-
         Ok(read_balance(&e, from))
     }
 }
 
+
+fn calculate_yield(user_balance: i128, apr: u32, time_elapsed: u64) -> i128 {
+    // Calculate yield based on the APR, time elapsed, and user's balance
+    let seconds_per_year = SECONDS_PER_YEAR;
+    let apr_bps = apr as i128;
+    let time_elapsed_i128 = time_elapsed as i128;
+
+    (user_balance * apr_bps * time_elapsed_i128) / (seconds_per_year * MAX_BPS)
+}
+
+fn update_yield_balance(e: &Env, from: &Address) -> i128 {
+    let apr = get_apr(e);
+    let last_harvest = get_last_harvest_time(e, from.clone());
+    let time_elapsed = e.ledger().timestamp().saturating_sub(last_harvest);
+
+    if time_elapsed == 0 {
+        return 0;
+    }
+
+    let user_balance = read_balance(e, from.clone());
+    let reward_amount = calculate_yield(user_balance, apr, time_elapsed);
+
+    if reward_amount == 0 {
+        return 0;
+    }
+
+    receive_yield(e, from.clone(), reward_amount);
+    set_last_harvest_time(e, e.ledger().timestamp(), from.clone());
+    read_yield(e, from.clone())
+}
+
 mod test;
\ No newline at end of file
diff --git a/apps/contracts/strategies/fixed_apr/src/storage.rs b/apps/contracts/strategies/fixed_apr/src/storage.rs
index 6fd7b39f..3df9aec5 100644
--- a/apps/contracts/strategies/fixed_apr/src/storage.rs
+++ b/apps/contracts/strategies/fixed_apr/src/storage.rs
@@ -1,12 +1,14 @@
-use soroban_sdk::{contracttype, Env, Address};
+use soroban_sdk::{contracttype, Address, Env};
 
 #[derive(Clone)]
 #[contracttype]
-
 pub enum DataKey {
     Initialized,
     UnderlyingAsset,
-    Balance(Address)
+    Balance(Address),
+    YieldBalance(Address),
+    Apr,
+    LastHarvestTime(Address),
 }
 
 const DAY_IN_LEDGERS: u32 = 17280;
@@ -34,4 +36,22 @@ pub fn set_underlying_asset(e: &Env, address: &Address) {
 
 pub fn get_underlying_asset(e: &Env) -> Address {
     e.storage().instance().get(&DataKey::UnderlyingAsset).unwrap()
+}
+
+// Apr
+pub fn set_apr(e: &Env, apr: u32) {
+    e.storage().instance().set(&DataKey::Apr, &apr);
+}
+
+pub fn get_apr(e: &Env) -> u32 {
+    e.storage().instance().get(&DataKey::Apr).unwrap()
+}
+
+// Last harvest time
+pub fn set_last_harvest_time(e: &Env, timestamp: u64, from: Address) {
+    e.storage().instance().set(&DataKey::LastHarvestTime(from), &timestamp);
+}
+
+pub fn get_last_harvest_time(e: &Env, from: Address) -> u64 {
+    e.storage().instance().get(&DataKey::LastHarvestTime(from)).unwrap_or(0)
 }
\ No newline at end of file
diff --git a/apps/contracts/strategies/fixed_apr/src/test.rs b/apps/contracts/strategies/fixed_apr/src/test.rs
index 6b759712..3885aeb8 100644
--- a/apps/contracts/strategies/fixed_apr/src/test.rs
+++ b/apps/contracts/strategies/fixed_apr/src/test.rs
@@ -1,7 +1,8 @@
 #![cfg(test)]
+extern crate std;
 use crate::{FixAprStrategy, FixAprStrategyClient, StrategyError};
 
-use soroban_sdk::token::{TokenClient, StellarAssetClient};
+use soroban_sdk::token::TokenClient;
 
 use soroban_sdk::{
     Env, 
@@ -9,6 +10,8 @@ use soroban_sdk::{
     testutils::Address as _,
 };
 
+use std::vec as stdvec;
+
 // Base Strategy Contract
 fn create_fixapr_strategy<'a>(e: &Env) -> FixAprStrategyClient<'a> {
     FixAprStrategyClient::new(e, &e.register_contract(None, FixAprStrategy {}))
@@ -23,7 +26,7 @@ pub struct FixAprStrategyTest<'a> {
     env: Env,
     strategy: FixAprStrategyClient<'a>,
     token: TokenClient<'a>,
-    user: Address,
+    strategy_admin: Address,
 }
 
 impl<'a> FixAprStrategyTest<'a> {
@@ -35,29 +38,27 @@ impl<'a> FixAprStrategyTest<'a> {
         let strategy = create_fixapr_strategy(&env);
         let admin = Address::generate(&env);
         let token = create_token_contract(&env, &admin);
-        let user = Address::generate(&env);
 
-        // Mint 1,000,000,000 to user
-        StellarAssetClient::new(&env, &token.address).mint(&user, &1_000_000_000);
+        let strategy_admin = Address::generate(&env);
 
         FixAprStrategyTest {
             env,
             strategy,
             token,
-            user
+            strategy_admin
         }
     }
     
-    // pub(crate) fn generate_random_users(e: &Env, users_count: u32) -> vec::Vec<Address> {
-    //     let mut users = vec![];
-    //     for _c in 0..users_count {
-    //         users.push(Address::generate(e));
-    //     }
-    //     users
-    // }
+    pub(crate) fn generate_random_users(e: &Env, users_count: u32) -> stdvec::Vec<Address> {
+        let mut users = stdvec![];
+        for _c in 0..users_count {
+            users.push(Address::generate(e));
+        }
+        users
+    }
 }
 
 mod initialize;
 mod deposit;
-mod events;
+mod harvest;
 mod withdraw;
\ No newline at end of file
diff --git a/apps/contracts/strategies/fixed_apr/src/test/deposit.rs b/apps/contracts/strategies/fixed_apr/src/test/deposit.rs
index 3267f974..6a68c39e 100644
--- a/apps/contracts/strategies/fixed_apr/src/test/deposit.rs
+++ b/apps/contracts/strategies/fixed_apr/src/test/deposit.rs
@@ -1,79 +1,103 @@
-use crate::test::HodlStrategyTest;
+use crate::test::FixAprStrategyTest;
 use crate::test::StrategyError;
+use soroban_sdk::token::StellarAssetClient;
+use soroban_sdk::vec;
 use soroban_sdk::{IntoVal, Vec, Val};
 
 // test deposit with negative amount
 #[test]
 fn deposit_with_negative_amount() {
-    let test = HodlStrategyTest::setup();
-    let init_fn_args: Vec<Val> = (0,).into_val(&test.env);
+    let test = FixAprStrategyTest::setup();
+    //MINT 100M to the strategy
+    let starting_amount = 100_000_000_000_0_000_000i128;
+    StellarAssetClient::new(&test.env, &test.token.address).mint(&test.strategy_admin, &starting_amount);
+
+    let init_fn_args: Vec<Val> = vec![&test.env,
+        1000u32.into_val(&test.env),
+        test.strategy_admin.into_val(&test.env),
+        starting_amount.into_val(&test.env),
+    ];
+
     test.strategy.initialize(&test.token.address, &init_fn_args);
 
+    let users = FixAprStrategyTest::generate_random_users(&test.env, 1);
+
     let amount = -123456;
 
-    let result = test.strategy.try_deposit(&amount, &test.user);
+    let result = test.strategy.try_deposit(&amount, &users[0]);
     assert_eq!(result, Err(Ok(StrategyError::NegativeNotAllowed)));
 }
 
-// check auth
-#[test]
-fn deposit_mock_auths() {
-    todo!()
-}
-
+// test deposit with zero amount
 #[test]
-fn deposit_and_withdrawal_flow() {
-    let test = HodlStrategyTest::setup();
-    // let users = HodlStrategyTest::generate_random_users(&test.env, 1);
-
-    // try deposit should return NotInitialized error before being initialize
-
-    let result = test.strategy.try_deposit(&10_000_000, &test.user);
-    assert_eq!(result, Err(Ok(StrategyError::NotInitialized)));
+fn deposit_with_zero_amount() {
+    let test = FixAprStrategyTest::setup();
+    // MINT 100M to the strategy
+    let starting_amount = 100_000_000_000_0_000_000i128;
+    StellarAssetClient::new(&test.env, &test.token.address).mint(&test.strategy_admin, &starting_amount);
+
+    let init_fn_args: Vec<Val> = vec![&test.env,
+        1000u32.into_val(&test.env),
+        test.strategy_admin.into_val(&test.env),
+        starting_amount.into_val(&test.env),
+    ];
 
-    // initialize
-    let init_fn_args: Vec<Val> = (0,).into_val(&test.env);
-    test.strategy.initialize(&test.token.address, &init_fn_args);   
+    test.strategy.initialize(&test.token.address, &init_fn_args);
 
-    // Initial user token balance
-    let balance = test.token.balance(&test.user);
+    let users = FixAprStrategyTest::generate_random_users(&test.env, 1);
 
-    let amount = 123456;
+    let amount = 0;
 
-    // Deposit amount of token from the user to the strategy
-    test.strategy.deposit(&amount, &test.user);
+    test.strategy.deposit(&amount, &users[0]);
+}
 
-    let balance_after_deposit = test.token.balance(&test.user);
-    assert_eq!(balance_after_deposit, balance - amount);
+// test deposit with positive amount
+#[test]
+fn deposit() {
+    let test = FixAprStrategyTest::setup();
+    // MINT 100M to the strategy
+    let starting_amount = 100_000_000_000_0_000_000i128;
+    StellarAssetClient::new(&test.env, &test.token.address).mint(&test.strategy_admin, &starting_amount);
+
+    let init_fn_args: Vec<Val> = vec![&test.env,
+        1000u32.into_val(&test.env),
+        test.strategy_admin.into_val(&test.env),
+        starting_amount.into_val(&test.env),
+    ];
 
-    // Reading strategy balance
-    let strategy_balance_after_deposit = test.token.balance(&test.strategy.address);
-    assert_eq!(strategy_balance_after_deposit, amount);
+    test.strategy.initialize(&test.token.address, &init_fn_args);
 
-    // Reading user balance on strategy contract
-    let user_balance_on_strategy = test.strategy.balance(&test.user);
-    assert_eq!(user_balance_on_strategy, amount);
+    let users = FixAprStrategyTest::generate_random_users(&test.env, 1);
 
+    let amount = 1_000_0_00_000;
+    StellarAssetClient::new(&test.env, &test.token.address).mint(&users[0], &amount);
 
-    let amount_to_withdraw = 100_000;
-    // Withdrawing token from the strategy to user
-    test.strategy.withdraw(&amount_to_withdraw, &test.user);
+    test.strategy.deposit(&amount, &users[0]);
+    let user_balance = test.token.balance(&users[0]);
+    assert_eq!(user_balance, 0);
+}
 
-    // Reading user balance in token
-    let balance = test.token.balance(&test.user);
-    assert_eq!(balance, balance_after_deposit + amount_to_withdraw);
+// test deposit with amount exceeding balance
+#[test]
+#[should_panic(expected = "HostError: Error(Contract, #10)")] // Unauthorized
+fn deposit_with_exceeding_balance() {
+    let test = FixAprStrategyTest::setup();
+    // MINT 100M to the strategy
+    let starting_amount = 100_000_000_000_0_000_000i128;
+    StellarAssetClient::new(&test.env, &test.token.address).mint(&test.strategy_admin, &starting_amount);
+
+    let init_fn_args: Vec<Val> = vec![&test.env,
+        1000u32.into_val(&test.env),
+        test.strategy_admin.into_val(&test.env),
+        starting_amount.into_val(&test.env),
+    ];
 
-    // Reading strategy balance in token
-    let balance = test.token.balance(&test.strategy.address);
-    assert_eq!(balance, amount - amount_to_withdraw);
+    test.strategy.initialize(&test.token.address, &init_fn_args);
 
-    // Reading user balance on strategy contract
-    let user_balance = test.strategy.balance(&test.user);
-    assert_eq!(user_balance, amount - amount_to_withdraw);
+    let users = FixAprStrategyTest::generate_random_users(&test.env, 1);
 
-    // now we will want to withdraw more of the remaining balance
-    let amount_to_withdraw = 200_000;
-    let result = test.strategy.try_withdraw(&amount_to_withdraw, &test.user);
-    assert_eq!(result, Err(Ok(StrategyError::InsufficientBalance)));
+    let amount = 1_000_0_00_000;
+    StellarAssetClient::new(&test.env, &test.token.address).mint(&users[0], &(&amount - 100_0_000_000));
 
-}
\ No newline at end of file
+    test.strategy.deposit(&amount, &users[0]);
+}
diff --git a/apps/contracts/strategies/fixed_apr/src/test/events.rs b/apps/contracts/strategies/fixed_apr/src/test/events.rs
deleted file mode 100644
index 239a9bd1..00000000
--- a/apps/contracts/strategies/fixed_apr/src/test/events.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-// TODO: Write tests for events
-
-#[test]
-fn test_events() {
-    todo!()
-}
\ No newline at end of file
diff --git a/apps/contracts/strategies/fixed_apr/src/test/harvest.rs b/apps/contracts/strategies/fixed_apr/src/test/harvest.rs
new file mode 100644
index 00000000..17c2711e
--- /dev/null
+++ b/apps/contracts/strategies/fixed_apr/src/test/harvest.rs
@@ -0,0 +1,72 @@
+use soroban_sdk::{testutils::Ledger, token::StellarAssetClient, vec, IntoVal, Val, Vec};
+
+use crate::{calculate_yield, test::FixAprStrategyTest};
+
+#[test]
+fn test_harvest_yields_multiple_users() {
+    let test = FixAprStrategyTest::setup();
+
+    //MINT 100M to the strategy
+    let starting_amount = 100_000_000_000_0_000_000i128;
+    StellarAssetClient::new(&test.env, &test.token.address).mint(&test.strategy_admin, &starting_amount);
+
+    let apr = 1000u32;
+    let init_fn_args: Vec<Val> = vec![&test.env,
+        apr.clone().into_val(&test.env),
+        test.strategy_admin.into_val(&test.env),
+        starting_amount.into_val(&test.env),
+    ];
+
+    test.strategy.initialize(&test.token.address, &init_fn_args);
+    assert_eq!(test.token.balance(&test.strategy.address), starting_amount);
+
+    let users = FixAprStrategyTest::generate_random_users(&test.env, 4);
+
+    // Mint tokens to users
+    let user1_amount = 1_000_0_000_000i128;
+    StellarAssetClient::new(&test.env, &test.token.address).mint(&users[0], &user1_amount);
+    let user2_amount = 2_000_0_000_000i128;
+    StellarAssetClient::new(&test.env, &test.token.address).mint(&users[1], &user2_amount);
+    let user3_amount = 500_0_000_000i128;
+    StellarAssetClient::new(&test.env, &test.token.address).mint(&users[2], &user3_amount);
+    let user4_amount = 10_000_0_000_000i128;
+    StellarAssetClient::new(&test.env, &test.token.address).mint(&users[3], &user4_amount);
+
+    // Deposit tokens for each user
+    test.strategy.deposit(&user1_amount, &users[0]);
+    let user1_balance = test.token.balance(&users[0]);
+    assert_eq!(user1_balance, 0);
+
+    test.strategy.deposit(&user2_amount, &users[1]);
+    let user2_balance = test.token.balance(&users[1]);
+    assert_eq!(user2_balance, 0);
+
+    test.strategy.deposit(&user3_amount, &users[2]);
+    let user3_balance = test.token.balance(&users[2]);
+    assert_eq!(user3_balance, 0);
+
+    test.strategy.deposit(&user4_amount, &users[3]);
+    let user4_balance = test.token.balance(&users[3]);
+    assert_eq!(user4_balance, 0);
+
+    // Simulate one year passing
+    let one_year_in_seconds = 31_536_000u64;
+    test.env.ledger().set_timestamp(test.env.ledger().timestamp() + one_year_in_seconds);
+
+    // Harvest for each user
+    test.strategy.harvest(&users[0]);
+    test.strategy.harvest(&users[1]);
+    test.strategy.harvest(&users[2]);
+    test.strategy.harvest(&users[3]);
+
+    // Check the harvested rewards for each user are correct
+    let user1_expected_reward = calculate_yield(user1_amount, apr, one_year_in_seconds);
+    let user2_expected_reward = calculate_yield(user2_amount, apr, one_year_in_seconds);
+    let user3_expected_reward = calculate_yield(user3_amount, apr, one_year_in_seconds);
+    let user4_expected_reward = calculate_yield(user4_amount, apr, one_year_in_seconds);
+
+    assert_eq!(test.strategy.balance(&users[0]), user1_amount + user1_expected_reward);
+    assert_eq!(test.strategy.balance(&users[1]), user2_amount + user2_expected_reward);
+    assert_eq!(test.strategy.balance(&users[2]), user3_amount + user3_expected_reward);
+    assert_eq!(test.strategy.balance(&users[3]), user4_amount + user4_expected_reward);
+}
\ No newline at end of file
diff --git a/apps/contracts/strategies/fixed_apr/src/test/initialize.rs b/apps/contracts/strategies/fixed_apr/src/test/initialize.rs
index 41037473..0d085a72 100644
--- a/apps/contracts/strategies/fixed_apr/src/test/initialize.rs
+++ b/apps/contracts/strategies/fixed_apr/src/test/initialize.rs
@@ -1,21 +1,55 @@
 // Cannot Initialize twice
 extern crate std;
+use soroban_sdk::token::StellarAssetClient;
+use soroban_sdk::vec;
 use soroban_sdk::{IntoVal, Vec, Val};
-use crate::test::HodlStrategyTest;
+use crate::test::FixAprStrategyTest;
 use crate::test::StrategyError;
 
+#[test]
+fn initialize() {
+    let test = FixAprStrategyTest::setup();
+
+    //MINT 100M to the strategy
+    let starting_amount = 100_000_000_000_0_000_000i128;
+    StellarAssetClient::new(&test.env, &test.token.address).mint(&test.strategy_admin, &starting_amount);
+
+    let init_fn_args: Vec<Val> = vec![&test.env,
+        1000u32.into_val(&test.env),
+        test.strategy_admin.into_val(&test.env),
+        starting_amount.into_val(&test.env),
+    ];
+
+    test.strategy.initialize(&test.token.address, &init_fn_args);
+
+    // get asset should return underlying asset
+    let underlying_asset = test.strategy.asset();
+    assert_eq!(underlying_asset, test.token.address);
+
+    // get contract token amount
+    let contract_token_amount = test.token.balance(&test.strategy.address);
+    assert_eq!(contract_token_amount, starting_amount);
+}
+
 #[test]
 fn cannot_initialize_twice() {
-    let test = HodlStrategyTest::setup();
+    let test = FixAprStrategyTest::setup();
+
+    //MINT 100M to the strategy
+    let starting_amount = 100_000_000_000_0_000_000i128;
+    StellarAssetClient::new(&test.env, &test.token.address).mint(&test.strategy_admin, &starting_amount);
 
-    let init_fn_args: Vec<Val> = (0,).into_val(&test.env);
+    let init_fn_args: Vec<Val> = vec![&test.env,
+        1000u32.into_val(&test.env),
+        test.strategy_admin.into_val(&test.env),
+        starting_amount.into_val(&test.env),
+    ];
 
     test.strategy.initialize(&test.token.address, &init_fn_args);
     let result = test.strategy.try_initialize(&test.token.address , &init_fn_args);
     assert_eq!(result, Err(Ok(StrategyError::AlreadyInitialized)));
 
     // get asset should return underlying asset
-
     let underlying_asset = test.strategy.asset();
     assert_eq!(underlying_asset, test.token.address);
 }
\ No newline at end of file
diff --git a/apps/contracts/strategies/fixed_apr/src/test/withdraw.rs b/apps/contracts/strategies/fixed_apr/src/test/withdraw.rs
index dd8aa9d5..b8f9592c 100644
--- a/apps/contracts/strategies/fixed_apr/src/test/withdraw.rs
+++ b/apps/contracts/strategies/fixed_apr/src/test/withdraw.rs
@@ -1,5 +1,143 @@
+use crate::{calculate_yield, test::FixAprStrategyTest};
+use defindex_strategy_core::StrategyError;
+use soroban_sdk::testutils::Ledger;
+use soroban_sdk::token::StellarAssetClient;
+use soroban_sdk::vec;
+use soroban_sdk::{IntoVal, Vec, Val};
 
 #[test]
 fn withdraw() {
-    todo!()
+    let test = FixAprStrategyTest::setup();
+    // MINT 100M to the strategy
+    let starting_amount = 100_000_000_000_0_000_000i128;
+    StellarAssetClient::new(&test.env, &test.token.address).mint(&test.strategy_admin, &starting_amount);
+
+    let init_fn_args: Vec<Val> = vec![&test.env,
+        1000u32.into_val(&test.env),
+        test.strategy_admin.into_val(&test.env),
+        starting_amount.into_val(&test.env),
+    ];
+
+    test.strategy.initialize(&test.token.address, &init_fn_args);
+
+    let users = FixAprStrategyTest::generate_random_users(&test.env, 1);
+
+    let amount = 1_000_0_00_000;
+    StellarAssetClient::new(&test.env, &test.token.address).mint(&users[0], &amount);
+
+    test.strategy.deposit(&amount, &users[0]);
+    let user_balance = test.token.balance(&users[0]);
+    assert_eq!(user_balance, 0);
+
+    test.strategy.withdraw(&amount, &users[0]);
+    let user_balance_after_withdraw = test.token.balance(&users[0]);
+    assert_eq!(user_balance_after_withdraw, amount);
+}
+
+#[test]
+fn withdraw_with_harvest() {
+    let test = FixAprStrategyTest::setup();
+    // MINT 100M to the strategy
+    let starting_amount = 100_000_000_000_0_000_000i128;
+    StellarAssetClient::new(&test.env, &test.token.address).mint(&test.strategy_admin, &starting_amount);
+
+    let init_fn_args: Vec<Val> = vec![&test.env,
+        1000u32.into_val(&test.env),
+        test.strategy_admin.into_val(&test.env),
+        starting_amount.into_val(&test.env),
+    ];
+
+    test.strategy.initialize(&test.token.address, &init_fn_args);
+
+    let users = FixAprStrategyTest::generate_random_users(&test.env, 1);
+
+    let amount = 1_000_0_00_000;
+    StellarAssetClient::new(&test.env, &test.token.address).mint(&users[0], &amount);
+
+    test.strategy.deposit(&amount, &users[0]);
+    let user_balance = test.token.balance(&users[0]);
+    assert_eq!(user_balance, 0);
+
+    // Simulate one year passing
+    let one_year_in_seconds = 31_536_000u64;
+    test.env.ledger().set_timestamp(test.env.ledger().timestamp() + one_year_in_seconds);
+
+    test.strategy.harvest(&users[0]);
+
+    let expected_reward = calculate_yield(amount, 1000u32, one_year_in_seconds);
+    let user_balance_after_harvest = test.strategy.balance(&users[0]);
+    assert_eq!(user_balance_after_harvest, amount + expected_reward);
+
+    test.strategy.withdraw(&amount, &users[0]);
+    let user_balance_after_withdraw = test.token.balance(&users[0]);
+    assert_eq!(user_balance_after_withdraw, amount);
+}
+
+#[test]
+fn withdraw_then_harvest_then_withdraw_again() {
+    let test = FixAprStrategyTest::setup();
+    // MINT 100M to the strategy
+    let starting_amount = 100_000_000_000_0_000_000i128;
+    StellarAssetClient::new(&test.env, &test.token.address).mint(&test.strategy_admin, &starting_amount);
+
+    let init_fn_args: Vec<Val> = vec![&test.env,
+        1000u32.into_val(&test.env),
+        test.strategy_admin.into_val(&test.env),
+        starting_amount.into_val(&test.env),
+    ];
+
+    test.strategy.initialize(&test.token.address, &init_fn_args);
+
+    let users = FixAprStrategyTest::generate_random_users(&test.env, 1);
+
+    let amount = 1_000_0_000_000;
+    StellarAssetClient::new(&test.env, &test.token.address).mint(&users[0], &amount);
+
+    test.strategy.deposit(&amount, &users[0]);
+    let user_balance = test.token.balance(&users[0]);
+    assert_eq!(user_balance, 0);
+    
+    // Simulate one year passing
+    let one_year_in_seconds = 31_536_000u64;
+    test.env.ledger().set_timestamp(test.env.ledger().timestamp() + one_year_in_seconds);
+    
+    let user_balance_before_harvest = test.strategy.balance(&users[0]);
+    assert_eq!(user_balance_before_harvest, amount);
+
+    test.strategy.withdraw(&amount, &users[0]);
+    let user_balance_after_withdraw = test.token.balance(&users[0]);
+    assert_eq!(user_balance_after_withdraw, amount);
+
+    // test.strategy.harvest(&users[0]);
+
+    // let expected_reward = calculate_yield(amount, 1000u32, one_year_in_seconds);
+    // let user_balance_after_harvest = test.strategy.balance(&users[0]);
+    // assert_eq!(user_balance_after_harvest, expected_reward);
+
+    // test.strategy.withdraw(&expected_reward, &users[0]);
+    // let user_balance_after_second_withdraw = test.token.balance(&users[0]);
+    // assert_eq!(user_balance_after_second_withdraw, amount + expected_reward);
+}
+
+#[test]
+fn withdraw_with_no_balance() {
+    let test = FixAprStrategyTest::setup();
+    // MINT 100M to the strategy
+    let starting_amount = 100_000_000_000_0_000_000i128;
+    StellarAssetClient::new(&test.env, &test.token.address).mint(&test.strategy_admin, &starting_amount);
+
+    let init_fn_args: Vec<Val> = vec![&test.env,
+        1000u32.into_val(&test.env),
+        test.strategy_admin.into_val(&test.env),
+        starting_amount.into_val(&test.env),
+    ];
+
+    test.strategy.initialize(&test.token.address, &init_fn_args);
+
+    let users = FixAprStrategyTest::generate_random_users(&test.env, 1);
+
+    let amount = 1_000_0_00_000;
+
+    let result = test.strategy.try_withdraw(&amount, &users[0]);
+    assert_eq!(result, Err(Ok(StrategyError::InsufficientBalance)));
 }
\ No newline at end of file
diff --git a/apps/contracts/strategies/fixed_apr/src/yield_balance.rs b/apps/contracts/strategies/fixed_apr/src/yield_balance.rs
new file mode 100644
index 00000000..bf60f929
--- /dev/null
+++ b/apps/contracts/strategies/fixed_apr/src/yield_balance.rs
@@ -0,0 +1,43 @@
+use soroban_sdk::{Address, Env};
+
+use crate::storage::{DataKey, INSTANCE_BUMP_AMOUNT, INSTANCE_LIFETIME_THRESHOLD};
+use crate::StrategyError;
+
+pub fn read_yield(e: &Env, addr: Address) -> i128 {
+    let key = DataKey::YieldBalance(addr);
+    if let Some(balance) = e.storage().persistent().get::<DataKey, i128>(&key) {
+        e.storage()
+            .persistent()
+            .extend_ttl(&key, INSTANCE_LIFETIME_THRESHOLD, INSTANCE_BUMP_AMOUNT);
+        balance
+    } else {
+        0
+    }
+}
+
+fn write_yield(e: &Env, addr: Address, amount: i128) {
+    let key = DataKey::YieldBalance(addr);
+    e.storage().persistent().set(&key, &amount);
+    e.storage()
+        .persistent()
+        .extend_ttl(&key, INSTANCE_LIFETIME_THRESHOLD, INSTANCE_BUMP_AMOUNT);
+}
+
+pub fn receive_yield(e: &Env, addr: Address, amount: i128) {
+    let balance = read_yield(e, addr.clone());
+
+    let new_balance = balance.checked_add(amount)
+        .expect("Integer overflow occurred while adding balance.");
+
+    write_yield(e, addr, new_balance);
+}
+
+pub fn spend_yield(e: &Env, addr: Address, amount: i128) -> Result<(), StrategyError> {
+    
+    let balance = read_yield(e, addr.clone());
+    if balance < amount {
+        return Err(StrategyError::InsufficientBalance);
+    }
+    write_yield(e, addr, balance - amount);
+    Ok(())
+}

From da6efd388b837ed4e12033591d3fe09db33b3e50 Mon Sep 17 00:00:00 2001
From: esteblock <estebaniglesiasmanriquez@gmail.com>
Date: Mon, 11 Nov 2024 10:30:47 -0300
Subject: [PATCH 38/39] fix warnings xycloans@

---
 apps/contracts/strategies/soroswap/src/lib.rs |  8 ++++----
 apps/contracts/strategies/xycloans/src/lib.rs | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/apps/contracts/strategies/soroswap/src/lib.rs b/apps/contracts/strategies/soroswap/src/lib.rs
index 3d4bf827..77daf1b9 100644
--- a/apps/contracts/strategies/soroswap/src/lib.rs
+++ b/apps/contracts/strategies/soroswap/src/lib.rs
@@ -123,7 +123,7 @@ impl DeFindexStrategyTrait for SoroswapAdapter {
         let total_swapped_amount = swap_result.last().unwrap();
 
         // Add liquidity
-        let result = soroswap_router_client.add_liquidity(
+        let _result = soroswap_router_client.add_liquidity(
             &usdc_address,
             &xlm_address,
             &swap_amount,
@@ -137,7 +137,7 @@ impl DeFindexStrategyTrait for SoroswapAdapter {
         Ok(())
     }
 
-    fn harvest(e: Env, from: Address) -> Result<(), StrategyError> {
+    fn harvest(e: Env, _from: Address) -> Result<(), StrategyError> {
         check_initialized(&e)?;
         extend_instance_ttl(&e);
 
@@ -146,7 +146,7 @@ impl DeFindexStrategyTrait for SoroswapAdapter {
 
     fn withdraw(
         e: Env,
-        amount: i128,
+        _amount: i128,
         from: Address,
     ) -> Result<i128, StrategyError> {
         from.require_auth();
@@ -186,7 +186,7 @@ impl DeFindexStrategyTrait for SoroswapAdapter {
         ]);
 
         // Remove liquidity
-        let (usdc_amount, xlm_amount) = soroswap_router_client.remove_liquidity(
+        let (_usdc_amount, xlm_amount) = soroswap_router_client.remove_liquidity(
             &usdc_address,
             &xlm_address,
             &lp_balance,
diff --git a/apps/contracts/strategies/xycloans/src/lib.rs b/apps/contracts/strategies/xycloans/src/lib.rs
index c47d5732..8383087f 100644
--- a/apps/contracts/strategies/xycloans/src/lib.rs
+++ b/apps/contracts/strategies/xycloans/src/lib.rs
@@ -5,11 +5,11 @@ mod storage;
 mod soroswap_router;
 mod xycloans_pool;
 
-use soroban_sdk::{auth::{ContractContext, InvokerContractAuthEntry, SubContractInvocation}, contract, contractimpl, vec, Address, Env, IntoVal, Symbol, Val, Vec};
+use soroban_sdk::{contract, contractimpl, Address, Env, IntoVal, Val, Vec};
 use storage::{
-    extend_instance_ttl, get_soroswap_router_address, get_pool_token, get_token_in, get_xycloans_pool_address, is_initialized, set_initialized, set_soroswap_router_address, set_pool_token, set_token_in, set_xycloans_pool_address, set_soroswap_factory_address, get_soroswap_factory_address
+    extend_instance_ttl, get_pool_token, get_token_in, get_xycloans_pool_address, is_initialized, set_initialized, set_soroswap_router_address, set_pool_token, set_token_in, set_xycloans_pool_address, set_soroswap_factory_address, get_soroswap_factory_address
 };
-use soroswap_router::{get_amount_out, get_reserves, pair_for, swap, SoroswapRouterClient};
+use soroswap_router::{get_amount_out, get_reserves, swap};
 use xycloans_pool::XycloansPoolClient;
 use defindex_strategy_core::{StrategyError, DeFindexStrategyTrait};
 
@@ -92,7 +92,7 @@ impl DeFindexStrategyTrait for XycloansAdapter {
         Ok(())
     }
 
-    fn harvest(e: Env, from: Address) -> Result<(), StrategyError> {
+    fn harvest(e: Env, _from: Address) -> Result<(), StrategyError> {
         check_initialized(&e)?;
         extend_instance_ttl(&e);
 
@@ -101,7 +101,7 @@ impl DeFindexStrategyTrait for XycloansAdapter {
 
     fn withdraw(
         e: Env,
-        amount: i128,
+        _amount: i128,
         from: Address,
     ) -> Result<i128, StrategyError> {
         from.require_auth();

From 7eefd81dfe577fcc2a23fa6eea69009b51b5d267 Mon Sep 17 00:00:00 2001
From: esteblock <estebaniglesiasmanriquez@gmail.com>
Date: Mon, 11 Nov 2024 10:37:39 -0300
Subject: [PATCH 39/39] clean warnings vault and factory

---
 apps/contracts/factory/src/test.rs            |  2 +-
 apps/contracts/factory/src/test/all_flow.rs   |  2 +-
 apps/contracts/factory/src/test/initialize.rs |  2 +-
 apps/contracts/vault/src/lib.rs               |  2 +-
 apps/contracts/vault/src/test/deposit.rs      |  4 +-
 apps/contracts/vault/src/test/initialize.rs   |  2 +-
 apps/contracts/vault/src/token/mod.rs         |  2 +-
 apps/contracts/vault/src/utils.rs             | 68 +++++++++----------
 8 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/apps/contracts/factory/src/test.rs b/apps/contracts/factory/src/test.rs
index dc9e065d..0a3d4368 100644
--- a/apps/contracts/factory/src/test.rs
+++ b/apps/contracts/factory/src/test.rs
@@ -43,7 +43,7 @@ mod defindex_vault_contract {
 
 // Create Test Token
 pub(crate) fn create_token_contract<'a>(e: &Env, admin: &Address) -> SorobanTokenClient<'a> {
-    SorobanTokenClient::new(e, &e.register_stellar_asset_contract(admin.clone()))
+    SorobanTokenClient::new(e, &e.register_stellar_asset_contract_v2(admin.clone()).address())
 }
 
 pub(crate) fn get_token_admin_client<'a>(
diff --git a/apps/contracts/factory/src/test/all_flow.rs b/apps/contracts/factory/src/test/all_flow.rs
index fa0e5e9b..52405f9d 100644
--- a/apps/contracts/factory/src/test/all_flow.rs
+++ b/apps/contracts/factory/src/test/all_flow.rs
@@ -1,4 +1,4 @@
-use soroban_sdk::{vec, BytesN, Map, String, Vec};
+use soroban_sdk::{vec, BytesN, String};
 
 use crate::test::{create_asset_params, defindex_vault_contract::{self, Investment}, DeFindexFactoryTest};
 
diff --git a/apps/contracts/factory/src/test/initialize.rs b/apps/contracts/factory/src/test/initialize.rs
index 7455baff..64cd8abc 100644
--- a/apps/contracts/factory/src/test/initialize.rs
+++ b/apps/contracts/factory/src/test/initialize.rs
@@ -1,4 +1,4 @@
-use soroban_sdk::{vec, Address, BytesN, String, Vec};
+use soroban_sdk::{BytesN, String};
 
 use crate::error::FactoryError;
 use crate::test::{create_asset_params, DeFindexFactoryTest};
diff --git a/apps/contracts/vault/src/lib.rs b/apps/contracts/vault/src/lib.rs
index 69a52ada..6f45c7c1 100755
--- a/apps/contracts/vault/src/lib.rs
+++ b/apps/contracts/vault/src/lib.rs
@@ -33,7 +33,7 @@ use models::{
     OptionalSwapDetailsExactOut,
 };
 use storage::{
-    get_assets, set_asset, set_defindex_protocol_fee_receiver, set_factory, set_last_fee_assesment,
+    get_assets, set_asset, set_defindex_protocol_fee_receiver, set_factory,
     set_total_assets, set_vault_fee, extend_instance_ttl
 };
 use strategies::{
diff --git a/apps/contracts/vault/src/test/deposit.rs b/apps/contracts/vault/src/test/deposit.rs
index 0da6e6a0..35626a23 100644
--- a/apps/contracts/vault/src/test/deposit.rs
+++ b/apps/contracts/vault/src/test/deposit.rs
@@ -71,7 +71,7 @@ fn deposit_amounts_desired_more_length() {
     let test = DeFindexVaultTest::setup();
     test.env.mock_all_auths();
     let strategy_params_token0 = create_strategy_params_token0(&test);
-    let strategy_params_token1 = create_strategy_params_token1(&test);
+    // let strategy_params_token1 = create_strategy_params_token1(&test);
 
     // initialize with 2 assets
     let assets: Vec<AssetAllocation> = sorobanvec![
@@ -669,7 +669,7 @@ fn deposit_several_assets_min_greater_than_optimal() {
     assert_eq!(deposit_result, Err(Ok(ContractError::InsufficientAmount)));
     
     // now we manage to deposit
-    let deposit_result=test.defindex_contract.deposit(
+    test.defindex_contract.deposit(
         &sorobanvec![&test.env, amount0, amount1],
         &sorobanvec![&test.env, amount0, amount1],
         &users[0],
diff --git a/apps/contracts/vault/src/test/initialize.rs b/apps/contracts/vault/src/test/initialize.rs
index 4c5faf24..9c9e5fa0 100644
--- a/apps/contracts/vault/src/test/initialize.rs
+++ b/apps/contracts/vault/src/test/initialize.rs
@@ -86,7 +86,7 @@ fn test_initialize_with_unsupported_strategy() {
 #[test]
 fn test_initialize_with_empty_asset_allocation() {
     let test = DeFindexVaultTest::setup();
-    let strategy_params_token0 = create_strategy_params_token0(&test);
+    // let strategy_params_token0 = create_strategy_params_token0(&test);
 
     let assets: Vec<AssetAllocation> = sorobanvec![&test.env];
 
diff --git a/apps/contracts/vault/src/token/mod.rs b/apps/contracts/vault/src/token/mod.rs
index 77d0ace3..869bda67 100644
--- a/apps/contracts/vault/src/token/mod.rs
+++ b/apps/contracts/vault/src/token/mod.rs
@@ -8,6 +8,6 @@ mod storage_types;
 mod total_supply;
 
 pub use contract::VaultToken;
-pub use contract::VaultTokenClient;
+// pub use contract::VaultTokenClient;
 pub use contract::{internal_burn, internal_mint};
 pub use metadata::write_metadata;
diff --git a/apps/contracts/vault/src/utils.rs b/apps/contracts/vault/src/utils.rs
index d8f9bad5..fd893167 100644
--- a/apps/contracts/vault/src/utils.rs
+++ b/apps/contracts/vault/src/utils.rs
@@ -83,40 +83,40 @@ pub fn calculate_asset_amounts_for_dftokens(
     asset_amounts
 }
 
-pub fn calculate_dftokens_from_asset_amounts(
-    env: &Env,
-    asset_amounts: Map<Address, i128>, // The input asset amounts
-    total_managed_funds: Map<Address, i128>, // The total managed funds for each asset
-) -> Result<i128, ContractError> {
-    let total_supply = VaultToken::total_supply(env.clone()); // Total dfToken supply
-
-    // Initialize the minimum dfTokens corresponding to each asset
-    let mut min_df_tokens: Option<i128> = None;
-
-    // Iterate over each asset in the input map
-    for (asset_address, input_amount) in asset_amounts.iter() {
-        // Get the total managed amount for this asset
-        let managed_amount = total_managed_funds.get(asset_address.clone()).unwrap_or(0);
-
-        // Ensure the managed amount is not zero to prevent division by zero
-        if managed_amount == 0 {
-            return Err(ContractError::InsufficientManagedFunds);
-        }
-
-        // Calculate the dfTokens corresponding to this asset's amount
-        let df_tokens_for_asset = (input_amount * total_supply) / managed_amount;
-
-        // If this is the first asset or if the calculated df_tokens_for_asset is smaller, update the minimum df_tokens
-        if let Some(current_min_df_tokens) = min_df_tokens {
-            min_df_tokens = Some(current_min_df_tokens.min(df_tokens_for_asset));
-        } else {
-            min_df_tokens = Some(df_tokens_for_asset);
-        }
-    }
-
-    // Return the minimum dfTokens across all assets
-    min_df_tokens.ok_or(ContractError::NoAssetsProvided)
-}
+// pub fn calculate_dftokens_from_asset_amounts(
+//     env: &Env,
+//     asset_amounts: Map<Address, i128>, // The input asset amounts
+//     total_managed_funds: Map<Address, i128>, // The total managed funds for each asset
+// ) -> Result<i128, ContractError> {
+//     let total_supply = VaultToken::total_supply(env.clone()); // Total dfToken supply
+
+//     // Initialize the minimum dfTokens corresponding to each asset
+//     let mut min_df_tokens: Option<i128> = None;
+
+//     // Iterate over each asset in the input map
+//     for (asset_address, input_amount) in asset_amounts.iter() {
+//         // Get the total managed amount for this asset
+//         let managed_amount = total_managed_funds.get(asset_address.clone()).unwrap_or(0);
+
+//         // Ensure the managed amount is not zero to prevent division by zero
+//         if managed_amount == 0 {
+//             return Err(ContractError::InsufficientManagedFunds);
+//         }
+
+//         // Calculate the dfTokens corresponding to this asset's amount
+//         let df_tokens_for_asset = (input_amount * total_supply) / managed_amount;
+
+//         // If this is the first asset or if the calculated df_tokens_for_asset is smaller, update the minimum df_tokens
+//         if let Some(current_min_df_tokens) = min_df_tokens {
+//             min_df_tokens = Some(current_min_df_tokens.min(df_tokens_for_asset));
+//         } else {
+//             min_df_tokens = Some(df_tokens_for_asset);
+//         }
+//     }
+
+//     // Return the minimum dfTokens across all assets
+//     min_df_tokens.ok_or(ContractError::NoAssetsProvided)
+// }
 
 pub fn calculate_optimal_amounts_and_shares_with_enforced_asset(
     e: &Env,