@lavarage/sdk 5.1.0 → 6.0.0

package/dist/index.mjs

@@ -28,7 +28,7 @@ var __async = (__this, __arguments, generator) => {
 import { BN } from "@coral-xyz/anchor";
 import bs58 from "bs58";
 import { AddressLookupTableAccount, ComputeBudgetProgram, PublicKey, SystemProgram, SYSVAR_CLOCK_PUBKEY, SYSVAR_INSTRUCTIONS_PUBKEY, Transaction, TransactionInstruction, TransactionMessage, VersionedTransaction } from "@solana/web3.js";
-import { ASSOCIATED_TOKEN_PROGRAM_ID, createAssociatedTokenAccountInstruction, getAccount, getAssociatedTokenAddressSync, TOKEN_PROGRAM_ID, TokenAccountNotFoundError, TokenInvalidAccountOwnerError } from "@solana/spl-token";
+import { ASSOCIATED_TOKEN_PROGRAM_ID, createAssociatedTokenAccountInstruction, createTransferInstruction, getAccount, getAssociatedTokenAddressSync, TokenAccountNotFoundError, TokenInvalidAccountOwnerError } from "@solana/spl-token";
 
 // idl/lavarage.ts
 var IDL = {
@@ -788,123 +788,6 @@ var IDL = {
         }
       ],
       "args": []
-    },
-    {
-      "name": "delegateExecuteTp",
-      "accounts": [
-        {
-          "name": "delegate",
-          "isMut": true,
-          "isSigner": false
-        },
-        {
-          "name": "delegateOperator",
-          "isMut": false,
-          "isSigner": true
-        },
-        {
-          "name": "account",
-          "isMut": true,
-          "isSigner": false
-        },
-        {
-          "name": "tradingPool",
-          "isMut": true,
-          "isSigner": false
-        },
-        {
-          "name": "tokenProgram",
-          "isMut": false,
-          "isSigner": false
-        },
-        {
-          "name": "positionTokenAccount",
-          "isMut": true,
-          "isSigner": false
-        },
-        {
-          "name": "delegateTokenAccount",
-          "isMut": true,
-          "isSigner": false
-        },
-        {
-          "name": "systemProgram",
-          "isMut": false,
-          "isSigner": false
-        }
-      ],
-      "args": [
-        {
-          "name": "seed",
-          "type": "publicKey"
-        }
-      ]
-    },
-    {
-      "name": "delegateClosePosition",
-      "accounts": [
-        {
-          "name": "delegate",
-          "isMut": true,
-          "isSigner": false
-        },
-        {
-          "name": "delegateOperator",
-          "isMut": false,
-          "isSigner": true
-        },
-        {
-          "name": "account",
-          "isMut": true,
-          "isSigner": false
-        },
-        {
-          "name": "tradingPool",
-          "isMut": true,
-          "isSigner": false
-        },
-        {
-          "name": "nodeWallet",
-          "isMut": true,
-          "isSigner": false
-        },
-        {
-          "name": "tokenProgram",
-          "isMut": false,
-          "isSigner": false
-        },
-        {
-          "name": "nodeWalletTokenAccount",
-          "isMut": true,
-          "isSigner": false
-        },
-        {
-          "name": "delegateTokenAccount",
-          "isMut": true,
-          "isSigner": false
-        },
-        {
-          "name": "feeTokenAccount",
-          "isMut": true,
-          "isSigner": false
-        },
-        {
-          "name": "profitTokenAccount",
-          "isMut": true,
-          "isSigner": false
-        },
-        {
-          "name": "systemProgram",
-          "isMut": false,
-          "isSigner": false
-        }
-      ],
-      "args": [
-        {
-          "name": "closingPositionSize",
-          "type": "u64"
-        }
-      ]
     }
   ],
   "accounts": [
@@ -2092,123 +1975,6 @@ var IDL2 = {
         }
       ]
     },
