From 8329b865703034898b6e37a62f35dcb5ac3394f3 Mon Sep 17 00:00:00 2001 From: Liamsi Date: Wed, 20 Jun 2018 20:25:08 -0700 Subject: [PATCH] more changes from #1721 --- consensus/test_data/many_blocks.cswal | Bin 11137 -> 0 bytes docs/examples/node2/config/genesis.json | 16 ++++++------- docs/examples/node2/config/node_key.json | 2 +- .../examples/node2/config/priv_validator.json | 10 ++++---- docs/examples/node3/config/genesis.json | 16 ++++++------- docs/examples/node3/config/node_key.json | 2 +- .../examples/node3/config/priv_validator.json | 10 ++++---- docs/running-in-production.md | 2 +- docs/spec/blockchain/encoding.md | 2 +- docs/using-tendermint.md | 22 +++++++++--------- lite/helpers.go | 1 + 11 files changed, 42 insertions(+), 41 deletions(-) delete mode 100644 consensus/test_data/many_blocks.cswal diff --git a/consensus/test_data/many_blocks.cswal b/consensus/test_data/many_blocks.cswal deleted file mode 100644 index d443fff78eab4ee086c5c5b3783eba7df00522f6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 11137 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 diff --git a/docs/examples/node2/config/genesis.json b/docs/examples/node2/config/genesis.json index b9c12e31b..ac306bd2f 100644 --- a/docs/examples/node2/config/genesis.json +++ b/docs/examples/node2/config/genesis.json @@ -4,34 +4,34 @@ "validators": [ { "pub_key": { - "type": "AC26791624DE60", + "type": "tendermint/PubKeyEd25519", "value": "D+k4AdjnYPWbB9wmad137Bdpo/kAulOoTRQrLy/Qc4k=" }, - "power": 10, + "power": "10", "name": "" }, { "pub_key": { - "type": "AC26791624DE60", + "type": "tendermint/PubKeyEd25519", "value": "b56N5GCR1adcVRuENjfKw/mrm2dkhT7wNZXV/SDsKsU=" }, - "power": 10, + "power": "10", "name": "" }, { "pub_key": { - "type": "AC26791624DE60", + "type": "tendermint/PubKeyEd25519", "value": "IgZDpJvGA0TAamicA8ircy+RX/BkUlj6DXwM791ywIU=" }, - "power": 10, + "power": "10", "name": "" }, { "pub_key": { - "type": "AC26791624DE60", + "type": "tendermint/PubKeyEd25519", "value": "KGAZfxZvIZ7abbeIQ85U1ECG6+I62KSdaH8ulc0+OiU=" }, - "power": 10, + "power": "10", "name": "" } ], diff --git a/docs/examples/node2/config/node_key.json b/docs/examples/node2/config/node_key.json index 52a978bb0..6f15a541b 100644 --- a/docs/examples/node2/config/node_key.json +++ b/docs/examples/node2/config/node_key.json @@ -1 +1 @@ -{"priv_key":{"type":"954568A3288910","value":"COHZ/Y2cWGWxJNkRwtpQBt5sYvOnb6Gpz0lO46XERRJFBIdSWD5x1UMGRSTmnvW1ec5G4bMdg6zUZKOZD+vVPg=="}} \ No newline at end of file +{"priv_key":{"type":"tendermint/PrivKeyEd25519","value":"COHZ/Y2cWGWxJNkRwtpQBt5sYvOnb6Gpz0lO46XERRJFBIdSWD5x1UMGRSTmnvW1ec5G4bMdg6zUZKOZD+vVPg=="}} diff --git a/docs/examples/node2/config/priv_validator.json b/docs/examples/node2/config/priv_validator.json index 65fa30484..2bcd31a76 100644 --- a/docs/examples/node2/config/priv_validator.json +++ b/docs/examples/node2/config/priv_validator.json @@ -1,14 +1,14 @@ { "address": "F0AA266949FB29ADA0B679C27889ED930BD1BDA1", "pub_key": { - "type": "AC26791624DE60", + "type": "tendermint/PubKeyEd25519", "value": "IgZDpJvGA0TAamicA8ircy+RX/BkUlj6DXwM791ywIU=" }, - "last_height": 0, - "last_round": 0, + "last_height": "0", + "last_round": "0", "last_step": 0, "priv_key": { - "type": "954568A3288910", + "type": "tendermint/PrivKeyEd25519", "value": "khADeZ5K/8u/L99DFaZNRq8V5g+EHWbwfqFjhCrppaAiBkOkm8YDRMBqaJwDyKtzL5Ff8GRSWPoNfAzv3XLAhQ==" } -} \ No newline at end of file +} diff --git a/docs/examples/node3/config/genesis.json b/docs/examples/node3/config/genesis.json index b9c12e31b..ac306bd2f 100644 --- a/docs/examples/node3/config/genesis.json +++ b/docs/examples/node3/config/genesis.json @@ -4,34 +4,34 @@ "validators": [ { "pub_key": { - "type": "AC26791624DE60", + "type": "tendermint/PubKeyEd25519", "value": "D+k4AdjnYPWbB9wmad137Bdpo/kAulOoTRQrLy/Qc4k=" }, - "power": 10, + "power": "10", "name": "" }, { "pub_key": { - "type": "AC26791624DE60", + "type": "tendermint/PubKeyEd25519", "value": "b56N5GCR1adcVRuENjfKw/mrm2dkhT7wNZXV/SDsKsU=" }, - "power": 10, + "power": "10", "name": "" }, { "pub_key": { - "type": "AC26791624DE60", + "type": "tendermint/PubKeyEd25519", "value": "IgZDpJvGA0TAamicA8ircy+RX/BkUlj6DXwM791ywIU=" }, - "power": 10, + "power": "10", "name": "" }, { "pub_key": { - "type": "AC26791624DE60", + "type": "tendermint/PubKeyEd25519", "value": "KGAZfxZvIZ7abbeIQ85U1ECG6+I62KSdaH8ulc0+OiU=" }, - "power": 10, + "power": "10", "name": "" } ], diff --git a/docs/examples/node3/config/node_key.json b/docs/examples/node3/config/node_key.json index bde4e0ede..01a14a3bf 100644 --- a/docs/examples/node3/config/node_key.json +++ b/docs/examples/node3/config/node_key.json @@ -1 +1 @@ -{"priv_key":{"type":"954568A3288910","value":"9Y9xp/tUJJ6pHTF5SUV0bGKYSdVbFtMHu+Lr8S0JBSZAwneaejnfOEU1LMKOnQ07skrDUaJcj5di3jAyjxJzqg=="}} \ No newline at end of file +{"priv_key":{"type":"tendermint/PrivKeyEd25519","value":"9Y9xp/tUJJ6pHTF5SUV0bGKYSdVbFtMHu+Lr8S0JBSZAwneaejnfOEU1LMKOnQ07skrDUaJcj5di3jAyjxJzqg=="}} diff --git a/docs/examples/node3/config/priv_validator.json b/docs/examples/node3/config/priv_validator.json index 1d985a00b..bc8a66513 100644 --- a/docs/examples/node3/config/priv_validator.json +++ b/docs/examples/node3/config/priv_validator.json @@ -1,14 +1,14 @@ { "address": "9A1A6914EB5F4FF0269C7EEEE627C27310CC64F9", "pub_key": { - "type": "AC26791624DE60", + "type": "tendermint/PubKeyEd25519", "value": "KGAZfxZvIZ7abbeIQ85U1ECG6+I62KSdaH8ulc0+OiU=" }, - "last_height": 0, - "last_round": 0, + "last_height": "0", + "last_round": "0", "last_step": 0, "priv_key": { - "type": "954568A3288910", + "type": "tendermint/PrivKeyEd25519", "value": "jb52LZ5gp+eQ8nJlFK1z06nBMp1gD8ICmyzdM1icGOgoYBl/Fm8hntptt4hDzlTUQIbr4jrYpJ1ofy6VzT46JQ==" } -} \ No newline at end of file +} diff --git a/docs/running-in-production.md b/docs/running-in-production.md index 7e6068d4b..dc60c618d 100644 --- a/docs/running-in-production.md +++ b/docs/running-in-production.md @@ -21,7 +21,7 @@ to prevent Denial-of-service attacks. You can read more about it ### P2P 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 send & receive rate per connection (`SendRate`, `RecvRate`). diff --git a/docs/spec/blockchain/encoding.md b/docs/spec/blockchain/encoding.md index aa1842107..e59d3c8ce 100644 --- a/docs/spec/blockchain/encoding.md +++ b/docs/spec/blockchain/encoding.md @@ -249,7 +249,7 @@ For instance, an ED25519 PubKey would look like: ``` { - "type": "AC26791624DE60", + "type": "tendermint/PubKeyEd25519", "value": "uZ4h63OFWuQ36ZZ4Bd6NF+/w9fWUwrOncrQsackrsTk=" } ``` diff --git a/docs/using-tendermint.md b/docs/using-tendermint.md index 86ec2529a..e645b48bf 100644 --- a/docs/using-tendermint.md +++ b/docs/using-tendermint.md @@ -214,7 +214,7 @@ When `tendermint init` is run, both a `genesis.json` and { "pub_key" : { "value" : "h3hk+QE8c6QLTySp8TcfzclJw/BG79ziGB/pIA+DfPE=", - "type" : "AC26791624DE60" + "type" : "tendermint/PubKeyEd25519" }, "power" : 10, "name" : "" @@ -229,16 +229,16 @@ And the `priv_validator.json`: { "last_step" : 0, - "last_round" : 0, + "last_round" : "0", "address" : "B788DEDE4F50AD8BC9462DE76741CCAFF87D51E2", "pub_key" : { "value" : "h3hk+QE8c6QLTySp8TcfzclJw/BG79ziGB/pIA+DfPE=", - "type" : "AC26791624DE60" + "type" : "tendermint/PubKeyEd25519" }, - "last_height" : 0, + "last_height" : "0", "priv_key" : { "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", "pub_key" : { "value" : "l9X9+fjkeBzDfPGbUM7AMIRE6uJN78zN5+lk5OYotek=", - "type" : "AC26791624DE60" + "type" : "tendermint/PubKeyEd25519" }, "priv_key" : { "value" : "EDJY9W6zlAw+su6ITgTKg2nTZcHAH1NMTW5iwlgmNDuX1f35+OR4HMN88ZtQzsAwhETq4k3vzM3n6WTk5ii16Q==", - "type" : "954568A3288910" + "type" : "tendermint/PrivKeyEd25519" }, "last_step" : 0, - "last_round" : 0, - "last_height" : 0 + "last_round" : "0", + "last_height" : "0" } then the new `genesis.json` will be: @@ -366,7 +366,7 @@ then the new `genesis.json` will be: { "pub_key" : { "value" : "h3hk+QE8c6QLTySp8TcfzclJw/BG79ziGB/pIA+DfPE=", - "type" : "AC26791624DE60" + "type" : "tendermint/PubKeyEd25519" }, "power" : 10, "name" : "" @@ -374,7 +374,7 @@ then the new `genesis.json` will be: { "pub_key" : { "value" : "l9X9+fjkeBzDfPGbUM7AMIRE6uJN78zN5+lk5OYotek=", - "type" : "AC26791624DE60" + "type" : "tendermint/PubKeyEd25519" }, "power" : 10, "name" : "" diff --git a/lite/helpers.go b/lite/helpers.go index a7d33c763..695f6fb9b 100644 --- a/lite/helpers.go +++ b/lite/helpers.go @@ -103,6 +103,7 @@ func makeVote(header *types.Header, vals *types.ValidatorSet, key crypto.PrivKey } // Sign it signBytes := vote.SignBytes(header.ChainID) + // TODO Consider reworking makeVote API to return an error sig, err := key.Sign(signBytes) if err != nil { panic(err)