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

Merge #337: joinmarket: 0.8.1 -> 0.8.2

Browse Source 
5ead2a7075 joinmarket: 0.8.1 -> 0.8.2 (nixbitcoin)

Pull request description:

ACKs for top commit:
  erikarvstedt:
    ACK 5ead2a7075

Tree-SHA512: 2ac87f74a1008c058adef81d11049d985a64f435d75ef61584e8debdcc985f78c1d43430c09ee71c247a93908a5ba3a1efdcf91b0666a84b3269509a99685343
This commit is contained in:
Jonas Nick 2021-03-10 21:24:08 +00:00
commit 1377cf5147
No known key found for this signature in database
GPG Key ID: 4861DBF262123605
5 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/joinmarket.nix
View File

@ -87,6 +87,12 @@ let
minsize = ${toString yg.minsize} minsize = ${toString yg.minsize}
size_factor = ${toString yg.size_factor} size_factor = ${toString yg.size_factor}
gaplimit = 6 gaplimit = 6
[SNICKER]
enabled = false
lowest_net_gain = 0
servers = cn5lfwvrswicuxn3gjsxoved6l2gu5hdvwy5l3ev7kg6j7lbji2k7hqd.onion,
polling_interval_minutes = 60
''; '';
# The jm scripts create a 'logs' dir in the working dir, # The jm scripts create a 'logs' dir in the working dir,

7
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.1"; version = "0.8.2";
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 = "1q3x1x0a78v6apwvbyhl7yh4dgr7xpikd8j07gi3by004ns3789d"; sha256 = "0bi1d49kn57b0775cd8gzsc13dbiivvnhrc61d1xb4z1cr3ih8q2";
}; };
runtimePackages = with nbPython3Packages; [ runtimePackages = with nbPython3Packages; [
@ -46,7 +46,8 @@ stdenv.mkDerivation {
chmod +x -R $out/bin chmod +x -R $out/bin
patchShebangs $out/bin patchShebangs $out/bin
# This file 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 $out/bin/orderbook.html
cp -r scripts/obwatch/vendor $out/bin/vendor
''; '';
} }

6
pkgs/python-packages/default.nix
View File

@ -5,6 +5,8 @@ let
joinmarketPkg = pkg: callPackage pkg { inherit (nbPkgs.joinmarket) version src; }; joinmarketPkg = pkg: callPackage pkg { inherit (nbPkgs.joinmarket) version src; };
clightningPkg = pkg: callPackage pkg { inherit (nbPkgs.pinned) clightning; }; clightningPkg = pkg: callPackage pkg { inherit (nbPkgs.pinned) clightning; };
unstable = (import ../nixpkgs-pinned.nix).nixpkgs-unstable;
in { in {
bencoderpyx = callPackage ./bencoderpyx {}; bencoderpyx = callPackage ./bencoderpyx {};
coincurve = callPackage ./coincurve {}; coincurve = callPackage ./coincurve {};
@ -13,6 +15,10 @@ in {
chromalog = callPackage ./chromalog {}; chromalog = callPackage ./chromalog {};
txzmq = callPackage ./txzmq {}; txzmq = callPackage ./txzmq {};
# cryptography 3.3.2, required by joinmarketdaemon
cryptography = callPackage "${unstable}/pkgs/development/python-modules/cryptography" {};
cryptography_vectors = callPackage "${unstable}/pkgs/development/python-modules/cryptography/vectors.nix" {};
joinmarketbase = joinmarketPkg ./jmbase; joinmarketbase = joinmarketPkg ./jmbase;
joinmarketclient = joinmarketPkg ./jmclient; joinmarketclient = joinmarketPkg ./jmclient;
joinmarketbitcoin = joinmarketPkg ./jmbitcoin; joinmarketbitcoin = joinmarketPkg ./jmbitcoin;

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

@ -1,4 +1,4 @@
{ version, src, lib, buildPythonPackage, fetchurl, future, twisted, service-identity, chromalog }: { version, src, lib, buildPythonPackage, fetchurl, future, twisted, service-identity, chromalog, txtorcon }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "joinmarketbase"; pname = "joinmarketbase";
@ -6,7 +6,7 @@ buildPythonPackage rec {
postUnpack = "sourceRoot=$sourceRoot/jmbase"; postUnpack = "sourceRoot=$sourceRoot/jmbase";
propagatedBuildInputs = [ future twisted service-identity chromalog ]; propagatedBuildInputs = [ future twisted service-identity chromalog txtorcon ];
meta = with lib; { meta = with lib; {
homepage = "https://github.com/Joinmarket-Org/joinmarket-clientserver"; homepage = "https://github.com/Joinmarket-Org/joinmarket-clientserver";

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

@ -1,4 +1,4 @@
{ version, src, lib, buildPythonPackage, fetchurl, future, txtorcon, pyopenssl, libnacl, joinmarketbase }: { version, src, lib, buildPythonPackage, fetchurl, future, txtorcon, cryptography, pyopenssl, libnacl, joinmarketbase }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "joinmarketdaemon"; pname = "joinmarketdaemon";
@ -6,7 +6,7 @@ buildPythonPackage rec {
postUnpack = "sourceRoot=$sourceRoot/jmdaemon"; postUnpack = "sourceRoot=$sourceRoot/jmdaemon";
propagatedBuildInputs = [ future txtorcon pyopenssl libnacl joinmarketbase ]; propagatedBuildInputs = [ future txtorcon cryptography pyopenssl libnacl joinmarketbase ];
meta = with lib; { meta = with lib; {
description = "Client library for Bitcoin coinjoins"; description = "Client library for Bitcoin coinjoins";