fix(order): Retry-Queue used to wrap workflow

package.json

@@ -29,6 +29,7 @@
   "repository": "Permissionless-Software-Foundation/bch-dex",
   "dependencies": {
     "@chris.troutner/retry-queue": "1.0.5",
+    "@psf/bch-js": "^6.4.5",
     "axios": "0.27.2",
     "bch-message-lib": "2.2.1",
     "bcryptjs": "2.4.3",
@@ -52,7 +53,7 @@
     "koa2-ratelimit": "0.9.1",
     "libp2p": "^0.36.2",
     "line-reader": "0.4.0",
-    "minimal-slp-wallet": "5.1.0",
+    "minimal-slp-wallet": "../minimal-slp-wallet/",
     "mongoose": "5.13.14",
     "node-fetch": "npm:@achingbrain/node-fetch@2.6.7",
     "nodemailer": "6.7.5",

src/adapters/p2wdb-adapter.js

@@ -27,6 +27,10 @@ class P2wdbAdapter {
 
     // Allow the localConfig to overwrite the config file values.
     this.p2wdbURL = localConfig.p2wdbURL || config.p2wdbUrl
+
+    // Bind the 'this' object to all functions
+    this.write = this.write.bind(this)
+    this.checkForSufficientFunds = this.checkForSufficientFunds.bind(this)
   }
 
   // Write some data to the P2WDB

src/adapters/wallet.js

@@ -31,6 +31,9 @@ class WalletAdapter {
     this.bitcoinJs = bitcoinJs
     this.BchWallet = BchWallet
     this.bchWallet = {} // Will be replaced when initialized.
+
+    // Bind the 'this' object
+    this.moveTokens = this.moveTokens.bind(this)
   }
 
   // Open the wallet file, or create one if the file doesn't exist.

src/entities/offer.js

@@ -29,7 +29,7 @@ class OfferEntity {
       utxoVout,
       offerStatus,
       makerAddr,
-      ticker,
+      // ticker,
       tokenType
     } = offerData.data
 
@@ -67,9 +67,9 @@ class OfferEntity {
     if (!makerAddr || typeof makerAddr !== 'string') {
       throw new Error("Property 'makerAddr' must be a string.")
     }
-    if (!ticker || typeof ticker !== 'string') {
-      throw new Error("Property 'ticker' must be a string.")
-    }
+    // if (!ticker || typeof ticker !== 'string') {
+    //   throw new Error("Property 'ticker' must be a string.")
+    // }
     if (!tokenType || typeof tokenType !== 'number') {
       throw new Error("Property 'tokenType' must be a number.")
     }
@@ -95,7 +95,7 @@ class OfferEntity {
       p2wdbHash: offerData.hash,
       offerStatus: offerStatus || this.offerStatus[0],
       makerAddr,
-      ticker,
+      // ticker,
       tokenType
     }
 

src/use-cases/order.js

@@ -26,6 +26,9 @@ class OrderLib {
     this.bch = this.adapters.bch
     this.config = config
     this.retryQueue = new RetryQueue({ retryPeriod: 1000, attempts: 3 })
+
+    // Bind subfunctions to the 'this' object.
+    this.ensureFunds = this.ensureFunds.bind(this)
   }
 
   // Create a new order model and add it to the Mongo database.
@@ -44,25 +47,29 @@ class OrderLib {
       const orderEntity = this.orderEntity.inputValidate(entryObj)
       console.log('orderEntity: ', orderEntity)
 
+      // Ensure sufficient tokens exist to create the order.
+      // await this.ensureFunds(orderEntity)
+      await this.retryQueue.addToQueue(this.ensureFunds, orderEntity)
+
       // Get Ticker for token ID.
-      const tokenData = await this.adapters.wallet.bchWallet.getTxData([entryObj.tokenId])
+      // const tokenData = await this.adapters.wallet.bchWallet.getTxData([entryObj.tokenId])
+      const tokenData = await this.retryQueue.addToQueue(this.adapters.wallet.bchWallet.getTxData, [entryObj.tokenId])
       // console.log(`tokenData: ${JSON.stringify(tokenData, null, 2)}`)
       entryObj.ticker = tokenData[0].tokenTicker
 
-      // Ensure sufficient tokens exist to create the order.
-      await this.ensureFunds(orderEntity)
-
       // Move the tokens to holding address.
       const moveObj = {
         tokenId: orderEntity.tokenId,
         qty: orderEntity.numTokens
       }
-      const utxoInfo = await this.adapters.wallet.moveTokens(moveObj)
+      // const utxoInfo = await this.adapters.wallet.moveTokens(moveObj)
+      const utxoInfo = await this.retryQueue.addToQueue(this.adapters.wallet.moveTokens, moveObj)
       console.log('utxoInfo: ', utxoInfo)
 
       // Update the UTXO store for the wallet.
       await this.adapters.wallet.bchWallet.bchjs.Util.sleep(3000)
-      await this.adapters.wallet.bchWallet.getUtxos()
+      // await this.adapters.wallet.bchWallet.getUtxos()
+      await this.retryQueue.addToQueue(this.adapters.wallet.bchWallet.initialize, {})
 
       // Update the order with the new UTXO information.
       orderEntity.utxoTxid = utxoInfo.txid
@@ -78,7 +85,8 @@ class OrderLib {
         data: orderEntity,
         appId: this.config.p2wdbAppId
       }
-      const hash = await this.adapters.p2wdb.write(p2wdbObj)
+      // const hash = await this.adapters.p2wdb.write(p2wdbObj)
+      const hash = await this.retryQueue.addToQueue(this.adapters.p2wdb.write, p2wdbObj)
       // console.log('hash: ', hash)
 
       // Create a MongoDB model to hold the Order

test/unit/mocks/adapters/wallet.js

@@ -35,6 +35,7 @@ class MockBchWallet {
       }]
     }
     this.getTokenData = async () => {}
+    this.initialize = async () => {}
 
     // Environment variable is used by wallet-balance.unit.js to force an error.
     if (process.env.NO_UTXO) {

test/unit/use-cases/order.use-case.unit.js

@@ -106,14 +106,12 @@ describe('#order-use-case', () => {
         numTokens: 1
       }
 
-      // Mock dependencies
-      // sandbox.stub(uut.adapters.wallet, 'burnPsf').resolves('fakeTxid')
-      // sandbox.stub(uut.adapters.wallet.bchWallet, 'getTxData').resolves({ tokenTicker: 'TROUT' })
+      // Mock dependencies and force expected code path
       sandbox.stub(uut.orderEntity, 'inputValidate').returns(entryObj)
       sandbox.stub(uut, 'ensureFunds').resolves()
       sandbox.stub(uut.adapters.wallet.bchWallet.bchjs.Util, 'sleep').resolves()
       sandbox.stub(uut.adapters.wallet, 'moveTokens').resolves({ txid: 'fakeTxid', vout: 0, hdIndex: 1 })
-      sandbox.stub(uut.adapters.wallet.bchWallet, 'getUtxos').resolves()
+      sandbox.stub(uut.adapters.wallet.bchWallet, 'initialize').resolves()
       sandbox.stub(uut.adapters.p2wdb, 'write').resolves('fakeHash')
 
       const result = await uut.createOrder(entryObj)