edge-currency-plugins 3.0.1 → 3.0.2

package/lib/common/utxobased/db/Models/ProcessorTransaction.js

@@ -24,6 +24,7 @@ var _bnjs = require('bn.js'); var _bnjs2 = _interopRequireDefault(_bnjs);
   const inputs = otherParams.psbt.inputs.map((input, n) => ({
     amount: input.value.toString(),
     scriptPubkey: Buffer.from(input.scriptPubkey).toString('hex'), // [1]
+    sequence: input.sequence,
     n,
     txId: Buffer.from(input.hash).reverse().toString('hex'), // [1]
     outputIndex: input.index

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

@@ -74,6 +74,10 @@ var _keymanager = require('../keymanager/keymanager');
 
 
 
+
+
+
+
 
 
 

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

@@ -155,8 +155,12 @@ var _UtxoWalletTools = require('./UtxoWalletTools');
       })
 
       // Transaction checks:
-      // The transaction must be found and not confirmed or dropped.
+      // Must be found
       if (replacedTx == null) return null
+      // Must have at least one input with the sequence enabling RBF policy
+      if (replacedTx.inputs.every(input => input.sequence > 0xfffffffd))
+        return null
+      // Must not be confirmed or dropped.
       if (replacedTx.blockHeight !== 0) return null
 
       // Double the fee used for the RBF transaction:

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

@@ -1332,9 +1332,10 @@ const processTransactionResponse = (
       })
     return {
       txId: vin.txid,
-      outputIndex: vin.vout, // case for tx `fefac8c22ba1178df5d7c90b78cc1c203d1a9f5f5506f7b8f6f469fa821c2674` no `vout` for input
+      outputIndex: vin.vout,
       n: vin.n,
       scriptPubkey,
+      sequence: vin.sequence,
       amount: vin.value
     }
   })

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

@@ -87,9 +87,15 @@ var _cleaners = require('cleaners');
     vin: _cleaners.asArray.call(void 0, 
       _cleaners.asObject.call(void 0, {
         txid: _cleaners.asString,
-        sequence: _cleaners.asOptional.call(void 0, _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),
         n: _cleaners.asNumber,
-        vout: _cleaners.asOptional.call(void 0, _cleaners.asNumber, 0), // If Blockbook doesn't provide vout, assume 0 (empirically observed)
+        // 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,

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

@@ -40,10 +40,14 @@ export interface IProcessorTransaction {
 }
 export interface ITransactionOutput {
     amount: string;
-    scriptPubkey: string;
     n: number;
+    scriptPubkey: string;
 }
-export interface ITransactionInput extends ITransactionOutput {
-    txId: string;
+export interface ITransactionInput {
+    amount: string;
+    n: number;
     outputIndex: number;
+    scriptPubkey: string;
+    sequence: number;
+    txId: string;
 }

package/lib/src/common/utxobased/keymanager/utxopicker/types.d.ts

@@ -5,7 +5,7 @@ export declare type Input = UTXO;
 export interface UTXO extends PsbtInput {
     hash: Buffer;
     index: number;
-    sequence?: number;
+    sequence: number;
     value: number;
     script: Buffer;
     scriptPubkey: Buffer;

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

@@ -28,7 +28,7 @@ export interface BlockbookTransaction {
     fees: string;
     vin: Array<{
         txid: string;
-        sequence?: number;
+        sequence: number;
         n: number;
         vout: number;
         addresses: string[];

package/package.json

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