remove dep on ethers signer

zeta-chain · Jul 8, 2024 · 8070087 · 8070087
1 parent 14a0a7a
commit 8070087
Show file tree

Hide file tree

Showing 3 changed files with 61 additions and 51 deletions.
diff --git a/app/page.tsx b/app/page.tsx
@@ -42,7 +42,7 @@ const universalSwapContract = "0xb459F14260D1dc6484CE56EB0826be317171e91F"
 export default function IndexPage() {
   const { stakingDelegations } = useStakingContext()
   const { prices } = usePricesContext()
-  const { trackTransaction, cctxs, inbounds } = useCCTXsContext()
+  const { trackTransaction } = useCCTXsContext()
 
   const { balances, balancesLoading, balancesRefreshing, fetchBalances } =
     useBalanceContext()
@@ -105,8 +105,6 @@ export default function IndexPage() {
 
   return (
     <div>
-      {JSON.stringify(cctxs)}
-      {JSON.stringify(inbounds)}
       <div className="grid sm:grid-cols-3 gap-x-10">
         <div className="sm:col-span-2 overflow-x-scroll mb-20">
           <div className="mt-12 mb-8">

diff --git a/components/Swap/hooks/useSendTransaction.ts b/components/Swap/hooks/useSendTransaction.ts
@@ -19,10 +19,9 @@ const useSendTransaction = (
   addressSelected: string,
   setSourceAmount: (amount: string) => void,
   omnichainSwapContractAddress: string,
-  track: any,
   bitcoinAddress: string,
   client: any,
-  signer: any
+  track?: any
 ) => {
   const { address } = useAccount()
   const [isSending, setIsSending] = useState(false)
@@ -102,9 +101,9 @@ const useSendTransaction = (
     window.xfi.bitcoin.request(
       bitcoinXDEFITransfer(bitcoinAddress, bitcoinTSSAddress, a, memo),
       (error: any, hash: any) => {
-        if (!error) {
+        if (!error && track) {
           track({
-            inboundHash: hash,
+            hash: hash,
             desc: `Sent ${sourceAmount} tBTC`,
           })
         }
@@ -131,9 +130,9 @@ const useSendTransaction = (
     window.xfi.bitcoin.request(
       bitcoinXDEFITransfer(bitcoinAddress, bitcoinTSSAddress, a, memo),
       (error: any, hash: any) => {
-        if (!error) {
+        if (!error && track) {
           track({
-            inboundHash: hash,
+            hash: hash,
             desc: `Sent ${a} tBTC`,
           })
         }
@@ -142,7 +141,7 @@ const useSendTransaction = (
   }
 
   m.transferNativeEVM = async () => {
-    await signer?.sendTransaction({
+    await client.signer?.sendTransaction({
       to: addressSelected,
       value: parseEther(sourceAmount),
     })
@@ -160,10 +159,12 @@ const useSendTransaction = (
       recipient: address as string,
       amount: sourceAmount,
     })
-    track({
-      inboundHash: tx.hash,
-      desc: `Sent ${sourceAmount} ZETA from ${from} to ${to}`,
-    })
+    if (track) {
+      track({
+        hash: tx.hash,
+        desc: `Sent ${sourceAmount} ZETA from ${from} to ${to}`,
+      })
+    }
   }
 
   m.withdrawBTC = async () => {
@@ -179,18 +180,20 @@ const useSendTransaction = (
       amount: sourceAmount,
       recipient: addressSelected,
     })
-    track({
-      inboundHash: tx.hash,
-      desc: `Sent ${sourceAmount} ${token} from ${from} to ${to}`,
-    })
+    if (track) {
+      track({
+        hash: tx.hash,
+        desc: `Sent ${sourceAmount} ${token} from ${from} to ${to}`,
+      })
+    }
   }
 
   m.wrapZeta = async () => {
     const zetaTokenAddress = getAddress("zetaToken", "zeta_testnet")
     if (!zetaTokenAddress) {
       throw new Error("ZetaToken address not found.")
     }
-    signer?.sendTransaction({
+    client.signer?.sendTransaction({
       to: zetaTokenAddress,
       value: parseEther(sourceAmount),
     })
@@ -201,8 +204,12 @@ const useSendTransaction = (
     if (!zetaTokenAddress) {
       throw new Error("ZetaToken address not found.")
     }
-    if (signer) {
-      const contract = new ethers.Contract(zetaTokenAddress, WETH9.abi, signer)
+    if (client.signer) {
+      const contract = new ethers.Contract(
+        zetaTokenAddress,
+        WETH9.abi,
+        client.signer
+      )
       contract.withdraw(parseEther(sourceAmount))
     }
   }
@@ -214,7 +221,7 @@ const useSendTransaction = (
     const contract = new ethers.Contract(
       sourceTokenSelected.contract as string,
       ERC20_ABI.abi,
-      signer
+      client.signer
     )
     const approve = await contract.approve(
       addressSelected,
@@ -245,10 +252,12 @@ const useSendTransaction = (
     const token = sourceTokenSelected.symbol
     const from = sourceTokenSelected.chain_name
     const dest = destinationTokenSelected.chain_name
-    track({
-      inboundHash: tx.hash,
-      desc: `Sent ${sourceAmount} ${token} from ${from} to ${dest}`,
-    })
+    if (track) {
+      track({
+        hash: tx.hash,
+        desc: `Sent ${sourceAmount} ${token} from ${from} to ${dest}`,
+      })
+    }
   }
 
   m.depositNative = async () => {
@@ -263,10 +272,12 @@ const useSendTransaction = (
       amount: sourceAmount,
       recipient: addressSelected,
     })
-    track({
-      inboundHash: tx.hash,
-      desc: `Sent ${sourceAmount} ${token} from ${from} to ${to}`,
-    })
+    if (track) {
+      track({
+        hash: tx.hash,
+        desc: `Sent ${sourceAmount} ${token} from ${from} to ${to}`,
+      })
+    }
   }
 
   m.fromZetaChainSwapAndWithdraw = async () => {
@@ -276,7 +287,7 @@ const useSendTransaction = (
     const swapContract = new ethers.Contract(
       omnichainSwapContractAddress,
       SwapToAnyToken.abi,
-      signer
+      client.signer
     )
     const amount = ethers.utils.parseUnits(
       sourceAmount,
@@ -287,7 +298,7 @@ const useSendTransaction = (
     const erc20Contract = new ethers.Contract(
       sourceToken as string,
       ERC20_ABI.abi,
-      signer
+      client.signer
     )
     const approve = await erc20Contract.approve(
       omnichainSwapContractAddress,
@@ -302,10 +313,12 @@ const useSendTransaction = (
       recipient,
       true
     )
-    track({
-      inboundHash: tx.hash,
-      desc: `Sent ${sourceAmount} ${sourceTokenSelected.symbol} from ZetaChain to ${destinationTokenSelected.chain_name}`,
-    })
+    if (track) {
+      track({
+        hash: tx.hash,
+        desc: `Sent ${sourceAmount} ${sourceTokenSelected.symbol} from ZetaChain to ${destinationTokenSelected.chain_name}`,
+      })
+    }
   }
 
   m.fromZetaChainSwap = async () => {
@@ -315,7 +328,7 @@ const useSendTransaction = (
     const swapContract = new ethers.Contract(
       omnichainSwapContractAddress,
       SwapToAnyToken.abi,
-      signer
+      client.signer
     )
     const amount = ethers.utils.parseUnits(
       sourceAmount,
@@ -326,7 +339,7 @@ const useSendTransaction = (
     const erc20Contract = new ethers.Contract(
       sourceToken as string,
       ERC20_ABI.abi,
-      signer
+      client.signer
     )
     const approve = await erc20Contract.approve(
       omnichainSwapContractAddress,
@@ -354,7 +367,7 @@ const useSendTransaction = (
     const custodyContract = new ethers.Contract(
       custodyAddress as string,
       ERC20Custody.abi,
-      signer
+      client.signer
     )
     const assetAddress = sourceTokenSelected.contract
     const amount = ethers.utils.parseUnits(
@@ -365,7 +378,7 @@ const useSendTransaction = (
       const contract = new ethers.Contract(
         assetAddress as string,
         ERC20_ABI.abi,
-        signer
+        client.signer
       )
       await (await contract.approve(custodyAddress, amount)).wait()
       const tx = await custodyContract.deposit(
@@ -378,10 +391,12 @@ const useSendTransaction = (
       const token = sourceTokenSelected.symbol
       const from = sourceTokenSelected.chain_name
       const dest = destinationTokenSelected.chain_name
-      track({
-        inboundHash: tx.hash,
-        desc: `Sent ${sourceAmount} ${token} from ${from} to ${dest}`,
-      })
+      if (track) {
+        track({
+          hash: tx.hash,
+          desc: `Sent ${sourceAmount} ${token} from ${from} to ${dest}`,
+        })
+      }
     } catch (error) {
       console.error("Error during deposit: ", error)
     }
@@ -433,9 +448,9 @@ const useSendTransaction = (
     }
     const tx = await client.deposit(params)
 
-    if (tx) {
+    if (tx && track) {
       track({
-        inboundHash: tx.hash,
+        hash: tx.hash,
         desc: `Sent ${sourceAmount} ${tiker} from ${from} to ${dest}`,
       })
     }

diff --git a/components/Swap/index.tsx b/components/Swap/index.tsx
@@ -6,7 +6,6 @@ import { useFeesContext } from "@/context/FeesContext"
 import { useAccount, useNetwork, useSwitchNetwork } from "wagmi"
 
 import { formatAddress } from "@/lib/utils"
-import { useEthersSigner } from "@/hooks/useEthersSigner"
 import { useZetaChainClient } from "@/hooks/useZetaChainClient"
 import useSendType, {
   computeSendType,
@@ -24,11 +23,10 @@ import useSwapErrors from "./hooks/useSwapErrors"
 
 interface SwapProps {
   contract: string
-  track: any
+  track?: any
 }
 
 const Swap: React.FC<SwapProps> = ({ contract, track }) => {
-  const signer = useEthersSigner()
   const { client } = useZetaChainClient()
   const { isLoading, pendingChainId, switchNetwork } = useSwitchNetwork()
   const { chain } = useNetwork()
@@ -105,10 +103,9 @@ const Swap: React.FC<SwapProps> = ({ contract, track }) => {
     addressSelected,
     setSourceAmount,
     contract,
-    track,
     bitcoinAddress,
     client,
-    signer
+    track
   )
 
   const sendDisabled =