@kamino-finance/klend-sdk 7.2.2 → 7.2.4

package/dist/classes/vault.js

@@ -155,6 +155,7 @@ class KaminoVaultClient {
             adminTokenAccount,
         };
         const initVaultIx = (0, instructions_1.initVault)(initVaultAccounts, undefined, this._kaminoVaultProgramId);
+        const createVaultFarm = await this.createVaultFarm(vaultConfig.admin, vaultState.address, sharesMint);
         // create and set up the vault lookup table
         const [createLUTIx, lut] = await (0, lookupTable_1.initLookupTableIx)(vaultConfig.admin, slot);
         const accountsToBeInserted = [
@@ -169,6 +170,8 @@ class KaminoVaultClient {
             token_1.TOKEN_PROGRAM_ADDRESS,
             this._kaminoLendProgramId,
             sysvars_1.SYSVAR_INSTRUCTIONS_ADDRESS,
+            createVaultFarm.farm.address,
+            farm_utils_1.FARMS_GLOBAL_CONFIG_MAINNET,
         ];
         const insertIntoLUTIxs = await (0, lookupTable_1.insertIntoLookupTableIxs)(this.getConnection(), vaultConfig.admin, lut, accountsToBeInserted, []);
         const setLUTIx = this.updateUninitialisedVaultConfigIx(vaultConfig.admin, vaultState.address, new types_1.VaultConfigField.LookupTable(), lut.toString());
@@ -185,6 +188,7 @@ class KaminoVaultClient {
             const setNameIx = this.updateUninitialisedVaultConfigIx(vaultConfig.admin, vaultState.address, new types_1.VaultConfigField.Name(), vaultConfig.name);
             ixs.push(setNameIx);
         }
+        const setFarmIx = this.updateUninitialisedVaultConfigIx(vaultConfig.admin, vaultState.address, new types_1.VaultConfigField.Farm(), createVaultFarm.farm.address);
         const metadataIx = await this.getSetSharesMetadataIx(this.getConnection(), vaultConfig.admin, vaultState.address, sharesMint, baseVaultAuthority, vaultConfig.vaultTokenSymbol, vaultConfig.vaultTokenName);
         return {
             vault: vaultState,
@@ -196,9 +200,30 @@ class KaminoVaultClient {
                 populateLUTIxs: insertIntoLUTIxs,
                 cleanupIxs,
                 initSharesMetadataIx: metadataIx,
+                createVaultFarm,
+                setFarmToVaultIx: setFarmIx,
             },
         };
     }
+    /**
+     * This method creates a farm for a vault
+     * @param signer - the signer of the transaction
+     * @param vaultSharesMint - the mint of the vault shares
+     * @param vaultAddress - the address of the vault (it doesn't need to be already initialized)
+     * @returns a struct with the farm, the setup farm ixs and the update farm ixs
+     */
+    async createVaultFarm(signer, vaultAddress, vaultSharesMint) {
+        const farmsSDK = new farms_sdk_1.Farms(this._rpc);
+        const farm = await (0, kit_1.generateKeyPairSigner)();
+        const ixs = await farmsSDK.createFarmIxs(signer, farm, farm_utils_1.FARMS_GLOBAL_CONFIG_MAINNET, vaultSharesMint);
+        const updatePendingFarmAdminIx = await farmsSDK.updateFarmConfigIx(signer, farm.address, lib_1.DEFAULT_PUBLIC_KEY, new dist_1.FarmConfigOption.UpdatePendingFarmAdmin(), farm_utils_1.FARMS_ADMIN_MAINNET, undefined, undefined, true);
+        const updateFarmVaultIdIx = await farmsSDK.updateFarmConfigIx(signer, farm.address, lib_1.DEFAULT_PUBLIC_KEY, new dist_1.FarmConfigOption.UpdateVaultId(), vaultAddress, undefined, undefined, true);
+        return {
+            farm,
+            setupFarmIxs: ixs,
+            updateFarmIxs: [updatePendingFarmAdminIx, updateFarmVaultIdIx],
+        };
+    }
     /**
      * This method creates an instruction to set the shares metadata for a vault
      * @param rpc
@@ -412,9 +437,11 @@ class KaminoVaultClient {
      * @param mode the field to update (based on VaultConfigFieldKind enum)
      * @param value the value to update the field with
      * @param [vaultAdminAuthority] the signer of the transaction. Optional. If not provided the admin of the vault will be used. It should be used when changing the admin of the vault if we want to build or batch multiple ixs in the same tx
+     * @param [lutIxsSigner] the signer of the transaction to be used for the lookup table instructions. Optional. If not provided the admin of the vault will be used. It should be used when changing the admin of the vault if we want to build or batch multiple ixs in the same tx
+     * @param [skipLutUpdate] if true, the lookup table instructions will not be included in the returned instructions
      * @returns a struct that contains the instruction to update the field and an optional list of instructions to update the lookup table
      */
