Re-implement show podle tries in showutxos method

See: fa50da9656

jmclient/jmclient/podle.py

@@ -380,14 +380,35 @@ def update_commitments(commitment=None,
     with open(PODLE_COMMIT_FILE, "wb") as f:
         f.write(json.dumps(to_write, indent=4))
 
+def get_podle_tries(utxo, priv=None, max_tries=1, external=False):
+    used_commitments, external_commitments = get_podle_commitments()
+
+    if external:
+        if utxo in external_commitments:
+            ec = external_commitments[utxo]
+            #use as many as were provided in the file, up to a max of max_tries
+            m = min([len(ec['reveal'].keys()), max_tries])
+            for i in reversed(range(m)):
+                key = str(i)
+                p = PoDLE(u=utxo,P=ec['P'],P2=ec['reveal'][key]['P2'],
+                          s=ec['reveal'][key]['s'], e=ec['reveal'][key]['e'])
+                if p.get_commitment() in used_commitments:
+                    return i+1
+    else:
+        for i in reversed(range(max_tries)):
+            p = PoDLE(u=utxo, priv=priv)
+            c = p.generate_podle(i)
+            if c['commit'] in used_commitments:
+                return i+1
+    return 0
 
-def generate_podle(priv_utxo_pairs, tries=1, allow_external=None, k=None):
+def generate_podle(priv_utxo_pairs, max_tries=1, allow_external=None, k=None):
     """Given a list of privkeys, try to generate a
-    PoDLE which is not yet used more than tries times.
+    PoDLE which is not yet used more than max_tries times.
     This effectively means satisfying two criteria:
     (1) the generated commitment is not in the list of used
     commitments
-    (2) the index required to generate is not greater than 'tries'.
+    (2) the index required to generate is not greater than 'max_tries'.
     Note that each retry means using a different generator
     (see notes in PoDLE.generate_podle)
     Once used, add the commitment to the list of used.
@@ -399,36 +420,32 @@ def generate_podle(priv_utxo_pairs, tries=1, allow_external=None, k=None):
     """
     used_commitments, external_commitments = get_podle_commitments()
     for priv, utxo in priv_utxo_pairs:
-        for i in range(tries):
-            #Note that we will return the *lowest* index
-            #which is still available.
-            p = PoDLE(u=utxo, priv=priv)
-            c = p.generate_podle(i, k=k)
-            if c['commit'] in used_commitments:
-                continue
-            #persist for future checks
-            update_commitments(commitment=c['commit'])
-            return c
+        tries = get_podle_tries(utxo, priv, max_tries)
+        if tries >= max_tries:
+            continue
+        #Note that we will return the *lowest* index
+        #which is still available.
+        index = tries
+        p = PoDLE(u=utxo, priv=priv)
+        c = p.generate_podle(index)
+        #persist for future checks
+        update_commitments(commitment=c['commit'])
+        return c
     if allow_external:
-        filtered_external = dict([(x, external_commitments[x])
-                                  for x in allow_external])
-        for u, ec in filtered_external.iteritems():
-            #use as many as were provided in the file, up to a max of tries
-            m = min([len(ec['reveal'].keys()), tries])
-            for i in [str(x) for x in range(m)]:
-                p = PoDLE(u=u,
-                          P=ec['P'],
-                          P2=ec['reveal'][i]['P2'],
-                          s=ec['reveal'][i]['s'],
-                          e=ec['reveal'][i]['e'])
-                if p.get_commitment() not in used_commitments:
-                    update_commitments(commitment=p.get_commitment())
-                    return p.reveal()
-            #If none of the entries in the 'reveal' list for this external
-            #commitment were available, they've all been used up, so
-            #remove this entry
-            if m == len(ec['reveal'].keys()):
+        for u in allow_external:
+            tries = get_podle_tries(utxo=u, max_tries=max_tries, external=True)
+            if (tries >= max_tries):
+                #If none of the entries in the 'reveal' list for this external
+                #commitment were available, they've all been used up, so
+                #remove this entry
                 update_commitments(external_to_remove=u)
+                continue
+            index = str(tries)
+            ec = external_commitments[u]
+            p = PoDLE(u=u,P=ec['P'],P2=ec['reveal'][index]['P2'],
+                      s=ec['reveal'][index]['s'], e=ec['reveal'][index]['e'])
+            update_commitments(commitment=p.get_commitment())
+            return p.reveal()
     #Failed to find any non-used valid commitment:
     return None
 

jmclient/jmclient/wallet_utils.py

@@ -8,7 +8,7 @@ import binascii
 from mnemonic import Mnemonic
 from optparse import OptionParser
 import getpass
-from jmclient import (get_network, Wallet, Bip39Wallet,
+from jmclient import (get_network, Wallet, Bip39Wallet, podle,
                       encryptData, get_p2pk_vbyte, jm_single,
                       mn_decode, mn_encode, BitcoinCoreInterface,
                       JsonRpcError, sync_wallet, WalletError, SegwitWallet)
@@ -277,15 +277,26 @@ def get_imported_privkey_branch(wallet, m, showprivkey):
 
 def wallet_showutxos(wallet, showprivkey):
     unsp = {}
-    if showprivkey:
-        for u, av in wallet.unspent.iteritems():
-            addr = av['address']
-            key = wallet.get_key_from_addr(addr)
+    max_tries = jm_single().config.getint("POLICY", "taker_utxo_retries")
+    for u, av in wallet.unspent.iteritems():
+        key = wallet.get_key_from_addr(av['address'])
+        tries = podle.get_podle_tries(u, key, max_tries)
+        tries_remaining = max(0, max_tries - tries)
+        unsp[u] = {'address': av['address'], 'value': av['value'],
+                   'tries': tries, 'tries_remaining': tries_remaining,
+                   'external': False}
+        if showprivkey:
             wifkey = btc.wif_compressed_privkey(key, vbyte=get_p2pk_vbyte())
-            unsp[u] = {'address': av['address'],
-                       'value': av['value'], 'privkey': wifkey}
-    else:
-        unsp = wallet.unspent
+            unsp[u]['privkey'] = wifkey
+
+    used_commitments, external_commitments = podle.get_podle_commitments()
+    for u, ec in external_commitments.iteritems():
+        tries = podle.get_podle_tries(utxo=u, max_tries=max_tries,
+                                          external=True)
+        tries_remaining = max(0, max_tries - tries)
+        unsp[u] = {'tries': tries, 'tries_remaining': tries_remaining,
+                   'external': True}
+
     return json.dumps(unsp, indent=4)
 
 def wallet_display(wallet, gaplimit, showprivkey, displayall=False):

jmclient/test/test_podle.py

@@ -133,7 +133,7 @@ def test_external_commitments(setup_podle):
     for c in known_commits[:-1]:
         update_commitments(commitment=c)
     #this should find the remaining one utxo and return from it
-    assert generate_podle([], tries=tries, allow_external=known_utxos)
+    assert generate_podle([], max_tries=tries, allow_external=known_utxos)
     #test commitment removal
     to_remove = ecs[binascii.hexlify(chr(3)*32)]
     update_commitments(external_to_remove={binascii.hexlify(chr(3)*32):to_remove})