diff --git a/server/Makefile b/server/Makefile index c4e9c24a8..c039659ea 100755 --- a/server/Makefile +++ b/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 diff --git a/server/envs/bitcoind.regtest.env b/server/envs/bitcoind.regtest.env index 93387b6a9..3793a1374 100644 --- a/server/envs/bitcoind.regtest.env +++ b/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 \ No newline at end of file +ARK_DATADIR=./data/regtest +ARK_VTXO_TREE_EXPIRY= 604672 +ARK_UNILATERAL_EXIT_DELAY = 1024 +ARK_BOARDING_EXIT_DELAY = 604672 \ No newline at end of file diff --git a/server/envs/neutrino.signet.env b/server/envs/neutrino.mutinynet.env similarity index 53% rename from server/envs/neutrino.signet.env rename to server/envs/neutrino.mutinynet.env index 73cb6f784..e7226aad6 100644 --- a/server/envs/neutrino.signet.env +++ b/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 \ No newline at end of file +ARK_DATADIR=./data/mutinynet +ARK_VTXO_TREE_EXPIRY= 604672 +ARK_UNILATERAL_EXIT_DELAY = 1024 +ARK_BOARDING_EXIT_DELAY = 604672 \ No newline at end of file diff --git a/server/envs/neutrino.regtest.env b/server/envs/neutrino.regtest.env index 5907ff707..b2fdb07a4 100644 --- a/server/envs/neutrino.regtest.env +++ b/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 \ No newline at end of file +ARK_ALLOW_ZERO_FEES=true +ARK_VTXO_TREE_EXPIRY= 604672 +ARK_UNILATERAL_EXIT_DELAY = 1024 +ARK_BOARDING_EXIT_DELAY = 604672 \ No newline at end of file diff --git a/server/internal/config/config.go b/server/internal/config/config.go index 8dd070b51..3beda0b2a 100644 --- a/server/internal/config/config.go +++ b/server/internal/config/config.go @@ -155,7 +155,7 @@ var ( AllowZeroFees = "ALLOW_ZERO_FEES" defaultDatadir = common.AppDataDir("arkd", false) - defaultRoundInterval = 15 + defaultRoundInterval = 30 DefaultPort = 7070 defaultDbType = "sqlite" defaultEventDbType = "badger" @@ -163,16 +163,16 @@ var ( 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