-    async updateVaultConfigIxs(vault, mode, value, vaultAdminAuthority) {
+    async updateVaultConfigIxs(vault, mode, value, vaultAdminAuthority, lutIxsSigner, skipLutUpdate = false) {
         const vaultState = await vault.getState();
         const admin = parseVaultAdmin(vaultState, vaultAdminAuthority);
         const updateVaultConfigAccs = {
@@ -449,22 +476,25 @@ class KaminoVaultClient {
         let updateVaultConfigIx = (0, instructions_1.updateVaultConfig)(updateVaultConfigArgs, updateVaultConfigAccs, undefined, this._kaminoVaultProgramId);
         updateVaultConfigIx = this.appendRemainingAccountsForVaultReserves(updateVaultConfigIx, vaultReserves, vaultReservesState);
         const updateLUTIxs = [];
-        if (mode.kind === new types_1.VaultConfigField.PendingVaultAdmin().kind) {
-            const newPubkey = (0, kit_1.address)(value);
-            const insertIntoLutIxs = await (0, lookupTable_1.insertIntoLookupTableIxs)(this.getConnection(), admin, vaultState.vaultLookupTable, [newPubkey]);
-            updateLUTIxs.push(...insertIntoLutIxs);
-        }
-        else if (mode.kind === new types_1.VaultConfigField.Farm().kind) {
-            const keysToAddToLUT = [(0, kit_1.address)(value)];
-            // if the farm already exist we want to read its state to add it to the LUT
-            try {
-                const farmState = await dist_1.FarmState.fetch(this.getConnection(), keysToAddToLUT[0]);
-                keysToAddToLUT.push(farmState.farmVault, farmState.farmVaultsAuthority, farmState.token.mint, farmState.scopePrices, farmState.globalConfig);
-                const insertIntoLutIxs = await (0, lookupTable_1.insertIntoLookupTableIxs)(this.getConnection(), admin, vaultState.vaultLookupTable, keysToAddToLUT);
+        if (!skipLutUpdate) {
+            const lutIxsSignerAccount = lutIxsSigner ? lutIxsSigner : admin;
+            if (mode.kind === new types_1.VaultConfigField.PendingVaultAdmin().kind) {
+                const newPubkey = (0, kit_1.address)(value);
+                const insertIntoLutIxs = await (0, lookupTable_1.insertIntoLookupTableIxs)(this.getConnection(), lutIxsSignerAccount, vaultState.vaultLookupTable, [newPubkey]);
                 updateLUTIxs.push(...insertIntoLutIxs);
             }
-            catch (error) {
-                console.log(`Error fetching farm ${keysToAddToLUT[0].toString()} state`, error);
+            else if (mode.kind === new types_1.VaultConfigField.Farm().kind) {
+                const keysToAddToLUT = [(0, kit_1.address)(value)];
+                // if the farm already exist we want to read its state to add it to the LUT
+                try {
+                    const farmState = await dist_1.FarmState.fetch(this.getConnection(), keysToAddToLUT[0]);
+                    keysToAddToLUT.push(farmState.farmVault, farmState.farmVaultsAuthority, farmState.token.mint, farmState.scopePrices, farmState.globalConfig);
+                    const insertIntoLutIxs = await (0, lookupTable_1.insertIntoLookupTableIxs)(this.getConnection(), lutIxsSignerAccount, vaultState.vaultLookupTable, keysToAddToLUT);
+                    updateLUTIxs.push(...insertIntoLutIxs);
+                }
+                catch (error) {
+                    console.log(`Error fetching farm ${keysToAddToLUT[0].toString()} state`, error);
+                }
             }
         }
         const updateVaultConfigIxs = {
@@ -478,14 +508,16 @@ class KaminoVaultClient {
      * @param farm - the farm where the vault shares can be staked
      * @param [errorOnOverride] - if true, the function will throw an error if the vault already has a farm. If false, it will override the farm
      * @param [vaultAdminAuthority] - vault admin - a noop vaultAdminAuthority is provided when absent for multisigs
-     *
+     * @param [lutIxsSigner] - the signer of the transaction to be used for the lookup table instructions. Optional. If not provided the admin of the vault will be used. It should be used when changing the admin of the vault if we want to build or batch multiple ixs in the same tx
+     * @param [skipLutUpdate] - if true, the lookup table instructions will not be included in the returned instructions
+     * @returns - a struct that contains the instruction to update the farm and an optional list of instructions to update the lookup table
      */
-    async setVaultFarmIxs(vault, farm, errorOnOverride = true, vaultAdminAuthority) {
+    async setVaultFarmIxs(vault, farm, errorOnOverride = true, vaultAdminAuthority, lutIxsSigner, skipLutUpdate = false) {
         const vaultHasFarm = await vault.hasFarm();
         if (vaultHasFarm && errorOnOverride) {
             throw new Error('Vault already has a farm, if you want to override it set errorOnOverride to false');
         }
-        return this.updateVaultConfigIxs(vault, new types_1.VaultConfigField.Farm(), farm, vaultAdminAuthority);
+        return this.updateVaultConfigIxs(vault, new types_1.VaultConfigField.Farm(), farm, vaultAdminAuthority, lutIxsSigner, skipLutUpdate);
     }
     /**
      * This method updates the vault config for a vault that
@@ -1242,10 +1274,10 @@ class KaminoVaultClient {
         }
         const initialVaultAllocations = this.getVaultAllocations(vaultState);
         // 2. Compute the allocation
-        return this.computeReservesAllocation(holdings.totalAUMIncludingFees.sub(holdings.pendingFees), new decimal_js_1.default(vaultState.unallocatedWeight.toString()), new decimal_js_1.default(vaultState.unallocatedTokensCap.toString()), initialVaultAllocations);
+        return this.computeReservesAllocation(holdings.totalAUMIncludingFees.sub(holdings.pendingFees), new decimal_js_1.default(vaultState.unallocatedWeight.toString()), new decimal_js_1.default(vaultState.unallocatedTokensCap.toString()), initialVaultAllocations, vaultState.tokenMintDecimals.toNumber());
     }
-    computeReservesAllocation(vaultAUM, vaultUnallocatedWeight, vaultUnallocatedCap, initialVaultAllocations) {
-        return (0, vaultAllocation_1.computeReservesAllocation)(vaultAUM, vaultUnallocatedWeight, vaultUnallocatedCap, initialVaultAllocations);
+    computeReservesAllocation(vaultAUM, vaultUnallocatedWeight, vaultUnallocatedCap, initialVaultAllocations, vaultTokenDecimals) {
+        return (0, vaultAllocation_1.computeReservesAllocation)(vaultAUM, vaultUnallocatedWeight, vaultUnallocatedCap, initialVaultAllocations, vaultTokenDecimals);
     }
     /**
      * This method returns the user shares balance for a given vault
@@ -1314,9 +1346,7 @@ class KaminoVaultClient {
             if (await vault.hasFarm()) {
                 const userFarmState = allUserFarmStatesMap.get(state.vaultFarm);
                 if (userFarmState) {
-                    console.log('there is a farm state for vault', vault.address);
                     const stakedShares = (0, farm_utils_1.getSharesInFarmUserPosition)(userFarmState, state.sharesMintDecimals.toNumber());
-                    console.log('staked shares', stakedShares);
                     const userSharesBalance = vaultUserShareBalance.get(vault.address);
                     if (userSharesBalance) {
                         userSharesBalance.stakedShares = stakedShares;