[Server] Update default env var values (#526)

* Update defaults and fix dev envs

* Fix

Author: altafan

server/Makefile

@@ -36,23 +36,22 @@ lint:
 	@echo "Linting code..."
 	@golangci-lint run --fix
 
-## run: run in regtest mode with bitcoind
+## run: run arkd in dev mode with bitcoind on regtest
 run: clean
-	@echo "Running arkd with Bitcoin Core in regtest mode ..."
+	@echo "Running arkd with Bitcoin Core in dev mode on regtest ..."
 	$(call setup_env, envs/bitcoind.regtest.env)
-
 	go run ./cmd/arkd
 
-## run-neutrino: run in regtest mode with neutrino
+## run-neutrino: run arkd in dev mode with neutrino on regtest
 run-neutrino: clean
-	@echo "Running arkd with Neutrino in regtest mode ..."
+	@echo "Running arkd with Neutrino in dev mode on regtest ..."
 	$(call setup_env, envs/neutrino.regtest.env)
 	go run ./cmd/arkd
 
-## run-neutrino-mutinynet: run in signet mode
+## run-neutrino-mutinynet: run arkd in dev mode with neutrino on mutinynet
 run-neutrino-mutinynet: clean
-	@echo "Running arkd with Neutrino in signet mode ..."
-	$(call setup_env, envs/neutrino.signet.env)
+	@echo "Running arkd with Neutrino in dev mode on mutinynet ..."
+	$(call setup_env, envs/neutrino.mutinynet.env)
 	go run ./cmd/arkd
 
 ## test: runs unit and component tests

server/envs/bitcoind.regtest.env

@@ -1,13 +1,12 @@
-ARK_ROUND_INTERVAL=10
 ARK_LOG_LEVEL=5
 ARK_NETWORK=regtest
-ARK_PORT=7070
-ARK_NO_TLS=true
 ARK_NO_MACAROONS=true
-ARK_TX_BUILDER_TYPE=covenantless
 ARK_BITCOIND_RPC_USER=admin1
 ARK_BITCOIND_RPC_PASS=123
 ARK_BITCOIND_RPC_HOST=localhost:18443
 ARK_BITCOIND_ZMQ_BLOCK=tcp://127.0.0.1:28332
 ARK_BITCOIND_ZMQ_TX=tcp://127.0.0.1:28333
-ARK_DATADIR=./data/regtest
+ARK_DATADIR=./data/regtest
+ARK_VTXO_TREE_EXPIRY= 604672
+ARK_UNILATERAL_EXIT_DELAY = 1024
+ARK_BOARDING_EXIT_DELAY = 604672

server/envs/neutrino.signet.env renamed to server/envs/neutrino.mutinynet.env

@@ -1,10 +1,9 @@
-ARK_ROUND_INTERVAL=10
 ARK_LOG_LEVEL=5
 ARK_NETWORK=mutinynet
-ARK_PORT=7070
-ARK_NO_TLS=true
 ARK_NO_MACAROONS=true
-ARK_TX_BUILDER_TYPE=covenantless
 ARK_ESPLORA_URL=https://mutinynet.com/api
 ARK_NEUTRINO_PEER=45.79.52.207:38333
-ARK_DATADIR=./data/mutinynet
+ARK_DATADIR=./data/mutinynet
+ARK_VTXO_TREE_EXPIRY= 604672
+ARK_UNILATERAL_EXIT_DELAY = 1024
+ARK_BOARDING_EXIT_DELAY = 604672

server/envs/neutrino.regtest.env

@@ -1,11 +1,10 @@
-ARK_ROUND_INTERVAL=10
 ARK_LOG_LEVEL=5
 ARK_NETWORK=regtest
-ARK_PORT=7070
-ARK_NO_TLS=true
 ARK_NO_MACAROONS=true
-ARK_TX_BUILDER_TYPE=covenantless
 ARK_ESPLORA_URL=http://localhost:3000
 ARK_NEUTRINO_PEER=localhost:18444
 ARK_DATADIR=./data/regtest
-ARK_ALLOW_ZERO_FEES=true
+ARK_ALLOW_ZERO_FEES=true
+ARK_VTXO_TREE_EXPIRY= 604672
+ARK_UNILATERAL_EXIT_DELAY = 1024
+ARK_BOARDING_EXIT_DELAY = 604672

server/internal/config/config.go

@@ -165,24 +165,24 @@ var (
 	VtxoMinAmount             = "VTXO_MIN_AMOUNT"
 
 	defaultDatadir             = common.AppDataDir("arkd", false)
-	defaultRoundInterval       = 15
+	defaultRoundInterval       = 30
 	DefaultPort                = 7070
 	defaultDbType              = "sqlite"
 	defaultEventDbType         = "badger"
 	defaultSchedulerType       = "gocron"
 	defaultTxBuilderType       = "covenantless"
 	defaultNetwork             = "bitcoin"
 	defaultEsploraURL          = "https://blockstream.info/api"
-	defaultLogLevel            = 5
-	defaultVtxoTreeExpiry      = 604672
-	defaultUnilateralExitDelay = 1024
-	defaultBoardingExitDelay   = 604672
+	defaultLogLevel            = 4
+	defaultVtxoTreeExpiry      = 604672  // 7 days
+	defaultUnilateralExitDelay = 86400   // 24 hours
+	defaultBoardingExitDelay   = 7776000 // 3 months
 	defaultNoMacaroons         = false
 	defaultNoTLS               = true
 	defaultNostrDefaultRelays  = []string{"wss://relay.primal.net", "wss://relay.damus.io"}
 	defaultMarketHourStartTime = time.Now()
-	defaultMarketHourEndTime   = defaultMarketHourStartTime.Add(time.Duration(defaultRoundInterval) * time.Second)
-	defaultMarketHourPeriod    = time.Duration(24) * time.Hour
+	defaultMarketHourEndTime   = defaultMarketHourStartTime.Add(time.Hour)
+	defaultMarketHourPeriod    = 24 * time.Hour
 	defaultMarketHourInterval  = time.Duration(defaultRoundInterval) * time.Second
 
 	defaultAllowZeroFees             = false