move types out of libstatus; remove libstatus types references

src/app/browser/core.nim

@@ -1,6 +1,5 @@
 import NimQml, chronicles
 import ../../status/status
-import ../../status/libstatus/types as status_types
 import view
 
 logScope:

src/app/browser/view.nim

@@ -1,7 +1,7 @@
 import NimQml, json, chronicles
 import ../../status/status
 import ../../status/libstatus/browser as status_browser
-import ../../status/libstatus/types
+import ../../status/types
 import views/bookmark_list
 
 QtObject:

src/app/browser/views/bookmark_list.nim

@@ -1,6 +1,6 @@
 import NimQml, Tables, chronicles
 import sequtils as sequtils
-import ../../../status/libstatus/types
+import ../../../status/types
 
 type
   BookmarkRoles {.pure.} = enum

src/app/chat/core.nim

@@ -2,7 +2,7 @@ import NimQml, chronicles, tables
 import ../../status/chat as chat_model
 import ../../status/messages as messages_model
 import ../../status/signals/types
-import ../../status/libstatus/types as status_types
+import ../../status/types as status_types
 import ../../status/[chat, contacts, status, wallet, stickers, settings]
 import view, views/channels_list, views/message_list, views/reactions, views/stickers as stickers_view
 import ../../eventemitter

src/app/chat/views/chat_item.nim

@@ -1,6 +1,6 @@
 import NimQml, Tables, std/wrapnils
 import ../../../status/[chat/chat, status, ens, accounts, settings]
-from ../../../status/libstatus/types import Setting
+from ../../../status/types import Setting
 import ../../../status/libstatus/utils as status_utils
 
 import chat_members

src/app/chat/views/communities.nim

@@ -7,7 +7,7 @@ import ./community_membership_request_list
 import ./channels_list
 import ../../utils/image_utils
 import ../../../status/signals/types as signal_types
-import ../../../status/libstatus/types
+import ../../../status/types
 
 
 logScope:

src/app/chat/views/reactions.nim

@@ -2,7 +2,7 @@ import NimQml, tables, json, chronicles
 import ../../../status/[status, chat/message, chat/chat, settings]
 import message_list, chat_item
 import ../../../status/libstatus/utils as status_utils
-import ../../../status/libstatus/types
+import ../../../status/types
 
 logScope:
   topics = "reactions-view"

src/app/chat/views/sticker_list.nim

@@ -1,6 +1,6 @@
 import NimQml, Tables, sequtils
 import ../../../status/chat/stickers
-import ../../../status/libstatus/types
+import ../../../status/types
 
 type
   StickerRoles {.pure.} = enum

src/app/chat/views/sticker_pack_list.nim

@@ -1,6 +1,6 @@
 import NimQml, Tables, sequtils, sugar
 import ../../../status/chat/stickers, ./sticker_list
-import ../../../status/libstatus/types, ../../../status/libstatus/utils
+import ../../../status/types, ../../../status/libstatus/utils
 
 type
   StickerPackRoles {.pure.} = enum

src/app/chat/views/stickers.nim

@@ -5,7 +5,7 @@ import # vendor libs
   chronicles, NimQml
 
 import # status-desktop libs
-  ../../../status/[status, stickers, wallet], ../../../status/libstatus/[types, utils],
+  ../../../status/[status, stickers, wallet, types], ../../../status/libstatus/utils,
   ../../../status/libstatus/stickers as status_stickers, sticker_pack_list, sticker_list, chat_item, ../../../status/tasks/[qt, task_runner_impl]
 
 logScope:

src/app/login/core.nim

@@ -1,5 +1,5 @@
 import NimQml, chronicles, options, std/wrapnils
-import ../../status/libstatus/types as status_types
+import ../../status/types as status_types
 import ../../status/signals/types
 import ../../status/status
 import view

src/app/login/view.nim

@@ -1,6 +1,6 @@
 import NimQml, Tables, json, nimcrypto, strformat, json_serialization, chronicles
 import ../../status/signals/types
