@vleap/warps-adapter-evm 0.2.0-alpha.40 → 0.2.0-alpha.42

package/dist/index.d.cts

@@ -1,4 +1,4 @@
-import { WarpChainAsset, AdapterFactory, WarpClientConfig, Adapter, WarpChain, WarpChainEnv, WarpChainInfo, WarpCache, AdapterWarpDataLoader, WarpChainAccount, WarpChainAction, WarpDataLoaderOptions, AdapterWarpExecutor, WarpExecutable, WarpActionExecution, AdapterWarpExplorer, AdapterWarpResults, Warp, WarpActionIndex, WarpAdapterGenericRemoteTransaction, ResolvedInput, WarpNativeValue, WarpExecutionResults, AdapterWarpSerializer, WarpSerializer, WarpActionInputType, BaseWarpActionInputType, WarpAdapterGenericType, AdapterWarpWallet, WarpAdapterGenericTransaction } from '@vleap/warps';
+import { WarpChainAsset, AdapterFactory, WarpClientConfig, Adapter, WarpChain, WarpChainEnv, WarpChainInfo, WarpCache, AdapterWarpDataLoader, WarpChainAccount, WarpChainAction, WarpDataLoaderOptions, AdapterWarpExecutor, WarpExecutable, WarpActionExecutionResult, AdapterWarpExplorer, AdapterWarpOutput, Warp, WarpActionIndex, WarpAdapterGenericRemoteTransaction, ResolvedInput, WarpNativeValue, WarpExecutionOutput, AdapterWarpSerializer, WarpSerializer, WarpActionInputType, BaseWarpActionInputType, WarpAdapterGenericType, AdapterWarpWallet, WarpAdapterGenericTransaction } from '@vleap/warps';
 import { ethers } from 'ethers';
 
 declare const NativeTokenArb: WarpChainAsset;
@@ -165,14 +165,14 @@ declare class WarpEvmExecutor implements AdapterWarpExecutor {
     private readonly chain;
     private readonly serializer;
     private readonly provider;
-    private readonly results;
+    private readonly output;
     constructor(config: WarpClientConfig, chain: WarpChainInfo);
     createTransaction(executable: WarpExecutable): Promise<ethers.TransactionRequest>;
     createTransferTransaction(executable: WarpExecutable): Promise<ethers.TransactionRequest>;
     createContractCallTransaction(executable: WarpExecutable): Promise<ethers.TransactionRequest>;
     private createTokenTransferTransaction;
     private createSingleTokenTransfer;
-    executeQuery(executable: WarpExecutable): Promise<WarpActionExecution>;
+    executeQuery(executable: WarpExecutable): Promise<WarpActionExecutionResult>;
     private estimateGasAndSetDefaults;
     verifyMessage(message: string, signature: string): Promise<string>;
 }
@@ -198,22 +198,22 @@ declare class WarpEvmExplorer implements AdapterWarpExplorer {
     getBlockUrls(blockNumber: string | number): Record<ExplorerName, string>;
 }
 
