Görli -> Sepolia

src/blockchain/addresses.ts

@@ -5,8 +5,9 @@ const getTokenAddress = (network?: NetworkEnum): string => {
   const etherStore = useEtherStore();
 
   const possibleTokenAddresses: { [key: string]: string } = {
-    Ethereum: "0x4A2886EAEc931e04297ed336Cc55c4eb7C75BA00",
+    Ethereum: "0x3eBE67A2C7bdB2081CBd34ba3281E90377462289",
     Polygon: "0xC86042E9F2977C62Da8c9dDF7F9c40fde4796A29",
+    Rootstock: "0xfE841c74250e57640390f46d914C88d22C51e82e",
   };
 
   return possibleTokenAddresses[network ? network : etherStore.networkName];
@@ -16,8 +17,9 @@ const getP2PixAddress = (network?: NetworkEnum): string => {
   const etherStore = useEtherStore();
 
   const possibleP2PixAddresses: { [key: string]: string } = {
-    Ethereum: "0x2414817FF64A114d91eCFA16a834d3fCf69103d4",
+    Ethereum: "0xb7cD135F5eFD9760981e02E2a898790b688939fe",
     Polygon: "0x4A2886EAEc931e04297ed336Cc55c4eb7C75BA00",
+    Rootstock: "0x98ba35eb14b38D6Aa709338283af3e922476dE34",
   };
 
   return possibleP2PixAddresses[network ? network : etherStore.networkName];
@@ -27,28 +29,29 @@ const getProviderUrl = (): string => {
   const etherStore = useEtherStore();
 
   const possibleProvidersUrls: { [key: string]: string } = {
-    Ethereum: import.meta.env.VITE_GOERLI_API_URL,
+    Ethereum: import.meta.env.VITE_SEPOLIA_API_URL,
     Polygon: import.meta.env.VITE_MUMBAI_API_URL,
+    Rootstock: import.meta.env.VITE_RSK_API_URL,
   };
 
   return possibleProvidersUrls[etherStore.networkName];
 };
 
 const possibleChains: { [key: string]: NetworkEnum } = {
-  "0x5": NetworkEnum.ethereum,
+  "11155111": NetworkEnum.ethereum,
-  "5": NetworkEnum.ethereum,
-  "0x13881": NetworkEnum.polygon,
   "80001": NetworkEnum.polygon,
+  "31": NetworkEnum.rootstock,
 };
 
 const network2Chain: { [key: string]: string } = {
-  Ethereum: "0x5",
+  Ethereum: "0xAA36A7",
   Polygon: "0x13881",
   Localhost: "0x7a69",
+  Rootstock: "0x1f",
 };
 
 const isPossibleNetwork = (networkChain: string): boolean => {
-  if (Object.keys(possibleChains).includes(networkChain)) {
+  if (Object.keys(possibleChains).includes(networkChain.toString())) {
     return true;
   }
   return false;

src/blockchain/events.ts

@@ -13,19 +13,23 @@ import type { Pix } from "@/model/Pix";
 const getNetworksLiquidity = async (): Promise<void> => {
   const etherStore = useEtherStore();
 
-  const goerliProvider = new ethers.providers.JsonRpcProvider(
+  const sepoliaProvider = new ethers.providers.JsonRpcProvider(
-    import.meta.env.VITE_GOERLI_API_URL,
+    import.meta.env.VITE_SEPOLIA_API_URL,
-    5
+    11155111
-  ); // goerli provider
+  ); // sepolia provider
   const mumbaiProvider = new ethers.providers.JsonRpcProvider(
     import.meta.env.VITE_MUMBAI_API_URL,
     80001
   ); // mumbai provider
+  const rootstockProvider = new ethers.providers.JsonRpcProvider(
+    import.meta.env.VITE_RSK_API_URL,
+    31
+  ); // rootstock provider
 
-  const p2pContractGoerli = new ethers.Contract(
+  const p2pContractSepolia = new ethers.Contract(
     getP2PixAddress(NetworkEnum.ethereum),
     p2pix.abi,
-    goerliProvider
+    sepoliaProvider
   );
   const p2pContractMumbai = new ethers.Contract(
     getP2PixAddress(NetworkEnum.polygon),
@@ -33,19 +37,32 @@ const getNetworksLiquidity = async (): Promise<void> => {
     mumbaiProvider
   );
 
-  etherStore.setLoadingNetworkLiquidity(true);
+  const p2pContractRootstock = new ethers.Contract(
-  const depositListGoerli = await getValidDeposits(
+    getP2PixAddress(NetworkEnum.rootstock),
-    getTokenAddress(NetworkEnum.ethereum),
+    p2pix.abi,
-    p2pContractGoerli
+    rootstockProvider
   );
 
+  etherStore.setLoadingNetworkLiquidity(true);
+
+  const depositListSepolia = await getValidDeposits(
+    getTokenAddress(NetworkEnum.ethereum),
+    p2pContractSepolia
+  ); 
+
   const depositListMumbai = await getValidDeposits(
     getTokenAddress(NetworkEnum.polygon),
     p2pContractMumbai
   );
 
-  etherStore.setDepositsValidListGoerli(depositListGoerli);
+  const depositListRootstock = await getValidDeposits(
+    getTokenAddress(NetworkEnum.rootstock),
+    p2pContractRootstock
+  );
+
+  etherStore.setDepositsValidListSepolia(depositListSepolia);
   etherStore.setDepositsValidListMumbai(depositListMumbai);
+  etherStore.setDepositsValidListRootstock(depositListRootstock);
   etherStore.setLoadingNetworkLiquidity(false);
 };
 

src/blockchain/wallet.ts

@@ -1,7 +1,7 @@
 import { useEtherStore } from "@/store/ether";
 
 import { getContract, getProvider } from "./provider";
-import { getTokenAddress, possibleChains } from "./addresses";
+import { getTokenAddress, possibleChains, isPossibleNetwork } from "./addresses";
 
 import mockToken from "@/utils/smart_contract_files/MockToken.json";
 
@@ -21,6 +21,10 @@ const updateWalletStatus = async (): Promise<void> => {
   const signer = provider.getSigner();
 
   const { chainId } = await provider.getNetwork();
+  if(!isPossibleNetwork(chainId.toString())){
+    window.alert("Invalid chain!:"+chainId);
+    return;
+  }
   etherStore.setNetworkName(possibleChains[chainId]);
 
   const mockTokenContract = new ethers.Contract(

src/components/ListingComponent/ListingComponent.vue

@@ -107,7 +107,7 @@ const showInitialItems = (): void => {
 const openEtherscanUrl = (transactionHash: string): void => {
   const networkUrl =
     etherStore.networkName == NetworkEnum.ethereum
-      ? "goerli.etherscan.io"
+      ? "sepolia.etherscan.io"
       : "mumbai.polygonscan.com";
   const url = `https://${networkUrl}/tx/${transactionHash}`;
   window.open(url, "_blank");

src/components/SearchComponent.vue

@@ -17,7 +17,7 @@ const etherStore = useEtherStore();
 const {
   walletAddress,
   networkName,
-  depositsValidListGoerli,
+  depositsValidListSepolia,
   depositsValidListMumbai,
   loadingNetworkLiquidity,
 } = storeToRefs(etherStore);
@@ -28,8 +28,9 @@ const enableConfirmButton = ref<boolean>(false);
 const enableWalletButton = ref<boolean>(false);
 const hasLiquidity = ref<boolean>(true);
 const validDecimals = ref<boolean>(true);
-const selectedGoerliDeposit = ref<ValidDeposit>();
+const selectedSepoliaDeposit = ref<ValidDeposit>();
 const selectedMumbaiDeposit = ref<ValidDeposit>();
+const selectedRootstockDeposit = ref<ValidDeposit>();
 
 // Emits
 const emit = defineEmits(["tokenBuy"]);
@@ -44,7 +45,7 @@ const connectAccount = async (): Promise<void> => {
 const emitConfirmButton = (): void => {
   const selectedDeposit =
     networkName.value == NetworkEnum.ethereum
-      ? selectedGoerliDeposit.value
+      ? selectedSepoliaDeposit.value
       : selectedMumbaiDeposit.value;
   emit("tokenBuy", selectedDeposit, tokenValue.value);
 };
@@ -68,18 +69,19 @@ const handleInputEvent = (event: any): void => {
 // Verify if there is a valid deposit to buy
 const verifyLiquidity = (): void => {
   enableConfirmButton.value = false;
-  selectedGoerliDeposit.value = undefined;
+  selectedSepoliaDeposit.value = undefined;
   selectedMumbaiDeposit.value = undefined;
+  selectedRootstockDeposit.value = undefined;
 
   if (tokenValue.value <= 0) {
     enableWalletButton.value = false;
     return;
   }
 
-  selectedGoerliDeposit.value = verifyNetworkLiquidity(
+  selectedSepoliaDeposit.value = verifyNetworkLiquidity(
     tokenValue.value,
     walletAddress.value,
-    depositsValidListGoerli.value
+    depositsValidListSepolia.value
   );
   selectedMumbaiDeposit.value = verifyNetworkLiquidity(
     tokenValue.value,
@@ -88,7 +90,7 @@ const verifyLiquidity = (): void => {
   );
 
   enableOrDisableConfirmButton();
-  if (selectedGoerliDeposit.value || selectedMumbaiDeposit.value) {
+  if (selectedSepoliaDeposit.value || selectedMumbaiDeposit.value) {
     hasLiquidity.value = true;
     enableWalletButton.value = true;
   } else {
@@ -98,7 +100,7 @@ const verifyLiquidity = (): void => {
 };
 
 const enableOrDisableConfirmButton = (): void => {
-  if (selectedGoerliDeposit.value && networkName.value == NetworkEnum.ethereum)
+  if (selectedSepoliaDeposit.value && networkName.value == NetworkEnum.ethereum)
     enableConfirmButton.value = true;
   else if (
     selectedMumbaiDeposit.value &&
@@ -183,7 +185,7 @@ watch(walletAddress, (): void => {
               src="@/assets/ethereum.svg"
               width="24"
               height="24"
-              v-if="selectedGoerliDeposit"
+              v-if="selectedSepoliaDeposit"
             />
           </div>
         </div>

src/components/TopBar/TopBar.vue

@@ -7,6 +7,7 @@ import { NetworkEnum } from "@/model/NetworkEnum";
 import { connectProvider, requestNetworkChange } from "@/blockchain/provider";
 import ethereumImage from "@/assets/ethereum.svg";
 import polygonImage from "@/assets/polygon.svg";
+import rootstockImage from "@/assets/rootstock.svg";
 
 // Store reference
 const etherStore = useEtherStore();
@@ -58,6 +59,7 @@ const getNetworkImage = (networkName: NetworkEnum): string => {
   let validImages = {
     Ethereum: ethereumImage,
     Polygon: polygonImage,
+    Rootstock: rootstockImage,
     Localhost: ethereumImage,
   };
 
@@ -233,6 +235,8 @@ onClickOutside(infoMenuRef, () => {
           <img
             alt="Choosed network image"
             :src="getNetworkImage(etherStore.networkName)"
+            height="24"
+            width="24"
           />
           <span
             class="default-text group-hover:text-gray-900 lg-view"
@@ -269,6 +273,23 @@ onClickOutside(infoMenuRef, () => {
         >
           <div class="mt-2">
             <div class="bg-white rounded-md z-10">
+              <div
+                class="menu-button gap-2 px-4 rounded-md cursor-pointer"
+                @click="networkChange(NetworkEnum.rootstock)"
+              >
+                <img
+                  alt="Rootstock image"
+                  width="20"
+                  height="20"
+                  src="@/assets/rootstock.svg"
+                />
+                <span class="text-gray-900 py-4 text-end font-semibold text-sm">
+                  Rootstock
+                </span>
+              </div>
+              <div class="w-full flex justify-center">
+                <hr class="w-4/5" />
+              </div>
               <div
                 class="menu-button gap-2 px-4 rounded-md cursor-pointer"
                 @click="networkChange(NetworkEnum.ethereum)"
@@ -468,6 +489,23 @@ onClickOutside(infoMenuRef, () => {
     >
       <div class="pl-4 mt-2 h-full">
         <div class="bg-white rounded-md z-10 h-full">
+          <div
+            class="menu-button gap-2 sm:px-4 rounded-md cursor-pointer py-2"
+            @click="networkChange(NetworkEnum.rootstock)"
+          >
+            <img
+              alt="Rootstock image"
+              width="20"
+              height="20"
+              src="@/assets/rootstock.svg"
+            />
+            <span class="text-gray-900 py-4 text-end font-bold text-sm">
+              Rootstock
+            </span>
+          </div>
+          <div class="w-full flex justify-center pb-12">
+            <hr class="w-4/5" />
+          </div>
           <div
             class="menu-button gap-2 sm:px-4 rounded-md cursor-pointer py-2"
             @click="networkChange(NetworkEnum.ethereum)"

src/model/NetworkEnum.ts

@@ -1,4 +1,5 @@
 export enum NetworkEnum {
   ethereum = "Ethereum",
   polygon = "Polygon",
+  rootstock = "Rootstock",
 }

src/store/ether.ts

@@ -9,10 +9,12 @@ export const useEtherStore = defineStore("ether", {
     networkName: NetworkEnum.ethereum,
     loadingLock: false,
     sellerView: false,
-    // Depósitos válidos para compra GOERLI
+    // Depósitos válidos para compra SEPOLIA
-    depositsValidListGoerli: [] as ValidDeposit[],
+    depositsValidListSepolia: [] as ValidDeposit[],
     // Depósitos válidos para compra MUMBAI
     depositsValidListMumbai: [] as ValidDeposit[],
+    // Depósitos válidos para compra ROOTSTOCK
+    depositsValidListRootstock: [] as ValidDeposit[],
     loadingWalletTransactions: false,
     loadingNetworkLiquidity: false,
   }),
@@ -32,12 +34,15 @@ export const useEtherStore = defineStore("ether", {
     setSellerView(sellerView: boolean) {
       this.sellerView = sellerView;
     },
-    setDepositsValidListGoerli(depositsValidList: ValidDeposit[]) {
+    setDepositsValidListSepolia(depositsValidList: ValidDeposit[]) {
-      this.depositsValidListGoerli = depositsValidList;
+      this.depositsValidListSepolia = depositsValidList;
     },
     setDepositsValidListMumbai(depositsValidList: ValidDeposit[]) {
       this.depositsValidListMumbai = depositsValidList;
     },
+    setDepositsValidListRootstock(depositsValidList: ValidDeposit[]) {
+      this.depositsValidListRootstock = depositsValidList;
+    },
     setLoadingWalletTransactions(isLoadingWalletTransactions: boolean) {
       this.loadingWalletTransactions = isLoadingWalletTransactions;
     },
@@ -49,7 +54,7 @@ export const useEtherStore = defineStore("ether", {
   getters: {
     getValidDepositByWalletAddress: (state) => {
       return (walletAddress: string) =>
-        state.depositsValidListGoerli
+        state.depositsValidListSepolia
           .filter((deposit) => deposit.seller == walletAddress)
           .sort((a, b) => {
             return b.blockNumber - a.blockNumber;