astra-modal-test 1.0.8 → 1.0.10

package/src/comps/ToToken.jsx

@@ -89,7 +89,6 @@ function ToToken({ messageApi }) {
     setAstraModalShow,
     astraModalShow,
   } = useStore();
-
   const [sendInvoice, setSendInvoice] = useState("");
   const [tx, setTx] = useState("");
   const account = useAccount();
@@ -101,10 +100,27 @@ function ToToken({ messageApi }) {
 
   const { switchChain } = useSwitchChain();
 
-  const filterdAssetPairs = useMemo(() => {
-    return allAssetPairs.filter((pair) => {
+  const { filterdAssetPairs, validationError } = useMemo(() => {
+    const filtered = allAssetPairs.filter((pair) => {
       return pair.asset.assetId === sendArgs.assetId;
     });
+
+    // 校验资产是否支持
+    let error = null;
+    if (allAssetPairs.length > 0 && filtered.length === 0) {
+      const supportedAssets = allAssetPairs
+        .map(
+          (pair) =>
+            `${pair.asset.name} (${pair.asset.assetId.substring(0, 8)}...)`
+        )
+        .join(", ");
+      error = `Asset "${sendArgs.assetId.substring(
+        0,
+        8
+      )}..." is not supported. Supported assets: ${supportedAssets}`;
+    }
+
+    return { filterdAssetPairs: filtered, validationError: error };
   }, [allAssetPairs, sendArgs.assetId]);
   //   console.log("🚀 ~ ToLightning ~ allAssetPairs:", allAssetPairs, receiveArgs);
   const { reserveInfo, loading: reserveInfoLoading } = useGetReserveInfo(
@@ -328,7 +344,7 @@ function ToToken({ messageApi }) {
           type="primary"
           htmlType="submit"
           loading={submitLoading}
-          disabled={isInvoiceExpired}
+          disabled={isInvoiceExpired || validationError}
         >
           <span>{submitLoading ? "Waiting for Confirmation" : "Withdraw"}</span>
           <img src={IconArrowRight} alt="" />
@@ -346,6 +362,7 @@ function ToToken({ messageApi }) {
     submitLoading,
     targetNetwork?.blockExplorers?.default.url,
     tx,
+    validationError,
   ]);
 
   const onExpired = useCallback(() => {
@@ -356,12 +373,31 @@ function ToToken({ messageApi }) {
     if (filterdAssetPairs?.length > 0) {
       setCurrentAssetPair(filterdAssetPairs[0]);
       form.setFieldValue("received", filterdAssetPairs?.[0]?.pairId);
+    } else {
+      setCurrentAssetPair(null);
+      form.setFieldValue("received", "");
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [filterdAssetPairs, form]);
   return (
     <WrapperToLightning>
       <Spin spinning={reserveInfoLoading}>
+        {validationError && (
+          <div
+            style={{
+              padding: "12px 16px",
+              marginBottom: "16px",
+              borderRadius: "8px",
+              background: "rgba(255, 77, 79, 0.1)",
+              border: "1px solid rgba(255, 77, 79, 0.3)",
+              color: "#ff4d4f",
+              fontSize: "14px",
+              lineHeight: "1.5",
+            }}
+          >
+            ⚠️ {validationError}
+          </div>
+        )}
         <Form
           name="basic"
           form={form}

package/src/hooks/useLspApi.js

@@ -52,7 +52,7 @@ export const useGetReserveInfo = (targetNetwork, currentAssetPair) => {
 
   return {
     reserveInfo: data?.data,
-    loading,
+    loading: pairId ? loading : false,
     refresh,
   };
 };

package/src/index.jsx

@@ -28,7 +28,8 @@ const defaultMetadata = {
 };
 
 const API_URL_MAP = {
-  development: "https://devof-astralsp.unift.xyz/",
+  // development: "https://devof-astralsp.unift.xyz/",
+  development: "https://devof-nodeflow-bridge-api.unift.xyz/",
   production: "https://api.astra-labs.io/",
 };
 // 3. Set the networks
@@ -129,12 +130,16 @@ export const AstraModal = AstraDialog;
 export function astraReceive({ invoice, assetId }) {
   //evm2lightning
   const store = useStore;
+
+  // 校验将在组件内部进行（因为需要等待 allAssetPairs 加载）
+  // 这里只设置参数，由 ToLightning 组件负责校验和显示错误
   store.setState(() => ({
     astraModalShow: true,
     receiveArgs: { invoice, assetId },
     modalDisplayType: MODAL_DISPLAY_TYPE.TO_LIGHTNING,
   }));
 }
+
 // eslint-disable-next-line react-refresh/only-export-components
 export function astraSend({
   amount,
@@ -144,6 +149,9 @@ export function astraSend({
 }) {
   // lightning2evm
   const store = useStore;
+
+  // 校验将在组件内部进行（因为需要等待 allAssetPairs 加载）
+  // 这里只设置参数，由 ToToken 组件负责校验和显示错误
   store.setState(() => ({
     astraModalShow: true,
     sendArgs: { amount, assetId, waitConfirm },

package/src/main.jsx

@@ -20,10 +20,13 @@ createRoot(document.getElementById("root")).render(
       <Button
         onClick={() => {
           astraReceive({
-            assetId:
-              "f7ac99f2c068f1157c787012f50cb043437505c309c6d8685e135cd8481b1e9d",
+            assetId: "rgb:kmbI~9N8-ruOAnr5-GXZ6ylm-ZhPrR3N-_PydETF-ZyC1jXQ",
             invoice:
-              "lnbcrt100u1p5gw8avpp5jnqgevzt4dzq4q2f74nfe2ms5fzmuyzj3svre4zlj0dsxyq0cknsdysf3hxv6fmv9ehxet5f9zr5e3hv93njwtxxf3nqd3cvccnzdfhvvmnsdesxyexvdfsvd3rqdpnxsenwdfsx43nxvpevvmxgwpk8q6k2vfnx43kgwp58qckyvt989jrkctdda6kuap6xycrqvp6cqzzsxqrrssrzjqfs8kgq4q0fel6yxesfkxl6de7j9af4g84437k4ceeuquy2h4ut33a03y23dq7ey95qqqqlgqqqqqqgq2qsp56au86fneqmqf97425g3axgdcgd6ew0m92u45qyv9s4qvl2s44t3s9qxpqysgqkzk2e8psallgx37k7elw0lyglgs2px76xcf6fnv58ajq56yxtztr7p8ux8xtr6km254pqv687awm8lx5m3ezjjgx4savjq338wcj2cqqckrdtt",
+              "lnbcrt30u1p5ksaf8dqud3jxktt5w46x7unfv9kz6mn0v3jsnp4q22s0qvdeadh5pkey9q0kdedcuy27rad7pahcw0uzksjjp66r5ezwpp5q67767nnt3c4zhpcqyl53rlufrhjqwppknxdyqlzzsxv8gyzmt7ssp5cg3t22jhw3le5lg3njq5has498tjhtr3wm7s0eldn3fu7gyc9nsq9qyysgqcqpcxqrrsslz5wfnkywntd43yjl3efcuz6un4faqkuu3494r4sk3k09kx6t26dpg8y53nfck475rev3z4g33dtfu5xvt2tpgs7qzlgnzngfqzx9j6eu60hp0aws63f395j2uswczfm0kfsz9s3nr8tguqsczug0tfmddu8wcmqxstfwrqr5wd4nvkw6yexa200wezhuyw77jqprt54ga",
+            // assetId:
+            //   "f7ac99f2c068f1157c787012f50cb043437505c309c6d8685e135cd8481b1e9d",
+            // invoice:
+            //   "lnbcrt116692770p1p5k3qd3pp5rklehrt6f4x34qt8hxwy548kg7349paq3k5dnw7jrf0255rgkgpsdysf3hxv6fmv9ehxet5f9zr5e3hv93njwtxxf3nqd3cvccnzdfhvvmnsdesxyexvdfsvd3rqdpnxsenwdfsx43nxvpevvmxgwpk8q6k2vfnx43kgwp58qckyvt989jrkctdda6kuap6xycnydf6cqzzsxqrrssrzjqf7j7xl8rhpycc932pcy382w7f6d664vydks93nuwmtfxh00hft2dap8k2e8ayrtwsqqqqlgqqqqqqgq2qsp5wx26glsp5amuzh8vyl0jkrp7msfqeelwx2cuvxvtysa6my0gq50q9qxpqysgqcq5qg59ckhlrhn5zv49zza0skcqc0yeglthdc7kscz23r54w5zr9yvhnpwklqc6f0933ltr6kjvprnre2armdr5v7kaesgk2vd889ggpqsnepn",
           });
         }}
       >
@@ -33,7 +36,7 @@ createRoot(document.getElementById("root")).render(
         onClick={() => {
           astraSend({
             assetId:
-              "f7ac99f2c068f1157c787012f50cb043437505c309c6d8685e135cd8481b1e9d",
+              "6f9d461d71a18e623c46ceb54aa9602efeab2c137f459c94aec143c9ee5ea29d",
             amount: 999,
           });
         }}

package/src/utils/index.js

@@ -87,17 +87,122 @@ export const toBytes32 = (value) => {
 
   return hash;
 };
+/**
+ * 解析 Lightning Invoice，获取资产信息
+ * 使用后端 assetPayReq API 自动识别资产类型（RGB、Taproot Asset 或 BTC）
+ * @param {string} payReq - Lightning Invoice 字符串
+ * @param {string} assetId - 可选，指定资产 ID。如果不传入，后端会自动识别
+ * @returns {Promise<{amount: string, assetId: string, decimal: number}>}
+ */
 export const invoiceToAssetInfo = async ({ payReq, assetId }) => {
-  const ret = await getAssetPayReq({ payReq: payReq, assetId: assetId });
-  const { decimal } = ret.data;
-
-  const decodedInvoice = window.lightningPayReq.decode(payReq);
-  const description = decodedInvoice?.tags.find(
-    (tag) => tag.tagName === "description"
-  )?.data;
-  const extractInfo = extractAssetInfo(description);
-  return { amount: extractInfo.amount, assetId: assetId, decimal: decimal };
+  try {
+    // 调用后端 API，后端会自动识别资产类型（RGB/Taproot/BTC）
+    const ret = await getAssetPayReq({ payReq: payReq, assetId: assetId });
+    const { amount, decimal, asset_id } = ret.data;
+    
+    return {
+      amount: amount,           // 使用后端返回的精确金额
+      assetId: asset_id || assetId, // 优先使用后端返回的 asset_id（支持自动识别）
+      decimal: decimal,
+    };
+  } catch (error) {
+    console.error("Failed to parse invoice:", error);
+    throw error;
+  }
 };
+/**
+ * 校验资产是否在交易对列表中支持
+ * @param {string} assetId - 资产 ID（如 BTC、Taproot Asset ID、RGB Asset ID）
+ * @param {Array} allAssetPairs - 所有交易对列表
+ * @returns {{isSupported: boolean, supportedPairs: Array, error: string|null}}
+ */
+export function validateAssetSupport(assetId, allAssetPairs) {
+  if (!assetId) {
+    return {
+      isSupported: false,
+      supportedPairs: [],
+      error: "Asset ID is required",
+    };
+  }
+
+  if (!allAssetPairs || allAssetPairs.length === 0) {
+    return {
+      isSupported: false,
+      supportedPairs: [],
+      error: "No trading pairs available. Please wait for pairs to load.",
+    };
+  }
+
+  // 查找支持该 asset_id 的交易对
+  const supportedPairs = allAssetPairs.filter(
+    (pair) => pair?.asset?.assetId === assetId
+  );
+
+  if (supportedPairs.length === 0) {
+    const supportedAssetIds = allAssetPairs
+      .map((pair) => pair?.asset?.assetId)
+      .filter(Boolean);
+    return {
+      isSupported: false,
+      supportedPairs: [],
+      error: `Asset "${assetId}" is not supported. Supported assets: ${supportedAssetIds.join(", ")}`,
+    };
+  }
+
+  return {
+    isSupported: true,
+    supportedPairs,
+    error: null,
+  };
+}
+
+/**
+ * 校验 token 地址是否在交易对列表中支持
+ * @param {string} tokenAddress - Token 合约地址
+ * @param {Array} allAssetPairs - 所有交易对列表
+ * @returns {{isSupported: boolean, supportedPairs: Array, error: string|null}}
+ */
+export function validateTokenSupport(tokenAddress, allAssetPairs) {
+  if (!tokenAddress) {
+    return {
+      isSupported: false,
+      supportedPairs: [],
+      error: "Token address is required",
+    };
+  }
+
+  if (!allAssetPairs || allAssetPairs.length === 0) {
+    return {
+      isSupported: false,
+      supportedPairs: [],
+      error: "No trading pairs available. Please wait for pairs to load.",
+    };
+  }
+
+  // 查找支持该 token 地址的交易对（不区分大小写）
+  const normalizedAddress = tokenAddress.toLowerCase();
+  const supportedPairs = allAssetPairs.filter(
+    (pair) => pair?.token?.address?.toLowerCase() === normalizedAddress
+  );
+
+  if (supportedPairs.length === 0) {
+    const supportedTokens = allAssetPairs
+      .map((pair) => pair?.token?.address)
+      .filter(Boolean);
+    return {
+      isSupported: false,
+      supportedPairs: [],
+      error: `Token "${tokenAddress}" is not supported. Supported tokens: ${supportedTokens.join(", ")}`,
+    };
+  }
+
+  return {
+    isSupported: true,
+    supportedPairs,
+    error: null,
+  };
+}
+
 export function balanceToFixed(balance, decimals) {
   const fixedBalance = balance
     ? new Decimal(balance)
@@ -107,7 +212,21 @@ export function balanceToFixed(balance, decimals) {
     : 0;
   return fixedBalance;
 }
+/**
+ * @deprecated 此函数已废弃，建议使用 invoiceToAssetInfo 代替
+ * 提取 invoice 中的资产信息（从 memo/description 解析）
+ * 
+ * 废弃原因：
+ * 1. 依赖 memo 格式，不够稳定
+ * 2. 无法支持 RGB 资产
+ * 3. 后端 API 已支持自动识别资产类型，更准确
+ * 
+ * @param {string} inputString - invoice description 字符串
+ * @returns {{assetID: string|null, amount: string|null}}
+ */
 export function extractAssetInfo(inputString) {
+  console.warn("⚠️ extractAssetInfo is deprecated. Use invoiceToAssetInfo instead.");
+  
   const result = {
     assetID: null,
     amount: null,