Skip to content

Commit

Permalink
Merge pull request #39 from ethpandaops/bbusa/bump-temp
Browse files Browse the repository at this point in the history
fix: update some default values to be less work
  • Loading branch information
barnabasbusa authored Jun 7, 2024
2 parents 50edbc8 + 57e0099 commit 48d7db4
Show file tree
Hide file tree
Showing 22 changed files with 108 additions and 117 deletions.
2 changes: 1 addition & 1 deletion .tool-versions
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ helm 3.12.1
shellcheck 0.9.0
sops 3.7.3
terraform 1.6.4
python 3.11.4
python 3.12.3
ansible-lint 6.17.2
awscli 2.13.7
yq 4.35.2
2 changes: 2 additions & 0 deletions ansible/cleanup_ethereum.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
- "geth-init"
- "geth"
- "nethermind"
- "reth"
- "execution"
- "reth"
# Consensus layer clients
Expand All @@ -44,6 +45,7 @@
- "prysm"
- "teku-validator"
- "teku"
- "grandine"
- "beacon"
- "validator"
- "grandine"
Expand Down
12 changes: 6 additions & 6 deletions ansible/group_vars/all/defaults.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ global_ipv6_subnet_ranges:
# role: ethpandaops.general.bootstrap
bootstrap_user: root
bootstrap_default_user_authorized_keys_github:
# - barnabasbusa
# - parithosh
# - samcm
# - savid
# - skylenet
# - pk910
- barnabasbusa
- parithosh
- samcm
- savid
- skylenet
- pk910

# role: robertdebock.fail2ban
fail2ban_loglevel: INFO
Expand Down
14 changes: 7 additions & 7 deletions ansible/inventories/devnet-0/group_vars/all/all.sops.yaml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
secret_zerossl:
ACME_EAB_KID: ENC[AES256_GCM,data:Gg5E8yH+1Q==,iv:hGQ5GGezb+TNZ7jU3RsRWu0o4wIDNPmNV4J4fAp2BSw=,tag:6nY9DJ+QJEfCGBsx3FNgUQ==,type:str]
ACME_EAB_HMAC_KEY: ENC[AES256_GCM,data:A3v0MxxygA==,iv:qsI0dp2cNVEHgqvFUKiOM542pjG7ZbzHexSXprMBw2E=,tag:Y7xsvVwRV7PQurO7QeNiWw==,type:str]
ACME_EAB_KID: ENC[AES256_GCM,data:OPsYVkpJ/ISkZcUDdZGLOcNUD2jfHg==,iv:WkDvniP4a1cjpRTQqT0MnJo9UkIp+iwJ3NPSTb8sFsU=,tag:ZjX5UFuCOd7zR9fOP0tcQg==,type:str]
ACME_EAB_HMAC_KEY: ENC[AES256_GCM,data:36+HfiQnMolcxAQHxsTEN2o0WpBYeoSFRe7RjoxnYIcsKwHrUVGNF2TtDczfXK7kZhsK2ZMuK+J4j5IfJVxsdfhJ07jJtIKGkRavo7Evb/+0IJt/sgs=,iv:Evd5W8ORLtUa3sSl6XeaqY69p0FAmpiFmjXDlP+XbUY=,tag:ZyW6rwzl2+I/bTKLeYDZyA==,type:str]
secret_prometheus_remote_write:
username: ENC[AES256_GCM,data:zpGvEsv1Lrk=,iv:OVx9miE7xFRL/rBM6dkc+hnBYqPuRJTWhhzQ4T/hsmU=,tag:o+ulpT+Hxx8pmp7O6YPdlw==,type:str]
password: ENC[AES256_GCM,data:14dBuUrGzQ==,iv:sOc8R7kQ0mxeUxTkjVIBCKhr+lvE7W2i3xfkmFlHj4U=,tag:1GhjGilrb32jr4wFVMXZ1w==,type:str]
secret_nginx_shared_basic_auth:
name: ENC[AES256_GCM,data:bjlM,iv:DiOGlqfOfrDlt7X4OGY27OYlkDDEHguv+kg1zRhBek0=,tag:ZPlucwl2PNXeXcOc8PmCBQ==,type:str]
password: ENC[AES256_GCM,data:NdtJvQ==,iv:qTDUrwmpKeh0yJB+GlJO7eZ2w0GHn8Lhu6wPS9Twc/g=,tag:QRtMmdNUCmm8XNjPQjqSnQ==,type:str]
secret_ethstats: ENC[AES256_GCM,data:WooVcg7hnyw=,iv:oChffj5kkh5901EC995UMnY8QmQAZtCycuHuF895vfU=,tag:WgwJwBjqYR/5d4cjukuM/A==,type:str]
secret_genesis_mnemonic: ENC[AES256_GCM,data:23GmxqsbgvBVxqzp3dV8FlhAO7u3PKMP2FnP2lbk/tmjHQ6k7SHOnitqyWhJvyBjDVdofI4B0cw+0jVtvdnA6akuamfiT1qasZEZCpsQt78HnDa7VSBWeMEkyJgaRMaiG+uCsMbEZ/OX5O7JoIYDx9+QZss1zGu4dX5soTWpto+hUf2o9Nfm7Alp4go53iuxoipdsDeKCkyHegozLP2DdA==,iv:9X2DYpWHroJMFRS2FXos5gIVdybLdRiLi6RYoYnRhx8=,tag:h+EIIeNpzw34ro5lzcSggw==,type:str]
password: ENC[AES256_GCM,data:ocIOy4nOHWVmW08S2hb7,iv:yvC4WWOOJvVeegWl0uj2P8yxcfBgNrvYSm5xUB5qux8=,tag:+8MDMeB7gKlCApMv5YrBGQ==,type:str]
secret_ethstats: ENC[AES256_GCM,data:sai7nuMTAtnMZ34=,iv:WHYxXgQ2LdLGMKxvagmT3UhmQl/dRucpyhYzZxHvLHc=,tag:dK0cqr61PwR6Yla8OKGjDg==,type:str]
secret_genesis_mnemonic: ENC[AES256_GCM,data:n1zuDj+DDsv8hB07Z7Ilb+JyhL4vuDSXRmvWl811WPD1X2SEPLZJn4Yktxj5P50biPgdg1vTal2MWSX+GK5xqTJu67FbbyNSm9IW7A5np3izxy7J5rVQ7nWpjGEN3lEgduh+WUwpfbkCt/0DLYd5cPVZ0KV5lmIH6Evnug29ORblyi1CkOFhHXWVmqLnowIf/1yWBtH6G+kkaNni63YI+gIZXI1T,iv:EaQilsQbnswzCqkWSK9G/R3wwmMRDwWZDjdZQ1fUZRk=,tag:03+lA5X1gO1V/+pGipP2hA==,type:str]
secret_mev_signingkey: ENC[AES256_GCM,data:7xug6L4MXETqWb7cmZS6BpAxBercs4mnJEg1NKp+LwZjCWl5pPAlTbfZASwXVBMo24Xoqi9/FbjeJML6WtaJ2Q==,iv:UGcVz81+wBNdb4cmkg9t4tSamqOaBUfWk6glh/6jUA8=,tag:W5Y00+vamA2tq2tEpAEhQA==,type:str]
secret_mev_flood_private_key: ENC[AES256_GCM,data:2vVJ+N0XLer202Dc5J2HVjTEW6XUa+LpmhS/mo2brt+qzabraTSaD7d4P5rVqbovW+W5Je5FdDr4s7rScyn/RA==,iv:1qNfUVqJ9eebRmA4Ly59KFR9WmaQ8eelSvNLJAWCJ10=,tag:knDhqt3zak1OEsHi2nQ3oA==,type:str]
secret_mev_flood_user_key: ENC[AES256_GCM,data:+XXSXUZdEKClV09Pfy/YWULlRl+5njMWcKOvPwuF6YUWHP2spLbJa8BnOimxxi6v7ioGMXEZW7XROVqqQiY4Aw==,iv:efkOBcrGeGJwT91SR+2wFI/fpnWASQeqjH3MJSIQBAA=,tag:KjJMfc7VgZkc8cy/IHrNNA==,type:str]
Expand All @@ -26,8 +26,8 @@ sops:
azure_kv: []
hc_vault: []
age: []
lastmodified: "2024-03-12T10:09:43Z"
mac: ENC[AES256_GCM,data:0KM0rp4RqsMWC9wUcyT629sIJl8QsOaYPZySWub8AfBhtVR1IfAH0jw9mzAjb7mmj+gX4sf6dH9YiYxRdBjLG6q0b7p5GyBH0HZ7xAzcfv6wYREGyQh+jGlh6uYsBtrXbOcWleH16DBGgsXpZmGsXxkp5+H6bjsfPN24oIQxkMo=,iv:0ZgxcP3UchRxnaGJeTVDSrjORVkMT5PqNwnhe3gilXI=,tag:/ztFtfrKos+k1lP+Ppa6MQ==,type:str]
lastmodified: "2024-05-29T12:30:12Z"
mac: ENC[AES256_GCM,data:Nfj+/02VFQjrxExUfV/6o94jOHbTXAMtcV3S6ow3j4mjHSuz5SjPQkaOo+6NepLBVRrUXP2V9OPfKths0901MAmkrFxKXqNVx3Aj8omgvl3N8JdrFMQGOibJjeBcXmNy5ah00McHhwsPFPOHlheE3ayuWo8TcqeUJPAKq1BTY6M=,iv:GpvsuPP1/8ShZawDU2leyqj+q97bcUdIciJWNHxlCMw=,tag:o9X4LoHdYdZB/sXUVqqOqg==,type:str]
pgp:
- created_at: "2023-09-28T11:48:21Z"
enc: |-
Expand Down
20 changes: 2 additions & 18 deletions ansible/inventories/devnet-0/group_vars/all/all.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,34 +51,18 @@ ethereum_genesis_generator_config_files:
cl/mnemonics.yaml: "{{ lookup('ansible.builtin.url', 'https://raw.githubusercontent.com/ethpandaops/ethereum-genesis-generator/v{{ethereum_genesis_generator_version}}/config-example/cl/mnemonics.yaml', split_lines=false) }}" # noqa yaml[line-length]
el/genesis-config.yaml: "{{ lookup('ansible.builtin.url', 'https://raw.githubusercontent.com/ethpandaops/ethereum-genesis-generator/v{{ethereum_genesis_generator_version}}/config-example/el/genesis-config.yaml', split_lines=false) }}" # noqa yaml[line-length]
values.env: |-
export PRESET_BASE="mainnet"
export CHAIN_ID="{{ ethereum_genesis_chain_id }}"
export DEPOSIT_CONTRACT_ADDRESS="0x6f22fFbC56eFF051aECF839396DD1eD9aD6BBA9D"
export EL_AND_CL_MNEMONIC="{{ ethereum_genesis_mnemonic }}"
export CL_EXEC_BLOCK="0"
export DEPOSIT_CONTRACT_BLOCK="0x0000000000000000000000000000000000000000000000000000000000000000"
export NUMBER_OF_VALIDATORS=200
export GENESIS_FORK_VERSION="0x10{{ ethereum_genesis_fork_version_suffix }}"
export ALTAIR_FORK_VERSION="0x20{{ ethereum_genesis_fork_version_suffix }}"
export BELLATRIX_FORK_VERSION="0x30{{ ethereum_genesis_fork_version_suffix }}"
export CAPELLA_FORK_VERSION="0x40{{ ethereum_genesis_fork_version_suffix }}"
export DENEB_FORK_VERSION="0x50{{ ethereum_genesis_fork_version_suffix }}"
export ELECTRA_FORK_VERSION="0x60{{ ethereum_genesis_fork_version_suffix }}"
export ELECTRA_FORK_EPOCH="5"
export EIP7594_FORK_VERSION="0x70{{ ethereum_genesis_fork_version_suffix }}"
export EIP7594_FORK_EPOCH="999999"
export WITHDRAWAL_TYPE="0x00"
export WITHDRAWAL_ADDRESS={{ ethereum_genesis_validator_bls_change_execution_address }}
export BEACON_STATIC_ENR=""
export GENESIS_TIMESTAMP={{ ethereum_genesis_timestamp }}
export GENESIS_DELAY={{ ethereum_genesis_timedelay }}
export SLOT_DURATION_IN_SECONDS=12
export MAX_PER_EPOCH_ACTIVATION_CHURN_LIMIT=8
export CHURN_LIMIT_QUOTIENT=65536
export EJECTION_BALANCE=16000000000
export ETH1_FOLLOW_DISTANCE=2048
export MIN_VALIDATOR_WITHDRAWABILITY_DELAY=256
export SHARD_COMMITTEE_PERIOD=256
ethereum_genesis_validator_keys_output_dir: "{{ ansible_inventory_sources[0] | dirname }}/files/validator_keys"
ethereum_genesis_validator_bls_change_execution_address: "{{ ethereum_node_cl_validator_fee_recipient }}"
ethereum_genesis_validator_keyranges: >-
Expand Down
5 changes: 4 additions & 1 deletion ansible/inventories/devnet-0/group_vars/all/images.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,7 @@ default_tooling_images:
blobscan_indexer: blossomlabs/blobscan-indexer:latest
dora: ethpandaops/dora:master
dugtrio: ethpandaops/dugtrio:latest
ethereum_genesis_generator: ethpandaops/ethereum-genesis-generator:3.1.5
ethereum_genesis_generator: ethpandaops/ethereum-genesis-generator:3.2.1
mev_boost: flashbots/mev-boost:latest
mev_relay: flashbots/mev-boost-relay:latest
mev_builder: flashbots/mev-builder:latest
18 changes: 9 additions & 9 deletions ansible/inventories/devnet-0/group_vars/besu.yaml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# role: ethpandaops.general.bootstrap
bootstrap_default_user_authorized_keys_github_team_el: []
# - garyschulte
# - jflo
# - fab-10
# - matkt
# - gezero
# - siladu
# - pinges
# - jframe
bootstrap_default_user_authorized_keys_github_team_el:
- garyschulte
- jflo
- fab-10
- matkt
- gezero
- siladu
- pinges
- jframe

# role: ethpandaops.general.ethereum_node
ethereum_node_el: besu
Expand Down
9 changes: 8 additions & 1 deletion ansible/inventories/devnet-0/group_vars/bootnode.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ teku_container_command_extra_args:
- --logging=info
- --Xlog-include-p2p-warnings-enabled
- --metrics-block-timing-tracking-enabled
# - --initial-state={{ checkpoint_sync_url }} # Need to remove genesis.ssz if using this

# role: ethpandaops.general.geth
geth_container_name: execution
Expand All @@ -48,11 +47,19 @@ geth_container_command_extra_args:
- --http.vhosts=*
- --networkid={{ ethereum_network_id }}
- --syncmode=full
- --gcmode=archive
- --state.scheme=hash
- --ethstats={{ inventory_hostname }}:{{ ethstats_secret }}@{{ ethstats_url }}
geth_init_custom_network: true
geth_init_custom_network_genesis_file: "{{ eth_testnet_config_dir }}/genesis.json"
geth_container_pull: true

geth_init_custom_network_container_command:
- --datadir=/data
- init
- --state.scheme=hash
- /genesis.json

# role: ethpandaops.general.prometheus
prometheus_remote_push_url: https://victoriametrics.ethdevops.io/insert/0/prometheus/api/v1/write
prometheus_remote_write_username: "{{ secret_prometheus_remote_write.username }}"
Expand Down
6 changes: 3 additions & 3 deletions ansible/inventories/devnet-0/group_vars/erigon.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# role: ethpandaops.general.bootstrap
bootstrap_default_user_authorized_keys_github_team_el: []
# - Giulio2002
# - yperbasis
bootstrap_default_user_authorized_keys_github_team_el:
- Giulio2002
- yperbasis

