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

Fixing release function and formatting functions

Browse Source
This commit is contained in:
Bruno 2022-12-07 21:28:34 -03:00
parent f25c61b21e
commit 50835c94ed
4 changed files with 57 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/TopBar.vue
View File

@ -24,9 +24,7 @@ const formatWalletAddress = (): string => {
};
const formatWalletBalance = (): string => {
const formattedBalance = blockchain.formatEther(balance.value);
const fixed = formattedBalance.substring(0, 8);
const fixed = balance.value.substring(0, 8);
return fixed;
};
</script>

86
src/utils/blockchain.ts
View File

@ -22,7 +22,7 @@ const updateWalletStatus = async () => {
const balance = await contract.balanceOf(walletAddress[0]);
etherStore.setBalance(String(balance));
etherStore.setBalance(formatBigNumber(balance));
etherStore.setWalletAddress(ethers.utils.getAddress(walletAddress[0]));
};
@ -63,8 +63,8 @@ const listTransactionByWalletAddress = async (walletAddress: string): Promise<an
})
}
// Update store
const updateStore = async () => {
// Update events at store methods
const updateDepositAddedEvents = async () => {
const etherStore = useEtherStore();
const window_ = window as any;
const connection = window_.ethereum;
@ -78,26 +78,41 @@ const updateStore = async () => {
const filterDeposits = p2pContract.filters.DepositAdded(null);
const eventsDeposits = await p2pContract.queryFilter(filterDeposits);
console.log("Deposits Added: ", eventsDeposits);
etherStore.setDepositsAddedList(eventsDeposits);
}
const updateLockAddedEvents = async () => {
const etherStore = useEtherStore();
const window_ = window as any;
const connection = window_.ethereum;
let provider: ethers.providers.Web3Provider | null = null;
if (!connection) return;
provider = new ethers.providers.Web3Provider(connection);
const signer = provider.getSigner();
const p2pContract = new ethers.Contract(addresses.p2pix, p2pix.abi, signer);
const filterLocks = p2pContract.filters.LockAdded(null);
const eventsLocks = await p2pContract.queryFilter(filterLocks);
console.log("Locks Added: ", eventsLocks);
etherStore.setLocksAddedList(eventsLocks);
}
const filterReleasedLocks = p2pContract.filters.LockReleased(null);
const eventsReleasedLocks = await p2pContract.queryFilter(filterReleasedLocks);
console.log("Released Locks: ", eventsReleasedLocks);
etherStore.setLocksReleasedList(eventsReleasedLocks);
const updateLockReleasedEvents = async () => {
const etherStore = useEtherStore();
const window_ = window as any;
const connection = window_.ethereum;
let provider: ethers.providers.Web3Provider | null = null;
const filterExpiredLocks = p2pContract.filters.LockReturned(null);
const eventsExpiredLocks = await p2pContract.queryFilter(filterExpiredLocks);
console.log("Expired Locks: ", eventsExpiredLocks);
etherStore.setLocksExpiredList(eventsExpiredLocks);
if (!connection) return;
provider = new ethers.providers.Web3Provider(connection);
const signer = provider.getSigner();
const p2pContract = new ethers.Contract(addresses.p2pix, p2pix.abi, signer);
// (TO DO) Filter valid deposits
const filterLocks = p2pContract.filters.LockReleased(null);
const eventsLocks = await p2pContract.queryFilter(filterLocks);
etherStore.setLocksReleasedList(eventsLocks);
}
// Provider methods
@ -106,7 +121,9 @@ const connectProvider = async () => {
const connection = window_.ethereum;
await updateWalletStatus();
await updateStore();
await updateDepositAddedEvents();
await updateLockAddedEvents();
await updateLockReleasedEvents();
connection.on("accountsChanged", () => {
updateWalletStatus();
@ -124,7 +141,7 @@ const getProvider = (): ethers.providers.Web3Provider | null => {
// Deposit methods
// Gets value and pix key from user's form to create a deposit in the blockchain
const addDeposit = async (tokenQty = "1000.0", pixKey = "00011122233") => {
const addDeposit = async (tokenQty: string, pixKey: string) => {
const provider = getProvider();
if (!provider) return;
@ -144,19 +161,20 @@ const addDeposit = async (tokenQty = "1000.0", pixKey = "00011122233") => {
// First get the approval
const apprv = await tokenContract.approve(
addresses.p2pix,
ethers.utils.parseEther(tokenQty)
formatEther(tokenQty)
);
await apprv.wait();
// Now we make the deposit
const deposit = await p2pContract.deposit(
addresses.token,
ethers.utils.parseEther(tokenQty),
formatEther(tokenQty),
pixKey
);
await deposit.wait();
updateStore();
updateWalletStatus();
updateDepositAddedEvents();
};
// Get specific deposit data by its ID
@ -194,7 +212,7 @@ const addLock = async (depositId: Number, amount: Number) => {
);
lock.wait();
updateStore();
updateLockAddedEvents();
};
// Get specific lock data by its ID
@ -214,24 +232,10 @@ const mapLocks = async (lockId: string) => {
};
// Releases lock by specific ID and other additional data
const releaseLock = async () => {
const etherStore = useEtherStore();
const releaseLock = async (pixKey: string, amount: Number, e2eId: Number, lockId: string) => {
const provider = getProvider();
if (!provider) return;
// pass depositId as a param
const myLock = etherStore.locksAddedList[0];
const lockId = myLock.args.lockID
const depositId = myLock.args.depositID
const amount = formatBigNumber(myLock.args.amount);
const myDeposit = await mapDeposits(depositId);
const pixKey = myDeposit.pixTarget
const e2eId = 123
console.log(pixKey, amount, e2eId)
const mockBacenSigner = new ethers.Wallet("0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80")
const messageToSign = ethers.utils.solidityKeccak256(
@ -242,7 +246,7 @@ const releaseLock = async () => {
],
[
pixKey,
ethers.utils.parseEther(amount),
amount,
e2eId
]
)
@ -262,15 +266,15 @@ const releaseLock = async () => {
sig.v
)
release.wait()
console.log(release)
updateStore();
updateLockReleasedEvents();
};
// Formatting methods
const formatEther = (balance: string) => {
const formatted = ethers.utils.formatEther(balance);
return formatted;
const formatEther = (num: string) => {
const formattedNum = ethers.utils.parseEther(num);
return formattedNum;
};
const formatBigNumber = (num: BigNumber) => {

42
src/views/HomeView.vue
View File

@ -13,52 +13,28 @@ enum Step {
const flowStep = ref<Step>(Step.Search)
const tokenAmmount = ref()
// (TO DO) Tirar isso tudo daqui
// import p2pix from "../utils/smart_contract_files/P2PIX.json";
// import addresses from "../utils/smart_contract_files/localhost.json";
// import { useEtherStore } from "@/store/ether";
// import { ethers } from "ethers";
const confirmBuyClick = async ({ selectedDeposit, tokenValue }: any) => {
// finish buy screen
console.log(selectedDeposit);
let depositDetail;
await blockchain
.mapDeposits(selectedDeposit["args"]["depositID"])
.mapDeposits(selectedDeposit.args.depositID)
.then((deposit) => (depositDetail = deposit));
console.log(tokenValue);
tokenAmmount.value = tokenValue
flowStep.value = Step.List
console.log(depositDetail);
console.log(depositDetail);
// Makes lock with deposit ID and the Amount
// if (depositDetail) {
// const lock = await blockchain.addLock(
// depositDetail.args.depositID,
// tokenValue
// );
// console.log(lock);
if (depositDetail) {
const lock = await blockchain.addLock(
selectedDeposit.args.depositID,
tokenValue
);
console.log(lock);
};
// // (TO DO) Tirar isso daqui
// const window_ = window as any;
// const connection = window_.ethereum;
// let provider: ethers.providers.Web3Provider | null = null;
// if (!connection) return;
// provider = new ethers.providers.Web3Provider(connection);
// const signer = provider.getSigner();
// const etherStore = useEtherStore();
// const p2pContract = new ethers.Contract(addresses.p2pix, p2pix.abi, signer);
// const filterLocks = p2pContract.filters.LockAdded(null);
// const eventsLocks = await p2pContract.queryFilter(filterLocks);
// etherStore.setLocksAddedList(eventsLocks);
// Data to QRCode
// Chave Pix = depositDetail.pixTarget
// Valor = tokenValue
// }
};
};
</script>
<template>

4
src/views/MockView.vue
View File

@ -95,7 +95,7 @@ const mapLock = (lockId: string) => {
@click="mapDeposit(deposit.args.depositID)"
>
Seller:<br />{{ formatWalletAddress(deposit.args.seller) }}<br />
MRBZ: {{ blockchain.formatEther(deposit.args.amount) }}
MRBZ: {{ blockchain.formatBigNumber(deposit.args.amount) }}
</li>
</ul>
<ul class="flex flex-col justify-center items-center gap-4">
@ -106,7 +106,7 @@ const mapLock = (lockId: string) => {
@click="mapLock(lock.args.lockID)"
>
Buyer:<br />{{ formatWalletAddress(lock.args.buyer) }}<br />
MRBZ: {{ blockchain.formatEther(lock.args.amount) }}
MRBZ: {{ blockchain.formatBigNumber(lock.args.amount) }}
</li>
</ul>
</div>