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

Fix up the pending set stuff.

Browse Source
This commit is contained in:
Gav Wood
2016-06-27 19:06:54 +02:00
parent 1667808ecb
commit 2a51a30d41
8 changed files with 70 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
parity/cli.rs
View File

@@ -141,9 +141,14 @@ Sealing/Mining Options:
all - reseal on all new transactions [default: all].
--max-tx-gas GAS Apply a limit of GAS as the maximum amount of gas
a single transaction may have for it to be mined.
--relay-validity REQ Requirements for relaying. REQ may be:
cheap - Relay only after cheap checks;
strict - Relay only once executed [default: cheap].
--relay-set SET Set of transactions to relay. SET may be:
cheap - Relay any transaction in the queue (this
may include invalid transactions);
strict - Relay only executed transactions (this
guarantees we don't relay invalid transactions, but
means we relay nothing if not mining);
lenient - Same as struct when mining, and cheap
when not [default: cheap].
--usd-per-tx USD Amount of USD to be paid for a basic transaction
[default: 0.005]. The minimum gas price is set
accordingly.
@@ -296,7 +301,7 @@ pub struct Args {
pub flag_force_sealing: bool,
pub flag_reseal_on_txs: String,
pub flag_max_tx_gas: Option<String>,
pub flag_relay_validity: String,
pub flag_relay_set: String,
pub flag_author: Option<String>,
pub flag_usd_per_tx: String,
pub flag_usd_per_eth: String,

11
parity/configuration.rs
View File

@@ -27,7 +27,7 @@ use util::*;
use ethcore::account_provider::AccountProvider;
use util::network_settings::NetworkSettings;
use ethcore::client::{append_path, get_db_path, ClientConfig, Switch, VMType};
use ethcore::miner::MinerOptions;
use ethcore::miner::{MinerOptions, PendingSet};
use ethcore::ethereum;
use ethcore::spec::Spec;
use ethsync::SyncConfig;
@@ -89,10 +89,11 @@ impl Configuration {
reseal_on_external_tx: ext,
reseal_on_own_tx: own,
max_tx_gas: self.args.flag_max_tx_gas.as_ref().map(|d| Self::decode_u256(d, "--max-tx-gas")),
strict_valid_pending: match self.args.flag_relay_validity.as_str() {
"cheap" => false,
"strict" => true,
x => die!("{}: Invalid value for --relay-validity option. Use --help for more information.", x)
pending_set: match self.args.flag_relay_set.as_str() {
"cheap" => PendingSet::AlwaysQueue,
"strict" => PendingSet::AlwaysSealing,
"lenient" => PendingSet::SealingOrElseQueue,
x => die!("{}: Invalid value for --relay-set option. Use --help for more information.", x)
},
}
}