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

Merge pull request #6302 from paritytech/ledger-sign

Browse Source 
Add more descriptive error when signing/decrypting using hw wallet.
This commit is contained in:
Robert Habermeier 2017-08-16 05:55:28 +02:00 committed by GitHub
commit f19911660d
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
rpc/src/v1/helpers/dispatch.rs
View File

@ -512,6 +512,10 @@ pub fn execute<D: Dispatcher + 'static>(
).boxed() ).boxed()
}, },
ConfirmationPayload::EthSignMessage(address, data) => { ConfirmationPayload::EthSignMessage(address, data) => {
if accounts.is_hardware_address(address) {
return future::err(errors::unsupported("Signing via hardware wallets is not supported.", None)).boxed();
}
let hash = eth_data_hash(data); let hash = eth_data_hash(data);
let res = signature(&accounts, address, hash, pass) let res = signature(&accounts, address, hash, pass)
.map(|result| result .map(|result| result
@ -522,6 +526,10 @@ pub fn execute<D: Dispatcher + 'static>(
future::done(res).boxed() future::done(res).boxed()
}, },
ConfirmationPayload::Decrypt(address, data) => { ConfirmationPayload::Decrypt(address, data) => {
if accounts.is_hardware_address(address) {
return future::err(errors::unsupported("Decrypting via hardware wallets is not supported.", None)).boxed();
}
let res = decrypt(&accounts, address, data, pass) let res = decrypt(&accounts, address, data, pass)
.map(|result| result .map(|result| result
.map(RpcBytes) .map(RpcBytes)

8
rpc/src/v1/helpers/errors.rs
View File

@ -71,6 +71,14 @@ pub fn public_unsupported(details: Option<String>) -> Error {
} }
} }
pub fn unsupported<T: Into<String>>(msg: T, details: Option<T>) -> Error {
Error {
code: ErrorCode::ServerError(codes::UNSUPPORTED_REQUEST),
message: msg.into(),
data: details.map(Into::into).map(Value::String),
}
}
pub fn request_not_found() -> Error { pub fn request_not_found() -> Error {
Error { Error {
code: ErrorCode::ServerError(codes::REQUEST_NOT_FOUND), code: ErrorCode::ServerError(codes::REQUEST_NOT_FOUND),