fix: lots of small bugs, improvements & cleanups

Author: karczuRF

app/page.tsx

@@ -59,7 +59,7 @@ export default function Home() {
       try {
         await setTariAccount()
       } catch (error) {
-        console.error('Failed to set Tari Account:', error)
+        console.error('[ TAPPLET-BRIDGE ] Failed to set Tari Account:', error)
       }
     }
     if (!signer) {
@@ -114,7 +114,7 @@ export default function Home() {
         setModalStep(2)
       })
       .catch((error) => {
-        console.error('Bridge operation failed:', error)
+        console.error('[ TAPPLET-BRIDGE ] Bridge operation failed:', error)
 
         removePendingTransaction(txId)
       })
@@ -128,7 +128,6 @@ export default function Home() {
   ])
 
   const handleBridgeToTari = () => {
-    console.log('[ TAPPLET-BRIDGE ] Bridging to Tari...')
     setModalStep(2)
   }
 

app/providers.tsx

@@ -18,7 +18,7 @@ export const Providers = ({ children }: { children: ReactNode }) => {
   }, [config])
 
   if (!initialState)
-    console.error('[ Bridge ] provider initial state undefined')
+    console.error('[ TAPPLET-BRIDGE ] provider initial state undefined')
 
   return (
     <WagmiProvider config={config} initialState={initialState}>

bridge-v0.1.0.zip

@@ -11,7 +11,7 @@ import {
 export interface SendOneSidedRequest {
   amount: string
   address: string
-  paymentId: string
+  paymentId?: string
 }
 
 export interface BridgeTxDetails {

clients/tari-l1-signer.ts

@@ -24,6 +24,7 @@ export const WrapModal: React.FC<WrapModalProps> = ({
     tariWalletAddress!,
   )
 
+  // TODO temp solution if backend is not ready to be fetched
   // in case tx is still pending
   const amountPending = pendingBridgeTxFromTU?.amount ?? amount
   const amountAfterFeePending =

components/modals/wrap-modal/wrap-modal.tsx

@@ -35,23 +35,28 @@ export const useBridgeToEthereum = () => {
   }) => {
     setIsBridging(true)
     if (!tariAccount) return
-    const tokenAmount = parseWxtmTokenAmount(amount)
+    const parsedAmount = parseWxtmTokenAmount(amount)
 
-    console.debug('[ TAPPLET-BRIDGE ] start bridging to eth')
+    console.debug(
+      '[ TAPPLET-BRIDGE ] start bridging to eth with amount:',
+      parsedAmount,
+    )
     const { paymentId } = await createTransaction.mutateAsync({
       to: ethAddress,
       from: tariAccount.address,
-      tokenAmount,
+      tokenAmount: parsedAmount,
     })
     console.debug('[ TAPPLET-BRIDGE ] created tx with id: ', paymentId)
 
+    // the amount is parsed in TU in the `send_one_sided_to_stealth_address` function
+    // so here it is necessary to pass the value entered by the user as is
     const isSend = await signer?.sendOneSided({
-      amount: tokenAmount,
+      amount: amount,
       address: config.TARI_BRIDGE_COLDWALLET_ADDRESS,
       paymentId: paymentId,
     })
     await signer?.addPendingTappletTx({
-      amount: tokenAmount,
+      amount: parsedAmount,
       amountToReceive: amountAfterFee,
       destinationAddress: ethAddress,
       paymentId: paymentId,

hooks/use-bridge-to-ethereum.ts

@@ -34,7 +34,6 @@ const initialState: State = {
 export const useTariAccount = create<OotleWalletStoreState>()((set) => ({
   ...initialState,
   setTariAccount: async () => {
-    console.info('[ TAPPLET-BRIDGE ] set tari account')
     const signer = useTariSigner.getState().signer
     try {
       if (!signer) {
@@ -43,8 +42,8 @@ export const useTariAccount = create<OotleWalletStoreState>()((set) => ({
       }
       const account = await signer.getAccount()
       const balance = await signer.getTariBalance()
+      // TODO temp solution if backend is not ready to be fetched
       const pendingTx = await signer.getPendingTappletTx()
-      console.info('[ TAPPLET-BRIDGE ] call TU pending tx', pendingTx)
       set({
         tariAccount: {
           account_id: account.account_id,
@@ -55,7 +54,10 @@ export const useTariAccount = create<OotleWalletStoreState>()((set) => ({
         isProcessingTransaction: !!pendingTx,
       })
     } catch (error) {
-      console.error('Could not set the Tari account: ', error)
+      console.error(
+        '[ TAPPLET-BRIDGE ] error setting the Tari account: ',
+        error,
+      )
     }
   },
 

package-lock.json

@@ -10,11 +10,6 @@ export interface SignerStore<TSigner extends TariL1Signer> {
 const useTariSigner = create<SignerStore<TariL1Signer>>()((set) => ({
   signer: null,
   setSigner(signer) {
-    console.info(
-      '[ TAPPLET-BRIDGE ] set tari signer with name:',
-      signer.signerName,
-    )
-
     set({ signer })
   },
 }))

store/account.ts

@@ -1,11 +1,12 @@
+import { parseUnits } from 'ethers'
+
 export function parseWxtmTokenAmount(amount: string): string {
   if (amount.split('.')[1] && amount.split('.')[1][0].length > 6) {
     throw new Error('Invalid amount: more than 6 decimal places')
   }
 
   const sanitizedAmount = amount.replace(/,/g, '')
 
-  // commented out because the amount is parsed when sending transactions from the TU
-  // const parsed = parseUnits(sanitizedAmount, 6)
-  return sanitizedAmount
+  const parsed = parseUnits(sanitizedAmount, 6)
+  return parsed.toString()
 }