-    {
-      "name": "delegateExecuteTp",
-      "accounts": [
-        {
-          "name": "delegate",
-          "isMut": true,
-          "isSigner": false
-        },
-        {
-          "name": "delegateOperator",
-          "isMut": false,
-          "isSigner": true
-        },
-        {
-          "name": "account",
-          "isMut": true,
-          "isSigner": false
-        },
-        {
-          "name": "tradingPool",
-          "isMut": true,
-          "isSigner": false
-        },
-        {
-          "name": "tokenProgram",
-          "isMut": false,
-          "isSigner": false
-        },
-        {
-          "name": "positionTokenAccount",
-          "isMut": true,
-          "isSigner": false
-        },
-        {
-          "name": "delegateTokenAccount",
-          "isMut": true,
-          "isSigner": false
-        },
-        {
-          "name": "systemProgram",
-          "isMut": false,
-          "isSigner": false
-        }
-      ],
-      "args": [
-        {
-          "name": "seed",
-          "type": "publicKey"
-        }
-      ]
-    },
-    {
-      "name": "delegateClosePosition",
-      "accounts": [
-        {
-          "name": "delegate",
-          "isMut": true,
-          "isSigner": false
-        },
-        {
-          "name": "delegateOperator",
-          "isMut": false,
-          "isSigner": true
-        },
-        {
-          "name": "account",
-          "isMut": true,
-          "isSigner": false
-        },
-        {
-          "name": "tradingPool",
-          "isMut": true,
-          "isSigner": false
-        },
-        {
-          "name": "nodeWallet",
-          "isMut": true,
-          "isSigner": false
-        },
-        {
-          "name": "tokenProgram",
-          "isMut": false,
-          "isSigner": false
-        },
-        {
-          "name": "nodeWalletTokenAccount",
-          "isMut": true,
-          "isSigner": false
-        },
-        {
-          "name": "delegateTokenAccount",
-          "isMut": true,
-          "isSigner": false
-        },
-        {
-          "name": "feeTokenAccount",
-          "isMut": true,
-          "isSigner": false
-        },
-        {
-          "name": "profitTokenAccount",
-          "isMut": true,
-          "isSigner": false
-        },
-        {
-          "name": "systemProgram",
-          "isMut": false,
-          "isSigner": false
-        }
-      ],
-      "args": [
-        {
-          "name": "closingPositionSize",
-          "type": "u64"
-        }
-      ]
-    },
     {
       "name": "tradingRemoveTpDelegate",
       "accounts": [
@@ -2632,9 +2398,9 @@ function getPda(seed, programId) {
 function getPositionAccountPDA(lavarageProgram, offer, seed) {
   return getPda([Buffer.from("position"), lavarageProgram.provider.publicKey.toBuffer(), offer.publicKey.toBuffer(), seed.toBuffer()], lavarageProgram.programId);
 }
-function getTokenAccountOrCreateIfNotExists(lavarageProgram, ownerPublicKey, tokenAddress) {
+function getTokenAccountOrCreateIfNotExists(lavarageProgram, ownerPublicKey, tokenAddress, tokenProgram) {
   return __async(this, null, function* () {
-    const associatedTokenAddress = getAssociatedTokenAddressSync(tokenAddress, ownerPublicKey, true, TOKEN_PROGRAM_ID, ASSOCIATED_TOKEN_PROGRAM_ID);
+    const associatedTokenAddress = getAssociatedTokenAddressSync(tokenAddress, ownerPublicKey, true, tokenProgram, ASSOCIATED_TOKEN_PROGRAM_ID);
     try {
       const tokenAccount = yield getAccount(lavarageProgram.provider.connection, associatedTokenAddress, "finalized");
       return { account: tokenAccount, instruction: null };
@@ -2645,7 +2411,7 @@ function getTokenAccountOrCreateIfNotExists(lavarageProgram, ownerPublicKey, tok
           associatedTokenAddress,
           ownerPublicKey,
           tokenAddress,
-          TOKEN_PROGRAM_ID,
+          tokenProgram,
           ASSOCIATED_TOKEN_PROGRAM_ID
         );
         return {
@@ -2732,8 +2498,10 @@ var getAllPositions = (lavarageProgram) => {
 };
 var openTradeV1 = (lavarageProgram, offer, jupInstruction, marginSOL, leverage, randomSeed, partnerFeeRecipient) => __async(void 0, null, function* () {
   const positionAccount = getPositionAccountPDA(lavarageProgram, offer, randomSeed.publicKey);
-  const fromTokenAccount = yield getTokenAccountOrCreateIfNotExists(lavarageProgram, lavarageProgram.provider.publicKey, offer.account.collateralType);
-  const toTokenAccount = yield getTokenAccountOrCreateIfNotExists(lavarageProgram, positionAccount, offer.account.collateralType);
+  const mintAccount = yield lavarageProgram.provider.connection.getAccountInfo(offer.account.collateralType);
+  const tokenProgram = mintAccount == null ? void 0 : mintAccount.owner;
+  const fromTokenAccount = yield getTokenAccountOrCreateIfNotExists(lavarageProgram, lavarageProgram.provider.publicKey, offer.account.collateralType, tokenProgram);
+  const toTokenAccount = yield getTokenAccountOrCreateIfNotExists(lavarageProgram, positionAccount, offer.account.collateralType, tokenProgram);
   const tokenAccountCreationTx = new Transaction();
   if (fromTokenAccount.instruction) {
     tokenAccountCreationTx.add(fromTokenAccount.instruction);
@@ -2816,8 +2584,12 @@ var openTradeV1 = (lavarageProgram, offer, jupInstruction, marginSOL, leverage,
 });
 var openTradeV2 = (lavarageProgram, offer, jupInstruction, marginSOL, leverage, randomSeed, quoteToken, partnerFeeRecipient) => __async(void 0, null, function* () {
   const positionAccount = getPositionAccountPDA(lavarageProgram, offer, randomSeed.publicKey);
-  const fromTokenAccount = yield getTokenAccountOrCreateIfNotExists(lavarageProgram, lavarageProgram.provider.publicKey, offer.account.collateralType);
-  const toTokenAccount = yield getTokenAccountOrCreateIfNotExists(lavarageProgram, positionAccount, offer.account.collateralType);
+  const mintAccount = yield lavarageProgram.provider.connection.getAccountInfo(offer.account.collateralType);
+  const tokenProgram = mintAccount == null ? void 0 : mintAccount.owner;
+  const quoteMintAccount = yield lavarageProgram.provider.connection.getAccountInfo(quoteToken);
+  const quoteTokenProgram = quoteMintAccount == null ? void 0 : quoteMintAccount.owner;
+  const fromTokenAccount = yield getTokenAccountOrCreateIfNotExists(lavarageProgram, lavarageProgram.provider.publicKey, offer.account.collateralType, tokenProgram);
+  const toTokenAccount = yield getTokenAccountOrCreateIfNotExists(lavarageProgram, positionAccount, offer.account.collateralType, tokenProgram);
   const tokenAccountCreationTx = new Transaction();
   if (fromTokenAccount.instruction) {
     tokenAccountCreationTx.add(fromTokenAccount.instruction);
@@ -2865,9 +2637,9 @@ var openTradeV2 = (lavarageProgram, offer, jupInstruction, marginSOL, leverage,
     clock: SYSVAR_CLOCK_PUBKEY,
     randomAccountAsId: randomSeed.publicKey.toBase58(),
     feeTokenAccount: getAssociatedTokenAddressSync(quoteToken, new PublicKey("6JfTobDvwuwZxZP6FR5JPmjdvQ4h4MovkEVH2FPsMSrF")),
-    toTokenAccount: getAssociatedTokenAddressSync(quoteToken, lavarageProgram.provider.publicKey),
-    tokenProgram: TOKEN_PROGRAM_ID,
-    fromTokenAccount: getAssociatedTokenAddressSync(quoteToken, offer.account.nodeWallet, true)
+    toTokenAccount: getAssociatedTokenAddressSync(quoteToken, lavarageProgram.provider.publicKey, true, quoteTokenProgram),
+    tokenProgram,
+    fromTokenAccount: getAssociatedTokenAddressSync(quoteToken, offer.account.nodeWallet, true, tokenProgram)
   }).remainingAccounts(partnerFeeRecipient ? [{
     pubkey: partnerFeeRecipient,
     isSigner: false,
@@ -2986,9 +2758,11 @@ var closeTradeV1 = (lavarageProgram, position, offer, jupInstruction, partnerFee
   const pool = offer;
   const poolPubKey = offer.publicKey;
   const tokenAddressPubKey = new PublicKey(offer.account.collateralType);
+  const mintAccount = yield lavarageProgram.provider.connection.getAccountInfo(offer.account.collateralType);
+  const tokenProgram = mintAccount == null ? void 0 : mintAccount.owner;
   const positionAccountPDA = position.publicKey;
-  const fromTokenAccount = yield getTokenAccountOrCreateIfNotExists(lavarageProgram, positionAccountPDA, tokenAddressPubKey);
-  const toTokenAccount = yield getTokenAccountOrCreateIfNotExists(lavarageProgram, lavarageProgram.provider.publicKey, tokenAddressPubKey);
+  const fromTokenAccount = yield getTokenAccountOrCreateIfNotExists(lavarageProgram, positionAccountPDA, tokenAddressPubKey, tokenProgram);
+  const toTokenAccount = yield getTokenAccountOrCreateIfNotExists(lavarageProgram, lavarageProgram.provider.publicKey, tokenAddressPubKey, tokenProgram);
   const jupiterSellIx = jupInstruction.instructions;
   const deserializeInstruction = (instruction) => {
     return new TransactionInstruction({
@@ -3027,7 +2801,7 @@ var closeTradeV1 = (lavarageProgram, position, offer, jupInstruction, partnerFee
     clock: SYSVAR_CLOCK_PUBKEY,
     systemProgram: SystemProgram.programId,
     trader: lavarageProgram.provider.publicKey,
-    tokenProgram: TOKEN_PROGRAM_ID,
+    tokenProgram,
     randomAccountAsId: position.account.seed
   }).instruction();
   let repaySolIx = null;
@@ -3097,9 +2871,13 @@ var closeTradeV2 = (lavarageProgram, position, offer, jupInstruction, quoteToken
   const pool = offer;
   const poolPubKey = offer.publicKey;
   const tokenAddressPubKey = new PublicKey(offer.account.collateralType);
+  const mintAccount = yield lavarageProgram.provider.connection.getAccountInfo(offer.account.collateralType);
+  const tokenProgram = mintAccount == null ? void 0 : mintAccount.owner;
+  const quoteMintAccount = yield lavarageProgram.provider.connection.getAccountInfo(quoteToken);
+  const quoteTokenProgram = quoteMintAccount == null ? void 0 : quoteMintAccount.owner;
   const positionAccountPDA = position.publicKey;
-  const fromTokenAccount = yield getTokenAccountOrCreateIfNotExists(lavarageProgram, positionAccountPDA, tokenAddressPubKey);
-  const toTokenAccount = yield getTokenAccountOrCreateIfNotExists(lavarageProgram, lavarageProgram.provider.publicKey, tokenAddressPubKey);
+  const fromTokenAccount = yield getTokenAccountOrCreateIfNotExists(lavarageProgram, positionAccountPDA, tokenAddressPubKey, tokenProgram);
+  const toTokenAccount = yield getTokenAccountOrCreateIfNotExists(lavarageProgram, lavarageProgram.provider.publicKey, tokenAddressPubKey, tokenProgram);
   const jupiterSellIx = jupInstruction.instructions;
   const deserializeInstruction = (instruction) => {
     return new TransactionInstruction({
@@ -3138,7 +2916,7 @@ var closeTradeV2 = (lavarageProgram, position, offer, jupInstruction, quoteToken
     clock: SYSVAR_CLOCK_PUBKEY,
     systemProgram: SystemProgram.programId,
     trader: lavarageProgram.provider.publicKey,
-    tokenProgram: TOKEN_PROGRAM_ID,
+    tokenProgram,
     randomAccountAsId: position.account.seed
   }).instruction();
   let repaySolIx = null;
@@ -3152,10 +2930,10 @@ var closeTradeV2 = (lavarageProgram, position, offer, jupInstruction, quoteToken
       systemProgram: SystemProgram.programId,
       clock: SYSVAR_CLOCK_PUBKEY,
       randomAccountAsId: position.account.seed,
-      feeTokenAccount: getAssociatedTokenAddressSync(quoteToken, new PublicKey("6JfTobDvwuwZxZP6FR5JPmjdvQ4h4MovkEVH2FPsMSrF")),
-      fromTokenAccount: getAssociatedTokenAddressSync(quoteToken, lavarageProgram.provider.publicKey),
-      tokenProgram: TOKEN_PROGRAM_ID,
-      toTokenAccount: getAssociatedTokenAddressSync(quoteToken, pool.account.nodeWallet, true),
+      feeTokenAccount: getAssociatedTokenAddressSync(quoteToken, new PublicKey("6JfTobDvwuwZxZP6FR5JPmjdvQ4h4MovkEVH2FPsMSrF"), false, quoteTokenProgram),
+      fromTokenAccount: getAssociatedTokenAddressSync(quoteToken, lavarageProgram.provider.publicKey, false, quoteTokenProgram),
+      tokenProgram: quoteTokenProgram,
+      toTokenAccount: getAssociatedTokenAddressSync(quoteToken, pool.account.nodeWallet, true, quoteTokenProgram),
       mint: quoteToken
     }).remainingAccounts(partnerFeeRecipient ? [{
       pubkey: partnerFeeRecipient,
@@ -3171,10 +2949,10 @@ var closeTradeV2 = (lavarageProgram, position, offer, jupInstruction, quoteToken
       systemProgram: SystemProgram.programId,
       clock: SYSVAR_CLOCK_PUBKEY,
       randomAccountAsId: position.account.seed,
-      feeTokenAccount: getAssociatedTokenAddressSync(quoteToken, new PublicKey("6JfTobDvwuwZxZP6FR5JPmjdvQ4h4MovkEVH2FPsMSrF")),
-      fromTokenAccount: getAssociatedTokenAddressSync(quoteToken, lavarageProgram.provider.publicKey),
-      tokenProgram: TOKEN_PROGRAM_ID,
-      toTokenAccount: getAssociatedTokenAddressSync(quoteToken, pool.account.nodeWallet, true),
+      feeTokenAccount: getAssociatedTokenAddressSync(quoteToken, new PublicKey("6JfTobDvwuwZxZP6FR5JPmjdvQ4h4MovkEVH2FPsMSrF"), false, quoteTokenProgram),
+      fromTokenAccount: getAssociatedTokenAddressSync(quoteToken, lavarageProgram.provider.publicKey, false, quoteTokenProgram),
+      tokenProgram: quoteTokenProgram,
+      toTokenAccount: getAssociatedTokenAddressSync(quoteToken, pool.account.nodeWallet, true, quoteTokenProgram),
       mint: quoteToken
     }).remainingAccounts(partnerFeeRecipient ? [{
       pubkey: partnerFeeRecipient,
@@ -3195,12 +2973,13 @@ var closeTradeV2 = (lavarageProgram, position, offer, jupInstruction, quoteToken
     closePositionIx,
     ...jupiterIxs,
     repaySolIx,
-    profitFeeMarkup && partnerFeeRecipient ? SystemProgram.transfer(
-      {
-        fromPubkey: lavarageProgram.provider.publicKey,
-        toPubkey: partnerFeeRecipient,
-        lamports: profit.toNumber() > 0 ? profit.mul(new BN(profitFeeMarkup * 1e3)).div(new BN(1e3)).toNumber() : 0
-      }
+    profitFeeMarkup && partnerFeeRecipient ? createTransferInstruction(
+      getAssociatedTokenAddressSync(quoteToken, lavarageProgram.provider.publicKey, false, quoteTokenProgram),
+      partnerFeeRecipient,
+      lavarageProgram.provider.publicKey,
+      profit.toNumber() > 0 ? profit.mul(new BN(profitFeeMarkup * 1e3)).div(new BN(1e3)).toNumber() : 0,
+      [],
+      quoteTokenProgram
     ) : null
   ].filter((i) => !!i);
   const messageV0 = new TransactionMessage({