greg
/
nix-bitcoin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

joinmarket: 0.8.3 -> 0.9.1

This commit is contained in:
nixbitcoin 2021-08-12 10:52:17 +00:00
parent 4040e4fd32
commit e95abf6c7e
No known key found for this signature in database
GPG Key ID: B6044ECBA2DAE5D0
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/joinmarket.nix
View File

@ -64,6 +64,8 @@ let
tx_broadcast = self tx_broadcast = self
minimum_makers = 4 minimum_makers = 4
max_sats_freeze_reuse = -1 max_sats_freeze_reuse = -1
interest_rate = """ + _DEFAULT_INTEREST_RATE + """
bondless_makers_allowance = """ + _DEFAULT_BONDLESS_MAKERS_ALLOWANCE + """
taker_utxo_retries = 3 taker_utxo_retries = 3
taker_utxo_age = 5 taker_utxo_age = 5
taker_utxo_amtpercent = 20 taker_utxo_amtpercent = 20

6
pkgs/joinmarket/default.nix
View File

@ -1,10 +1,10 @@
{ stdenv, lib, fetchurl, python3, nbPython3Packages, pkgs }: { stdenv, lib, fetchurl, python3, nbPython3Packages, pkgs }:
let let
version = "0.8.3"; version = "0.9.1";
src = fetchurl { src = fetchurl {
url = "https://github.com/JoinMarket-Org/joinmarket-clientserver/archive/v${version}.tar.gz"; url = "https://github.com/JoinMarket-Org/joinmarket-clientserver/archive/v${version}.tar.gz";
sha256 = "0kcgp8lsgnbaxfv13lrg6x7vcbdi5yj526lq9vmvbbidyw4km3r2"; sha256 = "0a8jlzi3ll1dw60fwnqs5awmcfxdjynh6i1gfmcc29qhwjpx5djl";
}; };
runtimePackages = with nbPython3Packages; [ runtimePackages = with nbPython3Packages; [
@ -47,7 +47,7 @@ stdenv.mkDerivation {
patchShebangs $out/bin patchShebangs $out/bin
# These files must be placed in the same dir as ob-watcher # 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 cp -r scripts/obwatch/vendor $out/bin/vendor
''; '';
} }

4
pkgs/python-packages/jmclient/default.nix
View File

@ -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 { buildPythonPackage rec {
pname = "joinmarketclient"; pname = "joinmarketclient";
@ -6,7 +6,7 @@ buildPythonPackage rec {
postUnpack = "sourceRoot=$sourceRoot/jmclient"; postUnpack = "sourceRoot=$sourceRoot/jmclient";
checkInputs = [ joinmarketbitcoin txtorcon ]; checkInputs = [ joinmarketbitcoin joinmarketdaemon txtorcon ];
# configparser may need to be compiled with python_version<"3.2" # configparser may need to be compiled with python_version<"3.2"
propagatedBuildInputs = [ future configparser joinmarketbase mnemonic argon2_cffi bencoderpyx pyaes ]; propagatedBuildInputs = [ future configparser joinmarketbase mnemonic argon2_cffi bencoderpyx pyaes ];