@funkit/connect 9.23.2-next.0 → 9.24.0

package/dist/clients/lighter.d.ts

@@ -14,7 +14,7 @@
  * caller provides the actual on-chain implementation.
  */
 import { type Address } from 'viem';
-import type { CustomWithdrawalConfig, MultiMethodWithdrawalConfig } from '~/providers/FunkitCheckoutContext/types';
+import type { CustomWithdrawalConfig, MultiMethodWithdrawalConfig } from '../providers/FunkitCheckoutContext/types';
 export type LighterTransferParams = {
     toAccountIndex: number;
     assetIndex: number;
@@ -60,6 +60,19 @@ export interface LighterWithdrawalConfig {
      * ```
      */
     getSecureMinWithdrawalAmount?: (symbol: string) => number | undefined;
+    /**
+     * Awaited hook fired after the user taps "Withdraw" but before either method
+     * (Fast or Secure) fetches a nonce, prompts the wallet, or submits the L2 tx.
+     *
+     * Lighter strategies and withdrawals share the same L2 signing account, so a
+     * strategy that's still placing/cancelling orders will bump the nonce out
+     * from under the withdrawal and the signed tx is rejected. Cancel in-flight
+     * strategies here (awaited) so the withdrawal signs against a stable nonce.
+     *
+     * Throw to abort the withdrawal — the message is shown to the user verbatim
+     * and no nonce is consumed. Applies to both Fast and Secure.
+     */
+    onBeforeSign?: () => Promise<void> | void;
 }
 /**
  * Default minimum Secure-withdrawal amounts (token units) for known Lighter
@@ -92,6 +105,11 @@ export interface LighterSecureWithdrawalConfig {
      * ```
      */
     getMinWithdrawalAmount?: (symbol: string) => number;
+    /**
+     * Awaited hook fired before the Secure withdrawal fetches a nonce, prompts
+     * the wallet, or submits the L2 tx. See {@link LighterWithdrawalConfig['onBeforeSign']}.
+     */
+    onBeforeSign?: () => Promise<void> | void;
 }
 /**
  * Records a Lighter Secure withdrawal in Fun's direct-execution table as

package/dist/clients/lighter.js

@@ -1,17 +1,17 @@
 "use client";
 import {
   AsyncImage
-} from "./chunk-LII3SVUH.js";
+} from "./chunk-7G3QEQFB.js";
 import {
   useFunkitConfig
-} from "./chunk-ELLXM7RO.js";
+} from "./chunk-MXPZTW2H.js";
 import {
   Box,
   useFunkitTranslation
-} from "./chunk-7FIVHWNC.js";
+} from "./chunk-7UIDHSYG.js";
 import {
   logger
-} from "./chunk-UUHGOBKZ.js";
+} from "./chunk-AHYOV7AV.js";
 
 // src/clients/lighter.tsx
 import {
@@ -20,14 +20,14 @@ import {
   createDirectExecution
 } from "@funkit/api-base";
 import { LIGHTER_CHAIN_ID, SOLANA_MAINNET_CHAIN_ID } from "@funkit/chains";
-import { RELAY_LIGHTER_CHAIN_ID } from "@funkit/fun-relay";
+import { RELAY_LIGHTER_CHAIN_ID as RELAY_LIGHTER_CHAIN_ID2 } from "@funkit/fun-relay";
 import { retry } from "@lifeomic/attempt";
 import { useQuery as useQuery2 } from "@tanstack/react-query";
 import i18next from "i18next";
-import React2, { useMemo } from "react";
+import React3, { useMemo as useMemo2 } from "react";
 import { v4 as uuid } from "uuid";
 import { pad, parseUnits, toHex } from "viem";
-import { arbitrum, base, bsc, mainnet as mainnet2, optimism } from "viem/chains";
+import { arbitrum, base, bsc, mainnet as mainnet3, optimism } from "viem/chains";
 
 // src/components/Icons/EvmWallet.tsx
 import React from "react";
@@ -52,11 +52,18 @@ var EvmWallet = ({ size = 20 }) => /* @__PURE__ */ React.createElement(
   )
 );
 
-// src/providers/provideFunkitConnectChains.ts
-import { chainMetadataById } from "@funkit/chains";
+// src/modals/WithdrawalModal/LighterWithdrawal.tsx
+import { RELAY_LIGHTER_CHAIN_ID } from "@funkit/fun-relay";
+import { formatAddress, formatCryptoAndStringify } from "@funkit/utils";
+import * as dnum from "dnum";
+import React2, { useEffect, useMemo } from "react";
+import { createPortal } from "react-dom";
+import { Trans } from "react-i18next";
+import { mainnet as mainnet2 } from "viem/chains";
 
 // src/utils/customer.ts
