bump

ethpandaops · Oct 23, 2023 · a3da3bf · a3da3bf
1 parent 9738caf
commit a3da3bf
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 14 deletions.
diff --git a/.tool-versions b/.tool-versions
@@ -5,3 +5,4 @@ sops 3.7.3
 terraform 1.5.4
 python 3.11.4
 ansible-lint 6.17.2
+yq 4.35.2
diff --git a/README.md b/README.md
@@ -49,4 +49,5 @@ Here's a table of where the keys are used
 | 4             | faucet-1          | ✅               |                | Faucet 1                          |
 | 5             | faucet-2          | ✅               |                | Faucet 2                          |
 | 6             | mev_flood_private_key | ✅           |                | Spams mev-able txs on the network |
-| 7-29          |                   |                  |                |                                   |
+| 7-29          | manual-deposits   |   ✅             |                | Used to make manual deposits      |
+| 8-29          | available         |                  |                |                                   |
diff --git a/ansible/inventories/devnet-10/group_vars/besu.yaml b/ansible/inventories/devnet-10/group_vars/besu.yaml
@@ -9,6 +9,7 @@ bootstrap_default_user_authorized_keys_github_team_el:
   - pinges
   - jframe
   - macfarla
+  - usmansaleem
 
 # role: ethpandaops.general.ethereum_node
 ethereum_node_el: besu

diff --git a/ansible/inventories/devnet-10/host_vars/mev-relay-1.yaml b/ansible/inventories/devnet-10/host_vars/mev-relay-1.yaml
@@ -14,9 +14,8 @@ mev_relay_docker_networks:
 beacon_endpoint: http://beacon:5052
 mev_img: flashbots/mev-boost-relay:0.28.0a2
 
-# NEEDS UPDATING FOR NEW CHAIN!
-gen_validators_root: 0x6079c0b803059b77610f0198ce4b4c459cf43afd4992359084894f719d40faba
-
+gen_validators_root: 0x4959da6d511502e1c2a16a769f8257ab2404d019002729a7d9bd33a553764833
+ethereum_genesis_fork_version_suffix: 416294
 # ------------------------------------------------------------------
 # mev-relay-housekeeper
 mev_relay_housekeeper_enabled: true
@@ -146,7 +145,6 @@ ethereum_node_el: geth
 
 # role: ethpandaops.general.geth
 geth_container_name: execution
-geth_container_image: "{{ default_ethereum_client_images.geth }}"
 geth_container_env:
   VIRTUAL_HOST: "{{ ethereum_node_rcp_hostname }}"
   VIRTUAL_PORT: "{{ ethereum_node_el_ports_http_rpc | string }}"
@@ -164,6 +162,7 @@ geth_container_command_extra_args:
   - --syncmode=full
   - --bootnodes={{ ethereum_el_bootnodes | join(',') }}
   - --ethstats={{ inventory_hostname }}:{{ ethstats_secret }}@{{ ethstats_url }}
+  - --builder
   - --builder.remote_relay_endpoint=http://mev-api.{{ network_subdomain }}:9062
   - --builder.beacon_endpoints=http://beacon:5052
   - --builder.bellatrix_fork_version=0x30{{ ethereum_genesis_fork_version_suffix }}
@@ -174,7 +173,7 @@ geth_init_custom_network: true
 geth_init_custom_network_genesis_file: "{{ eth_testnet_config_dir }}/genesis.json"
 geth_container_pull: true
 
-geth_container_image: flashbots/builder:1.13.2.4844.dev4
+geth_container_image: flashbots/builder:v1.13.2.4844.dev5+4d161de
 
 ethereum_node_json_rpc_snooper_engine_enabled: false
 
diff --git a/ansible/inventories/devnet-10/host_vars/prysm-besu-1-arm.yaml b/ansible/inventories/devnet-10/host_vars/prysm-besu-1-arm.yaml
@@ -0,0 +1,2 @@
+prysm_container_image: gcr.io/prylabs-dev/prysm/validator:devnet-10
+prysm_validator_container_image: gcr.io/prylabs-dev/prysm/beacon-chain:devnet-10
diff --git a/ansible/inventories/devnet-10/host_vars/teku-besu-2.yaml b/ansible/inventories/devnet-10/host_vars/teku-besu-2.yaml
@@ -0,0 +1,4 @@
+# teku_container_validator_args:
+#   - --external-signer
+#   - --validators-proposer-default-fee-recipient={{ teku_validator_fee_recipient }}
+#   - --validators-keystore-locking-enabled=false
diff --git a/ansible/inventories/devnet-10/inventory.ini b/ansible/inventories/devnet-10/inventory.ini
@@ -4,8 +4,8 @@ localhost
 ethereum_network_name=dencun-devnet-10
 
 [bootnode]
