Skip to content

Commit

Permalink
Bump various versions (#64)
Browse files Browse the repository at this point in the history
* bump VOTING_VERSION and update info url

* bump dashd requirements

* Bump p2p protocol version (still accept old ones for now)
  • Loading branch information
UdjinM6 authored Feb 22, 2019
1 parent 6d4bef8 commit 081a7ef
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Requirements:
-------------------------
Generic:

* Dashd >=0.12.2.0
* Dashd >=0.13.0.0
* Python >=2.7
* Twisted >=13.0.0
* Zope.interface >=3.8.0
Expand Down
4 changes: 2 additions & 2 deletions p2pool/data.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ def load_share(share, net, peer_addr):

class Share(object):
VERSION = 16
VOTING_VERSION = 15
VOTING_VERSION = 16
SUCCESSOR = None

small_block_header_type = pack.ComposedType([
Expand Down Expand Up @@ -655,7 +655,7 @@ def get_warnings(tracker, best_share, net, dashd_getnetworkinfo, dashd_work_valu
majority_desired_version = max(desired_version_counts, key=lambda k: desired_version_counts[k])
if majority_desired_version > (Share.SUCCESSOR if Share.SUCCESSOR is not None else Share).VOTING_VERSION and desired_version_counts[majority_desired_version] > sum(desired_version_counts.itervalues())/2:
res.append('A MAJORITY OF SHARES CONTAIN A VOTE FOR AN UNSUPPORTED SHARE IMPLEMENTATION! (v%i with %i%% support)\n'
'An upgrade is likely necessary. Check http://p2pool.forre.st/ for more information.' % (
'An upgrade is likely necessary. Check https://github.com/dashpay/p2pool-dash for more information.' % (
majority_desired_version, 100*desired_version_counts[majority_desired_version]/sum(desired_version_counts.itervalues())))

if dashd_getnetworkinfo['warnings'] != '':
Expand Down
2 changes: 1 addition & 1 deletion p2pool/p2p.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ def fragment(f, **kwargs):
fragment(f, **dict((k, v[len(v)//2:]) for k, v in kwargs.iteritems()))

class Protocol(p2protocol.Protocol):
VERSION = 1500
VERSION = 1600

max_remembered_txs_size = 2500000

Expand Down

0 comments on commit 081a7ef

Please sign in to comment.