feat: introduced wallet extended public key to functions adding key pairs

src/app/modules/onboarding/controller.nim

@@ -216,11 +216,12 @@ proc deleteMultiaccount*(self: Controller, keyUid: string): string =
   return self.accountsService.deleteMultiaccount(keyUid)
 
 proc restoreKeycardAccountAndLogin*(self: Controller, keyUid, instanceUid: string,
-  keycardKeys: KeycardExportedKeysDto, thirdpartyServicesEnabled: bool): string =
+  keycardKeys: KeycardExportedKeysDto, walletXPub: string, thirdpartyServicesEnabled: bool): string =
   return self.accountsService.restoreKeycardAccountAndLoginV2(
     keyUid,
     instanceUid,
     keycardKeys,
+    walletXPub,
     thirdpartyServicesEnabled,
   )
 

src/app/modules/onboarding/module.nim

@@ -105,11 +105,11 @@ method onMainFailedToLoad*[T](self: Module[T]) =
 method load*[T](self: Module[T]) =
   singletonInstance.engine.setRootContextProperty("onboardingModule", self.viewVariant)
   self.controller.init()
-  
+
   let loggedInAccount = self.accountsService.fetchLoggedInAccount()
   self.resumeLogin = loggedInAccount.isValid()
   if (self.resumeLogin):
-    self.controller.setLoggedInAccount(loggedInAccount)    
+    self.controller.setLoggedInAccount(loggedInAccount)
     self.finishAppLoading2()
     return
 
@@ -247,6 +247,7 @@ method finishOnboardingFlow*[T](self: Module[T], flowInt: int, dataJson: string)
           keycardInfo.keyUID,
           keycardInfo.instanceUID,
           self.exportedKeys,
+          walletXPub = "",
           thirdpartyServicesEnabled,
         )
       of OnboardingFlow.LoginWithLostKeycardSeedphrase:

src/app/modules/shared_modules/add_account/controller.nim

@@ -199,7 +199,7 @@ proc addNewSeedPhraseKeypair*(self: Controller, seedPhrase: string, doPasswordHa
     info "cannot create keystore file if provided password is empty", keypairName=keypairName
     return false
   let err = self.walletAccountService.addNewSeedPhraseKeypair(seedPhrase, password, doPasswordHashing, keypairName,
-    accountCreationDetails)
+    coldWallet = wallet_account_service.ColdWalletTypeNoNone, accountCreationDetails)
   if err.len > 0:
     info "adding new keypair from seed phrase failed", keypairName=keypairName
     return false

src/app/modules/shared_modules/keycard_management/controller.nim

@@ -127,8 +127,9 @@ proc getKeyUidForSeedPhrase*(self: Controller, seedPhrase: string): string =
 proc getKeypairByKeyUid*(self: Controller, keyUid: string): KeypairDto =
   return self.walletAccountService.getKeypairByKeyUid(keyUid)
 
-proc addNewKeycardStoredKeypair*(self: Controller, keyUid, keypairName, xpub, coldWallet: string, accounts: seq[wallet_account_service.WalletAccountDto]): string =
-  return self.walletAccountService.addNewKeycardStoredKeypairNew(keyUid, keypairName, xpub, coldWallet, rootWalletMasterKey="", accounts)
+proc addNewColdWalletStoredKeypair*(self: Controller, keyUid, keypairName, xpub, coldWallet: string, accounts: seq[wallet_account_service.WalletAccountDto]): string =
+  return self.walletAccountService.addNewColdWalletStoredKeypair(keyUid, keypairName, xpub, coldWallet,
+    rootWalletMasterKey = "", accounts)
 
 proc addKeycardOrAccounts*(self: Controller, keyPair: KeycardDto, password: string) =
   self.walletAccountService.addKeycardOrAccountsAsync(keyPair, password)

src/app/modules/shared_modules/keycard_management/module.nim

@@ -297,7 +297,7 @@ proc addNewKeycardKeypair*[T](self: Module[T]): string =
       colorId: account.colorId,
       emoji: account.emoji,
     ))
