GlcoinCore/joinmarket
1
0
Fork 0
mirror of https://github.com/JoinMarket-Org/joinmarket-clientserver.git synced 2026-08-13 12:33:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix SNICKER client-daemon setup

Browse source 
This commit fixes two minor bugs encountered in
running create-snicker-proposal.py. First, the
port for AMP connections was not correct (by
convention it is now the Joinmarket proto main port
minus 1000), second in the above mentioned script,
the reactor startup client side was not disabling
the Joinmarket protocol, as it should.
This commit is contained in:
Adam Gibson 2021-04-16 22:46:54 +01:00
parent 967a5bd0ae
commit c30929a31c
No known key found for this signature in database
GPG key ID: 141001A1AF77F20B
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
jmclient/jmclient/client_protocol.py
View file

@ -821,9 +821,9 @@ def start_reactor(host, port, factory=None, snickerfactory=None,
jmcport = start_daemon_on_port(port_a, dfactory, "Joinmarket", 0)
# (See above) For now these other two are just on ports that are 1K offsets.
if snickerfactory:
snickerport = start_daemon_on_port(port_a, sdfactory, "SNICKER", 1000)
snickerport = start_daemon_on_port(port_a, sdfactory, "SNICKER", 1000) - 1000
if bip78:
bip78port = start_daemon_on_port(port_a, bip78factory, "BIP78", 2000)
start_daemon_on_port(port_a, bip78factory, "BIP78", 2000)
# if the port had to be incremented due to conflict above, we should update
# it in the config var so e.g. bip78 connections choose the port we actually

3
scripts/snicker/create-snicker-proposal.py
View file

@ -172,7 +172,8 @@ def main():
snicker_pf = SNICKERClientProtocolFactory(snicker_client, servers)
start_reactor(jm_single().config.get("DAEMON", "daemon_host"),
jm_single().config.getint("DAEMON", "daemon_port"),
None, snickerfactory=snicker_pf,
snickerfactory=snicker_pf,
jm_coinjoin=False,
daemon=daemon)
class SNICKERPostingClient(object):