mirror of
https://github.com/JoinMarket-Org/joinmarket-clientserver.git
synced 2026-08-17 13:07:51 +02:00
catch connection lost failures in default errbacks for daemon and client
This commit is contained in:
Adam Gibson
parent
d1bc0e4e17
commit
473cf2e217
2 changed files with 37 additions and 17 deletions
|
|
@ -3,6 +3,9 @@ from __future__ import print_function
|
|||
from twisted.python.log import startLogging, err
|
||||
from twisted.internet import protocol, reactor
|
||||
from twisted.internet.task import LoopingCall
|
||||
from twisted.internet.error import (ConnectionLost, ConnectionAborted,
|
||||
ConnectionClosed, ConnectionDone)
|
||||
from twisted.python import failure
|
||||
from twisted.protocols import amp
|
||||
from twisted.internet.protocol import ClientFactory
|
||||
from twisted.internet.endpoints import TCP4ClientEndpoint
|
||||
|
|
@ -57,6 +60,13 @@ class JMTakerClientProtocol(amp.AMP):
|
|||
if 'accepted' not in response or not response['accepted']:
|
||||
reactor.stop()
|
||||
|
||||
def defaultErrback(self, failure):
|
||||
failure.trap(ConnectionAborted, ConnectionClosed, ConnectionDone, ConnectionLost)
|
||||
|
||||
def defaultCallbacks(self, d):
|
||||
d.addCallback(self.checkClientResponse)
|
||||
d.addErrback(self.defaultErrback)
|
||||
|
||||
def connectionMade(self):
|
||||
self.factory.setClient(self)
|
||||
self.clientStart()
|
||||
|
|
@ -80,7 +90,7 @@ class JMTakerClientProtocol(amp.AMP):
|
|||
irc_configs=json.dumps(irc_configs),
|
||||
minmakers=minmakers,
|
||||
maker_timeout_sec=maker_timeout_sec)
|
||||
d.addCallback(self.checkClientResponse)
|
||||
self.defaultCallbacks(d)
|
||||
|
||||
def set_nick(self):
|
||||
self.nick_pubkey = btc.privtopub(self.nick_priv)
|
||||
|
|
@ -108,7 +118,7 @@ class JMTakerClientProtocol(amp.AMP):
|
|||
self.set_nick()
|
||||
d = self.callRemote(commands.JMStartMC,
|
||||
nick=self.nick)
|
||||
d.addCallback(self.checkClientResponse)
|
||||
self.defaultCallbacks(d)
|
||||
return {'accepted': True}
|
||||
|
||||
@commands.JMUp.responder
|
||||
|
|
@ -116,7 +126,7 @@ class JMTakerClientProtocol(amp.AMP):
|
|||
d = self.callRemote(commands.JMSetup,
|
||||
role="TAKER",
|
||||
n_counterparties=4) #TODO this number should be set
|
||||
d.addCallback(self.checkClientResponse)
|
||||
self.defaultCallbacks(d)
|
||||
return {'accepted': True}
|
||||
|
||||
@commands.JMSetupDone.responder
|
||||
|
|
@ -167,7 +177,7 @@ class JMTakerClientProtocol(amp.AMP):
|
|||
commitment=str(cmt),
|
||||
revelation=str(rev),
|
||||
filled_offers=json.dumps(foffers))
|
||||
d.addCallback(self.checkClientResponse)
|
||||
self.defaultCallbacks(d)
|
||||
return {'accepted': True}
|
||||
|
||||
@commands.JMSigReceived.responder
|
||||
|
|
@ -188,7 +198,7 @@ class JMTakerClientProtocol(amp.AMP):
|
|||
cmd=cmd,
|
||||
msg_to_return=msg_to_return,
|
||||
hostid=hostid)
|
||||
d.addCallback(self.checkClientResponse)
|
||||
self.defaultCallbacks(d)
|
||||
return {'accepted': True}
|
||||
|
||||
@commands.JMRequestMsgSigVerify.responder
|
||||
|
|
@ -214,18 +224,18 @@ class JMTakerClientProtocol(amp.AMP):
|
|||
nick=nick,
|
||||
fullmsg=fullmsg,
|
||||
hostid=hostid)
|
||||
d.addCallback(self.checkClientResponse)
|
||||
self.defaultCallbacks(d)
|
||||
return {'accepted': True}
|
||||
|
||||
def get_offers(self):
|
||||
d = self.callRemote(commands.JMRequestOffers)
|
||||
d.addCallback(self.checkClientResponse)
|
||||
self.defaultCallbacks(d)
|
||||
|
||||
def make_tx(self, nick_list, txhex):
|
||||
d = self.callRemote(commands.JMMakeTx,
|
||||
nick_list= json.dumps(nick_list),
|
||||
txhex=txhex)
|
||||
d.addCallback(self.checkClientResponse)
|
||||
self.defaultCallbacks(d)
|
||||
|
||||
|
||||
class JMTakerClientProtocolFactory(protocol.ClientFactory):
|
||||
|
|
|
|||
|
|
@ -12,7 +12,9 @@ from twisted.protocols import amp
|
|||
from twisted.internet import reactor
|
||||
from twisted.internet.protocol import ServerFactory
|
||||
from twisted.python.log import startLogging, err
|
||||
from twisted.python import log
|
||||
from twisted.internet.error import (ConnectionLost, ConnectionAborted,
|
||||
ConnectionClosed, ConnectionDone)
|
||||
from twisted.python import failure, log
|
||||
import json
|
||||
import time
|
||||
import threading
|
||||
|
|
@ -62,6 +64,13 @@ class JMDaemonServerProtocol(amp.AMP, OrderbookWatch):
|
|||
if 'accepted' not in response or not response['accepted']:
|
||||
reactor.stop()
|
||||
|
||||
def defaultErrback(self, failure):
|
||||
failure.trap(ConnectionAborted, ConnectionClosed, ConnectionDone, ConnectionLost)
|
||||
|
||||
def defaultCallbacks(self, d):
|
||||
d.addCallback(self.checkClientResponse)
|
||||
d.addErrback(self.defaultErrback)
|
||||
|
||||
@JMInit.responder
|
||||
def on_JM_INIT(self, bcsource, network, irc_configs, minmakers,
|
||||
maker_timeout_sec):
|
||||
|
|
@ -101,7 +110,7 @@ class JMDaemonServerProtocol(amp.AMP, OrderbookWatch):
|
|||
nick_max_encoded=NICK_MAX_ENCODED,
|
||||
joinmarket_nick_header=JOINMARKET_NICK_HEADER,
|
||||
joinmarket_version=JM_VERSION)
|
||||
d.addCallback(self.checkClientResponse)
|
||||
self.defaultCallbacks(d)
|
||||
return {'accepted': True}
|
||||
|
||||
@JMStartMC.responder
|
||||
|
|
@ -129,7 +138,7 @@ class JMDaemonServerProtocol(amp.AMP, OrderbookWatch):
|
|||
"""Fired when channel indicated state readiness
|
||||
"""
|
||||
d = self.callRemote(JMUp)
|
||||
d.addCallback(self.checkClientResponse)
|
||||
self.defaultCallbacks(d)
|
||||
|
||||
@JMSetup.responder
|
||||
def on_JM_SETUP(self, role, n_counterparties):
|
||||
|
|
@ -142,7 +151,7 @@ class JMDaemonServerProtocol(amp.AMP, OrderbookWatch):
|
|||
self.kp = init_keypair()
|
||||
print("Received setup command")
|
||||
d = self.callRemote(JMSetupDone)
|
||||
d.addCallback(self.checkClientResponse)
|
||||
self.defaultCallbacks(d)
|
||||
#Request orderbook here, on explicit setup request from client,
|
||||
#assumes messagechannels are in "up" state. Orders are read
|
||||
#in the callback on_order_seen in OrderbookWatch.
|
||||
|
|
@ -160,7 +169,7 @@ class JMDaemonServerProtocol(amp.AMP, OrderbookWatch):
|
|||
string_orderbook = json.dumps(self.orderbook[:100])
|
||||
d = self.callRemote(JMOffers,
|
||||
orderbook=string_orderbook)
|
||||
d.addCallback(self.checkClientResponse)
|
||||
self.defaultCallbacks(d)
|
||||
return {'accepted': True}
|
||||
|
||||
@JMFill.responder
|
||||
|
|
@ -218,11 +227,12 @@ class JMDaemonServerProtocol(amp.AMP, OrderbookWatch):
|
|||
ioauth_data = json.dumps(self.ioauth_data))
|
||||
if not accepted:
|
||||
#Client simply accepts failure TODO
|
||||
d.addCallback(self.checkClientResponse)
|
||||
self.defaultCallbacks(d)
|
||||
else:
|
||||
#Act differently if *we* provided utxos, but
|
||||
#client does not accept for some reason
|
||||
d.addCallback(self.checkUtxosAccepted)
|
||||
d.addErrback(self.defaultErrback)
|
||||
|
||||
def completeStage1(self):
|
||||
"""Timeout of stage 1 requests;
|
||||
|
|
@ -251,7 +261,7 @@ class JMDaemonServerProtocol(amp.AMP, OrderbookWatch):
|
|||
d = self.callRemote(JMSigReceived,
|
||||
nick=nick,
|
||||
sig=sig)
|
||||
d.addCallback(self.checkClientResponse)
|
||||
self.defaultCallbacks(d)
|
||||
|
||||
"""The following functions handle requests and responses
|
||||
from client for messaging signing and verifying.
|
||||
|
|
@ -271,7 +281,7 @@ class JMDaemonServerProtocol(amp.AMP, OrderbookWatch):
|
|||
msg=str(msg),
|
||||
msg_to_be_signed=str(msg_to_be_signed),
|
||||
hostid=str(hostid))
|
||||
d.addCallback(self.checkClientResponse)
|
||||
self.defaultCallbacks(d)
|
||||
|
||||
def request_signature_verify(self, msg, fullmsg, sig, pubkey, nick, hashlen,
|
||||
max_encoded, hostid):
|
||||
|
|
@ -285,7 +295,7 @@ class JMDaemonServerProtocol(amp.AMP, OrderbookWatch):
|
|||
hashlen=hashlen,
|
||||
max_encoded=max_encoded,
|
||||
hostid=hostid)
|
||||
d.addCallback(self.checkClientResponse)
|
||||
self.defaultCallbacks(d)
|
||||
|
||||
@JMMsgSignature.responder
|
||||
def on_JM_MSGSIGNATURE(self, nick, cmd, msg_to_return, hostid):
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue