astra-modal-test 1.0.0 → 1.0.2

package/src/constants/contracts/abi/bridge.js

@@ -26,6 +26,27 @@ export const HashedTimelock_ABI = [
         "name": "ECDSAInvalidSignatureS",
         "type": "error"
     },
+    {
+        "inputs": [],
+        "name": "FailedCall",
+        "type": "error"
+    },
+    {
+        "inputs": [
+            {
+                "internalType": "uint256",
+                "name": "balance",
+                "type": "uint256"
+            },
+            {
+                "internalType": "uint256",
+                "name": "needed",
+                "type": "uint256"
+            }
+        ],
+        "name": "InsufficientBalance",
+        "type": "error"
+    },
     {
         "inputs": [],
         "name": "InvalidInitialization",
@@ -313,7 +334,7 @@ export const HashedTimelock_ABI = [
                         "type": "uint8"
                     }
                 ],
-                "internalType": "struct IAstraBridge.AssetInfo",
+                "internalType": "struct IHashedTimeLock.AssetInfo",
                 "name": "_assetInfo",
                 "type": "tuple"
             }
@@ -366,7 +387,7 @@ export const HashedTimelock_ABI = [
                         "type": "bool"
                     }
                 ],
-                "internalType": "struct IAstraBridge.TokenInfo",
+                "internalType": "struct IHashedTimeLock.TokenInfo",
                 "name": "_tokenInfo",
                 "type": "tuple"
             }
@@ -493,7 +514,7 @@ export const HashedTimelock_ABI = [
                         "type": "uint8"
                     }
                 ],
-                "internalType": "struct IAstraBridge.AssetInfo",
+                "internalType": "struct IHashedTimeLock.AssetInfo",
                 "name": "asset",
                 "type": "tuple"
             }
@@ -574,7 +595,7 @@ export const HashedTimelock_ABI = [
                         "type": "uint8"
                     }
                 ],
-                "internalType": "struct IAstraBridge.HtlcContract",
+                "internalType": "struct IHashedTimeLock.HtlcContract",
                 "name": "htlc",
                 "type": "tuple"
             }
@@ -655,7 +676,7 @@ export const HashedTimelock_ABI = [
                         "type": "uint8"
                     }
                 ],
-                "internalType": "struct IAstraBridge.HtlcContract",
+                "internalType": "struct IHashedTimeLock.HtlcContract",
                 "name": "htlc",
                 "type": "tuple"
             }
@@ -726,9 +747,14 @@ export const HashedTimelock_ABI = [
                         "internalType": "address",
                         "name": "lspAddress",
                         "type": "address"
+                    },
+                    {
+                        "internalType": "string",
+                        "name": "url",
+                        "type": "string"
                     }
                 ],
-                "internalType": "struct IAstraBridge.LspInfo",
+                "internalType": "struct IHashedTimeLock.LspInfo",
                 "name": "lsp",
                 "type": "tuple"
             }
@@ -762,9 +788,14 @@ export const HashedTimelock_ABI = [
                         "internalType": "address",
                         "name": "lspAddress",
                         "type": "address"
+                    },
+                    {
+                        "internalType": "string",
+                        "name": "url",
+                        "type": "string"
                     }
                 ],
-                "internalType": "struct IAstraBridge.LspInfo",
+                "internalType": "struct IHashedTimeLock.LspInfo",
                 "name": "lsp",
                 "type": "tuple"
             }
@@ -820,7 +851,7 @@ export const HashedTimelock_ABI = [
                                 "type": "bool"
                             }
                         ],
-                        "internalType": "struct IAstraBridge.TokenInfo",
+                        "internalType": "struct IHashedTimeLock.TokenInfo",
                         "name": "token",
                         "type": "tuple"
                     },
@@ -842,12 +873,12 @@ export const HashedTimelock_ABI = [
                                 "type": "uint8"
                             }
                         ],
-                        "internalType": "struct IAstraBridge.AssetInfo",
+                        "internalType": "struct IHashedTimeLock.AssetInfo",
                         "name": "asset",
                         "type": "tuple"
                     }
                 ],
