dae5d75dd6
* cargo upgrade "ethereum-types" --all --allow-prerelease * [ethash] fix compilation errors * [ethkey] fix compilation errors * [journaldb] fix compilation errors * [dir] fix compilation errors * [ethabi] update to 0.7 * wip * [eip-712] fix compilation errors * [ethjson] fix compilation errors * [Cargo.toml] add TODO to remove patches * [ethstore] fix compilation errors * use patched keccak-hash with new primitive-types * wip * [ethcore-network-devp2p] fix compilation errors * [vm] fix compilation errors * [common-types, evm, wasm] fix compilation errors * [ethcore-db] Require AsRef instead of Deref for keys * [ethcore-blockchain] fix some compilation errors * [blooms-db] fix compilation errors Thanks a lot @dvdplm :) * we don't need no rlp ethereum feature * [ethcore] fix some compilation errors * [parity-ipfs-api] fix compilation error * [ethcore-light] fix compilation errors * [Cargo.lock] update parity-common * [ethcore-private-tx] fix some compilation errors * wip * [ethcore-private-tx] fix compilation errors * [parity-updater] fix compilation errors * [parity-rpc] fix compilation errors * [parity-bin] fix other compilation errors * update to new ethereum-types * update keccak-hash * [fastmap] fix compilation in tests * [blooms-db] fix compilation in tests * [common-types] fix compilation in tests * [triehash-ethereum] fix compilation in tests * [ethkey] fix compilation in tests * [pwasm-run-test] fix compilation errors * [wasm] fix compilation errors * [ethjson] fix compilation in tests * [eip-712] fix compilation in tests * [ethcore-blockchain] fix compilation in tests * [ethstore] fix compilation in tests * [ethstore-accounts] fix compilation in tests * [parity-hash-fetch] fix compilation in tests * [parity-whisper] fix compilation in tests * [ethcore-miner] fix compilation in tests * [ethcore-network-devp2p] fix compilation in tests * [*] upgrade rand to 0.6 * [evm] get rid of num-bigint conversions * [ethcore] downgrade trie-standardmap and criterion * [ethcore] fix some warnings * [ethcore] fix compilation in tests * [evmbin] fix compilation in tests * [updater] fix compilation in tests * [ethash] fix compilation in tests * [ethcore-secretstore] fix compilation in tests * [ethcore-sync] fix compilation in tests * [parity-rpc] fix compilation in tests * [ethcore] finally fix compilation in tests FUCK YEAH!!! * [ethstore] lazy_static is unused * [ethcore] fix test * fix up bad merge * [Cargo.toml] remove unused patches * [*] replace some git dependencies with crates.io * [Cargo.toml] remove unused lazy_static * [*] clean up * [ethcore] fix transaction_filter_deprecated test * [private-tx] fix serialization tests * fix more serialization tests * [ethkey] fix smoky test * [rpc] fix tests, please? * [ethcore] remove commented out code * Apply suggestions from code review Co-Authored-By: Tomasz Drwięga <tomusdrw@users.noreply.github.com> * [ethstore] remove unused dev-dependency * [ethcore] remove resolved TODO * [*] resolve keccak-hash TODO * [*] s/Address::default()/Address::zero() * [rpc] remove Subscribers::new_test * [rpc] remove EthPubSubClient::new_test * [ethcore] use trie-standardmap from crates.io * [dir] fix db_root_path * [ethcore] simplify snapshot::tests::helpers::fill_storage * Apply suggestions from code review Co-Authored-By: David <dvdplm@gmail.com> * [ethcore-secretstore] resolve TODO in serialization * [ethcore-network-devp2p] resolve TODO in save_key * [Cargo.lock] update triehash * [*] use ethabi from crates.io * [ethkey] use secp256k1 from master branch * [Cargo.lock] update eth-secp256k1
115 lines
3.3 KiB
Rust
115 lines
3.3 KiB
Rust
// Copyright 2015-2019 Parity Technologies (UK) Ltd.
|
|
// This file is part of Parity Ethereum.
|
|
|
|
// Parity Ethereum is free software: you can redistribute it and/or modify
|
|
// it under the terms of the GNU General Public License as published by
|
|
// the Free Software Foundation, either version 3 of the License, or
|
|
// (at your option) any later version.
|
|
|
|
// Parity Ethereum is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU General Public License for more details.
|
|
|
|
// You should have received a copy of the GNU General Public License
|
|
// along with Parity Ethereum. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
use std::fmt;
|
|
use secp256k1::key;
|
|
use super::{Secret, Public, Address, SECP256K1, Error};
|
|
use parity_crypto::Keccak256 as _;
|
|
|
|
pub fn public_to_address(public: &Public) -> Address {
|
|
let hash = public.keccak256();
|
|
let mut result = Address::zero();
|
|
result.as_bytes_mut().copy_from_slice(&hash[12..]);
|
|
result
|
|
}
|
|
|
|
#[derive(Debug, Clone, PartialEq)]
|
|
/// secp256k1 key pair
|
|
pub struct KeyPair {
|
|
secret: Secret,
|
|
public: Public,
|
|
}
|
|
|
|
impl fmt::Display for KeyPair {
|
|
fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> {
|
|
writeln!(f, "secret: {:x}", self.secret)?;
|
|
writeln!(f, "public: {:x}", self.public)?;
|
|
write!(f, "address: {:x}", self.address())
|
|
}
|
|
}
|
|
|
|
impl KeyPair {
|
|
/// Create a pair from secret key
|
|
pub fn from_secret(secret: Secret) -> Result<KeyPair, Error> {
|
|
let context = &SECP256K1;
|
|
let s: key::SecretKey = key::SecretKey::from_slice(context, &secret[..])?;
|
|
let pub_key = key::PublicKey::from_secret_key(context, &s)?;
|
|
let serialized = pub_key.serialize_vec(context, false);
|
|
|
|
let mut public = Public::default();
|
|
public.as_bytes_mut().copy_from_slice(&serialized[1..65]);
|
|
|
|
let keypair = KeyPair {
|
|
secret: secret,
|
|
public: public,
|
|
};
|
|
|
|
Ok(keypair)
|
|
}
|
|
|
|
pub fn from_secret_slice(slice: &[u8]) -> Result<KeyPair, Error> {
|
|
Self::from_secret(Secret::from_unsafe_slice(slice)?)
|
|
}
|
|
|
|
pub fn from_keypair(sec: key::SecretKey, publ: key::PublicKey) -> Self {
|
|
let context = &SECP256K1;
|
|
let serialized = publ.serialize_vec(context, false);
|
|
let secret = Secret::from(sec);
|
|
let mut public = Public::default();
|
|
public.as_bytes_mut().copy_from_slice(&serialized[1..65]);
|
|
|
|
KeyPair {
|
|
secret: secret,
|
|
public: public,
|
|
}
|
|
}
|
|
|
|
pub fn secret(&self) -> &Secret {
|
|
&self.secret
|
|
}
|
|
|
|
pub fn public(&self) -> &Public {
|
|
&self.public
|
|
}
|
|
|
|
pub fn address(&self) -> Address {
|
|
public_to_address(&self.public)
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use std::str::FromStr;
|
|
use {KeyPair, Secret};
|
|
|
|
#[test]
|
|
fn from_secret() {
|
|
let secret = Secret::from_str("a100df7a048e50ed308ea696dc600215098141cb391e9527329df289f9383f65").unwrap();
|
|
let _ = KeyPair::from_secret(secret).unwrap();
|
|
}
|
|
|
|
#[test]
|
|
fn keypair_display() {
|
|
let expected =
|
|
"secret: a100df7a048e50ed308ea696dc600215098141cb391e9527329df289f9383f65
|
|
public: 8ce0db0b0359ffc5866ba61903cc2518c3675ef2cf380a7e54bde7ea20e6fa1ab45b7617346cd11b7610001ee6ae5b0155c41cad9527cbcdff44ec67848943a4
|
|
address: 5b073e9233944b5e729e46d618f0d8edf3d9c34a".to_owned();
|
|
let secret = Secret::from_str("a100df7a048e50ed308ea696dc600215098141cb391e9527329df289f9383f65").unwrap();
|
|
let kp = KeyPair::from_secret(secret).unwrap();
|
|
assert_eq!(format!("{}", kp), expected);
|
|
}
|
|
}
|