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

Light client Provide default nonce in transactions when it´s missing (#9370)

Browse Source 
* Provide `default_nonce` in tx`s when it´s missing

When `nonce` is missing in a `EthTransaction` will cause it to fall in
these cases provide `default_nonce` value instead!

* Changed http:// to https:// on Yasm link (#9369)

Changed http:// to https:// on Yasm link in README.md

* Provide `default_nonce` in tx`s when it´s missing

When `nonce` is missing in a `EthTransaction` will cause it to fall in
these cases provide `default_nonce` value instead!

* Address grumbles
This commit is contained in:
Niklas Adolfsson 2018-08-17 15:45:43 +02:00 committed by Andrew Jones
parent 949b9c85ca
commit 3ae10915e4
1 changed files with 12 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
rpc/src/v1/helpers/light_fetch.rs
View File

@ -47,7 +47,7 @@ use transaction::{Action, Transaction as EthTransaction, SignedTransaction, Loca
use v1::helpers::{CallRequest as CallRequestHelper, errors, dispatch}; use v1::helpers::{CallRequest as CallRequestHelper, errors, dispatch};
use v1::types::{BlockNumber, CallRequest, Log, Transaction}; use v1::types::{BlockNumber, CallRequest, Log, Transaction};
const NO_INVALID_BACK_REFS: &'static str = "Fails only on invalid back-references; back-references here known to be valid; qed"; const NO_INVALID_BACK_REFS: &str = "Fails only on invalid back-references; back-references here known to be valid; qed";
/// Helper for fetching blockchain data either from the light client or the network /// Helper for fetching blockchain data either from the light client or the network
/// as necessary. /// as necessary.
@ -207,7 +207,7 @@ impl LightFetch {
} }
}; };
let from = req.from.unwrap_or(Address::zero()); let from = req.from.unwrap_or_else(|| Address::zero());
let nonce_fut = match req.nonce { let nonce_fut = match req.nonce {
Some(nonce) => Either::A(future::ok(Some(nonce))), Some(nonce) => Either::A(future::ok(Some(nonce))),
None => Either::B(self.account(from, id).map(|acc| acc.map(|a| a.nonce))), None => Either::B(self.account(from, id).map(|acc| acc.map(|a| a.nonce))),
@ -232,29 +232,16 @@ impl LightFetch {
// fetch missing transaction fields from the network. // fetch missing transaction fields from the network.
Box::new(nonce_fut.join(gas_price_fut).and_then(move |(nonce, gas_price)| { Box::new(nonce_fut.join(gas_price_fut).and_then(move |(nonce, gas_price)| {
let action = req.to.map_or(Action::Create, Action::Call); future::done(
let value = req.value.unwrap_or_else(U256::zero); Ok((req.gas.is_some(), EthTransaction {
let data = req.data.unwrap_or_default(); nonce: nonce.unwrap_or_default(),
action: req.to.map_or(Action::Create, Action::Call),
future::done(match (nonce, req.gas) { gas: req.gas.unwrap_or_else(|| START_GAS.into()),
(Some(n), Some(gas)) => Ok((true, EthTransaction { gas_price,
nonce: n, value: req.value.unwrap_or_else(U256::zero),
action: action, data: req.data.unwrap_or_default(),
gas: gas, }))
gas_price: gas_price, )
value: value,
data: data,
})),
(Some(n), None) => Ok((false, EthTransaction {
nonce: n,
action: action,
gas: START_GAS.into(),
gas_price: gas_price,
value: value,
data: data,
})),
(None, _) => Err(errors::unknown_block()),
})
}).join(header_fut).and_then(move |((gas_known, tx), hdr)| { }).join(header_fut).and_then(move |((gas_known, tx), hdr)| {
// then request proved execution. // then request proved execution.
// TODO: get last-hashes from network. // TODO: get last-hashes from network.