Skip to content

Commit 346fc35

Browse files
committed
Merge pull-request #189
2 parents 13dc566 + 360f774 commit 346fc35

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

docs/documentation/concepts/organizations.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ All organizations are controlled by a [Root Quorum](/concepts/users/root-quorum)
1414

1515
## Features
1616

17-
Organizations can opt-in or opt-out of the following features:
17+
Organization features are Turnkey product offerings that organizations can opt-in to or opt-out of. Note that these features can be set and updated using the activities `ACTIVITY_TYPE_SET_ORGANIZATION_FEATURE` and `ACTIVITY_TYPE_REMOVE_ORGANIZATION_FEATURE`. The following is a list of such features:
1818

1919
| Name | Description | Default | Notes |
2020
| ----------------------------- | --------------------------------------------- | -------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |

docs/documentation/concepts/policy-management/Policy-language.md

+5-1
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ The language is strongly typed which makes policies easy to author and maintain.
113113

114114
| Resource Type | Action | Activity Type |
115115
| ---------------- | ------ | :---------------------------------------- |
116-
| **ORGANIZATION** | CREATE | ACTIVITY_TYPE_CREATE_SUB_ORGANIZATION_V5 |
116+
| **ORGANIZATION** | CREATE | ACTIVITY_TYPE_CREATE_SUB_ORGANIZATION_V7 |
117117
| | UPDATE | ACTIVITY_TYPE_UPDATE_ROOT_QUORUM |
118118
| | UPDATE | ACTIVITY_TYPE_SET_ORGANIZATION_FEATURE |
119119
| | REMOVE | ACTIVITY_TYPE_REMOVE_ORGANIZATION_FEATURE |
@@ -164,6 +164,10 @@ The language is strongly typed which makes policies easy to author and maintain.
164164

165165
## Appendix
166166

167+
### Root quorum activities
168+
169+
There are a select few activities that are not governed by policies, but rather by an organization's [root quorum](../../concepts/user-management/Root-quorum.md). These activities are: `ACTIVITY_TYPE_UPDATE_ROOT_QUORUM`, `ACTIVITY_TYPE_SET_ORGANIZATION_FEATURE`, `ACTIVITY_TYPE_REMOVE_ORGANIZATION_FEATURE`. For example, if a policy is added that allows a specific non-root user to perform `ACTIVITY_TYPE_SET_ORGANIZATION_FEATURE` activities, these requests will still fail as they are subject specifically to root quorum.
170+
167171
### Ethereum
168172

169173
Our Ethereum policy language (accessible via `eth.tx`) allows for the granular governance of signing Ethereum (EVM-compatible) transactions. Our policy engine exposes a [fairly standard set of properties](https://ethereum.org/en/developers/docs/transactions/#typed-transaction-envelope) belonging to a transaction.

0 commit comments

Comments
 (0)