chore(flake): update sovran-bitcoin with btcpayserver RPC whitelist fix

fix(bitcoin): expand btcpayserver RPC whitelist for NBXplorer
- Ensure services.bitcoind.rpc.users.btcpayserver.rpcwhitelist includes public.rpcwhitelist and NBXplorer capability-scan/wallet RPC methods (validateaddress, testmempoolaccept, signrawtransactionwithkey, signrawtransactionwithwallet, getblockfrompeer, generatetoaddress, getindexinfo, createwallet, loadwallet, importdescriptors, etc.).
2026-10-18 17:15:44 -05:00 · 2026-10-18 17:15:03 -05:00 · 2026-10-18 16:47:38 -05:00 · 2026-10-18 16:47:36 -05:00
2 changed files with 58 additions and 8 deletions
@@ -152,11 +152,11 @@
        "nixpkgs": "nixpkgs_4"
      },
      "locked": {
-        "lastModified": 1792349245,
-        "narHash": "sha256-EVk00bSi11pzw3OyzGOsYpryQ/QbN/KDiMAbUMKuRIg=",
+        "lastModified": 1792361662,
+        "narHash": "sha256-EySy/HbufH9trjH0kEuZ2nVVk0+Sn5FoxJI7YtHrspo=",
        "owner": "naturallaw777",
        "repo": "Sovran_Bitcoin",
-        "rev": "50a8b76afab06ed7d4eeb38a1d0425432f388cbf",
+        "rev": "5c13bf5e01beccc4a225a36cde833f00b2595718",
        "type": "github"
      },
      "original": {
@@ -12,7 +12,7 @@
 #   3. Applies OS-specific overrides (Second_Drive paths, operator "free",
 #      forced wallet enable, Hub firewall port, domain requirements)
 #   4. Wires the Sovran Hub's NWC environment to the Alby Hub service
-{ config, pkgs, lib, ... }:
+{ config, pkgs, lib, options, ... }:

 let
  cfg = config.sovran_systemsOS;
@@ -55,11 +55,34 @@ in {
  };

  # ── 2. Second_Drive data paths (OS-specific) ──────────────────
-  services.bitcoind = lib.mkIf cfg.services.bitcoin {
+  services.bitcoind = lib.mkIf cfg.services.bitcoin ({
    dataDir = "/run/media/Second_Drive/BTCEcoandBackup/Bitcoin_Node";
    # The OS always enables the bitcoind wallet — the Hub and BTCPay need it.
    disablewallet = lib.mkForce false;
-  };
+    # electrs 0.12.0 (bindex) requires bitcoind's REST interface (rest=1).
+    extraConfig = lib.optionalString (!(options.services.bitcoind ? rest)) "rest=1";
+  } // lib.optionalAttrs cfg.web.btcpayserver {
+    rpc.users.btcpayserver.rpcwhitelist = lib.mkForce (lib.unique (config.services.bitcoind.rpc.users.public.rpcwhitelist ++ [
+      "setban"
+      "generatetoaddress"
+      "getrpcinfo"
+      "gettransaction"
+      "getwalletinfo"
+      "getnewaddress"
+      "listunspent"
+      "listtransactions"
+      "listreceivedbyaddress"
+      "importmulti"
+      "importdescriptors"
+      "importaddress"
+      "importprivkey"
+      "importpubkey"
+      "rescanblockchain"
+      "createwallet"
+      "loadwallet"
+      "signrawtransactionwithwallet"
+    ]));
+  });

  services.electrs = lib.mkIf cfg.services.bitcoin {
    dataDir = "/run/media/Second_Drive/BTCEcoandBackup/Electrs_Data";
@@ -72,11 +95,38 @@ in {
    serviceConfig.PrivateUsers = lib.mkForce false;
  };

-  systemd.services.electrs = lib.mkIf cfg.services.bitcoin {
+  systemd.services.electrs = lib.mkIf cfg.services.bitcoin (
+    let
+      bitcoind = config.services.bitcoind;
+      electrsCfg = config.services.electrs;
+      nbLib = config.nix-bitcoin.lib;
+    in {
      requires = lib.mkForce [ "run-media-Second_Drive.mount" ];
      after    = [ "run-media-Second_Drive.mount" "bitcoind.service" ];
      wants    = [ "bitcoind.service" ];
-  };
+    } // lib.optionalAttrs (!(options.services.bitcoind ? rest)) {
+      # Fallback when locked against Sovran_Bitcoin <= 1.1.1:
+      # electrs 0.12.0 removed --daemon-p2p-addr and switched to bindex (format v1).
+      preStart = lib.mkAfter ''
+        dbNetDir='${electrsCfg.dataDir}/${bitcoind.makeNetworkName "bitcoin" "regtest"}'
+        if [[ -d "$dbNetDir" ]] && grep -q 'prefix_extractor=rocksdb\.FixedPrefix\.8' "$dbNetDir"/OPTIONS-* 2>/dev/null; then
+          echo "electrs: removing pre-0.12.0 database at $dbNetDir for bindex 0.12.0 reindex"
+          rm -rf "$dbNetDir"
+        fi
+      '';
+      serviceConfig.ExecStart = lib.mkForce ''
+        ${pkgs.electrs}/bin/electrs \
+        --log-filters=INFO \
+        --network=${bitcoind.makeNetworkName "bitcoin" "regtest"} \
+        --db-dir='${electrsCfg.dataDir}' \
+        --daemon-dir='${bitcoind.dataDir}' \
+        --electrum-rpc-addr=${electrsCfg.address}:${toString electrsCfg.port} \
+        --monitoring-addr=${electrsCfg.address}:${toString electrsCfg.monitoringPort} \
+        --daemon-rpc-addr=${nbLib.addressWithPort bitcoind.rpc.address bitcoind.rpc.port} \
+        ${electrsCfg.extraArgs}
+      '';
+    }
+  );

  systemd.services.lnd = lib.mkIf cfg.services.bitcoin {
    wants    = [ "bitcoind.service" ];
Author	SHA1	Message	Date
naturallaw777	1d59a995e8	chore(flake): update sovran-bitcoin with btcpayserver RPC whitelist fix	2026-10-18 17:15:44 -05:00
Sovran Systems	f1f0bf0d11	fix(bitcoin): expand btcpayserver RPC whitelist for NBXplorer - Ensure services.bitcoind.rpc.users.btcpayserver.rpcwhitelist includes public.rpcwhitelist and NBXplorer capability-scan/wallet RPC methods (validateaddress, testmempoolaccept, signrawtransactionwithkey, signrawtransactionwithwallet, getblockfrompeer, generatetoaddress, getindexinfo, createwallet, loadwallet, importdescriptors, etc.).	2026-10-18 17:15:03 -05:00
naturallaw777	7b5f25d599	chore(flake): update sovran-bitcoin with electrs 0.12.0 fix	2026-10-18 16:47:38 -05:00
Sovran Systems	497ac49cfd	fix(bitcoin): support electrs 0.12.0 (drop --daemon-p2p-addr, enable bitcoind rest=1) - Ensure bitcoind enables rest=1 and electrs.service omits the removed --daemon-p2p-addr flag even before Sovran_Bitcoin flake input is re-locked. - Clean up pre-0.12.0 (FixedPrefix.8) RocksDB directories in electrs preStart so bindex 0.12.0 reindexes cleanly.	2026-10-18 16:47:36 -05:00