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

Merge fort-nix/nix-bitcoin#468: joinmarket: 0.9.4 -> 0.9.5

Browse Source 
4f74690292 joinmarket: 0.9.4 -> 0.9.5 (nixbitcoin)

Pull request description:

ACKs for top commit:
  erikarvstedt:
    ACK 4f74690292

Tree-SHA512: 69bb194682d57ec0f1852c13d89d86c479459d32860106746b7bcbf26de7f4d94bf01a6d2852884e02cba5ebd53569f1beb96410c6de12355ec2739a05925998
This commit is contained in:
Jonas Nick 2022-04-03 23:53:08 +00:00
commit 54f8f2d240
No known key found for this signature in database
GPG Key ID: 4861DBF262123605
6 changed files with 21 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/joinmarket.nix
View File

@ -150,16 +150,8 @@ let
usessl = false usessl = false
${socks5Settings} ${socks5Settings}
# agora.anarplex.net
[MESSAGING:server3]
host = vxecvd6lc4giwtasjhgbrr3eop6pzq6i5rveracktioneunalgqlwfad.onion
channel = joinmarket-pit
port = 6667
usessl = false
${socks5Settings}
# ilita # ilita
[MESSAGING:server4] [MESSAGING:server3]
host = ilitafrzzgxymv6umx2ux7kbz3imyeko6cnqkvy4nisjjj4qpqkrptid.onion host = ilitafrzzgxymv6umx2ux7kbz3imyeko6cnqkvy4nisjjj4qpqkrptid.onion
channel = joinmarket-pit channel = joinmarket-pit
port = 6667 port = 6667

16
pkgs/joinmarket/default.nix
View File

@ -1,10 +1,20 @@
{ stdenv, lib, fetchurl, python3, nbPython3Packages, pkgs }: { stdenv, lib, fetchurl, applyPatches, fetchpatch, python3, nbPython3Packages, pkgs }:
let let
version = "0.9.4"; version = "0.9.5";
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 = "1xkz274g9lv5yif77h0mci1fsgam56sdc8m281q3a8hij9nmzmq1"; sha256 = "0q8hfq4y7az5ly97brq1khhhvhnq6irzw0ginmz20fwn7w3yc5sn";
};
patches = [
(fetchpatch {
# https://github.com/JoinMarket-Org/joinmarket-clientserver/pull/1206
name = "ob-export-fix";
url = "https://patch-diff.githubusercontent.com/raw/JoinMarket-Org/joinmarket-clientserver/pull/1206.patch";
sha256 = "0532gixjyc8r11sfmlf32v5iwy0rhkpa8rbvm4b7h509hnyycvhx";
})
];
}; };
runtimePackages = with nbPython3Packages; [ runtimePackages = with nbPython3Packages; [

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

@ -2,11 +2,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "python-bitcointx"; pname = "python-bitcointx";
version = "1.1.1.post0"; version = "1.1.3";
src = fetchurl { src = fetchurl {
url = "https://github.com/Simplexum/${pname}/archive/${pname}-v${version}.tar.gz"; url = "https://github.com/Simplexum/${pname}/archive/${pname}-v${version}.tar.gz";
sha256 = "d12593b09785a7a4ce08cb1928815c2366e9f6e4fab317267462857bf83904b0"; sha256 = "f0f487c29619df0e94a04f6deb3dc950ff9954c072017bd3eda90f73c24f0953";
}; };
patchPhase = '' patchPhase = ''

2
pkgs/python-packages/python-bitcointx/get-sha256.sh
View File

@ -9,7 +9,7 @@ cd $TMPDIR
echo "Fetching latest release" echo "Fetching latest release"
git clone https://github.com/simplexum/python-bitcointx 2> /dev/null git clone https://github.com/simplexum/python-bitcointx 2> /dev/null
cd python-bitcointx cd python-bitcointx
latest=python-bitcointx-v1.1.1.post0 latest=python-bitcointx-v1.1.3
echo "Latest release is ${latest}" echo "Latest release is ${latest}"
# GPG verification # GPG verification

4
test/tests.nix
View File

@ -108,10 +108,6 @@ let
txfee = 200; txfee = 200;
}; };
# Disable restarting joinmarket-ob-watcher because it always fails
# on non-synced mainnet nodes
systemd.services.joinmarket-ob-watcher.serviceConfig.Restart = mkForce "no";
tests.nodeinfo = config.nix-bitcoin.nodeinfo.enable; tests.nodeinfo = config.nix-bitcoin.nodeinfo.enable;
tests.backups = cfg.backups.enable; tests.backups = cfg.backups.enable;

5
test/tests.py
View File

@ -241,9 +241,8 @@ def _():
@test("joinmarket-ob-watcher") @test("joinmarket-ob-watcher")
def _(): def _():
# joinmarket-ob-watcher fails on non-synced mainnet nodes. assert_running("joinmarket-ob-watcher")
# Also, it doesn't support any of the test networks. machine.wait_until_succeeds(log_has_string("joinmarket-ob-watcher", "Starting ob-watcher"))
machine.wait_until_succeeds(log_has_string("joinmarket-ob-watcher", "unknown error in JSON-RPC"))
@test("nodeinfo") @test("nodeinfo")
def _(): def _():