-  return self.controller.addNewKeycardStoredKeypair(self.tmpKeyUid, self.tmpKeypairName, self.tmpXpub,
+  return self.controller.addNewColdWalletStoredKeypair(self.tmpKeyUid, self.tmpKeypairName, self.tmpXpub,
     wallet_account_service.ColdWalletTypeStatusKeycard, walletAccounts)
 
 ## #########################################################

src/app/modules/shared_modules/keycard_popup/controller.nim

@@ -740,11 +740,12 @@ proc updateKeycardUid*(self: Controller, keyUid: string, keycardUid: string) =
       self.tmpKeycardUid = keycardUid
       info "update keycard uid failed", oldKeycardUid=self.tmpKeycardUid, newKeycardUid=keycardUid
 
-proc addNewKeycardStoredKeypair*(self: Controller, keyUid, keypairName, rootWalletMasterKey: string,
-  accounts: seq[WalletAccountDto]): bool =
-  let err = self.walletAccountService.addNewKeycardStoredKeypair(keyUid, keypairName, rootWalletMasterKey, accounts)
+proc addNewColdWalletStoredKeypair*(self: Controller, keyUid, keypairName, walletXPub, coldWallet,
+  rootWalletMasterKey: string, accounts: seq[WalletAccountDto]): bool =
+  let err = self.walletAccountService.addNewColdWalletStoredKeypair(keyUid, keypairName, walletXPub, coldWallet,
+    rootWalletMasterKey, accounts)
   if err.len > 0:
-    info "adding new keypair from keycard failed", keypairName=keypairName, keyUid=keyUid
+    info "adding new keypair to cold wallet failed", keypairName=keypairName, keyUid=keyUid
     return false
   return true
 

src/app/modules/shared_modules/keycard_popup/internal/creating_account_new_seed_phrase_state.nim

@@ -55,9 +55,11 @@ proc addAccountsToWallet(self: CreatingAccountNewSeedPhraseState, controller: Co
       colorId: account.getColorId(),
       emoji: account.getEmoji()
     ))
-  return controller.addNewKeycardStoredKeypair(
+  return controller.addNewColdWalletStoredKeypair(
     keyUid = kpForProcessing.getKeyUid(),
     keypairName = kpForProcessing.getName(),
+    walletXPub = "",
+    coldWallet = ColdWalletTypeStatusKeycard,
     rootWalletMasterKey = kpForProcessing.getDerivedFrom(),
     accounts = walletAccounts
   )

src/app/modules/shared_modules/keycard_popup/internal/creating_account_old_seed_phrase_state.nim

@@ -55,9 +55,11 @@ proc addAccountsToWallet(self: CreatingAccountOldSeedPhraseState, controller: Co
       colorId: account.getColorId(),
       emoji: account.getEmoji()
     ))
-  return controller.addNewKeycardStoredKeypair(
+  return controller.addNewColdWalletStoredKeypair(
     keyUid = kpForProcessing.getKeyUid(),
     keypairName = kpForProcessing.getName(),
+    walletXPub = "",
+    coldWallet = ColdWalletTypeStatusKeycard,
     rootWalletMasterKey = kpForProcessing.getDerivedFrom(),
     accounts = walletAccounts
   )

src/app/modules/shared_modules/keycard_popup/internal/importing_from_keycard_state.nim

@@ -25,9 +25,11 @@ proc addAccountsToWallet(self: ImportingFromKeycardState, controller: Controller
       colorId: account.getColorId(),
       emoji: account.getEmoji()
     ))
