Merge branch 'master' of github.com:ethcore/parity into cli-rpc

2016-12-11 13:30:48 +01:00
parent 2c653d2c2e 95af942fc9
commit a49ff3fb32
210 changed files with 4204 additions and 1374 deletions
--- a/rpc_cli/src/lib.rs
+++ b/rpc_cli/src/lib.rs
@@ -91,7 +91,7 @@ fn list_transactions(signer: &mut SignerRpc) -> Result<String, String> {
 fn sign_transaction(
 	signer: &mut SignerRpc, id: U256, password: &str
 ) -> Result<String, String> {
-	try!(signer.confirm_request(id, None, password).map(|res| {
+	try!(signer.confirm_request(id, None, None, password).map(|res| {
 		match res {
 			Ok(u) => Ok(format!("Signed transaction id: {:#x}", u)),
 			Err(e) => Err(format!("{:?}", e)),