From 1ee631c04ebee43163f90051c7746eb1c330c93c Mon Sep 17 00:00:00 2001 From: Pascal Precht <445106+PascalPrecht@users.noreply.github.com> Date: Fri, 8 Apr 2022 12:44:50 +0200 Subject: [PATCH] feat: introduce default torrent node config --- src/app_service/common/network_constants.nim | 12 +++++++++++- src/app_service/service/accounts/service.nim | 8 +++++++- src/constants.nim | 2 +- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/src/app_service/common/network_constants.nim b/src/app_service/common/network_constants.nim index 6149106d86..05e0e7960c 100644 --- a/src/app_service/common/network_constants.nim +++ b/src/app_service/common/network_constants.nim @@ -1,4 +1,5 @@ import json, os, chronicles, utils +import ../../constants as main_constants # set via `nim c` param `-d:INFURA_TOKEN:[token]`; should be set in CI/release builds const INFURA_TOKEN {.strdefine.} = "" @@ -21,6 +22,9 @@ let OPENSEA_API_KEY_RESOLVED* = else: OPENSEA_API_KEY +let DEFAULT_TORRENT_CONFIG_PORT* = 9025 +let DEFAULT_TORRENT_CONFIG_DATADIR* = joinPath(main_constants.defaultDataDir(), "data", "archivedata") +let DEFAULT_TORRENT_CONFIG_TORRENTDIR* = joinPath(main_constants.defaultDataDir(), "data", "torrents") const DEFAULT_NETWORK_NAME* = "mainnet_rpc" @@ -253,7 +257,13 @@ var NODE_CONFIG* = %* { "layer": 2, "enabled": true, } - ] + ], + "TorrentConfig": { + "Enabled": false, + "Port": DEFAULT_TORRENT_CONFIG_PORT, + "DataDir": DEFAULT_TORRENT_CONFIG_DATADIR, + "TorrentDir": DEFAULT_TORRENT_CONFIG_TORRENTDIR + } } proc getNetworkConfig*(currentNetwork: string): JsonNode = diff --git a/src/app_service/service/accounts/service.nim b/src/app_service/service/accounts/service.nim index 3fc7474dd0..5c519a1918 100644 --- a/src/app_service/service/accounts/service.nim +++ b/src/app_service/service/accounts/service.nim @@ -1,4 +1,4 @@ -import json, sequtils, strutils, uuids +import json, sequtils, strutils, uuids, os import json_serialization, chronicles import ./dto/accounts as dto_accounts @@ -334,6 +334,12 @@ proc login*(self: Service, account: AccountDto, password: string): string = "Enabled": true, "OpenseaAPIKey": OPENSEA_API_KEY_RESOLVED }, + "TorrentConfig": { + "Enabled": false, + "DataDir": DEFAULT_TORRENT_CONFIG_DATADIR, + "TorrentDir": DEFAULT_TORRENT_CONFIG_TORRENTDIR, + "Port": DEFAULT_TORRENT_CONFIG_PORT + } } let response = status_account.login(account.name, account.keyUid, hashedPassword, thumbnailImage, diff --git a/src/constants.nim b/src/constants.nim index 897a22dce9..205116b41e 100644 --- a/src/constants.nim +++ b/src/constants.nim @@ -5,7 +5,7 @@ import # vendor libs const sep = when defined(windows): "\\" else: "/" -proc defaultDataDir(): string = +proc defaultDataDir*(): string = let homeDir = getHomeDir() let parentDir = if defined(development):