diff --git a/docs/static/openapi.yml b/docs/static/openapi.yml index 0bf9f1bbb..cf73a0224 100644 --- a/docs/static/openapi.yml +++ b/docs/static/openapi.yml @@ -1498,6 +1498,9 @@ paths: 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 vendorID: type: integer format: int32 @@ -1516,6 +1519,9 @@ paths: 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 productIDs: type: array items: @@ -2257,6 +2263,9 @@ paths: UTC info: type: string + schemaVersion: + type: integer + format: int64 vendorID: type: integer format: int32 @@ -2275,6 +2284,9 @@ paths: UTC info: type: string + schemaVersion: + type: integer + format: int64 productIDs: type: array items: @@ -2732,6 +2744,9 @@ paths: 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 vendorID: type: integer format: int32 @@ -2750,6 +2765,9 @@ paths: 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 productIDs: type: array items: @@ -3291,6 +3309,9 @@ paths: 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 vendorID: type: integer format: int32 @@ -3309,6 +3330,9 @@ paths: 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 productIDs: type: array items: @@ -3560,6 +3584,9 @@ paths: 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 schemaVersion: type: integer format: int64 @@ -3871,6 +3898,9 @@ paths: UTC info: type: string + schemaVersion: + type: integer + format: int64 schemaVersion: type: integer format: int64 @@ -4317,6 +4347,9 @@ paths: 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 vendorID: type: integer format: int32 @@ -4335,6 +4368,9 @@ paths: 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 productIDs: type: array items: @@ -4872,6 +4908,9 @@ paths: 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 vendorID: type: integer format: int32 @@ -4890,6 +4929,9 @@ paths: 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 productIDs: type: array items: @@ -5350,6 +5392,9 @@ paths: 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 vendorID: type: integer format: int32 @@ -5368,6 +5413,9 @@ paths: 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 productIDs: type: array items: @@ -5397,6 +5445,9 @@ paths: 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 reason: type: string enum: @@ -5926,6 +5977,9 @@ paths: 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 vendorID: type: integer format: int32 @@ -5944,6 +5998,9 @@ paths: 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 productIDs: type: array items: @@ -5973,6 +6030,9 @@ paths: UTC info: type: string + schemaVersion: + type: integer + format: int64 reason: type: string enum: @@ -6334,6 +6394,9 @@ paths: 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 rejects: type: array items: @@ -6349,6 +6412,9 @@ paths: 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 schemaVersion: type: integer format: int64 @@ -6782,6 +6848,9 @@ paths: UTC info: type: string + schemaVersion: + type: integer + format: int64 rejects: type: array items: @@ -6797,6 +6866,9 @@ paths: UTC info: type: string + schemaVersion: + type: integer + format: int64 schemaVersion: type: integer format: int64 @@ -7152,6 +7224,9 @@ paths: 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 rejects: type: array items: @@ -7167,6 +7242,9 @@ paths: 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 schemaVersion: type: integer format: int64 @@ -7600,6 +7678,9 @@ paths: UTC info: type: string + schemaVersion: + type: integer + format: int64 rejects: type: array items: @@ -7615,6 +7696,9 @@ paths: UTC info: type: string + schemaVersion: + type: integer + format: int64 schemaVersion: type: integer format: int64 @@ -7970,6 +8054,9 @@ paths: 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 rejects: type: array items: @@ -7985,6 +8072,9 @@ paths: 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 schemaVersion: type: integer format: int64 @@ -8418,6 +8508,9 @@ paths: UTC info: type: string + schemaVersion: + type: integer + format: int64 rejects: type: array items: @@ -8433,6 +8526,9 @@ paths: UTC info: type: string + schemaVersion: + type: integer + format: int64 schemaVersion: type: integer format: int64 @@ -8695,7 +8791,7 @@ paths: schemaVersion: type: integer format: int64 - commissionerRemoteUiFlowUrl: + managedAclExtensionRequestFlowUrl: type: string pagination: type: object @@ -8830,6 +8926,9 @@ paths: type: string partNumber: type: string + schemaVersion: + type: integer + format: int64 schemaVersion: type: integer format: int64 @@ -8918,7 +9017,7 @@ paths: schemaVersion: type: integer format: int64 - commissionerRemoteUiFlowUrl: + managedAclExtensionRequestFlowUrl: type: string default: description: An unexpected error response. @@ -9158,6 +9257,9 @@ paths: 1, 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 subjectAsText: type: string rejects: @@ -9175,6 +9277,9 @@ paths: 1, 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 vid: type: integer format: int32 @@ -9399,6 +9504,9 @@ paths: 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 subjectAsText: type: string rejects: @@ -9416,6 +9524,9 @@ paths: 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 vid: type: integer format: int32 @@ -9572,6 +9683,9 @@ paths: 1, 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 subjectAsText: type: string rejects: @@ -9589,6 +9703,9 @@ paths: 1, 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 vid: type: integer format: int32 @@ -9761,6 +9878,9 @@ paths: 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 subjectAsText: type: string rejects: @@ -9778,6 +9898,9 @@ paths: 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 vid: type: integer format: int32 @@ -9873,6 +9996,9 @@ paths: 1, 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 subjectAsText: type: string rejects: @@ -9890,6 +10016,9 @@ paths: 1, 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 vid: type: integer format: int32 @@ -10062,6 +10191,9 @@ paths: 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 subjectAsText: type: string rejects: @@ -10079,6 +10211,9 @@ paths: 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 vid: type: integer format: int32 @@ -10174,6 +10309,9 @@ paths: 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 subjectAsText: type: string rejects: @@ -10191,6 +10329,9 @@ paths: 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 vid: type: integer format: int32 @@ -10275,6 +10416,9 @@ paths: 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 subjectAsText: type: string rejects: @@ -10292,6 +10436,9 @@ paths: 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 vid: type: integer format: int32 @@ -10444,6 +10591,9 @@ paths: UTC info: type: string + schemaVersion: + type: integer + format: int64 subjectAsText: type: string rejects: @@ -10461,6 +10611,9 @@ paths: UTC info: type: string + schemaVersion: + type: integer + format: int64 vid: type: integer format: int32 @@ -10533,6 +10686,9 @@ paths: 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 subjectAsText: type: string serialNumber: @@ -10679,6 +10835,9 @@ paths: UTC info: type: string + schemaVersion: + type: integer + format: int64 subjectAsText: type: string serialNumber: @@ -10780,6 +10939,9 @@ paths: 1, 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 subjectAsText: type: string rejects: @@ -10797,6 +10959,9 @@ paths: 1, 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 vid: type: integer format: int32 @@ -10970,6 +11135,9 @@ paths: 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 subjectAsText: type: string rejects: @@ -10987,6 +11155,9 @@ paths: 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 vid: type: integer format: int32 @@ -11397,6 +11568,9 @@ paths: 1, 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 subjectAsText: type: string rejects: @@ -11414,6 +11588,9 @@ paths: 1, 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 vid: type: integer format: int32 @@ -11587,6 +11764,9 @@ paths: 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 subjectAsText: type: string rejects: @@ -11604,6 +11784,9 @@ paths: 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 vid: type: integer format: int32 @@ -11703,6 +11886,9 @@ paths: 1, 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 subjectAsText: type: string rejects: @@ -11720,6 +11906,9 @@ paths: 1, 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 vid: type: integer format: int32 @@ -11893,6 +12082,9 @@ paths: 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 subjectAsText: type: string rejects: @@ -11910,6 +12102,9 @@ paths: 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 vid: type: integer format: int32 @@ -12074,6 +12269,9 @@ paths: 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 disabledByNodeAdmin: type: boolean rejects: @@ -12091,6 +12289,9 @@ paths: 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 schemaVersion: type: integer format: int64 @@ -12404,6 +12605,9 @@ paths: UTC info: type: string + schemaVersion: + type: integer + format: int64 disabledByNodeAdmin: type: boolean rejects: @@ -12421,6 +12625,9 @@ paths: UTC info: type: string + schemaVersion: + type: integer + format: int64 schemaVersion: type: integer format: int64 @@ -14106,6 +14313,9 @@ paths: 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 rejects: type: array items: @@ -14121,6 +14331,9 @@ paths: 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 schemaVersion: type: integer format: int64 @@ -14434,6 +14647,9 @@ paths: UTC info: type: string + schemaVersion: + type: integer + format: int64 rejects: type: array items: @@ -14449,6 +14665,9 @@ paths: UTC info: type: string + schemaVersion: + type: integer + format: int64 schemaVersion: type: integer format: int64 @@ -14684,6 +14903,9 @@ paths: 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 rejects: type: array items: @@ -14699,6 +14921,9 @@ paths: 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 schemaVersion: type: integer format: int64 @@ -15012,6 +15237,9 @@ paths: UTC info: type: string + schemaVersion: + type: integer + format: int64 rejects: type: array items: @@ -15027,6 +15255,9 @@ paths: UTC info: type: string + schemaVersion: + type: integer + format: int64 schemaVersion: type: integer format: int64 @@ -17061,6 +17292,9 @@ definitions: title: number of nanoseconds elapsed since January 1, 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 vendorID: type: integer format: int32 @@ -17077,6 +17311,9 @@ definitions: title: number of nanoseconds elapsed since January 1, 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 productIDs: type: array items: @@ -17111,6 +17348,9 @@ definitions: title: number of nanoseconds elapsed since January 1, 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 zigbeealliance.distributedcomplianceledger.dclauth.PendingAccount: type: object properties: @@ -17333,6 +17573,9 @@ definitions: title: number of nanoseconds elapsed since January 1, 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 vendorID: type: integer format: int32 @@ -17349,6 +17592,9 @@ definitions: title: number of nanoseconds elapsed since January 1, 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 productIDs: type: array items: @@ -17388,6 +17634,9 @@ definitions: title: number of nanoseconds elapsed since January 1, 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 schemaVersion: type: integer format: int64 @@ -17619,6 +17868,9 @@ definitions: title: number of nanoseconds elapsed since January 1, 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 vendorID: type: integer format: int32 @@ -17635,6 +17887,9 @@ definitions: title: number of nanoseconds elapsed since January 1, 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 productIDs: type: array items: @@ -17910,6 +18165,9 @@ definitions: UTC info: type: string + schemaVersion: + type: integer + format: int64 vendorID: type: integer format: int32 @@ -17928,6 +18186,9 @@ definitions: UTC info: type: string + schemaVersion: + type: integer + format: int64 productIDs: type: array items: @@ -17998,7 +18259,10 @@ definitions: title: number of nanoseconds elapsed since January 1, 1970 UTC info: type: string - schemaVersion: + schemaVersion: + type: integer + format: int64 + schemaVersion: type: integer format: int64 pagination: @@ -18262,6 +18526,9 @@ definitions: UTC info: type: string + schemaVersion: + type: integer + format: int64 vendorID: type: integer format: int32 @@ -18280,6 +18547,9 @@ definitions: UTC info: type: string + schemaVersion: + type: integer + format: int64 productIDs: type: array items: @@ -18558,6 +18828,9 @@ definitions: UTC info: type: string + schemaVersion: + type: integer + format: int64 vendorID: type: integer format: int32 @@ -18576,6 +18849,9 @@ definitions: UTC info: type: string + schemaVersion: + type: integer + format: int64 productIDs: type: array items: @@ -18603,6 +18879,9 @@ definitions: title: number of nanoseconds elapsed since January 1, 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 reason: type: string enum: @@ -18860,6 +19139,9 @@ definitions: title: number of nanoseconds elapsed since January 1, 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 vendorID: type: integer format: int32 @@ -18876,6 +19158,9 @@ definitions: title: number of nanoseconds elapsed since January 1, 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 productIDs: type: array items: @@ -19131,6 +19416,9 @@ definitions: title: number of nanoseconds elapsed since January 1, 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 vendorID: type: integer format: int32 @@ -19147,6 +19435,9 @@ definitions: title: number of nanoseconds elapsed since January 1, 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 productIDs: type: array items: @@ -19189,6 +19480,9 @@ definitions: title: number of nanoseconds elapsed since January 1, 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 schemaVersion: type: integer format: int64 @@ -19421,6 +19715,9 @@ definitions: title: number of nanoseconds elapsed since January 1, 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 vendorID: type: integer format: int32 @@ -19437,6 +19734,9 @@ definitions: title: number of nanoseconds elapsed since January 1, 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 productIDs: type: array items: @@ -19683,6 +19983,9 @@ definitions: title: number of nanoseconds elapsed since January 1, 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 vendorID: type: integer format: int32 @@ -19699,6 +20002,9 @@ definitions: title: number of nanoseconds elapsed since January 1, 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 productIDs: type: array items: @@ -19726,6 +20032,9 @@ definitions: title: number of nanoseconds elapsed since January 1, 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 reason: type: string enum: @@ -19957,6 +20266,9 @@ definitions: title: number of nanoseconds elapsed since January 1, 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 vendorID: type: integer format: int32 @@ -19973,6 +20285,9 @@ definitions: title: number of nanoseconds elapsed since January 1, 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 productIDs: type: array items: @@ -20212,6 +20527,9 @@ definitions: title: number of nanoseconds elapsed since January 1, 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 vendorID: type: integer format: int32 @@ -20228,6 +20546,9 @@ definitions: title: number of nanoseconds elapsed since January 1, 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 productIDs: type: array items: @@ -20255,6 +20576,9 @@ definitions: title: number of nanoseconds elapsed since January 1, 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 reason: type: string enum: @@ -20517,6 +20841,9 @@ definitions: title: number of nanoseconds elapsed since January 1, 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 rejects: type: array items: @@ -20530,6 +20857,9 @@ definitions: title: number of nanoseconds elapsed since January 1, 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 schemaVersion: type: integer format: int64 @@ -20544,6 +20874,9 @@ definitions: title: number of nanoseconds elapsed since January 1, 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 zigbeealliance.distributedcomplianceledger.dclupgrade.ProposedUpgrade: type: object properties: @@ -20680,6 +21013,9 @@ definitions: title: number of nanoseconds elapsed since January 1, 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 rejects: type: array items: @@ -20693,6 +21029,9 @@ definitions: title: number of nanoseconds elapsed since January 1, 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 schemaVersion: type: integer format: int64 @@ -20841,6 +21180,9 @@ definitions: title: number of nanoseconds elapsed since January 1, 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 rejects: type: array items: @@ -20854,6 +21196,9 @@ definitions: title: number of nanoseconds elapsed since January 1, 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 schemaVersion: type: integer format: int64 @@ -21028,6 +21373,9 @@ definitions: title: number of nanoseconds elapsed since January 1, 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 rejects: type: array items: @@ -21041,6 +21389,9 @@ definitions: title: number of nanoseconds elapsed since January 1, 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 schemaVersion: type: integer format: int64 @@ -21215,6 +21566,9 @@ definitions: title: number of nanoseconds elapsed since January 1, 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 rejects: type: array items: @@ -21228,6 +21582,9 @@ definitions: title: number of nanoseconds elapsed since January 1, 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 schemaVersion: type: integer format: int64 @@ -21398,6 +21755,9 @@ definitions: title: number of nanoseconds elapsed since January 1, 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 rejects: type: array items: @@ -21411,6 +21771,9 @@ definitions: title: number of nanoseconds elapsed since January 1, 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 schemaVersion: type: integer format: int64 @@ -21555,6 +21918,9 @@ definitions: title: number of nanoseconds elapsed since January 1, 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 rejects: type: array items: @@ -21568,6 +21934,9 @@ definitions: title: number of nanoseconds elapsed since January 1, 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 schemaVersion: type: integer format: int64 @@ -21712,6 +22081,9 @@ definitions: title: number of nanoseconds elapsed since January 1, 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 rejects: type: array items: @@ -21725,6 +22097,9 @@ definitions: title: number of nanoseconds elapsed since January 1, 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 schemaVersion: type: integer format: int64 @@ -21864,6 +22239,9 @@ definitions: title: number of nanoseconds elapsed since January 1, 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 rejects: type: array items: @@ -21877,6 +22255,9 @@ definitions: title: number of nanoseconds elapsed since January 1, 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 schemaVersion: type: integer format: int64 @@ -21929,7 +22310,7 @@ definitions: schemaVersion: type: integer format: int64 - commissionerRemoteUiFlowUrl: + managedAclExtensionRequestFlowUrl: type: string zigbeealliance.distributedcomplianceledger.model.ModelVersion: type: object @@ -22002,6 +22383,9 @@ definitions: type: string partNumber: type: string + schemaVersion: + type: integer + format: int64 zigbeealliance.distributedcomplianceledger.model.QueryAllModelResponse: type: object properties: @@ -22056,7 +22440,7 @@ definitions: schemaVersion: type: integer format: int64 - commissionerRemoteUiFlowUrl: + managedAclExtensionRequestFlowUrl: type: string pagination: type: object @@ -22136,7 +22520,7 @@ definitions: schemaVersion: type: integer format: int64 - commissionerRemoteUiFlowUrl: + managedAclExtensionRequestFlowUrl: type: string zigbeealliance.distributedcomplianceledger.model.QueryGetModelVersionResponse: type: object @@ -22226,6 +22610,9 @@ definitions: type: string partNumber: type: string + schemaVersion: + type: integer + format: int64 schemaVersion: type: integer format: int64 @@ -22247,6 +22634,9 @@ definitions: type: string partNumber: type: string + schemaVersion: + type: integer + format: int64 schemaVersion: type: integer format: int64 @@ -22295,6 +22685,9 @@ definitions: title: number of nanoseconds elapsed since January 1, 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 subjectAsText: type: string rejects: @@ -22310,6 +22703,9 @@ definitions: title: number of nanoseconds elapsed since January 1, 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 vid: type: integer format: int32 @@ -22384,6 +22780,9 @@ definitions: title: number of nanoseconds elapsed since January 1, 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 subjectAsText: type: string rejects: @@ -22399,6 +22798,9 @@ definitions: title: number of nanoseconds elapsed since January 1, 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 vid: type: integer format: int32 @@ -22444,6 +22846,9 @@ definitions: title: number of nanoseconds elapsed since January 1, 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 zigbeealliance.distributedcomplianceledger.pki.NocIcaCertificates: type: object properties: @@ -22488,6 +22893,9 @@ definitions: title: number of nanoseconds elapsed since January 1, 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 subjectAsText: type: string rejects: @@ -22503,6 +22911,9 @@ definitions: title: number of nanoseconds elapsed since January 1, 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 vid: type: integer format: int32 @@ -22558,6 +22969,9 @@ definitions: title: number of nanoseconds elapsed since January 1, 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 subjectAsText: type: string rejects: @@ -22573,6 +22987,9 @@ definitions: title: number of nanoseconds elapsed since January 1, 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 vid: type: integer format: int32 @@ -22630,6 +23047,9 @@ definitions: title: number of nanoseconds elapsed since January 1, 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 subjectAsText: type: string rejects: @@ -22645,6 +23065,9 @@ definitions: title: number of nanoseconds elapsed since January 1, 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 vid: type: integer format: int32 @@ -22765,6 +23188,9 @@ definitions: title: number of nanoseconds elapsed since January 1, 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 subjectAsText: type: string rejects: @@ -22780,6 +23206,9 @@ definitions: title: number of nanoseconds elapsed since January 1, 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 vid: type: integer format: int32 @@ -22809,6 +23238,9 @@ definitions: title: number of nanoseconds elapsed since January 1, 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 subjectAsText: type: string serialNumber: @@ -22870,6 +23302,9 @@ definitions: UTC info: type: string + schemaVersion: + type: integer + format: int64 subjectAsText: type: string rejects: @@ -22887,6 +23322,9 @@ definitions: UTC info: type: string + schemaVersion: + type: integer + format: int64 vid: type: integer format: int32 @@ -22975,6 +23413,9 @@ definitions: UTC info: type: string + schemaVersion: + type: integer + format: int64 subjectAsText: type: string rejects: @@ -22992,6 +23433,9 @@ definitions: UTC info: type: string + schemaVersion: + type: integer + format: int64 vid: type: integer format: int32 @@ -23080,6 +23524,9 @@ definitions: UTC info: type: string + schemaVersion: + type: integer + format: int64 subjectAsText: type: string rejects: @@ -23097,6 +23544,9 @@ definitions: UTC info: type: string + schemaVersion: + type: integer + format: int64 vid: type: integer format: int32 @@ -23231,6 +23681,9 @@ definitions: title: number of nanoseconds elapsed since January 1, 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 subjectAsText: type: string rejects: @@ -23246,6 +23699,9 @@ definitions: title: number of nanoseconds elapsed since January 1, 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 vid: type: integer format: int32 @@ -23306,6 +23762,9 @@ definitions: title: number of nanoseconds elapsed since January 1, 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 subjectAsText: type: string serialNumber: @@ -23393,6 +23852,9 @@ definitions: UTC info: type: string + schemaVersion: + type: integer + format: int64 subjectAsText: type: string rejects: @@ -23410,6 +23872,9 @@ definitions: UTC info: type: string + schemaVersion: + type: integer + format: int64 vid: type: integer format: int32 @@ -23499,6 +23964,9 @@ definitions: UTC info: type: string + schemaVersion: + type: integer + format: int64 subjectAsText: type: string rejects: @@ -23516,6 +23984,9 @@ definitions: UTC info: type: string + schemaVersion: + type: integer + format: int64 vid: type: integer format: int32 @@ -23605,6 +24076,9 @@ definitions: UTC info: type: string + schemaVersion: + type: integer + format: int64 subjectAsText: type: string rejects: @@ -23622,6 +24096,9 @@ definitions: UTC info: type: string + schemaVersion: + type: integer + format: int64 vid: type: integer format: int32 @@ -23724,6 +24201,9 @@ definitions: UTC info: type: string + schemaVersion: + type: integer + format: int64 subjectAsText: type: string rejects: @@ -23741,6 +24221,9 @@ definitions: UTC info: type: string + schemaVersion: + type: integer + format: int64 vid: type: integer format: int32 @@ -23841,6 +24324,9 @@ definitions: UTC info: type: string + schemaVersion: + type: integer + format: int64 subjectAsText: type: string rejects: @@ -23858,6 +24344,9 @@ definitions: UTC info: type: string + schemaVersion: + type: integer + format: int64 vid: type: integer format: int32 @@ -23920,6 +24409,9 @@ definitions: UTC info: type: string + schemaVersion: + type: integer + format: int64 subjectAsText: type: string rejects: @@ -23937,6 +24429,9 @@ definitions: UTC info: type: string + schemaVersion: + type: integer + format: int64 vid: type: integer format: int32 @@ -24000,6 +24495,9 @@ definitions: UTC info: type: string + schemaVersion: + type: integer + format: int64 subjectAsText: type: string rejects: @@ -24017,6 +24515,9 @@ definitions: UTC info: type: string + schemaVersion: + type: integer + format: int64 vid: type: integer format: int32 @@ -24143,6 +24644,9 @@ definitions: title: number of nanoseconds elapsed since January 1, 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 subjectAsText: type: string rejects: @@ -24158,6 +24662,9 @@ definitions: title: number of nanoseconds elapsed since January 1, 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 vid: type: integer format: int32 @@ -24190,6 +24697,9 @@ definitions: title: number of nanoseconds elapsed since January 1, 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 subjectAsText: type: string serialNumber: @@ -24249,6 +24759,9 @@ definitions: UTC info: type: string + schemaVersion: + type: integer + format: int64 subjectAsText: type: string rejects: @@ -24266,6 +24779,9 @@ definitions: UTC info: type: string + schemaVersion: + type: integer + format: int64 vid: type: integer format: int32 @@ -24327,6 +24843,9 @@ definitions: UTC info: type: string + schemaVersion: + type: integer + format: int64 subjectAsText: type: string rejects: @@ -24344,6 +24863,9 @@ definitions: UTC info: type: string + schemaVersion: + type: integer + format: int64 vid: type: integer format: int32 @@ -24405,6 +24927,9 @@ definitions: UTC info: type: string + schemaVersion: + type: integer + format: int64 subjectAsText: type: string rejects: @@ -24422,6 +24947,9 @@ definitions: UTC info: type: string + schemaVersion: + type: integer + format: int64 vid: type: integer format: int32 @@ -24496,6 +25024,9 @@ definitions: title: number of nanoseconds elapsed since January 1, 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 subjectAsText: type: string rejects: @@ -24511,6 +25042,9 @@ definitions: title: number of nanoseconds elapsed since January 1, 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 vid: type: integer format: int32 @@ -24567,6 +25101,9 @@ definitions: title: number of nanoseconds elapsed since January 1, 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 subjectAsText: type: string rejects: @@ -24582,6 +25119,9 @@ definitions: title: number of nanoseconds elapsed since January 1, 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 vid: type: integer format: int32 @@ -24638,6 +25178,9 @@ definitions: title: number of nanoseconds elapsed since January 1, 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 subjectAsText: type: string rejects: @@ -24653,6 +25196,9 @@ definitions: title: number of nanoseconds elapsed since January 1, 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 vid: type: integer format: int32 @@ -24714,6 +25260,9 @@ definitions: title: number of nanoseconds elapsed since January 1, 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 disabledByNodeAdmin: type: boolean rejects: @@ -24729,6 +25278,9 @@ definitions: title: number of nanoseconds elapsed since January 1, 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 schemaVersion: type: integer format: int64 @@ -24743,6 +25295,9 @@ definitions: title: number of nanoseconds elapsed since January 1, 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 zigbeealliance.distributedcomplianceledger.validator.LastValidatorPower: type: object properties: @@ -24774,6 +25329,9 @@ definitions: title: number of nanoseconds elapsed since January 1, 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 rejects: type: array items: @@ -24787,6 +25345,9 @@ definitions: title: number of nanoseconds elapsed since January 1, 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 schemaVersion: type: integer format: int64 @@ -24815,6 +25376,9 @@ definitions: title: number of nanoseconds elapsed since January 1, 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 disabledByNodeAdmin: type: boolean rejects: @@ -24830,6 +25394,9 @@ definitions: title: number of nanoseconds elapsed since January 1, 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 schemaVersion: type: integer format: int64 @@ -24926,6 +25493,9 @@ definitions: title: number of nanoseconds elapsed since January 1, 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 rejects: type: array items: @@ -24939,6 +25509,9 @@ definitions: title: number of nanoseconds elapsed since January 1, 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 schemaVersion: type: integer format: int64 @@ -24993,6 +25566,9 @@ definitions: title: number of nanoseconds elapsed since January 1, 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 rejects: type: array items: @@ -25006,6 +25582,9 @@ definitions: title: number of nanoseconds elapsed since January 1, 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 schemaVersion: type: integer format: int64 @@ -25298,6 +25877,9 @@ definitions: title: number of nanoseconds elapsed since January 1, 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 disabledByNodeAdmin: type: boolean rejects: @@ -25313,6 +25895,9 @@ definitions: title: number of nanoseconds elapsed since January 1, 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 schemaVersion: type: integer format: int64 @@ -25353,6 +25938,9 @@ definitions: title: number of nanoseconds elapsed since January 1, 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 rejects: type: array items: @@ -25366,6 +25954,9 @@ definitions: title: number of nanoseconds elapsed since January 1, 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 schemaVersion: type: integer format: int64 @@ -25392,6 +25983,9 @@ definitions: title: number of nanoseconds elapsed since January 1, 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 rejects: type: array items: @@ -25405,6 +25999,9 @@ definitions: title: number of nanoseconds elapsed since January 1, 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 schemaVersion: type: integer format: int64 @@ -25636,6 +26233,9 @@ definitions: title: number of nanoseconds elapsed since January 1, 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 rejects: type: array items: @@ -25649,6 +26249,9 @@ definitions: title: number of nanoseconds elapsed since January 1, 1970 UTC info: type: string + schemaVersion: + type: integer + format: int64 schemaVersion: type: integer format: int64 diff --git a/docs/transactions.md b/docs/transactions.md index b24e0b6c4..d27c65bd3 100644 --- a/docs/transactions.md +++ b/docs/transactions.md @@ -208,7 +208,7 @@ Not all fields can be edited (see `EDIT_MODEL`). - commissioningModeInitialStepsInstruction: `optional(string)` - commissioningModeInitialStepsInstruction SHALL contain text which relates to specific values of CommissioningModeInitialStepsHint. Certain values of CommissioningModeInitialStepsHint, as defined in the Pairing Hint Table, indicate a Pairing Instruction (PI) dependency, and for these values the commissioningModeInitialStepsInstruction SHALL be set - commissioningModeSecondaryStepsHint: `optional(uint32)` - commissioningModeSecondaryStepsHint SHALL identify a hint for steps that can be used to put into commissioning mode a device that has already been commissioned. This field is a bitmap with values defined in the Pairing Hint Table. For example, a value of 4 (bit 2 is set) indicates that a device that has already been commissioned will require the user to visit a current CHIP Administrator to put the device into commissioning mode. - commissioningModeSecondaryStepInstruction: `optional(string)` - commissioningModeSecondaryStepInstruction SHALL contain text which relates to specific values of commissioningModeSecondaryStepsHint. Certain values of commissioningModeSecondaryStepsHint, as defined in the Pairing Hint Table, indicate a Pairing Instruction (PI) dependency, and for these values the commissioningModeSecondaryStepInstruction SHALL be set - - commissionerRemoteUiFlowURL `optional(string)` - commissionerRemoteUiFlowURL SHALL identify URL to show a custom flow UI for the commissioner + - managedAclExtensionRequestFlowUrl `optional(string)` - managedAclExtensionRequestFlowUrl SHALL identify a vendor-specific URL that can be used to request additional access to what is currently provided by the optional ManagedACL attribute - userManualURL: `optional(string)` - URL that contains product specific web page that contains user manual for the device model. - supportURL: `optional(string)` - URL that contains product specific web page that contains support details for the device model. - productURL: `optional(string)` - URL that contains product specific web page that contains details for the device model. @@ -255,7 +255,7 @@ All non-edited fields remain the same. - commissioningCustomFlowURL: `optional(string)` - commissioningCustomFlowURL SHALL identify a vendor specific commissioning URL for the device model when the commissioningCustomFlow field is set to '2' - commissioningModeInitialStepsInstruction: `optional(string)` - commissioningModeInitialStepsInstruction SHALL contain text which relates to specific values of CommissioningModeInitialStepsHint. Certain values of CommissioningModeInitialStepsHint, as defined in the Pairing Hint Table, indicate a Pairing Instruction (PI) dependency, and for these values the commissioningModeInitialStepsInstruction SHALL be set - commissioningModeSecondaryStepInstruction: `optional(string)` - commissioningModeSecondaryStepInstruction SHALL contain text which relates to specific values of commissioningModeSecondaryStepsHint. Certain values of commissioningModeSecondaryStepsHint, as defined in the Pairing Hint Table, indicate a Pairing Instruction (PI) dependency, and for these values the commissioningModeSecondaryStepInstruction SHALL be set - - commissionerRemoteUiFlowURL `optional(string)` - commissionerRemoteUiFlowURL SHALL identify URL to show a custom flow UI for the commissioner + - managedAclExtensionRequestFlowUrl `optional(string)` - managedAclExtensionRequestFlowUrl SHALL identify a vendor-specific URL that can be used to request additional access to what is currently provided by the optional ManagedACL attribute - userManualURL: `optional(string)` - URL that contains product specific web page that contains user manual for the device model. - supportURL: `optional(string)` - URL that contains product specific web page that contains support details for the device model. - productURL: `optional(string)` - URL that contains product specific web page that contains details for the device model. diff --git a/integration_tests/cli/model-demo.sh b/integration_tests/cli/model-demo.sh index e8f60030e..741ba2d95 100755 --- a/integration_tests/cli/model-demo.sh +++ b/integration_tests/cli/model-demo.sh @@ -60,9 +60,9 @@ test_divider productLabel="Device #1" schema_version_0=0 schema_version_2=2 -commissionerRemoteUiFlowURL="https://commissionerRemoteUiFlowURL.dclmodel" +managedAclExtensionRequestFlowUrl="https://managedAclExtensionRequestFlowUrl.dclmodel" echo "Add Model with VID: $vid PID: $pid" -result=$(echo "test1234" | dcld tx model add-model --vid=$vid --pid=$pid --deviceTypeID=1 --productName=TestProduct --productLabel="$productLabel" --partNumber=1 --commissioningCustomFlow=0 --commissionerRemoteUiFlowURL="$commissionerRemoteUiFlowURL" --schemaVersion=$schema_version_2 --from=$vendor_account --yes) +result=$(echo "test1234" | dcld tx model add-model --vid=$vid --pid=$pid --deviceTypeID=1 --productName=TestProduct --productLabel="$productLabel" --partNumber=1 --commissioningCustomFlow=0 --managedAclExtensionRequestFlowUrl="$managedAclExtensionRequestFlowUrl" --schemaVersion=$schema_version_2 --from=$vendor_account --yes) result=$(get_txn_result "$result") check_response "$result" "\"code\": 0" echo "$result" @@ -84,7 +84,7 @@ check_response "$result" "\"vid\": $vid" check_response "$result" "\"pid\": $pid" check_response "$result" "\"productLabel\": \"$productLabel\"" check_response "$result" "\"schemaVersion\": $schema_version_2" -check_response "$result" "\"commissionerRemoteUiFlowUrl\": \"$commissionerRemoteUiFlowURL\"" +check_response "$result" "\"managedAclExtensionRequestFlowUrl\": \"$managedAclExtensionRequestFlowUrl\"" echo "$result" echo "Get Model with VID: $vid_with_pids PID: $pid" @@ -130,12 +130,12 @@ echo "$result" test_divider -echo "Update Model with VID: ${vid} PID: ${pid} with new description, commissionerRemoteUiFlowURL and commissioningModeInitialStepsHint" +echo "Update Model with VID: ${vid} PID: ${pid} with new description, managedAclExtensionRequestFlowUrl and commissioningModeInitialStepsHint" description="New Device Description" schema_version_3=3 -newCommissionerRemoteUiFlowURL="https://commissionerRemoteUiFlowURL.dclmodel.updated" +newManagedAclExtensionRequestFlowUrl="https://managedAclExtensionRequestFlowUrl.dclmodel.updated" newCommissioningModeInitialStepsHint=8 -result=$(echo "test1234" | dcld tx model update-model --vid=$vid --pid=$pid --from $vendor_account --yes --productLabel "$description" --schemaVersion=$schema_version_3 --commissionerRemoteUiFlowURL="$newCommissionerRemoteUiFlowURL" --commissioningModeInitialStepsHint="$newCommissioningModeInitialStepsHint") +result=$(echo "test1234" | dcld tx model update-model --vid=$vid --pid=$pid --from $vendor_account --yes --productLabel "$description" --schemaVersion=$schema_version_3 --managedAclExtensionRequestFlowUrl="$newManagedAclExtensionRequestFlowUrl" --commissioningModeInitialStepsHint="$newCommissioningModeInitialStepsHint") result=$(get_txn_result "$result") check_response "$result" "\"code\": 0" echo "$result" @@ -156,7 +156,7 @@ check_response "$result" "\"vid\": $vid" check_response "$result" "\"pid\": $pid" check_response "$result" "\"productLabel\": \"$description\"" check_response "$result" "\"schemaVersion\": $schema_version_3" -check_response "$result" "\"commissionerRemoteUiFlowUrl\": \"$newCommissionerRemoteUiFlowURL\"" +check_response "$result" "\"managedAclExtensionRequestFlowUrl\": \"$newManagedAclExtensionRequestFlowUrl\"" check_response "$result" "\"commissioningModeInitialStepsHint\": $newCommissioningModeInitialStepsHint" echo "$result" diff --git a/proto/zigbeealliance/distributedcomplianceledger/dclauth/grant.proto b/proto/zigbeealliance/distributedcomplianceledger/dclauth/grant.proto index 53f7ed323..2352ae881 100644 --- a/proto/zigbeealliance/distributedcomplianceledger/dclauth/grant.proto +++ b/proto/zigbeealliance/distributedcomplianceledger/dclauth/grant.proto @@ -9,5 +9,6 @@ message Grant { string address = 1 [(cosmos_proto.scalar) = "cosmos.AddressString"]; int64 time = 2; // number of nanoseconds elapsed since January 1, 1970 UTC string info = 3; + uint32 schemaVersion = 4; } diff --git a/proto/zigbeealliance/distributedcomplianceledger/dclupgrade/grant.proto b/proto/zigbeealliance/distributedcomplianceledger/dclupgrade/grant.proto index 7ac0410e8..6b6c0f480 100644 --- a/proto/zigbeealliance/distributedcomplianceledger/dclupgrade/grant.proto +++ b/proto/zigbeealliance/distributedcomplianceledger/dclupgrade/grant.proto @@ -9,5 +9,6 @@ message Grant { string address = 1 [(cosmos_proto.scalar) = "cosmos.AddressString"]; int64 time = 2; // number of nanoseconds elapsed since January 1, 1970 UTC string info = 3; + uint32 schemaVersion = 4; } diff --git a/proto/zigbeealliance/distributedcomplianceledger/model/model.proto b/proto/zigbeealliance/distributedcomplianceledger/model/model.proto index ffa606579..80cf3dc71 100644 --- a/proto/zigbeealliance/distributedcomplianceledger/model/model.proto +++ b/proto/zigbeealliance/distributedcomplianceledger/model/model.proto @@ -25,6 +25,6 @@ message Model { int32 lsfRevision = 17; string creator = 18 [(cosmos_proto.scalar) = "cosmos.AddressString"]; uint32 schemaVersion = 19; - string commissionerRemoteUiFlowUrl = 20; + string managedAclExtensionRequestFlowUrl = 20; } diff --git a/proto/zigbeealliance/distributedcomplianceledger/model/product.proto b/proto/zigbeealliance/distributedcomplianceledger/model/product.proto index 35a67a652..a14bf1524 100644 --- a/proto/zigbeealliance/distributedcomplianceledger/model/product.proto +++ b/proto/zigbeealliance/distributedcomplianceledger/model/product.proto @@ -8,4 +8,5 @@ message Product { int32 pid = 1; string name = 2; string partNumber = 3; + uint32 schemaVersion = 4; } diff --git a/proto/zigbeealliance/distributedcomplianceledger/model/tx.proto b/proto/zigbeealliance/distributedcomplianceledger/model/tx.proto index 09396cae6..111948169 100644 --- a/proto/zigbeealliance/distributedcomplianceledger/model/tx.proto +++ b/proto/zigbeealliance/distributedcomplianceledger/model/tx.proto @@ -41,7 +41,7 @@ message MsgCreateModel { string productUrl = 16 [(gogoproto.moretags) = "validate:\"omitempty,url,startsnotwith=http:,max=256\""]; string lsfUrl = 17 [(gogoproto.moretags) = "validate:\"omitempty,url,startsnotwith=http:,max=256\""]; uint32 schemaVersion = 18 [(gogoproto.moretags) = "validate:\"gte=0,lte=65535\""]; - string commissionerRemoteUiFlowUrl = 19 [(gogoproto.moretags) = "validate:\"omitempty,url,startsnotwith=http:,max=256\""]; + string managedAclExtensionRequestFlowUrl = 19 [(gogoproto.moretags) = "validate:\"omitempty,url,startsnotwith=http:,max=256\""]; } message MsgCreateModelResponse {} @@ -62,7 +62,7 @@ message MsgUpdateModel { string lsfUrl = 13 [(gogoproto.moretags) = "validate:\"omitempty,url,startsnotwith=http:,max=256\""]; int32 lsfRevision = 14 [(gogoproto.moretags) = "validate:\"gte=0,lte=65535\""]; uint32 schemaVersion = 15 [(gogoproto.moretags) = "validate:\"gte=0,lte=65535\""]; - string commissionerRemoteUiFlowUrl = 16 [(gogoproto.moretags) = "validate:\"omitempty,url,startsnotwith=http:,max=256\""]; + string managedAclExtensionRequestFlowUrl = 16 [(gogoproto.moretags) = "validate:\"omitempty,url,startsnotwith=http:,max=256\""]; uint32 commissioningModeInitialStepsHint = 17; } message MsgUpdateModelResponse {} diff --git a/proto/zigbeealliance/distributedcomplianceledger/pki/grant.proto b/proto/zigbeealliance/distributedcomplianceledger/pki/grant.proto index 5c76753c3..c1028833d 100644 --- a/proto/zigbeealliance/distributedcomplianceledger/pki/grant.proto +++ b/proto/zigbeealliance/distributedcomplianceledger/pki/grant.proto @@ -9,5 +9,6 @@ message Grant { string address = 1 [(cosmos_proto.scalar) = "cosmos.AddressString"]; int64 time = 2; // number of nanoseconds elapsed since January 1, 1970 UTC string info = 3; + uint32 schemaVersion = 4; } diff --git a/proto/zigbeealliance/distributedcomplianceledger/validator/grant.proto b/proto/zigbeealliance/distributedcomplianceledger/validator/grant.proto index 3284611f9..d11ad361e 100644 --- a/proto/zigbeealliance/distributedcomplianceledger/validator/grant.proto +++ b/proto/zigbeealliance/distributedcomplianceledger/validator/grant.proto @@ -9,4 +9,5 @@ message Grant { string address = 1 [(cosmos_proto.scalar) = "cosmos.AddressString"]; int64 time = 2; // number of nanoseconds elapsed since January 1, 1970 UTC string info = 3; + uint32 schemaVersion = 4; } \ No newline at end of file diff --git a/ts-client/zigbeealliance.distributedcomplianceledger.dclauth/rest.ts b/ts-client/zigbeealliance.distributedcomplianceledger.dclauth/rest.ts index 4ef5c9a34..1f3b07bf0 100644 --- a/ts-client/zigbeealliance.distributedcomplianceledger.dclauth/rest.ts +++ b/ts-client/zigbeealliance.distributedcomplianceledger.dclauth/rest.ts @@ -31,6 +31,9 @@ export interface DclauthGrant { */ time?: string; info?: string; + + /** @format int64 */ + schemaVersion?: number; } export type DclauthMsgApproveAddAccountResponse = object; diff --git a/ts-client/zigbeealliance.distributedcomplianceledger.dclauth/types/zigbeealliance/distributedcomplianceledger/dclauth/grant.ts b/ts-client/zigbeealliance.distributedcomplianceledger.dclauth/types/zigbeealliance/distributedcomplianceledger/dclauth/grant.ts index a38e736d6..da6f7415e 100644 --- a/ts-client/zigbeealliance.distributedcomplianceledger.dclauth/types/zigbeealliance/distributedcomplianceledger/dclauth/grant.ts +++ b/ts-client/zigbeealliance.distributedcomplianceledger.dclauth/types/zigbeealliance/distributedcomplianceledger/dclauth/grant.ts @@ -9,10 +9,11 @@ export interface Grant { /** number of nanoseconds elapsed since January 1, 1970 UTC */ time: number; info: string; + schemaVersion: number; } function createBaseGrant(): Grant { - return { address: "", time: 0, info: "" }; + return { address: "", time: 0, info: "", schemaVersion: 0 }; } export const Grant = { @@ -26,6 +27,9 @@ export const Grant = { if (message.info !== "") { writer.uint32(26).string(message.info); } + if (message.schemaVersion !== 0) { + writer.uint32(32).uint32(message.schemaVersion); + } return writer; }, @@ -45,6 +49,9 @@ export const Grant = { case 3: message.info = reader.string(); break; + case 4: + message.schemaVersion = reader.uint32(); + break; default: reader.skipType(tag & 7); break; @@ -58,6 +65,7 @@ export const Grant = { address: isSet(object.address) ? String(object.address) : "", time: isSet(object.time) ? Number(object.time) : 0, info: isSet(object.info) ? String(object.info) : "", + schemaVersion: isSet(object.schemaVersion) ? Number(object.schemaVersion) : 0, }; }, @@ -66,6 +74,7 @@ export const Grant = { message.address !== undefined && (obj.address = message.address); message.time !== undefined && (obj.time = Math.round(message.time)); message.info !== undefined && (obj.info = message.info); + message.schemaVersion !== undefined && (obj.schemaVersion = Math.round(message.schemaVersion)); return obj; }, @@ -74,6 +83,7 @@ export const Grant = { message.address = object.address ?? ""; message.time = object.time ?? 0; message.info = object.info ?? ""; + message.schemaVersion = object.schemaVersion ?? 0; return message; }, }; diff --git a/ts-client/zigbeealliance.distributedcomplianceledger.dclupgrade/rest.ts b/ts-client/zigbeealliance.distributedcomplianceledger.dclupgrade/rest.ts index 07680b9a1..39dc50d88 100644 --- a/ts-client/zigbeealliance.distributedcomplianceledger.dclupgrade/rest.ts +++ b/ts-client/zigbeealliance.distributedcomplianceledger.dclupgrade/rest.ts @@ -18,6 +18,9 @@ export interface DclupgradeGrant { */ time?: string; info?: string; + + /** @format int64 */ + schemaVersion?: number; } export type DclupgradeMsgApproveUpgradeResponse = object; diff --git a/ts-client/zigbeealliance.distributedcomplianceledger.dclupgrade/types/zigbeealliance/distributedcomplianceledger/dclupgrade/grant.ts b/ts-client/zigbeealliance.distributedcomplianceledger.dclupgrade/types/zigbeealliance/distributedcomplianceledger/dclupgrade/grant.ts index f17b680a5..68c7309f9 100644 --- a/ts-client/zigbeealliance.distributedcomplianceledger.dclupgrade/types/zigbeealliance/distributedcomplianceledger/dclupgrade/grant.ts +++ b/ts-client/zigbeealliance.distributedcomplianceledger.dclupgrade/types/zigbeealliance/distributedcomplianceledger/dclupgrade/grant.ts @@ -9,10 +9,11 @@ export interface Grant { /** number of nanoseconds elapsed since January 1, 1970 UTC */ time: number; info: string; + schemaVersion: number; } function createBaseGrant(): Grant { - return { address: "", time: 0, info: "" }; + return { address: "", time: 0, info: "", schemaVersion: 0 }; } export const Grant = { @@ -26,6 +27,9 @@ export const Grant = { if (message.info !== "") { writer.uint32(26).string(message.info); } + if (message.schemaVersion !== 0) { + writer.uint32(32).uint32(message.schemaVersion); + } return writer; }, @@ -45,6 +49,9 @@ export const Grant = { case 3: message.info = reader.string(); break; + case 4: + message.schemaVersion = reader.uint32(); + break; default: reader.skipType(tag & 7); break; @@ -58,6 +65,7 @@ export const Grant = { address: isSet(object.address) ? String(object.address) : "", time: isSet(object.time) ? Number(object.time) : 0, info: isSet(object.info) ? String(object.info) : "", + schemaVersion: isSet(object.schemaVersion) ? Number(object.schemaVersion) : 0, }; }, @@ -66,6 +74,7 @@ export const Grant = { message.address !== undefined && (obj.address = message.address); message.time !== undefined && (obj.time = Math.round(message.time)); message.info !== undefined && (obj.info = message.info); + message.schemaVersion !== undefined && (obj.schemaVersion = Math.round(message.schemaVersion)); return obj; }, @@ -74,6 +83,7 @@ export const Grant = { message.address = object.address ?? ""; message.time = object.time ?? 0; message.info = object.info ?? ""; + message.schemaVersion = object.schemaVersion ?? 0; return message; }, }; diff --git a/ts-client/zigbeealliance.distributedcomplianceledger.model/rest.ts b/ts-client/zigbeealliance.distributedcomplianceledger.model/rest.ts index 3039a2091..efb3ae045 100644 --- a/ts-client/zigbeealliance.distributedcomplianceledger.model/rest.ts +++ b/ts-client/zigbeealliance.distributedcomplianceledger.model/rest.ts @@ -44,7 +44,7 @@ export interface DistributedcomplianceledgermodelModel { /** @format int64 */ schemaVersion?: number; - commissionerRemoteUiFlowUrl?: string; + managedAclExtensionRequestFlowUrl?: string; } export interface DistributedcomplianceledgermodelModelVersion { @@ -121,6 +121,9 @@ export interface ModelProduct { pid?: number; name?: string; partNumber?: string; + + /** @format int64 */ + schemaVersion?: number; } export interface ModelQueryAllModelResponse { diff --git a/ts-client/zigbeealliance.distributedcomplianceledger.model/types/zigbeealliance/distributedcomplianceledger/model/model.ts b/ts-client/zigbeealliance.distributedcomplianceledger.model/types/zigbeealliance/distributedcomplianceledger/model/model.ts index cfe021f18..d93ddb950 100644 --- a/ts-client/zigbeealliance.distributedcomplianceledger.model/types/zigbeealliance/distributedcomplianceledger/model/model.ts +++ b/ts-client/zigbeealliance.distributedcomplianceledger.model/types/zigbeealliance/distributedcomplianceledger/model/model.ts @@ -23,7 +23,7 @@ export interface Model { lsfRevision: number; creator: string; schemaVersion: number; - commissionerRemoteUiFlowUrl: string; + managedAclExtensionRequestFlowUrl: string; } function createBaseModel(): Model { @@ -47,7 +47,7 @@ function createBaseModel(): Model { lsfRevision: 0, creator: "", schemaVersion: 0, - commissionerRemoteUiFlowUrl: "", + managedAclExtensionRequestFlowUrl: "", }; } @@ -110,8 +110,8 @@ export const Model = { if (message.schemaVersion !== 0) { writer.uint32(152).uint32(message.schemaVersion); } - if (message.commissionerRemoteUiFlowUrl !== "") { - writer.uint32(162).string(message.commissionerRemoteUiFlowUrl); + if (message.managedAclExtensionRequestFlowUrl !== "") { + writer.uint32(162).string(message.managedAclExtensionRequestFlowUrl); } return writer; }, @@ -181,7 +181,7 @@ export const Model = { message.schemaVersion = reader.uint32(); break; case 20: - message.commissionerRemoteUiFlowUrl = reader.string(); + message.managedAclExtensionRequestFlowUrl = reader.string(); break; default: reader.skipType(tag & 7); @@ -222,8 +222,8 @@ export const Model = { lsfRevision: isSet(object.lsfRevision) ? Number(object.lsfRevision) : 0, creator: isSet(object.creator) ? String(object.creator) : "", schemaVersion: isSet(object.schemaVersion) ? Number(object.schemaVersion) : 0, - commissionerRemoteUiFlowUrl: isSet(object.commissionerRemoteUiFlowUrl) - ? String(object.commissionerRemoteUiFlowUrl) + managedAclExtensionRequestFlowUrl: isSet(object.managedAclExtensionRequestFlowUrl) + ? String(object.managedAclExtensionRequestFlowUrl) : "", }; }, @@ -255,8 +255,8 @@ export const Model = { message.lsfRevision !== undefined && (obj.lsfRevision = Math.round(message.lsfRevision)); message.creator !== undefined && (obj.creator = message.creator); message.schemaVersion !== undefined && (obj.schemaVersion = Math.round(message.schemaVersion)); - message.commissionerRemoteUiFlowUrl !== undefined - && (obj.commissionerRemoteUiFlowUrl = message.commissionerRemoteUiFlowUrl); + message.managedAclExtensionRequestFlowUrl !== undefined + && (obj.managedAclExtensionRequestFlowUrl = message.managedAclExtensionRequestFlowUrl); return obj; }, @@ -281,7 +281,7 @@ export const Model = { message.lsfRevision = object.lsfRevision ?? 0; message.creator = object.creator ?? ""; message.schemaVersion = object.schemaVersion ?? 0; - message.commissionerRemoteUiFlowUrl = object.commissionerRemoteUiFlowUrl ?? ""; + message.managedAclExtensionRequestFlowUrl = object.managedAclExtensionRequestFlowUrl ?? ""; return message; }, }; diff --git a/ts-client/zigbeealliance.distributedcomplianceledger.model/types/zigbeealliance/distributedcomplianceledger/model/product.ts b/ts-client/zigbeealliance.distributedcomplianceledger.model/types/zigbeealliance/distributedcomplianceledger/model/product.ts index 28b33ea0d..e1858e074 100644 --- a/ts-client/zigbeealliance.distributedcomplianceledger.model/types/zigbeealliance/distributedcomplianceledger/model/product.ts +++ b/ts-client/zigbeealliance.distributedcomplianceledger.model/types/zigbeealliance/distributedcomplianceledger/model/product.ts @@ -7,10 +7,11 @@ export interface Product { pid: number; name: string; partNumber: string; + schemaVersion: number; } function createBaseProduct(): Product { - return { pid: 0, name: "", partNumber: "" }; + return { pid: 0, name: "", partNumber: "", schemaVersion: 0 }; } export const Product = { @@ -24,6 +25,9 @@ export const Product = { if (message.partNumber !== "") { writer.uint32(26).string(message.partNumber); } + if (message.schemaVersion !== 0) { + writer.uint32(32).uint32(message.schemaVersion); + } return writer; }, @@ -43,6 +47,9 @@ export const Product = { case 3: message.partNumber = reader.string(); break; + case 4: + message.schemaVersion = reader.uint32(); + break; default: reader.skipType(tag & 7); break; @@ -56,6 +63,7 @@ export const Product = { pid: isSet(object.pid) ? Number(object.pid) : 0, name: isSet(object.name) ? String(object.name) : "", partNumber: isSet(object.partNumber) ? String(object.partNumber) : "", + schemaVersion: isSet(object.schemaVersion) ? Number(object.schemaVersion) : 0, }; }, @@ -64,6 +72,7 @@ export const Product = { message.pid !== undefined && (obj.pid = Math.round(message.pid)); message.name !== undefined && (obj.name = message.name); message.partNumber !== undefined && (obj.partNumber = message.partNumber); + message.schemaVersion !== undefined && (obj.schemaVersion = Math.round(message.schemaVersion)); return obj; }, @@ -72,6 +81,7 @@ export const Product = { message.pid = object.pid ?? 0; message.name = object.name ?? ""; message.partNumber = object.partNumber ?? ""; + message.schemaVersion = object.schemaVersion ?? 0; return message; }, }; diff --git a/ts-client/zigbeealliance.distributedcomplianceledger.model/types/zigbeealliance/distributedcomplianceledger/model/tx.ts b/ts-client/zigbeealliance.distributedcomplianceledger.model/types/zigbeealliance/distributedcomplianceledger/model/tx.ts index 940c33b3d..24afd9ca1 100644 --- a/ts-client/zigbeealliance.distributedcomplianceledger.model/types/zigbeealliance/distributedcomplianceledger/model/tx.ts +++ b/ts-client/zigbeealliance.distributedcomplianceledger.model/types/zigbeealliance/distributedcomplianceledger/model/tx.ts @@ -23,7 +23,7 @@ export interface MsgCreateModel { productUrl: string; lsfUrl: string; schemaVersion: number; - commissionerRemoteUiFlowUrl: string; + managedAclExtensionRequestFlowUrl: string; } export interface MsgCreateModelResponse { @@ -45,7 +45,7 @@ export interface MsgUpdateModel { lsfUrl: string; lsfRevision: number; schemaVersion: number; - commissionerRemoteUiFlowUrl: string; + managedAclExtensionRequestFlowUrl: string; commissioningModeInitialStepsHint: number; } @@ -131,7 +131,7 @@ function createBaseMsgCreateModel(): MsgCreateModel { productUrl: "", lsfUrl: "", schemaVersion: 0, - commissionerRemoteUiFlowUrl: "", + managedAclExtensionRequestFlowUrl: "", }; } @@ -191,8 +191,8 @@ export const MsgCreateModel = { if (message.schemaVersion !== 0) { writer.uint32(144).uint32(message.schemaVersion); } - if (message.commissionerRemoteUiFlowUrl !== "") { - writer.uint32(154).string(message.commissionerRemoteUiFlowUrl); + if (message.managedAclExtensionRequestFlowUrl !== "") { + writer.uint32(154).string(message.managedAclExtensionRequestFlowUrl); } return writer; }, @@ -259,7 +259,7 @@ export const MsgCreateModel = { message.schemaVersion = reader.uint32(); break; case 19: - message.commissionerRemoteUiFlowUrl = reader.string(); + message.managedAclExtensionRequestFlowUrl = reader.string(); break; default: reader.skipType(tag & 7); @@ -299,8 +299,8 @@ export const MsgCreateModel = { productUrl: isSet(object.productUrl) ? String(object.productUrl) : "", lsfUrl: isSet(object.lsfUrl) ? String(object.lsfUrl) : "", schemaVersion: isSet(object.schemaVersion) ? Number(object.schemaVersion) : 0, - commissionerRemoteUiFlowUrl: isSet(object.commissionerRemoteUiFlowUrl) - ? String(object.commissionerRemoteUiFlowUrl) + managedAclExtensionRequestFlowUrl: isSet(object.managedAclExtensionRequestFlowUrl) + ? String(object.managedAclExtensionRequestFlowUrl) : "", }; }, @@ -331,8 +331,8 @@ export const MsgCreateModel = { message.productUrl !== undefined && (obj.productUrl = message.productUrl); message.lsfUrl !== undefined && (obj.lsfUrl = message.lsfUrl); message.schemaVersion !== undefined && (obj.schemaVersion = Math.round(message.schemaVersion)); - message.commissionerRemoteUiFlowUrl !== undefined - && (obj.commissionerRemoteUiFlowUrl = message.commissionerRemoteUiFlowUrl); + message.managedAclExtensionRequestFlowUrl !== undefined + && (obj.managedAclExtensionRequestFlowUrl = message.managedAclExtensionRequestFlowUrl); return obj; }, @@ -356,7 +356,7 @@ export const MsgCreateModel = { message.productUrl = object.productUrl ?? ""; message.lsfUrl = object.lsfUrl ?? ""; message.schemaVersion = object.schemaVersion ?? 0; - message.commissionerRemoteUiFlowUrl = object.commissionerRemoteUiFlowUrl ?? ""; + message.managedAclExtensionRequestFlowUrl = object.managedAclExtensionRequestFlowUrl ?? ""; return message; }, }; @@ -417,7 +417,7 @@ function createBaseMsgUpdateModel(): MsgUpdateModel { lsfUrl: "", lsfRevision: 0, schemaVersion: 0, - commissionerRemoteUiFlowUrl: "", + managedAclExtensionRequestFlowUrl: "", commissioningModeInitialStepsHint: 0, }; } @@ -469,8 +469,8 @@ export const MsgUpdateModel = { if (message.schemaVersion !== 0) { writer.uint32(120).uint32(message.schemaVersion); } - if (message.commissionerRemoteUiFlowUrl !== "") { - writer.uint32(130).string(message.commissionerRemoteUiFlowUrl); + if (message.managedAclExtensionRequestFlowUrl !== "") { + writer.uint32(130).string(message.managedAclExtensionRequestFlowUrl); } if (message.commissioningModeInitialStepsHint !== 0) { writer.uint32(136).uint32(message.commissioningModeInitialStepsHint); @@ -531,7 +531,7 @@ export const MsgUpdateModel = { message.schemaVersion = reader.uint32(); break; case 16: - message.commissionerRemoteUiFlowUrl = reader.string(); + message.managedAclExtensionRequestFlowUrl = reader.string(); break; case 17: message.commissioningModeInitialStepsHint = reader.uint32(); @@ -567,8 +567,8 @@ export const MsgUpdateModel = { lsfUrl: isSet(object.lsfUrl) ? String(object.lsfUrl) : "", lsfRevision: isSet(object.lsfRevision) ? Number(object.lsfRevision) : 0, schemaVersion: isSet(object.schemaVersion) ? Number(object.schemaVersion) : 0, - commissionerRemoteUiFlowUrl: isSet(object.commissionerRemoteUiFlowUrl) - ? String(object.commissionerRemoteUiFlowUrl) + managedAclExtensionRequestFlowUrl: isSet(object.managedAclExtensionRequestFlowUrl) + ? String(object.managedAclExtensionRequestFlowUrl) : "", commissioningModeInitialStepsHint: isSet(object.commissioningModeInitialStepsHint) ? Number(object.commissioningModeInitialStepsHint) @@ -596,8 +596,8 @@ export const MsgUpdateModel = { message.lsfUrl !== undefined && (obj.lsfUrl = message.lsfUrl); message.lsfRevision !== undefined && (obj.lsfRevision = Math.round(message.lsfRevision)); message.schemaVersion !== undefined && (obj.schemaVersion = Math.round(message.schemaVersion)); - message.commissionerRemoteUiFlowUrl !== undefined - && (obj.commissionerRemoteUiFlowUrl = message.commissionerRemoteUiFlowUrl); + message.managedAclExtensionRequestFlowUrl !== undefined + && (obj.managedAclExtensionRequestFlowUrl = message.managedAclExtensionRequestFlowUrl); message.commissioningModeInitialStepsHint !== undefined && (obj.commissioningModeInitialStepsHint = Math.round(message.commissioningModeInitialStepsHint)); return obj; @@ -620,7 +620,7 @@ export const MsgUpdateModel = { message.lsfUrl = object.lsfUrl ?? ""; message.lsfRevision = object.lsfRevision ?? 0; message.schemaVersion = object.schemaVersion ?? 0; - message.commissionerRemoteUiFlowUrl = object.commissionerRemoteUiFlowUrl ?? ""; + message.managedAclExtensionRequestFlowUrl = object.managedAclExtensionRequestFlowUrl ?? ""; message.commissioningModeInitialStepsHint = object.commissioningModeInitialStepsHint ?? 0; return message; }, diff --git a/ts-client/zigbeealliance.distributedcomplianceledger.pki/rest.ts b/ts-client/zigbeealliance.distributedcomplianceledger.pki/rest.ts index 90c474ffe..9617e39bc 100644 --- a/ts-client/zigbeealliance.distributedcomplianceledger.pki/rest.ts +++ b/ts-client/zigbeealliance.distributedcomplianceledger.pki/rest.ts @@ -211,6 +211,9 @@ export interface PkiGrant { */ time?: string; info?: string; + + /** @format int64 */ + schemaVersion?: number; } export type PkiMsgAddNocX509IcaCertResponse = object; diff --git a/ts-client/zigbeealliance.distributedcomplianceledger.pki/types/zigbeealliance/distributedcomplianceledger/pki/grant.ts b/ts-client/zigbeealliance.distributedcomplianceledger.pki/types/zigbeealliance/distributedcomplianceledger/pki/grant.ts index 935b67f32..aaf7add44 100644 --- a/ts-client/zigbeealliance.distributedcomplianceledger.pki/types/zigbeealliance/distributedcomplianceledger/pki/grant.ts +++ b/ts-client/zigbeealliance.distributedcomplianceledger.pki/types/zigbeealliance/distributedcomplianceledger/pki/grant.ts @@ -9,10 +9,11 @@ export interface Grant { /** number of nanoseconds elapsed since January 1, 1970 UTC */ time: number; info: string; + schemaVersion: number; } function createBaseGrant(): Grant { - return { address: "", time: 0, info: "" }; + return { address: "", time: 0, info: "", schemaVersion: 0 }; } export const Grant = { @@ -26,6 +27,9 @@ export const Grant = { if (message.info !== "") { writer.uint32(26).string(message.info); } + if (message.schemaVersion !== 0) { + writer.uint32(32).uint32(message.schemaVersion); + } return writer; }, @@ -45,6 +49,9 @@ export const Grant = { case 3: message.info = reader.string(); break; + case 4: + message.schemaVersion = reader.uint32(); + break; default: reader.skipType(tag & 7); break; @@ -58,6 +65,7 @@ export const Grant = { address: isSet(object.address) ? String(object.address) : "", time: isSet(object.time) ? Number(object.time) : 0, info: isSet(object.info) ? String(object.info) : "", + schemaVersion: isSet(object.schemaVersion) ? Number(object.schemaVersion) : 0, }; }, @@ -66,6 +74,7 @@ export const Grant = { message.address !== undefined && (obj.address = message.address); message.time !== undefined && (obj.time = Math.round(message.time)); message.info !== undefined && (obj.info = message.info); + message.schemaVersion !== undefined && (obj.schemaVersion = Math.round(message.schemaVersion)); return obj; }, @@ -74,6 +83,7 @@ export const Grant = { message.address = object.address ?? ""; message.time = object.time ?? 0; message.info = object.info ?? ""; + message.schemaVersion = object.schemaVersion ?? 0; return message; }, }; diff --git a/ts-client/zigbeealliance.distributedcomplianceledger.validator/rest.ts b/ts-client/zigbeealliance.distributedcomplianceledger.validator/rest.ts index f034a49b8..7ed347d86 100644 --- a/ts-client/zigbeealliance.distributedcomplianceledger.validator/rest.ts +++ b/ts-client/zigbeealliance.distributedcomplianceledger.validator/rest.ts @@ -350,6 +350,9 @@ export interface ValidatorGrant { */ time?: string; info?: string; + + /** @format int64 */ + schemaVersion?: number; } export type ValidatorMsgApproveDisableValidatorResponse = object; diff --git a/ts-client/zigbeealliance.distributedcomplianceledger.validator/types/zigbeealliance/distributedcomplianceledger/validator/grant.ts b/ts-client/zigbeealliance.distributedcomplianceledger.validator/types/zigbeealliance/distributedcomplianceledger/validator/grant.ts index f6db5569f..e82377c3e 100644 --- a/ts-client/zigbeealliance.distributedcomplianceledger.validator/types/zigbeealliance/distributedcomplianceledger/validator/grant.ts +++ b/ts-client/zigbeealliance.distributedcomplianceledger.validator/types/zigbeealliance/distributedcomplianceledger/validator/grant.ts @@ -9,10 +9,11 @@ export interface Grant { /** number of nanoseconds elapsed since January 1, 1970 UTC */ time: number; info: string; + schemaVersion: number; } function createBaseGrant(): Grant { - return { address: "", time: 0, info: "" }; + return { address: "", time: 0, info: "", schemaVersion: 0 }; } export const Grant = { @@ -26,6 +27,9 @@ export const Grant = { if (message.info !== "") { writer.uint32(26).string(message.info); } + if (message.schemaVersion !== 0) { + writer.uint32(32).uint32(message.schemaVersion); + } return writer; }, @@ -45,6 +49,9 @@ export const Grant = { case 3: message.info = reader.string(); break; + case 4: + message.schemaVersion = reader.uint32(); + break; default: reader.skipType(tag & 7); break; @@ -58,6 +65,7 @@ export const Grant = { address: isSet(object.address) ? String(object.address) : "", time: isSet(object.time) ? Number(object.time) : 0, info: isSet(object.info) ? String(object.info) : "", + schemaVersion: isSet(object.schemaVersion) ? Number(object.schemaVersion) : 0, }; }, @@ -66,6 +74,7 @@ export const Grant = { message.address !== undefined && (obj.address = message.address); message.time !== undefined && (obj.time = Math.round(message.time)); message.info !== undefined && (obj.info = message.info); + message.schemaVersion !== undefined && (obj.schemaVersion = Math.round(message.schemaVersion)); return obj; }, @@ -74,6 +83,7 @@ export const Grant = { message.address = object.address ?? ""; message.time = object.time ?? 0; message.info = object.info ?? ""; + message.schemaVersion = object.schemaVersion ?? 0; return message; }, }; diff --git a/x/dclauth/types/grant.pb.go b/x/dclauth/types/grant.pb.go index 20e513f18..b2066a082 100644 --- a/x/dclauth/types/grant.pb.go +++ b/x/dclauth/types/grant.pb.go @@ -24,9 +24,10 @@ var _ = math.Inf const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type Grant struct { - Address string `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` - Time int64 `protobuf:"varint,2,opt,name=time,proto3" json:"time,omitempty"` - Info string `protobuf:"bytes,3,opt,name=info,proto3" json:"info,omitempty"` + Address string `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` + Time int64 `protobuf:"varint,2,opt,name=time,proto3" json:"time,omitempty"` + Info string `protobuf:"bytes,3,opt,name=info,proto3" json:"info,omitempty"` + SchemaVersion uint32 `protobuf:"varint,4,opt,name=schemaVersion,proto3" json:"schemaVersion,omitempty"` } func (m *Grant) Reset() { *m = Grant{} } @@ -83,6 +84,13 @@ func (m *Grant) GetInfo() string { return "" } +func (m *Grant) GetSchemaVersion() uint32 { + if m != nil { + return m.SchemaVersion + } + return 0 +} + func init() { proto.RegisterType((*Grant)(nil), "zigbeealliance.distributedcomplianceledger.dclauth.Grant") } @@ -92,23 +100,25 @@ func init() { } var fileDescriptor_86ef6cca43825bdb = []byte{ - // 251 bytes of a gzipped FileDescriptorProto + // 278 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xb2, 0xab, 0xca, 0x4c, 0x4f, 0x4a, 0x4d, 0x4d, 0xcc, 0xc9, 0xc9, 0x4c, 0xcc, 0x4b, 0x4e, 0xd5, 0x4f, 0xc9, 0x2c, 0x2e, 0x29, 0xca, 0x4c, 0x2a, 0x2d, 0x49, 0x4d, 0x49, 0xce, 0xcf, 0x2d, 0x80, 0x88, 0xe6, 0xa4, 0xa6, 0xa4, 0xa7, 0x16, 0xe9, 0xa7, 0x24, 0xe7, 0x24, 0x96, 0x96, 0x64, 0xe8, 0xa7, 0x17, 0x25, 0xe6, 0x95, 0xe8, 0x15, 0x14, 0xe5, 0x97, 0xe4, 0x0b, 0x19, 0xa1, 0xea, 0xd7, 0xc3, 0xa3, 0x5f, 0x0f, 0xaa, 0x5f, 0x4a, 0x32, 0x39, 0xbf, 0x38, 0x37, 0xbf, 0x38, 0x1e, 0x6c, 0x82, 0x3e, 0x84, 0x03, 0x31, - 0x4e, 0x29, 0x99, 0x8b, 0xd5, 0x1d, 0x64, 0xba, 0x90, 0x11, 0x17, 0x7b, 0x62, 0x4a, 0x4a, 0x51, - 0x6a, 0x71, 0xb1, 0x04, 0xa3, 0x02, 0xa3, 0x06, 0xa7, 0x93, 0xc4, 0xa5, 0x2d, 0xba, 0x22, 0x50, - 0xb5, 0x8e, 0x10, 0x99, 0xe0, 0x92, 0xa2, 0xcc, 0xbc, 0xf4, 0x20, 0x98, 0x42, 0x21, 0x21, 0x2e, - 0x96, 0x92, 0xcc, 0xdc, 0x54, 0x09, 0x26, 0x05, 0x46, 0x0d, 0xe6, 0x20, 0x30, 0x1b, 0x24, 0x96, - 0x99, 0x97, 0x96, 0x2f, 0xc1, 0x0c, 0x32, 0x24, 0x08, 0xcc, 0x76, 0x4a, 0x3a, 0xf1, 0x48, 0x8e, - 0xf1, 0xc2, 0x23, 0x39, 0xc6, 0x07, 0x8f, 0xe4, 0x18, 0x27, 0x3c, 0x96, 0x63, 0xb8, 0xf0, 0x58, - 0x8e, 0xe1, 0xc6, 0x63, 0x39, 0x86, 0x28, 0x8f, 0xf4, 0xcc, 0x92, 0x8c, 0xd2, 0x24, 0xbd, 0xe4, - 0xfc, 0x5c, 0x7d, 0x88, 0xc7, 0x74, 0xb1, 0x85, 0x8c, 0x2e, 0xc2, 0x6b, 0xba, 0xd0, 0xb0, 0xa9, - 0x80, 0x87, 0x4e, 0x49, 0x65, 0x41, 0x6a, 0x71, 0x12, 0x1b, 0xd8, 0x3f, 0xc6, 0x80, 0x00, 0x00, - 0x00, 0xff, 0xff, 0x0f, 0xb6, 0x99, 0x19, 0x60, 0x01, 0x00, 0x00, + 0x4e, 0xa9, 0x93, 0x91, 0x8b, 0xd5, 0x1d, 0x64, 0xbc, 0x90, 0x11, 0x17, 0x7b, 0x62, 0x4a, 0x4a, + 0x51, 0x6a, 0x71, 0xb1, 0x04, 0xa3, 0x02, 0xa3, 0x06, 0xa7, 0x93, 0xc4, 0xa5, 0x2d, 0xba, 0x22, + 0x50, 0xc5, 0x8e, 0x10, 0x99, 0xe0, 0x92, 0xa2, 0xcc, 0xbc, 0xf4, 0x20, 0x98, 0x42, 0x21, 0x21, + 0x2e, 0x96, 0x92, 0xcc, 0xdc, 0x54, 0x09, 0x26, 0x05, 0x46, 0x0d, 0xe6, 0x20, 0x30, 0x1b, 0x24, + 0x96, 0x99, 0x97, 0x96, 0x2f, 0xc1, 0x0c, 0x32, 0x24, 0x08, 0xcc, 0x16, 0x52, 0xe1, 0xe2, 0x2d, + 0x4e, 0xce, 0x48, 0xcd, 0x4d, 0x0c, 0x4b, 0x2d, 0x2a, 0xce, 0xcc, 0xcf, 0x93, 0x60, 0x51, 0x60, + 0xd4, 0xe0, 0x0d, 0x42, 0x15, 0x74, 0x4a, 0x3a, 0xf1, 0x48, 0x8e, 0xf1, 0xc2, 0x23, 0x39, 0xc6, + 0x07, 0x8f, 0xe4, 0x18, 0x27, 0x3c, 0x96, 0x63, 0xb8, 0xf0, 0x58, 0x8e, 0xe1, 0xc6, 0x63, 0x39, + 0x86, 0x28, 0x8f, 0xf4, 0xcc, 0x92, 0x8c, 0xd2, 0x24, 0xbd, 0xe4, 0xfc, 0x5c, 0x7d, 0x88, 0xff, + 0x75, 0xb1, 0x05, 0xa0, 0x2e, 0x22, 0x04, 0x74, 0xa1, 0x41, 0x58, 0x01, 0x0f, 0xc4, 0x92, 0xca, + 0x82, 0xd4, 0xe2, 0x24, 0x36, 0xb0, 0xb7, 0x8d, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0x69, 0xd8, + 0x78, 0xa0, 0x87, 0x01, 0x00, 0x00, } func (m *Grant) Marshal() (dAtA []byte, err error) { @@ -131,6 +141,11 @@ func (m *Grant) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if m.SchemaVersion != 0 { + i = encodeVarintGrant(dAtA, i, uint64(m.SchemaVersion)) + i-- + dAtA[i] = 0x20 + } if len(m.Info) > 0 { i -= len(m.Info) copy(dAtA[i:], m.Info) @@ -181,6 +196,9 @@ func (m *Grant) Size() (n int) { if l > 0 { n += 1 + l + sovGrant(uint64(l)) } + if m.SchemaVersion != 0 { + n += 1 + sovGrant(uint64(m.SchemaVersion)) + } return n } @@ -302,6 +320,25 @@ func (m *Grant) Unmarshal(dAtA []byte) error { } m.Info = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex + case 4: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field SchemaVersion", wireType) + } + m.SchemaVersion = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGrant + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.SchemaVersion |= uint32(b&0x7F) << shift + if b < 0x80 { + break + } + } default: iNdEx = preIndex skippy, err := skipGrant(dAtA[iNdEx:]) diff --git a/x/dclupgrade/types/grant.pb.go b/x/dclupgrade/types/grant.pb.go index 29d4f2e60..96583e6ab 100644 --- a/x/dclupgrade/types/grant.pb.go +++ b/x/dclupgrade/types/grant.pb.go @@ -24,9 +24,10 @@ var _ = math.Inf const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type Grant struct { - Address string `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` - Time int64 `protobuf:"varint,2,opt,name=time,proto3" json:"time,omitempty"` - Info string `protobuf:"bytes,3,opt,name=info,proto3" json:"info,omitempty"` + Address string `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` + Time int64 `protobuf:"varint,2,opt,name=time,proto3" json:"time,omitempty"` + Info string `protobuf:"bytes,3,opt,name=info,proto3" json:"info,omitempty"` + SchemaVersion uint32 `protobuf:"varint,4,opt,name=schemaVersion,proto3" json:"schemaVersion,omitempty"` } func (m *Grant) Reset() { *m = Grant{} } @@ -83,6 +84,13 @@ func (m *Grant) GetInfo() string { return "" } +func (m *Grant) GetSchemaVersion() uint32 { + if m != nil { + return m.SchemaVersion + } + return 0 +} + func init() { proto.RegisterType((*Grant)(nil), "zigbeealliance.distributedcomplianceledger.dclupgrade.Grant") } @@ -92,23 +100,25 @@ func init() { } var fileDescriptor_a749b46e32743c76 = []byte{ - // 254 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x72, 0xac, 0xca, 0x4c, 0x4f, - 0x4a, 0x4d, 0x4d, 0xcc, 0xc9, 0xc9, 0x4c, 0xcc, 0x4b, 0x4e, 0xd5, 0x4f, 0xc9, 0x2c, 0x2e, 0x29, - 0xca, 0x4c, 0x2a, 0x2d, 0x49, 0x4d, 0x49, 0xce, 0xcf, 0x2d, 0x80, 0x88, 0xe6, 0xa4, 0xa6, 0xa4, - 0xa7, 0x16, 0xe9, 0xa7, 0x24, 0xe7, 0x94, 0x16, 0xa4, 0x17, 0x25, 0xa6, 0xa4, 0xea, 0xa7, 0x17, - 0x25, 0xe6, 0x95, 0xe8, 0x15, 0x14, 0xe5, 0x97, 0xe4, 0x0b, 0x99, 0xa2, 0x1a, 0xa1, 0x87, 0xc7, - 0x08, 0x3d, 0x84, 0x11, 0x52, 0x92, 0xc9, 0xf9, 0xc5, 0xb9, 0xf9, 0xc5, 0xf1, 0x60, 0x43, 0xf4, - 0x21, 0x1c, 0x88, 0x89, 0x4a, 0xc9, 0x5c, 0xac, 0xee, 0x20, 0x0b, 0x84, 0x8c, 0xb8, 0xd8, 0x13, - 0x53, 0x52, 0x8a, 0x52, 0x8b, 0x8b, 0x25, 0x18, 0x15, 0x18, 0x35, 0x38, 0x9d, 0x24, 0x2e, 0x6d, - 0xd1, 0x15, 0x81, 0xaa, 0x75, 0x84, 0xc8, 0x04, 0x97, 0x14, 0x65, 0xe6, 0xa5, 0x07, 0xc1, 0x14, - 0x0a, 0x09, 0x71, 0xb1, 0x94, 0x64, 0xe6, 0xa6, 0x4a, 0x30, 0x29, 0x30, 0x6a, 0x30, 0x07, 0x81, - 0xd9, 0x20, 0xb1, 0xcc, 0xbc, 0xb4, 0x7c, 0x09, 0x66, 0x90, 0x21, 0x41, 0x60, 0xb6, 0x53, 0xea, - 0x89, 0x47, 0x72, 0x8c, 0x17, 0x1e, 0xc9, 0x31, 0x3e, 0x78, 0x24, 0xc7, 0x38, 0xe1, 0xb1, 0x1c, - 0xc3, 0x85, 0xc7, 0x72, 0x0c, 0x37, 0x1e, 0xcb, 0x31, 0x44, 0x79, 0xa7, 0x67, 0x96, 0x64, 0x94, - 0x26, 0xe9, 0x25, 0xe7, 0xe7, 0xea, 0x43, 0xfc, 0xa6, 0x8b, 0x2d, 0x7c, 0x74, 0x11, 0xbe, 0xd3, - 0x85, 0x86, 0x50, 0x05, 0x72, 0x18, 0x95, 0x54, 0x16, 0xa4, 0x16, 0x27, 0xb1, 0x81, 0xbd, 0x64, - 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0xea, 0x91, 0x79, 0x3d, 0x69, 0x01, 0x00, 0x00, + // 280 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x90, 0xb1, 0x4a, 0xc4, 0x30, + 0x1c, 0xc6, 0x1b, 0xef, 0x54, 0x2c, 0xdc, 0x52, 0x1c, 0xaa, 0x43, 0x28, 0xe2, 0xd0, 0xa5, 0x2d, + 0x28, 0x3e, 0xc0, 0xdd, 0xe2, 0xe0, 0x56, 0xc1, 0xc1, 0x45, 0xd2, 0xe4, 0x6f, 0x2e, 0xd0, 0x24, + 0x25, 0x49, 0x41, 0x7d, 0x03, 0x37, 0x1f, 0xc6, 0x87, 0x70, 0x3c, 0x9c, 0x1c, 0xa5, 0x7d, 0x11, + 0x69, 0x73, 0x72, 0x1e, 0xc8, 0x6d, 0x5f, 0xbe, 0x7c, 0xfc, 0x42, 0x7e, 0xe1, 0xfc, 0x45, 0xf0, + 0x0a, 0x80, 0xd4, 0xb5, 0x20, 0x8a, 0x42, 0xc1, 0x84, 0x75, 0x46, 0x54, 0xad, 0x03, 0x46, 0xb5, + 0x6c, 0x7c, 0x5b, 0x03, 0xe3, 0x60, 0x0a, 0x46, 0xeb, 0xb6, 0xe1, 0x86, 0x30, 0x28, 0xb8, 0x21, + 0xca, 0xe5, 0x8d, 0xd1, 0x4e, 0x47, 0x57, 0xdb, 0x88, 0x7c, 0x07, 0x22, 0xdf, 0x20, 0x4e, 0x4f, + 0xa8, 0xb6, 0x52, 0xdb, 0x87, 0x11, 0x52, 0xf8, 0x83, 0x27, 0x9e, 0xbd, 0xa2, 0x70, 0xff, 0x7a, + 0x78, 0x21, 0xba, 0x08, 0x0f, 0x09, 0x63, 0x06, 0xac, 0x8d, 0x51, 0x82, 0xd2, 0xa3, 0x45, 0xfc, + 0xf9, 0x9e, 0x1d, 0xaf, 0xc7, 0x73, 0x7f, 0x73, 0xeb, 0x8c, 0x50, 0xbc, 0xfc, 0x1d, 0x46, 0x51, + 0x38, 0x75, 0x42, 0x42, 0xbc, 0x97, 0xa0, 0x74, 0x52, 0x8e, 0x79, 0xe8, 0x84, 0x7a, 0xd4, 0xf1, + 0x64, 0x80, 0x94, 0x63, 0x8e, 0xce, 0xc3, 0x99, 0xa5, 0x4b, 0x90, 0xe4, 0x0e, 0x8c, 0x15, 0x5a, + 0xc5, 0xd3, 0x04, 0xa5, 0xb3, 0x72, 0xbb, 0x5c, 0xc0, 0x47, 0x87, 0xd1, 0xaa, 0xc3, 0xe8, 0xbb, + 0xc3, 0xe8, 0xad, 0xc7, 0xc1, 0xaa, 0xc7, 0xc1, 0x57, 0x8f, 0x83, 0xfb, 0x1b, 0x2e, 0xdc, 0xb2, + 0xad, 0x72, 0xaa, 0x65, 0xe1, 0x15, 0x64, 0xff, 0x69, 0xcc, 0x36, 0x12, 0xb2, 0xb5, 0xc8, 0xa7, + 0xbf, 0x2a, 0xdd, 0x73, 0x03, 0xb6, 0x3a, 0x18, 0x7f, 0x7e, 0xf9, 0x13, 0x00, 0x00, 0xff, 0xff, + 0x67, 0x33, 0x51, 0x41, 0x90, 0x01, 0x00, 0x00, } func (m *Grant) Marshal() (dAtA []byte, err error) { @@ -131,6 +141,11 @@ func (m *Grant) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if m.SchemaVersion != 0 { + i = encodeVarintGrant(dAtA, i, uint64(m.SchemaVersion)) + i-- + dAtA[i] = 0x20 + } if len(m.Info) > 0 { i -= len(m.Info) copy(dAtA[i:], m.Info) @@ -181,6 +196,9 @@ func (m *Grant) Size() (n int) { if l > 0 { n += 1 + l + sovGrant(uint64(l)) } + if m.SchemaVersion != 0 { + n += 1 + sovGrant(uint64(m.SchemaVersion)) + } return n } @@ -302,6 +320,25 @@ func (m *Grant) Unmarshal(dAtA []byte) error { } m.Info = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex + case 4: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field SchemaVersion", wireType) + } + m.SchemaVersion = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGrant + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.SchemaVersion |= uint32(b&0x7F) << shift + if b < 0x80 { + break + } + } default: iNdEx = preIndex skippy, err := skipGrant(dAtA[iNdEx:]) diff --git a/x/model/client/cli/flags.go b/x/model/client/cli/flags.go index 896535909..7f0df2729 100644 --- a/x/model/client/cli/flags.go +++ b/x/model/client/cli/flags.go @@ -16,7 +16,7 @@ const ( FlagCommissioningModeInitialStepsInstruction = "commissioningModeInitialStepsInstruction" FlagCommissioningModeSecondaryStepsHint = "commissioningModeSecondaryStepsHint" FlagCommissioningModeSecondaryStepsInstruction = "commissioningModeSecondaryStepsInstruction" - FlagCommissionerRemoteUIFlowURL = "commissionerRemoteUiFlowURL" + FlagManagedACLExtensionRequestFlowURL = "managedAclExtensionRequestFlowUrl" FlagUserManualURL = "userManualURL" FlagSupportURL = "supportURL" FlagProductURL = "productURL" diff --git a/x/model/client/cli/tx_model.go b/x/model/client/cli/tx_model.go index e3a09f59f..46acb4ec5 100644 --- a/x/model/client/cli/tx_model.go +++ b/x/model/client/cli/tx_model.go @@ -25,7 +25,7 @@ func CmdCreateModel() *cobra.Command { commissioningModeInitialStepsInstruction string commissioningModeSecondaryStepsHint uint32 commissioningModeSecondaryStepsInstruction string - commissionerRemoteUIFlowURL string + managedACLExtensionRequestFlowURL string userManualURL string supportURL string productURL string @@ -62,7 +62,7 @@ func CmdCreateModel() *cobra.Command { commissioningModeInitialStepsInstruction, commissioningModeSecondaryStepsHint, commissioningModeSecondaryStepsInstruction, - commissionerRemoteUIFlowURL, + managedACLExtensionRequestFlowURL, userManualURL, supportURL, productURL, @@ -122,8 +122,8 @@ current CHIP Administrator to put the device into commissioning mode.`) of commissioningModeSecondaryStepsHint. Certain values of commissioningModeSecondaryStepsHint, as defined in the Pairing Hint Table, indicate a Pairing Instruction (PI) dependency, and for these values the commissioningModeSecondaryStepInstruction SHALL be set`) - cmd.Flags().StringVar(&commissionerRemoteUIFlowURL, FlagCommissionerRemoteUIFlowURL, "", - `commissionerRemoteUIFlowURL SHALL identify URL to show a custom flow UI for the commissioner`) + cmd.Flags().StringVar(&managedACLExtensionRequestFlowURL, FlagManagedACLExtensionRequestFlowURL, "", + `managedACLExtensionRequestFlowURL SHALL identify URL to show a custom flow UI for the commissioner`) cmd.Flags().StringVar(&userManualURL, FlagUserManualURL, "", "URL that contains product specific web page that contains user manual for the device model.") cmd.Flags().StringVar(&supportURL, FlagSupportURL, "", @@ -153,7 +153,7 @@ func CmdUpdateModel() *cobra.Command { commissioningCustomFlowURL string commissioningModeInitialStepsInstruction string commissioningModeSecondaryStepsInstruction string - commissionerRemoteUIFlowURL string + managedACLExtensionRequestFlowURL string userManualURL string supportURL string productURL string @@ -188,7 +188,7 @@ func CmdUpdateModel() *cobra.Command { commissioningCustomFlowURL, commissioningModeInitialStepsInstruction, commissioningModeSecondaryStepsInstruction, - commissionerRemoteUIFlowURL, + managedACLExtensionRequestFlowURL, userManualURL, supportURL, productURL, @@ -231,8 +231,8 @@ values the commissioningModeInitialStepsInstruction SHALL be set`) of commissioningModeSecondaryStepsHint. Certain values of commissioningModeSecondaryStepsHint, as defined in the Pairing Hint Table, indicate a Pairing Instruction (PI) dependency, and for these values the commissioningModeSecondaryStepInstruction SHALL be set`) - cmd.Flags().StringVar(&commissionerRemoteUIFlowURL, FlagCommissionerRemoteUIFlowURL, "", - `commissionerRemoteUIFlowURL SHALL identify URL to show a custom flow UI for the commissioner`) + cmd.Flags().StringVar(&managedACLExtensionRequestFlowURL, FlagManagedACLExtensionRequestFlowURL, "", + `managedACLExtensionRequestFlowURL SHALL identify URL to show a custom flow UI for the commissioner`) cmd.Flags().StringVar(&userManualURL, FlagUserManualURL, "", "URL that contains product specific web page that contains user manual for the device model.") cmd.Flags().StringVar(&supportURL, FlagSupportURL, "", diff --git a/x/model/keeper/msg_server_model.go b/x/model/keeper/msg_server_model.go index 15ae92d4c..f020a15a3 100644 --- a/x/model/keeper/msg_server_model.go +++ b/x/model/keeper/msg_server_model.go @@ -45,7 +45,7 @@ func (k msgServer) CreateModel(goCtx context.Context, msg *types.MsgCreateModel) CommissioningModeInitialStepsInstruction: msg.CommissioningModeInitialStepsInstruction, CommissioningModeSecondaryStepsHint: msg.CommissioningModeSecondaryStepsHint, CommissioningModeSecondaryStepsInstruction: msg.CommissioningModeSecondaryStepsInstruction, - CommissionerRemoteUiFlowUrl: msg.CommissionerRemoteUiFlowUrl, + ManagedAclExtensionRequestFlowUrl: msg.ManagedAclExtensionRequestFlowUrl, UserManualUrl: msg.UserManualUrl, SupportUrl: msg.SupportUrl, ProductUrl: msg.ProductUrl, @@ -128,8 +128,8 @@ func (k msgServer) UpdateModel(goCtx context.Context, msg *types.MsgUpdateModel) model.CommissioningModeSecondaryStepsInstruction = msg.CommissioningModeSecondaryStepsInstruction } - if msg.CommissionerRemoteUiFlowUrl != "" { - model.CommissionerRemoteUiFlowUrl = msg.CommissionerRemoteUiFlowUrl + if msg.ManagedAclExtensionRequestFlowUrl != "" { + model.ManagedAclExtensionRequestFlowUrl = msg.ManagedAclExtensionRequestFlowUrl } if msg.UserManualUrl != "" { diff --git a/x/model/types/messages_model.go b/x/model/types/messages_model.go index bc20d1812..558642510 100644 --- a/x/model/types/messages_model.go +++ b/x/model/types/messages_model.go @@ -30,7 +30,7 @@ func NewMsgCreateModel( commissioningModeInitialStepsInstruction string, commissioningModeSecondaryStepsHint uint32, commissioningModeSecondaryStepsInstruction string, - commissionerRemoteUIFlowURL string, + managedACLExtensionRequestFlowURL string, userManualURL string, supportURL string, productURL string, @@ -51,7 +51,7 @@ func NewMsgCreateModel( CommissioningModeInitialStepsInstruction: commissioningModeInitialStepsInstruction, CommissioningModeSecondaryStepsHint: commissioningModeSecondaryStepsHint, CommissioningModeSecondaryStepsInstruction: commissioningModeSecondaryStepsInstruction, - CommissionerRemoteUiFlowUrl: commissionerRemoteUIFlowURL, + ManagedAclExtensionRequestFlowUrl: managedACLExtensionRequestFlowURL, UserManualUrl: userManualURL, SupportUrl: supportURL, ProductUrl: productURL, @@ -109,7 +109,7 @@ func NewMsgUpdateModel( commissioningCustomFlowURL string, commissioningModeInitialStepsInstruction string, commissioningModeSecondaryStepsInstruction string, - commissionerRemoteUIFlowURL string, + managedACLExtensionRequestFlowURL string, userManualURL string, supportURL string, productURL string, @@ -128,7 +128,7 @@ func NewMsgUpdateModel( CommissioningCustomFlowUrl: commissioningCustomFlowURL, CommissioningModeInitialStepsInstruction: commissioningModeInitialStepsInstruction, CommissioningModeSecondaryStepsInstruction: commissioningModeSecondaryStepsInstruction, - CommissionerRemoteUiFlowUrl: commissionerRemoteUIFlowURL, + ManagedAclExtensionRequestFlowUrl: managedACLExtensionRequestFlowURL, UserManualUrl: userManualURL, SupportUrl: supportURL, ProductUrl: productURL, diff --git a/x/model/types/messages_model_test.go b/x/model/types/messages_model_test.go index 3bd94f287..ee25ec879 100644 --- a/x/model/types/messages_model_test.go +++ b/x/model/types/messages_model_test.go @@ -335,9 +335,9 @@ func TestMsgCreateModel_ValidateBasic(t *testing.T) { err: validator.ErrFieldUpperBoundViolated, }, { - name: "CommissionerRemoteUiFlowUrl length > 256", + name: "ManagedAclExtensionRequestFlowUrl length > 256", msg: func(msg *MsgCreateModel) *MsgCreateModel { - msg.CommissionerRemoteUiFlowUrl = "https://sampleflowurl.dclauth/" + tmrand.Str(257-30) // length = 257 + msg.ManagedAclExtensionRequestFlowUrl = "https://sampleflowurl.dclauth/" + tmrand.Str(257-30) // length = 257 return msg }(validMsgCreateModel()), @@ -604,17 +604,17 @@ func TestMsgCreateModel_ValidateBasic(t *testing.T) { }(validMsgCreateModel()), }, { - name: "CommissionerRemoteUiFlowUrl is omitted", + name: "ManagedAclExtensionRequestFlowUrl is omitted", msg: func(msg *MsgCreateModel) *MsgCreateModel { - msg.CommissionerRemoteUiFlowUrl = "" + msg.ManagedAclExtensionRequestFlowUrl = "" return msg }(validMsgCreateModel()), }, { - name: "CommissionerRemoteUiFlowUrl length == 256", + name: "ManagedAclExtensionRequestFlowUrl length == 256", msg: func(msg *MsgCreateModel) *MsgCreateModel { - msg.CommissionerRemoteUiFlowUrl = "https://sampleflowurl.dclauth/" + tmrand.Str(256-30) // length = 256 + msg.ManagedAclExtensionRequestFlowUrl = "https://sampleflowurl.dclauth/" + tmrand.Str(256-30) // length = 256 return msg }(validMsgCreateModel()), @@ -924,9 +924,9 @@ func TestMsgUpdateModel_ValidateBasic(t *testing.T) { err: validator.ErrFieldUpperBoundViolated, }, { - name: "CommissionerRemoteUiFlowUrl length > 256", + name: "ManagedAclExtensionRequestFlowUrl length > 256", msg: func(msg *MsgUpdateModel) *MsgUpdateModel { - msg.CommissionerRemoteUiFlowUrl = "https://sampleflowurl.dclauth/" + tmrand.Str(257-30) // length = 257 + msg.ManagedAclExtensionRequestFlowUrl = "https://sampleflowurl.dclauth/" + tmrand.Str(257-30) // length = 257 return msg }(validMsgUpdateModel()), @@ -1153,17 +1153,17 @@ func TestMsgUpdateModel_ValidateBasic(t *testing.T) { }(validMsgUpdateModel()), }, { - name: "CommissionerRemoteUiFlowUrl is omitted", + name: "ManagedAclExtensionRequestFlowUrl is omitted", msg: func(msg *MsgUpdateModel) *MsgUpdateModel { - msg.CommissionerRemoteUiFlowUrl = "" + msg.ManagedAclExtensionRequestFlowUrl = "" return msg }(validMsgUpdateModel()), }, { - name: "CommissionerRemoteUiFlowUrl length == 256", + name: "ManagedAclExtensionRequestFlowUrl length == 256", msg: func(msg *MsgUpdateModel) *MsgUpdateModel { - msg.CommissionerRemoteUiFlowUrl = "https://sampleflowurl.dclauth/" + tmrand.Str(256-30) // length = 256 + msg.ManagedAclExtensionRequestFlowUrl = "https://sampleflowurl.dclauth/" + tmrand.Str(256-30) // length = 256 return msg }(validMsgUpdateModel()), @@ -1343,7 +1343,7 @@ func validMsgCreateModel() *MsgCreateModel { CommissioningModeInitialStepsInstruction: testconstants.CommissioningModeInitialStepsInstruction, CommissioningModeSecondaryStepsHint: testconstants.CommissioningModeSecondaryStepsHint, CommissioningModeSecondaryStepsInstruction: testconstants.CommissioningModeSecondaryStepsInstruction, - CommissionerRemoteUiFlowUrl: testconstants.CommissioningCustomFlowURL, + ManagedAclExtensionRequestFlowUrl: testconstants.CommissioningCustomFlowURL, UserManualUrl: testconstants.UserManualURL, SupportUrl: testconstants.SupportURL, ProductUrl: testconstants.ProductURL, @@ -1362,7 +1362,7 @@ func validMsgUpdateModel() *MsgUpdateModel { CommissioningCustomFlowUrl: testconstants.CommissioningCustomFlowURL + "/updated", CommissioningModeInitialStepsInstruction: testconstants.CommissioningModeInitialStepsInstruction + "-updated", CommissioningModeSecondaryStepsInstruction: testconstants.CommissioningModeSecondaryStepsInstruction + "-updated", - CommissionerRemoteUiFlowUrl: testconstants.CommissioningCustomFlowURL + "-updated", + ManagedAclExtensionRequestFlowUrl: testconstants.CommissioningCustomFlowURL + "-updated", UserManualUrl: testconstants.UserManualURL + "/updated", SupportUrl: testconstants.SupportURL + "/updated", ProductUrl: testconstants.ProductURL + "/updated", diff --git a/x/model/types/model.pb.go b/x/model/types/model.pb.go index 81822a632..356ad2565 100644 --- a/x/model/types/model.pb.go +++ b/x/model/types/model.pb.go @@ -43,7 +43,7 @@ type Model struct { LsfRevision int32 `protobuf:"varint,17,opt,name=lsfRevision,proto3" json:"lsfRevision,omitempty"` Creator string `protobuf:"bytes,18,opt,name=creator,proto3" json:"creator,omitempty"` SchemaVersion uint32 `protobuf:"varint,19,opt,name=schemaVersion,proto3" json:"schemaVersion,omitempty"` - CommissionerRemoteUiFlowUrl string `protobuf:"bytes,20,opt,name=commissionerRemoteUiFlowUrl,proto3" json:"commissionerRemoteUiFlowUrl,omitempty"` + ManagedAclExtensionRequestFlowUrl string `protobuf:"bytes,20,opt,name=managedAclExtensionRequestFlowUrl,proto3" json:"managedAclExtensionRequestFlowUrl,omitempty"` } func (m *Model) Reset() { *m = Model{} } @@ -212,9 +212,9 @@ func (m *Model) GetSchemaVersion() uint32 { return 0 } -func (m *Model) GetCommissionerRemoteUiFlowUrl() string { +func (m *Model) GetManagedAclExtensionRequestFlowUrl() string { if m != nil { - return m.CommissionerRemoteUiFlowUrl + return m.ManagedAclExtensionRequestFlowUrl } return "" } @@ -228,42 +228,43 @@ func init() { } var fileDescriptor_363bb1b07b19a129 = []byte{ - // 553 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x54, 0x41, 0x6f, 0xd3, 0x30, - 0x14, 0x5e, 0x18, 0x6d, 0x99, 0xb7, 0xc2, 0x30, 0x13, 0x98, 0x21, 0x45, 0x65, 0x70, 0xa8, 0x90, - 0xda, 0x22, 0xb8, 0x70, 0x40, 0x08, 0x86, 0x34, 0x51, 0x69, 0x9b, 0x50, 0xca, 0x38, 0xec, 0x00, - 0x24, 0xf1, 0x5b, 0x67, 0xc9, 0x8e, 0x2d, 0xdb, 0x29, 0x94, 0x5f, 0xc1, 0x8f, 0xe1, 0x3f, 0xc0, - 0x71, 0xe2, 0xc4, 0x11, 0xb5, 0x7f, 0x04, 0xd9, 0xc9, 0x68, 0x23, 0x58, 0x37, 0x2e, 0x51, 0xfc, - 0x7d, 0xdf, 0x7b, 0xf9, 0xf2, 0xf2, 0xe5, 0xa1, 0xa7, 0x9f, 0xd9, 0x30, 0x01, 0x88, 0x39, 0x67, - 0x71, 0x96, 0x42, 0x8f, 0x32, 0x63, 0x35, 0x4b, 0x72, 0x0b, 0x34, 0x95, 0x42, 0x15, 0x28, 0x07, - 0x3a, 0x04, 0xdd, 0x13, 0x92, 0x02, 0x2f, 0xae, 0x5d, 0xa5, 0xa5, 0x95, 0xf8, 0x61, 0xb5, 0xba, - 0xbb, 0xa0, 0xba, 0xeb, 0xeb, 0x36, 0x6f, 0xa7, 0xd2, 0x08, 0x69, 0xde, 0xfb, 0xfa, 0x5e, 0x71, - 0x28, 0x9a, 0x6d, 0x7d, 0x6b, 0xa0, 0xda, 0x9e, 0x13, 0xe1, 0x75, 0xb4, 0x3c, 0x62, 0x94, 0x04, - 0xad, 0xa0, 0x5d, 0x8b, 0xdc, 0xad, 0x43, 0x14, 0xa3, 0xe4, 0x52, 0x81, 0x28, 0x46, 0xf1, 0x16, - 0x5a, 0xa3, 0x30, 0x62, 0x29, 0xbc, 0x19, 0x2b, 0xe8, 0x53, 0xb2, 0xec, 0xa9, 0x0a, 0x86, 0x5b, - 0x68, 0x55, 0x69, 0x49, 0xf3, 0xd4, 0xee, 0xc7, 0x02, 0xc8, 0xe5, 0x56, 0xd0, 0x5e, 0x89, 0xe6, - 0x21, 0xd7, 0xa5, 0x3c, 0xee, 0xc6, 0x09, 0x70, 0x52, 0xf3, 0x92, 0x0a, 0x86, 0x43, 0x84, 0x54, - 0xac, 0xed, 0x7e, 0x2e, 0x12, 0xd0, 0xa4, 0xee, 0x15, 0x73, 0x08, 0x7e, 0x82, 0x6e, 0xa5, 0x52, - 0x08, 0x66, 0x0c, 0x93, 0x19, 0xcb, 0x86, 0x2f, 0x73, 0x63, 0xa5, 0xd8, 0xe1, 0xf2, 0x23, 0x69, - 0x78, 0x53, 0x67, 0xd1, 0xf8, 0x19, 0xda, 0x3c, 0x83, 0x3a, 0xd0, 0x9c, 0x5c, 0xf1, 0x4f, 0x5a, - 0xa0, 0xc0, 0xbb, 0xe8, 0x6e, 0x85, 0x75, 0xd3, 0xeb, 0x67, 0xcc, 0xb2, 0x98, 0x0f, 0x2c, 0x28, - 0xf3, 0x8a, 0x65, 0x96, 0xac, 0xb4, 0x82, 0x76, 0x33, 0x3a, 0x5f, 0x88, 0x0f, 0x51, 0x7b, 0xa1, - 0xa8, 0x9f, 0x19, 0xab, 0xf3, 0xd4, 0x32, 0x99, 0x11, 0xe4, 0xbd, 0x5d, 0x58, 0x8f, 0x5f, 0xa3, - 0x7b, 0x7f, 0x69, 0x07, 0x90, 0xca, 0x8c, 0xc6, 0x7a, 0x3c, 0xf3, 0xba, 0xea, 0xbd, 0x5e, 0x44, - 0x8a, 0xdf, 0xa1, 0x07, 0xe7, 0xc8, 0xe6, 0xfd, 0xae, 0x79, 0xbf, 0xff, 0x51, 0x81, 0xef, 0xa3, - 0x66, 0x6e, 0x40, 0xef, 0xc5, 0x59, 0x1e, 0x73, 0xf7, 0x39, 0x9a, 0xbe, 0x45, 0x15, 0x74, 0xd9, - 0x30, 0xb9, 0x52, 0x52, 0x5b, 0x27, 0xb9, 0x5a, 0x64, 0x63, 0x86, 0xf8, 0xec, 0x14, 0x59, 0x72, - 0xfc, 0xb5, 0x32, 0x3b, 0x7f, 0x10, 0x7c, 0x13, 0xd5, 0xb9, 0x39, 0x72, 0xdc, 0xba, 0xe7, 0xca, - 0x93, 0x4b, 0x2e, 0x37, 0x47, 0x11, 0x8c, 0x98, 0x33, 0x4b, 0xae, 0xfb, 0x1c, 0xcd, 0x43, 0xf8, - 0x11, 0x6a, 0xa4, 0x1a, 0x62, 0x2b, 0x35, 0xc1, 0xae, 0x74, 0x9b, 0xfc, 0xf8, 0xda, 0xd9, 0x28, - 0x7f, 0xa8, 0x17, 0x94, 0x6a, 0x30, 0x66, 0x60, 0x35, 0xcb, 0x86, 0xd1, 0xa9, 0xd0, 0xbd, 0x93, - 0x49, 0x8f, 0x41, 0xc4, 0x6f, 0x41, 0xfb, 0xbe, 0x37, 0xfc, 0xbc, 0xab, 0x20, 0x7e, 0x8e, 0xee, - 0xcc, 0xe6, 0x04, 0x3a, 0x02, 0x21, 0x2d, 0x1c, 0xb0, 0xd3, 0x58, 0x6e, 0x78, 0xa3, 0x8b, 0x24, - 0xdb, 0x1f, 0xbe, 0x4f, 0xc2, 0xe0, 0x64, 0x12, 0x06, 0xbf, 0x26, 0x61, 0xf0, 0x65, 0x1a, 0x2e, - 0x9d, 0x4c, 0xc3, 0xa5, 0x9f, 0xd3, 0x70, 0xe9, 0x70, 0x67, 0xc8, 0xec, 0x71, 0x9e, 0x74, 0x53, - 0x29, 0x7a, 0xc5, 0xee, 0xe8, 0xfc, 0x6b, 0xf5, 0x74, 0x66, 0xdb, 0xa3, 0x53, 0x2e, 0x9f, 0x4f, - 0xe5, 0xfa, 0xb1, 0x63, 0x05, 0x26, 0xa9, 0xfb, 0x95, 0xf1, 0xf8, 0x77, 0x00, 0x00, 0x00, 0xff, - 0xff, 0x49, 0xe5, 0x97, 0x8a, 0xbf, 0x04, 0x00, 0x00, + // 561 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x54, 0xc1, 0x6e, 0xd4, 0x3a, + 0x14, 0x6d, 0x5e, 0x5f, 0x5b, 0xea, 0xb6, 0x50, 0x4c, 0x05, 0xa6, 0x8b, 0x68, 0x28, 0x2c, 0x46, + 0x48, 0x33, 0x83, 0x60, 0xc3, 0x02, 0x21, 0xb5, 0x88, 0x8a, 0x4a, 0x6d, 0x85, 0x52, 0x60, 0xd1, + 0x05, 0xe0, 0xd8, 0xb7, 0xa9, 0x25, 0xc7, 0x0e, 0xb6, 0x53, 0x3a, 0x7c, 0x05, 0x1f, 0xc3, 0x47, + 0xb0, 0xac, 0x60, 0xc3, 0x12, 0xcd, 0xfc, 0x08, 0xb2, 0x93, 0x32, 0x13, 0x41, 0x67, 0xca, 0x26, + 0xca, 0x3d, 0xe7, 0xdc, 0x9b, 0x13, 0xe7, 0xe4, 0xa2, 0x27, 0x9f, 0x44, 0x96, 0x02, 0x50, 0x29, + 0x05, 0x55, 0x0c, 0x7a, 0x5c, 0x58, 0x67, 0x44, 0x5a, 0x3a, 0xe0, 0x4c, 0xe7, 0x45, 0x85, 0x4a, + 0xe0, 0x19, 0x98, 0x5e, 0xae, 0x39, 0xc8, 0xea, 0xda, 0x2d, 0x8c, 0x76, 0x1a, 0x3f, 0x68, 0x76, + 0x77, 0x27, 0x74, 0x77, 0x43, 0xdf, 0xfa, 0x6d, 0xa6, 0x6d, 0xae, 0xed, 0xbb, 0xd0, 0xdf, 0xab, + 0x8a, 0x6a, 0xd8, 0xc6, 0xf7, 0x05, 0x34, 0xb7, 0xe7, 0x45, 0x78, 0x15, 0xcd, 0x9e, 0x08, 0x4e, + 0xa2, 0x56, 0xd4, 0x9e, 0x4b, 0xfc, 0xad, 0x47, 0x0a, 0xc1, 0xc9, 0x7f, 0x15, 0x52, 0x08, 0x8e, + 0x37, 0xd0, 0x32, 0x87, 0x13, 0xc1, 0xe0, 0x55, 0xbf, 0x80, 0x1d, 0x4e, 0x66, 0x03, 0xd5, 0xc0, + 0x70, 0x0b, 0x2d, 0x15, 0x46, 0xf3, 0x92, 0xb9, 0x7d, 0x9a, 0x03, 0xf9, 0xbf, 0x15, 0xb5, 0x17, + 0x93, 0x71, 0xc8, 0x4f, 0xa9, 0xcb, 0x5d, 0x9a, 0x82, 0x24, 0x73, 0x41, 0xd2, 0xc0, 0x70, 0x8c, + 0x50, 0x41, 0x8d, 0xdb, 0x2f, 0xf3, 0x14, 0x0c, 0x99, 0x0f, 0x8a, 0x31, 0x04, 0x3f, 0x46, 0xb7, + 0x98, 0xce, 0x73, 0x61, 0xad, 0xd0, 0x4a, 0xa8, 0xec, 0x59, 0x69, 0x9d, 0xce, 0xb7, 0xa5, 0xfe, + 0x48, 0x16, 0x82, 0xa9, 0x8b, 0x68, 0xfc, 0x14, 0xad, 0x5f, 0x40, 0xbd, 0x36, 0x92, 0x5c, 0x09, + 0x4f, 0x9a, 0xa0, 0xc0, 0xbb, 0xe8, 0x4e, 0x83, 0xf5, 0xa7, 0xb7, 0xa3, 0x84, 0x13, 0x54, 0x1e, + 0x38, 0x28, 0xec, 0x0b, 0xa1, 0x1c, 0x59, 0x6c, 0x45, 0xed, 0x95, 0x64, 0xba, 0x10, 0x1f, 0xa2, + 0xf6, 0x44, 0xd1, 0x8e, 0xb2, 0xce, 0x94, 0xcc, 0x09, 0xad, 0x08, 0x0a, 0xde, 0x2e, 0xad, 0xc7, + 0x2f, 0xd1, 0xdd, 0x3f, 0xb4, 0x07, 0xc0, 0xb4, 0xe2, 0xd4, 0xf4, 0x47, 0x5e, 0x97, 0x82, 0xd7, + 0xcb, 0x48, 0xf1, 0x5b, 0x74, 0x7f, 0x8a, 0x6c, 0xdc, 0xef, 0x72, 0xf0, 0xfb, 0x0f, 0x1d, 0xf8, + 0x1e, 0x5a, 0x29, 0x2d, 0x98, 0x3d, 0xaa, 0x4a, 0x2a, 0xfd, 0xe7, 0x58, 0x09, 0x23, 0x9a, 0xa0, + 0xcf, 0x86, 0x2d, 0x8b, 0x42, 0x1b, 0xe7, 0x25, 0x57, 0xab, 0x6c, 0x8c, 0x90, 0x90, 0x9d, 0x2a, + 0x4b, 0x9e, 0xbf, 0x56, 0x67, 0xe7, 0x37, 0x82, 0x6f, 0xa2, 0x79, 0x69, 0x8f, 0x3c, 0xb7, 0x1a, + 0xb8, 0xba, 0xf2, 0xc9, 0x95, 0xf6, 0x28, 0x81, 0x13, 0xe1, 0xcd, 0x92, 0xeb, 0x21, 0x47, 0xe3, + 0x10, 0x7e, 0x88, 0x16, 0x98, 0x01, 0xea, 0xb4, 0x21, 0xd8, 0xb7, 0x6e, 0x91, 0x6f, 0x5f, 0x3a, + 0x6b, 0xf5, 0x0f, 0xb5, 0xc9, 0xb9, 0x01, 0x6b, 0x0f, 0x9c, 0x11, 0x2a, 0x4b, 0xce, 0x85, 0xfe, + 0x9d, 0x2c, 0x3b, 0x86, 0x9c, 0xbe, 0x01, 0x13, 0xe6, 0xde, 0x08, 0xe7, 0xdd, 0x04, 0x7d, 0xaa, + 0x72, 0xaa, 0x68, 0x06, 0x7c, 0x93, 0xc9, 0xe7, 0xa7, 0x0e, 0x94, 0x87, 0x13, 0xf8, 0x50, 0x82, + 0x75, 0xe7, 0xe1, 0x5c, 0x0b, 0x76, 0xa7, 0x0b, 0xb7, 0xde, 0x7f, 0x1d, 0xc4, 0xd1, 0xd9, 0x20, + 0x8e, 0x7e, 0x0e, 0xe2, 0xe8, 0xf3, 0x30, 0x9e, 0x39, 0x1b, 0xc6, 0x33, 0x3f, 0x86, 0xf1, 0xcc, + 0xe1, 0x76, 0x26, 0xdc, 0x71, 0x99, 0x76, 0x99, 0xce, 0x7b, 0xd5, 0x1e, 0xe9, 0xfc, 0x6d, 0x0d, + 0x75, 0x46, 0x9b, 0xa4, 0x53, 0x2f, 0xa2, 0xd3, 0x7a, 0x15, 0xb9, 0x7e, 0x01, 0x36, 0x9d, 0x0f, + 0xeb, 0xe3, 0xd1, 0xaf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x8c, 0xa8, 0x2e, 0x3d, 0xcb, 0x04, 0x00, + 0x00, } func (m *Model) Marshal() (dAtA []byte, err error) { @@ -286,10 +287,10 @@ func (m *Model) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if len(m.CommissionerRemoteUiFlowUrl) > 0 { - i -= len(m.CommissionerRemoteUiFlowUrl) - copy(dAtA[i:], m.CommissionerRemoteUiFlowUrl) - i = encodeVarintModel(dAtA, i, uint64(len(m.CommissionerRemoteUiFlowUrl))) + if len(m.ManagedAclExtensionRequestFlowUrl) > 0 { + i -= len(m.ManagedAclExtensionRequestFlowUrl) + copy(dAtA[i:], m.ManagedAclExtensionRequestFlowUrl) + i = encodeVarintModel(dAtA, i, uint64(len(m.ManagedAclExtensionRequestFlowUrl))) i-- dAtA[i] = 0x1 i-- @@ -508,7 +509,7 @@ func (m *Model) Size() (n int) { if m.SchemaVersion != 0 { n += 2 + sovModel(uint64(m.SchemaVersion)) } - l = len(m.CommissionerRemoteUiFlowUrl) + l = len(m.ManagedAclExtensionRequestFlowUrl) if l > 0 { n += 2 + l + sovModel(uint64(l)) } @@ -1056,7 +1057,7 @@ func (m *Model) Unmarshal(dAtA []byte) error { } case 20: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field CommissionerRemoteUiFlowUrl", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field ManagedAclExtensionRequestFlowUrl", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -1084,7 +1085,7 @@ func (m *Model) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.CommissionerRemoteUiFlowUrl = string(dAtA[iNdEx:postIndex]) + m.ManagedAclExtensionRequestFlowUrl = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex default: iNdEx = preIndex diff --git a/x/model/types/product.pb.go b/x/model/types/product.pb.go index 43400f58f..f28506f7f 100644 --- a/x/model/types/product.pb.go +++ b/x/model/types/product.pb.go @@ -23,9 +23,10 @@ var _ = math.Inf const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type Product struct { - Pid int32 `protobuf:"varint,1,opt,name=pid,proto3" json:"pid,omitempty"` - Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"` - PartNumber string `protobuf:"bytes,3,opt,name=partNumber,proto3" json:"partNumber,omitempty"` + Pid int32 `protobuf:"varint,1,opt,name=pid,proto3" json:"pid,omitempty"` + Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"` + PartNumber string `protobuf:"bytes,3,opt,name=partNumber,proto3" json:"partNumber,omitempty"` + SchemaVersion uint32 `protobuf:"varint,4,opt,name=schemaVersion,proto3" json:"schemaVersion,omitempty"` } func (m *Product) Reset() { *m = Product{} } @@ -82,6 +83,13 @@ func (m *Product) GetPartNumber() string { return "" } +func (m *Product) GetSchemaVersion() uint32 { + if m != nil { + return m.SchemaVersion + } + return 0 +} + func init() { proto.RegisterType((*Product)(nil), "zigbeealliance.distributedcomplianceledger.model.Product") } @@ -91,21 +99,23 @@ func init() { } var fileDescriptor_a2362e9df72af44d = []byte{ - // 220 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xb2, 0xab, 0xca, 0x4c, 0x4f, - 0x4a, 0x4d, 0x4d, 0xcc, 0xc9, 0xc9, 0x4c, 0xcc, 0x4b, 0x4e, 0xd5, 0x4f, 0xc9, 0x2c, 0x2e, 0x29, - 0xca, 0x4c, 0x2a, 0x2d, 0x49, 0x4d, 0x49, 0xce, 0xcf, 0x2d, 0x80, 0x88, 0xe6, 0xa4, 0xa6, 0xa4, - 0xa7, 0x16, 0xe9, 0xe7, 0xe6, 0xa7, 0xa4, 0xe6, 0xe8, 0x17, 0x14, 0xe5, 0xa7, 0x94, 0x26, 0x97, - 0xe8, 0x15, 0x14, 0xe5, 0x97, 0xe4, 0x0b, 0x19, 0xa0, 0xea, 0xd7, 0xc3, 0xa3, 0x5f, 0x0f, 0xac, - 0x5f, 0xc9, 0x9f, 0x8b, 0x3d, 0x00, 0x62, 0x84, 0x90, 0x00, 0x17, 0x73, 0x41, 0x66, 0x8a, 0x04, - 0xa3, 0x02, 0xa3, 0x06, 0x6b, 0x10, 0x88, 0x29, 0x24, 0xc4, 0xc5, 0x92, 0x97, 0x98, 0x9b, 0x2a, - 0xc1, 0xa4, 0xc0, 0xa8, 0xc1, 0x19, 0x04, 0x66, 0x0b, 0xc9, 0x71, 0x71, 0x15, 0x24, 0x16, 0x95, - 0xf8, 0x95, 0xe6, 0x26, 0xa5, 0x16, 0x49, 0x30, 0x83, 0x65, 0x90, 0x44, 0x9c, 0x12, 0x4e, 0x3c, - 0x92, 0x63, 0xbc, 0xf0, 0x48, 0x8e, 0xf1, 0xc1, 0x23, 0x39, 0xc6, 0x09, 0x8f, 0xe5, 0x18, 0x2e, - 0x3c, 0x96, 0x63, 0xb8, 0xf1, 0x58, 0x8e, 0x21, 0xca, 0x2d, 0x3d, 0xb3, 0x24, 0xa3, 0x34, 0x49, - 0x2f, 0x39, 0x3f, 0x57, 0x1f, 0xe2, 0x4e, 0x5d, 0x6c, 0x1e, 0xd5, 0x45, 0xb8, 0x54, 0x17, 0xea, - 0xd5, 0x0a, 0xa8, 0x67, 0x4b, 0x2a, 0x0b, 0x52, 0x8b, 0x93, 0xd8, 0xc0, 0x7e, 0x35, 0x06, 0x04, - 0x00, 0x00, 0xff, 0xff, 0x00, 0xaf, 0x53, 0x85, 0x2d, 0x01, 0x00, 0x00, + // 245 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x90, 0xbd, 0x4a, 0xc4, 0x40, + 0x14, 0x85, 0x33, 0xee, 0xaa, 0x38, 0xb0, 0x20, 0x53, 0xa5, 0x1a, 0x82, 0x58, 0xa4, 0x49, 0x22, + 0xd8, 0x5b, 0x58, 0x58, 0x8a, 0xa4, 0xb0, 0xb0, 0x72, 0x7e, 0x2e, 0xd9, 0x81, 0x4c, 0x66, 0x98, + 0x1f, 0x50, 0x9f, 0xc2, 0xc7, 0xb2, 0xdc, 0xd2, 0x52, 0x92, 0x17, 0x11, 0x27, 0x0b, 0x1a, 0x90, + 0xed, 0x0e, 0xe7, 0xf2, 0x5d, 0x38, 0x1f, 0xbe, 0x79, 0x53, 0x1d, 0x07, 0x60, 0x7d, 0xaf, 0xd8, + 0x20, 0xa0, 0x91, 0xca, 0x07, 0xa7, 0x78, 0x0c, 0x20, 0x85, 0xd1, 0x76, 0x6e, 0x7b, 0x90, 0x1d, + 0xb8, 0x46, 0x1b, 0x09, 0x7d, 0x63, 0x9d, 0x91, 0x51, 0x84, 0xda, 0x3a, 0x13, 0x0c, 0xb9, 0x5a, + 0xf2, 0xf5, 0x01, 0xbe, 0x4e, 0xfc, 0x45, 0xc4, 0xa7, 0x0f, 0xf3, 0x0b, 0x72, 0x8e, 0x57, 0x56, + 0xc9, 0x1c, 0x15, 0xa8, 0x3c, 0x6e, 0x7f, 0x22, 0x21, 0x78, 0x3d, 0x30, 0x0d, 0xf9, 0x51, 0x81, + 0xca, 0xb3, 0x36, 0x65, 0x42, 0x31, 0xb6, 0xcc, 0x85, 0xfb, 0xa8, 0x39, 0xb8, 0x7c, 0x95, 0x2e, + 0x7f, 0x1a, 0x72, 0x89, 0x37, 0x5e, 0x6c, 0x41, 0xb3, 0x47, 0x70, 0x5e, 0x99, 0x21, 0x5f, 0x17, + 0xa8, 0xdc, 0xb4, 0xcb, 0xf2, 0xf6, 0xf9, 0x63, 0xa4, 0x68, 0x37, 0x52, 0xf4, 0x35, 0x52, 0xf4, + 0x3e, 0xd1, 0x6c, 0x37, 0xd1, 0xec, 0x73, 0xa2, 0xd9, 0xd3, 0x5d, 0xa7, 0xc2, 0x36, 0xf2, 0x5a, + 0x18, 0xdd, 0xcc, 0x6b, 0xaa, 0xff, 0x74, 0x54, 0xbf, 0x7b, 0xaa, 0xbd, 0x90, 0x97, 0xbd, 0x92, + 0xf0, 0x6a, 0xc1, 0xf3, 0x93, 0x64, 0xe4, 0xfa, 0x3b, 0x00, 0x00, 0xff, 0xff, 0x9a, 0xa4, 0x88, + 0xb3, 0x53, 0x01, 0x00, 0x00, } func (m *Product) Marshal() (dAtA []byte, err error) { @@ -128,6 +138,11 @@ func (m *Product) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if m.SchemaVersion != 0 { + i = encodeVarintProduct(dAtA, i, uint64(m.SchemaVersion)) + i-- + dAtA[i] = 0x20 + } if len(m.PartNumber) > 0 { i -= len(m.PartNumber) copy(dAtA[i:], m.PartNumber) @@ -178,6 +193,9 @@ func (m *Product) Size() (n int) { if l > 0 { n += 1 + l + sovProduct(uint64(l)) } + if m.SchemaVersion != 0 { + n += 1 + sovProduct(uint64(m.SchemaVersion)) + } return n } @@ -299,6 +317,25 @@ func (m *Product) Unmarshal(dAtA []byte) error { } m.PartNumber = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex + case 4: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field SchemaVersion", wireType) + } + m.SchemaVersion = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowProduct + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.SchemaVersion |= uint32(b&0x7F) << shift + if b < 0x80 { + break + } + } default: iNdEx = preIndex skippy, err := skipProduct(dAtA[iNdEx:]) diff --git a/x/model/types/tx.pb.go b/x/model/types/tx.pb.go index 825fd3c01..03d298b0b 100644 --- a/x/model/types/tx.pb.go +++ b/x/model/types/tx.pb.go @@ -48,7 +48,7 @@ type MsgCreateModel struct { ProductUrl string `protobuf:"bytes,16,opt,name=productUrl,proto3" json:"productUrl,omitempty" validate:"omitempty,url,startsnotwith=http:,max=256"` LsfUrl string `protobuf:"bytes,17,opt,name=lsfUrl,proto3" json:"lsfUrl,omitempty" validate:"omitempty,url,startsnotwith=http:,max=256"` SchemaVersion uint32 `protobuf:"varint,18,opt,name=schemaVersion,proto3" json:"schemaVersion,omitempty" validate:"gte=0,lte=65535"` - CommissionerRemoteUiFlowUrl string `protobuf:"bytes,19,opt,name=commissionerRemoteUiFlowUrl,proto3" json:"commissionerRemoteUiFlowUrl,omitempty" validate:"omitempty,url,startsnotwith=http:,max=256"` + ManagedAclExtensionRequestFlowUrl string `protobuf:"bytes,19,opt,name=managedAclExtensionRequestFlowUrl,proto3" json:"managedAclExtensionRequestFlowUrl,omitempty" validate:"omitempty,url,startsnotwith=http:,max=256"` } func (m *MsgCreateModel) Reset() { *m = MsgCreateModel{} } @@ -210,9 +210,9 @@ func (m *MsgCreateModel) GetSchemaVersion() uint32 { return 0 } -func (m *MsgCreateModel) GetCommissionerRemoteUiFlowUrl() string { +func (m *MsgCreateModel) GetManagedAclExtensionRequestFlowUrl() string { if m != nil { - return m.CommissionerRemoteUiFlowUrl + return m.ManagedAclExtensionRequestFlowUrl } return "" } @@ -269,7 +269,7 @@ type MsgUpdateModel struct { LsfUrl string `protobuf:"bytes,13,opt,name=lsfUrl,proto3" json:"lsfUrl,omitempty" validate:"omitempty,url,startsnotwith=http:,max=256"` LsfRevision int32 `protobuf:"varint,14,opt,name=lsfRevision,proto3" json:"lsfRevision,omitempty" validate:"gte=0,lte=65535"` SchemaVersion uint32 `protobuf:"varint,15,opt,name=schemaVersion,proto3" json:"schemaVersion,omitempty" validate:"gte=0,lte=65535"` - CommissionerRemoteUiFlowUrl string `protobuf:"bytes,16,opt,name=commissionerRemoteUiFlowUrl,proto3" json:"commissionerRemoteUiFlowUrl,omitempty" validate:"omitempty,url,startsnotwith=http:,max=256"` + ManagedAclExtensionRequestFlowUrl string `protobuf:"bytes,16,opt,name=managedAclExtensionRequestFlowUrl,proto3" json:"managedAclExtensionRequestFlowUrl,omitempty" validate:"omitempty,url,startsnotwith=http:,max=256"` CommissioningModeInitialStepsHint uint32 `protobuf:"varint,17,opt,name=commissioningModeInitialStepsHint,proto3" json:"commissioningModeInitialStepsHint,omitempty"` } @@ -411,9 +411,9 @@ func (m *MsgUpdateModel) GetSchemaVersion() uint32 { return 0 } -func (m *MsgUpdateModel) GetCommissionerRemoteUiFlowUrl() string { +func (m *MsgUpdateModel) GetManagedAclExtensionRequestFlowUrl() string { if m != nil { - return m.CommissionerRemoteUiFlowUrl + return m.ManagedAclExtensionRequestFlowUrl } return "" } @@ -1049,94 +1049,95 @@ func init() { } var fileDescriptor_bc57f11ad3062327 = []byte{ - // 1388 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x59, 0xcd, 0x6f, 0xdb, 0xb6, - 0x1b, 0xae, 0x7e, 0xcd, 0x27, 0x9d, 0x8f, 0x96, 0xfd, 0xd2, 0xcf, 0xed, 0xac, 0x4c, 0x05, 0x86, - 0xa0, 0x48, 0xe2, 0xd4, 0x69, 0xb2, 0xae, 0x68, 0x80, 0xd6, 0xe9, 0xda, 0x04, 0x68, 0xda, 0x42, - 0x69, 0x8b, 0xa1, 0xc0, 0xda, 0xc9, 0x12, 0xed, 0x10, 0x93, 0x44, 0x8d, 0xa4, 0xf3, 0x75, 0xde, - 0x71, 0x87, 0x5d, 0x77, 0xd9, 0x9f, 0xb0, 0xd3, 0xce, 0xdb, 0x6d, 0xd8, 0xb1, 0xd8, 0x69, 0x27, - 0x61, 0x68, 0x81, 0x9d, 0x76, 0x18, 0xf4, 0x17, 0x0c, 0xa2, 0xe5, 0x58, 0xb2, 0xe5, 0x8f, 0x58, - 0xf6, 0x21, 0xbd, 0x18, 0x16, 0xc9, 0xe7, 0xe1, 0xfb, 0x92, 0xef, 0xfb, 0xbc, 0xa4, 0x04, 0x3e, - 0x3b, 0xc2, 0x95, 0x12, 0x42, 0xba, 0x65, 0x61, 0xdd, 0x31, 0x50, 0xde, 0xc4, 0x8c, 0x53, 0x5c, - 0xaa, 0x72, 0x64, 0x1a, 0xc4, 0x76, 0x6b, 0xad, 0x16, 0x32, 0x2b, 0x88, 0xe6, 0x6d, 0x62, 0x22, - 0x2b, 0xcf, 0x0f, 0x96, 0x5c, 0x4a, 0x38, 0x81, 0xcb, 0x71, 0xe8, 0x52, 0x07, 0xe8, 0x92, 0x80, - 0x66, 0xef, 0x9e, 0x78, 0x32, 0xf1, 0x5b, 0x9b, 0x2f, 0xfb, 0xa0, 0x3f, 0xf4, 0x9b, 0x3d, 0x44, - 0x19, 0x26, 0x4e, 0xc8, 0x72, 0xb1, 0x42, 0x2a, 0x44, 0xfc, 0xcd, 0x07, 0xff, 0xc2, 0xd6, 0xff, - 0x1b, 0x84, 0xd9, 0x84, 0xbd, 0xa9, 0x75, 0xd4, 0x1e, 0x6a, 0x5d, 0xea, 0xdf, 0x53, 0x60, 0x66, - 0x9b, 0x55, 0x36, 0x28, 0xd2, 0x39, 0xda, 0x0e, 0x18, 0xe1, 0x16, 0x18, 0x37, 0x82, 0x47, 0x42, - 0x65, 0x69, 0x4e, 0x9a, 0x9f, 0x2c, 0xe6, 0x7d, 0x4f, 0xb9, 0xb0, 0xa7, 0x5b, 0xd8, 0xd4, 0x39, - 0xba, 0xa3, 0x52, 0xf4, 0x4d, 0x15, 0x53, 0x64, 0xaa, 0x7f, 0xfc, 0xbc, 0x78, 0x31, 0x24, 0xbb, - 0x6f, 0x9a, 0x14, 0x31, 0xb6, 0xc3, 0x29, 0x76, 0x2a, 0x5a, 0x1d, 0x0f, 0x97, 0xc1, 0xd9, 0x3d, - 0x6c, 0xca, 0xff, 0x9b, 0x93, 0xe6, 0x47, 0x8b, 0x39, 0xdf, 0x53, 0xb2, 0x0d, 0x9a, 0x0a, 0x47, - 0xeb, 0x37, 0x17, 0x2c, 0x8e, 0xd6, 0xd7, 0x56, 0x57, 0x57, 0x56, 0x55, 0x2d, 0x18, 0x1a, 0x20, - 0x5c, 0x6c, 0xca, 0x67, 0x7b, 0x43, 0xb8, 0xd8, 0x84, 0x45, 0x30, 0x65, 0xa2, 0x3d, 0x6c, 0xa0, - 0xe7, 0x87, 0x2e, 0xda, 0x32, 0xe5, 0x91, 0x76, 0xd0, 0xe5, 0x28, 0x34, 0x86, 0x81, 0xf7, 0x41, - 0xc6, 0xa5, 0xc4, 0xac, 0x1a, 0xfc, 0x89, 0x6e, 0x23, 0x79, 0x54, 0xb8, 0xad, 0xf8, 0x9e, 0x72, - 0xb5, 0xd5, 0xed, 0x05, 0x5b, 0x3f, 0x58, 0xbf, 0x59, 0xb8, 0xad, 0x6a, 0x51, 0x0c, 0xbc, 0x03, - 0xa6, 0xc2, 0xc7, 0xc7, 0x7a, 0x09, 0x59, 0xf2, 0x98, 0xe0, 0xb8, 0xec, 0x7b, 0x0a, 0x6c, 0x70, - 0x04, 0xd0, 0xc2, 0xea, 0x9a, 0xaa, 0xc5, 0xc6, 0xc2, 0x55, 0x00, 0x5c, 0x9d, 0xf2, 0x27, 0x55, - 0xbb, 0x84, 0xa8, 0x3c, 0x2e, 0x90, 0x97, 0x7c, 0x4f, 0x39, 0x1f, 0x47, 0xae, 0x14, 0x54, 0x2d, - 0x32, 0x10, 0x3e, 0x07, 0x57, 0x0c, 0x62, 0xdb, 0x98, 0x05, 0x01, 0x80, 0x9d, 0xca, 0x46, 0x95, - 0x71, 0x62, 0x3f, 0xb4, 0xc8, 0xbe, 0x3c, 0x21, 0x16, 0x21, 0xeb, 0x7b, 0xca, 0xe5, 0xa4, 0x45, - 0x28, 0xa8, 0x5a, 0x3b, 0x28, 0xfc, 0x51, 0x02, 0xd9, 0x36, 0x7d, 0x2f, 0xa8, 0x25, 0x4f, 0x0a, - 0xeb, 0x5e, 0xfb, 0x9e, 0xf2, 0xaa, 0x75, 0x6d, 0xde, 0xe0, 0xf2, 0xfa, 0x46, 0x32, 0x76, 0xae, - 0xb0, 0x40, 0x6c, 0xcc, 0x91, 0xed, 0xf2, 0xc3, 0x85, 0x2a, 0xb5, 0x16, 0x18, 0xd7, 0x29, 0x67, - 0x0e, 0xe1, 0xfb, 0x98, 0xef, 0xae, 0xef, 0x72, 0xee, 0xde, 0x59, 0x38, 0x5e, 0x9f, 0x0e, 0x16, - 0xc0, 0xc7, 0xe0, 0xe3, 0x58, 0x6f, 0x10, 0xb5, 0x5b, 0x0e, 0xe6, 0x58, 0xb7, 0x76, 0x38, 0x72, - 0xd9, 0x26, 0x76, 0xb8, 0x0c, 0xe6, 0xa4, 0xf9, 0x69, 0xad, 0xfb, 0x40, 0xc8, 0xc0, 0x7c, 0xc7, - 0x41, 0x5b, 0x0e, 0xe3, 0xb4, 0x6a, 0x70, 0x4c, 0x1c, 0x39, 0x23, 0x7c, 0xbf, 0x12, 0x4f, 0x07, - 0x11, 0x0e, 0xcb, 0x85, 0x5b, 0xaa, 0xd6, 0x33, 0x11, 0x7c, 0x06, 0xae, 0xb7, 0x8c, 0xdd, 0x41, - 0x06, 0x71, 0x4c, 0x9d, 0x1e, 0x36, 0x9c, 0x98, 0x12, 0x4e, 0xf4, 0x32, 0x14, 0xee, 0x83, 0x1b, - 0x5d, 0x86, 0x45, 0x1d, 0x99, 0xee, 0xec, 0xc8, 0x09, 0xa8, 0xe0, 0x6b, 0x30, 0x5d, 0x65, 0x88, - 0x6e, 0xeb, 0x4e, 0x55, 0xb7, 0x82, 0x00, 0x99, 0x11, 0xdc, 0xb7, 0x7d, 0x4f, 0xb9, 0xd5, 0xe0, - 0x3e, 0xc1, 0xd6, 0xc7, 0xe9, 0xe0, 0x17, 0x00, 0xb0, 0xaa, 0xeb, 0x12, 0xca, 0x03, 0xf2, 0xd9, - 0x94, 0xe4, 0x11, 0xae, 0x80, 0x39, 0xcc, 0xc2, 0x80, 0xf9, 0x5c, 0x5a, 0xe6, 0x06, 0x17, 0x7c, - 0x06, 0xc6, 0x2c, 0x56, 0x0e, 0x58, 0xcf, 0xa7, 0x64, 0x0d, 0x79, 0xe0, 0x03, 0x30, 0xcd, 0x8c, - 0x5d, 0x64, 0xeb, 0x2f, 0x6b, 0x72, 0x2f, 0xc3, 0x20, 0x34, 0xba, 0xaa, 0x5c, 0x1c, 0x04, 0x8f, - 0xc0, 0xd5, 0xc6, 0xce, 0x22, 0xaa, 0x21, 0x9b, 0x70, 0xf4, 0x02, 0xd7, 0x53, 0xfb, 0x42, 0x4a, - 0x63, 0x3b, 0x91, 0xab, 0x32, 0xb8, 0x1c, 0xaf, 0x33, 0x1a, 0x62, 0x2e, 0x71, 0x18, 0x52, 0xbf, - 0xcb, 0x88, 0x12, 0xf4, 0xc2, 0x35, 0x4f, 0x6b, 0x09, 0xba, 0x1d, 0x2f, 0x1f, 0x23, 0xed, 0xa4, - 0xbf, 0x7b, 0xd5, 0x18, 0xed, 0xbb, 0x6a, 0x8c, 0xf5, 0x5a, 0x35, 0x0e, 0x3a, 0xca, 0xfb, 0x78, - 0xca, 0x18, 0xe8, 0x24, 0xdc, 0x27, 0x91, 0xda, 0x89, 0x41, 0x49, 0xed, 0xc9, 0x84, 0x71, 0x72, - 0x88, 0xc2, 0x08, 0x86, 0x29, 0x8c, 0x99, 0xa1, 0x09, 0xe3, 0xd4, 0x50, 0x84, 0x71, 0x7a, 0x40, - 0xc2, 0x78, 0x0f, 0x64, 0x2c, 0x56, 0xd6, 0xd0, 0x1e, 0x16, 0xb2, 0x38, 0xd3, 0xd3, 0xe1, 0x2f, - 0x0a, 0x69, 0x95, 0xd6, 0xd9, 0x21, 0x48, 0xeb, 0xb9, 0x21, 0x4a, 0x6b, 0x6f, 0x07, 0xa2, 0xf3, - 0x3d, 0x1e, 0x88, 0x42, 0xa1, 0x8e, 0xa8, 0xf1, 0xb1, 0x50, 0xff, 0x2a, 0x09, 0xa1, 0x7e, 0x80, - 0x2c, 0x74, 0x3a, 0x85, 0x3a, 0xf4, 0x2d, 0xe2, 0xc0, 0xb1, 0x6f, 0xbf, 0x4c, 0x82, 0x4b, 0xf1, - 0xfa, 0x54, 0xdf, 0xd9, 0x53, 0x56, 0x8b, 0xe6, 0xc1, 0x2c, 0x23, 0x65, 0xbe, 0xaf, 0x53, 0x54, - 0x0f, 0xe8, 0x11, 0xb1, 0xf5, 0xcd, 0xcd, 0xf0, 0x39, 0xb8, 0xd4, 0xd4, 0x54, 0xb3, 0x37, 0x2c, - 0x42, 0x4d, 0xb3, 0xc5, 0xae, 0x3f, 0x6b, 0xb7, 0x54, 0x2d, 0x19, 0x0c, 0x37, 0xc1, 0xac, 0x61, - 0x86, 0x4d, 0x91, 0xd2, 0xd4, 0x3d, 0x29, 0x9b, 0x61, 0x70, 0x13, 0x5c, 0x28, 0x63, 0x6a, 0x07, - 0x53, 0x6c, 0x39, 0x65, 0x42, 0x6d, 0x5d, 0x48, 0xf4, 0x78, 0xbb, 0x12, 0xb9, 0x7a, 0xb3, 0xa0, - 0x6a, 0x49, 0x10, 0x58, 0x00, 0x17, 0x9b, 0x8c, 0x7d, 0x19, 0x20, 0x45, 0x91, 0x99, 0xd0, 0x12, - 0xfb, 0x02, 0xa9, 0x22, 0x5c, 0x6f, 0xdc, 0x78, 0x52, 0x48, 0x55, 0x8d, 0x07, 0x7e, 0x0e, 0x32, - 0x84, 0xeb, 0x0f, 0xb1, 0x85, 0x76, 0xf0, 0x11, 0x12, 0xe5, 0x60, 0xa4, 0x78, 0xdd, 0xf7, 0x14, - 0x25, 0xe1, 0x22, 0x25, 0x88, 0x9e, 0x0a, 0xa0, 0xaa, 0x45, 0x71, 0xf0, 0xb1, 0xa0, 0xd9, 0xd8, - 0x45, 0xc6, 0xd7, 0xac, 0x6a, 0x87, 0xc2, 0x7f, 0xc3, 0xf7, 0x94, 0x4f, 0x3a, 0xd3, 0x1c, 0x6f, - 0x5c, 0x14, 0x0e, 0xbf, 0x04, 0xb3, 0x91, 0xc7, 0xe0, 0x3a, 0x2c, 0x04, 0x7f, 0xb4, 0xb8, 0xe2, - 0x7b, 0x4a, 0xbe, 0x0b, 0x63, 0xeb, 0x1e, 0x36, 0x71, 0xc1, 0x22, 0xb8, 0x66, 0x63, 0xe7, 0xbe, - 0xeb, 0x5a, 0xd8, 0xd0, 0x4b, 0x16, 0xda, 0x69, 0x0a, 0xcd, 0x69, 0x11, 0x9a, 0x1d, 0xc7, 0xc0, - 0x23, 0x70, 0xcd, 0xd6, 0x0f, 0xda, 0x73, 0xcc, 0x08, 0xbd, 0x5e, 0xf3, 0x3d, 0xa5, 0x10, 0x0b, - 0x2f, 0x83, 0x95, 0x31, 0xb2, 0xcc, 0xf5, 0xed, 0x0e, 0xe4, 0xaa, 0xd6, 0x91, 0x1b, 0x96, 0xc0, - 0x2c, 0x45, 0x16, 0xd2, 0x19, 0x7a, 0x42, 0x38, 0x62, 0x83, 0xb8, 0x82, 0x34, 0x13, 0xb6, 0x16, - 0xa0, 0x73, 0x7d, 0x14, 0x20, 0x55, 0x01, 0x1f, 0x25, 0xea, 0xd7, 0xb1, 0xc2, 0xfd, 0x36, 0x26, - 0x14, 0x2e, 0x22, 0xec, 0x1f, 0xbc, 0xc2, 0xb5, 0xcb, 0xfb, 0xd1, 0x9e, 0xf2, 0x7e, 0x6c, 0x40, - 0x79, 0xdf, 0x2d, 0x07, 0xc6, 0x7b, 0xc8, 0x81, 0x6f, 0xa5, 0x2e, 0x49, 0x30, 0x21, 0x62, 0xe6, - 0x9e, 0xef, 0x29, 0x77, 0x93, 0x8c, 0x1d, 0x5e, 0x3a, 0x4c, 0x0e, 0x3a, 0x1d, 0xe6, 0x12, 0x64, - 0x32, 0xae, 0x80, 0x9f, 0x26, 0x29, 0x60, 0xc2, 0xcd, 0xa7, 0x45, 0xec, 0x5a, 0x32, 0x6d, 0xaa, - 0xff, 0x4c, 0x6b, 0xcd, 0xa3, 0xe3, 0x4c, 0xfb, 0x57, 0x12, 0x99, 0x16, 0x39, 0x66, 0x7c, 0xe8, - 0x99, 0x16, 0xae, 0x49, 0xab, 0xc7, 0xf5, 0x35, 0x29, 0xfc, 0x33, 0x0e, 0xce, 0x6e, 0xb3, 0x0a, - 0xfc, 0x41, 0x02, 0x99, 0xe8, 0xcb, 0xe6, 0x7b, 0x4b, 0x27, 0x7d, 0xcf, 0xbe, 0x14, 0x97, 0xb9, - 0xec, 0x66, 0x5a, 0x86, 0xba, 0x8d, 0xc2, 0xb6, 0xe8, 0x5b, 0x88, 0xfe, 0x6c, 0x8b, 0x30, 0xf4, - 0x69, 0x5b, 0xc2, 0xd9, 0x5b, 0xd8, 0x16, 0x3d, 0x78, 0xf7, 0x67, 0x5b, 0x84, 0xa1, 0x4f, 0xdb, - 0x12, 0xce, 0xce, 0xf0, 0x27, 0x09, 0xc0, 0x84, 0x83, 0xf3, 0xa3, 0xb4, 0x1b, 0x13, 0x12, 0x65, - 0x9f, 0x0e, 0x88, 0x28, 0x66, 0x70, 0x42, 0x1d, 0x7c, 0x94, 0x76, 0xb7, 0xd2, 0x19, 0xdc, 0x5e, - 0x51, 0x84, 0xc1, 0x09, 0x72, 0xf2, 0x28, 0xed, 0x16, 0xa6, 0x33, 0xb8, 0x7d, 0xba, 0x17, 0xbf, - 0xfa, 0xfd, 0x5d, 0x4e, 0x7a, 0xfb, 0x2e, 0x27, 0xfd, 0xf5, 0x2e, 0x27, 0x7d, 0xff, 0x3e, 0x77, - 0xe6, 0xed, 0xfb, 0xdc, 0x99, 0x3f, 0xdf, 0xe7, 0xce, 0xbc, 0x7a, 0x58, 0xc1, 0x7c, 0xb7, 0x5a, - 0x5a, 0x32, 0x88, 0x9d, 0xaf, 0x4d, 0xba, 0x98, 0xf4, 0xcd, 0x6b, 0xb1, 0x31, 0xed, 0x62, 0xf8, - 0xd5, 0xeb, 0xa0, 0xfe, 0x89, 0xee, 0xd0, 0x45, 0xac, 0x34, 0x26, 0xbe, 0x5f, 0xad, 0xfc, 0x17, - 0x00, 0x00, 0xff, 0xff, 0x27, 0xcf, 0x77, 0x07, 0xe3, 0x1b, 0x00, 0x00, + // 1397 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x59, 0xcb, 0x6f, 0xdb, 0x36, + 0x18, 0xaf, 0xd6, 0x3c, 0xe9, 0x3c, 0x5a, 0xf6, 0xa5, 0x79, 0x9d, 0x95, 0xaa, 0xc0, 0x10, 0x14, + 0x49, 0x9c, 0x3a, 0x4d, 0xd6, 0x15, 0x0d, 0xd0, 0x38, 0x7d, 0x24, 0x40, 0xd3, 0x16, 0x4a, 0x5b, + 0x0c, 0x05, 0xd6, 0x4e, 0x96, 0x68, 0x87, 0x98, 0x24, 0xaa, 0x24, 0x95, 0x47, 0xcf, 0xc3, 0xce, + 0xbb, 0xf6, 0xb2, 0x3f, 0x61, 0xa7, 0x9d, 0xb7, 0xdb, 0xb0, 0x63, 0xb1, 0xd3, 0x4e, 0xc2, 0xd0, + 0x5e, 0x77, 0x18, 0xb4, 0x7f, 0x60, 0x10, 0x2d, 0xc7, 0x92, 0x2d, 0x3f, 0x62, 0xc7, 0x87, 0xf4, + 0x62, 0x58, 0x24, 0x7f, 0x3f, 0x7e, 0x1f, 0xf9, 0x7d, 0xbf, 0x8f, 0x94, 0xc0, 0x57, 0x6f, 0x70, + 0xa5, 0x84, 0x90, 0x6e, 0x59, 0x58, 0x77, 0x0c, 0x94, 0x37, 0x31, 0xe3, 0x14, 0x97, 0x3c, 0x8e, + 0x4c, 0x83, 0xd8, 0x6e, 0xb5, 0xd5, 0x42, 0x66, 0x05, 0xd1, 0xbc, 0x4d, 0x4c, 0x64, 0xe5, 0xf9, + 0xfe, 0x82, 0x4b, 0x09, 0x27, 0x70, 0x31, 0x09, 0x5d, 0x68, 0x03, 0x5d, 0x10, 0xd0, 0xec, 0xed, + 0x23, 0x4f, 0x26, 0x7e, 0xab, 0xf3, 0x65, 0xef, 0xf6, 0x86, 0x7e, 0xb5, 0x8b, 0x28, 0xc3, 0xc4, + 0x89, 0x58, 0xce, 0x57, 0x48, 0x85, 0x88, 0xbf, 0xf9, 0xf0, 0x5f, 0xd4, 0xfa, 0xa9, 0x41, 0x98, + 0x4d, 0xd8, 0xab, 0x6a, 0x47, 0xf5, 0xa1, 0xda, 0xa5, 0xfe, 0x37, 0x01, 0xa6, 0xb6, 0x58, 0x65, + 0x9d, 0x22, 0x9d, 0xa3, 0xad, 0x90, 0x11, 0x6e, 0x82, 0x51, 0x23, 0x7c, 0x24, 0x54, 0x96, 0x66, + 0xa4, 0xd9, 0xf1, 0x62, 0x3e, 0xf0, 0x95, 0x73, 0xbb, 0xba, 0x85, 0x4d, 0x9d, 0xa3, 0x5b, 0x2a, + 0x45, 0xaf, 0x3d, 0x4c, 0x91, 0xa9, 0xfe, 0xf9, 0xcb, 0xfc, 0xf9, 0x88, 0x6c, 0xcd, 0x34, 0x29, + 0x62, 0x6c, 0x9b, 0x53, 0xec, 0x54, 0xb4, 0x1a, 0x1e, 0x2e, 0x82, 0xd3, 0xbb, 0xd8, 0x94, 0x3f, + 0x99, 0x91, 0x66, 0x87, 0x8b, 0xb9, 0xc0, 0x57, 0xb2, 0x75, 0x9a, 0x0a, 0x47, 0xab, 0xd7, 0xe7, + 0x2c, 0x8e, 0x56, 0x57, 0x96, 0x97, 0x97, 0x96, 0x55, 0x2d, 0x1c, 0x1a, 0x22, 0x5c, 0x6c, 0xca, + 0xa7, 0xbb, 0x43, 0xb8, 0xd8, 0x84, 0x45, 0x30, 0x61, 0xa2, 0x5d, 0x6c, 0xa0, 0xa7, 0x07, 0x2e, + 0xda, 0x34, 0xe5, 0xa1, 0x56, 0xd0, 0xc5, 0x38, 0x34, 0x81, 0x81, 0x6b, 0x20, 0xe3, 0x52, 0x62, + 0x7a, 0x06, 0x7f, 0xa4, 0xdb, 0x48, 0x1e, 0x16, 0x6e, 0x2b, 0x81, 0xaf, 0x7c, 0xd6, 0xec, 0xf6, + 0x9c, 0xad, 0xef, 0xaf, 0x5e, 0x2f, 0xdc, 0x54, 0xb5, 0x38, 0x06, 0xde, 0x02, 0x13, 0xd1, 0xe3, + 0x43, 0xbd, 0x84, 0x2c, 0x79, 0x44, 0x70, 0x5c, 0x0c, 0x7c, 0x05, 0xd6, 0x39, 0x42, 0x68, 0x61, + 0x79, 0x45, 0xd5, 0x12, 0x63, 0xe1, 0x32, 0x00, 0xae, 0x4e, 0xf9, 0x23, 0xcf, 0x2e, 0x21, 0x2a, + 0x8f, 0x0a, 0xe4, 0x85, 0xc0, 0x57, 0xce, 0x26, 0x91, 0x4b, 0x05, 0x55, 0x8b, 0x0d, 0x84, 0x4f, + 0xc1, 0x25, 0x83, 0xd8, 0x36, 0x66, 0x61, 0x00, 0x60, 0xa7, 0xb2, 0xee, 0x31, 0x4e, 0xec, 0xfb, + 0x16, 0xd9, 0x93, 0xc7, 0xc4, 0x22, 0x64, 0x03, 0x5f, 0xb9, 0x98, 0xb6, 0x08, 0x05, 0x55, 0x6b, + 0x05, 0x85, 0x3f, 0x49, 0x20, 0xdb, 0xa2, 0xef, 0x19, 0xb5, 0xe4, 0x71, 0x61, 0xdd, 0xcb, 0xc0, + 0x57, 0x5e, 0x34, 0xaf, 0xcd, 0x2b, 0x5c, 0x5e, 0x5d, 0x4f, 0xc7, 0xce, 0x14, 0xe6, 0x88, 0x8d, + 0x39, 0xb2, 0x5d, 0x7e, 0x30, 0xe7, 0x51, 0x6b, 0x8e, 0x71, 0x9d, 0x72, 0xe6, 0x10, 0xbe, 0x87, + 0xf9, 0xce, 0xea, 0x0e, 0xe7, 0xee, 0xad, 0xb9, 0xc3, 0xf5, 0x69, 0x63, 0x01, 0x7c, 0x08, 0xae, + 0x24, 0x7a, 0xc3, 0xa8, 0xdd, 0x74, 0x30, 0xc7, 0xba, 0xb5, 0xcd, 0x91, 0xcb, 0x36, 0xb0, 0xc3, + 0x65, 0x30, 0x23, 0xcd, 0x4e, 0x6a, 0x9d, 0x07, 0x42, 0x06, 0x66, 0xdb, 0x0e, 0xda, 0x74, 0x18, + 0xa7, 0x9e, 0xc1, 0x31, 0x71, 0xe4, 0x8c, 0xf0, 0xfd, 0x52, 0x32, 0x1d, 0x44, 0x38, 0x2c, 0x16, + 0x6e, 0xa8, 0x5a, 0xd7, 0x44, 0xf0, 0x09, 0xb8, 0xda, 0x34, 0x76, 0x1b, 0x19, 0xc4, 0x31, 0x75, + 0x7a, 0x50, 0x77, 0x62, 0x42, 0x38, 0xd1, 0xcd, 0x50, 0xb8, 0x07, 0xae, 0x75, 0x18, 0x16, 0x77, + 0x64, 0xb2, 0xbd, 0x23, 0x47, 0xa0, 0x82, 0x2f, 0xc1, 0xa4, 0xc7, 0x10, 0xdd, 0xd2, 0x1d, 0x4f, + 0xb7, 0xc2, 0x00, 0x99, 0x12, 0xdc, 0x37, 0x03, 0x5f, 0xb9, 0x51, 0xe7, 0x3e, 0xc2, 0xd6, 0x27, + 0xe9, 0xe0, 0xd7, 0x00, 0x30, 0xcf, 0x75, 0x09, 0xe5, 0x21, 0xf9, 0x74, 0x9f, 0xe4, 0x31, 0xae, + 0x90, 0x39, 0xca, 0xc2, 0x90, 0xf9, 0x4c, 0xbf, 0xcc, 0x75, 0x2e, 0xf8, 0x04, 0x8c, 0x58, 0xac, + 0x1c, 0xb2, 0x9e, 0xed, 0x93, 0x35, 0xe2, 0x81, 0x77, 0xc1, 0x24, 0x33, 0x76, 0x90, 0xad, 0x3f, + 0xaf, 0xca, 0xbd, 0x0c, 0xc3, 0xd0, 0xe8, 0xa8, 0x72, 0x49, 0x10, 0xfc, 0x41, 0x02, 0x57, 0x6c, + 0xdd, 0xd1, 0x2b, 0xc8, 0x5c, 0x33, 0xac, 0x7b, 0xfb, 0x1c, 0x39, 0x61, 0xbb, 0x86, 0x5e, 0x7b, + 0x88, 0xf1, 0x5a, 0x86, 0x9f, 0xeb, 0xd3, 0xe6, 0xce, 0x53, 0xa8, 0x32, 0xb8, 0x98, 0x2c, 0x3a, + 0x1a, 0x62, 0x2e, 0x71, 0x18, 0x52, 0xdf, 0x66, 0x44, 0x3d, 0x7a, 0xe6, 0x9a, 0x27, 0xb5, 0x1e, + 0xdd, 0x4c, 0xd6, 0x92, 0xa1, 0x56, 0x75, 0xa0, 0x73, 0x09, 0x19, 0xee, 0xb9, 0x84, 0x8c, 0x74, + 0x5b, 0x42, 0xf6, 0xdb, 0x6a, 0xfd, 0x68, 0x9f, 0x91, 0xd0, 0x4e, 0xc5, 0x8f, 0xa2, 0xbb, 0x63, + 0xc7, 0xa5, 0xbb, 0x47, 0x53, 0xc9, 0xf1, 0x01, 0xaa, 0x24, 0x18, 0xa4, 0x4a, 0x66, 0x06, 0xa6, + 0x92, 0x13, 0x03, 0x51, 0xc9, 0xc9, 0x63, 0x52, 0xc9, 0x3b, 0x20, 0x63, 0xb1, 0xb2, 0x86, 0x76, + 0xb1, 0xd0, 0xc8, 0xa9, 0xae, 0x4e, 0x82, 0x71, 0x48, 0xb3, 0xce, 0x4e, 0x0f, 0x4e, 0x67, 0xcf, + 0x0c, 0x5c, 0x67, 0xbb, 0x3b, 0x2a, 0x9d, 0xed, 0xf2, 0xa8, 0x14, 0xa9, 0x76, 0x4c, 0x9a, 0x0f, + 0x55, 0xfb, 0x37, 0x49, 0xa8, 0xf6, 0x5d, 0x64, 0xa1, 0x93, 0xa9, 0xda, 0x91, 0x6f, 0x31, 0x07, + 0x0e, 0x7d, 0xfb, 0x75, 0x1c, 0x5c, 0x48, 0x16, 0xab, 0xda, 0x36, 0x9f, 0xb0, 0xc2, 0x34, 0x0b, + 0xa6, 0x19, 0x29, 0xf3, 0x3d, 0x9d, 0xa2, 0x5a, 0x74, 0x0f, 0x89, 0xad, 0x6f, 0x6c, 0x86, 0x4f, + 0xc1, 0x85, 0x86, 0xa6, 0xaa, 0xbd, 0x51, 0x45, 0x6a, 0x98, 0x2d, 0x71, 0x31, 0x5a, 0xb9, 0xa1, + 0x6a, 0xe9, 0x60, 0xb8, 0x01, 0xa6, 0x0d, 0x33, 0x6a, 0x8a, 0xd5, 0xa9, 0xce, 0x19, 0xda, 0x08, + 0x83, 0x1b, 0xe0, 0x5c, 0x19, 0x53, 0x3b, 0x9c, 0x62, 0xd3, 0x29, 0x13, 0x6a, 0xeb, 0x42, 0xaf, + 0x47, 0x5b, 0xd5, 0xcb, 0xe5, 0xeb, 0x05, 0x55, 0x4b, 0x83, 0xc0, 0x02, 0x38, 0xdf, 0x60, 0xec, + 0xf3, 0x10, 0x29, 0x2a, 0xce, 0x98, 0x96, 0xda, 0x17, 0xea, 0x16, 0xe1, 0x7a, 0xfd, 0x2e, 0xd4, + 0x87, 0x6e, 0x55, 0x79, 0xe0, 0x3d, 0x90, 0x21, 0x5c, 0xbf, 0x8f, 0x2d, 0xb4, 0x8d, 0xdf, 0x20, + 0x51, 0x1b, 0x86, 0x8a, 0x57, 0x03, 0x5f, 0x51, 0x52, 0xae, 0x58, 0x82, 0xe8, 0xb1, 0x00, 0xaa, + 0x5a, 0x1c, 0x07, 0x1f, 0x0a, 0x9a, 0xf5, 0x1d, 0x64, 0x7c, 0xc7, 0x3c, 0x3b, 0xaa, 0x02, 0xd7, + 0x02, 0x5f, 0xf9, 0xa2, 0x3d, 0xcd, 0xe1, 0xc6, 0xc5, 0xe1, 0xf0, 0x1b, 0x30, 0x1d, 0x7b, 0x0c, + 0x2f, 0xca, 0x42, 0xfd, 0x87, 0x8b, 0x4b, 0x81, 0xaf, 0xe4, 0x3b, 0x30, 0x36, 0xef, 0x61, 0x03, + 0x17, 0x2c, 0x82, 0xcb, 0x36, 0x76, 0xd6, 0x5c, 0xd7, 0xc2, 0x86, 0x5e, 0xb2, 0xd0, 0x76, 0x43, + 0x68, 0x4e, 0x8a, 0xd0, 0x6c, 0x3b, 0x06, 0xbe, 0x01, 0x97, 0x6d, 0x7d, 0xbf, 0x35, 0xc7, 0x94, + 0x10, 0xef, 0x95, 0xc0, 0x57, 0x0a, 0x89, 0xf0, 0x32, 0x58, 0x19, 0x23, 0xcb, 0x5c, 0xdd, 0x6a, + 0x43, 0xae, 0x6a, 0x6d, 0xb9, 0x61, 0x09, 0x4c, 0x53, 0x64, 0x21, 0x9d, 0xa1, 0x47, 0x84, 0x23, + 0x76, 0x1c, 0x97, 0x93, 0x46, 0xc2, 0xe6, 0x6a, 0x74, 0xa6, 0x87, 0x6a, 0xa4, 0x2a, 0xe0, 0xf3, + 0x54, 0xfd, 0x3a, 0x54, 0xb8, 0xdf, 0x47, 0x84, 0xc2, 0xc5, 0x84, 0xfd, 0xa3, 0x57, 0xb8, 0x56, + 0x79, 0x3f, 0xdc, 0x55, 0xde, 0x8f, 0x1c, 0x53, 0xde, 0x77, 0xca, 0x81, 0xd1, 0x2e, 0x72, 0xe0, + 0x7b, 0xa9, 0x43, 0x12, 0x8c, 0x89, 0x98, 0xb9, 0x13, 0xf8, 0xca, 0xed, 0x34, 0x63, 0x07, 0x97, + 0x0e, 0xe3, 0xc7, 0x9d, 0x0e, 0x33, 0x29, 0x32, 0x99, 0x54, 0xc0, 0x2f, 0xd3, 0x14, 0x30, 0xe5, + 0x1a, 0xd4, 0x24, 0x76, 0x4d, 0x99, 0x36, 0xd1, 0x7b, 0xa6, 0x35, 0xe7, 0xd1, 0x61, 0xa6, 0xfd, + 0x2b, 0x89, 0x4c, 0x8b, 0x1d, 0x33, 0x3e, 0xf6, 0x4c, 0x8b, 0xd6, 0xa4, 0xd9, 0xe3, 0xda, 0x9a, + 0x14, 0xfe, 0x19, 0x05, 0xa7, 0xb7, 0x58, 0x05, 0xbe, 0x95, 0x40, 0x26, 0xfe, 0x1a, 0xfa, 0xce, + 0xc2, 0x51, 0xdf, 0xc0, 0x2f, 0x24, 0x65, 0x2e, 0xbb, 0xd1, 0x2f, 0x43, 0xcd, 0x46, 0x61, 0x5b, + 0xfc, 0x95, 0x44, 0x6f, 0xb6, 0xc5, 0x18, 0x7a, 0xb4, 0x2d, 0xe5, 0xec, 0x2d, 0x6c, 0x8b, 0x1f, + 0xbc, 0x7b, 0xb3, 0x2d, 0xc6, 0xd0, 0xa3, 0x6d, 0x29, 0x67, 0x67, 0xf8, 0xb3, 0x04, 0x60, 0xca, + 0xc1, 0xf9, 0x41, 0xbf, 0x1b, 0x13, 0x11, 0x65, 0x1f, 0x1f, 0x13, 0x51, 0xc2, 0xe0, 0x94, 0x3a, + 0xf8, 0xa0, 0xdf, 0xdd, 0xea, 0xcf, 0xe0, 0xd6, 0x8a, 0x22, 0x0c, 0x4e, 0x91, 0x93, 0x07, 0xfd, + 0x6e, 0x61, 0x7f, 0x06, 0xb7, 0x4e, 0xf7, 0xe2, 0xb7, 0x7f, 0xbc, 0xcf, 0x49, 0xef, 0xde, 0xe7, + 0xa4, 0xbf, 0xdf, 0xe7, 0xa4, 0x1f, 0x3f, 0xe4, 0x4e, 0xbd, 0xfb, 0x90, 0x3b, 0xf5, 0xd7, 0x87, + 0xdc, 0xa9, 0x17, 0xf7, 0x2b, 0x98, 0xef, 0x78, 0xa5, 0x05, 0x83, 0xd8, 0xf9, 0xea, 0xa4, 0xf3, + 0x69, 0x5f, 0xc3, 0xe6, 0xeb, 0xd3, 0xce, 0x47, 0xdf, 0xc3, 0xf6, 0x6b, 0x1f, 0xef, 0x0e, 0x5c, + 0xc4, 0x4a, 0x23, 0xe2, 0xcb, 0xd6, 0xd2, 0xff, 0x01, 0x00, 0x00, 0xff, 0xff, 0x01, 0x2e, 0x34, + 0x4f, 0xfd, 0x1b, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -1419,10 +1420,10 @@ func (m *MsgCreateModel) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if len(m.CommissionerRemoteUiFlowUrl) > 0 { - i -= len(m.CommissionerRemoteUiFlowUrl) - copy(dAtA[i:], m.CommissionerRemoteUiFlowUrl) - i = encodeVarintTx(dAtA, i, uint64(len(m.CommissionerRemoteUiFlowUrl))) + if len(m.ManagedAclExtensionRequestFlowUrl) > 0 { + i -= len(m.ManagedAclExtensionRequestFlowUrl) + copy(dAtA[i:], m.ManagedAclExtensionRequestFlowUrl) + i = encodeVarintTx(dAtA, i, uint64(len(m.ManagedAclExtensionRequestFlowUrl))) i-- dAtA[i] = 0x1 i-- @@ -1599,10 +1600,10 @@ func (m *MsgUpdateModel) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x88 } - if len(m.CommissionerRemoteUiFlowUrl) > 0 { - i -= len(m.CommissionerRemoteUiFlowUrl) - copy(dAtA[i:], m.CommissionerRemoteUiFlowUrl) - i = encodeVarintTx(dAtA, i, uint64(len(m.CommissionerRemoteUiFlowUrl))) + if len(m.ManagedAclExtensionRequestFlowUrl) > 0 { + i -= len(m.ManagedAclExtensionRequestFlowUrl) + copy(dAtA[i:], m.ManagedAclExtensionRequestFlowUrl) + i = encodeVarintTx(dAtA, i, uint64(len(m.ManagedAclExtensionRequestFlowUrl))) i-- dAtA[i] = 0x1 i-- @@ -2208,7 +2209,7 @@ func (m *MsgCreateModel) Size() (n int) { if m.SchemaVersion != 0 { n += 2 + sovTx(uint64(m.SchemaVersion)) } - l = len(m.CommissionerRemoteUiFlowUrl) + l = len(m.ManagedAclExtensionRequestFlowUrl) if l > 0 { n += 2 + l + sovTx(uint64(l)) } @@ -2286,7 +2287,7 @@ func (m *MsgUpdateModel) Size() (n int) { if m.SchemaVersion != 0 { n += 1 + sovTx(uint64(m.SchemaVersion)) } - l = len(m.CommissionerRemoteUiFlowUrl) + l = len(m.ManagedAclExtensionRequestFlowUrl) if l > 0 { n += 2 + l + sovTx(uint64(l)) } @@ -3016,7 +3017,7 @@ func (m *MsgCreateModel) Unmarshal(dAtA []byte) error { } case 19: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field CommissionerRemoteUiFlowUrl", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field ManagedAclExtensionRequestFlowUrl", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -3044,7 +3045,7 @@ func (m *MsgCreateModel) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.CommissionerRemoteUiFlowUrl = string(dAtA[iNdEx:postIndex]) + m.ManagedAclExtensionRequestFlowUrl = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex default: iNdEx = preIndex @@ -3576,7 +3577,7 @@ func (m *MsgUpdateModel) Unmarshal(dAtA []byte) error { } case 16: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field CommissionerRemoteUiFlowUrl", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field ManagedAclExtensionRequestFlowUrl", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -3604,7 +3605,7 @@ func (m *MsgUpdateModel) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.CommissionerRemoteUiFlowUrl = string(dAtA[iNdEx:postIndex]) + m.ManagedAclExtensionRequestFlowUrl = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 17: if wireType != 0 { diff --git a/x/pki/types/grant.pb.go b/x/pki/types/grant.pb.go index 404c26d10..d8832b8b7 100644 --- a/x/pki/types/grant.pb.go +++ b/x/pki/types/grant.pb.go @@ -24,9 +24,10 @@ var _ = math.Inf const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type Grant struct { - Address string `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` - Time int64 `protobuf:"varint,2,opt,name=time,proto3" json:"time,omitempty"` - Info string `protobuf:"bytes,3,opt,name=info,proto3" json:"info,omitempty"` + Address string `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` + Time int64 `protobuf:"varint,2,opt,name=time,proto3" json:"time,omitempty"` + Info string `protobuf:"bytes,3,opt,name=info,proto3" json:"info,omitempty"` + SchemaVersion uint32 `protobuf:"varint,4,opt,name=schemaVersion,proto3" json:"schemaVersion,omitempty"` } func (m *Grant) Reset() { *m = Grant{} } @@ -83,6 +84,13 @@ func (m *Grant) GetInfo() string { return "" } +func (m *Grant) GetSchemaVersion() uint32 { + if m != nil { + return m.SchemaVersion + } + return 0 +} + func init() { proto.RegisterType((*Grant)(nil), "zigbeealliance.distributedcomplianceledger.pki.Grant") } @@ -92,23 +100,25 @@ func init() { } var fileDescriptor_046cecf95bd45d05 = []byte{ - // 248 bytes of a gzipped FileDescriptorProto + // 275 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xb2, 0xaa, 0xca, 0x4c, 0x4f, 0x4a, 0x4d, 0x4d, 0xcc, 0xc9, 0xc9, 0x4c, 0xcc, 0x4b, 0x4e, 0xd5, 0x4f, 0xc9, 0x2c, 0x2e, 0x29, 0xca, 0x4c, 0x2a, 0x2d, 0x49, 0x4d, 0x49, 0xce, 0xcf, 0x2d, 0x80, 0x88, 0xe6, 0xa4, 0xa6, 0xa4, 0xa7, 0x16, 0xe9, 0x17, 0x64, 0x67, 0xea, 0xa7, 0x17, 0x25, 0xe6, 0x95, 0xe8, 0x15, 0x14, 0xe5, 0x97, 0xe4, 0x0b, 0xe9, 0xa1, 0xea, 0xd5, 0xc3, 0xa3, 0x57, 0xaf, 0x20, 0x3b, 0x53, 0x4a, 0x32, - 0x39, 0xbf, 0x38, 0x37, 0xbf, 0x38, 0x1e, 0xac, 0x5b, 0x1f, 0xc2, 0x81, 0x18, 0xa5, 0x94, 0xcc, - 0xc5, 0xea, 0x0e, 0x32, 0x59, 0xc8, 0x88, 0x8b, 0x3d, 0x31, 0x25, 0xa5, 0x28, 0xb5, 0xb8, 0x58, - 0x82, 0x51, 0x81, 0x51, 0x83, 0xd3, 0x49, 0xe2, 0xd2, 0x16, 0x5d, 0x11, 0xa8, 0x5a, 0x47, 0x88, - 0x4c, 0x70, 0x49, 0x51, 0x66, 0x5e, 0x7a, 0x10, 0x4c, 0xa1, 0x90, 0x10, 0x17, 0x4b, 0x49, 0x66, - 0x6e, 0xaa, 0x04, 0x93, 0x02, 0xa3, 0x06, 0x73, 0x10, 0x98, 0x0d, 0x12, 0xcb, 0xcc, 0x4b, 0xcb, - 0x97, 0x60, 0x06, 0x19, 0x12, 0x04, 0x66, 0x3b, 0xc5, 0x9d, 0x78, 0x24, 0xc7, 0x78, 0xe1, 0x91, - 0x1c, 0xe3, 0x83, 0x47, 0x72, 0x8c, 0x13, 0x1e, 0xcb, 0x31, 0x5c, 0x78, 0x2c, 0xc7, 0x70, 0xe3, - 0xb1, 0x1c, 0x43, 0x94, 0x4b, 0x7a, 0x66, 0x49, 0x46, 0x69, 0x92, 0x5e, 0x72, 0x7e, 0xae, 0x3e, - 0xc4, 0x53, 0xba, 0xd8, 0x42, 0x44, 0x17, 0xe1, 0x2d, 0x5d, 0x68, 0x98, 0x54, 0x80, 0x43, 0xa5, - 0xa4, 0xb2, 0x20, 0xb5, 0x38, 0x89, 0x0d, 0xec, 0x17, 0x63, 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, - 0x48, 0x59, 0x12, 0xcb, 0x54, 0x01, 0x00, 0x00, + 0x39, 0xbf, 0x38, 0x37, 0xbf, 0x38, 0x1e, 0xac, 0x5b, 0x1f, 0xc2, 0x81, 0x18, 0xa5, 0xd4, 0xc9, + 0xc8, 0xc5, 0xea, 0x0e, 0x32, 0x5a, 0xc8, 0x88, 0x8b, 0x3d, 0x31, 0x25, 0xa5, 0x28, 0xb5, 0xb8, + 0x58, 0x82, 0x51, 0x81, 0x51, 0x83, 0xd3, 0x49, 0xe2, 0xd2, 0x16, 0x5d, 0x11, 0xa8, 0x62, 0x47, + 0x88, 0x4c, 0x70, 0x49, 0x51, 0x66, 0x5e, 0x7a, 0x10, 0x4c, 0xa1, 0x90, 0x10, 0x17, 0x4b, 0x49, + 0x66, 0x6e, 0xaa, 0x04, 0x93, 0x02, 0xa3, 0x06, 0x73, 0x10, 0x98, 0x0d, 0x12, 0xcb, 0xcc, 0x4b, + 0xcb, 0x97, 0x60, 0x06, 0x19, 0x12, 0x04, 0x66, 0x0b, 0xa9, 0x70, 0xf1, 0x16, 0x27, 0x67, 0xa4, + 0xe6, 0x26, 0x86, 0xa5, 0x16, 0x15, 0x67, 0xe6, 0xe7, 0x49, 0xb0, 0x28, 0x30, 0x6a, 0xf0, 0x06, + 0xa1, 0x0a, 0x3a, 0xc5, 0x9d, 0x78, 0x24, 0xc7, 0x78, 0xe1, 0x91, 0x1c, 0xe3, 0x83, 0x47, 0x72, + 0x8c, 0x13, 0x1e, 0xcb, 0x31, 0x5c, 0x78, 0x2c, 0xc7, 0x70, 0xe3, 0xb1, 0x1c, 0x43, 0x94, 0x4b, + 0x7a, 0x66, 0x49, 0x46, 0x69, 0x92, 0x5e, 0x72, 0x7e, 0xae, 0x3e, 0xc4, 0xef, 0xba, 0xd8, 0x02, + 0x4e, 0x17, 0xe1, 0x7b, 0x5d, 0x68, 0xd0, 0x55, 0x80, 0x03, 0xaf, 0xa4, 0xb2, 0x20, 0xb5, 0x38, + 0x89, 0x0d, 0xec, 0x65, 0x63, 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, 0x27, 0x18, 0xa8, 0x11, 0x7b, + 0x01, 0x00, 0x00, } func (m *Grant) Marshal() (dAtA []byte, err error) { @@ -131,6 +141,11 @@ func (m *Grant) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if m.SchemaVersion != 0 { + i = encodeVarintGrant(dAtA, i, uint64(m.SchemaVersion)) + i-- + dAtA[i] = 0x20 + } if len(m.Info) > 0 { i -= len(m.Info) copy(dAtA[i:], m.Info) @@ -181,6 +196,9 @@ func (m *Grant) Size() (n int) { if l > 0 { n += 1 + l + sovGrant(uint64(l)) } + if m.SchemaVersion != 0 { + n += 1 + sovGrant(uint64(m.SchemaVersion)) + } return n } @@ -302,6 +320,25 @@ func (m *Grant) Unmarshal(dAtA []byte) error { } m.Info = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex + case 4: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field SchemaVersion", wireType) + } + m.SchemaVersion = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGrant + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.SchemaVersion |= uint32(b&0x7F) << shift + if b < 0x80 { + break + } + } default: iNdEx = preIndex skippy, err := skipGrant(dAtA[iNdEx:]) diff --git a/x/validator/types/grant.pb.go b/x/validator/types/grant.pb.go index f944d8677..39c76ca2b 100644 --- a/x/validator/types/grant.pb.go +++ b/x/validator/types/grant.pb.go @@ -24,9 +24,10 @@ var _ = math.Inf const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type Grant struct { - Address string `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` - Time int64 `protobuf:"varint,2,opt,name=time,proto3" json:"time,omitempty"` - Info string `protobuf:"bytes,3,opt,name=info,proto3" json:"info,omitempty"` + Address string `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` + Time int64 `protobuf:"varint,2,opt,name=time,proto3" json:"time,omitempty"` + Info string `protobuf:"bytes,3,opt,name=info,proto3" json:"info,omitempty"` + SchemaVersion uint32 `protobuf:"varint,4,opt,name=schemaVersion,proto3" json:"schemaVersion,omitempty"` } func (m *Grant) Reset() { *m = Grant{} } @@ -83,6 +84,13 @@ func (m *Grant) GetInfo() string { return "" } +func (m *Grant) GetSchemaVersion() uint32 { + if m != nil { + return m.SchemaVersion + } + return 0 +} + func init() { proto.RegisterType((*Grant)(nil), "zigbeealliance.distributedcomplianceledger.validator.Grant") } @@ -92,23 +100,25 @@ func init() { } var fileDescriptor_8991a374e1961121 = []byte{ - // 253 bytes of a gzipped FileDescriptorProto + // 280 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x72, 0xa8, 0xca, 0x4c, 0x4f, 0x4a, 0x4d, 0x4d, 0xcc, 0xc9, 0xc9, 0x4c, 0xcc, 0x4b, 0x4e, 0xd5, 0x4f, 0xc9, 0x2c, 0x2e, 0x29, 0xca, 0x4c, 0x2a, 0x2d, 0x49, 0x4d, 0x49, 0xce, 0xcf, 0x2d, 0x80, 0x88, 0xe6, 0xa4, 0xa6, 0xa4, 0xa7, 0x16, 0xe9, 0x97, 0x25, 0xe6, 0x64, 0xa6, 0x24, 0x96, 0xe4, 0x17, 0xe9, 0xa7, 0x17, 0x25, 0xe6, 0x95, 0xe8, 0x15, 0x14, 0xe5, 0x97, 0xe4, 0x0b, 0x99, 0xa0, 0x9a, 0xa0, 0x87, 0xc7, 0x04, 0x3d, 0xb8, 0x09, 0x52, 0x92, 0xc9, 0xf9, 0xc5, 0xb9, 0xf9, 0xc5, 0xf1, 0x60, 0x33, 0xf4, 0x21, - 0x1c, 0x88, 0x81, 0x4a, 0xc9, 0x5c, 0xac, 0xee, 0x20, 0xf3, 0x85, 0x8c, 0xb8, 0xd8, 0x13, 0x53, - 0x52, 0x8a, 0x52, 0x8b, 0x8b, 0x25, 0x18, 0x15, 0x18, 0x35, 0x38, 0x9d, 0x24, 0x2e, 0x6d, 0xd1, - 0x15, 0x81, 0xaa, 0x75, 0x84, 0xc8, 0x04, 0x97, 0x14, 0x65, 0xe6, 0xa5, 0x07, 0xc1, 0x14, 0x0a, - 0x09, 0x71, 0xb1, 0x94, 0x64, 0xe6, 0xa6, 0x4a, 0x30, 0x29, 0x30, 0x6a, 0x30, 0x07, 0x81, 0xd9, - 0x20, 0xb1, 0xcc, 0xbc, 0xb4, 0x7c, 0x09, 0x66, 0x90, 0x21, 0x41, 0x60, 0xb6, 0x53, 0xca, 0x89, - 0x47, 0x72, 0x8c, 0x17, 0x1e, 0xc9, 0x31, 0x3e, 0x78, 0x24, 0xc7, 0x38, 0xe1, 0xb1, 0x1c, 0xc3, - 0x85, 0xc7, 0x72, 0x0c, 0x37, 0x1e, 0xcb, 0x31, 0x44, 0x79, 0xa5, 0x67, 0x96, 0x64, 0x94, 0x26, - 0xe9, 0x25, 0xe7, 0xe7, 0xea, 0x43, 0xbc, 0xa6, 0x8b, 0x2d, 0x74, 0x74, 0x11, 0x9e, 0xd3, 0x85, - 0x86, 0x4f, 0x05, 0x52, 0x08, 0x95, 0x54, 0x16, 0xa4, 0x16, 0x27, 0xb1, 0x81, 0x7d, 0x64, 0x0c, - 0x08, 0x00, 0x00, 0xff, 0xff, 0x9f, 0xa9, 0xc7, 0x85, 0x66, 0x01, 0x00, 0x00, + 0x1c, 0x88, 0x81, 0x4a, 0x9d, 0x8c, 0x5c, 0xac, 0xee, 0x20, 0x0b, 0x84, 0x8c, 0xb8, 0xd8, 0x13, + 0x53, 0x52, 0x8a, 0x52, 0x8b, 0x8b, 0x25, 0x18, 0x15, 0x18, 0x35, 0x38, 0x9d, 0x24, 0x2e, 0x6d, + 0xd1, 0x15, 0x81, 0x2a, 0x76, 0x84, 0xc8, 0x04, 0x97, 0x14, 0x65, 0xe6, 0xa5, 0x07, 0xc1, 0x14, + 0x0a, 0x09, 0x71, 0xb1, 0x94, 0x64, 0xe6, 0xa6, 0x4a, 0x30, 0x29, 0x30, 0x6a, 0x30, 0x07, 0x81, + 0xd9, 0x20, 0xb1, 0xcc, 0xbc, 0xb4, 0x7c, 0x09, 0x66, 0x90, 0x21, 0x41, 0x60, 0xb6, 0x90, 0x0a, + 0x17, 0x6f, 0x71, 0x72, 0x46, 0x6a, 0x6e, 0x62, 0x58, 0x6a, 0x51, 0x71, 0x66, 0x7e, 0x9e, 0x04, + 0x8b, 0x02, 0xa3, 0x06, 0x6f, 0x10, 0xaa, 0xa0, 0x53, 0xca, 0x89, 0x47, 0x72, 0x8c, 0x17, 0x1e, + 0xc9, 0x31, 0x3e, 0x78, 0x24, 0xc7, 0x38, 0xe1, 0xb1, 0x1c, 0xc3, 0x85, 0xc7, 0x72, 0x0c, 0x37, + 0x1e, 0xcb, 0x31, 0x44, 0x79, 0xa5, 0x67, 0x96, 0x64, 0x94, 0x26, 0xe9, 0x25, 0xe7, 0xe7, 0xea, + 0x43, 0x42, 0x40, 0x17, 0x5b, 0x20, 0xea, 0x22, 0xc2, 0x40, 0x17, 0x1a, 0x8c, 0x15, 0x48, 0x01, + 0x59, 0x52, 0x59, 0x90, 0x5a, 0x9c, 0xc4, 0x06, 0xf6, 0xb8, 0x31, 0x20, 0x00, 0x00, 0xff, 0xff, + 0x72, 0x9c, 0x8c, 0x62, 0x8d, 0x01, 0x00, 0x00, } func (m *Grant) Marshal() (dAtA []byte, err error) { @@ -131,6 +141,11 @@ func (m *Grant) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if m.SchemaVersion != 0 { + i = encodeVarintGrant(dAtA, i, uint64(m.SchemaVersion)) + i-- + dAtA[i] = 0x20 + } if len(m.Info) > 0 { i -= len(m.Info) copy(dAtA[i:], m.Info) @@ -181,6 +196,9 @@ func (m *Grant) Size() (n int) { if l > 0 { n += 1 + l + sovGrant(uint64(l)) } + if m.SchemaVersion != 0 { + n += 1 + sovGrant(uint64(m.SchemaVersion)) + } return n } @@ -302,6 +320,25 @@ func (m *Grant) Unmarshal(dAtA []byte) error { } m.Info = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex + case 4: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field SchemaVersion", wireType) + } + m.SchemaVersion = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGrant + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.SchemaVersion |= uint32(b&0x7F) << shift + if b < 0x80 { + break + } + } default: iNdEx = preIndex skippy, err := skipGrant(dAtA[iNdEx:])