Merge branch 'master' into signed-validator-registration

.github/workflows/main.yml

@@ -9,7 +9,7 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - uses: actions/setup-node@v2
-    - run: npm i -g @apidevtools/swagger-cli@4 @stoplight/spectral-cli@6.2.0
+    - run: npm i -g @apidevtools/swagger-cli@4 @stoplight/spectral-cli@6.3.0
     - run: spectral --version
 
     - name: Lint spec

.gitignore

@@ -1 +1,2 @@
-.idea
+.idea
+deploy

README.md

@@ -56,11 +56,11 @@ Api spec is checked for lint errors before merge.
 
 To run lint locally, install linter with
 ```
-npm install -g @stoplight/spectral-cli@6.2.1
+npm install -g @stoplight/spectral-cli@6.3.0
 
 # OR
 
-yarn global add @stoplight/spectral-cli@6.2.1
+yarn global add @stoplight/spectral-cli@6.3.0
 ```
 and run lint with
 ```

apis/beacon/blocks/blinded_blocks.yaml

@@ -14,6 +14,13 @@ post:
     therefore validate the block internally, however blocks which fail the validation are still
     broadcast but a different status code is returned (202). Pre-Bellatrix, this endpoint will accept 
     a `SignedBeaconBlock`.
+  parameters:
+    - in: header
+      schema:
+        $ref: '../../../beacon-node-oapi.yaml#/components/schemas/ConsensusVersion'
+      required: false
+      name: Eth-Consensus-Version
+      description: "Version of the block being submitted, if using SSZ encoding."
   requestBody:
     description: "The `SignedBlindedBeaconBlock` object composed of `BlindedBeaconBlock` object (produced by beacon node) and validator signature."
     required: true
@@ -24,6 +31,9 @@ post:
             - $ref: '../../../beacon-node-oapi.yaml#/components/schemas/SignedBeaconBlock'
             - $ref: "../../../beacon-node-oapi.yaml#/components/schemas/Altair.SignedBeaconBlock"
             - $ref: "../../../beacon-node-oapi.yaml#/components/schemas/Bellatrix.SignedBlindedBeaconBlock"
+      application/octet-stream:
+        schema:
+          description: "SSZ serialized block bytes. Use content type header to indicate that SSZ data is contained in the request body."
   responses:
     "200":
       description: "The block was validated successfully and has been broadcast. It has also been integrated into the beacon node's database."

apis/beacon/blocks/blocks.yaml

@@ -11,6 +11,13 @@ post:
     successful. The beacon node is expected to integrate the new block into its state, and
     therefore validate the block internally, however blocks which fail the validation are still
     broadcast but a different status code is returned (202)
+  parameters:
+    - in: header
+      schema:
+        $ref: '../../../beacon-node-oapi.yaml#/components/schemas/ConsensusVersion'
+      required: false
+      name: Eth-Consensus-Version
+      description: "Version of the block being submitted, if using SSZ encoding."
   requestBody:
     description: "The `SignedBeaconBlock` object composed of `BeaconBlock` object (produced by beacon node) and validator signature."
     required: true
@@ -21,6 +28,9 @@ post:
            - $ref: '../../../beacon-node-oapi.yaml#/components/schemas/SignedBeaconBlock'
            - $ref: "../../../beacon-node-oapi.yaml#/components/schemas/Altair.SignedBeaconBlock"
            - $ref: "../../../beacon-node-oapi.yaml#/components/schemas/Bellatrix.SignedBeaconBlock"
+      application/octet-stream:
+        schema:
+          description: "SSZ serialized block bytes. Use content type header to indicate that SSZ data is contained in the request body."
   responses:
     "200":
       description: "The block was validated successfully and has been broadcast. It has also been integrated into the beacon node's database."

apis/validator/beacon_committee_subscriptions.yaml

@@ -41,7 +41,7 @@ post:
       description: |
         Slot signature is valid and beacon node has prepared the attestation subnet.
 
-        Note that, we cannot be certain Beacon node will find peers for that subnet for various reasons,"
+        Note that we cannot be certain the Beacon node will find peers for that subnet for various reasons.
     "400":
       $ref: '../../beacon-node-oapi.yaml#/components/responses/InvalidRequest'
     "500":

apis/validator/blinded_block.yaml

@@ -49,6 +49,9 @@ get:
                   - $ref: '../../beacon-node-oapi.yaml#/components/schemas/BeaconBlock'
                   - $ref: "../../beacon-node-oapi.yaml#/components/schemas/Altair.BeaconBlock"
                   - $ref: "../../beacon-node-oapi.yaml#/components/schemas/Bellatrix.BlindedBeaconBlock"
+        application/octet-stream:
+          schema:
+            description: "SSZ serialized block bytes. Use Accept header to choose this response type, version string is sent in header `Eth-Consensus-Version`."
     "400":
       description: "Invalid block production request"
       content:

apis/validator/block.v2.yaml

@@ -31,6 +31,9 @@ get:
   responses:
     "200":
       description: Success response
+      headers:
+        Eth-Consensus-Version:
+          $ref: '../../beacon-node-oapi.yaml#/components/headers/Eth-Consensus-Version'
       content:
         application/json:
           schema:
@@ -46,6 +49,9 @@ get:
                  - $ref: '../../beacon-node-oapi.yaml#/components/schemas/BeaconBlock'
                  - $ref: "../../beacon-node-oapi.yaml#/components/schemas/Altair.BeaconBlock"
                  - $ref: "../../beacon-node-oapi.yaml#/components/schemas/Bellatrix.BeaconBlock"
+        application/octet-stream:
+          schema:
+            description: "SSZ serialized block bytes. Use Accept header to choose this response type, version string is sent in header `Eth-Consensus-Version`."
     "400":
       description: "Invalid block production request"
       content:

beacon-node-oapi.yaml

@@ -270,7 +270,9 @@ components:
       $ref: './types/bellatrix/block.yaml#/Bellatrix/BlindedBeaconBlock'
     Bellatrix.SignedBlindedBeaconBlock:
       $ref: './types/bellatrix/block.yaml#/Bellatrix/SignedBlindedBeaconBlock'
-
+    ConsensusVersion:
+      enum: [phase0, altair, bellatrix]
+      example: "phase0"
   parameters:
     StateId:
       $ref: './params/index.yaml#/StateId'
@@ -290,7 +292,6 @@ components:
   headers:
     Eth-Consensus-Version:
       description: Required in response so client can deserialize returned json or ssz data more effectively.
+      required: true
       schema:
-        type: string
-        enum: [phase0, altair, bellatrix]
-        example: "phase0"
+        $ref: '#/components/schemas/ConsensusVersion'

validator-flow.md

@@ -1,3 +1,9 @@
+---
+layout: page
+title: "Validator flow"
+permalink: /validator-flow/
+---
+
 # Validator Flow
 
 Detail explanation how validator should utilize this API to perform his regular BeaconChain duties.