Skip to content

Commit 75c2f3d

Browse files
committed
Merge branch 'master' into #303-Upgrade-Cosmos-SDK
Signed-off-by: Abdulbois <abdulbois123@gmail.com> # Conflicts: # integration_tests/cli/compliance-demo.sh # integration_tests/cli/compliance-provisioning.sh # integration_tests/cli/compliance-revocation.sh # integration_tests/cli/model-demo.sh # integration_tests/cli/modelversion-demo.sh # integration_tests/cli/pki-demo.sh # integration_tests/cli/pki-revocation-points.sh # integration_tests/cli/vendorinfo-demo.sh # integration_tests/light_client_proxy/pki.sh # proto/zigbeealliance/distributedcomplianceledger/pki/approved_certificates.proto # proto/zigbeealliance/distributedcomplianceledger/pki/genesis.proto # proto/zigbeealliance/distributedcomplianceledger/pki/noc_certificates.proto # proto/zigbeealliance/distributedcomplianceledger/pki/noc_root_certificates.proto # proto/zigbeealliance/distributedcomplianceledger/pki/query.proto # proto/zigbeealliance/distributedcomplianceledger/pki/revoked_noc_root_certificates.proto # types/pki/errors.go # x/compliance/types/compliance_info.pb.go # x/compliance/types/device_software_compliance.pb.go # x/compliance/types/genesis.pb.go # x/compliance/types/tx.pb.go # x/model/types/model.pb.go # x/model/types/model_version.pb.go # x/model/types/tx.pb.go # x/pki/keeper/msg_server_add_x_509_cert.go # x/pki/keeper/msg_server_propose_add_x_509_root_cert.go # x/pki/keeper/msg_server_revoke_x_509_cert.go # x/pki/types/approved_certificates.pb.go # x/pki/types/certificate.pb.go # x/pki/types/genesis.pb.go # x/pki/types/pki_revocation_distribution_point.pb.go # x/pki/types/proposed_certificate.pb.go # x/pki/types/proposed_certificate_revocation.pb.go # x/pki/types/query.pb.go # x/pki/types/rejected_certificate.pb.go # x/pki/types/revoked_certificates.pb.go # x/pki/types/tx.pb.go # x/vendorinfo/types/tx.pb.go # x/vendorinfo/types/vendor_info.pb.go
2 parents 034ef55 + 9ad0b95 commit 75c2f3d

File tree

81 files changed

+3244
-2240
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+3244
-2240
lines changed

docs/static/openapi.yml

