Skip to content
This repository has been archived by the owner on Sep 26, 2019. It is now read-only.

[PAN-2881] [PAN-2885] Updated onchain permissioning to include accounts and dapp #1652

Merged
merged 16 commits into from
Jul 27, 2019
Prev Previous commit
Next Next commit
Merge branch 'master' into accountPerm12
  • Loading branch information
MadelineMurray authored Jul 24, 2019
commit c73374b104760b4d9eab922c0ab0ea259e81a1dd
13 changes: 9 additions & 4 deletions docs/Permissions/Permissioning-Overview.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,7 @@ Use account permissioning:
![Account Permissioning](../images/account-permissioning.png)


[Local permissioning](Local-Permissioning.md) is specified at the node level. Each node in the network has a [permissions configuration file](Local-Permissioning.md#permissions-configuration-file).
Updates to local permissioning must be made to the configuration file for each node.
## Specifying Permissioning

Permissioning is [local](#local) or [onchain](#onchain).

Expand All @@ -50,5 +49,11 @@ protect your node. Your rules are not enforced in blocks produced by other nodes

### Onchain

[Onchain permissioning](Onchain-Permissioning/Onchain-Permissioning.md) is specified in a smart contract on the network. Specifying permissioning onchain
enables all nodes to read and update permissioning configuration from one location.
[Onchain permissioning](Onchain-Permissioning.md) is specified in a smart contract on the network. Specifying permissioning onchain
enables all nodes to read and update permissioning in one location.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"...enables all nodes to read and update permissioning configuration at a single location"

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed


Onchain permissioning requires co-ordination to update rules. The network may not be able to act immediately
(for example, the smart contract may enforce a minimum of votes before changing permissioning rules).

When onchain permissioning is updated, the update is applied across the network and new blocks abide by the updated rules.
For example, blocked accounts can no longer add transactions to the chain.
3 changes: 0 additions & 3 deletions docs/Reference/Pantheon-CLI-Syntax.md
Original file line number Diff line number Diff line change
Expand Up @@ -829,9 +829,6 @@ Default is the `permissions_config.toml` file in the [data directory](#data-path
`--permissions-accounts-config-file` and [`--permissions-nodes-config-file`](#permissions-nodes-config-file)
can use the same file.

!!!note
This option is not used when running Pantheon from the [Docker image](../Getting-Started/Run-Docker-Image.md#permissions-configuration-file).

### permissions-accounts-contract-address

```bash tab="Syntax"
Expand Down
2 changes: 1 addition & 1 deletion docs/Resources/Resources.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ description: Pantheon resources including blog posts, webinars, and meetup recor

## Webinars

[Permissioning in Blockchain: A Technical Look at Benefits and Best Practices](https://pegasys.wistia.com/medias/3px9eo2sf5)
[Permissioning in Blockchain: A Technical Look at Benefits and Best Practices](https://www.youtube.com/watch?v=CD0pHtNDqZs)

[Privacy in Pantheon: How PegaSys Redefined Blockchain for Enterprises](https://www.youtube.com/watch?v=8l7SSZLyFL8)

Expand Down
19 changes: 10 additions & 9 deletions mkdocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -100,15 +100,16 @@ nav:
- IBFT 2.0: Consensus-Protocols/IBFT.md
- Quorum IBFT 1.0: Consensus-Protocols/QuorumIBFT.md
- Privacy:
- Overview: Privacy/Privacy-Overview.md
- Processing Private Transactions: Privacy/Private-Transaction-Processing.md
- Configuring a Privacy-Enabled Network: Privacy/Configuring-Privacy.md
- Creating and Sending Private Transactions:
- Overview: Privacy/Private-Transactions/Creating-Sending-Private-Transactions.md
- web3.js-eea Client Library: Privacy/Private-Transactions/eeajs.md
- web3.js-eea Multinode Example: Privacy/Private-Transactions/eeajs-Multinode-example.md
- Quickstart for Private Transactions: Privacy/Privacy-Quickstart.md
- Permissioning:
- Tutorials:
- Configuring a Privacy-Enabled Network: Privacy/Tutorials/Configuring-Privacy.md
- Using web3.js-eea Multinode Example: Privacy/Tutorials/eeajs-Multinode-example.md
- How To:
- Create and Send Private Transactions: Privacy/How-To/Creating-Sending-Private-Transactions.md
- Use the web3.js-eea Client Library: Privacy/How-To/eeajs.md
- Explanation:
- Privacy Overview: Privacy/Explanation/Privacy-Overview.md
- Processing Private Transactions: Privacy/Explanation/Private-Transaction-Processing.md
- Permissions:
- Overview: Permissions/Permissioning-Overview.md
- Local Permissioning: Permissions/Local-Permissioning.md
- Onchain Permissioning:
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.