@coin-voyage/crypto 2.4.0 → 2.4.3-beta.0

package/dist/evm/use-evm-transaction.js

@@ -1,27 +1,59 @@
-import { getEvmPaymentData } from "@coin-voyage/shared/payment";
 import { estimateFeesPerGas } from "viem/actions";
-import { useConfig, useSendTransaction, useWriteContract } from "wagmi";
+import { useChainId, useConfig, useSendTransaction, useSwitchChain, useWriteContract } from "wagmi";
 export function useEVMTransaction() {
     const { writeContractAsync } = useWriteContract();
     const { sendTransactionAsync } = useSendTransaction();
     const config = useConfig();
+    const walletChainId = useChainId();
+    const { switchChainAsync } = useSwitchChain();
+    const trySwitchChain = async (sourceChainId) => {
+        if (walletChainId === sourceChainId)
+            return;
+        let switchedId;
+        try {
+            const switched = await switchChainAsync({ chainId: sourceChainId });
+            switchedId = switched?.id;
+        }
+        catch (e) {
+            console.error("Failed to switch chain", e);
+            throw new Error("Failed to switch chain", { cause: e });
+        }
+        if (switchedId !== sourceChainId) {
+            console.error("Failed to switch chain", { expected: sourceChainId, actual: switchedId });
+            throw new Error("Failed to switch chain");
+        }
+    };
+    const feesPerGas = async (options) => {
+        try {
+            const client = config.getClient({ chainId: options.chainId });
+            return await estimateFeesPerGas(client, options);
+        }
+        catch (e) {
+            console.error("Failed to estimate fees per gas", e);
+            throw new Error("Failed to estimate fees per gas", { cause: e });
+        }
+    };
     const execute = async (params) => {
-        const client = config.getClient();
-        const gasEstimates = await estimateFeesPerGas(client, {
-            chain: client.chain,
-            type: "eip1559",
-        });
-        const evmPaymentData = getEvmPaymentData(params.paymentData);
+        const evmPaymentData = params.paymentData?.evm;
         if (evmPaymentData) {
+            await trySwitchChain(evmPaymentData.chainId);
+            if (!evmPaymentData.maxFeePerGas && !evmPaymentData.maxPriorityFeePerGas) {
+                const gasEstimates = await feesPerGas({
+                    chainId: evmPaymentData.chainId,
+                    type: "eip1559",
+                });
+                evmPaymentData.maxFeePerGas = gasEstimates.maxFeePerGas?.toString();
+                evmPaymentData.maxPriorityFeePerGas = gasEstimates.maxPriorityFeePerGas?.toString();
+            }
             const tx = await sendTransactionAsync({
                 to: evmPaymentData.to,
                 data: evmPaymentData.data,
                 value: BigInt(evmPaymentData.value),
                 chainId: evmPaymentData.chainId,
-                maxFeePerGas: evmPaymentData.maxFeePerGas ? BigInt(evmPaymentData.maxFeePerGas) : gasEstimates.maxFeePerGas,
+                maxFeePerGas: evmPaymentData.maxFeePerGas ? BigInt(evmPaymentData.maxFeePerGas) : undefined,
                 maxPriorityFeePerGas: evmPaymentData.maxPriorityFeePerGas
                     ? BigInt(evmPaymentData.maxPriorityFeePerGas)
-                    : gasEstimates.maxPriorityFeePerGas,
+                    : undefined,
             });
             return tx;
         }
@@ -29,15 +61,26 @@ export function useEVMTransaction() {
         if (!toAddress || amount == undefined) {
             throw new Error("Missing EVM transfer target or amount");
         }
+        if (chainId) {
+            await trySwitchChain(chainId);
+        }
+        const gasEstimates = await feesPerGas({
+            chainId,
+            type: "eip1559",
+        });
         const value = BigInt(amount);
         const to = toAddress;
+        const maxFeePerGas = gasEstimates.maxFeePerGas ? BigInt(gasEstimates.maxFeePerGas) : undefined;
+        const maxPriorityFeePerGas = gasEstimates.maxPriorityFeePerGas
+            ? BigInt(gasEstimates.maxPriorityFeePerGas)
+            : undefined;
         if (!token) {
             const tx = await sendTransactionAsync({
                 to,
                 value,
                 chainId,
-                maxFeePerGas: gasEstimates.maxFeePerGas,
-                maxPriorityFeePerGas: gasEstimates.maxPriorityFeePerGas,
+                maxFeePerGas,
+                maxPriorityFeePerGas,
             });
             return tx;
         }
@@ -58,8 +101,8 @@ export function useEVMTransaction() {
             address: token.address,
             functionName: "transfer",
             chainId,
-            maxFeePerGas: gasEstimates.maxFeePerGas,
-            maxPriorityFeePerGas: gasEstimates.maxPriorityFeePerGas,
+            maxFeePerGas,
+            maxPriorityFeePerGas,
             args: [to, value],
         });
         return tx;

package/dist/solana/use-solana-transaction.js

@@ -1,4 +1,3 @@
-import { getSolanaPaymentData } from "@coin-voyage/shared/payment";
 import { hex } from "@scure/base";
 import { createTransferCheckedInstruction, getAssociatedTokenAddress } from "@solana/spl-token";
 import { useConnection, useWallet } from "@solana/wallet-adapter-react";
@@ -17,7 +16,7 @@ export function useSolanaTransaction() {
                 throw new Error("Wallet not connected. Please reconnect your wallet and try again.");
             }
         }
-        const preparedPayment = getSolanaPaymentData(params.paymentData);
+        const preparedPayment = params.paymentData?.solana;
         if (preparedPayment) {
             const { context: { slot: minContextSlot }, value: { lastValidBlockHeight }, } = await connection.getLatestBlockhashAndContext();
             const transaction = deserializePreparedSolanaTransaction(preparedPayment.transaction);

package/dist/sui/use-sui-transaction.js

@@ -1,4 +1,3 @@
-import { getSuiPaymentData } from "@coin-voyage/shared/payment";
 import { useReportTransactionEffects, useSignTransaction, useSuiClient } from "@mysten/dapp-kit";
 import { Transaction } from "@mysten/sui/transactions";
 import { SUI_PACKAGE_IDS } from "./constants";
@@ -7,7 +6,7 @@ export function useSUITransaction() {
     const { mutateAsync: signTransaction } = useSignTransaction();
     const { mutate: reportTransactionEffects } = useReportTransactionEffects();
     const execute = async (params) => {
-        const preparedPayment = getSuiPaymentData(params.paymentData);
+        const preparedPayment = params.paymentData?.sui;
         if (preparedPayment) {
             const transaction = typeof preparedPayment.transaction === "string"
                 ? preparedPayment.transaction

package/dist/utxo/use-utxo-transaction.js

@@ -1,10 +1,9 @@
 import { useAccount } from "@bigmi/react";
-import { getBitcoinPaymentData } from "@coin-voyage/shared/payment";
 import { sendBtc } from "./send-btc";
 export function useUTXOTransaction() {
     const { account, connector } = useAccount();
     const execute = async (params) => {
-        const bitcoinPaymentData = getBitcoinPaymentData(params.paymentData);
+        const bitcoinPaymentData = params.paymentData?.bitcoin;
         if (bitcoinPaymentData) {
             throw new Error("Prepared Bitcoin transactions are not supported in wallet flow yet.");
         }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@coin-voyage/crypto",
   "description": "Crypto utilities for Coin Voyage",
-  "version": "2.4.0",
+  "version": "2.4.3-beta.0",
   "private": false,
   "sideEffects": false,
   "author": "Lars <lars@coinvoyage.io>",
@@ -106,7 +106,7 @@
     "@solana/wallet-adapter-walletconnect": "0.1.21",
     "@solana/wallet-adapter-base": "0.9.27",
     "@solana/wallet-adapter-coinbase": "0.1.23",
-    "@coin-voyage/shared": "2.4.0"
+    "@coin-voyage/shared": "2.4.3-beta.0"
   },
   "devDependencies": {
     "@types/elliptic": "6.4.18"