Improve code quality by fixing lint issues
Co-authored-by: brunoedcf <brest.dallacosta@outlook.com>
This commit is contained in:
parent
8338064dcd
commit
c8a3fd12b2
@ -8,7 +8,6 @@ import p2pix from "../utils/smart_contract_files/P2PIX.json";
|
||||
import { BigNumber, ethers, type Event } from "ethers";
|
||||
import { formatEther, parseEther } from "ethers/lib/utils";
|
||||
|
||||
|
||||
// Buyer Flow methods //
|
||||
|
||||
// Make lock
|
||||
@ -43,7 +42,6 @@ const releaseLock = async (
|
||||
e2eId: string,
|
||||
lockId: string
|
||||
) => {
|
||||
|
||||
const mockBacenSigner = new ethers.Wallet(
|
||||
"0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80"
|
||||
);
|
||||
@ -60,7 +58,7 @@ const releaseLock = async (
|
||||
const messageHashBytes = ethers.utils.arrayify(messageToSign);
|
||||
const flatSig = await mockBacenSigner.signMessage(messageHashBytes);
|
||||
const provider = getProvider();
|
||||
|
||||
|
||||
const sig = ethers.utils.splitSignature(flatSig);
|
||||
|
||||
const signer = provider.getSigner();
|
||||
@ -105,9 +103,6 @@ const withdrawDeposit = async (depositId: BigNumber): Promise<Boolean> => {
|
||||
return true;
|
||||
};
|
||||
|
||||
|
||||
|
||||
// Releases lock by specific ID and other additional data
|
||||
|
||||
|
||||
export { cancelDeposit, withdrawDeposit, addLock, releaseLock };
|
||||
|
@ -41,13 +41,12 @@ const getNetworksLiquidity = async () => {
|
||||
console.log(depositListMumbai);
|
||||
};
|
||||
|
||||
const getValidDeposits = async ( contract?: Contract ): Promise<any[]> => {
|
||||
const getValidDeposits = async (contract?: Contract): Promise<any[]> => {
|
||||
let p2pContract: Contract;
|
||||
|
||||
if (contract){
|
||||
if (contract) {
|
||||
p2pContract = contract;
|
||||
}
|
||||
else{
|
||||
} else {
|
||||
const provider = getProvider();
|
||||
const signer = provider.getSigner();
|
||||
|
||||
@ -60,7 +59,9 @@ const getValidDeposits = async ( contract?: Contract ): Promise<any[]> => {
|
||||
const depositList: any[] = await Promise.all(
|
||||
eventsDeposits
|
||||
.map(async (deposit) => {
|
||||
const mappedDeposit = await p2pContract.mapDeposits(deposit.args?.depositID);
|
||||
const mappedDeposit = await p2pContract.mapDeposits(
|
||||
deposit.args?.depositID
|
||||
);
|
||||
let validDeposit = {};
|
||||
|
||||
if (mappedDeposit.valid) {
|
||||
@ -69,7 +70,7 @@ const getValidDeposits = async ( contract?: Contract ): Promise<any[]> => {
|
||||
depositID: deposit.args?.depositID,
|
||||
remaining: formatEther(mappedDeposit.remaining),
|
||||
seller: mappedDeposit.seller,
|
||||
pixKey: mappedDeposit.pixTarget
|
||||
pixKey: mappedDeposit.pixTarget,
|
||||
};
|
||||
}
|
||||
|
||||
|
@ -46,7 +46,6 @@ const listValidDepositTransactionsByWalletAddress = async (
|
||||
return [];
|
||||
};
|
||||
|
||||
|
||||
const listAllTransactionByWalletAddress = async (
|
||||
walletAddress: string
|
||||
): Promise<any[] | undefined> => {
|
||||
@ -94,10 +93,9 @@ const listReleaseTransactionByWalletAddress = async (
|
||||
});
|
||||
};
|
||||
|
||||
|
||||
export {
|
||||
export {
|
||||
updateWalletStatus,
|
||||
listValidDepositTransactionsByWalletAddress,
|
||||
listAllTransactionByWalletAddress,
|
||||
listReleaseTransactionByWalletAddress
|
||||
listReleaseTransactionByWalletAddress,
|
||||
};
|
||||
|
@ -11,7 +11,12 @@ import { NetworkEnum } from "@/model/NetworkEnum";
|
||||
// Store reference
|
||||
const etherStore = useEtherStore();
|
||||
|
||||
const { walletAddress, networkName, depositsValidListGoerli, depositsValidListMumbai } = storeToRefs(etherStore);
|
||||
const {
|
||||
walletAddress,
|
||||
networkName,
|
||||
depositsValidListGoerli,
|
||||
depositsValidListMumbai,
|
||||
} = storeToRefs(etherStore);
|
||||
|
||||
// Reactive state
|
||||
const tokenValue = ref(0);
|
||||
@ -33,9 +38,12 @@ const connectAccount = async () => {
|
||||
};
|
||||
|
||||
const emitConfirmButton = () => {
|
||||
const selectedDeposit = networkName.value == NetworkEnum.ethereum ? selectedGoerliDeposit.value : selectedMumbaiDeposit.value;
|
||||
emit('tokenBuy', selectedDeposit, tokenValue.value)
|
||||
}
|
||||
const selectedDeposit =
|
||||
networkName.value == NetworkEnum.ethereum
|
||||
? selectedGoerliDeposit.value
|
||||
: selectedMumbaiDeposit.value;
|
||||
emit("tokenBuy", selectedDeposit, tokenValue.value);
|
||||
};
|
||||
|
||||
// Debounce methods
|
||||
const handleInputEvent = (event: any) => {
|
||||
@ -74,31 +82,37 @@ const verifyLiquidity = () => {
|
||||
return;
|
||||
}
|
||||
|
||||
selectedGoerliDeposit.value = verifyNetworkLiquidity(tokenValue.value, walletAddress.value, depositsValidListGoerli.value);
|
||||
selectedMumbaiDeposit.value = verifyNetworkLiquidity(tokenValue.value, walletAddress.value, depositsValidListMumbai.value);
|
||||
selectedGoerliDeposit.value = verifyNetworkLiquidity(
|
||||
tokenValue.value,
|
||||
walletAddress.value,
|
||||
depositsValidListGoerli.value
|
||||
);
|
||||
selectedMumbaiDeposit.value = verifyNetworkLiquidity(
|
||||
tokenValue.value,
|
||||
walletAddress.value,
|
||||
depositsValidListMumbai.value
|
||||
);
|
||||
|
||||
enableOrDisableConfirmButton()
|
||||
if(selectedGoerliDeposit.value || selectedMumbaiDeposit.value){
|
||||
enableOrDisableConfirmButton();
|
||||
if (selectedGoerliDeposit.value || selectedMumbaiDeposit.value) {
|
||||
hasLiquidity.value = true;
|
||||
enableWalletButton.value = true;
|
||||
}
|
||||
else{
|
||||
} else {
|
||||
hasLiquidity.value = false;
|
||||
enableWalletButton.value = true;
|
||||
}
|
||||
};
|
||||
|
||||
const enableOrDisableConfirmButton = (): void => {
|
||||
if(selectedGoerliDeposit.value && networkName.value == NetworkEnum.ethereum)
|
||||
if (selectedGoerliDeposit.value && networkName.value == NetworkEnum.ethereum)
|
||||
enableConfirmButton.value = true;
|
||||
if(selectedMumbaiDeposit.value && networkName.value == NetworkEnum.polygon)
|
||||
if (selectedMumbaiDeposit.value && networkName.value == NetworkEnum.polygon)
|
||||
enableConfirmButton.value = true;
|
||||
else
|
||||
enableConfirmButton.value = false;
|
||||
}
|
||||
else enableConfirmButton.value = false;
|
||||
};
|
||||
|
||||
watch(networkName, async () => {
|
||||
enableOrDisableConfirmButton()
|
||||
enableOrDisableConfirmButton();
|
||||
});
|
||||
</script>
|
||||
|
||||
|
@ -1,17 +1,21 @@
|
||||
const verifyNetworkLiquidity = (tokenValue: number, walletAddress: string, validDepositList: any[]) => {
|
||||
const element = validDepositList.find((element) => {
|
||||
const remaining = element.remaining;
|
||||
if (
|
||||
tokenValue!! <= remaining &&
|
||||
tokenValue!! != 0 &&
|
||||
element.seller !== walletAddress
|
||||
) {
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
});
|
||||
const verifyNetworkLiquidity = (
|
||||
tokenValue: number,
|
||||
walletAddress: string,
|
||||
validDepositList: any[]
|
||||
) => {
|
||||
const element = validDepositList.find((element) => {
|
||||
const remaining = element.remaining;
|
||||
if (
|
||||
tokenValue!! <= remaining &&
|
||||
tokenValue!! != 0 &&
|
||||
element.seller !== walletAddress
|
||||
) {
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
});
|
||||
|
||||
return element
|
||||
}
|
||||
return element;
|
||||
};
|
||||
|
||||
export { verifyNetworkLiquidity }
|
||||
export { verifyNetworkLiquidity };
|
||||
|
@ -10,7 +10,7 @@ import { storeToRefs } from "pinia";
|
||||
import { addLock, releaseLock } from "@/blockchain/buyerMethods";
|
||||
import { updateWalletStatus } from "@/blockchain/wallet";
|
||||
import { getNetworksLiquidity } from "@/blockchain/events";
|
||||
import { listReleaseTransactionByWalletAddress } from "@/blockchain/wallet"
|
||||
import { listReleaseTransactionByWalletAddress } from "@/blockchain/wallet";
|
||||
|
||||
enum Step {
|
||||
Search,
|
||||
@ -46,7 +46,7 @@ const confirmBuyClick = async (selectedDeposit: any, tokenValue: number) => {
|
||||
lockTransactionHash.value = lock.transactionHash;
|
||||
})
|
||||
.catch((err) => {
|
||||
console.log(err)
|
||||
console.log(err);
|
||||
flowStep.value = Step.Search;
|
||||
});
|
||||
|
||||
@ -75,21 +75,21 @@ const releaseTransaction = async ({ e2eId }: any) => {
|
||||
);
|
||||
release.wait();
|
||||
|
||||
await listReleaseTransactionByWalletAddress(walletAddress.value.toLowerCase())
|
||||
.then((releaseTransactions) => {
|
||||
if (releaseTransactions)
|
||||
lastWalletReleaseTransactions.value = releaseTransactions;
|
||||
});
|
||||
await listReleaseTransactionByWalletAddress(
|
||||
walletAddress.value.toLowerCase()
|
||||
).then((releaseTransactions) => {
|
||||
if (releaseTransactions)
|
||||
lastWalletReleaseTransactions.value = releaseTransactions;
|
||||
});
|
||||
|
||||
await updateWalletStatus();
|
||||
loadingRelease.value = false;
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
onMounted(async () => {
|
||||
await getNetworksLiquidity();
|
||||
})
|
||||
});
|
||||
</script>
|
||||
|
||||
<template>
|
||||
|
@ -5,7 +5,7 @@ import ListingComponent from "@/components/ListingComponent.vue";
|
||||
import type { BigNumber } from "ethers";
|
||||
import { ref, watch } from "vue";
|
||||
import { cancelDeposit, withdrawDeposit } from "@/blockchain/buyerMethods";
|
||||
import { listValidDepositTransactionsByWalletAddress } from "@/blockchain/wallet"
|
||||
import { listValidDepositTransactionsByWalletAddress } from "@/blockchain/wallet";
|
||||
|
||||
const etherStore = useEtherStore();
|
||||
|
||||
@ -13,10 +13,9 @@ const { walletAddress } = storeToRefs(etherStore);
|
||||
const depositList = ref<any[]>([]);
|
||||
|
||||
if (walletAddress.value) {
|
||||
const walletDeposits =
|
||||
await listValidDepositTransactionsByWalletAddress(
|
||||
walletAddress.value
|
||||
);
|
||||
const walletDeposits = await listValidDepositTransactionsByWalletAddress(
|
||||
walletAddress.value
|
||||
);
|
||||
if (walletDeposits) {
|
||||
depositList.value = walletDeposits;
|
||||
}
|
||||
@ -39,10 +38,9 @@ const handleWithDrawDeposit = async (depositID: BigNumber, index: number) => {
|
||||
};
|
||||
|
||||
watch(walletAddress, async () => {
|
||||
const walletDeposits =
|
||||
await listValidDepositTransactionsByWalletAddress(
|
||||
walletAddress.value
|
||||
);
|
||||
const walletDeposits = await listValidDepositTransactionsByWalletAddress(
|
||||
walletAddress.value
|
||||
);
|
||||
if (walletDeposits) {
|
||||
depositList.value = walletDeposits;
|
||||
}
|
||||
|
@ -10,10 +10,9 @@ const { walletAddress } = storeToRefs(etherStore);
|
||||
const allUserTransactions = ref<any[]>([]);
|
||||
|
||||
if (walletAddress.value) {
|
||||
await listAllTransactionByWalletAddress(walletAddress.value)
|
||||
.then((res) => {
|
||||
if (res) allUserTransactions.value = res;
|
||||
});
|
||||
await listAllTransactionByWalletAddress(walletAddress.value).then((res) => {
|
||||
if (res) allUserTransactions.value = res;
|
||||
});
|
||||
}
|
||||
|
||||
watch(walletAddress, async (newValue) => {
|
||||
|
Loading…
x
Reference in New Issue
Block a user