Add devnet-12 updates (#15)

README.md

@@ -1,6 +1,6 @@
-# Running a node (Lighthouse/Geth) on Dencun devnet-11
+# Running a node (Lighthouse/Geth) on Dencun devnet-12
 
-Docker Compose setup for running a Lighthouse/Geth node on Dencun devnet-11. Builds docker images from Dencun devnet-11 branches of Lighthouse and Geth.
+Docker Compose setup for running a Lighthouse/Geth node on Dencun devnet-12. Builds docker images from Dencun devnet-12 branches of Lighthouse and Geth.
 
 ## Run with Docker
 
@@ -39,10 +39,10 @@ CHECKPOINT_SYNC_URL=http://host.docker.internal:5053
 
 ## How to test
 
-### Request devnet-11 eth
+### Request devnet-12 eth
 
 Request some devnet eth from one of the faucets here:
-https://dencun-devnet-11.ethpandaops.io/
+https://dencun-devnet-12.ethpandaops.io/
 
 ### Sending Blobs
 
@@ -77,7 +77,7 @@ To send a blob, replace `your_private_key` with your private key.
     --to 0x0000000000000000000000000000000000000000 \
     --private-key <your_private_key> \
     --gas-limit 210000 \
-    --chain-id 7011893059 \
+    --chain-id 7011893062 \
     --priority-gas-price 200000000 \
     --max-fee-per-blob-gas 300000000
 ```
@@ -91,5 +91,5 @@ curl http://localhost:5052/eth/v1/beacon/blob_sidecars/68267 | jq .
 
 ## References
 
-- [dencun-devnet-11](https://dencun-devnet-11.ethpandaops.io/)
-- [Devnet-11 Spec](https://notes.ethereum.org/@ethpandaops/dencun-devnet-11)
+- [dencun-devnet-12](https://dencun-devnet-12.ethpandaops.io/)
+- [Devnet-12 Spec](https://notes.ethereum.org/@ethpandaops/dencun-devnet-12)

cl_config/config.yaml

@@ -8,8 +8,8 @@ CONFIG_NAME: testnet # needs to exist because of Prysm. Otherwise it conflicts w
 MIN_GENESIS_ACTIVE_VALIDATOR_COUNT: 2700
 # 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: 1698751740
-GENESIS_FORK_VERSION: 0x10762367
+MIN_GENESIS_TIME: 1701262740
+GENESIS_FORK_VERSION: 0x10430399
 GENESIS_DELAY: 60
 
 
@@ -20,22 +20,22 @@ GENESIS_DELAY: 60
 #  - Temporarily set to max uint64 value: 2**64 - 1
 
 # Altair
-ALTAIR_FORK_VERSION: 0x20762367
+ALTAIR_FORK_VERSION: 0x20430399
 ALTAIR_FORK_EPOCH: 0
 # Merge
-BELLATRIX_FORK_VERSION: 0x30762367
+BELLATRIX_FORK_VERSION: 0x30430399
 BELLATRIX_FORK_EPOCH: 0
 TERMINAL_TOTAL_DIFFICULTY: 0
 TERMINAL_BLOCK_HASH: 0x0000000000000000000000000000000000000000000000000000000000000000
 TERMINAL_BLOCK_HASH_ACTIVATION_EPOCH: 18446744073709551615
 
 # Capella
-CAPELLA_FORK_VERSION: 0x40762367
+CAPELLA_FORK_VERSION: 0x40430399
 CAPELLA_FORK_EPOCH: 0
 
 # DENEB
-DENEB_FORK_VERSION: 0x50762367
-DENEB_FORK_EPOCH: 20
+DENEB_FORK_VERSION: 0x50430399
+DENEB_FORK_EPOCH: 220
 
 # Time parameters
 # ---------------------------------------------------------------
@@ -73,8 +73,8 @@ PROPOSER_SCORE_BOOST: 40
 
 # Deposit contract
 # ---------------------------------------------------------------
-DEPOSIT_CHAIN_ID: 7011893061
-DEPOSIT_NETWORK_ID: 7011893061
+DEPOSIT_CHAIN_ID: 7011893062
+DEPOSIT_NETWORK_ID: 7011893062
 DEPOSIT_CONTRACT_ADDRESS: 0x6f22fFbC56eFF051aECF839396DD1eD9aD6BBA9D
 
 # Networking

geth/Dockerfile.geth

@@ -1,4 +1,4 @@
-FROM golang:1.20-alpine3.18 as builder
+FROM golang:1.21-alpine as builder
 
 RUN apk add --no-cache make gcc musl-dev linux-headers git bash
 
@@ -8,10 +8,10 @@ WORKDIR /app
 # ENV CGO_CFLAGS="-O -D__BLST_PORTABLE__"
 ENV CGO_CFLAGS=$CGO_CFLAGS
 
-RUN bash -c "git clone https://github.com/lightclient/go-ethereum && cd go-ethereum && git checkout devnet-10 && make geth"
+RUN bash -c "git clone https://github.com/ethereum/go-ethereum && cd go-ethereum && git checkout master && make geth"
 
 # Pull Geth into a second stage deploy alpine container
-FROM alpine:3.15
+FROM alpine:latest
 
 RUN apk add --no-cache ca-certificates curl jq bind-tools
 COPY --from=builder /app/go-ethereum/build/bin/geth /usr/local/bin/

geth/enodes.list

@@ -1 +1 @@
-enode://87751cc74ae85c25df643d4800e432d6dba2ab1d777a4aeb7967e89bd68ad8f40eb8871e77007ab91cb90fe617442122d85fb1e37412acead986d345bebf9f64@167.99.136.53:30303?discport=30303,enode://d634ed702e2ea58908da5eb6417aac0ed1c51613a31bf6b252a149bbd2d19bb31696fafa1be2399f8062178574d928a20a64829305edfa1bb23ae9cf4948e8cf@64.227.139.163:30303?discport=30303,enode://ee6cf30b51aa8377e6b5fe2c9e4e980eae3c58858d631ce2557717fad99c9b5bd2cddf10d9238031d9ef9ce9f33eddebdd69f2659e0a70e93dc4385f8ec002e4@146.190.119.132:30303?discport=30303,enode://28dab32dcf02128ad1d13040d740ad31efc96705b1b35d4b9b87cecc32a808f23bc76ad5c3930d96b94d77780244b818311ac0999a45d3ca2bc8ff8f42b9181e@64.227.125.139:30303?discport=30303,enode://cd2905cc980cff8b1e16985eabbd1901a3a1327b0ac5e1ce4bb7a7764fc6ade202e93eab47790cf32cd1d4be1ad8fd408520a59c1d91689be901c897b089d20f@65.109.130.109:30303?discport=30303,enode://6ed72a0acf679a5ba2feb1a13ac6df3747ada1bb42b348e7d14829891871da7b2b584e96514a54542a9d51ac3fdc9f499b641b888a680799f12b89a92f51e33a@137.184.30.39:30303?discport=30303,,,enode://3fef4935fa663f1834d66b39e3c60071151d70032fc104abcf21f9115d1ba7a00dae3e92e67b28b96c9d426561cbde7852f095390b33f6ab8a8d4ad8b9d44612@146.190.119.143:30303?discport=30303,enode://8f95cfa5c7a2908b490a479384f6db5e6c1ee4b1abf1abea491cebc0db7d3fb03b64571be1edeaa8ae74cdfc687669dea324ac6bf6cf8cc10ec74f58b04d5d35@170.64.142.171:30303?discport=30303,enode://cce124cce081f816ee80d6dfc6690f9339c8ad2282acf12708aa3770f8c859a984431efeee1ec0a3a3e06a21bb805f41fe2d5fe300360409a339d72328886dd4@174.138.37.36:30303,enode://8e88c32189b180f88da6feabd4cbc060605f0d18c32c3e858f8fced14282789a01b52e441a1bf76b9de9e6dc219e69df6796a52e5d13f4484e2f856cc2dab97e@64.227.122.194:30303?discport=30303,enode://d4737143abdb0235e7a8de90deac233e975f87dc3906948516358d272aae2375cebf40356ace8bdd628254af164d3bdb4f5d7e5cb121c34caf1ba01a86a130be@139.59.29.220:30303?discport=30303,enode://4ba3eced504363946e7db21834bcdffa9ae5688a758054719463e4cb56ff1aa1f618fdb9e96f2a1926f5b9ca19507b6851f6a208743deca4774dba85bd5c64be@95.216.144.240:30303?discport=30303,,enode://c3a065046db942e6440a82d4422d757dabb1e1909f54b3a5708785b5ffc05ac81b2f87dbffd63f4194c1cdcbb55138f7f87927d7608586e81d3a7eabe630f4d2@64.227.139.164:30303?discport=30303,enode://8c722313875ea17ee7adf6761c6286f1bbbbc03dfc127fb7d8fd0d5a7a6395c0eb007e7bb1e13441a6371b6ee4ac013e360422630939958bf59df627377749e4@24.199.125.199:30303?discport=30303,enode://db884dbd98212a09ea367de386590f101156eac69b7cc7a37fb99bd6bc06221c0f4430ec1d73db4e4cfe5f9615b11c70723070aae20257966de0766273d13121@128.140.1.73:30303?discport=30303,enode://7bb61590f63bc4e6b74c030565793ca23eb871215761d37288d5442afe3b10e4887d4ab2d8e3dcbcdd48c12f303cdc014432fde954f474f5f155ea4e5e6049d3@67.205.161.189:30303?discport=30303,enode://69e9b209cadfc26009210071c817ceb7bef4c3f01aa6809bb1b0639637f27794034102ca78c8dae28ae43279e09d53babc1089715880f5b9ba20b676424e5c59@209.38.200.7:30303?discport=30303,enode://4bda67917143464fa763afe03f4f6e08ce684e228432e5d7b9268a0214ef02bcabb9fc2a9913b2b56df73272cb8c7a4e2901335f3d0cd8c238e6bc676f31a29f@78.46.142.182:30303?discport=30303,,,enode://625c64f436e195f1a70c2ef3453d25d9c7459ae6c35d77fa318832babaecb8b5a58ca1e4592d6b32bfcbd4f15689237473e9525ef7c8bc974916f47a13009ee9@164.90.224.225:30303?discport=30303,enode://793e8f1913ace34f7859ae592e3daa45d556637021a4a8e92bc5a8ff741e1c2f222ee41e4f9c9805fb485155608e58a2009c69536ff520ef889ecfb89e943470@78.47.26.6:30303?discport=30303,enode://3b070089a3eb404e5584c9ddb86b6b241d78fa7f013d656c725b49125abaf05fe9b9c44176d5f030dfe7c0203499a362073ca04be0a3566ab7b81852011a3063@64.227.182.29:30303?discport=30303,enode://0cc853aeb01a7697040af164cda0d05e7be6f59fdc56058821b49f83f440db695f8a70df58bc3cf85606822c9f6f5766bee3ae8fa810702432365bf522066420@170.64.150.222:30303?discport=30303,enode://40006e1785395ef41d52224edef7d5e5dce5c55b1bc15b2a4fe59e7089dca102e20566cac9899721e1fd1eb821edc530cc0e0e0f09260da5d1791f627e370b04@64.227.8.183:30303?discport=30303,,enode://9a1dba2b27fc14f687582d307a78001ca27c296f1c8e1bdea2c73fd10a3c063022778b09724bff317a9f2dcfdf61c8231a82682a75f042251122f75e7c8eb469@137.184.183.128:30303?discport=30303,enode://0d3b9e6f9f593e8b9cd19d5054e71e4f2b8d25ccb08b0cb58f3c06b04c903be24a90e0ca7f0fe6fa1d928638dbb204d4a7f54c7043fc1ea47ba32a32477d0242@116.203.129.6:30303?discport=30303,enode://f4e294e9058946b059a97c6bf4e4aec4d815918f8435d1da7fa391005bbbc07255d9694bbfff3b65c1cc2bf5176be69e5794857850fcfa24d998ca101a73867c@170.64.166.39:30303?discport=30303,enode://090842f24bd3477489e68b6b108f6cd5f6b755656f8885400cb2269d762ed8b0a7cc1d5132206995bb1d35b529a1ba8a3959aa593f3eee7b58493df6a95d7d75@164.90.234.103:30303?discport=30303,enode://c20fea53a5bd9347dee397b9493d1cbbca65f9bc67f4389a1e47d6fbdf4e41201bfc3894007e54f7256c9478d22b5e192cf1657e450a958c83375b859ab9b943@65.108.88.204:30303?discport=30303,enode://59016d1323660c6e7acd7a36e42557c87fbf2e2cb21da1b1d33100ac61faaee0b90da5cd7744ab199fb36e98b10a426bf06d31e857afe9195356dfbab0498d0a@142.93.216.205:30303?discport=30303,enode://ce05d387049f64217ee849cfd54d83ff43717b27dcde5c79e1582b488ead1517c31da8c0673a409d70368662e72bb5bb63697dc43879c94f7a7ac30b87b8d489@49.13.116.26:30303?discport=30303,,
+enode://59744008cb2de257daf3bdaa4fa34428c447e82705893be42a7407f20a84e45231b942c56e6bd771cbfb79c13b08eb85a002fe78cfd0c19b8634505aabed01db@64.226.104.183:30303?discport=30303,enode://665838f37b50d709e848ce0e191ba89b67a6a89a046d9e9ca1be80547bec34534fabff93312235cca27917674c7037ba8319aae057374d2365696e2a33398ffa@134.209.145.195:30303?discport=30303,enode://90fd03ef12c498b4af516dbc0e7a139b65fac30a0d65fd0a167e9b4caf2b9cd2915065b34fbe8d4bfc09910315f249964b0b3f263603e56e002ac14da9fb5183@137.184.11.255:30303?discport=30303,enode://43cd49019aba5ff1396a99992dfb7388b47f854dec6758e653e02e6517f4dc2092677f43bf97d073b89101ddb2f430a9f1f12e1502feaf0d97745c96697c14a5@78.47.26.6:30303?discport=30303,enode://cc2d3f2078350b2d6900c1ce028a282d7cb3b451ae70a370d88c9da142061fb5e2e070d6cae0afd2f6b8307ecd54988be5c75ce639fe3e878d9ea246e83c0333@164.90.222.95:30303?discport=30303,enode://af65e6b7b35a7437bcbae5b9dd3203c894cc3622c73ffe1e8d54cbd162caaec82530867f2d0d33a565abedc05eb249d5d67e7fb0b7d3f9f977dd1745450a96ea@95.216.144.240:30303?discport=30303,enode://782e35fbaf977f059365ba5109d733679a5c47fab8c8fd22876937fb036b3e94129a460b9e275867346688d2b80079db00ee1aa69ff839441387c44e6118a352@206.189.191.180:30303?discport=30303,enode://f27af372f250621edc49813584b2d8f43b1307a1b843778082424ecf59ecf4121187352bb4b5a36ed3da7566726d048c27b39772f5e6fb6fbc0d237ee45e4acd@128.140.1.73:30303?discport=30303,,,enode://e4f9f3a6ea435cd6433f027ca843e69fbdcaa2b611ff790588561ce34d6604d89a52fe1161bb529b1e17146a0c21b921c8877e1c05939a14f6e619ea76ec74af@137.184.11.204:30303?discport=30303,enode://ce457308ae16d7510cef75f37c2f478fd4c281633d43146d136d7756636f018649a1c235667e82fe4b3c683f571a79edfc2cdad49c95b943d153321d6203daa7@170.64.162.71:30303?discport=30303,enode://077cf63bfee8d993c61e8a902cb0c57c7837ead19f72f946532a0a0655bc2035631a5277304498cec03d80c2860a925dcaff96ebc808ee5b7d2815cac6de8877@104.248.116.60:30303,enode://3b6879b705ff8a01ccd166ccb0ecddd4a561bacd4be3f1373759404e173363423793f4b76ab0eb261f6fdef1048baa7b6bca800a2ffd921ece42af653d40dca1@68.183.214.202:30303?discport=30303,enode://da3c5fede7b93db9f64683db692c5643023155358a33fa8213be1ad0794594602bda2fa1e4ef637572d0fb5225c92ead4a2922f1004d4d431be7e17136a7a539@134.209.145.199:30303?discport=30303,enode://5323e4f1f9d9bcc2aa496120a1562736b13b85e9b666fbf653cd7d5c60f803ba1f1fcb34e39e56fc4e019a40b9f33408435860f4e401e5ad2d3210a6b81afd38@65.108.88.204:30303?discport=30303,,enode://f0f447d8df479c583817d70c586e66496a218ddef8d63b06860fbd35e6968268d355ff44dca2d58e9ca040088f5235ad29d7b6deb1595cbba1052e07c5b31fd7@68.183.85.180:30303?discport=30303,enode://a3ba7084b35ad49a23a70c630894277b09a746e7c389f6e04c4e0944167206d8ec7c799b34dbee183ea5a3ac4689dd251e9ef2e21ee411f805fa2bea636dbaed@146.190.161.212:30303?discport=30303,enode://79ff2a62149e088819d486cd5320391d7f7726118965fb6e89671a97a6d3b577dad73a7622bd7ab94f22e359ee5d7950a8bb35a8d89c58aacd51a0f20014168c@94.130.168.148:30303?discport=30303,enode://f61d6bc95bebf144308885e45559ec133794ab0dc2e369a0fdf9efa5f1648cbf399449c124996190da892d557e5a07a1448951c63f0d1f729957846f8ee2708f@64.227.24.82:30303?discport=30303,enode://dc176def413fd47601ffa856b15c28bcb15e652eae7148c0879766b0723b9e6c4f6bf794a5439d07f88df040e9622c149b5067419a885ff6a08b05d4cc7807de@164.90.214.14:30303?discport=30303,enode://8925bf0d098b5348ec69e705a1a3bc9436701df8e0bde7b0f2c21189f9e398f817d6bf129bec24f5110909a8ca39aec629f1019c57b4b1ee26588633e1ad26ca@49.13.116.26:30303?discport=30303,,,,enode://44242914b149795210d094109593936b3bf7305eb40bc21c50a02d6b4e8941de8ea8e257fb62750a0302155ec6ebbdf9df66c3ea9eab21a38447b655b1f43f12@128.199.3.253:30303?discport=30303,enode://ced4e26a540c986d50286ebcbd2fa481a11f5b3815f5dc3cf508a0668a6de9b24a521bd0cfd615add16cb2b90cdf7811f6a50df3dbe0a1342dde18cfe9db0ac4@195.201.140.228:30303?discport=30303,enode://d9d475fe5b702c1b9c56da64edbdd74c265c9f601da9894f55507bb94f498a6340a540a7f783add2bd4120c6440a34961b7b761876cfee11ef9f3d1be324d008@170.64.161.86:30303?discport=30303,enode://2f3b1fd8991d83bd9187000578cedcc87480dadded923d495310870ff04c8939663bc76aa98ca04fd4ef3098fe2a0070332bea658beb4222f85ae14f6db1dfe1@164.90.218.160:30303?discport=30303,enode://d3c31934dd01ad39e4ed683eb1f5a7076ba64a305eb44e0c4a0985477caf0a3883714513d4645de124fad10a2b36db302b3323ae13e1a79ba1c30b27b250b643@65.109.130.109:30303?discport=30303,enode://1419b308ca19511240c3eaa8da916d224cccbf61747653a612667fe3530697814c5e86815db8be30cfa6e6caed9ef589faf338d8ee386e17f136c169cd70d396@134.209.145.105:30303?discport=30303,enode://eac7cb9add9e835aeb126bfaeb591c3152a3e07f914663a8a6e3e10677415ac658ab231358b932dd8f4d6e1d5b9cad9786b3f1bb9663e0c1cefd205c3b4b3479@78.46.142.182:30303?discport=30303,,

geth/genesis.json

@@ -1,6 +1,6 @@
 {
   "config": {
-    "chainId": 7011893061,
+    "chainId": 7011893062,
     "homesteadBlock": 0,
     "eip150Block": 0,
     "eip155Block": 0,
@@ -14,8 +14,8 @@
     "mergeNetsplitBlock": 0,
     "terminalTotalDifficulty": 0,
     "terminalTotalDifficultyPassed": true,
-    "shanghaiTime": 1698751800,
-    "cancunTime": 1698759480
+    "shanghaiTime": 1701262800,
+    "cancunTime": 1701347280
   },
   "alloc": {
     "0x0000000000000000000000000000000000000000": {
@@ -918,5 +918,5 @@
   "nonce": "0x1234",
   "mixhash": "0x0000000000000000000000000000000000000000000000000000000000000000",
   "parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
-  "timestamp": "1698751740"
+  "timestamp": "1701262740"
 }

lighthouse/Dockerfile.lighthouse

@@ -1,8 +1,8 @@
-FROM rust:1.71.1-bullseye AS builder
+FROM rust:1.74.0-bullseye AS builder
 RUN apt-get update && apt-get -y upgrade && apt-get install -y cmake clang libclang-dev protobuf-compiler bash
 ARG FEATURES
 
-RUN bash -c "git clone https://github.com/sigp/lighthouse.git && cd lighthouse && git checkout devnet-10 && CROSS_PROFILE=maxperf make"
+RUN bash -c "git clone https://github.com/sigp/lighthouse.git && cd lighthouse && git checkout sidecar-inclusion-proof && CROSS_PROFILE=maxperf make"
 
 FROM ubuntu:22.04
 RUN apt-get update && apt-get install -y software-properties-common && add-apt-repository ppa:rmescandon/yq

update_files.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 set -x
 
-BASE_URL=https://config.dencun-devnet-11.ethpandaops.io
+BASE_URL=https://config.dencun-devnet-12.ethpandaops.io
 
 curl -s $BASE_URL/cl/config.yaml > cl_config/config.yaml
 curl -s $BASE_URL/api/v1/nodes/inventory | jq -r '.ethereum_pairs[] | .consensus.enr' | sed 's/^/- /' > cl_config/boot_enr.yaml