remove most references to libstatus wallet

src/app/chat/views/stickers.nim

@@ -5,10 +5,8 @@ import # vendor libs
   chronicles, NimQml
 
 import # status-desktop libs
-  ../../../status/[status, stickers], ../../../status/libstatus/[types, utils],
+  ../../../status/[status, stickers, wallet], ../../../status/libstatus/[types, utils],
-  ../../../status/libstatus/stickers as status_stickers,
+  ../../../status/libstatus/stickers as status_stickers, sticker_pack_list, sticker_list, chat_item, ../../../status/tasks/[qt, task_runner_impl]
-  ../../../status/libstatus/wallet as status_wallet, sticker_pack_list,
-  sticker_list, chat_item, ../../../status/tasks/[qt, task_runner_impl]
 
 logScope:
   topics = "stickers-view"
@@ -143,7 +141,7 @@ QtObject:
 
   proc setAvailableStickerPacks*(self: StickersView, availableStickersJSON: string) {.slot.} =
     let
-      accounts = status_wallet.getWalletAccounts() # TODO: make generic
+      accounts = self.status.wallet.getWalletAccounts() # TODO: make generic
       installedStickerPacks = self.status.stickers.getInstalledStickerPacks()
     var
       purchasedStickerPacks: seq[int]
@@ -152,7 +150,7 @@ QtObject:
       purchasedStickerPacks = self.status.stickers.getPurchasedStickerPacks(address)
     let availableStickers = JSON.decode($availableStickersJSON, seq[StickerPack])
 
-    let pendingTransactions = status_wallet.getPendingTransactions()
+    let pendingTransactions = self.status.wallet.getPendingTransactions()
     var pendingStickerPacks = initHashSet[int]()
     if (pendingTransactions != ""):
       for trx in pendingTransactions.parseJson{"result"}.getElems():

src/app/profile/views/ens_manager.nim

@@ -8,7 +8,7 @@ import ../../../status/ens as status_ens
 import ../../../status/libstatus/wallet as status_wallet
 import ../../../status/libstatus/settings as status_settings
 import ../../../status/libstatus/utils as libstatus_utils
-import ../../../status/[status, settings]
+import ../../../status/[status, settings, wallet]
 import ../../../status/wallet
 import sets
 import web3/ethtypes
@@ -108,7 +108,7 @@ QtObject:
     self.usernames = getSetting[seq[string]](self.status.settings, Setting.Usernames, @[])
     
     # Get pending ens names
-    let pendingTransactions = status_wallet.getPendingTransactions()
+    let pendingTransactions = self.status.wallet.getPendingTransactions()
     if (pendingTransactions == ""):
       return
     for trx in pendingTransactions.parseJson{"result"}.getElems():

src/app/utilsView/view.nim

@@ -1,13 +1,12 @@
 import NimQml, os, strformat, strutils, parseUtils, chronicles
 import stint
-import ../../status/status
+import ../../status/[status, wallet]
 import ../../status/accounts as status_accounts
 import ../../status/stickers
 import ../../status/libstatus/accounts/constants as accountConstants
 import ../../status/libstatus/tokens
 import ../../status/libstatus/types
 import ../../status/libstatus/settings
-import ../../status/libstatus/wallet as status_wallet
 import ../../status/libstatus/utils as status_utils
 import ../../status/ens as status_ens
 import ../utils/image_utils
@@ -49,7 +48,7 @@ QtObject:
     result = getSNTAddress()
 
   proc getSNTBalance*(self: UtilsView): string {.slot.} =
-    let currAcct = status_wallet.getWalletAccounts()[0]
+    let currAcct = self.status.wallet.getWalletAccounts()[0]
     result = getSNTBalance($currAcct.address)
 
   proc eth2Wei*(self: UtilsView, eth: string, decimals: int): string {.slot.} =

src/app/wallet/core.nim

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

src/app/wallet/view.nim

@@ -554,7 +554,7 @@ QtObject:
     var addresses:seq[string] = @[]
     for acc in self.status.wallet.accounts:
       addresses.add(acc.address)
-    discard status_wallet.checkRecentHistory(addresses)
+    discard self.status.wallet.checkRecentHistory(addresses)
 
   proc transactionWatchResultReceived(self: WalletView, watchResult: string) {.slot.} =
     let wTxRes = watchResult.parseJSON()["result"].getStr().parseJson(){"result"}
@@ -675,7 +675,7 @@ QtObject:
     read = defaultGasLimit
 
   proc getDefaultAddress*(self: WalletView): string {.slot.} =
-    result = $status_wallet.getWalletAccounts()[0].address
+    result = $self.status.wallet.getWalletAccounts()[0].address
 
   proc getDefaultTokenList(self: WalletView): QVariant {.slot.} =
     self.defaultTokenList.loadDefaultTokens()
@@ -816,4 +816,4 @@ QtObject:
     notify = dappBrowserAccountChanged
 
   proc setInitialRange*(self: WalletView) {.slot.} = 
-    discard status_wallet.setInitialBlocksRange()
+    discard self.status.wallet.setInitialBlocksRange()

src/status/wallet.nim

@@ -359,3 +359,18 @@ proc getGasPricePredictions*(): GasPricePrediction =
   except Exception as e:
     echo "error getting gas price predictions"
     echo e.msg
+
+proc checkRecentHistory*(self: WalletModel, addresses: seq[string]): string =
+  result = status_wallet.checkRecentHistory(addresses)
+
+proc setInitialBlocksRange*(self: WalletModel): string =
+  result = status_wallet.setInitialBlocksRange()
+
+proc getWalletAccounts*(self: WalletModel): seq[WalletAccount] =
+  result = status_wallet.getWalletAccounts()
+
+proc watchTransaction*(self: WalletModel, transactionHash: string): string =
+  result = status_wallet.watchTransaction(transactionHash)
+
+proc getPendingTransactions*(self: WalletModel): string =
+  result = status_wallet.getPendingTransactions()