@lavarage/sdk 7.0.3 → 7.1.0

package/dist/index.mjs

@@ -1120,29 +1120,45 @@ function getWithdrawalAccessListPDA(programId) {
 function createNodeWallet(lavarageProgram, params) {
   return __async(this, null, function* () {
     const { blockhash } = yield lavarageProgram.provider.connection.getLatestBlockhash("finalized");
-    let instruction, nodeWallet;
+    let instructions = [];
+    let nodeWallet;
     if (params.mint !== void 0 && params.liquidationLtv !== void 0) {
       nodeWallet = getNodeWalletPDA(
         new PublicKey(params.operator),
         new PublicKey(params.mint),
         lavarageProgram.programId
       );
-      instruction = yield lavarageProgram.methods.lpOperatorCreateNodeWallet(new BN(params.liquidationLtv)).accounts({
+      instructions.push(yield lavarageProgram.methods.lpOperatorCreateNodeWallet(new BN(params.liquidationLtv)).accounts({
         nodeWallet,
         operator: new PublicKey(params.operator),
         systemProgram: SystemProgram.programId,
         mint: new PublicKey(params.mint)
-      }).instruction();
+      }).instruction());
     } else {
-      nodeWallet = Keypair.generate();
-      instruction = yield lavarageProgram.methods.lpOperatorCreateNodeWallet().accounts({
-        nodeWallet: nodeWallet.publicKey,
+      const seed = params.operator.toBase58().slice(0, 32);
+      const auxAccountPubkey = yield PublicKey.createWithSeed(
+        params.operator,
+        seed,
+        lavarageProgram.programId
+      );
+      nodeWallet = auxAccountPubkey;
+      instructions.push(SystemProgram.createAccountWithSeed({
+        fromPubkey: params.operator,
+        basePubkey: params.operator,
+        seed,
+        newAccountPubkey: auxAccountPubkey,
+        lamports: 13e5,
+        space: 58,
+        programId: lavarageProgram.programId
+      }));
+      instructions.push(yield lavarageProgram.methods.lpOperatorCreateNodeWallet().accounts({
+        nodeWallet: auxAccountPubkey,
         operator: new PublicKey(params.operator),
         systemProgram: SystemProgram.programId
-      }).instruction();
+      }).instruction());
     }
     return {
-      instruction,
+      instructions,
       nodeWallet: nodeWallet instanceof Keypair ? nodeWallet : void 0,
       nodeWalletAccount: nodeWallet instanceof Keypair ? nodeWallet.publicKey : nodeWallet
     };
@@ -1292,7 +1308,7 @@ function withdrawFunds(lavarageProgram, params) {
 function createOffer(lavarageProgram, params) {
   return __async(this, null, function* () {
     var _a;
-    let nodeWalletAccount, nodeWalletSigner, createNodeWalletInstruction, nodeWalletPubKey;
+    let nodeWalletAccount, nodeWalletSigner, createNodeWalletInstruction = [], nodeWalletPubKey;
     if (params.quoteMint === "So11111111111111111111111111111111111111112") {
       const nodeWallets = yield lavarageProgram.account.nodeWallet.all();
       nodeWalletAccount = nodeWallets.find(
@@ -1314,7 +1330,7 @@ function createOffer(lavarageProgram, params) {
     if (!(nodeWalletAccount == null ? void 0 : nodeWalletAccount.account)) {
       const isSOL = params.quoteMint === "So11111111111111111111111111111111111111112";
       const {
-        instruction: instruction2,
+        instructions,
         nodeWallet,
         nodeWalletAccount: nodeWalletPublicKey
       } = yield createNodeWallet(lavarageProgram, {
@@ -1325,7 +1341,7 @@ function createOffer(lavarageProgram, params) {
         // Only pass liquidationLtv for V2 (non-SOL)
       });
       nodeWalletSigner = nodeWallet;
-      createNodeWalletInstruction = instruction2;
+      createNodeWalletInstruction = instructions;
       nodeWalletPubKey = nodeWalletPublicKey;
     } else {
       nodeWalletPubKey = nodeWalletAccount.publicKey;
@@ -1357,18 +1373,13 @@ function createOffer(lavarageProgram, params) {
       payerKey: lavarageProgram.provider.publicKey,
       recentBlockhash: blockhash,
       instructions: [
-        createNodeWalletInstruction === void 0 ? null : createNodeWalletInstruction,
+        ...createNodeWalletInstruction,
         instruction,
         updateMaxExposureInstruction,
         transferInstruction,
         computeFeeIx
       ].filter(Boolean)
     }).compileToV0Message();
-    if (nodeWalletSigner) {
-      const transaction = new VersionedTransaction(messageV0);
-      transaction.sign([nodeWalletSigner]);
-      return transaction;
-    }
     return new VersionedTransaction(messageV0);
   });
 }