Merge pull request #14 from dashevo/fix/txlockvote

Fix/txlockvote
dashpay · Dec 11, 2017 · fee85ee · fee85ee
2 parents a708fd9 + 1420f0b
commit fee85ee
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/lib/services/bitcoind.js b/lib/services/bitcoind.js
@@ -79,7 +79,7 @@ Bitcoin.DEFAULT_REINDEX_INTERVAL = 10000;
 Bitcoin.DEFAULT_START_RETRY_INTERVAL = 5000;
 Bitcoin.DEFAULT_TIP_UPDATE_INTERVAL = 15000;
 Bitcoin.DEFAULT_TRANSACTION_CONCURRENCY = 5;
-Bitcoin.DEFAULT_INSTANTSEND_FEE = 100000;
+Bitcoin.DEFAULT_INSTANTSEND_FEE = 10000;
 Bitcoin.DEFAULT_CONFIG_SETTINGS = {
   server: 1,
   whitelist: '127.0.0.1',
@@ -2086,6 +2086,7 @@ Bitcoin.prototype.getDetailedTransaction = function(txid, callback) {
   function addTxlockToTx(tx,result) {
     tx.txlock = false;
     if (tx.feeSatoshis >= Bitcoin.DEFAULT_INSTANTSEND_FEE) { // if transaction fee is >= 0.001 check for txlock
+    if (tx.feeSatoshis >= Bitcoin.DEFAULT_INSTANTSEND_FEE) { // if transaction fee is >= 0.0001 check for txlock
       var rawTx = new bitcore.Transaction(result.hex);
       var hash = bitcore.crypto.Hash.sha256sha256(rawTx.toBuffer());
       var id = hash.toString('binary');