-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Libwallet: Vault exports Signers instead RootAccount (#47)
* feat: Vault exporting signer instead of root account * feat: Add AccountSigner struct for managing public/private key pairs in memory vault * refactor: Update type definition in account_generation.rs and key_pair.rs to use Generic type for Simple vault. Update Vault implementation in simple.rs to use Generic type for Simple vault * fix: fix type Id for vault os * chore: update cargo.toml * feat(account): Add methods to handle default accounts and update method names in examples
- Loading branch information
Showing
12 changed files
with
452 additions
and
382 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,103 +1,9 @@ | ||
| use core::fmt::{Debug, Display}; | ||
|
|
||
| use crate::{ | ||
| any::{self, AnySignature}, | ||
| Derive, Network, Pair, Public, RootAccount, | ||
| Public, Signer, | ||
| }; | ||
| use arrayvec::ArrayString; | ||
| // use regex::Regex; | ||
| // use sp_core::crypto::DeriveJunction; | ||
|
|
||
| const MAX_PATH_LEN: usize = 16; | ||
|
|
||
| /// Account is an abstration around public/private key pairs that are more convenient to use and | ||
| /// can hold extra metadata. Accounts are constructed by the wallet and are used to sign messages. | ||
| #[derive(Debug)] | ||
| pub struct Account { | ||
| pair: Option<any::Pair>, | ||
| network: Network, | ||
| path: ArrayString<MAX_PATH_LEN>, | ||
| name: ArrayString<{ MAX_PATH_LEN - 2 }>, | ||
| } | ||
|
|
||
| impl Account { | ||
| pub(crate) fn new<'a>(name: impl Into<Option<&'a str>>) -> Self { | ||
| let n = name.into().unwrap_or_else(|| "default"); | ||
| let mut path = ArrayString::from("//").unwrap(); | ||
| path.push_str(&n); | ||
| Account { | ||
| pair: None, | ||
| network: Network::default(), | ||
| name: ArrayString::from(&n).expect("short name"), | ||
| path, | ||
| } | ||
| } | ||
|
|
||
| pub fn switch_network(self, net: impl Into<Network>) -> Self { | ||
| Account { | ||
| network: net.into(), | ||
| ..self | ||
| } | ||
| } | ||
|
|
||
| pub fn name(&self) -> &str { | ||
| &self.name | ||
| } | ||
|
|
||
| pub fn public(&self) -> impl Public { | ||
| self.pair.as_ref().expect("account unlocked").public() | ||
| } | ||
|
|
||
| pub fn network(&self) -> &Network { | ||
| &self.network | ||
| } | ||
|
|
||
| pub fn is_locked(&self) -> bool { | ||
| self.pair.is_none() | ||
| } | ||
|
|
||
| pub(crate) fn unlock(&mut self, root: &RootAccount) -> &Self { | ||
| if self.is_locked() { | ||
| self.pair = Some(root.derive(&self.path)); | ||
| } | ||
| self | ||
| } | ||
| } | ||
|
|
||
| impl crate::Signer for Account { | ||
| type Signature = AnySignature; | ||
|
|
||
| fn sign_msg<M: AsRef<[u8]>>(&self, msg: M) -> Self::Signature { | ||
| self.pair.as_ref().expect("account unlocked").sign_msg(msg) | ||
| } | ||
|
|
||
| fn verify<M: AsRef<[u8]>>(&self, msg: M, sig: &[u8]) -> bool { | ||
| self.pair | ||
| .as_ref() | ||
| .expect("account unlocked") | ||
| .verify(msg, sig) | ||
| } | ||
| } | ||
|
|
||
| #[cfg(feature = "serde")] | ||
| impl serde::Serialize for Account { | ||
| fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error> | ||
| where | ||
| S: serde::Serializer, | ||
| { | ||
| use serde::ser::SerializeStruct; | ||
|
|
||
| let mut state = serializer.serialize_struct("Account", 1)?; | ||
| state.serialize_field("network", &self.network)?; | ||
| state.serialize_field("path", self.path.as_str())?; | ||
| state.serialize_field("name", self.name.as_str())?; | ||
| state.end() | ||
| } | ||
| } | ||
|
|
||
| impl core::fmt::Display for Account { | ||
| fn fmt(&self, f: &mut core::fmt::Formatter) -> core::fmt::Result { | ||
| for byte in self.public().as_ref() { | ||
| write!(f, "{:02x}", byte)?; | ||
| } | ||
| Ok(()) | ||
| } | ||
| pub trait Account: Signer + Display { | ||
| fn public(&self) -> impl Public; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.