-import ../../status/libstatus/types as status_types
+import ../../status/types as status_types
 import ../../status/accounts as AccountModel
 import ../onboarding/views/account_info
 import ../../status/status

src/app/node/core.nim

@@ -1,7 +1,7 @@
 import NimQml, chronicles
 import ../../status/signals/types
 import ../../status/[status, node, network]
-import ../../status/libstatus/types as status_types
+import ../../status/types as status_types
 import ../../eventemitter
 import view
 

src/app/onboarding/core.nim

@@ -1,5 +1,5 @@
 import NimQml, chronicles, std/wrapnils
-import ../../status/libstatus/types as status_types
+import ../../status/types as status_types
 import ../../status/accounts as AccountModel
 import ../../status/status
 import ../../status/signals/types

src/app/onboarding/view.nim

@@ -1,5 +1,5 @@
 import NimQml, Tables, json, nimcrypto, strformat, json_serialization, strutils
-import ../../status/libstatus/types as status_types
+import ../../status/types as status_types
 import ../../status/signals/types
 import ../../status/accounts as AccountModel
 import ../../status/[status, wallet]

src/app/onboarding/views/account_info.nim

@@ -1,5 +1,5 @@
 import NimQml
-import ../../../status/libstatus/types
+import ../../../status/types
 import std/wrapnils
 
 QtObject:

src/app/profile/core.nim

@@ -2,7 +2,7 @@ import NimQml, json, strutils, sugar, sequtils, tables
 import json_serialization
 import ../../status/signals/types
 import ../../status/libstatus/accounts/constants
-import ../../status/libstatus/types as status_types
+import ../../status/types as status_types
 import ../../status/profile/[profile, mailserver]
 import ../../status/[status, settings]
 import ../../status/contacts as status_contacts

src/app/profile/view.nim

@@ -8,7 +8,7 @@ import ../../status/contacts as status_contacts
 import ../../status/status
 import ../../status/ens as status_ens
 import ../../status/chat/chat
-import ../../status/libstatus/types
+import ../../status/types
 import ../../status/libstatus/accounts/constants as accountConstants
 import qrcode/qrcode
 import ../utils/image_utils

src/app/profile/views/custom_networks.nim

@@ -2,7 +2,7 @@ import NimQml
 import Tables
 import json, sequtils, sugar
 import ../../../status/libstatus/settings
-import ../../../status/libstatus/types
+import ../../../status/types
 
 type
   CustomNetworkRoles {.pure.} = enum

src/app/profile/views/ens_manager.nim

@@ -3,7 +3,7 @@ import Tables
 import json
 import sequtils
 import strutils
-from ../../../status/libstatus/types import Setting, PendingTransactionType, RpcException
+from ../../../status/types import Setting, PendingTransactionType, RpcException
 import ../../../status/ens as status_ens
 import ../../../status/libstatus/wallet as status_wallet
 import ../../../status/libstatus/settings as status_settings

src/app/profile/views/fleets.nim

@@ -1,6 +1,6 @@
 import NimQml
 import chronicles, strutils
-import ../../../status/libstatus/types as status_types
+import ../../../status/types as status_types
 import ../../../status/[status, settings, accounts]
 
 QtObject:

src/app/profile/views/mnemonic.nim

@@ -1,6 +1,6 @@
 import NimQml, chronicles, strutils
 import ../../../status/[status, settings]
-import ../../../status/libstatus/types
+import ../../../status/types
 import options
 
 logScope:

src/app/profile/views/profile_info.nim

@@ -1,7 +1,7 @@
 import NimQml
 import chronicles
 import ../../../status/profile/profile
-import ../../../status/libstatus/types
+import ../../../status/types
 import std/wrapnils
 
 QtObject:

src/app/provider/view.nim

@@ -1,6 +1,6 @@
 import NimQml
 import ../../status/[status, ens, chat/stickers, wallet, settings]
