rootstock testnet re-deployment

V2

src/App.vue

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

src/blockchain/addresses.ts

@@ -1,7 +1,7 @@
 import { useUser } from "@/composables/useUser";
 import { NetworkEnum, TokenEnum } from "@/model/NetworkEnum";
 import { createPublicClient, http, type Address } from "viem";
-import { sepolia, rootstock } from "viem/chains";
+import { sepolia, rootstockTestnet } from "viem/chains";
 
 const Tokens: { [key in NetworkEnum]: { [key in TokenEnum]: Address } } = {
   [NetworkEnum.sepolia]: {
@@ -39,7 +39,7 @@ export const getP2PixAddress = (network?: NetworkEnum): Address => {
   const user = useUser();
   const possibleP2PixAddresses: { [key in NetworkEnum]: Address } = {
     [NetworkEnum.sepolia]: "0xb7cD135F5eFD9760981e02E2a898790b688939fe",
-    [NetworkEnum.rootstock]: "0x98ba35eb14b38D6Aa709338283af3e922476dE34",
+    [NetworkEnum.rootstock]: "0x57Dcba05980761169508886eEdc6f5E7EC0411Dc",
   };
 
   return possibleP2PixAddresses[
@@ -58,7 +58,7 @@ export const getProviderUrl = (network?: NetworkEnum): string => {
 };
 
 export const getProviderByNetwork = (network: NetworkEnum) => {
-  const chain = network === NetworkEnum.sepolia ? sepolia : rootstock;
+  const chain = network === NetworkEnum.sepolia ? sepolia : rootstockTestnet;
   return createPublicClient({
     chain,
     transport: http(getProviderUrl(network)),

src/blockchain/buyerMethods.ts

@@ -1,15 +1,9 @@
 import { getContract } from "./provider";
 import { getTokenAddress } from "./addresses";
 import {
-  bytesToHex,
-  encodeAbiParameters,
-  keccak256,
-  parseAbiParameters,
   parseEther,
-  stringToBytes,
-  stringToHex,
-  toBytes,
   type Address,
+  type TransactionReceipt,
 } from "viem";
 import type { TokenEnum } from "@/model/NetworkEnum";
 
@@ -69,24 +63,20 @@ export const withdrawDeposit = async (
 
 export const releaseLock = async (
   lockID: bigint,
-  pixtarget: string,
+  pixTimestamp: `0x${string}`&{lenght:34},
-  signature: string
+  signature: `0x${string}`
-): Promise<any> => {
+): Promise<TransactionReceipt> => {
   const { address, abi, wallet, client, account } = await getContract();
 
-  console.log("Releasing lock", { lockID, pixtarget, signature });
   if (!wallet) {
     throw new Error("Wallet not connected");
   }
 
-  // Convert pixtarget to bytes32
-  const pixTimestamp = keccak256(stringToHex(pixtarget, { size: 32 }) );
-
   const { request } = await client.simulateContract({
     address,
     abi,
     functionName: "release",
-    args: [BigInt(lockID), pixTimestamp, stringToHex(signature)],
+    args: [BigInt(lockID), pixTimestamp, signature],
     account
   });
 

src/blockchain/events.ts

@@ -32,8 +32,8 @@ const getNetworksLiquidity = async (): Promise<void> => {
 };
 
 const getParticipantID = async (
-  seller: string,
+  seller: Address,
-  token: string
+  token: Address
 ): Promise<string> => {
   const { address, abi, client } = await getContract();
 

src/blockchain/provider.ts

@@ -9,7 +9,7 @@ import {
   PublicClient,
   WalletClient,
 } from "viem";
-import { sepolia, rootstock } from "viem/chains";
+import { sepolia, rootstockTestnet } from "viem/chains";
 import { useUser } from "@/composables/useUser";
 
 let walletClient: WalletClient | null = null;
@@ -19,7 +19,7 @@ const getPublicClient = (): PublicClient => {
     const rpcUrl = getProviderUrl();
     return createPublicClient({
       chain:
-        Number(user.networkName.value) === sepolia.id ? sepolia : rootstock,
+        Number(user.networkName.value) === sepolia.id ? sepolia : rootstockTestnet,
       transport: http(rpcUrl),
     });
 };
@@ -46,7 +46,7 @@ const getContract = async (onlyRpcProvider = false) => {
 const connectProvider = async (p: any): Promise<void> => {
   const user = useUser();
   const chain =
-    Number(user.networkName.value) === sepolia.id ? sepolia : rootstock;
+    Number(user.networkName.value) === sepolia.id ? sepolia : rootstockTestnet;
 
   const [account] = await p!.request({ method: "eth_requestAccounts" });
 

src/blockchain/sellerMethods.ts

@@ -1,7 +1,7 @@
 import { getContract, getPublicClient, getWalletClient } from "./provider";
 import { getTokenAddress, getP2PixAddress } from "./addresses";
 import { parseEther, toHex } from "viem";
-import { sepolia, rootstock } from "viem/chains";
+import { sepolia, rootstockTestnet } from "viem/chains";
 
 import { mockTokenAbi } from "./abi";
 import { useUser } from "@/composables/useUser";
@@ -33,7 +33,7 @@ const approveTokens = async (participant: Participant): Promise<any> => {
 
   if ( allowance < parseEther(participant.offer.toString()) ) {
     // Approve tokens
-    const chain = user.networkId.value === sepolia.id ? sepolia : rootstock;
+    const chain = user.networkId.value === sepolia.id ? sepolia : rootstockTestnet;
     const hash = await walletClient.writeContract({
       address: tokenAddress,
       abi: mockTokenAbi,
@@ -65,7 +65,7 @@ const addDeposit = async (): Promise<any> => {
   if (!sellerId.id) {
     throw new Error("Failed to create participant");
   }
-  const chain = user.networkId.value === sepolia.id ? sepolia : rootstock;
+  const chain = user.networkId.value === sepolia.id ? sepolia : rootstockTestnet;
   const hash = await walletClient.writeContract({
     address,
     abi,

src/blockchain/wallet.ts

@@ -1,4 +1,4 @@
-import { formatEther, hexToString, type Address } from "viem";
+import { formatEther, type Address } from "viem";
 import { useUser } from "@/composables/useUser";
 
 import { getPublicClient, getWalletClient, getContract } from "./provider";
@@ -463,18 +463,3 @@ 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 { getSellerParticipantId } from "@/blockchain/wallet";
+import { getParticipantID } from "@/blockchain/events";
 import { getUnreleasedLockById } from "@/blockchain/events";
 import QRCode from "qrcode";
 
@@ -18,7 +18,7 @@ const props = defineProps<Props>();
 const qrCode = ref<string>("");
 const qrCodeSvg = ref<string>("");
 const showWarnModal = ref<boolean>(true);
-const pixTarget = ref<string>("");
+const pixTimestamp = ref<string>("");
 const releaseSignature = ref<string>("");
 const solicitationData = ref<any>(null);
 const pollingInterval = ref<NodeJS.Timeout | null>(null);
@@ -56,7 +56,7 @@ const checkSolicitationStatus = async () => {
     );
 
     if (response.signature) {
-      pixTarget.value = response.pixTarget;
+      pixTimestamp.value = response.pixTimestamp;
       releaseSignature.value = response.signature;
       // Stop polling when payment is confirmed
       if (pollingInterval.value) {
@@ -86,7 +86,7 @@ onMounted(async () => {
       BigInt(props.lockID)
     );
 
-    const participantId = await getSellerParticipantId(
+    const participantId = await getParticipantID(
       sellerAddress,
       tokenAddress
     );
@@ -170,7 +170,7 @@ onUnmounted(() => {
           releaseSignature ? 'Enviar para a rede' : 'Validando pagamento...'
         "
         @button-clicked="
-          emit('pixValidated', { pixTarget, signature: releaseSignature })
+          emit('pixValidated', { pixTimestamp, signature: releaseSignature })
         "
       />
     </div>

src/composables/useUser.ts

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

src/model/Networks.ts

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

src/utils/bbPay.ts

@@ -61,15 +61,15 @@ export const createSolicitation = async (offer: Offer) => {
   return response.json();
 };
 
-export const getSolicitation = async (id: string) => {
+export const getSolicitation = async (id: bigint): Promise<{pixTimestamp: `0x${string}`, signature: `0x${string}`}> => {
   const response = await fetch(
     `${import.meta.env.VITE_APP_API_URL}/release/${id}`
   );
 
-  const obj: any = await response.json();
+  const obj = await response.json();
 
   return {
-    pixTarget: obj.pixTarget,
+    pixTimestamp: obj.pixTimestamp,
     signature: obj.signature,
   };
 };

src/views/HomeView.vue

@@ -59,19 +59,15 @@ const confirmBuyClick = async (
   }
 };
 
-const releaseTransaction = async ({
+const releaseTransaction = async (params: {
-  pixTarget,
+  pixTimestamp: `0x${string}`&{lenght:34},
-  signature,
+  signature: `0x${string}`,
-}: {
-  pixTarget: string;
-  signature: string;
 }) => {
   flowStep.value = Step.List;
   showBuyAlert.value = true;
   loadingRelease.value = true;
 
-  const release = await releaseLock(BigInt(lockID.value), pixTarget, signature);
+  const release = await releaseLock(BigInt(lockID.value), params.pixTimestamp, params.signature);
-  await release.wait();
 
   await updateWalletStatus();
   loadingRelease.value = false;