forked from MystenLabs/sui
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[fastx] Replace KeyPair With Signer & Load Keys From File (MystenLabs…
…#590) * Replace KeyPair With Signer & Load Keys From File * Fixup after rebase * Add license header * impl TryFrom<Vec<u8>> instead of From<Vec<u8>> for SuiAddress
- Loading branch information
1 parent
f53fbe9
commit 0da6369
Showing
10 changed files
with
171 additions
and
65 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,104 @@ | ||
| // Copyright (c) 2022, Mysten Labs, Inc. | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
|
|
||
| use anyhow::anyhow; | ||
| use ed25519_dalek::ed25519::signature; | ||
| use ed25519_dalek::{ed25519, Signer}; | ||
| use serde::{Deserialize, Serialize}; | ||
| use std::collections::BTreeMap; | ||
| use std::fs; | ||
| use std::fs::File; | ||
| use std::io::BufReader; | ||
| use std::path::{Path, PathBuf}; | ||
| use std::sync::{Arc, Mutex}; | ||
| use sui_types::base_types::SuiAddress; | ||
| use sui_types::crypto::{KeyPair, Signature}; | ||
|
|
||
| #[derive(Serialize, Deserialize)] | ||
| pub enum KeystoreType { | ||
| File(PathBuf), | ||
| } | ||
|
|
||
| pub trait Keystore: Send + Sync { | ||
| fn sign(&self, address: &SuiAddress, msg: &[u8]) -> Result<Signature, anyhow::Error>; | ||
| fn add_key(&mut self, keypair: KeyPair) -> Result<(), anyhow::Error>; | ||
| } | ||
|
|
||
| impl KeystoreType { | ||
| pub fn init(&self) -> Result<Box<dyn Keystore>, anyhow::Error> { | ||
| Ok(match self { | ||
| KeystoreType::File(path) => Box::new(SuiKeystore::load_or_create(path)?), | ||
| }) | ||
| } | ||
| } | ||
|
|
||
| #[derive(Serialize, Deserialize)] | ||
| pub struct SuiKeystore { | ||
| keys: BTreeMap<SuiAddress, KeyPair>, | ||
| path: PathBuf, | ||
| } | ||
|
|
||
| impl Keystore for SuiKeystore { | ||
| fn sign(&self, address: &SuiAddress, msg: &[u8]) -> Result<Signature, anyhow::Error> { | ||
| Ok(self | ||
| .keys | ||
| .get(address) | ||
| .ok_or_else(|| anyhow!("Cannot find key for address: [{}]", address))? | ||
| .sign(msg)) | ||
| } | ||
| fn add_key(&mut self, keypair: KeyPair) -> Result<(), anyhow::Error> { | ||
| self.keys | ||
| .insert(SuiAddress::from(keypair.public_key_bytes()), keypair); | ||
| self.save() | ||
| } | ||
| } | ||
|
|
||
| impl SuiKeystore { | ||
| pub fn load_or_create(path: &Path) -> Result<Self, anyhow::Error> { | ||
| let keys: Vec<KeyPair> = if path.exists() { | ||
| let reader = BufReader::new(File::open(path)?); | ||
| serde_json::from_reader(reader)? | ||
| } else { | ||
| Vec::new() | ||
| }; | ||
|
|
||
| let keys = keys | ||
| .into_iter() | ||
| .map(|key| (SuiAddress::from(key.public_key_bytes()), key)) | ||
| .collect(); | ||
|
|
||
| Ok(Self { | ||
| keys, | ||
| path: path.to_path_buf(), | ||
| }) | ||
| } | ||
|
|
||
| pub fn save(&self) -> Result<(), anyhow::Error> { | ||
| let store = serde_json::to_string_pretty(&self.keys.values().collect::<Vec<_>>()).unwrap(); | ||
| Ok(fs::write(&self.path, store)?) | ||
| } | ||
| } | ||
|
|
||
| pub struct SuiKeystoreSigner { | ||
| keystore: Arc<Mutex<Box<dyn Keystore>>>, | ||
| address: SuiAddress, | ||
| } | ||
|
|
||
| impl SuiKeystoreSigner { | ||
| pub fn new(keystore: Arc<Mutex<Box<dyn Keystore>>>, account: SuiAddress) -> Self { | ||
| Self { | ||
| keystore, | ||
| address: account, | ||
| } | ||
| } | ||
| } | ||
|
|
||
| impl signature::Signer<Signature> for SuiKeystoreSigner { | ||
| fn try_sign(&self, msg: &[u8]) -> Result<Signature, ed25519::Error> { | ||
| self.keystore | ||
| .lock() | ||
| .unwrap() | ||
| .sign(&self.address, msg) | ||
| .map_err(ed25519::Error::from_source) | ||
| } | ||
| } |
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
Oops, something went wrong.