Skip to content

Commit

Permalink
Merge branch 'master' into #303-Upgrade-Cosmos-SDK
Browse files Browse the repository at this point in the history
Signed-off-by: Abdulbois <[email protected]>

# 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
  • Loading branch information
Abdulbois committed Apr 22, 2024
2 parents f562122 + 50ef772 commit 3a7aa57
Show file tree
Hide file tree
Showing 59 changed files with 4,136 additions and 1,261 deletions.
257 changes: 257 additions & 0 deletions docs/static/openapi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9987,6 +9987,120 @@ paths:
format: int32
tags:
- Query
/dcl/pki/noc-root-certificates/{vid}/{subjectKeyId}:
get:
summary: Queries a NocRootCertificatesByVidAndSkid by index.
operationId: NocRootCertificatesByVidAndSkid
responses:
'200':
description: A successful response.
schema:
type: object
properties:
nocRootCertificatesByVidAndSkid:
type: object
properties:
vid:
type: integer
format: int32
subjectKeyId:
type: string
certs:
type: array
items:
type: object
properties:
pemCert:
type: string
serialNumber:
type: string
issuer:
type: string
authorityKeyId:
type: string
rootSubject:
type: string
rootSubjectKeyId:
type: string
isRoot:
type: boolean
owner:
type: string
subject:
type: string
subjectKeyId:
type: string
approvals:
type: array
items:
type: object
properties:
address:
type: string
time:
type: string
format: int64
info:
type: string
subjectAsText:
type: string
rejects:
type: array
items:
type: object
properties:
address:
type: string
time:
type: string
format: int64
info:
type: string
vid:
type: integer
format: int32
isNoc:
type: boolean
schemaVersion:
type: integer
format: int64
tq:
type: number
format: float
default:
description: An unexpected error response.
schema:
type: object
properties:
error:
type: string
code:
type: integer
format: int32
message:
type: string
details:
type: array
items:
type: object
properties:
type_url:
type: string
value:
type: string
format: byte
parameters:
- name: vid
in: path
required: true
type: integer
format: int32
- name: subjectKeyId
in: path
required: true
type: string
tags:
- Query
/dcl/pki/proposed-certificates:
get:
summary: Queries a list of ProposedCertificate items.
Expand Down Expand Up @@ -22102,6 +22216,76 @@ definitions:
schemaVersion:
type: integer
format: int64
zigbeealliance.distributedcomplianceledger.pki.NocRootCertificatesByVidAndSkid:
type: object
properties:
vid:
type: integer
format: int32
subjectKeyId:
type: string
certs:
type: array
items:
type: object
properties:
pemCert:
type: string
serialNumber:
type: string
issuer:
type: string
authorityKeyId:
type: string
rootSubject:
type: string
rootSubjectKeyId:
type: string
isRoot:
type: boolean
owner:
type: string
subject:
type: string
subjectKeyId:
type: string
approvals:
type: array
items:
type: object
properties:
address:
type: string
time:
type: string
format: int64
info:
type: string
subjectAsText:
type: string
rejects:
type: array
items:
type: object
properties:
address:
type: string
time:
type: string
format: int64
info:
type: string
vid:
type: integer
format: int32
isNoc:
type: boolean
schemaVersion:
type: integer
format: int64
tq:
type: number
format: float
zigbeealliance.distributedcomplianceledger.pki.PkiRevocationDistributionPoint:
type: object
properties:
Expand Down Expand Up @@ -23288,6 +23472,79 @@ definitions:
schemaVersion:
type: integer
format: int64
zigbeealliance.distributedcomplianceledger.pki.QueryGetNocRootCertificatesByVidAndSkidResponse:
type: object
properties:
nocRootCertificatesByVidAndSkid:
type: object
properties:
vid:
type: integer
format: int32
subjectKeyId:
type: string
certs:
type: array
items:
type: object
properties:
pemCert:
type: string
serialNumber:
type: string
issuer:
type: string
authorityKeyId:
type: string
rootSubject:
type: string
rootSubjectKeyId:
type: string
isRoot:
type: boolean
owner:
type: string
subject:
type: string
subjectKeyId:
type: string
approvals:
type: array
items:
type: object
properties:
address:
type: string
time:
type: string
format: int64
info:
type: string
subjectAsText:
type: string
rejects:
type: array
items:
type: object
properties:
address:
type: string
time:
type: string
format: int64
info:
type: string
vid:
type: integer
format: int32
isNoc:
type: boolean
schemaVersion:
type: integer
format: int64
tq:
type: number
format: float
zigbeealliance.distributedcomplianceledger.pki.QueryGetNocRootCertificatesResponse:
type: object
properties:
Expand Down
19 changes: 19 additions & 0 deletions docs/transactions.md
Original file line number Diff line number Diff line change
Expand Up @@ -1483,6 +1483,25 @@ Use [GET_ALL_REVOKED_NOC_ROOT](#get_revoked_noc_root) to get a list of all revok
- REST API:
- GET `/dcl/pki/noc-root-certificates/{vid}`

#### GET_NOC_ROOT_BY_VID_AND_SKID

**Status: Implemented**

Retrieve NOC root certificates associated with a specific VID and subject key ID.
This request also returns the Trust Quotient (TQ) value of the certificate

Revoked NOC root certificates are not returned.
Use [GET_ALL_REVOKED_NOC_ROOT](#get_revoked_noc_root) to get a list of all revoked NOC root certificates.

- Who can send: Any account
- Parameters:
- vid: `uint16` - Vendor ID (positive non-zero)
- 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`
- CLI Command:
- `dcld query pki noc-x509-root-certs --vid=<uint16> --subject-key-id=<hex string>`
- REST API:
- GET `/dcl/pki/noc-root-certificates/{vid}/{subject_key_id}`

#### GET_NOC_ICA_BY_VID

**Status: Implemented**
Expand Down
Loading

0 comments on commit 3a7aa57

Please sign in to comment.