more changes from #1721

This commit is contained in:
Liamsi
2018-06-20 20:25:08 -07:00
parent 4fb40e5437
commit 8329b86570
11 changed files with 42 additions and 41 deletions

View File

@ -4,34 +4,34 @@
"validators": [ "validators": [
{ {
"pub_key": { "pub_key": {
"type": "AC26791624DE60", "type": "tendermint/PubKeyEd25519",
"value": "D+k4AdjnYPWbB9wmad137Bdpo/kAulOoTRQrLy/Qc4k=" "value": "D+k4AdjnYPWbB9wmad137Bdpo/kAulOoTRQrLy/Qc4k="
}, },
"power": 10, "power": "10",
"name": "" "name": ""
}, },
{ {
"pub_key": { "pub_key": {
"type": "AC26791624DE60", "type": "tendermint/PubKeyEd25519",
"value": "b56N5GCR1adcVRuENjfKw/mrm2dkhT7wNZXV/SDsKsU=" "value": "b56N5GCR1adcVRuENjfKw/mrm2dkhT7wNZXV/SDsKsU="
}, },
"power": 10, "power": "10",
"name": "" "name": ""
}, },
{ {
"pub_key": { "pub_key": {
"type": "AC26791624DE60", "type": "tendermint/PubKeyEd25519",
"value": "IgZDpJvGA0TAamicA8ircy+RX/BkUlj6DXwM791ywIU=" "value": "IgZDpJvGA0TAamicA8ircy+RX/BkUlj6DXwM791ywIU="
}, },
"power": 10, "power": "10",
"name": "" "name": ""
}, },
{ {
"pub_key": { "pub_key": {
"type": "AC26791624DE60", "type": "tendermint/PubKeyEd25519",
"value": "KGAZfxZvIZ7abbeIQ85U1ECG6+I62KSdaH8ulc0+OiU=" "value": "KGAZfxZvIZ7abbeIQ85U1ECG6+I62KSdaH8ulc0+OiU="
}, },
"power": 10, "power": "10",
"name": "" "name": ""
} }
], ],

View File

@ -1 +1 @@
{"priv_key":{"type":"954568A3288910","value":"COHZ/Y2cWGWxJNkRwtpQBt5sYvOnb6Gpz0lO46XERRJFBIdSWD5x1UMGRSTmnvW1ec5G4bMdg6zUZKOZD+vVPg=="}} {"priv_key":{"type":"tendermint/PrivKeyEd25519","value":"COHZ/Y2cWGWxJNkRwtpQBt5sYvOnb6Gpz0lO46XERRJFBIdSWD5x1UMGRSTmnvW1ec5G4bMdg6zUZKOZD+vVPg=="}}

View File

@ -1,14 +1,14 @@
{ {
"address": "F0AA266949FB29ADA0B679C27889ED930BD1BDA1", "address": "F0AA266949FB29ADA0B679C27889ED930BD1BDA1",
"pub_key": { "pub_key": {
"type": "AC26791624DE60", "type": "tendermint/PubKeyEd25519",
"value": "IgZDpJvGA0TAamicA8ircy+RX/BkUlj6DXwM791ywIU=" "value": "IgZDpJvGA0TAamicA8ircy+RX/BkUlj6DXwM791ywIU="
}, },
"last_height": 0, "last_height": "0",
"last_round": 0, "last_round": "0",
"last_step": 0, "last_step": 0,
"priv_key": { "priv_key": {
"type": "954568A3288910", "type": "tendermint/PrivKeyEd25519",
"value": "khADeZ5K/8u/L99DFaZNRq8V5g+EHWbwfqFjhCrppaAiBkOkm8YDRMBqaJwDyKtzL5Ff8GRSWPoNfAzv3XLAhQ==" "value": "khADeZ5K/8u/L99DFaZNRq8V5g+EHWbwfqFjhCrppaAiBkOkm8YDRMBqaJwDyKtzL5Ff8GRSWPoNfAzv3XLAhQ=="
} }
} }

View File

