X-Git-Url: https://git.immae.eu/?p=perso%2FImmae%2FProjets%2FCryptomonnaies%2FBIP39.git;a=blobdiff_plain;f=src%2Fjs%2Findex.js;h=8262947a64aa82a967566e6549370dcbef5a83c8;hp=86997333d7756030635db050753937ab0ace3718;hb=bf13c95fb0a800b8d40b2c8ee0826a49b17ccd7d;hpb=7a11300336844b822a8f3ec4f85586b79c5954f4

diff --git a/src/js/index.js b/src/js/index.js
index 8699733..8262947 100644
--- a/src/js/index.js
+++ b/src/js/index.js
@@ -929,17 +929,13 @@
                     pubkey = ethUtil.addHexPrefix(pubkey);
                 }
                 if ((networks[DOM.network.val()].name == "NAS - Nebulas")) {
-                    var NasAccount = require("nebulas").Account;
+                    var NasAccount = require("nebulas-account");
                     var privKeyBuffer = keyPair.d.toBuffer(32);
-                    // privkey = privKeyBuffer.toString('hex');
-                    console.log(privkey);
-                    var nasAccount = NasAccount.NewAccount(privKeyBuffer);
-                    // var addressBuffer = ethUtil.privateToAddress(privKeyBuffer);
-                    // var hexAddress = addressBuffer.toString('hex');
-                    // var checksumAddress = ethUtil.toChecksumAddress(hexAddress);
-                    address = nasAccount.getAddressString();
-                    privkey = nasAccount.getPrivateKeyString();
-                    pubkey = nasAccount.getPublicKeyString();
+                    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") {
@@ -956,6 +952,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) {
@@ -974,6 +977,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();
@@ -1722,7 +1730,7 @@
                 network = bitcoinjs.bitcoin.networks.blocknode;
                 setHdCoin(2941);
             },
-        },	
+        },
 		{
             name: "tBND - Blocknode Testnet",
             onSelect: function() {
@@ -1871,6 +1879,13 @@
                 setHdCoin(186);
             },
         },
+        {
+            name: "CRW - Crown (Legacy)",
+            onSelect: function() {
+                network = bitcoinjs.bitcoin.networks.crown;
+                setHdCoin(72);
+            },
+        },
         {
             name: "CRW - Crown",
             onSelect: function() {
@@ -2490,6 +2505,13 @@
                 setHdCoin(111);
             },
         },
+        {
+            name: "SLP - Simple Ledger Protocol",
+            onSelect: function() {
+                DOM.bitcoinCashAddressTypeContainer.removeClass("hidden");
+                setHdCoin(245);
+            },
+        },
         {
             name: "SLR - Solarcoin",
             onSelect: function() {