Skip to content

Commit

Permalink
KDX -> Karlsen Desktop
Browse files Browse the repository at this point in the history
  • Loading branch information
Leon1777 committed Aug 28, 2024
1 parent 6c31c99 commit 87f0576
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 13 deletions.
12 changes: 6 additions & 6 deletions cli/src/modules/account.rs
Original file line number Diff line number Diff line change
Expand Up @@ -80,14 +80,14 @@ impl Account {
tprintln!(ctx, "");
ctx.term().help(
&[
("account import legacy-data", "Import KDX keydata file or karlsen-network web wallet data on the same domain"),
("account import legacy-data", "Import Karlsen-Desktop keydata file or Web Wallet data on the same domain"),
(
"account import mnemonic bip32",
"Import Bip32 (12 or 24 word mnemonics used by karlsenwallet, kaspium, onekey, tangem etc.)",
"Import Bip32 (12 or 24 word mnemonics used by karlsenwallet or karlsen-mobile)",
),
(
"account import mnemonic legacy",
"Import accounts 12 word mnemonic used by legacy applications (KDX and karlsen-network web wallet)",
"Import accounts 12 word mnemonic used by legacy applications (Karlsen-Desktop and Web Wallet)",
),
(
"account import mnemonic multisig [additional keys]",
Expand Down Expand Up @@ -160,7 +160,7 @@ impl Account {
} else if application_runtime::is_web() {
return Err("'karlsen-network' web wallet storage not found at this domain name".into());
} else {
return Err("KDX keydata file not found".into());
return Err("Karlsen-Desktop keydata file not found".into());
}
}
"mnemonic" => {
Expand All @@ -170,7 +170,7 @@ impl Account {
"usage: 'account import mnemonic <bip32|legacy|multisig>'"
);
tprintln!(ctx, "please specify the mnemonic type");
tprintln!(ctx, "please use 'legacy' for 12-word KDX and karlsen-network web wallet mnemonics\r\n");
tprintln!(ctx, "please use 'legacy' for 12-word Karlsen-Desktop and Web Wallet mnemonics\r\n");
return Ok(());
}

Expand Down Expand Up @@ -251,7 +251,7 @@ impl Account {
(
"import <import-type> [<key-type> [extra keys]]",
"Import accounts from a private key using 24 or 12 word mnemonic or legacy data \
(KDX and karlsen-network web wallet). Use 'account import' for additional help.",
(Karlsen-Desktop and Web Wallet). Use 'account import' for additional help.",
),
("name <name>", "Name or rename the selected account (use 'remove' to remove the name"),
("scan [<derivations>] or scan [<start>] [<derivations>]", "Scan extended address derivation chain (legacy accounts)"),
Expand Down
4 changes: 2 additions & 2 deletions cli/src/modules/import.rs
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ impl Import {
} else if application_runtime::is_web() {
return Err("'karlsen-network' web wallet storage not found at this domain name".into());
} else {
return Err("KDX/karlsen-network keydata file not found".into());
return Err("Karlsen-Desktop/karlsen-network keydata file not found".into());
}
}
// todo "read-only" => {}
Expand All @@ -61,7 +61,7 @@ impl Import {
"mnemonic [<type>] [<additional xpub keys>] ",
"Import a 24 or 12 word mnemonic (types: 'bip32' (default), 'legacy', 'multisig'), ",
),
("legacy", "Import a legacy (local KDX) wallet"),
("legacy", "Import a legacy (local Karlsen-Desktop) wallet"),
// ("purge", "Purge an account from the wallet"),
],
None,
Expand Down
2 changes: 1 addition & 1 deletion cli/src/modules/wallet.rs
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ impl Wallet {
(
"import [<name>]",
"Create a wallet from an existing mnemonic (bip32 only). \r\n\r\n\
To import legacy wallets (KDX or karlsen-network) please create \
To import legacy wallets (Karlsen-Desktop or Web Wallet) please create \
a new bip32 wallet and use the 'account import' command. \
Legacy wallets can only be imported as accounts. \
\r\n",
Expand Down
4 changes: 2 additions & 2 deletions wallet/core/src/account/variants/legacy.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//!
//! Legacy (KDX, karlsen-network.io Web Wallet) account implementation
//! Legacy (Karlsen-Desktop, wallet.karlsencoin.com Web Wallet) account implementation
//!
use crate::account::{AsLegacyAccount, Inner};
Expand All @@ -20,7 +20,7 @@ impl Factory for Ctor {
}

fn description(&self) -> String {
"Karlsen Legacy Account (KDX, karlsen-network.io Web Wallet)".to_string()
"Karlsen Legacy Account (Karlsen-Desktop, wallet.karlsencoin.com Web Wallet)".to_string()
}

async fn try_load(
Expand Down
2 changes: 1 addition & 1 deletion wallet/core/src/api/traits.rs
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ pub trait WalletApi: Send + Sync + AnySync {
///
/// If `legacy_accounts` is true, the wallet will enable legacy account compatibility mode
/// allowing the wallet to operate on legacy accounts. Legacy accounts were created by
/// applications such as KDX and karlsen-network.io web wallet using a deprecated derivation path
/// applications such as Karlsen-Desktop and wallet.karlsencoin.com web wallet using a deprecated derivation path
/// and are considered deprecated. Legacy accounts should not be used in 3rd-party applications.
///
/// See [`wallet_open`](Self::wallet_open) for a convenience wrapper around this call.
Expand Down
2 changes: 1 addition & 1 deletion wallet/core/src/compat/gen0.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//!
//! v0 (KDX-style) account data decryption
//! v0 (Karlsen-Desktop-style) account data decryption
//!
use crate::error::Error;
Expand Down

0 comments on commit 87f0576

Please sign in to comment.