@kamino-finance/klend-sdk 5.10.35-beta.0 → 5.10.35-beta.1

package/src/utils/userMetadata.ts

@@ -267,18 +267,18 @@ function getMultiplyObligationAndObligationFarmStateAddresses(
       if (!collReserve.state.farmCollateral.equals(PublicKey.default)) {
         farmUserStates.push({
           address: obligationFarmStatePda(
-            multiplyObligation.toPda(kaminoMarket.getAddress(), user),
-            collReserve.state.farmCollateral!
-          )[0],
+            collReserve.state.farmCollateral!,
+            multiplyObligation.toPda(kaminoMarket.getAddress(), user)
+          ),
           log: 'collReserve farmState for multiply obligation coll: ' + collMintString + ' debt: ' + debtMintString,
         });
       }
       if (!debtReserve.state.farmDebt.equals(PublicKey.default)) {
         farmUserStates.push({
           address: obligationFarmStatePda(
-            multiplyObligation.toPda(kaminoMarket.getAddress(), user),
-            debtReserve.state.farmDebt!
-          )[0],
+            debtReserve.state.farmDebt!,
+            multiplyObligation.toPda(kaminoMarket.getAddress(), user)
+          ),
           log: 'debtReserve farmState for multiply obligation coll: ' + collMintString + ' debt: ' + debtMintString,
         });
       }
@@ -310,18 +310,18 @@ function getLeverageObligationAndObligationFarmStateAddresses(
       if (!collReserve.state.farmCollateral.equals(PublicKey.default)) {
         farmUserStates.push({
           address: obligationFarmStatePda(
-            leverageObligation.toPda(kaminoMarket.getAddress(), user),
-            collReserve.state.farmCollateral!
-          )[0],
+            collReserve.state.farmCollateral!,
+            leverageObligation.toPda(kaminoMarket.getAddress(), user)
+          ),
           log: 'collReserve farmState for leverage obligation coll: ' + collMintString + ' debt: ' + debtMintString,
         });
       }
       if (!debtReserve.state.farmDebt.equals(PublicKey.default)) {
         farmUserStates.push({
           address: obligationFarmStatePda(
-            leverageObligation.toPda(kaminoMarket.getAddress(), user),
-            debtReserve.state.farmDebt!
-          )[0],
+            debtReserve.state.farmDebt!,
+            leverageObligation.toPda(kaminoMarket.getAddress(), user)
+          ),
           log: 'debtReserve farmState for leverage obligation coll: ' + collMintString + ' debt: ' + debtMintString,
         });
       }