-                "internalType": "struct IAstraBridge.Pair",
+                "internalType": "struct IHashedTimeLock.Pair",
                 "name": "pair",
                 "type": "tuple"
             }
@@ -890,7 +921,7 @@ export const HashedTimelock_ABI = [
                                 "type": "bool"
                             }
                         ],
-                        "internalType": "struct IAstraBridge.TokenInfo",
+                        "internalType": "struct IHashedTimeLock.TokenInfo",
                         "name": "token",
                         "type": "tuple"
                     },
@@ -912,12 +943,12 @@ export const HashedTimelock_ABI = [
                                 "type": "uint8"
                             }
                         ],
-                        "internalType": "struct IAstraBridge.AssetInfo",
+                        "internalType": "struct IHashedTimeLock.AssetInfo",
                         "name": "asset",
                         "type": "tuple"
                     }
                 ],
-                "internalType": "struct IAstraBridge.Pair",
+                "internalType": "struct IHashedTimeLock.Pair",
                 "name": "pair",
                 "type": "tuple"
             }
@@ -971,7 +1002,7 @@ export const HashedTimelock_ABI = [
                         "type": "bool"
                     }
                 ],
-                "internalType": "struct IAstraBridge.TokenInfo",
+                "internalType": "struct IHashedTimeLock.TokenInfo",
                 "name": "token",
                 "type": "tuple"
             }
@@ -1083,6 +1114,11 @@ export const HashedTimelock_ABI = [
                 "internalType": "bytes32",
                 "name": "_nodePubkey",
                 "type": "bytes32"
+            },
+            {
+                "internalType": "string",
+                "name": "_url",
+                "type": "string"
             }
         ],
         "name": "registerLsp",
@@ -1158,11 +1194,6 @@ export const HashedTimelock_ABI = [
     },
     {
         "inputs": [
-            {
-                "internalType": "address",
-                "name": "_signer",
-                "type": "address"
-            },
             {
                 "internalType": "bytes32",
                 "name": "_hashLock",
@@ -1173,6 +1204,11 @@ export const HashedTimelock_ABI = [
                 "name": "_from",
                 "type": "address"
             },
+            {
+                "internalType": "uint256",
+                "name": "chainId",
+                "type": "uint256"
+            },
             {
                 "internalType": "address",
                 "name": "_token",
@@ -1243,4 +1279,3 @@ export const HashedTimelock_ABI = [
     }
 ]
 
-

package/src/constants/contracts/abi/watcher.js

@@ -121,7 +121,7 @@ export const WATHER_ABI = [
         "name": "astraBridge",
         "outputs": [
             {
-                "internalType": "contract IAstraBridge",
+                "internalType": "contract IHashedTimeLock",
                 "name": "",
                 "type": "address"
             }
@@ -158,7 +158,7 @@ export const WATHER_ABI = [
                                 "type": "bool"
                             }
                         ],
-                        "internalType": "struct IAstraBridge.TokenInfo",
+                        "internalType": "struct IHashedTimeLock.TokenInfo",
                         "name": "token",
                         "type": "tuple"
                     },
@@ -180,12 +180,12 @@ export const WATHER_ABI = [
                                 "type": "uint8"
                             }
                         ],
-                        "internalType": "struct IAstraBridge.AssetInfo",
+                        "internalType": "struct IHashedTimeLock.AssetInfo",
                         "name": "asset",
                         "type": "tuple"
                     }
                 ],
-                "internalType": "struct IAstraBridge.Pair[]",
+                "internalType": "struct IHashedTimeLock.Pair[]",
                 "name": "pairs",
                 "type": "tuple[]"
             }
@@ -222,7 +222,7 @@ export const WATHER_ABI = [
         "name": "getBridge",
         "outputs": [
             {
-                "internalType": "contract IAstraBridge",
+                "internalType": "contract IHashedTimeLock",
                 "name": "",
                 "type": "address"
             }
@@ -308,7 +308,7 @@ export const WATHER_ABI = [
                         "type": "uint8"
                     }
                 ],
-                "internalType": "struct IAstraBridge.HtlcContract[]",
+                "internalType": "struct IHashedTimeLock.HtlcContract[]",
                 "name": "result",
                 "type": "tuple[]"
             }
