From 7dee80dce6d3b36709aff21e48056c9702676952 Mon Sep 17 00:00:00 2001 From: uink45 <79078981+uink45@users.noreply.github.com> Date: Wed, 9 Oct 2024 15:29:21 +1000 Subject: [PATCH 1/2] Update BeaconClientOptions.cs --- src/Lantern.Beacon/BeaconClientOptions.cs | 30 ++++++++++++++++++++--- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/src/Lantern.Beacon/BeaconClientOptions.cs b/src/Lantern.Beacon/BeaconClientOptions.cs index c187ab7..90a4caa 100644 --- a/src/Lantern.Beacon/BeaconClientOptions.cs +++ b/src/Lantern.Beacon/BeaconClientOptions.cs @@ -9,9 +9,9 @@ public class BeaconClientOptions public int TargetNodesToFind { get; set; } = 100; - public int MaxParallelDials { get; set; } = 1; + public int MaxParallelDials { get; set; } = 10; - public int DialTimeoutSeconds { get; set; } = 5; + public int DialTimeoutSeconds { get; set; } = 10; public int TcpPort { get; set; } = 9001; @@ -51,7 +51,29 @@ public static BeaconClientOptions Parse(string[] args) throw new ArgumentException("Missing value for --network"); } break; - + + case "--genesis-time": + if (i + 1 < argsList.Count && ulong.TryParse(argsList[++i], out var genesisTime)) + { + options.SyncProtocolOptions.GenesisTime = genesisTime; + } + else + { + throw new ArgumentException("Invalid or missing value for --genesis-time"); + } + break; + + case "--genesis-validators-root": + if (i + 1 < argsList.Count) + { + options.SyncProtocolOptions.GenesisValidatorsRoot = GetTrustedBlockRootBytes(argsList[++i]); + } + else + { + throw new ArgumentException("Missing value for --genesis-validators-root"); + } + break; + case "--block-root": if (i + 1 < argsList.Count) { @@ -148,6 +170,7 @@ public static BeaconClientOptions Parse(string[] args) options.Bootnodes.Add(argsList[++i]); } break; + case "--enable-discovery": if (i + 1 < argsList.Count && bool.TryParse(argsList[++i], out var enableDiscovery)) { @@ -172,7 +195,6 @@ private static NetworkType GetNetworkType(string network) return network.ToLower() switch { "mainnet" => NetworkType.Mainnet, - "holesky" => NetworkType.Holesky, _ => throw new ArgumentException($"Unsupported network type: {network}") }; } From 18051c4ffdf7f206db12bd5f728682a651ce8077 Mon Sep 17 00:00:00 2001 From: uink45 <79078981+uink45@users.noreply.github.com> Date: Wed, 9 Oct 2024 15:31:51 +1000 Subject: [PATCH 2/2] Update BeaconClientOptions.cs --- src/Lantern.Beacon/BeaconClientOptions.cs | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/src/Lantern.Beacon/BeaconClientOptions.cs b/src/Lantern.Beacon/BeaconClientOptions.cs index 90a4caa..5e55378 100644 --- a/src/Lantern.Beacon/BeaconClientOptions.cs +++ b/src/Lantern.Beacon/BeaconClientOptions.cs @@ -1,5 +1,6 @@ using Lantern.Beacon.Sync; using Lantern.Beacon.Sync.Types; +using SszSharp; namespace Lantern.Beacon; @@ -74,6 +75,17 @@ public static BeaconClientOptions Parse(string[] args) } break; + case "--preset": + if (i + 1 < argsList.Count) + { + options.SyncProtocolOptions.Preset = GetPreset(argsList[++i]); + } + else + { + throw new ArgumentException("Missing value for --preset"); + } + break; + case "--block-root": if (i + 1 < argsList.Count) { @@ -190,6 +202,15 @@ public static BeaconClientOptions Parse(string[] args) return options; } + private static SizePreset GetPreset(string preset) + { + return preset.ToLower() switch + { + "mainnet" => SizePreset.MainnetPreset, + _ => throw new ArgumentException($"Unsupported preset: {preset}") + }; + } + private static NetworkType GetNetworkType(string network) { return network.ToLower() switch