Merge branch 'master' into error-prone-final-beacon-module

.circleci/config.yml

@@ -148,7 +148,7 @@ commands:
           name: "Publish Docker Images"
           command: |
             docker login --username "${DOCKER_USER_RW}" --password "${DOCKER_PASSWORD_RW}"
-            ./gradlew --no-daemon --parallel "-Pbranch=${CIRCLE_BRANCH}" uploadDocker
+            ./gradlew --no-daemon --parallel "-Pbranch=${CIRCLE_BRANCH} -PincludeCommitHash=<< pipeline.parameters.include_commit_hash >>" uploadDocker
 
   notify:
     description: "Notify Slack"
@@ -157,6 +157,12 @@ commands:
           mentions: "team-centaur"
           fail_only: true
           only_for_branches: 'master'
+
+parameters:
+  include_commit_hash:
+    type: boolean
+    default: false
+
 jobs:
   assemble:
     executor: large_executor
@@ -431,6 +437,10 @@ jobs:
       - notify
 
   publishDockerAmd64:
+    parameters:
+      include_commit_hash:
+        type: boolean
+        default: false
     executor: machine_executor_amd64
     steps:
       - prepare
@@ -441,6 +451,10 @@ jobs:
       - notify
 
   publishDockerArm64:
+    parameters:
+      include_commit_hash:
+        type: boolean
+        default: false
     executor: machine_executor_arm64
     steps:
       - prepare
@@ -497,7 +511,7 @@ jobs:
           paths:
             - .openapidoc/spec/teku.json
 
-  # longish story here: we store the openapi json spec in the `gh-pages` branch of teku on Github 
+  # longish story here: we store the openapi json spec in the `gh-pages` branch of teku on Github
   # The reason we don't use GHA and instead use Circle to push to GHA is:
   # 1. We need assemble -> extractAPISpec -> publishAPISpec and this takes circa 10 mins to build in GHA,
   # 2. We publish artifacts (openapi, docker, binaries etc) only after ALL tests and we can't check for all the jobs passing to kick this one off

CHANGELOG.md