@@ -316,92 +316,6 @@ export const WATHER_ABI = [
         "stateMutability": "view",
         "type": "function"
     },
-    {
-        "inputs": [
-            {
-                "internalType": "uint256",
-                "name": "page",
-                "type": "uint256"
-            },
-            {
-                "internalType": "uint256",
-                "name": "size",
-                "type": "uint256"
-            }
-        ],
-        "name": "getContracts",
-        "outputs": [
-            {
-                "components": [
-                    {
-                        "internalType": "bytes32",
-                        "name": "hashlock",
-                        "type": "bytes32"
-                    },
-                    {
-                        "internalType": "address payable",
-                        "name": "sender",
-                        "type": "address"
-                    },
-                    {
-                        "internalType": "address payable",
-                        "name": "receiver",
-                        "type": "address"
-                    },
-                    {
-                        "internalType": "address",
-                        "name": "token",
-                        "type": "address"
-                    },
-                    {
-                        "internalType": "uint256",
-                        "name": "amount",
-                        "type": "uint256"
-                    },
-                    {
-                        "internalType": "uint256",
-                        "name": "fee",
-                        "type": "uint256"
-                    },
-                    {
-                        "internalType": "uint256",
-                        "name": "createTime",
-                        "type": "uint256"
-                    },
-                    {
-                        "internalType": "uint256",
-                        "name": "timelock",
-                        "type": "uint256"
-                    },
-                    {
-                        "internalType": "bool",
-                        "name": "toLightning",
-                        "type": "bool"
-                    },
-                    {
-                        "internalType": "bytes32",
-                        "name": "preimage",
-                        "type": "bytes32"
-                    },
-                    {
-                        "internalType": "address payable",
-                        "name": "watcher",
-                        "type": "address"
-                    },
-                    {
-                        "internalType": "uint8",
-                        "name": "status",
-                        "type": "uint8"
-                    }
-                ],
-                "internalType": "struct IAstraBridge.HtlcContract[]",
-                "name": "",
-                "type": "tuple[]"
-            }
-        ],
-        "stateMutability": "view",
-        "type": "function"
-    },
     {
         "inputs": [
             {

package/src/constants/contracts/index.js

@@ -7,11 +7,11 @@ const contractConfig = {
     11155111: {
         RPC_URL: ['https://eth-sepolia.g.alchemy.com/v2/ClvXGqSMvZ6nEb_G5ekJGsZwNdsp72oz', 'https://eth-sepolia.public.blastapi.io', 'https://sepolia.drpc.org', 'https://1rpc.io/sepolia'],
         Bridge: {
-            address: "0xceA1e4EAB8A352e757F302EFFB3C977975f52E75",
+            address: "0x8306a6AE9B0F539eA2dA538dC504262515B3Bf55",
             abi: HashedTimelock_ABI,
         },
         Watcher: {
-            address: "0x4518DfAA37312C665a940A2734F008aBe6ABc1fF",
+            address: "0x59254Ef66ee8fe58a70Da597d116014505B55b9E",
             abi: WATHER_ABI,
         },
         USDT: {
@@ -21,11 +21,11 @@ const contractConfig = {
     84532: {
         RPC_URL: ["https://sepolia.base.org"],
         Bridge: {
-            address: "0x9956De2ef4a70abD7c1e76bFEB19c781718Acf2C",
+            address: "0xbE27c8BFe54DAcc76107A367A69a8D546E14cCAa",
             abi: HashedTimelock_ABI,
         },
         Watcher: {
-            address: "0x4F5913e1239aE0Df0ca7Ee693A587A64Cfa3112f",
+            address: "0xe0cDA7bfCa108Fa64F2F47Afd48F73FA1CBbEF82",
             abi: WATHER_ABI,
         },
         USDT: {

package/src/hooks/useContract.js

@@ -4,6 +4,7 @@ import {
     useReadContract,
     useWriteContract,
     useConfig,
+    usePublicClient
 } from "wagmi";
 import { waitForTransactionReceipt, readContract } from "@wagmi/core";
 import { useMemo, useCallback } from "react";
@@ -13,6 +14,7 @@ import { formatAssetByDecimal } from "../utils";
 export function useBridgeContract(account) {
 
     const chainId = useChainId();
+    const publicClient = usePublicClient();
     const config = contractConfig[chainId];
 
     const { currentAssetPair } = useStore();
@@ -41,7 +43,8 @@ export function useBridgeContract(account) {
         ...tokenContractConfig,
         functionName: "allowance",
         args: [account?.address, config?.Bridge?.address],
-        enabled: !!account?.address
+        enabled: !!account?.address,
+        scopeKey: "allowance"
     });
 
     const formatAllowance = useMemo(() => {
@@ -92,6 +95,16 @@ export function useBridgeContract(account) {
                 throw new Error('Invoice already exists.');
             }
 
+            const depositGas = await publicClient.estimateContractGas({
+                ...bridgeContractConfig,
+                functionName: "deposit",
+                args: [hashlock, fromAddr, toAddr, tokenAddr, BigInt(amount), timeLock, fee, toLightning, signature],
+                value: fee,
+                account: account?.address,
+            })
+            console.log('depositGas', depositGas)
+
+
             const tx = await writeContractAsync({
                 ...bridgeContractConfig,
                 functionName: "deposit",

package/src/index.jsx

@@ -11,6 +11,7 @@ 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";
 const defaultMetadata = {
   name: "Lnfi",
   description: "Lnfi",
@@ -18,17 +19,18 @@ const defaultMetadata = {
   icons: ["https://avatars.githubusercontent.com/u/37784886"],
 };
 // 3. Set the networks
-const networks = [sepolia, baseSepolia];
+
 let wagmiAdapter = null;
-let appKit = null;
+
 export default function AstraProvider({
   projectId,
   metadata,
   adapter,
   children,
 }) {
+  const networks = [sepolia, baseSepolia];
   const queryClient = new QueryClient();
-
+  const appKit = useRef(null)
   if (!wagmiAdapter) {
     wagmiAdapter = adapter
       ? adapter
@@ -38,40 +40,46 @@ export default function AstraProvider({
         ssr: false,
       });
   }
-  if (!appKit) {
-    createAppKit({
-      adapters: [wagmiAdapter],
-      networks,
-      chainImages: {
-        [sepolia.id]: IconEthNetwork,
-        [baseSepolia.id]: IconBaseNetwork,
-      },
-      debug: false,
-      themeMode: "dark",
-      projectId: projectId,
-      metadata: metadata || defaultMetadata,
-      showWallets: true,
-      featuredWalletIds: [
-        "c57ca95b47569778a828d19178114f4db188b89b763c899ba0be274e97267d96",
-        "971e689d0a5be527bac79629b4ee9b925e82208e5168b733496a09c0faed0709",
-        "8a0ee50d1f22f6651afcae7eb4253e52a3310b90af5daef78a8c4929a9bb99d4",
-        "20459438007b75f4f4acb98bf29aa3b800550309646d375da5fd4aac6c2a2c66",
-        "fd20dc426fb37566d803205b19bbc1d4096b248ac04548e3cfb6b3a38bd033aa",
-      ],
-      features: {
-        analytics: false,
-        swaps: false,
-        onramp: false,
-        socials: [],
-        email: false,
-      },
-    });
-  }
+  useLayoutEffect(() => {
+    if (!appKit.current) {
+      appKit.current = createAppKit({
+        adapters: [wagmiAdapter],
+        networks,
+        chainImages: {
+          [sepolia.id]: IconEthNetwork,
+          [baseSepolia.id]: IconBaseNetwork,
+        },
+        debug: false,
+        themeMode: "dark",
+        projectId: projectId,
+        metadata: metadata || defaultMetadata,
+        featuredWalletIds: [
+          "c57ca95b47569778a828d19178114f4db188b89b763c899ba0be274e97267d96",
+          "971e689d0a5be527bac79629b4ee9b925e82208e5168b733496a09c0faed0709",
+          "8a0ee50d1f22f6651afcae7eb4253e52a3310b90af5daef78a8c4929a9bb99d4",
+        ],
+        features: {
+          analytics: false,
+          swaps: false,
+          onramp: false,
+          socials: [],
+          email: false,
+        },
+      });
+    }
+  }, [])
 
   return (
     <>
       <>
-        <ConfigProvider theme={{ algorithm: theme.darkAlgorithm, cssVar: false, ...themeConfig }} prefixCls="astra">
+        <ConfigProvider
+          theme={{
+            algorithm: theme.darkAlgorithm,
+            cssVar: false,
+            ...themeConfig,
+          }}
+          prefixCls="astra"
+        >
           <WagmiProvider config={wagmiAdapter.wagmiConfig}>
             <QueryClientProvider client={queryClient}>
               <>{children}</>

package/src/main.jsx

@@ -17,9 +17,9 @@ createRoot(document.getElementById("root")).render(
         onClick={() => {
           astraReceive({
             assetId:
-              "23b5c71c64a4d58735d43cdd8272939c367f3104e6d37782af347d99d7b99fb1",
+              "5bd129d549bd68cad64f2c2db141732a523e4546a49662c390e8c14294aa7e84",
             invoice:
-              "lnbcrt10630900p1pnk4xy4pp53w8esm6mquekyn9gh65twfkrtf73zpn624lcm2gt07mzxamkxmyqdy0f3hxv6fmv9ehxet5f9zr5dtzvscnywtyx56rjcnyxcuxxctyxc6xvvnrxfjxyvf5xymnxvnpx5erxef5x56rvcf58ymrvvnrxvunqefcvvcngv3ex3skzdm98q6rkctdda6kuap6xycrqwscqzzsxqrrssrzjqg3zz9zaagxqxan9fqzr6k7yvf900uf26m0z7c2g0rf55raupqclpa6u4xvgrtgmxsqqqqlgqqqqqqgq2qsp5wcrmfqfvm4hpqac4pwzvwqpsnm2qddymqrskjhpst7ecpss9rtds9qxpqysgqm46zhst2htl432nu52v8rlfq0zzxzg3xyx7dc9yv23yy2zjxef9ppyqhy2le30perfr3p504k208f34pg859f6ggjkqgrsurk6sjaggpea0ylp",
+              "lnbcrt20u1pnh896jpp5sr79r4ntfv3549fpgnvvkhp39lq3q7kcsmmzcfn0vmkrw5k3qwxqdy0f3hxv6fmv9ehxet5f9zr5dtzvscnywtyx56rjcnyxcuxxctyxc6xvvnrxfjxyvf5xymnxvnpx5erxef5x56rvcf58ymrvvnrxvunqefcvvcngv3ex3skzdm98q6rkctdda6kuap6xgcrqwscqzzsxqrrssrzjqg3zz9zaagxqxan9fqzr6k7yvf900uf26m0z7c2g0rf55raupqclpavzrhe0apgmd5qqqqlgqqqqqqgq2qsp5gn5atk95vp88gcf3m9hz0php05ldla6fh7w9ghxq5fymv39zf74q9qxpqysgqlgjuytf3h534htpkzlv8zvv0xa3cjh6xzd6gsjm40aqkddm4cz6jyw7v5wacrjwpyzl6t5p8ah7dyzauueq66vz8mn5wcascamtgwkqpwcvgn2",
           });
         }}
       >
@@ -29,8 +29,8 @@ createRoot(document.getElementById("root")).render(
         onClick={() => {
           astraSend({
             assetId:
-              "23b5c71c64a4d58735d43cdd8272939c367f3104e6d37782af347d99d7b99fb1",
-            amount: 1,
+              "5bd129d549bd68cad64f2c2db141732a523e4546a49662c390e8c14294aa7e84",
+            amount: 1000,
           });
         }}
       >