diff --git a/jmclient/jmclient/maker.py b/jmclient/jmclient/maker.py index 67f444b..24d053a 100644 --- a/jmclient/jmclient/maker.py +++ b/jmclient/jmclient/maker.py @@ -418,7 +418,8 @@ class P2EPMaker(Maker): tx = btc.deserialize(txhex) except (IndexError, SerializationError, SerializationTruncationError) as e: return (False, 'malformed txhex. ' + repr(e)) - self.user_info('obtained tx proposal from sender:\n' + pprint.pformat(tx)) + self.user_info('obtained proposed fallback (non-coinjoin) ' +\ + 'transaction from sender:\n' + pprint.pformat(tx)) if len(tx["outs"]) != 2: return (False, "Transaction has more than 2 outputs; not supported.") @@ -465,7 +466,8 @@ class P2EPMaker(Maker): # included fee is within 0.3-3x our own current estimates, if not user # must decide. btc_fee = total_sender_input - self.receiving_amount - proposed_change_value - self.user_info("Network transaction fee is: " + str(btc_fee) + " satoshis.") + self.user_info("Network transaction fee of fallback tx is: " + str( + btc_fee) + " satoshis.") fee_est = estimate_tx_fee(len(tx['ins']), len(tx['outs']), txtype=self.wallet.get_txtype()) fee_ok = False diff --git a/jmclient/jmclient/taker.py b/jmclient/jmclient/taker.py index 477cb9f..78b45b9 100644 --- a/jmclient/jmclient/taker.py +++ b/jmclient/jmclient/taker.py @@ -981,7 +981,7 @@ class P2EPTaker(Taker): # to the transaction; this preparatory version contains only those. tx = make_shuffled_tx(self.utxos[None], self.outputs, False, 2, currentblock) - jlog.info('Obtained proposed payjoin tx\n' + pprint.pformat( + jlog.info('Created proposed fallback tx\n' + pprint.pformat( btc.deserialize(tx))) # We now sign as a courtesy, because if we disappear the recipient # can still claim his coins with this.