@vleap/warps-adapter-evm 0.2.0-beta.68 → 0.2.0-beta.69

package/dist/index.d.cts

@@ -272,6 +272,11 @@ declare class WarpEvmWallet implements AdapterWarpWallet {
     private createProvider;
     private initializeCache;
     private createProviderForOperation;
+    private formatTransaction;
+    private formatBigInt;
+    private parseBigInt;
+    private normalizePriorityFee;
+    private needsFormatting;
 }
 
 export { ArbitrumAdapter, ArbitrumExplorers, BaseAdapter, BaseExplorers, EthereumAdapter, EthereumExplorers, EvmChainIdMap, EvmChainIds, EvmExplorers, type ExplorerName, ExplorerUrls, KnownTokens, NativeTokenArb, NativeTokenBase, NativeTokenEth, SupportedEvmChainIds, type TokenBalance, type TokenInfo, type TokenListResponse, type TokenMetadata, type UniswapToken, type UniswapTokenList, WarpEvmConstants, WarpEvmDataLoader, WarpEvmExecutor, WarpEvmExplorer, WarpEvmOutput, WarpEvmSerializer, WarpEvmWallet, createEvmAdapter, findKnownTokenById, getAllEvmAdapters, getAllEvmChainNames, getKnownTokensForChain };

package/dist/index.d.ts

@@ -272,6 +272,11 @@ declare class WarpEvmWallet implements AdapterWarpWallet {
     private createProvider;
     private initializeCache;
     private createProviderForOperation;
+    private formatTransaction;
+    private formatBigInt;
+    private parseBigInt;
+    private normalizePriorityFee;
+    private needsFormatting;
 }
 
 export { ArbitrumAdapter, ArbitrumExplorers, BaseAdapter, BaseExplorers, EthereumAdapter, EthereumExplorers, EvmChainIdMap, EvmChainIds, EvmExplorers, type ExplorerName, ExplorerUrls, KnownTokens, NativeTokenArb, NativeTokenBase, NativeTokenEth, SupportedEvmChainIds, type TokenBalance, type TokenInfo, type TokenListResponse, type TokenMetadata, type UniswapToken, type UniswapTokenList, WarpEvmConstants, WarpEvmDataLoader, WarpEvmExecutor, WarpEvmExplorer, WarpEvmOutput, WarpEvmSerializer, WarpEvmWallet, createEvmAdapter, findKnownTokenById, getAllEvmAdapters, getAllEvmChainNames, getKnownTokensForChain };

package/dist/index.js

