updating configs

ethpandaops · Feb 22, 2024 · 3defee0 · 3defee0
1 parent 7d49de7
commit 3defee0
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 16 deletions.
diff --git a/ansible/inventories/msf-1/group_vars/all/all.sops.yaml b/ansible/inventories/msf-1/group_vars/all/all.sops.yaml
@@ -16,9 +16,9 @@ secret_xatu_sentry:
     server_address: ENC[AES256_GCM,data:dqTkFwFWVmNoscaMVGma8Py3qNcmkkOXGUX6ix5QPAXr/a52EKse5sNgfZtsOJsl61v3,iv:HyHvJ0moeJyXWy85Z4j9lzcLGSCAwU3GykX9oI1u2zM=,tag:tXyO9njRJBnzotwC4RHAfw==,type:str]
     user: ENC[AES256_GCM,data:CP+oFlU3+Q==,iv:rZI0Uy9cSl1x83Ev00I8iu51vQ7tEw97R1ptAsHcJj4=,tag:OUmnkc1PXD8L5NA7043ZwQ==,type:str]
     password: ENC[AES256_GCM,data:MPiGyB7L6aJ0WmI0AZbsHntbMh1wROoQ8ek8iwELDHZTo3AI,iv:jg3K8YiaRIUopk4A3Kq5XUrzjWezto4wcmRCuLKoBrg=,tag:WswN/DtPEEVt82Mupf7sQA==,type:str]
-tx_fuzz_blobs_privkey: ENC[AES256_GCM,data:6/WK64huAS8K2OJ1YaxFNXX99IXOA6sC4zYUzJziBoiuysTtGRzkEnNeObIoTYk1Xxgokb2rALDNOBwt6LOtYQ==,iv:gVUleMlxMCZBel6izLLbRKG13CCIMHr/CMPgCOA1Hnw=,tag:1rLndkZXL8ScElvAAMb0cw==,type:str]
+tx_fuzz_blobs_privkey: ENC[AES256_GCM,data:OzEFFZVqmwmHsRcB/dOa7i/N90/6SWwLywCrmQYCHzY1qfMHAPLmME4cRskv4sVDAwVu7NR82h5quOhuPWFExg==,iv:uDK+gjfz/0IFTyi0vXKMeEpvXxvkYIHAtjuw6bjycHw=,tag:Y6/xybymoET+51nLBcv75g==,type:str]
 tx_fuzz_txs_privkey: ENC[AES256_GCM,data:6MD8VIRpnkvngbUE9J6NR7mD6biZkGjdq3rpM3VVub7bCqV3frETzOFzwaHi898LquRb+oMFQSZKINl1+63OZg==,iv:C+PN6gUXQdyy2J401xmGN092jzEvd3lx7+2UQ56N0/o=,tag:2ecaxuZN6YsO0cm+nmgYWw==,type:str]
-goomy_private_key: ENC[AES256_GCM,data:Gncg6q3pjrkkj07Y50kgvi8HG/Ljy/mA9s7QBZ9ju2iMx+jFhGO7JzWimh0zZzTr6+H/bQF1tVKP9b3ytrC3KQ==,iv:hvDdjVypYYblhIE9zZSDHmcA0ng0IC08+R9ihqxS9/E=,tag:YgONgoj8ChH6gUWYh7CBWQ==,type:str]
+goomy_private_key: ENC[AES256_GCM,data:2AIi2SQBEiNXH/gLqJQat0UPV28pF752rWfaKQyYT9Ioa8q10slIb7qSRPSwoLP/IvUMlNe5lkiFxYGuEazisw==,iv:7cEbMn8y3UlnL8ar2Kf3i+StfxoG/1yGnrJcUm95fRQ=,tag:6DcXA+MmJdkgGwkAZ2WmoA==,type:str]
 sops:
     kms: []
     gcp_kms: []
@@ -34,8 +34,8 @@ sops:
             cjFQSjNMdEtTZ3ZsVXF0S1YzUFpjSWMK9egMDPVbDH9wZ63Xphb71mEISx2Oen4T
             DVSVbwUAAWgyxR4TWC2hk/JjYZ3MKIFY65WVc4J1MB/ULq+l0HhttQ==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-02-13T12:17:58Z"
-    mac: ENC[AES256_GCM,data:y1seScyJ88D6WDk5oos8ZxrpA4L/+RekhqtkX96epTqpxSikxMTX8dZ78wWaykVWGjPLDr6afaQRAsxRJ37Whsup9bLbKaFe1DCCOe6v0XztGygDUSRZsR0jE5msAJNFXNNY/5O5rCwZ2vvhqsVMDnyXUUUYKufFOLvAl12xeTw=,iv:RF6lyxQdvtYSVecbqsh+nxhfCcH+hWdZH5CP0oVrDRc=,tag:3GCH5hXmkUeAiwxb5tU+HQ==,type:str]
+    lastmodified: "2024-02-22T13:39:33Z"
+    mac: ENC[AES256_GCM,data:obw4oEZtpZfPg59VwteTYHobsYBCZLExcsen8HN7d5uQ/sqNAdGTbNGQUwkALwbtaCDyB3ALcl4lXmDc4fG3Kjmrw0ylEJAsYmEz5Eaw7bqHV+Q5BgcoTDWiiOveDb2EPb58NW1Ma/zsWf/opwTFpz0gX65zVMjnL3EnggYGHt0=,iv:LS2VxUtB5mUVuNg3+XgmAfdhQCjvB2awJi5ro1Ule/4=,tag:cQ/Big8xRmf9RGcg7qvQzw==,type:str]
     pgp:
         - created_at: "2023-08-17T08:39:40Z"
           enc: |-

