Merge branch 'master' into janez/get-transaction-execution-metrics-after

onflow · Aug 21, 2024 · 9fca1cc · 9fca1cc
2 parents cbebf11 + 93bf60a
commit 9fca1cc
Show file tree

Hide file tree

Showing 10 changed files with 640 additions and 20 deletions.
diff --git a/agendas/2024/sprint-kickoff/2024-08-16-Flow-Sprint-Kickoff.md b/agendas/2024/sprint-kickoff/2024-08-16-Flow-Sprint-Kickoff.md
diff --git a/openapi/access.yaml b/openapi/access.yaml
@@ -1193,6 +1193,17 @@ components:
       properties:
         chain_id:
           type: string
+    CompatibleRange:
+      type: object
+      description: A compatible version range.
+      required:
+        - start_height
+        - end_height
+      properties:
+        start_height:
+          type: string
+        end_height:
+          type: string
     NodeVersionInfo:
       type: object
       required:
@@ -1218,6 +1229,8 @@ components:
         node_root_block_height:
           type: string
           format: uint64
+        compatible_range:
+          $ref: '#/components/schemas/CompatibleRange'
     SubscribeEvents:
       type: object
       properties:

diff --git a/openapi/go-client-generated/README.md b/openapi/go-client-generated/README.md
@@ -55,6 +55,7 @@ Class | Method | HTTP request | Description
  - [Collection](docs/Collection.md)
  - [CollectionExpandable](docs/CollectionExpandable.md)
  - [CollectionGuarantee](docs/CollectionGuarantee.md)
+ - [CompatibleRange](docs/CompatibleRange.md)
  - [Event](docs/Event.md)
  - [ExecutionResult](docs/ExecutionResult.md)
  - [HashingAlgorithm](docs/HashingAlgorithm.md)

diff --git a/openapi/go-client-generated/api/swagger.yaml b/openapi/go-client-generated/api/swagger.yaml
@@ -2070,6 +2070,20 @@ components:
           type: string
       example:
         chain_id: chain_id
+    CompatibleRange:
+      required:
+      - end_height
+      - start_height
+      type: object
+      properties:
+        start_height:
+          type: string
+        end_height:
+          type: string
+      description: A compatible version range.
+      example:
+        end_height: end_height
+        start_height: start_height
     NodeVersionInfo:
       required:
       - commit
@@ -2095,9 +2109,14 @@ components:
         node_root_block_height:
           type: string
           format: uint64
+        compatible_range:
+          $ref: '#/components/schemas/CompatibleRange'
       example:
         protocol_version: protocol_version
         semver: semver
+        compatible_range:
+          end_height: end_height
+          start_height: start_height
         commit: commit
         node_root_block_height: node_root_block_height
         spork_id: spork_id

diff --git a/openapi/go-client-generated/docs/CompatibleRange.md b/openapi/go-client-generated/docs/CompatibleRange.md
@@ -0,0 +1,10 @@
+# CompatibleRange
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**StartHeight** | **string** |  | [default to null]
+**EndHeight** | **string** |  | [default to null]
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
diff --git a/openapi/go-client-generated/docs/NodeVersionInfo.md b/openapi/go-client-generated/docs/NodeVersionInfo.md
@@ -9,6 +9,7 @@ Name | Type | Description | Notes
 **ProtocolVersion** | **string** |  | [default to null]
 **SporkRootBlockHeight** | **string** |  | [default to null]
 **NodeRootBlockHeight** | **string** |  | [default to null]
+**CompatibleRange** | [***CompatibleRange**](CompatibleRange.md) |  | [optional] [default to null]
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/openapi/go-client-generated/model_compatible_range.go b/openapi/go-client-generated/model_compatible_range.go
@@ -0,0 +1,15 @@
+/*
+ * Access API
+ *
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * API version: 1.0.0
+ * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
+ */
+package swagger
+
+// A compatible version range.
+type CompatibleRange struct {
+	StartHeight string `json:"start_height"`
+	EndHeight string `json:"end_height"`
+}
diff --git a/openapi/go-client-generated/model_node_version_info.go b/openapi/go-client-generated/model_node_version_info.go
@@ -15,4 +15,5 @@ type NodeVersionInfo struct {
 	ProtocolVersion string `json:"protocol_version"`
 	SporkRootBlockHeight string `json:"spork_root_block_height"`
 	NodeRootBlockHeight string `json:"node_root_block_height"`
+	CompatibleRange *CompatibleRange `json:"compatible_range,omitempty"`
 }
diff --git a/protobuf/flow/entities/node_version_info.proto b/protobuf/flow/entities/node_version_info.proto
@@ -5,21 +5,29 @@ package flow.entities;
 option go_package = "github.com/onflow/flow/protobuf/go/flow/entities";
 option java_package = "org.onflow.protobuf.entities";
 
