Allow specifying local accounts via CLI (#9960)
* Allow specifying local accounts via CLI * Add `tx-queue-locals` CLI option * ethcore: modify miner to check options vec before importing transaction * modify tests (ethcore/parity) Resolves #9634 * fix formatting * fixes: Make prefer HashSet over Vec<>, add test, comment formatting * Update ethcore/src/miner/miner.rs Co-Authored-By: insipx <aplaza@liquidthink.net> * Fix comments and add helper for set->vec conversion * remove blank line from use statement * fix helper test * formatting * fix test to pass on nightly * revert test fix for nightly
This commit is contained in:
committed by
Afri Schoedon
parent
94db961975
commit
50f5ccc4f2
@@ -18,7 +18,8 @@ use std::time::Duration;
|
||||
use std::io::Read;
|
||||
use std::net::SocketAddr;
|
||||
use std::path::PathBuf;
|
||||
use std::collections::BTreeMap;
|
||||
use std::collections::{HashSet, BTreeMap};
|
||||
use std::iter::FromIterator;
|
||||
use std::cmp;
|
||||
use cli::{Args, ArgsError};
|
||||
use hash::keccak;
|
||||
@@ -572,6 +573,7 @@ impl Configuration {
|
||||
infinite_pending_block: self.args.flag_infinite_pending_block,
|
||||
|
||||
tx_queue_penalization: to_queue_penalization(self.args.arg_tx_time_limit)?,
|
||||
tx_queue_locals: HashSet::from_iter(to_addresses(&self.args.arg_tx_queue_locals)?.into_iter()),
|
||||
tx_queue_strategy: to_queue_strategy(&self.args.arg_tx_queue_strategy)?,
|
||||
tx_queue_no_unfamiliar_locals: self.args.flag_tx_queue_no_unfamiliar_locals,
|
||||
refuse_service_transactions: self.args.flag_refuse_service_transactions,
|
||||
|
||||
Reference in New Issue
Block a user