Merge branch 'master' into master

src/js/jsbip39.js

@@ -156,14 +156,7 @@ var Mnemonic = function(language) {
     }
 
     self.normalizeString = function(str) {
-        if (typeof str.normalize == "function") {
-            return str.normalize("NFKD");
-        }
-        else {
-            // TODO decide how to handle this in the future.
-            // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/normalize
-            return str;
-        }
+        return str.normalize("NFKD");
     }
 
     function byteArrayToWordArray(data) {

src/js/segwit-parameters.js

@@ -15,6 +15,19 @@ bitcoinjs.bitcoin.networks.bitcoin.p2wpkh = {
     wif: 0x80
 };
 
+bitcoinjs.bitcoin.networks.testnet.p2wpkh = {
+    baseNetwork: "testnet",
+    messagePrefix: '\x18Bitcoin Signed Message:\n',
+    bech32: 'tb',
+    bip32: {
+        public: 0x045f1cf6,
+        private: 0x045f18bc
+    },
+    pubKeyHash: 0x6f,
+    scriptHash: 0xc4,
+    wif: 0xef
+};
+
 // p2wpkh in p2sh
 
 bitcoinjs.bitcoin.networks.bitcoin.p2wpkhInP2sh = {
@@ -43,9 +56,23 @@ bitcoinjs.bitcoin.networks.testnet.p2wpkhInP2sh = {
     wif: 0xef
 };
 
+bitcoinjs.bitcoin.networks.litecoin.p2wpkh = {
+    baseNetwork: "litecoin",
+    messagePrefix: '\x19Litecoin Signed Message:\n',
+    bech32: 'ltc',
+    bip32: {
+        public: 0x04b24746,
+        private: 0x04b2430c
+    },
+    pubKeyHash: 0x30,
+    scriptHash: 0x32,
+    wif: 0xb0
+};
+
 bitcoinjs.bitcoin.networks.litecoin.p2wpkhInP2sh = {
     baseNetwork: "litecoin",
     messagePrefix: '\x19Litecoin Signed Message:\n',
+    bech32: 'ltc',
     bip32: {
         public: 0x01b26ef6,
         private: 0x01b26792
@@ -55,4 +82,131 @@ bitcoinjs.bitcoin.networks.litecoin.p2wpkhInP2sh = {
     wif: 0xb0
 };
 
+bitcoinjs.bitcoin.networks.fujicoin.p2wpkh = {
+    baseNetwork: "fujicoin",
+    messagePrefix: '\x19FujiCoin Signed Message:\n',
+    bech32: 'fc',
+    bip32: {
+        public: 0x04b24746,
+        private: 0x04b2430c
+    },
+    pubKeyHash: 0x24,
+    scriptHash: 0x10,
+    wif: 0xa4
+};
+
+bitcoinjs.bitcoin.networks.fujicoin.p2wpkhInP2sh = {
+    baseNetwork: "fujicoin",
+    messagePrefix: '\x19FujiCoin Signed Message:\n',
+    bech32: 'fc',
+    bip32: {
+        public: 0x049d7cb2,
+        private: 0x049d7878
+    },
+    pubKeyHash: 0x24,
+    scriptHash: 0x10,
+    wif: 0xa4
+};
+
+bitcoinjs.bitcoin.networks.vertcoin.p2wpkh = {
+    baseNetwork: "vertcoin",
+    messagePrefix: '\x18Vertcoin Signed Message:\n',
+    bech32: 'vtc',
+    bip32: {
+        public: 0x0488b21e,
+        private: 0x0488ade4
+    },
+    pubKeyHash: 71,
+    scriptHash: 5,
+    wif: 0x80
+};
+
+bitcoinjs.bitcoin.networks.vertcoin.p2wpkhInP2sh = {
+    baseNetwork: "vertcoin",
+    messagePrefix: '\x18Vertcoin Signed Message:\n',
+    bip32: {
+        public: 0x0488b21e,
+        private: 0x0488ade4
+    },
+    pubKeyHash: 71,
+    scriptHash: 5,
+    wif: 0x80
+};
+
+bitcoinjs.bitcoin.networks.bgold.p2wpkh = {
+    baseNetwork: "bgold",
+    messagePrefix: '\x1DBitcoin Gold Signed Message:\n',
+    bech32: 'btg',
+    bip32: {
+        public: 0x04b24746,
+        private: 0x04b2430c
+    },
+    pubKeyHash: 0x26,
+    scriptHash: 0x17,
+    wif: 0x80,
+};
+
+bitcoinjs.bitcoin.networks.bgold.p2wpkhInP2sh = {
+    baseNetwork: "bgold",
+    messagePrefix: '\x1DBitcoin Gold Signed Message:\n',
+    bech32: 'btg',
+    bip32: {
+        public: 0x049d7cb2,
+        private: 0x049d7878
+    },
+    pubKeyHash: 0x26,
+    scriptHash: 0x17,
+    wif: 0x80,
+};
+
+bitcoinjs.bitcoin.networks.digibyte.p2wpkh = {
+    baseNetwork: "digibyte",
+    messagePrefix: '\x18DigiByte Signed Message:\n',
+    bech32: 'dgb',
+    bip32: {
+        public: 0x0488B21E,
+        private: 0x0488ADE4
+    },
+    pubKeyHash: 0x1e,
+    scriptHash: 0x3f,
+    wif: 0x80
+};
+
+bitcoinjs.bitcoin.networks.digibyte.p2wpkhInP2sh = {
+    baseNetwork: "digibyte",	
+    messagePrefix: '\x18DigiByte Signed Message:\n',
+    bech32: 'dgb',
+    bip32: {
+        public: 0x0488B21E,
+        private: 0x0488ADE4
+    },
+    pubKeyHash: 0x1e,
+    scriptHash: 0x3f,
+    wif: 0x80
+};
+    bitcoinjs.bitcoin.networks.deimos.p2wpkh = {
+    baseNetwork: "deimos",
+    messagePrefix: '\x18Deimos Signed Message:\n',
+    bech32: 'dei',
+    bip32: {
+        public: 0x0488B21E,
+        private: 0x0488ADE4
+    },
+    pubKeyHash: 0x1f,
+    scriptHash: 0x21,
+    wif: 0x8a
+};
+
+bitcoinjs.bitcoin.networks.deimos.p2wpkhInP2sh = {
+    baseNetwork: "deimos",	
+    messagePrefix: '\x18Deimos Signed Message:\n',
+    bech32: 'dei',
+    bip32: {
+        public: 0x0488B21E,
+        private: 0x0488ADE4
+    },
+    pubKeyHash: 0x1f,
+    scriptHash: 0x21,
+    wif: 0x8a
+};
 })();

src/js/unorm.js

@@ -1,3 +1,6 @@
+// Polyfill for NFKD normalization
+// See https://github.com/walling/unorm
+
 (function (root) {
    "use strict";