+29-13
Original file line numberDiff line numberDiff line change
@@ -9297,17 +9297,17 @@ paths:
92979297
type: string
92989298
tags:
92999299
- Query
9300-
/dcl/pki/noc-certificates:
9300+
/dcl/pki/noc-ica-certificates:
93019301
get:
9302-
summary: Queries a list of NocCertificates items.
9303-
operationId: NocCertificatesAll
9302+
summary: Queries a list of NocIcaCertificates items.
9303+
operationId: NocIcaCertificatesAll
93049304
responses:
93059305
'200':
93069306
description: A successful response.
93079307
schema:
93089308
type: object
93099309
properties:
9310-
nocCertificates:
9310+
nocIcaCertificates:
93119311
type: array
93129312
items:
93139313
type: object
@@ -9482,17 +9482,17 @@ paths:
94829482
type: boolean
94839483
tags:
94849484
- Query
9485-
/dcl/pki/noc-certificates/{vid}:
9485+
/dcl/pki/noc-ica-certificates/{vid}:
94869486
get:
9487-
summary: Queries a NocCertificates by index.
9488-
operationId: NocCertificates
9487+
summary: Queries a NocIcaCertificates by index.
9488+
operationId: NocIcaCertificates
94899489
responses:
94909490
'200':
94919491
description: A successful response.
94929492
schema:
94939493
type: object
94949494
properties:
9495-
nocCertificates:
9495+
nocIcaCertificates:
94969496
type: object
94979497
properties:
94989498
vid:
@@ -10705,6 +10705,8 @@ paths:
1070510705
schemaVersion:
1070610706
type: integer
1070710707
format: int64
10708+
crlSignerDelegator:
10709+
type: string
1070810710
pagination:
1070910711
type: object
1071010712
properties:
@@ -10863,6 +10865,8 @@ paths:
1086310865
schemaVersion:
1086410866
type: integer
1086510867
format: int64
10868+
crlSignerDelegator:
10869+
type: string
1086610870
default:
1086710871
description: An unexpected error response.
1086810872
schema:
@@ -10935,6 +10939,8 @@ paths:
1093510939
schemaVersion:
1093610940
type: integer
1093710941
format: int64
10942+
crlSignerDelegator:
10943+
type: string
1093810944
default:
1093910945
description: An unexpected error response.
1094010946
schema:
@@ -21678,7 +21684,7 @@ definitions:
2167821684
format: int64
2167921685
info:
2168021686
type: string
21681-
zigbeealliance.distributedcomplianceledger.pki.NocCertificates:
21687+
zigbeealliance.distributedcomplianceledger.pki.NocIcaCertificates:
2168221688
type: object
2168321689
properties:
2168421690
vid:
@@ -21841,6 +21847,8 @@ definitions:
2184121847
schemaVersion:
2184221848
type: integer
2184321849
format: int64
21850+
crlSignerDelegator:
21851+
type: string
2184421852
zigbeealliance.distributedcomplianceledger.pki.PkiRevocationDistributionPointsByIssuerSubjectKeyID:
2184521853
type: object
2184621854
properties:
@@ -21881,6 +21889,8 @@ definitions:
2188121889
schemaVersion:
2188221890
type: integer
2188321891
format: int64
21892+
crlSignerDelegator:
21893+
type: string
2188421894
zigbeealliance.distributedcomplianceledger.pki.ProposedCertificate:
2188521895
type: object
2188621896
properties:
@@ -22056,10 +22066,10 @@ definitions:
2205622066
repeated Bar results = 1;
2205722067
PageResponse page = 2;
2205822068
}
22059-
zigbeealliance.distributedcomplianceledger.pki.QueryAllNocCertificatesResponse:
22069+
zigbeealliance.distributedcomplianceledger.pki.QueryAllNocIcaCertificatesResponse:
2206022070
type: object
2206122071
properties:
22062-
nocCertificates:
22072+
nocIcaCertificates:
2206322073
type: array
2206422074
items:
2206522075
type: object
@@ -22284,6 +22294,8 @@ definitions:
2228422294
schemaVersion:
2228522295
type: integer
2228622296
format: int64
22297+
crlSignerDelegator:
22298+
type: string
2228722299
pagination:
2228822300
type: object
2228922301
properties:
@@ -22857,10 +22869,10 @@ definitions:
2285722869
type: string
2285822870
subjectKeyId:
2285922871
type: string
22860-
zigbeealliance.distributedcomplianceledger.pki.QueryGetNocCertificatesResponse:
22872+
zigbeealliance.distributedcomplianceledger.pki.QueryGetNocIcaCertificatesResponse:
2286122873
type: object
2286222874
properties:
22863-
nocCertificates:
22875+
nocIcaCertificates:
2286422876
type: object
2286522877
properties:
2286622878
vid:
@@ -23029,6 +23041,8 @@ definitions:
2302923041
schemaVersion:
2303023042
type: integer
2303123043
format: int64
23044+
crlSignerDelegator:
23045+
type: string
2303223046
zigbeealliance.distributedcomplianceledger.pki.QueryGetPkiRevocationDistributionPointsByIssuerSubjectKeyIDResponse:
2303323047
type: object
2303423048
properties:
@@ -23072,6 +23086,8 @@ definitions:
2307223086
schemaVersion:
2307323087
type: integer
2307423088
format: int64
23089+
crlSignerDelegator:
23090+
type: string
2307523091
zigbeealliance.distributedcomplianceledger.pki.QueryGetProposedCertificateResponse:
2307623092
type: object
2307723093
properties:

0 commit comments

Comments
 (0)