Skip to content

Commit b017ca8

Browse files
committed
bal-devnet-3 launch fixes
1 parent 5b18301 commit b017ca8

File tree

7 files changed

+42
-17
lines changed

7 files changed

+42
-17
lines changed

ansible/inventories/devnet-3/group_vars/all/all.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ primary_bootnode: bootnode-1
2727

2828
### Checkpoint sync specific for Ansible & Kubernetes
2929
checkpoint_sync_node: "{{ primary_bootnode }}"
30-
ethereum_node_cl_checkpoint_sync_enabled: true
30+
ethereum_node_cl_checkpoint_sync_enabled: false
3131

3232
checkpoint_sync_url: https://beacon.{{ ethereum_network_name }}.{{ domain }}
3333
#checkpoint_sync_url: https://{{ secret_nginx_shared_basic_auth.name }}:{{ secret_nginx_shared_basic_auth.password }}@{{ ethereum_node_beacon_prefix }}{{ checkpoint_sync_node }}.{{ ethereum_network_name }}.{{ domain }}

ansible/inventories/devnet-3/group_vars/bootnode.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
ethereum_cl_bootnode: "{{ hostvars[primary_bootnode]['bootnodoor_fact_enr'] }}"
22
ethereum_el_bootnode: "{{ hostvars[primary_bootnode]['bootnodoor_fact_enode'] }}"
33

