new syntax
This commit is contained in:
parent
fe142452e2
commit
49c422db67
|
@ -4,7 +4,7 @@ import socket, time, interface
|
||||||
|
|
||||||
i = interface.AsynchronousInterface('ecdsa.org', 50001)
|
i = interface.AsynchronousInterface('ecdsa.org', 50001)
|
||||||
i.start()
|
i.start()
|
||||||
i.send([('numblocks.subscribe',[])])
|
i.send([('blockchain.numblocks.subscribe',[])])
|
||||||
|
|
||||||
while True:
|
while True:
|
||||||
r = i.responses.get(True, 100000000000)
|
r = i.responses.get(True, 100000000000)
|
||||||
|
|
|
@ -69,11 +69,11 @@ class Interface:
|
||||||
|
|
||||||
|
|
||||||
def update_waiting_lists(self, method, params):
|
def update_waiting_lists(self, method, params):
|
||||||
if method == 'address.subscribe':
|
if method == 'blockchain.address.subscribe':
|
||||||
addr = params[-1]
|
addr = params[-1]
|
||||||
if addr in self.addresses_waiting_for_status:
|
if addr in self.addresses_waiting_for_status:
|
||||||
self.addresses_waiting_for_status.remove(addr)
|
self.addresses_waiting_for_status.remove(addr)
|
||||||
elif method == 'address.get_history':
|
elif method == 'blockchain.address.get_history':
|
||||||
addr = params[0]
|
addr = params[0]
|
||||||
if addr in self.addresses_waiting_for_history:
|
if addr in self.addresses_waiting_for_history:
|
||||||
self.addresses_waiting_for_history.remove(addr)
|
self.addresses_waiting_for_history.remove(addr)
|
||||||
|
@ -82,7 +82,7 @@ class Interface:
|
||||||
def subscribe(self, addresses):
|
def subscribe(self, addresses):
|
||||||
messages = []
|
messages = []
|
||||||
for addr in addresses:
|
for addr in addresses:
|
||||||
messages.append(('address.subscribe', [addr]))
|
messages.append(('blockchain.address.subscribe', [addr]))
|
||||||
self.addresses_waiting_for_status.append(addr)
|
self.addresses_waiting_for_status.append(addr)
|
||||||
self.send(messages)
|
self.send(messages)
|
||||||
|
|
||||||
|
@ -111,7 +111,7 @@ class Interface:
|
||||||
def start_session(self, addresses, version):
|
def start_session(self, addresses, version):
|
||||||
#print "Starting new session: %s:%d"%(self.host,self.port)
|
#print "Starting new session: %s:%d"%(self.host,self.port)
|
||||||
self.start()
|
self.start()
|
||||||
self.send([('client.version', [version]), ('server.banner',[]), ('numblocks.subscribe',[]), ('server.peers',[])])
|
self.send([('client.version', [version]), ('server.banner',[]), ('blockchain.numblocks.subscribe',[]), ('server.peers.subscribe',[])])
|
||||||
self.subscribe(addresses)
|
self.subscribe(addresses)
|
||||||
|
|
||||||
|
|
||||||
|
@ -167,9 +167,9 @@ class NativeInterface(PollingInterface):
|
||||||
cmds = {'session.new':'new_session',
|
cmds = {'session.new':'new_session',
|
||||||
'server.peers':'peers',
|
'server.peers':'peers',
|
||||||
'session.poll':'poll',
|
'session.poll':'poll',
|
||||||
'transaction.broadcast':'tx',
|
'blockchain.transaction.broadcast':'tx',
|
||||||
'address.get_history':'h',
|
'blockchain.address.get_history':'h',
|
||||||
'address.subscribe':'address.subscribe'
|
'blockchain.address.subscribe':'address.subscribe'
|
||||||
}
|
}
|
||||||
|
|
||||||
for m in messages:
|
for m in messages:
|
||||||
|
|
|
@ -935,23 +935,23 @@ class Wallet:
|
||||||
for addr, status in changed_addresses.items():
|
for addr, status in changed_addresses.items():
|
||||||
self.receive_status_callback(addr, status)
|
self.receive_status_callback(addr, status)
|
||||||
|
|
||||||
elif method == 'server.peers':
|
elif method == 'server.peers.subscribe':
|
||||||
self.interface.servers = map( lambda x:x[1], result )
|
self.interface.servers = map( lambda x:x[1], result )
|
||||||
|
|
||||||
elif method == 'address.subscribe':
|
elif method == 'blockchain.address.subscribe':
|
||||||
addr = params[-1]
|
addr = params[-1]
|
||||||
self.receive_status_callback(addr, result)
|
self.receive_status_callback(addr, result)
|
||||||
|
|
||||||
elif method == 'address.get_history':
|
elif method == 'blockchain.address.get_history':
|
||||||
addr = params[0]
|
addr = params[0]
|
||||||
self.receive_history_callback(addr, result)
|
self.receive_history_callback(addr, result)
|
||||||
self.was_updated = True
|
self.was_updated = True
|
||||||
|
|
||||||
elif method == 'transaction.broadcast':
|
elif method == 'blockchain.transaction.broadcast':
|
||||||
self.tx_result = result
|
self.tx_result = result
|
||||||
self.tx_event.set()
|
self.tx_event.set()
|
||||||
|
|
||||||
elif method == 'numblocks.subscribe':
|
elif method == 'blockchain.numblocks.subscribe':
|
||||||
self.blocks = result
|
self.blocks = result
|
||||||
|
|
||||||
elif method == 'client.version':
|
elif method == 'client.version':
|
||||||
|
|
Loading…
Reference in New Issue