Skip to content

Commit 8550d43

Browse files
authored
Merge branch 'master' into qu0b/besu-rpc-limits
2 parents f2b1ad1 + 1b99549 commit 8550d43

35 files changed

+270
-351
lines changed

.github/workflows/hive-devnet-1.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ jobs:
122122
inputs.client_source
123123
}}
124124
steps:
125-
- uses: ethpandaops/hive-github-action/helpers/client-config@ef42b1df92b6984a473db62f5a76c32136eda6ce # v0.6.0
125+
- uses: ethpandaops/hive-github-action/helpers/client-config@09050fc75bae8a10b1876a0826ca4114ea9ed6e8 # v0.6.3
126126
if: github.event_name == 'schedule'
127127
name: "Client config: schedule"
128128
id: client_config_schedule
@@ -132,7 +132,7 @@ jobs:
132132
hive_version: "ethereum/hive@master"
133133
goproxy: ${{ env.GOPROXY }}
134134

135-
- uses: ethpandaops/hive-github-action/helpers/client-config@ef42b1df92b6984a473db62f5a76c32136eda6ce # v0.6.0
135+
- uses: ethpandaops/hive-github-action/helpers/client-config@09050fc75bae8a10b1876a0826ca4114ea9ed6e8 # v0.6.3
136136
if: github.event_name == 'workflow_dispatch'
137137
name: "Client config: workflow_dispatch"
138138
id: client_config_dispatch
@@ -179,13 +179,13 @@ jobs:
179179
'))}}
180180
steps:
181181
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
182-
- uses: ethpandaops/hive-github-action/helpers/self-hosted-runner-dependencies@ef42b1df92b6984a473db62f5a76c32136eda6ce # v0.6.0
182+
- uses: ethpandaops/hive-github-action/helpers/self-hosted-runner-dependencies@09050fc75bae8a10b1876a0826ca4114ea9ed6e8 # v0.6.3
183183
if: runner.environment != 'github-hosted'
184184
- uses: ethpandaops/actions/docker-login@a91b7a8dd6a264f5e845ac2aa52d2d6f24e6d01d
185185
with:
186186
username: ethpandaops
187187
password: ${{ secrets.DOCKERHUB_TOKEN }}
188-
- uses: ethpandaops/hive-github-action@ef42b1df92b6984a473db62f5a76c32136eda6ce # v0.6.0
188+
- uses: ethpandaops/hive-github-action@09050fc75bae8a10b1876a0826ca4114ea9ed6e8 # v0.6.3
189189
with:
190190
hive_repository: ${{ needs.prepare.outputs.hive_repo }}
191191
hive_version: ${{ needs.prepare.outputs.hive_tag }}

.github/workflows/hive-devnet-2-quick.yaml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ jobs:
116116
echo "eels_branch=$BRANCH" >> "$GITHUB_OUTPUT"
117117
echo "Using EELS branch: $BRANCH"
118118
119-
- uses: ethpandaops/hive-github-action/helpers/client-config@1aa8d73dad34de13afbb3113ab16c1a462d2fbc3 # v0.5.0
119+
- uses: ethpandaops/hive-github-action/helpers/client-config@09050fc75bae8a10b1876a0826ca4114ea9ed6e8 # v0.6.3
120120
name: "Client config"
121121
id: client_config
122122
with:
@@ -154,7 +154,9 @@ jobs:
154154
"go-ethereum",
155155
"nethermind",
156156
"nimbus-el",
157-
"erigon"
157+
"erigon",
158+
"besu",
159+
"reth"
158160
'))}}
159161
# TODO: add back "ethereum/eels/consume-rlp" when clients have bal-devnet-2 branch
160162
simulator: >-
@@ -163,13 +165,13 @@ jobs:
163165
'))}}
164166
steps:
165167
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
166-
- uses: ethpandaops/hive-github-action/helpers/self-hosted-runner-dependencies@1aa8d73dad34de13afbb3113ab16c1a462d2fbc3 # v0.5.0
168+
- uses: ethpandaops/hive-github-action/helpers/self-hosted-runner-dependencies@09050fc75bae8a10b1876a0826ca4114ea9ed6e8 # v0.6.3
167169
if: runner.environment != 'github-hosted'
168170
- uses: ethpandaops/actions/docker-login@a91b7a8dd6a264f5e845ac2aa52d2d6f24e6d01d
169171
with:
170172
username: ethpandaops
171173
password: ${{ secrets.DOCKERHUB_TOKEN }}
172-
- uses: ethpandaops/hive-github-action@1aa8d73dad34de13afbb3113ab16c1a462d2fbc3 # v0.5.0
174+
- uses: ethpandaops/hive-github-action@09050fc75bae8a10b1876a0826ca4114ea9ed6e8 # v0.6.3
173175
with:
174176
hive_repository: ${{ needs.prepare.outputs.hive_repo }}
175177
hive_version: ${{ needs.prepare.outputs.hive_tag }}

.github/workflows/hive-devnet-2.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ jobs:
139139
echo "eels_branch=$BRANCH" >> "$GITHUB_OUTPUT"
140140
echo "Using EELS branch: $BRANCH"
141141
142-
- uses: ethpandaops/hive-github-action/helpers/client-config@ef42b1df92b6984a473db62f5a76c32136eda6ce # v0.6.0
142+
- uses: ethpandaops/hive-github-action/helpers/client-config@09050fc75bae8a10b1876a0826ca4114ea9ed6e8 # v0.6.3
143143
if: github.event_name == 'schedule'
144144
name: "Client config: schedule"
145145
id: client_config_schedule
@@ -149,7 +149,7 @@ jobs:
149149
hive_version: "ethereum/hive@master"
150150
goproxy: ${{ env.GOPROXY }}
151151

152-
- uses: ethpandaops/hive-github-action/helpers/client-config@ef42b1df92b6984a473db62f5a76c32136eda6ce # v0.6.0
152+
- uses: ethpandaops/hive-github-action/helpers/client-config@09050fc75bae8a10b1876a0826ca4114ea9ed6e8 # v0.6.3
153153
if: github.event_name == 'workflow_dispatch'
154154
name: "Client config: workflow_dispatch"
155155
id: client_config_dispatch
@@ -199,13 +199,13 @@ jobs:
199199
'))}}
200200
steps:
201201
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
202-
- uses: ethpandaops/hive-github-action/helpers/self-hosted-runner-dependencies@ef42b1df92b6984a473db62f5a76c32136eda6ce # v0.6.0
202+
- uses: ethpandaops/hive-github-action/helpers/self-hosted-runner-dependencies@09050fc75bae8a10b1876a0826ca4114ea9ed6e8 # v0.6.3
203203
if: runner.environment != 'github-hosted'
204204
- uses: ethpandaops/actions/docker-login@a91b7a8dd6a264f5e845ac2aa52d2d6f24e6d01d
205205
with:
206206
username: ethpandaops
207207
password: ${{ secrets.DOCKERHUB_TOKEN }}
208-
- uses: ethpandaops/hive-github-action@ef42b1df92b6984a473db62f5a76c32136eda6ce # v0.6.0
208+
- uses: ethpandaops/hive-github-action@09050fc75bae8a10b1876a0826ca4114ea9ed6e8 # v0.6.3
209209
with:
210210
hive_repository: ${{ needs.prepare.outputs.hive_repo }}
211211
hive_version: ${{ needs.prepare.outputs.hive_tag }}

.github/workflows/lint-ansible.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
ansible-lint:
2020
runs-on: ubuntu-latest
2121
steps:
22-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
22+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2323
- uses: ./.github/actions/setup
2424
- name: Install ansible role/collection dependencies
2525
working-directory: ./ansible

