Merge branch 'unstable' into dev/etan/lc-db

.github/workflows/release.yml

@@ -288,11 +288,11 @@ jobs:
 
           ## Urgency guidelines
 
-          `low-urgency`: update at your own convenience, sometime within our normal update cycle of two weeks
+          \`low-urgency\`: update at your own convenience, sometime within our normal update cycle of two weeks
 
-          `medium-urgency`: may contain an important stability fix, it is better to update sooner rather than later
+          \`medium-urgency\`: may contain an important stability fix, it is better to update sooner rather than later
 
-          `high-urgency`: update as soon as you can, this is a critical update required for Nimbus to function correctly
+          \`high-urgency\`: update as soon as you can, this is a critical update required for Nimbus to function correctly
 
           ## SHA512 checksums
 

CHANGELOG.md

@@ -1,3 +1,25 @@
+2022-06-29 v22.6.1
+==================
+
+Nimbus `v22.6.1` is a `low-urgency` release which comes pre-configured with the correct TTD value for the Sepolia network and improves the behavior of Nimbus in merge testnets.
+
+### Improvement
+
+* Allow testing the Engine API JWT credentials even before the merge.
+  https://github.com/status-im/nimbus-eth2/pull/3786
+
+### Fixes
+
+* Lack of detection of the connected execution client's network when attached to the Engine API port.
+  https://github.com/status-im/nimbus-eth2/pull/3804
+
+* Logic error leading to a premature start of the `exchange transition configuration` Engine API requests.
+  https://github.com/status-im/nimbus-eth2/pull/3809
+
+* Inappropriate inclusion of the `execution_optimistic` field in REST responses before the merge.
+  https://github.com/status-im/nimbus-eth2/pull/3807
+
+
 2022-06-20 v22.6.0
 ==================
 

beacon_chain/nimbus_beacon_node.nim

@@ -183,7 +183,6 @@ proc loadChainDag(
         maxPeriods: config.lightClientDataMaxPeriods,
         onLightClientFinalityUpdate: onLightClientFinalityUpdateCb,
         onLightClientOptimisticUpdate: onLightClientOptimisticUpdateCb))
-
     databaseGenesisValidatorsRoot =
       getStateField(dag.headState, genesis_validators_root)
 

beacon_chain/version.nim

@@ -15,7 +15,7 @@ when not defined(nimscript):
 const
   versionMajor* = 22
   versionMinor* = 6
-  versionBuild* = 0
+  versionBuild* = 1
 
   versionBlob* = "stateofus" # Single word - ends up in the default graffiti
 

scripts/launch_local_testnet.sh

@@ -865,6 +865,7 @@ for NUM_NODE in $(seq 0 $(( NUM_NODES - 1 ))); do
     WEB3_ARG="--web3-url=http://127.0.0.1:${EL_RPC_PORTS[${NUM_NODE}]}"
   fi
 
+  # TODO re-add --jwt-secret
   ${BEACON_NODE_COMMAND} \
     --config-file="${CLI_CONF_FILE}" \
     --tcp-port=$(( BASE_PORT + NUM_NODE )) \
@@ -879,7 +880,6 @@ for NUM_NODE in $(seq 0 $(( NUM_NODES - 1 ))); do
     --light-client-enable=on \
     --light-client-data-serve=on \
     --light-client-data-import-mode=only-new \
-    --jwt-secret=/tmp/jwtsecret \
     ${EXTRA_ARGS} \
     &> "${DATA_DIR}/log${NUM_NODE}.txt" &
 

vendor/nim-eth

@@ -1 +1 @@
-Subproject commit 1b516682bdef195174e632bc1772a75c97950e2f
+Subproject commit 6e813353ebe3ccd9e9003f3e5d7d0512b3b7ae1b