@@ -304,7 +304,7 @@ var _MnemonicWalletProvider = class _MnemonicWalletProvider {
     return this.getWallet();
   }
   async importFromMnemonic(mnemonic) {
-    const wallet = import_ethers2.ethers.Wallet.fromPhrase(mnemonic);
+    const wallet = import_ethers2.HDNodeWallet.fromPhrase(mnemonic.trim());
     const walletDetails = {
       provider: _MnemonicWalletProvider.PROVIDER_NAME,
       address: wallet.address,
@@ -337,8 +337,12 @@ var _MnemonicWalletProvider = class _MnemonicWalletProvider {
     };
   }
   async generate() {
-    const mnemonic = bip39.generateMnemonic(import_english.wordlist, 256);
-    const wallet = import_ethers2.ethers.Wallet.fromPhrase(mnemonic);
+    const mnemonicRaw = bip39.generateMnemonic(import_english.wordlist, 256);
+    const mnemonic = typeof mnemonicRaw === "string" ? mnemonicRaw.trim() : String(mnemonicRaw).trim();
+    const words = mnemonic.split(/\s+/).filter((w) => w.length > 0);
+    if (words.length !== 24) throw new Error(`Failed to generate valid 24-word mnemonic. Got ${words.length} words`);
+    const mnemonicForEthers = words.join(" ");
+    const wallet = import_ethers2.HDNodeWallet.fromPhrase(mnemonicForEthers);
     return {
       provider: _MnemonicWalletProvider.PROVIDER_NAME,
       address: wallet.address,
@@ -350,7 +354,7 @@ var _MnemonicWalletProvider = class _MnemonicWalletProvider {
     if (this.wallet) return this.wallet;
     const mnemonic = (0, import_warps3.getWarpWalletMnemonicFromConfig)(this.config, this.chain.name);
     if (!mnemonic) throw new Error("No mnemonic provided");
-    this.wallet = import_ethers2.ethers.Wallet.fromPhrase(mnemonic);
+    this.wallet = import_ethers2.HDNodeWallet.fromPhrase(mnemonic.trim());
     return this.wallet;
   }
 };
@@ -1698,7 +1702,8 @@ var WarpEvmWallet = class {
         tx.nonce = await this.provider.getTransactionCount(address, "pending");
       }
     }
-    return await this.walletProvider.signTransaction(tx);
+    const formattedTx = this.needsFormatting() ? this.formatTransaction(tx) : tx;
+    return await this.walletProvider.signTransaction(formattedTx);
   }
   async signTransactions(txs) {
     if (txs.length === 0) return [];
@@ -1825,6 +1830,59 @@ var WarpEvmWallet = class {
     if (provider === "mnemonic") return new MnemonicWalletProvider(this.config, this.chain);
     throw new Error(`Unsupported wallet provider for ${this.chain.name}: ${provider}`);
   }
+  formatTransaction(tx) {
+    const formatted = {
+      ...tx,
+      value: this.formatBigInt(tx.value) || "0x0",
+      data: tx.data || "0x",
+      chainId: typeof tx.chainId === "number" ? tx.chainId : parseInt(String(tx.chainId || this.chain.chainId))
+    };
+    if (tx.gasLimit) formatted.gas = this.formatBigInt(tx.gasLimit);
+    if (tx.nonce !== void 0)
+      formatted.nonce = typeof tx.nonce === "number" ? `0x${tx.nonce.toString(16)}` : this.formatBigInt(tx.nonce);
+    const hasEip1559Fields = tx.maxFeePerGas !== void 0 && tx.maxPriorityFeePerGas !== void 0;
+    const hasLegacyFields = tx.gasPrice !== void 0 && !hasEip1559Fields;
+    if (hasEip1559Fields) {
+      const maxFee = this.parseBigInt(tx.maxFeePerGas);
+      const maxPriorityFee = this.parseBigInt(tx.maxPriorityFeePerGas);
+      const safePriorityFee = this.normalizePriorityFee(maxFee, maxPriorityFee);
+      formatted.maxFeePerGas = this.formatBigInt(maxFee);
+      formatted.maxPriorityFeePerGas = this.formatBigInt(safePriorityFee);
+    } else if (hasLegacyFields) {
+      const gasPrice = this.parseBigInt(tx.gasPrice);
+      formatted.maxFeePerGas = this.formatBigInt(gasPrice);
+      const priorityFee = gasPrice * 9n / 10n;
+      formatted.maxPriorityFeePerGas = this.formatBigInt(priorityFee > 0n ? priorityFee : 1n);
+    } else {
+      const defaultMaxFee = 1000000000n;
+      formatted.maxFeePerGas = this.formatBigInt(defaultMaxFee);
+      formatted.maxPriorityFeePerGas = this.formatBigInt(defaultMaxFee / 10n);
+    }
+    return formatted;
+  }
+  formatBigInt(value) {
+    if (value === void 0 || value === null) return void 0;
+    if (typeof value === "bigint") return `0x${value.toString(16)}`;
+    if (typeof value === "string" && value.startsWith("0x")) return value;
+    return `0x${BigInt(value).toString(16)}`;
+  }
+  parseBigInt(value) {
+    if (value === void 0 || value === null) return void 0;
+    if (typeof value === "bigint") return value;
+    return BigInt(value);
+  }
+  normalizePriorityFee(maxFee, maxPriorityFee) {
+    if (maxPriorityFee <= maxFee) return maxPriorityFee;
+    const safeFee = maxFee / 10n;
+    if (safeFee < 1n) return 1n;
+    if (safeFee > maxFee) return maxFee;
+    return safeFee;
+  }
+  needsFormatting() {
+    if (!this.walletProvider) return false;
+    const providerName = this.walletProvider.constructor?.PROVIDER_NAME;
+    return providerName === "coinbase";
+  }
 };
 
 // src/chains/common.ts