diff --git a/src/networks.js b/src/networks.js index 4b1f690..fdb3706 100644 --- a/src/networks.js +++ b/src/networks.js @@ -10,8 +10,8 @@ module.exports = { pubKeyHash: 0x00, scriptHash: 0x05, wif: 0x80, - dustThreshold: 5430, //should be 546 https://github.com/bitcoin/bitcoin/pull/2760/files - feePerKb: 20000 + dustThreshold: 546, + feePerKb: 10000 }, dogecoin: { magicPrefix: '\x19Dogecoin Signed Message:\n', @@ -22,7 +22,7 @@ module.exports = { pubKeyHash: 0x1e, scriptHash: 0x16, wif: 0x9e, - dustThreshold: 1000000, + dustThreshold: 0, feePerKb: 100000000 }, litecoin: { @@ -34,7 +34,7 @@ module.exports = { pubKeyHash: 0x30, scriptHash: 0x05, wif: 0xb0, - dustThreshold: 1000, + dustThreshold: 0, feePerKb: 100000 }, testnet: { @@ -46,7 +46,7 @@ module.exports = { pubKeyHash: 0x6f, scriptHash: 0xc4, wif: 0xef, - dustThreshold: 5430, - feePerKb: 20000 + dustThreshold: 546, + feePerKb: 10000 } } diff --git a/test/wallet.js b/test/wallet.js index ad94d03..eec0ac0 100644 --- a/test/wallet.js +++ b/test/wallet.js @@ -389,7 +389,7 @@ describe('Wallet', function() { "hash": fakeTxId(3), "outputIndex": 0, "address" : address2, - "value": 520000 // enough for value and fee + "value": 510000 // enough for value and fee } ] wallet.setUnspentOutputs(utxo) @@ -417,7 +417,7 @@ describe('Wallet', function() { }) it('allows fee to be set to zero', function(){ - value = 520000 + value = 510000 var fee = 0 var tx = wallet.createTx(to, value, fee) @@ -459,7 +459,7 @@ describe('Wallet', function() { }]) var to = 'mt7MyTVVEWnbwpF5hBn6fgnJcv95Syk2ue' - var toValue = value - 20000 + var toValue = value - 10000 var tx = wallet.createTx(to, toValue) assert.equal(tx.outs.length, 1) @@ -516,7 +516,7 @@ describe('Wallet', function() { describe('change', function(){ it('uses the last change address if there is any', function(){ - var fee = 5000 + var fee = 0 wallet.generateChangeAddress() wallet.generateChangeAddress() var tx = wallet.createTx(to, value, fee) @@ -526,11 +526,11 @@ describe('Wallet', function() { var outAddress = Address.fromOutputScript(out.script) assert.equal(outAddress.toString(), wallet.changeAddresses[1]) - assert.equal(out.value, 15000) + assert.equal(out.value, 10000) }) it('generates a change address if there is not any', function(){ - var fee = 5000 + var fee = 0 assert.equal(wallet.changeAddresses.length, 0) var tx = wallet.createTx(to, value, fee) @@ -540,7 +540,7 @@ describe('Wallet', function() { var outAddress = Address.fromOutputScript(out.script) assert.equal(outAddress.toString(), wallet.changeAddresses[0]) - assert.equal(out.value, 15000) + assert.equal(out.value, 10000) }) it('skips change if it is not above dust threshold', function(){ @@ -569,11 +569,11 @@ describe('Wallet', function() { describe('when value is below dust threshold', function(){ it('throws an error', function(){ - var value = 5430 + var value = 546 assert.throws(function() { wallet.createTx(to, value) - }, /5430 must be above dust threshold \(5430 Satoshis\)/) + }, /546 must be above dust threshold \(546 Satoshis\)/) }) }) @@ -583,7 +583,7 @@ describe('Wallet', function() { assert.throws(function() { wallet.createTx(to, value) - }, /Not enough funds \(incl. fee\): 1420000 < 1420001/) + }, /Not enough funds \(incl. fee\): 1410000 < 1410001/) }) }) })