-declare class WarpEvmResults implements AdapterWarpResults {
+declare class WarpEvmOutput implements AdapterWarpOutput {
     private readonly config;
     private readonly chain;
     private readonly serializer;
     private readonly provider;
     constructor(config: WarpClientConfig, chain: WarpChainInfo);
-    getActionExecution(warp: Warp, actionIndex: WarpActionIndex, tx: WarpAdapterGenericRemoteTransaction): Promise<WarpActionExecution>;
+    getActionExecution(warp: Warp, actionIndex: WarpActionIndex, tx: WarpAdapterGenericRemoteTransaction): Promise<WarpActionExecutionResult>;
     private createFailedExecution;
     private handleWarpChainAction;
     private handleTransactionReceipt;
-    extractQueryResults(warp: Warp, typedValues: unknown[], actionIndex: number, inputs: ResolvedInput[]): Promise<{
+    extractQueryOutput(warp: Warp, typedValues: unknown[], actionIndex: number, inputs: ResolvedInput[]): Promise<{
         values: {
             string: string[];
             native: WarpNativeValue[];
         };
-        results: WarpExecutionResults;
+        output: WarpExecutionOutput;
     }>;
     getTransactionStatus(txHash: string): Promise<{
         status: 'pending' | 'confirmed' | 'failed';
@@ -258,4 +258,4 @@ declare class WarpEvmWallet implements AdapterWarpWallet {
     private getWallet;
 }
 
-export { ArbitrumExplorers, BaseExplorers, EthereumExplorers, EvmExplorers, type ExplorerName, ExplorerUrls, KnownTokens, NativeTokenArb, NativeTokenBase, NativeTokenEth, type TokenBalance, type TokenInfo, type TokenListResponse, type TokenMetadata, UniswapService, type UniswapToken, type UniswapTokenList, WarpEvmConstants, WarpEvmDataLoader, WarpEvmExecutor, WarpEvmExplorer, WarpEvmResults, WarpEvmSerializer, WarpEvmWallet, createEvmAdapter, findKnownTokenById, getAllEvmAdapters, getAllEvmChainNames, getArbitrumAdapter, getBaseAdapter, getEthereumAdapter, getKnownTokensForChain };
+export { ArbitrumExplorers, BaseExplorers, EthereumExplorers, EvmExplorers, type ExplorerName, ExplorerUrls, KnownTokens, NativeTokenArb, NativeTokenBase, NativeTokenEth, type TokenBalance, type TokenInfo, type TokenListResponse, type TokenMetadata, UniswapService, type UniswapToken, type UniswapTokenList, WarpEvmConstants, WarpEvmDataLoader, WarpEvmExecutor, WarpEvmExplorer, WarpEvmOutput, WarpEvmSerializer, WarpEvmWallet, createEvmAdapter, findKnownTokenById, getAllEvmAdapters, getAllEvmChainNames, getArbitrumAdapter, getBaseAdapter, getEthereumAdapter, getKnownTokensForChain };

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { WarpChainAsset, AdapterFactory, WarpClientConfig, Adapter, WarpChain, WarpChainEnv, WarpChainInfo, WarpCache, AdapterWarpDataLoader, WarpChainAccount, WarpChainAction, WarpDataLoaderOptions, AdapterWarpExecutor, WarpExecutable, WarpActionExecution, AdapterWarpExplorer, AdapterWarpResults, Warp, WarpActionIndex, WarpAdapterGenericRemoteTransaction, ResolvedInput, WarpNativeValue, WarpExecutionResults, AdapterWarpSerializer, WarpSerializer, WarpActionInputType, BaseWarpActionInputType, WarpAdapterGenericType, AdapterWarpWallet, WarpAdapterGenericTransaction } from '@vleap/warps';
+import { WarpChainAsset, AdapterFactory, WarpClientConfig, Adapter, WarpChain, WarpChainEnv, WarpChainInfo, WarpCache, AdapterWarpDataLoader, WarpChainAccount, WarpChainAction, WarpDataLoaderOptions, AdapterWarpExecutor, WarpExecutable, WarpActionExecutionResult, AdapterWarpExplorer, AdapterWarpOutput, Warp, WarpActionIndex, WarpAdapterGenericRemoteTransaction, ResolvedInput, WarpNativeValue, WarpExecutionOutput, AdapterWarpSerializer, WarpSerializer, WarpActionInputType, BaseWarpActionInputType, WarpAdapterGenericType, AdapterWarpWallet, WarpAdapterGenericTransaction } from '@vleap/warps';
 import { ethers } from 'ethers';
 
 declare const NativeTokenArb: WarpChainAsset;
@@ -165,14 +165,14 @@ declare class WarpEvmExecutor implements AdapterWarpExecutor {
     private readonly chain;
     private readonly serializer;
     private readonly provider;
-    private readonly results;
+    private readonly output;
     constructor(config: WarpClientConfig, chain: WarpChainInfo);
     createTransaction(executable: WarpExecutable): Promise<ethers.TransactionRequest>;
     createTransferTransaction(executable: WarpExecutable): Promise<ethers.TransactionRequest>;
     createContractCallTransaction(executable: WarpExecutable): Promise<ethers.TransactionRequest>;
     private createTokenTransferTransaction;
     private createSingleTokenTransfer;
-    executeQuery(executable: WarpExecutable): Promise<WarpActionExecution>;
+    executeQuery(executable: WarpExecutable): Promise<WarpActionExecutionResult>;
     private estimateGasAndSetDefaults;
     verifyMessage(message: string, signature: string): Promise<string>;
 }
@@ -198,22 +198,22 @@ declare class WarpEvmExplorer implements AdapterWarpExplorer {
     getBlockUrls(blockNumber: string | number): Record<ExplorerName, string>;
 }
 
-declare class WarpEvmResults implements AdapterWarpResults {
+declare class WarpEvmOutput implements AdapterWarpOutput {
     private readonly config;
     private readonly chain;
     private readonly serializer;
     private readonly provider;
     constructor(config: WarpClientConfig, chain: WarpChainInfo);
-    getActionExecution(warp: Warp, actionIndex: WarpActionIndex, tx: WarpAdapterGenericRemoteTransaction): Promise<WarpActionExecution>;
+    getActionExecution(warp: Warp, actionIndex: WarpActionIndex, tx: WarpAdapterGenericRemoteTransaction): Promise<WarpActionExecutionResult>;
     private createFailedExecution;
     private handleWarpChainAction;
     private handleTransactionReceipt;
-    extractQueryResults(warp: Warp, typedValues: unknown[], actionIndex: number, inputs: ResolvedInput[]): Promise<{
+    extractQueryOutput(warp: Warp, typedValues: unknown[], actionIndex: number, inputs: ResolvedInput[]): Promise<{
         values: {
             string: string[];
             native: WarpNativeValue[];
         };
-        results: WarpExecutionResults;
+        output: WarpExecutionOutput;
     }>;
     getTransactionStatus(txHash: string): Promise<{
         status: 'pending' | 'confirmed' | 'failed';
@@ -258,4 +258,4 @@ declare class WarpEvmWallet implements AdapterWarpWallet {
     private getWallet;
 }
 
-export { ArbitrumExplorers, BaseExplorers, EthereumExplorers, EvmExplorers, type ExplorerName, ExplorerUrls, KnownTokens, NativeTokenArb, NativeTokenBase, NativeTokenEth, type TokenBalance, type TokenInfo, type TokenListResponse, type TokenMetadata, UniswapService, type UniswapToken, type UniswapTokenList, WarpEvmConstants, WarpEvmDataLoader, WarpEvmExecutor, WarpEvmExplorer, WarpEvmResults, WarpEvmSerializer, WarpEvmWallet, createEvmAdapter, findKnownTokenById, getAllEvmAdapters, getAllEvmChainNames, getArbitrumAdapter, getBaseAdapter, getEthereumAdapter, getKnownTokensForChain };
+export { ArbitrumExplorers, BaseExplorers, EthereumExplorers, EvmExplorers, type ExplorerName, ExplorerUrls, KnownTokens, NativeTokenArb, NativeTokenBase, NativeTokenEth, type TokenBalance, type TokenInfo, type TokenListResponse, type TokenMetadata, UniswapService, type UniswapToken, type UniswapTokenList, WarpEvmConstants, WarpEvmDataLoader, WarpEvmExecutor, WarpEvmExplorer, WarpEvmOutput, WarpEvmSerializer, WarpEvmWallet, createEvmAdapter, findKnownTokenById, getAllEvmAdapters, getAllEvmChainNames, getArbitrumAdapter, getBaseAdapter, getEthereumAdapter, getKnownTokensForChain };

package/dist/index.js

@@ -34,7 +34,7 @@ __export(index_exports, {
   WarpEvmDataLoader: () => WarpEvmDataLoader,
   WarpEvmExecutor: () => WarpEvmExecutor,
   WarpEvmExplorer: () => WarpEvmExplorer,
-  WarpEvmResults: () => WarpEvmResults,
+  WarpEvmOutput: () => WarpEvmOutput,
   WarpEvmSerializer: () => WarpEvmSerializer,
   WarpEvmWallet: () => WarpEvmWallet,
   createEvmAdapter: () => createEvmAdapter,
@@ -579,7 +579,7 @@ var ExplorerUrls = {
   ["blockscout_base_sepolia" /* BlockscoutBaseSepolia */]: "https://sepolia.blockscout.com"
 };
 
-// src/WarpEvmResults.ts
+// src/WarpEvmOutput.ts
 var import_warps9 = require("@vleap/warps");
 var import_ethers3 = require("ethers");
 
@@ -735,8 +735,8 @@ var WarpEvmSerializer = class {
   }
 };
 
-// src/WarpEvmResults.ts
-var WarpEvmResults = class {
+// src/WarpEvmOutput.ts
+var WarpEvmOutput = class {
   constructor(config, chain) {
     this.config = config;
     this.chain = chain;
@@ -756,7 +756,7 @@ var WarpEvmResults = class {
   }
   createFailedExecution(warp, actionIndex) {
     return {
-      success: false,
+      status: "error",
       warp,
       action: actionIndex,
       user: (0, import_warps9.getWarpWalletAddressFromConfig)(this.config, this.chain.name),
@@ -764,7 +764,7 @@ var WarpEvmResults = class {
       tx: null,
       next: null,
       values: { string: [], native: [] },
-      results: {},
+      output: {},
       messages: {}
     };
   }
@@ -777,7 +777,7 @@ var WarpEvmResults = class {
     const rawValues = [transactionHash, blockNumber, gasUsed, gasPrice];
     const stringValues = rawValues.map(String);
     return {
-      success,
+      status: success ? "success" : "error",
       warp,
       action: actionIndex,
       user: (0, import_warps9.getWarpWalletAddressFromConfig)(this.config, this.chain.name),
@@ -785,7 +785,7 @@ var WarpEvmResults = class {
       tx,
       next: null,
       values: { string: stringValues, native: rawValues },
-      results: {},
+      output: {},
       messages: {}
     };
   }
@@ -806,7 +806,7 @@ var WarpEvmResults = class {
     const rawValues = [transactionHash, blockNumber, gasUsed, gasPrice, ...logs.length > 0 ? logs : []];
     const stringValues = rawValues.map(String);
     return {
-      success,
+      status: success ? "success" : "error",
       warp,
       action: actionIndex,
       user: (0, import_warps9.getWarpWalletAddressFromConfig)(this.config, this.chain.name),
@@ -814,16 +814,16 @@ var WarpEvmResults = class {
       tx,
       next: null,
       values: { string: stringValues, native: rawValues },
-      results: {},
+      output: {},
       messages: {}
     };
   }
-  async extractQueryResults(warp, typedValues, actionIndex, inputs) {
+  async extractQueryOutput(warp, typedValues, actionIndex, inputs) {
     const stringValues = typedValues.map((t) => this.serializer.typedToString(t));
     const nativeValues = typedValues.map((t) => this.serializer.typedToNative(t)[1]);
     const values = { string: stringValues, native: nativeValues };
-    let results = {};
-    if (!warp.results) return { values, results };
+    let output = {};
+    if (!warp.output) return { values, output };
     const getNestedValue = (path) => {
       const indices = path.split(".").slice(1).map((i) => parseInt(i) - 1);
       if (indices.length === 0) return void 0;
@@ -834,20 +834,20 @@ var WarpEvmResults = class {
       }
       return value;
     };
-    for (const [key, path] of Object.entries(warp.results)) {
+    for (const [key, path] of Object.entries(warp.output)) {
       if (path.startsWith(import_warps9.WarpConstants.Transform.Prefix)) continue;
-      const currentActionIndex = (0, import_warps9.parseResultsOutIndex)(path);
+      const currentActionIndex = (0, import_warps9.parseOutputOutIndex)(path);
       if (currentActionIndex !== null && currentActionIndex !== actionIndex) {
-        results[key] = null;
+        output[key] = null;
         continue;
       }
       if (path.startsWith("out.") || path === "out" || path.startsWith("out[")) {
-        results[key] = getNestedValue(path) || null;
+        output[key] = getNestedValue(path) || null;
       } else {
-        results[key] = path;
+        output[key] = path;
       }
     }
-    return { values, results: await (0, import_warps9.evaluateResultsCommon)(warp, results, actionIndex, inputs, this.serializer.coreSerializer, this.config) };
+    return { values, output: await (0, import_warps9.evaluateOutputCommon)(warp, output, actionIndex, inputs, this.serializer.coreSerializer, this.config) };
   }
   async getTransactionStatus(txHash) {
     try {
@@ -882,7 +882,7 @@ var WarpEvmExecutor = class {
     const providerConfig = (0, import_warps10.getProviderConfig)(this.config, chain.name, this.config.env, this.chain.defaultApiUrl);
     const network = new import_ethers4.ethers.Network(this.chain.name, parseInt(this.chain.chainId));
     this.provider = new import_ethers4.ethers.JsonRpcProvider(providerConfig.url, network);
-    this.results = new WarpEvmResults(config, this.chain);
+    this.output = new WarpEvmOutput(config, this.chain);
   }
   async createTransaction(executable) {
     const action = (0, import_warps10.getWarpActionByIndex)(executable.warp, executable.action);
@@ -994,15 +994,15 @@ var WarpEvmExecutor = class {
       });
       const decodedResult = iface.decodeFunctionResult(action.func, result);
       const isSuccess = true;
-      const { values, results } = await this.results.extractQueryResults(
+      const { values, output } = await this.output.extractQueryOutput(
         executable.warp,
         decodedResult,
         executable.action,
         executable.resolvedInputs
       );
-      const next = (0, import_warps10.getNextInfo)(this.config, [], executable.warp, executable.action, results);
+      const next = (0, import_warps10.getNextInfo)(this.config, [], executable.warp, executable.action, output);
       return {
-        success: isSuccess,
+        status: isSuccess ? "success" : "error",
         warp: executable.warp,
         action: executable.action,
         user: (0, import_warps10.getWarpWalletAddressFromConfig)(this.config, executable.chain.name),
@@ -1010,12 +1010,12 @@ var WarpEvmExecutor = class {
         tx: null,
         next,
         values,
-        results,
-        messages: (0, import_warps10.applyResultsToMessages)(executable.warp, results)
+        output: { ...output, _DATA: decodedResult },
+        messages: (0, import_warps10.applyOutputToMessages)(executable.warp, output)
       };
     } catch (error) {
       return {
-        success: false,
+        status: "error",
         warp: executable.warp,
         action: executable.action,
         user: (0, import_warps10.getWarpWalletAddressFromConfig)(this.config, executable.chain.name),
@@ -1023,7 +1023,7 @@ var WarpEvmExecutor = class {
         tx: null,
         next: null,
         values: { string: [], native: [] },
-        results: {},
+        output: { _DATA: error },
         messages: {}
       };
     }
@@ -1310,7 +1310,7 @@ var createEvmAdapter = (chainName, chainInfos) => {
       chainInfo: chainInfos[config.env],
       builder: () => fallback.builder(),
       executor: new WarpEvmExecutor(config, chainInfos[config.env]),
-      results: new WarpEvmResults(config, chainInfos[config.env]),
+      output: new WarpEvmOutput(config, chainInfos[config.env]),
       serializer: new WarpEvmSerializer(),
       registry: fallback.registry,
       explorer: new WarpEvmExplorer(chainInfos[config.env], config),
@@ -1533,7 +1533,7 @@ var getAllEvmChainNames = () => [
   WarpEvmDataLoader,
   WarpEvmExecutor,
   WarpEvmExplorer,
-  WarpEvmResults,
+  WarpEvmOutput,
   WarpEvmSerializer,
   WarpEvmWallet,
   createEvmAdapter,