@ -4,34 +4,34 @@
"validators": [ "validators": [
{ {
"pub_key": { "pub_key": {
"type": "AC26791624DE60", "type": "tendermint/PubKeyEd25519",
"value": "D+k4AdjnYPWbB9wmad137Bdpo/kAulOoTRQrLy/Qc4k=" "value": "D+k4AdjnYPWbB9wmad137Bdpo/kAulOoTRQrLy/Qc4k="
}, },
"power": 10, "power": "10",
"name": "" "name": ""
}, },
{ {
"pub_key": { "pub_key": {
"type": "AC26791624DE60", "type": "tendermint/PubKeyEd25519",
"value": "b56N5GCR1adcVRuENjfKw/mrm2dkhT7wNZXV/SDsKsU=" "value": "b56N5GCR1adcVRuENjfKw/mrm2dkhT7wNZXV/SDsKsU="
}, },
"power": 10, "power": "10",
"name": "" "name": ""
}, },
{ {
"pub_key": { "pub_key": {
"type": "AC26791624DE60", "type": "tendermint/PubKeyEd25519",
"value": "IgZDpJvGA0TAamicA8ircy+RX/BkUlj6DXwM791ywIU=" "value": "IgZDpJvGA0TAamicA8ircy+RX/BkUlj6DXwM791ywIU="
}, },
"power": 10, "power": "10",
"name": "" "name": ""
}, },
{ {
"pub_key": { "pub_key": {
"type": "AC26791624DE60", "type": "tendermint/PubKeyEd25519",
"value": "KGAZfxZvIZ7abbeIQ85U1ECG6+I62KSdaH8ulc0+OiU=" "value": "KGAZfxZvIZ7abbeIQ85U1ECG6+I62KSdaH8ulc0+OiU="
}, },
"power": 10, "power": "10",
"name": "" "name": ""
} }
], ],

View File

@ -1 +1 @@
{"priv_key":{"type":"954568A3288910","value":"9Y9xp/tUJJ6pHTF5SUV0bGKYSdVbFtMHu+Lr8S0JBSZAwneaejnfOEU1LMKOnQ07skrDUaJcj5di3jAyjxJzqg=="}} {"priv_key":{"type":"tendermint/PrivKeyEd25519","value":"9Y9xp/tUJJ6pHTF5SUV0bGKYSdVbFtMHu+Lr8S0JBSZAwneaejnfOEU1LMKOnQ07skrDUaJcj5di3jAyjxJzqg=="}}

View File

@ -1,14 +1,14 @@
{ {
"address": "9A1A6914EB5F4FF0269C7EEEE627C27310CC64F9", "address": "9A1A6914EB5F4FF0269C7EEEE627C27310CC64F9",
"pub_key": { "pub_key": {
"type": "AC26791624DE60", "type": "tendermint/PubKeyEd25519",
"value": "KGAZfxZvIZ7abbeIQ85U1ECG6+I62KSdaH8ulc0+OiU=" "value": "KGAZfxZvIZ7abbeIQ85U1ECG6+I62KSdaH8ulc0+OiU="
}, },
"last_height": 0, "last_height": "0",
"last_round": 0, "last_round": "0",
"last_step": 0, "last_step": 0,
"priv_key": { "priv_key": {
"type": "954568A3288910", "type": "tendermint/PrivKeyEd25519",
"value": "jb52LZ5gp+eQ8nJlFK1z06nBMp1gD8ICmyzdM1icGOgoYBl/Fm8hntptt4hDzlTUQIbr4jrYpJ1ofy6VzT46JQ==" "value": "jb52LZ5gp+eQ8nJlFK1z06nBMp1gD8ICmyzdM1icGOgoYBl/Fm8hntptt4hDzlTUQIbr4jrYpJ1ofy6VzT46JQ=="
} }
} }

View File

@ -21,7 +21,7 @@ to prevent Denial-of-service attacks. You can read more about it
### P2P ### P2P
The core of the Tendermint peer-to-peer system is `MConnection`. Each The core of the Tendermint peer-to-peer system is `MConnection`. Each
connection has `MaxPacketMsgPayloadSize`, which is the maximum packet connection has `MaxPacketMsgSize`, which is the maximum packet
size and bounded send & receive queues. One can impose restrictions on size and bounded send & receive queues. One can impose restrictions on
send & receive rate per connection (`SendRate`, `RecvRate`). send & receive rate per connection (`SendRate`, `RecvRate`).

View File

@ -249,7 +249,7 @@ For instance, an ED25519 PubKey would look like:
``` ```
{ {
"type": "AC26791624DE60", "type": "tendermint/PubKeyEd25519",
"value": "uZ4h63OFWuQ36ZZ4Bd6NF+/w9fWUwrOncrQsackrsTk=" "value": "uZ4h63OFWuQ36ZZ4Bd6NF+/w9fWUwrOncrQsackrsTk="
} }
``` ```

View File

