fix: resolve issues with error handling and tx matching (#11)

Author: ceeb4e

index.js

@@ -18,6 +18,7 @@ const Wallet = require('./src/lib/wallet.js')
 const WalletPayGeneric = require('./src/lib/wallet-pay-generic.js')
 const Provider = require('./src/modules/provider.js')
 const HdWallet = require('./src/modules/hdwallet.js')
+const StateDb = require('./src/modules/state.js')
 const TetherCurrency = require('./src/tether-currency.js')
 module.exports = {
   Currency,
@@ -26,5 +27,6 @@ module.exports = {
   WalletPayGeneric,
   Wallet,
   HdWallet,
+  StateDb,
   TetherCurrency
 }

src/lib/wallet-pay-generic.js

@@ -152,7 +152,12 @@ class WalletPayGeneric extends WalletPay {
   }
 
   _listenToEvents () {
-    this.provider.on('subscribeAccount', async (res) => {
+    this.provider.on('subscribeAccount', async (err, res) => {
+      if (err) {
+        console.trace(err)
+        return
+      }
+
       if (res.token) {
         this._eachToken(async (token) => {
           if (token.tokenContract.toLowerCase() !== res?.token.toLowerCase()) return
@@ -212,7 +217,7 @@ class WalletPayGeneric extends WalletPay {
   /**
    * Get balance of entire wallet or 1 address
    * @param {object} opts options
-   * @param {string} opts.token token name, for getting balance of token
+   * @param {string=} opts.token token name, for getting balance of token
    * @param {string} addr Pass address to get balance of specific address
    * @returns {Promise<Balance>}
    */
@@ -246,7 +251,12 @@ class WalletPayGeneric extends WalletPay {
     return state
   }
 
-  async _syncAddressPath (addr, signal) {
+  /**
+   * @param {string} addr
+   * @param {any} signal
+   * @param {StateDb=} stateInstance
+   */
+  async _syncAddressPath (addr, signal, stateInstance = undefined) {
     const provider = this.provider
     const path = addr.path
     const txs = await provider.getTransactionsByAddress({ address: addr.address })
@@ -257,34 +267,42 @@ class WalletPayGeneric extends WalletPay {
 
     this._hdWallet.addAddress(addr)
     for (const t of txs) {
-      await this._storeTx(t)
+      await this._storeTx(t, stateInstance)
     }
-    await this._setAddrBalance(addr.address)
+    await this._setAddrBalance(addr.address, stateInstance)
+
+    const txIndex = await stateInstance.getTxIndex()
+    console.log('txIndex', txIndex)
+
     return txs.length > 0 ? signal.hasTx : signal.noTx
   }
 
-  async _setAddrBalance (addr) {
-    const balances = await this.state.getBalances()
+  async _setAddrBalance (addr, stateInstance = undefined) {
+    const state = stateInstance ?? this.state
+
+    const balances = await state.getBalances()
     const bal = await this.getBalance({}, addr)
     await balances.setBal(addr, bal.confirmed)
   }
 
-  async _storeTx (tx) {
+  async _storeTx (tx, stateInstance = undefined) {
+    const state = stateInstance ?? this.state
+
     const data = {
       from: tx.from,
       to: tx.to,
       value: new this._Curr(tx.value, 'base'),
       height: tx.blockNumber,
       txid: tx.hash
     }
-    await this.state.storeTxHistory(data)
+    await state.storeTxHistory(data)
     return data
   }
 
   /**
    * Crawl HD wallet path, collect transactions and calculate balance of all addresses.
    * @param {object} opts
-   * @param {bool=} opts.reset Reset all state and resync
+   * @param {boolean=} opts.reset Reset all state and resync
    * @param {string=} opts.token Token name
    * @fires sync-path when a hd path is synced
    * @fires sync-end when entire HD path has been traversed, or when syncing is halted
@@ -309,7 +327,7 @@ class WalletPayGeneric extends WalletPay {
         return this.callToken('syncPath', opts.token, [addr, signal])
       }
 
-      const res = await this._syncAddressPath(addr, signal)
+      const res = await this._syncAddressPath(addr, signal, state)
       this.emit('synced-path', syncState._addrType, syncState.path, res === signal.hasTx, syncState.toJSON())
       return res
     })

src/modules/provider.js

@@ -68,7 +68,7 @@ class Provider extends EventEmitter {
         }
         const evname = res?.event
         if (!evname) return console.log('event has no name ignored ', res)
-        this.emit(evname, res.data)
+        this.emit(evname, res.error, res.data)
       })
       ws.on('open', resolve)
     })

src/modules/state.js

@@ -122,7 +122,10 @@ class StateDb {
   async storeTxHistory (data) {
     const i = Number(data.height)
     const blockTx = await this.getTxHistory(i)
-    const exists = blockTx.filter(tx => tx.txid === data.txid).length > 0
+    const exists = blockTx.filter(tx => {
+      // Since there can be multiple txs with the same hash, we compare hash, to and from
+      return tx.txid === data.txid && tx.to === data.to && tx.from === data.from
+    }).length > 0
     if (exists) return
     blockTx.push(data)
     await this.updateTxIndex(i)