@ab-org/predicate-market-sdk 0.0.1 → 0.1.0

package/dist/ui/WithdrawModal.d.ts

@@ -1,5 +1,6 @@
 import type { ChangeEventHandler } from "react";
 import { type SelectOption } from "./components/DropdownField.js";
+import { type WithdrawOrderResponseData } from "../modules/api.js";
 export type WithdrawUiStatus = "idle" | "pending" | "success" | "manual_review";
 export interface WithdrawModalProps {
     address?: string;
@@ -18,6 +19,14 @@ export interface WithdrawModalProps {
     useMerchantApi?: boolean;
     /** 创建订单后传入，用于轮询提现订单状态 */
     orderId?: string;
+    /** 提现模式：direct 直接提现，cross_chain 跨链提现 */
+    withdrawMode?: "direct" | "cross_chain";
+    /**
+     * 直接提现模式（无 orderId）下的结果数据；
+     * 将用来构造一个与 getWithdrawOrder 返回值兼容的对象，从而复用“有 orderId”时的全部交互与展示。
+     * 最少建议提供：status、dst_token_amount、target_chain_id、target_address（必要时包含 dst_tx_hash / out_tx_hash、fee）。
+     */
+    withdrawDirectResult?: Partial<WithdrawOrderResponseData>;
     /** 成功页 Fee 展示：优先用订单接口返回的 fee，若后端未返回则用此值（如询价时的 fee），均无则显示 "—" */
     feeDisplay?: string;
     /** 广播后的 funding tx 所在链 id，与 txHash 一起用于展示「查看交易」链接 */
@@ -30,11 +39,12 @@ export interface WithdrawModalProps {
     onChainSelect?: (id: string) => void;
     onAmountChange?: ChangeEventHandler<HTMLInputElement>;
     onMaxClick?: () => void;
-    /** 提交时传入当前表单值（收款地址、金额、所选 token、所选 chain），由调用方执行提现 */
+    /** 提交时传入当前表单值（收款地址、金额、所选 token、链上合约地址、所选 chain），由调用方执行提现 */
     onSubmit?: (payload: {
         toAddress: string;
         amount: string;
         token: string;
+        tokenAddress: string;
         chain: string;
     }) => void;
     /** 提现订单状态变为 completed 时调用，用于调用方刷新余额等 */
@@ -44,4 +54,4 @@ export interface WithdrawModalProps {
     onSignIn?: () => void;
     onClose?: () => void;
 }
-export declare const WithdrawModal: ({ address, token, tokenSymbol, chain, amount, balance, status, receiveAmount: receiveAmountProp, txHash, tokenOptions: tokenOptionsProp, chainOptions: chainOptionsProp, useMerchantApi, orderId, feeDisplay, fundingChainId, explorerTxUrl, onShowToast, onAddressChange, onTokenSelect, onChainSelect, onAmountChange, onMaxClick, onSubmit, onWithdrawCompleted, onStartAnotherWithdrawal, onSignIn, onClose, }: WithdrawModalProps) => import("react/jsx-runtime.js").JSX.Element;
+export declare const WithdrawModal: ({ address, token, tokenSymbol, chain, amount, balance, status, receiveAmount: receiveAmountProp, txHash, tokenOptions: tokenOptionsProp, chainOptions: chainOptionsProp, useMerchantApi, orderId, withdrawMode, withdrawDirectResult, feeDisplay, fundingChainId, onShowToast, onAddressChange, onTokenSelect, onChainSelect, onAmountChange, onMaxClick, onSubmit, onWithdrawCompleted, onStartAnotherWithdrawal, onSignIn, onClose, }: WithdrawModalProps) => import("react/jsx-runtime.js").JSX.Element;

package/dist/ui/WithdrawModal.js

@@ -8,11 +8,13 @@ import { LoginRequiredOverlay } from "./components/LoginRequiredOverlay.js";
 import { useSession } from "./hooks/useSession.js";
 import { colors, fonts, radii } from "./theme.js";
 import { getChains, quote, getWithdrawOrder, } from "../modules/api.js";
+import { getEnv } from "../utils/env";
 import { getExplorerUrl } from "../utils/explorer.js";
 import { SuccessIcon } from "./components/Success";
 function CopyIcon() {
     return (_jsxs("svg", { width: "16", height: "16", viewBox: "0 0 16 16", fill: "none", xmlns: "http://www.w3.org/2000/svg", "aria-hidden": true, children: [_jsx("rect", { x: "5", y: "5", width: "9", height: "9", rx: "1", stroke: "currentColor", strokeWidth: "1.2", fill: "none" }), _jsx("path", { d: "M3 11V3a1 1 0 0 1 1-1h8", stroke: "currentColor", strokeWidth: "1.2", fill: "none" })] }));
 }
+const FUNDING_TOKEN_SYMBOL = getEnv("FUNDING_TOKEN_SYMBOL");
 function chainsToTokenOptions(chains) {
     const bySymbol = new Map();
     for (const c of chains) {
@@ -36,7 +38,7 @@ function getTokenAddressForChain(chains, chainId, tokenSymbol) {
     const chain = chains.find((c) => c.chain_id === chainId);
     return chain?.tokens.find((t) => t.symbol === tokenSymbol)?.address;
 }
-/** 从 balance 字符串解析出数值部分（如 "123.46 USD1" → 123.46） */
+/** 从 balance 字符串解析出数值部分（如 "123.46 xxx" → 123.46） */
 function parseBalanceNumber(balance) {
     const match = balance.trim().match(/^(\d*\.?\d*)/);
     if (!match)
@@ -44,7 +46,7 @@ function parseBalanceNumber(balance) {
     const n = Number(match[1]);
     return Number.isNaN(n) ? null : n;
 }
-/** 将 balance 字符串格式化为小数点后 2 位（如 "123.456789012 USD1" → "123.46 USD1"） */
+/** 将 balance 字符串格式化为小数点后 2 位（如 "123.456789012 xxx" → "123.46 xxx"） */
 function formatBalanceTo2Decimals(balance) {
     const match = balance.trim().match(/^(\d*\.?\d*)(.*)$/);
     if (!match)
@@ -57,7 +59,6 @@ function formatBalanceTo2Decimals(balance) {
     const formatted = n.toFixed(2);
     return formatted + suffix;
 }
-const WEI_PER_ETHER = 1e18;
 /** Wei (string) to ether display string; keeps up to 6 decimal places, strips trailing zeros */
 function weiToEtherDisplay(wei) {
     const s = (wei || "0").trim().replace(/^0+/, "") || "0";
@@ -74,7 +75,7 @@ function weiToEtherDisplay(wei) {
     return fixed;
 }
 const POLL_INTERVAL_MS = 4000;
-export const WithdrawModal = ({ address = "", token, tokenSymbol = "USDT", chain, amount = "", balance, status = "idle", receiveAmount: receiveAmountProp, txHash, tokenOptions: tokenOptionsProp, chainOptions: chainOptionsProp, useMerchantApi = false, orderId, feeDisplay, fundingChainId, explorerTxUrl, onShowToast, onAddressChange, onTokenSelect, onChainSelect, onAmountChange, onMaxClick, onSubmit, onWithdrawCompleted, onStartAnotherWithdrawal, onSignIn, onClose, }) => {
+export const WithdrawModal = ({ address = "", token, tokenSymbol, chain, amount = "", balance, status = "idle", receiveAmount: receiveAmountProp, txHash, tokenOptions: tokenOptionsProp, chainOptions: chainOptionsProp, useMerchantApi = false, orderId, withdrawMode, withdrawDirectResult, feeDisplay, fundingChainId, onShowToast, onAddressChange, onTokenSelect, onChainSelect, onAmountChange, onMaxClick, onSubmit, onWithdrawCompleted, onStartAnotherWithdrawal, onSignIn, onClose, }) => {
     const session = useSession();
     const addressInputRef = useRef(null);
     const [addressInputFocused, setAddressInputFocused] = useState(false);
@@ -100,7 +101,7 @@ export const WithdrawModal = ({ address = "", token, tokenSymbol = "USDT", chain
                 : undefined;
         if (!raw?.length)
             return undefined;
-        return raw.filter((o) => o.id !== "USD1" && o.label !== "USD1");
+        return raw;
     }, [tokenOptionsProp, apiChains]);
     const chainOptions = useMemo(() => {
         if (chainOptionsProp?.length)
@@ -109,7 +110,19 @@ export const WithdrawModal = ({ address = "", token, tokenSymbol = "USDT", chain
             return undefined;
         return chainsToChainOptionsForToken(apiChains, token);
     }, [chainOptionsProp, apiChains, token]);
-    const trackingWithdraw = useMemo(() => Boolean(orderId), [orderId]);
+    /** 当前选中的 token + chain 在 getChains 数据中的合约地址（与询价 / quote 使用同一解析方式） */
+    const resolvedTokenAddress = useMemo(() => {
+        if (!apiChains?.length || !token || !chain)
+            return undefined;
+        return getTokenAddressForChain(apiChains, chain, token);
+    }, [apiChains, token, chain]);
+    // direct 模式的内部激活标记（便于“Start another withdrawal”时重置为表单态）
+    const [directActive, setDirectActive] = useState(false);
+    // 当外部把 withdrawMode 设为 direct 且提供 withdrawDirectResut 时，进入“追踪提现”态
+    useEffect(() => {
+        setDirectActive(withdrawMode === "direct" && Boolean(withdrawDirectResult));
+    }, [withdrawMode, withdrawDirectResult]);
+    const trackingWithdraw = useMemo(() => Boolean(orderId) || directActive, [orderId, directActive]);
     // Default focus on recipient address when form is visible; white border while focused, revert on blur
     useEffect(() => {
         if (trackingWithdraw)
@@ -126,10 +139,10 @@ export const WithdrawModal = ({ address = "", token, tokenSymbol = "USDT", chain
             return;
         setLoadingChains(true);
         getChains()
-            .then((res) => setApiChains(res?.chains ?? {}))
+            .then((res) => setApiChains(res?.chains ?? []))
             .finally(() => setLoadingChains(false));
     }, [shouldLoadChains]);
-    // 选中 token + chain 后即询价；未填 amount 时用 1 USD1 获取 rate
+    // 选中 token + chain 后即询价；未填 amount 时用 1 xxx 获取 rate
     useEffect(() => {
         if (!apiChains?.length || !token || !chain) {
             setApiQuote(null);
@@ -147,7 +160,7 @@ export const WithdrawModal = ({ address = "", token, tokenSymbol = "USDT", chain
             direction: "withdraw",
             chain_id: chain,
             token_address: tokenAddress,
-            usd1_amount: amountWei,
+            dst_token_amount: amountWei,
         })
             .then((q) => setApiQuote(q ?? null))
             .catch(() => {
@@ -183,41 +196,73 @@ export const WithdrawModal = ({ address = "", token, tokenSymbol = "USDT", chain
         order_id: orderId ?? "",
         status: "pending",
         chain_id: "56",
-        usd1_amount: "0",
+        dst_token_amount: "0",
         target_chain_id: chain ?? "1",
         target_address: address ?? "0x",
         created_at: new Date().toISOString(),
         updated_at: new Date().toISOString(),
     }), [orderId, chain, address]);
     useEffect(() => {
-        if (!orderId) {
-            setWithdrawOrder(null);
-            return;
-        }
-        const t = setInterval(() => {
+        // 1) 有 orderId：按原逻辑轮询
+        if (orderId) {
+            const t = setInterval(() => {
+                getWithdrawOrder(orderId)
+                    .then((order) => {
+                    setWithdrawOrder(order);
+                    if (order.status === "completed" && onShowToast) {
+                        onShowToast("Withdrawal completed");
+                    }
+                })
+                    .catch(() => setWithdrawOrder(mockWithdrawOrderState));
+            }, POLL_INTERVAL_MS);
             getWithdrawOrder(orderId)
-                .then((order) => {
-                setWithdrawOrder(order);
-                if (order.status === "completed" && onShowToast) {
-                    onShowToast("Withdrawal completed");
-                }
-            })
+                .then(setWithdrawOrder)
                 .catch(() => setWithdrawOrder(mockWithdrawOrderState));
-        }, POLL_INTERVAL_MS);
-        getWithdrawOrder(orderId)
-            .then(setWithdrawOrder)
-            .catch(() => setWithdrawOrder(mockWithdrawOrderState));
-        return () => clearInterval(t);
-    }, [orderId, onShowToast, mockWithdrawOrderState]);
-    const completedOrderIdRef = useRef(null);
+            return () => clearInterval(t);
+        }
+        // 2) 无 orderId 且 direct 模式：用传入的结果构造一个“伪订单”，以复用已提交/成功页
+        if (!orderId && directActive) {
+            const now = new Date().toISOString();
+            const inferredAmountWei = (() => {
+                if (withdrawDirectResult?.dst_token_amount)
+                    return withdrawDirectResult.dst_token_amount;
+                const n = Number(amount || "0");
+                return String(n > 0 ? BigInt(Math.floor(n * 1e18)) : 0n);
+            })();
+            const synthetic = {
+                order_id: withdrawDirectResult?.order_id ?? `direct-${Date.now()}`,
+                status: withdrawDirectResult?.status ?? "pending",
+                chain_id: withdrawDirectResult?.chain_id ?? String(fundingChainId ?? "3131"),
+                dst_token_amount: inferredAmountWei,
+                fee: withdrawDirectResult?.fee ?? feeDisplay,
+                target_chain_id: withdrawDirectResult?.target_chain_id ?? (chain ?? ""),
+                target_address: withdrawDirectResult?.target_address ?? (address ?? ""),
+                funding_tx_hash: withdrawDirectResult?.funding_tx_hash ?? txHash,
+                dst_tx_hash: withdrawDirectResult?.dst_tx_hash,
+                out_tx_hash: withdrawDirectResult?.out_tx_hash,
+                created_at: withdrawDirectResult?.created_at ?? now,
+                updated_at: withdrawDirectResult?.updated_at ?? now,
+                one_time_address: withdrawDirectResult?.one_time_address,
+            };
+            setWithdrawOrder(synthetic);
+            return;
+        }
+        // 3) 默认：清空订单，显示表单
+        setWithdrawOrder(null);
+    }, [orderId, directActive, withdrawDirectResult, amount, feeDisplay, chain, address, txHash, fundingChainId, onShowToast, mockWithdrawOrderState]);
+    // 订单完成回调：支持 orderId 或 direct 模式
+    const completedKeyRef = useRef(null);
     useEffect(() => {
-        if (withdrawOrder?.status === "completed" && orderId && completedOrderIdRef.current !== orderId) {
-            completedOrderIdRef.current = orderId;
+        if (withdrawOrder?.status !== "completed")
+            return;
+        const key = orderId ?? withdrawOrder.order_id;
+        if (key && completedKeyRef.current !== key) {
+            completedKeyRef.current = key;
             onWithdrawCompleted?.();
         }
-        if (!orderId)
-            completedOrderIdRef.current = null;
-    }, [withdrawOrder?.status, orderId, onWithdrawCompleted]);
+        if (!trackingWithdraw)
+            completedKeyRef.current = null;
+    }, [withdrawOrder?.status, orderId, trackingWithdraw, onWithdrawCompleted]);
     const receiveAmount = useMemo(() => {
         if (receiveAmountProp) {
             const n = Number(receiveAmountProp);
@@ -254,7 +299,7 @@ export const WithdrawModal = ({ address = "", token, tokenSymbol = "USDT", chain
             direction: "withdraw",
             chain_id: chain,
             token_address: tokenAddress,
-            usd1_amount: amountWei,
+            dst_token_amount: amountWei,
         })
             .then((q) => setApiQuote(q ?? null))
             .catch(() => {
@@ -379,7 +424,7 @@ export const WithdrawModal = ({ address = "", token, tokenSymbol = "USDT", chain
                                                                 flexDirection: "column",
                                                                 gap: 4,
                                                                 width: "100%",
-                                                            }, children: [_jsxs("div", { style: { display: "flex", justifyContent: "space-between", alignItems: "center", padding: "8px 0", height: 36 }, children: [_jsx("span", { style: { fontSize: 14, lineHeight: 1.4, color: colors.textSecondary }, children: "Amount" }), _jsxs("span", { style: { fontSize: 14, lineHeight: 1.4, color: colors.textPrimary }, children: [weiToEtherDisplay(withdrawOrder.usd1_amount), " ", tokenSymbol ?? "USD1"] })] }), _jsxs("div", { style: { display: "flex", justifyContent: "space-between", alignItems: "center", padding: "8px 0", height: 36 }, children: [_jsx("span", { style: { fontSize: 14, lineHeight: 1.4, color: colors.textSecondary }, children: "Fee" }), _jsx("span", { style: { fontSize: 14, lineHeight: 1.4, color: colors.textPrimary }, children: withdrawOrder.fee ?? feeDisplay ?? "—" })] }), _jsxs("div", { style: { display: "flex", justifyContent: "space-between", alignItems: "center", padding: "8px 0", height: 36 }, children: [_jsx("span", { style: { fontSize: 14, lineHeight: 1.4, color: colors.textSecondary }, children: "Network" }), _jsx("span", { style: { fontSize: 14, lineHeight: 1.4, color: colors.textPrimary }, children: targetChainName })] }), destTxHash && (_jsxs("div", { style: { display: "flex", justifyContent: "space-between", alignItems: "center", padding: "8px 0", minHeight: 38 }, children: [_jsx("span", { style: { fontSize: 14, lineHeight: 1.4, color: colors.textSecondary }, children: "Transaction Hash" }), _jsxs("div", { style: { display: "flex", alignItems: "center", gap: 8 }, children: [explorerUrl ? (_jsxs("a", { href: explorerUrl, target: "_blank", rel: "noopener noreferrer", style: { fontSize: 14, color: colors.textPrimary, textDecoration: "underline" }, children: [destTxHash.slice(0, 10), "...", destTxHash.slice(-8)] })) : (_jsxs("span", { style: { fontSize: 14, color: colors.textPrimary }, children: [destTxHash.slice(0, 10), "...", destTxHash.slice(-8)] })), _jsx("button", { type: "button", onClick: copyHash, "aria-label": "Copy hash", style: {
+                                                            }, children: [_jsxs("div", { style: { display: "flex", justifyContent: "space-between", alignItems: "center", padding: "8px 0", height: 36 }, children: [_jsx("span", { style: { fontSize: 14, lineHeight: 1.4, color: colors.textSecondary }, children: "Amount" }), _jsxs("span", { style: { fontSize: 14, lineHeight: 1.4, color: colors.textPrimary }, children: [weiToEtherDisplay(withdrawOrder.dst_token_amount), " ", tokenSymbol] })] }), _jsxs("div", { style: { display: "flex", justifyContent: "space-between", alignItems: "center", padding: "8px 0", height: 36 }, children: [_jsx("span", { style: { fontSize: 14, lineHeight: 1.4, color: colors.textSecondary }, children: "Fee" }), _jsx("span", { style: { fontSize: 14, lineHeight: 1.4, color: colors.textPrimary }, children: withdrawOrder.fee ?? feeDisplay ?? "—" })] }), _jsxs("div", { style: { display: "flex", justifyContent: "space-between", alignItems: "center", padding: "8px 0", height: 36 }, children: [_jsx("span", { style: { fontSize: 14, lineHeight: 1.4, color: colors.textSecondary }, children: "Network" }), _jsx("span", { style: { fontSize: 14, lineHeight: 1.4, color: colors.textPrimary }, children: targetChainName })] }), destTxHash && (_jsxs("div", { style: { display: "flex", justifyContent: "space-between", alignItems: "center", padding: "8px 0", minHeight: 38 }, children: [_jsx("span", { style: { fontSize: 14, lineHeight: 1.4, color: colors.textSecondary }, children: "Transaction Hash" }), _jsxs("div", { style: { display: "flex", alignItems: "center", gap: 8 }, children: [explorerUrl ? (_jsxs("a", { href: explorerUrl, target: "_blank", rel: "noopener noreferrer", style: { fontSize: 14, color: colors.textPrimary, textDecoration: "underline" }, children: [destTxHash.slice(0, 10), "...", destTxHash.slice(-8)] })) : (_jsxs("span", { style: { fontSize: 14, color: colors.textPrimary }, children: [destTxHash.slice(0, 10), "...", destTxHash.slice(-8)] })), _jsx("button", { type: "button", onClick: copyHash, "aria-label": "Copy hash", style: {
                                                                                         padding: 0,
                                                                                         border: "none",
                                                                                         background: "transparent",
@@ -390,7 +435,12 @@ export const WithdrawModal = ({ address = "", token, tokenSymbol = "USDT", chain
                                                                                         justifyContent: "center",
                                                                                         width: 16,
                                                                                         height: 16,
-                                                                                    }, children: _jsx(CopyIcon, {}) })] })] }))] }), _jsx("div", { style: { paddingTop: 24, width: "100%", display: "flex", justifyContent: "center" }, children: _jsx("button", { type: "button", onClick: () => (onStartAnotherWithdrawal ?? onClose)?.(), style: {
+                                                                                    }, children: _jsx(CopyIcon, {}) })] })] }))] }), _jsx("div", { style: { paddingTop: 24, width: "100%", display: "flex", justifyContent: "center" }, children: _jsx("button", { type: "button", onClick: () => {
+                                                                    // 重置 direct 模式追踪与本地订单，恢复到表单态
+                                                                    setDirectActive(false);
+                                                                    setWithdrawOrder(null);
+                                                                    (onStartAnotherWithdrawal ?? onClose)?.();
+                                                                }, style: {
                                                                     width: 274,
                                                                     padding: "12px 0",
                                                                     borderRadius: radii.full,
@@ -435,7 +485,7 @@ export const WithdrawModal = ({ address = "", token, tokenSymbol = "USDT", chain
                                                         display: "flex",
                                                         flexDirection: "column",
                                                         gap: 8,
-                                                    }, children: loadingQuote ? (_jsx("span", { style: { fontSize: 13, color: colors.textSecondary }, children: "Loading\u2026" })) : (_jsxs(_Fragment, { children: [_jsxs("span", { style: { fontSize: 13, color: colors.textSecondary }, children: ["Rate: 1 USD1 = ", apiQuote.rate, " ", apiQuote.token_symbol] }), apiQuote.expires_at && (_jsx(Countdown, { expiresAt: apiQuote.expires_at, isExpired: quoteExpired, onExpired: handleRefreshQuote })), quoteExpired && (_jsxs("div", { style: { display: "flex", alignItems: "center", gap: 8 }, children: [_jsx("span", { style: { fontSize: 13, color: "#f59e0b" }, children: "Quote expired, please refresh" }), _jsx("button", { type: "button", onClick: handleRefreshQuote, style: {
+                                                    }, children: loadingQuote ? (_jsx("span", { style: { fontSize: 13, color: colors.textSecondary }, children: "Loading\u2026" })) : (_jsxs(_Fragment, { children: [_jsxs("span", { style: { fontSize: 13, color: colors.textSecondary }, children: ["Rate: 1 ", FUNDING_TOKEN_SYMBOL, " = ", apiQuote.rate, " ", apiQuote.token_symbol] }), apiQuote.expires_at && (_jsx(Countdown, { expiresAt: apiQuote.expires_at, isExpired: quoteExpired, onExpired: handleRefreshQuote })), quoteExpired && (_jsxs("div", { style: { display: "flex", alignItems: "center", gap: 8 }, children: [_jsx("span", { style: { fontSize: 13, color: "#f59e0b" }, children: "Quote expired, please refresh" }), _jsx("button", { type: "button", onClick: handleRefreshQuote, style: {
                                                                             padding: "4px 12px",
                                                                             fontSize: 12,
                                                                             borderRadius: radii.pill,
@@ -444,7 +494,7 @@ export const WithdrawModal = ({ address = "", token, tokenSymbol = "USDT", chain
                                                                             color: colors.textPrimary,
                                                                             cursor: "pointer",
                                                                             fontFamily: fonts.family,
-                                                                        }, children: "Refresh" })] }))] })) })), _jsx("div", { style: { display: "flex", flexDirection: "column", gap: 16 }, children: _jsxs("div", { style: { display: "flex", flexDirection: "column", gap: 8 }, children: [_jsxs("div", { style: { display: "flex", justifyContent: "space-between", alignItems: "center" }, children: [_jsx("span", { style: { fontSize: 14, lineHeight: 1.4, color: colors.textPrimary }, children: "Amount" }), balance && (_jsxs("span", { style: { fontSize: 13, lineHeight: 1.2, color: colors.textSecondary }, children: ["Balance: \u00A0", formatBalanceTo2Decimals(balance)] }))] }), _jsxs("div", { style: {
+                                                                        }, children: "Refresh" })] }))] })) })), _jsx("div", { style: { display: "flex", flexDirection: "column", gap: 16 }, children: _jsxs("div", { style: { display: "flex", flexDirection: "column", gap: 8 }, children: [_jsxs("div", { style: { display: "flex", justifyContent: "space-between", alignItems: "center" }, children: [_jsx("span", { style: { fontSize: 14, lineHeight: 1.4, color: colors.textPrimary }, children: "Amount" }), balance && (_jsxs("span", { style: { fontSize: 13, lineHeight: 1.2, color: colors.textSecondary }, children: ["Balance: \u00A0", formatBalanceTo2Decimals(balance), " ", FUNDING_TOKEN_SYMBOL] }))] }), _jsxs("div", { style: {
                                                                     display: "flex",
                                                                     alignItems: "center",
                                                                     justifyContent: "space-between",
@@ -463,23 +513,18 @@ export const WithdrawModal = ({ address = "", token, tokenSymbol = "USDT", chain
                                                                             fontFamily: fonts.family,
                                                                             lineHeight: 1.4,
                                                                             padding: 0,
-                                                                        } }), _jsxs("div", { style: { display: "flex", alignItems: "center", gap: 8 }, children: [_jsx("span", { style: {
-                                                                                    fontSize: 14,
-                                                                                    lineHeight: 1.4,
-                                                                                    color: colors.textSecondary,
-                                                                                    fontFamily: fonts.family,
-                                                                                }, children: "USD1" }), _jsx("button", { type: "button", onClick: onMaxClick, style: {
-                                                                                    background: colors.textPrimary,
-                                                                                    border: "none",
-                                                                                    borderRadius: radii.pill,
-                                                                                    padding: "2px 8px",
-                                                                                    fontSize: 12,
-                                                                                    lineHeight: 1.4,
-                                                                                    fontWeight: 400,
-                                                                                    color: "#15181D",
-                                                                                    fontFamily: fonts.family,
-                                                                                    cursor: "pointer",
-                                                                                }, children: "Max" })] })] })] }) })] }) })] })] })] }), _jsxs("div", { style: { padding: "20px 20px 0", display: "flex", flexDirection: "column", gap: 10, alignItems: "center" }, id: "WithdrawModalReceiveAmount", children: [!trackingWithdraw && amount && Number(amount) > 0 && (_jsxs("span", { style: { fontSize: 14, lineHeight: 1.4, color: colors.textPrimary }, children: ["You will receive : ", receiveAmount] })), orderInProgress && withdrawOrder && (() => {
+                                                                        } }), _jsx("div", { style: { display: "flex", alignItems: "center", gap: 8 }, children: _jsx("button", { type: "button", onClick: onMaxClick, style: {
+                                                                                background: colors.textPrimary,
+                                                                                border: "none",
+                                                                                borderRadius: radii.pill,
+                                                                                padding: "2px 8px",
+                                                                                fontSize: 12,
+                                                                                lineHeight: 1.4,
+                                                                                fontWeight: 400,
+                                                                                color: "#15181D",
+                                                                                fontFamily: fonts.family,
+                                                                                cursor: "pointer",
+                                                                            }, children: "Max" }) })] })] }) })] }) })] })] })] }), _jsxs("div", { style: { padding: "20px 20px 0", display: "flex", flexDirection: "column", gap: 10, alignItems: "center" }, id: "WithdrawModalReceiveAmount", children: [!trackingWithdraw && amount && Number(amount) > 0 && (_jsxs("span", { style: { fontSize: 14, lineHeight: 1.4, color: colors.textPrimary }, children: ["You will receive : ", receiveAmount] })), orderInProgress && withdrawOrder && (() => {
                         const fundingHash = txHash ?? withdrawOrder?.funding_tx_hash;
                         const showFundingLink = fundingHash && fundingChainId;
                         try {
@@ -500,6 +545,7 @@ export const WithdrawModal = ({ address = "", token, tokenSymbol = "USDT", chain
                             toAddress: address,
                             amount: amount ?? "",
                             token: token ?? "",
+                            tokenAddress: resolvedTokenAddress ?? apiQuote?.token_address ?? "",
                             chain: chain ?? "",
                         }) }))] })] }));
 };

