From 5694408d3ae7622639da3c0454ef16e4f7c925aa Mon Sep 17 00:00:00 2001
From: Erik Arvstedt <erik.arvstedt@gmail.com>
Date: Sat, 27 Jul 2024 19:52:49 +0200
Subject: [PATCH] joinmarket: remove deleted option `txfee`

---
 docs/services.md             |  2 +-
 modules/joinmarket.nix       |  7 -------
 modules/obsolete-options.nix | 11 ++++++++++-
 test/tests.nix               |  1 -
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/docs/services.md b/docs/services.md
index 8037905..f4a408d 100644
--- a/docs/services.md
+++ b/docs/services.md
@@ -543,8 +543,8 @@ See [here](https://github.com/JoinMarket-Org/joinmarket-clientserver/blob/master
     services.joinmarket.yieldgenerator = {
       enable = true;
       # Optional: Add custom parameters
-      txfee = 200;
       cjfee_a = 300;
+      cjfee_r = 0.00003;
     };
     '';
     ```
diff --git a/modules/joinmarket.nix b/modules/joinmarket.nix
index 3579c42..45d6b8b 100644
--- a/modules/joinmarket.nix
+++ b/modules/joinmarket.nix
@@ -102,13 +102,6 @@ let
           Variance around the average cj fee.
         '';
       };
-      txfee = mkOption {
-        type = types.ints.unsigned;
-        default = 100;
-        description = ''
-          The average transaction fee you're adding to coinjoin transactions.
-        '';
-      };
       txfee_contribution_factor = mkOption {
         type = types.float;
         default = 0.3;
diff --git a/modules/obsolete-options.nix b/modules/obsolete-options.nix
index d0f8d43..5dda777 100644
--- a/modules/obsolete-options.nix
+++ b/modules/obsolete-options.nix
@@ -115,7 +115,16 @@ in {
       This plugin is no longer maintained.
     '')
     [ "summary" "helpme" "prometheus" ]
-  );
+  )
+  ++
+  # 0.0.110
+  [
+    (mkRemovedOptionModule [ "services" "joinmarket" "yieldgenerator" "txfee" ] ''
+      Option `txfee` has been removed in joinmarket 0.9.3:
+      https://github.com/JoinMarket-Org/joinmarket-clientserver/blob/v0.9.3/docs/release-notes/release-notes-0.9.3.md
+    '')
+  ];
+
   config = {
     # Migrate old clightning-rest datadir from nix-bitcoin versions < 0.0.70
     systemd.services.clightning-rest-migrate-datadir = let
diff --git a/test/tests.nix b/test/tests.nix
index 88b4b88..6310cce 100644
--- a/test/tests.nix
+++ b/test/tests.nix
@@ -135,7 +135,6 @@ let
         ordertype = "absoffer";
         cjfee_a = 300;
         cjfee_r = 0.00003;
-        txfee = 200;
       };
 
       tests.nodeinfo = config.nix-bitcoin.nodeinfo.enable;