@lavarage/sdk 8.0.12 → 8.0.13

package/index.ts

@@ -43,7 +43,7 @@ import {
   TOKEN_PROGRAM_ID,
 } from "@solana/spl-token";
 import { queuePubkey, USDC_MINT } from "./constants";
-import { getOracleQuoteForCollateralType, getOracleQuoteForFeedId } from "./switchboard";
+import { getOracleQuoteForCollateralType, getOracleQuoteForFeedId, getSwitchboardQueue } from "./switchboard";
 import { u8ArrayToString } from "./utils";
 import { ApiKeys } from "./crossbar";
 
@@ -59,6 +59,8 @@ type OptionalRPCResults = {
 }
 const REFFERAL_VAULT_PROGRAM_ID = new PublicKey("FFe8xWs9iBdWB6vsxg8yBLirZHsbACFNbXqAM4K3fPPB");
 
+const LAVARAGE_LOOKUP_TABLE = "CDPmKb5VggsHABwDCTaxiw5XXLjcgkqSJMNKRTzHWXwK";
+
 /**
  * Derives a Program Derived Address (PDA) for the given seed(s) and program ID
  * 
@@ -1069,7 +1071,7 @@ export const openTradeV1 = async (
 
   addressLookupTableAccounts.push(
     ...(await getAddressLookupTableAccounts([
-      "5LEAB3owNUSKvECm7vkr58tDtQpzbngQ2NYpc7qmRFdi",
+      LAVARAGE_LOOKUP_TABLE,
       ...addressLookupTableAddresses,
     ]))
   );
@@ -1453,12 +1455,18 @@ export const openTradeV2 = async (
 
   const addressLookupTableAccounts: AddressLookupTableAccount[] = [];
 
+  // @ts-expect-error @coral-xyz/anchor versions mismatch
+  const queue = await getSwitchboardQueue(program.provider);
+
+  const switchboardLookupTables = await queue.loadLookupTable();
+
   addressLookupTableAccounts.push(
     ...(await getAddressLookupTableAccounts([
       ...addressLookupTableAddresses,
       getQuoteCurrencySpecificAddressLookupTable(quoteToken.toBase58()),
-      "5LEAB3owNUSKvECm7vkr58tDtQpzbngQ2NYpc7qmRFdi",
-    ]))
+      LAVARAGE_LOOKUP_TABLE,
+    ])),
+    switchboardLookupTables
   );
 
   const { blockhash } =
@@ -2514,7 +2522,7 @@ export const closeTradeV1 = async (
     ].filter((i) => !!i);
     addressLookupTableAccounts.push(
       ...(await getAddressLookupTableAccounts([
-        "5LEAB3owNUSKvECm7vkr58tDtQpzbngQ2NYpc7qmRFdi",
+        LAVARAGE_LOOKUP_TABLE,
         ...addressLookupTableAddresses,
       ]))
     );
@@ -2895,7 +2903,9 @@ export const closeTradeV2 = async (
       : await lavarageProgram.methods
           .tradingCloseRepaySol(
             new BN(jupInstruction.quoteResponse.outAmount),
-            new BN(9997)
+            new BN(9997),
+            null,
+            null,
           )
           .accountsStrict({
             nodeWallet: pool.account.nodeWallet,
@@ -3006,7 +3016,9 @@ export const closeTradeV2 = async (
       : await lavarageProgram.methods
           .tradingCloseRepaySol(
             new BN(jupInstruction.quoteResponse.outAmount),
-            new BN(9998)
+            new BN(9998),
+            null,
+            null,
           )
           .accountsStrict({
             nodeWallet: pool.account.nodeWallet,
@@ -3076,7 +3088,7 @@ export const closeTradeV2 = async (
       ...(await getAddressLookupTableAccounts([
         ...addressLookupTableAddresses,
         getQuoteCurrencySpecificAddressLookupTable(quoteToken.toBase58()),
-        "5LEAB3owNUSKvECm7vkr58tDtQpzbngQ2NYpc7qmRFdi",
+        LAVARAGE_LOOKUP_TABLE,
       ]))
     );
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lavarage/sdk",
-  "version": "8.0.12",
+  "version": "8.0.13",
   "description": "Lavarage SDK",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",

package/switchboard.ts

@@ -1,7 +1,8 @@
-import { OracleQuote } from "@switchboard-xyz/on-demand";
+import { ON_DEMAND_DEVNET_QUEUE, getQueue, isMainnetConnection, ON_DEMAND_MAINNET_QUEUE, OracleQuote, Queue, ON_DEMAND_MAINNET_PID, ON_DEMAND_DEVNET_PID } from "@switchboard-xyz/on-demand";
 import { queuePubkey } from "./constants";
 import { PublicKey } from "@solana/web3.js";
 import { SURGE_FEEDS } from "./crossbar";
+import { AnchorProvider, Program } from "@coral-xyz/anchor";
 
 export function getOracleQuoteForFeedId(feedId: string) {
   const [oracleQuote] = OracleQuote.getCanonicalPubkey(
@@ -20,4 +21,20 @@ export function getOracleQuoteForCollateralType(collateralType: PublicKey) {
   }
 
   return getOracleQuoteForFeedId(feed.feedId);
+}
+
+async function getSwitchboardProgram(provider: AnchorProvider): Promise<Program> {
+  const programId = await isMainnetConnection(provider.connection) ? ON_DEMAND_MAINNET_PID : ON_DEMAND_DEVNET_PID;
+  
+  return Program.at(programId, provider);
+}
+
+export async function getSwitchboardQueue(provider: AnchorProvider): Promise<Queue> {
+  const program = await getSwitchboardProgram(provider);
+
+  return await getQueue({
+    // @ts-expect-error @coral-xyz/anchor versions mismatch
+    program,
+    queueAddress: await isMainnetConnection(provider.connection) ? ON_DEMAND_MAINNET_QUEUE : ON_DEMAND_DEVNET_QUEUE,
+  });
 }