Skip to content
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
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
35 changes: 9 additions & 26 deletions src/python_bindings.rs
Original file line number Diff line number Diff line change
Expand Up @@ -326,11 +326,6 @@ impl PyKeypair {
self.inner.ss58_format()
}

#[getter]
fn seed_hex(&self) -> Option<Vec<u8>> {
self.inner.seed_hex()
}

#[getter]
fn crypto_type(&self) -> u8 {
self.inner.crypto_type()
Expand All @@ -340,18 +335,6 @@ impl PyKeypair {
fn set_crypto_type(&mut self, crypto_type: u8) {
self.inner.set_crypto_type(crypto_type)
}

#[getter]
fn mnemonic(&self) -> Option<String> {
self.inner.mnemonic()
}

#[getter]
fn private_key(&self) -> PyResult<Option<Vec<u8>>> {
self.inner
.private_key()
.map_err(|e| PyErr::new::<PyValueError, _>(e))
}
}

// Error type bindings
Expand Down Expand Up @@ -1204,10 +1187,10 @@ except argparse.ArgumentError:
mnemonic=None,
seed=None,
json=None,
use_password=None,
overwrite=None,
suppress=None,
save_coldkey_to_env=None,
use_password=true,
overwrite=false,
suppress=false,
save_coldkey_to_env=false,
coldkey_password=None
))]
fn regenerate_coldkey(
Expand All @@ -1227,7 +1210,7 @@ except argparse.ArgumentError:
mnemonic,
seed,
json,
use_password.unwrap_or(false),
use_password.unwrap_or(true),
overwrite.unwrap_or(false),
suppress.unwrap_or(false),
save_coldkey_to_env.unwrap_or(false),
Expand Down Expand Up @@ -1262,10 +1245,10 @@ except argparse.ArgumentError:
mnemonic=None,
seed=None,
json=None,
use_password=None,
overwrite=None,
suppress=None,
save_hotkey_to_env=None,
use_password=true,
overwrite=false,
suppress=false,
save_hotkey_to_env=false,
hotkey_password=None
))]
fn regenerate_hotkey(
Expand Down
4 changes: 2 additions & 2 deletions src/wallet.rs
Original file line number Diff line number Diff line change
Expand Up @@ -719,7 +719,7 @@ impl Wallet {
keypair
} else if let Some(seed) = seed {
// seed
Keypair::create_from_seed(seed.as_bytes().to_vec())
Keypair::create_from_seed(hex::decode(seed).unwrap())
.map_err(|e| KeyFileError::Generic(e.to_string()))?
} else if let Some((json_data, passphrase)) = json {
// json_data + passphrase
Expand Down Expand Up @@ -764,7 +764,7 @@ impl Wallet {
keypair
} else if let Some(seed) = seed {
// seed
Keypair::create_from_seed(seed.as_bytes().to_vec())
Keypair::create_from_seed(hex::decode(seed).unwrap())
.map_err(|e| KeyFileError::Generic(e.to_string()))?
} else if let Some((json_data, passphrase)) = json {
// json_data + passphrase
Expand Down