hueso/P2Pix-Front-End
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix connect provider call and lint

Browse Source 
Co-authored-by: brunoedcf <brest.dallacosta@outlook.com>
This commit is contained in:
RcleydsonR 2023-01-12 19:47:11 -03:00
parent f8e1b888ba
commit a5d5c0dde3
3 changed files with 85 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

108
src/blockchain/provider.ts
View File

@ -4,71 +4,69 @@ import { NetworkEnum } from "@/model/NetworkEnum";
import { updateWalletStatus } from "./wallet"; import { updateWalletStatus } from "./wallet";
const getProviderUrl = (): string => { const getProviderUrl = (): string => {
const etherStore = useEtherStore(); const etherStore = useEtherStore();
const possibleProvidersUrls: {[key: string]: string} = { const possibleProvidersUrls: { [key: string]: string } = {
Ethereum: import.meta.env.VITE_GOERLI_API_URL, Ethereum: import.meta.env.VITE_GOERLI_API_URL,
Polygon: import.meta.env.VITE_MUMBAI_API_URL, Polygon: import.meta.env.VITE_MUMBAI_API_URL,
Localhost: import.meta.env.VITE_GOERLI_API_URL Localhost: import.meta.env.VITE_GOERLI_API_URL,
} };
return possibleProvidersUrls[etherStore.networkName] return possibleProvidersUrls[etherStore.networkName];
} };
const getProvider = (): ethers.providers.Web3Provider | ethers.providers.JsonRpcProvider => { const getProvider = ():
const window_ = window as any; | ethers.providers.Web3Provider
const connection = window_.ethereum; | ethers.providers.JsonRpcProvider => {
const window_ = window as any;
if (!connection) const connection = window_.ethereum;
return new ethers.providers.JsonRpcProvider(getProviderUrl()); // alchemy provider
return new ethers.providers.Web3Provider(connection); // metamask provider if (!connection)
return new ethers.providers.JsonRpcProvider(getProviderUrl()); // alchemy provider
return new ethers.providers.Web3Provider(connection); // metamask provider
}; };
const connectProvider = async (): Promise<void | null> => { const connectProvider = async (): Promise<void | null> => {
const window_ = window as any; const window_ = window as any;
const connection = window_.ethereum; const connection = window_.ethereum;
const provider = getProvider(); const provider = getProvider();
if(!(provider instanceof ethers.providers.Web3Provider)){ if (!(provider instanceof ethers.providers.Web3Provider)) {
window.alert("Please, connect to metamask extension"); window.alert("Please, connect to metamask extension");
return null; return null;
} }
await updateWalletStatus(); await updateWalletStatus();
// await updateValidDeposits(); // await updateValidDeposits();
// await updateDepositAddedEvents(); // await updateDepositAddedEvents();
// await updateLockAddedEvents(); // await updateLockAddedEvents();
// await updateLockReleasedEvents(); // await updateLockReleasedEvents();
listenToNetworkChange(connection); listenToNetworkChange(connection);
listenToWalletChange(connection); listenToWalletChange(connection);
}; };
const listenToWalletChange = (connection: any): void => { const listenToWalletChange = (connection: any): void => {
connection.on("accountsChanged", async () => { connection.on("accountsChanged", async () => {
await updateWalletStatus(); await updateWalletStatus();
}); });
} };
const listenToNetworkChange = (connection: any) => { const listenToNetworkChange = (connection: any) => {
const etherStore = useEtherStore(); const etherStore = useEtherStore();
const possibleNetworks: {[key: string]: NetworkEnum} = {
"0x5": NetworkEnum.ethereum,
"0x13881": NetworkEnum.polygon,
"0x7a69": NetworkEnum.localhost,
}
connection.on("chainChanged", (networkChain: string) => {
if (Object.keys(possibleNetworks).includes(networkChain)){
etherStore.setNetworkName(possibleNetworks[networkChain]);
}
});
}
export { const possibleNetworks: { [key: string]: NetworkEnum } = {
getProvider, "0x5": NetworkEnum.ethereum,
listenToNetworkChange "0x13881": NetworkEnum.polygon,
} "0x7a69": NetworkEnum.localhost,
};
connection.on("chainChanged", (networkChain: string) => {
if (Object.keys(possibleNetworks).includes(networkChain)) {
etherStore.setNetworkName(possibleNetworks[networkChain]);
}
});
};
export { getProvider, connectProvider, listenToNetworkChange };

