RanchiMall/fcoin
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into handle-sigint

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

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

4
lib/protocol/networks.js
View File

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

2
lib/protocol/policy.js
View File

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

6765
package-lock.json generated Normal file
View File

File diff suppressed because it is too large Load Diff