Merge branch 'master' into patch-1

This commit is contained in:
Greg Colvin 2018-09-29 16:12:29 -06:00 committed by GitHub
commit a1ea76c83e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -64,7 +64,7 @@ function getKey(bytes32 _key) constant returns(uint256[] purposes, uint256 keyTy
#### keyHasPurpose
Returns the `TRUE` if a key has is present and has the given purpose. If the key is not present it returns `FALSE`.
Returns `TRUE` if a key is present and has the given purpose. If the key is not present it returns `FALSE`.
``` js
function keyHasPurpose(bytes32 _key, uint256 purpose) constant returns(bool exists);
@ -73,7 +73,7 @@ function keyHasPurpose(bytes32 _key, uint256 purpose) constant returns(bool exis
#### getKeysByPurpose
Returns an array of public key bytes32 hold by this identity.
Returns an array of public key bytes32 held by this identity.
``` js
function getKeysByPurpose(uint256 _purpose) constant returns(bytes32[] keys);
@ -85,11 +85,11 @@ function getKeysByPurpose(uint256 _purpose) constant returns(bytes32[] keys);
Adds a `_key` to the identity. The `_purpose` specifies the purpose of the key. Initially, we propose four purposes:
- `1`: MANAGEMENT keys, which can manage the identity
- `2`: ACTION keys, which perform actions in this identities name (signing, logins, transactions, etc.)
- `2`: ACTION keys, which perform actions in this identity's name (signing, logins, transactions, etc.)
- `3`: CLAIM signer keys, used to sign claims on other identities which need to be revocable.
- `4`: ENCRYPTION keys, used to encrypt data e.g. hold in claims.
MUST only be done by keys of purpose `1`, or the identity itself. If its the identity itself, the approval process will determine its approval.
MUST only be done by keys of purpose `1`, or the identity itself. If it's the identity itself, the approval process will determine its approval.
**Triggers Event:** [KeyAdded](#keyadded)
@ -102,7 +102,7 @@ function addKey(bytes32 _key, uint256 _purpose, uint256 _keyType) returns (bool
Removes `_key` from the identity.
MUST only be done by keys of purpose `1`, or the identity itself. If its the identity itself, the approval process will determine its approval.
MUST only be done by keys of purpose `1`, or the identity itself. If it's the identity itself, the approval process will determine its approval.
**Triggers Event:** [KeyRemoved](#keyremoved)
@ -168,7 +168,7 @@ Only Events:
#### removeClaim
MUST only be done by the `issuer` of the claim, or keys of purpose `1`, or the identity itself. If its the identity itself, the approval process will determine its approval.
MUST only be done by the `issuer` of the claim, or keys of purpose `1`, or the identity itself. If it's the identity itself, the approval process will determine its approval.
--------------------------------------------------------