kylefang/stacks-puppet-node
1
0
Fork 0
mirror of https://github.com/alexgo-io/stacks-puppet-node.git synced 2026-04-23 19:31:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'rc-0.14.3' of https://github.com/blockstack/blockstack-core into rc-0.14.3

Browse Source
This commit is contained in:
Jude Nelson
2017-07-05 17:40:03 -04:00
parent 7ce3fef2bd 9eb011a5fb
commit 30b91122d8
25 changed files with 3142 additions and 605 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
blockstack/lib/config.py
View File

@@ -447,6 +447,9 @@ NUM_CONFIRMATIONS = 6 # number of blocks to wait for bef
if os.environ.get("BLOCKSTACK_TEST", None) == "1":
NUM_CONFIRMATIONS = 0
log.warning("NUM_CONFIRMATIONS = %s" % NUM_CONFIRMATIONS)
if os.environ.get("BLOCKSTACK_CORE_NUM_CONFS", None) is not None:
NUM_CONFIRMATIONS = int(os.environ["BLOCKSTACK_CORE_NUM_CONFS"])
log.warning("NUM_CONFIRMATIONS = %s" % NUM_CONFIRMATIONS)
# burn address for fees (the address of public key 0x0000000000000000000000000000000000000000)
BLOCKSTACK_BURN_PUBKEY_HASH = "0000000000000000000000000000000000000000"