+message CompatibleRange {
+    // The first block that the version supports.
+    uint64 start_height = 1;
+    // The last block that the version supports.
+    uint64 end_height = 2;
+}
+
 message NodeVersionInfo {
-  // The currently running node software version.
-  string semver = 1;
-  // The git commit hash of the currently running node software.
-  string commit = 2;
-  // The unique identifier for the node's network within the current spork.
-  bytes spork_id = 3;
-  // The protocol version of the currently running node software.
-  uint64 protocol_version = 4;
-  // The spork root block height. This is the height of the first sealed block
-  // in the spork network.
-  uint64 spork_root_block_height = 5;
-  // The node's root block height. This is the first sealed block in the node's
-  // protocol database. If the node started at the beginning of the spork, it is
-  // the same as the spork root block height. If the node started after the
-  // beginning of the spork, it is the height of the first sealed block indexed.
-  uint64 node_root_block_height = 6;
+    // The currently running node software version.
+    string semver = 1;
+    // The git commit hash of the currently running node software.
+    string commit = 2;
+    // The unique identifier for the node's network within the current spork.
+    bytes spork_id = 3;
+    // The protocol version of the currently running node software.
+    uint64 protocol_version = 4;
+    // The spork root block height. This is the height of the first sealed block in the spork network.
+    uint64 spork_root_block_height = 5;
+    // The node's root block height. This is the first sealed block in the node's protocol database.
+    // If the node started at the beginning of the spork, it is the same as the spork root block height.
+    // If the node started after the beginning of the spork, it is the height of the first sealed block
+    // indexed.
+    uint64 node_root_block_height = 6;
+    // The compatible version range.
+    CompatibleRange compatible_range = 7;
 }
diff --git a/sporks.json b/sporks.json
@@ -1262,9 +1262,48 @@
       }
     },
     "testnet": {
+     "testnet51": {
+        "id": 51,
+        "live": true,
+        "name": "Testnet51",
+        "sporkTime": "2024-08-14T15:00:00Z",
+        "rootHeight": "211176670",
+        "rootParentId": "c92e07e5d4fbb3a64e0091085a190a4a1119bfc628c71efe513e373dc0482f5a",
+        "rootStateCommitment": "c3af77992f253f4dcfeac808912ff68e6f10923aa3fc4541a2e39eb9786c9eb3",
+        "gitCommitHash": "eeac47931cd6837ec6e29c4c0480609238959ccd",
+        "stateArtefacts": {
+          "gcp": {
+            "rootCheckpointFile": "https://storage.googleapis.com/flow-genesis-bootstrap/testnet-51-execution/public-root-information/root.checkpoint",
+            "rootProtocolStateSnapshot": "https://storage.googleapis.com/flow-genesis-bootstrap/testnet-51/public-root-information/root-protocol-state-snapshot.json",
+            "rootProtocolStateSnapshotSignature": "https://storage.googleapis.com/flow-genesis-bootstrap/testnet-51/public-root-information/root-protocol-state-snapshot.json.asc",
+            "nodeInfo": "https://storage.googleapis.com/flow-genesis-bootstrap/testnet-51/public-root-information/node-infos.pub.json"
+          },
+          "s3": {
+            "rootCheckpointFile": "",
+            "rootProtocolStateSnapshot": "",
+            "nodeInfo": "",
+            "executionStateBucket": ""
+          }
+        },
+        "tags": {
+          "flow-go-tag": "v0.37.1",
+          "flow-dps-tag": "v0.37.1",
+          "cadence-tag": "v0.37.1",
+          "docker-tag": "v0.37.1"
+        },
+        "accessNodes": [
+          "access.devnet.nodes.onflow.org:9000"
+        ],
+        "seedNodes": [
+          {
+            "address": "access-003.devnet51.nodes.onflow.org:3570",
+            "key": "b662102f4184fc1caeb2933cf87bba75cdd37758926584c0ce8a90549bb12ee0f9115111bbbb6acc2b889461208533369a91e8321eaf6bcb871a788ddd6bfbf7"
+          }
+        ]
+      },
      "testnet50": {
         "id": 50,
-        "live": true,
+        "live": false,
         "name": "Testnet50",
         "sporkTime": "2024-05-20T08:00:00Z",
         "rootHeight": "185185854",
@@ -1292,15 +1331,15 @@
           "docker-tag": "v0.33.23-failure-mode-revert-patch"
         },
         "accessNodes": [
-          "access.devnet.nodes.onflow.org:9000"
+          "access-001.devnet50.nodes.onflow.org:9000"
         ],
         "seedNodes": [
           {
-            "address": "access-003.devnet50.nodes.onflow.org:3570",
+            "address": "access-001.devnet50.nodes.onflow.org:3570",
             "key": "b662102f4184fc1caeb2933cf87bba75cdd37758926584c0ce8a90549bb12ee0f9115111bbbb6acc2b889461208533369a91e8321eaf6bcb871a788ddd6bfbf7"
           }
         ]
-      },   
+      },
       "testnet49": {
         "id": 49,
         "live": false,