tweaked getTokenByAddress

src/App.vue

@@ -5,8 +5,8 @@ import SpinnerComponent from "@/components/SpinnerComponent.vue";
 import ToasterComponent from "@/components/ToasterComponent.vue";
 import { init, useOnboard } from "@web3-onboard/vue";
 import injectedModule from "@web3-onboard/injected-wallets";
-import { Networks } from "./model/Networks";
+import { Networks } from "@/model/Networks";
-import { NetworkEnum } from "./model/NetworkEnum";
+import { NetworkEnum } from "@/model/NetworkEnum";
 import { ref } from "vue";
 
 const route = useRoute();
@@ -15,20 +15,12 @@ const targetNetwork = ref(NetworkEnum.sepolia);
 
 const web3Onboard = init({
   wallets: [injected],
-  chains: [
+  chains: Object.entries(Networks).map(([, network]) => ({
-    {
+    id: network.chainId,
-      id: Networks[NetworkEnum.sepolia].chainId,
+    token: network.token,
-      token: "ETH",
+    label: network.chainName,
-      label: "Sepolia",
+    rpcUrl: network.rpcUrl,
-      rpcUrl: import.meta.env.VITE_SEPOLIA_API_URL,
+  })),
-    },
-    {
-      id: Networks[NetworkEnum.rootstock].chainId,
-      token: "tRBTC",
-      label: "Rootstock Testnet",
-      rpcUrl: import.meta.env.VITE_ROOTSTOCK_API_URL,
-    },
-  ],
   connect: {
     autoConnectLastWallet: true,
   },

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",
@@ -14,12 +14,12 @@ const Tokens: { [key in NetworkEnum]: { [key in TokenEnum]: string } } = {
   },
 };
 
-export const getTokenByAddress = (address: string) => {
+export const getTokenByAddress = (address: `0x${string}`) => {
-  const user = useUser();
+  for ( let network in NetworkEnum ) {
-  const networksTokens = Tokens[user.networkName.value];
+    for (const token of Object.keys(Tokens[Number(network) as NetworkEnum])) {
-  for (const [token, tokenAddress] of Object.entries(networksTokens)) {
+      if (address === Tokens[Number(network) as NetworkEnum][token as TokenEnum]) {
-    if (tokenAddress.toLowerCase() === address.toLowerCase()) {
+        return token as TokenEnum;
-      return token;
+      }
     }
   }
   return null;
@@ -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

src/composables/useUser.ts

@@ -2,7 +2,7 @@ import { ref } from "vue";
 import { NetworkEnum, TokenEnum } from "../model/NetworkEnum";
 import type { ValidDeposit } from "@/model/ValidDeposit";
 import type { Participant } from "../utils/bbPay";
-import { NetworkById } from "@/model/Networks";
+import { Networks } from "@/model/Networks";
 
 const walletAddress = ref("");
 const balance = ref("");
@@ -32,7 +32,7 @@ export function useUser() {
   };
 
   const setNetworkId = (network: string | number) => {
-    networkName.value = NetworkById(network) || NetworkEnum.sepolia;
+    networkName.value = Number(network) as NetworkEnum || NetworkEnum.sepolia;
     networkId.value = Number(network);
   };
 

src/model/Networks.ts

@@ -1,37 +1,26 @@
-import { NetworkEnum } from "@/model/NetworkEnum";
+import { NetworkEnum } from "./NetworkEnum";
 
-export const NetworkById = (
+export interface NetworkConfig {
-  chainId: string | number
+  chainId: string;
-): NetworkEnum | undefined => {
+  chainName: string;
-  const normalizedChainId =
+  token: string;
-    typeof chainId === "number" ? chainId : Number(chainId);
+  rpcUrl?: string;
+  blockExplorerUrl?: string;
+}
 
-  for (const [network, details] of Object.entries(Networks)) {
+export const Networks: { [key in NetworkEnum]: NetworkConfig } = {
-    if (Number(details.chainId) === normalizedChainId) {
-      return network as unknown as NetworkEnum;
-    }
-  }
-
-  return undefined;
-};
-
-export const Networks = {
   [NetworkEnum.sepolia]: {
-    chainId: "0xAA36A7",
+    chainId: "0xaa36a7",
-    chainName: "Sepolia Testnet",
+    chainName: "Sepolia",
+    token: "ETH",
+    rpcUrl: import.meta.env.VITE_SEPOLIA_API_URL,
+    blockExplorerUrl: "https://sepolia.etherscan.io",
   },
   [NetworkEnum.rootstock]: {
-    chainId: "0x1F",
+    chainId: "0x1f",
     chainName: "Rootstock Testnet",
-    rpcUrls: ["https://public-node.testnet.rsk.co/"],
+    token: "tRBTC",
-    iconUrls: [
+    rpcUrl: import.meta.env.VITE_ROOTSTOCK_API_URL,
-      "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACQAAAAoCAYAAACWwljjAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAPOSURBVHgBxVhNUhpBFH6vGdxp4S4LoSYnEE8gnEA4AbpMJUQ4gXgCRJK1egLxBOIJJCdwJElVllMu49Cd1z04zD/dY1H5qihmut/M93VPv59uhHdAXFaPAaEDgA2/BaeA4hq/zG+gIBAKQoyr9yshid4Jdn+2oQAYFIC4rA2zxUhgS3yrDqEAjGdIDD/YYG09aRl7L7vYd10wgPkMlcoNfdvtFhjCXJBAeyO2S5gLQuFo25bEIxjCCt8oN2Z46I+Mu4A4SbjwojQBi1+BDl5LP+JNYlhtQRmPsjjQN1ILldwY7JTXOuD9bWL/jxO8dFy7oL9TyMcIu/PeSghxlLduQUA9jwPXiAk98HLw5jFiaFfAEjRLImPR0qi7z+2VmArZ7zzqcDAS01ljCKqf7QSjxb7jKkIhTohu6rOCq64RjsNiFEo7x7ocSNMvlddhPWb0CQ6gAAw4HKZpKGFDcWhzSEG6kbQCm4dLbi9m+XlpBTHea2D31zTSNtxrAGMNdcP5FPuxfhlKdCHgASUJxcd7zUcobkAPXvkzWGyf7uVCt2M2DtkMljaHSxu92WWLAz8OjWsD+juD/4tzcpqBSh3yQrmwoNFFMZNuDB7bJRsp/hzMMQqeT+NQ96KtNEBK+SG+23XgHgUyy8FPjpPozy3M4sZwh1/nLRMOK26Mn50Z5IHjA6XkBugJSn1XHkeBbK8dJsxsl0jMEOUpm0o9+gkX+7+TI0E+0x6Hsk0ijyNYQ/4OAqWn2aF+5cLxEoRq6idqtyEPtFhp/XyMNI2p9ADFUc/iYL5h7YzEXEEyptj04mvVHxkGP4F8MS4sWDsqRr4DbyGZRiIcqCKtpRMYeTMcpVVAFewqMVPSjUkMVQTBp6BPVKeiTqN65E0qP1AvIArWC98qcQsms39oDeBEtoXFKFgLbQ76ZKiXiRH2E01UF9Go+kGDh32/LWHZAD2OQ7mGdLO4ndrqWaHZyNyD6XJUWEq6yIQqReOweCe49ivD2DNUIutjJgXpHwyUtyPbY/IMWehfBA0IZxQSQoW9rKXL+ltq0oKqYC+RB6yLKys4xEw/Idde5R02cTGOcgh1LSNnid+nihIqcN0tr48MhL89L2uoG+Dqv5Px/IwqAhkqnEi296M1OyLPqVCgdKhcuKNjlUnQL4X78cRk1E1JlMkBME1sFE0gRrRJZGs3iT44bRZP5z0wQJHzIZMMbpztN1t+FDhsMBe0YNfatimHDetgLGiZGkYapqPwYt6YIAWPDYI9fSrETfjkwwSFT2EVrV/USY+r+/GGNp2I7zoW/gdR9aOdZ/lPGgAAAABJRU5ErkJggg==",
+    blockExplorerUrl: "https://explorer.testnet.rsk.co",
-    ],
-    nativeCurrency: {
-      name: "tRBTC",
-      symbol: "tRBTC",
-      decimals: 18,
-    },
-    blockExplorerUrls: ["https://explorer.testnet.rootstock.io/"],
   },
 };