astra-modal-test 1.0.5 → 1.0.7

package/src/index.jsx

@@ -2,7 +2,13 @@
 import { ConfigProvider, theme } from "antd";
 import { createAppKit } from "@reown/appkit/react";
 import { WagmiProvider } from "wagmi";
-import { sepolia, baseSepolia } from "@reown/appkit/networks";
+import {
+  sepolia,
+  baseSepolia,
+  base,
+  bsc,
+  botanixTestnet,
+} from "@reown/appkit/networks";
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
 import { WagmiAdapter } from "@reown/appkit-adapter-wagmi";
 import AstraDialog from "./comps/AstraModal.jsx";
@@ -11,13 +17,20 @@ import { themeConfig } from "./theme.js";
 import { MODAL_DISPLAY_TYPE } from "./constants/index.js";
 import IconEthNetwork from "./assets/network/eth.png";
 import IconBaseNetwork from "./assets/network/base.png";
-import { useLayoutEffect, useRef } from "react";
+import IconBotanixNetwork from "./assets/network/botanix.png";
+import { useLayoutEffect, useMemo, useRef } from "react";
+
 const defaultMetadata = {
   name: "Lnfi",
   description: "Lnfi",
-  url: "https://devoflnfi.unift.xyz/", // origin must match your domain & subdomain
+  url: "https://www.lnfi.network/", // origin must match your domain & subdomain
   icons: ["https://avatars.githubusercontent.com/u/37784886"],
 };
+
+const API_URL_MAP = {
+  development: "https://devof-astralsp.unift.xyz/",
+  production: "https://api.astra-labs.io/",
+};
 // 3. Set the networks
 
 let wagmiAdapter = null;