-  return controller.addNewKeycardStoredKeypair(
+  return controller.addNewColdWalletStoredKeypair(
     keyUid = kpForProcessing.getKeyUid(),
     keypairName = kpForProcessing.getName(),
+    walletXPub = "",
+    coldWallet = ColdWalletTypeStatusKeycard,
     rootWalletMasterKey = kpForProcessing.getDerivedFrom(),
     accounts = walletAccounts
   )

src/app_service/service/accounts/dto/keycard_data.nim

@@ -12,6 +12,8 @@ type
     walletRootAddress*: string
     eip1581Address*: string
     encryptionPublicKey*: string
+    walletXPub*: string
+    coldWallet*: string
 
 proc toJson*(self: KeycardData): JsonNode =
   result = %*{
@@ -24,5 +26,7 @@ proc toJson*(self: KeycardData): JsonNode =
     "walletAddress": self.walletAddress,
     "walletRootAddress": self.walletRootAddress,
     "eip1581Address": self.eip1581Address,
-    "encryptionPublicKey": self.encryptionPublicKey
+    "encryptionPublicKey": self.encryptionPublicKey,
+    "walletXPub": self.walletXPub,
+    "coldWallet": self.coldWallet
   }

src/app_service/service/accounts/service.nim

@@ -9,6 +9,7 @@ import ./dto/restore_account_request
 
 from ../keycard/service import KeycardEvent, KeyDetails
 from ../keycardV2/dto import KeycardExportedKeysDto, KeyDetailsV2
+from ../wallet_account/dto/keypair_dto import ColdWalletTypeStatusKeycard
 import backend/general as status_general
 import backend/core as status_core
 import backend/privacy as status_privacy
@@ -270,6 +271,8 @@ QtObject:
       walletRootAddress: keycardData.walletRootKey.address,
       eip1581Address: keycardData.eip1581Key.address,
       encryptionPublicKey: keycardData.encryptionKey.publicKey,
+      walletXPub: "",
+      coldWallet: ColdWalletTypeStatusKeycard,
     )
 
     var request = RestoreAccountRequest(
@@ -284,6 +287,7 @@ QtObject:
     keyUid: string,
     instanceUid: string,
     keycardKeys: KeycardExportedKeysDto,
+    walletXPub: string,
     thirdpartyServicesEnabled: bool
     ): string =
 
@@ -298,6 +302,8 @@ QtObject:
       walletRootAddress: keycardKeys.walletRootKey.address,
       eip1581Address: keycardKeys.eip1581Key.address,
       encryptionPublicKey: keycardKeys.encryptionKey.publicKey,
