Add proposal timeout, bump versions (#167)

* Add proposal timeout, bump versions

* Add ejector instructions and fix bracket

* Change version

* Remove default proposal timeout featureset

Author: OisinKyne

.env.sample.holesky

@@ -149,6 +149,9 @@ CHARON_P2P_RELAYS=https://0.relay.obol.tech,https://1.relay.obol.tech/,https://c
 # The address of the execution engine JSON-RPC API. 
 #CHARON_EXECUTION_CLIENT_RPC_ENDPOINT=
 
+# Enable opt-in charon features
+#CHARON_FEATURE_SET_ENABLE=
+
 # Override the charon logging level; debug, info, warning, error.
 #CHARON_LOG_LEVEL=
 

.env.sample.hoodi

@@ -149,6 +149,9 @@ CHARON_P2P_RELAYS=https://0.relay.obol.tech,https://1.relay.obol.tech/,https://c
 # The address of the execution engine JSON-RPC API. 
 #CHARON_EXECUTION_CLIENT_RPC_ENDPOINT=
 
+# Enable opt-in charon features
+#CHARON_FEATURE_SET_ENABLE=
+
 # Override the charon logging level; debug, info, warning, error.
 #CHARON_LOG_LEVEL=
 

.env.sample.mainnet

@@ -149,6 +149,9 @@ CHARON_P2P_RELAYS=https://0.relay.obol.tech,https://1.relay.obol.tech/,https://c
 # The address of the execution engine JSON-RPC API. 
 #CHARON_EXECUTION_CLIENT_RPC_ENDPOINT=
 
+# Enable opt-in charon features
+#CHARON_FEATURE_SET_ENABLE=
+
 # Override the charon logging level; debug, info, warning, error.
 #CHARON_LOG_LEVEL=
 

README.md

@@ -52,7 +52,8 @@ To configure this repo for a particular network, follow these instructions. If y
 
 2. Grab your operator ID from the lido [mainnet dashboard](https://operators.lido.fi/) or [testnet dashboard](https://operators-holesky.testnet.fi/).
 3. Find `VE_OPERATOR_ID` in `.env` and set it to your operator ID.
-4. Save and close `.env`.
+4. Find `VE_EASY_TRACK_MOTION_CREATOR_ADDRESSES_ALLOWLIST=["0xYourNodeOperatorRewardAddress"]`, uncomment it, and change `0xYourNodeOperatorRewardAddress` to your Lido Operator SAFE manager address for your cluster.
+5. Save and close `.env`.
 
 You will need a `.charon/` folder from a completed DKG present to complete the setup of this repo.
 

compose-el.yml

@@ -11,7 +11,7 @@ services:
 
   el-nethermind:
     profiles: [el-nethermind]
-    image: nethermind/nethermind:${EL_NETHERMIND_VERSION:-1.32.2}
+    image: nethermind/nethermind:${EL_NETHERMIND_VERSION:-1.33.0}
     restart: unless-stopped
     ports:
       - ${EL_PORT_P2P:-30303}:30303/tcp # P2P TCP

docker-compose.yml

@@ -100,11 +100,11 @@ services:
       - CHARON_VALIDATOR_API_ADDRESS=0.0.0.0:3600
       - CHARON_MONITORING_ADDRESS=0.0.0.0:3620
       - CHARON_BUILDER_API=${BUILDER_API_ENABLED:-true}
-      - CHARON_FEATURE_SET_ENABLE=eager_double_linear,consensus_participate
+      - CHARON_FEATURE_SET_ENABLE=${CHARON_FEATURE_SET_ENABLE:-}
       - CHARON_LOKI_ADDRESSES=${CHARON_LOKI_ADDRESSES:-http://loki:3100/loki/api/v1/push}
       - CHARON_LOKI_SERVICE=charon
       - CHARON_NICKNAME=${CHARON_NICKNAME:-}
-      - CHARON_EXECUTION_CLIENT_RPC_ENDPOINT=${CHARON_EXECUTION_CLIENT_RPC_ENDPOINT:-http://nethermind:8545}
+      - CHARON_EXECUTION_CLIENT_RPC_ENDPOINT=${CHARON_EXECUTION_CLIENT_RPC_ENDPOINT:-http://${EL:-nethermind}:8545}
     ports:
       - ${CHARON_PORT_P2P_TCP:-3610}:${CHARON_PORT_P2P_TCP:-3610}/tcp # P2P TCP libp2p
     networks: [dvnode]