Skip to content

fix: Fix derivation path #2672

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lwshang merged 4 commits into from
Oct 10, 2022
Merged

fix: Fix derivation path #2672

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
46c9096
Fix derivation path
adamspofford-dfinity Oct 10, 2022
5afa18e
Update known seed for test
adamspofford-dfinity Oct 10, 2022
4117326
Merge branch 'master' into spofford/fix-derivation-path
lwshang Oct 10, 2022
7aac66d
Merge branch 'master' into spofford/fix-derivation-path
mergify[bot] Oct 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions e2e/tests-dfx/identity_command.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,8 +465,8 @@ XXX
}

@test "identity: consistently imports a known seed phrase" {
echo "hollow damage this yard journey anchor tool fat action school cash ridge oval beef tribe magnet apology cabbage leisure group sign around object exact">seed.txt
echo "display dawn estate night naive stomach receive lock expose boring square boy deposit mistake volume soldier coil rocket match diamond repair opinion action paddle">seed.txt
assert_command dfx identity import alice --seed-file seed.txt --disable-encryption
assert_command dfx identity get-principal --identity alice
assert_eq "zs7ty-uv4vo-rvgkk-srfjo-hjaxr-w55wx-ybo5x-qx7k3-noknf-wzwe5-pqe"
assert_eq "qimd7-lqrvx-kdvsm-7zeqn-bgoix-ukjfi-hgmfg-ur2he-odgb2-joms4-nae"
}
2 changes: 1 addition & 1 deletion src/dfx/src/lib/identity/identity_manager.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -580,7 +580,7 @@ pub(super) fn generate_key() -> DfxResult<(Vec<u8>, Mnemonic)> {
}

pub fn mnemonic_to_key(mnemonic: &Mnemonic) -> DfxResult<SecretKey> {
const DEFAULT_DERIVATION_PATH: &str = "m/44'/60'/0'/0/0";
const DEFAULT_DERIVATION_PATH: &str = "m/44'/223'/0'/0/0";
let seed = Seed::new(mnemonic, "");
let pk = XPrv::derive_from_path(seed.as_bytes(), &DEFAULT_DERIVATION_PATH.parse()?)?;
Ok(SecretKey::from(pk.private_key()))
Expand Down