mirror of
https://github.com/JoinMarket-Org/joinmarket-clientserver.git
synced 2026-08-16 13:01:17 +02:00
28abddf062
- update mktx() to allow optional locktime setting (and sequence) - add a mk_shuffled_tx method to the wallet module - add a P2EPTaker and P2EPMaker class (inherit from Taker, Maker) - add a -T option to sendpayment script for doing payjoins - add a receive_payjoin script for receivers. - add payjoin tests in jmclient/test/test_payjoin.py - add a custom utxo selection method select_one_utxo to support.py - support bech32 wallets (SegwitWallet, p2wpkh) with native=true in config POLICY for PayJoin and direct send (not Joinmarket CJ) - add a PayJoin.md usage guide in docs/ - include version bytes in pubkey message for forward compat - taker pays fees but controls size (utxo number and fee/kB) - add P2WPKH fee estimator - Enforce INFO level logging in payjoin - refactors regtest config settings into one place - bugfix: script_to_address vbyte argument is bytes not integer
88 lines
3.5 KiB
Python
88 lines
3.5 KiB
Python
#! /usr/bin/env python
|
|
from __future__ import (absolute_import, division,
|
|
print_function, unicode_literals)
|
|
from builtins import * # noqa: F401
|
|
|
|
from optparse import OptionParser
|
|
|
|
import sys
|
|
from twisted.python.log import startLogging
|
|
from jmbase import get_log, set_logging_level
|
|
from jmclient import P2EPMaker, jm_single, load_program_config, \
|
|
sync_wallet, JMClientProtocolFactory, start_reactor, \
|
|
open_test_wallet_maybe, get_wallet_path
|
|
from cli_options import check_regtest
|
|
|
|
jlog = get_log()
|
|
|
|
def receive_payjoin_main(makerclass):
|
|
parser = OptionParser(usage='usage: %prog [options] [wallet file] [amount-to-receive]')
|
|
parser.add_option('-g', '--gap-limit', action='store', type="int",
|
|
dest='gaplimit', default=6,
|
|
help='gap limit for wallet, default=6')
|
|
parser.add_option('--fast',
|
|
action='store_true',
|
|
dest='fastsync',
|
|
default=False,
|
|
help=('choose to do fast wallet sync, only for Core and '
|
|
'only for previously synced wallet'))
|
|
parser.add_option('-m', '--mixdepth', action='store', type='int',
|
|
dest='mixdepth', default=0,
|
|
help="mixdepth to source coins from")
|
|
parser.add_option('-a',
|
|
'--amtmixdepths',
|
|
action='store',
|
|
type='int',
|
|
dest='amtmixdepths',
|
|
help='number of mixdepths in wallet, default 5',
|
|
default=5)
|
|
(options, args) = parser.parse_args()
|
|
if len(args) < 2:
|
|
parser.error('Needs a wallet, and a receiving amount in satoshis')
|
|
sys.exit(0)
|
|
wallet_name = args[0]
|
|
try:
|
|
receiving_amount = int(args[1])
|
|
except:
|
|
parser.error("Invalid receiving amount passed: " + receiving_amount)
|
|
sys.exit(0)
|
|
if receiving_amount < 0:
|
|
parser.error("Receiving amount must be a positive integer in satoshis")
|
|
sys.exit(0)
|
|
load_program_config()
|
|
|
|
check_regtest()
|
|
|
|
# This workflow requires command line reading; we force info level logging
|
|
# to remove noise, and mostly communicate to the user with the fn
|
|
# log.info (via P2EPMaker.user_info).
|
|
set_logging_level("INFO")
|
|
|
|
wallet_path = get_wallet_path(wallet_name, 'wallets')
|
|
max_mix_depth = max([options.mixdepth, options.amtmixdepths - 1])
|
|
wallet = open_test_wallet_maybe(
|
|
wallet_path, wallet_name, max_mix_depth,
|
|
gap_limit=options.gaplimit)
|
|
|
|
if jm_single().config.get("BLOCKCHAIN", "blockchain_source") == "electrum-server":
|
|
jm_single().bc_interface.synctype = "with-script"
|
|
|
|
while not jm_single().bc_interface.wallet_synced:
|
|
sync_wallet(wallet, fast=options.fastsync)
|
|
|
|
maker = makerclass(wallet, options.mixdepth, receiving_amount)
|
|
|
|
jlog.info('starting receive-payjoin')
|
|
clientfactory = JMClientProtocolFactory(maker, proto_type="MAKER")
|
|
|
|
nodaemon = jm_single().config.getint("DAEMON", "no_daemon")
|
|
daemon = True if nodaemon == 1 else False
|
|
if jm_single().config.get("BLOCKCHAIN", "network") in ["regtest", "testnet"]:
|
|
startLogging(sys.stdout)
|
|
start_reactor(jm_single().config.get("DAEMON", "daemon_host"),
|
|
jm_single().config.getint("DAEMON", "daemon_port"),
|
|
clientfactory, daemon=daemon, p2ep=True)
|
|
|
|
if __name__ == "__main__":
|
|
receive_payjoin_main(P2EPMaker)
|
|
print('done')
|