Merge branch 'master' into master-sf

2026-03-21 22:04:44 +00:00 · 2020-04-30 11:53:32 +05:30
parent 47124ca404 f4ac0422e2
commit 2390b013ac
15 changed files with 162 additions and 52 deletions
--- a/lcli/src/main.rs
+++ b/lcli/src/main.rs
@@ -226,6 +226,14 @@ async fn main() {
                        .takes_value(true)
                        .help("The value for state.genesis_time. Defaults to now."),
                )
+                .arg(
+                    Arg::with_name("genesis-fork-version")
+                        .long("genesis-fork-version")
+                        .value_name("HEX")
+                        .takes_value(true)
+                        .help("Used to avoid reply attacks between testnets. Recommended to set to
+                              non-default."),
+                )
        )
        .subcommand(
            SubCommand::with_name("change-genesis-time")