RanchiMall/fcoin
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #122 from mnaamani/bip69-optional

Browse Source 
add option to disable bip69 in Wallet.send
This commit is contained in:
Christopher Jeffrey (JJ) 2017-01-27 17:49:35 -08:00 committed by GitHub
commit 94ec846fdd
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/wallet/wallet.js
View File

@ -1543,8 +1543,8 @@ Wallet.prototype.estimateSize = co(function* estimateSize(prev) {
/** /**
* Build a transaction, fill it with outputs and inputs, * Build a transaction, fill it with outputs and inputs,
* sort the members according to BIP69, set locktime, * sort the members according to BIP69 (set options.noSorting
* and template it. * to avoid sorting), set locktime, and template it.
* @param {Object} options - See {@link Wallet#fund options}. * @param {Object} options - See {@link Wallet#fund options}.
* @param {Object[]} options.outputs - See {@link MTX#addOutput}. * @param {Object[]} options.outputs - See {@link MTX#addOutput}.
* @returns {Promise} - Returns {@link MTX}. * @returns {Promise} - Returns {@link MTX}.
@ -1572,7 +1572,8 @@ Wallet.prototype.createTX = co(function* createTX(options, force) {
yield this.fund(mtx, options, force); yield this.fund(mtx, options, force);
// Sort members a la BIP69 // Sort members a la BIP69
mtx.sortMembers(); if(!options.noSorting)
mtx.sortMembers();
// Set the locktime to target value. // Set the locktime to target value.
if (options.locktime != null) if (options.locktime != null)