import sys
import time
-from twisted.internet import protocol, task
+from twisted.internet import protocol
import p2pool
from . import data as bitcoin_data
class Protocol(p2protocol.Protocol):
def __init__(self, net):
- p2protocol.Protocol.__init__(self, net.P2P_PREFIX, 1000000)
+ p2protocol.Protocol.__init__(self, net.P2P_PREFIX, 1000000, ignore_trailing_payload=True)
def connectionMade(self):
self.send_version(
port=self.transport.getHost().port,
),
nonce=random.randrange(2**64),
- sub_version_num='',
+ sub_version_num='/P2Pool:%s/' % (p2pool.__version__,),
start_height=0,
)
def handle_verack(self):
self.get_block = deferral.ReplyMatcher(lambda hash: self.send_getdata(requests=[dict(type='block', hash=hash)]))
self.get_block_header = deferral.ReplyMatcher(lambda hash: self.send_getheaders(version=1, have=[], last=hash))
- self.get_tx = deferral.ReplyMatcher(lambda hash: self.send_getdata(requests=[dict(type='tx', hash=hash)]))
if hasattr(self.factory, 'resetDelay'):
self.factory.resetDelay()
if hasattr(self.factory, 'gotConnection'):
self.factory.gotConnection(self)
- self.pinger = task.LoopingCall(self.send_ping)
+ self.pinger = deferral.RobustLoopingCall(self.send_ping)
self.pinger.start(30)
message_inv = pack.ComposedType([
def handle_inv(self, invs):
for inv in invs:
if inv['type'] == 'tx':
- self.factory.new_tx.happened(inv['hash'])
+ self.send_getdata(requests=[inv])
elif inv['type'] == 'block':
self.factory.new_block.happened(inv['hash'])
else:
- print 'Unknown inv type', item
+ print 'Unknown inv type', inv
message_getdata = pack.ComposedType([
('requests', pack.ListType(pack.ComposedType([
('tx', bitcoin_data.tx_type),
])
def handle_tx(self, tx):
- self.get_tx.got_response(bitcoin_data.hash256(bitcoin_data.tx_type.pack(tx)), tx)
+ self.factory.new_tx.happened(tx)
message_block = pack.ComposedType([
('block', bitcoin_data.block_type),