@joai/warps-adapter-evm 1.0.0 → 1.1.0

package/dist/index.mjs

@@ -33,7 +33,7 @@ var _UniswapService = class _UniswapService {
   async findToken(address) {
     const normalizedAddress = address.toLowerCase();
     const cacheKey = `uniswap:token:${this.chainId}:${normalizedAddress}`;
-    const cachedToken = this.cache.get(cacheKey);
+    const cachedToken = await this.cache.get(cacheKey);
     if (cachedToken) {
       return cachedToken;
     }
@@ -44,9 +44,9 @@ var _UniswapService = class _UniswapService {
         return null;
       }
       if (token) {
-        this.cache.set(cacheKey, token, CacheTtl.OneHour);
+        await this.cache.set(cacheKey, token, CacheTtl.OneHour);
       } else {
-        this.cache.set(cacheKey, null, CacheTtl.OneMinute * 5);
+        await this.cache.set(cacheKey, null, CacheTtl.OneMinute * 5);
       }
       return token;
     } catch (error) {
@@ -56,13 +56,13 @@ var _UniswapService = class _UniswapService {
   async getTokenMetadata(address) {
     const normalizedAddress = address.toLowerCase();
     const cacheKey = `uniswap:metadata:${this.chainId}:${normalizedAddress}`;
-    const cachedMetadata = this.cache.get(cacheKey);
+    const cachedMetadata = await this.cache.get(cacheKey);
     if (cachedMetadata !== null) {
       return cachedMetadata;
     }
     const token = await this.findToken(address);
     if (!token) {
-      this.cache.set(cacheKey, null, CacheTtl.OneMinute * 5);
+      await this.cache.set(cacheKey, null, CacheTtl.OneMinute * 5);
       return null;
     }
     const metadata = {
@@ -71,26 +71,26 @@ var _UniswapService = class _UniswapService {
       decimals: token.decimals,
       logoUrl: token.logoURI
     };
-    this.cache.set(cacheKey, metadata, CacheTtl.OneHour);
+    await this.cache.set(cacheKey, metadata, CacheTtl.OneHour);
     return metadata;
   }
   async getBridgeInfo(address) {
     const normalizedAddress = address.toLowerCase();
     const cacheKey = `uniswap:bridge:${this.chainId}:${normalizedAddress}`;
-    const cachedBridgeInfo = this.cache.get(cacheKey);
+    const cachedBridgeInfo = await this.cache.get(cacheKey);
     if (cachedBridgeInfo !== null) {
       return cachedBridgeInfo;
     }
     const token = await this.findToken(address);
     if (!token?.extensions?.bridgeInfo) {
-      this.cache.set(cacheKey, null, CacheTtl.OneMinute * 5);
+      await this.cache.set(cacheKey, null, CacheTtl.OneMinute * 5);
       return null;
     }
     const bridgeInfo = {};
     for (const [chainId, info] of Object.entries(token.extensions.bridgeInfo)) {
       bridgeInfo[chainId] = info.tokenAddress;
     }
-    this.cache.set(cacheKey, bridgeInfo, CacheTtl.OneHour);
+    await this.cache.set(cacheKey, bridgeInfo, CacheTtl.OneHour);
     return bridgeInfo;
   }
 };
@@ -102,6 +102,7 @@ import { ethers } from "ethers";
 import {
   getWarpWalletMnemonicFromConfig,
   getWarpWalletPrivateKeyFromConfig,
+  removeWarpWalletFromConfig,
   setWarpWalletInConfig
 } from "@joai/warps";
 var _PrivateKeyWalletProvider = class _PrivateKeyWalletProvider {
@@ -190,6 +191,9 @@ var _PrivateKeyWalletProvider = class _PrivateKeyWalletProvider {
       mnemonic: null
     };
   }
+  async delete(externalId) {
+    removeWarpWalletFromConfig(this.config, this.chain.name);
+  }
   getWallet() {
     if (this.wallet) return this.wallet;
     const privateKey = getWarpWalletPrivateKeyFromConfig(this.config, this.chain.name);
@@ -210,6 +214,7 @@ import {
   getWarpWalletPrivateKeyFromConfig as getWarpWalletPrivateKeyFromConfig2,
   normalizeAndValidateMnemonic,
   normalizeMnemonic,
+  removeWarpWalletFromConfig as removeWarpWalletFromConfig2,
   setWarpWalletInConfig as setWarpWalletInConfig2,
   validateMnemonicLength
 } from "@joai/warps";
@@ -304,6 +309,9 @@ var _MnemonicWalletProvider = class _MnemonicWalletProvider {
       mnemonic
     };
   }
+  async delete(externalId) {
+    removeWarpWalletFromConfig2(this.config, this.chain.name);
+  }
   getWallet() {
     if (this.wallet) return this.wallet;
     const mnemonic = getWarpWalletMnemonicFromConfig2(this.config, this.chain.name);
@@ -316,7 +324,7 @@ _MnemonicWalletProvider.PROVIDER_NAME = "mnemonic";
 var MnemonicWalletProvider = _MnemonicWalletProvider;
 
 // src/providers/ReadOnlyWalletProvider.ts
-import { getWarpWalletAddressFromConfig } from "@joai/warps";
+import { getWarpWalletAddressFromConfig, removeWarpWalletFromConfig as removeWarpWalletFromConfig3 } from "@joai/warps";
 var ReadOnlyWalletProvider = class {
   constructor(config, chain) {
     this.config = config;
@@ -352,6 +360,9 @@ var ReadOnlyWalletProvider = class {
     const address = getWarpWalletAddressFromConfig(this.config, this.chain.name);
     throw new Error(`Wallet can not be used for signing: ${address}`);
   }
+  async delete(externalId) {
+    removeWarpWalletFromConfig3(this.config, this.chain.name);
+  }
 };
 
 // src/tokens.ts
@@ -774,7 +785,7 @@ var WarpEvmDataLoader = class {
         return this.chain.nativeToken;
       }
       const cacheKey = WarpCacheKey.Asset(this.config.env, this.chain.name, identifier);
-      const cachedAsset = this.cache.get(cacheKey);
+      const cachedAsset = await this.cache.get(cacheKey);
       if (cachedAsset) {
         return cachedAsset;
       }
@@ -801,7 +812,7 @@ var WarpEvmDataLoader = class {
         decimals: metadata.decimals,
         logoUrl: metadata.logoUrl
       };
-      this.cache.set(cacheKey, asset, CacheTtl2.OneHour);
+      await this.cache.set(cacheKey, asset, CacheTtl2.OneHour);
       return asset;
     } catch (error) {
       return null;
@@ -1231,7 +1242,7 @@ var WarpEvmOutput = class {
     this.cache = new WarpCache3(config.env, config.cache);
   }
   async getActionExecution(warp, actionIndex, tx) {
-    const inputs = this.cache.get(WarpCacheKey2.WarpExecutable(this.config.env, warp.meta?.hash || "", actionIndex)) ?? [];
+    const inputs = await this.cache.get(WarpCacheKey2.WarpExecutable(this.config.env, warp.meta?.hash || "", actionIndex)) ?? [];
     const resolvedInputs = extractResolvedInputValues(inputs);
     if (!tx) {
       return this.createFailedExecution(warp, actionIndex, resolvedInputs);
@@ -1343,7 +1354,7 @@ var WarpEvmOutput = class {
         output[key] = path;
       }
     }
-    return { values, output: await evaluateOutputCommon(warp, output, actionIndex, inputs, this.serializer.coreSerializer, this.config) };
+    return { values, output: await evaluateOutputCommon(warp, output, nativeValues, actionIndex, inputs, this.serializer.coreSerializer, this.config) };
   }
   async getTransactionStatus(txHash) {
     try {
@@ -1773,8 +1784,10 @@ var WarpEvmExplorer = class {
 import {
   getProviderConfig as getProviderConfig4
 } from "@joai/warps";
+import { toClientEvmSigner } from "@x402/evm";
 import { registerExactEvmScheme } from "@x402/evm/exact/client";
 import { ethers as ethers7 } from "ethers";
+import { createPublicClient, http } from "viem";
 import { privateKeyToAccount } from "viem/accounts";
 var WarpEvmWallet = class {
   constructor(config, chain) {
@@ -1871,6 +1884,10 @@ var WarpEvmWallet = class {
     const walletProvider = this.createProviderForOperation(provider);
     return await walletProvider.generate();
   }
+  async delete(provider, externalId) {
+    const walletProvider = this.createProviderForOperation(provider);
+    await walletProvider.delete(externalId);
+  }
   getAddress() {
     return this.cachedAddress;
   }
@@ -1884,7 +1901,12 @@ var WarpEvmWallet = class {
     if (typeof getInstance !== "function") throw new Error("Wallet provider does not have getWalletInstance method");
     const wallet = getInstance();
     if (!wallet || !wallet.privateKey) throw new Error("Wallet instance does not have private key");
-    const signer = privateKeyToAccount(wallet.privateKey);
+    const signer = toClientEvmSigner(
+      privateKeyToAccount(wallet.privateKey),
+      createPublicClient({
+        transport: http(getProviderConfig4(this.config, this.chain.name, this.config.env, this.chain.defaultApiUrl).url)
+      })
+    );
     const handlers = {};
     for (const chainId of SupportedEvmChainIds) {
       handlers[`eip155:${chainId}`] = () => {