-bootnode-1 ansible_host=137.184.56.116 cloud=digitalocean cloud_region=nyc1 
-bootnode-2 ansible_host=134.209.83.7 cloud=digitalocean cloud_region=ams3 
+bootnode-1 ansible_host=137.184.56.116 cloud=digitalocean cloud_region=nyc1
+bootnode-2 ansible_host=134.209.83.7 cloud=digitalocean cloud_region=ams3
 
 [lighthouse_besu]
 lighthouse-besu-1 ansible_host=159.223.100.48 cloud=digitalocean cloud_region=nyc1 validator_start=225000 validator_end=230000
@@ -64,7 +64,7 @@ lodestar-nethermind-5 ansible_host=159.223.126.140 cloud=digitalocean cloud_regi
 lodestar-reth-1 ansible_host=157.230.9.218 cloud=digitalocean cloud_region=nyc1 validator_start=332000 validator_end=333000
 
 [mev_relay]
-mev-relay-1 ansible_host=24.144.96.166 cloud=digitalocean cloud_region=nyc1 
+mev-relay-1 ansible_host=24.144.96.166 cloud=digitalocean cloud_region=nyc1
 
 [nimbus_besu]
 nimbus-besu-1 ansible_host=137.184.210.238 cloud=digitalocean cloud_region=nyc1 validator_start=305000 validator_end=310000
@@ -124,7 +124,7 @@ prysm-reth-1 ansible_host=146.190.212.16 cloud=digitalocean cloud_region=nyc1 va
 
 [teku_besu]
 teku-besu-1 ansible_host=159.223.134.50 cloud=digitalocean cloud_region=nyc1 validator_start=285000 validator_end=290000
-teku-besu-2 ansible_host=64.225.71.80 cloud=digitalocean cloud_region=ams3 validator_start=290000 validator_end=295000
+teku-besu-2 ansible_host=64.225.71.80 cloud=digitalocean cloud_region=ams3 validator_start=290000 validator_end=295000 #(Web3signer)
 
 [teku_erigon]
 teku-erigon-1 ansible_host=159.223.118.242 cloud=digitalocean cloud_region=nyc1 validator_start=295000 validator_end=300000

diff --git a/ansible/requirements.yaml b/ansible/requirements.yaml
@@ -17,6 +17,6 @@ collections:
   - name: community.sops
     version: 1.6.0
   - name: ethpandaops.general
-    source: https://github.com/ethpandaops/ansible-collection-general.git,bbusa/mev-boost
+    source: https://github.com/ethpandaops/ansible-collection-general.git,master
     type: git
   - name: kubernetes.core
diff --git a/scripts/run.zsh b/scripts/run.zsh
@@ -1,6 +1,6 @@
 #!/bin/zsh
 node="lighthouse-geth-1"
-network="devnet-9"
+network="devnet-10"
 domain="ethpandaops.io"
 prefix="dencun"
 sops_name=$(sops --decrypt ../ansible/inventories/$network/group_vars/all/all.sops.yaml | yq -r '.secret_nginx_shared_basic_auth.name')
@@ -324,7 +324,7 @@ for arg in "${command[@]}"; do
       ;;
     "send_blob")
       # Get a private key from a mnemonic
-      privatekey=$(ethereal hd keys --path="m/44'/60'/0'/0/3" --seed="$sops_mnemonic" | awk '/Private key/{print $NF}')
+      privatekey=$(ethereal hd keys --path="m/44'/60'/0'/0/7" --seed="$sops_mnemonic" | awk '/Private key/{print $NF}')
       if [[ -z "${command[2]}" ]]; then
         # sending only one blob
         echo "Sending a blob"
@@ -353,7 +353,7 @@ for arg in "${command[@]}"; do
         echo "  Example: ${0} deposit 0 10"
         exit;
       else
-        deposit_path="m/44'/60'/0'/0/3"
+        deposit_path="m/44'/60'/0'/0/7"
         privatekey=$(ethereal hd keys --path="$deposit_path" --seed="$sops_mnemonic" | awk '/Private key/{print $NF}')
         publickey=$(ethereal hd keys --path="$deposit_path" --seed="$sops_mnemonic" | awk '/Ethereum address/{print $NF}')
         fork_version=$(curl -s $bn_endpoint/eth/v1/beacon/genesis | jq -r '.data.genesis_fork_version')

diff --git a/setup.sh b/setup.sh
@@ -6,6 +6,7 @@ asdf plugin add shellcheck https://github.com/luizm/asdf-shellcheck.git
 asdf plugin add sops https://github.com/feniix/asdf-sops.git
 asdf plugin add terraform https://github.com/asdf-community/asdf-hashicorp.git
 asdf plugin-add helm https://github.com/Antiarchitect/asdf-helm.git
+asdf plugin-add yq https://github.com/sudermanjr/asdf-yq.git
 asdf plugin-add python
 
 asdf install
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		prysm_container_image: gcr.io/prylabs-dev/prysm/validator:devnet-10
		prysm_validator_container_image: gcr.io/prylabs-dev/prysm/beacon-chain:devnet-10