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 { NetworkEnum } from "@/model/NetworkEnum";
+import { Networks } from "./model/Networks";
+import { NetworkEnum } from "./model/NetworkEnum";
 import { ref } from "vue";
 
 const route = useRoute();
@@ -15,12 +15,20 @@ const targetNetwork = ref(NetworkEnum.sepolia);
 
 const web3Onboard = init({
   wallets: [injected],
-  chains: Object.entries(Networks).map(([, network]) => ({
-    id: network.chainId,
-    token: network.token,
-    label: network.chainName,
-    rpcUrl: network.rpcUrl,
-  })),
+  chains: [
+    {
+      id: Networks[NetworkEnum.sepolia].chainId,
+      token: "ETH",
+      label: "Sepolia",
+      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

@@ -39,7 +39,7 @@ export const getP2PixAddress = (network?: NetworkEnum): Address => {
   const user = useUser();
   const possibleP2PixAddresses: { [key in NetworkEnum]: Address } = {
     [NetworkEnum.sepolia]: "0xb7cD135F5eFD9760981e02E2a898790b688939fe",
-    [NetworkEnum.rootstock]: "0x57Dcba05980761169508886eEdc6f5E7EC0411Dc",
+    [NetworkEnum.rootstock]: "0x98ba35eb14b38D6Aa709338283af3e922476dE34",
   };
 
   return possibleP2PixAddresses[

src/blockchain/buyerMethods.ts

@@ -1,7 +1,14 @@
 import { getContract } from "./provider";
 import { getTokenAddress } from "./addresses";
 import {
+  bytesToHex,
+  encodeAbiParameters,
+  keccak256,
+  parseAbiParameters,
   parseEther,
+  stringToBytes,
+  stringToHex,
+  toBytes,
   type Address,
   type TransactionReceipt,
 } from "viem";

src/blockchain/wallet.ts

@@ -1,4 +1,4 @@
-import { formatEther, type Address } from "viem";
+import { formatEther, hexToString, type Address } from "viem";
 import { useUser } from "@/composables/useUser";
 
 import { getPublicClient, getWalletClient, getContract } from "./provider";
@@ -463,3 +463,18 @@ export const getActiveLockAmount = async (
     return total;
   }, 0);
 };
+
+export const getSellerParticipantId = async (
+  sellerAddress: Address,
+  tokenAddress: Address
+): Promise<string> => {
+  const { address, abi, client } = await getContract();
+
+  const participantId = await client.readContract({
+    address,
+    abi,
+    functionName: "getPixTarget",
+    args: [sellerAddress, tokenAddress],
+  });
+  return hexToString(participantId);
+};

src/components/QrCodeComponent.vue

@@ -4,7 +4,7 @@ import CustomButton from "@/components/CustomButton/CustomButton.vue";
 import CustomModal from "@/components//CustomModal/CustomModal.vue";
 import SpinnerComponent from "@/components/SpinnerComponent.vue";
 import { createSolicitation, getSolicitation, type Offer } from "@/utils/bbPay";
-import { getParticipantID } from "@/blockchain/events";
+import { getSellerParticipantId } from "@/blockchain/wallet";
 import { getUnreleasedLockById } from "@/blockchain/events";
 import QRCode from "qrcode";
 
@@ -86,7 +86,7 @@ onMounted(async () => {
       BigInt(props.lockID)
     );
 
-    const participantId = await getParticipantID(
+    const participantId = await getSellerParticipantId(
       sellerAddress,
       tokenAddress
     );

src/composables/useUser.ts

@@ -2,6 +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 type { Address } from "viem"
 
 const walletAddress = ref<Address | null>(null);
@@ -32,7 +33,7 @@ export function useUser() {
   };
 
   const setNetworkId = (network: string | number) => {
-    networkName.value = Number(network) as NetworkEnum || NetworkEnum.sepolia;
+    networkName.value = NetworkById(network) || NetworkEnum.sepolia;
     networkId.value = Number(network);
   };
 

src/model/Networks.ts

@@ -1,26 +1,37 @@
 import { NetworkEnum } from "@/model/NetworkEnum";
 
-export interface NetworkConfig {
-  chainId: string;
-  chainName: string;
-  token: string;
-  rpcUrl?: string;
-  blockExplorerUrl?: string;
-}
+export const NetworkById = (
+  chainId: string | number
+): NetworkEnum | undefined => {
+  const normalizedChainId =
+    typeof chainId === "number" ? chainId : Number(chainId);
 
-export const Networks: { [key in NetworkEnum]: NetworkConfig } = {
+  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",
     chainName: "Sepolia Testnet",
-    token: "ETH",
-    rpcUrl: import.meta.env.VITE_SEPOLIA_API_URL,
-    blockExplorerUrl: "https://sepolia.etherscan.io",
   },
   [NetworkEnum.rootstock]: {
     chainId: "0x1F",
     chainName: "Rootstock Testnet",
-    token: "tRBTC",
-    rpcUrl: import.meta.env.VITE_ROOTSTOCK_API_URL,
-    blockExplorerUrl: "https://explorer.testnet.rsk.co",
+    rpcUrls: ["https://public-node.testnet.rsk.co/"],
+    iconUrls: [
+      "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==",
+    ],
+    nativeCurrency: {
+      name: "tRBTC",
+      symbol: "tRBTC",
+      decimals: 18,
+    },
+    blockExplorerUrls: ["https://explorer.testnet.rootstock.io/"],
   },
 };