-import ../../status/libstatus/types
+import ../../status/types
 import ../../status/libstatus/accounts
 import ../../status/libstatus/core
 import ../../status/libstatus/settings as status_settings

src/app/utilsView/core.nim

@@ -1,7 +1,7 @@
 import NimQml, chronicles
 import ../../status/signals/types
 import ../../status/[status, node, network]
-import ../../status/libstatus/types as status_types
+import ../../status/types as status_types
 import view
 import ../../eventemitter
 

src/app/utilsView/view.nim

@@ -4,7 +4,7 @@ import ../../status/[status, wallet]
 import ../../status/stickers
 import ../../status/libstatus/accounts/constants as accountConstants
 import ../../status/libstatus/tokens
-import ../../status/libstatus/types
+import ../../status/types
 import ../../status/libstatus/settings
 import ../../status/libstatus/utils as status_utils
 import ../../status/ens as status_ens

src/app/wallet/core.nim

@@ -2,7 +2,7 @@ import NimQml, strformat, strutils, chronicles, sugar, sequtils
 
 import view
 import views/[asset_list, account_list, account_item]
-import ../../status/libstatus/types as status_types
+import ../../status/types as status_types
 import ../../status/signals/types
 import ../../status/[status, wallet, settings]
 import ../../status/wallet/account as WalletTypes

src/app/wallet/view.nim

@@ -10,7 +10,7 @@ import # status-desktop libs
   ../../status/wallet/collectibles as status_collectibles,
   ../../status/libstatus/accounts/constants,
   ../../status/libstatus/wallet as status_wallet,
-  ../../status/libstatus/tokens, ../../status/libstatus/types,
+  ../../status/libstatus/tokens, ../../status/types,
   ../../status/libstatus/utils as status_utils,
   ../../status/libstatus/eth/contracts, ../../status/ens as status_ens,
   views/[asset_list, account_list, account_item, token_list, transaction_list, collectibles_list],

src/nim_status_client.nim

@@ -10,7 +10,7 @@ import app/onboarding/core as onboarding
 import app/login/core as login
 import app/provider/core as provider
 import status/signals/core as signals
-import status/libstatus/types
+import status/types
 import status/libstatus/accounts/constants
 import status_go
 import status/status as statuslib

src/status/accounts.nim

@@ -2,7 +2,7 @@ import options, chronicles, json, json_serialization, sequtils, sugar
 import libstatus/accounts as status_accounts
 import libstatus/settings as status_settings
 import libstatus/accounts/constants
-import libstatus/types
+import types
 import libstatus/utils
 import ../eventemitter
 

src/status/chat.nim

@@ -3,7 +3,7 @@ import libstatus/chat as status_chat
 import libstatus/mailservers as status_mailservers
 import libstatus/chatCommands as status_chat_commands
 import libstatus/accounts/constants as constants
-import libstatus/types
+import types
 import libstatus/utils as status_utils
 import libstatus/contacts as status_contacts
 import stickers

src/status/chat/chat.nim

@@ -1,6 +1,6 @@
 import strformat, json, sequtils
 from message import Message
-import ../libstatus/types
+import ../types
 
 type ChatType* {.pure.}= enum
   Unknown = 0,

src/status/devices.nim

@@ -1,6 +1,6 @@
 import system
 import libstatus/settings
-import libstatus/types
+import types
 import libstatus/installations
 import profile/devices
 import json

src/status/ens.nim

@@ -6,7 +6,7 @@ import json_serialization
 import tables
 import strformat
 import libstatus/core
-import libstatus/types
+import types
 import libstatus/utils
 import libstatus/wallet
 import stew/byteutils

src/status/fleet.nim

@@ -1,5 +1,5 @@
 import json
-import libstatus/types
+import types
 
 type
   FleetModel* = ref object

src/status/libstatus/accounts.nim

@@ -3,7 +3,7 @@ import json, os, nimcrypto, uuids, json_serialization, chronicles, strutils
 from status_go import multiAccountGenerateAndDeriveAddresses, generateAlias, identicon, saveAccountAndLogin, login, openAccounts
 import core
 import utils as utils
