edge-currency-plugins 2.0.2 → 2.0.4

package/lib/common/utxobased/db/makeBaselets.js

@@ -23,6 +23,7 @@ var _baselet = require('baselet');
 
 
 
+
 var _baselet3 = require('./Models/baselet');
 
 
@@ -69,30 +70,30 @@ var _baselet3 = require('./Models/baselet');
   /* Tables */
   const addressBases = {
     addressByScriptPubkey: await _baselet.createOrOpenHashBase.call(void 0, 
-      config.disklet,
+      config.storage,
       _baselet3.addressByScriptPubkeyOptions
     ),
     scriptPubkeyByPath: await _baselet.createOrOpenCountBase.call(void 0, 
-      config.disklet,
+      config.storage,
       _baselet3.scriptPubkeyByPathOptions
     ),
     lastUsedByFormatPath: await _baselet.createOrOpenHashBase.call(void 0, 
-      config.disklet,
+      config.storage,
       _baselet3.lastUsedByFormatPathOptions
     )
   }
   const txBases = {
-    txById: await _baselet.createOrOpenHashBase.call(void 0, config.disklet, _baselet3.txByIdOptions),
+    txById: await _baselet.createOrOpenHashBase.call(void 0, config.storage, _baselet3.txByIdOptions),
     txIdsByBlockHeight: await _baselet.createOrOpenRangeBase.call(void 0, 
-      config.disklet,
+      config.storage,
       _baselet3.txIdsByBlockHeightOptions
     ),
-    txIdsByDate: await _baselet.createOrOpenRangeBase.call(void 0, config.disklet, _baselet3.txIdsByDateOptions)
+    txIdsByDate: await _baselet.createOrOpenRangeBase.call(void 0, config.storage, _baselet3.txIdsByDateOptions)
   }
   const utxoBases = {
-    utxoById: await _baselet.createOrOpenHashBase.call(void 0, config.disklet, _baselet3.utxoByIdOptions),
+    utxoById: await _baselet.createOrOpenHashBase.call(void 0, config.storage, _baselet3.utxoByIdOptions),
     utxoIdsByScriptPubkey: await _baselet.createOrOpenHashBase.call(void 0, 
-      config.disklet,
+      config.storage,
       _baselet3.utxoIdsByScriptPubkeyOptions
     )
   }

package/lib/common/utxobased/db/makeProcessor.js

@@ -2,6 +2,7 @@
 var _biggystring = require('biggystring'); var bs = _interopRequireWildcard(_biggystring);
 var _disklet = require('disklet');
 
+var _memlet = require('memlet');
 
 var _unixTime = require('../../../util/unixTime');
 
@@ -111,8 +112,9 @@ const BASELET_DIR = 'tables'
   config
 ) {
   const disklet = _disklet.navigateDisklet.call(void 0, config.disklet, BASELET_DIR)
-  let baselets = await _makeBaselets.makeBaselets.call(void 0, { disklet }).catch(async error => {
-    await disklet.delete('.')
+  let memlet = _memlet.makeMemlet.call(void 0, disklet)
+  let baselets = await _makeBaselets.makeBaselets.call(void 0, { storage: memlet }).catch(async error => {
+    await memlet.delete('.')
     throw error
   })
 
@@ -147,11 +149,11 @@ const BASELET_DIR = 'tables'
 
   const processor = {
     async clearAll() {
+      await memlet.onFlush.next().value
       await _baselet.clearMemletCache.call(void 0, )
-      // why is this delay needed?
-      await new Promise(resolve => setTimeout(resolve, 0))
       await disklet.delete('.')
-      baselets = await _makeBaselets.makeBaselets.call(void 0, { disklet })
+      memlet = _memlet.makeMemlet.call(void 0, disklet)
+      baselets = await _makeBaselets.makeBaselets.call(void 0, { storage: memlet })
     },
 
     async dumpData() {

package/lib/common/utxobased/engine/makeUtxoEngine.js

@@ -15,6 +15,7 @@ var _disklet = require('disklet');
 
 
 
+
 var _edgecorejs = require('edge-core-js');
 
 var _filterUndefined = require('../../../util/filterUndefined');
@@ -178,7 +179,12 @@ var _utils = require('./utils');
           )
         }
       }
-      const id = await engineState.broadcastTx(transaction)
+      const id = await engineState.broadcastTx(transaction).catch(err => {
+        if (String(err).includes('Error: Blockbook Error: -26: dust')) {
+          throw new (0, _edgecorejs.DustSpendError)()
+        }
+        throw err
+      })
       if (id !== transaction.txid) {
         throw new Error('broadcast response txid does not match original')
       }

package/lib/src/common/utxobased/db/makeBaselets.d.ts

@@ -1,7 +1,8 @@
 import { Disklet } from 'disklet';
+import { Memlet } from 'memlet';
 import { AddressByScriptPubkeyBaselet, LastUsedByFormatPathBaselet, ScriptPubkeyByPathBaselet, TxByIdBaselet, TxIdByBlockHeightBaselet, TxIdByDateBaselet, UtxoByIdBaselet, UtxoIdsByScriptPubkeyBaselet } from './Models/baselet';
 interface MakeBaseletsConfig {
-    disklet: Disklet;
+    storage: Disklet | Memlet;
 }
 declare type Executor<BaseletName extends keyof AllBaselets, T> = (tables: AllBaselets[BaseletName]) => Promise<T>;
 interface AllBaselets {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "edge-currency-plugins",
-  "version": "2.0.2",
+  "version": "2.0.4",
   "description": "Edge currency plugins to fetch and process wallet accounts, balances and transactions.",
   "repository": "https://github.com/EdgeApp/edge-currency-plugins",
   "license": "MIT",
@@ -35,7 +35,7 @@
   "dependencies": {
     "altcoin-js": "https://github.com/EdgeApp/altcoin-js.git#master",
     "async-mutex": "^0.2.6",
-    "baselet": "^0.2.3",
+    "baselet": "^0.2.4",
     "biggystring": "^4.0.0",
     "bip32": "^2.0.5",
     "bip32grs": "^2.0.5",
@@ -48,7 +48,6 @@
     "bs58smartcheck": "^2.0.4",
     "cleaners": "^0.3.12",
     "disklet": "^0.4.5",
-    "edge-core-js": "^0.19.48",
     "edge-sync-client": "^0.2.7",
     "memlet": "^0.1.7",
     "uri-js": "^4.4.0",
@@ -73,6 +72,7 @@
     "@typescript-eslint/parser": "^4.8.2",
     "chai": "^4.2.0",
     "chai-as-promised": "^7.1.1",
+    "edge-core-js": "^0.19.48",
     "eslint": "^7.14.0",
     "eslint-config-standard-kit": "0.15.1",
     "eslint-plugin-import": "^2.22.1",