.github/workflows/lint-helm.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
helm-lint:
2121
runs-on: ubuntu-latest
2222
steps:
23-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
23+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2424
- uses: ./.github/actions/setup
2525
- name: Check if kubernetes/*/* is not empty
2626
id: check-kubernetes-directory

.github/workflows/lint-terraform.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
terraform-lint:
2020
runs-on: ubuntu-latest
2121
steps:
22-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
22+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2323
- uses: ./.github/actions/setup
2424
- name: Lint
2525
working-directory: ./terraform

.github/workflows/syncoor-generate-index.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626

2727
steps:
2828
- name: Checkout repository
29-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
29+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
3030

3131
- name: Run Index Generator
3232
uses: ethpandaops/syncoor@master

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,6 @@ terraform.rc
3131
# Validator keys
3232
**/files/validator_keys/*
3333
network-configs/**/mnemonics.yaml
34+
35+
scripts/*.json
36+
scripts/*.txt

ansible/inventories/devnet-2/group_vars/all/images.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ default_ethereum_client_images:
1414
nethermind: ethpandaops/nethermind:bal-devnet-2
1515
reth: ethpandaops/reth:bal-devnet-2
1616
nimbusel: ethpandaops/nimbus-eth1:bal-devnet-2
17+
ethrex: ethpandaops/ethrex:bal-devnet-2
1718

1819
default_tooling_images:
1920
mev_boost: ethpandaops/mev-boost:develop
Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
# role: ethpandaops.general.bootstrap
2+
bootstrap_default_user_authorized_keys_github_team_el:
3+
- edg-l
4+
- JereSalo
5+
- ilitteri
6+
7+
# role: ethpandaops.general.ethereum_node
8+
ethereum_node_el: ethrex
9+
# role: ethpandaops.general.ethrex
10+
ethrex_container_name: execution
11+
ethrex_container_image: "{{ default_ethereum_client_images.ethrex }}"
12+
ethrex_container_env:
13+
VIRTUAL_HOST: "{{ ethereum_node_rcp_hostname }}"
14+
VIRTUAL_PORT: "{{ ethereum_node_el_ports_http_rpc | string }}"
15+
LETSENCRYPT_HOST: "{{ ethereum_node_rcp_hostname }}"
16+
RUST_LOG: "info"
17+
ethrex_container_volumes:
18+
- "{{ ethrex_datadir }}:/data"
19+
- "{{ ethrex_auth_jwt_path }}:/execution-auth.jwt:ro"
20+
- "{{ eth_testnet_config_dir }}:/network-config:ro"
21+
ethrex_container_command_extra_args:
22+
- --network=/network-config/genesis.json
23+
- --bootnodes={{ ethereum_el_bootnodes | join(',') }}
24+
- --builder.gas-limit=80000000
25+
26+
prometheus_config: |
27+
global:
28+
scrape_interval: 30s
29+
evaluation_interval: 30s
30+
scrape_timeout: 10s
31+
external_labels:
32+
instance: "{{ ethereum_network_name }}-{{ inventory_hostname }}"
33+
ip_address: "{{ ansible_host }}"
34+
network: "{{ ethereum_network_name }}"
35+
testnet: "{{ ethereum_network_name }}"
36+
execution_client: "{{ ethereum_node_el }}"
37+
consensus_client: "{{ ethereum_node_cl }}"
38+
supernode: "{{ ethereum_node_cl_supernode_enabled | bool | default(false) }}"
39+
remote_write:
40+
- queue_config:
41+
batch_send_deadline: 5s
42+
max_backoff: 500ms
43+
max_samples_per_send: 500
44+
min_backoff: 50ms
45+
max_shards: 100
46+
url: {{ prometheus_remote_push_url }}
47+
remote_timeout: 10s
48+
basic_auth:
49+
username: {{ prometheus_remote_write_username }}
50+
password: {{ prometheus_remote_write_password }}
51+
scrape_configs:
52+
- job_name: "prometheus"
53+
metrics_path: "/metrics"
54+
static_configs:
55+
- targets: ["localhost:9090"]
56+
labels:
57+
instance: "{{ ethereum_network_name }}-{{ inventory_hostname }}"
58+
- job_name: "node"
59+
metrics_path: "/metrics"
60+
static_configs:
61+
- targets: ["172.17.0.1:9100"]
62+
labels:
63+
instance: "{{ ethereum_network_name }}-{{ inventory_hostname }}"
64+
- job_name: "exporter"
65+
metrics_path: "/metrics"
66+
static_configs:
67+
- targets: ["ethereum-metrics-exporter:9090"]
68+
labels:
69+
instance: "{{ ethereum_network_name }}-{{ inventory_hostname }}"
70+
- job_name: "consensus_node"
71+
metrics_path: "/metrics"
72+
static_configs:
73+
- targets: ["{{ vars[ethereum_node_cl + '_container_name'] }}:{{ ethereum_node_cl_ports_metrics }}"]
74+
labels:
75+
instance: "{{ ethereum_network_name }}-{{ inventory_hostname }}"
76+
- job_name: "execution"
77+
metrics_path: "/metrics"
78+
static_configs:
79+
- targets: ["execution:{{ ethereum_node_el_ports_metrics }}"]
80+
labels:
81+
instance: "{{ ethereum_network_name }}-{{ inventory_hostname }}"

0 commit comments

Comments
 (0)