fix type errors

src/blockchain/addresses.ts

@@ -3,7 +3,7 @@ import { NetworkEnum, TokenEnum } from "@/model/NetworkEnum";
 import { createPublicClient, http } from "viem";
 import { sepolia, rootstock } from "viem/chains";
 
-const Tokens: { [key in NetworkEnum]: { [key in TokenEnum]: string } } = {
+const Tokens: { [key in NetworkEnum]: { [key in TokenEnum]: `0x${string}` } } = {
   [NetworkEnum.sepolia]: {
     BRZ: "0x3eBE67A2C7bdB2081CBd34ba3281E90377462289",
     // BRX: "0x3eBE67A2C7bdB2081CBd34ba3281E90377462289",
@@ -28,14 +28,14 @@ export const getTokenByAddress = (address: string) => {
 export const getTokenAddress = (
   token: TokenEnum,
   network?: NetworkEnum
-): string => {
+): `0x${string}` => {
   const user = useUser();
   return Tokens[network ? network : user.networkName.value][token];
 };
 
-export const getP2PixAddress = (network?: NetworkEnum): string => {
+export const getP2PixAddress = (network?: NetworkEnum): `0x${string}` => {
   const user = useUser();
-  const possibleP2PixAddresses: { [key in NetworkEnum]: string } = {
+  const possibleP2PixAddresses: { [key in NetworkEnum]: `0x${string}` } = {
     [NetworkEnum.sepolia]: "0xb7cD135F5eFD9760981e02E2a898790b688939fe",
     [NetworkEnum.rootstock]: "0x98ba35eb14b38D6Aa709338283af3e922476dE34",
   };

src/blockchain/buyerMethods.ts

@@ -8,7 +8,7 @@ export const addLock = async (
   tokenAddress: string,
   amount: number
 ): Promise<string> => {
-  const { address, abi, wallet, client } = await getContract();
+  const { address, abi, wallet, client, account } = await getContract();
   const parsedAmount = parseEther(amount.toString());
 
   const { request } = await client.simulateContract({
@@ -16,19 +16,31 @@ export const addLock = async (
     abi,
     functionName: "lock",
     args: [sellerAddress, tokenAddress, parsedAmount, [], []],
+    account,
   });
   console.log(wallet);
+  if (!wallet) {
+    throw new Error("Wallet is undefined");
+  }
   const hash = await wallet.writeContract(request);
   const receipt = await client.waitForTransactionReceipt({ hash });
 
-  return receipt.status ? receipt.logs[0].topics[2] : "";
+  if (!receipt.status)
+    throw new Error("Transaction failed: " + receipt.transactionHash);
+
+  const topic = receipt.logs[0]?.topics[2];
+  if (!topic) {
+    throw new Error("Topic is undefined");
+  }
+
+  return topic;
 };
 
 export const withdrawDeposit = async (
   amount: string,
   token: TokenEnum
 ): Promise<boolean> => {
-  const { address, abi, wallet, client } = await getContract();
+  const { address, abi, wallet, client, account } = await getContract();
 
   const tokenAddress = getTokenAddress(token);
 
@@ -37,24 +49,38 @@ export const withdrawDeposit = async (
     abi,
     functionName: "withdraw",
     args: [tokenAddress, parseEther(amount), []],
+    account
   });
 
+  if (!wallet) {
+    throw new Error("Wallet is undefined");
+  }
+
   const hash = await wallet.writeContract(request);
   const receipt = await client.waitForTransactionReceipt({ hash });
 
-  return receipt.status;
+  if ( receipt.status == "success"){
+    return true;
+  } else {
+    return false;
+  }
 };
 
 export const releaseLock = async (solicitation: any): Promise<any> => {
-  const { address, abi, wallet, client } = await getContract();
+  const { address, abi, wallet, client, account } = await getContract();
 
   const { request } = await client.simulateContract({
     address,
     abi,
     functionName: "release",
     args: [solicitation.lockId, solicitation.e2eId],
+    account
   });
 
+  if (!wallet) {
+    throw new Error("Wallet is undefined");
+  }
+
   const hash = await wallet.writeContract(request);
   return client.waitForTransactionReceipt({ hash });
 };

src/blockchain/events.ts

@@ -1,5 +1,5 @@
 import { useUser } from "@/composables/useUser";
-import { formatEther, toHex, type PublicClient } from "viem";
+import { formatEther, toHex, type PublicClient, type ByteArray } from "viem";
 
 import p2pix from "@/utils/smart_contract_files/P2PIX.json";
 import { getContract } from "./provider";
@@ -9,6 +9,28 @@ import { getNetworkSubgraphURL, NetworkEnum } from "@/model/NetworkEnum";
 import type { UnreleasedLock } from "@/model/UnreleasedLock";
 import type { Pix } from "@/model/Pix";
 
+export interface Lock { // from DataTypes.sol
+  counter: bigint;
+  expirationBlock: bigint;
+  pixTarget: string;
+  amount: bigint;
+  token:  `0x${string}`;
+  buyerAddress: `0x${string}`;
+  seller: `0x${string}`;
+}
+
+export enum LockStatus {
+    Inexistent = 0, // Uninitialized Lock
+    Active = 1,     // Valid Lock
+    Expired = 2,    // Expired Lock
+    Released = 3    // Already released Lock
+}
+
+export interface GetLocksStatusResponse {
+    sortedIDs: number[];
+    status: LockStatus[];
+}
+
 const getNetworksLiquidity = async (): Promise<void> => {
   const user = useUser();
   user.setLoadingNetworkLiquidity(true);
@@ -38,7 +60,7 @@ const getPixKey = async (seller: string, token: string): Promise<string> => {
     abi,
     functionName: "getPixTarget",
     args: [seller, token],
-  });
+  }) as ByteArray;
 
   // Remove '0x' prefix and convert hex to UTF-8 string
   const hexString =
@@ -156,7 +178,7 @@ const getUnreleasedLockById = async (
     abi,
     functionName: "mapLocks",
     args: [BigInt(lockID)],
-  });
+  }) as Lock;
 
   const pixTarget = lock.pixTarget;
   const amount = formatEther(lock.amount);

src/blockchain/provider.ts

@@ -11,12 +11,10 @@ import {
 } from "viem";
 import { sepolia, rootstock } from "viem/chains";
 import { useUser } from "@/composables/useUser";
-
 let publicClient: PublicClient | null = null;
 let walletClient: WalletClient | null = null;
 
-const getPublicClient: PublicClient | null = (onlyRpcProvider = false) => {
+const getPublicClient = (): PublicClient => {
-  if (onlyRpcProvider) {
     const user = useUser();
     const rpcUrl = getProviderUrl();
     return createPublicClient({
@@ -24,21 +22,22 @@ const getPublicClient: PublicClient | null = (onlyRpcProvider = false) => {
         Number(user.networkName.value) === sepolia.id ? sepolia : rootstock,
       transport: http(rpcUrl),
     });
-  }
-  return publicClient;
 };
 
-const getWalletClient: WalletClient | null = () => {
+const getWalletClient = (): WalletClient | null => {
   return walletClient;
 };
 
 const getContract = async (onlyRpcProvider = false) => {
-  const client = getPublicClient(onlyRpcProvider);
+  const client = getPublicClient();
+  if (!client) {
+    throw new Error("Public client is not initialized");
+  }
   const address = getP2PixAddress();
   const abi = p2pix.abi;
   const wallet = getWalletClient();
 
-  const [account] = wallet ? await wallet.getAddresses() : [""];
+  const [account] = wallet ? await wallet.getAddresses() : [null];
 
   return { address, abi, client, wallet, account };
 };

src/blockchain/sellerMethods.ts

@@ -28,18 +28,19 @@ const approveTokens = async (participant: Participant): Promise<any> => {
     abi: mockToken.abi,
     functionName: "allowance",
     args: [account, getP2PixAddress()],
-  });
+  }) as bigint;
 
   if (allowance < parseEther(participant.offer.toString())) {
     // Approve tokens
-    const hash = await walletClient.writeContract({
+    const { result } = await publicClient.simulateContract({
       address: tokenAddress,
       abi: mockToken.abi,
       functionName: "approve",
       args: [getP2PixAddress(), parseEther(participant.offer.toString())],
-      account,
+      account
     });
 
+    const hash = await walletClient.writeContract(result);
     await publicClient.waitForTransactionReceipt({ hash });
     return true;
   }
@@ -48,6 +49,7 @@ const approveTokens = async (participant: Participant): Promise<any> => {
 
 const addDeposit = async (): Promise<any> => {
   const { address, abi, client } = await getContract();
+  const publicClient = getPublicClient();
   const walletClient = getWalletClient();
   const user = useUser();
 
@@ -60,7 +62,7 @@ const addDeposit = async (): Promise<any> => {
   const sellerId = await createParticipant(user.seller.value);
   user.setSellerId(sellerId.id);
 
-  const hash = await walletClient.writeContract({
+  const { result } = await publicClient.simulateContract({
     address,
     abi,
     functionName: "deposit",
@@ -74,6 +76,7 @@ const addDeposit = async (): Promise<any> => {
     account,
   });
 
+  const hash = await walletClient.writeContract(result);
   const receipt = await client.waitForTransactionReceipt({ hash });
   return receipt;
 };

src/blockchain/wallet.ts

@@ -6,7 +6,7 @@ import { getTokenAddress } from "./addresses";
 
 import p2pix from "@/utils/smart_contract_files/P2PIX.json";
 
-import { getValidDeposits } from "./events";
+import { getValidDeposits, Lock, LockStatus, GetLocksStatusResponse } from "./events";
 
 import type { ValidDeposit } from "@/model/ValidDeposit";
 import type { WalletTransaction } from "@/model/WalletTransaction";
@@ -52,15 +52,15 @@ export const listValidDepositTransactionsByWalletAddress = async (
   return [];
 };
 
-const getLockStatus = async (id: bigint): Promise<number> => {
+const getLockStatus = async (id: bigint): Promise<LockStatus> => {
   const { address, abi, client } = await getContract();
-  const result = await client.readContract({
+  const { sortedIDs , status } = await client.readContract({
     address,
     abi,
     functionName: "getLocksStatus",
     args: [[id]],
-  });
+  }) as GetLocksStatusResponse;
-  return result[1][0];
+  return status[0];
 };
 
 const filterLockStatus = async (
@@ -469,12 +469,12 @@ export const checkUnreleasedLock = async (
 
   const lockIds = addedLocks.map((lock: any) => lock.args.lockID);
 
-  const lockStatus = await client.readContract({
+  const { sortedIDs, status: lockStatus }  = await client.readContract({
     address,
     abi,
     functionName: "getLocksStatus",
     args: [lockIds],
-  });
+  }) as GetLocksStatusResponse;
 
   const unreleasedLockId = lockStatus[1].findIndex(
     (status: number) => status == 1
@@ -488,7 +488,7 @@ export const checkUnreleasedLock = async (
       abi,
       functionName: "mapLocks",
       args: [lockID],
-    });
+    }) as Lock;
 
     const pixTarget = lock.pixTarget;
     const amount = formatEther(lock.amount);
@@ -512,12 +512,12 @@ export const getActiveLockAmount = async (
 
   const lockIds = lockSeller.map((lock: any) => lock.args.lockID);
 
-  const lockStatus = await client.readContract({
+  const { sortedIDs, status: lockStatus } = await client.readContract({
     address,
     abi,
     functionName: "getLocksStatus",
     args: [lockIds],
-  });
+  }) as GetLocksStatusResponse;
 
   const mapLocksRequests = lockStatus[0].map((id: bigint) =>
     client.readContract({

src/components/ListingComponent/ListingComponent.vue

@@ -174,12 +174,12 @@ showInitialItems();
             Saldo disponível
           </p>
           <p class="text-xl leading-7 font-semibold text-gray-900">
-            {{ getRemaining() }} {{ etherStore.selectedToken }}
+            {{ getRemaining() }} {{ user.networkName.value }}
           </p>
           <div class="flex gap-2 w-32 sm:w-56" v-if="activeLockAmount != 0">
             <span class="text-xs font-normal text-gray-400" ref="infoText">{{
               `com ${activeLockAmount.toFixed(2)} ${
-                etherStore.selectedToken
+                user.networkName.value
               } em lock`
             }}</span>
             <div