diff --git a/src/components/ui/NetworkSelector.vue b/src/components/ui/NetworkSelector.vue
index 59f0e0a..0920648 100644
--- a/src/components/ui/NetworkSelector.vue
+++ b/src/components/ui/NetworkSelector.vue
@@ -1,16 +1,16 @@
diff --git a/src/composables/useUser.ts b/src/composables/useUser.ts
index f2402c4..4117696 100644
--- a/src/composables/useUser.ts
+++ b/src/composables/useUser.ts
@@ -1,15 +1,14 @@
import { ref } from "vue";
-import { NetworkEnum, TokenEnum } from "../model/NetworkEnum";
import type { ValidDeposit } from "@/model/ValidDeposit";
import type { Participant } from "../utils/bbPay";
import type { Address } from "viem"
-import { DEFAULT_NETWORK, getNetworkConfig } from "@/config/networks";
+import { DEFAULT_NETWORK, Networks } from "@/config/networks";
+import { TokenEnum, NetworkConfig } from "@/model/NetworkEnum"
const walletAddress = ref(null);
const balance = ref("");
-const networkId = ref(parseInt(getNetworkConfig(DEFAULT_NETWORK).chainId, 16));
-const networkName = ref(DEFAULT_NETWORK);
-const selectedToken = ref(TokenEnum.BRZ);
+const network = ref(DEFAULT_NETWORK);
+const selectedToken = ref(TokenEnum.BRZ);
const loadingLock = ref(false);
const sellerView = ref(false);
const depositsValidList = ref([]);
@@ -32,9 +31,29 @@ export function useUser() {
selectedToken.value = token;
};
- const setNetworkId = (network: string | number) => {
- networkName.value = Number(network) as NetworkEnum || DEFAULT_NETWORK;
- networkId.value = Number(network);
+ const setNetwork = (chain: NetworkConfig) => {
+ network.value = chain;
+ };
+
+ const setNetworkById = (id: string | number) => {
+ let chainId: number;
+
+ if (typeof id === 'string') {
+ // Parse hex string or number string to number
+ if (id.startsWith('0x')) {
+ chainId = parseInt(id, 16);
+ } else {
+ chainId = parseInt(id, 10);
+ }
+ } else {
+ chainId = id;
+ }
+
+ // Find network by chain ID
+ const chain = Object.values(Networks).find(n => n.id === chainId);
+ if (chain) {
+ network.value = chain;
+ }
};
const setLoadingLock = (isLoading: boolean) => {
@@ -76,8 +95,7 @@ export function useUser() {
// State
walletAddress,
balance,
- networkId,
- networkName,
+ network,
selectedToken,
loadingLock,
sellerView,
@@ -91,7 +109,8 @@ export function useUser() {
setWalletAddress,
setBalance,
setSelectedToken,
- setNetworkId,
+ setNetwork,
+ setNetworkById,
setLoadingLock,
setSellerView,
setDepositsValidList,
diff --git a/src/config/networks.ts b/src/config/networks.ts
index 3658801..0192dad 100644
--- a/src/config/networks.ts
+++ b/src/config/networks.ts
@@ -1,103 +1,24 @@
-import { NetworkEnum } from "@/model/NetworkEnum";
-import { sepolia, rootstockTestnet, type Chain } from "viem/chains";
+import { sepolia, rootstockTestnet } from "viem/chains";
+import { NetworkConfig } from "@/model/NetworkEnum"
+// TODO: import addresses from p2pix-smart-contracts deployments
-export interface NetworkConfig {
- id: NetworkEnum;
- chainId: string;
- chainName: string;
- token: string;
- rpcUrl: string;
- blockExplorerUrl: string;
- iconPath: string;
- viemChain: Chain;
- contracts: {
- p2pixAddress: string;
- tokenAddresses: Record;
- };
-}
-
-export const NETWORK_CONFIGS: Record = {
- [NetworkEnum.sepolia]: {
- id: NetworkEnum.sepolia,
- chainId: "0xAA36A7",
- chainName: "Sepolia Testnet",
- token: "ETH",
- rpcUrl: import.meta.env.VITE_SEPOLIA_API_URL,
- blockExplorerUrl: "https://sepolia.etherscan.io",
- iconPath: "/ethereum.svg",
- viemChain: sepolia,
- contracts: {
- p2pixAddress: "0xb7cD135F5eFD9760981e02E2a898790b688939fe",
- tokenAddresses: {
- BRZ: "0x3eBE67A2C7bdB2081CBd34ba3281E90377462289",
- },
- },
+export const Networks: {[key:string]: NetworkConfig} = {
+ sepolia: { ...sepolia,
+ rpcUrls: { default: { http: [import.meta.env.VITE_SEPOLIA_API_URL]}},
+ contracts: { ...sepolia.contracts,
+ p2pix: {address:"0xb7cD135F5eFD9760981e02E2a898790b688939fe"} },
+ tokens: {
+ BRZ: {address:"0x3eBE67A2C7bdB2081CBd34ba3281E90377462289"} },
+ subgraphUrls: [import.meta.env.VITE_SEPOLIA_SUBGRAPH_URL]
},
- [NetworkEnum.rootstock]: {
- id: NetworkEnum.rootstock,
- chainId: "0x1F",
- chainName: "Rootstock Testnet",
- token: "tRBTC",
- rpcUrl: import.meta.env.VITE_ROOTSTOCK_API_URL,
- blockExplorerUrl: "https://explorer.testnet.rsk.co",
- iconPath: "/rootstock.svg",
- viemChain: rootstockTestnet,
- contracts: {
- p2pixAddress: "0x57Dcba05980761169508886eEdc6f5E7EC0411Dc",
- tokenAddresses: {
- BRZ: "0xfE841c74250e57640390f46d914C88d22C51e82e",
- },
- },
+ rootstockTestnet: { ...rootstockTestnet,
+ rpcUrls: { default: { http: [import.meta.env.VITE_RSK_API_URL]}},
+ contracts: { ...rootstockTestnet.contracts,
+ p2pix: {address:"0x57Dcba05980761169508886eEdc6f5E7EC0411Dc"} },
+ tokens: {
+ BRZ: {address:"0xfE841c74250e57640390f46d914C88d22C51e82e"} },
+ subgraphUrls: [import.meta.env.VITE_RSK_SUBGRAPH_URL]
},
};
-export const DEFAULT_NETWORK = NetworkEnum.sepolia;
-
-export const ENABLED_NETWORKS: NetworkEnum[] = [
- NetworkEnum.sepolia,
- NetworkEnum.rootstock,
-];
-
-export const getNetworkConfig = (networkId: NetworkEnum): NetworkConfig => {
- return NETWORK_CONFIGS[networkId];
-};
-
-export const getEnabledNetworks = (): NetworkConfig[] => {
- return ENABLED_NETWORKS.map(id => NETWORK_CONFIGS[id]);
-};
-
-export const isNetworkEnabled = (networkId: NetworkEnum): boolean => {
- return ENABLED_NETWORKS.includes(networkId);
-};
-
-export const getNetworkByChainId = (chainId: string): NetworkConfig | null => {
- const network = Object.values(NETWORK_CONFIGS).find(
- config => config.chainId === chainId
- );
- return network || null;
-};
-
-export const getContractAddress = (
- networkId: NetworkEnum,
- contractType: 'p2pix' | string
-): string => {
- const config = getNetworkConfig(networkId);
-
- if (contractType === 'p2pix') {
- return config.contracts.p2pixAddress;
- }
-
- return config.contracts.tokenAddresses[contractType] || '';
-};
-
-export const getRpcUrl = (networkId: NetworkEnum): string => {
- return getNetworkConfig(networkId).rpcUrl;
-};
-
-export const getBlockExplorerUrl = (networkId: NetworkEnum): string => {
- return getNetworkConfig(networkId).blockExplorerUrl;
-};
-
-export const getViemChain = (networkId: NetworkEnum): Chain => {
- return getNetworkConfig(networkId).viemChain;
-};
+export const DEFAULT_NETWORK = Networks.sepolia;
diff --git a/src/model/NetworkEnum.ts b/src/model/NetworkEnum.ts
index 8dd7978..cd07f1e 100644
--- a/src/model/NetworkEnum.ts
+++ b/src/model/NetworkEnum.ts
@@ -1,18 +1,10 @@
-export enum NetworkEnum {
- sepolia = 11155111,
- rootstock = 31,
-}
-
-export const getNetworkSubgraphURL = (network: NetworkEnum) => {
- const networkMap: Record = {
- [NetworkEnum.sepolia]: import.meta.env.VITE_SEPOLIA_SUBGRAPH_URL || "",
- [NetworkEnum.rootstock]: import.meta.env.VITE_RSK_SUBGRAPH_URL || "",
- };
-
- return networkMap[network] || "";
-};
+import type { Chain, ChainContract } from "viem";
export enum TokenEnum {
- BRZ = "BRZ",
+ BRZ = 'BRZ',
// BRX = 'BRX'
}
+export type NetworkConfig = Chain & {
+ tokens: Record,
+ subgraphUrls: string[]
+};
diff --git a/src/model/Networks.ts b/src/model/Networks.ts
deleted file mode 100644
index a136e11..0000000
--- a/src/model/Networks.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import { NetworkEnum } from "@/model/NetworkEnum";
-import { getNetworkConfig } from "@/config/networks";
-
-export interface NetworkConfig {
- chainId: string;
- chainName: string;
- token: string;
- rpcUrl?: string;
- blockExplorerUrl?: string;
-}
-
-// Mapeamento para compatibilidade com código existente
-export const Networks: { [key in NetworkEnum]: NetworkConfig } = {
- [NetworkEnum.sepolia]: {
- chainId: getNetworkConfig(NetworkEnum.sepolia).chainId,
- chainName: getNetworkConfig(NetworkEnum.sepolia).chainName,
- token: getNetworkConfig(NetworkEnum.sepolia).token,
- rpcUrl: getNetworkConfig(NetworkEnum.sepolia).rpcUrl,
- blockExplorerUrl: getNetworkConfig(NetworkEnum.sepolia).blockExplorerUrl,
- },
- [NetworkEnum.rootstock]: {
- chainId: getNetworkConfig(NetworkEnum.rootstock).chainId,
- chainName: getNetworkConfig(NetworkEnum.rootstock).chainName,
- token: getNetworkConfig(NetworkEnum.rootstock).token,
- rpcUrl: getNetworkConfig(NetworkEnum.rootstock).rpcUrl,
- blockExplorerUrl: getNetworkConfig(NetworkEnum.rootstock).blockExplorerUrl,
- },
-};
diff --git a/src/model/ValidDeposit.ts b/src/model/ValidDeposit.ts
index 8cad7e8..a910076 100644
--- a/src/model/ValidDeposit.ts
+++ b/src/model/ValidDeposit.ts
@@ -1,5 +1,5 @@
-import { NetworkEnum } from "./NetworkEnum";
import type { Address } from "viem";
+import type { NetworkConfig } from "@/model/NetworkEnum";
export type ValidDeposit = {
token: Address;
@@ -7,6 +7,6 @@ export type ValidDeposit = {
remaining: number;
seller: Address;
participantID: string;
- network: NetworkEnum;
+ network: NetworkConfig;
open?: boolean;
};
diff --git a/src/utils/imagesPath.ts b/src/utils/imagesPath.ts
index 5100d43..5487400 100644
--- a/src/utils/imagesPath.ts
+++ b/src/utils/imagesPath.ts
@@ -1,30 +1,11 @@
import type { TokenEnum } from "@/model/NetworkEnum";
-
-export const imagesPath = import.meta.glob("@/assets/*.{png,svg}", {
- eager: true,
- query: "?url",
- import: "default",
-});
+import { Networks } from "@/config/networks";
export const getNetworkImage = (networkName: string): string => {
- try {
- const path = Object.keys(imagesPath).find((key) =>
- key.endsWith(`${networkName.toLowerCase()}.svg`)
- );
- 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 "";
- }
+ const normalizedName = networkName.toLowerCase().replace(/[^a-z0-9]/g, '-');
+ return new URL(`../assets/networks/${normalizedName}.svg`, import.meta.url).href;
};
export const getTokenImage = (tokenName: TokenEnum): string => {
- const path = Object.keys(imagesPath).find((key) =>
- key.endsWith(`${tokenName.toLowerCase()}.svg`)
- );
- return path ? imagesPath[path] : "";
+ return new URL(`../assets/tokens/${tokenName.toLowerCase()}.svg`, import.meta.url).href;
};
diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue
index 934a5d4..babf3ba 100644
--- a/src/views/HomeView.vue
+++ b/src/views/HomeView.vue
@@ -24,7 +24,7 @@ const user = useUser();
user.setSellerView(false);
// States
-const { loadingLock, walletAddress, networkName } = user;
+const { loadingLock, walletAddress, network } = user;
const flowStep = ref(Step.Search);
const participantID = ref();
const sellerAddress = ref();
@@ -103,7 +103,7 @@ if (paramLockID) {
await checkForUnreleasedLocks();
});
- watch(networkName, async () => {
+ watch(network, async () => {
if (walletAddress.value) await checkForUnreleasedLocks();
});
}
diff --git a/src/views/ManageBidsView.vue b/src/views/ManageBidsView.vue
index 5d831db..d6733fc 100644
--- a/src/views/ManageBidsView.vue
+++ b/src/views/ManageBidsView.vue
@@ -16,7 +16,7 @@ import type { WalletTransaction } from "@/model/WalletTransaction";
import router from "@/router/index";
const user = useUser();
-const { walletAddress, networkName, selectedToken } = user;
+const { walletAddress, network, selectedToken } = user;
const loadingWithdraw = ref(false);
const showAlert = ref(false);
@@ -29,7 +29,9 @@ const callWithdraw = async (amount: string) => {
loadingWithdraw.value = true;
let withdraw;
try {
- withdraw = await withdrawDeposit(amount, selectedToken.value);
+ withdraw = await withdrawDeposit(
+ amount,
+ network.value.tokens[selectedToken.value].address);
} catch {
loadingWithdraw.value = false;
}
@@ -79,7 +81,7 @@ watch(walletAddress, async () => {
await getWalletTransactions();
});
-watch(networkName, async () => {
+watch(network, async () => {
await getWalletTransactions();
});