fix build error

README.md

@@ -102,3 +102,17 @@ cd P2Pix-Front-End
 # Run docker-compose up command
 docker-compose up
 ```
+
+### Backend Communication
+
+Backend Repo: `https://gitea.kosmos.org/hueso/helpix`
+
+Backend Endpoint: `https://api.p2pix.co/release/1279331`
+
+curl -X POST \
+  -H "Content-Type: application/json" \
+  -H "Authorization: Bearer {api-key}" \
+  -d '{"query": "{ depositAddeds { id seller token amount } }"}' \
+https://api.studio.thegraph.com/query/113713/p-2-pix/sepolia
+
+https://api.studio.thegraph.com/query/113713/p-2-pix/1

package.json

@@ -10,7 +10,7 @@
     "coverage": "vitest run --coverage",
     "build-only": "vite build",
     "type-check": "vue-tsc --skipLibCheck --noEmit",
-    "lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --ignore-path .gitignore",
+    "lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --ignore-path .gitignore --fix",
     "lint:fix": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix --ignore-path .gitignore"
   },
   "dependencies": {
@@ -25,9 +25,8 @@
     "crc": "^3.8.0",
     "ethers": "^6.13.4",
     "marked": "^4.2.12",
-    "pinia": "^2.0.23",
     "qrcode": "^1.5.1",
-    "viem": "2.x",
+    "viem": "^2.31.3",
     "vite-svg-loader": "^5.1.0",
     "vue": "^3.2.41",
     "vue-markdown": "^2.2.4",
@@ -36,7 +35,6 @@
   "devDependencies": {
     "@babel/preset-env": "^7.20.2",
     "@babel/preset-typescript": "^7.18.6",
-    "@pinia/testing": "^0.0.14",
     "@rushstack/eslint-patch": "^1.1.4",
     "@types/crc": "^3.8.0",
     "@types/jest": "^27.0.0",

src/App.vue

@@ -2,13 +2,16 @@
 import { useRoute } from "vue-router";
 import TopBar from "@/components/TopBar/TopBar.vue";
 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 { NetworkEnum } from "./model/NetworkEnum";
+import { ref } from "vue";
 
 const route = useRoute();
 const injected = injectedModule();
+const targetNetwork = ref(NetworkEnum.sepolia);
 
 const web3Onboard = init({
   wallets: [injected],
@@ -58,5 +61,6 @@ if (!connectedWallet) {
         </Transition>
       </template>
     </RouterView>
+    <ToasterComponent :targetNetwork="targetNetwork" />
   </div>
 </template>

src/assets/main.css

@@ -28,3 +28,9 @@ a,
 .main-container {
   @apply flex w-full md:max-w-lg flex-col justify-center items-center px-4 sm:px-8 py-4 sm:py-6 gap-4 rounded-lg border border-gray-500 backdrop-blur-md drop-shadow-lg shadow-lg mt-10;
 }
+
+input[type="number"] {
+  appearance: textfield;
+  -webkit-appearance: textfield;
+  -moz-appearance: textfield;
+}

src/blockchain/__tests__/addresses.spec.ts

@@ -8,7 +8,7 @@ import {
 
 import { setActivePinia, createPinia } from "pinia";
 import { NetworkEnum, TokenEnum } from "@/model/NetworkEnum";
-import { useEtherStore } from "@/store/ether";
+import { useUser } from "@/composables/useUser";
 
 describe("addresses.ts types", () => {
   it("My addresses.ts types work properly", () => {
@@ -25,16 +25,16 @@ describe("addresses.ts functions", () => {
   });
 
   it("getTokenAddress Ethereum", () => {
-    const etherStore = useEtherStore();
+    const user = useUser();
-    etherStore.setNetworkId(NetworkEnum.sepolia);
+    user.setNetworkId(11155111);
     expect(getTokenAddress(TokenEnum.BRZ)).toBe(
       "0x4A2886EAEc931e04297ed336Cc55c4eb7C75BA00"
     );
   });
 
   it("getTokenAddress Rootstock", () => {
-    const etherStore = useEtherStore();
+    const user = useUser();
-    etherStore.setNetworkId(NetworkEnum.rootstock);
+    user.setNetworkId(30);
     expect(getTokenAddress(TokenEnum.BRZ)).toBe(
       "0xfE841c74250e57640390f46d914C88d22C51e82e"
     );
@@ -47,16 +47,16 @@ describe("addresses.ts functions", () => {
   });
 
   it("getP2PixAddress Ethereum", () => {
-    const etherStore = useEtherStore();
+    const user = useUser();
-    etherStore.setNetworkId(NetworkEnum.sepolia);
+    user.setNetworkId(11155111);
     expect(getP2PixAddress()).toBe(
       "0x2414817FF64A114d91eCFA16a834d3fCf69103d4"
     );
   });
 
   it("getP2PixAddress Rootstock", () => {
-    const etherStore = useEtherStore();
+    const user = useUser();
-    etherStore.setNetworkId(NetworkEnum.rootstock);
+    user.setNetworkId(30);
     expect(getP2PixAddress()).toBe(
       "0x98ba35eb14b38D6Aa709338283af3e922476dE34"
     );
@@ -69,14 +69,14 @@ describe("addresses.ts functions", () => {
   });
 
   it("getProviderUrl Ethereum", () => {
-    const etherStore = useEtherStore();
+    const user = useUser();
-    etherStore.setNetworkId(NetworkEnum.sepolia);
+    user.setNetworkId(11155111);
     expect(getProviderUrl()).toBe(import.meta.env.VITE_GOERLI_API_URL);
   });
 
   it("getProviderUrl Rootstock", () => {
-    const etherStore = useEtherStore();
+    const user = useUser();
-    etherStore.setNetworkId(NetworkEnum.rootstock);
+    user.setNetworkId(30);
     expect(getProviderUrl()).toBe(import.meta.env.VITE_ROOTSTOCK_API_URL);
   });
 
@@ -85,8 +85,8 @@ describe("addresses.ts functions", () => {
   });
 
   it("isPossibleNetwork Returns", () => {
-    const etherStore = useEtherStore();
+    const user = useUser();
-    etherStore.setNetworkId(NetworkEnum.sepolia);
+    user.setNetworkId(11155111);
     expect(isPossibleNetwork(0x5 as NetworkEnum)).toBe(true);
     expect(isPossibleNetwork(5 as NetworkEnum)).toBe(true);
     expect(isPossibleNetwork(0x13881 as NetworkEnum)).toBe(true);

src/blockchain/addresses.ts

@@ -1,6 +1,7 @@
-import { useEtherStore } from "@/store/ether";
+import { useUser } from "@/composables/useUser";
 import { NetworkEnum, TokenEnum } from "@/model/NetworkEnum";
-import { JsonRpcProvider } from "ethers";
+import { createPublicClient, http } from "viem";
+import { sepolia, rootstock } from "viem/chains";
 
 const Tokens: { [key in NetworkEnum]: { [key in TokenEnum]: string } } = {
   [NetworkEnum.sepolia]: {
@@ -14,57 +15,53 @@ const Tokens: { [key in NetworkEnum]: { [key in TokenEnum]: string } } = {
 };
 
 export const getTokenByAddress = (address: string) => {
-  for (const network of Object.values(NetworkEnum).filter(
+  const user = useUser();
-    (v) => !isNaN(Number(v))
+  const networksTokens = Tokens[user.networkName.value];
-  )) {
+  for (const [token, tokenAddress] of Object.entries(networksTokens)) {
-    for (const token of Object.keys(Tokens[network as NetworkEnum])) {
+    if (tokenAddress.toLowerCase() === address.toLowerCase()) {
-      if (address === Tokens[network as NetworkEnum][token as TokenEnum]) {
+      return token;
-        return token as TokenEnum;
-      }
     }
   }
-
   return null;
 };
 
-const getTokenAddress = (token: TokenEnum, network?: NetworkEnum): string => {
+export const getTokenAddress = (
-  const etherStore = useEtherStore();
+  token: TokenEnum,
-  return Tokens[network ? network : etherStore.networkName][token];
+  network?: NetworkEnum
+): string => {
+  const user = useUser();
+  return Tokens[network ? network : user.networkName.value][token];
 };
 
-const getP2PixAddress = (network?: NetworkEnum): string => {
+export const getP2PixAddress = (network?: NetworkEnum): string => {
-  const etherStore = useEtherStore();
+  const user = useUser();
   const possibleP2PixAddresses: { [key in NetworkEnum]: string } = {
     [NetworkEnum.sepolia]: "0xb7cD135F5eFD9760981e02E2a898790b688939fe",
     [NetworkEnum.rootstock]: "0x98ba35eb14b38D6Aa709338283af3e922476dE34",
   };
 
-  return possibleP2PixAddresses[network ? network : etherStore.networkName];
+  return possibleP2PixAddresses[network ? network : user.networkName.value];
 };
 
-const getProviderUrl = (network?: NetworkEnum): string => {
+export const getProviderUrl = (network?: NetworkEnum): string => {
-  const etherStore = useEtherStore();
+  const user = useUser();
   const possibleProvidersUrls: { [key in NetworkEnum]: string } = {
     [NetworkEnum.sepolia]: import.meta.env.VITE_SEPOLIA_API_URL,
     [NetworkEnum.rootstock]: import.meta.env.VITE_RSK_API_URL,
   };
 
-  return possibleProvidersUrls[network || etherStore.networkName];
+  return possibleProvidersUrls[network || user.networkName.value];
 };
 
-const getProviderByNetwork = (network: NetworkEnum): JsonRpcProvider => {
+export const getProviderByNetwork = (network: NetworkEnum) => {
   console.log("network", network);
-  return new JsonRpcProvider(getProviderUrl(network), network);
+  const chain = network === NetworkEnum.sepolia ? sepolia : rootstock;
+  return createPublicClient({
+    chain,
+    transport: http(getProviderUrl(network)),
+  });
 };
 
-const isPossibleNetwork = (networkChain: NetworkEnum): boolean => {
+export const isPossibleNetwork = (networkChain: NetworkEnum): boolean => {
   return Number(networkChain) in NetworkEnum;
 };
-
-export {
-  getTokenAddress,
-  getProviderUrl,
-  isPossibleNetwork,
-  getP2PixAddress,
-  getProviderByNetwork,
-};

src/blockchain/buyerMethods.ts

@@ -1,94 +1,60 @@
-import { getContract, getProvider } from "./provider";
+import { getContract } from "./provider";
-import { getP2PixAddress, getTokenAddress } from "./addresses";
+import { getTokenAddress } from "./addresses";
-import { encodeBytes32String, Signature, Contract, parseEther } from "ethers";
+import { parseEther } from "viem";
-
-import p2pix from "@/utils/smart_contract_files/P2PIX.json";
-
 import type { TokenEnum } from "@/model/NetworkEnum";
-import { createSolicitation } from "../utils/bbPay";
-import type { Offer } from "../utils/bbPay";
 
-const addLock = async (
+export const addLock = async (
-  sellerId: string,
+  sellerAddress: string,
-  token: string,
+  tokenAddress: string,
   amount: number
 ): Promise<string> => {
-  const p2pContract = await getContract();
+  const { address, abi, wallet, client } = await getContract();
+  const parsedAmount = parseEther(amount.toString());
 
-  const lock = await p2pContract.lock(
+  const { request } = await client.simulateContract({
-    sellerId,
+    address,
-    token,
+    abi,
-    parseEther(String(amount)), // BigNumber
+    functionName: "lock",
-    [],
+    args: [sellerAddress, tokenAddress, parsedAmount, [], []],
-    []
+  });
-  );
+  console.log(wallet);
+  const hash = await wallet.writeContract(request);
+  const receipt = await client.waitForTransactionReceipt({ hash });
 
-  const lock_rec = await lock.wait();
+  return receipt.status ? receipt.logs[0].topics[2] : "";
-  const [t] = lock_rec.events;
-
-  const offer: Offer = {
-    amount,
-    lockId: String(t.args.lockID),
-    sellerId: sellerId,
-  };
-  const solicitation = await createSolicitation(offer);
-
-  return;
 };
 
-const releaseLock = async (solicitation: any): Promise<any> => {
+export const withdrawDeposit = async (
-  // const mockBacenSigner = new Wallet(
-  //   "0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80"
-  // );
-
-  // const messageToSign = solidityPackedKeccak256(
-  //   ["bytes32", "uint256", "bytes32"],
-  //   [sellerId, parseEther(String(amount)), encodeBytes32String(signature)]
-  // );
-
-  // const messageHashBytes = getBytes(messageToSign);
-  // const flatSig = await mockBacenSigner.signMessage(messageHashBytes);
-
-  const provider = getProvider();
-
-  const sig = Signature.from(flatSig);
-  console.log(sig);
-  const signer = await provider.getSigner();
-  const p2pContract = new Contract(getP2PixAddress(), p2pix.abi, signer);
-
-  const release = await p2pContract.release(
-    BigInt(lockId),
-    encodeBytes32String(e2eId),
-    flatSig
-  );
-  await release.wait();
-
-  return release;
-};
-
-const cancelDeposit = async (depositId: bigint): Promise<any> => {
-  const contract = await getContract();
-
-  const cancel = await contract.cancelDeposit(depositId);
-  await cancel.wait();
-
-  return cancel;
-};
-
-const withdrawDeposit = async (
   amount: string,
   token: TokenEnum
-): Promise<any> => {
+): Promise<boolean> => {
-  const contract = await getContract();
+  const { address, abi, wallet, client } = await getContract();
 
-  const withdraw = await contract.withdraw(
+  const tokenAddress = getTokenAddress(token);
-    getTokenAddress(token),
-    parseEther(String(amount)),
-    []
-  );
-  await withdraw.wait();
 
-  return withdraw;
+  const { request } = await client.simulateContract({
+    address,
+    abi,
+    functionName: "withdraw",
+    args: [tokenAddress, parseEther(amount), []],
+  });
+
+  const hash = await wallet.writeContract(request);
+  const receipt = await client.waitForTransactionReceipt({ hash });
+
+  return receipt.status;
 };
 
-export { cancelDeposit, withdrawDeposit, addLock, releaseLock };
+export const releaseLock = async (solicitation: any): Promise<any> => {
+  const { address, abi, wallet, client } = await getContract();
+
+  const { request } = await client.simulateContract({
+    address,
+    abi,
+    functionName: "release",
+    args: [solicitation.lockId, solicitation.e2eId],
+  });
+
+  const hash = await wallet.writeContract(request);
+  return client.waitForTransactionReceipt({ hash });
+};

src/blockchain/events.ts

@@ -1,53 +1,52 @@
-import { useEtherStore } from "@/store/ether";
+import { useUser } from "@/composables/useUser";
-import { Contract, formatEther, Interface } from "ethers";
+import { formatEther, toHex, type PublicClient } from "viem";
 
 import p2pix from "@/utils/smart_contract_files/P2PIX.json";
 import { getContract } from "./provider";
 import type { ValidDeposit } from "@/model/ValidDeposit";
-import {
+import { getP2PixAddress, getTokenAddress } from "./addresses";
-  getP2PixAddress,
+import { getNetworkSubgraphURL, NetworkEnum } from "@/model/NetworkEnum";
-  getProviderByNetwork,
-  getTokenAddress,
-} from "./addresses";
-import { NetworkEnum } from "@/model/NetworkEnum";
 import type { UnreleasedLock } from "@/model/UnreleasedLock";
 import type { Pix } from "@/model/Pix";
 
 const getNetworksLiquidity = async (): Promise<void> => {
-  const etherStore = useEtherStore();
+  const user = useUser();
-  etherStore.setLoadingNetworkLiquidity(true);
+  user.setLoadingNetworkLiquidity(true);
 
   const depositLists: ValidDeposit[][] = [];
 
   for (const network of Object.values(NetworkEnum).filter(
     (v) => !isNaN(Number(v))
   )) {
-    console.log("getNetworksLiquidity", network);
+    const deposits = await getValidDeposits(
-    const p2pContract = new Contract(
+      getTokenAddress(user.selectedToken.value),
-      getP2PixAddress(network as NetworkEnum),
+      Number(network)
-      p2pix.abi,
-      getProviderByNetwork(network as NetworkEnum)
-    );
-
-    depositLists.push(
-      await getValidDeposits(
-        getTokenAddress(etherStore.selectedToken, network as NetworkEnum),
-        network as NetworkEnum,
-        p2pContract
-      )
     );
+    if (deposits) depositLists.push(deposits);
   }
 
-  etherStore.setDepositsValidList(depositLists.flat());
+  const allDeposits = depositLists.flat();
-  etherStore.setLoadingNetworkLiquidity(false);
+  user.setDepositsValidList(allDeposits);
+  user.setLoadingNetworkLiquidity(false);
 };
 
 const getPixKey = async (seller: string, token: string): Promise<string> => {
-  const p2pContract = await getContract();
+  const { address, abi, client } = await getContract();
-  const pixKeyHex = await p2pContract.getPixTarget(seller, token);
+
+  const pixKeyHex = await client.readContract({
+    address,
+    abi,
+    functionName: "getPixTarget",
+    args: [seller, token],
+  });
+
   // Remove '0x' prefix and convert hex to UTF-8 string
+  const hexString =
+    typeof pixKeyHex === "string" ? pixKeyHex : toHex(pixKeyHex);
+  if (!hexString) throw new Error("PixKey not found");
   const bytes = new Uint8Array(
-    pixKeyHex
+    // @ts-ignore
+    hexString
       .slice(2)
       .match(/.{1,2}/g)
       .map((byte: string) => parseInt(byte, 16))
@@ -59,67 +58,108 @@ const getPixKey = async (seller: string, token: string): Promise<string> => {
 const getValidDeposits = async (
   token: string,
   network: NetworkEnum,
-  contract?: Contract
+  contractInfo?: { client: any; address: string }
 ): Promise<ValidDeposit[]> => {
-  let p2pContract: Contract;
+  let client: PublicClient, address, abi;
 
-  if (contract) {
+  if (contractInfo) {
-    p2pContract = contract;
+    ({ client, address } = contractInfo);
+    abi = p2pix.abi;
   } else {
-    p2pContract = await getContract(true);
+    ({ address, abi, client } = await getContract(true));
   }
 
-  const filterDeposits = p2pContract.filters.DepositAdded(null);
+  // TODO: Remove this once we have a subgraph for rootstock
-  const eventsDeposits = await p2pContract.queryFilter(
+  if (network === NetworkEnum.rootstock) return [];
-    filterDeposits
+
-    // 0,
+  const body = {
-    // "latest"
+    query: `
+      {
+        depositAddeds(where: { token: "${token}" }) {
+          seller
+          amount
+          blockTimestamp
+          blockNumber
+        }
+      }
+  `,
+  };
+
+  const depositLogs = await fetch(getNetworkSubgraphURL(network), {
+    method: "POST",
+    headers: {
+      "Content-Type": "application/json",
+    },
+    body: JSON.stringify(body),
+  });
+
+  // remove doubles from sellers list
+  const depositData = await depositLogs.json();
+  const depositAddeds = depositData.data.depositAddeds;
+  const uniqueSellers = depositAddeds.reduce(
+    (acc: Record<string, boolean>, deposit: any) => {
+      acc[deposit.seller] = true;
+      return acc;
+    },
+    {} as Record<string, boolean>
   );
-  if (!contract) p2pContract = await getContract(); // get metamask provider contract
+
+  if (!contractInfo) {
+    // Get metamask provider contract
+    ({ abi, client } = await getContract(true));
+  }
+
   const depositList: { [key: string]: ValidDeposit } = {};
 
-  for (const deposit of eventsDeposits) {
+  const sellersList = Object.keys(uniqueSellers);
-    const IPix2Pix = new Interface(p2pix.abi);
+  // Use multicall to batch all getBalance requests
-    const decoded = IPix2Pix.parseLog({
+  const balanceCalls = sellersList.map((seller) => ({
-      topics: deposit.topics,
+    address: getP2PixAddress(network),
-      data: deposit.data,
+    abi,
-    });
+    functionName: "getBalance",
-    // Get liquidity only for the selected token
+    args: [seller, token],
-    if (decoded?.args.token != token) continue;
+  }));
-    const mappedBalance = await p2pContract.getBalance(
-      decoded.args.seller,
-      token
-    );
-    let validDeposit: ValidDeposit | null = null;
 
-    if (mappedBalance) {
+  const balanceResults = await client.multicall({
-      validDeposit = {
+    contracts: balanceCalls as any,
+  });
+
+  // Process results into the depositList
+  sellersList.forEach((seller, index) => {
+    const mappedBalance = balanceResults[index];
+
+    if (!mappedBalance.error && mappedBalance.result) {
+      const validDeposit: ValidDeposit = {
         token: token,
-        blockNumber: deposit.blockNumber,
+        blockNumber: 0,
-        remaining: Number(formatEther(mappedBalance)),
+        remaining: Number(formatEther(mappedBalance.result as bigint)),
-        seller: decoded.args.seller,
+        seller: seller,
         network,
         pixKey: "",
       };
+      depositList[seller + token] = validDeposit;
     }
-    if (validDeposit) depositList[decoded.args.seller + token] = validDeposit;
+  });
-  }
-
   return Object.values(depositList);
 };
 
 const getUnreleasedLockById = async (
   lockID: string
 ): Promise<UnreleasedLock> => {
-  const p2pContract = await getContract();
+  const { address, abi, client } = await getContract();
   const pixData: Pix = {
     pixKey: "",
   };
 
-  const lock = await p2pContract.mapLocks(lockID);
+  const lock = await client.readContract({
+    address,
+    abi,
+    functionName: "mapLocks",
+    args: [BigInt(lockID)],
+  });
 
   const pixTarget = lock.pixTarget;
-  const amount = formatEther(lock?.amount);
+  const amount = formatEther(lock.amount);
   pixData.pixKey = pixTarget;
   pixData.value = Number(amount);
 

src/blockchain/provider.ts

@@ -1,27 +1,68 @@
 import p2pix from "@/utils/smart_contract_files/P2PIX.json";
 import { updateWalletStatus } from "./wallet";
 import { getProviderUrl, getP2PixAddress } from "./addresses";
-import { BrowserProvider, JsonRpcProvider, Contract } from "ethers";
+import {
+  createPublicClient,
+  createWalletClient,
+  custom,
+  http,
+  PublicClient,
+  WalletClient,
+} from "viem";
+import { sepolia, rootstock } from "viem/chains";
+import { useUser } from "@/composables/useUser";
 
-let provider: BrowserProvider | JsonRpcProvider | null = null;
+let publicClient: PublicClient | null = null;
+let walletClient: WalletClient | null = null;
 
-const getProvider = (onlyAlchemyProvider: boolean = false) => {
+const getPublicClient: PublicClient | null = (onlyRpcProvider = false) => {
-  if (onlyAlchemyProvider) return new JsonRpcProvider(getProviderUrl()); // alchemy provider
+  if (onlyRpcProvider) {
-  return provider;
+    const user = useUser();
+    const rpcUrl = getProviderUrl();
+    return createPublicClient({
+      chain:
+        Number(user.networkName.value) === sepolia.id ? sepolia : rootstock,
+      transport: http(rpcUrl),
+    });
+  }
+  return publicClient;
 };
 
-const getContract = async (onlyAlchemyProvider: boolean = false) => {
+const getWalletClient: WalletClient | null = () => {
-  const p = getProvider(onlyAlchemyProvider);
+  return walletClient;
-  try {
+};
-    const signer = await p?.getSigner();
+
-    return new Contract(getP2PixAddress(), p2pix.abi, signer);
+const getContract = async (onlyRpcProvider = false) => {
-  } catch (err) {
+  const client = getPublicClient(onlyRpcProvider);
-    return new Contract(getP2PixAddress(), p2pix.abi, p);
+  const address = getP2PixAddress();
-  }
+  const abi = p2pix.abi;
+  const wallet = getWalletClient();
+
+  const [account] = wallet ? await wallet.getAddresses() : [""];
+
+  return { address, abi, client, wallet, account };
 };
 
 const connectProvider = async (p: any): Promise<void> => {
-  provider = new BrowserProvider(p, "any");
+  console.log("Connecting to wallet provider...");
+  const user = useUser();
+  const chain =
+    Number(user.networkName.value) === sepolia.id ? sepolia : rootstock;
+
+  publicClient = createPublicClient({
+    chain,
+    transport: custom(p),
+  });
+
+  const [account] = await p!.request({ method: "eth_requestAccounts" });
+
+  walletClient = createWalletClient({
+    account,
+    chain,
+    transport: custom(p),
+  });
+
   await updateWalletStatus();
 };
-export { getProvider, getContract, connectProvider };
+
+export { getPublicClient, getWalletClient, getContract, connectProvider };

src/blockchain/sellerMethods.ts

@@ -1,60 +1,81 @@
-import { getContract, getProvider } from "./provider";
+import { getContract, getPublicClient, getWalletClient } from "./provider";
 import { getTokenAddress, getP2PixAddress } from "./addresses";
-
+import { parseEther, toHex } from "viem";
-import { encodeBytes32String, Contract, parseEther } from "ethers";
 
 import mockToken from "../utils/smart_contract_files/MockToken.json";
-import { useEtherStore } from "@/store/ether";
+import { useUser } from "@/composables/useUser";
 import { createParticipant } from "@/utils/bbPay";
 import type { Participant } from "@/utils/bbPay";
 
 const approveTokens = async (participant: Participant): Promise<any> => {
-  const provider = getProvider();
+  const user = useUser();
-  const signer = await provider?.getSigner();
+  const publicClient = getPublicClient();
-  const etherStore = useEtherStore();
+  const walletClient = getWalletClient();
 
-  etherStore.setSeller(participant);
+  if (!publicClient || !walletClient) {
-  const tokenContract = new Contract(
+    throw new Error("Clients not initialized");
-    getTokenAddress(etherStore.selectedToken),
+  }
-    mockToken.abi,
+
-    signer
+  user.setSeller(participant);
-  );
+  const [account] = await walletClient.getAddresses();
+
+  // Get token address
+  const tokenAddress = getTokenAddress(user.selectedToken.value);
 
   // Check if the token is already approved
-  const approved = await tokenContract.allowance(
+  const allowance = await publicClient.readContract({
-    await signer?.getAddress(),
+    address: tokenAddress,
-    getP2PixAddress()
+    abi: mockToken.abi,
-  );
+    functionName: "allowance",
-  if (approved < parseEther(participant.offer)) {
+    args: [account, getP2PixAddress()],
+  });
+
+  if (allowance < parseEther(participant.offer.toString())) {
     // Approve tokens
-    const apprv = await tokenContract.approve(
+    const hash = await walletClient.writeContract({
-      getP2PixAddress(),
+      address: tokenAddress,
-      parseEther(participant.offer)
+      abi: mockToken.abi,
-    );
+      functionName: "approve",
-    await apprv.wait();
+      args: [getP2PixAddress(), parseEther(participant.offer.toString())],
+      account,
+    });
+
+    await publicClient.waitForTransactionReceipt({ hash });
     return true;
   }
   return true;
 };
 
 const addDeposit = async (): Promise<any> => {
-  const p2pContract = await getContract();
+  const { address, abi, client } = await getContract();
-  const etherStore = useEtherStore();
+  const walletClient = getWalletClient();
+  const user = useUser();
 
-  const sellerId = await createParticipant(etherStore.seller);
+  if (!walletClient) {
-  etherStore.setSellerId(sellerId.id);
+    throw new Error("Wallet client not initialized");
+  }
 
-  const deposit = await p2pContract.deposit(
+  const [account] = await walletClient.getAddresses();
-    sellerId,
-    encodeBytes32String(""),
-    getTokenAddress(etherStore.selectedToken),
-    parseEther(etherStore.seller.offer),
-    true
-  );
 
-  await deposit.wait();
+  const sellerId = await createParticipant(user.seller.value);
+  user.setSellerId(sellerId.id);
 
-  return deposit;
+  const hash = await walletClient.writeContract({
+    address,
+    abi,
+    functionName: "deposit",
+    args: [
+      user.networkId + "-" + sellerId.id,
+      toHex("", { size: 32 }),
+      getTokenAddress(user.selectedToken.value),
+      parseEther(user.seller.value.offer.toString()),
+      true,
+    ],
+    account,
+  });
+
+  const receipt = await client.waitForTransactionReceipt({ hash });
+  return receipt;
 };
 
 export { approveTokens, addDeposit };

src/blockchain/wallet.ts

@@ -1,17 +1,9 @@
-import {
+import { decodeEventLog, formatEther, type Log } from "viem";
-  Contract,
+import { useUser } from "@/composables/useUser";
-  formatEther,
-  getAddress,
-  Interface,
-  Log,
-  LogDescription,
-} from "ethers";
-import { useEtherStore } from "@/store/ether";
 
-import { getContract, getProvider } from "./provider";
+import { getPublicClient, getWalletClient, getContract } from "./provider";
-import { getTokenAddress, isPossibleNetwork } from "./addresses";
+import { getTokenAddress } from "./addresses";
 
-import mockToken from "@/utils/smart_contract_files/MockToken.json";
 import p2pix from "@/utils/smart_contract_files/P2PIX.json";
 
 import { getValidDeposits } from "./events";
@@ -20,45 +12,39 @@ import type { ValidDeposit } from "@/model/ValidDeposit";
 import type { WalletTransaction } from "@/model/WalletTransaction";
 import type { UnreleasedLock } from "@/model/UnreleasedLock";
 import type { Pix } from "@/model/Pix";
+import { getNetworkSubgraphURL } from "@/model/NetworkEnum";
 
 export const updateWalletStatus = async (): Promise<void> => {
-  const etherStore = useEtherStore();
+  const user = useUser();
 
-  const provider = await getProvider();
+  const publicClient = getPublicClient();
-  const signer = await provider?.getSigner();
+  const walletClient = getWalletClient();
-  const network = await provider?.getNetwork();
+
-  const chainId = network?.chainId;
+  if (!publicClient || !walletClient) {
-  if (!isPossibleNetwork(Number(chainId))) {
+    console.error("Client not initialized");
-    window.alert("Invalid chain!:" + chainId);
     return;
   }
-  etherStore.setNetworkId(Number(chainId));
 
-  const mockTokenContract = new Contract(
+  // Get balance
-    getTokenAddress(etherStore.selectedToken),
+  const [account] = await walletClient.getAddresses();
-    mockToken.abi,
+  const balance = await publicClient.getBalance({ address: account });
-    signer
-  );
 
-  const walletAddress = await provider?.send("eth_requestAccounts", []);
+  user.setWalletAddress(account);
-  const balance = await mockTokenContract.balanceOf(walletAddress[0]);
+  user.setBalance(formatEther(balance));
-
-  etherStore.setBalance(formatEther(balance));
-  etherStore.setWalletAddress(getAddress(walletAddress[0]));
 };
 
 export const listValidDepositTransactionsByWalletAddress = async (
   walletAddress: string
 ): Promise<ValidDeposit[]> => {
-  const etherStore = useEtherStore();
+  const user = useUser();
   const walletDeposits = await getValidDeposits(
-    getTokenAddress(etherStore.selectedToken),
+    getTokenAddress(user.selectedToken.value),
-    etherStore.networkName
+    user.networkName.value
   );
   if (walletDeposits) {
     return walletDeposits
       .filter((deposit) => deposit.seller == walletAddress)
-      .sort((a, b) => {
+      .sort((a: ValidDeposit, b: ValidDeposit) => {
         return b.blockNumber - a.blockNumber;
       });
   }
@@ -66,10 +52,15 @@ export const listValidDepositTransactionsByWalletAddress = async (
   return [];
 };
 
-const getLockStatus = async (id: [BigInt]): Promise<number> => {
+const getLockStatus = async (id: bigint): Promise<number> => {
-  const p2pContract = await getContract();
+  const { address, abi, client } = await getContract();
-  const res = await p2pContract.getLocksStatus([id]);
+  const result = await client.readContract({
-  return res[1][0];
+    address,
+    abi,
+    functionName: "getLocksStatus",
+    args: [[id]],
+  });
+  return result[1][0];
 };
 
 const filterLockStatus = async (
@@ -78,31 +69,38 @@ const filterLockStatus = async (
   const txs: WalletTransaction[] = [];
 
   for (const transaction of transactions) {
-    const IPix2Pix = new Interface(p2pix.abi);
+    try {
-    const decoded = IPix2Pix.parseLog({
+      const decoded = decodeEventLog({
-      topics: transaction.topics,
+        abi: p2pix.abi,
-      data: transaction.data,
+        data: transaction.data,
-    });
+        topics: transaction.topics,
-    if (!decoded) continue;
+      });
-    const tx: WalletTransaction = {
+
-      token: decoded.args.token ? decoded.args.token : "",
+      if (!decoded || !decoded.args) continue;
-      blockNumber: transaction.blockNumber,
+
-      amount: decoded.args.amount
+      // Type assertion to handle the args safely
-        ? Number(formatEther(decoded.args.amount))
+      const args = decoded.args as Record<string, any>;
-        : -1,
+
-      seller: decoded.args.seller ? decoded.args.seller : "",
+      const tx: WalletTransaction = {
-      buyer: decoded.args.buyer ? decoded.args.buyer : "",
+        token: args.token ? String(args.token) : "",
-      event: decoded.name,
+        blockNumber: Number(transaction.blockNumber),
-      lockStatus:
+        amount: args.amount ? Number(formatEther(args.amount)) : -1,
-        decoded.name == "LockAdded"
+        seller: args.seller ? String(args.seller) : "",
-          ? await getLockStatus(decoded.args.lockID)
+        buyer: args.buyer ? String(args.buyer) : "",
-          : -1,
+        event: decoded.eventName || "",
-      transactionHash: transaction.transactionHash
+        lockStatus:
-        ? transaction.transactionHash
+          decoded.eventName == "LockAdded" && args.lockID
-        : "",
+            ? await getLockStatus(args.lockID)
-      transactionID: decoded.args.lockID ? decoded.args.lockID.toString() : "",
+            : -1,
-    };
+        transactionHash: transaction.transactionHash
-    txs.push(tx);
+          ? transaction.transactionHash
+          : "",
+        transactionID: args.lockID ? args.lockID.toString() : "",
+      };
+      txs.push(tx);
+    } catch (error) {
+      console.error("Error decoding log", error);
+    }
   }
   return txs;
 };
@@ -110,162 +108,395 @@ const filterLockStatus = async (
 export const listAllTransactionByWalletAddress = async (
   walletAddress: string
 ): Promise<WalletTransaction[]> => {
-  const p2pContract = await getContract(true);
+  const user = useUser();
 
-  // Get deposits
+  // Get the current network for the subgraph URL
-  const filterDeposits = p2pContract.filters.DepositAdded([walletAddress]);
+  const network = user.networkName.value;
-  const eventsDeposits = await p2pContract.queryFilter(
-    filterDeposits,
-    0,
-    "latest"
-  );
-  console.log("Fetched all wallet deposits");
 
-  // Get locks
+  // Query subgraph for all relevant transactions
-  const filterAddedLocks = p2pContract.filters.LockAdded([walletAddress]);
+  const subgraphQuery = {
-  const eventsAddedLocks = await p2pContract.queryFilter(
+    query: `
-    filterAddedLocks,
+      {
-    0,
+        depositAddeds(where: {seller: "${walletAddress.toLowerCase()}"}) {
-    "latest"
+          seller
-  );
+          token
-  console.log("Fetched all wallet locks");
+          amount
+          blockTimestamp
+          blockNumber
+          transactionHash
+        }
+        lockAddeds(where: {buyer: "${walletAddress.toLowerCase()}"}) {
+          buyer
+          lockID
+          seller
+          token
+          amount
+          blockTimestamp
+          blockNumber
+          transactionHash
+        }
+        lockReleaseds(where: {buyer: "${walletAddress.toLowerCase()}"}) {
+          buyer
+          lockId
+          e2eId
+          blockTimestamp
+          blockNumber
+          transactionHash
+        }
+        depositWithdrawns(where: {seller: "${walletAddress.toLowerCase()}"}) {
+          seller
+          token
+          amount
+          blockTimestamp
+          blockNumber
+          transactionHash
+        }
+      }
+    `,
+  };
 
-  // Get released locks
+  console.log("Fetching transactions from subgraph");
-  const filterReleasedLocks = p2pContract.filters.LockReleased([walletAddress]);
+  const response = await fetch(getNetworkSubgraphURL(network), {
-  const eventsReleasedLocks = await p2pContract.queryFilter(
+    method: "POST",
-    filterReleasedLocks,
+    headers: {
-    0,
+      "Content-Type": "application/json",
-    "latest"
+    },
-  );
+    body: JSON.stringify(subgraphQuery),
-  console.log("Fetched all wallet released locks");
+  });
 
-  // Get withdrawn deposits
+  const data = await response.json();
-  const filterWithdrawnDeposits = p2pContract.filters.DepositWithdrawn([
+  console.log("Subgraph data fetched:", data);
-    walletAddress,
-  ]);
-  const eventsWithdrawnDeposits = await p2pContract.queryFilter(
-    filterWithdrawnDeposits
-  );
-  console.log("Fetched all wallet withdrawn deposits");
 
-  const lockStatusFiltered = await filterLockStatus(
+  // Convert all transactions to common WalletTransaction format
-    [
+  const transactions: WalletTransaction[] = [];
-      ...eventsDeposits,
-      ...eventsAddedLocks,
-      ...eventsReleasedLocks,
-      ...eventsWithdrawnDeposits,
-    ].sort((a, b) => {
-      return b.blockNumber - a.blockNumber;
-    })
-  );
 
-  return lockStatusFiltered;
+  // Process deposit added events
+  if (data.data?.depositAddeds) {
+    console.log("Processing deposit events");
+    for (const deposit of data.data.depositAddeds) {
+      transactions.push({
+        token: deposit.token,
+        blockNumber: parseInt(deposit.blockNumber),
+        amount: parseFloat(formatEther(BigInt(deposit.amount))),
+        seller: deposit.seller,
+        buyer: "",
+        event: "DepositAdded",
+        lockStatus: -1,
+        transactionHash: deposit.transactionHash,
+      });
+    }
+  }
+
+  // Process lock added events
+  if (data.data?.lockAddeds) {
+    console.log("Processing lock events");
+    for (const lock of data.data.lockAddeds) {
+      // Get lock status from the contract
+      const lockStatus = await getLockStatus(BigInt(lock.lockID));
+
+      transactions.push({
+        token: lock.token,
+        blockNumber: parseInt(lock.blockNumber),
+        amount: parseFloat(formatEther(BigInt(lock.amount))),
+        seller: lock.seller,
+        buyer: lock.buyer,
+        event: "LockAdded",
+        lockStatus: lockStatus,
+        transactionHash: lock.transactionHash,
+        transactionID: lock.lockID.toString(),
+      });
+    }
+  }
+
+  // Process lock released events
+  if (data.data?.lockReleaseds) {
+    console.log("Processing release events");
+    for (const release of data.data.lockReleaseds) {
+      transactions.push({
+        token: "", // Subgraph doesn't provide token in this event, we could enhance this later
+        blockNumber: parseInt(release.blockNumber),
+        amount: -1, // Amount not available in this event
+        seller: "",
+        buyer: release.buyer,
+        event: "LockReleased",
+        lockStatus: -1,
+        transactionHash: release.transactionHash,
+        transactionID: release.lockId.toString(),
+      });
+    }
+  }
+
+  // Process deposit withdrawn events
+  if (data.data?.depositWithdrawns) {
+    console.log("Processing withdrawal events");
+    for (const withdrawal of data.data.depositWithdrawns) {
+      transactions.push({
+        token: withdrawal.token,
+        blockNumber: parseInt(withdrawal.blockNumber),
+        amount: parseFloat(formatEther(BigInt(withdrawal.amount))),
+        seller: withdrawal.seller,
+        buyer: "",
+        event: "DepositWithdrawn",
+        lockStatus: -1,
+        transactionHash: withdrawal.transactionHash,
+      });
+    }
+  }
+
+  // Sort transactions by block number (newest first)
+  return transactions.sort((a, b) => b.blockNumber - a.blockNumber);
 };
 
 // get wallet's release transactions
 export const listReleaseTransactionByWalletAddress = async (
   walletAddress: string
-): Promise<LogDescription[]> => {
+) => {
-  const p2pContract = await getContract(true);
+  const user = useUser();
+  const network = user.networkName.value;
 
-  const filterReleasedLocks = p2pContract.filters.LockReleased([walletAddress]);
+  // Query subgraph for release transactions
-  const eventsReleasedLocks = await p2pContract.queryFilter(
+  const subgraphQuery = {
-    filterReleasedLocks,
+    query: `
-    0,
+      {
-    "latest"
+        lockReleaseds(where: {buyer: "${walletAddress.toLowerCase()}"}) {
-  );
+          buyer
+          lockId
+          e2eId
+          blockTimestamp
+          blockNumber
+          transactionHash
+        }
+      }
+    `,
+  };
 
-  return eventsReleasedLocks
+  // Fetch data from subgraph
-    .sort((a, b) => {
+  const response = await fetch(getNetworkSubgraphURL(network), {
-      return b.blockNumber - a.blockNumber;
+    method: "POST",
+    headers: {
+      "Content-Type": "application/json",
+    },
+    body: JSON.stringify(subgraphQuery),
+  });
+
+  const data = await response.json();
+
+  // Process the subgraph response into the same format as the previous implementation
+  if (!data.data?.lockReleaseds) {
+    return [];
+  }
+
+  // Transform the subgraph data to match the event log decode format
+  return data.data.lockReleaseds
+    .sort((a: any, b: any) => {
+      return parseInt(b.blockNumber) - parseInt(a.blockNumber);
     })
-    .map((lock) => {
+    .map((release: any) => {
-      const IPix2Pix = new Interface(p2pix.abi);
+      try {
-      const decoded = IPix2Pix.parseLog({
+        // Create a structure similar to the decoded event log
-        topics: lock.topics,
+        return {
-        data: lock.data,
+          eventName: "LockReleased",
-      });
+          args: {
-      return decoded;
+            buyer: release.buyer,
+            lockID: BigInt(release.lockId),
+            e2eId: release.e2eId,
+          },
+          // Add any other necessary fields to match the original return format
+          blockNumber: BigInt(release.blockNumber),
+          transactionHash: release.transactionHash,
+        };
+      } catch (error) {
+        console.error("Error processing subgraph data", error);
+        return null;
+      }
     })
-    .filter((lock) => lock !== null);
+    .filter((decoded: any) => decoded !== null);
 };
 
-const listLockTransactionByWalletAddress = async (
+const listLockTransactionByWalletAddress = async (walletAddress: string) => {
-  walletAddress: string
+  const user = useUser();
-): Promise<LogDescription[]> => {
+  const network = user.networkName.value;
-  const p2pContract = await getContract(true);
 
-  const filterAddedLocks = p2pContract.filters.LockAdded([walletAddress]);
+  // Query subgraph for lock added transactions
-  const eventsReleasedLocks = await p2pContract.queryFilter(filterAddedLocks);
+  const subgraphQuery = {
+    query: `
+      {
+        lockAddeds(where: {buyer: "${walletAddress.toLowerCase()}"}) {
+          buyer
+          lockID
+          seller
+          token
+          amount
+          blockTimestamp
+          blockNumber
+          transactionHash
+        }
+      }
+    `,
+  };
 
-  return eventsReleasedLocks
+  try {
-    .sort((a, b) => {
+    // Fetch data from subgraph
-      return b.blockNumber - a.blockNumber;
+    const response = await fetch(getNetworkSubgraphURL(network), {
-    })
+      method: "POST",
-    .map((lock) => {
+      headers: {
-      const IPix2Pix = new Interface(p2pix.abi);
+        "Content-Type": "application/json",
-      const decoded = IPix2Pix.parseLog({
+      },
-        topics: lock.topics,
+      body: JSON.stringify(subgraphQuery),
-        data: lock.data,
+    });
-      });
+
-      return decoded;
+    const data = await response.json();
-    })
+
-    .filter((lock) => lock !== null);
+    if (!data.data?.lockAddeds) {
+      return [];
+    }
+
+    // Transform the subgraph data to match the event log decode format
+    return data.data.lockAddeds
+      .sort((a: any, b: any) => {
+        return parseInt(b.blockNumber) - parseInt(a.blockNumber);
+      })
+      .map((lock: any) => {
+        try {
+          // Create a structure similar to the decoded event log
+          return {
+            eventName: "LockAdded",
+            args: {
+              buyer: lock.buyer,
+              lockID: BigInt(lock.lockID),
+              seller: lock.seller,
+              token: lock.token,
+              amount: BigInt(lock.amount),
+            },
+            // Add other necessary fields to match the original format
+            blockNumber: BigInt(lock.blockNumber),
+            transactionHash: lock.transactionHash,
+          };
+        } catch (error) {
+          console.error("Error processing subgraph data", error);
+          return null;
+        }
+      })
+      .filter((decoded: any) => decoded !== null);
+  } catch (error) {
+    console.error("Error fetching from subgraph:", error);
+  }
 };
 
-const listLockTransactionBySellerAddress = async (
+const listLockTransactionBySellerAddress = async (sellerAddress: string) => {
-  sellerAddress: string
+  const user = useUser();
-): Promise<LogDescription[]> => {
+  const network = user.networkName.value;
-  const p2pContract = await getContract(true);
   console.log("Will get locks as seller", sellerAddress);
-  const filterAddedLocks = p2pContract.filters.LockAdded();
+
-  const eventsReleasedLocks = await p2pContract.queryFilter(
+  // Query subgraph for lock added transactions where seller matches
-    filterAddedLocks
+  const subgraphQuery = {
-    // 0,
+    query: `
-    // "latest"
+      {
-  );
+        lockAddeds(where: {seller: "${sellerAddress.toLowerCase()}"}) {
-  return eventsReleasedLocks
+          buyer
-    .map((lock) => {
+          lockID
-      const IPix2Pix = new Interface(p2pix.abi);
+          seller
-      const decoded = IPix2Pix.parseLog({
+          token
-        topics: lock.topics,
+          amount
-        data: lock.data,
+          blockTimestamp
-      });
+          blockNumber
-      return decoded;
+          transactionHash
-    })
+        }
-    .filter((lock) => lock !== null)
+      }
-    .filter(
+    `,
-      (lock) => lock.args.seller.toLowerCase() == sellerAddress.toLowerCase()
+  };
-    );
+
+  try {
+    // Fetch data from subgraph
+    const response = await fetch(getNetworkSubgraphURL(network), {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+      },
+      body: JSON.stringify(subgraphQuery),
+    });
+
+    const data = await response.json();
+
+    if (!data.data?.lockAddeds) {
+      return [];
+    }
+
+    // Transform the subgraph data to match the event log decode format
+    return data.data.lockAddeds
+      .sort((a: any, b: any) => {
+        return parseInt(b.blockNumber) - parseInt(a.blockNumber);
+      })
+      .map((lock: any) => {
+        try {
+          // Create a structure similar to the decoded event log
+          return {
+            eventName: "LockAdded",
+            args: {
+              buyer: lock.buyer,
+              lockID: BigInt(lock.lockID),
+              seller: lock.seller,
+              token: lock.token,
+              amount: BigInt(lock.amount),
+            },
+            // Add other necessary fields to match the original format
+            blockNumber: BigInt(lock.blockNumber),
+            transactionHash: lock.transactionHash,
+          };
+        } catch (error) {
+          console.error("Error processing subgraph data", error);
+          return null;
+        }
+      })
+      .filter((decoded: any) => decoded !== null);
+  } catch (error) {
+    console.error("Error fetching from subgraph:", error);
+    return [];
+  }
 };
 
 export const checkUnreleasedLock = async (
   walletAddress: string
 ): Promise<UnreleasedLock | undefined> => {
-  const p2pContract = await getContract();
+  const { address, abi, client } = await getContract();
   const pixData: Pix = {
     pixKey: "",
   };
 
   const addedLocks = await listLockTransactionByWalletAddress(walletAddress);
-  const lockStatus = await p2pContract.getLocksStatus(
+
-    addedLocks.map((lock) => lock.args?.lockID)
+  if (!addedLocks.length) return undefined;
-  );
+
+  const lockIds = addedLocks.map((lock: any) => lock.args.lockID);
+
+  const lockStatus = await client.readContract({
+    address,
+    abi,
+    functionName: "getLocksStatus",
+    args: [lockIds],
+  });
+
   const unreleasedLockId = lockStatus[1].findIndex(
-    (lockStatus: number) => lockStatus == 1
+    (status: number) => status == 1
   );
 
-  if (unreleasedLockId != -1) {
+  if (unreleasedLockId !== -1) {
-    const _lockID = lockStatus[0][unreleasedLockId];
+    const lockID = lockStatus[0][unreleasedLockId];
-    const lock = await p2pContract.mapLocks(_lockID);
+
+    const lock = await client.readContract({
+      address,
+      abi,
+      functionName: "mapLocks",
+      args: [lockID],
+    });
 
     const pixTarget = lock.pixTarget;
-    const amount = formatEther(lock?.amount);
+    const amount = formatEther(lock.amount);
     pixData.pixKey = pixTarget;
     pixData.value = Number(amount);
 
     return {
-      lockID: _lockID,
+      lockID,
       pix: pixData,
     };
   }
@@ -274,27 +505,37 @@ export const checkUnreleasedLock = async (
 export const getActiveLockAmount = async (
   walletAddress: string
 ): Promise<number> => {
-  const p2pContract = await getContract(true);
+  const { address, abi, client } = await getContract(true);
   const lockSeller = await listLockTransactionBySellerAddress(walletAddress);
 
-  const lockStatus = await p2pContract.getLocksStatus(
+  if (!lockSeller.length) return 0;
-    lockSeller.map((lock) => lock.args?.lockID)
+
+  const lockIds = lockSeller.map((lock: any) => lock.args.lockID);
+
+  const lockStatus = await client.readContract({
+    address,
+    abi,
+    functionName: "getLocksStatus",
+    args: [lockIds],
+  });
+
+  const mapLocksRequests = lockStatus[0].map((id: bigint) =>
+    client.readContract({
+      address,
+      abi,
+      functionName: "mapLocks",
+      args: [id],
+    })
   );
 
-  const activeLockAmount = await lockStatus[1].reduce(
+  const mapLocksResults = await client.multicall({
-    async (sumValue: Promise<number>, currentStatus: number, index: number) => {
+    contracts: mapLocksRequests as any,
-      const currValue = await sumValue;
+  });
-      let valueToSum = 0;
 
-      if (currentStatus == 1) {
+  return mapLocksResults.reduce((total: number, lock: any, index: number) => {
-        const lock = await p2pContract.mapLocks(lockStatus[0][index]);
+    if (lockStatus[1][index] === 1) {
-        valueToSum = Number(formatEther(lock?.amount));
+      return total + Number(formatEther(lock.amount));
-      }
+    }
-
+    return total;
-      return currValue + valueToSum;
+  }, 0);
-    },
-    Promise.resolve(0)
-  );
-
-  return activeLockAmount;
 };

src/components/BuyConfirmedComponent/BuyConfirmedComponent.vue

@@ -8,8 +8,7 @@ import {
 import CustomButton from "@/components/CustomButton/CustomButton.vue";
 import type { ValidDeposit } from "@/model/ValidDeposit";
 import type { WalletTransaction } from "@/model/WalletTransaction";
-import { useEtherStore } from "@/store/ether";
+import { useUser } from "@/composables/useUser";
-import { storeToRefs } from "pinia";
 import { onMounted, ref, watch } from "vue";
 import ListingComponent from "../ListingComponent/ListingComponent.vue";
 
@@ -19,8 +18,8 @@ const props = defineProps<{
   isCurrentStep: boolean;
 }>();
 
-const etherStore = useEtherStore();
+const user = useUser();
-const { walletAddress } = storeToRefs(etherStore);
+const { walletAddress } = useUser();
 
 const lastWalletTransactions = ref<WalletTransaction[]>([]);
 const depositList = ref<ValidDeposit[]>([]);
@@ -29,7 +28,7 @@ const activeLockAmount = ref<number>(0);
 // methods
 
 const getWalletTransactions = async () => {
-  etherStore.setLoadingWalletTransactions(true);
+  user.setLoadingWalletTransactions(true);
   if (walletAddress.value) {
     const walletDeposits = await listValidDepositTransactionsByWalletAddress(
       walletAddress.value
@@ -48,20 +47,20 @@ const getWalletTransactions = async () => {
       lastWalletTransactions.value = allUserTransactions;
     }
   }
-  etherStore.setLoadingWalletTransactions(false);
+  user.setLoadingWalletTransactions(false);
 };
 
 const callWithdraw = async (amount: string) => {
   if (amount) {
-    etherStore.setLoadingWalletTransactions(true);
+    user.setLoadingWalletTransactions(true);
-    const withdraw = await withdrawDeposit(amount, etherStore.selectedToken);
+    const withdraw = await withdrawDeposit(amount, user.selectedToken.value);
     if (withdraw) {
       console.log("Saque realizado!");
       await getWalletTransactions();
     } else {
       console.log("Não foi possível realizar o saque!");
     }
-    etherStore.setLoadingWalletTransactions(false);
+    user.setLoadingWalletTransactions(false);
   }
 };
 
@@ -93,14 +92,14 @@ onMounted(async () => {
         <div>
           <p>Tokens recebidos</p>
           <p class="text-2xl text-gray-900">
-            {{ props.tokenAmount }} {{ etherStore.selectedToken }}
+            {{ props.tokenAmount }} {{ user.selectedToken }}
           </p>
         </div>
         <div class="my-5">
           <p class="text-sm">
             <b>Não encontrou os tokens? </b><br />Clique no botão abaixo para
             <br />
-            cadastrar o {{ etherStore.selectedToken }} em sua carteira.
+            cadastrar o {{ user.selectedToken }} em sua carteira.
           </p>
         </div>
         <CustomButton :text="'Cadastrar token'" @buttonClicked="() => {}" />
@@ -150,10 +149,6 @@ p {
   @apply font-medium text-base text-gray-900;
 }
 
-input[type="number"] {
-  -moz-appearance: textfield;
-}
-
 input[type="number"]::-webkit-inner-spin-button,
 input[type="number"]::-webkit-outer-spin-button {
   -webkit-appearance: none;

src/components/ListingComponent/ListingComponent.vue

@@ -1,10 +1,8 @@
 <script setup lang="ts">
-import { withdrawDeposit } from "@/blockchain/buyerMethods";
 import { NetworkEnum } from "@/model/NetworkEnum";
 import type { ValidDeposit } from "@/model/ValidDeposit";
 import type { WalletTransaction } from "@/model/WalletTransaction";
-import { useEtherStore } from "@/store/ether";
+import { useUser } from "@/composables/useUser";
-import { storeToRefs } from "pinia";
 import { ref, watch, onMounted } from "vue";
 import SpinnerComponent from "../SpinnerComponent.vue";
 import { decimalCount } from "@/utils/decimalCount";
@@ -12,7 +10,7 @@ import { debounce } from "@/utils/debounce";
 import { getTokenByAddress } from "@/blockchain/addresses";
 import { useFloating, arrow, offset, flip, shift } from "@floating-ui/vue";
 
-const etherStore = useEtherStore();
+const user = useUser();
 
 // props
 const props = defineProps<{
@@ -23,8 +21,9 @@ const props = defineProps<{
 
 const emit = defineEmits(["depositWithdrawn"]);
 
-const { loadingWalletTransactions } = storeToRefs(etherStore);
+const { loadingWalletTransactions } = user;
-const remaining = ref<number>(0.0);
+
+const remaining = ref<number>(0);
 const itemsToShow = ref<WalletTransaction[]>([]);
 const withdrawAmount = ref<string>("");
 const withdrawButtonOpacity = ref<number>(0.6);
@@ -85,8 +84,7 @@ watch(withdrawAmount, (): void => {
 });
 
 const getRemaining = (): number => {
-  if (props.validDeposits instanceof Array) {
+  if (props.validDeposits.length > 0) {
-    // Here we are getting only the first element of the list because
     // in this release only the BRL token is being used.
     const deposit = props.validDeposits[0];
     remaining.value = deposit ? deposit.remaining : 0;
@@ -96,7 +94,7 @@ const getRemaining = (): number => {
 };
 
 const getExplorer = (): string => {
-  return etherStore.networkName == NetworkEnum.sepolia
+  return user.networkName.value == NetworkEnum.sepolia
     ? "Etherscan"
     : "Polygonscan";
 };
@@ -107,7 +105,7 @@ const showInitialItems = (): void => {
 
 const openEtherscanUrl = (transactionHash: string): void => {
   const networkUrl =
-    etherStore.networkName == NetworkEnum.sepolia
+    user.networkName.value == NetworkEnum.sepolia
       ? "sepolia.etherscan.io"
       : "mumbai.polygonscan.com";
   const url = `https://${networkUrl}/tx/${transactionHash}`;

src/components/ListingComponent/__tests__/ListingComponent.spec.ts

@@ -1,15 +1,13 @@
+import { describe, expect, beforeEach } from "vitest";
 import { mount } from "@vue/test-utils";
-import ListingComponent from "@/components/ListingComponent/ListingComponent.vue";
+import ListingComponent from "../ListingComponent.vue";
-import { createPinia, setActivePinia } from "pinia";
+import { useUser } from "@/composables/useUser";
-import { expect } from "vitest";
 import { MockValidDeposits } from "@/model/mock/ValidDepositMock";
 import { MockWalletTransactions } from "@/model/mock/WalletTransactionMock";
-import { useEtherStore } from "@/store/ether";
 
 describe("ListingComponent.vue", () => {
   beforeEach(() => {
-    setActivePinia(createPinia());
+    useUser().setLoadingWalletTransactions(false);
-    useEtherStore().setLoadingWalletTransactions(false);
   });
 
   test("Test Message when an empty array is received", () => {

src/components/QrCodeComponent.vue

@@ -2,14 +2,6 @@
 import { onMounted, onUnmounted, ref } from "vue";
 import CustomButton from "@/components/CustomButton/CustomButton.vue";
 import CustomModal from "@/components//CustomModal/CustomModal.vue";
-import QRCode from "qrcode";
-
-// props and store references
-const props = defineProps({
-  sellerId: String,
-  amount: Number,
-  qrcode: String,
-});
 
 const windowSize = ref<number>(window.innerWidth);
 const qrCode = ref<string>("");

src/components/SearchComponent.vue

@@ -1,21 +1,20 @@
 <script setup lang="ts">
 import { ref, watch } from "vue";
+import { useUser } from "@/composables/useUser";
+import SpinnerComponent from "@/components/SpinnerComponent.vue";
 import CustomButton from "@/components/CustomButton/CustomButton.vue";
 import { debounce } from "@/utils/debounce";
-import { useEtherStore } from "@/store/ether";
-import { storeToRefs } from "pinia";
 import { verifyNetworkLiquidity } from "@/utils/networkLiquidity";
 import { NetworkEnum } from "@/model/NetworkEnum";
 import type { ValidDeposit } from "@/model/ValidDeposit";
 import { decimalCount } from "@/utils/decimalCount";
-import SpinnerComponent from "./SpinnerComponent.vue";
 import { getTokenImage } from "@/utils/imagesPath";
 import { onClickOutside } from "@vueuse/core";
 
 import { TokenEnum } from "@/model/NetworkEnum";
 
 // Store reference
-const etherStore = useEtherStore();
+const user = useUser();
 const selectTokenToggle = ref<boolean>(false);
 
 const {
@@ -24,7 +23,7 @@ const {
   selectedToken,
   depositsValidList,
   loadingNetworkLiquidity,
-} = storeToRefs(etherStore);
+} = user;
 
 // html references
 const tokenDropdownRef = ref<any>(null);
@@ -52,7 +51,7 @@ const connectAccount = async (): Promise<void> => {
 
 const emitConfirmButton = async (): Promise<void> => {
   const deposit = selectedDeposits.value?.find(
-    (d) => d.network === networkName.value
+    (d) => d.network === Number(networkName.value)
   );
   if (!deposit) return;
   deposit.pixKey = await getPixKey(deposit.seller, deposit.token);
@@ -84,7 +83,7 @@ onClickOutside(tokenDropdownRef, () => {
 });
 
 const handleSelectedToken = (token: TokenEnum): void => {
-  etherStore.setSelectedToken(token);
+  user.setSelectedToken(token);
   selectTokenToggle.value = false;
 };
 
@@ -96,10 +95,9 @@ const verifyLiquidity = (): void => {
     walletAddress.value,
     depositsValidList.value
   );
-
   selectedDeposits.value = selDeposits;
   hasLiquidity.value = !!selDeposits.find(
-    (d) => d.network === networkName.value
+    (d) => d.network === Number(networkName.value)
   );
   enableOrDisableConfirmButton();
 };
@@ -130,8 +128,6 @@ watch(walletAddress, (): void => {
 // Add form submission handler
 const handleSubmit = async (e: Event): Promise<void> => {
   e.preventDefault();
-  if (!enableConfirmButton.value) return;
-
   if (walletAddress.value) {
     await emitConfirmButton();
   } else {
@@ -275,7 +271,9 @@ const handleSubmit = async (e: Event): Promise<void> => {
         </div>
         <div
           class="flex justify-center"
-          v-else-if="!hasLiquidity && !loadingNetworkLiquidity"
+          v-else-if="
+            !hasLiquidity && !loadingNetworkLiquidity && tokenValue > 0
+          "
         >
           <span class="text-red-500 font-normal text-sm"
             >Atualmente não há liquidez nas rede selecionada para sua

src/components/SellerSteps/SellerComponent.vue

@@ -1,9 +1,8 @@
 <script setup lang="ts">
-import { computed, ref } from "vue";
+import { ref, computed } from "vue";
-import CustomButton from "../CustomButton/CustomButton.vue";
+import { useUser } from "@/composables/useUser";
-import { pixFormatValidation, postProcessKey } from "@/utils/pixKeyFormat";
+import CustomButton from "@/components/CustomButton/CustomButton.vue";
-import { useEtherStore } from "@/store/ether";
+import { postProcessKey } from "@/utils/pixKeyFormat";
-import { storeToRefs } from "pinia";
 import { TokenEnum } from "@/model/NetworkEnum";
 import { getTokenImage } from "@/utils/imagesPath";
 import { useOnboard } from "@web3-onboard/vue";
@@ -24,10 +23,9 @@ const tokenDropdownRef = ref<any>(null);
 const formRef = ref<HTMLFormElement | null>(null);
 
 // Reactive state
-const etherStore = useEtherStore();
+const user = useUser();
-const { walletAddress, selectedToken } = storeToRefs(etherStore);
+const { walletAddress, selectedToken } = user;
 
-const fullName = ref<string>("");
 const offer = ref<string>("");
 const identification = ref<string>("");
 const account = ref<string>("");
@@ -73,7 +71,7 @@ const handleSubmit = (e: Event): void => {
 
   const data: Participant = {
     offer: offer.value,
-    fullName: fullName.value,
+    chainID: user.networkId.value,
     identification: processedIdentification,
     bankIspb: selectedBank.value?.ISPB,
     accountType: accountType.value,
@@ -91,7 +89,7 @@ const openTokenSelection = (): void => {
 };
 
 const handleSelectedToken = (token: TokenEnum): void => {
-  etherStore.setSelectedToken(token);
+  user.setSelectedToken(token);
   selectTokenToggle.value = false;
 };
 </script>
@@ -186,21 +184,6 @@ const handleSelectedToken = (token: TokenEnum): void => {
           </transition>
         </div>
       </div>
-
-      <!-- Full name input -->
-      <div
-        class="flex flex-col w-full bg-white sm:px-10 px-6 py-4 rounded-lg border-y-10"
-      >
-        <input
-          type="text"
-          v-model="fullName"
-          class="border-none outline-none sm:text-lg text-sm text-gray-900 w-full"
-          maxlength="60"
-          :class="{ 'text-xl font-medium': fullName }"
-          placeholder="Digite seu nome completo"
-          required
-        />
-      </div>
       <!-- CPF or CNPJ input -->
       <div
         class="flex flex-col w-full bg-white sm:px-10 px-6 py-4 rounded-lg border-y-10"

src/components/SellerSteps/SellerSearchComponent.vue

@@ -1,17 +1,15 @@
 <script setup lang="ts">
 import { ref } from "vue";
+import { useUser } from "@/composables/useUser";
 import CustomButton from "@/components/CustomButton/CustomButton.vue";
 import { debounce } from "@/utils/debounce";
 import { decimalCount } from "@/utils/decimalCount";
-
-import { useEtherStore } from "@/store/ether";
 import { getTokenImage } from "@/utils/imagesPath";
-import { storeToRefs } from "pinia";
 import { useOnboard } from "@web3-onboard/vue";
 
 // Store
-const etherStore = useEtherStore();
+const user = useUser();
-const { walletAddress } = storeToRefs(etherStore);
+const { walletAddress } = user;
 
 // Reactive state
 const tokenValue = ref<number>(0);
@@ -76,10 +74,10 @@ const handleInputEvent = (event: any): void => {
             <img
               alt="Token image"
               class="w-fit"
-              :src="getTokenImage(etherStore.selectedToken)"
+              :src="getTokenImage(user.selectedToken.value)"
             />
             <span class="text-gray-900 text-lg w-fit" id="token">{{
-              etherStore.selectedToken
+              user.selectedToken
             }}</span>
           </div>
         </div>
@@ -153,10 +151,6 @@ const handleInputEvent = (event: any): void => {
   @apply text-white text-center;
 }
 
-input[type="number"] {
-  -moz-appearance: textfield;
-}
-
 input[type="number"]::-webkit-inner-spin-button,
 input[type="number"]::-webkit-outer-spin-button {
   -webkit-appearance: none;

src/components/SellerSteps/SendNetwork.vue

@@ -26,7 +26,7 @@ const props = defineProps({
         os tokens de volta.</span
       >
     </div>
-    <div class="main-container sm:w-1/3">
+    <div class="main-container">
       <div
         class="flex flex-col w-full bg-white px-10 py-5 rounded-lg border-y-10"
       >
@@ -79,10 +79,6 @@ p {
   @apply font-medium text-base;
 }
 
-input[type="number"] {
-  -moz-appearance: textfield;
-}
-
 input[type="number"]::-webkit-inner-spin-button,
 input[type="number"]::-webkit-outer-spin-button {
   -webkit-appearance: none;

src/components/ToasterComponent.vue

@@ -0,0 +1,82 @@
+<script setup lang="ts">
+import { ref, computed, watch, onMounted } from "vue";
+import { useOnboard } from "@web3-onboard/vue";
+import { Networks } from "../model/Networks";
+import { useUser } from "@/composables/useUser";
+
+const { connectedWallet } = useOnboard();
+const user = useUser();
+const { networkId, networkName } = user;
+
+const isWrongNetwork = ref(false);
+const targetNetworkName = computed(() => Networks[networkName.value].chainName);
+
+const checkNetwork = () => {
+  if (connectedWallet.value) {
+    const chainId = connectedWallet.value.chains[0].id;
+    isWrongNetwork.value = Number(chainId) !== networkId.value;
+  } else {
+    isWrongNetwork.value = false; // No wallet connected yet
+  }
+};
+
+const switchNetwork = async () => {
+  try {
+    if (connectedWallet.value && connectedWallet.value.provider) {
+      await connectedWallet.value.provider.request({
+        method: "wallet_switchEthereumChain",
+        params: [
+          {
+            chainId: Networks[networkName.value].chainId,
+          },
+        ],
+      });
+    }
+  } catch (error) {
+    console.error("Failed to switch network:", error);
+  }
+};
+
+onMounted(checkNetwork);
+watch(connectedWallet, checkNetwork);
+watch(networkId, checkNetwork, { immediate: true });
+</script>
+
+<template>
+  <transition name="slide-up" appear>
+    <div
+      v-if="isWrongNetwork"
+      class="fixed bottom-0 left-0 right-0 bg-red-500 text-white p-4 flex justify-between items-center z-50"
+    >
+      <div>
+        <span class="font-bold">Wrong network!</span>
+        <span> Please switch to {{ targetNetworkName }}.</span>
+      </div>
+      <button
+        @click="switchNetwork"
+        class="bg-white text-red-500 px-4 py-2 rounded font-bold hover:bg-gray-100 transition-colors"
+      >
+        Switch Network
+      </button>
+    </div>
+  </transition>
+</template>
+
+<style scoped>
+.slide-up-enter-active,
+.slide-up-leave-active {
+  transition: transform 0.3s ease, opacity 0.3s ease;
+}
+
+.slide-up-enter-from,
+.slide-up-leave-to {
+  transform: translateY(100%);
+  opacity: 0;
+}
+
+.slide-up-enter-to,
+.slide-up-leave-from {
+  transform: translateY(0);
+  opacity: 1;
+}
+</style>

src/components/TopBar/TopBar.vue

@@ -1,7 +1,6 @@
 <script setup lang="ts">
-import { storeToRefs } from "pinia";
-import { useEtherStore } from "@/store/ether";
 import { ref, watch } from "vue";
+import { useUser } from "@/composables/useUser";
 import { onClickOutside } from "@vueuse/core";
 import { NetworkEnum } from "@/model/NetworkEnum";
 import { getNetworkImage } from "@/utils/imagesPath";
@@ -15,10 +14,9 @@ import LinkedinIcon from "@/assets/linkedinIcon.svg";
 import GithubIcon from "@/assets/githubIcon.svg";
 import { connectProvider } from "@/blockchain/provider";
 
-// Store reference
+// Use the new composable
-const etherStore = useEtherStore();
+const user = useUser();
-
+const { walletAddress, sellerView, networkId } = user;
-const { walletAddress, sellerView } = storeToRefs(etherStore);
 
 const menuOpenToggle = ref<boolean>(false);
 const infoMenuOpenToggle = ref<boolean>(false);
@@ -38,11 +36,24 @@ const connnectWallet = async (): Promise<void> => {
 watch(connectedWallet, async (newVal: any) => {
   connectProvider(newVal.provider);
   const addresses = await newVal.provider.request({ method: "eth_accounts" });
-  etherStore.setWalletAddress(addresses.shift());
+  user.setWalletAddress(addresses.shift());
 });
 
 watch(connectedChain, (newVal: any) => {
-  etherStore.setNetworkId(newVal?.id);
+  // Check if connected chain is valid, otherwise default to Sepolia (NetworkEnum.SEPOLIA)
+  if (
+    !newVal ||
+    !Object.values(Networks).some(
+      (network) => Number(network.chainId) === Number(newVal.id)
+    )
+  ) {
+    console.log(
+      "Invalid or unsupported network detected, defaulting to Sepolia"
+    );
+    user.setNetworkId(user.networkId.value);
+    return;
+  }
+  user.setNetworkId(newVal?.id);
 });
 
 const formatWalletAddress = (): string => {
@@ -56,7 +67,7 @@ const formatWalletAddress = (): string => {
 };
 
 const disconnectUser = async (): Promise<void> => {
-  etherStore.setWalletAddress("");
+  user.setWalletAddress("");
   await disconnectWallet({ label: connectedWallet.value?.label || "" });
   closeMenu();
 };
@@ -72,7 +83,7 @@ const networkChange = async (network: NetworkEnum): Promise<void> => {
       chainId: Networks[network].chainId,
       wallet: connectedWallet.value?.label || "",
     });
-    etherStore.setNetworkId(network);
+    user.setNetworkId(network);
   } catch (error) {
     console.log("Error changing network", error);
   }
@@ -245,7 +256,7 @@ onClickOutside(infoMenuRef, () => {
         >
           <img
             alt="Choosed network image"
-            :src="getNetworkImage(NetworkEnum[etherStore.networkName])"
+            :src="getNetworkImage(NetworkEnum[user.networkName.value])"
             height="24"
             width="24"
           />
@@ -253,7 +264,11 @@ onClickOutside(infoMenuRef, () => {
             class="default-text hidden sm:inline-block text-gray-50 group-hover:text-gray-900 transition-all duration-500 ease-in-out whitespace-nowrap text-ellipsis overflow-hidden"
             :class="{ '!text-gray-900': currencyMenuOpenToggle }"
           >
-            {{ Networks[etherStore.networkName].chainName }}
+            {{
+              Networks[user.networkName.value]
+                ? Networks[user.networkName.value].chainName
+                : "Invalid Chain"
+            }}
           </span>
           <div
             class="transition-all duration-500 ease-in-out mt-1"

src/components/TopBar/__tests__/TopBar.spec.ts

@@ -1,7 +1,7 @@
-/* eslint-disable no-undef */
+import { describe, it, expect, beforeEach } from "vitest";
-import { shallowMount } from "@vue/test-utils";
+import { mount } from "@vue/test-utils";
 import TopBar from "../TopBar.vue";
-import { useEtherStore } from "../../../store/ether";
+import { useUser } from "@/composables/useUser";
 
 import { createPinia, setActivePinia } from "pinia";
 
@@ -11,24 +11,24 @@ describe("TopBar.vue", () => {
   });
 
   it("should render connect wallet button", () => {
-    const wrapper = shallowMount(TopBar);
+    const wrapper = mount(TopBar);
     expect(wrapper.html()).toContain("Conectar carteira");
   });
 
   it("should render button to change to seller view when in buyer screen", () => {
-    const wrapper = shallowMount(TopBar);
+    const wrapper = mount(TopBar);
     expect(wrapper.html()).toContain("Quero vender");
   });
 
   it("should render button to change to seller view when in buyer screen", () => {
-    const etherStore = useEtherStore();
+    const user = useUser();
-    etherStore.setSellerView(true);
+    user.setSellerView(true);
-    const wrapper = shallowMount(TopBar);
+    const wrapper = mount(TopBar);
     expect(wrapper.html()).toContain("Quero comprar");
   });
 
   it("should render the P2Pix logo correctly", () => {
-    const wrapper = shallowMount(TopBar);
+    const wrapper = mount(TopBar);
     const img = wrapper.findAll(".logo");
     expect(img.length).toBe(2);
   });

src/composables/useUser.ts

@@ -0,0 +1,105 @@
+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";
+
+const walletAddress = ref("");
+const balance = ref("");
+const networkId = ref(11155111);
+const networkName = ref(NetworkEnum.sepolia);
+const selectedToken = ref(TokenEnum.BRZ);
+const loadingLock = ref(false);
+const sellerView = ref(false);
+const depositsValidList = ref<ValidDeposit[]>([]);
+const loadingWalletTransactions = ref(false);
+const loadingNetworkLiquidity = ref(false);
+const seller = ref<Participant>({} as Participant);
+const sellerId = ref("");
+
+export function useUser() {
+  // Actions become regular functions
+  const setWalletAddress = (address: string) => {
+    walletAddress.value = address;
+  };
+
+  const setBalance = (newBalance: string) => {
+    balance.value = newBalance;
+  };
+
+  const setSelectedToken = (token: TokenEnum) => {
+    selectedToken.value = token;
+  };
+
+  const setNetworkId = (network: string | number) => {
+    networkName.value = NetworkById(network) || NetworkEnum.sepolia;
+    networkId.value = Number(network);
+  };
+
+  const setLoadingLock = (isLoading: boolean) => {
+    loadingLock.value = isLoading;
+  };
+
+  const setSellerView = (view: boolean) => {
+    sellerView.value = view;
+  };
+
+  const setDepositsValidList = (deposits: ValidDeposit[]) => {
+    depositsValidList.value = deposits;
+  };
+
+  const setLoadingWalletTransactions = (isLoading: boolean) => {
+    loadingWalletTransactions.value = isLoading;
+  };
+
+  const setLoadingNetworkLiquidity = (isLoading: boolean) => {
+    loadingNetworkLiquidity.value = isLoading;
+  };
+
+  const setSeller = (newSeller: Participant) => {
+    seller.value = newSeller;
+  };
+
+  const setSellerId = (id: string) => {
+    sellerId.value = id;
+  };
+
+  // Getters become computed or regular functions
+  const getValidDepositByWalletAddress = (address: string) => {
+    return depositsValidList.value
+      .filter((deposit) => deposit.seller == address)
+      .sort((a, b) => b.blockNumber - a.blockNumber);
+  };
+
+  return {
+    // State
+    walletAddress,
+    balance,
+    networkId,
+    networkName,
+    selectedToken,
+    loadingLock,
+    sellerView,
+    depositsValidList,
+    loadingWalletTransactions,
+    loadingNetworkLiquidity,
+    seller,
+    sellerId,
+
+    // Actions
+    setWalletAddress,
+    setBalance,
+    setSelectedToken,
+    setNetworkId,
+    setLoadingLock,
+    setSellerView,
+    setDepositsValidList,
+    setLoadingWalletTransactions,
+    setLoadingNetworkLiquidity,
+    setSeller,
+    setSellerId,
+
+    // Getters
+    getValidDepositByWalletAddress,
+  };
+}

src/main.ts

@@ -1,7 +1,6 @@
 import { createApp } from "vue";
 import App from "./App.vue";
 import router from "./router";
-import { createPinia } from "pinia";
 
 import "./assets/main.css";
 import "./assets/transitions.css";
@@ -9,6 +8,5 @@ import "./assets/transitions.css";
 const app = createApp(App);
 
 app.use(router);
-app.use(createPinia());
 
 app.mount("#app");

src/model/NetworkEnum.ts

@@ -3,6 +3,15 @@ export enum NetworkEnum {
   rootstock = 31,
 }
 
+export const getNetworkSubgraphURL = (network: NetworkEnum | number) => {
+  const networkMap: Record<number, string> = {
+    [NetworkEnum.sepolia]: import.meta.env.VITE_SEPOLIA_SUBGRAPH_URL || "",
+    [NetworkEnum.rootstock]: import.meta.env.VITE_RSK_SUBGRAPH_URL || "",
+  };
+
+  return networkMap[typeof network === "number" ? network : network] || "";
+};
+
 export enum TokenEnum {
   BRZ = "BRZ",
   // BRX = 'BRX'

src/model/Networks.ts

@@ -1,5 +1,20 @@
 import { NetworkEnum } from "@/model/NetworkEnum";
 
+export const NetworkById = (
+  chainId: string | number
+): NetworkEnum | undefined => {
+  const normalizedChainId =
+    typeof chainId === "number" ? chainId : Number(chainId);
+
+  for (const [network, details] of Object.entries(Networks)) {
+    if (Number(details.chainId) === normalizedChainId) {
+      return network as unknown as NetworkEnum;
+    }
+  }
+
+  return undefined;
+};
+
 export const Networks = {
   [NetworkEnum.sepolia]: {
     chainId: "0xAA36A7",

src/store/ether.ts

@@ -1,65 +0,0 @@
-import { NetworkEnum, TokenEnum } from "../model/NetworkEnum";
-import type { ValidDeposit } from "@/model/ValidDeposit";
-import type { Participant } from "../utils/bbPay";
-import { defineStore } from "pinia";
-
-export const useEtherStore = defineStore("ether", {
-  state: () => ({
-    walletAddress: "",
-    balance: "",
-    networkName: NetworkEnum.sepolia,
-    selectedToken: TokenEnum.BRZ,
-    loadingLock: false,
-    sellerView: false,
-    depositsValidList: [] as ValidDeposit[],
-    loadingWalletTransactions: false,
-    loadingNetworkLiquidity: false,
-    seller: {} as Participant,
-    sellerId: "",
-  }),
-  actions: {
-    setWalletAddress(walletAddress: string) {
-      this.walletAddress = walletAddress;
-    },
-    setBalance(balance: string) {
-      this.balance = balance;
-    },
-    setSelectedToken(token: TokenEnum) {
-      this.selectedToken = token;
-    },
-    setNetworkId(networkName: NetworkEnum) {
-      this.networkName = Number(networkName);
-    },
-    setLoadingLock(isLoadingLock: boolean) {
-      this.loadingLock = isLoadingLock;
-    },
-    setSellerView(sellerView: boolean) {
-      this.sellerView = sellerView;
-    },
-    setDepositsValidList(depositsValidList: ValidDeposit[]) {
-      this.depositsValidList = depositsValidList;
-    },
-    setLoadingWalletTransactions(isLoadingWalletTransactions: boolean) {
-      this.loadingWalletTransactions = isLoadingWalletTransactions;
-    },
-    setLoadingNetworkLiquidity(isLoadingNetworkLiquidity: boolean) {
-      this.loadingNetworkLiquidity = isLoadingNetworkLiquidity;
-    },
-    setSeller(seller: Participant) {
-      this.seller = seller;
-    },
-    setSellerId(sellerId: string) {
-      this.sellerId = sellerId;
-    },
-  },
-  getters: {
-    getValidDepositByWalletAddress: (state) => {
-      return (walletAddress: string) =>
-        state.depositsValidList
-          .filter((deposit) => deposit.seller == walletAddress)
-          .sort((a, b) => {
-            return b.blockNumber - a.blockNumber;
-          });
-    },
-  },
-});

src/utils/bbPay.ts

@@ -1,6 +1,8 @@
+import { off } from "process";
+
 export interface Participant {
   offer: string;
-  fullName: string;
+  chainID: number;
   identification: string;
   bankIspb?: string;
   accountType: string;
@@ -23,25 +25,43 @@ export interface Offer {
 // https://apoio.developers.bb.com.br/sandbox/spec/665797498bb48200130fc32c
 
 export const createParticipant = async (participant: Participant) => {
-  const response = await fetch(`${process.env.VUE_APP_API_URL}/participants`, {
+  console.log("Creating participant", participant);
-    method: "PUT",
+  const response = await fetch(`${import.meta.env.VITE_APP_API_URL}/register`, {
-    body: JSON.stringify(participant),
+    method: "POST",
+    headers: {
+      "Content-Type": "application/json",
+    },
+    body: JSON.stringify({
+      chainID: participant.chainID,
+      tipoDocumento: 1,
+      numeroDocumento: participant.identification,
+      numeroConta: participant.account,
+      numeroAgencia: participant.branch,
+      tipoConta: participant.accountType,
+      codigoIspb: participant.bankIspb,
+    }),
   });
   const data = await response.json();
   return { ...participant, id: data.id } as ParticipantWithID;
 };
 
 export const createSolicitation = async (offer: Offer) => {
-  const response = await fetch(`${process.env.VUE_APP_API_URL}/solicitation`, {
+  const response = await fetch(`${import.meta.env.VITE_APP_API_URL}/request`, {
     method: "POST",
-    body: JSON.stringify(offer),
+    headers: {
+      "Content-Type": "application/json",
+    },
+    body: JSON.stringify({
+      amount: offer.amount,
+      pixTarget: offer.sellerId,
+    }),
   });
   return response.json();
 };
 
 export const getSolicitation = async (id: string) => {
   const response = await fetch(
-    `${process.env.VUE_APP_API_URL}/solicitation/${id}`
+    `${import.meta.env.VITE_APP_API_URL}/release/${id}`
   );
 
   const obj: any = response.json();

src/utils/imagesPath.ts

@@ -7,10 +7,19 @@ export const imagesPath = import.meta.glob<string>("@/assets/*.{png,svg}", {
 });
 
 export const getNetworkImage = (networkName: string): string => {
-  const path = Object.keys(imagesPath).find((key) =>
+  try {
-    key.endsWith(`${networkName.toLowerCase()}.svg`)
+    const path = Object.keys(imagesPath).find((key) =>
-  );
+      key.endsWith(`${networkName.toLowerCase()}.svg`)
-  return path ? imagesPath[path] : "";
+    );
+    return path ? imagesPath[path] : "";
+  } catch (error) {
+    console.error("Error fetching network image");
+    const path = Object.keys(imagesPath).find((key) =>
+      key.endsWith(`invalidIcon.svg`)
+    );
+    return path ? imagesPath[path] : "";
+    return "";
+  }
 };
 
 export const getTokenImage = (tokenName: TokenEnum): string => {

src/views/HomeView.vue

@@ -3,9 +3,8 @@ import SearchComponent from "@/components/SearchComponent.vue";
 import LoadingComponent from "@/components/LoadingComponent/LoadingComponent.vue";
 import BuyConfirmedComponent from "@/components/BuyConfirmedComponent/BuyConfirmedComponent.vue";
 import { ref, onMounted, watch } from "vue";
-import { useEtherStore } from "@/store/ether";
+import { useUser } from "@/composables/useUser";
 import QrCodeComponent from "@/components/QrCodeComponent.vue";
-import { storeToRefs } from "pinia";
 import { addLock, releaseLock } from "@/blockchain/buyerMethods";
 import { updateWalletStatus, checkUnreleasedLock } from "@/blockchain/wallet";
 import { getNetworksLiquidity } from "@/blockchain/events";
@@ -20,11 +19,11 @@ enum Step {
   List,
 }
 
-const etherStore = useEtherStore();
+const user = useUser();
-etherStore.setSellerView(false);
+user.setSellerView(false);
 
 // States
-const { loadingLock, walletAddress, networkName } = storeToRefs(etherStore);
+const { loadingLock, walletAddress, networkName } = user;
 const flowStep = ref<Step>(Step.Search);
 const pixTarget = ref<string>();
 const tokenAmount = ref<number>();
@@ -38,14 +37,12 @@ const confirmBuyClick = async (
   selectedDeposit: ValidDeposit,
   tokenValue: number
 ) => {
-  // finish buy screen
   pixTarget.value = selectedDeposit.pixKey;
   tokenAmount.value = tokenValue;
 
-  // Makes lock with deposit ID and the Amount
   if (selectedDeposit) {
     flowStep.value = Step.Buy;
-    etherStore.setLoadingLock(true);
+    user.setLoadingLock(true);
 
     await addLock(selectedDeposit.seller, selectedDeposit.token, tokenValue)
       .then((_lockID) => {
@@ -56,7 +53,7 @@ const confirmBuyClick = async (
         flowStep.value = Step.Search;
       });
 
-    etherStore.setLoadingLock(false);
+    user.setLoadingLock(false);
   }
 };
 
@@ -77,7 +74,6 @@ const releaseTransaction = async (lockId: string) => {
 };
 
 const checkForUnreleasedLocks = async (): Promise<void> => {
-  console.log("Checking for unreleased locks");
   const walletLocks = await checkUnreleasedLock(walletAddress.value);
   if (walletLocks) {
     lockID.value = walletLocks.lockID;

src/views/ManageBidsView.vue

@@ -1,10 +1,9 @@
 <script setup lang="ts">
-import { useEtherStore } from "@/store/ether";
+import { ref, onMounted, watch } from "vue";
-import { storeToRefs } from "pinia";
+import { useUser } from "@/composables/useUser";
 import ListingComponent from "@/components/ListingComponent/ListingComponent.vue";
 import LoadingComponent from "@/components/LoadingComponent/LoadingComponent.vue";
 import CustomAlert from "@/components/CustomAlert/CustomAlert.vue";
-import { ref, watch, onMounted } from "vue";
 import {
   listValidDepositTransactionsByWalletAddress,
   listAllTransactionByWalletAddress,
@@ -16,8 +15,8 @@ import type { WalletTransaction } from "@/model/WalletTransaction";
 
 import router from "@/router/index";
 
-const etherStore = useEtherStore();
+const user = useUser();
-const { walletAddress, networkName, selectedToken } = storeToRefs(etherStore);
+const { walletAddress, networkName, selectedToken } = user;
 const loadingWithdraw = ref<boolean>(false);
 const showAlert = ref<boolean>(false);
 
@@ -47,7 +46,7 @@ const callWithdraw = async (amount: string) => {
 };
 
 const getWalletTransactions = async () => {
-  etherStore.setLoadingWalletTransactions(true);
+  user.setLoadingWalletTransactions(true);
   if (walletAddress.value) {
     console.log("Will fetch all required data...");
     const walletDeposits = await listValidDepositTransactionsByWalletAddress(
@@ -70,7 +69,7 @@ const getWalletTransactions = async () => {
       transactionsList.value = allUserTransactions;
     }
   }
-  etherStore.setLoadingWalletTransactions(false);
+  user.setLoadingWalletTransactions(false);
 };
 
 onMounted(async () => {

src/views/SellerView.vue

@@ -1,11 +1,11 @@
 <script setup lang="ts">
+import { ref } from "vue";
+
 import SellerComponent from "@/components/SellerSteps/SellerComponent.vue";
 import SendNetwork from "@/components/SellerSteps/SendNetwork.vue";
 import LoadingComponent from "@/components/LoadingComponent/LoadingComponent.vue";
+import { useUser } from "@/composables/useUser";
 import { approveTokens, addDeposit } from "@/blockchain/sellerMethods";
-
-import { ref } from "vue";
-import { useEtherStore } from "@/store/ether";
 import CustomAlert from "@/components/CustomAlert/CustomAlert.vue";
 import type { Participant } from "@/utils/bbPay";
 
@@ -15,12 +15,11 @@ enum Step {
   Network,
 }
 
-const etherStore = useEtherStore();
+const user = useUser();
-etherStore.setSellerView(true);
+user.setSellerView(true);
 
 const flowStep = ref<Step>(Step.Sell);
 const loading = ref<boolean>(false);
-
 const showAlert = ref<boolean>(false);
 
 // Verificar tipagem
@@ -40,7 +39,7 @@ const approveOffer = async (args: Participant) => {
 const sendNetwork = async () => {
   loading.value = true;
   try {
-    if (etherStore.seller) {
+    if (user.seller.value) {
       await addDeposit();
       flowStep.value = Step.Sell;
       loading.value = false;
@@ -70,9 +69,9 @@ const sendNetwork = async () => {
     />
     <div v-if="flowStep == Step.Network">
       <SendNetwork
-        :sellerId="etherStore.sellerId"
+        :sellerId="user.sellerId.value"
-        :offer="Number(etherStore.seller.offer)"
+        :offer="Number(user.seller.value.offer)"
-        :selected-token="etherStore.selectedToken"
+        :selected-token="user.selectedToken.value"
         v-if="!loading"
         @send-network="sendNetwork"
       />

tsconfig.json

@@ -27,7 +27,7 @@
     ],
     "preserveValueImports": false,
     "importsNotUsedAsValues": "remove",
-    "verbatimModuleSyntax": true
+    "verbatimModuleSyntax": false
   },
   "references": [
     {

vite.config.ts

@@ -36,6 +36,9 @@ export default defineConfig({
   resolve: {
     alias: {
       "@": fileURLToPath(new URL("./src", import.meta.url)),
+      "viem/errors": fileURLToPath(
+        new URL("./node_modules/viem/errors", import.meta.url)
+      ),
     },
   },
 });