# role: ethpandaops.general.ethereum_node
ethereum_node_el: erigon
Expand Down
10 changes: 5 additions & 5 deletions ansible/inventories/devnet-0/group_vars/ethereumjs.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# role: ethpandaops.general.bootstrap
bootstrap_default_user_authorized_keys_github_team_el: []
# - g11tech
# - acolytec3
# - holgerd77
# - jochem-brouwer
bootstrap_default_user_authorized_keys_github_team_el:
- g11tech
- acolytec3
- holgerd77
- jochem-brouwer

# role: ethpandaops.general.ethereum_node
ethereum_node_el: ethereumjs
Expand Down
12 changes: 5 additions & 7 deletions ansible/inventories/devnet-0/group_vars/geth.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# role: ethpandaops.general.bootstrap
bootstrap_default_user_authorized_keys_github_team_el: []
# - mariusVanDerWijden
# - holiman
# - karalabe
# - g11tech
bootstrap_default_user_authorized_keys_github_team_el:
- mariusVanDerWijden
- holiman
- karalabe
- g11tech

# role: ethpandaops.general.ethereum_node
ethereum_node_el: geth
Expand All @@ -18,7 +18,6 @@ geth_container_env:
geth_container_command_extra_args:
- --http.api=eth,net,web3,debug,admin
- --http.vhosts=*
- --state.scheme=path
- --networkid={{ ethereum_network_id }}
- --syncmode=full
- --bootnodes={{ ethereum_el_bootnodes | join(',') }}
Expand All @@ -28,7 +27,6 @@ geth_init_custom_network_genesis_file: "{{ eth_testnet_config_dir }}/genesis.jso
geth_init_custom_network_container_command:
- --datadir=/data
- init
- --state.scheme=path
- /genesis.json
geth_container_pull: true