63
src/blockchain/wallet.ts
View File

@ -1,43 +1,38 @@
import { ethers } from "ethers"; import { ethers } from "ethers";
import { getProvider } from "./provider"; import { getProvider } from "./provider";
import blockchain from "../utils/blockchain" import blockchain from "../utils/blockchain";
import { useEtherStore } from "@/store/ether"; import { useEtherStore } from "@/store/ether";
import mockToken from "../utils/smart_contract_files/MockToken.json"; import mockToken from "../utils/smart_contract_files/MockToken.json";
import addresses from "../utils/smart_contract_files/localhost.json"; import addresses from "../utils/smart_contract_files/localhost.json";
const updateWalletStatus = async () => { const updateWalletStatus = async () => {
const etherStore = useEtherStore(); const etherStore = useEtherStore();
const provider = getProvider(); const provider = getProvider();
if (!provider) return;
const signer = provider.getSigner();
const contract = new ethers.Contract(addresses.token, mockToken.abi, signer);
const walletAddress = await provider.send("eth_requestAccounts", []);
const balance = await contract.balanceOf(walletAddress[0]);
etherStore.setBalance(blockchain.formatBigNumber(balance));
etherStore.setWalletAddress(ethers.utils.getAddress(walletAddress[0]));
};
const updateWalletBalance = async () => {
const etherStore = useEtherStore();
const provider = getProvider();
if (!provider) return;
const signer = provider.getSigner();
const contract = new ethers.Contract(addresses.token, mockToken.abi, signer);
const walletAddress = await provider.send("eth_requestAccounts", []);
const balance = await contract.balanceOf(walletAddress[0]);
etherStore.setBalance(blockchain.formatBigNumber(balance));
};
export { const signer = provider.getSigner();
updateWalletStatus, const contract = new ethers.Contract(addresses.token, mockToken.abi, signer);
updateWalletBalance
} const walletAddress = await provider.send("eth_requestAccounts", []);
const balance = await contract.balanceOf(walletAddress[0]);
etherStore.setBalance(blockchain.formatBigNumber(balance));
etherStore.setWalletAddress(ethers.utils.getAddress(walletAddress[0]));
};
const updateWalletBalance = async () => {
const etherStore = useEtherStore();
const provider = getProvider();
if (!provider) return;
const signer = provider.getSigner();
const contract = new ethers.Contract(addresses.token, mockToken.abi, signer);
const walletAddress = await provider.send("eth_requestAccounts", []);
const balance = await contract.balanceOf(walletAddress[0]);
etherStore.setBalance(blockchain.formatBigNumber(balance));
};
export { updateWalletStatus, updateWalletBalance };

6
src/components/TopBar.vue
View File

@ -3,7 +3,7 @@ import { storeToRefs } from "pinia";
import { useEtherStore } from "../store/ether"; import { useEtherStore } from "../store/ether";
import { ref } from "vue"; import { ref } from "vue";
import { NetworkEnum } from "@/model/NetworkEnum"; import { NetworkEnum } from "@/model/NetworkEnum";
import blockchain from "../utils/blockchain"; import { connectProvider } from "../blockchain/provider";
import ethereumImage from "../assets/ethereum.svg"; import ethereumImage from "../assets/ethereum.svg";
import polygonImage from "../assets/polygon.svg"; import polygonImage from "../assets/polygon.svg";
@ -20,7 +20,7 @@ const currencyMenuHoverToggle = ref<boolean>(false);
//Methods //Methods
const connectMetaMask = () => { const connectMetaMask = () => {
blockchain.connectProvider(); connectProvider();
}; };
const formatWalletAddress = (): string => { const formatWalletAddress = (): string => {
@ -52,7 +52,7 @@ const getNetworkImage = (networkName: NetworkEnum) => {
let validImages = { let validImages = {
Ethereum: ethereumImage, Ethereum: ethereumImage,
Polygon: polygonImage, Polygon: polygonImage,
Localhost: ethereumImage Localhost: ethereumImage,
}; };
return validImages[networkName]; return validImages[networkName];