oci/zeronet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/HelloZeroNet/ZeroNet

Browse source
This commit is contained in:
shortcutme 2019-02-24 02:29:42 +01:00
commit 44c467f472
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
plugins/Zeroname/updater/zeroname_updater.py
View file

@ -216,7 +216,10 @@ while 1:
while 1: while 1:
try: try:
time.sleep(1) time.sleep(1)
rpc.waitforblock() if node_version < 160000 :
rpc.waitforblock()
else:
rpc.waitfornewblock()
print "Found" print "Found"
break # Block found break # Block found
except socket.timeout: # Timeout except socket.timeout: # Timeout
@ -227,7 +230,10 @@ while 1:
time.sleep(5) time.sleep(5)
rpc = AuthServiceProxy(rpc_auth, timeout=rpc_timeout) rpc = AuthServiceProxy(rpc_auth, timeout=rpc_timeout)
last_block = int(rpc.getinfo()["blocks"]) if node_version < 160000 :
last_block = int(rpc.getinfo()["blocks"])
else:
last_block = int(rpc.getblockchaininfo()["blocks"])
should_publish = False should_publish = False
for block_id in range(config["lastprocessed"] + 1, last_block + 1): for block_id in range(config["lastprocessed"] + 1, last_block + 1):
if processBlock(block_id): if processBlock(block_id):