diff --git a/ansible/group_vars/nimbus.sepolia.yml b/ansible/group_vars/nimbus.sepolia.yml index 9c65718..0ccdb42 100644 --- a/ansible/group_vars/nimbus.sepolia.yml +++ b/ansible/group_vars/nimbus.sepolia.yml @@ -43,8 +43,8 @@ beacon_node_web3_jwt_secret: '{{ geth_authrpc_jwtsecret | mandatory }}' beacon_node_suggested_fee_recipient: '{{lookup("bitwarden", "nimbus/wallet/prater", field="address")}}' # Validators from nimbus-private repo¬ beacon_node_dist_validators_enabled: '{{ node.start is defined and node.end is defined }}' -beacon_node_dist_validators_start: '{{ node.start | mandatory }}' -beacon_node_dist_validators_end: '{{ node.end | mandatory }}' +beacon_node_dist_validators_start: '{{ node.validator_client | ternary(0, node.start) | mandatory }}' +beacon_node_dist_validators_end: '{{ node.validator_client | ternary(0, node.end) | mandatory }}' # Ports beacon_node_discovery_port: '{{ 9000 + idx|int + 11 }}' beacon_node_listening_port: '{{ 9000 + idx|int + 11 }}' @@ -52,9 +52,29 @@ beacon_node_metrics_port: '{{ 9200 + idx|int + 11 }}' beacon_node_rest_port: '{{ 9300 + idx|int + 11 }}' beacon_node_rest_address: '0.0.0.0' +# Validator Client +validator_client_service_name: 'validator-client-{{ validator_client_network }}-{{ validator_client_build_repo_branch }}-{{ "%02d"|format(idx|int+1) }}' +validator_client_service_enabled: '{{ node.validator_client }}' +validator_client_network: '{{ beacon_node_network }}' +validator_client_log_level: 'INFO' +validator_client_beacon_node_url: 'http://127.0.0.1:{{ beacon_node_rest_port }}' +# Builds +validator_client_build_repo_branch: '{{ beacon_node_repo_branch }}' +validator_client_build_frequency: 'daily' +# Ports +validator_client_metrics_port: '{{ 8108 + idx|int + 1 }}' +validator_client_keymanager_port: '{{ 5052 + idx|int + 1 }}' +# Keymanager +validator_client_keymanager_enabled: true +validator_client_keymanager_token: '{{lookup("bitwarden", "nimbus/keymanager", field="token")}}' +# Validators Distribution +validator_client_dist_validators_enabled: '{{ node.start is defined and node.end is defined }}' +validator_client_dist_validators_start: '{{ (not node.validator_client) | ternary(0, node.start) | mandatory }}' +validator_client_dist_validators_end: '{{ (not node.validator_client) | ternary(0, node.end) | mandatory }}' + nodes_layout: 'linux-01.he-eu-hel1.nimbus.sepolia': - - { start: 0, end: 25 } - - { start: 25, end: 50, nim_commit: 'version-1-6', payload_builder: true } - - { start: 50, end: 75, nim_commit: 'version-1-6' } - - { start: 75, end: 100, nim_flags: '-d:json_rpc_websocket_package=websock' } + - { start: 0, end: 25, validator_client: true } + - { start: 25, end: 50, validator_client: false, nim_commit: 'version-1-6', payload_builder: true } + - { start: 50, end: 75, validator_client: false, nim_commit: 'version-1-6' } + - { start: 75, end: 100, validator_client: false, nim_flags: '-d:json_rpc_websocket_package=websock' } diff --git a/ansible/requirements.yml b/ansible/requirements.yml index 37b7d95..3cde502 100644 --- a/ansible/requirements.yml +++ b/ansible/requirements.yml @@ -41,7 +41,7 @@ - name: consul-service src: git@github.com:status-im/infra-role-consul-service.git - version: 7653d06cfc4d2613ee14bf637d38d98b0201864f + version: 4849a3c9d7f2045669880e4e17eeb71980b2e4d0 scm: git - name: infra-role-beacon-node-linux @@ -61,7 +61,7 @@ - name: infra-role-validator-client src: git@github.com:status-im/infra-role-validator-client.git - version: 928073b75034b7646a0ed4e2bed3c31a63250001 + version: 4acb22624d2f00d30c3a028453cf36ab82aa578f scm: git - name: infra-role-nimbus-eth1 @@ -71,7 +71,7 @@ - name: infra-role-nimbus-fluffy src: git@github.com:status-im/infra-role-nimbus-fluffy.git - version: 0e75161807c4d8d17e5a421bc27113436357b18c + version: d8f04d0a374fbdd108557b805af1560437d1a80d scm: git - name: infra-role-dist-validators diff --git a/ansible/sepolia.yml b/ansible/sepolia.yml index 4a7cf87..f92eb48 100644 --- a/ansible/sepolia.yml +++ b/ansible/sepolia.yml @@ -29,6 +29,13 @@ loop_var: node index_var: idx + - include_role: name=infra-role-validator-client + tags: [ validator-client, infra-role-validator-client ] + with_items: '{{ nodes_layout[hostname] }}' + loop_control: + loop_var: node + index_var: idx + - name: Deploy Spolia Testnet Nimbus-Eth1 trial become: true serial: '{{ serial|default(1) }}'