edge-currency-plugins 3.4.3 → 3.4.4

package/lib/common/utxobased/db/util/utxo.js

@@ -12,11 +12,10 @@ var _keymanager = require('../../keymanager/keymanager');
   inputIndex
 ) => {
   const input = transactionData.inputs[inputIndex]
-  const { scriptPubkey } = input
-  const address = await dataLayer.fetchAddress(scriptPubkey)
+  const address = await dataLayer.fetchAddress(input.scriptPubkey)
 
   if (address == null)
-    throw new Error(`Cannot find address for ${scriptPubkey}`)
+    throw new Error(`Cannot find address for ${input.scriptPubkey}`)
   if (address.path == null)
     throw new Error(`Address has no derivation path information`)
 
@@ -25,8 +24,6 @@ var _keymanager = require('../../keymanager/keymanager');
 
   const purposeType = _utils.currencyFormatToPurposeType.call(void 0, address.path.format)
   const getScripts = async (
-    scriptPubkey
-  
 
 
 ) => {
@@ -41,26 +38,26 @@ var _keymanager = require('../../keymanager/keymanager');
       }
       case _keymanager.BIP43PurposeTypeEnum.WrappedSegwit:
         return {
-          script: scriptPubkey,
+          script: input.scriptPubkey,
           scriptType: _keymanager.ScriptTypeEnum.p2wpkhp2sh
         }
       case _keymanager.BIP43PurposeTypeEnum.Segwit:
         return {
-          script: scriptPubkey,
+          script: input.scriptPubkey,
           scriptType: _keymanager.ScriptTypeEnum.p2wpkh
         }
       default:
         throw new Error(`Unknown purpose type ${purposeType}`)
     }
   }
