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

package/README.md

@@ -94,6 +94,16 @@ initSDK({
 
 Rules:
 - **`NEXT_PUBLIC_RELAY_ORIGIN`** (or `RELAY_ORIGIN`) must match where you serve **`/relay/google`** and **`/relay/x`**
+
+### Funding chain & funding token (withdraw / balance)
+
+- **`getChainInfo(chainId?)`** — resolves RPC, explorer metadata, native currency fields, and **`defaultFundingTokenAddress`** (per-chain default ERC-20 for the funding leg). If **`chainId`** is omitted or empty, defaults to **`3131`** (Tenderly BSC vnet). Built-in ids are **`3131`** and **`56`** (BSC mainnet); unknown ids throw.
+- **`getFundingTokenAddress(chainId?)`** — same optional **`chainId`** as **`getChainInfo`**. If **`NEXT_PUBLIC_FUNDING_TOKEN_ADDRESS`** / **`FUNDING_TOKEN_ADDRESS`** or legacy **`NEXT_PUBLIC_BSC_USD1_ADDRESS`** / **`BSC_USD1_ADDRESS`** is set (checksummed `0x` + 40 hex), that value overrides defaults for **all** chains; otherwise returns **`getChainInfo(chainId).defaultFundingTokenAddress`**.
+- **`DEFAULT_FUNDING_TOKEN_ADDRESS`** — shorthand for **`getChainInfo().defaultFundingTokenAddress`** (default funding chain **`3131`**).
+- **`fetchFundingTokenBalance(address, { chainId, rpcUrl?, tokenAddress?, decimals?, displaySymbol? })`** — uses **`getChainInfo(chainId)`** for RPC when **`rpcUrl`** is omitted, **`getFundingTokenAddress(chainId)`** when **`tokenAddress`** is omitted, and **`decimals`** default **`chain.nativeCurrencyDecimals`** when omitted (override if your funding token uses different decimals). 
+- **`createFundingWithdrawExecutor({ chainId?, rpcUrl?, tokenAddress?, … })`** — uses the same **`chainId`** for **`getChainInfo`**, default token address (**`getFundingTokenAddress(chainId)`**), and order payload (default **`3131`** when **`chainId`** omitted).
+
+**Type note:** **`EvmChainInfo`** includes **`defaultFundingTokenAddress`**. If you construct chain objects manually in TypeScript, add that field or use **`getChainInfo`** instead of literals.
 - `socialProviders: undefined` uses built-in defaults (`google`, `x`)
 - `socialProviders: []` hides all social buttons
 - known social ids like `google` and `x` automatically reuse built-in icons unless you override `icon`

package/dist/constants/chains.d.ts

@@ -1,22 +1,2 @@
-export declare const testBsc: {
-    readonly chainId: "3131";
-    readonly name: "BSC_TENDERLY";
-    readonly chainName: "BSC_TENDERLY";
-    readonly nativeCurrencyName: "BSC";
-    readonly nativeCurrencySymbol: "BSC";
-    readonly nativeCurrencyDecimals: 18;
-    readonly rpcUrls: readonly ["https://virtual.binance.eu.rpc.tenderly.co/e643ea28-32eb-4fb9-8116-90be24f7defa"];
-    readonly blockExplorerUrl: "https://dashboard.tenderly.co/explorer/vnet/6593bc72-f548-497d-bff9-5be061436a48";
-    readonly platformType: "EVM";
-    readonly icon: "https://static.tomo.inc/token/bsc_new.svg";
-    readonly supportSwap: true;
-    readonly supportGift: true;
-    readonly supportHistory: true;
-};
-export declare const clientIds: {
-    readonly google: string;
-    readonly x: string;
-    readonly sdk: "MfLzAb2ItdDR3RZfE33ueqUhRf3mo1w0tBzLfExvLG72oUzvI6mgACtq19v6Vz7cmHVsfMBpbmr1fFU09sn30wbD";
-};
-export declare const BSC_USD1_ADDRESS = "0x8d0D000Ee44948FC98c9B98A4FA4921476f08B0d";
-export declare const BSC_USD1_PLATFORM_CONTRACT_ADDRESS = "0x1234567890123456789012345678901234567890";
+export { ClientIds, DEFAULT_FUNDING_CHAIN_ID, DEFAULT_FUNDING_TOKEN_ADDRESS, getFundingTokenAddress, getChainInfo, type EvmChainInfo, } from "@ab-org/wallet-utils";
+/** Demo / docs placeholder platform contract; replace in production. */

package/dist/constants/chains.js

@@ -1,23 +1,3 @@
-import { getEnv } from "../utils/env.js";
-export const testBsc = {
-    chainId: "3131",
-    name: "BSC_TENDERLY",
-    chainName: "BSC_TENDERLY",
-    nativeCurrencyName: "BSC",
-    nativeCurrencySymbol: "BSC",
-    nativeCurrencyDecimals: 18,
-    rpcUrls: ["https://virtual.binance.eu.rpc.tenderly.co/e643ea28-32eb-4fb9-8116-90be24f7defa"],
-    blockExplorerUrl: "https://dashboard.tenderly.co/explorer/vnet/6593bc72-f548-497d-bff9-5be061436a48",
-    platformType: "EVM",
-    icon: "https://static.tomo.inc/token/bsc_new.svg",
-    supportSwap: true,
-    supportGift: true,
-    supportHistory: true,
-};
-export const clientIds = {
-    google: getEnv("GOOGLE_CLIENT_ID"),
-    x: getEnv("X_CLIENT_ID"),
-    sdk: "MfLzAb2ItdDR3RZfE33ueqUhRf3mo1w0tBzLfExvLG72oUzvI6mgACtq19v6Vz7cmHVsfMBpbmr1fFU09sn30wbD",
-};
-export const BSC_USD1_ADDRESS = "0x8d0D000Ee44948FC98c9B98A4FA4921476f08B0d";
-export const BSC_USD1_PLATFORM_CONTRACT_ADDRESS = "0x1234567890123456789012345678901234567890";
+export { ClientIds, DEFAULT_FUNDING_CHAIN_ID, DEFAULT_FUNDING_TOKEN_ADDRESS, getFundingTokenAddress, getChainInfo, } from "@ab-org/wallet-utils";
+/** Demo / docs placeholder platform contract; replace in production. */
+// export const FUNDING_TOKEN_PLATFORM_CONTRACT_ADDRESS ="0x1234567890123456789012345678901234567890";

package/dist/index.d.ts

@@ -8,6 +8,8 @@ export * from "./modules/withdraw.js";
 export * from "./modules/marketData.js";
 export * from "./modules/balanceQuery.js";
 export * from "./modules/withdrawExecutor.js";
+export * from "./modules/api.js";
+export * from "./modules/withdrawDirect.js";
 export * from "./policyAdapter.js";
 export * from "./ui/SignInModal.js";
 export * from "./ui/signInTypes.js";
@@ -17,3 +19,4 @@ export * from "./ui/WithdrawModal.js";
 export * from "./ui/components/DropdownField.js";
 export * from "./ui/components/DepositDetailsPanel.js";
 export * from "./walletUtils.js";
+export * from "./constants/chains.js";

package/dist/index.js

@@ -8,6 +8,8 @@ export * from "./modules/withdraw.js";
 export * from "./modules/marketData.js";
 export * from "./modules/balanceQuery.js";
 export * from "./modules/withdrawExecutor.js";
+export * from "./modules/api.js";
+export * from "./modules/withdrawDirect.js";
 export * from "./policyAdapter.js";
 export * from "./ui/SignInModal.js";
 export * from "./ui/signInTypes.js";
@@ -17,3 +19,5 @@ export * from "./ui/WithdrawModal.js";
 export * from "./ui/components/DropdownField.js";
 export * from "./ui/components/DepositDetailsPanel.js";
 export * from "./walletUtils.js";
+// Re-export funding chain helpers so apps can import from package root
+export * from "./constants/chains.js";

package/dist/modules/api.d.ts

@@ -1,5 +1,5 @@
 /**
- * Merchant API client (BaseUrl: https://merchant.tomo.services)
+ * Merchant API client
  * 基于 axios 封装，类型与文档一致。
  */
 import { type AxiosInstance } from "axios";
@@ -14,6 +14,10 @@ export interface TokenData {
     symbol: string;
     address: string;
     decimals: number;
+    /** 最小充值量（最小单位字符串，如 `"15000000"`） */
+    minimum_deposit?: string;
+    /** 是否为 USD 类稳定币 */
+    is_usd_stable?: boolean;
 }
 export interface ChainData {
     chain_id: string;
@@ -33,12 +37,12 @@ export interface PlatformRegisterResponseData {
     chain_id: string;
 }
 export type QuoteDirection = "deposit" | "withdraw";
-export interface QuoteRequest {
+interface QuoteRequest {
     direction: QuoteDirection;
     chain_id: string;
     token_address: string;
     token_amount?: string;
-    usd1_amount?: string;
+    dst_token_amount?: string;
 }
 export interface QuoteResponseData {
     token_address: string;
@@ -47,7 +51,7 @@ export interface QuoteResponseData {
     rate: string;
     chain_id: number;
     deposit_address?: string;
-    usd1_amount?: string;
+    dst_token_amount?: string;
     token_amount?: string;
     expires_at?: string;
 }
@@ -58,7 +62,7 @@ export interface DepositOrderResponseData {
     source_chain_id: string;
     token_address: string;
     token_amount?: string;
-    usd1_amount?: string;
+    dst_token_amount?: string;
     deposit_address?: string;
     source_tx_hash?: string;
     created_at?: string;
@@ -70,7 +74,7 @@ export interface WithdrawOrderResponseData {
     status: WithdrawOrderStatus;
     one_time_address?: string;
     chain_id: string;
-    usd1_amount: string;
+    dst_token_amount: string;
     /** Fee (e.g. "0.01 USD1"); only present if backend includes it in GET /api/v1/orders/withdraw/:id. UI falls back to feeDisplay prop or "—". */
     fee?: string;
     target_chain_id: string;
@@ -123,7 +127,7 @@ export interface CreateOrderResponseData {
     payment_sessions: PaymentSessionResponseData[];
 }
 /**
- * 配置 Merchant API 的 baseURL（可选，默认 https://merchant.tomo.services）
+ * 配置 Merchant API 的 baseURL
  */
 export declare function configureMerchantApi(): void;
 /**
@@ -142,3 +146,4 @@ export declare function getDepositOrder(orderId: string): Promise<DepositOrderRe
 export declare function getWithdrawOrder(orderId: string): Promise<WithdrawOrderResponseData>;
 /** POST /order - 创建 NATIVE_SWAP 提现订单 */
 export declare function createOrder(body: CreateOrderRequest): Promise<CreateOrderResponseData>;
+export {};

package/dist/modules/api.js

@@ -1,13 +1,15 @@
 /**
- * Merchant API client (BaseUrl: https://merchant.tomo.services)
+ * Merchant API client
  * 基于 axios 封装，类型与文档一致。
  */
 import { getEnv } from "../utils/env.js";
 import axios from "axios";
-const DEFAULT_MERCHANT_BASE_URL = "https://merchant.tomo.services";
 // ─── Axios 实例与请求封装 ─────────────────────────────────────────────────────
 function createClient() {
-    const BASE_URL = getEnv("MERCHANT_BASE_URL") || DEFAULT_MERCHANT_BASE_URL;
+    const BASE_URL = getEnv("MERCHANT_BASE_URL");
+    if (!BASE_URL) {
+        throw new Error('MERCHANT_BASE_URL is not set');
+    }
     return axios.create({
         baseURL: BASE_URL,
         timeout: 30000,
@@ -24,7 +26,7 @@ function unwrap(res) {
 // 单例 client，可通过 configureMerchantApi 修改 baseURL
 let apiClient = createClient();
 /**
- * 配置 Merchant API 的 baseURL（可选，默认 https://merchant.tomo.services）
+ * 配置 Merchant API 的 baseURL
  */
 export function configureMerchantApi() {
     apiClient = createClient();

package/dist/modules/balanceQuery.d.ts

@@ -8,13 +8,20 @@ export interface Erc20BalanceResult {
  * No external library dependency – uses the global `fetch`.
  */
 export declare function fetchErc20Balance(rpcUrl: string, tokenAddress: string, walletAddress: string): Promise<bigint>;
-export interface BscUsd1BalanceOptions {
+export interface FundingTokenBalanceOptions {
     rpcUrl?: string;
     tokenAddress?: string;
     decimals?: number;
+    /**
+     * Funding chain id (e.g. `"3131"` Tenderly BSC, `"56"` mainnet).
+     * When omitted, defaults to `3131` via {@link getChainInfo}.
+     */
+    chainId?: string | number | null;
+    /** Label for {@link Erc20BalanceResult.symbol} (default `"Funding"`). */
+    displaySymbol?: string;
 }
 /**
- * Convenience wrapper – fetches the USD1 balance on BSC for a given wallet.
- * All parameters have sensible defaults and can be overridden.
+ * Fetches the configured funding ERC-20 balance on the selected funding chain.
+ * Defaults: chain `3131`, RPC from {@link getChainInfo}, token from {@link getFundingTokenAddress} / env.
  */
-export declare function fetchBscUsd1Balance(walletAddress: string, options?: BscUsd1BalanceOptions): Promise<Erc20BalanceResult>;
+export declare function fetchFundingTokenBalance(walletAddress: string, options?: FundingTokenBalanceOptions): Promise<Erc20BalanceResult>;

package/dist/modules/balanceQuery.js

@@ -1,7 +1,6 @@
-import { testBsc, BSC_USD1_ADDRESS } from "../constants/chains.js";
+import { getEnv } from "../utils/env";
+import { getFundingTokenAddress, getChainInfo } from "../constants/chains.js";
 const ERC20_BALANCE_OF_SELECTOR = "0x70a08231";
-const USD1_DECIMALS = testBsc.nativeCurrencyDecimals;
-const BSC_RPC_URL = testBsc.rpcUrls[0];
 function padAddress(address) {
     return address.toLowerCase().replace("0x", "").padStart(64, "0");
 }
@@ -42,17 +41,20 @@ export async function fetchErc20Balance(rpcUrl, tokenAddress, walletAddress) {
     return BigInt(json.result ?? "0x0");
 }
 /**
- * Convenience wrapper – fetches the USD1 balance on BSC for a given wallet.
- * All parameters have sensible defaults and can be overridden.
+ * Fetches the configured funding ERC-20 balance on the selected funding chain.
+ * Defaults: chain `3131`, RPC from {@link getChainInfo}, token from {@link getFundingTokenAddress} / env.
  */
-export async function fetchBscUsd1Balance(walletAddress, options) {
-    const rpcUrl = options?.rpcUrl ?? BSC_RPC_URL;
-    const tokenAddress = options?.tokenAddress ?? BSC_USD1_ADDRESS;
-    const decimals = options?.decimals ?? USD1_DECIMALS;
+export async function fetchFundingTokenBalance(walletAddress, options) {
+    const chain = getChainInfo(options?.chainId);
+    const rpcUrl = options?.rpcUrl ?? chain.rpcUrls[0];
+    const tokenAddress = options?.tokenAddress ?? getFundingTokenAddress(options?.chainId);
+    const decimals = options?.decimals ?? chain.nativeCurrencyDecimals;
+    const FUNDING_TOKEN_SYMBOL = getEnv("FUNDING_TOKEN_SYMBOL");
+    const displaySymbol = options?.displaySymbol ?? (FUNDING_TOKEN_SYMBOL || "Funding");
     const raw = await fetchErc20Balance(rpcUrl, tokenAddress, walletAddress);
     return {
         raw,
         formatted: formatBalanceDisplay(raw, decimals),
-        symbol: "USD1",
+        symbol: displaySymbol,
     };
 }

package/dist/modules/marketData.d.ts

@@ -3,6 +3,6 @@ import type { MarketDataProvider } from "../types.js";
  * Default `MarketDataProvider` backed by the merchant chains API.
  * - getSupportedTokens / getSupportedChains: from GET `{merchantBase}/chains`
  * - getQuote: local estimate until a dedicated quote API exists
- * - getDepositAddress: session wallet address + fixed minimum (no deposit-address HTTP API here)
+ * - getDepositAddress: 当前 session 钱包地址 + 与 `token`/`chain` 匹配的 `GET /chains` 中 `minimum_deposit`（按 decimals 格式化）
  */
 export declare function createMarketDataProvider(): MarketDataProvider;

package/dist/modules/marketData.js

@@ -1,45 +1,20 @@
 import { sessionStore } from "@ab-org/sdk-core";
-import { getEnv } from "../utils/env.js";
-const DEFAULT_MERCHANT_BASE_URL = "https://merchant.tomo.services";
+import { formatUnits } from "viem";
+import { getChains } from "./api.js";
 let cachedChains = null;
-/** Fallback when chains API fails (network error, 4xx/5xx, parse error, missing base URL). */
-const DEFAULT_CHAINS_FALLBACK = [
-    {
-        chain_id: "56",
-        network: "BSC",
-        tokens: [
-            { symbol: "USD1", address: "0x", decimals: 18 },
-            { symbol: "USDT", address: "0x", decimals: 6 },
-            { symbol: "USDC", address: "0x", decimals: 6 },
-        ],
-    },
-    {
-        chain_id: "ETH",
-        network: "Ethereum",
-        tokens: [
-            { symbol: "USDT", address: "0x", decimals: 6 },
-            { symbol: "USDC", address: "0x", decimals: 6 },
-        ],
-    },
-];
 async function fetchChainsFromApi() {
     if (cachedChains)
         return cachedChains;
     try {
-        const CHAINS_API_BASE = getEnv("MERCHANT_BASE_URL") || DEFAULT_MERCHANT_BASE_URL;
-        const res = await fetch(`${CHAINS_API_BASE}/chains`);
-        if (!res.ok)
-            throw new Error(`Chains API error: ${res.status} ${res.statusText}`);
-        const json = (await res.json());
-        const chains = json.data?.chains ?? [];
+        const { chains } = await getChains();
         if (chains.length > 0) {
             cachedChains = chains;
             return chains;
         }
-        return DEFAULT_CHAINS_FALLBACK;
+        return [];
     }
     catch {
-        return DEFAULT_CHAINS_FALLBACK;
+        return [];
     }
 }
 function chainToChainInfo(chain) {
@@ -48,6 +23,22 @@ function chainToChainInfo(chain) {
         name: chain.network,
     };
 }
+function findTokenInChains(chains, chainId, tokenSymbol) {
+    const chain = chains.find((c) => c.chain_id === chainId);
+    return chain?.tokens.find((t) => t.symbol === tokenSymbol);
+}
+/** `minimum_deposit` 为链上最小单位整数字符串，按 `decimals` 转成可读金额并拼 token 符号 */
+function formatMinimumDepositDisplay(token, tokenSymbol) {
+    const raw = token.minimum_deposit?.trim();
+    if (raw == null || raw === "")
+        return undefined;
+    try {
+        return `${formatUnits(BigInt(raw), token.decimals)} ${tokenSymbol}`;
+    }
+    catch {
+        return `${raw} ${tokenSymbol}`;
+    }
+}
 function deriveTokensFromChains(chains) {
     const bySymbol = new Map();
     for (const chain of chains) {
@@ -84,7 +75,7 @@ function computeDefaultQuote(request) {
  * Default `MarketDataProvider` backed by the merchant chains API.
  * - getSupportedTokens / getSupportedChains: from GET `{merchantBase}/chains`
  * - getQuote: local estimate until a dedicated quote API exists
- * - getDepositAddress: session wallet address + fixed minimum (no deposit-address HTTP API here)
+ * - getDepositAddress: 当前 session 钱包地址 + 与 `token`/`chain` 匹配的 `GET /chains` 中 `minimum_deposit`（按 decimals 格式化）
  */
 export function createMarketDataProvider() {
     return {
@@ -102,11 +93,14 @@ export function createMarketDataProvider() {
         async getQuote(request) {
             return computeDefaultQuote(request);
         },
-        async getDepositAddress(_token, _chain) {
+        async getDepositAddress(token, chain) {
             const session = sessionStore.getState().session;
+            const chains = await fetchChainsFromApi();
+            const meta = findTokenInChains(chains, chain, token);
+            const minimumDeposit = meta != null ? formatMinimumDepositDisplay(meta, token) : undefined;
             return {
                 address: session?.address ?? "",
-                minimumDeposit: "15.00",
+                minimumDeposit,
             };
         },
     };

package/dist/modules/withdrawDirect.d.ts

@@ -0,0 +1,14 @@
+import type { ChainData, TokenData } from "./api.js";
+/**
+ * funding 链（与 {@link DEFAULT_FUNDING_CHAIN_ID} 一致）上，且 `tokenAddress` 在 Merchant `GET /chains`
+ * 中对应条目的 `is_usd_stable === true` 时，由业务层自行完成提现并构造 `withdrawDirectResult`；
+ * 其余情况走默认 funding 提现执行器与订单轮询。
+ */
+export declare function isUsdtWithdrawDirect(chainId: string, tokenAddress: string, chains: ChainData[]): boolean;
+/**
+ * 从 `getChains()` 返回的 `chains` 中，按当前选择的链 id + token symbol 或合约地址解析 `TokenData`。
+ */
+export declare function findTokenDataFromChains(chains: ChainData[], chainId: string, opts: {
+    symbol: string;
+    tokenAddress?: string;
+}): TokenData | undefined;

package/dist/modules/withdrawDirect.js

@@ -0,0 +1,33 @@
+import { DEFAULT_FUNDING_CHAIN_ID } from "../constants/chains.js";
+/**
+ * funding 链（与 {@link DEFAULT_FUNDING_CHAIN_ID} 一致）上，且 `tokenAddress` 在 Merchant `GET /chains`
+ * 中对应条目的 `is_usd_stable === true` 时，由业务层自行完成提现并构造 `withdrawDirectResult`；
+ * 其余情况走默认 funding 提现执行器与订单轮询。
+ */
+export function isUsdtWithdrawDirect(chainId, tokenAddress, chains) {
+    if (chainId !== String(DEFAULT_FUNDING_CHAIN_ID))
+        return false;
+    const addr = tokenAddress.trim();
+    if (!addr)
+        return false;
+    const chain = chains.find((c) => c.chain_id === chainId);
+    const token = chain?.tokens.find((t) => t.address.toLowerCase() === addr.toLowerCase());
+    return token?.is_usd_stable === true;
+}
+/**
+ * 从 `getChains()` 返回的 `chains` 中，按当前选择的链 id + token symbol 或合约地址解析 `TokenData`。
+ */
+export function findTokenDataFromChains(chains, chainId, opts) {
+    const chain = chains.find((c) => c.chain_id === chainId);
+    if (!chain?.tokens.length)
+        return undefined;
+    const sym = opts.symbol.trim();
+    const addr = opts.tokenAddress?.trim().toLowerCase();
+    return chain.tokens.find((t) => {
+        if (addr && t.address.toLowerCase() === addr)
+            return true;
+        if (sym.length > 0 && t.symbol === sym)
+            return true;
+        return false;
+    });
+}

package/dist/modules/withdrawExecutor.d.ts

@@ -9,7 +9,7 @@ export interface WithdrawRequest {
     chain: string;
 }
 export interface WithdrawResult {
-    /** BSC 上转入一次性地址的 funding tx hash */
+    /** Funding 链上转入一次性地址的 tx hash */
     txHash: string;
     /** 提现订单 ID，用于轮询 getWithdrawOrder(orderId) */
     orderId: string;
@@ -30,18 +30,27 @@ export type WithdrawExecutor = (request: WithdrawRequest) => Promise<WithdrawRes
  *   "100.1" → 100100000000000000000n
  */
 export declare function parseUnits(value: string, decimals: number): bigint;
-export interface BscUsd1WithdrawExecutorOptions {
-    /** 源代币 USD1 合约地址（提现场景下为 BSC 上的 USD1） */
+export interface FundingWithdrawExecutorOptions {
+    /** 源链 funding ERC-20 合约地址；默认 {@link getFundingTokenAddress} / env */
     tokenAddress?: string;
     decimals?: number;
-    chainId?: number;
+    /**
+     * Funding EVM chain id（如 `3131` Tenderly、`56` 主网）。未传时默认 `3131`。
+     */
+    chainId?: number | string;
+    /** 覆盖 {@link getChainInfo} 提供的 JSON-RPC URL */
+    rpcUrl?: string;
     /** 系统配置的单笔限额（wei 字符串），若提供则校验 request.amount 不得超过此值 */
     maxAmountWei?: string;
+    /**
+     * 与商户订单接口约定的 funding 侧 token symbol（默认 `USD1`，按后端协议）。
+     */
+    fundingLegTokenSymbol?: string;
 }
 /**
  * Factory that returns a `WithdrawExecutor` implementing the flow in withdraw.md:
  * 1) Create NATIVE_SWAP order → get one-time wallet address (OTW);
- * 2) Sign ERC-20 transfer of USD1 on BSC to the OTW (not to user);
+ * 2) Sign ERC-20 transfer of the funding token on the funding chain to the OTW (not to user);
  * 3) Broadcast tx and return { txHash, orderId } for the client to poll getWithdrawOrder(orderId).
  */
-export declare function createBscUsd1WithdrawExecutor(options?: BscUsd1WithdrawExecutorOptions): WithdrawExecutor;
+export declare function createFundingWithdrawExecutor(options?: FundingWithdrawExecutorOptions): WithdrawExecutor;

package/dist/modules/withdrawExecutor.js

@@ -2,12 +2,10 @@ import { sessionStore } from "@ab-org/sdk-core";
 import { tryAutoReconnect } from "../auth/autoReconnect.js";
 import { getChains, createOrder } from "./api.js";
 import { fromHex, parseGwei, toHex } from "viem";
-import { testBsc, BSC_USD1_ADDRESS } from "../constants/chains.js";
+import { getFundingTokenAddress, getChainInfo } from "../constants/chains.js";
 const MAX_WITHDRAW_GAS_LIMIT = 500000n;
-const BSC_RPC_URL = testBsc.rpcUrls[0];
 /* ─── Internal helpers ────────────────────────── */
 const ERC20_TRANSFER_SELECTOR = "0xa9059cbb";
-const USD1_DECIMALS = testBsc.nativeCurrencyDecimals;
 function padHex256(value) {
     return value.toString(16).padStart(64, "0");
 }
@@ -82,13 +80,13 @@ async function requestHexQuantity(provider, rpcUrl, method, params) {
         return toHexQuantity(await callRpc(rpcUrl, method, params));
     }
 }
-async function ensureBscChain(provider, chainId) {
+async function ensureFundingEvmChain(provider, chainId) {
     const hex = `0x${chainId.toString(16)}`;
     try {
         await provider.request({ method: "wallet_switchEthereumChain", params: [{ chainId: hex }] });
     }
     catch {
-        // Ignored – the wallet may already be on BSC or may not support switching.
+        // Ignored – the wallet may already be on the funding chain or may not support switching.
     }
 }
 function getDstTokenAddress(chains, chainId, tokenSymbol) {
@@ -98,14 +96,17 @@ function getDstTokenAddress(chains, chainId, tokenSymbol) {
 /**
  * Factory that returns a `WithdrawExecutor` implementing the flow in withdraw.md:
  * 1) Create NATIVE_SWAP order → get one-time wallet address (OTW);
- * 2) Sign ERC-20 transfer of USD1 on BSC to the OTW (not to user);
+ * 2) Sign ERC-20 transfer of the funding token on the funding chain to the OTW (not to user);
  * 3) Broadcast tx and return { txHash, orderId } for the client to poll getWithdrawOrder(orderId).
  */
-export function createBscUsd1WithdrawExecutor(options) {
-    const tokenAddress = options?.tokenAddress ?? BSC_USD1_ADDRESS;
-    const decimals = options?.decimals ?? USD1_DECIMALS;
+export function createFundingWithdrawExecutor(options) {
+    const fundingChain = getChainInfo(options?.chainId);
+    const chainIdNum = Number(fundingChain.chainId);
+    const rpcUrl = options?.rpcUrl ?? fundingChain.rpcUrls[0];
+    const tokenAddress = options?.tokenAddress ?? getFundingTokenAddress(options?.chainId);
+    const decimals = options?.decimals ?? fundingChain.nativeCurrencyDecimals;
     const maxAmountWei = options?.maxAmountWei;
-    const chainId = options?.chainId ?? Number(testBsc.chainId);
+    const fundingLegTokenSymbol = options?.fundingLegTokenSymbol ?? "USD1";
     return async (request) => {
         const amountWei = parseUnits(request.amount, decimals);
         const amountWeiStr = amountWei.toString();
@@ -139,13 +140,13 @@ export function createBscUsd1WithdrawExecutor(options) {
         if (!dstTokenAddress) {
             throw new Error(`Unsupported token ${request.token} on chain ${request.chain}`);
         }
-        // 校验规则：源代币或目标代币中必须有一个是 USD1。提现场景下源代币（token_address）为 USD1；token_amount 已按 maxAmountWei 做单笔限额校验
-        const sourceTokenSymbol = "USD1";
+        // 校验规则：源/目标代币需满足商户约定；提现场景下源链为 funding token；token_amount 已按 maxAmountWei 做单笔限额校验
+        const sourceTokenSymbol = fundingLegTokenSymbol;
         const orderRes = await createOrder({
             intent_id: `withdraw-${Date.now()}`,
             order_type: "NATIVE_SWAP",
             order_payload: {
-                chain_id: String(chainId),
+                chain_id: fundingChain.chainId,
                 token_address: tokenAddress,
                 token_amount: amountWeiStr,
                 dst_chain_id: request.chain,
@@ -158,7 +159,7 @@ export function createBscUsd1WithdrawExecutor(options) {
                     token_amount: amountWeiStr,
                     token_address: tokenAddress,
                     user_address: session.address,
-                    chain_id: String(chainId),
+                    chain_id: fundingChain.chainId,
                 },
             ],
         });
@@ -166,18 +167,18 @@ export function createBscUsd1WithdrawExecutor(options) {
         if (!oneTimeAddress) {
             throw new Error("Order created but no one-time wallet address returned");
         }
-        await ensureBscChain(provider, chainId);
+        await ensureFundingEvmChain(provider, chainIdNum);
         const data = encodeTransferData(oneTimeAddress, amountWei);
-        const nonce = await requestHexQuantity(provider, BSC_RPC_URL, "eth_getTransactionCount", [session.address, "latest"]);
+        const nonce = await requestHexQuantity(provider, rpcUrl, "eth_getTransactionCount", [session.address, "latest"]);
         const tx = {
             from: session.address,
             to: tokenAddress,
             value: "0x0",
             nonce,
             data,
-            chainId: toHex(chainId),
+            chainId: toHex(chainIdNum),
         };
-        const estimatedGasHex = await requestHexQuantity(provider, BSC_RPC_URL, "eth_estimateGas", [tx]);
+        const estimatedGasHex = await requestHexQuantity(provider, rpcUrl, "eth_estimateGas", [tx]);
         const estimatedGas = fromHex(estimatedGasHex, "bigint");
         const gas = toHex(estimatedGas > MAX_WITHDRAW_GAS_LIMIT ? MAX_WITHDRAW_GAS_LIMIT : estimatedGas);
         const transaction = {
@@ -201,8 +202,8 @@ export function createBscUsd1WithdrawExecutor(options) {
                 method: "eth_signTransaction",
                 params: [transaction],
             });
-            txHash = await callRpc(BSC_RPC_URL, "eth_sendRawTransaction", [signedTx]);
+            txHash = await callRpc(rpcUrl, "eth_sendRawTransaction", [signedTx]);
         }
-        return { txHash, orderId: orderRes.order_id, fundingChainId: String(chainId) };
+        return { txHash, orderId: orderRes.order_id, fundingChainId: fundingChain.chainId };
     };
 }

package/dist/ui/DepositModal.js

@@ -9,6 +9,7 @@ import { LoginRequiredOverlay } from "./components/LoginRequiredOverlay.js";
 import { useSession } from "./hooks/useSession.js";
 import { colors, fonts, radii } from "./theme.js";
 import { getChains, quote, } from "../modules/api.js";
+import { getEnv } from "../utils/env";
 /** 校验是否为合法的充值地址（传入值）：非空且长度满足常见链地址格式 */
 function isValidDepositAddress(v) {
     return typeof v === "string" && v.trim().length >= 20;
@@ -43,8 +44,6 @@ const DefaultCryptoIcons = () => {
             }, children: t.label }, i))) }));
 };
 /* ─── Helpers: derive options from getChains ─── */
-/** Deposit 时不可选 USD1（充值是转入 USD1，源代币为 USDT/USDC 等） */
-const DEPOSIT_EXCLUDED_TOKEN = "USD1";
 function chainsToTokenOptions(chains) {
     const bySymbol = new Map();
     for (const c of chains) {
@@ -54,7 +53,6 @@ function chainsToTokenOptions(chains) {
         }
     }
     return Array.from(bySymbol.entries())
-        .filter(([id]) => id !== DEPOSIT_EXCLUDED_TOKEN)
         .map(([id, { symbol }]) => ({
         id,
         label: symbol,
@@ -88,6 +86,8 @@ function getTokenAddressForChain(chains, chainId, tokenSymbol) {
     const chain = chains.find((c) => c.chain_id === chainId);
     return chain?.tokens.find((t) => t.symbol === tokenSymbol)?.address;
 }
+/* ─── Main Component ─────────────────────────── */
+const FUNDING_TOKEN_SYMBOL = getEnv("FUNDING_TOKEN_SYMBOL");
 export const DepositModal = ({ token, chain, tokenOptions: tokenOptionsProp, chainOptions: chainOptionsProp, depositAddress, minimumDeposit, qrCenterIcon, cryptoIcons, depositAmount, onShowToast, txHash, explorerTxUrl, onTokenSelect, onChainSelect, onCopyAddress, onBuyCrypto, onSignIn, onBack, onClose, }) => {
     const session = useSession();
     const [view, setView] = useState("entry");
@@ -98,9 +98,8 @@ export const DepositModal = ({ token, chain, tokenOptions: tokenOptionsProp, cha
     const [loadingQuote, setLoadingQuote] = useState(false);
     const [quoteRefreshKey, setQuoteRefreshKey] = useState(0);
     const tokenOptions = useMemo(() => {
-        const excludeUsd1 = (opts) => opts.filter((o) => o.id !== DEPOSIT_EXCLUDED_TOKEN && o.label !== DEPOSIT_EXCLUDED_TOKEN);
         if (tokenOptionsProp?.length)
-            return excludeUsd1(tokenOptionsProp);
+            return tokenOptionsProp;
         if (!apiChains?.length)
             return undefined;
         return chainsToTokenOptions(apiChains);
@@ -112,12 +111,6 @@ export const DepositModal = ({ token, chain, tokenOptions: tokenOptionsProp, cha
             return undefined;
         return chainsToChainOptionsForToken(apiChains, token);
     }, [chainOptionsProp, apiChains, token]);
-    // 当前选中的是 USD1 时自动切到第一个可选 token（deposit 不允许选 USD1）
-    useEffect(() => {
-        if (token !== DEPOSIT_EXCLUDED_TOKEN || !tokenOptions?.length || !onTokenSelect)
-            return;
-        onTokenSelect(tokenOptions[0].id);
-    }, [token, tokenOptions, onTokenSelect]);
     // 仅有一个 chain 选项时默认选中
     useEffect(() => {
         if (chainOptions?.length !== 1 || !onChainSelect)
@@ -166,7 +159,7 @@ export const DepositModal = ({ token, chain, tokenOptions: tokenOptionsProp, cha
                 rate: "1",
                 chain_id: Number(chain) || 56,
                 deposit_address: "0x" + "0".repeat(39) + "1",
-                usd1_amount: depositAmount ?? "0",
+                dst_token_amount: depositAmount ?? "0",
                 expires_at: new Date(Date.now() + 60000).toISOString(),
             });
         })
@@ -227,7 +220,7 @@ export const DepositModal = ({ token, chain, tokenOptions: tokenOptionsProp, cha
                                 rate: "1",
                                 chain_id: Number(chain) || 56,
                                 deposit_address: "0x" + "0".repeat(39) + "1",
-                                usd1_amount: depositAmount ?? "0",
+                                dst_token_amount: depositAmount ?? "0",
                                 expires_at: new Date(Date.now() + 60000).toISOString(),
                             });
                         })
@@ -302,7 +295,7 @@ const TransferView = ({ token, chain, tokenOptions, chainOptions, depositAddress
                                     display: "flex",
                                     flexDirection: "column",
                                     gap: 8,
-                                }, children: quoteLoading ? (_jsx("span", { style: { fontSize: 13, color: colors.textSecondary }, children: "Loading\u2026" })) : (_jsxs(_Fragment, { children: [_jsxs("span", { style: { fontSize: 13, color: colors.textSecondary }, children: ["1 ", quoteData.token_symbol, " = ", quoteData.rate, " USD1"] }), quoteData.expires_at && (_jsx(Countdown, { expiresAt: quoteData.expires_at, isExpired: quoteExpired, onExpired: onQuoteExpired })), quoteExpired && (_jsxs("div", { style: { display: "flex", alignItems: "center", gap: 8 }, children: [_jsx("span", { style: { fontSize: 13, color: "#f59e0b" }, children: "Quote expired, please refresh" }), onRefreshQuote && (_jsx("button", { type: "button", onClick: onRefreshQuote, style: {
+                                }, children: quoteLoading ? (_jsx("span", { style: { fontSize: 13, color: colors.textSecondary }, children: "Loading\u2026" })) : (_jsxs(_Fragment, { children: [_jsxs("span", { style: { fontSize: 13, color: colors.textSecondary }, children: ["1 ", quoteData.token_symbol, " = ", quoteData.rate, " ", FUNDING_TOKEN_SYMBOL] }), quoteData.expires_at && (_jsx(Countdown, { expiresAt: quoteData.expires_at, isExpired: quoteExpired, onExpired: onQuoteExpired })), quoteExpired && (_jsxs("div", { style: { display: "flex", alignItems: "center", gap: 8 }, children: [_jsx("span", { style: { fontSize: 13, color: "#f59e0b" }, children: "Quote expired, please refresh" }), onRefreshQuote && (_jsx("button", { type: "button", onClick: onRefreshQuote, style: {
                                                         padding: "4px 12px",
                                                         fontSize: 12,
                                                         borderRadius: radii.pill,

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.js

@@ -3,7 +3,7 @@ import { getSDKConfig } from "../auth/config.js";
 import { createOidcRelayAuth } from "../auth/oidcRelay.js";
 import WalletAccount from "../auth/walletAccount.js";
 import { getEnv } from "../utils/env.js";
-import { describeSessionCapabilityPolicy, WalletConnector, createDefaultInjectedWalletRegistry, } from "@ab-org/sdk-core";
+import { WalletConnector, createDefaultInjectedWalletRegistry, } from "@ab-org/sdk-core";
 import { resolveWalletItems } from "./SignInModal.shared.js";
 function resolveOidcStage() {
     return getEnv("STAGE").toLowerCase() === "prod" ? "prod" : "dev";
@@ -13,7 +13,6 @@ export const useSignInModalController = ({ wallets, initialVisibleCount, onGoogl
     const [loadingProvider, setLoadingProvider] = useState(null);
     const [loadingWalletId, setLoadingWalletId] = useState(null);
     const defaultWalletRegistry = useMemo(() => createDefaultInjectedWalletRegistry(), []);
-    const sdkConfig = getSDKConfig();
     const defaultWalletConnector = useMemo(() => new WalletConnector([
         ...defaultWalletRegistry.map((item) => item.provider),
     ]), [defaultWalletRegistry]);
@@ -21,30 +20,6 @@ export const useSignInModalController = ({ wallets, initialVisibleCount, onGoogl
     const showExpandToggle = resolvedWallets.length > initialVisibleCount;
     const visibleWallets = expanded ? resolvedWallets : resolvedWallets.slice(0, initialVisibleCount);
     const isBusy = !!loadingProvider || !!loadingWalletId;
-    const confirmCapabilitySession = async (providerId, cubeSignerSession) => {
-        const confirmation = sdkConfig.signIn?.sessionConfirmation;
-        const policy = cubeSignerSession && sdkConfig.cubeSigner
-            ? {
-                id: "preview",
-                ...(sdkConfig.signIn?.sessionPolicy ?? sdkConfig.cubeSigner.defaultSessionPolicy),
-            }
-            : undefined;
-        if (confirmation?.enabled === false || !policy) {
-            return true;
-        }
-        if (typeof window === "undefined" || typeof window.confirm !== "function") {
-            return true;
-        }
-        const lines = describeSessionCapabilityPolicy(policy);
-        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 handleSocialClick = async (providerId) => {
         setLoadingProvider(providerId);
         try {
@@ -67,11 +42,6 @@ export const useSignInModalController = ({ wallets, initialVisibleCount, onGoogl
                 await WalletAccount.getInstance(oidcToken, authSource, config.cubeSigner);
                 const session = WalletAccount.getWalletSession();
                 const cubeSignerSession = WalletAccount.getCubeSignerSession();
-                const confirmed = await confirmCapabilitySession(providerId, cubeSignerSession);
-                if (!confirmed) {
-                    WalletAccount.clearInstance();
-                    return null;
-                }
                 onGoogleLogin?.({ idToken: oidcToken });
                 if (cubeSignerSession)
                     onCubeSignerSession?.(cubeSignerSession);
@@ -91,11 +61,6 @@ export const useSignInModalController = ({ wallets, initialVisibleCount, onGoogl
                 await WalletAccount.getInstance(oidcToken, authSource, config.cubeSigner);
                 const session = WalletAccount.getWalletSession();
                 const cubeSignerSession = WalletAccount.getCubeSignerSession();
-                const confirmed = await confirmCapabilitySession(providerId, cubeSignerSession);
-                if (!confirmed) {
-                    WalletAccount.clearInstance();
-                    return null;
-                }
                 onTwitterLogin?.({ code: "", codeVerifier: "", state: "" });
                 if (cubeSignerSession)
                     onCubeSignerSession?.(cubeSignerSession);

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.2",
+  "version": "0.1.0",
   "type": "module",
   "files": [
     "dist/**/*",
@@ -23,6 +23,7 @@
     "@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": {