+      walletXPub: walletXPub,
+      coldWallet: ColdWalletTypeStatusKeycard,
     )
 
     var request = RestoreAccountRequest(

src/app_service/service/wallet_account/service_account.nim

@@ -402,12 +402,13 @@ proc makePrivateKeyKeypairFullyOperable*(self: Service, keyUid, privateKey, pass
 
 ## Mandatory fields for all accounts are `path`, `name`, `emoji`, `colorId`
 proc addNewSeedPhraseKeypair*(self: Service, seedPhrase, password: string, doPasswordHashing: bool,
-  keypairName: string, accountCreationDetails: AccountCreationDetails): string =
+  keypairName, coldWallet: string, accountCreationDetails: AccountCreationDetails): string =
   var finalPassword = password
   if password.len > 0 and doPasswordHashing:
     finalPassword = utils.hashPassword(password)
   try:
-    var response = status_go_accounts.addKeypairViaSeedPhrase(seedPhrase, finalPassword, keypairName, accountCreationDetails)
+    var response = status_go_accounts.addKeypairViaSeedPhrase(seedPhrase, finalPassword, keypairName, coldWallet,
+      accountCreationDetails)
     if not response.error.isNil:
       error "status-go error adding keypair", procName="addNewSeedPhraseKeypair", errCode=response.error.code, errDesription=response.error.message
       return response.error.message
@@ -418,32 +419,20 @@ proc addNewSeedPhraseKeypair*(self: Service, seedPhrase, password: string, doPas
     error "error: ", procName="addNewSeedPhraseKeypair", errName=e.name, errDesription=e.msg
     return e.msg
 
-proc addNewKeycardStoredKeypair*(self: Service, keyUid, keypairName, rootWalletMasterKey: string, accounts: seq[WalletAccountDto]): string =
-  try:
-    var response = status_go_accounts.addKeypairStoredToKeycard(keyUid, rootWalletMasterKey, keypairName, accounts)
-    if not response.error.isNil:
-      error "status-go error adding keypair", procName="addNewKeycardStoredKeypair", errCode=response.error.code, errDesription=response.error.message
-      return response.error.message
-
-    for i in 0 ..< accounts.len:
-      self.addNewKeypairsAccountsToLocalStoreAndNotify()
-    return ""
-  except Exception as e:
-    error "error: ", procName="addNewKeycardStoredKeypair", errName=e.name, errDesription=e.msg
-    return e.msg
-
-proc addNewKeycardStoredKeypairNew*(self: Service, keyUid, keypairName, xpub, coldWallet, rootWalletMasterKey: string = "", accounts: seq[WalletAccountDto]): string =
+proc addNewColdWalletStoredKeypair*(self: Service, keyUid, keypairName, walletXPub, coldWallet, rootWalletMasterKey: string,
+  accounts: seq[WalletAccountDto]): string =
   try:
-    var response = status_go_accounts.addKeypairStoredToKeycardNew(keyUid, rootWalletMasterKey, keypairName, xpub, coldWallet, accounts)
+    var response = status_go_accounts.addKeypairStoredToColdWallet(keyUid, rootWalletMasterKey, keypairName, walletXPub,
+      coldWallet, accounts)
     if not response.error.isNil:
-      error "status-go error adding keypair", procName="addNewKeycardStoredKeypair", errCode=response.error.code, errDesription=response.error.message
+      error "status-go error adding keypair", procName="addNewColdWalletStoredKeypair", errCode=response.error.code, errDesription=response.error.message
       return response.error.message
 
     for i in 0 ..< accounts.len:
       self.addNewKeypairsAccountsToLocalStoreAndNotify()
     return ""
   except Exception as e:
-    error "error: ", procName="addNewKeycardStoredKeypair", errName=e.name, errDesription=e.msg
+    error "error: ", procName="addNewColdWalletStoredKeypair", errName=e.name, errDesription=e.msg
     return e.msg
 
 proc makeSeedPhraseKeypairFullyOperable*(self: Service, keyUid, mnemonic, password: string, doPasswordHashing: bool): string =

src/backend/accounts.nim

@@ -69,11 +69,13 @@ proc addKeypairViaPrivateKey*(privateKey, password, name: string, accountCreatio
   let payload = %* [privateKey, password, name, accountCreationDetails]
   return core.callPrivateRPC("accounts_addKeypairViaPrivateKey", payload)
 
-proc addKeypairViaSeedPhrase*(seedPhrase, password, name: string, accountCreationDetails: AccountCreationDetails): RpcResponse[JsonNode] =
-  let payload = %* [seedPhrase, password, name, accountCreationDetails]
+proc addKeypairViaSeedPhrase*(seedPhrase, password, name, coldWallet: string,
+  accountCreationDetails: AccountCreationDetails): RpcResponse[JsonNode] =
+  let payload = %* [seedPhrase, password, name, coldWallet, accountCreationDetails]
   return core.callPrivateRPC("accounts_addKeypairViaSeedPhrase", payload)
 
-proc addKeypairStoredToKeycard*(keyUID, masterAddress, name: string, walletAccounts: seq[WalletAccountDto]): RpcResponse[JsonNode] =
+proc addKeypairStoredToColdWallet*(keyUID, masterAddress, name, walletXPub, coldWallet: string,
+  walletAccounts: seq[WalletAccountDto]): RpcResponse[JsonNode] =
   var accountsJson: JsonNode = %* []
   for acc in walletAccounts:
     accountsJson.add(%*{
@@ -92,30 +94,8 @@ proc addKeypairStoredToKeycard*(keyUID, masterAddress, name: string, walletAccou
       }
     )
 
-  let payload = %* [keyUID, masterAddress, name, accountsJson]
-  return core.callPrivateRPC("accounts_addKeypairStoredToKeycard", payload)
-
-proc addKeypairStoredToKeycardNew*(keyUID, masterAddress, name, xpub, coldWallet: string, walletAccounts: seq[WalletAccountDto]): RpcResponse[JsonNode] =
-  var accountsJson: JsonNode = %* []
-  for acc in walletAccounts:
-    accountsJson.add(%*{
-        "address": acc.address,
-        "key-uid": acc.keyUID,
-        "wallet": acc.isWallet,
-        "chat": acc.isChat,
-        "type": acc.walletType,
-        "path": acc.path,
-        "public-key": acc.publicKey,
-        "name": acc.name,
-        "emoji": acc.emoji,
-        "colorId": acc.colorId,
-        "hidden": acc.hideFromTotalBalance
-        # other fields are set on the status-go side
-      }
-    )
-
-  let payload = %* [keyUID, masterAddress, name, xpub, coldWallet, accountsJson]
-  return core.callPrivateRPC("accounts_addKeypairStoredToKeycardNew", payload)
+  let payload = %* [keyUID, masterAddress, name, walletXPub, coldWallet, accountsJson]
+  return core.callPrivateRPC("accounts_addKeypairStoredToColdWallet", payload)
 
 ## Adds a new account without creating a Keystore file and notifies paired devices
 proc addAccountWithoutKeystoreFileCreation*(name, address, path, publicKey, keyUid, accountType, colorId, emoji: string, hideFromTotalBalance: bool):