diff --git a/scripts/configure b/scripts/configure index f3c6ecd..f806083 100755 --- a/scripts/configure +++ b/scripts/configure @@ -113,6 +113,9 @@ FRONTAIL_IP="10.21.21.7" BITCOIN_IP="10.21.21.8" BITCOIN_RPC_PORT="8332" BITCOIN_P2P_PORT="8333" +BITCOIN_ZMQ_RAWBLOCK_PORT="28332" +BITCOIN_ZMQ_RAWTX_PORT="28333" +BITCOIN_ZMQ_HASHBLOCK_PORT="28334" LND_IP="10.21.21.9" LND_GRPC_PORT="10009" LND_REST_PORT="8080" @@ -195,7 +198,7 @@ if [ "$BITCOIN_NETWORK" == "regtest" ]; then sed -i "s/network = \"bitcoin\"/network = \"regtest\"/g;" "$ELECTRS_CONF_FILE" fi -# Update RPC and P2P Ports +# Update RPC, P2P and ZMQ Ports sed -i "s/rpcport=/rpcport=$BITCOIN_RPC_PORT/g;" "$BITCOIN_CONF_FILE" sed -i "s/port=/port=$BITCOIN_P2P_PORT/g;" "$BITCOIN_CONF_FILE" sed -i "s//$BITCOIN_RPC_PORT/g;" "$TOR_CONF_FILE" @@ -259,6 +262,9 @@ for template in "${NGINX_CONF_FILE}" "${BITCOIN_CONF_FILE}" "${LND_CONF_FILE}" " sed -i "s//${ELECTRUM_PORT}/g" "${template}" sed -i "s//${TOR_PROXY_IP}/g" "${template}" sed -i "s//${TOR_PROXY_PORT}/g" "${template}" + sed -i "s//${BITCOIN_ZMQ_RAWBLOCK_PORT}/g;" "${template}" + sed -i "s//${BITCOIN_ZMQ_RAWTX_PORT}/g;" "${template}" + sed -i "s//${BITCOIN_ZMQ_HASHBLOCK_PORT}/g;" "${template}" # Apps sed -i "s//${APP_BTC_RPC_EXPLORER_IP}/g" "${template}" diff --git a/templates/.env-sample b/templates/.env-sample index 44abe1f..e9c0e71 100644 --- a/templates/.env-sample +++ b/templates/.env-sample @@ -11,6 +11,9 @@ BITCOIN_NETWORK= BITCOIN_IP= BITCOIN_RPC_PORT= BITCOIN_P2P_PORT= +BITCOIN_ZMQ_RAWBLOCK_PORT= +BITCOIN_ZMQ_RAWTX_PORT= +BITCOIN_ZMQ_HASHBLOCK_PORT= BITCOIN_RPC_USER= BITCOIN_RPC_PASS= BITCOIN_RPC_AUTH= diff --git a/templates/bitcoin-sample.conf b/templates/bitcoin-sample.conf index 7919c15..3ce98d5 100644 --- a/templates/bitcoin-sample.conf +++ b/templates/bitcoin-sample.conf @@ -19,8 +19,9 @@ maxconnections=40 maxuploadtarget=1000 # zmq -zmqpubrawblock=tcp://0.0.0.0:28332 -zmqpubrawtx=tcp://0.0.0.0:28333 +zmqpubrawblock=tcp://0.0.0.0: +zmqpubrawtx=tcp://0.0.0.0: +zmqpubhashblock=tcp://0.0.0.0: # Indexes txindex=1 diff --git a/templates/lnd-sample.conf b/templates/lnd-sample.conf index 20babfb..cf6a4e1 100644 --- a/templates/lnd-sample.conf +++ b/templates/lnd-sample.conf @@ -14,8 +14,8 @@ tlsdisableautofill=1 bitcoind.rpchost= bitcoind.rpcuser= bitcoind.rpcpass= -bitcoind.zmqpubrawblock=tcp://:28332 -bitcoind.zmqpubrawtx=tcp://:28333 +bitcoind.zmqpubrawblock=tcp://: +bitcoind.zmqpubrawtx=tcp://: [Bitcoin] bitcoin.active=1