Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

joinmarket: Add option settings #722

Merged
merged 4 commits into from
Aug 13, 2024

Conversation

erikarvstedt
Copy link
Collaborator

@erikarvstedt erikarvstedt commented Jul 27, 2024

Joinmarket settings can now be freely specified:

services.joinmarket = {
  enable = true;
  settings = {
    POLICY = {
      merge_algorithm = "gradual";
      tx_fees = 5;
    };
    LOGGING = {
      console_log_level = "DEBUG";
    };
  };
};

Closes #707

The updated joinmarket-ob-watcher is deployed at https://nixbitcoin.org and is working fine.

@seberm, can you help reviewing and testing this?

@erikarvstedt erikarvstedt force-pushed the joinmarket-settings branch 4 times, most recently from e83173a to 6875d04 Compare July 27, 2024 17:55
@erikarvstedt
Copy link
Collaborator Author

I've removed option txfee_contribution. It's deprecated and should no longer be used:
https://github.com/JoinMarket-Org/joinmarket-clientserver/blob/v0.9.3/docs/release-notes/release-notes-0.9.3.md

Copy link
Contributor

@seberm seberm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hello @erikarvstedt , I've tried to run the code on my testing node. All of the settings were deployed successfuly and the services seems to be running fine. I think it's good to go.

modules/joinmarket-ob-watcher.nix Show resolved Hide resolved
docs/services.md Outdated Show resolved Hide resolved
modules/joinmarket.nix Outdated Show resolved Hide resolved
These options are set by default in `jmclient/configure.py` and don't
need to be repeated.

Some options, like those in section `POLICY`, might be assigned more
suitable default values in future joinmarket releases, so don't override
them in nix-bitcoin.
jonasnick
jonasnick previously approved these changes Aug 2, 2024
Copy link
Member

@jonasnick jonasnick left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK 9d9e921

@erikarvstedt
Copy link
Collaborator Author

I think we can merge this now.

Joinmarket settings can now be freely specified.
Copy link
Member

@jonasnick jonasnick left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK cf3f0db

@jonasnick jonasnick merged commit 6e208d6 into fort-nix:master Aug 13, 2024
5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Allow for modification of the "merge_algorithm" for JoinMarket policy
3 participants