@vleap/warps-adapter-evm 0.2.0-beta.63 → 0.2.0-beta.65

package/dist/index.mjs

@@ -99,7 +99,11 @@ var UniswapService = _UniswapService;
 
 // src/providers/PrivateKeyWalletProvider.ts
 import { ethers } from "ethers";
-import { getWarpWalletPrivateKeyFromConfig } from "@vleap/warps";
+import {
+  getWarpWalletMnemonicFromConfig,
+  getWarpWalletPrivateKeyFromConfig,
+  setWarpWalletInConfig
+} from "@vleap/warps";
 var _PrivateKeyWalletProvider = class _PrivateKeyWalletProvider {
   constructor(config, chain) {
     this.config = config;
@@ -145,16 +149,39 @@ var _PrivateKeyWalletProvider = class _PrivateKeyWalletProvider {
   getWalletInstance() {
     return this.getWallet();
   }
-  create(mnemonic) {
+  async importFromMnemonic(mnemonic) {
     const wallet = ethers.Wallet.fromPhrase(mnemonic);
-    return {
+    const walletDetails = {
+      provider: _PrivateKeyWalletProvider.PROVIDER_NAME,
+      address: wallet.address,
+      privateKey: wallet.privateKey,
+      mnemonic
+    };
+    setWarpWalletInConfig(this.config, this.chain.name, walletDetails);
+    return walletDetails;
+  }
+  async importFromPrivateKey(privateKey) {
+    const wallet = new ethers.Wallet(privateKey);
+    const walletDetails = {
       provider: _PrivateKeyWalletProvider.PROVIDER_NAME,
       address: wallet.address,
       privateKey: wallet.privateKey,
       mnemonic: null
     };
+    setWarpWalletInConfig(this.config, this.chain.name, walletDetails);
+    return walletDetails;
   }
-  generate() {
+  async export() {
+    const wallet = this.getWallet();
+    const mnemonic = getWarpWalletMnemonicFromConfig(this.config, this.chain.name);
+    return {
+      provider: _PrivateKeyWalletProvider.PROVIDER_NAME,
+      address: wallet.address,
+      privateKey: wallet.privateKey,
+      mnemonic: mnemonic || null
+    };
+  }
+  async generate() {
     const wallet = ethers.Wallet.createRandom();
     return {
       provider: _PrivateKeyWalletProvider.PROVIDER_NAME,
@@ -176,7 +203,11 @@ var PrivateKeyWalletProvider = _PrivateKeyWalletProvider;
 
 // src/providers/MnemonicWalletProvider.ts
 import { ethers as ethers2 } from "ethers";
-import { getWarpWalletMnemonicFromConfig } from "@vleap/warps";
+import {
+  getWarpWalletMnemonicFromConfig as getWarpWalletMnemonicFromConfig2,
+  getWarpWalletPrivateKeyFromConfig as getWarpWalletPrivateKeyFromConfig2,
+  setWarpWalletInConfig as setWarpWalletInConfig2
+} from "@vleap/warps";
 var _MnemonicWalletProvider = class _MnemonicWalletProvider {
   constructor(config, chain) {
     this.config = config;
@@ -222,16 +253,40 @@ var _MnemonicWalletProvider = class _MnemonicWalletProvider {
   getWalletInstance() {
     return this.getWallet();
   }
-  create(mnemonic) {
+  async importFromMnemonic(mnemonic) {
     const wallet = ethers2.Wallet.fromPhrase(mnemonic);
-    return {
+    const walletDetails = {
       provider: _MnemonicWalletProvider.PROVIDER_NAME,
       address: wallet.address,
-      privateKey: null,
+      privateKey: wallet.privateKey,
       mnemonic
     };
+    setWarpWalletInConfig2(this.config, this.chain.name, walletDetails);
+    return walletDetails;
+  }
+  async importFromPrivateKey(privateKey) {
+    const wallet = new ethers2.Wallet(privateKey);
+    const walletDetails = {
+      provider: _MnemonicWalletProvider.PROVIDER_NAME,
+      address: wallet.address,
+      privateKey: wallet.privateKey,
+      mnemonic: null
+    };
+    setWarpWalletInConfig2(this.config, this.chain.name, walletDetails);
+    return walletDetails;
+  }
+  async export() {
+    const wallet = this.getWallet();
+    const mnemonic = getWarpWalletMnemonicFromConfig2(this.config, this.chain.name);
+    const privateKey = getWarpWalletPrivateKeyFromConfig2(this.config, this.chain.name);
+    return {
+      provider: _MnemonicWalletProvider.PROVIDER_NAME,
+      address: wallet.address,
+      privateKey: privateKey || null,
+      mnemonic: mnemonic || null
+    };
   }
-  generate() {
+  async generate() {
     const wallet = ethers2.Wallet.createRandom();
     return {
       provider: _MnemonicWalletProvider.PROVIDER_NAME,
@@ -242,7 +297,7 @@ var _MnemonicWalletProvider = class _MnemonicWalletProvider {
   }
   getWallet() {
     if (this.wallet) return this.wallet;
-    const mnemonic = getWarpWalletMnemonicFromConfig(this.config, this.chain.name);
+    const mnemonic = getWarpWalletMnemonicFromConfig2(this.config, this.chain.name);
     if (!mnemonic) throw new Error("No mnemonic provided");
     this.wallet = ethers2.Wallet.fromPhrase(mnemonic);
     return this.wallet;
@@ -272,11 +327,19 @@ var ReadOnlyWalletProvider = class {
     const address = await this.getAddress();
     throw new Error(`Wallet can not be used for signing: ${address}`);
   }
-  create(mnemonic) {
+  async importFromMnemonic(mnemonic) {
     const address = getWarpWalletAddressFromConfig(this.config, this.chain.name);
     throw new Error(`Wallet can not be used for signing: ${address}`);
   }
-  generate() {
+  async importFromPrivateKey(privateKey) {
+    const address = getWarpWalletAddressFromConfig(this.config, this.chain.name);
+    throw new Error(`Wallet can not be used for signing: ${address}`);
+  }
+  async export() {
+    const address = getWarpWalletAddressFromConfig(this.config, this.chain.name);
+    throw new Error(`Wallet can not be used for signing: ${address}`);
+  }
+  async generate() {
     const address = getWarpWalletAddressFromConfig(this.config, this.chain.name);
     throw new Error(`Wallet can not be used for signing: ${address}`);
   }
@@ -1597,37 +1660,43 @@ var WarpEvmWallet = class {
     if (!tx || typeof tx !== "object") throw new Error("Invalid transaction object");
     if (!this.walletProvider) throw new Error("No wallet provider available");
     if (this.walletProvider instanceof ReadOnlyWalletProvider) throw new Error(`Wallet (${this.chain.name}) is read-only`);
+    if (tx.nonce === void 0) {
+      const address = this.getAddress();
+      if (address) {
+        tx.nonce = await this.provider.getTransactionCount(address, "pending");
+      }
+    }
     return await this.walletProvider.signTransaction(tx);
   }
   async signTransactions(txs) {
     if (txs.length === 0) return [];
     if (!this.walletProvider) throw new Error("No wallet provider available");
-    if (this.walletProvider instanceof PrivateKeyWalletProvider || this.walletProvider instanceof MnemonicWalletProvider) {
-      const wallet = this.walletProvider.getWalletInstance();
-      const address = wallet.address;
-      if (txs.length > 1) {
-        const currentNonce = await this.provider.getTransactionCount(address, "pending");
-        const signedTxs2 = [];
-        for (let i = 0; i < txs.length; i++) {
-          const tx = { ...txs[i] };
+    const address = this.getAddress();
+    if (!address) throw new Error("No wallet address available");
+    if (txs.length > 1) {
+      const currentNonce = await this.provider.getTransactionCount(address, "pending");
+      const signedTxs2 = [];
+      for (let i = 0; i < txs.length; i++) {
+        const tx = { ...txs[i] };
+        if (tx.nonce === void 0) {
           tx.nonce = currentNonce + i;
-          if (i > 0) {
-            const priorityReduction = BigInt(i * 1e9);
-            const minGasPrice = BigInt(1e9);
-            if (tx.maxFeePerGas && tx.maxPriorityFeePerGas) {
-              tx.maxFeePerGas = tx.maxFeePerGas > priorityReduction ? tx.maxFeePerGas - priorityReduction : minGasPrice;
-              tx.maxPriorityFeePerGas = tx.maxPriorityFeePerGas > priorityReduction ? tx.maxPriorityFeePerGas - priorityReduction : minGasPrice;
-              delete tx.gasPrice;
-            } else if (tx.gasPrice) {
-              tx.gasPrice = tx.gasPrice > priorityReduction ? tx.gasPrice - priorityReduction : minGasPrice;
-              delete tx.maxFeePerGas;
-              delete tx.maxPriorityFeePerGas;
-            }
+        }
+        if (i > 0 && (this.walletProvider instanceof PrivateKeyWalletProvider || this.walletProvider instanceof MnemonicWalletProvider)) {
+          const priorityReduction = BigInt(i * 1e9);
+          const minGasPrice = BigInt(1e9);
+          if (tx.maxFeePerGas && tx.maxPriorityFeePerGas) {
+            tx.maxFeePerGas = tx.maxFeePerGas > priorityReduction ? tx.maxFeePerGas - priorityReduction : minGasPrice;
+            tx.maxPriorityFeePerGas = tx.maxPriorityFeePerGas > priorityReduction ? tx.maxPriorityFeePerGas - priorityReduction : minGasPrice;
+            delete tx.gasPrice;
+          } else if (tx.gasPrice) {
+            tx.gasPrice = tx.gasPrice > priorityReduction ? tx.gasPrice - priorityReduction : minGasPrice;
+            delete tx.maxFeePerGas;
+            delete tx.maxPriorityFeePerGas;
           }
-          signedTxs2.push(await this.signTransaction(tx));
         }
-        return signedTxs2;
+        signedTxs2.push(await this.signTransaction(tx));
       }
+      return signedTxs2;
     }
     const signedTxs = [];
     for (const tx of txs) {
@@ -1644,6 +1713,10 @@ var WarpEvmWallet = class {
     if (!tx || typeof tx !== "object") throw new Error("Invalid transaction object");
     if (!tx.signature) throw new Error("Transaction must be signed before sending");
     if (!this.walletProvider) throw new Error("No wallet provider available");
+    if (typeof tx.signature === "string" && tx.signature.startsWith("0x")) {
+      const txResponse = await this.provider.broadcastTransaction(tx.signature);
+      return txResponse.hash;
+    }
     if (this.walletProvider instanceof PrivateKeyWalletProvider || this.walletProvider instanceof MnemonicWalletProvider) {
       const wallet = this.walletProvider.getWalletInstance();
       const connectedWallet = wallet.connect(this.provider);
@@ -1655,13 +1728,21 @@ var WarpEvmWallet = class {
   async sendTransactions(txs) {
     return Promise.all(txs.map(async (tx) => this.sendTransaction(tx)));
   }
-  create(provider, mnemonic) {
+  async importFromMnemonic(provider, mnemonic) {
+    const walletProvider = this.createProviderForOperation(provider);
+    return await walletProvider.importFromMnemonic(mnemonic);
+  }
+  async importFromPrivateKey(provider, privateKey) {
+    const walletProvider = this.createProviderForOperation(provider);
+    return await walletProvider.importFromPrivateKey(privateKey);
+  }
+  async export(provider) {
     const walletProvider = this.createProviderForOperation(provider);
-    return walletProvider.create(mnemonic);
+    return await walletProvider.export();
   }
-  generate(provider) {
+  async generate(provider) {
     const walletProvider = this.createProviderForOperation(provider);
-    return walletProvider.generate();
+    return await walletProvider.generate();
   }
   getAddress() {
     return this.cachedAddress;
@@ -1858,7 +1939,10 @@ var EthereumAdapter = createEvmAdapter(WarpChainName10.Ethereum, {
     blockTime: 12e3,
     addressHrp: "0x",
     defaultApiUrl: "https://ethereum-rpc.publicnode.com",
-    logoUrl: "https://joai.ai/images/chains/ethereum.svg",
+    logoUrl: {
+      light: "https://joai.ai/images/chains/ethereum-white.svg",
+      dark: "https://joai.ai/images/chains/ethereum-black.svg"
+    },
     nativeToken: NativeTokenEth
   },
   testnet: {
@@ -1868,7 +1952,10 @@ var EthereumAdapter = createEvmAdapter(WarpChainName10.Ethereum, {
     blockTime: 12e3,
     addressHrp: "0x",
     defaultApiUrl: "https://ethereum-sepolia-rpc.publicnode.com",
-    logoUrl: "https://joai.ai/images/chains/ethereum.svg",
+    logoUrl: {
+      light: "https://joai.ai/images/chains/ethereum-white.svg",
+      dark: "https://joai.ai/images/chains/ethereum-black.svg"
+    },
     nativeToken: NativeTokenEth
   },
   devnet: {
@@ -1878,7 +1965,10 @@ var EthereumAdapter = createEvmAdapter(WarpChainName10.Ethereum, {
     blockTime: 12e3,
     addressHrp: "0x",
     defaultApiUrl: "https://ethereum-sepolia-rpc.publicnode.com",
-    logoUrl: "https://joai.ai/images/chains/ethereum.svg",
+    logoUrl: {
+      light: "https://joai.ai/images/chains/ethereum-white.svg",
+      dark: "https://joai.ai/images/chains/ethereum-black.svg"
+    },
     nativeToken: NativeTokenEth
   }
 });