Skip to content

fix network argument to be a string and not a list #4243

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jakubgs wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix network argument to be a string and not a list #4243

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 6 additions & 12 deletions execution_chain/conf.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,12 +138,11 @@ type
"- mainnet/1 : Ethereum main network\n" &
"- sepolia/11155111: Testnet for smart contract testing\n" &
"- hoodi/560048 : Testnet for staking and hard forks\n" &
"- custom/path : /path/to/genesis-or-network-configuration.json\n" &
"Both --network: name/path --network:id can be set at the same time to override network id number"
defaultValue: @[] # the default value is set in makeConfig
"- custom/path : /path/to/genesis-or-network-configuration.json"
defaultValue: none(string) # the default value is set in makeConfig
defaultValueDesc: "mainnet(1)"
abbr: "i"
name: "network" .}: seq[string]
name: "network" .}: Option[string]

customNetwork {.
ignore
Expand Down Expand Up @@ -663,7 +662,7 @@ proc parseNetworkParams(network: string): (NetworkParams, bool) =
(params, true)

proc processNetworkParamsAndNetworkId(config: var ExecutionClientConf) =
if config.network.len == 0 and config.customNetwork.isNone:
if config.network.isNone and config.customNetwork.isNone:
# Default value if none is set
config.networkId = MainNet
config.networkParams = networkParams(MainNet)
Expand All @@ -674,16 +673,11 @@ proc processNetworkParamsAndNetworkId(config: var ExecutionClientConf) =
id: Opt[NetworkId]
simulatedCustomNetwork = false

for network in config.network:
if config.network.isSome:
let network = config.network.get
if decOrHex(network):
if id.isSome:
warn "Network ID already set, ignore new value", id=network
continue
id = Opt.some parseNetworkId(network)
else:
if params.isSome:
warn "Network configuration already set, ignore new value", network
continue
let (parsedParams, custom) = parseNetworkParams(network)
params = Opt.some parsedParams
# Simulate --custom-network while it is still not disabled.
Expand Down
Loading