@lavarage/sdk 7.5.21 → 8.0.1

package/index.ts

@@ -13,9 +13,10 @@
  */
 
 import { BN, Program, ProgramAccount } from "@coral-xyz/anchor";
-import { Lavarage } from "./idl/lavarage";
-import { Lavarage as LavarageV2 } from "./idl/lavaragev2";
-import { UserVault, IDL as userVaultIDL } from "./idl/referralVault";
+import { Lavarage as LavarageSOL } from "./idl/lavarageSOL";
+import { Lavarage as LavarageUSDC } from "./idl/lavarageUSDC";
+import { UserVault } from "./idl/userVault";
+import userVaultIDL from "./idl/userVault.json";
 import bs58 from "bs58";
 import {
   AccountInfo,
@@ -26,6 +27,7 @@ import {
   SystemProgram,
   SYSVAR_CLOCK_PUBKEY,
   SYSVAR_INSTRUCTIONS_PUBKEY,
+  SYSVAR_SLOT_HASHES_PUBKEY,
   Transaction,
   TransactionInstruction,
   TransactionMessage,
@@ -35,13 +37,14 @@ import {
   ASSOCIATED_TOKEN_PROGRAM_ID,
   createAssociatedTokenAccountIdempotentInstruction,
   createAssociatedTokenAccountInstruction,
-  createTransferInstruction,
-  getAccount,
   getAssociatedTokenAddressSync,
+  NATIVE_MINT,
   TOKEN_PROGRAM_ID,
-  TokenAccountNotFoundError,
-  TokenInvalidAccountOwnerError,
 } from "@solana/spl-token";
+import { queuePubkey, USDC_MINT } from "./constants";
+import { getOracleQuoteForCollateralType, getOracleQuoteForFeedId } from "./switchboard";
+import { u8ArrayToString } from "./utils";
+import { ApiKeys, getUpdateOracleIxs } from "./crossbar";
 
 export * from "./evm";
 export * as lending from "./lending";
@@ -55,8 +58,6 @@ type OptionalRPCResults = {
 }
 const REFFERAL_VAULT_PROGRAM_ID = new PublicKey("FFe8xWs9iBdWB6vsxg8yBLirZHsbACFNbXqAM4K3fPPB");
 
-
-
 /**
  * Derives a Program Derived Address (PDA) for the given seed(s) and program ID
  * 
@@ -100,7 +101,7 @@ export function getPda(seed: Buffer | Buffer[], programId: PublicKey) {
  */
 
 export function getPositionAccountPDA(
-  lavarageProgram: Program<Lavarage> | Program<LavarageV2>,
+  lavarageProgram: Program<LavarageSOL> | Program<LavarageUSDC>,
   offer: ProgramAccount,
   seed: PublicKey
 ) {
@@ -130,7 +131,7 @@ export function getPositionAccountPDA(
  */
 
 async function getTokenAccountOrCreateIfNotExists(
-  lavarageProgram: Program<Lavarage> | Program<LavarageV2>,
+  lavarageProgram: Program<LavarageSOL> | Program<LavarageUSDC>,
   ownerPublicKey: PublicKey,
   tokenAddress: PublicKey,
   tokenProgram?: PublicKey,
@@ -173,12 +174,12 @@ async function getTokenAccountOrCreateIfNotExists(
  * Re-exports all types and interfaces from the Lavarage V1 IDL
  * @group Solana
  */
-export * from "./idl/lavarage";
+export * from "./idl/lavarageSOL";
 /**
  * Namespace containing all types and interfaces from the Lavarage V2 IDL
  * @group Solana
  */
-export * as IDLV2 from "./idl/lavaragev2";
+export * as IDLV2 from "./idl/lavarageUSDC";
 /**
  * Fetches all available lending offers from the Lavarage protocol
  * 
@@ -202,7 +203,7 @@ export * as IDLV2 from "./idl/lavaragev2";
  */
 
 export const getOffers = (
-  lavarageProgram: Program<Lavarage> | Program<LavarageV2>
+  lavarageProgram: Program<LavarageSOL> | Program<LavarageUSDC>
 ) => {
   return lavarageProgram.account.pool.all();
 };
@@ -237,7 +238,7 @@ export const getOffers = (
  */
 
 export const getOpenPositions = (
-  lavarageProgram: Program<Lavarage> | Program<LavarageV2>
+  lavarageProgram: Program<LavarageSOL> | Program<LavarageUSDC>
 ) => {
   return lavarageProgram.account.position.all([
     { dataSize: 178 },
@@ -275,7 +276,7 @@ export const getOpenPositions = (
  */
 
 export const getClosedPositions = async (
-  lavarageProgram: Program<Lavarage> | Program<LavarageV2>
+  lavarageProgram: Program<LavarageSOL> | Program<LavarageUSDC>
 ) => {
   const value = BigInt(9997);
   const valueBuffer = Buffer.alloc(8);
@@ -352,7 +353,7 @@ export const getClosedPositions = async (
  */
 
 export const getLiquidatedPositions = (
-  lavarageProgram: Program<Lavarage> | Program<LavarageV2>
+  lavarageProgram: Program<LavarageSOL> | Program<LavarageUSDC>
 ) => {
   const value = BigInt(9999);
   const valueBuffer = Buffer.alloc(8);
@@ -403,13 +404,13 @@ export const getLiquidatedPositions = (
  */
 
 export const getAllPositions = (
-  lavarageProgram: Program<Lavarage> | Program<LavarageV2>
+  lavarageProgram: Program<LavarageSOL> | Program<LavarageUSDC>
 ) => {
   return lavarageProgram.account.position.all([{ dataSize: 178 }]);
 };
 
 export const borrowV1 = async (
-  lavarageProgram: Program<Lavarage>,
+  lavarageProgram: Program<LavarageSOL>,
   offer: ProgramAccount<{
     nodeWallet: PublicKey;
     interestRate: number;
@@ -598,17 +599,19 @@ export const borrowV1 = async (
 };
 
 export const borrowV2 = async (
-  lavarageProgram: Program<LavarageV2>,
+  lavarageProgram: Program<LavarageUSDC>,
   offer: ProgramAccount<{
     nodeWallet: PublicKey;
     interestRate: number;
     collateralType: PublicKey;
+    feedId: number[];
   }>,
   marginSOL: BN,
   leverage: number,
   randomSeed: Keypair,
   quoteToken: PublicKey,
   tokenProgram: PublicKey,
+  apiKeys: ApiKeys,
   partnerFeeRecipient?: PublicKey,
   partnerFeeMarkup?: number,
   computeBudgetMicroLamports?: number,
@@ -706,9 +709,16 @@ export const borrowV2 = async (
     }
   }
 
+  const updateOracleInstructions = await getUpdateOracleIxs(
+    // @ts-expect-error IDL mismatch
+    lavarageProgram,
+    u8ArrayToString(offer.account.feedId), lavarageProgram.provider.publicKey!,
+    apiKeys
+  );
+
   const tradingOpenBorrowInstruction = useReferral
     ? await lavarageProgram.methods
-        .tradingOpenBorrowWithReferral(
+        .tradingOpenBorrow(
           new BN((marginSOL.toNumber() * leverage).toFixed(0)),
           marginSOL,
           new BN(discountBps),
@@ -829,6 +839,10 @@ export const borrowV2 = async (
         )
         .instruction();
 
+  const baseOracleQuote = getOracleQuoteForFeedId(u8ArrayToString(offer.account.feedId));
+
+  const quoteOracleQuote = getOracleQuoteForCollateralType(USDC_MINT);
+
   const openAddCollateralInstruction = await lavarageProgram.methods
     .tradingOpenAddCollateral(offer.account.interestRate < 255 ? offer.account.interestRate + 1 : 255)
     .accountsStrict({
@@ -840,7 +854,12 @@ export const borrowV2 = async (
       positionAccount,
       randomAccountAsId: randomSeed.publicKey.toBase58(),
       tokenProgram: tokenProgram,
-      associatedTokenProgram: ASSOCIATED_TOKEN_PROGRAM_ID,
+      baseOracleQuote,
+      quoteOracleQuote,
+      clockSysvar: SYSVAR_CLOCK_PUBKEY,
+      instructionsSysvar: SYSVAR_INSTRUCTIONS_PUBKEY,
+      oracleQueue: queuePubkey,
+      slotHashesSysvar: SYSVAR_SLOT_HASHES_PUBKEY,
     })
     .instruction();
 
@@ -852,6 +871,7 @@ export const borrowV2 = async (
     fromTokenAccount.instruction!,
     partnerFeeRecipientVaultCreateIx,
     partnerFeeRecipientTokenAccountCreateIx,
+    ...updateOracleInstructions,
     tradingOpenBorrowInstruction!,
     openAddCollateralInstruction!,
     computeBudgetMicroLamports ? computeFeeIx : undefined,
@@ -925,7 +945,7 @@ export const borrowV2 = async (
  */
 
 export const openTradeV1 = async (
-  lavarageProgram: Program<Lavarage>,
+  lavarageProgram: Program<LavarageSOL>,
   offer: ProgramAccount<{
     nodeWallet: PublicKey;
     interestRate: number;
@@ -952,7 +972,7 @@ export const openTradeV1 = async (
   optionalRPCResults?: OptionalRPCResults,
 ) => {
   let partnerFeeMarkupAsPkey;
-  const referralVaultProgram = new Program<UserVault>(userVaultIDL, REFFERAL_VAULT_PROGRAM_ID, lavarageProgram.provider);
+  const referralVaultProgram = new Program<UserVault>(userVaultIDL, lavarageProgram.provider);
   if (partnerFeeMarkup) {
     const feeBuffer = Buffer.alloc(8);
     feeBuffer.writeBigUInt64LE(BigInt(partnerFeeMarkup));
@@ -1303,11 +1323,12 @@ export const openTradeV1 = async (
  */
 
 export const openTradeV2 = async (
-  lavarageProgram: Program<LavarageV2>,
+  lavarageProgram: Program<LavarageUSDC>,
   offer: ProgramAccount<{
     nodeWallet: PublicKey;
     interestRate: number;
     collateralType: PublicKey;
+    feedId: number[];
   }>,
   jupInstruction: {
     instructions: {
@@ -1321,6 +1342,7 @@ export const openTradeV2 = async (
   randomSeed: Keypair,
   quoteToken: PublicKey,
   tokenProgram: PublicKey,
+  apiKeys: ApiKeys,
   partnerFeeRecipient?: PublicKey,
   partnerFeeMarkup?: number,
   computeBudgetMicroLamports?: number,
@@ -1331,7 +1353,7 @@ export const openTradeV2 = async (
   optionalRPCResults?: OptionalRPCResults,
 ) => {
   let partnerFeeMarkupAsPkey;
-  const referralVaultProgram = new Program<UserVault>(userVaultIDL, REFFERAL_VAULT_PROGRAM_ID, lavarageProgram.provider);
+  const referralVaultProgram = new Program<UserVault>(userVaultIDL, lavarageProgram.provider);
   
   if (partnerFeeMarkup) {
     const feeBuffer = Buffer.alloc(8);
@@ -1524,9 +1546,16 @@ export const openTradeV2 = async (
 
   
 
+  const updateOracleInstructions = await getUpdateOracleIxs(
+    // @ts-expect-error IDL mismatch
+    lavarageProgram,
+    u8ArrayToString(offer.account.feedId), lavarageProgram.provider.publicKey!,
+    apiKeys
+  );
+
   const tradingOpenBorrowInstruction = useReferral
     ? await lavarageProgram.methods
-        .tradingOpenBorrowWithReferral(
+        .tradingOpenBorrow(
           new BN((marginSOL.toNumber() * leverage).toFixed(0)),
           marginSOL,
           new BN(discountBps),
@@ -1642,6 +1671,10 @@ export const openTradeV2 = async (
         )
         .instruction();
 
+  const baseOracleQuote = getOracleQuoteForFeedId(u8ArrayToString(offer.account.feedId));
+
+  const quoteOracleQuote = getOracleQuoteForCollateralType(USDC_MINT);
+
   const openAddCollateralInstruction = await lavarageProgram.methods
     .tradingOpenAddCollateral(offer.account.interestRate < 255 ? offer.account.interestRate + 1 : 255)
     .accountsStrict({
@@ -1653,7 +1686,12 @@ export const openTradeV2 = async (
       positionAccount,
       randomAccountAsId: randomSeed.publicKey.toBase58(),
       tokenProgram: tokenProgram,
-      associatedTokenProgram: ASSOCIATED_TOKEN_PROGRAM_ID,
+      baseOracleQuote,
+      quoteOracleQuote,
+      clockSysvar: SYSVAR_CLOCK_PUBKEY,
+      slotHashesSysvar: SYSVAR_SLOT_HASHES_PUBKEY,
+      instructionsSysvar: SYSVAR_INSTRUCTIONS_PUBKEY,
+      oracleQueue: queuePubkey,
     })
     .instruction();
 
@@ -1676,6 +1714,7 @@ export const openTradeV2 = async (
     ].filter(Boolean) as TransactionInstruction[];
 
     const allInstructions = [
+      ...updateOracleInstructions,
       tradingOpenBorrowInstruction!,
       deserializeInstruction(swapInstructionPayload), ,
       openAddCollateralInstruction!,
@@ -1767,7 +1806,7 @@ export const openTradeV2 = async (
  */
 
 export const createTpDelegate = async (
-  lavarageProgram: Program<Lavarage> | Program<LavarageV2>,
+  lavarageProgram: Program<LavarageSOL> | Program<LavarageUSDC>,
   position: ProgramAccount<{
     pool: PublicKey;
     seed: PublicKey;
@@ -1866,7 +1905,7 @@ export const createTpDelegate = async (
  */
 
 export const modifyTpDelegate = async (
-  lavarageProgram: Program<Lavarage> | Program<LavarageV2>,
+  lavarageProgram: Program<LavarageSOL> | Program<LavarageUSDC>,
   position: ProgramAccount<{
     pool: PublicKey;
     seed: PublicKey;
@@ -1969,7 +2008,7 @@ export const modifyTpDelegate = async (
  */
 
 export const removeTpDelegate = async (
-  lavarageProgram: Program<Lavarage> | Program<LavarageV2>,
+  lavarageProgram: Program<LavarageSOL> | Program<LavarageUSDC>,
   position: ProgramAccount<{
     pool: PublicKey;
     seed: PublicKey;
@@ -2034,7 +2073,7 @@ export const removeTpDelegate = async (
  */
 
 export const partialRepayV1 = async (
-  lavarageProgram: Program<Lavarage>,
+  lavarageProgram: Program<LavarageSOL>,
   position: ProgramAccount<{
     pool: PublicKey;
     seed: PublicKey;
@@ -2095,7 +2134,7 @@ export const partialRepayV1 = async (
  * @see {@link partialRepayV1} - The V1 version supporting SOL as quote token
  */
 export const partialRepayV2 = async (
-  lavarageProgram: Program<LavarageV2>,
+  lavarageProgram: Program<LavarageUSDC>,
   position: ProgramAccount<{
     pool: PublicKey;
     seed: PublicKey;
@@ -2184,7 +2223,7 @@ export const partialRepayV2 = async (
  * @see {@link partialRepayV1} - Partial repayments on V1 
  */
 export const closeTradeV1 = async (
-  lavarageProgram: Program<Lavarage>,
+  lavarageProgram: Program<LavarageSOL>,
   position: ProgramAccount<{
     pool: PublicKey;
     seed: PublicKey;
@@ -2215,7 +2254,7 @@ export const closeTradeV1 = async (
   referralBps?: number,
 ) => {
   let partnerFeeMarkupAsPkey;
-  const referralVaultProgram = new Program<UserVault>(userVaultIDL, REFFERAL_VAULT_PROGRAM_ID, lavarageProgram.provider);
+  const referralVaultProgram = new Program<UserVault>(userVaultIDL, lavarageProgram.provider);
   
   if (partnerFeeMarkup) {
     const feeBuffer = Buffer.alloc(8);
@@ -2613,7 +2652,7 @@ export const closeTradeV1 = async (
  * @see {@link partialRepayV2} - Partial repay a V2 position 
  */
 export const closeTradeV2 = async (
-  lavarageProgram: Program<LavarageV2>,
+  lavarageProgram: Program<LavarageUSDC>,
   position: ProgramAccount<{
     pool: PublicKey;
     seed: PublicKey;
@@ -2645,7 +2684,7 @@ export const closeTradeV2 = async (
   referralBps?: number,
 ) => {
   let partnerFeeMarkupAsPkey;
-  const referralVaultProgram = new Program<UserVault>(userVaultIDL, REFFERAL_VAULT_PROGRAM_ID, lavarageProgram.provider);
+  const referralVaultProgram = new Program<UserVault>(userVaultIDL, lavarageProgram.provider);
   
   if (partnerFeeMarkup) {
     const feeBuffer = Buffer.alloc(8);
@@ -2814,7 +2853,7 @@ export const closeTradeV2 = async (
   if (jupInstruction.instructions == undefined) {
     repaySolIx = useReferral
       ? await lavarageProgram.methods
-          .tradingCloseRepaySolWithReferral(
+          .tradingCloseRepaySol(
             new BN(jupInstruction.quoteResponse.outAmount),
             new BN(9997),
             new BN(discountBps),
@@ -2925,7 +2964,7 @@ export const closeTradeV2 = async (
   } else {
     repaySolIx = useReferral
       ? await lavarageProgram.methods
-          .tradingCloseRepaySolWithReferral(
+          .tradingCloseRepaySol(
             new BN(jupInstruction.quoteResponse.outAmount),
             new BN(9998),
             new BN(discountBps),
@@ -3170,7 +3209,7 @@ export const closeTradeV2 = async (
  * @see {@link removeTpDelegate} - Remove take-profit settings
  */
 export const getDelegateAccounts = async (
-  lavarageProgram: Program<Lavarage> | Program<LavarageV2>,
+  lavarageProgram: Program<LavarageSOL> | Program<LavarageUSDC>,
   userPubKey?: PublicKey
 ) => {
   const delegateAccounts = await lavarageProgram.account.delegate.all(
@@ -3239,7 +3278,7 @@ const getQuoteCurrencySpecificAddressLookupTable = (quoteCurrency: string) => {
  * @see {@link mergePositionV2} - Merge two positions into one
  */
 export const splitPositionV2 = async (
-  lavarageProgram: Program<LavarageV2> | Program<Lavarage>,
+  lavarageProgram: Program<LavarageUSDC> | Program<LavarageSOL>,
   position: ProgramAccount<{
     pool: PublicKey;
     seed: PublicKey;
@@ -3399,7 +3438,7 @@ export const splitPositionV2 = async (
  * @see {@link splitPositionV2} - Split a position into two
  */
 export const mergePositionV2 = async (
-  lavarageProgram: Program<LavarageV2>,
+  lavarageProgram: Program<LavarageUSDC>,
   position1: ProgramAccount<{
     pool: PublicKey;
     seed: PublicKey;