LBRYCommunity/bitcoinjs-lib
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix bitcoin dustThreshold and feePerKb values

Browse source
This commit is contained in:
Wei Lu 2014-06-17 14:36:57 +08:00
parent 45a72416c9
commit 79ec61d085
2 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/networks.js
View file

@ -10,8 +10,8 @@ module.exports = {
pubKeyHash: 0x00, pubKeyHash: 0x00,
scriptHash: 0x05, scriptHash: 0x05,
wif: 0x80, wif: 0x80,
dustThreshold: 5430, //should be 546 https://github.com/bitcoin/bitcoin/pull/2760/files dustThreshold: 546,
feePerKb: 20000 feePerKb: 10000
}, },
dogecoin: { dogecoin: {
magicPrefix: '\x19Dogecoin Signed Message:\n', magicPrefix: '\x19Dogecoin Signed Message:\n',
@ -22,7 +22,7 @@ module.exports = {
pubKeyHash: 0x1e, pubKeyHash: 0x1e,
scriptHash: 0x16, scriptHash: 0x16,
wif: 0x9e, wif: 0x9e,
dustThreshold: 1000000, dustThreshold: 0,
feePerKb: 100000000 feePerKb: 100000000
}, },
litecoin: { litecoin: {
@ -34,7 +34,7 @@ module.exports = {
pubKeyHash: 0x30, pubKeyHash: 0x30,
scriptHash: 0x05, scriptHash: 0x05,
wif: 0xb0, wif: 0xb0,
dustThreshold: 1000, dustThreshold: 0,
feePerKb: 100000 feePerKb: 100000
}, },
testnet: { testnet: {
@ -46,7 +46,7 @@ module.exports = {
pubKeyHash: 0x6f, pubKeyHash: 0x6f,
scriptHash: 0xc4, scriptHash: 0xc4,
wif: 0xef, wif: 0xef,
dustThreshold: 5430, dustThreshold: 546,
feePerKb: 20000 feePerKb: 10000
} }
} }

20
test/wallet.js
View file

@ -389,7 +389,7 @@ describe('Wallet', function() {
"hash": fakeTxId(3), "hash": fakeTxId(3),
"outputIndex": 0, "outputIndex": 0,
"address" : address2, "address" : address2,
"value": 520000 // enough for value and fee "value": 510000 // enough for value and fee
} }
] ]
wallet.setUnspentOutputs(utxo) wallet.setUnspentOutputs(utxo)
@ -417,7 +417,7 @@ describe('Wallet', function() {
}) })
it('allows fee to be set to zero', function(){ it('allows fee to be set to zero', function(){
value = 520000 value = 510000
var fee = 0 var fee = 0
var tx = wallet.createTx(to, value, fee) var tx = wallet.createTx(to, value, fee)
@ -459,7 +459,7 @@ describe('Wallet', function() {
}]) }])
var to = 'mt7MyTVVEWnbwpF5hBn6fgnJcv95Syk2ue' var to = 'mt7MyTVVEWnbwpF5hBn6fgnJcv95Syk2ue'
var toValue = value - 20000 var toValue = value - 10000
var tx = wallet.createTx(to, toValue) var tx = wallet.createTx(to, toValue)
assert.equal(tx.outs.length, 1) assert.equal(tx.outs.length, 1)
@ -516,7 +516,7 @@ describe('Wallet', function() {
describe('change', function(){ describe('change', function(){
it('uses the last change address if there is any', function(){ it('uses the last change address if there is any', function(){
var fee = 5000 var fee = 0
wallet.generateChangeAddress() wallet.generateChangeAddress()
wallet.generateChangeAddress() wallet.generateChangeAddress()
var tx = wallet.createTx(to, value, fee) var tx = wallet.createTx(to, value, fee)
@ -526,11 +526,11 @@ describe('Wallet', function() {
var outAddress = Address.fromOutputScript(out.script) var outAddress = Address.fromOutputScript(out.script)
assert.equal(outAddress.toString(), wallet.changeAddresses[1]) 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(){ it('generates a change address if there is not any', function(){
var fee = 5000 var fee = 0
assert.equal(wallet.changeAddresses.length, 0) assert.equal(wallet.changeAddresses.length, 0)
var tx = wallet.createTx(to, value, fee) var tx = wallet.createTx(to, value, fee)
@ -540,7 +540,7 @@ describe('Wallet', function() {
var outAddress = Address.fromOutputScript(out.script) var outAddress = Address.fromOutputScript(out.script)
assert.equal(outAddress.toString(), wallet.changeAddresses[0]) 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(){ 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(){ describe('when value is below dust threshold', function(){
it('throws an error', function(){ it('throws an error', function(){
var value = 5430 var value = 546
assert.throws(function() { assert.throws(function() {
wallet.createTx(to, value) 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() { assert.throws(function() {
wallet.createTx(to, value) wallet.createTx(to, value)
}, /Not enough funds \(incl. fee\): 1420000 < 1420001/) }, /Not enough funds \(incl. fee\): 1410000 < 1410001/)
}) })
}) })
}) })