cerc-io/lighthouse
10
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Allow value for beacon_node fee-recipient argument (#2884)

Browse Source 
## Issue Addressed

The fee-recipient argument of the beacon node does not allow a value to be specified:

> $ lighthouse beacon_node --merge --fee-recipient "0x332E43696A505EF45b9319973785F837ce5267b9"
> error: Found argument '0x332E43696A505EF45b9319973785F837ce5267b9' which wasn't expected, or isn't valid in this context
> 
> USAGE:
>    lighthouse beacon_node --fee-recipient --merge
>
> For more information try --help

## Proposed Changes

Allow specifying a value for the fee-recipient argument in beacon_node/src/cli.rs

## Additional Info

I've added .takes_value(true) and successfully proposed a block in the kintsugi testnet with my own fee-recipient address instead of the hardcoded default. I think that was just missed as the argument does not make sense without a value :)


Co-authored-by: pk910 <philipp@pk910.de>
Co-authored-by: Michael Sproul <micsproul@gmail.com>
Co-authored-by: Michael Sproul <michael@sigmaprime.io>
This commit is contained in:
Philipp K 2022-01-07 01:21:42 +00:00
parent f6b5b1a8be
commit 668477872e
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
beacon_node/src/cli.rs
View File

@ -402,11 +402,13 @@ pub fn cli_app<'a, 'b>() -> App<'a, 'b> {
.arg( .arg(
Arg::with_name("fee-recipient") Arg::with_name("fee-recipient")
.long("fee-recipient") .long("fee-recipient")
.value_name("FEE-RECIPIENT")
.help("Once the merge has happened, this address will receive transaction fees \ .help("Once the merge has happened, this address will receive transaction fees \
collected from any blocks produced by this node. Defaults to a junk \ collected from any blocks produced by this node. Defaults to a junk \
address whilst the merge is in development stages. THE DEFAULT VALUE \ address whilst the merge is in development stages. THE DEFAULT VALUE \
WILL BE REMOVED BEFORE THE MERGE ENTERS PRODUCTION") WILL BE REMOVED BEFORE THE MERGE ENTERS PRODUCTION")
.requires("merge") .requires("merge")
.takes_value(true)
) )
/* /*

20
lighthouse/tests/beacon_node.rs
View File

@ -11,7 +11,7 @@ use std::process::Command;
use std::str::FromStr; use std::str::FromStr;
use std::string::ToString; use std::string::ToString;
use tempfile::TempDir; use tempfile::TempDir;
use types::{Checkpoint, Epoch, Hash256}; use types::{Address, Checkpoint, Epoch, Hash256};
const DEFAULT_ETH1_ENDPOINT: &str = "http://localhost:8545/"; const DEFAULT_ETH1_ENDPOINT: &str = "http://localhost:8545/";
@ -206,6 +206,24 @@ fn eth1_purge_cache_flag() {
.with_config(|config| assert!(config.eth1.purge_cache)); .with_config(|config| assert!(config.eth1.purge_cache));
} }
// Tests for Merge flags.
#[test]
fn merge_fee_recipient_flag() {
CommandLineTest::new()
.flag("merge", None)
.flag(
"fee-recipient",
Some("0x00000000219ab540356cbb839cbe05303d7705fa"),
)
.run_with_zero_port()
.with_config(|config| {
assert_eq!(
config.suggested_fee_recipient,
Some(Address::from_str("0x00000000219ab540356cbb839cbe05303d7705fa").unwrap())
)
});
}
// Tests for Network flags. // Tests for Network flags.
#[test] #[test]
fn network_dir_flag() { fn network_dir_flag() {