@vleap/warps-adapter-solana 0.1.0-beta.2 → 0.1.0-beta.3

package/dist/index.mjs

@@ -329,6 +329,8 @@ var WarpSolanaDataLoader = class {
 };
 
 // src/WarpSolanaExecutor.ts
+import { createAssociatedTokenAccountInstruction, createTransferInstruction, getAssociatedTokenAddress } from "@solana/spl-token";
+import { ComputeBudgetProgram, Connection as Connection3, PublicKey as PublicKey3, SystemProgram, Transaction, TransactionInstruction } from "@solana/web3.js";
 import {
   applyOutputToMessages,
   extractResolvedInputValues as extractResolvedInputValues2,
@@ -337,8 +339,6 @@ import {
   getWarpActionByIndex,
   getWarpWalletAddressFromConfig as getWarpWalletAddressFromConfig2
 } from "@vleap/warps";
-import { Connection as Connection3, PublicKey as PublicKey3, SystemProgram, Transaction, TransactionInstruction, ComputeBudgetProgram } from "@solana/web3.js";
-import { createTransferInstruction, getAssociatedTokenAddress, createAssociatedTokenAccountInstruction } from "@solana/spl-token";
 
 // src/WarpSolanaOutput.ts
 import {
@@ -837,14 +837,14 @@ var WarpSolanaExecutor = class {
     try {
       const data = Buffer.alloc(8);
       if (instructionDef.discriminator && Buffer.isBuffer(instructionDef.discriminator)) {
-        instructionDef.discriminator.copy(data, 0);
+        data.set(instructionDef.discriminator.subarray(0, Math.min(8, instructionDef.discriminator.length)), 0);
       } else {
-        const hash = Buffer.from(funcName).slice(0, 8);
-        hash.copy(data, 0);
+        const hash = Buffer.from(funcName).subarray(0, 8);
+        data.set(hash, 0);
       }
       if (args.length > 0 && instructionDef.args) {
         const encodedArgs = this.encodeArgs(args, instructionDef.args);
-        return Buffer.concat([data, encodedArgs]);
+        return Buffer.from([...data, ...encodedArgs]);
       }
       return data;
     } catch {
@@ -852,9 +852,9 @@ var WarpSolanaExecutor = class {
     }
   }
   encodeBasicInstructionData(args, funcName) {
-    const funcHash = Buffer.from(funcName).slice(0, 8);
+    const funcHash = Buffer.from(funcName).subarray(0, 8);
     const data = Buffer.alloc(8);
-    funcHash.copy(data, 0);
+    data.set(funcHash, 0);
     if (args.length > 0) {
       const encodedArgs = args.map((arg) => {
         if (typeof arg === "string") {
@@ -871,7 +871,7 @@ var WarpSolanaExecutor = class {
         }
         return Buffer.from(String(arg), "utf8");
       });
-      return Buffer.concat([data, ...encodedArgs]);
+      return Buffer.from([...data, ...encodedArgs]);
     }
     return data;
   }
@@ -885,7 +885,7 @@ var WarpSolanaExecutor = class {
         const size = def.type === "u128" ? 16 : 8;
         const buf = Buffer.alloc(size);
         if (size === 16) {
-          buf.writeBigUInt64LE(num & 0xFFFFFFFFFFFFFFFFn, 0);
+          buf.writeBigUInt64LE(num & 0xffffffffffffffffn, 0);
           buf.writeBigUInt64LE(num >> 64n, 8);
         } else {
           buf.writeBigUInt64LE(num, 0);
@@ -904,7 +904,7 @@ var WarpSolanaExecutor = class {
         buffers.push(Buffer.from(String(arg), "utf8"));
       }
     }
-    return Buffer.concat(buffers);
+    return Buffer.from(buffers.flatMap((buf) => Array.from(buf)));
   }
   buildInstructionAccounts(action, executable, fromPubkey, programId) {
     const accounts = [
@@ -975,23 +975,9 @@ var WarpSolanaExecutor = class {
     }
     const destinationAccountInfo = await this.connection.getAccountInfo(destinationTokenAccount);
     if (!destinationAccountInfo) {
-      transaction.add(
-        createAssociatedTokenAccountInstruction(
-          fromPubkey,
-          destinationTokenAccount,
-          destinationPubkey,
-          mintAddress
-        )
-      );
+      transaction.add(createAssociatedTokenAccountInstruction(fromPubkey, destinationTokenAccount, destinationPubkey, mintAddress));
     }
-    transaction.add(
-      createTransferInstruction(
-        sourceTokenAccount,
-        destinationTokenAccount,
-        fromPubkey,
-        Number(transfer.amount)
-      )
-    );
+    transaction.add(createTransferInstruction(sourceTokenAccount, destinationTokenAccount, fromPubkey, Number(transfer.amount)));
     return this.setTransactionDefaults(transaction, fromPubkey);
   }
   async executeQuery(executable) {
@@ -1048,9 +1034,7 @@ var WarpSolanaExecutor = class {
         executable.resolvedInputs
       );
       const next = getNextInfo(this.config, [], executable.warp, executable.action, output);
-      const destinationInput = executable.resolvedInputs.find(
-        (i) => i.input.position === "receiver" || i.input.position === "destination"
-      );
+      const destinationInput = executable.resolvedInputs.find((i) => i.input.position === "receiver" || i.input.position === "destination");
       const destination = destinationInput?.value || executable.destination;
       const resolvedInputs = extractResolvedInputValues2(executable.resolvedInputs);
       return {
@@ -1069,9 +1053,7 @@ var WarpSolanaExecutor = class {
       };
     } catch (error) {
       const errorMessage = error instanceof Error ? error.message : String(error);
-      const destinationInput = executable.resolvedInputs.find(
-        (i) => i.input.position === "receiver" || i.input.position === "destination"
-      );
+      const destinationInput = executable.resolvedInputs.find((i) => i.input.position === "receiver" || i.input.position === "destination");
       const destination = destinationInput?.value || executable.destination;
       const resolvedInputs = extractResolvedInputValues2(executable.resolvedInputs);
       return {
@@ -1107,12 +1089,8 @@ var WarpSolanaExecutor = class {
         transaction.feePayer = fromPubkey;
       }
       const instructions = transaction.instructions;
-      const hasTransfer = instructions.some(
-        (ix) => ix.programId.equals(SystemProgram.programId) && ix.data.length === 4
-      );
-      const hasTokenTransfer = instructions.some(
-        (ix) => ix.programId.toBase58() === WarpSolanaConstants.Programs.TokenProgram
-      );
+      const hasTransfer = instructions.some((ix) => ix.programId.equals(SystemProgram.programId) && ix.data.length === 4);
+      const hasTokenTransfer = instructions.some((ix) => ix.programId.toBase58() === WarpSolanaConstants.Programs.TokenProgram);
       let computeUnits = WarpSolanaConstants.ComputeUnitLimit.Default;
       if (hasTransfer && !hasTokenTransfer) {
         computeUnits = WarpSolanaConstants.ComputeUnitLimit.Transfer;