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

package/dist/index.js

@@ -50,8 +50,11 @@ __export(index_exports, {
 });
 module.exports = __toCommonJS(index_exports);
 
+// src/chains/solana.ts
+var import_warps7 = require("@vleap/warps");
+
 // src/WarpSolanaDataLoader.ts
-var import_warps = require("@vleap/warps");
+var import_warps2 = require("@vleap/warps");
 var import_web3 = require("@solana/web3.js");
 var import_spl_token = require("@solana/spl-token");
 
@@ -111,7 +114,8 @@ var SolanaExplorerNames = {
 var SolanaExplorerUrls = ExplorerUrls;
 
 // src/tokens/solana.ts
-var SolanaChain = "solana";
+var import_warps = require("@vleap/warps");
+var SolanaChain = import_warps.WarpChainName.Solana;
 var SolanaTokens = [
   {
     chain: SolanaChain,
@@ -168,9 +172,9 @@ var WarpSolanaDataLoader = class {
   constructor(config, chain) {
     this.config = config;
     this.chain = chain;
-    const providerConfig = (0, import_warps.getProviderConfig)(this.config, this.chain.name, this.config.env, this.chain.defaultApiUrl);
+    const providerConfig = (0, import_warps2.getProviderConfig)(this.config, this.chain.name, this.config.env, this.chain.defaultApiUrl);
     this.connection = new import_web3.Connection(providerConfig.url, "confirmed");
-    this.cache = new import_warps.WarpCache(config.cache?.type);
+    this.cache = new import_warps2.WarpCache(config.cache?.type);
   }
   async getAccount(address) {
     try {
@@ -213,7 +217,7 @@ var WarpSolanaDataLoader = class {
       if (identifier === this.chain.nativeToken.identifier || identifier === "SOL") {
         return this.chain.nativeToken;
       }
-      const cacheKey = import_warps.WarpCacheKey.Asset(this.config.env, this.chain.name, identifier);
+      const cacheKey = import_warps2.WarpCacheKey.Asset(this.config.env, this.chain.name, identifier);
       const cachedAsset = this.cache.get(cacheKey);
       if (cachedAsset) {
         return cachedAsset;
@@ -241,7 +245,7 @@ var WarpSolanaDataLoader = class {
         decimals: metadata.decimals,
         logoUrl: metadata.logoUrl
       };
-      this.cache.set(cacheKey, asset, import_warps.CacheTtl.OneHour);
+      this.cache.set(cacheKey, asset, import_warps2.CacheTtl.OneHour);
       return asset;
     } catch (error) {
       return null;
@@ -372,21 +376,21 @@ var WarpSolanaDataLoader = class {
 };
 
 // src/WarpSolanaExecutor.ts
-var import_warps4 = 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_warps3 = require("@vleap/warps");
+var import_warps4 = require("@vleap/warps");
 var import_web33 = require("@solana/web3.js");
 
 // src/WarpSolanaSerializer.ts
-var import_warps2 = require("@vleap/warps");
+var import_warps3 = require("@vleap/warps");
 var import_web32 = require("@solana/web3.js");
 var import_bs58 = __toESM(require("bs58"), 1);
 var WarpSolanaSerializer = class {
   constructor() {
-    this.coreSerializer = new import_warps2.WarpSerializer();
+    this.coreSerializer = new import_warps3.WarpSerializer();
   }
   typedToString(value) {
     if (value && typeof value === "object" && "toBase58" in value && typeof value.toBase58 === "function") {
@@ -431,15 +435,15 @@ var WarpSolanaSerializer = class {
     if (typeof value === "object" && value !== null && "identifier" in value && "amount" in value) {
       const asset = value;
       if (asset.decimals !== void 0) {
-        return `asset:${asset.identifier}${import_warps2.WarpConstants.ArgCompositeSeparator}${asset.amount.toString()}${import_warps2.WarpConstants.ArgCompositeSeparator}${asset.decimals}`;
+        return `asset:${asset.identifier}${import_warps3.WarpConstants.ArgCompositeSeparator}${asset.amount.toString()}${import_warps3.WarpConstants.ArgCompositeSeparator}${asset.decimals}`;
       }
-      return `asset:${asset.identifier}${import_warps2.WarpConstants.ArgCompositeSeparator}${asset.amount.toString()}`;
+      return `asset:${asset.identifier}${import_warps3.WarpConstants.ArgCompositeSeparator}${asset.amount.toString()}`;
     }
     if (Array.isArray(value)) {
       if (value.length === 0) return `list:string:`;
-      const types = value.map((item) => this.typedToString(item).split(import_warps2.WarpConstants.ArgParamsSeparator)[0]);
+      const types = value.map((item) => this.typedToString(item).split(import_warps3.WarpConstants.ArgParamsSeparator)[0]);
       const type = types[0];
-      const values = value.map((item) => this.typedToString(item).split(import_warps2.WarpConstants.ArgParamsSeparator)[1]);
+      const values = value.map((item) => this.typedToString(item).split(import_warps3.WarpConstants.ArgParamsSeparator)[1]);
       return `list:${type}:${values.join(",")}`;
     }
     if (value === null || value === void 0) {
@@ -449,8 +453,8 @@ var WarpSolanaSerializer = class {
   }
   typedToNative(value) {
     const stringValue = this.typedToString(value);
-    const [type, ...valueParts] = stringValue.split(import_warps2.WarpConstants.ArgParamsSeparator);
-    const nativeValue = valueParts.join(import_warps2.WarpConstants.ArgParamsSeparator);
+    const [type, ...valueParts] = stringValue.split(import_warps3.WarpConstants.ArgParamsSeparator);
+    const nativeValue = valueParts.join(import_warps3.WarpConstants.ArgParamsSeparator);
     return [type, this.parseNativeValue(type, nativeValue)];
   }
   nativeToTyped(type, value) {
@@ -506,7 +510,7 @@ var WarpSolanaSerializer = class {
     }
   }
   stringToTyped(value) {
-    const parts = value.split(import_warps2.WarpConstants.ArgParamsSeparator, 2);
+    const parts = value.split(import_warps3.WarpConstants.ArgParamsSeparator, 2);
     if (parts.length < 2) {
       return value;
     }
@@ -528,7 +532,7 @@ var WarpSolanaSerializer = class {
       case "hex":
         return stringValue;
       case "asset":
-        const assetParts = stringValue.split(import_warps2.WarpConstants.ArgCompositeSeparator);
+        const assetParts = stringValue.split(import_warps3.WarpConstants.ArgCompositeSeparator);
         const identifier = assetParts[0] || "";
         const amount = assetParts[1] ? BigInt(assetParts[1]) : 0n;
         const decimals = assetParts[2] ? parseInt(assetParts[2], 10) : void 0;
@@ -571,13 +575,13 @@ var WarpSolanaOutput = class {
     this.config = config;
     this.chain = chain;
     this.serializer = new WarpSolanaSerializer();
-    const providerConfig = (0, import_warps3.getProviderConfig)(this.config, this.chain.name, this.config.env, this.chain.defaultApiUrl);
+    const providerConfig = (0, import_warps4.getProviderConfig)(this.config, this.chain.name, this.config.env, this.chain.defaultApiUrl);
     this.connection = new import_web33.Connection(providerConfig.url, "confirmed");
-    this.cache = new import_warps3.WarpCache(config.cache?.type);
+    this.cache = new import_warps4.WarpCache(config.cache?.type);
   }
   async getActionExecution(warp, actionIndex, tx) {
-    const inputs = this.cache.get(import_warps3.WarpCacheKey.WarpExecutable(this.config.env, warp.meta?.hash || "", actionIndex)) ?? [];
-    const resolvedInputs = (0, import_warps3.extractResolvedInputValues)(inputs);
+    const inputs = this.cache.get(import_warps4.WarpCacheKey.WarpExecutable(this.config.env, warp.meta?.hash || "", actionIndex)) ?? [];
+    const resolvedInputs = (0, import_warps4.extractResolvedInputValues)(inputs);
     if (!tx) {
       return this.createFailedExecution(warp, actionIndex, resolvedInputs);
     }
@@ -594,7 +598,7 @@ var WarpSolanaOutput = class {
       status: "error",
       warp,
       action: actionIndex,
-      user: (0, import_warps3.getWarpWalletAddressFromConfig)(this.config, this.chain.name),
+      user: (0, import_warps4.getWarpWalletAddressFromConfig)(this.config, this.chain.name),
       txHash: "",
       tx: null,
       next: null,
@@ -616,7 +620,7 @@ var WarpSolanaOutput = class {
       status: success ? "success" : "error",
       warp,
       action: actionIndex,
-      user: (0, import_warps3.getWarpWalletAddressFromConfig)(this.config, this.chain.name),
+      user: (0, import_warps4.getWarpWalletAddressFromConfig)(this.config, this.chain.name),
       txHash: transactionHash,
       tx,
       next: null,
@@ -646,7 +650,7 @@ var WarpSolanaOutput = class {
         status: success ? "success" : "error",
         warp,
         action: actionIndex,
-        user: (0, import_warps3.getWarpWalletAddressFromConfig)(this.config, this.chain.name),
+        user: (0, import_warps4.getWarpWalletAddressFromConfig)(this.config, this.chain.name),
         txHash: signature,
         tx: {
           signature,
@@ -683,8 +687,8 @@ var WarpSolanaOutput = class {
       return value;
     };
     for (const [key, path] of Object.entries(warp.output)) {
-      if (path.startsWith(import_warps3.WarpConstants.Transform.Prefix)) continue;
-      const currentActionIndex = (0, import_warps3.parseOutputOutIndex)(path);
+      if (path.startsWith(import_warps4.WarpConstants.Transform.Prefix)) continue;
+      const currentActionIndex = (0, import_warps4.parseOutputOutIndex)(path);
       if (currentActionIndex !== null && currentActionIndex !== actionIndex) {
         output[key] = null;
         continue;
@@ -695,7 +699,7 @@ var WarpSolanaOutput = class {
         output[key] = path;
       }
     }
-    return { values, output: await (0, import_warps3.evaluateOutputCommon)(warp, output, actionIndex, inputs, this.serializer.coreSerializer, this.config) };
+    return { values, output: await (0, import_warps4.evaluateOutputCommon)(warp, output, actionIndex, inputs, this.serializer.coreSerializer, this.config) };
   }
   async getTransactionStatus(txHash) {
     try {
@@ -743,12 +747,12 @@ var WarpSolanaExecutor = class {
     this.config = config;
     this.chain = chain;
     this.serializer = new WarpSolanaSerializer();
-    const providerConfig = (0, import_warps4.getProviderConfig)(this.config, chain.name, this.config.env, this.chain.defaultApiUrl);
+    const providerConfig = (0, import_warps5.getProviderConfig)(this.config, chain.name, this.config.env, this.chain.defaultApiUrl);
     this.connection = new import_web34.Connection(providerConfig.url, "confirmed");
     this.output = new WarpSolanaOutput(config, this.chain);
   }
   async createTransaction(executable) {
-    const action = (0, import_warps4.getWarpActionByIndex)(executable.warp, executable.action);
+    const action = (0, import_warps5.getWarpActionByIndex)(executable.warp, executable.action);
     let tx = null;
     if (action.type === "transfer") {
       tx = await this.createTransferTransaction(executable);
@@ -763,7 +767,7 @@ var WarpSolanaExecutor = class {
     return tx;
   }
   async createTransferTransaction(executable) {
-    const userWallet = (0, import_warps4.getWarpWalletAddressFromConfig)(this.config, executable.chain.name);
+    const userWallet = (0, import_warps5.getWarpWalletAddressFromConfig)(this.config, executable.chain.name);
     if (!userWallet) throw new Error("WarpSolanaExecutor: createTransfer - user address not set");
     let destinationPubkey;
     try {
@@ -804,9 +808,9 @@ var WarpSolanaExecutor = class {
     return this.setTransactionDefaults(transaction, fromPubkey);
   }
   async createContractCallTransaction(executable) {
-    const userWallet = (0, import_warps4.getWarpWalletAddressFromConfig)(this.config, executable.chain.name);
+    const userWallet = (0, import_warps5.getWarpWalletAddressFromConfig)(this.config, executable.chain.name);
     if (!userWallet) throw new Error("WarpSolanaExecutor: createContractCall - user address not set");
-    const action = (0, import_warps4.getWarpActionByIndex)(executable.warp, executable.action);
+    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 {
@@ -861,14 +865,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 {
@@ -876,9 +880,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") {
@@ -895,7 +899,7 @@ var WarpSolanaExecutor = class {
         }
         return Buffer.from(String(arg), "utf8");
       });
-      return Buffer.concat([data, ...encodedArgs]);
+      return Buffer.from([...data, ...encodedArgs]);
     }
     return data;
   }
@@ -909,7 +913,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);
@@ -928,7 +932,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 = [
@@ -999,27 +1003,13 @@ 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) {
-    const action = (0, import_warps4.getWarpActionByIndex)(executable.warp, executable.action);
+    const action = (0, import_warps5.getWarpActionByIndex)(executable.warp, executable.action);
     if (action.type !== "query") throw new Error(`WarpSolanaExecutor: Invalid action type for executeQuery: ${action.type}`);
     if (!action.func) throw new Error("WarpSolanaExecutor: Query action must have a function name");
     let queryAddress;
@@ -1071,38 +1061,34 @@ var WarpSolanaExecutor = class {
         executable.action,
         executable.resolvedInputs
       );
-      const next = (0, import_warps4.getNextInfo)(this.config, [], executable.warp, executable.action, output);
-      const destinationInput = executable.resolvedInputs.find(
-        (i) => i.input.position === "receiver" || i.input.position === "destination"
-      );
+      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 destination = destinationInput?.value || executable.destination;
-      const resolvedInputs = (0, import_warps4.extractResolvedInputValues)(executable.resolvedInputs);
+      const resolvedInputs = (0, import_warps5.extractResolvedInputValues)(executable.resolvedInputs);
       return {
         status: isSuccess ? "success" : "error",
         warp: executable.warp,
         action: executable.action,
-        user: (0, import_warps4.getWarpWalletAddressFromConfig)(this.config, executable.chain.name),
+        user: (0, import_warps5.getWarpWalletAddressFromConfig)(this.config, executable.chain.name),
         txHash: null,
         tx: null,
         next,
         values,
         output: { ...output, _DATA: decodedResult },
-        messages: (0, import_warps4.applyOutputToMessages)(executable.warp, output, this.config),
+        messages: (0, import_warps5.applyOutputToMessages)(executable.warp, output, this.config),
         destination,
         resolvedInputs
       };
     } 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_warps4.extractResolvedInputValues)(executable.resolvedInputs);
+      const resolvedInputs = (0, import_warps5.extractResolvedInputValues)(executable.resolvedInputs);
       return {
         status: "error",
         warp: executable.warp,
         action: executable.action,
-        user: (0, import_warps4.getWarpWalletAddressFromConfig)(this.config, executable.chain.name),
+        user: (0, import_warps5.getWarpWalletAddressFromConfig)(this.config, executable.chain.name),
         txHash: null,
         tx: null,
         next: null,
@@ -1131,12 +1117,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;
@@ -1289,7 +1271,7 @@ var WarpSolanaExplorer = class {
 };
 
 // src/WarpSolanaWallet.ts
-var import_warps5 = require("@vleap/warps");
+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");
@@ -1298,7 +1280,7 @@ var WarpSolanaWallet = class {
   constructor(config, chain) {
     this.config = config;
     this.chain = chain;
-    const providerConfig = (0, import_warps5.getProviderConfig)(config, chain.name, config.env, chain.defaultApiUrl);
+    const providerConfig = (0, import_warps6.getProviderConfig)(config, chain.name, config.env, chain.defaultApiUrl);
     this.connection = new import_web35.Connection(providerConfig.url, "confirmed");
   }
   async signTransaction(tx) {
@@ -1438,7 +1420,7 @@ var WarpSolanaWallet = class {
     }
   }
   getKeypair() {
-    const privateKey = (0, import_warps5.getWarpWalletPrivateKeyFromConfig)(this.config, this.chain.name);
+    const privateKey = (0, import_warps6.getWarpWalletPrivateKeyFromConfig)(this.config, this.chain.name);
     if (privateKey) {
       try {
         const secretKey = import_bs582.default.decode(privateKey);
@@ -1456,7 +1438,7 @@ var WarpSolanaWallet = class {
         throw new Error("Invalid private key format");
       }
     }
-    const mnemonic = (0, import_warps5.getWarpWalletMnemonicFromConfig)(this.config, this.chain.name);
+    const mnemonic = (0, import_warps6.getWarpWalletMnemonicFromConfig)(this.config, this.chain.name);
     if (mnemonic) {
       const seed = bip39.mnemonicToSeedSync(mnemonic);
       return import_web35.Keypair.fromSeed(seed.slice(0, 32));
@@ -1487,16 +1469,16 @@ var createSolanaAdapter = (chainName, chainInfos) => {
 
 // src/chains/solana.ts
 var NativeTokenSol = {
-  chain: "solana",
+  chain: import_warps7.WarpChainName.Solana,
   identifier: "SOL",
   symbol: "SOL",
   name: "Solana",
   decimals: 9,
   logoUrl: "https://vleap.ai/images/tokens/sol.svg"
 };
-var getSolanaAdapter = createSolanaAdapter("solana", {
+var getSolanaAdapter = createSolanaAdapter(import_warps7.WarpChainName.Solana, {
   mainnet: {
-    name: "solana",
+    name: import_warps7.WarpChainName.Solana,
     displayName: "Solana Mainnet",
     chainId: "101",
     blockTime: 400,
@@ -1506,7 +1488,7 @@ var getSolanaAdapter = createSolanaAdapter("solana", {
     nativeToken: NativeTokenSol
   },
   testnet: {
-    name: "solana",
+    name: import_warps7.WarpChainName.Solana,
     displayName: "Solana Testnet",
     chainId: "103",
     blockTime: 400,
@@ -1516,7 +1498,7 @@ var getSolanaAdapter = createSolanaAdapter("solana", {
     nativeToken: NativeTokenSol
   },
   devnet: {
-    name: "solana",
+    name: import_warps7.WarpChainName.Solana,
     displayName: "Solana Devnet",
     chainId: "103",
     blockTime: 400,