package/dist/ui/signInTypes.d.ts

@@ -16,6 +16,9 @@ export interface SignInUiConfig {
     socialProviders?: SocialProvider[];
     wallets?: WalletItem[];
     initialVisibleCount?: number;
+    /**
+     * @deprecated Ignored by `SignInModal` / `useSignInModalController`: social login creates the session without `window.confirm`.
+     */
     sessionConfirmation?: {
         enabled?: boolean;
         title?: string;

package/dist/ui/useSignInModalController.d.ts

@@ -1,5 +1,5 @@
-import { type GoogleCredential } from "../auth/google.js";
-import { type TwitterAuthResult } from "../auth/twitter.js";
+import type { GoogleCredential } from "../auth/google.js";
+import type { TwitterAuthResult } from "../auth/twitter.js";
 import { type CubeSignerSession, type WalletSession } from "@ab-org/sdk-core";
 import type { WalletItem } from "./signInTypes.js";
 export interface SignInModalControllerOptions {

package/dist/ui/useSignInModalController.js

@@ -1,71 +1,25 @@
 import { useMemo, useState } from "react";
 import { getSDKConfig } from "../auth/config.js";
-import { signInWithGoogle } from "../auth/google.js";
-import { signInWithTwitter } from "../auth/twitter.js";
-import { CubistSocialProvider, describeSessionCapabilityPolicy, WalletConnector, createDefaultInjectedWalletRegistry, } from "@ab-org/sdk-core";
+import { createOidcRelayAuth } from "../auth/oidcRelay.js";
+import WalletAccount from "../auth/walletAccount.js";
+import { getEnv } from "../utils/env.js";
+import { WalletConnector, createDefaultInjectedWalletRegistry, } from "@ab-org/sdk-core";
 import { resolveWalletItems } from "./SignInModal.shared.js";
+function resolveOidcStage() {
+    return getEnv("STAGE").toLowerCase() === "prod" ? "prod" : "dev";
+}
 export const useSignInModalController = ({ wallets, initialVisibleCount, onGoogleLogin, onTwitterLogin, onCubeSignerSession, onWalletConnected, onSocialLogin, onWalletSelect, }) => {
     const [expanded, setExpanded] = useState(false);
     const [loadingProvider, setLoadingProvider] = useState(null);
     const [loadingWalletId, setLoadingWalletId] = useState(null);
     const defaultWalletRegistry = useMemo(() => createDefaultInjectedWalletRegistry(), []);
-    const sdkConfig = getSDKConfig();
-    const cubistProvider = useMemo(() => {
-        if (!sdkConfig.cubeSigner)
-            return null;
-        return new CubistSocialProvider({
-            ...sdkConfig.cubeSigner,
-            defaultSessionPolicy: sdkConfig.signIn?.sessionPolicy ?? sdkConfig.cubeSigner.defaultSessionPolicy,
-        });
-    }, [sdkConfig.cubeSigner, sdkConfig.signIn?.sessionPolicy]);
     const defaultWalletConnector = useMemo(() => new WalletConnector([
         ...defaultWalletRegistry.map((item) => item.provider),
-        ...(cubistProvider ? [cubistProvider] : []),
-    ]), [cubistProvider, defaultWalletRegistry]);
+    ]), [defaultWalletRegistry]);
     const resolvedWallets = useMemo(() => resolveWalletItems(wallets, defaultWalletRegistry), [defaultWalletRegistry, wallets]);
     const showExpandToggle = resolvedWallets.length > initialVisibleCount;
     const visibleWallets = expanded ? resolvedWallets : resolvedWallets.slice(0, initialVisibleCount);
     const isBusy = !!loadingProvider || !!loadingWalletId;
-    const confirmCapabilitySession = async (providerId, cubistForPolicy) => {
-        const cubist = cubistForPolicy ?? cubistProvider;
-        const confirmation = sdkConfig.signIn?.sessionConfirmation;
-        const policy = cubist?.cubeSignerAuth.defaultSessionPolicy;
-        if (confirmation?.enabled === false || !policy) {
-            return true;
-        }
-        if (typeof window === "undefined" || typeof window.confirm !== "function") {
-            return true;
-        }
-        const lines = describeSessionCapabilityPolicy(cubist?.cubeSignerAuth.defaultSessionPolicy
-            ? {
-                id: "preview",
-                ...cubist.cubeSignerAuth.defaultSessionPolicy,
-            }
-            : undefined);
-        const message = [
-            confirmation?.title ?? "Authorize smart-wallet session",
-            confirmation?.message ?? `Continue with ${providerId} and create a capability session?`,
-            ...lines,
-        ]
-            .filter(Boolean)
-            .join("\n");
-        return window.confirm(message);
-    };
-    const getCubistAndConnector = (config) => {
-        if (!config.cubeSigner)
-            return { cubist: null, connector: defaultWalletConnector };
-        if (cubistProvider)
-            return { cubist: cubistProvider, connector: defaultWalletConnector };
-        const cubist = new CubistSocialProvider({
-            ...config.cubeSigner,
-            defaultSessionPolicy: config.signIn?.sessionPolicy ?? config.cubeSigner.defaultSessionPolicy,
-        });
-        const connector = new WalletConnector([
-            ...defaultWalletRegistry.map((item) => item.provider),
-            cubist,
-        ]);
-        return { cubist, connector };
-    };
     const handleSocialClick = async (providerId) => {
         setLoadingProvider(providerId);
         try {
@@ -73,55 +27,47 @@ export const useSignInModalController = ({ wallets, initialVisibleCount, onGoogl
             if (!config.cubeSigner) {
                 throw new Error("cubeSigner config is required for social login");
             }
-            const { cubist, connector } = getCubistAndConnector(config);
-            if (!cubist) {
-                throw new Error("Cubist provider is unavailable");
-            }
-            const confirmed = await confirmCapabilitySession(providerId, cubist);
-            if (!confirmed)
-                return null;
+            const auth = createOidcRelayAuth({
+                stage: resolveOidcStage(),
+                googleClientId: config.googleClientId ?? "",
+                xClientId: config.twitterClientId ?? "",
+            });
             if (providerId === "google") {
                 if (!config.googleClientId) {
                     throw new Error("googleClientId is required for Google sign-in");
                 }
-                const credential = await signInWithGoogle(config.googleClientId);
-                onGoogleLogin?.(credential);
-                const session = await connector.connect(cubist.id, {
-                    payload: { type: "google", idToken: credential.idToken },
-                });
-                const cubeSignerSession = cubist.cubeSignerSession;
+                const oidcToken = await auth.loginByGoogle();
+                const authSource = "google";
+                WalletAccount.clearInstance();
+                await WalletAccount.getInstance(oidcToken, authSource, config.cubeSigner);
+                const session = WalletAccount.getWalletSession();
+                const cubeSignerSession = WalletAccount.getCubeSignerSession();
+                onGoogleLogin?.({ idToken: oidcToken });
                 if (cubeSignerSession)
                     onCubeSignerSession?.(cubeSignerSession);
                 onSocialLogin?.(providerId);
+                if (!session) {
+                    throw new Error("Failed to build wallet session from Google login");
+                }
                 return session;
             }
             if (providerId === "x") {
                 if (!config.twitterClientId) {
                     throw new Error("twitterClientId is required for X sign-in");
                 }
-                const redirectUri = config.twitterRedirectUri ??
-                    (typeof window !== "undefined"
-                        ? `${window.location.origin}/auth/twitter-callback`
-                        : undefined);
-                if (!redirectUri) {
-                    throw new Error("twitterRedirectUri is required for X sign-in");
-                }
-                const result = await signInWithTwitter(config.twitterClientId, redirectUri);
-                onTwitterLogin?.(result);
-                const session = await connector.connect(cubist.id, {
-                    payload: {
-                        type: "twitter",
-                        params: {
-                            code: result.code,
-                            codeVerifier: result.codeVerifier,
-                            redirectUri,
-                        },
-                    },
-                });
-                const cubeSignerSession = cubist.cubeSignerSession;
+                const oidcToken = await auth.loginByX();
+                const authSource = "twitter";
+                WalletAccount.clearInstance();
+                await WalletAccount.getInstance(oidcToken, authSource, config.cubeSigner);
+                const session = WalletAccount.getWalletSession();
+                const cubeSignerSession = WalletAccount.getCubeSignerSession();
+                onTwitterLogin?.({ code: "", codeVerifier: "", state: "" });
                 if (cubeSignerSession)
                     onCubeSignerSession?.(cubeSignerSession);
                 onSocialLogin?.(providerId);
+                if (!session) {
+                    throw new Error("Failed to build wallet session from X login");
+                }
                 return session;
             }
             throw new Error(`Unsupported social provider: ${providerId}`);
@@ -152,7 +98,7 @@ export const useSignInModalController = ({ wallets, initialVisibleCount, onGoogl
             return session;
         }
         catch (error) {
-            console.error(`[SDK] Wallet connect failed for ${walletId}:`, error);
+            console.error(`[predicate-market-sdk] Wallet connect failed for ${walletId}:`, error);
             throw error;
         }
         finally {

package/dist/utils/env.js

@@ -28,6 +28,8 @@ function readProcessEnvStatic(key) {
             return pick(process.env.NEXT_PUBLIC_CUBE_REG, process.env.CUBE_REG);
         case "RELAY_ORIGIN":
             return pick(process.env.NEXT_PUBLIC_RELAY_ORIGIN, process.env.RELAY_ORIGIN);
+        case "FUNDING_TOKEN_SYMBOL":
+            return pick(process.env.NEXT_PUBLIC_FUNDING_TOKEN_SYMBOL, process.env.FUNDING_TOKEN_SYMBOL) || "USDT";
         default:
             return undefined;
     }

package/dist/walletUtils.d.ts

@@ -1,3 +1,3 @@
 export { getEnv } from "./utils/env.js";
 export { getExplorerUrl } from "./utils/explorer.js";
-export { testBsc, clientIds as ClientIds, BSC_USD1_ADDRESS, BSC_USD1_PLATFORM_CONTRACT_ADDRESS, } from "./constants/chains.js";
+export { ClientIds, DEFAULT_FUNDING_TOKEN_ADDRESS, DEFAULT_FUNDING_CHAIN_ID, getFundingTokenAddress, getChainInfo, type EvmChainInfo, } from "./constants/chains.js";

package/dist/walletUtils.js

@@ -1,3 +1,3 @@
 export { getEnv } from "./utils/env.js";
 export { getExplorerUrl } from "./utils/explorer.js";
-export { testBsc, clientIds as ClientIds, BSC_USD1_ADDRESS, BSC_USD1_PLATFORM_CONTRACT_ADDRESS, } from "./constants/chains.js";
+export { ClientIds, DEFAULT_FUNDING_TOKEN_ADDRESS, DEFAULT_FUNDING_CHAIN_ID, getFundingTokenAddress, getChainInfo, } from "./constants/chains.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ab-org/predicate-market-sdk",
-  "version": "0.0.1",
+  "version": "0.1.0",
   "type": "module",
   "files": [
     "dist/**/*",
@@ -20,8 +20,10 @@
     "registry": "https://registry.npmjs.org/"
   },
   "dependencies": {
+    "@cubist-labs/cubesigner-sdk": "^0.4.219",
     "axios": "^1.13.6",
     "qrcode-generator": "^2.0.4",
+    "@ab-org/wallet-utils": "0.0.7",
     "@ab-org/sdk-core": "0.0.1"
   },
   "peerDependencies": {