From e5a00fe07c151a7a821ae02ed3cc7e199be32998 Mon Sep 17 00:00:00 2001
From: shrpne <shrpne@gmail.com>
Date: Fri, 10 Dec 2021 20:43:17 +0300
Subject: [PATCH] HubDeposit: prune old pending txs if one with same nonce is
 confirmed

---
 components/HubDepositAccountMinter.vue |  1 +
 components/HubDepositForm.vue          |  3 +++
 store/hub.js                           | 16 +++++++++++++++-
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/components/HubDepositAccountMinter.vue b/components/HubDepositAccountMinter.vue
index 905b82c2..f9a5454c 100644
--- a/components/HubDepositAccountMinter.vue
+++ b/components/HubDepositAccountMinter.vue
@@ -57,6 +57,7 @@ export default {
             }
             return undefined;
         },
+        // @TODO get gasPrice from eth_fee.fast
         gasPriceGwei() {
             const priceItem = this.priceList.find((item) => item.name === `${this.selectedHubNetwork}/gas`);
             let gasPriceGwei;
diff --git a/components/HubDepositForm.vue b/components/HubDepositForm.vue
index 951d6034..a3d41d1a 100644
--- a/components/HubDepositForm.vue
+++ b/components/HubDepositForm.vue
@@ -305,6 +305,9 @@ export default {
                 }
             },
         },
+        // @TODO isUnwrapRequired may not change, because native token balance will be less than expected, because it will be spent on tx gas
+        // @TODO including gas fee to unwrap amount should fix it
+        // @TODO unwrap errors will not stop loader
         isUnwrapRequired: {
             handler(newVal) {
                 // stop form sending loader after unwrap tx confirmed
diff --git a/store/hub.js b/store/hub.js
index 96940893..edd40bda 100644
--- a/store/hub.js
+++ b/store/hub.js
@@ -62,7 +62,6 @@ export const mutations = {
     setEthAddress(state, address) {
         state.ethAddress = address.toLowerCase();
     },
-    //@TODO check txs with same nonce and filter out pending if another is confirmed
     saveDeposit(state, tx) {
         if (!tx.from) {
             console.warn('hub/saveDeposit: can\'t save because `tx.from` not specified');
@@ -71,6 +70,7 @@ export const mutations = {
         const ethAddress = tx.from.toLowerCase();
         let depositList = state.ethList[ethAddress] || [];
         const index = depositList.findIndex((item) => item.hash === tx.hash);
+        // update list
         if (index >= 0) {
             depositList[index] = {
                 ...depositList[index],
@@ -79,6 +79,20 @@ export const mutations = {
         } else {
             depositList.unshift(tx);
         }
+        // check txs with same nonce and filter out pending if another is confirmed
+        let currentNonce = typeof tx.nonce !== 'undefined' ? tx.nonce : depositList[index]?.nonce;
+        const isConfirmed = depositList.some((item) => item.nonce === currentNonce && item.blockHash);
+        if (isConfirmed) {
+            // find unconfirmed with same nonce
+            const txsToPrune = depositList.filter((item) => {
+                return !item.blockHash && item.nonce === currentNonce;
+            });
+            depositList = depositList.filter((item) => {
+                const shouldPrune = txsToPrune.some((toPrune) => toPrune.hash === item.hash);
+                return !shouldPrune;
+            });
+        }
+        // preserve list length
         if (depositList.length > 5) {
             depositList = depositList.slice(0, 5);
         }