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

Merge branch 'master' into bcoin-1.0.2

Browse Source
This commit is contained in:
Sky Young 2019-07-15 16:53:15 -06:00 committed by GitHub
commit 28dca48cd7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/protocol/networks.js
View File

@ -490,8 +490,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.

2
package-lock.json generated
View File

@ -1,6 +1,6 @@
{ {
"name": "fcoin", "name": "fcoin",
"version": "1.0.2", "version": "1.1.0",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {