diff --git a/modules/joinmarket.nix b/modules/joinmarket.nix index 289bf2e..bdadc92 100644 --- a/modules/joinmarket.nix +++ b/modules/joinmarket.nix @@ -64,6 +64,8 @@ let tx_broadcast = self minimum_makers = 4 max_sats_freeze_reuse = -1 + interest_rate = """ + _DEFAULT_INTEREST_RATE + """ + bondless_makers_allowance = """ + _DEFAULT_BONDLESS_MAKERS_ALLOWANCE + """ taker_utxo_retries = 3 taker_utxo_age = 5 taker_utxo_amtpercent = 20 diff --git a/pkgs/joinmarket/default.nix b/pkgs/joinmarket/default.nix index a94c691..7c3d71f 100644 --- a/pkgs/joinmarket/default.nix +++ b/pkgs/joinmarket/default.nix @@ -1,10 +1,10 @@ { stdenv, lib, fetchurl, python3, nbPython3Packages, pkgs }: let - version = "0.8.3"; + version = "0.9.1"; src = fetchurl { url = "https://github.com/JoinMarket-Org/joinmarket-clientserver/archive/v${version}.tar.gz"; - sha256 = "0kcgp8lsgnbaxfv13lrg6x7vcbdi5yj526lq9vmvbbidyw4km3r2"; + sha256 = "0a8jlzi3ll1dw60fwnqs5awmcfxdjynh6i1gfmcc29qhwjpx5djl"; }; runtimePackages = with nbPython3Packages; [ @@ -47,7 +47,7 @@ stdenv.mkDerivation { patchShebangs $out/bin # These files must be placed in the same dir as ob-watcher - cp scripts/obwatch/orderbook.html $out/bin/orderbook.html + cp scripts/obwatch/{orderbook.html,sybil_attack_calculations.py} $out/bin/ cp -r scripts/obwatch/vendor $out/bin/vendor ''; } diff --git a/pkgs/python-packages/jmclient/default.nix b/pkgs/python-packages/jmclient/default.nix index dd8d4a3..cf8702d 100644 --- a/pkgs/python-packages/jmclient/default.nix +++ b/pkgs/python-packages/jmclient/default.nix @@ -1,4 +1,4 @@ -{ version, src, lib, buildPythonPackage, fetchurl, future, configparser, joinmarketbase, mnemonic, argon2_cffi, bencoderpyx, pyaes, joinmarketbitcoin, txtorcon }: +{ version, src, lib, buildPythonPackage, fetchurl, future, configparser, joinmarketbase, joinmarketdaemon, mnemonic, argon2_cffi, bencoderpyx, pyaes, joinmarketbitcoin, txtorcon }: buildPythonPackage rec { pname = "joinmarketclient"; @@ -6,7 +6,7 @@ buildPythonPackage rec { postUnpack = "sourceRoot=$sourceRoot/jmclient"; - checkInputs = [ joinmarketbitcoin txtorcon ]; + checkInputs = [ joinmarketbitcoin joinmarketdaemon txtorcon ]; # configparser may need to be compiled with python_version<"3.2" propagatedBuildInputs = [ future configparser joinmarketbase mnemonic argon2_cffi bencoderpyx pyaes ];