-import types as types
+import ../types as types
 import accounts/constants
 import ../signals/types as signal_types
 import ../wallet/account

src/status/libstatus/browser.nim

@@ -1,4 +1,4 @@
-import core, types, json, chronicles
+import core, ../types, json, chronicles
 
 proc storeBookmark*(url: string, name: string): Bookmark =
   let payload = %* [{"url": url, "name": name}]

src/status/libstatus/chat.nim

@@ -2,7 +2,7 @@ import json, times, strutils, sequtils, chronicles, json_serialization, algorith
 import core, utils
 import ../chat/[chat, message]
 import ../signals/messages
-import ./types
+import ../types
 import ./settings as status_settings
 
 proc buildFilter*(chat: Chat):JsonNode =

src/status/libstatus/contacts.nim

@@ -1,5 +1,5 @@
 import json, strmisc, atomics
-import core, utils, types, settings
+import core, utils, ../types, settings
 from ../profile/profile import Profile
 
 var

src/status/libstatus/edn_helpers.nim

@@ -1,6 +1,6 @@
 import typetraits
 import edn, chronicles
-import ./types # FIXME: there should be no type deps
+import ../types # FIXME: there should be no type deps
 
 # forward declaration:
 proc parseNode[T](node: EdnNode, searchName: string): T

src/status/libstatus/eth/contracts.nim

@@ -5,7 +5,7 @@ import
   web3/ethtypes, stew/byteutils, nimcrypto, json_serialization, chronicles
 
 import
-  ../types, ../settings, ../coder, transactions, methods, ../utils
+  ../../types, ../settings, ../coder, transactions, methods, ../utils
 
 export
   GetPackData, PackData, BuyToken, ApproveAndCall, Transfer, BalanceOf, Register, SetPubkey,

src/status/libstatus/eth/eth.nim

@@ -2,7 +2,7 @@ import
   web3/ethtypes
 
 import
-  transactions, ../types
+  transactions, ../../types
 
 proc sendTransaction*(tx: var EthSend, password: string, success: var bool): string =
   success = true

src/status/libstatus/eth/methods.nim

@@ -5,7 +5,7 @@ import
   nimcrypto, web3/[encoding, ethtypes]
 
 import 
-  ../coder, eth, transactions, ../types # FIXME: 'types' produces a compiler warning, but doesn't compiler without it 🤷‍♂️
+  ../coder, eth, transactions, ../../types # FIXME: 'types' produces a compiler warning, but doesn't compiler without it 🤷‍♂️
 
 export sendTransaction
 

src/status/libstatus/eth/transactions.nim

@@ -5,7 +5,7 @@ import
   json_serialization, chronicles, web3/ethtypes
 
 import
-  ../core, ../types, ../conversions
+  ../core, ../../types, ../conversions
 
 proc estimateGas*(tx: EthSend): RpcResponse =
   let response = core.callPrivateRPC("eth_estimateGas", %*[%tx])

src/status/libstatus/settings.nim

@@ -5,7 +5,7 @@ import
   json_serialization, chronicles, uuids
 
 import
-  ./core, ./types, ../signals/types as statusgo_types, ./accounts/constants,
+  ./core, ../types, ../signals/types as statusgo_types, ./accounts/constants,
   ./utils
 
 var

src/status/libstatus/stickers.nim

@@ -8,7 +8,7 @@ import # vendor libs
 from nimcrypto import fromHex
 
 import # status-desktop libs
-  ./core as status, ./types, ./eth/contracts, ./settings, ./edn_helpers
+  ./core as status, ../types, ./eth/contracts, ./settings, ./edn_helpers
 
 proc decodeContentHash*(value: string): string =
   if value == "":

src/status/libstatus/tokens.nim

@@ -6,7 +6,7 @@ import
 
 import 
   ./settings, ./core, ./wallet, ./eth/contracts
-from types import Setting, Network, RpcResponse, RpcException
+from ../types import Setting, Network, RpcResponse, RpcException
 from utils import parseAddress
 
 logScope:

