Ci fixes

.github/workflows/post-merge-run.yml

@@ -35,6 +35,8 @@ jobs:
           brew install docker-buildx
       - name: Test jq is installed
         run: jq --help
+      - name: Install jwt and add to path
+        run: cargo install jwt-cli && export PATH=$HOME/.cargo/bin:$PATH
       # Vectors are already generated, but this serves as a test
       - name: Generate vectors
         run: bash ./scripts/generate_test_vectors_nethermind.sh

scripts/apply_test_vectors.sh

@@ -66,6 +66,14 @@ function apply_block_file() {
     http://localhost:8546 \
   )
   echo engine_forkchoiceUpdatedV1 set new block as head RESPONSE $RESPONSE
+
+  PAYLOAD_STATUS=$(echo $RESPONSE | jq --raw-output '.result.payloadStatus.status')
+  echo PAYLOAD_STATUS: $PAYLOAD_STATUS
+  # If the status is not "VALID", exit the script with a non-zero code to make CI fail
+  if [ "$PAYLOAD_STATUS" != "VALID" ]; then
+    echo "Error: Payload status is $PAYLOAD_STATUS, failing CI."
+    exit 1
+  fi
 }
 
 

scripts/generate_test_vectors.sh

@@ -15,7 +15,6 @@ DIR="$(dirname "$0")"
 OUT_DIR=$DIR/blocks
 mkdir -p $OUT_DIR
 
-
 # Retry the curl command until it succeeds
 until curl -X POST -H "Content-Type: application/json" \
   --data '{"jsonrpc":"2.0","method":"eth_getBlockByNumber","params":["0x0", false],"id":1}' \
@@ -24,14 +23,29 @@ until curl -X POST -H "Content-Type: application/json" \
     sleep 2
 done
 
+echo "Nethermind is available"
+
 BLOCK_COUNTER=0
 
 function make_block() {
+
+  # increment block counter
   ((BLOCK_COUNTER++))
 
+  echo "Making block $BLOCK_COUNTER"
+
   HEAD_BLOCK=$(curl -X POST -H "Content-Type: application/json" \
-    --data '{"jsonrpc":"2.0","method":"eth_getBlockByNumber","params":["latest", false],"id":1}' \
-    http://localhost:8545)
+    --data "{
+      \"jsonrpc\":\"2.0\",
+      \"method\":\"eth_getBlockByNumber\",
+      \"params\":[
+        \"latest\",
+        false
+      ],
+      \"id\":1
+    }" \
+    http://localhost:8545 \
+  )
 
   # --raw-output remove the double quotes
   HEAD_BLOCK_HASH=$(echo $HEAD_BLOCK | jq --raw-output '.result.hash')
@@ -103,7 +117,6 @@ function make_block() {
   echo $BLOCK | jq '.' > $OUT_DIR/block_$BLOCK_NUMBER_HEX.json
 
   # send the new block as payload
-
   RESPONSE=$(curl -X POST -H "Content-Type: application/json" \
     -H "Authorization: Bearer $JWT_TOKEN" \
     --data "{
@@ -139,13 +152,13 @@ function make_block() {
     http://localhost:8546 \
   )
   echo engine_forkchoiceUpdatedV1 set new block as head RESPONSE $RESPONSE
-
 }
 
 # Number of times to call make_block
 N=5
 
 for ((i = 1; i <= N; i++)); do
+  echo "Making block $i"
   make_block
 done
 

scripts/generate_test_vectors_nethermind.sh

@@ -25,4 +25,3 @@ cleanup() {
 trap cleanup EXIT
 
 $DIR/generate_test_vectors.sh
-

scripts/run_reth.sh

@@ -4,6 +4,8 @@
 #
 # reth genesis from https://github.com/ethpandaops/ethereum-genesis-generator/blob/a4b6733ea9d47b2b2ec497f5212f0265b83fb601/apps/el-gen/genesis_geth.py#L34
 
+# if TMPDIR is empty, use /tmp
+TMPDIR=${TMPDIR:-/tmp}
 DATA_DIR=$TMPDIR/reth_test
 # Ensure no data from previous tests
 rm -rf $DATA_DIR