Merge branch 'master' into handle-sigint

This commit is contained in:
Sky Young 2019-07-10 13:29:37 -06:00 committed by GitHub
commit 40fa7f5550
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6773 additions and 9 deletions

11
.gitignore vendored
View File

@ -1,7 +1,6 @@
node_modules/
docs/reference/
docker_data/
browser/bcoin*
package-lock.json
npm-debug.log
node_modules/
docs/reference/
docker_data/
browser/bcoin*
npm-debug.log
.DS_Store

View File

@ -482,8 +482,8 @@ main.keyPrefix = {
main.addressPrefix = {
pubkeyhash: 0x23,
scripthash: 0x08,
scripthash2: 0x5e,
scripthash: 0x5e,
scripthash2: 0x08,
witnesspubkeyhash: 0x06,
witnessscripthash: 0x0a,
bech32: 'flo'

View File

@ -145,7 +145,7 @@ exports.MAX_P2WSH_SIZE = 3600;
* @default
*/
exports.MEMPOOL_MAX_ANCESTORS = 25;
exports.MEMPOOL_MAX_ANCESTORS = 1250;
/**
* Default maximum mempool size in bytes.

6765
package-lock.json generated Normal file

File diff suppressed because it is too large Load Diff