@lavarage/sdk 6.8.3 → 6.8.5

package/dist/index.d.mts

@@ -2884,8 +2884,8 @@ declare function withdrawFunds(lavarageProgram: Program<Lavarage$1> | Program<La
 declare function createOffer(lavarageProgram: Program<Lavarage$1> | Program<Lavarage>, params: {
     tradingPool: PublicKey;
     poolOwner: PublicKey;
-    nodeWallet: string;
-    mint?: string;
+    mint: string;
+    quoteMint: string;
     interestRate: number;
     maxExposure: number;
 }): Promise<VersionedTransaction>;

package/dist/index.d.ts

@@ -2884,8 +2884,8 @@ declare function withdrawFunds(lavarageProgram: Program<Lavarage$1> | Program<La
 declare function createOffer(lavarageProgram: Program<Lavarage$1> | Program<Lavarage>, params: {
     tradingPool: PublicKey;
     poolOwner: PublicKey;
-    nodeWallet: string;
-    mint?: string;
+    mint: string;
+    quoteMint: string;
     interestRate: number;
     maxExposure: number;
 }): Promise<VersionedTransaction>;

package/dist/index.js

@@ -1142,7 +1142,7 @@ function createNodeWallet(lavarageProgram, params) {
   return __async(this, null, function* () {
     const { blockhash } = yield lavarageProgram.provider.connection.getLatestBlockhash("finalized");
     let instruction, nodeWallet;
-    if (params.mint !== void 0) {
+    if (params.mint !== void 0 && params.liquidationLtv !== void 0) {
       nodeWallet = getNodeWalletPDA(
         new import_web3.PublicKey(params.operator),
         new import_web3.PublicKey(params.mint),
@@ -1164,7 +1164,8 @@ function createNodeWallet(lavarageProgram, params) {
     }
     return {
       instruction,
-      nodeWallet: nodeWallet instanceof import_web3.Keypair ? nodeWallet : void 0
+      nodeWallet: nodeWallet instanceof import_web3.Keypair ? nodeWallet : void 0,
+      nodeWalletAccount: nodeWallet instanceof import_web3.Keypair ? nodeWallet.publicKey : nodeWallet
     };
   });
 }
@@ -1180,12 +1181,29 @@ function depositFunds(lavarageProgram, params) {
       }).instruction();
     } else {
       const mintPubkey = new import_web3.PublicKey(params.mint);
-      const mintOwner = yield lavarageProgram.provider.connection.getAccountInfo(mintPubkey);
-      const mintAccount = yield (0, import_spl_token.getMint)(lavarageProgram.provider.connection, mintPubkey, "confirmed", mintOwner == null ? void 0 : mintOwner.owner);
+      const mintOwner = yield lavarageProgram.provider.connection.getAccountInfo(
+        mintPubkey
+      );
+      const mintAccount = yield (0, import_spl_token.getMint)(
+        lavarageProgram.provider.connection,
+        mintPubkey,
+        "confirmed",
+        mintOwner == null ? void 0 : mintOwner.owner
+      );
       instruction = (0, import_spl_token.createTransferCheckedInstruction)(
-        (0, import_spl_token.getAssociatedTokenAddressSync)(mintPubkey, new import_web3.PublicKey(params.funder), true, mintOwner == null ? void 0 : mintOwner.owner),
+        (0, import_spl_token.getAssociatedTokenAddressSync)(
+          mintPubkey,
+          new import_web3.PublicKey(params.funder),
+          true,
+          mintOwner == null ? void 0 : mintOwner.owner
+        ),
         new import_web3.PublicKey(params.mint),
-        (0, import_spl_token.getAssociatedTokenAddressSync)(mintPubkey, new import_web3.PublicKey(params.nodeWallet), true, mintOwner == null ? void 0 : mintOwner.owner),
+        (0, import_spl_token.getAssociatedTokenAddressSync)(
+          mintPubkey,
+          new import_web3.PublicKey(params.nodeWallet),
+          true,
+          mintOwner == null ? void 0 : mintOwner.owner
+        ),
         lavarageProgram.provider.publicKey,
         params.amount,
         mintAccount.decimals,
@@ -1262,35 +1280,68 @@ function withdrawFunds(lavarageProgram, params) {
 }
 function createOffer(lavarageProgram, params) {
   return __async(this, null, function* () {
-    const nodeWalletAccount = yield lavarageProgram.provider.connection.getAccountInfo(new import_web3.PublicKey(params.nodeWallet));
-    let nodeWalletSigner, createNodeWalletInstruction;
+    let nodeWalletAccount, nodeWalletSigner, createNodeWalletInstruction, nodeWalletPubKey;
+    if (params.mint === "So11111111111111111111111111111111111111112") {
+      const nodeWallets = yield lavarageProgram.account.nodeWallet.all();
+      nodeWalletAccount = nodeWallets.find(
+        (wallet) => wallet.account.nodeOperator.equals(new import_web3.PublicKey(params.poolOwner))
+      );
+    } else {
+      const nodeWalletPda = getNodeWalletPDA(
+        new import_web3.PublicKey(params.poolOwner),
+        new import_web3.PublicKey(params.quoteMint),
+        lavarageProgram.programId
+      );
+      const nodeWalletAccountInfo = yield lavarageProgram.provider.connection.getAccountInfo(nodeWalletPda);
+      if (nodeWalletAccountInfo) {
+        nodeWalletAccount = {
+          publicKey: nodeWalletPda
+        };
+      }
+    }
     if (!nodeWalletAccount) {
-      const { instruction: instruction2, nodeWallet } = yield createNodeWallet(lavarageProgram, {
+      const isSOL = params.quoteMint === "So11111111111111111111111111111111111111112";
+      const {
+        instruction: instruction2,
+        nodeWallet,
+        nodeWalletAccount: nodeWalletPublicKey
+      } = yield createNodeWallet(lavarageProgram, {
         operator: new import_web3.PublicKey(params.poolOwner.toBase58()),
-        mint: params.mint,
-        liquidationLtv: 90
+        mint: isSOL ? void 0 : params.quoteMint,
+        // Only pass mint for V2 (non-SOL)
+        liquidationLtv: isSOL ? void 0 : 90
+        // Only pass liquidationLtv for V2 (non-SOL)
       });
       nodeWalletSigner = nodeWallet;
       createNodeWalletInstruction = instruction2;
+      nodeWalletPubKey = nodeWalletPublicKey;
+    } else {
+      nodeWalletPubKey = nodeWalletAccount.publicKey;
     }
     const { blockhash } = yield lavarageProgram.provider.connection.getLatestBlockhash("finalized");
     const instruction = yield lavarageProgram.methods.lpOperatorCreateTradingPool(new import_anchor.BN(params.interestRate)).accounts({
       tradingPool: params.tradingPool,
       operator: params.poolOwner,
-      nodeWallet: new import_web3.PublicKey(params.nodeWallet),
-      mint: params.mint ? new import_web3.PublicKey(params.mint) : void 0,
+      nodeWallet: nodeWalletPubKey,
+      mint: new import_web3.PublicKey(params.mint),
+      // Always required for both V1 and V2
       systemProgram: import_web3.SystemProgram.programId
     }).instruction();
     const updateMaxExposureInstruction = yield lavarageProgram.methods.lpOperatorUpdateMaxExposure(new import_anchor.BN(params.maxExposure)).accounts({
       tradingPool: params.tradingPool,
-      nodeWallet: new import_web3.PublicKey(params.nodeWallet),
+      nodeWallet: nodeWalletPubKey,
       operator: params.poolOwner,
       systemProgram: import_web3.SystemProgram.programId
     }).instruction();
     const messageV0 = new import_web3.TransactionMessage({
       payerKey: lavarageProgram.provider.publicKey,
       recentBlockhash: blockhash,
-      instructions: [createNodeWalletInstruction === void 0 ? null : createNodeWalletInstruction, instruction, updateMaxExposureInstruction, computeFeeIx].filter(Boolean)
+      instructions: [
+        createNodeWalletInstruction === void 0 ? null : createNodeWalletInstruction,
+        instruction,
+        updateMaxExposureInstruction,
+        computeFeeIx
+      ].filter(Boolean)
     }).compileToV0Message();
     if (nodeWalletSigner) {
       const transaction = new import_web3.VersionedTransaction(messageV0);