diff --git a/clightning-config.ini b/clightning-config.ini index 0d4c6183..ce66f8ea 100644 --- a/clightning-config.ini +++ b/clightning-config.ini @@ -9,7 +9,6 @@ rpc_host=localhost rpc_port=18332 rpc_user=devuser rpc_pass=devpass -zeromq_hashblock_port=28334 [tor] proxy_ip=localhost diff --git a/config.ini b/config.ini index 15890193..373a6681 100644 --- a/config.ini +++ b/config.ini @@ -11,7 +11,6 @@ rpc_host=localhost rpc_port=18332 rpc_user=devuser rpc_pass=devpass -zeromq_hashblock_port=28334 [tor] proxy_ip=localhost diff --git a/docker/config-clightning.ini b/docker/config-clightning.ini index dbb94859..d4d3105f 100644 --- a/docker/config-clightning.ini +++ b/docker/config-clightning.ini @@ -14,7 +14,6 @@ rpc_host=bitcoin-core rpc_port=18332 rpc_user=devuser rpc_pass=devpass -zeromq_hashblock_port=28334 [tor] proxy_ip=tor-node diff --git a/docker/config.ini b/docker/config.ini index ce767ab3..44cf9456 100644 --- a/docker/config.ini +++ b/docker/config.ini @@ -12,7 +12,6 @@ rpc_host=bitcoin-core rpc_port=18332 rpc_user=devuser rpc_pass=devpass -zeromq_hashblock_port=28334 [tor] proxy_ip=tor-node diff --git a/docs/configuration.md b/docs/configuration.md index 2d8bee8e..5e703d6d 100644 --- a/docs/configuration.md +++ b/docs/configuration.md @@ -26,7 +26,6 @@ bitcoin.rpc_user | string | | yes | "" | SQUEAKNODE_BITCOIN_RPC_USER | The usern bitcoin.rpc_pass | string | | yes | "" | SQUEAKNODE_BITCOIN_RPC_PASS | The password to use for authentication on the bitcoin node. bitcoin.rpc_use_ssl | boolean | [true, false] | yes | false | SQUEAKNODE_BITCOIN_USE_SSL | Use SSL for the connection to the bitcoin node. bitcoin.rpc_ssl_cert | str | | yes | "" | SQUEAKNODE_BITCOIN_SSL_CERT | The path to the SSL cert to use for connection to the bitcoin node, if one is used. -bitcoin.zeromq_hashblock_port | int | | yes | 28334 | SQUEAKNODE_BITCOIN_ZEROMQ_HASHBLOCK_PORT | The port to use to subscribe with zeromq to new block hashes on the bitcoin node. lightning.backend | string | | yes | "lnd" | SQUEAKNODE_LIGHTNING_BACKEND | The Lightning Network node implementation to use. lightning.external_host | string | | yes | "" | SQUEAKNODE_LIGHTNING_EXTERNAL_HOST | The host of the lightning node to share with other peers. lightning.external_port | int | | yes | | SQUEAKNODE_LIGHTNING_EXTERNAL_PORT | The port of the lightning node to share with other peers. diff --git a/squeaknode/config/config.py b/squeaknode/config/config.py index 0455f54f..f2ec3303 100644 --- a/squeaknode/config/config.py +++ b/squeaknode/config/config.py @@ -48,7 +48,6 @@ DEFAULT_WEBADMIN_HOST = "0.0.0.0" DEFAULT_WEBADMIN_PORT = 12994 DEFAULT_BITCOIN_RPC_HOST = "localhost" DEFAULT_BITCOIN_RPC_PORT = 18334 -DEFAULT_BITCOIN_ZEROMQ_HASHBLOCK_PORT = 28334 BITCOIN_RPC_PORT = { "mainnet": 8332, "testnet": 18332, @@ -82,8 +81,6 @@ class BitcoinConfig(Config): rpc_pass = key(cast=str, required=False, default="") rpc_use_ssl = key(cast=bool, required=False, default=False) rpc_ssl_cert = key(cast=str, required=False, default="") - zeromq_hashblock_port = key(cast=int, required=False, - default=DEFAULT_BITCOIN_ZEROMQ_HASHBLOCK_PORT) @section('lightning')