edge-currency-plugins 3.5.2 → 3.5.3-1

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

@@ -1328,7 +1328,7 @@ const processTransactionResponse = (
 
   const inputs = txResponse.vin.map(vin => {
     // Handle coinbase input
-    if (!vin.isAddress) {
+    if (vin.coinbase != null) {
       return {
         amount: outputTotalValue,
         n: 0,
@@ -1339,6 +1339,10 @@ const processTransactionResponse = (
       }
     }
 
+    if (vin.txid == null) {
+      throw new Error(`Unexpected null txid when processing transaction inputs`)
+    }
+
     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

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

@@ -9,8 +9,6 @@
 
 
 
-
-
 var _cleaners = require('cleaners');
 
 /**
@@ -73,11 +71,6 @@ var _cleaners = require('cleaners');
 
 
 
-
-
-
-
-
 
 
 
@@ -95,36 +88,28 @@ var _cleaners = require('cleaners');
     blockTime: _cleaners.asNumber,
     fees: _cleaners.asString,
     vin: _cleaners.asArray.call(void 0, 
-      _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
-        })
-      )
+      _cleaners.asObject.call(void 0, {
+        addresses: _cleaners.asOptional.call(void 0, _cleaners.asArray.call(void 0, _cleaners.asString), () => []),
+        // `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.asBoolean,
+        // 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.asOptional.call(void 0, _cleaners.asString),
+        value: _cleaners.asOptional.call(void 0, _cleaners.asString, '0'),
+        // 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),
+        coinbase: _cleaners.asOptional.call(void 0, _cleaners.asString),
+        isOwn: _cleaners.asOptional.call(void 0, _cleaners.asBoolean),
+        hex: _cleaners.asOptional.call(void 0, _cleaners.asString),
+        asm: _cleaners.asOptional.call(void 0, _cleaners.asString)
+      })
     ),
     vout: _cleaners.asArray.call(void 0, 
       _cleaners.asObject.call(void 0, {

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

@@ -28,18 +28,16 @@ export interface BlockbookTransaction {
     fees: string;
     vin: Array<{
         addresses: string[];
-        hex?: string;
-        isAddress: true;
+        isAddress: boolean;
         n: number;
         sequence: number;
-        txid: string;
+        txid?: string;
         value: string;
         vout: number;
-    } | {
-        coinbase: string;
-        isAddress: false;
-        n: number;
-        sequence: number;
+        coinbase?: string;
+        isOwn?: boolean;
+        hex?: string;
+        asm?: string;
     }>;
     vout: Array<{
         n: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "edge-currency-plugins",
-  "version": "3.5.2",
+  "version": "3.5.3-1",
   "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",