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

Merge fort-nix/nix-bitcoin#489: Update nixpkgs & joinmarket: 0.9.5 -> 0.9.6 

cb295d1a16 joinmarket: 0.9.5 -> 0.9.6 (nixbitcoin)
568d728e5c joinmarket: put python-packages in alphabetical order (nixbitcoin)
a3ff1351d9 update nixpkgs (Jonas Nick)
636d508b50 spark-wallet: use nodejs 14 instead of 12 since latter is EOL (Jonas Nick)

Pull request description:

ACKs for top commit:
  erikarvstedt:
    ACK cb295d1a16

Tree-SHA512: ca124de4d393c3828454599e4d3d3357560a6ae902c569b3edabf395cd6f5d50d8904db9f078f02b70cd0b67d013a263d238e9bc36ba34bc1bb7d9d9fd02a7e9
This commit is contained in:
Jonas Nick 2022-06-04 07:56:07 +00:00
parent 9a860738ee cb295d1a16
commit 043ef53cb9
No known key found for this signature in database
GPG Key ID: 4861DBF262123605
10 changed files with 72 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
flake.lock
View File

@ -2,11 +2,11 @@
"nodes": { "nodes": {
"flake-utils": { "flake-utils": {
"locked": { "locked": {
"lastModified": 1652557277, "lastModified": 1653893745,
"narHash": "sha256-jSes9DaIVMdmwBB78KkFUVrlDzawmD62vrUg0GS2500=", "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "12806d31a381e7cd169a6bac35590e7b36dc5fe5", "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -17,11 +17,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1652559422, "lastModified": 1653830209,
"narHash": "sha256-jPVTNImBTUIFdtur+d4IVot6eXmsvtOcBm0TzxmhWPk=", "narHash": "sha256-V+HnLKJzvk2HZcLUKt9z2puZ46vLo74chOakxbLfXek=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "8b3398bc7587ebb79f93dfeea1b8c574d3c6dba1", "rev": "cc257c49c495b2d0d7d40c5753a452d0abc8adf3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -33,11 +33,11 @@
}, },
"nixpkgsUnstable": { "nixpkgsUnstable": {
"locked": { "locked": {
"lastModified": 1652692103, "lastModified": 1653738054,
"narHash": "sha256-ygRLh8g0F/WkVCSfQcxMoVaaD45i6Ky+f+b4wCOazag=", "narHash": "sha256-IaR8iLN4Ms3f5EjU1CJkXSc49ZzyS5qv03DtVAti6/s=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "556ce9a40abde33738e6c9eac65f965a8be3b623", "rev": "17b62c338f2a0862a58bb6951556beecd98ccda9",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
modules/joinmarket-ob-watcher.nix
View File

@ -49,7 +49,7 @@ let
rpc_port = ${toString bitcoind.rpc.port} rpc_port = ${toString bitcoind.rpc.port}
rpc_user = ${bitcoind.rpc.users.joinmarket-ob-watcher.name} rpc_user = ${bitcoind.rpc.users.joinmarket-ob-watcher.name}
${joinmarket.ircServers} ${joinmarket.messagingConfig}
''; '';
in { in {
inherit options; inherit options;

46
modules/joinmarket.nix
View File

@ -20,6 +20,21 @@ let
default = 64180; # A random private port default = 64180; # A random private port
description = "The port corresponding to option `payjoinAddress`."; description = "The port corresponding to option `payjoinAddress`.";
}; };
messagingAddress = mkOption {
type = types.str;
default = "127.0.0.1";
description = ''
The address where messaging onion connections are forwarded to.
This address is never used directly, it only serves as the internal endpoint
for the messaging onion service.
The onion service is automatically setup by joinmarket.
'';
};
messagingPort = mkOption {
type = types.port;
default = 64181; # payjoinPort + 1
description = "The port corresponding to option `messagingAddress`.";
};
dataDir = mkOption { dataDir = mkOption {
type = types.path; type = types.path;
default = "/var/lib/joinmarket"; default = "/var/lib/joinmarket";
@ -47,9 +62,9 @@ let
defaultText = "(See source)"; defaultText = "(See source)";
}; };
# Used by ./joinmarket-ob-watcher.nix # Used by ./joinmarket-ob-watcher.nix
ircServers = mkOption { messagingConfig = mkOption {
readOnly = true; readOnly = true;
default = ircServers; default = messagingConfig;
defaultText = "(See source)"; defaultText = "(See source)";
}; };
# This option is only used by netns-isolation. # This option is only used by netns-isolation.
@ -133,7 +148,18 @@ let
socks5_port = ${toString torAddress.port} socks5_port = ${toString torAddress.port}
''; '';
ircServers = '' messagingConfig = ''
[MESSAGING:onion]
type = onion
${socks5Settings}
tor_control_host = unix:/run/tor/control
# required option, but ignored for unix socket host
tor_control_port = 9051
onion_serving_host = ${cfg.messagingAddress}
onion_serving_port = ${toString cfg.messagingPort}
hidden_service_dir =
directory_nodes = 3kxw6lf5vf6y26emzwgibzhrzhmhqiw6ekrek3nqfjjmhwznb2moonad.onion:5222,jmdirjmioywe2s5jad7ts6kgcqg66rj6wujj6q77n6wbdrgocqwexzid.onion:5222,bqlpq6ak24mwvuixixitift4yu42nxchlilrcqwk2ugn45tdclg42qid.onion:5222
# irc.darkscience.net # irc.darkscience.net
[MESSAGING:server1] [MESSAGING:server1]
host = darkirc6tqgpnwd3blln3yfv5ckl47eg7llfxkmtovrv7c7iwohhb6ad.onion host = darkirc6tqgpnwd3blln3yfv5ckl47eg7llfxkmtovrv7c7iwohhb6ad.onion
@ -142,17 +168,17 @@ let
usessl = true usessl = true
${socks5Settings} ${socks5Settings}
# irc.hackint.org # ilita
[MESSAGING:server2] [MESSAGING:server2]
host = ncwkrwxpq2ikcngxq3dy2xctuheniggtqeibvgofixpzvrwpa77tozqd.onion host = ilitafrzzgxymv6umx2ux7kbz3imyeko6cnqkvy4nisjjj4qpqkrptid.onion
channel = joinmarket-pit channel = joinmarket-pit
port = 6667 port = 6667
usessl = false usessl = false
${socks5Settings} ${socks5Settings}
# ilita # irc.hackint.org
[MESSAGING:server3] [MESSAGING:server3]
host = ilitafrzzgxymv6umx2ux7kbz3imyeko6cnqkvy4nisjjj4qpqkrptid.onion host = ncwkrwxpq2ikcngxq3dy2xctuheniggtqeibvgofixpzvrwpa77tozqd.onion
channel = joinmarket-pit channel = joinmarket-pit
port = 6667 port = 6667
usessl = false usessl = false
@ -176,7 +202,7 @@ let
rpc_user = ${bitcoind.rpc.users.privileged.name} rpc_user = ${bitcoind.rpc.users.privileged.name}
${optionalString (cfg.rpcWalletFile != null) "rpc_wallet_file = ${cfg.rpcWalletFile}"} ${optionalString (cfg.rpcWalletFile != null) "rpc_wallet_file = ${cfg.rpcWalletFile}"}
${ircServers} ${messagingConfig}
[LOGGING] [LOGGING]
console_log_level = INFO console_log_level = INFO
@ -195,11 +221,13 @@ let
max_sats_freeze_reuse = -1 max_sats_freeze_reuse = -1
interest_rate = 0.015 interest_rate = 0.015
bondless_makers_allowance = 0.125 bondless_makers_allowance = 0.125
bond_value_exponent = 1.3
taker_utxo_retries = 3 taker_utxo_retries = 3
taker_utxo_age = 5 taker_utxo_age = 5
taker_utxo_amtpercent = 20 taker_utxo_amtpercent = 20
accept_commitment_broadcasts = 1 accept_commitment_broadcasts = 1
commit_file_location = cmtdata/commitments.json commit_file_location = cmtdata/commitments.json
commitment_list_location = cmtdata/commitmentlist
[PAYJOIN] [PAYJOIN]
payjoin_version = 1 payjoin_version = 1
@ -209,6 +237,8 @@ let
onion_socks5_host = ${torAddress.addr} onion_socks5_host = ${torAddress.addr}
onion_socks5_port = ${toString torAddress.port} onion_socks5_port = ${toString torAddress.port}
tor_control_host = unix:/run/tor/control tor_control_host = unix:/run/tor/control
# Required option, but unused because `tor_control_host` is a Unix socket
tor_control_port = 9051
onion_serving_host = ${cfg.payjoinAddress} onion_serving_host = ${cfg.payjoinAddress}
onion_serving_port = ${toString cfg.payjoinPort} onion_serving_port = ${toString cfg.payjoinPort}
hidden_service_ssl = false hidden_service_ssl = false

1
modules/netns-isolation.nix
View File

@ -336,6 +336,7 @@ in {
services.joinmarket = { services.joinmarket = {
payjoinAddress = netns.joinmarket.address; payjoinAddress = netns.joinmarket.address;
messagingAddress = netns.joinmarket.address;
cliExec = mkCliExec "joinmarket"; cliExec = mkCliExec "joinmarket";
}; };
systemd.services.joinmarket-yieldgenerator = mkIf config.services.joinmarket.yieldgenerator.enable { systemd.services.joinmarket-yieldgenerator = mkIf config.services.joinmarket.yieldgenerator.enable {

12
pkgs/joinmarket/default.nix
View File

@ -1,18 +1,18 @@
{ stdenv, lib, fetchurl, applyPatches, fetchpatch, python3, nbPythonPackageOverrides, pkgs }: { stdenv, lib, fetchurl, applyPatches, fetchpatch, python3, nbPythonPackageOverrides, pkgs }:
let let
version = "0.9.5"; version = "0.9.6";
src = applyPatches { src = applyPatches {
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 = "0q8hfq4y7az5ly97brq1khhhvhnq6irzw0ginmz20fwn7w3yc5sn"; sha256 = "040qj3abqkk74zyi5yav1ijlh5cmd49wlymald2lzk35adnx804g";
}; };
patches = [ patches = [
(fetchpatch { (fetchpatch {
# https://github.com/JoinMarket-Org/joinmarket-clientserver/pull/1206 # https://github.com/JoinMarket-Org/joinmarket-clientserver/pull/1264
name = "ob-export-fix"; name = "use-twisted-22.4.0";
url = "https://patch-diff.githubusercontent.com/raw/JoinMarket-Org/joinmarket-clientserver/pull/1206.patch"; url = "https://patch-diff.githubusercontent.com/raw/JoinMarket-Org/joinmarket-clientserver/pull/1264.patch";
sha256 = "0532gixjyc8r11sfmlf32v5iwy0rhkpa8rbvm4b7h509hnyycvhx"; sha256 = "1nlyhc5myph9239d5zczsl4jan4qj4ggy0l1f39jv0ihjbjhcks5";
}) })
]; ];
}; };

4
pkgs/pinned.nix
View File

@ -3,8 +3,7 @@ pkgs: pkgsUnstable:
{ {
inherit (pkgs) inherit (pkgs)
charge-lnd charge-lnd
extra-container extra-container;
lndconnect;
inherit (pkgsUnstable) inherit (pkgsUnstable)
bitcoin bitcoin
@ -17,6 +16,7 @@ pkgs: pkgsUnstable:
lightning-loop lightning-loop
lightning-pool lightning-pool
lnd lnd
lndconnect
nbxplorer; nbxplorer;
inherit pkgs pkgsUnstable; inherit pkgs pkgsUnstable;

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

@ -8,13 +8,13 @@ let
unstable = (import ../nixpkgs-pinned.nix).nixpkgs-unstable; unstable = (import ../nixpkgs-pinned.nix).nixpkgs-unstable;
in { in {
bencoderpyx = callPackage ./bencoderpyx {}; bencoderpyx = callPackage ./bencoderpyx {};
chromalog = callPackage ./chromalog {};
coincurve = callPackage ./coincurve {}; coincurve = callPackage ./coincurve {};
python-bitcointx = callPackage ./python-bitcointx { inherit (nbPkgs) secp256k1; }; python-bitcointx = callPackage ./python-bitcointx { inherit (nbPkgs) secp256k1; };
urldecode = callPackage ./urldecode {};
chromalog = callPackage ./chromalog {};
txzmq = callPackage ./txzmq {};
sha256 = callPackage ./sha256 {};
runes = callPackage ./runes {}; runes = callPackage ./runes {};
sha256 = callPackage ./sha256 {};
txzmq = callPackage ./txzmq {};
urldecode = callPackage ./urldecode {};
joinmarketbase = joinmarketPkg ./jmbase; joinmarketbase = joinmarketPkg ./jmbase;
joinmarketclient = joinmarketPkg ./jmclient; joinmarketclient = joinmarketPkg ./jmclient;

2
pkgs/spark-wallet/composition.nix
View File

@ -2,7 +2,7 @@
{pkgs ? import <nixpkgs> { {pkgs ? import <nixpkgs> {
inherit system; inherit system;
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}: }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}:
let let
nodeEnv = import "${toString pkgs.path}/pkgs/development/node-packages/node-env.nix" { nodeEnv = import "${toString pkgs.path}/pkgs/development/node-packages/node-env.nix" {

5
pkgs/spark-wallet/generate.sh
View File

@ -28,8 +28,11 @@ tar xvf $TMPDIR/$file -C $src --strip-components 1 >/dev/null
jq '.dependencies["qrcode-terminal"] = .optionalDependencies["qrcode-terminal"]' $src/package.json | sponge $src/package.json jq '.dependencies["qrcode-terminal"] = .optionalDependencies["qrcode-terminal"]' $src/package.json | sponge $src/package.json
# Generate nix pkg # Generate nix pkg
# TODO-EXTERNAL: remove --nodejs-14 option once
# https://github.com/svanderburg/node2nix/pull/296 has made its way into a
# node2nix release.
node2nix \ node2nix \
--nodejs-12 \ --nodejs-14 \
--input $src/package.json \ --input $src/package.json \
--lock $src/npm-shrinkwrap.json \ --lock $src/npm-shrinkwrap.json \
--composition composition.nix \ --composition composition.nix \

12
test/nixos-search/flake.lock
View File

@ -18,11 +18,11 @@
"nixos-org-configurations": { "nixos-org-configurations": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1651495498, "lastModified": 1653498760,
"narHash": "sha256-u/WU4G+DBJp7L8UO7UMLcor7QHfHp8P6pKwDPhBz504=", "narHash": "sha256-KCNAUCcWkTQy/ddrZzYZrtiT3Zg6rLb7QIylUDvKcco=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-org-configurations", "repo": "nixos-org-configurations",
"rev": "2a65c35c03163f0ecbe0f86f4bd56aaf5c4f4dd0", "rev": "34b9422847c5b67cbdbe26b89201b3354557f677",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -38,11 +38,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1652295804, "lastModified": 1653738462,
"narHash": "sha256-VzvA5YxzPsn4t2tFLgj+QavsdO2YpH/1d3xrZ/18VdQ=", "narHash": "sha256-2eOJBUcahP6C7KmsYCM9GyZhGNFGyyUNmn0LNhEVKY4=",
"owner": "nixos", "owner": "nixos",
"repo": "nixos-search", "repo": "nixos-search",
"rev": "3b41f2dcfd3448efea38f241c5229ac4948e51a7", "rev": "1bf3ce7c9829d3daedc46a000062d09339936034",
"type": "github" "type": "github"
}, },
"original": { "original": {