-import { useQuery } from "@tanstack/react-query";
+import { useQuery, useQueryClient } from "@tanstack/react-query";
+import { useCallback } from "react";
 
 // src/consts/customers.ts
 import {
@@ -121,6 +128,9 @@ function useLighterAccounts({
   };
 }
 
+// src/providers/provideFunkitConnectChains.ts
+import { chainMetadataById } from "@funkit/chains";
+
 // src/utils/timeFormat.ts
 import { formatSecondsToReadableForm } from "@funkit/utils";
 function formatSecondsTranslated(seconds, t, specifyUnderMinute = false, omitSeconds = false) {
@@ -133,6 +143,11 @@ function formatSecondsTranslated(seconds, t, specifyUnderMinute = false, omitSec
   });
 }
 
+// src/modals/WithdrawalModal/LighterWithdrawal.tsx
+var LIGHTER_FAST_METHOD_ID = "lighter-fast";
+var LIGHTER_SECURE_METHOD_ID = "lighter-secure";
+var LIGHTER_FAST_MAX_WITHDRAWAL_USD = 3e6;
+
 // src/clients/lighter.tsx
 var LIGHTER_USDC_PERPS_ADDRESS = "0x0000000000000000000000000000000000000000";
 var MAINNET_USDC = "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48";
@@ -278,7 +293,7 @@ function createLighterAdaptedWallet({
   }
   return {
     vmType: "lvm",
-    getChainId: async () => Number(RELAY_LIGHTER_CHAIN_ID),
+    getChainId: async () => Number(RELAY_LIGHTER_CHAIN_ID2),
     address: async () => accountIndex.toString(),
     handleSignMessageStep: async () => {
       throw new Error("Message signing not implemented for Lighter");
@@ -356,7 +371,7 @@ async function trackLighterSecureWithdrawal({
     recipientAddr,
     fromChainId: LIGHTER_CHAIN_ID.toString(),
     fromTokenAddress,
-    toChainId: mainnet2.id.toString(),
+    toChainId: mainnet3.id.toString(),
     toTokenAddress: mainnetTokenAddress,
     fromAmountBaseUnit: baseUnitAmount,
     toAmountBaseUnit: baseUnitAmount,
@@ -373,7 +388,7 @@ async function trackLighterSecureWithdrawal({
       initSettings: {
         config: {
           targetAsset: mainnetTokenAddress,
-          targetChain: mainnet2.id.toString(),
+          targetChain: mainnet3.id.toString(),
           targetAssetTicker: symbol
         }
       },
@@ -457,10 +472,11 @@ function createLighterSecureWithdrawalConfig(config) {
   return {
     modalTitle: config.modalTitle ?? i18next.t("withdrawal.withdraw"),
     disableConnectedWallet: config.disableConnectedWallet,
+    onBeforeSign: config.onBeforeSign,
     withdrawCallback: buildSecureWithdrawalCallback({
       exec: config.sendLighterSecureWithdrawal
     }),
-    sourceChainId: mainnet2.id.toString(),
+    sourceChainId: mainnet3.id.toString(),
     sourceTokenSymbol: "USDC",
     defaultReceiveToken: "USDC",
     sourceTokenAddress: MAINNET_USDC,
@@ -474,7 +490,8 @@ function buildLighterFastWalletWithdrawalConfig({
   accountIndex,
   modalTitle,
   disableConnectedWallet,
-  iconSrc
+  iconSrc,
+  onBeforeSign
 }) {
   const adaptedWallet = createLighterAdaptedWallet({
     signerClient,
@@ -484,7 +501,7 @@ function buildLighterFastWalletWithdrawalConfig({
     _type: "lighter",
     adaptedWallet,
     address: () => String(accountIndex),
-    getChainId: async () => Number(RELAY_LIGHTER_CHAIN_ID),
+    getChainId: async () => Number(RELAY_LIGHTER_CHAIN_ID2),
     // biome-ignore lint/suspicious/noEmptyBlockStatements: no-op — Lighter has no EVM chain switching
     switchChain: async () => {
     },
@@ -498,26 +515,28 @@ function buildLighterFastWalletWithdrawalConfig({
   return {
     modalTitle: modalTitle ?? i18next.t("withdrawal.withdraw"),
     disableConnectedWallet,
+    onBeforeSign,
     wallet,
-    sourceChainId: RELAY_LIGHTER_CHAIN_ID,
+    sourceChainId: RELAY_LIGHTER_CHAIN_ID2,
     sourceTokenSymbol: "USDC",
     defaultReceiveToken: "USDC",
     sourceTokenAddress: LIGHTER_USDC_PERPS_ADDRESS,
     iconSrc: iconSrc ?? "https://sdk-cdn.fun.xyz/images/logos/lighter.png",
-    getMinWithdrawalUSD: () => 4
+    getMinWithdrawalUSD: () => 4,
+    getMaxWithdrawalUSD: () => LIGHTER_FAST_MAX_WITHDRAWAL_USD
   };
 }
 function ChainIconStack({ chainIds }) {
-  return /* @__PURE__ */ React2.createElement(Box, { display: "flex", alignItems: "center", justifyContent: "flex-end" }, chainIds.map((chainId, index) => {
+  return /* @__PURE__ */ React3.createElement(Box, { display: "flex", alignItems: "center", justifyContent: "flex-end" }, chainIds.map((chainId, index) => {
     const metadata = chainMetadataById[chainId];
-    return /* @__PURE__ */ React2.createElement(
+    return /* @__PURE__ */ React3.createElement(
       Box,
       {
         key: chainId,
         position: "relative",
         style: { right: `${(chainIds.length - index - 1) * -2}px` }
       },
-      /* @__PURE__ */ React2.createElement(
+      /* @__PURE__ */ React3.createElement(
         AsyncImage,
         {
           alt: metadata?.name ?? "",
@@ -537,7 +556,7 @@ var LIGHTER_FAST_PREVIEW_CHAIN_IDS = [
   bsc.id,
   SOLANA_MAINNET_CHAIN_ID
 ];
-var LIGHTER_SECURE_PREVIEW_CHAIN_IDS = [mainnet2.id];
+var LIGHTER_SECURE_PREVIEW_CHAIN_IDS = [mainnet3.id];
 function buildLighterMultiMethodConfig({
   config,
   accountIndex,
@@ -549,7 +568,8 @@ function buildLighterMultiMethodConfig({
     accountIndex: Number(accountIndex),
     modalTitle: config.modalTitle,
     disableConnectedWallet: config.disableConnectedWallet,
-    iconSrc: config.fastIconSrc
+    iconSrc: config.fastIconSrc,
+    onBeforeSign: config.onBeforeSign
   });
   const secureConfig = createLighterSecureWithdrawalConfig({
     accountIndex,
@@ -557,6 +577,7 @@ function buildLighterMultiMethodConfig({
     disableConnectedWallet: config.disableConnectedWallet,
     iconSrc: config.secureIconSrc,
     sendLighterSecureWithdrawal: config.sendLighterSecureWithdrawal,
+    onBeforeSign: config.onBeforeSign,
     getMinWithdrawalAmount: (symbol) => {
       const userMin = config.getSecureMinWithdrawalAmount?.(symbol);
       if (userMin !== void 0) {
@@ -566,15 +587,15 @@ function buildLighterMultiMethodConfig({
     }
   });
   const fast = {
-    id: "lighter-fast",
+    id: LIGHTER_FAST_METHOD_ID,
     keyText: t("withdrawal.methodFast"),
     subtitleText: t("withdrawal.fastDisclaimer"),
-    icon: /* @__PURE__ */ React2.createElement(EvmWallet, { size: 20 }),
-    valueIcon: /* @__PURE__ */ React2.createElement(ChainIconStack, { chainIds: LIGHTER_FAST_PREVIEW_CHAIN_IDS }),
+    icon: /* @__PURE__ */ React3.createElement(EvmWallet, { size: 20 }),
+    valueIcon: /* @__PURE__ */ React3.createElement(ChainIconStack, { chainIds: LIGHTER_FAST_PREVIEW_CHAIN_IDS }),
     config: fastConfig
   };
   const secure = {
-    id: "lighter-secure",
+    id: LIGHTER_SECURE_METHOD_ID,
     keyText: t("withdrawal.methodSecure"),
     subtitleText: t("withdrawal.secureDisclaimer", {
       // Until the live value loads, show the localized "60+ minutes"
@@ -582,8 +603,8 @@ function buildLighterMultiMethodConfig({
       // so it doesn't bleed into live values, which are exact.
       delay: secureDelayText ?? t("withdrawal.secureFallbackDelay")
     }),
-    icon: /* @__PURE__ */ React2.createElement(EvmWallet, { size: 20 }),
-    valueIcon: /* @__PURE__ */ React2.createElement(ChainIconStack, { chainIds: LIGHTER_SECURE_PREVIEW_CHAIN_IDS }),
+    icon: /* @__PURE__ */ React3.createElement(EvmWallet, { size: 20 }),
+    valueIcon: /* @__PURE__ */ React3.createElement(ChainIconStack, { chainIds: LIGHTER_SECURE_PREVIEW_CHAIN_IDS }),
     config: secureConfig
   };
   return {
@@ -599,7 +620,7 @@ function useLighterWithdrawalConfig(config) {
   });
   const accountIndex = mainAccountIndex && /^\d+$/.test(mainAccountIndex) ? mainAccountIndex : void 0;
   const secureDelayText = useLighterSecureDelayText();
-  return useMemo(() => {
+  return useMemo2(() => {
     if (!config || !accountIndex) {
       return null;
     }

package/dist/clients/mallard.d.ts

@@ -15,7 +15,7 @@
  * verified on-chain (owner = the Fun deployer).
  */
 import { type Address } from 'viem';
-import type { FunkitCheckoutActionParams } from '~/providers/FunkitCheckoutContext/types';
+import type { FunkitCheckoutActionParams } from '../providers/FunkitCheckoutContext/types';
 /** Mallard deposit contract to credit a Mallard (perps) account. */
 export declare const MALLARD_DEPOSIT_ADDRESS: `0x${string}`;
 /** VaultDepositooor on Zorro chain. */