src/status/libstatus/wallet.nim

@@ -1,12 +1,9 @@
-import # std libs
+import json, json, options, json_serialization, stint, chronicles
-  json, times, options, strutils, strformat
+import core, ../types, utils, strutils, strformat
-
+import utils
-import # vendor libs
+from status_go import validateMnemonic#, startWallet
-  json_serialization, stint, chronicles, web3/ethtypes
+import ../wallet/account
-from status_go import validateMnemonic
+import web3/ethtypes
-
-import # status-desktop libs
-  ../wallet/account, ./types, ./conversions, ./core, ./types, ./utils
 
 proc getWalletAccounts*(): seq[WalletAccount] =
   try:

src/status/mailservers.nim

@@ -8,7 +8,7 @@ import ../eventemitter
 import signals/types
 
 #TODO: temporary?
-import libstatus/types as LibStatusTypes
+import types as LibStatusTypes
 
 type
     MailserversModel* = ref object

src/status/network.nim

@@ -4,7 +4,7 @@ import libstatus/settings
 import json
 import uuids
 import json_serialization
-import libstatus/types
+import types
 
 logScope:
   topics = "network-model"

src/status/profile.nim

@@ -1,5 +1,5 @@
 import json
-import libstatus/types
+import types
 import profile/profile
 import libstatus/core as libstatus_core
 import libstatus/accounts as status_accounts

src/status/profile/profile.nim

@@ -1,5 +1,5 @@
 import json
-import ../libstatus/types
+import ../types
 
 type Profile* = ref object
   id*, alias*, username*, identicon*, address*, ensName*, localNickname*: string

src/status/settings.nim

@@ -8,7 +8,7 @@ import ../eventemitter
 import signals/types
 
 #TODO: temporary?
-import libstatus/types as LibStatusTypes
+import types as LibStatusTypes
 
 type
     SettingsModel* = ref object

src/status/signals/communities.nim

@@ -1,6 +1,6 @@
 import json, strutils, sequtils, sugar, chronicles
 import json_serialization
-import ../libstatus/types as status_types
+import ../types as status_types
 import ../chat/[chat]
 import types, messages
 

src/status/signals/core.nim

@@ -1,5 +1,5 @@
 import NimQml, tables, json, chronicles, strutils, json_serialization
-import ../libstatus/types as status_types
+import ../types as status_types
 import types, messages, discovery, whisperFilter, envelopes, expired, wallet, mailserver, communities
 import ../status
 import ../../eventemitter

src/status/signals/messages.nim

@@ -5,7 +5,7 @@ import ../libstatus/accounts as status_accounts
 import ../libstatus/accounts/constants as constants
 import ../libstatus/settings as status_settings
 import ../libstatus/tokens as status_tokens
-import ../libstatus/types as status_types
+import ../types as status_types
 import ../libstatus/eth/contracts as status_contracts
 import ../chat/[chat, message]
 import ../profile/[profile, devices]

src/status/signals/types.nim

@@ -1,5 +1,5 @@
 import json, chronicles, json_serialization, tables
-import ../libstatus/types
+import ../types
 import ../chat/[chat, message]
 import ../profile/[profile, devices]
 import ../../eventemitter

src/status/status.nim

@@ -1,7 +1,7 @@
 import libstatus/accounts as libstatus_accounts
 import libstatus/core as libstatus_core
 import libstatus/settings as libstatus_settings
-import libstatus/types as libstatus_types
+import types as libstatus_types
 import chat, accounts, wallet, node, network, messages, contacts, profile, stickers, permissions, fleet, settings, mailservers
 import ../eventemitter
 import ./tasks/task_runner_impl

src/status/stickers.nim

@@ -5,7 +5,7 @@ import # project deps
   chronicles, web3/[ethtypes, conversions], stint
 
 import # local deps
