Skip to content

Commit

Permalink
Updated config files
Browse files Browse the repository at this point in the history
  • Loading branch information
kevinbogner committed Jul 5, 2023
1 parent 44b0191 commit 5849b91
Show file tree
Hide file tree
Showing 12 changed files with 70,682 additions and 66,504 deletions.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
default_ethereum_client_images:
besu: kevinbogner/6110-besu:0403
lighthouse: kevinbogner/6110-lh:0410
besu: ethpandaops/besu:eip-4844-6110-04dc4d2
lighthouse: kevinbogner/6110-lh:v1.1.2debug

default_tooling_images:
ethereum_metrics_exporter: ethpandaops/ethereum-metrics-exporter:0.21.0
3 changes: 3 additions & 0 deletions ansible/inventories/deposit-devnet-1/group_vars/besu.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ besu_container_command_extra_args:
- --rpc-http-api=ADMIN,DEBUG,ETH,MINER,NET,TRACE,TXPOOL,WEB3
- --sync-mode=FULL
- --data-storage-format=BONSAI
- --tx-pool-limit-by-account-percentage=1
- --kzg-trusted-setup=/network-config/trusted_setup.txt
- --rpc-http-max-active-connections=250

# role: ethpandaops.general.prometheus
prometheus_config: |
Expand Down
5 changes: 5 additions & 0 deletions ansible/inventories/deposit-devnet-1/group_vars/bootnode.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ lighthouse_container_volumes:
lighthouse_container_command_extra_args:
- --testnet-dir=/network-config
- --debug-level=debug
- --prune-payloads=false
- --dummy-eth1
lighthouse_validator_container_volumes:
- "{{ lighthouse_validator_datadir }}:/validator-data"
- "{{ eth_testnet_config_dir }}:/network-config:ro"
Expand Down Expand Up @@ -71,6 +73,9 @@ besu_container_command_extra_args:
- --rpc-http-api=ADMIN,DEBUG,ETH,MINER,NET,TRACE,TXPOOL,WEB3
- --sync-mode=FULL
- --data-storage-format=BONSAI
- --tx-pool-limit-by-account-percentage=1
- --kzg-trusted-setup=/network-config/trusted_setup.txt
- --rpc-http-max-active-connections=250

# role: ethpandaops.general.prometheus
prometheus_config: |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ lighthouse_container_command_extra_args:
- --testnet-dir=/network-config
- --boot-nodes={{ ethereum_cl_bootnodes | join(',') }}
- --debug-level=info
- --prune-payloads=false
- --dummy-eth1
lighthouse_validator_container_volumes:
- "{{ lighthouse_validator_datadir }}:/validator-data"
- "{{ eth_testnet_config_dir }}:/network-config:ro"
Expand Down
7 changes: 4 additions & 3 deletions network-configs/deposit-devnet-1/besu.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,9 @@
"preMergeForkBlock": 0,
"terminalTotalDifficulty": 0,
"depositContractAddress": "0x4242424242424242424242424242424242424242",
"shanghaiTime": 1681991544,
"experimentaleipstime": 1681991928,
"shanghaiTime": 1688381999,
"cancunTime": 1688382383,
"experimentaleipstime": 1688382767,
"ethash": {}
},
"alloc": {
Expand Down Expand Up @@ -851,5 +852,5 @@
"nonce": "0x1234",
"mixhash": "0x0000000000000000000000000000000000000000000000000000000000000000",
"parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
"timestamp": "1681991100"
"timestamp": "1688381555"
}
13 changes: 7 additions & 6 deletions network-configs/deposit-devnet-1/chainspec.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,12 @@
"eip3198Transition": "0x0",
"eip3529Transition": "0x0",
"eip3541Transition": "0x0",
"eip4895TransitionTimestamp": "0x64412778",
"eip3855TransitionTimestamp": "0x64412778",
"eip3651TransitionTimestamp": "0x64412778",
"eip3860TransitionTimestamp": "0x64412778",
"terminalTotalDifficulty": "0x0"
"eip4895TransitionTimestamp": "0x64a2aa2f",
"eip3855TransitionTimestamp": "0x64a2aa2f",
"eip3651TransitionTimestamp": "0x64a2aa2f",
"eip3860TransitionTimestamp": "0x64a2aa2f",
"terminalTotalDifficulty": "0x0",
"eip4844TransitionTimestamp": "0x64a2abaf"
},
"genesis": {
"seal": {
Expand All @@ -56,7 +57,7 @@
},
"difficulty": "0x01",
"author": "0x0000000000000000000000000000000000000000",
"timestamp": "0x644125bc",
"timestamp": "0x64a2a873",
"parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
"extraData": "",
"gasLimit": "0x17D7840"
Expand Down
8 changes: 4 additions & 4 deletions network-configs/deposit-devnet-1/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ CONFIG_NAME: testnet # needs to exist because of Prysm. Otherwise it conflicts w
MIN_GENESIS_ACTIVE_VALIDATOR_COUNT: 512
# Mar-01-2021 08:53:32 AM +UTC
# This is an invalid valid and should be updated when you create the genesis
MIN_GENESIS_TIME: 1681991100
MIN_GENESIS_TIME: 1688381555
GENESIS_FORK_VERSION: 0x10000060
GENESIS_DELAY: 60

Expand All @@ -34,12 +34,12 @@ CAPELLA_FORK_VERSION: 0x40000060
CAPELLA_FORK_EPOCH: 1

# EIP4844
EIP4844_FORK_VERSION: 0x50000060
EIP4844_FORK_EPOCH: 18446744073709551615
DENEB_FORK_VERSION: 0x50000060
DENEB_FORK_EPOCH: 2

# EIP6110
EIP6110_FORK_VERSION: 0x60000060
EIP6110_FORK_EPOCH: 2
EIP6110_FORK_EPOCH: 3

# Time parameters
# ---------------------------------------------------------------
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0xb5fa1d67c1f8130c759e973192c2d8d8dfb85380225cdb6bae66d21b0a502f84
0xdee1e0d8d4ab77b9c09b6c947605636703b100938da83f798f8226c28ea2ac63
7 changes: 5 additions & 2 deletions network-configs/deposit-devnet-1/genesis.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,10 @@
"londonBlock": 0,
"mergeForkBlock": 0,
"terminalTotalDifficulty": 0,
"shanghaiTime": 1681991544
"shanghaiTime": 1688381999,
"terminalTotalDifficultyPassed": true,
"cancunTime": 1688382383,
"experimentaleipstime": 1688382767
},
"alloc": {
"0x0000000000000000000000000000000000000000": {
Expand Down Expand Up @@ -847,5 +850,5 @@
"nonce": "0x1234",
"mixhash": "0x0000000000000000000000000000000000000000000000000000000000000000",
"parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
"timestamp": "1681991100"
"timestamp": "1688381555"
}
Binary file modified network-configs/deposit-devnet-1/genesis.ssz
Binary file not shown.
Loading

0 comments on commit 5849b91

Please sign in to comment.