grassrootseconomics/openethereum
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Crypto primitives removed from ethkey (#11174)

Browse Source 
* Crypto utils removed from ethkey

* Fix ethkey lib

* Switch ethsore to new crypto

* Accounts crate fixed

* Secret store crate switched to new crypto

* Ethcore builtin fixed

* Accounts crate fixed

* Ethcore crate fixed

* Util network fixed

* Util network-devp2p fixed

* Private tx fixed

* Ethcore sync fixed

* Secret store fixed

* Rpc fixed

* Parity fixed

* Ethkey cli fixed

* Local store fixed

* Ethcore blockchain fixed

* Cargo.lock pushed; doc comment added for reversed nonce

* Ethstore tests fixed

* Ethstore cli fixed

* Miner fixed

* Snapshot tests are fixed

* Single brackets removed

* Machine fixed

* Verification fixed

* Executive state fixed

* More single brackets removed

* Update version of parity-crypto

* Use published version 0.4.2 of parity-crypto

* New test in tx_filter fixed
This commit is contained in:
Anton Gavrilov
2019-10-23 13:03:46 +02:00
committed by GitHub
parent 81ca599f2a
commit 834585d61b
176 changed files with 579 additions and 2376 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ethcore/engine/src/test_helpers.rs
View File

@@ -19,25 +19,26 @@
use std::sync::Arc;
use ethereum_types::{Address, H256};
use ethkey::{Password, Signature};
use ethkey::Password;
use parity_crypto::publickey::{Signature, Error};
use log::warn;
use accounts::{self, AccountProvider, SignError};
use crate::signer::EngineSigner;
impl EngineSigner for (Arc<AccountProvider>, Address, Password) {
fn sign(&self, hash: H256) -> Result<Signature, ethkey::Error> {
fn sign(&self, hash: H256) -> Result<Signature, Error> {
match self.0.sign(self.1, Some(self.2.clone()), hash) {
Err(SignError::NotUnlocked) => unreachable!(),
Err(SignError::NotFound) => Err(ethkey::Error::InvalidAddress),
Err(SignError::SStore(accounts::Error::EthKey(err))) => Err(err),
Err(SignError::SStore(accounts::Error::EthKeyCrypto(err))) => {
Err(SignError::NotFound) => Err(Error::InvalidAddress),
Err(SignError::SStore(accounts::Error::EthCrypto(err))) => Err(Error::Custom(err.to_string())),
Err(SignError::SStore(accounts::Error::EthPublicKeyCrypto(err))) => {
warn!("Low level crypto error: {:?}", err);
Err(ethkey::Error::InvalidSecret)
Err(Error::InvalidSecretKey)
},
Err(SignError::SStore(err)) => {
warn!("Error signing for engine: {:?}", err);
Err(ethkey::Error::InvalidSignature)
Err(Error::InvalidSignature)
},
Ok(ok) => Ok(ok),
}