-  libstatus/types, libstatus/eth/contracts as status_contracts,
+  types, libstatus/eth/contracts as status_contracts,
   libstatus/stickers as status_stickers, transactions,
   libstatus/wallet, ../eventemitter
 from libstatus/utils as libstatus_utils import eth2Wei, gwei2Wei, toUInt64, parseAddress

src/status/tasks/marathon/mailserver/model.nim

@@ -7,7 +7,7 @@ import
   ../../../libstatus/settings as status_settings,
   ../../../libstatus/mailservers as status_mailservers,
   ../../../libstatus/core as status_core, ../../../libstatus/chat as status_chat,
-  ../../../libstatus/types, ../../../fleet,
+  ../../../types, ../../../fleet,
   ./events as mailserver_events
 
 logScope:

src/status/transactions.nim

@@ -5,7 +5,7 @@ import
   stint, web3/ethtypes
 
 import
-  libstatus/types
+  types
 from libstatus/utils as status_utils import toUInt64, gwei2Wei, parseAddress
 
 proc buildTransaction*(source: Address, value: Uint256, gas = "", gasPrice = "", data = ""): EthSend =

src/status/types.nim

@@ -1,11 +1,7 @@
-import # std libs
+import json, options, typetraits, tables, sequtils
-  json, options, typetraits, tables, sequtils, strutils
+import web3/ethtypes, json_serialization, stint
-
+import libstatus/accounts/constants
-import # vendor libs
+import ../eventemitter
-  web3/ethtypes, json_serialization, stint
-
-import # status-desktop libs
-  accounts/constants, ../../eventemitter
 
 type SignalType* {.pure.} = enum
   Message = "messages.new"
@@ -270,3 +266,4 @@ proc getNodes*(self: FleetConfig, fleet: Fleet, nodeType: FleetNodes = FleetNode
 
 proc getMailservers*(self: FleetConfig, fleet: Fleet): Table[string, string] =
   result = self.fleet[$fleet][$FleetNodes.Mailservers]
+

src/status/wallet.nim

@@ -10,7 +10,7 @@ import libstatus/wallet as status_wallet
 import libstatus/accounts/constants as constants
 import libstatus/eth/[eth, contracts]
 from libstatus/core import getBlockByNumber
-from libstatus/types import PendingTransactionType, GeneratedAccount, DerivedAccount, Transaction, Setting, GasPricePrediction, `%`, StatusGoException, Network, RpcResponse, RpcException
+from types import PendingTransactionType, GeneratedAccount, DerivedAccount, Transaction, Setting, GasPricePrediction, `%`, StatusGoException, Network, RpcResponse, RpcException
 from libstatus/utils as libstatus_utils import eth2Wei, gwei2Wei, first, toUInt64, parseAddress
 import wallet/[balance_manager, account, collectibles]
 import transactions

src/status/wallet/account.nim

@@ -1,5 +1,5 @@
 from ../../eventemitter import Args
-import ../libstatus/types
+import ../types
 import options
 
 type CollectibleList* = ref object

src/status/wallet/balance_manager.nim

@@ -1,7 +1,7 @@
 import strformat, strutils, stint, httpclient, json, chronicles, net
 import ../libstatus/wallet as status_wallet
 import ../libstatus/tokens as status_tokens
-import ../libstatus/types as status_types
+import ../types as status_types
 import ../utils/cache
 import account
 import options

src/status/wallet/collectibles.nim

@@ -7,7 +7,7 @@ import # vendor libs
 
 import # status-desktop libs
   ../libstatus/core as status, ../libstatus/eth/contracts as contracts,
-  ../libstatus/stickers as status_stickers, ../libstatus/types,
+  ../libstatus/stickers as status_stickers, ../types,
   web3/[conversions, ethtypes], ../libstatus/utils, account
 
 const CRYPTOKITTY* = "cryptokitty"

vendor/status-go

@@ -1 +1 @@
-Subproject commit 43fa2edc1e6e0afa65724d47a95d47cd28c21d85
+Subproject commit 10becb490228d416ff361bdb8a965537b4803af5