zebra.lucky
/
joinmarket-clientserver
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

refactor podle error msg to jmclient.podle

master
Adam Gibson 9 years ago
parent
ceff9fa829
commit
323b8f71d9
No known key found for this signature in database
GPG Key ID: B3AE09F1E9A3197A
3 changed files with 52 additions and 51 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      jmclient/__init__.py
  2. 45
      jmclient/podle.py
  3. 55
      jmclient/taker.py

3
jmclient/__init__.py
Unescape View File

@ -23,7 +23,8 @@ from .configure import load_program_config, jm_single, get_p2pk_vbyte, \
from .blockchaininterface import (BlockrInterface, BlockchainInterface, sync_wallet,
RegtestBitcoinCoreInterface, BitcoinCoreInterface)
from .client_protocol import JMTakerClientProtocolFactory, start_reactor
from .podle import set_commitment_file, get_commitment_file
from .podle import (set_commitment_file, get_commitment_file,
generate_podle_error_string)
from .commands import *
from .schedule import get_schedule
# Set default logging handler to avoid "No handler found" warnings.

45
jmclient/podle.py
Unescape View File

@ -21,6 +21,51 @@ def get_commitment_file():
return PODLE_COMMIT_FILE
def generate_podle_error_string(priv_utxo_pairs, to, ts, unspent, cjamount,
taker_utxo_age, taker_utxo_amtpercent):
"""Gives detailed error information on why commitment sourcing failed.
"""
errmsg = ""
errmsgheader = ("Failed to source a commitment; this debugging information"
" may help:\n\n")
errmsg += ("1: Utxos that passed age and size limits, but have "
"been used too many times (see taker_utxo_retries "
"in the config):\n")
if len(priv_utxo_pairs) == 0:
errmsg += ("None\n")
else:
for p, u in priv_utxo_pairs:
errmsg += (str(u) + "\n")
errmsg += "2: Utxos that have less than " + taker_utxo_age + " confirmations:\n"
if len(to) == 0:
errmsg += ("None\n")
else:
for t in to:
errmsg += (str(t) + "\n")
errmsg += ("3: Utxos that were not at least " + taker_utxo_amtpercent + \
"% of the size of the coinjoin amount " + str(cjamount) + "\n")
if len(ts) == 0:
errmsg += ("None\n")
else:
for t in ts:
errmsg += (str(t) + "\n")
errmsg += ('***\n')
errmsg += ("Utxos that appeared in item 1 cannot be used again.\n")
errmsg += ("Utxos only in item 2 can be used by waiting for more "
"confirmations, (set by the value of taker_utxo_age).\n")
errmsg += ("Utxos only in item 3 are not big enough for this "
"coinjoin transaction, set by the value "
"of taker_utxo_amtpercent.\n")
errmsg += ("If you cannot source a utxo from your wallet according "
"to these rules, use the tool add-utxo.py to source a "
"utxo external to your joinmarket wallet. Read the help "
"with 'python add-utxo.py --help'\n\n")
errmsg += ("You can also reset the rules in the joinmarket.cfg "
"file, but this is generally inadvisable.\n")
errmsg += ("***\nFor reference, here are the utxos in your wallet:\n")
errmsg += ("\n" + str(unspent))
return (errmsgheader, errmsg)
class PoDLEError(Exception):
pass

55
jmclient/taker.py
Unescape View File

@ -14,7 +14,7 @@ from jmbase.support import get_log
from jmclient.support import calc_cj_fee, weighted_order_choose, choose_orders
from jmclient.wallet import estimate_tx_fee
from jmclient.podle import (generate_podle, get_podle_commitments,
PoDLE, PoDLEError)
PoDLE, PoDLEError, generate_podle_error_string)
jlog = get_log()
@ -472,55 +472,10 @@ class Taker(object):
return (commit_type_byte + podle_data["commit"], revelation,
"Commitment sourced OK")
else:
#we know that priv_utxo_pairs all passed age and size tests, so
#they must have failed the retries test. Summarize this info,
#return error message to caller, and also dump to commitments_debug.txt
errmsg = ""
errmsgheader = ("Failed to source a commitment; this debugging information"
" may help:\n\n")
errmsg += ("1: Utxos that passed age and size limits, but have "
"been used too many times (see taker_utxo_retries "
"in the config):\n")
if len(priv_utxo_pairs) == 0:
errmsg += ("None\n")
else:
for p, u in priv_utxo_pairs:
errmsg += (str(u) + "\n")
errmsg += ("2: Utxos that have less than " + jm_single(
).config.get("POLICY", "taker_utxo_age") + " confirmations:\n")
if len(to) == 0:
errmsg += ("None\n")
else:
for t in to:
errmsg += (str(t) + "\n")
errmsg += ("3: Utxos that were not at least " + \
jm_single().config.get(
"POLICY", "taker_utxo_amtpercent") + "% of the "
"size of the coinjoin amount " + str(
self.cjamount) + "\n")
if len(ts) == 0:
errmsg += ("None\n")
else:
for t in ts:
errmsg += (str(t) + "\n")
errmsg += ('***\n')
errmsg += ("Utxos that appeared in item 1 cannot be used again.\n")
errmsg += (
"Utxos only in item 2 can be used by waiting for more "
"confirmations, (set by the value of taker_utxo_age).\n")
errmsg += ("Utxos only in item 3 are not big enough for this "
"coinjoin transaction, set by the value "
"of taker_utxo_amtpercent.\n")
errmsg += (
"If you cannot source a utxo from your wallet according "
"to these rules, use the tool add-utxo.py to source a "
"utxo external to your joinmarket wallet. Read the help "
"with 'python add-utxo.py --help'\n\n")
errmsg += ("You can also reset the rules in the joinmarket.cfg "
"file, but this is generally inadvisable.\n")
errmsg += (
"***\nFor reference, here are the utxos in your wallet:\n")
errmsg += ("\n" + str(self.wallet.unspent))
errmsgheader, errmsg = generate_podle_error_string(priv_utxo_pairs,
to, ts, self.wallet.unspent, self.cjamount,
jm_single().config.get("POLICY", "taker_utxo_age"),
jm_single().config.get("POLICY", "taker_utxo_amtpercent"))
with open("commitments_debug.txt", "wb") as f:
errmsgfileheader = ("THIS IS A TEMPORARY FILE FOR DEBUGGING; "

Write Preview
Loading…
Cancel
Save