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

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 */],
@@ -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) {
@@ -872,7 +855,7 @@ var WarpSolanaExecutor = class {
       }
       if (args.length > 0 && instructionDef.args) {
         const encodedArgs = this.encodeArgs(args, instructionDef.args);
-        return Buffer.from([...data, ...encodedArgs]);
+        return Buffer.concat([data, encodedArgs]);
       }
       return data;
     } catch {
@@ -899,7 +882,7 @@ var WarpSolanaExecutor = class {
         }
         return Buffer.from(String(arg), "utf8");
       });
-      return Buffer.from([...data, ...encodedArgs]);
+      return Buffer.concat([data, ...encodedArgs]);
     }
     return data;
   }
@@ -932,7 +915,7 @@ var WarpSolanaExecutor = class {
         buffers.push(Buffer.from(String(arg), "utf8"));
       }
     }
-    return Buffer.from(buffers.flatMap((buf) => Array.from(buf)));
+    return Buffer.concat(buffers);
   }
   buildInstructionAccounts(action, executable, fromPubkey, programId) {
     const accounts = [
@@ -1127,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);
@@ -1178,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}`;
   }
@@ -1274,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) {
@@ -1474,7 +1474,7 @@ var NativeTokenSol = {
   symbol: "SOL",
   name: "Solana",
   decimals: 9,
-  logoUrl: "https://vleap.ai/images/tokens/sol.svg"
+  logoUrl: "https://joai.ai/images/tokens/sol.svg"
 };
 var getSolanaAdapter = createSolanaAdapter(import_warps7.WarpChainName.Solana, {
   mainnet: {
@@ -1484,7 +1484,7 @@ var getSolanaAdapter = createSolanaAdapter(import_warps7.WarpChainName.Solana, {
     blockTime: 400,
     addressHrp: "",
     defaultApiUrl: "https://api.mainnet-beta.solana.com",
-    logoUrl: "https://vleap.ai/images/chains/solana.svg",
+    logoUrl: "https://joai.ai/images/chains/solana.svg",
     nativeToken: NativeTokenSol
   },
   testnet: {
@@ -1494,7 +1494,7 @@ var getSolanaAdapter = createSolanaAdapter(import_warps7.WarpChainName.Solana, {
     blockTime: 400,
     addressHrp: "",
     defaultApiUrl: "https://api.testnet.solana.com",
-    logoUrl: "https://vleap.ai/images/chains/solana.svg",
+    logoUrl: "https://joai.ai/images/chains/solana.svg",
     nativeToken: NativeTokenSol
   },
   devnet: {
@@ -1504,7 +1504,7 @@ var getSolanaAdapter = createSolanaAdapter(import_warps7.WarpChainName.Solana, {
     blockTime: 400,
     addressHrp: "",
     defaultApiUrl: "https://api.devnet.solana.com",
-    logoUrl: "https://vleap.ai/images/chains/solana.svg",
+    logoUrl: "https://joai.ai/images/chains/solana.svg",
     nativeToken: NativeTokenSol
   }
 });