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

Allow modifications of gas when confirming in signer (#3798)

Browse Source
This commit is contained in:
Tomasz Drwięga 2016-12-10 20:18:42 +01:00 committed by Arkadiy Paronyan
parent a6fcd8a0d9
commit 08a47ea2d4
3 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
rpc/src/v1/impls/signer.rs
View File

@ -89,11 +89,13 @@ impl<C: 'static, M: 'static> Signer for SignerClient<C, M> where C: MiningBlockC
signer.peek(&id).map(|confirmation| { signer.peek(&id).map(|confirmation| {
let mut payload = confirmation.payload.clone(); let mut payload = confirmation.payload.clone();
// Modify payload // Modify payload
match (&mut payload, modification.gas_price) { if let ConfirmationPayload::SendTransaction(ref mut request) = payload {
(&mut ConfirmationPayload::SendTransaction(ref mut request), Some(gas_price)) => { if let Some(gas_price) = modification.gas_price {
request.gas_price = gas_price.into(); request.gas_price = gas_price.into();
}, }
_ => {}, if let Some(gas) = modification.gas {
request.gas = gas.into();
}
} }
// Execute // Execute
let result = dispatch::execute(&*client, &*miner, &*accounts, payload, Some(pass)); let result = dispatch::execute(&*client, &*miner, &*accounts, payload, Some(pass));

4
rpc/src/v1/tests/mocked/signer.rs
View File

@ -183,7 +183,7 @@ fn should_confirm_transaction_and_dispatch() {
let t = Transaction { let t = Transaction {
nonce: U256::zero(), nonce: U256::zero(),
gas_price: U256::from(0x1000), gas_price: U256::from(0x1000),
gas: U256::from(10_000_000), gas: U256::from(0x50505),
action: Action::Call(recipient), action: Action::Call(recipient),
value: U256::from(0x1), value: U256::from(0x1),
data: vec![] data: vec![]
@ -198,7 +198,7 @@ fn should_confirm_transaction_and_dispatch() {
let request = r#"{ let request = r#"{
"jsonrpc":"2.0", "jsonrpc":"2.0",
"method":"signer_confirmRequest", "method":"signer_confirmRequest",
"params":["0x1", {"gasPrice":"0x1000"}, "test"], "params":["0x1", {"gasPrice":"0x1000","gas":"0x50505"}, "test"],
"id":1 "id":1
}"#; }"#;
let response = r#"{"jsonrpc":"2.0","result":""#.to_owned() + format!("0x{:?}", t.hash()).as_ref() + r#"","id":1}"#; let response = r#"{"jsonrpc":"2.0","result":""#.to_owned() + format!("0x{:?}", t.hash()).as_ref() + r#"","id":1}"#;

12
rpc/src/v1/types/confirmations.rs
View File

@ -142,6 +142,8 @@ pub struct TransactionModification {
/// Modified gas price /// Modified gas price
#[serde(rename="gasPrice")] #[serde(rename="gasPrice")]
pub gas_price: Option<U256>, pub gas_price: Option<U256>,
/// Modified gas
pub gas: Option<U256>,
} }
/// Represents two possible return values. /// Represents two possible return values.
@ -275,18 +277,26 @@ mod tests {
let s1 = r#"{ let s1 = r#"{
"gasPrice":"0xba43b7400" "gasPrice":"0xba43b7400"
}"#; }"#;
let s2 = r#"{}"#; let s2 = r#"{"gas": "0x1233"}"#;
let s3 = r#"{}"#;
// when // when
let res1: TransactionModification = serde_json::from_str(s1).unwrap(); let res1: TransactionModification = serde_json::from_str(s1).unwrap();
let res2: TransactionModification = serde_json::from_str(s2).unwrap(); let res2: TransactionModification = serde_json::from_str(s2).unwrap();
let res3: TransactionModification = serde_json::from_str(s3).unwrap();
// then // then
assert_eq!(res1, TransactionModification { assert_eq!(res1, TransactionModification {
gas_price: Some(U256::from_str("0ba43b7400").unwrap()), gas_price: Some(U256::from_str("0ba43b7400").unwrap()),
gas: None,
}); });
assert_eq!(res2, TransactionModification { assert_eq!(res2, TransactionModification {
gas_price: None, gas_price: None,
gas: Some(U256::from_str("1233").unwrap()),
});
assert_eq!(res3, TransactionModification {
gas_price: None,
gas: None,
}); });
} }
} }