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

Change getValidDeposits to receive a contract in param and use it on getNetworksLiquidity

Browse Source
This commit is contained in:
RcleydsonR 2023-01-17 14:53:47 -03:00
parent 80a70a5240
commit e0b4c81b77
1 changed files with 16 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
src/blockchain/events.ts
View File

@ -1,12 +1,12 @@
import { useEtherStore } from "@/store/ether"; import { useEtherStore } from "@/store/ether";
import { ethers } from "ethers"; import { Contract, ethers } from "ethers";
import { getProvider } from "./provider";
import { mapDeposits } from "./sellerMethods"; import { mapDeposits } from "./sellerMethods";
import { getP2PixAddress } from "./addresses";
import p2pix from "../utils/smart_contract_files/P2PIX.json"; import p2pix from "../utils/smart_contract_files/P2PIX.json";
import { formatEther } from "ethers/lib/utils"; import { formatEther } from "ethers/lib/utils";
import { getProvider } from "./provider";
import { getP2PixAddress } from "./addresses";
const getNetworksLiquidity = async () => { const getNetworksLiquidity = async () => {
console.log("Loading events"); console.log("Loading events");
@ -31,61 +31,8 @@ const getNetworksLiquidity = async () => {
mumbaiProvider mumbaiProvider
); );
const filterDepositsGoerli = p2pContractGoerli.filters.DepositAdded(null); const depositListGoerli = await getValidDeposits(p2pContractGoerli)
const eventsDepositsGoerli = await p2pContractGoerli.queryFilter( const depositListMumbai = await getValidDeposits(p2pContractMumbai)
filterDepositsGoerli
);
const filterDepositsMumbai = p2pContractMumbai.filters.DepositAdded(null);
const eventsDepositsMumbai = await p2pContractMumbai.queryFilter(
filterDepositsMumbai
);
const depositListGoerli: any[] = await Promise.all(
eventsDepositsGoerli
.map(async (deposit) => {
const mappedDeposit = await p2pContractGoerli.mapDeposits(
deposit.args?.depositID
);
let validDepositGoerli = {};
if (mappedDeposit.valid) {
validDepositGoerli = {
blockNumber: deposit.blockNumber,
depositID: deposit.args?.depositID,
remaining: formatEther(mappedDeposit.remaining),
seller: mappedDeposit.seller,
pixKey: mappedDeposit.pixTarget,
};
}
return validDepositGoerli;
})
.filter((deposit) => deposit)
);
const depositListMumbai: any[] = await Promise.all(
eventsDepositsMumbai
.map(async (deposit) => {
const mappedDeposit = await p2pContractMumbai.mapDeposits(
deposit.args?.depositID
);
let validDepositMumbai = {};
if (mappedDeposit.valid) {
validDepositMumbai = {
blockNumber: deposit.blockNumber,
depositID: deposit.args?.depositID,
remaining: formatEther(mappedDeposit.remaining),
seller: mappedDeposit.seller,
pixKey: mappedDeposit.pixTarget,
};
}
return validDepositMumbai;
})
.filter((deposit) => deposit)
);
const etherStore = useEtherStore(); const etherStore = useEtherStore();
@ -96,11 +43,18 @@ const getNetworksLiquidity = async () => {
console.log(depositListMumbai); console.log(depositListMumbai);
}; };
const getValidDeposits = async (): Promise<any[] | undefined> => { const getValidDeposits = async (contract?: Contract): Promise<any[]> => {
const provider = getProvider(); let p2pContract: Contract;
const signer = provider.getSigner();
const p2pContract = new ethers.Contract(getP2PixAddress(), p2pix.abi, signer); if (contract){
p2pContract = contract;
}
else{
const provider = getProvider();
const signer = provider.getSigner();
p2pContract = new ethers.Contract(getP2PixAddress(), p2pix.abi, signer);
}
const filterDeposits = p2pContract.filters.DepositAdded(null); const filterDeposits = p2pContract.filters.DepositAdded(null);
const eventsDeposits = await p2pContract.queryFilter(filterDeposits); const eventsDeposits = await p2pContract.queryFilter(filterDeposits);
@ -126,10 +80,6 @@ const getValidDeposits = async (): Promise<any[] | undefined> => {
.filter((deposit) => deposit) .filter((deposit) => deposit)
); );
// const etherStore = useEtherStore();
// etherStore.setDepositsValidList(depositList);
// console.log(depositList)
return depositList; return depositList;
}; };