-  const { script, scriptType } = await getScripts(scriptPubkey)
+  const { script, scriptType } = await getScripts()
 
   return {
     id: `${input.txId}_${input.outputIndex}`,
     txid: input.txId,
     vout: input.outputIndex,
     value: input.amount,
-    scriptPubkey,
+    scriptPubkey: input.scriptPubkey,
     script,
     redeemScript,
     scriptType,

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

@@ -231,13 +231,13 @@ var _constants = require('./constants');
         if (uri == null || !(uri in serverStatesCache)) return false
 
         const generator = pickNextTaskCB(uri)
-        let nextValue
-        while (true) {
-          const result
+
+        let result
 
 
- = await generator.next(nextValue)
+ = await generator.next()
 
+        while (true) {
           if (_optionalChain([result, 'optionalAccess', _ => _.done]) === true) {
             return result.value
           }
@@ -250,7 +250,18 @@ var _constants = require('./constants');
             )}`
             log(`${uri} nextTask: ${taskMessage}`)
           }
-          nextValue = yield task
+          try {
+            const nextValue = yield task
+            result = await generator.next(nextValue)
+          } catch (error) {
+            // Delegate the error handling to the task generator:
+            result = await generator.throw(error).catch(error => {
+              // If unhandled, log the error up to the core:
+              log.error(error)
+              // End the task generator routine (task threw unhandled error)
+              return { done: true, value: false }
+            })
+          }
         }
       }
 

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

@@ -1257,7 +1257,39 @@ const processTransactionResponse = (
   args
 ) => {
   const { txResponse } = args
+
+  let outputTotalValue = '0'
+  const outputs = txResponse.vout.map(vout => {
+    const scriptPubkey =
+      _nullishCoalesce(vout.hex, () => (
+      _cleaners.asMaybe.call(void 0, 
+        raw => _utils3.validScriptPubkeyFromAddress.call(void 0, raw),
+        'unknown'
+      )({
+        address: vout.addresses[0],
+        coin: common.pluginInfo.coinInfo.name
+      })))
+    outputTotalValue = _biggystring.add.call(void 0, outputTotalValue, vout.value)
+    return {
+      n: vout.n,
+      scriptPubkey,
+      amount: vout.value
+    }
+  })
+
   const inputs = txResponse.vin.map(vin => {
+    // Handle coinbase input
+    if (!vin.isAddress) {
+      return {
+        amount: outputTotalValue,
+        n: 0,
+        outputIndex: 4294967295,
+        scriptPubkey: '', // Maybe there's a bogus scriptPubkey we can use here?
+        sequence: vin.sequence,
+        txId: '0000000000000000000000000000000000000000000000000000000000000000'
+      }
+    }
+
     const scriptPubkey =
       // Note: Blockbook has empirically not sent a hex value as the
       // scriptPubkey for vins. If we discover this to be changed for some
@@ -1278,22 +1310,7 @@ const processTransactionResponse = (
       amount: vin.value
     }
   })
-  const outputs = txResponse.vout.map(vout => {
-    const scriptPubkey =
-      _nullishCoalesce(vout.hex, () => (
-      _cleaners.asMaybe.call(void 0, 
-        raw => _utils3.validScriptPubkeyFromAddress.call(void 0, raw),
-        'unknown'
-      )({
-        address: vout.addresses[0],
-        coin: common.pluginInfo.coinInfo.name
-      })))
-    return {
-      n: vout.n,
-      scriptPubkey,
-      amount: vout.value
-    }
-  })
+
   return {
     txid: txResponse.txid,
     hex: txResponse.hex,

package/lib/common/utxobased/network/blockbookApi.js

@@ -9,6 +9,8 @@
 
 
 
+
+
 var _cleaners = require('cleaners');
 
 /**
@@ -65,6 +67,14 @@ var _cleaners = require('cleaners');
 
 
 
+
+
+
+
+
+
+
+
 
 
 
@@ -85,22 +95,36 @@ var _cleaners = require('cleaners');
     blockTime: _cleaners.asNumber,
     fees: _cleaners.asString,
     vin: _cleaners.asArray.call(void 0, 
-      _cleaners.asObject.call(void 0, {
-        txid: _cleaners.asString,
-        // Empirically observed omitted sequence is possible for when sequence is zero.
-        // Is the case for tx `19ecc679cfc7e71ad616a22bbee96fd5abe8616e4f408f1f5daaf137400ae091`.
-        sequence: _cleaners.asOptional.call(void 0, _cleaners.asNumber, 0),
-        n: _cleaners.asNumber,
-        // If Blockbook doesn't provide vout, assume 0. Empirically observed
-        // case for tx `fefac8c22ba1178df5d7c90b78cc1c203d1a9f5f5506f7b8f6f469fa821c2674`
-        // which has no `vout` for input in WebSocket response payload but block
-        // will show the input's vout value to be `0`.
-        vout: _cleaners.asOptional.call(void 0, _cleaners.asNumber, 0),
-        addresses: _cleaners.asArray.call(void 0, asAddress),
-        isAddress: _cleaners.asBoolean,
-        value: _cleaners.asString,
-        hex: _cleaners.asOptional.call(void 0, _cleaners.asString)
-      })
+      _cleaners.asEither.call(void 0, 
+        // Address input:
+        _cleaners.asObject.call(void 0, {
+          addresses: _cleaners.asArray.call(void 0, asAddress),
+          // `isAddress` is a boolean flag that indicates whether the input is an address.
+          // And therefore has `addresses` field. If `isAddress` is false, then the input is likely a coinbase input.
+          isAddress: _cleaners.asValue.call(void 0, true),
+          // This is the index of the input. Not to be confused with the index of the previous output (vout).
+          n: _cleaners.asNumber,
+          // Empirically observed omitted sequence is possible for when sequence is zero.
+          // Is the case for tx `19ecc679cfc7e71ad616a22bbee96fd5abe8616e4f408f1f5daaf137400ae091`.
+          sequence: _cleaners.asOptional.call(void 0, _cleaners.asNumber, 0),
+          txid: _cleaners.asString,
+          value: _cleaners.asString,
+          // If Blockbook doesn't provide vout, assume 0. Empirically observed
+          // case for tx `fefac8c22ba1178df5d7c90b78cc1c203d1a9f5f5506f7b8f6f469fa821c2674`
+          // which has no `vout` for input in WebSocket response payload but block
+          // will show the input's vout value to be `0`.
+          vout: _cleaners.asOptional.call(void 0, _cleaners.asNumber, 0),
+          hex: _cleaners.asOptional.call(void 0, _cleaners.asString)
+        }),
+        // Coinbase input:
+        _cleaners.asObject.call(void 0, {
+          // Coinbase input is a string of hex data (see example c6e617656b7b6d9fdcf8800fb5370479e5aceea4b6fe2fd74bd7bb0f3f2c64db)
+          coinbase: _cleaners.asString,
+          isAddress: _cleaners.asValue.call(void 0, false),
+          n: _cleaners.asNumber,
+          sequence: _cleaners.asNumber
+        })
+      )
     ),
     vout: _cleaners.asArray.call(void 0, 
       _cleaners.asObject.call(void 0, {

package/lib/src/common/utxobased/network/blockbookApi.d.ts

@@ -27,14 +27,19 @@ export interface BlockbookTransaction {
     blockTime: number;
     fees: string;
     vin: Array<{
-        txid: string;
-        sequence: number;
-        n: number;
-        vout: number;
         addresses: string[];
-        isAddress: boolean;
-        value: string;
         hex?: string;
+        isAddress: true;
+        n: number;
+        sequence: number;
+        txid: string;
+        value: string;
+        vout: number;
+    } | {
+        coinbase: string;
+        isAddress: false;
+        n: number;
+        sequence: number;
     }>;
     vout: Array<{
         n: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "edge-currency-plugins",
-  "version": "3.4.3",
+  "version": "3.4.4",
   "description": "Edge currency plugins to fetch and process wallet accounts, balances and transactions.",
   "homepage": "https://edge.app/",
   "repository": "https://github.com/EdgeApp/edge-currency-plugins",
@@ -54,7 +54,7 @@
     "bs58": "^4.0.1",
     "bs58grscheck": "^2.1.2",
     "bs58smartcheck": "^2.0.4",
-    "cleaners": "^0.3.12",
+    "cleaners": "^0.3.17",
     "disklet": "^0.4.5",
     "ecpair": "https://github.com/EdgeApp/ecpair.git#b193eb8ea2ec0c93b528f4b0223a605407ff43e4",
     "edge-sync-client": "^0.2.7",