@@ -342,7 +342,7 @@ function getRepayWithCollObligationFarmStateAddresses(
     const borrowReserve = kaminoMarket.getReserveByMint(borrow.mintAddress)!;
     if (!borrowReserve.state.farmDebt.equals(PublicKey.default)) {
       farmUserStates.push({
-        address: obligationFarmStatePda(obligation.obligationAddress, borrowReserve.state.farmDebt!)[0],
+        address: obligationFarmStatePda(borrowReserve.state.farmDebt!, obligation.obligationAddress),
         log: 'debtReserve farmState for vanilla obligation: ' + obligationString,
       });
     }
@@ -352,7 +352,7 @@ function getRepayWithCollObligationFarmStateAddresses(
     const depositReserve = kaminoMarket.getReserveByMint(deposit.mintAddress)!;
     if (!depositReserve.state.farmCollateral.equals(PublicKey.default)) {
       farmUserStates.push({
-        address: obligationFarmStatePda(obligation.obligationAddress, depositReserve.state.farmCollateral!)[0],
+        address: obligationFarmStatePda(depositReserve.state.farmCollateral!, obligation.obligationAddress),
         log: 'collReserve farmState for vanilla obligation' + obligationString,
       });
     }

package/dist/classes/lut_utils.d.ts

@@ -1,29 +0,0 @@
-import { Connection, PublicKey, TransactionInstruction } from '@solana/web3.js';
-/**
- * This method retuns an instruction that creates a lookup table, alongside the pubkey of the lookup table
- * @param payer - the owner of the lookup table
- * @param slot - the current slot
- * @returns - the instruction to create the lookup table and its address
- */
-export declare function initLookupTableIx(payer: PublicKey, slot: number): [TransactionInstruction, PublicKey];
-/**
- * This method retuns an instruction that deactivates a lookup table, which is needed to close it
- * @param payer - the owner of the lookup table
- * @param lookupTable - the lookup table to deactivate
- * @returns - the instruction to deactivate the lookup table
- */
-export declare function deactivateLookupTableIx(payer: PublicKey, lookupTable: PublicKey): TransactionInstruction;
-/**
- * This method returns an instruction that closes a lookup table. That lookup table needs to be disabled at least 500 blocks before closing it.
- * @param payer - the owner of the lookup table
- * @param lookupTable - the lookup table to close
- * @returns - the instruction to close the lookup table
- */
-export declare function closeLookupTableIx(payer: PublicKey, lookupTable: PublicKey): TransactionInstruction;
-/**
- * Returns the accounts in a lookup table
- * @param lookupTable - lookup table to get the accounts from
- * @returns - an array of accounts in the lookup table
- */
-export declare function getAccountsInLUT(connection: Connection, lookupTable: PublicKey): Promise<PublicKey[]>;
-//# sourceMappingURL=lut_utils.d.ts.map

package/dist/classes/lut_utils.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"lut_utils.d.ts","sourceRoot":"","sources":["../../src/classes/lut_utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAA6B,UAAU,EAAE,SAAS,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAC;AAE3G;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,GAAG,CAAC,sBAAsB,EAAE,SAAS,CAAC,CAQrG;AAED;;;;;GAKG;AACH,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE,SAAS,GAAG,sBAAsB,CAOxG;AAED;;;;;GAKG;AAEH,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE,SAAS,GAAG,sBAAsB,CAQnG;AAED;;;;GAIG;AACH,wBAAsB,gBAAgB,CAAC,UAAU,EAAE,UAAU,EAAE,WAAW,EAAE,SAAS,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC,CAO3G"}

package/dist/classes/lut_utils.js

@@ -1,62 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.initLookupTableIx = initLookupTableIx;
-exports.deactivateLookupTableIx = deactivateLookupTableIx;
-exports.closeLookupTableIx = closeLookupTableIx;
-exports.getAccountsInLUT = getAccountsInLUT;
-const web3_js_1 = require("@solana/web3.js");
-/**
- * This method retuns an instruction that creates a lookup table, alongside the pubkey of the lookup table
- * @param payer - the owner of the lookup table
- * @param slot - the current slot
- * @returns - the instruction to create the lookup table and its address
- */
-function initLookupTableIx(payer, slot) {
-    const [ixn, address] = web3_js_1.AddressLookupTableProgram.createLookupTable({
-        authority: payer,
-        payer,
-        recentSlot: slot,
-    });
-    return [ixn, address];
-}
-/**
- * This method retuns an instruction that deactivates a lookup table, which is needed to close it
- * @param payer - the owner of the lookup table
- * @param lookupTable - the lookup table to deactivate
- * @returns - the instruction to deactivate the lookup table
- */
-function deactivateLookupTableIx(payer, lookupTable) {
-    const ixn = web3_js_1.AddressLookupTableProgram.deactivateLookupTable({
-        authority: payer,
-        lookupTable: lookupTable,
-    });
-    return ixn;
-}
-/**
- * This method returns an instruction that closes a lookup table. That lookup table needs to be disabled at least 500 blocks before closing it.
- * @param payer - the owner of the lookup table
- * @param lookupTable - the lookup table to close
- * @returns - the instruction to close the lookup table
- */
-/// this require the LUT to be deactivated at least 500 blocks before
-function closeLookupTableIx(payer, lookupTable) {
-    const ixn = web3_js_1.AddressLookupTableProgram.closeLookupTable({
-        authority: payer,
-        recipient: payer,
-        lookupTable: lookupTable,
-    });
-    return ixn;
-}
-/**
- * Returns the accounts in a lookup table
- * @param lookupTable - lookup table to get the accounts from
- * @returns - an array of accounts in the lookup table
- */
-async function getAccountsInLUT(connection, lookupTable) {
-    const lutState = await connection.getAddressLookupTable(lookupTable);
-    if (!lutState || !lutState.value) {
-        throw new Error(`Lookup table ${lookupTable} not found`);
-    }
-    return lutState.value.state.addresses;
-}
-//# sourceMappingURL=lut_utils.js.map

package/dist/classes/lut_utils.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"lut_utils.js","sourceRoot":"","sources":["../../src/classes/lut_utils.ts"],"names":[],"mappings":";;AAQA,8CAQC;AAQD,0DAOC;AASD,gDAQC;AAOD,4CAOC;AA9DD,6CAA2G;AAE3G;;;;;GAKG;AACH,SAAgB,iBAAiB,CAAC,KAAgB,EAAE,IAAY;IAC9D,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,GAAG,mCAAyB,CAAC,iBAAiB,CAAC;QACjE,SAAS,EAAE,KAAK;QAChB,KAAK;QACL,UAAU,EAAE,IAAI;KACjB,CAAC,CAAC;IAEH,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;AACxB,CAAC;AAED;;;;;GAKG;AACH,SAAgB,uBAAuB,CAAC,KAAgB,EAAE,WAAsB;IAC9E,MAAM,GAAG,GAAG,mCAAyB,CAAC,qBAAqB,CAAC;QAC1D,SAAS,EAAE,KAAK;QAChB,WAAW,EAAE,WAAW;KACzB,CAAC,CAAC;IAEH,OAAO,GAAG,CAAC;AACb,CAAC;AAED;;;;;GAKG;AACH,qEAAqE;AACrE,SAAgB,kBAAkB,CAAC,KAAgB,EAAE,WAAsB;IACzE,MAAM,GAAG,GAAG,mCAAyB,CAAC,gBAAgB,CAAC;QACrD,SAAS,EAAE,KAAK;QAChB,SAAS,EAAE,KAAK;QAChB,WAAW,EAAE,WAAW;KACzB,CAAC,CAAC;IAEH,OAAO,GAAG,CAAC;AACb,CAAC;AAED;;;;GAIG;AACI,KAAK,UAAU,gBAAgB,CAAC,UAAsB,EAAE,WAAsB;IACnF,MAAM,QAAQ,GAAG,MAAM,UAAU,CAAC,qBAAqB,CAAC,WAAW,CAAC,CAAC;IACrE,IAAI,CAAC,QAAQ,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;QACjC,MAAM,IAAI,KAAK,CAAC,gBAAgB,WAAW,YAAY,CAAC,CAAC;IAC3D,CAAC;IAED,OAAO,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC;AACxC,CAAC"}

package/src/classes/lut_utils.ts

@@ -1,63 +0,0 @@
-import { AddressLookupTableProgram, Connection, PublicKey, TransactionInstruction } from '@solana/web3.js';
-
-/**
- * This method retuns an instruction that creates a lookup table, alongside the pubkey of the lookup table
- * @param payer - the owner of the lookup table
- * @param slot - the current slot
- * @returns - the instruction to create the lookup table and its address
- */
-export function initLookupTableIx(payer: PublicKey, slot: number): [TransactionInstruction, PublicKey] {
-  const [ixn, address] = AddressLookupTableProgram.createLookupTable({
-    authority: payer,
-    payer,
-    recentSlot: slot,
-  });
-
-  return [ixn, address];
-}
-
-/**
- * This method retuns an instruction that deactivates a lookup table, which is needed to close it
- * @param payer - the owner of the lookup table
- * @param lookupTable - the lookup table to deactivate
- * @returns - the instruction to deactivate the lookup table
- */
-export function deactivateLookupTableIx(payer: PublicKey, lookupTable: PublicKey): TransactionInstruction {
-  const ixn = AddressLookupTableProgram.deactivateLookupTable({
-    authority: payer,
-    lookupTable: lookupTable,
-  });
-
-  return ixn;
-}
-
-/**
- * This method returns an instruction that closes a lookup table. That lookup table needs to be disabled at least 500 blocks before closing it.
- * @param payer - the owner of the lookup table
- * @param lookupTable - the lookup table to close
- * @returns - the instruction to close the lookup table
- */
-/// this require the LUT to be deactivated at least 500 blocks before
-export function closeLookupTableIx(payer: PublicKey, lookupTable: PublicKey): TransactionInstruction {
-  const ixn = AddressLookupTableProgram.closeLookupTable({
-    authority: payer,
-    recipient: payer,
-    lookupTable: lookupTable,
-  });
-
-  return ixn;
-}
-
-/**
- * Returns the accounts in a lookup table
- * @param lookupTable - lookup table to get the accounts from
- * @returns - an array of accounts in the lookup table
- */
-export async function getAccountsInLUT(connection: Connection, lookupTable: PublicKey): Promise<PublicKey[]> {
-  const lutState = await connection.getAddressLookupTable(lookupTable);
-  if (!lutState || !lutState.value) {
-    throw new Error(`Lookup table ${lookupTable} not found`);
-  }
-
-  return lutState.value.state.addresses;
-}