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

Commit

Permalink
Added IBFT 1.0 (#1081)
Browse files Browse the repository at this point in the history
  • Loading branch information
MadelineMurray authored Mar 13, 2019
1 parent 7b11510 commit 1d5ac74
Show file tree
Hide file tree
Showing 4 changed files with 42 additions and 3 deletions.
2 changes: 1 addition & 1 deletion docs/Consensus-Protocols/IBFT.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ Properties that have specific values in IBFT 2.0 genesis files are:
* `difficulty` - `0x1`
* `mixHash` - `0x63746963616c2062797a616e74696e65206661756c7420746f6c6572616e6365` for Istanbul block identification.

To start a node on an IBFT 2.0 private network, use the [`--genesis-file`](../Reference/Pantheon-CLI-Syntax.md#genesis-file`) option to specify the custom genesis file.
To start a node on an IBFT 2.0 private network, use the [`--genesis-file`](../Reference/Pantheon-CLI-Syntax.md#genesis-file) option to specify the custom genesis file.

!!!note
The [`--genesis-file`](../Reference/Pantheon-CLI-Syntax.md#genesis-file) option is not used when running
Expand Down
19 changes: 17 additions & 2 deletions docs/Consensus-Protocols/Overview-Consensus.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@ Pantheon implements a number of consensus protocols:

* [IBFT 2.0](IBFT.md) (Proof of Authority)

The genesis file specifies the consensus protocol for a chain `config`:
* [Quorum IBFT 1.0](QuorumIBFT.md) (Proof of Authority)

The genesis file specifies the consensus protocol for a chain in the `config` property:

```json tab="Ethash"
{
Expand Down Expand Up @@ -47,4 +49,17 @@ The genesis file specifies the consensus protocol for a chain `config`:
},
...
}
```
```

```json tab="IBFT 1.0"
{
"config": {
....
"ibft": {
...
}
},
...
}
```

23 changes: 23 additions & 0 deletions docs/Consensus-Protocols/QuorumIBFT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
description: Pantheon consensus protocols
<!--- END of page meta data -->

# IBFT 1.0

Pantheon nodes can participate (submit transactions and receive blocks) in a Quorum [IBFT 1.0](https://github.com/ethereum/EIPs/issues/650)
network but cannot be a validator.

To connect to a Quorum IBFT 1.0 network:

1. In the Quorum IBFT 1.0 genesis file, update the consensus protocol specified in the `config` property
from `istanbul` to `ibft`:

```json
"config": {
...
"ibft": {
...
}
```

1. Use the [`--genesis-file`](../Reference/Pantheon-CLI-Syntax.md#genesis-file) option to specify the
IBFT 1.0 genesis file.
1 change: 1 addition & 0 deletions mkdocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ nav:
- Comparing PoA Consensus Protocols: Consensus-Protocols/Comparing-PoA.md
- Clique: Consensus-Protocols/Clique.md
- IBFT 2.0: Consensus-Protocols/IBFT.md
- Quorum IBFT 1.0: Consensus-Protocols/QuorumIBFT.md
- JSON-RPC API:
- Overview: JSON-RPC-API/JSON-RPC-API.md
- Using the JSON-RPC API: JSON-RPC-API/Using-JSON-RPC-API.md
Expand Down

0 comments on commit 1d5ac74

Please sign in to comment.