@@ -26,19 +39,36 @@ export default function AstraProvider({
   projectId,
   metadata,
   adapter,
+  env = "production",
+  apiUrl = "https://api.astra-labs.io/",
   children,
 }) {
-  const networks = [sepolia, baseSepolia];
+  const networks = useMemo(() => {
+    return env === "development" ? [sepolia, baseSepolia] : [bsc, base];
+  }, [env]);
+  // const transports = useMemo(()=>{
+  //   return env==='development'? {
+  //     [sepolia.id]: http(`https://eth-sepolia.g.alchemy.com/v2/${ALCHEMY_KEY}`),
+  //     [baseSepolia.id]: http(`https://base-sepolia.g.alchemy.com/v2/${ALCHEMY_KEY}`),
+  //   }:{
+  //     [bsc.id]: http(`https://bnb-mainnet.g.alchemy.com/v2/${ALCHEMY_KEY}`),
+  //     [base.id]: http(`https://base-mainnet.g.alchemy.com/v2/${ALCHEMY_KEY}`),
+  //   }
+  // },[env])
+  const { setAstrApiUrl } = useStore();
   const queryClient = new QueryClient();
-  const appKit = useRef(null)
+  const appKit = useRef(null);
   if (!wagmiAdapter) {
     wagmiAdapter = adapter
       ? adapter
       : new WagmiAdapter({
-        networks,
-        projectId: projectId,
-        ssr: false,
-      });
+          networks,
+          // transports: transports,
+          projectId: projectId,
+          pollingInterval: 8_000,
+          cacheTime: 6_000,
+          ssr: false,
+        });
   }
   useLayoutEffect(() => {
     if (!appKit.current) {
@@ -48,6 +78,7 @@ export default function AstraProvider({
         chainImages: {
           [sepolia.id]: IconEthNetwork,
           [baseSepolia.id]: IconBaseNetwork,
+          [botanixTestnet.id]: IconBotanixNetwork,
         },
         debug: false,
         themeMode: "dark",
@@ -67,7 +98,9 @@ export default function AstraProvider({
         },
       });
     }
-  }, [])
+    const finalApiUrl = API_URL_MAP[env] || apiUrl;
+    setAstrApiUrl(finalApiUrl);
+  }, [apiUrl, env, metadata, networks, projectId, setAstrApiUrl]);
 
   return (
     <>

package/src/main.jsx

@@ -9,17 +9,48 @@ import AstraProvider, {
   astraReceive,
 } from "./index.jsx";
 
+const projectId = "a9bfbd4c2e362787a57afa3c91acaf90";
+
+const env = "development";
+
 createRoot(document.getElementById("root")).render(
   <StrictMode>
-    <AstraProvider projectId="92461524d3cfcb3d78b38b5dbd6a6ce3">
-      <AstraModal astraApiUri="https://devof-astralsp.unift.xyz/" />
+    <AstraProvider projectId={projectId} env={env}>
+      <AstraModal />
+      <Button
+        onClick={() => {
+          astraReceive({
+            assetId:
+              "f7ac99f2c068f1157c787012f50cb043437505c309c6d8685e135cd8481b1e9d",
+            invoice:
+              "lnbcrt100u1p5gw8avpp5jnqgevzt4dzq4q2f74nfe2ms5fzmuyzj3svre4zlj0dsxyq0cknsdysf3hxv6fmv9ehxet5f9zr5e3hv93njwtxxf3nqd3cvccnzdfhvvmnsdesxyexvdfsvd3rqdpnxsenwdfsx43nxvpevvmxgwpk8q6k2vfnx43kgwp58qckyvt989jrkctdda6kuap6xycrqvp6cqzzsxqrrssrzjqfs8kgq4q0fel6yxesfkxl6de7j9af4g84437k4ceeuquy2h4ut33a03y23dq7ey95qqqqlgqqqqqqgq2qsp56au86fneqmqf97425g3axgdcgd6ew0m92u45qyv9s4qvl2s44t3s9qxpqysgqkzk2e8psallgx37k7elw0lyglgs2px76xcf6fnv58ajq56yxtztr7p8ux8xtr6km254pqv687awm8lx5m3ezjjgx4savjq338wcj2cqqckrdtt",
+          });
+        }}
+      >
+        emvToLightning
+      </Button>
+      <Button
+        onClick={() => {
+          astraSend({
+            assetId:
+              "f7ac99f2c068f1157c787012f50cb043437505c309c6d8685e135cd8481b1e9d",
+            amount: 999,
+          });
+        }}
+      >
+        lightningToEvm
+      </Button>
+    </AstraProvider>
+    {/*    <AstraProvider projectId="92461524d3cfcb3d78b38b5dbd6a6ce3" apiUrl="https://devof-astralsp.unift.xyz/" env="development">
+   
+      <AstraModal />
       <Button
         onClick={() => {
           astraReceive({
             assetId:
               "5bd129d549bd68cad64f2c2db141732a523e4546a49662c390e8c14294aa7e84",
             invoice:
-              "lnbcrt20u1pnh896jpp5sr79r4ntfv3549fpgnvvkhp39lq3q7kcsmmzcfn0vmkrw5k3qwxqdy0f3hxv6fmv9ehxet5f9zr5dtzvscnywtyx56rjcnyxcuxxctyxc6xvvnrxfjxyvf5xymnxvnpx5erxef5x56rvcf58ymrvvnrxvunqefcvvcngv3ex3skzdm98q6rkctdda6kuap6xgcrqwscqzzsxqrrssrzjqg3zz9zaagxqxan9fqzr6k7yvf900uf26m0z7c2g0rf55raupqclpavzrhe0apgmd5qqqqlgqqqqqqgq2qsp5gn5atk95vp88gcf3m9hz0php05ldla6fh7w9ghxq5fymv39zf74q9qxpqysgqlgjuytf3h534htpkzlv8zvv0xa3cjh6xzd6gsjm40aqkddm4cz6jyw7v5wacrjwpyzl6t5p8ah7dyzauueq66vz8mn5wcascamtgwkqpwcvgn2",
+              "lnbcrt10u1pncsl97pp5d36zwsnr8zz4njssl8nzrf3uunjgayx0mtme8w9ahtk5a3lng37qdy0f3hxv6fmv9ehxet5f9zr5dtzvscnywtyx56rjcnyxcuxxctyxc6xvvnrxfjxyvf5xymnxvnpx5erxef5x56rvcf58ymrvvnrxvunqefcvvcngv3ex3skzdm98q6rkctdda6kuap6xycrqwscqzzsxqrrssrzjqg3zz9zaagxqxan9fqzr6k7yvf900uf26m0z7c2g0rf55raupqclpa040f0l30n4s5qqqqlgqqqqqqgq2qsp55qzcz8qgfhke67954whzlna58zlsc9s27g43jm32w7l09yr8n5gs9qxpqysgqx2aceldh9plumffk65j23rhuy6ers24p36uf9r9utc34rl85fw387xhtn6x3te50pvpkq3kyq6n4z55dezuz4u2txgm8cf6hnahdhpcp07k2cw",
           });
         }}
       >
@@ -30,12 +61,12 @@ createRoot(document.getElementById("root")).render(
           astraSend({
             assetId:
               "5bd129d549bd68cad64f2c2db141732a523e4546a49662c390e8c14294aa7e84",
-            amount: 1000,
+            amount: 10,
           });
         }}
       >
         Send
       </Button>
-    </AstraProvider>
+    </AstraProvider> */}
   </StrictMode>
 );

package/src/utils/index.js

@@ -1,36 +1,148 @@
 import Decimal from "decimal.js";
-export const msatsToTprAsset = async (msats, asset_id) => {
+import { BaseError as BaseViemError, stringToHex } from "viem";
+import { sha256 } from "viem/utils";
+import { getAssetPayReq } from "../apis/lspApi";
+/* export const msatsToTprAsset = async (msats, asset_id) => {
+  try {
+    const response = await fetch(
+      `https://bridge-oracle.ln.exchange/napi/price/getOne?transactionType=1&subjectAssetId=${asset_id}&paymentAssetId=0000000000000000000000000000000000000000000000000000000000000000`
+    );
+    const ret = await response.json();
 
-    try {
-        const response = await fetch(
-            `https://oracle.ln.exchange/napi/price/getOne?transactionType=1&subjectAssetId=${asset_id}&paymentAssetId=0000000000000000000000000000000000000000000000000000000000000000`,
-        );
-        const ret = await response.json();
+    const coefficient = ret?.ok?.assetRates?.subjectAssetRate?.coefficient;
+    const scale = ret?.ok?.assetRates?.subjectAssetRate?.scale;
 
-        const coefficient = ret?.ok?.assetRates?.subjectAssetRate?.coefficient;
-        const scale = ret?.ok?.assetRates?.subjectAssetRate?.scale;
+    //const BTC_TO_USDT_RATE = new Decimal(coefficient).div(10 ** (scale + 8 + 3)).toNumber();
 
-        //const BTC_TO_USDT_RATE = new Decimal(coefficient).div(10 ** (scale + 8 + 3)).toNumber();
+    const priceOneUnit = new Decimal(coefficient).div(10 ** scale);
+    const satToUSDTValue = new Decimal(msats)
+      .div(10 ** (8 + 3))
+      .mul(priceOneUnit)
+      .toFixed(0);
 
-        const priceOneUnit = new Decimal(coefficient).div(10 ** scale)
-        const satToUSDTValue = new Decimal(msats).div(10 ** (8 + 3)).mul(priceOneUnit).toFixed(0)
+    return satToUSDTValue;
+  } catch (e) {
+    console.error(e.message);
+    return 0;
+  }
+}; */
 
-        return satToUSDTValue;
-    } catch (e) {
-        console.error(e.message);
-        return 0;
+export const formatAssetByDecimal = (value, decimal) => {
+  return new Decimal(value).div(10 ** decimal).toFixed(decimal);
+};
+export function numberWithCommas(x) {
+  if (!x && x != 0) {
+    return "0";
+  }
+
+  var parts = x.toString().split(".");
+  parts[0] = parts[0].replace(/\B(?=(\d{3})+(?!\d))/g, ",");
+  return parts.join(".");
+}
+export function sleep(time = 1000) {
+  return new Promise((resolve) => {
+    setTimeout(() => {
+      resolve(true);
+    }, time);
+  });
+}
+export const getParsedError = (e) => {
+  let message = e.message ?? "An unknown error occurred";
+  if (e instanceof BaseViemError) {
+    if (e.details) {
+      message = e.details;
+    } else if (e.shortMessage) {
+      message = e.shortMessage;
+      const cause = e.cause;
+      // if its not generic error, append custom error name and its args to message
+      if (cause?.data && cause.data?.abiItem?.name !== "Error") {
+        const customErrorArgs = cause.data.args?.toString() ?? "";
+        message = `${message.replace(
+          /reverted\.$/,
+          "reverted with following reason:"
+        )}\n${cause.data.errorName}(${customErrorArgs})`;
+      }
+    } else if (e.message) {
+      message = e.message;
+    } else if (e.name) {
+      message = e.name;
     }
+  }
+
+  return message;
 };
 
-export const formatAssetByDecimal = (value, decimal) => {
-    return new Decimal(value).div(10 ** decimal).toFixed(decimal)
+export const toBytes32 = (value) => {
+  const inputValue = value.startsWith("0x")
+    ? value
+    : /^[0-9a-fA-F]+$/.test(value)
+    ? "0x" + value
+    : value;
+
+  const dataToHash = /^0x[0-9a-fA-F]+$/.test(inputValue)
+    ? inputValue
+    : stringToHex(inputValue);
+
+  const hash = sha256(dataToHash);
+
+  return hash;
+};
+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 };
+};
+export function balanceToFixed(balance, decimals) {
+  const fixedBalance = balance
+    ? new Decimal(balance)
+        .div(10 ** decimals)
+        .toFixed(decimals, Decimal.ROUND_DOWN)
+        .toString()
+    : 0;
+  return fixedBalance;
 }
-export function numberWithCommas(x) {
-    if (!x && x != 0) {
-        return "0";
+export function extractAssetInfo(inputString) {
+  const result = {
+    assetID: null,
+    amount: null,
+  };
+
+  if (!inputString) {
+    return result; // Handle empty/null input
+  }
+
+  // --- Extract assetID ---
+  // Regex looks for "assetID:" followed by capturing non-semicolon characters
+  const assetIDMatch = inputString.match(/assetID:([^;]+)/);
+  if (assetIDMatch && assetIDMatch[1]) {
+    // Get the captured value (group 1)
+    let value = assetIDMatch[1].trim();
+    // Remove potential trailing colon
+    if (value.endsWith(":")) {
+      value = value.slice(0, -1);
     }
+    result.assetID = value;
+  }
 
-    var parts = x.toString().split(".");
-    parts[0] = parts[0].replace(/\B(?=(\d{3})+(?!\d))/g, ",");
-    return parts.join(".");
-}
+  // --- Extract amount ---
+  // Regex looks for "amount:" followed by capturing non-semicolon characters
+  const amountMatch = inputString.match(/amount:([^;]+)/);
+  if (amountMatch && amountMatch[1]) {
+    // Get the captured value (group 1)
+    let value = amountMatch[1].trim();
+    // Remove potential trailing colon
+    if (value.endsWith(":")) {
+      value = value.slice(0, -1);
+    }
+    result.amount = value;
+    // Optional number conversion can be done here
+  }
+
+  return result;
+}

package/vite.config.js

@@ -9,10 +9,15 @@ export default defineConfig({
       entry: 'src/index.jsx',
       name: 'astra-sdk',
       fileName: (format) => `astra-sdk.${format}.js`,
+      formats: ['es']
     },
     rollupOptions: {
       external: ['react', 'react-dom', 'antd', 'ahooks', 'axios', 'decimal.js', '@ant-design/icons'],
       output: {
+        exports: "named",
+        format: 'esm',
+        preserveModules: false,
+        inlineDynamicImports: false,
         globals: {
           react: 'React',
           'react-dom': 'ReactDOM',
@@ -21,7 +26,8 @@ export default defineConfig({
           'decimal.js': 'Decimal',
           ahooks: 'ahooks',
           axios: 'axios',
-        },
+        }, 
+       
       },
     },
   },