Skip to content

Commit 3a7aa57

Browse files
AbdulboisAbdulbois
committed
Merge branch 'master' into #303-Upgrade-Cosmos-SDK
Signed-off-by: Abdulbois <abdulbois123@gmail.com> # Conflicts: # proto/zigbeealliance/distributedcomplianceledger/pki/genesis.proto # proto/zigbeealliance/distributedcomplianceledger/pki/noc_root_certificates_by_vid_and_skid.proto # proto/zigbeealliance/distributedcomplianceledger/pki/query.proto # x/pki/types/genesis.pb.go # x/pki/types/query.pb.go
2 parents f562122 + 50ef772 commit 3a7aa57

File tree

59 files changed

+4136
-1261
lines changed

Some content is hidden

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

59 files changed

+4136
-1261
lines changed

‎docs/static/openapi.yml

+257
Original file line numberDiff line numberDiff line change
@@ -9987,6 +9987,120 @@ paths:
99879987
format: int32
99889988
tags:
99899989
- Query
9990+
/dcl/pki/noc-root-certificates/{vid}/{subjectKeyId}:
9991+
get:
9992+
summary: Queries a NocRootCertificatesByVidAndSkid by index.
9993+
operationId: NocRootCertificatesByVidAndSkid
9994+
responses:
9995+
'200':
9996+
description: A successful response.
9997+
schema:
9998+
type: object
9999+
properties:
10000+
nocRootCertificatesByVidAndSkid:
10001+
type: object
10002+
properties:
10003+
vid:
10004+
type: integer
10005+
format: int32
10006+
subjectKeyId:
10007+
type: string
10008+
certs:
10009+
type: array
10010+
items:
10011+
type: object
10012+
properties:
10013+
pemCert:
10014+
type: string
10015+
serialNumber:
10016+
type: string
10017+
issuer:
10018+
type: string
10019+
authorityKeyId:
10020+
type: string
10021+
rootSubject:
10022+
type: string
10023+
rootSubjectKeyId:
10024+
type: string
10025+
isRoot:
10026+
type: boolean
10027+
owner:
10028+
type: string
10029+
subject:
10030+
type: string
10031+
subjectKeyId:
10032+
type: string
10033+
approvals:
10034+
type: array
10035+
items:
10036+
type: object
10037+
properties:
10038+
address:
10039+
type: string
10040+
time:
10041+
type: string
10042+
format: int64
10043+
info:
10044+
type: string
10045+
subjectAsText:
10046+
type: string
10047+
rejects:
10048+
type: array
10049+
items:
10050+
type: object
10051+
properties:
10052+
address:
10053+
type: string
10054+
time:
10055+
type: string
10056+
format: int64
10057+
info:
10058+
type: string
10059+
vid:
10060+
type: integer
10061+
format: int32
10062+
isNoc:
10063+
type: boolean
10064+
schemaVersion:
10065+
type: integer
10066+
format: int64
10067+
tq:
10068+
type: number
10069+
format: float
10070+
default:
10071+
description: An unexpected error response.
10072+
schema:
10073+
type: object
10074+
properties:
10075+
error:
10076+
type: string
10077+
code:
10078+
type: integer
10079+
format: int32
10080+
message:
10081+
type: string
10082+
details:
10083+
type: array
10084+
items:
10085+
type: object
10086+
properties:
10087+
type_url:
10088+
type: string
10089+
value:
10090+
type: string
10091+
format: byte
10092+
parameters:
10093+
- name: vid
10094+
in: path
10095+
required: true
10096+
type: integer
10097+
format: int32
10098+
- name: subjectKeyId
10099+
in: path
10100+
required: true
10101+
type: string
10102+
tags:
10103+
- Query
999010104
/dcl/pki/proposed-certificates:
999110105
get:
999210106
summary: Queries a list of ProposedCertificate items.
@@ -22102,6 +22216,76 @@ definitions:
2210222216
schemaVersion:
2210322217
type: integer
2210422218
format: int64
22219+
zigbeealliance.distributedcomplianceledger.pki.NocRootCertificatesByVidAndSkid:
22220+
type: object
22221+
properties:
22222+
vid:
22223+
type: integer
22224+
format: int32
22225+
subjectKeyId:
22226+
type: string
22227+
certs:
22228+
type: array
22229+
items:
22230+
type: object
22231+
properties:
22232+
pemCert:
22233+
type: string
22234+
serialNumber:
22235+
type: string
22236+
issuer:
22237+
type: string
22238+
authorityKeyId:
22239+
type: string
22240+
rootSubject:
22241+
type: string
22242+
rootSubjectKeyId:
22243+
type: string
22244+
isRoot:
22245+
type: boolean
22246+
owner:
22247+
type: string
22248+
subject:
22249+
type: string
22250+
subjectKeyId:
22251+
type: string
22252+
approvals:
22253+
type: array
22254+
items:
22255+
type: object
22256+
properties:
22257+
address:
22258+
type: string
22259+
time:
22260+
type: string
22261+
format: int64
22262+
info:
22263+
type: string
22264+
subjectAsText:
22265+
type: string
22266+
rejects:
22267+
type: array
22268+
items:
22269+
type: object
22270+
properties:
22271+
address:
22272+
type: string
22273+
time:
22274+
type: string
22275+
format: int64
22276+
info:
22277+
type: string
22278+
vid:
22279+
type: integer
22280+
format: int32
22281+
isNoc:
22282+
type: boolean
22283+
schemaVersion:
22284+
type: integer
22285+
format: int64
22286+
tq:
22287+
type: number
22288+
format: float
2210522289
zigbeealliance.distributedcomplianceledger.pki.PkiRevocationDistributionPoint:
2210622290
type: object
2210722291
properties:
@@ -23288,6 +23472,79 @@ definitions:
2328823472
schemaVersion:
2328923473
type: integer
2329023474
format: int64
23475+
zigbeealliance.distributedcomplianceledger.pki.QueryGetNocRootCertificatesByVidAndSkidResponse:
23476+
type: object
23477+
properties:
23478+
nocRootCertificatesByVidAndSkid:
23479+
type: object
23480+
properties:
23481+
vid:
23482+
type: integer
23483+
format: int32
23484+
subjectKeyId:
23485+
type: string
23486+
certs:
23487+
type: array
23488+
items:
23489+
type: object
23490+
properties:
23491+
pemCert:
23492+
type: string
23493+
serialNumber:
23494+
type: string
23495+
issuer:
23496+
type: string
23497+
authorityKeyId:
23498+
type: string
23499+
rootSubject:
23500+
type: string
23501+
rootSubjectKeyId:
23502+
type: string
23503+
isRoot:
23504+
type: boolean
23505+
owner:
23506+
type: string
23507+
subject:
23508+
type: string
23509+
subjectKeyId:
23510+
type: string
23511+
approvals:
23512+
type: array
23513+
items:
23514+
type: object
23515+
properties:
23516+
address:
23517+
type: string
23518+
time:
23519+
type: string
23520+
format: int64
23521+
info:
23522+
type: string
23523+
subjectAsText:
23524+
type: string
23525+
rejects:
23526+
type: array
23527+
items:
23528+
type: object
23529+
properties:
23530+
address:
23531+
type: string
23532+
time:
23533+
type: string
23534+
format: int64
23535+
info:
23536+
type: string
23537+
vid:
23538+
type: integer
23539+
format: int32
23540+
isNoc:
23541+
type: boolean
23542+
schemaVersion:
23543+
type: integer
23544+
format: int64
23545+
tq:
23546+
type: number
23547+
format: float
2329123548
zigbeealliance.distributedcomplianceledger.pki.QueryGetNocRootCertificatesResponse:
2329223549
type: object
2329323550
properties:

