Merge branch 'spark-0.2.8'

modules/spark-wallet.nix

@@ -15,6 +15,9 @@ let
       CMD="$CMD --public-url http://$(cat /var/lib/onion-chef/clightning/spark-wallet)"
       ''
     }
+    # Use rate provide wasabi because default (bitstamp) doesn't accept
+    # connections through Tor and add proxy for rate lookup.
+    CMD="$CMD --rate-provider wasabi --proxy socks5h://${config.services.tor.client.socksListenAddress}"
     echo Running $CMD
     $CMD
   '';
@@ -45,6 +48,8 @@ in {
 
   config = mkIf cfg.enable {
     services.tor.enable = cfg.onion-service;
+    # requires client functionality for Bitcoin rate lookup
+    services.tor.client.enable = true;
     services.tor.hiddenServices.spark-wallet = mkIf cfg.onion-service {
       map = [{
         port = 80; toPort = 9737;

pkgs/spark-wallet/composition.nix

@@ -1,4 +1,4 @@
-# This file has been generated by node2nix 1.6.1. Do not edit!
+# This file has been generated by node2nix 1.6.0. Do not edit!
 
 {pkgs ? import <nixpkgs> {
     inherit system;

pkgs/spark-wallet/pkg.json

@@ -1,3 +1,3 @@
 [
-  { "spark-wallet": "^0.2.5" }
+  { "spark-wallet": "^0.2.8" }
 ]

pkgs/spark-wallet/supplement.nix

@@ -1,4 +1,4 @@
-# This file has been generated by node2nix 1.6.1. Do not edit!
+# This file has been generated by node2nix 1.6.0. Do not edit!
 
 {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: