Merge branch 'master' into indexer

Author: sekulicd

pkg/client-sdk/client.go

@@ -74,19 +74,31 @@ func (a *arkClient) GetConfigData(
 }
 
 func (a *arkClient) Unlock(ctx context.Context, pasword string) error {
+	if a.wallet == nil {
+		return fmt.Errorf("wallet not initialized")
+	}
 	_, err := a.wallet.Unlock(ctx, pasword)
 	return err
 }
 
 func (a *arkClient) Lock(ctx context.Context) error {
+	if a.wallet == nil {
+		return fmt.Errorf("wallet not initialized")
+	}
 	return a.wallet.Lock(ctx)
 }
 
 func (a *arkClient) IsLocked(ctx context.Context) bool {
+	if a.wallet == nil {
+		return true
+	}
 	return a.wallet.IsLocked()
 }
 
 func (a *arkClient) Dump(ctx context.Context) (string, error) {
+	if err := a.safeCheck(); err != nil {
+		return "", err
+	}
 	return a.wallet.Dump(ctx)
 }
 
@@ -100,14 +112,23 @@ func (a *arkClient) Receive(ctx context.Context) (string, string, error) {
 }
 
 func (a *arkClient) GetTransactionEventChannel(_ context.Context) chan types.TransactionEvent {
-	return a.store.TransactionStore().GetEventChannel()
+	if a.store != nil && a.store.TransactionStore() != nil {
+		return a.store.TransactionStore().GetEventChannel()
+	}
+	return nil
 }
 
 func (a *arkClient) GetVtxoEventChannel(_ context.Context) chan types.VtxoEvent {
-	return a.store.VtxoStore().GetEventChannel()
+	if a.store != nil && a.store.VtxoStore() != nil {
+		return a.store.VtxoStore().GetEventChannel()
+	}
+	return nil
 }
 
 func (a *arkClient) SignTransaction(ctx context.Context, tx string) (string, error) {
+	if err := a.safeCheck(); err != nil {
+		return "", err
+	}
 	return a.wallet.SignTransaction(ctx, a.explorer, tx)
 }
 
