Add "manual" tx_broadcast method

jmclient/jmclient/configure.py

@@ -239,10 +239,11 @@ def jm_single():
 # spends from unconfirmed inputs, which may then get malleated or double-spent!
 # other counterparties are likely to reject unconfirmed inputs... don't do it.
 
-# options: self, random-peer, not-self (note: currently, ONLY 'self' works).
+# options: self, random-peer, not-self, manual (note: currently, ONLY 'self' and 'manual' works).
 # self = broadcast transaction with your bitcoin node's ip
 # random-peer = everyone who took part in the coinjoin has a chance of broadcasting
 # not-self = never broadcast with your own ip
+# manual = don't broadcast at all, output tx data for manual broadcast by the user
 tx_broadcast = self
 
 # If makers do not respond while creating a coinjoin transaction,

jmclient/jmclient/taker.py

@@ -13,7 +13,7 @@
 from jmbitcoin import SerializationError, SerializationTruncationError
 import jmbitcoin as btc
 from jmclient.configure import jm_single, validate_address
-from jmbase.support import get_log
+from jmbase.support import get_log, jmprint
 from jmclient.support import (calc_cj_fee, weighted_order_choose, choose_orders,
                               choose_sweep_orders)
 from jmclient.wallet import estimate_tx_fee
@@ -819,8 +819,12 @@ def push(self):
             else:
                 nick_to_use = list(self.maker_utxo_data.keys())[i]
                 pushed = True
+        elif tx_broadcast == 'manual':
+            jmprint("Transaction data for manual broadcast:")
+            jmprint(tx)
+            pushed = True
         else:
-            jlog.info("Only self, random-peer and not-self broadcast "
+            jlog.info("Only self, random-peer, not-self and manual broadcast "
                       "methods supported. Reverting to self-broadcast.")
             pushed = jm_single().bc_interface.pushtx(tx)
         if not pushed:

jmclient/jmclient/taker_utils.py

@@ -85,7 +85,10 @@ def direct_send(wallet_service, amount, mixdepth, destaddr, answeryes=False,
     log.info(tx)
     actual_amount = amount if amount != 0 else total_inputs_val - fee_est
     log.info("Sends: " + str(actual_amount) + " satoshis to address: " + destaddr)
-    if not answeryes:
+
+    tx_broadcast = jm_single().config.get('POLICY', 'tx_broadcast')
+
+    if not answeryes and tx_broadcast != "manual":
         if not accept_callback:
             if input('Would you like to push to the network? (y/n):')[0] != 'y':
                 log.info("You chose not to broadcast the transaction, quitting.")
@@ -95,9 +98,12 @@ def direct_send(wallet_service, amount, mixdepth, destaddr, answeryes=False,
                                        fee_est)
             if not accepted:
                 return False
-    jm_single().bc_interface.pushtx(tx)
     txid = txhash(tx)
-    successmsg = "Transaction sent: " + txid
+    if tx_broadcast != "manual":
+        jm_single().bc_interface.pushtx(tx)
+        successmsg = "Transaction sent: " + txid
+    else:
+        successmsg = "Broadcast manually:\n\n" + tx + "\n\nTransaction id: " + txid
     cb = log.info if not info_callback else info_callback
     cb(successmsg)
     return txid

scripts/qtsupport.py

@@ -110,8 +110,8 @@
     "consider switching to DEBUG in case of problems.",
     "absurd_fee_per_kb": "maximum satoshis/kilobyte you are willing to pay,\n" +
     "whatever the fee estimate currently says.",
-    "tx_broadcast": "Options: self, random-peer, not-self (note: random-maker\n" +
-    "is not currently supported).\n" +
+    "tx_broadcast": "Options: self, random-peer, not-self, manual\n" +
+    "(note: only self and manual is currently supported).\n" +
     "self = broadcast transaction with your own ip\n" +
     "random-peer = everyone who took part in the coinjoin has\n" +
     "a chance of broadcasting.\n" +