diff --git a/src/app_service/service/accounts/service.nim b/src/app_service/service/accounts/service.nim index 440a1a556e..b0f21d7c55 100644 --- a/src/app_service/service/accounts/service.nim +++ b/src/app_service/service/accounts/service.nim @@ -337,6 +337,7 @@ QtObject: result["Rendezvous"] = newJBool(false) result["KeyStoreDir"] = newJString(self.keyStoreDir.replace(main_constants.STATUSGODIR, "")) + result["RootDataDir"] = newJString(main_constants.STATUSGODIR) proc setLocalAccountSettingsFile(self: Service) = if(main_constants.IS_MACOS and self.getLoggedInAccount.isValid()): @@ -746,4 +747,7 @@ QtObject: return response.result.getBool except Exception as e: error "error: ", procName="verifyPassword", errName = e.name, errDesription = e.msg - return false \ No newline at end of file + return false + + proc getKdfIterations*(self: Service): int = + return KDF_ITERATIONS \ No newline at end of file diff --git a/src/app_service/service/devices/service.nim b/src/app_service/service/devices/service.nim index 0a2f5e6443..e1fac84ecb 100644 --- a/src/app_service/service/devices/service.nim +++ b/src/app_service/service/devices/service.nim @@ -165,11 +165,15 @@ QtObject: proc getConnectionStringForBootstrappingAnotherDevice*(self: Service, keyUid: string, password: string): string = let configJSON = %* { - "keyUID": keyUid, - "keystorePath": joinPath(main_constants.ROOTKEYSTOREDIR, keyUid), - "deviceType": hostOs, - "password": utils.hashPassword(password), - "timeout": 5 * 60 * 1000, + "senderConfig": %* { + "keystorePath": joinPath(main_constants.ROOTKEYSTOREDIR, keyUid), + "deviceType": hostOs, + "keyUID": keyUid, + "password": utils.hashPassword(password), + }, + "serverConfig": %* { + "timeout": 5 * 60 * 1000, + } } self.localPairingStatus.mode = LocalPairingMode.BootstrapingOtherDevice return status_go.getConnectionStringForBootstrappingAnotherDevice($configJSON) @@ -177,12 +181,15 @@ QtObject: proc inputConnectionStringForBootstrapping*(self: Service, connectionString: string): string = let installationId = $genUUID() let nodeConfigJson = self.accountsService.getDefaultNodeConfig(installationId) - let configJSON = %* { - "keystorePath": main_constants.ROOTKEYSTOREDIR, - "nodeConfig": nodeConfigJson, - "deviceType": hostOs, - "RootDataDir": main_constants.STATUSGODIR + "receiverConfig": %* { + "keystorePath": main_constants.ROOTKEYSTOREDIR, + "deviceType" : hostOs, + "nodeConfig": nodeConfigJson, + "kdfIterations": self.accountsService.getKdfIterations(), + "settingCurrentNetwork": "" + }, + "clientConfig": %* {} } self.localPairingStatus.mode = LocalPairingMode.BootstrapingThisDevice diff --git a/vendor/status-go b/vendor/status-go index a3f1a84d29..7cd7430d31 160000 --- a/vendor/status-go +++ b/vendor/status-go @@ -1 +1 @@ -Subproject commit a3f1a84d291749d32408f340d331877555cee5c1 +Subproject commit 7cd7430d3141b08f7c455d7918f4160ea8fd0559