From cc19c54471596dba32d2d9e70fbc27b1ee6251bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= Date: Wed, 21 Oct 2020 12:42:12 +0200 Subject: [PATCH] don't use --networkid flag, it causes issues MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jakub SokoĊ‚owski --- defaults/main.yml | 11 +---------- tasks/container.yml | 5 +++-- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index ee7be92..9a71db0 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -74,17 +74,8 @@ geth_lov_level_names: geth_log_level_name: 'info' geth_log_level_id: '{{ geth_lov_level_names[geth_log_level_name | lower] | mandatory }}' -# Mapping of network names to IDs for --networkid flag -geth_network_ids: - frontier: 1 - mainnet: 1 - ropsten: 3 - testnet: 3 - rinkeby: 4 - goerli: 5 -# Available: frontier/mainnet, ropsten/testnet, rinkeby, goerli +# Available: mainnet, goerli, rinkeby, yolov1, ropsten geth_network_name: 'mainnet' -geth_network_id: '{{ geth_network_ids[geth_network_name] }}' # Port to listen on geth_port: 30303 diff --git a/tasks/container.yml b/tasks/container.yml index 8eae611..b104d75 100644 --- a/tasks/container.yml +++ b/tasks/container.yml @@ -19,9 +19,10 @@ labels: # These are just for documentation org.ethereum.geth.network_name: '{{ geth_network_name }}' - org.ethereum.geth.network_id: '{{ geth_network_id }}' command: | - --networkid={{ geth_network_id }} + {% if geth_network_name != "mainnet" %} + --{{ geth_network_name }} + {% endif %} {% if geth_v5disc_enabled %} --v5disc {% endif %}