From a33668b5388698a11e37f202bfcf9bf2f1750fdc Mon Sep 17 00:00:00 2001
From: MickWang <1244134672@qq.com>
Date: Wed, 1 May 2024 15:09:07 +0800
Subject: [PATCH 1/2] add explorer api for withdrawals

---
 pages/transfers.vue              |  1 +
 store/zksync/transfersHistory.ts | 39 ++++++++++++++++++++++++++++++--
 store/zksync/withdrawals.ts      |  2 +-
 3 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/pages/transfers.vue b/pages/transfers.vue
index cce85cd4..110454e4 100644
--- a/pages/transfers.vue
+++ b/pages/transfers.vue
@@ -184,6 +184,7 @@ const fetch = () => {
   if (!isConnected.value) return;
   transfersHistoryStore.requestRecentTransfers();
   failedDepositHistory.requestFailedDepositTransfers();
+  transfersHistoryStore.requestWithdrawals();
 };
 fetch();
 
diff --git a/store/zksync/transfersHistory.ts b/store/zksync/transfersHistory.ts
index d79af10b..8b76f80e 100644
--- a/store/zksync/transfersHistory.ts
+++ b/store/zksync/transfersHistory.ts
@@ -75,8 +75,24 @@ export const useZkSyncTransfersHistoryStore = defineStore("zkSyncTransfersHistor
     url.searchParams.set("limit", TRANSACTIONS_FETCH_LIMIT.toString());
     return url;
   });
-  const transfers = ref<Transfer[]>([]);
 
+  const {
+    canLoadMore: canLoadMoreWithdrawals,
+    loadNext: loadNextWithdrawals,
+    reset: resetPaginatedWithdrawalsRequest,
+  } = usePaginatedRequest<Api.Response.Transfer>(() => {
+    if (!eraNetwork.value.blockExplorerApi)
+      throw new Error(`Block Explorer API is not available on ${eraNetwork.value.name}`);
+
+    const url = new URL(
+      `/address/${account.value.address}/withdrawalTransfers?limit=100`,
+      eraNetwork.value.blockExplorerApi
+    );
+    return url;
+  });
+
+  const transfers = ref<Transfer[]>([]);
+  const withdrawals = ref<Transfer[]>([]);
   const {
     inProgress: recentTransfersRequestInProgress,
     error: recentTransfersRequestError,
@@ -90,7 +106,24 @@ export const useZkSyncTransfersHistoryStore = defineStore("zkSyncTransfersHistor
       }
       const response = await loadNext();
       const mappedTransfers = response.items.map(mapApiTransfer);
-      useZkSyncWithdrawalsStore().updateWithdrawals();
+      transfers.value = filterOutDuplicateTransfers(mappedTransfers);
+    },
+    { cache: 30000 }
+  );
+
+  const {
+    inProgress: requestWithdrawalsInProgress,
+    error: requestWithdrawalsError,
+    execute: requestWithdrawals,
+    reset: restRequestWithdrawals,
+    reload: reloadRequestWithdrawals,
+  } = usePromise(
+    async () => {
+      if (withdrawals.value.length) {
+        restRequestWithdrawals();
+      }
+      const response = await loadNextWithdrawals();
+      const mappedTransfers = response.items.map(mapApiTransfer);
       transfers.value = filterOutDuplicateTransfers(mappedTransfers);
       //TODO put withdrawals into local storage
       for (const withdrawal of transfers.value.filter((e) => e.type === "withdrawal")) {
@@ -128,6 +161,7 @@ export const useZkSyncTransfersHistoryStore = defineStore("zkSyncTransfersHistor
           });
         }
       }
+      useZkSyncWithdrawalsStore().updateWithdrawals();
     },
     { cache: 30000 }
   );
@@ -169,5 +203,6 @@ export const useZkSyncTransfersHistoryStore = defineStore("zkSyncTransfersHistor
     previousTransfersRequestInProgress,
     previousTransfersRequestError,
     requestPreviousTransfers,
+    requestWithdrawals,
   };
 });
diff --git a/store/zksync/withdrawals.ts b/store/zksync/withdrawals.ts
index 7f4d2c96..2fc9af0e 100644
--- a/store/zksync/withdrawals.ts
+++ b/store/zksync/withdrawals.ts
@@ -204,7 +204,7 @@ export const useZkSyncWithdrawalsStore = defineStore("zkSyncWithdrawals", () =>
     const transfers: { items: any[] } = await $fetch(
       `${eraNetwork.value.blockExplorerApi}/address/${
         account.value.address
-      }/transfers?limit=${TRANSACTIONS_FETCH_LIMIT.toString()}`
+      }/withdrawalTransfers?limit=${TRANSACTIONS_FETCH_LIMIT.toString()}`
     );
     const withdrawals = transfers.items.filter((e) => e.type === "withdrawal" && e.token && e.amount);
     for (const withdrawal of withdrawals) {

From 69b974f6e849bc000519f501126aab32ef9cea2d Mon Sep 17 00:00:00 2001
From: MickWang <1244134672@qq.com>
Date: Thu, 2 May 2024 15:50:31 +0800
Subject: [PATCH 2/2] update history issue

---
 store/zksync/transfersHistory.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/store/zksync/transfersHistory.ts b/store/zksync/transfersHistory.ts
index 8b76f80e..6e58adb5 100644
--- a/store/zksync/transfersHistory.ts
+++ b/store/zksync/transfersHistory.ts
@@ -124,9 +124,9 @@ export const useZkSyncTransfersHistoryStore = defineStore("zkSyncTransfersHistor
       }
       const response = await loadNextWithdrawals();
       const mappedTransfers = response.items.map(mapApiTransfer);
-      transfers.value = filterOutDuplicateTransfers(mappedTransfers);
+      withdrawals.value = filterOutDuplicateTransfers(mappedTransfers);
       //TODO put withdrawals into local storage
-      for (const withdrawal of transfers.value.filter((e) => e.type === "withdrawal")) {
+      for (const withdrawal of withdrawals.value.filter((e) => e.type === "withdrawal")) {
         if (!userTransactions.value.find((e) => e.transactionHash === withdrawal.transactionHash)) {
           const eraNetworks = getNetworkInfo(withdrawal);
           const obj = {