Commit graph

15 commits

Author SHA1 Message Date
dchoe
a490ddf3d1
Move YG settings to a config file
Allow YG settings to be saved to joinmarket.cfg.
Before this commit, yield generator settings were
set inside the python script, which is not good.
After this commit, the order of precedence for the
settings for a yield generator is:
* Command line arguments, or
* Settings in [YIELDGENERATOR] in joinmarket.cfg, or
* default config settings in jmclient.configure.py
2021-01-20 12:45:47 +00:00
Adam Gibson
d1ae07d81d
set default txfee contrib to zero, improve error message 2020-11-23 12:45:00 +00:00
Adam Gibson
3c96d412e1
Several tweaks for bech32 orderbook, plus docs
* yg scripts set reloffer/absoffer only:

Prior to this commit, the yield generator user
level scripts required the user to specify offer
types depending on the wallet, but only 'rel/abs'
distinction is user choice; the other element
(native segwit, p2sh or p2pkh) must be defined
by the wallet, so we now call `wallet.get_txtype()`
to translate from reloffer/absoffer to sw0.. etc.

* Taker chooses nversion, nlocktime per wallet type:

Takers who are still using p2sh-p2wpkh wallets will
not want to flag their transactions with different
tx metadata than previous versions that are still
running, so we check the `get_txtype()` output to
decide which nVersion and nLockTime to use.
Also, the SNICKER locktime is reverted to zero as
according to draft spec.

* change offer type in test_coinjoin

* update docs for bech32 wallets
2020-11-10 15:28:05 +00:00
Jules Comte
ab87db2477 Create native segwit v0 order type
Note: The defaults for the fake offer and yg-privacyenhanced remain
on nested segwit
2020-11-06 18:34:27 -05:00
Kristaps Kaupe
3876c1cf97 Change shebang to python3 and +x for scripts 2020-05-04 23:48:19 +03:00
James Hilliard
4bf1f50d4e Remove Python 2 compatibility imports and disable Python 2 installation in setuptools. 2020-01-19 11:31:57 -07:00
Daniel Kraft
8b1e24e20a Make yg algorithms easier to define.
This refactors YieldGeneratorBasic a bit.  In particular, we move things
that custom algorithms will most likely want to change to separate
functions.  That way, it is easy to define the behaviour of inputs
and outputs for the join without the need to duplicate the other, more
general logic of create_my_orders and oid_to_order.
2019-10-05 11:49:10 +02:00
AdamISZ
c139067be4
Include chromalog package for colorized logs
Also use this lib to print non-log messages with
standardized color formats.
Some clean up in jmbase, remove unused objects/methods.
2019-01-14 15:25:59 +01:00
AdamISZ
54618e61da
Remove btc.py
Previous to this commit, the jmbitcoin package was accessed via
a file in jmclient `btc.py` which was originally added as an
interface to allow the client to use a non-jmbitcoin package to
provide the implementation; while this idea is useful, the way
it was implemented was not, moreover it is not currently used
and contained duplicated code that was unmanaged. Also, the
original usage of this was only by the electrum plugin, which
has currently been abandoned. This simplifies the code and
avoids spurious error messages. Note that most of the changes
are a result of pulling the logging function directly from the
jmbase package instead of indirectly via this interface (which
was unnecessary and not connected with jmbitcoin).
2018-12-19 14:37:26 +01:00
James Hilliard
6dc3504f8a Convert jmclient to py3 style 2018-12-06 02:40:36 +08:00
undeath
03ee77b96b
fix issues highlighted by flake8 2018-10-08 00:07:28 +02:00
undeath
1451c9e3ae remove unused imports 2018-08-19 18:21:28 +02:00
Alex Cato
f7029f6492 Reduce yield generator default cj fees by one order of magnitude to be in line with current JM fee environment 2018-07-16 15:17:10 +02:00
Adam Gibson
13d065cd5d
make YGBasic part of jmclient package for reuse 2017-07-19 16:52:24 +03:00
Adam Gibson
ea9eb4a32b
Include maker and yieldgen modules. Fix tx notifications
for confirm and unconfirm callback; yg-basic now functioning.
Some rearrangement of daemon protocol module.
2017-07-19 16:07:29 +03:00