edge-currency-plugins 1.3.1 → 1.3.3

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

@@ -111,7 +111,10 @@ 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 })
+  let baselets = await _makeBaselets.makeBaselets.call(void 0, { disklet }).catch(async error => {
+    await disklet.delete('.')
+    throw error
+  })
 
   /**
    * Calculates the transaction value supplied (negative) or received (positive). In order to calculate
@@ -453,8 +456,8 @@ const BASELET_DIR = 'tables'
             existingAddress.lastTouched = address.lastTouched
           }
 
-          // Only update the balance field if one was given and does not equal the existing value
-          if (address.balance !== existingAddress.balance) {
+          // Only update the balance field if we have a value here
+          if (address.balance != null) {
             existingAddress.balance = address.balance
           }
 

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

@@ -24,7 +24,6 @@
     lastQueriedBlockHeight: 0,
     lastQuery: 0,
     lastTouched: 0,
-    balance: '0',
     ...rest
   }
 }; exports.makeIAddress = makeIAddress

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

@@ -301,10 +301,12 @@ var _utils3 = require('./utils');
             scriptPubkey: processorAddress.scriptPubkey
           })
           addressesToSubscribe.add(address)
-          addressBalanceChanges.push({
-            scriptPubkey: processorAddress.scriptPubkey,
-            balance: processorAddress.balance
-          })
+          if (processorAddress.balance != null) {
+            addressBalanceChanges.push({
+              scriptPubkey: processorAddress.scriptPubkey,
+              balance: processorAddress.balance
+            })
+          }
         }
         addToAddressSubscribeCache(commonArgs.taskCache, addressesToSubscribe, {
           format,
@@ -1186,16 +1188,9 @@ const internalGetFreshAddress = async (
     path.addressIndex = forceIndex
   }
 
-  let nativeBalance = '0'
-  let scriptPubkey
   const iAddress = await processor.fetchAddress(path)
-  if (iAddress != null) {
-    nativeBalance = iAddress.balance
-    scriptPubkey = iAddress.scriptPubkey
-  } else {
-    const scriptPubKeyRet = await walletTools.getScriptPubkey(path)
-    scriptPubkey = scriptPubKeyRet.scriptPubkey
-  }
+  const nativeBalance = _nullishCoalesce(_optionalChain([iAddress, 'optionalAccess', _2 => _2.balance]), () => ( '0'))
+  const { scriptPubkey } = await _asyncNullishCoalesce(iAddress, async () => ( (await walletTools.getScriptPubkey(path))))
 
   if (scriptPubkey == null) {
     throw new Error('Unknown address path')

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

@@ -3,7 +3,7 @@ import { AddressByScriptPubkeyBaselet, LastUsedByFormatPathBaselet, ScriptPubkey
 interface MakeBaseletsConfig {
     disklet: Disklet;
 }
-declare type Executor<BaseletName extends keyof AllBaselets> = (tables: AllBaselets[BaseletName]) => Promise<unknown>;
+declare type Executor<BaseletName extends keyof AllBaselets, T> = (tables: AllBaselets[BaseletName]) => Promise<T>;
 interface AllBaselets {
     address: AddressBaselets;
     tx: TransactionBaselets;
@@ -24,9 +24,9 @@ interface UtxoBaselets {
     utxoIdsByScriptPubkey: UtxoIdsByScriptPubkeyBaselet;
 }
 export interface Baselets {
-    address: <E extends Executor<'address'>>(fn: E) => Promise<ReturnType<E>>;
-    tx: <E extends Executor<'tx'>>(fn: E) => Promise<ReturnType<E>>;
-    utxo: <E extends Executor<'utxo'>>(fn: E) => Promise<ReturnType<E>>;
+    address: <T>(fn: Executor<'address', T>) => Promise<T>;
+    tx: <T>(fn: Executor<'tx', T>) => Promise<T>;
+    utxo: <T>(fn: Executor<'utxo', T>) => Promise<T>;
     all: AddressBaselets & TransactionBaselets & UtxoBaselets;
 }
 export declare const makeBaselets: (config: MakeBaseletsConfig) => Promise<Baselets>;

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

@@ -9,7 +9,7 @@ export interface IAddress {
     lastQuery: number;
     lastTouched: number;
     used: boolean;
-    balance: string;
+    balance?: string;
 }
 export declare const makeIAddress: (addressFields: SoftPick<IAddress, 'scriptPubkey'>) => IAddress;
 export interface IUTXO {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "edge-currency-plugins",
-  "version": "1.3.1",
+  "version": "1.3.3",
   "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.2",
+    "baselet": "^0.2.3",
     "biggystring": "^4.0.0",
     "bip32": "^2.0.5",
     "bip32grs": "^2.0.5",
@@ -50,7 +50,7 @@
     "disklet": "^0.4.5",
     "edge-core-js": "^0.19.33",
     "edge-sync-client": "^0.2.7",
-    "memlet": "^0.1.6",
+    "memlet": "^0.1.7",
     "uri-js": "^4.4.0",
     "url-parse": "^1.5.2",
     "wif-smart": "^2.0.0",