Merge branch 'production-namebase' into bennetthoffman/ch2594/hsd-pro…

…xy-http-endpoint-for-sendbididempotent
namebasehq · Aug 28, 2020 · 5a4992d · 5a4992d
2 parents 2cde6cc + 71b0f09
commit 5a4992d
Show file tree

Hide file tree

Showing 3 changed files with 67 additions and 0 deletions.
diff --git a/lib/primitives/mtx.js b/lib/primitives/mtx.js
@@ -1598,6 +1598,9 @@ class CoinSelector {
       case 'value':
         this.coins.sort(sortValue);
         break;
+      case 'sweepdust':
+        this.coins.sort(reversed(sortValue))
+        break;
       default:
         throw new FundingError(`Bad selection type: ${this.selection}.`);
     }
@@ -1638,6 +1641,9 @@ class CoinSelector {
     if (coin.covenant.isNonspendable())
       return false;
 
+    if (this.selection === 'sweepdust' && coin.value === 0)
+      return false;
+
     if (this.height === -1)
       return true;
 
@@ -1898,6 +1904,7 @@ function sortRandom(a, b) {
   return Math.random() > 0.5 ? 1 : -1;
 }
 
+// sorts from large to small
 function sortValue(a, b) {
   if (a.height === -1 && b.height !== -1)
     return 1;
@@ -1908,6 +1915,10 @@ function sortValue(a, b) {
   return b.value - a.value;
 }
 
+function reversed(sortFunc) {
+  return (a, b) => sortFunc(b, a)
+}
+
 function sortInputs(a, b) {
   return a.compare(b);
 }

diff --git a/lib/wallet/http.js b/lib/wallet/http.js
@@ -229,6 +229,36 @@ class HTTP extends Server {
       res.json(200, { success: true });
     });
 
+    // Clear cache
+    this.del('/cache/:cacheName', (req, res) => {
+      const cacheName = req.params.cacheName;
+      try {
+        for (const wallet of this.wdb.wallets.values()) {
+          wallet.clearCache(cacheName);
+        }
+      } catch (err) {
+        return res.json(400, {error: err.message})
+      }
+
+      return res.json(200, {message: "ok"});
+    });
+
+    // Clear specific cache key
+    this.del('/cache/:cacheName/:cacheKey', (req, res) => {
+      const cacheName = req.params.cacheName;
+      const cacheKey = req.params.cacheKey;
+
+      try {
+        for (const wallet of this.wdb.wallets.values()) {
+          wallet.clearCache(cacheName, cacheKey);
+        }
+      } catch (err) {
+        return res.json(400, {error: err.message})
+      }
+
+      return res.json(200, {message: "ok"});
+    })
+
     // List wallets
     this.get('/wallet', async (req, res) => {
       if (!req.admin) {

diff --git a/lib/wallet/wallet.js b/lib/wallet/wallet.js
@@ -1215,6 +1215,7 @@ class Wallet extends EventEmitter {
   /**
    * Fill a transaction with inputs without a lock.
    * @private
+   * @param {MTX} mtx - The mutable transaction to fill
    * @see MTX#selectCoins
    * @see MTX#fill
    */
@@ -4948,6 +4949,31 @@ class Wallet extends EventEmitter {
   static isWallet(obj) {
     return obj instanceof Wallet;
   }
+
+  /**
+   * Clear a cache.
+   * @param {String} cacheName
+   * @param {String | undefined} cacheKey
+   */
+
+   clearCache(cacheName, cacheKey) {
+      let cache;
+      if(cacheName === 'bid') {
+        cache = this.sendBidResults;
+      } else if (cacheName === 'open') {
+        cache = this.sendOpenResults;
+      } else if (cacheName === 'update') {
+        cache = this.sendUpdateResults;
+      } else {
+        throw new Error(`invalid cache name: ${cacheName}`)
+      }
+
+      if (cacheKey === null || cacheKey === undefined || cacheKey === '') {
+        cache.reset();
+      } else {
+        cache.remove(cacheKey);
+      }
+   }
 }
 
 /*