Add missing isBmFullNode parameter

Signed-off-by: HenrikJannsen <[email protected]>
HenrikJannsen · Sep 6, 2024 · 1d46b02 · 1d46b02
1 parent 5d86410
commit 1d46b02
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -195,6 +195,7 @@ seednode: seednode/build
 		--useLocalhostForP2P=true \
 		--useDevPrivilegeKeys=true \
 		--fullDaoNode=true \
+		--isBmFullNode=true \
 		--rpcUser=bisqdao \
 		--rpcPassword=bsq \
 		--rpcBlockNotificationPort=5120 \
@@ -208,6 +209,7 @@ seednode2: seednode/build
 		--useLocalhostForP2P=true \
 		--useDevPrivilegeKeys=true \
 		--fullDaoNode=true \
+		--isBmFullNode=true \
 		--rpcUser=bisqdao \
 		--rpcPassword=bsq \
 		--rpcBlockNotificationPort=5121 \
@@ -231,6 +233,7 @@ alice: setup
 		--useDevPrivilegeKeys=true \
 		--nodePort=5555 \
 		--fullDaoNode=true \
+		--isBmFullNode=true \
 		--rpcUser=bisqdao \
 		--rpcPassword=bsq \
 		--rpcBlockNotificationPort=5122 \

diff --git a/build-logic/regtest/src/main/kotlin/bisq/gradle/regtest_plugin/RegtestPlugin.kt b/build-logic/regtest/src/main/kotlin/bisq/gradle/regtest_plugin/RegtestPlugin.kt
@@ -106,6 +106,7 @@ class RegtestPlugin @Inject constructor(private val javaToolchainService: JavaTo
 
             val additionalArgs = listOf(
                 "--fullDaoNode=true",
+                "--isBmFullNode=true",
                 "--rpcUser=bisqdao",
                 "--rpcPassword=bsq",
                 "--rpcBlockNotificationPort=5122",
@@ -177,6 +178,7 @@ class RegtestPlugin @Inject constructor(private val javaToolchainService: JavaTo
         createBisqCommonArgs(nodePort) +
                 listOf(
                     "--fullDaoNode=true",
+                    "--isBmFullNode=true",
 
                     "--rpcUser=${RPC_USER}",
                     "--rpcPassword=${RPC_PASSWORD}",

diff --git a/docs/autosetup-regtest-dao/bisq/seed_node b/docs/autosetup-regtest-dao/bisq/seed_node
@@ -1,4 +1,4 @@
 #!/bin/bash
 
 . ./config.sh
-~/bin/bisq/bisq-seednode --baseCurrencyNetwork=BTC_REGTEST --useLocalhostForP2P=true --useDevPrivilegeKeys=true --nodePort=2002 --appName=bisq-BTC_REGTEST_Seed_2002 --daoActivated=true --genesisBlockHeight=$genesis_height --genesisTxId=$genesis_tx --fullDaoNode=$dao --rpcUser=$rpcuser --rpcPassword=$rpcpassword --rpcPort=$rpcport --rpcBlockNotificationPort=$blocknotifyport
+~/bin/bisq/bisq-seednode --baseCurrencyNetwork=BTC_REGTEST --useLocalhostForP2P=true --useDevPrivilegeKeys=true --nodePort=2002 --appName=bisq-BTC_REGTEST_Seed_2002 --daoActivated=true --genesisBlockHeight=$genesis_height --genesisTxId=$genesis_tx --fullDaoNode=$dao --isBmFullNode=$dao --rpcUser=$rpcuser --rpcPassword=$rpcpassword --rpcPort=$rpcport --rpcBlockNotificationPort=$blocknotifyport
diff --git a/docs/dao-setup.md b/docs/dao-setup.md
@@ -92,6 +92,7 @@ echo %1 | ncat -w 1 127.0.0.1 5123
  - `--genesisBlockHeight`: If set it overrides the hard coded block height of the genesis tx. Set it to your local genesis tx height.
  - `--genesisTxId`: If set it overrides the hard coded genesis tx ID. Set it to your local genesis tx ID.
  - `--fullDaoNode`: If true it enables full DAO node mode (in contrast to default lite node mode). At least one seed node must be running as a full DAO node to support other lite nodes.
+- `--isBmFullNode`: If true it enables full Burningman node mode which provides accounting data to lite nodes.
  - `--rpcUser`: RPC user as defined in bitcoin.conf
  - `--rpcPassword`: RPC pw as defined in bitcoin.conf
  - `--rpcPort`: RPC port. For regtest 18443
@@ -104,7 +105,7 @@ If you want to run any instance in DAO mode, use the following program arguments
 
 Full node mode:
 
-`--daoActivated=true --genesisBlockHeight=111 --genesisTxId=30af0050040befd8af25068cc697e418e09c2d8ebd8d411d2240591b9ec203cf --baseCurrencyNetwork=BTC_REGTEST --useDevPrivilegeKeys=true --useLocalhostForP2P=true --nodePort=7777 --appName=bisq-BTC_REGTEST_Alice_dao --fullDaoNode=true --rpcUser=YOUR_USER_NAME --rpcPassword=YOUR_PW --rpcPort=18443 --rpcBlockNotificationPort=5120`
+`--daoActivated=true --genesisBlockHeight=111 --genesisTxId=30af0050040befd8af25068cc697e418e09c2d8ebd8d411d2240591b9ec203cf --baseCurrencyNetwork=BTC_REGTEST --useDevPrivilegeKeys=true --useLocalhostForP2P=true --nodePort=7777 --appName=bisq-BTC_REGTEST_Alice_dao --fullDaoNode=true --isBmFullNode=true --rpcUser=YOUR_USER_NAME --rpcPassword=YOUR_PW --rpcPort=18443 --rpcBlockNotificationPort=5120`
 
 Lite node mode:
 

diff --git a/seednode/bisq.service b/seednode/bisq.service
@@ -12,6 +12,7 @@ EnvironmentFile=/etc/default/bisq.env
 
 ExecStart=/bin/bash __BISQ_HOME__/__BISQ_REPO_NAME__/${BISQ_ENTRYPOINT} \
           --fullDaoNode=${BISQ_DAO_FULLNODE} \
+          --isBmFullNode=${BISQ_DAO_FULLNODE} \
           --userDataDir=${BISQ_HOME} \
           --appName=${BISQ_APP_NAME} \
           --baseCurrencyNetwork=${BISQ_BASE_CURRENCY} \

diff --git a/seednode/deployment_v2/docker/regtest/seednode_1_config b/seednode/deployment_v2/docker/regtest/seednode_1_config
@@ -2,6 +2,7 @@ baseCurrencyNetwork=BTC_REGTEST
 useLocalhostForP2P=true
 useDevPrivilegeKeys=true
 fullDaoNode=true
+isBmFullNode=true
 btcNodes=bisq-bitcoind:18444
 rpcHost=bisq-bitcoind
 rpcPort=18443

diff --git a/seednode/deployment_v2/docker/regtest/seednode_2_config b/seednode/deployment_v2/docker/regtest/seednode_2_config
@@ -2,6 +2,7 @@ baseCurrencyNetwork=BTC_REGTEST
 useLocalhostForP2P=true
 useDevPrivilegeKeys=true
 fullDaoNode=true
+isBmFullNode=true
 btcNodes=bisq-bitcoind:18444
 rpcHost=bisq-bitcoind
 rpcPort=18443

diff --git a/seednode/deployment_v2/docker/seednode_config b/seednode/deployment_v2/docker/seednode_config
@@ -1,4 +1,5 @@
 fullDaoNode=true
+isBmFullNode=true
 userDataDir=/bisq
 appName=bisq-seednode
 baseCurrencyNetwork=btc_mainnet