From 1c2b8c6b2d77cdb0162f040c07d25bbe7cafe7c2 Mon Sep 17 00:00:00 2001 From: Ian Coleman Date: Wed, 22 Nov 2017 09:40:35 +1100 Subject: Use ltub for litecoin by default instead of xprv Introduced when upgrading from bitcoinjs-lib v3.3.0 --- src/index.html | 2 +- src/js/bitcoinjs-extensions.js | 11 +++++++++++ src/js/index.js | 6 +++--- tests/spec/tests.js | 10 +++++----- 4 files changed, 20 insertions(+), 9 deletions(-) diff --git a/src/index.html b/src/index.html index 659f572..9c126b9 100644 --- a/src/index.html +++ b/src/index.html @@ -277,7 +277,7 @@
diff --git a/src/js/bitcoinjs-extensions.js b/src/js/bitcoinjs-extensions.js index c98ff63..63f7c6e 100644 --- a/src/js/bitcoinjs-extensions.js +++ b/src/js/bitcoinjs-extensions.js @@ -316,3 +316,14 @@ bitcoinjs.bitcoin.networks.litecoinBip49 = { scriptHash: 0x32, wif: 0xb0 }; + +bitcoinjs.bitcoin.networks.litecoinXprv = { + messagePrefix: '\x19Litecoin Signed Message:\n', + bip32: { + public: 0x0488b21e, + private: 0x0488ade4, + }, + pubKeyHash: 0x30, + scriptHash: 0x32, + wif: 0xb0 +}; diff --git a/src/js/index.js b/src/js/index.js index 38a7efd..e4920ce 100644 --- a/src/js/index.js +++ b/src/js/index.js @@ -14,7 +14,7 @@ var showPubKey = true; var showPrivKey = true; var showQr = false; - var litecoinUseLtub = false; + var litecoinUseLtub = true; var entropyChangeTimeoutEvent = null; var phraseChangeTimeoutEvent = null; @@ -318,10 +318,10 @@ function litecoinUseLtubChanged() { litecoinUseLtub = DOM.litecoinUseLtub.prop("checked"); if (litecoinUseLtub) { - network = bitcoinjs.bitcoin.networks.litecoinLtub; + network = bitcoinjs.bitcoin.networks.litecoin; } else { - network = bitcoinjs.bitcoin.networks.litecoin; + network = bitcoinjs.bitcoin.networks.litecoinXprv; } phraseChanged(); } diff --git a/tests/spec/tests.js b/tests/spec/tests.js index f10f7a4..4f774e8 100644 --- a/tests/spec/tests.js +++ b/tests/spec/tests.js @@ -2473,11 +2473,11 @@ it('Shows error for hardened addresses with xpub root key', function(done) { }); }); -// Litecoin uses xprv by default, and can optionally be set to ltpv +// Litecoin uses ltub by default, and can optionally be set to xprv // github issue 96 // https://github.com/iancoleman/bip39/issues/96 // Issue with extended keys on Litecoin -it('Uses xprv by default for litecoin, but can be set to ltpv', function(done) { +it('Uses ltub by default for litecoin, but can be set to xprv', function(done) { driver.findElement(By.css('.phrase')) .sendKeys("abandon abandon ability"); selectNetwork("LTC - Litecoin"); @@ -2486,17 +2486,17 @@ it('Uses xprv by default for litecoin, but can be set to ltpv', function(done) { driver.findElement(By.css('.root-key')) .getAttribute("value") .then(function(rootKey) { - expect(rootKey).toBe("xprv9s21ZrQH143K2jkGDCeTLgRewT9F2pH5JZs2zDmmjXes34geVnFiuNa8KTvY5WoYvdn4Ag6oYRoB6cXtc43NgJAEqDXf51xPm6fhiMCKwpi"); + expect(rootKey).toBe("Ltpv71G8qDifUiNesiPqf6h5V6eQ8ic77oxQiYtawiACjBEx3sTXNR2HGDGnHETYxESjqkMLFBkKhWVq67ey1B2MKQXannUqNy1RZVHbmrEjnEU"); // set litecoin to use ltub driver.executeScript(function() { - $(".litecoin-use-ltub").prop("checked", true); + $(".litecoin-use-ltub").prop("checked", false); $(".litecoin-use-ltub").trigger("change"); }); driver.sleep(generateDelay).then(function() { driver.findElement(By.css('.root-key')) .getAttribute("value") .then(function(rootKey) { - expect(rootKey).toBe("Ltpv71G8qDifUiNesiPqf6h5V6eQ8ic77oxQiYtawiACjBEx3sTXNR2HGDGnHETYxESjqkMLFBkKhWVq67ey1B2MKQXannUqNy1RZVHbmrEjnEU"); + expect(rootKey).toBe("xprv9s21ZrQH143K2jkGDCeTLgRewT9F2pH5JZs2zDmmjXes34geVnFiuNa8KTvY5WoYvdn4Ag6oYRoB6cXtc43NgJAEqDXf51xPm6fhiMCKwpi"); done(); }); }) -- cgit v1.2.3