@glamsystems/glam-sdk 1.0.14-alpha.3 → 1.0.14-alpha.5

package/index.cjs.js

@@ -47360,7 +47360,11 @@ let TxBuilder$g = class TxBuilder extends BaseTxBuilder {
         const inputStakePool = STAKE_POOLS_MAP.get(inputMint.toBase58())?.poolState || null;
         const outputStakePool = STAKE_POOLS_MAP.get(outputMint.toBase58())?.poolState || null;
         const preInstructions = await this.getPreInstructions(glamSigner, inputMint, outputMint, amount, outputTokenProgram);
-        // glam_config is auto-resolved by Anchor via its PDA seeds declaration.
+        if (oracleAccounts?.kaminoReservesToRefresh && oracleAccounts.kaminoReservesToRefresh.length > 0) {
+            const reserves = await this.client.klend.fetchAndParseReserves(oracleAccounts.kaminoReservesToRefresh);
+            const refreshReservesIx = this.client.klend.txBuilder.refreshReservesBatchIx(reserves, false);
+            preInstructions.push(refreshReservesIx);
+        }
         const ix = await this.client.base.protocolProgram.methods.jupiterSwapV2(skipQuotePriceCheck, swapIx.data).accounts({
             glamState: this.client.base.statePda,
             glamSigner,
@@ -47430,9 +47434,10 @@ class JupiterSwapClient {
         const tx = await this.txBuilder.swapV2Tx(options, txOptions);
         return await this.base.sendAndConfirm(tx);
     }
-    constructor(base, vault){
+    constructor(base, vault, klend){
         this.base = base;
         this.vault = vault;
+        this.klend = klend;
         this.txBuilder = new TxBuilder$g(this);
         this.jupApi = this.base.jupiterApiClient || new JupiterApiClient({
             apiKey: this.base.jupiterApiKey
@@ -48175,8 +48180,7 @@ class Reserve extends Decodable {
     get liquidityFeeReceiver() {
         return web3_js.PublicKey.findProgramAddressSync([
             Buffer.from("fee_receiver"),
-            this.lendingMarket.toBuffer(),
-            this.liquidity.mintPubkey.toBuffer()
+            this._address.toBuffer()
         ], KAMINO_LENDING_PROGRAM)[0];
     }
     get farmDebtNullable() {
@@ -54170,7 +54174,7 @@ class EpiClient {
     }
     get jupiterSwap() {
         if (!this._jupiterSwap) {
-            this._jupiterSwap = new JupiterSwapClient(this, this.vault);
+            this._jupiterSwap = new JupiterSwapClient(this, this.vault, this.kaminoLending);
         }
         return this._jupiterSwap;
     }

package/index.esm.js

@@ -47340,7 +47340,11 @@ let TxBuilder$g = class TxBuilder extends BaseTxBuilder {
         const inputStakePool = STAKE_POOLS_MAP.get(inputMint.toBase58())?.poolState || null;
         const outputStakePool = STAKE_POOLS_MAP.get(outputMint.toBase58())?.poolState || null;
         const preInstructions = await this.getPreInstructions(glamSigner, inputMint, outputMint, amount, outputTokenProgram);
-        // glam_config is auto-resolved by Anchor via its PDA seeds declaration.
+        if (oracleAccounts?.kaminoReservesToRefresh && oracleAccounts.kaminoReservesToRefresh.length > 0) {
+            const reserves = await this.client.klend.fetchAndParseReserves(oracleAccounts.kaminoReservesToRefresh);
+            const refreshReservesIx = this.client.klend.txBuilder.refreshReservesBatchIx(reserves, false);
+            preInstructions.push(refreshReservesIx);
+        }
         const ix = await this.client.base.protocolProgram.methods.jupiterSwapV2(skipQuotePriceCheck, swapIx.data).accounts({
             glamState: this.client.base.statePda,
             glamSigner,
@@ -47410,9 +47414,10 @@ class JupiterSwapClient {
         const tx = await this.txBuilder.swapV2Tx(options, txOptions);
         return await this.base.sendAndConfirm(tx);
     }
-    constructor(base, vault){
+    constructor(base, vault, klend){
         this.base = base;
         this.vault = vault;
+        this.klend = klend;
         this.txBuilder = new TxBuilder$g(this);
         this.jupApi = this.base.jupiterApiClient || new JupiterApiClient({
             apiKey: this.base.jupiterApiKey
@@ -48155,8 +48160,7 @@ class Reserve extends Decodable {
     get liquidityFeeReceiver() {
         return PublicKey.findProgramAddressSync([
             Buffer.from("fee_receiver"),
-            this.lendingMarket.toBuffer(),
-            this.liquidity.mintPubkey.toBuffer()
+            this._address.toBuffer()
         ], KAMINO_LENDING_PROGRAM)[0];
     }
     get farmDebtNullable() {
@@ -54150,7 +54154,7 @@ class EpiClient {
     }
     get jupiterSwap() {
         if (!this._jupiterSwap) {
-            this._jupiterSwap = new JupiterSwapClient(this, this.vault);
+            this._jupiterSwap = new JupiterSwapClient(this, this.vault, this.kaminoLending);
         }
         return this._jupiterSwap;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@glamsystems/glam-sdk",
-  "version": "1.0.14-alpha.3",
+  "version": "1.0.14-alpha.5",
   "description": "TypeScript SDK for the GLAM Protocol",
   "main": "./index.cjs.js",
   "module": "./index.esm.js",

package/src/client/jupiter.d.ts

@@ -3,6 +3,7 @@ import { PublicKey, TransactionInstruction, TransactionSignature, VersionedTrans
 import { BaseClient, BaseTxBuilder, TxOptions } from "./base";
 import { VaultClient } from "./vault";
 import { JupiterApiClient, JupiterInstruction, QuoteParams, QuoteResponse, SwapInstructions } from "../utils/jupiterApi";
+import { KaminoLendingClient } from "./kamino";
 export type JupiterSwapOptions = {
     quoteParams?: QuoteParams;
     quoteResponse?: QuoteResponse;
@@ -13,6 +14,7 @@ export type JupiterSwapV2OracleAccounts = {
     solUsdOracle?: PublicKey;
     inputTokenOracle?: PublicKey;
     outputTokenOracle?: PublicKey;
+    kaminoReservesToRefresh: PublicKey[];
 };
 export type JupiterSwapV2Options = JupiterSwapOptions & {
     skipQuotePriceCheck?: boolean;
@@ -33,9 +35,10 @@ declare class TxBuilder extends BaseTxBuilder<JupiterSwapClient> {
 export declare class JupiterSwapClient {
     readonly base: BaseClient;
     readonly vault: VaultClient;
+    readonly klend: KaminoLendingClient;
     readonly txBuilder: TxBuilder;
     readonly jupApi: JupiterApiClient;
-    constructor(base: BaseClient, vault: VaultClient);
+    constructor(base: BaseClient, vault: VaultClient, klend: KaminoLendingClient);
     swap(options: JupiterSwapOptions, txOptions?: TxOptions): Promise<TransactionSignature>;
     swapV2(options: JupiterSwapV2Options, txOptions?: TxOptions): Promise<TransactionSignature>;
 }