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

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Jude Nelson
2018-10-22 18:42:16 -04:00
parent 2291a27e74 0242f4b669
commit 308587ef35
6 changed files with 57 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
blockstack/lib/config.py
View File

@@ -183,10 +183,18 @@ else:
RPC_SERVER_PORT = 6264
DEFAULT_API_HOST = 'localhost'
if os.environ.get('BLOCKSTACK_API_HOST'):
DEFAULT_API_HOST = os.environ.get('BLOCKSTACK_API_HOST')
log.debug('BLOCKSTACK_API_HOST = {}'.format(DEFAULT_API_HOST))
DEFAULT_API_PORT = 6270 # API endpoint port
if BLOCKSTACK_TEST:
DEFAULT_API_PORT = 16268
if os.environ.get('BLOCKSTACK_API_PORT'):
DEFAULT_API_PORT = int(os.environ.get('BLOCKSTACK_API_PORT'))
log.debug('BLOCKSTACK_API_PORT = {}'.format(DEFAULT_API_PORT))
RPC_DEFAULT_TIMEOUT = 30 # in secs
RPC_MAX_ZONEFILE_LEN = 40960 # 40KB
RPC_MAX_INDEXING_DELAY = 2 * 3600 # 2 hours; maximum amount of time before the absence of new blocks causes the node to stop responding

2
blockstack/version.py
View File

@@ -1,5 +1,5 @@
# this is the only place where version should be updated
__version_major__ = '20'
__version_minor__ = '0'
__version_patch__ = '2'
__version_patch__ = '6'
__version__ = '{}.{}.{}.0'.format(__version_major__, __version_minor__, __version_patch__)