diff --git a/ansible/inventories/msf-1/group_vars/goomy.yaml b/ansible/inventories/msf-1/group_vars/goomy.yaml
@@ -1,7 +1,7 @@
 
 goomy_container_networks: "{{ docker_networks_shared }}"
 goomy_rpc_urls:
-  - "https://{{ secret_nginx_shared_basic_auth.name }}:{{ secret_nginx_shared_basic_auth.password }}@rpc.lighthouse-geth-1.{{ network_subdomain }}"
+  - "https://{{ secret_nginx_shared_basic_auth.name }}:{{ secret_nginx_shared_basic_auth.password }}@rpc.bootnode-1.{{ network_subdomain }}"
 
 goomy_scenario: "combined"
-goomy_extra_args: ["--sidecars", "6", "--throughput", "6", "--max-pending", "50"]
+goomy_extra_args: ["--sidecars", "2", "--throughput", "2", "--max-pending", "50"]
diff --git a/ansible/inventories/msf-1/group_vars/mev_boost.yaml b/ansible/inventories/msf-1/group_vars/mev_boost.yaml
@@ -6,4 +6,4 @@ mev_boost_container_env:
   BOOST_LISTEN_ADDR: 0.0.0.0:{{ mev_boost_server_port }}
   RELAYS: http://0xa55c1285d84ba83a5ad26420cd5ad3091e49c55a813eee651cd467db38a8c8e63192f47955e9376f6b42f6d190571cb5@mev-api.{{ network_subdomain }}:9062
 
-ethereum_node_mev_boost_enabled: false
+ethereum_node_mev_boost_enabled: true
diff --git a/ansible/inventories/msf-1/group_vars/tx_fuzz_blobs.yaml b/ansible/inventories/msf-1/group_vars/tx_fuzz_blobs.yaml
@@ -7,6 +7,6 @@ tx_fuzz_blobs_container_command:
   - --no-al
   - --rpc=https://{{ secret_nginx_shared_basic_auth.name }}:{{ secret_nginx_shared_basic_auth.password }}@rpc.lighthouse-geth-1.{{ network_subdomain }}
   - --sk={{ tx_fuzz_blobs_privkey }}
-  - --txcount=3
+  - --txcount=1
 
 tx_fuzz_container_networks: "{{ docker_networks_shared }}"
diff --git a/ansible/inventories/msf-1/inventory.ini b/ansible/inventories/msf-1/inventory.ini
@@ -4,7 +4,7 @@ localhost
 ethereum_network_name=dencun-msf-1
 
 [bootnode]
-bootnode-1 ansible_host=164.92.235.136 cloud=digitalocean cloud_region=fra1 
+bootnode-1 ansible_host=164.92.235.136 cloud=digitalocean cloud_region=fra1
 
 [lighthouse_besu]
 lighthouse-besu-1 ansible_host=139.59.8.249 cloud=digitalocean cloud_region=blr1 validator_start=1000 validator_end=1500
@@ -37,7 +37,7 @@ lodestar-nethermind-1 ansible_host=64.227.165.83 cloud=digitalocean cloud_region
 lodestar-reth-1 ansible_host=159.223.25.9 cloud=digitalocean cloud_region=fra1 validator_start=8500 validator_end=9000
 
 [mev_relay]
-mev-relay-1 ansible_host=68.183.214.212 cloud=digitalocean cloud_region=fra1 
+mev-relay-1 ansible_host=68.183.214.212 cloud=digitalocean cloud_region=fra1
 
 [nimbus_besu]
 nimbus-besu-1 ansible_host=159.65.149.227 cloud=digitalocean cloud_region=blr1 validator_start=7000 validator_end=7500
@@ -172,5 +172,25 @@ reth
 consensus_node
 execution_node
 
+[xatu]
+teku-besu-1
+teku-reth-1
+teku-nethermind-1
+lighthouse-erigon-1
+lighthouse-geth-1
+lodestar-besu-1
+lodestar-erigon-1
+lodestar-geth-1
+nimbus-geth-1
+nimbus-besu-1
+prysm-geth-1
+prysm-besu-1
+
+[mev_boost]
+teku-reth-1
+
+[tx_fuzz_blobs]
+bootnode-1
+
 #[beaconchain_explorer:children]
 #lighthouse_erigon
diff --git a/ansible/playbook.yaml b/ansible/playbook.yaml
@@ -95,11 +95,11 @@
             - "tech.pegasys.teku.statetransition.blobs"
 
 
-# - hosts: bootnode
-#   become: true
-#   roles:
-#     - role: ethpandaops.general.ethereum_inventory_web
-#       tags: [ethereum, eth_inventory_web, ethereum_inventory_web]
+- hosts: bootnode
+  become: true
+  roles:
+   - role: ethpandaops.general.ethereum_inventory_web
+     tags: [ethereum, eth_inventory_web, ethereum_inventory_web]
 
 - hosts: localhost
   roles:

diff --git a/network-configs/msf-1/chainspec.json b/network-configs/msf-1/chainspec.json
@@ -181,7 +181,7 @@
     "eip3198Transition": "0xC5D488",
     "eip3529Transition": "0xC5D488",
     "eip3541Transition": "0xC5D488",
-    "totalDifficulty": "0x0c70d808a128d7380000",
+    "terminalTotalDifficulty": "0x0c70d808a128d7380000",
     "eip4895TransitionTimestamp": "0x64373057",
     "eip3855TransitionTimestamp": "0x64373057",
     "eip3651TransitionTimestamp": "0x64373057",