Merge pull request #1613 from onflow/tim/add-collection-guarantee-chainid

Add ClusterChainID field to CollectionGuarantee

Author: tim-barry

openapi/access.yaml

@@ -1005,6 +1005,8 @@ components:
         - collection_id
         - signer_ids
         - signature
+        - reference_block_id
+        - cluster_chain_id
       properties:
         collection_id:
           $ref: '#/components/schemas/Identifier'
@@ -1016,6 +1018,10 @@ components:
           uniqueItems: true
         signature:
           $ref: '#/components/schemas/Signature'
+        reference_block_id:
+          $ref: '#/components/schemas/Identifier'
+        cluster_chain_id:
+          $ref: string
     BlockSeal:
       type: object
       required:

openapi/go-client-generated/.swagger-codegen/VERSION

@@ -1 +1 @@
-3.0.68
+3.0.71

openapi/go-client-generated/api/swagger.yaml

@@ -1607,11 +1607,15 @@ components:
             - null
             - null
             signature: null
+            reference_block_id: null
+            cluster_chain_id: "{}"
           - collection_id: null
             signer_ids:
             - null
             - null
             signature: null
+            reference_block_id: null
+            cluster_chain_id: "{}"
           block_seals:
           - result_id: null
             final_state: final_state
@@ -1739,11 +1743,15 @@ components:
           - null
           - null
           signature: null
+          reference_block_id: null
+          cluster_chain_id: "{}"
         - collection_id: null
           signer_ids:
           - null
           - null
           signature: null
+          reference_block_id: null
+          cluster_chain_id: "{}"
         block_seals:
         - result_id: null
           final_state: final_state
@@ -1779,7 +1787,9 @@ components:
           block_id: null
     CollectionGuarantee:
       required:
+      - cluster_chain_id
       - collection_id
+      - reference_block_id
       - signature
       - signer_ids
       type: object
@@ -1794,12 +1804,18 @@ components:
             $ref: "#/components/schemas/Identifier"
         signature:
           $ref: "#/components/schemas/Signature"
+        reference_block_id:
+          $ref: "#/components/schemas/Identifier"
+        cluster_chain_id:
+          $ref: "#/components/schemas/string"
       example:
         collection_id: null
         signer_ids:
         - null
         - null
         signature: null
+        reference_block_id: null
+        cluster_chain_id: "{}"
     BlockSeal:
       required:
       - aggregated_approval_signatures

openapi/go-client-generated/docs/CollectionGuarantee.md

@@ -6,6 +6,8 @@ Name | Type | Description | Notes
 **CollectionId** | **string** |  | [default to null]
 **SignerIds** | **[]string** |  | [default to null]
 **Signature** | **string** |  | [default to null]
+**ReferenceBlockId** | **string** |  | [default to null]
+**ClusterChainId** | **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)
 

openapi/go-client-generated/model_collection_guarantee.go

@@ -12,4 +12,6 @@ type CollectionGuarantee struct {
 	CollectionId string `json:"collection_id"`
 	SignerIds []string `json:"signer_ids"`
 	Signature string `json:"signature"`
+	ReferenceBlockId string `json:"reference_block_id"`
+	ClusterChainId string `json:"cluster_chain_id"`
 }

protobuf/flow/entities/collection.proto

@@ -17,4 +17,5 @@ message CollectionGuarantee {
   bytes signature = 4;
   repeated bytes signer_ids = 5; // deprecated!! value will be empty. replaced by signer_indices
   bytes signer_indices = 6;
+  bytes cluster_chain_id = 7;
 }