Expand Down
4 changes: 2 additions & 2 deletions ansible/inventories/devnet-0/group_vars/grandine.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# role: ethpandaops.general.bootstrap
bootstrap_default_user_authorized_keys_github_team_cl: []
# - sauliusgrigaitis
bootstrap_default_user_authorized_keys_github_team_cl:
- sauliusgrigaitis

# role: validator_keys
validator_keys_sync_files:
Expand Down
18 changes: 8 additions & 10 deletions ansible/inventories/devnet-0/group_vars/lighthouse.yaml
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
# role: ethpandaops.general.bootstrap
bootstrap_default_user_authorized_keys_github_team_cl: []
# - AgeManning
# - ethdreamer
# - paulhauner
# - pawanjay176
# - michaelsproul
# - potuz
# - nisdas
# - antondlr
# - realbigsean
bootstrap_default_user_authorized_keys_github_team_cl:
- AgeManning
- ethdreamer
- paulhauner
- pawanjay176
- michaelsproul
- antondlr
- realbigsean

# role: validator_keys
validator_keys_sync_files:
Expand Down
13 changes: 6 additions & 7 deletions ansible/inventories/devnet-0/group_vars/lodestar.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
# role: ethpandaops.general.bootstrap
bootstrap_default_user_authorized_keys_github_team_cl: []
# - dapplion
# - wemeetagain
# - tuyennhv
# - g11tech
# - philknows
# - nazarhussain
bootstrap_default_user_authorized_keys_github_team_cl:
- wemeetagain
- tuyennhv
- g11tech
- philknows
- nazarhussain

