diff options
author | iancoleman <1281387+iancoleman@users.noreply.github.com> | 2020-11-23 10:28:16 +1100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-11-23 10:28:16 +1100 |
commit | d75ddf4ea80cd8385f8d946bd4f50cacbdf6c0cb (patch) | |
tree | ecd936e9b06ed6f15432dffd2ea3a90d49189861 /libs | |
parent | 4e59e7d6fcafa09d2f35542349ee0be2eaebc1ed (diff) | |
parent | 16ff1df7ab1119c97fdb042d494fd5b0f3bfb8c0 (diff) | |
download | BIP39-d75ddf4ea80cd8385f8d946bd4f50cacbdf6c0cb.tar.gz BIP39-d75ddf4ea80cd8385f8d946bd4f50cacbdf6c0cb.tar.zst BIP39-d75ddf4ea80cd8385f8d946bd4f50cacbdf6c0cb.zip |
Merge pull request #454 from AndreasGassmann/master
Add BIP85 support
Diffstat (limited to 'libs')
-rw-r--r-- | libs/combined/index.js | 4 | ||||
-rw-r--r-- | libs/combined/package.json | 1 |
2 files changed, 5 insertions, 0 deletions
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') | |||
18 | 18 | ||
19 | module.exports.bip38 = require('bip38') | 19 | module.exports.bip38 = require('bip38') |
20 | 20 | ||
21 | /* bip85 */ | ||
22 | |||
23 | module.exports.bip85 = require('bip85') | ||
24 | |||
21 | /* bitcoinjs-lib */ | 25 | /* bitcoinjs-lib */ |
22 | 26 | ||
23 | module.exports.bitcoin = require('bitcoinjs-lib') | 27 | 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 @@ | |||
10 | "bchaddrjs-slp": "git://github.com/simpleledger/bchaddrjs.git#af16e44a6bfbe4b3980a62dba50e2f68ed864c6b", | 10 | "bchaddrjs-slp": "git://github.com/simpleledger/bchaddrjs.git#af16e44a6bfbe4b3980a62dba50e2f68ed864c6b", |
11 | "bip38": "2.0.2", | 11 | "bip38": "2.0.2", |
12 | "bip38grs": "git://github.com/Groestlcoin/bip38grs.git#091975b01679b74dc0a4136bb743fe17791b0151", | 12 | "bip38grs": "git://github.com/Groestlcoin/bip38grs.git#091975b01679b74dc0a4136bb743fe17791b0151", |
13 | "bip85": "0.0.3", | ||
13 | "bitcoinjs-lib": "git://github.com/iancoleman/bitcoinjs-lib.git#v3.3.2_16bit", | 14 | "bitcoinjs-lib": "git://github.com/iancoleman/bitcoinjs-lib.git#v3.3.2_16bit", |
14 | "bs58": "^4.0.1", | 15 | "bs58": "^4.0.1", |
15 | "buffer": "^5.4.3", | 16 | "buffer": "^5.4.3", |