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

package/dist/index.js

@@ -101,10 +101,10 @@ var SolanaExplorerMap = {
 var ExplorerUrls = {
   ["solscan" /* Solscan */]: "https://solscan.io",
   ["solscan_mainnet" /* SolscanMainnet */]: "https://solscan.io",
-  ["solscan_devnet" /* SolscanDevnet */]: "https://solscan.io/?cluster=devnet",
+  ["solscan_devnet" /* SolscanDevnet */]: "https://solscan.io",
   ["solana_explorer" /* SolanaExplorer */]: "https://explorer.solana.com",
   ["solana_explorer_mainnet" /* SolanaExplorerMainnet */]: "https://explorer.solana.com",
-  ["solana_explorer_devnet" /* SolanaExplorerDevnet */]: "https://explorer.solana.com/?cluster=devnet"
+  ["solana_explorer_devnet" /* SolanaExplorerDevnet */]: "https://explorer.solana.com"
 };
 var SolanaExplorerNames = {
   mainnet: ["solscan_mainnet" /* SolscanMainnet */, "solana_explorer_mainnet" /* SolanaExplorerMainnet */],
@@ -376,9 +376,9 @@ var WarpSolanaDataLoader = class {
 };
 
 // src/WarpSolanaExecutor.ts
-var import_warps5 = require("@vleap/warps");
-var import_web34 = require("@solana/web3.js");
 var import_spl_token2 = require("@solana/spl-token");
+var import_web34 = require("@solana/web3.js");
+var import_warps5 = require("@vleap/warps");
 
 // src/WarpSolanaOutput.ts
 var import_warps4 = require("@vleap/warps");
@@ -769,12 +769,12 @@ var WarpSolanaExecutor = class {
   async createTransferTransaction(executable) {
     const userWallet = (0, import_warps5.getWarpWalletAddressFromConfig)(this.config, executable.chain.name);
     if (!userWallet) throw new Error("WarpSolanaExecutor: createTransfer - user address not set");
+    if (!executable.destination) throw new Error("WarpSolanaExecutor: Destination address is required");
     let destinationPubkey;
     try {
-      if (!executable.destination) throw new Error("WarpSolanaExecutor: Destination address is required");
       destinationPubkey = new import_web34.PublicKey(executable.destination);
-    } catch {
-      throw new Error(`WarpSolanaExecutor: Invalid destination address: ${executable.destination}`);
+    } catch (error) {
+      throw new Error("WarpSolanaExecutor: Invalid destination address");
     }
     if (executable.transfers && executable.transfers.length > 0) {
       return this.createTokenTransferTransaction(executable, userWallet, destinationPubkey);
@@ -782,13 +782,7 @@ var WarpSolanaExecutor = class {
     const fromPubkey = new import_web34.PublicKey(userWallet);
     const transaction = new import_web34.Transaction();
     if (executable.value > 0n) {
-      transaction.add(
-        import_web34.SystemProgram.transfer({
-          fromPubkey,
-          toPubkey: destinationPubkey,
-          lamports: Number(executable.value)
-        })
-      );
+      transaction.add(import_web34.SystemProgram.transfer({ fromPubkey, toPubkey: destinationPubkey, lamports: Number(executable.value) }));
     }
     if (executable.data) {
       const data = this.serializer.stringToTyped(executable.data);
@@ -812,13 +806,8 @@ var WarpSolanaExecutor = class {
     if (!userWallet) throw new Error("WarpSolanaExecutor: createContractCall - user address not set");
     const action = (0, import_warps5.getWarpActionByIndex)(executable.warp, executable.action);
     if (!action || !("func" in action) || !action.func) throw new Error("WarpSolanaExecutor: Contract action must have a function name");
-    let programId;
-    try {
-      if (!executable.destination) throw new Error("WarpSolanaExecutor: Contract address is required");
-      programId = new import_web34.PublicKey(executable.destination);
-    } catch {
-      throw new Error(`WarpSolanaExecutor: Invalid contract address: ${executable.destination}`);
-    }
+    if (!executable.destination) throw new Error("WarpSolanaExecutor: Contract address is required");
+    const programId = new import_web34.PublicKey(executable.destination);
     const fromPubkey = new import_web34.PublicKey(userWallet);
     const transaction = new import_web34.Transaction();
     try {
@@ -847,13 +836,7 @@ var WarpSolanaExecutor = class {
       });
       transaction.add(instruction);
       if (executable.value > 0n) {
-        transaction.add(
-          import_web34.SystemProgram.transfer({
-            fromPubkey,
-            toPubkey: programId,
-            lamports: Number(executable.value)
-          })
-        );
+        transaction.add(import_web34.SystemProgram.transfer({ fromPubkey, toPubkey: programId, lamports: Number(executable.value) }));
       }
       return this.setTransactionDefaults(transaction, fromPubkey);
     } catch (error) {
@@ -865,10 +848,10 @@ 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);
@@ -880,9 +863,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") {
@@ -913,7 +896,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);
@@ -1003,23 +986,9 @@ var WarpSolanaExecutor = class {
     }
     const destinationAccountInfo = await this.connection.getAccountInfo(destinationTokenAccount);
     if (!destinationAccountInfo) {
-      transaction.add(
-        (0, import_spl_token2.createAssociatedTokenAccountInstruction)(
-          fromPubkey,
-          destinationTokenAccount,
-          destinationPubkey,
-          mintAddress
-        )
-      );
+      transaction.add((0, import_spl_token2.createAssociatedTokenAccountInstruction)(fromPubkey, destinationTokenAccount, destinationPubkey, mintAddress));
     }
-    transaction.add(
-      (0, import_spl_token2.createTransferInstruction)(
-        sourceTokenAccount,
-        destinationTokenAccount,
-        fromPubkey,
-        Number(transfer.amount)
-      )
-    );
+    transaction.add((0, import_spl_token2.createTransferInstruction)(sourceTokenAccount, destinationTokenAccount, fromPubkey, Number(transfer.amount)));
     return this.setTransactionDefaults(transaction, fromPubkey);
   }
   async executeQuery(executable) {
@@ -1076,9 +1045,7 @@ var WarpSolanaExecutor = class {
         executable.resolvedInputs
       );
       const next = (0, import_warps5.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 = (0, import_warps5.extractResolvedInputValues)(executable.resolvedInputs);
       return {
@@ -1097,9 +1064,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 = (0, import_warps5.extractResolvedInputValues)(executable.resolvedInputs);
       return {
@@ -1135,12 +1100,8 @@ var WarpSolanaExecutor = class {
         transaction.feePayer = fromPubkey;
       }
       const instructions = transaction.instructions;
-      const hasTransfer = instructions.some(
-        (ix) => ix.programId.equals(import_web34.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(import_web34.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;
@@ -1149,16 +1110,13 @@ var WarpSolanaExecutor = class {
       } else {
         computeUnits = WarpSolanaConstants.ComputeUnitLimit.ContractCall;
       }
-      transaction.add(
-        import_web34.ComputeBudgetProgram.setComputeUnitLimit({
-          units: computeUnits
-        })
-      );
-      transaction.add(
-        import_web34.ComputeBudgetProgram.setComputeUnitPrice({
-          microLamports: WarpSolanaConstants.PriorityFee.Default
-        })
-      );
+      const computeUnitLimitIx = import_web34.ComputeBudgetProgram.setComputeUnitLimit({
+        units: computeUnits
+      });
+      const computeUnitPriceIx = import_web34.ComputeBudgetProgram.setComputeUnitPrice({
+        microLamports: WarpSolanaConstants.PriorityFee.Default
+      });
+      transaction.instructions = [computeUnitLimitIx, computeUnitPriceIx, ...transaction.instructions];
       return transaction;
     } catch (error) {
       const errorMessage = error instanceof Error ? error.message : String(error);
@@ -1200,26 +1158,46 @@ var WarpSolanaExplorer = class {
   }
   getAccountUrl(address, explorer) {
     const baseUrl = this.getExplorerUrlByName(explorer);
+    if (baseUrl.includes("?")) {
+      const cluster2 = this.config.env === "mainnet" ? "" : `&cluster=${this.config.env}`;
+      return `${baseUrl}/account/${address}${cluster2}`;
+    }
     const cluster = this.config.env === "mainnet" ? "" : `?cluster=${this.config.env}`;
     return `${baseUrl}/account/${address}${cluster}`;
   }
   getTransactionUrl(hash, explorer) {
     const baseUrl = this.getExplorerUrlByName(explorer);
+    if (baseUrl.includes("?")) {
+      const cluster2 = this.config.env === "mainnet" ? "" : `&cluster=${this.config.env}`;
+      return `${baseUrl}/tx/${hash}${cluster2}`;
+    }
     const cluster = this.config.env === "mainnet" ? "" : `?cluster=${this.config.env}`;
     return `${baseUrl}/tx/${hash}${cluster}`;
   }
   getBlockUrl(blockNumber, explorer) {
     const baseUrl = this.getExplorerUrlByName(explorer);
+    if (baseUrl.includes("?")) {
+      const cluster2 = this.config.env === "mainnet" ? "" : `&cluster=${this.config.env}`;
+      return `${baseUrl}/block/${blockNumber}${cluster2}`;
+    }
     const cluster = this.config.env === "mainnet" ? "" : `?cluster=${this.config.env}`;
     return `${baseUrl}/block/${blockNumber}${cluster}`;
   }
   getAssetUrl(identifier, explorer) {
     const baseUrl = this.getExplorerUrlByName(explorer);
+    if (baseUrl.includes("?")) {
+      const cluster2 = this.config.env === "mainnet" ? "" : `&cluster=${this.config.env}`;
+      return `${baseUrl}/token/${identifier}${cluster2}`;
+    }
     const cluster = this.config.env === "mainnet" ? "" : `?cluster=${this.config.env}`;
     return `${baseUrl}/token/${identifier}${cluster}`;
   }
   getContractUrl(address, explorer) {
     const baseUrl = this.getExplorerUrlByName(explorer);
+    if (baseUrl.includes("?")) {
+      const cluster2 = this.config.env === "mainnet" ? "" : `&cluster=${this.config.env}`;
+      return `${baseUrl}/account/${address}${cluster2}`;
+    }
     const cluster = this.config.env === "mainnet" ? "" : `?cluster=${this.config.env}`;
     return `${baseUrl}/account/${address}${cluster}`;
   }
@@ -1296,7 +1274,7 @@ var WarpSolanaExplorer = class {
 var import_warps6 = require("@vleap/warps");
 var import_web35 = require("@solana/web3.js");
 var bip39 = __toESM(require("@scure/bip39"), 1);
-var import_english = require("@scure/bip39/wordlists/english");
+var import_english = require("@scure/bip39/wordlists/english.js");
 var import_bs582 = __toESM(require("bs58"), 1);
 var WarpSolanaWallet = class {
   constructor(config, chain) {