From 29c30bf33ae079c55007d8738d077d10d40bca2b Mon Sep 17 00:00:00 2001 From: woodser Date: Fri, 18 May 2018 10:26:54 -0400 Subject: Fix incorrect address generation for altcoins with bip38 --- src/js/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/js/index.js b/src/js/index.js index 567a3f7..afa743d 100644 --- a/src/js/index.js +++ b/src/js/index.js @@ -813,7 +813,7 @@ var keyPair = key.keyPair; var useUncompressed = useBip38; if (useUncompressed) { - keyPair = new bitcoinjs.bitcoin.ECPair(keyPair.d, null, { compressed: false }); + keyPair = new bitcoinjs.bitcoin.ECPair(keyPair.d, null, { network: network, compressed: false }); } // get address var address = keyPair.getAddress().toString(); @@ -821,7 +821,7 @@ var hasPrivkey = !key.isNeutered(); var privkey = "NA"; if (hasPrivkey) { - privkey = keyPair.toWIF(network); + privkey = keyPair.toWIF(); // BIP38 encode private key if required if (useBip38) { privkey = bitcoinjsBip38.encrypt(keyPair.d.toBuffer(), false, bip38password, function(p) { -- cgit v1.2.3 From 6df5b2a1004c99e82d33c4070a25ee94157301f8 Mon Sep 17 00:00:00 2001 From: woodser Date: Fri, 18 May 2018 10:31:46 -0400 Subject: increase maximum payload length for zcash --- src/js/bitcoinjs-3.3.2.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/js/bitcoinjs-3.3.2.js b/src/js/bitcoinjs-3.3.2.js index 2390168..0a6c588 100644 --- a/src/js/bitcoinjs-3.3.2.js +++ b/src/js/bitcoinjs-3.3.2.js @@ -8642,7 +8642,7 @@ function fromBase58Check (address) { // TODO: 4.0.0, move to "toOutputScript" if (payload.length < 21) throw new TypeError(address + ' is too short') - if (payload.length > 21) throw new TypeError(address + ' is too long') + if (payload.length > 22) throw new TypeError(address + ' is too long') var version = payload.readUInt8(0) var hash = payload.slice(1) -- cgit v1.2.3 From 55b878d8d55639cea6d5cd0755194e0e768ba4de Mon Sep 17 00:00:00 2001 From: woodser Date: Mon, 21 May 2018 11:05:49 -0400 Subject: undo zcash max payload length fix --- src/js/bitcoinjs-3.3.2.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/js/bitcoinjs-3.3.2.js b/src/js/bitcoinjs-3.3.2.js index 0a6c588..2390168 100644 --- a/src/js/bitcoinjs-3.3.2.js +++ b/src/js/bitcoinjs-3.3.2.js @@ -8642,7 +8642,7 @@ function fromBase58Check (address) { // TODO: 4.0.0, move to "toOutputScript" if (payload.length < 21) throw new TypeError(address + ' is too short') - if (payload.length > 22) throw new TypeError(address + ' is too long') + if (payload.length > 21) throw new TypeError(address + ' is too long') var version = payload.readUInt8(0) var hash = payload.slice(1) -- cgit v1.2.3