From 61ea11e01e1294d0e1f59c0c16e01929d99fdc1b Mon Sep 17 00:00:00 2001 From: UdjinM6 Date: Tue, 14 Jan 2020 05:41:47 +0300 Subject: [PATCH 1/2] Bump p2p version to 70216 --- p2pool/dash/p2p.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/p2pool/dash/p2p.py b/p2pool/dash/p2p.py index 1f0dc4b3..5e1fdb4a 100644 --- a/p2pool/dash/p2p.py +++ b/p2pool/dash/p2p.py @@ -19,7 +19,7 @@ def __init__(self, net): def connectionMade(self): self.send_version( - version=70213, + version=70216, services=1, time=int(time.time()), addr_to=dict( From be66cc63aca38f537aa8a030d4714dbcbfc73171 Mon Sep 17 00:00:00 2001 From: UdjinM6 Date: Tue, 14 Jan 2020 13:37:01 +0300 Subject: [PATCH 2/2] update inv enum --- p2pool/dash/p2p.py | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/p2pool/dash/p2p.py b/p2pool/dash/p2p.py index 5e1fdb4a..c4695797 100644 --- a/p2pool/dash/p2p.py +++ b/p2pool/dash/p2p.py @@ -63,7 +63,7 @@ def handle_verack(self): self.pinger = deferral.RobustLoopingCall(self.send_ping, nonce=1234) self.pinger.start(30) - # https://github.com/dashpay/dash/blob/v0.12.1.x/src/protocol.h#L338-L362 + # https://github.com/dashpay/dash/blob/master/src/protocol.h message_inv = pack.ComposedType([ ('invs', pack.ListType(pack.ComposedType([ ('type', pack.EnumType(pack.IntType(32), { @@ -71,31 +71,32 @@ def handle_verack(self): 2: 'block', 3: 'filtered_block', 4: 'txlock_request', - 5: 'txlock_vote', + # 5: 'txlock_vote', 6: 'spork', - 7: 'masternode_winner', - 8: 'masternode_scanning_error', - 9: 'budget_vote', - 10: 'budget_proposal', - 11: 'budget_finalized', - 12: 'budget_finalized_vote', - 13: 'masternode_quorum', - 14: 'masternode_announce', - 15: 'masternode_ping', + # 7: 'masternode_winner', + # 8: 'masternode_scanning_error', + # 9: 'budget_vote', + # 10: 'budget_proposal', + # 11: 'budget_finalized', + # 12: 'budget_finalized_vote', + # 13: 'masternode_quorum', + # 14: 'masternode_announce', + # 15: 'masternode_ping', 16: 'dstx', 17: 'governance_object', 18: 'governance_object_vote', - 19: 'masternode_verify', + # 19: 'masternode_verify', 20: 'compact_block', 21: 'quorum_final_commitment', - 22: 'quorum_dummy_commitment', + # 22: 'quorum_dummy_commitment', 23: 'quorum_contrib', 24: 'quorum_complaint', 25: 'quorum_justification', 26: 'quorum_premature_commitment', - 27: 'quorum_debug_status', + # 27: 'quorum_debug_status', 28: 'quorum_recovered_sig', - 29: 'clsig' + 29: 'clsig', + 30: 'islock', })), ('hash', pack.IntType(256)), ]))),