# role: validator_keys
validator_keys_sync_files:
Expand Down
2 changes: 1 addition & 1 deletion ansible/inventories/devnet-0/group_vars/mev_boost.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
mev_boost_container_image: flashbots/mev-boost:1.6.4844.dev5
mev_boost_container_image: "{{ default_ethereum_client_images.mev_boost }}"

mev_boost_container_env:
GENESIS_FORK_VERSION: "0x10{{ ethereum_genesis_fork_version_suffix }}"
Expand Down
21 changes: 10 additions & 11 deletions ansible/inventories/devnet-0/group_vars/nethermind.yaml
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
# role: ethpandaops.general.bootstrap
bootstrap_default_user_authorized_keys_github_team_el: []
# - MarekM25
# - kamilchodola
# - LukaszRozmej
# - marcindsobczak
# - asdacap
# - rubo
# - smartprogrammer93
# - g11tech
# - cbermudez97
# - flcl42
bootstrap_default_user_authorized_keys_github_team_el:
- MarekM25
- kamilchodola
- LukaszRozmej
- marcindsobczak
- asdacap
- rubo
- smartprogrammer93
- cbermudez97
- flcl42

# role: ethpandaops.general.ethereum_node
ethereum_node_el: nethermind
Expand Down
12 changes: 6 additions & 6 deletions ansible/inventories/devnet-0/group_vars/nimbus.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# role: ethpandaops.general.bootstrap
bootstrap_default_user_authorized_keys_github_team_cl: []
# - zah
# - tersec
# - etan-status
# - arnetheduck
bootstrap_default_user_authorized_keys_github_team_cl:
- zah
- tersec
- etan-status
- arnetheduck

# role: validator_keys
validator_keys_sync_files:
Expand All @@ -21,7 +21,7 @@ validator_bls_sync_files:
# role: ethpandaops.general.ethereum_node
ethereum_node_cl: nimbus

# Checkpointsync
# Checkpointsync
nimbus_checkpoint_autoremove_enabled: true

# role: ethpandaops.general.nimbus
Expand Down
11 changes: 6 additions & 5 deletions ansible/inventories/devnet-0/group_vars/prysm.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
# role: ethpandaops.general.bootstrap
bootstrap_default_user_authorized_keys_github_team_cl: []
# - kasey
# - terencechain
# - potuz
# - nisdas
bootstrap_default_user_authorized_keys_github_team_cl:
- kasey
- terencechain
- potuz
- nisdas
- prestonvanloon

# role: validator_keys
validator_keys_sync_files:
Expand Down
4 changes: 2 additions & 2 deletions ansible/inventories/devnet-0/group_vars/reth.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# role: ethpandaops.general.bootstrap
bootstrap_default_user_authorized_keys_github_team_el: []
# - gakonst
bootstrap_default_user_authorized_keys_github_team_el:
- gakonst

# role: ethpandaops.general.ethereum_node
ethereum_node_el: reth
Expand Down
19 changes: 10 additions & 9 deletions ansible/inventories/devnet-0/group_vars/teku.yaml
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
# role: ethpandaops.general.bootstrap
bootstrap_default_user_authorized_keys_github_team_cl: []
# - tbenr
# - ajsutton
# - rolfyone
# - siladu
# - lucassaldanha
# - StefanBratanov
# - zilm13
# - mehdi-aouadi
bootstrap_default_user_authorized_keys_github_team_cl:
- tbenr
- ajsutton
- rolfyone
- siladu
- lucassaldanha
- StefanBratanov
- zilm13
- mehdi-aouadi

# role: validator_keys
validator_keys_sync_files:
- src: "{{ inventory_dir }}/files/validator_keys/{{ inventory_hostname }}/teku-keys/"
Expand Down
Loading

0 comments on commit 48d7db4

Please sign in to comment.