diff --git a/ansible/group_vars/nimbus.eth1.yml b/ansible/group_vars/nimbus.eth1.yml index aa8a1f0..4bcc893 100644 --- a/ansible/group_vars/nimbus.eth1.yml +++ b/ansible/group_vars/nimbus.eth1.yml @@ -15,10 +15,10 @@ rocketpool_eth2_rpc_port: 59190 # Eth1 Sync # TODO query Consul for these rocketpool_eth1_exec_layer_jwtsecret: '{{ nimbus_eth1_jwt_secret }}' -rocketpool_eth1_exec_layer_authrpc_url: 'http://localhost:{{ nimbus_eth1_engine_ws_port }}' -rocketpool_eth1_exec_layer_rpc_url: 'http://localhost:{{ nimbus_eth1_rpc_port }}' -rocketpool_eth1_exec_layer_ws_url: 'ws://localhost:{{ nimbus_eth1_ws_port }}' -rocketpool_eth1_archive_url: 'http://localhost:{{ nimbus_eth1_rpc_port }}' +rocketpool_eth1_exec_layer_authrpc_url: 'http://localhost:{{ nimbus_eth1_http_port }}' +rocketpool_eth1_exec_layer_rpc_url: 'http://localhost:{{ nimbus_eth1_http_port }}' +rocketpool_eth1_exec_layer_ws_url: 'ws://localhost:{{ nimbus_eth1_http_port }}' +rocketpool_eth1_archive_url: 'http://localhost:{{ nimbus_eth1_http_port }}' # Eth1 Wallet rocketpool_password: '{{lookup("passwordstore", "services/Rocketpool/test/Eth1/pass")}}' rocketpool_wallet: '{{lookup("passwordstore", "services/Rocketpool/test/Eth1/wallet")}}' @@ -31,9 +31,6 @@ nimbus_eth1_network: 'goerli' nimbus_eth1_max_peers: 160 nimbus_eth1_log_level: 'DEBUG' # Ports -nimbus_eth1_ws_port: 8546 -nimbus_eth1_rpc_port: 8545 -nimbus_eth1_engine_ws_port: 8551 nimbus_eth1_metrics_port: 9093 nimbus_eth1_metrics_address: '0.0.0.0' # API secert diff --git a/ansible/requirements.yml b/ansible/requirements.yml index 492a618..c528ff7 100644 --- a/ansible/requirements.yml +++ b/ansible/requirements.yml @@ -65,7 +65,7 @@ - name: infra-role-nimbus-eth1 src: git@github.com:status-im/infra-role-nimbus-eth1.git - version: 6b626f0852ecd12626d7cbd2fe9cb94102e88f65 + version: f9ed9de88388285fb307bba98ba88e61d52c3e8e scm: git - name: infra-role-nimbus-fluffy diff --git a/ansible/vars/nimbus-sepolia-trial.yml b/ansible/vars/nimbus-sepolia-trial.yml index 38c63d2..774ecd0 100644 --- a/ansible/vars/nimbus-sepolia-trial.yml +++ b/ansible/vars/nimbus-sepolia-trial.yml @@ -8,12 +8,9 @@ nimbus_eth1_log_level: 'DEBUG' nimbus_eth1_metrics_address: '0.0.0.0' # Kinda hacky way to just add this as 5th node. nimbus_eth1_rpc_enabled: true -nimbus_eth1_rpc_port: '{{ 8545 + idx|int + 22 }}' +nimbus_eth1_http_port: '{{ 8545 + idx|int + 22 }}' nimbus_eth1_ws_enabled: true -nimbus_eth1_ws_port: '{{ 8646 + idx|int + 22 }}' nimbus_eth1_engine_ws_enabled: true -nimbus_eth1_engine_ws_port: '{{ 8551 + idx|int + 22 }}' -nimbus_eth1_graphql_port: '{{ 8848 + idx|int + 22 }}' nimbus_eth1_jwt_secret: '{{lookup("bitwarden", "nimbus/jwt-token")}}' # Beacon Nodes ----------------------------------------------------------------- @@ -29,7 +26,7 @@ beacon_node_build_frequency: 'daily' beacon_node_validator_monitor_auto: true beacon_node_validator_monitor_details: true # Execution layer Enginer API -beacon_node_exec_layer_urls: ['ws://localhost:{{ nimbus_eth1_engine_ws_port }}'] +beacon_node_exec_layer_urls: ['ws://localhost:{{ nimbus_eth1_http_port }}'] beacon_node_exec_layer_jwt_secret: '{{ nimbus_eth1_jwt_secret }}' # Validators from nimbus-private repo¬ beacon_node_dist_validators_enabled: '{{ node.start is defined and node.end is defined }}'