Merge w master

This commit is contained in:
arkpar 2016-12-11 14:59:57 +01:00
parent a49ff3fb32
commit 05dcf951d1

View File

@ -22,13 +22,14 @@ impl SignerRpc {
pub fn confirm_request( pub fn confirm_request(
&mut self, &mut self,
id: U256, id: U256,
new_gas: Option<U256>,
new_gas_price: Option<U256>, new_gas_price: Option<U256>,
pwd: &str pwd: &str
) -> BoxFuture<Result<U256, RpcError>, Canceled> ) -> BoxFuture<Result<U256, RpcError>, Canceled>
{ {
self.rpc.request("personal_confirmRequest", vec![ self.rpc.request("personal_confirmRequest", vec![
to_value(&format!("{:#x}", id)), to_value(&format!("{:#x}", id)),
to_value(&TransactionModification { gas_price: new_gas_price }), to_value(&TransactionModification { gas_price: new_gas_price, gas: new_gas }),
to_value(&pwd), to_value(&pwd),
]) ])
} }