From: iancoleman <1281387+iancoleman@users.noreply.github.com> Date: Sun, 29 Nov 2020 21:46:02 +0000 (+1100) Subject: Merge pull request #456 from r1979/master X-Git-Url: https://git.immae.eu/?p=perso%2FImmae%2FProjets%2FCryptomonnaies%2FBIP39.git;a=commitdiff_plain;h=1b54929bda9b7b71ada0cb04d1cb11ceb78328de;hp=ad07c1c0b5fd6724f0801eff2b3211e7723ec589 Merge pull request #456 from r1979/master Updated Zcoin (XZC) Due to its rebrand fo Firo (FIRO) --- diff --git a/libs/combined/index.js b/libs/combined/index.js index 1bfcce2..99af3ce 100644 --- a/libs/combined/index.js +++ b/libs/combined/index.js @@ -18,6 +18,10 @@ module.exports.BigInteger = require('javascript-biginteger') module.exports.bip38 = require('bip38') +/* bip85 */ + +module.exports.bip85 = require('bip85') + /* bitcoinjs-lib */ module.exports.bitcoin = require('bitcoinjs-lib') diff --git a/libs/combined/package.json b/libs/combined/package.json index 455d263..5b47f74 100644 --- a/libs/combined/package.json +++ b/libs/combined/package.json @@ -10,6 +10,7 @@ "bchaddrjs-slp": "git://github.com/simpleledger/bchaddrjs.git#af16e44a6bfbe4b3980a62dba50e2f68ed864c6b", "bip38": "2.0.2", "bip38grs": "git://github.com/Groestlcoin/bip38grs.git#091975b01679b74dc0a4136bb743fe17791b0151", + "bip85": "0.0.3", "bitcoinjs-lib": "git://github.com/iancoleman/bitcoinjs-lib.git#v3.3.2_16bit", "bs58": "^4.0.1", "buffer": "^5.4.3", diff --git a/src/index.html b/src/index.html index b73bf50..6548288 100644 --- a/src/index.html +++ b/src/index.html @@ -248,6 +248,95 @@ + +
+
+
+ +
+
+ + + + + + + + + + + + +