@ -214,7 +214,7 @@ When `tendermint init` is run, both a `genesis.json` and
{ {
"pub_key" : { "pub_key" : {
"value" : "h3hk+QE8c6QLTySp8TcfzclJw/BG79ziGB/pIA+DfPE=", "value" : "h3hk+QE8c6QLTySp8TcfzclJw/BG79ziGB/pIA+DfPE=",
"type" : "AC26791624DE60" "type" : "tendermint/PubKeyEd25519"
}, },
"power" : 10, "power" : 10,
"name" : "" "name" : ""
@ -229,16 +229,16 @@ And the `priv_validator.json`:
{ {
"last_step" : 0, "last_step" : 0,
"last_round" : 0, "last_round" : "0",
"address" : "B788DEDE4F50AD8BC9462DE76741CCAFF87D51E2", "address" : "B788DEDE4F50AD8BC9462DE76741CCAFF87D51E2",
"pub_key" : { "pub_key" : {
"value" : "h3hk+QE8c6QLTySp8TcfzclJw/BG79ziGB/pIA+DfPE=", "value" : "h3hk+QE8c6QLTySp8TcfzclJw/BG79ziGB/pIA+DfPE=",
"type" : "AC26791624DE60" "type" : "tendermint/PubKeyEd25519"
}, },
"last_height" : 0, "last_height" : "0",
"priv_key" : { "priv_key" : {
"value" : "JPivl82x+LfVkp8i3ztoTjY6c6GJ4pBxQexErOCyhwqHeGT5ATxzpAtPJKnxNx/NyUnD8Ebv3OIYH+kgD4N88Q==", "value" : "JPivl82x+LfVkp8i3ztoTjY6c6GJ4pBxQexErOCyhwqHeGT5ATxzpAtPJKnxNx/NyUnD8Ebv3OIYH+kgD4N88Q==",
"type" : "954568A3288910" "type" : "tendermint/PrivKeyEd25519"
} }
} }
@ -348,15 +348,15 @@ Now we can update our genesis file. For instance, if the new
"address" : "5AF49D2A2D4F5AD4C7C8C4CC2FB020131E9C4902", "address" : "5AF49D2A2D4F5AD4C7C8C4CC2FB020131E9C4902",
"pub_key" : { "pub_key" : {
"value" : "l9X9+fjkeBzDfPGbUM7AMIRE6uJN78zN5+lk5OYotek=", "value" : "l9X9+fjkeBzDfPGbUM7AMIRE6uJN78zN5+lk5OYotek=",
"type" : "AC26791624DE60" "type" : "tendermint/PubKeyEd25519"
}, },
"priv_key" : { "priv_key" : {
"value" : "EDJY9W6zlAw+su6ITgTKg2nTZcHAH1NMTW5iwlgmNDuX1f35+OR4HMN88ZtQzsAwhETq4k3vzM3n6WTk5ii16Q==", "value" : "EDJY9W6zlAw+su6ITgTKg2nTZcHAH1NMTW5iwlgmNDuX1f35+OR4HMN88ZtQzsAwhETq4k3vzM3n6WTk5ii16Q==",
"type" : "954568A3288910" "type" : "tendermint/PrivKeyEd25519"
}, },
"last_step" : 0, "last_step" : 0,
"last_round" : 0, "last_round" : "0",
"last_height" : 0 "last_height" : "0"
} }
then the new `genesis.json` will be: then the new `genesis.json` will be:
@ -366,7 +366,7 @@ then the new `genesis.json` will be:
{ {
"pub_key" : { "pub_key" : {
"value" : "h3hk+QE8c6QLTySp8TcfzclJw/BG79ziGB/pIA+DfPE=", "value" : "h3hk+QE8c6QLTySp8TcfzclJw/BG79ziGB/pIA+DfPE=",
"type" : "AC26791624DE60" "type" : "tendermint/PubKeyEd25519"
}, },
"power" : 10, "power" : 10,
"name" : "" "name" : ""
@ -374,7 +374,7 @@ then the new `genesis.json` will be:
{ {
"pub_key" : { "pub_key" : {
"value" : "l9X9+fjkeBzDfPGbUM7AMIRE6uJN78zN5+lk5OYotek=", "value" : "l9X9+fjkeBzDfPGbUM7AMIRE6uJN78zN5+lk5OYotek=",
"type" : "AC26791624DE60" "type" : "tendermint/PubKeyEd25519"
}, },
"power" : 10, "power" : 10,
"name" : "" "name" : ""

View File

@ -103,6 +103,7 @@ func makeVote(header *types.Header, vals *types.ValidatorSet, key crypto.PrivKey
} }
// Sign it // Sign it
signBytes := vote.SignBytes(header.ChainID) signBytes := vote.SignBytes(header.ChainID)
// TODO Consider reworking makeVote API to return an error
sig, err := key.Sign(signBytes) sig, err := key.Sign(signBytes)
if err != nil { if err != nil {
panic(err) panic(err)