‎docs/transactions.md

+19
Original file line numberDiff line numberDiff line change
@@ -1483,6 +1483,25 @@ Use [GET_ALL_REVOKED_NOC_ROOT](#get_revoked_noc_root) to get a list of all revok
14831483
- REST API:
14841484
- GET `/dcl/pki/noc-root-certificates/{vid}`
14851485

1486+
#### GET_NOC_ROOT_BY_VID_AND_SKID
1487+
1488+
**Status: Implemented**
1489+
1490+
Retrieve NOC root certificates associated with a specific VID and subject key ID.
1491+
This request also returns the Trust Quotient (TQ) value of the certificate
1492+
1493+
Revoked NOC root certificates are not returned.
1494+
Use [GET_ALL_REVOKED_NOC_ROOT](#get_revoked_noc_root) to get a list of all revoked NOC root certificates.
1495+
1496+
- Who can send: Any account
1497+
- Parameters:
1498+
- vid: `uint16` - Vendor ID (positive non-zero)
1499+
- subject_key_id: `string` - Certificate's `Subject Key Id` in hex string format, e.g., `5A:88:0E:6C:36:53:D0:7F:B0:89:71:A3:F4:73:79:09:30:E6:2B:DB`
1500+
- CLI Command:
1501+
- `dcld query pki noc-x509-root-certs --vid=<uint16> --subject-key-id=<hex string>`
1502+
- REST API:
1503+
- GET `/dcl/pki/noc-root-certificates/{vid}/{subject_key_id}`
1504+
14861505
#### GET_NOC_ICA_BY_VID
14871506

14881507
**Status: Implemented**

0 commit comments

Comments
 (0)