@vleap/warps-adapter-evm 0.2.0-beta.50 → 0.2.0-beta.52

package/dist/index.d.cts

@@ -175,6 +175,9 @@ declare class WarpEvmExecutor implements AdapterWarpExecutor {
     executeQuery(executable: WarpExecutable): Promise<WarpActionExecutionResult>;
     private estimateGasAndSetDefaults;
     verifyMessage(message: string, signature: string): Promise<string>;
+    private getPayableValue;
+    private findNativeTokenAsset;
+    private prepareNativeArgs;
 }
 
 declare class WarpEvmExplorer implements AdapterWarpExplorer {

package/dist/index.d.ts

@@ -175,6 +175,9 @@ declare class WarpEvmExecutor implements AdapterWarpExecutor {
     executeQuery(executable: WarpExecutable): Promise<WarpActionExecutionResult>;
     private estimateGasAndSetDefaults;
     verifyMessage(message: string, signature: string): Promise<string>;
+    private getPayableValue;
+    private findNativeTokenAsset;
+    private prepareNativeArgs;
 }
 
 declare class WarpEvmExplorer implements AdapterWarpExplorer {

package/dist/index.js

@@ -466,6 +466,7 @@ var WarpEvmDataLoader = class {
   }
   async getAsset(identifier) {
     try {
+      console.log("WarpEvmDataLoader.getAsset", identifier);
       if (identifier === this.chain.nativeToken.identifier) {
         return this.chain.nativeToken;
       }
@@ -474,6 +475,7 @@ var WarpEvmDataLoader = class {
       if (cachedAsset) {
         return cachedAsset;
       }
+      console.log("WarpEvmDataLoader.getAsset: findKnownTokenById", this.chain.name, this.config.env, identifier);
       const knownToken = findKnownTokenById(this.chain.name, this.config.env, identifier);
       if (knownToken) {
         return {
@@ -494,7 +496,7 @@ var WarpEvmDataLoader = class {
         symbol: metadata.symbol,
         amount: 0n,
         decimals: metadata.decimals,
-        logoUrl: metadata.logoUrl || ""
+        logoUrl: metadata.logoUrl
       };
       this.cache.set(cacheKey, asset, import_warps8.CacheTtl.OneHour);
       return asset;
@@ -597,7 +599,7 @@ var WarpEvmConstants = {
     Swap: 2e5
   },
   GasPrice: {
-    Default: "20000000000"
+    Default: "1200010"
   },
   Validation: {
     MinGasLimit: 21e3,
@@ -1017,11 +1019,16 @@ var WarpEvmExecutor = class {
       } catch {
         iface = new import_ethers4.ethers.Interface([action.abi]);
       }
-      const nativeArgs = executable.args.map((arg) => this.serializer.coreSerializer.stringToNative(arg)[1]);
+      const funcFragment = iface.getFunction(action.func);
+      if (!funcFragment) throw new Error(`WarpEvmExecutor: Function ${action.func} not found in ABI`);
+      const nativeArgs = this.prepareNativeArgs(executable.args, funcFragment);
       const encodedData = iface.encodeFunctionData(action.func, nativeArgs);
+      const value = this.getPayableValue(executable, funcFragment);
+      console.log("Encoded data:", encodedData);
+      console.log("Value:", value);
       const tx = {
         to: executable.destination,
-        value: executable.value,
+        value,
         data: encodedData
       };
       return this.estimateGasAndSetDefaults(tx, userWallet);
@@ -1075,7 +1082,9 @@ var WarpEvmExecutor = class {
       } catch {
         iface = new import_ethers4.ethers.Interface([action.abi]);
       }
-      const nativeArgs = executable.args.map((arg) => this.serializer.coreSerializer.stringToNative(arg)[1]);
+      const funcFragment = iface.getFunction(action.func);
+      if (!funcFragment) throw new Error(`WarpEvmExecutor: Function ${action.func} not found in ABI`);
+      const nativeArgs = this.prepareNativeArgs(executable.args, funcFragment);
       const encodedData = iface.encodeFunctionData(action.func, nativeArgs);
       const result = await this.provider.call({
         to: executable.destination,
@@ -1090,9 +1099,7 @@ var WarpEvmExecutor = class {
         executable.resolvedInputs
       );
       const next = (0, import_warps11.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_warps11.extractResolvedInputValues)(executable.resolvedInputs);
       return {
@@ -1110,9 +1117,7 @@ var WarpEvmExecutor = class {
         resolvedInputs
       };
     } catch (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_warps11.extractResolvedInputValues)(executable.resolvedInputs);
       return {
@@ -1190,6 +1195,53 @@ var WarpEvmExecutor = class {
       throw new Error(`Failed to verify message: ${error}`);
     }
   }
+  getPayableValue(executable, funcFragment) {
+    if (funcFragment.stateMutability !== "payable") {
+      return executable.value;
+    }
+    const nativeTokenId = this.chain.nativeToken?.identifier;
+    const zeroAddress = "0x0000000000000000000000000000000000000000";
+    const nativeTokenTransfer = nativeTokenId ? executable.transfers.find((transfer) => transfer.identifier === nativeTokenId || transfer.identifier === zeroAddress) : void 0;
+    if (nativeTokenTransfer) {
+      return nativeTokenTransfer.amount;
+    }
+    const nativeTokenAsset = this.findNativeTokenAsset(executable.resolvedInputs, nativeTokenId, zeroAddress);
+    if (nativeTokenAsset) {
+      return nativeTokenAsset.amount;
+    }
+    return executable.value;
+  }
+  findNativeTokenAsset(resolvedInputs, nativeTokenId, zeroAddress) {
+    for (const input of resolvedInputs) {
+      if (input.input.type === "asset" && input.value) {
+        const [, assetValue] = this.serializer.coreSerializer.stringToNative(input.value);
+        const asset = assetValue;
+        if (asset && "amount" in asset) {
+          if (asset.identifier === nativeTokenId || asset.identifier === zeroAddress) {
+            return asset;
+          }
+        }
+      }
+    }
+    return null;
+  }
+  prepareNativeArgs(args, funcFragment) {
+    return args.map((arg, index) => {
+      const nativeValue = this.serializer.coreSerializer.stringToNative(arg)[1];
+      const paramType = funcFragment.inputs[index]?.type;
+      if (paramType === "bytes32" && typeof nativeValue === "string") {
+        let hexValue = nativeValue;
+        if (!hexValue.startsWith("0x")) {
+          hexValue = "0x" + hexValue;
+        }
+        if (hexValue.length !== 66) {
+          hexValue = import_ethers4.ethers.zeroPadValue(hexValue, 32);
+        }
+        return hexValue;
+      }
+      return nativeValue;
+    });
+  }
 };
 
 // src/WarpEvmExplorer.ts