From: Suat Özgür Date: Sat, 25 May 2019 12:18:15 +0000 (+0200) Subject: Merge branch 'master' into master X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;ds=sidebyside;h=c2e4f93870bcebdebf501ba0353f2837ab68417f;hp=-c;p=perso%2FImmae%2FProjets%2FCryptomonnaies%2FBIP39.git Merge branch 'master' into master --- c2e4f93870bcebdebf501ba0353f2837ab68417f diff --combined src/index.html index a3d6c0c,cc8dcad..d64d27e --- a/src/index.html +++ b/src/index.html @@@ -15,7 -15,7 +15,7 @@@

Mnemonic Code Converter

-

v0.3.9

+

v0.3.11

@@@ -69,7 -69,7 +69,7 @@@
- +
- +
@@@ -748,14 -748,6 +748,6 @@@ Read more at the official BIP49 spec

-

Private Keys

-

- - Use private keys at - brainwallet.org. - - Be careful - it can be easy to make mistakes if you don't know what you're doing. -

Entropy

Entropy values should not include the BIP39 checksum. This is automatically added by the tool. @@@ -935,6 -927,7 +927,7 @@@ + @@@ -948,7 -941,6 +941,7 @@@ + diff --combined src/js/index.js index 353f40f,6085f1b..d822b55 --- a/src/js/index.js +++ b/src/js/index.js @@@ -917,7 -917,11 +917,11 @@@ || (networks[DOM.network.val()].name == "MUSIC - Musicoin") || (networks[DOM.network.val()].name == "POA - Poa") || (networks[DOM.network.val()].name == "EXP - Expanse") - || (networks[DOM.network.val()].name == "CLO - Callisto")) { + || (networks[DOM.network.val()].name == "CLO - Callisto") + || (networks[DOM.network.val()].name == "DXN - DEXON") + || (networks[DOM.network.val()].name == "ELLA - Ellaism") + || (networks[DOM.network.val()].name == "ESN - Ethersocial Network") + ) { var privKeyBuffer = keyPair.d.toBuffer(32); privkey = privKeyBuffer.toString('hex'); var addressBuffer = ethUtil.privateToAddress(privKeyBuffer); @@@ -927,18 -931,15 +931,28 @@@ privkey = ethUtil.addHexPrefix(privkey); pubkey = ethUtil.addHexPrefix(pubkey); } ++ + // Stellar is different + if (networks[DOM.network.val()].name == "XLM - Stellar") { + var purpose = parseIntNoNaN(DOM.bip44purpose.val(), 44); + var coin = parseIntNoNaN(DOM.bip44coin.val(), 0); + var path = "m/"; + path += purpose + "'/"; + path += coin + "'/" + index + "'"; + var keypair = stellarUtil.getKeypair(path, seed); + indexText = path; + privkey = keypair.secret(); + pubkey = address = keypair.publicKey(); + } + if ((networks[DOM.network.val()].name == "NAS - Nebulas")) { + var NasAccount = require("nebulas-account"); + var privKeyBuffer = keyPair.d.toBuffer(32); + var nebulasAccount = new NasAccount(); + nebulasAccount.setPrivateKey(privKeyBuffer); + address = nebulasAccount.getAddressString(); + privkey = nebulasAccount.getPrivateKeyString(); + pubkey = nebulasAccount.getPublicKeyString(); + } // Ripple values are different if (networks[DOM.network.val()].name == "XRP - Ripple") { privkey = convertRipplePriv(privkey); @@@ -954,6 -955,13 +968,13 @@@ address = bchaddr.toBitpayAddress(address); } } + // Bitcoin Cash address format may vary + if (networks[DOM.network.val()].name == "SLP - Simple Ledger Protocol") { + var bchAddrType = DOM.bitcoinCashAddressType.filter(":checked").val(); + if (bchAddrType == "cashaddr") { + address = bchaddr.toSlpAddress(address); + } + } // Segwit addresses are different if (isSegwit) { if (!segwitAvailable) { @@@ -972,6 -980,11 +993,11 @@@ address = bitcoinjs.bitcoin.address.fromOutputScript(scriptpubkey, network) } } + + if ((networks[DOM.network.val()].name == "CRW - Crown")) { + address = bitcoinjs.bitcoin.networks.crown.toNewAddress(address); + } + addAddressToList(indexText, address, pubkey, privkey); if (isLast) { hidePending(); @@@ -1679,6 -1692,13 +1705,13 @@@ setHdCoin(220); }, }, + { + name: "BOLI - Bolivarcoin", + onSelect: function() { + network = bitcoinjs.bitcoin.networks.bolivarcoin; + setHdCoin(278); + }, + }, { name: "BCA - Bitcoin Atom", onSelect: function() { @@@ -1720,7 -1740,7 +1753,7 @@@ network = bitcoinjs.bitcoin.networks.blocknode; setHdCoin(2941); }, - }, + }, { name: "tBND - Blocknode Testnet", onSelect: function() { @@@ -1741,6 -1761,13 +1774,13 @@@ network = bitcoinjs.bitcoin.networks.bitsend; setHdCoin(91); }, + }, + { + name: "BST - BlockStamp", + onSelect: function() { + network = bitcoinjs.bitcoin.networks.blockstamp; + setHdCoin(254); + }, }, { name: "BTA - Bata", @@@ -1862,6 -1889,13 +1902,13 @@@ setHdCoin(186); }, }, + { + name: "CRW - Crown (Legacy)", + onSelect: function() { + network = bitcoinjs.bitcoin.networks.crown; + setHdCoin(72); + }, + }, { name: "CRW - Crown", onSelect: function() { @@@ -1925,6 -1959,13 +1972,13 @@@ setHdCoin(3); }, }, + { + name: "DXN - DEXON", + onSelect: function() { + network = bitcoinjs.bitcoin.networks.bitcoin; + setHdCoin(237); + }, + }, { name: "ECN - Ecoin", onSelect: function() { @@@ -1946,6 -1987,14 +2000,14 @@@ setHdCoin(78); }, }, + { + name: "ELLA - Ellaism", + segwitAvailable: false, + onSelect: function() { + network = bitcoinjs.bitcoin.networks.bitcoin; + setHdCoin(163); + }, + }, { name: "EMC2 - Einsteinium", onSelect: function() { @@@ -1960,6 -2009,14 +2022,14 @@@ setHdCoin(151); }, }, + { + name: "ESN - Ethersocial Network", + segwitAvailable: false, + onSelect: function() { + network = bitcoinjs.bitcoin.networks.bitcoin; + setHdCoin(31102); + }, + }, { name: "ETC - Ethereum Classic", segwitAvailable: false, @@@ -2139,6 -2196,14 +2209,14 @@@ setHdCoin(114); }, }, + { + name: "LKR - Lkrcoin", + segwitAvailable: false, + onSelect: function() { + network = bitcoinjs.bitcoin.networks.lkrcoin; + setHdCoin(557); + }, + }, { name: "LTC - Litecoin", onSelect: function() { @@@ -2212,6 -2277,13 +2290,13 @@@ setHdCoin(130); }, }, + { + name: "NAS - Nebulas", + onSelect: function() { + network = bitcoinjs.bitcoin.networks.bitcoin; + setHdCoin(2718); + }, + }, { name: "NEBL - Neblio", onSelect: function() { @@@ -2226,6 -2298,13 +2311,13 @@@ setHdCoin(25); }, }, + { + name: "NIX - NIX Platform", + onSelect: function() { + network = bitcoinjs.bitcoin.networks.nix; + setHdCoin(400); + }, + }, { name: "NLG - Gulden", onSelect: function() { @@@ -2452,6 -2531,13 +2544,13 @@@ setHdCoin(111); }, }, + { + name: "SLP - Simple Ledger Protocol", + onSelect: function() { + DOM.bitcoinCashAddressTypeContainer.removeClass("hidden"); + setHdCoin(245); + }, + }, { name: "SLR - Solarcoin", onSelect: function() { @@@ -2592,14 -2678,6 +2691,14 @@@ setHdCoin(65); }, }, + { + name: "XLM - Stellar", + onSelect: function() { + segwitAvailable: false, + network =bitcoinjs.bitcoin.networks.bitcoin; + setHdCoin(148); + }, + }, { name: "XMY - Myriadcoin", onSelect: function() {