@@ -119,7 +140,7 @@ func (a *arkClient) Reset(ctx context.Context) {
 }
 
 func (a *arkClient) Stop() error {
-	if a.Config.WithTransactionFeed {
+	if a.txStreamCtxCancel != nil {
 		a.txStreamCtxCancel()
 	}
 
@@ -234,6 +255,7 @@ func (a *arkClient) initWithWallet(
 		MarketHourEndTime:          info.MarketHourEndTime,
 		MarketHourPeriod:           info.MarketHourPeriod,
 		MarketHourRoundInterval:    info.MarketHourRoundInterval,
+		ExplorerURL:                explorerSvc.BaseUrl(),
 	}
 	if err := a.store.ConfigStore().AddData(ctx, storeData); err != nil {
 		return err
@@ -309,7 +331,7 @@ func (a *arkClient) init(
 		UnilateralExitDelay:        common.RelativeLocktime{Type: unilateralExitDelayType, Value: uint32(info.UnilateralExitDelay)},
 		Dust:                       info.Dust,
 		BoardingDescriptorTemplate: info.BoardingDescriptorTemplate,
-		ExplorerURL:                args.ExplorerURL,
+		ExplorerURL:                explorerSvc.BaseUrl(),
 		ForfeitAddress:             info.ForfeitAddress,
 		WithTransactionFeed:        args.WithTransactionFeed,
 		MarketHourStartTime:        info.MarketHourStartTime,

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

@@ -166,24 +166,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

server/internal/core/application/covenantless.go

@@ -1917,7 +1917,9 @@ func (s *covenantlessService) getNewVtxos(round *domain.Round) []domain.Vtxo {
 		return nil
 	}
 
-	createdAt := time.Now().Unix()
+	now := time.Now()
+	createdAt := now.Unix()
+	expireAt := now.Add(time.Duration(s.vtxoTreeExpiry.Seconds()) * time.Second).Unix()
 
 	leaves := round.VtxoTree.Leaves()
 	vtxos := make([]domain.Vtxo, 0)
@@ -1941,6 +1943,7 @@ func (s *covenantlessService) getNewVtxos(round *domain.Round) []domain.Vtxo {
 				Amount:    uint64(out.Value),
 				RoundTxid: round.Txid,
 				CreatedAt: createdAt,
+				ExpireAt:  expireAt,
 			})
 		}
 	}

server/internal/infrastructure/db/sqlite/migration/20250410112433_fix_txid_index.down.sql

@@ -0,0 +1,3 @@
+DROP INDEX IF EXISTS idx_round_txid;
+
+CREATE UNIQUE INDEX IF NOT EXISTS idx_round_txid ON round(txid);

server/internal/infrastructure/db/sqlite/migration/20250410112433_fix_txid_index.up.sql

@@ -0,0 +1,3 @@
+DROP INDEX IF EXISTS idx_round_txid;
+
+CREATE INDEX IF NOT EXISTS idx_round_txid ON round(txid);

server/internal/infrastructure/wallet/btc-embedded/esplora.go

@@ -45,7 +45,7 @@ func (f *esploraClient) broadcast(txhex string) error {
 			return err
 		}
 
-		if strings.Contains(strings.ToLower(string(content)), "non-BIP68-final") {
+		if strings.Contains(strings.ToLower(string(content)), "non-bip68-final") {
 			return ports.ErrNonFinalBIP68
 		}
 

server/internal/interface/grpc/permissions/permissions.go

@@ -162,6 +162,10 @@ func Whitelist() map[string][]bakery.Op {
 			Entity: EntityArk,
 			Action: "write",
 		}},
+		fmt.Sprintf("/%s/GetTransactionsStream", arkv1.ArkService_ServiceDesc.ServiceName): {{
+			Entity: EntityArk,
+			Action: "read",
+		}},
 		fmt.Sprintf("/%s/GetRound", arkv1.ExplorerService_ServiceDesc.ServiceName): {{
 			Entity: EntityExplorer,
 			Action: "read",
@@ -174,6 +178,10 @@ func Whitelist() map[string][]bakery.Op {
 			Entity: EntityExplorer,
 			Action: "read",
 		}},
+		fmt.Sprintf("/%s/SubscribeForAddress", arkv1.ExplorerService_ServiceDesc.ServiceName): {{
+			Entity: EntityExplorer,
+			Action: "read",
+		}},
 	}
 }
 

server/internal/interface/grpc/permissions/permissions_test.go

@@ -30,15 +30,28 @@ func TestRestrictedMethods(t *testing.T) {
 
 func TestWhitelistedMethods(t *testing.T) {
 	allMethods := make([]string, 0)
+
 	for _, m := range arkv1.ArkService_ServiceDesc.Methods {
 		allMethods = append(allMethods, fmt.Sprintf("/%s/%s", arkv1.ArkService_ServiceDesc.ServiceName, m.MethodName))
 	}
+	for _, m := range arkv1.ArkService_ServiceDesc.Streams {
+		allMethods = append(allMethods, fmt.Sprintf("/%s/%s", arkv1.ArkService_ServiceDesc.ServiceName, m.StreamName))
+	}
+
 	for _, v := range arkv1.WalletInitializerService_ServiceDesc.Methods {
 		allMethods = append(allMethods, fmt.Sprintf("/%s/%s", arkv1.WalletInitializerService_ServiceDesc.ServiceName, v.MethodName))
 	}
+	for _, m := range arkv1.WalletInitializerService_ServiceDesc.Streams {
+		allMethods = append(allMethods, fmt.Sprintf("/%s/%s", arkv1.WalletInitializerService_ServiceDesc.ServiceName, m.StreamName))
+	}
+
 	for _, m := range arkv1.ExplorerService_ServiceDesc.Methods {
 		allMethods = append(allMethods, fmt.Sprintf("/%s/%s", arkv1.ExplorerService_ServiceDesc.ServiceName, m.MethodName))
 	}
+	for _, m := range arkv1.ExplorerService_ServiceDesc.Streams {
+		allMethods = append(allMethods, fmt.Sprintf("/%s/%s", arkv1.ExplorerService_ServiceDesc.ServiceName, m.StreamName))
+	}
+
 	allMethods = append(allMethods, fmt.Sprintf("/%s/%s", grpchealth.Health_ServiceDesc.ServiceName, "Check"))
 
 	whitelist := permissions.Whitelist()