Merge remote-tracking branch 'origin/master'

Author: shumkov

lib/instantlock/instantlock.js

@@ -75,7 +75,7 @@ class InstantLock {
       signature,
     };
 
-    if (version === 1) {
+    if (version >= 1) {
       result.version = version;
       result.cyclehash = cyclehash;
     }
@@ -406,7 +406,7 @@ class InstantLock {
       signature: this.signature.toString('hex'),
     };
 
-    if (this.version === 1) {
+    if (this.version >= 1) {
       result.version = this.version;
       result.cyclehash = this.cyclehash;
     }

lib/transaction/transaction.js

@@ -1494,7 +1494,7 @@ Transaction.prototype.getOutPointBuffer = function getOutPointBuffer(
     );
   }
 
-  var binaryTransactionHash = Buffer.from(this.hash, 'hex');
+  var binaryTransactionHash = this._getHash();
   var indexBuffer = Buffer.alloc(4);
 
   indexBuffer.writeUInt32LE(outputIndex, 0);

test/transaction/transaction.js

@@ -1591,7 +1591,7 @@ describe('Transaction', function () {
 
       var outPointBuffer = transaction.getOutPointBuffer(0);
 
-      expect(outPointBuffer.toString('hex')).to.be.equal(txHash + indexHex);
+      expect(outPointBuffer.toString('hex')).to.be.equal(transaction._getHash().toString('hex') + indexHex);
       expect(outPointBuffer.length).to.be.equal(36);
     });