From c27dde4dfe94d81aeeee5ed1ca4f47b2da382114 Mon Sep 17 00:00:00 2001 From: brunoedcf Date: Sat, 11 Feb 2023 19:47:39 -0300 Subject: [PATCH] withdraw integration --- src/blockchain/buyerMethods.ts | 17 +++-- src/blockchain/wallet.ts | 18 +++-- .../ListingComponent/ListingComponent.vue | 46 +++++++++++-- .../SellerSteps/WantSellComponent.vue | 5 +- src/components/TopBar/TopBar.vue | 16 ----- src/router/index.ts | 6 -- src/views/ManageBidsView.vue | 67 ++++++++++++++----- src/views/TransactionHistoryView.vue | 63 ----------------- 8 files changed, 116 insertions(+), 122 deletions(-) delete mode 100644 src/views/TransactionHistoryView.vue diff --git a/src/blockchain/buyerMethods.ts b/src/blockchain/buyerMethods.ts index f8a06f1..5c5890b 100644 --- a/src/blockchain/buyerMethods.ts +++ b/src/blockchain/buyerMethods.ts @@ -1,7 +1,7 @@ import { useEtherStore } from "@/store/ether"; import { getContract, getProvider } from "./provider"; -import { getP2PixAddress } from "./addresses"; +import { getP2PixAddress, getTokenAddress } from "./addresses"; import p2pix from "../utils/smart_contract_files/P2PIX.json"; @@ -84,15 +84,18 @@ const cancelDeposit = async (depositId: BigNumber): Promise => { return cancel; }; -const withdrawDeposit = async ( - depositId: BigNumber, - amount: string -): Promise => { +const withdrawDeposit = async (amount: string): Promise => { const contract = getContract(); - const withdraw = await contract.withdraw(depositId, amount, []); - await withdraw.wait(); + const withdraw = await contract.withdraw( + getTokenAddress(), + parseEther(String(amount)), + [] + ); + const with_rec = await withdraw.wait(); + const [t] = with_rec.events; + console.log(t.args); return withdraw; }; diff --git a/src/blockchain/wallet.ts b/src/blockchain/wallet.ts index 6aa2035..75d0470 100644 --- a/src/blockchain/wallet.ts +++ b/src/blockchain/wallet.ts @@ -64,11 +64,21 @@ const listAllTransactionByWalletAddress = async ( filterReleasedLocks ); - return [...eventsDeposits, ...eventsAddedLocks, ...eventsReleasedLocks].sort( - (a, b) => { - return b.blockNumber - a.blockNumber; - } + const filterWithdrawnDeposits = p2pContract.filters.DepositWithdrawn([ + walletAddress, + ]); + const eventsWithdrawnDeposits = await p2pContract.queryFilter( + filterWithdrawnDeposits ); + + return [ + ...eventsDeposits, + ...eventsAddedLocks, + ...eventsReleasedLocks, + ...eventsWithdrawnDeposits, + ].sort((a, b) => { + return b.blockNumber - a.blockNumber; + }); }; // get wallet's release transactions diff --git a/src/components/ListingComponent/ListingComponent.vue b/src/components/ListingComponent/ListingComponent.vue index 4cdde1d..6fd6e2d 100644 --- a/src/components/ListingComponent/ListingComponent.vue +++ b/src/components/ListingComponent/ListingComponent.vue @@ -1,4 +1,5 @@ @@ -92,20 +114,30 @@ showInitialItems();

Saldo disponível

-

0 BRZ

+

+ {{ getRemaining() }} BRZ +

Valor do saque

- +
Withdraw image Sacar @@ -138,7 +170,7 @@ showInitialItems(); Finalizado
@@ -183,7 +215,7 @@ showInitialItems(); ({{ itemsToShow.length }} de {{ props.walletTransactions.length }} - {{ isManageMode ? "ofertas" : "transações" }}) + transações )
diff --git a/src/components/SellerSteps/WantSellComponent.vue b/src/components/SellerSteps/WantSellComponent.vue index 56f346b..2f61843 100644 --- a/src/components/SellerSteps/WantSellComponent.vue +++ b/src/components/SellerSteps/WantSellComponent.vue @@ -56,8 +56,9 @@ const handleButtonClick = async ( offer: string, pixKey: string ): Promise => { - console.log(postProcessKey(pixKey)); - if (walletAddress.value) emit("approveTokens", { offer, pixKey }); + const postProcessedPixKey = postProcessKey(pixKey); + if (walletAddress.value) + emit("approveTokens", { offer, postProcessedPixKey }); else await connectProvider(); }; diff --git a/src/components/TopBar/TopBar.vue b/src/components/TopBar/TopBar.vue index a4b93f6..8bf15c7 100644 --- a/src/components/TopBar/TopBar.vue +++ b/src/components/TopBar/TopBar.vue @@ -284,14 +284,6 @@ onClickOutside(currencyRef, () => { >
-
- - Histórico de transações - -
-
-
-
Gerenciar Ofertas @@ -328,14 +320,6 @@ onClickOutside(currencyRef, () => {
-
- - Histórico de transações - -
-
-
-
Gerenciar Ofertas diff --git a/src/router/index.ts b/src/router/index.ts index 9b48387..43b0186 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -1,6 +1,5 @@ import { createRouter, createWebHistory } from "vue-router"; import HomeView from "../views/HomeView.vue"; -import TransactionHistoryView from "../views/TransactionHistoryView.vue"; import FaqView from "../views/FaqView.vue"; import ManageBidsView from "../views/ManageBidsView.vue"; import SellerView from "@/views/SellerView.vue"; @@ -18,11 +17,6 @@ const router = createRouter({ name: "seller", component: SellerView, }, - { - path: "/transaction_history", - name: "transaction history", - component: TransactionHistoryView, - }, { path: "/manage_bids", name: "manage bids", diff --git a/src/views/ManageBidsView.vue b/src/views/ManageBidsView.vue index 81cb0eb..8ae7cd9 100644 --- a/src/views/ManageBidsView.vue +++ b/src/views/ManageBidsView.vue @@ -2,45 +2,69 @@ import { useEtherStore } from "@/store/ether"; import { storeToRefs } from "pinia"; import ListingComponent from "@/components/ListingComponent/ListingComponent.vue"; -import type { BigNumber } from "ethers"; import { ref, watch, onMounted } from "vue"; -import { withdrawDeposit } from "@/blockchain/buyerMethods"; -import { listValidDepositTransactionsByWalletAddress } from "@/blockchain/wallet"; +import { + listValidDepositTransactionsByWalletAddress, + listAllTransactionByWalletAddress, +} from "@/blockchain/wallet"; import type { ValidDeposit } from "@/model/ValidDeposit"; +import type { Event } from "ethers"; const etherStore = useEtherStore(); const { walletAddress, networkName } = storeToRefs(etherStore); const depositList = ref([]); +const transactionsList = ref<(Event | ValidDeposit)[]>([]); + +const updateRemaining = async () => { + const walletDeposits = await listValidDepositTransactionsByWalletAddress( + walletAddress.value + ); + depositList.value = walletDeposits; + + const allUserTransactions = await listAllTransactionByWalletAddress( + walletAddress.value + ); + transactionsList.value = allUserTransactions; +}; onMounted(async () => { if (walletAddress.value) { const walletDeposits = await listValidDepositTransactionsByWalletAddress( walletAddress.value ); + console.log(walletDeposits); + + const allUserTransactions = await listAllTransactionByWalletAddress( + walletAddress.value + ); + console.log(allUserTransactions); + if (walletDeposits) { depositList.value = walletDeposits; } + if (allUserTransactions) { + transactionsList.value = allUserTransactions; + } } }); -const handleWithDrawDeposit = async (token: BigNumber, index: number) => { - const fixedAmount = "1"; // Need to ask user for amount - const response = await withdrawDeposit(token, fixedAmount); - if (response) { - console.log("Token retirado com sucesso."); - depositList.value.splice(index, 1); - } -}; - -watch(walletAddress, async () => { - await listValidDepositTransactionsByWalletAddress(walletAddress.value) +watch(walletAddress, async (newValue) => { + await listValidDepositTransactionsByWalletAddress(newValue) .then((res) => { if (res) depositList.value = res; }) .catch(() => { depositList.value = []; }); + + await listAllTransactionByWalletAddress(newValue) + .then((res) => { + if (res) transactionsList.value = res; + }) + .catch(() => { + transactionsList.value = []; + }); }); watch(networkName, async () => { @@ -51,17 +75,26 @@ watch(networkName, async () => { .catch(() => { depositList.value = []; }); + + await listAllTransactionByWalletAddress(walletAddress.value) + .then((res) => { + if (res) transactionsList.value = res; + }) + .catch(() => { + transactionsList.value = []; + }); });