@@ -16,7 +16,7 @@ the [releases page](https://github.com/Consensys/teku/releases).
 - Added `peers_direction_current` libp2p metric to track the number of peers by direction (inbound and outbound).
 - Deposit tree snapshots will be loaded from database as a default unless custom snapshot has been provided.
 - Added hidden option `--Xdeposit-contract-logs-syncing-enabled` to allow disabling the syncing of the deposit contract logs from the EL. This is useful when running a non-validating node. It is advisable to be used alongside with `--Xeth1-missing-deposits-event-logging-enabled=false` to avoid unnecessary logging of missing deposits.
-- Updated the bootnodes for Chiado and Gnosis networks
+- Updated the bootnodes for Chiado and Gnosis networks.
 - Added hidden option `--Xp2p-dumps-to-file-enabled` to enable saving p2p dumps to file.
 
 ### Bug Fixes

build.gradle

@@ -532,6 +532,16 @@ def executableAndArg = System.getProperty('os.name').toLowerCase().contains('win
 task distDocker  {
   dependsOn dockerDistUntar
   def dockerBuildVersion = 'develop'
+
+  if (project.hasProperty('includeCommitHash') && project.property('includeCommitHash').toBoolean()) {
+    def commitHash = new ByteArrayOutputStream()
+    exec {
+      commandLine 'git', 'rev-parse', '--short', 'HEAD'
+      standardOutput = commitHash
+    }
+    dockerBuildVersion += '-' + commitHash
+  }
+
   doLast {
     for (def variant in dockerJdkVariants) {
       copy {

data/beaconrestapi/src/integration-test/resources/tech/pegasys/teku/beaconrestapi/beacon/schema/ExecutionLayerExit.json → data/beaconrestapi/src/integration-test/resources/tech/pegasys/teku/beaconrestapi/beacon/schema/ExecutionLayerWithdrawalRequest.json

@@ -1,7 +1,7 @@
 {
-  "title" : "ExecutionLayerExit",
+  "title" : "ExecutionLayerWithdrawalRequest",
   "type" : "object",
-  "required" : [ "source_address", "validator_pubkey" ],
+  "required" : [ "source_address", "validator_pubkey", "amount" ],
   "properties" : {
     "source_address" : {
       "type" : "string",
@@ -14,6 +14,12 @@
       "pattern" : "^0x[a-fA-F0-9]{2,}$",
       "description" : "Bytes48 hexadecimal",
       "format" : "bytes"
+    },
+    "amount" : {
+      "type" : "string",
+      "description" : "unsigned 64 bit integer",
+      "example" : "1",
+      "format" : "uint64"
     }
   }
 }

data/beaconrestapi/src/integration-test/resources/tech/pegasys/teku/beaconrestapi/beacon/schema/ExecutionPayloadElectra.json

@@ -1,7 +1,7 @@
 {
   "title" : "ExecutionPayloadElectra",
   "type" : "object",
-  "required" : [ "parent_hash", "fee_recipient", "state_root", "receipts_root", "logs_bloom", "prev_randao", "block_number", "gas_limit", "gas_used", "timestamp", "extra_data", "base_fee_per_gas", "block_hash", "transactions", "withdrawals", "blob_gas_used", "excess_blob_gas", "deposit_receipts", "exits" ],
+  "required" : [ "parent_hash", "fee_recipient", "state_root", "receipts_root", "logs_bloom", "prev_randao", "block_number", "gas_limit", "gas_used", "timestamp", "extra_data", "base_fee_per_gas", "block_hash", "transactions", "withdrawals", "blob_gas_used", "excess_blob_gas", "deposit_receipts", "withdrawal_requests" ],
   "properties" : {
     "parent_hash" : {
       "type" : "string",
@@ -114,10 +114,10 @@
         "$ref" : "#/components/schemas/DepositReceipt"
       }
     },
-    "exits" : {
+    "withdrawal_requests" : {
       "type" : "array",
       "items" : {
-        "$ref" : "#/components/schemas/ExecutionLayerExit"
+        "$ref" : "#/components/schemas/ExecutionLayerWithdrawalRequest"
       }
     }
   }

data/beaconrestapi/src/integration-test/resources/tech/pegasys/teku/beaconrestapi/beacon/schema/ExecutionPayloadHeaderElectra.json

@@ -1,7 +1,7 @@
 {
   "title" : "ExecutionPayloadHeaderElectra",
   "type" : "object",
-  "required" : [ "parent_hash", "fee_recipient", "state_root", "receipts_root", "logs_bloom", "prev_randao", "block_number", "gas_limit", "gas_used", "timestamp", "extra_data", "base_fee_per_gas", "block_hash", "transactions_root", "withdrawals_root", "blob_gas_used", "excess_blob_gas", "deposit_receipts_root", "exits_root" ],
+  "required" : [ "parent_hash", "fee_recipient", "state_root", "receipts_root", "logs_bloom", "prev_randao", "block_number", "gas_limit", "gas_used", "timestamp", "extra_data", "base_fee_per_gas", "block_hash", "transactions_root", "withdrawals_root", "blob_gas_used", "excess_blob_gas", "deposit_receipts_root", "withdrawal_requests_root" ],
   "properties" : {
     "parent_hash" : {
       "type" : "string",
@@ -111,7 +111,7 @@
       "example" : "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
       "format" : "byte"
     },
-    "exits_root" : {
+    "withdrawal_requests_root" : {
       "type" : "string",
       "description" : "Bytes32 hexadecimal",
       "example" : "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",

data/beaconrestapi/src/integration-test/resources/tech/pegasys/teku/beaconrestapi/v3/newBlindedBlockELECTRA.json

@@ -216,7 +216,7 @@
         "blob_gas_used": "4476638188903342311",
         "excess_blob_gas": "4521255257228650249",
         "deposit_receipts_root": "0xc7dab83ea972daeec7b1385f04b22e210f708323c38b84160159653a163f259e",
-        "exits_root": "0x8e77ca3ec98f3c20e7e802dd8917f1b9fc66866da0310ae878d59ae1871cfffd"
+        "withdrawal_requests_root": "0x8e77ca3ec98f3c20e7e802dd8917f1b9fc66866da0310ae878d59ae1871cfffd"
       },
       "bls_to_execution_changes": [
         {