update smart contract

This commit is contained in:
brunoedcf 2022-12-27 18:15:46 -03:00
parent 788132509b
commit cdea930c8a
5 changed files with 383 additions and 20 deletions

View File

@ -178,7 +178,9 @@ const updateDepositAddedEvents = async () => {
const filterDeposits = p2pContract.filters.DepositAdded(null);
const eventsDeposits = await p2pContract.queryFilter(filterDeposits);
etherStore.setDepositsAddedList(eventsDeposits);
console.log("DEPOSITS", eventsDeposits);
};
const updateLockAddedEvents = async () => {
@ -196,6 +198,7 @@ const updateLockAddedEvents = async () => {
const filterLocks = p2pContract.filters.LockAdded(null);
const eventsLocks = await p2pContract.queryFilter(filterLocks);
etherStore.setLocksAddedList(eventsLocks);
console.log("LOCKS", eventsLocks);
};
const updateLockReleasedEvents = async () => {
@ -210,9 +213,10 @@ const updateLockReleasedEvents = async () => {
const signer = provider.getSigner();
const p2pContract = new ethers.Contract(addresses.p2pix, p2pix.abi, signer);
const filterLocks = p2pContract.filters.LockReleased(null);
const eventsLocks = await p2pContract.queryFilter(filterLocks);
etherStore.setLocksReleasedList(eventsLocks);
const filterReleases = p2pContract.filters.LockReleased(null);
const eventsReleases = await p2pContract.queryFilter(filterReleases);
etherStore.setLocksReleasedList(eventsReleases);
console.log("RELEASES", eventsReleases);
};
// Provider methods
@ -272,7 +276,8 @@ const addDeposit = async (tokenQty: Number, pixKey: String) => {
const deposit = await p2pContract.deposit(
addresses.token,
formatEther(String(tokenQty)),
pixKey
pixKey,
ethers.utils.formatBytes32String("")
);
await deposit.wait();
@ -304,7 +309,8 @@ const mockDeposit = async (tokenQty: Number, pixKey: String) => {
const deposit = await p2pContract.deposit(
addresses.token,
formatEther(String(tokenQty)),
pixKey
pixKey,
ethers.utils.formatBytes32String("")
);
await deposit.wait();
@ -344,6 +350,7 @@ const addLock = async (depositId: BigNumber, amount: Number) => {
ethers.constants.AddressZero, // String "0x0000000000000000000000000000000000000000"
0,
formatEther(String(amount)), // BigNumber
[],
[]
);
lock.wait();
@ -384,8 +391,12 @@ const releaseLock = async (
);
const messageToSign = ethers.utils.solidityKeccak256(
["string", "uint256", "uint256"],
[pixKey, formatEther(String(amount)), formatEther(e2eId)]
["string", "uint256", "bytes32"],
[
pixKey,
formatEther(String(amount)),
ethers.utils.formatBytes32String(e2eId),
]
);
const messageHashBytes = ethers.utils.arrayify(messageToSign);
@ -397,7 +408,8 @@ const releaseLock = async (
const release = await p2pContract.release(
lockId,
formatEther(e2eId),
ethers.constants.AddressZero,
ethers.utils.formatBytes32String(e2eId),
sig.r,
sig.s,
sig.v

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -3,6 +3,6 @@
"0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266",
"0x70997970C51812dc3A010C7d01b50e0d17dc79C8"
],
"p2pix": "0x5FbDB2315678afecb367f032d93F642f64180aa3",
"token": "0xe7f1725E7734CE288F8367e1Bb143E90bb3F0512"
"p2pix": "0x9fE46736679d2D9a65F0992F2272dE9f3c7fa6e0",
"token": "0x5FbDB2315678afecb367f032d93F642f64180aa3"
}

View File

@ -34,6 +34,7 @@ const approveOffer = async ({ offer, pixKey }: any) => {
};
const sendNetwork = async () => {
console.log("OIOI");
loading.value = true;
try {
if (offerValue.value && pixKeyBuyer.value) {
@ -41,7 +42,9 @@ const sendNetwork = async () => {
flowStep.value = Step.Sell;
loading.value = false;
}
} catch {
} catch (err) {
console.log("Erro");
console.log(err);
flowStep.value = Step.Network;
loading.value = false;
}