Backports to beta (#1919)

* RPC errors & logs (#1845) * Refactoring errors in RPC * Updating jsonrpc-core * Fixing code_at * Avoid mentioning obvious segments in proof [ci:skip] * fixed cache_manager lock order * Purging .derefs, fixing clippy warnings. (#1890) * Fixing clippy warnings * Purging derefs * Simplifying engine derefs * Simplifying more engine derefs * Adding more details to miner log * fixed #1889, .DS_Store is no longer treated as key file (#1892) * fixed #1889, .DS_Store is no longer treated as key file * ethstore filters directories, hidden files and common system files * fixed compiling * fix regression with geth dir * fix regression with geth dir * Fix ipc compilation and add ipc feature to test targets (#1902) * fix compilation and add it to the ci run * no separator? * use quotes and spaces * RocksDB version bump * Don't return deleted nodes that are not yet flushed (#1908) * polling & connection timeouts (#1910) * Peers RPC + UI displaying active/connected/max peers (#1915) * Peers API * Bumping Parity-UI * Fixing tests * Save nodes removed from backing_overlay until commit (#1917)
2016-08-12 12:16:20 +02:00
parent 52ac5a00f5
commit dfb2ddfdc2
77 changed files with 1139 additions and 858 deletions
--- a/rpc/src/v1/helpers/errors.rs
+++ b/rpc/src/v1/helpers/errors.rs
@@ -0,0 +1,188 @@
+// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// This file is part of Parity.
+
+// Parity 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 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.  If not, see <http://www.gnu.org/licenses/>.
+
+//! RPC Error codes and error objects
+
+macro_rules! rpc_unimplemented {
+	() => (Err(::v1::helpers::errors::unimplemented()))
+}
+
+use std::fmt;
+use ethcore::error::Error as EthcoreError;
+use ethcore::account_provider::{Error as AccountError};
+use jsonrpc_core::{Error, ErrorCode, Value};
+
+mod codes {
+	// NOTE [ToDr] Codes from [-32099, -32000]
+	pub const UNSUPPORTED_REQUEST: i64 = -32000;
+	pub const NO_WORK: i64 = -32001;
+	pub const NO_AUTHOR: i64 = -32002;
+	pub const UNKNOWN_ERROR: i64 = -32009;
+	pub const TRANSACTION_ERROR: i64 = -32010;
+	pub const ACCOUNT_LOCKED: i64 = -32020;
+	pub const PASSWORD_INVALID: i64 = -32021;
+	pub const ACCOUNT_ERROR: i64 = -32023;
+	pub const SIGNER_DISABLED: i64 = -32030;
+	pub const REQUEST_REJECTED: i64 = -32040;
+	pub const REQUEST_NOT_FOUND: i64 = -32041;
+	pub const COMPILATION_ERROR: i64 = -32050;
+}
+
+pub fn unimplemented() -> Error {
+	Error {
+		code: ErrorCode::ServerError(codes::UNSUPPORTED_REQUEST),
+		message: "This request is not implemented yet. Please create an issue on Github repo.".into(),
+		data: None
+	}
+}
+
+pub fn request_not_found() -> Error {
+	Error {
+		code: ErrorCode::ServerError(codes::REQUEST_NOT_FOUND),
+		message: "Request not found.".into(),
+		data: None,
+	}
+}
+
+pub fn request_rejected() -> Error {
+	Error {
+		code: ErrorCode::ServerError(codes::REQUEST_REJECTED),
+		message: "Request has been rejected.".into(),
+		data: None,
+	}
+}
+
+
+pub fn account<T: fmt::Debug>(error: &str, details: T) -> Error {
+	Error {
+		code: ErrorCode::ServerError(codes::ACCOUNT_ERROR),
+		message: error.into(),
+		data: Some(Value::String(format!("{:?}", details))),
+	}
+}
+
+pub fn compilation<T: fmt::Debug>(error: T) -> Error {
+	Error {
+		code: ErrorCode::ServerError(codes::COMPILATION_ERROR),
+		message: "Error while compiling code.".into(),
+		data: Some(Value::String(format!("{:?}", error))),
+	}
+}
+
+pub fn internal<T: fmt::Debug>(error: &str, data: T) -> Error {
+	Error {
+		code: ErrorCode::InternalError,
+		message: format!("Internal error occurred: {}", error),
+		data: Some(Value::String(format!("{:?}", data))),
+	}
+}
+
+pub fn invalid_params<T: fmt::Debug>(param: &str, details: T) -> Error {
+	Error {
+		code: ErrorCode::InvalidParams,
+		message: format!("Couldn't parse parameters: {}", param),
+		data: Some(Value::String(format!("{:?}", details))),
+	}
+}
+
+pub fn state_pruned() -> Error {
+	Error {
+		code: ErrorCode::ServerError(codes::UNSUPPORTED_REQUEST),
+		message: "This request is not supported because your node is running with state pruning. Run with --pruning=archive.".into(),
+		data: None
+	}
+}
+
+pub fn no_work() -> Error {
+	Error {
+		code: ErrorCode::ServerError(codes::NO_WORK),
+		message: "Still syncing.".into(),
+		data: None
+	}
+}
+
+pub fn no_author() -> Error {
+	Error {
+		code: ErrorCode::ServerError(codes::NO_AUTHOR),
+		message: "Author not configured. Run Parity with --author to configure.".into(),
+		data: None
+	}
+}
+
+
+pub fn signer_disabled() -> Error {
+	Error {
+		code: ErrorCode::ServerError(codes::SIGNER_DISABLED),
+		message: "Trusted Signer is disabled. This API is not available.".into(),
+		data: None
+	}
+}
+
+pub fn from_signing_error(error: AccountError) -> Error {
+	Error {
+		code: ErrorCode::ServerError(codes::ACCOUNT_LOCKED),
+		message: "Your account is locked. Unlock the account via CLI, personal_unlockAccount or use Trusted Signer.".into(),
+		data: Some(Value::String(format!("{:?}", error))),
+	}
+}
+
+pub fn from_password_error(error: AccountError) -> Error {
+	Error {
+		code: ErrorCode::ServerError(codes::PASSWORD_INVALID),
+		message: "Account password is invalid or account does not exist.".into(),
+		data: Some(Value::String(format!("{:?}", error))),
+	}
+}
+
+pub fn from_transaction_error(error: EthcoreError) -> Error {
+	use ethcore::error::TransactionError::*;
+
+	if let EthcoreError::Transaction(e) = error {
+		let msg = match e {
+			AlreadyImported => "Transaction with the same hash was already imported.".into(),
+			Old => "Transaction nonce is too low. Try incrementing the nonce.".into(),
+			TooCheapToReplace => {
+				"Transaction fee is too low. There is another transaction with same nonce in the queue. Try increasing the fee or incrementing the nonce.".into()
+			},
+			LimitReached => {
+				"There are too many transactions in the queue. Your transaction was dropped due to limit. Try increasing the fee.".into()
+			},
+			InsufficientGasPrice { minimal, got } => {
+				format!("Transaction fee is too low. It does not satisfy your node's minimal fee (minimal: {}, got: {}). Try increasing the fee.", minimal, got)
+			},
+			InsufficientBalance { balance, cost } => {
+				format!("Insufficient funds. Account you try to send transaction from does not have enough funds. Required {} and got: {}.", cost, balance)
+			},
+			GasLimitExceeded { limit, got } => {
+				format!("Transaction cost exceeds current gas limit. Limit: {}, got: {}. Try decreasing supplied gas.", limit, got)
+			},
+			InvalidGasLimit(_) => "Supplied gas is beyond limit.".into(),
+		};
+		Error {
+			code: ErrorCode::ServerError(codes::TRANSACTION_ERROR),
+			message: msg,
+			data: None,
+		}
+	} else {
+		Error {
+			code: ErrorCode::ServerError(codes::UNKNOWN_ERROR),
+			message: "Unknown error when sending transaction.".into(),
+			data: Some(Value::String(format!("{:?}", error))),
+		}
+	}
+}
+
+