@lavarage/sdk 7.0.4 → 7.1.1

package/idl/lavarage.ts

@@ -44,7 +44,7 @@ export type Lavarage = {
         {
           "name": "nodeWallet",
           "isMut": true,
-          "isSigner": true
+          "isSigner": false
         },
         {
           "name": "operator",
@@ -1265,6 +1265,9 @@ export type Lavarage = {
           },
           {
             "name": "UnauthorizedWithdrawal"
+          },
+          {
+            "name": "AccountAlreadyInitialized"
           }
         ]
       }
@@ -1516,7 +1519,7 @@ export const IDL: Lavarage = {
         {
           "name": "nodeWallet",
           "isMut": true,
-          "isSigner": true
+          "isSigner": false
         },
         {
           "name": "operator",
@@ -2737,6 +2740,9 @@ export const IDL: Lavarage = {
           },
           {
             "name": "UnauthorizedWithdrawal"
+          },
+          {
+            "name": "AccountAlreadyInitialized"
           }
         ]
       }

package/lending.ts

@@ -69,14 +69,15 @@ async function createNodeWallet(
     liquidationLtv?: number; // Required for V2, optional for V1
   }
 ): Promise<{
-  instruction: TransactionInstruction;
+  instructions: TransactionInstruction[];
   nodeWallet: Keypair | undefined;
   nodeWalletAccount: PublicKey;
 }> {
   const { blockhash } =
     await lavarageProgram.provider.connection.getLatestBlockhash("finalized");
 
-  let instruction, nodeWallet;
+  let instructions: TransactionInstruction[] = [];
+  let nodeWallet;
 
   // Check if this is V2 program (has mint and liquidationLtv parameters)
   if (params.mint !== undefined && params.liquidationLtv !== undefined) {
@@ -86,7 +87,7 @@ async function createNodeWallet(
       lavarageProgram.programId
     );
     // V2 version
-    instruction = await (lavarageProgram as Program<LavarageV2>).methods
+    instructions.push(await (lavarageProgram as Program<LavarageV2>).methods
       .lpOperatorCreateNodeWallet(new BN(params.liquidationLtv))
       .accounts({
         nodeWallet: nodeWallet,
@@ -94,22 +95,41 @@ async function createNodeWallet(
         systemProgram: SystemProgram.programId,
         mint: new PublicKey(params.mint),
       })
-      .instruction();
+      .instruction());
   } else {
-    nodeWallet = Keypair.generate();
+    const seed = params.operator.toBase58().slice(0, 32);
+
+    const auxAccountPubkey = await PublicKey.createWithSeed(
+      params.operator,
+      seed,
+      lavarageProgram.programId
+    );
+
+    nodeWallet = auxAccountPubkey;
+
+    instructions.push(SystemProgram.createAccountWithSeed({
+      fromPubkey: params.operator,
+      basePubkey: params.operator,
+      seed,
+      newAccountPubkey: auxAccountPubkey,
+      lamports: 1300000,
+      space: 58,
+      programId: lavarageProgram.programId,
+    }));// Some code
+    
     // V1 version
-    instruction = await (lavarageProgram as Program<Lavarage>).methods
+    instructions.push(await (lavarageProgram as Program<Lavarage>).methods
       .lpOperatorCreateNodeWallet()
       .accounts({
-        nodeWallet: nodeWallet.publicKey,
+        nodeWallet: auxAccountPubkey,
         operator: new PublicKey(params.operator),
         systemProgram: SystemProgram.programId,
       })
-      .instruction();
+      .instruction());
   }
 
   return {
-    instruction,
+    instructions ,
     nodeWallet: nodeWallet instanceof Keypair ? nodeWallet : undefined,
     nodeWalletAccount:
       nodeWallet instanceof Keypair ? nodeWallet.publicKey : nodeWallet,
@@ -338,7 +358,7 @@ export async function createOffer(
   }
 ): Promise<VersionedTransaction> {
   
-  let nodeWalletAccount, nodeWalletSigner, createNodeWalletInstruction, nodeWalletPubKey;
+  let nodeWalletAccount, nodeWalletSigner, createNodeWalletInstruction: TransactionInstruction[] =[], nodeWalletPubKey;
 
   if (params.quoteMint === "So11111111111111111111111111111111111111112") {
     const nodeWallets = await lavarageProgram.account.nodeWallet.all();
@@ -364,7 +384,7 @@ export async function createOffer(
     const isSOL = params.quoteMint === "So11111111111111111111111111111111111111112";
 
     const {
-      instruction,
+      instructions,
       nodeWallet,
       nodeWalletAccount: nodeWalletPublicKey,
     } = await createNodeWallet(lavarageProgram, {
@@ -373,7 +393,7 @@ export async function createOffer(
       liquidationLtv: isSOL ? undefined : 90, // Only pass liquidationLtv for V2 (non-SOL)
     });
     nodeWalletSigner = nodeWallet;
-    createNodeWalletInstruction = instruction;
+    createNodeWalletInstruction = instructions;
     nodeWalletPubKey = nodeWalletPublicKey;
   } else {
     nodeWalletPubKey = nodeWalletAccount.publicKey;
@@ -418,9 +438,7 @@ export async function createOffer(
     payerKey: lavarageProgram.provider.publicKey!,
     recentBlockhash: blockhash,
     instructions: [
-      createNodeWalletInstruction === undefined
-        ? null
-        : createNodeWalletInstruction,
+      ...createNodeWalletInstruction,
       instruction,
       updateMaxExposureInstruction,
       transferInstruction,
@@ -428,12 +446,6 @@ export async function createOffer(
     ].filter(Boolean) as TransactionInstruction[],
   }).compileToV0Message();
 
-  if (nodeWalletSigner) {
-    const transaction = new VersionedTransaction(messageV0);
-    transaction.sign([nodeWalletSigner]);
-    return transaction;
-  }
-
   return new VersionedTransaction(messageV0);
 }
 

package/package.json

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