diff --git a/src/app/wallet/core.nim b/src/app/wallet/core.nim index 6f8b374eb0..f11e35669a 100644 --- a/src/app/wallet/core.nim +++ b/src/app/wallet/core.nim @@ -26,6 +26,7 @@ proc delete*(self: WalletController) = delete self.view proc init*(self: WalletController) = + status_wallet.startWallet() self.status.wallet.initAccounts() var accounts = self.status.wallet.accounts for account in accounts: diff --git a/src/status/libstatus/accounts.nim b/src/status/libstatus/accounts.nim index 3ceba0c8ff..ac3b5e25a0 100644 --- a/src/status/libstatus/accounts.nim +++ b/src/status/libstatus/accounts.nim @@ -1,6 +1,7 @@ import json, os, nimcrypto, uuids, json_serialization, chronicles, strutils -import nim_status, core +from nim_status import multiAccountGenerateAndDeriveAddresses, generateAlias, identicon, saveAccountAndLogin, login, openAccounts +import core import utils as utils import types as types import accounts/constants @@ -42,10 +43,10 @@ proc generateAddresses*(n = 5): seq[GeneratedAccount] = result = Json.decode(generatedAccounts, seq[GeneratedAccount]) proc generateAlias*(publicKey: string): string = - result = $nim_status.generateAlias(publicKey.cstring) + result = $nim_status.generateAlias(publicKey) proc generateIdenticon*(publicKey: string): string = - result = $nim_status.identicon(publicKey.cstring) + result = $nim_status.identicon(publicKey) proc ensureDir(dirname: string) = if not existsDir(dirname): diff --git a/src/status/libstatus/utils.nim b/src/status/libstatus/utils.nim index 6392114b77..86d1f91b15 100644 --- a/src/status/libstatus/utils.nim +++ b/src/status/libstatus/utils.nim @@ -19,9 +19,6 @@ proc keys*(obj: JsonNode): seq[string] = for k, _ in obj: result.add k -proc toGoString*(str: string): GoString = - result = GoString(str: str, length: cint(str.len)) - proc generateSigningPhrase*(count: int): string = let now = getTime() var rng = initRand(now.toUnix * 1000000000 + now.nanosecond) diff --git a/src/status/libstatus/wallet.nim b/src/status/libstatus/wallet.nim index e48b6344b5..f1b1c31ba9 100644 --- a/src/status/libstatus/wallet.nim +++ b/src/status/libstatus/wallet.nim @@ -1,6 +1,6 @@ -import json, options -import stint, chronicles, json_serialization -import nim_status, core, types, utils +import json, options, httpclient, json, json_serialization, strformat, stint, strutils, sequtils, chronicles, parseutils, tables +import core, types, utils +from nim_status import validateMnemonic, startWallet import ../wallet/account import ./contracts as contractMethods import eth/common/eth_types @@ -88,3 +88,8 @@ proc hex2Eth*(input: string): string = proc validateMnemonic*(mnemonic: string): string = result = $nim_status.validateMnemonic(mnemonic) + +proc startWallet*() = + discard nim_status.startWallet() + + \ No newline at end of file diff --git a/vendor/nim-status b/vendor/nim-status index b3e3a8920b..46c93dd734 160000 --- a/vendor/nim-status +++ b/vendor/nim-status @@ -1 +1 @@ -Subproject commit b3e3a8920b79a5a75c6680730c7f75e6201afde7 +Subproject commit 46c93dd7346c8e6f8778dbc92ab5cee2e4930e60