Skip to content

Commit ea5cc2b

Browse files
committed
fix docker config drift validation after jd_server_sv2 refactor
1 parent 580f73d commit ea5cc2b

3 files changed

Lines changed: 28 additions & 10 deletions

File tree

docker/config/pool-config.toml.template renamed to docker/config/pool-jds-config.toml.template

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,20 @@ shares_per_minute = ${POOL_SHARES_PER_MINUTE}
2626
# How many shares do we want to acknowledge in a batch
2727
share_batch_size = ${POOL_SHARE_BATCH_SIZE}
2828

29+
# Protocol Extensions Configuration
30+
# Extensions that the pool supports (will accept if requested by clients)
31+
# Comment/uncomment to enable/disable specific extensions:
32+
supported_extensions = [
33+
# 0x0002, # Worker-Specific Hashrate Tracking
34+
]
35+
36+
# Extensions that the pool requires (clients must support these to connect)
37+
# Use with caution - requiring extensions may prevent some clients from connecting
38+
required_extensions = [
39+
# Example: require Worker-Specific Hashrate Tracking
40+
# 0x0002,
41+
]
42+
2943
# Monitoring HTTP server address for exposing channel data (optional)
3044
monitoring_address = "0.0.0.0:9090"
3145
monitoring_cache_refresh_secs = 15
@@ -35,3 +49,11 @@ monitoring_cache_refresh_secs = 15
3549
network = "mainnet"
3650
fee_threshold = ${POOL_FEE_THRESHOLD}
3751
min_interval = ${POOL_MIN_INTERVAL}
52+
53+
# Optional: Embedded Job Declaration Server (JDS)
54+
# When enabled, Pool runs a JDS subserver that listens for JDP connections from JDC.
55+
# Requires template_provider_type = BitcoinCoreIpc (engine_config derived from it).
56+
# Shared fields (authority keys, cert_validity, coinbase_reward_script) are inherited
57+
# from the Pool config above.
58+
[jds]
59+
listen_address = "0.0.0.0:34254"

docker/docker-compose.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ services:
55
env_file:
66
- docker_env
77
volumes:
8-
- ./config/pool-config.toml.template:/app/pool-config.toml.template:ro
8+
- ./config/pool-jds-config.toml.template:/app/pool-jds-config.toml.template:ro
99
- "${BITCOIN_SOCKET_PATH?}:/root/.bitcoin/node.sock"
1010
entrypoint: >
1111
sh -c '
12-
envsubst < /app/pool-config.toml.template> /app/pool-config.toml &&
12+
envsubst < /app/pool-jds-config.toml.template> /app/pool-config.toml &&
1313
exec /app/pool_sv2
1414
'
1515
ports:

scripts/validate-docker-config.sh

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,17 @@ set -euo pipefail
33

44

55
CONFIG_FILES=(
6-
"pool-apps/pool/config-examples/mainnet/pool-config-bitcoin-core-ipc-example.toml"
7-
"pool-apps/jd-server/config-examples/mainnet/jds-config-local-example.toml"
6+
"pool-apps/pool/config-examples/mainnet/pool-jds-config-bitcoin-core-ipc-example.toml"
87
"miner-apps/jd-client/config-examples/mainnet/jdc-config-bitcoin-core-ipc-hosted-infra-example.toml"
98
"miner-apps/translator/config-examples/mainnet/tproxy-config-local-jdc-example.toml"
109
)
1110

1211
get_template_for_config() {
1312
case "$1" in
14-
pool-apps/pool/config-examples/mainnet/pool-config-bitcoin-core-ipc-example.toml)
15-
echo "docker/config/pool-config.toml.template"
16-
;;
17-
pool-apps/jd-server/config-examples/mainnet/jds-config-local-example.toml)
18-
echo "docker/config/jds-config.toml.template"
13+
pool-apps/pool/config-examples/mainnet/pool-jds-config-bitcoin-core-ipc-example.toml)
14+
echo "docker/config/pool-jds-config.toml.template"
1915
;;
16+
2017
miner-apps/jd-client/config-examples/mainnet/jdc-config-bitcoin-core-ipc-hosted-infra-example.toml)
2118
echo "docker/config/jdc-config.toml.template"
2219
;;
@@ -126,4 +123,3 @@ if [[ "$FAILED" -ne 0 ]]; then
126123
fi
127124

128125
echo "All Docker templates match their configs."
129-

0 commit comments

Comments
 (0)