diff --git a/src/app_service/common/network_constants.nim b/src/app_service/common/network_constants.nim index 797913ffeb..e0677c58f7 100644 --- a/src/app_service/common/network_constants.nim +++ b/src/app_service/common/network_constants.nim @@ -271,3 +271,14 @@ var NODE_CONFIG* = %* { }, "OutputMessageCSVEnabled": false } + +var STATUS_NODE_API_CONFIG* = %* { + "APIModules": "connector", + "ConnectorEnabled": true, + "HTTPEnabled": true, + "HTTPHost": "0.0.0.0", + "HTTPPort": 8545, + "WSEnabled": true, + "WSHost": "0.0.0.0", + "WSPort": 8586, +} diff --git a/src/app_service/service/accounts/dto/create_account_request.nim b/src/app_service/service/accounts/dto/create_account_request.nim index 1f81b8d9a7..e775eb4bb0 100644 --- a/src/app_service/service/accounts/dto/create_account_request.nim +++ b/src/app_service/service/accounts/dto/create_account_request.nim @@ -40,6 +40,7 @@ type keycardInstanceUID*: string keycardPairingDataFile*: string + apiConfig*: Option[JsonNode] proc toJson*(self: CreateAccountRequest): JsonNode = result = %*{ @@ -91,3 +92,5 @@ proc toJson*(self: CreateAccountRequest): JsonNode = for key, value in self.walletSecretsConfig.toJson().pairs(): result[key] = value + if self.apiConfig.isSome(): + result["apiConfig"] = %self.apiConfig.get() diff --git a/src/app_service/service/accounts/dto/login_request.nim b/src/app_service/service/accounts/dto/login_request.nim index 2b91c38da2..61fb5a2ad2 100644 --- a/src/app_service/service/accounts/dto/login_request.nim +++ b/src/app_service/service/accounts/dto/login_request.nim @@ -1,4 +1,4 @@ -import json +import json, std/options import wallet_secretes_config export wallet_secretes_config @@ -14,6 +14,7 @@ type keycardWhisperPrivateKey*: string mnemonic*: string walletSecretsConfig*: WalletSecretsConfig + apiConfig*: Option[JsonNode] proc toJson*(self: LoginAccountRequest): JsonNode = result = %* { @@ -28,3 +29,6 @@ proc toJson*(self: LoginAccountRequest): JsonNode = } for key, value in self.walletSecretsConfig.toJson().pairs(): result[key] = value + + if self.apiConfig.isSome(): + result["apiConfig"] = %self.apiConfig.get() diff --git a/src/app_service/service/accounts/service.nim b/src/app_service/service/accounts/service.nim index d792203934..004d6e7543 100644 --- a/src/app_service/service/accounts/service.nim +++ b/src/app_service/service/accounts/service.nim @@ -238,6 +238,7 @@ QtObject: torrentConfigPort: some(TORRENT_CONFIG_PORT), keycardPairingDataFile: main_constants.KEYCARDPAIRINGDATAFILE, walletSecretsConfig: self.buildWalletSecrets(), + apiConfig: some(STATUS_NODE_API_CONFIG) ) proc createAccountAndLogin*(self: Service, password: string, displayName: string, imagePath: string, imageCropRectangle: ImageCropRectangle): string = @@ -421,6 +422,7 @@ QtObject: mnemonic: mnemonic, walletSecretsConfig: self.buildWalletSecrets(), bandwidthStatsEnabled: true, + apiConfig: some(STATUS_NODE_API_CONFIG) ) if main_constants.runtimeLogLevelSet(): diff --git a/vendor/status-go b/vendor/status-go index 49eaabaca5..1ba4b86c7e 160000 --- a/vendor/status-go +++ b/vendor/status-go @@ -1 +1 @@ -Subproject commit 49eaabaca5100368c5b39fb8c107aad2535371e5 +Subproject commit 1ba4b86c7e2a63864aa84698039e7a1d46082701