4+
45
# role: ethpandaops.general.bootnodoor
56
bootnodoor_privkey: >-
67
{{
@@ -63,13 +64,12 @@ lodestar_container_volumes:
6364
lodestar_container_command_extra_args:
6465
- --paramsFile=/network-config/config.yaml
6566
- --genesisStateFile=/network-config/genesis.ssz
67+
- --persistNetworkIdentity
6668
- --rest.namespace="*"
6769
- --nat=true
6870
- --logLevel=debug
69-
- --disablePeerScoring
7071
- --serveHistoricalState
7172
- --network.connectToDiscv5Bootnodes
72-
- --network.connectToDiscv5Bootnodes
7373
- >-
7474
--bootnodes={{
7575
(
@@ -98,12 +98,13 @@ geth_container_env:
9898
VIRTUAL_PORT: "{{ ethereum_node_el_ports_http_rpc | string }}"
9999
LETSENCRYPT_HOST: "{{ ethereum_node_rcp_hostname }}"
100100
geth_container_command_extra_args:
101-
- --http.api=eth,net,web3,debug,admin
101+
- --http.api=eth,net,web3,debug,admin,txpool,trace
102102
- --http.vhosts=*
103103
- --networkid={{ ethereum_network_id }}
104104
- --syncmode=full
105105
- --gcmode=archive
106-
- --state.scheme=hash
106+
- --history.state=0
107+
- --miner.gaslimit=80000000
107108
- >-
108109
--bootnodes={{
109110
(
@@ -130,7 +131,6 @@ geth_container_pull: true
130131
geth_init_custom_network_container_command:
131132
- --datadir=/data
132133
- init
133-
- --state.scheme=hash
134134
- /genesis.json
135135

136136
# role: ethpandaops.general.prometheus

ansible/inventories/devnet-3/group_vars/erigon.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@ bootstrap_default_user_authorized_keys_github_team_el:
99
# role: ethpandaops.general.ethereum_node
1010
ethereum_node_el: erigon
1111

12+
# Disable IPv6 for erigon: the ansible role appends a second --nat=extip:<ipv6>
13+
# which overrides the IPv4 --nat, causing erigon to only advertise its IPv6 address.
14+
# This results in poor peering since bootnodes and most peers use IPv4 enodes.
15+
erigon_ipv6_enabled: false
16+
1217
# role: ethpandaops.general.erigon
1318
erigon_container_name: execution
1419
erigon_container_image: "{{ default_ethereum_client_images.erigon }}"
@@ -25,6 +30,7 @@ erigon_container_command_extra_args:
2530
- --db.size.limit=500GB
2631
- --bootnodes={{ ethereum_el_bootnodes | join(',') }}
2732
- --miner.gaslimit=80000000
33+
- --discovery.v4
2834
erigon_init_custom_network: true
2935
erigon_init_custom_network_genesis_file: "{{ eth_testnet_config_dir }}/genesis.json"
3036

ansible/inventories/devnet-3/group_vars/ethereum_node.yaml

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,22 @@
1-
ethereum_cl_bootnodes:
2-
- "{{ hostvars[primary_bootnode]['bootnodoor_fact_enr'] }}"
3-
- "{{ hostvars[primary_bootnode]['ethereum_node_fact_cl_enr'] }}"
4-
- "{{ hostvars['lighthouse-geth-super-1']['ethereum_node_fact_cl_enr'] }}"
5-
- "{{ hostvars['lighthouse-nethermind-super-1']['ethereum_node_fact_cl_enr'] }}"
1+
ethereum_cl_bootnodes: >-
2+
{{
3+
(
4+
[hostvars[primary_bootnode]['bootnodoor_fact_enr'] | default(None)]
5+
+ [hostvars[primary_bootnode]['ethereum_node_fact_cl_enr'] | default(None)]
6+
+ [hostvars['lighthouse-geth-super-1']['ethereum_node_fact_cl_enr'] | default(None)]
7+
+ [hostvars['lighthouse-nethermind-super-1']['ethereum_node_fact_cl_enr'] | default(None)]
8+
) | select('string') | list
9+
}}
610
7-
8-
ethereum_el_bootnodes:
9-
- "{{ hostvars[primary_bootnode]['bootnodoor_fact_enode'] }}"
10-
- "{{ hostvars[primary_bootnode]['ethereum_node_fact_el_enode'] }}"
11-
- "{{ hostvars['lighthouse-geth-super-1']['ethereum_node_fact_el_enode'] }}"
12-
- "{{ hostvars['lighthouse-nethermind-super-1']['ethereum_node_fact_el_enode'] }}"
11+
ethereum_el_bootnodes: >-
12+
{{
13+
(
14+
[hostvars[primary_bootnode]['bootnodoor_fact_enode'] | default(None)]
15+
+ [hostvars[primary_bootnode]['ethereum_node_fact_el_enode'] | default(None)]
16+
+ [hostvars['lighthouse-geth-super-1']['ethereum_node_fact_el_enode'] | default(None)]
17+
+ [hostvars['lighthouse-nethermind-super-1']['ethereum_node_fact_el_enode'] | default(None)]
18+
) | select('string') | list
19+
}}
1320
1421
ethereum_node_xatu_sentry_enabled: true
1522

ansible/inventories/devnet-3/group_vars/ethrex.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@ bootstrap_default_user_authorized_keys_github_team_el:
77

88
# role: ethpandaops.general.ethereum_node
99
ethereum_node_el: ethrex
10+
11+
# role: ethpandaops.general.ethereum_node_fact_discovery
12+
# ethrex stores nodekey in chain-specific subdir: /data/chain-<chainid>/node.key
13+
ethereum_node_fact_discovery_el_key_cmd:
14+
ethrex: xxd -p -c32 {{ ethrex_datadir | default('/data/ethrex') }}/chain-{{ ethereum_network_id | trim }}/node.key
1015
# role: ethpandaops.general.ethrex
1116
ethrex_container_name: execution
1217
ethrex_container_image: "{{ default_ethereum_client_images.ethrex }}"

ansible/playbook.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,11 @@
135135
destination_port: "30303"
136136
jump: DROP
137137
comment: "ethrex p2p UDP drop excess"
138+
- name: Ensure iptables directory exists
139+
ansible.builtin.file:
140+
path: /etc/iptables
141+
state: directory
142+
mode: "0755"
138143
- name: Persist iptables rules
139144
ansible.builtin.shell: iptables-save > /etc/iptables/rules.v4
140145
args:

network-configs/devnet-3/metadata/enodes.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
enode://afa37cbdaa112f879574f6772d2383fc624733d9bb44f3181059a2fdf612c01af98ed3d77deec9b52da9b41ea67338d5321d80ab9cf04157bd2c6ab2c9153bbc@178.104.163.135:30303?discport=30303
22
enode://d1248fa44b15412899558490176ef4ef02df23576c64167ddd72a005367b51dc67e001909a072436c808476ce0545846a9dd335ec5344d6c3f6aacd7067235ca@178.104.164.200:30303?discport=30303
33
enode://65ef228142a30659fa17aec35faad8721a3fb05aa42416d81a1780290d71c238cc7ae15d9e9dedfce9ce6a6a0a44f1b185b62c49bacd39daf87a1ddf68338070@178.104.171.252:30303?discport=30303
4+
enode://31ebdbe6409069c0930f91243208fa43fa85144e86c698f71132855b2b4166b26a0ca4e4b100395e7fb9f9c1e50b9f067682a5d5412f7ab491ed0df405b564a4@178.104.162.229:30303?discport=30303
45
enode://890f8406fde2a0d9e81d3c457ae540dba6dc181013aa0df1a81fc792bcc442c7f0992ce2dea269722198dd67609303396bbdd12cc4b1b938d536056e7ab6be12@178.104.170.143:30303?discport=30303
56
enode://c458decff8fb1b6f38982d3ce8d961cfadac4b4732c0a8b5740311821a4159c731529ecbabb00583e02d9dd43d6453fcaeeec73f301f7fbfff2e26df8a3f9e29@178.104.173.113:30303?discport=30303
67
enode://4f79d7b857298c02775d7b886113efeb95d6176591ec20080b3a245eb5a2644e7cffe4b5fb6ad9b8cc2290f5996e792ec3a67a1e39e17a0c3bd35bd42450e85c@178.104.166.39:30303?discport=30303
78
enode://2f84f7dc86693dc7d16711c9f886f4d90324bd81584d106b208b64d74622b76293c25f3e8d215e623e3ddc727154b72c98bbf2d693b4074d70c3ca32a81ce1cc@178.104.164.69:30303?discport=30303
89
enode://1953063c7a0c38c02b62451703e29523b49d76889625761d96a1ea63ad44a929c3f9fd8bf35a418cdd6cb6ddd32c8da98f163ad340cfe137b92f69111de484cf@178.104.171.24:30303?discport=30303
910
enode://f85b5262df321b5539045e392f027b26e337b03a790d07210ba957c8ed2a0da2c77d1b40411360cae39e7e3a9dded6b4ec60aad3ee702dcd8c17dbcddfcfa522@178.104.161.162:30303?discport=30303
11+
enode://9e9e52358bdce0411e01db92f2fd701a970cb68bb562eb8b12b9f04176128a9af96c0a693d2ca79c2b994a4d42d4b8b9645fa4b32f4e8cfdd05f6217dbc6a3a4@178.104.161.203:30303?discport=30303
1012
enode://7bb6d5a0c55c0f8eb4ecc59923a9ca18655f19575d08c573dbd264208d18614d40e36a2968df08bc94ec30fb4a40a919c070674d1b77bafc487eba6e388056a3@178.104.173.228:30303?discport=30303
1113
enode://323272bbbbc43f26221cc4300f95bb9f08975924f2d6b15a257c1be64ca2c5b2358e3f744d7791176ef53e8543b6cc1fad1bbfaf2d0b802b2a0537c02dcb15c5@178.104.167.130:30303?discport=30303
1214
enode://05b9411e389c8ed0269b37fb6de9a6787e8056545e108299755a9c32914d6a658aee9dab6e4f0fe35a0a64c731bf8ac51b9673cf05bfd6d5f82050feada63d62@178.104.173.253:30303?discport=30303

0 commit comments

Comments
 (0)