More of funky comparisons, now for TX

bcoin-org · Apr 18, 2019 · 903d70d · 903d70d
1 parent 01a7c8b
commit 903d70d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/lib/funky.js b/lib/funky.js
@@ -1,6 +1,11 @@
 const MTX = require('bcoin/lib/primitives/mtx');
+const TX = require('bcoin/lib/primitives/tx');
 const CoinView = require('bcoin/lib/coins/coinview');
 
+export function isTX(obj) {
+    return TX.isTX(obj) || (obj.constructor.toString() == TX.toString()) || isMTX(obj)
+}
+
 export function isMTX(obj) {
     return MTX.isMTX(obj) || (obj.constructor.toString() == MTX.toString())
 }

diff --git a/lib/ledger.js b/lib/ledger.js
@@ -79,7 +79,7 @@ class LedgerBTCApp {
 
   async getTrustedInput(tx, inputIndex) {
     assert(this.device);
-    assert(TX.isTX(tx));
+    assert(funky.isTX(tx));
 
     const messages = utilTX.splitTransaction(tx);
 
@@ -121,7 +121,7 @@ class LedgerBTCApp {
 
   async hashTransactionStart(tx, view, tis, isNew, hasWitness) {
     assert(this.device);
-    assert(TX.isTX(tx), 'tx must be instanceof TX');
+    assert(funky.isTX(tx), 'tx must be instanceof TX');
     assert(funky.isCoinView(view), 'view must be instanceof CoinView');
     assert(typeof tis === 'object', 'Trusted input map not found.');
 
@@ -269,7 +269,7 @@ class LedgerBTCApp {
 
   async hashTransactionStartSegwit(tx, view, key, prev) {
     assert(this.device);
-    assert(TX.isTX(tx));
+    assert(funky.isTX(tx));
 
     const newTX = new TX();
     newTX.inject(tx);
@@ -305,7 +305,7 @@ class LedgerBTCApp {
 
   async hashOutputFinalize(tx) {
     assert(this.device);
-    assert(funky.isMTX(tx));
+    assert(funky.isTX(tx));
 
     let size = encoding.sizeVarint(tx.outputs.length);
 
@@ -347,7 +347,7 @@ class LedgerBTCApp {
 
   async hashSign(tx, path, type) {
     assert(this.device);
-    assert(TX.isTX(tx));
+    assert(funky.isTX(tx));
 
     if (typeof path === 'string')
       path = util.parsePath(path, true);