Skip to content

Conversation

@hulxv
Copy link
Collaborator

@hulxv hulxv commented Jan 1, 2026

Unexpose the network port of makerd inside the docker compose because there's no option change it, so it will prevent to start the stack if there's an existed maker that run on the same port. Also, we don't need to expose it so it doesn't make any difference

@hulxv hulxv requested a review from mojoX911 January 1, 2026 11:46
Copy link

@mojoX911 mojoX911 left a comment

Choose a reason for hiding this comment

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

Ack.

@codecov
Copy link

codecov bot commented Jan 1, 2026

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 78.21%. Comparing base (776b75d) to head (a074c0a).
⚠️ Report is 73 commits behind head on master.

Additional details and impacted files
@@            Coverage Diff             @@
##           master     #678      +/-   ##
==========================================
+ Coverage   68.87%   78.21%   +9.33%     
==========================================
  Files          35       49      +14     
  Lines        4932    15125   +10193     
==========================================
+ Hits         3397    11830    +8433     
- Misses       1535     3295    +1760     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@hulxv hulxv force-pushed the docker/fix/unexpose-makerd-port branch from 615a85f to 4f07fb2 Compare January 1, 2026 14:02
@mojoX911
Copy link

mojoX911 commented Jan 1, 2026

@hulxv, one more copy request on the Docker setup.

Instead of saying say yes to experimental taproot feature. Say something like Choose Swap Type. 1. Taproot (Default) or 2. Legacy(P2WSH). Both features are on equal footing currently, so we shouldn't downplay one over the other. Taproot is fully operational with all major edge cases covered.

Also, add a note in the option in bold to catch eyes with the following:

"
This option determines the Type of swaps.

  1. Taproot: Contract Tx with [Musig2 + Tarpoot HTLC]. Cheaper swap fees, more private. (recommended new protocol)
  2. Legacy: Contract Tx with [2of2 Multisig + P2WSH HTLC]. Higher swap fees, less private. (OG atomic swap protocol)

Currently, a maker can only perform Legacy or Taproot swaps, but cannot perform both. Although it can handle both taproot and legacy transactions for regular wallet operations. If you wanna serve both types of swap in the market, run two separate makers of each type. (You can use the existing bitcoind Docker sockets for the second maker too to avoid multiple node IBD).
"

Shorten this text as much as possible to fit in the CLI screen. But this is important info that maker runners should know.

@hulxv hulxv force-pushed the docker/fix/unexpose-makerd-port branch from d2fe36d to d9846cd Compare January 2, 2026 20:22
@hulxv hulxv force-pushed the docker/fix/unexpose-makerd-port branch from d9846cd to a074c0a Compare January 2, 2026 20:23
@hulxv hulxv changed the title docker: unexpose makerd network port docker: enhance swap type selection and unexpose makerd port Jan 2, 2026
@hulxv hulxv requested a review from mojoX911 January 2, 2026 20:23
Copy link

@mojoX911 mojoX911 left a comment

Choose a reason for hiding this comment

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

Ack

@mojoX911 mojoX911 merged commit 3b85ea7 into citadel-tech:master Jan 3, 2026
9 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.

2 participants