Ethan Buchman
7 years ago
95 changed files with 2316 additions and 769 deletions
Split View
Diff Options
-
+0 -21.circleci/config.yml
-
+4 -0.gitignore
-
+54 -8CHANGELOG.md
-
+4 -4DOCKER/Dockerfile
-
+1 -1DOCKER/Dockerfile.develop
-
+2 -1DOCKER/README.md
-
+42 -4Gopkg.lock
-
+28 -9Gopkg.toml
-
+4 -9Makefile
-
+3 -3blockchain/reactor.go
-
+2 -2cmd/tendermint/commands/lite.go
-
+6 -6cmd/tendermint/commands/run_node.go
-
+5 -0codecov.yml
-
+84 -81config/config.go
-
+4 -0config/toml.go
-
+2 -2consensus/common_test.go
-
+6 -6consensus/mempool_test.go
-
+49 -18consensus/reactor.go
-
+110 -1consensus/reactor_test.go
-
+6 -6consensus/replay.go
-
+9 -10consensus/replay_file.go
-
+3 -3consensus/replay_test.go
-
+108 -109consensus/state.go
-
+1 -1consensus/wal_generator.go
-
+2 -3docs/conf.py
-
+1 -1docs/examples/getting-started.md
-
+4 -4docs/examples/install_tendermint.sh
-
+2 -1docs/index.rst
-
+3 -3docs/specification/byzantine-consensus-algorithm.rst
-
+4 -0docs/specification/configuration.rst
-
+16 -2docs/specification/new-spec/bft-time.md
-
+114 -0docs/specification/new-spec/light-client.md
-
+8 -1docs/specification/new-spec/reactors/pex/pex.md
-
+1 -0docs/specification/rpc.rst
-
+9 -0lite/proxy/block.go
-
+218 -0lite/proxy/validate_test.go
-
+21 -19node/node.go
-
+4 -4p2p/base_reactor.go
-
+1 -2p2p/conn/connection.go
-
+3 -5p2p/conn/secret_connection.go
-
+2 -1p2p/conn/secret_connection_test.go
-
+72 -0p2p/dummy/peer.go
-
+2 -3p2p/key.go
-
+1 -1p2p/listener.go
-
+26 -15p2p/netaddress.go
-
+46 -29p2p/netaddress_test.go
-
+1 -0p2p/node_info.go
-
+3 -1p2p/peer.go
-
+1 -2p2p/peer_set.go
-
+1 -1p2p/peer_set_test.go
-
+9 -2p2p/peer_test.go
-
+140 -13p2p/pex/addrbook.go
-
+125 -0p2p/pex/addrbook_test.go
-
+1 -1p2p/pex/known_address.go
-
+53 -30p2p/pex/pex_reactor.go
-
+68 -19p2p/pex/pex_reactor_test.go
-
+37 -9p2p/switch.go
-
+59 -12p2p/switch_test.go
-
+1 -1p2p/test_util.go
-
+1 -1p2p/upnp/upnp.go
-
+9 -0rpc/client/httpclient.go
-
+1 -0rpc/client/interface.go
-
+4 -0rpc/client/localclient.go
-
+20 -11rpc/client/rpc_test.go
-
+1 -0rpc/core/doc.go
-
+31 -0rpc/core/health.go
-
+2 -0rpc/core/net.go
-
+2 -2rpc/core/pipe.go
-
+1 -0rpc/core/routes.go
-
+46 -3rpc/core/status.go
-
+10 -4rpc/core/tx.go
-
+16 -7rpc/core/types/responses.go
-
+13 -13rpc/lib/client/ws_client.go
-
+32 -13rpc/lib/server/http_server.go
-
+1 -2rpc/lib/types/types.go
-
+0 -35scripts/dep_utils/checkout.sh
-
+1 -0scripts/wal2json/main.go
-
+2 -2state/state_test.go
-
+90 -51state/txindex/kv/kv.go
-
+31 -2state/txindex/kv/kv_test.go
-
+0 -4test/README.md
-
+0 -34test/test_libs.sh
-
+9 -5types/block.go
-
+15 -1types/block_test.go
-
+1 -1types/event_bus.go
-
+49 -0types/event_bus_test.go
-
+1 -1types/evidence.go
-
+11 -1types/genesis.go
-
+13 -17types/part_set.go
-
+238 -0types/priv_validator/sign_info.go
-
+3 -2types/validator.go
-
+45 -35types/validator_set.go
-
+1 -1types/validator_set_test.go
-
+19 -30types/vote_set.go
-
+1 -1version/version.go
+ 0
- 21
.circleci/config.yml
View File
+ 4
- 0
.gitignore
View File
+ 54
- 8
CHANGELOG.md
View File
+ 4
- 4
DOCKER/Dockerfile
View File
+ 1
- 1
DOCKER/Dockerfile.develop
View File
+ 2
- 1
DOCKER/README.md
View File
+ 42
- 4
Gopkg.lock
View File
+ 28
- 9
Gopkg.toml
View File
+ 4
- 9
Makefile
View File
+ 3
- 3
blockchain/reactor.go
View File
+ 2
- 2
cmd/tendermint/commands/lite.go
View File
+ 6
- 6
cmd/tendermint/commands/run_node.go
View File
+ 5
- 0
codecov.yml
View File
+ 84
- 81
config/config.go
View File
+ 4
- 0
config/toml.go
View File
+ 2
- 2
consensus/common_test.go
View File
+ 6
- 6
consensus/mempool_test.go
View File
+ 49
- 18
consensus/reactor.go
View File
+ 110
- 1
consensus/reactor_test.go
View File
+ 6
- 6
consensus/replay.go
View File
+ 9
- 10
consensus/replay_file.go
View File
+ 3
- 3
consensus/replay_test.go
View File
+ 108
- 109
consensus/state.go
View File
+ 1
- 1
consensus/wal_generator.go
View File
+ 2
- 3
docs/conf.py
View File
+ 1
- 1
docs/examples/getting-started.md
View File
+ 4
- 4
docs/examples/install_tendermint.sh
View File
+ 2
- 1
docs/index.rst
View File
+ 3
- 3
docs/specification/byzantine-consensus-algorithm.rst
View File
+ 4
- 0
docs/specification/configuration.rst
View File
+ 16
- 2
docs/specification/new-spec/bft-time.md
View File
+ 114
- 0
docs/specification/new-spec/light-client.md
View File
| @ -0,0 +1,114 @@ | |||
| # Light client | |||
| A light client is a process that connects to the Tendermint Full Node(s) and then tries to verify the Merkle proofs | |||
| about the blockchain application. In this document we describe mechanisms that ensures that the Tendermint light client | |||
| has the same level of security as Full Node processes (without being itself a Full Node). | |||
| To be able to validate a Merkle proof, a light client needs to validate the blockchain header that contains the root app hash. | |||
| Validating a blockchain header in Tendermint consists in verifying that the header is committed (signed) by >2/3 of the | |||
| voting power of the corresponding validator set. As the validator set is a dynamic set (it is changing), one of the | |||
| core functionality of the light client is updating the current validator set, that is then used to verify the | |||
| blockchain header, and further the corresponding Merkle proofs. | |||
| For the purpose of this light client specification, we assume that the Tendermint Full Node exposes the following functions over | |||
| Tendermint RPC: | |||
| ```golang | |||
| Header(height int64) (SignedHeader, error) // returns signed header for the given height | |||
| Validators(height int64) (ResultValidators, error) // returns validator set for the given height | |||
| LastHeader(valSetNumber int64) (SignedHeader, error) // returns last header signed by the validator set with the given validator set number | |||
| type SignedHeader struct { | |||
| Header Header | |||
| Commit Commit | |||
| ValSetNumber int64 | |||
| } | |||
| type ResultValidators struct { | |||
| BlockHeight int64 | |||
| Validators []Validator | |||
| // time the current validator set is initialised, i.e, time of the last validator change before header BlockHeight | |||
| ValSetTime int64 | |||
| } | |||
| ``` | |||
| We assume that Tendermint keeps track of the validator set changes and that each time a validator set is changed it is | |||
| being assigned the next sequence number. We can call this number the validator set sequence number. Tendermint also remembers | |||
| the Time from the header when the next validator set is initialised (starts to be in power), and we refer to this time | |||
| as validator set init time. | |||
| Furthermore, we assume that each validator set change is signed (committed) by the current validator set. More precisely, | |||
| given a block `H` that contains transactions that are modifying the current validator set, the Merkle root hash of the next | |||
| validator set (modified based on transactions from block H) will be in block `H+1` (and signed by the current validator | |||
| set), and then starting from the block `H+2`, it will be signed by the next validator set. | |||
| Note that the real Tendermint RPC API is slightly different (for example, response messages contain more data and function | |||
| names are slightly different); we shortened (and modified) it for the purpose of this document to make the spec more | |||
| clear and simple. Furthermore, note that in case of the third function, the returned header has `ValSetNumber` equals to | |||
| `valSetNumber+1`. | |||
| Locally, light client manages the following state: | |||
| ```golang | |||
| valSet []Validator // current validator set (last known and verified validator set) | |||
| valSetNumber int64 // sequence number of the current validator set | |||
| valSetHash []byte // hash of the current validator set | |||
| valSetTime int64 // time when the current validator set is initialised | |||
| ``` | |||
| The light client is initialised with the trusted validator set, for example based on the known validator set hash, | |||
| validator set sequence number and the validator set init time. | |||
| The core of the light client logic is captured by the VerifyAndUpdate function that is used to 1) verify if the given header is valid, | |||
| and 2) update the validator set (when the given header is valid and it is more recent than the seen headers). | |||
| ```golang | |||
| VerifyAndUpdate(signedHeader SignedHeader): | |||
| assertThat signedHeader.valSetNumber >= valSetNumber | |||
| if isValid(signedHeader) and signedHeader.Header.Time <= valSetTime + UNBONDING_PERIOD then | |||
| setValidatorSet(signedHeader) | |||
| return true | |||
| else | |||
| updateValidatorSet(signedHeader.ValSetNumber) | |||
| return VerifyAndUpdate(signedHeader) | |||
| isValid(signedHeader SignedHeader): | |||
| valSetOfTheHeader = Validators(signedHeader.Header.Height) | |||
| assertThat Hash(valSetOfTheHeader) == signedHeader.Header.ValSetHash | |||
| assertThat signedHeader is passing basic validation | |||
| if votingPower(signedHeader.Commit) > 2/3 * votingPower(valSetOfTheHeader) then return true | |||
| else | |||
| return false | |||
| setValidatorSet(signedHeader SignedHeader): | |||
| nextValSet = Validators(signedHeader.Header.Height) | |||
| assertThat Hash(nextValSet) == signedHeader.Header.ValidatorsHash | |||
| valSet = nextValSet.Validators | |||
| valSetHash = signedHeader.Header.ValidatorsHash | |||
| valSetNumber = signedHeader.ValSetNumber | |||
| valSetTime = nextValSet.ValSetTime | |||
| votingPower(commit Commit): | |||
| votingPower = 0 | |||
| for each precommit in commit.Precommits do: | |||
| if precommit.ValidatorAddress is in valSet and signature of the precommit verifies then | |||
| votingPower += valSet[precommit.ValidatorAddress].VotingPower | |||
| return votingPower | |||
| votingPower(validatorSet []Validator): | |||
| for each validator in validatorSet do: | |||
| votingPower += validator.VotingPower | |||
| return votingPower | |||
| updateValidatorSet(valSetNumberOfTheHeader): | |||
| while valSetNumber != valSetNumberOfTheHeader do | |||
| signedHeader = LastHeader(valSetNumber) | |||
| if isValid(signedHeader) then | |||
| setValidatorSet(signedHeader) | |||
| else return error | |||
| return | |||
| ``` | |||
| Note that in the logic above we assume that the light client will always go upward with respect to header verifications, | |||
| i.e., that it will always be used to verify more recent headers. In case a light client needs to be used to verify older | |||
| headers (go backward) the same mechanisms and similar logic can be used. In case a call to the FullNode or subsequent | |||
| checks fail, a light client need to implement some recovery strategy, for example connecting to other FullNode. | |||
+ 8
- 1
docs/specification/new-spec/reactors/pex/pex.md
View File
+ 1
- 0
docs/specification/rpc.rst
View File
+ 9
- 0
lite/proxy/block.go
View File
+ 218
- 0
lite/proxy/validate_test.go
View File
| @ -0,0 +1,218 @@ | |||
| package proxy_test | |||
| import ( | |||
| "testing" | |||
| "time" | |||
| "github.com/stretchr/testify/assert" | |||
| "github.com/tendermint/tendermint/lite" | |||
| "github.com/tendermint/tendermint/lite/proxy" | |||
| "github.com/tendermint/tendermint/types" | |||
| ) | |||
| var ( | |||
| deadBeefTxs = types.Txs{[]byte("DE"), []byte("AD"), []byte("BE"), []byte("EF")} | |||
| deadBeefHash = deadBeefTxs.Hash() | |||
| testTime1 = time.Date(2018, 1, 1, 1, 1, 1, 1, time.UTC) | |||
| testTime2 = time.Date(2017, 1, 2, 1, 1, 1, 1, time.UTC) | |||
| ) | |||
| var hdrHeight11 = &types.Header{ | |||
| Height: 11, | |||
| Time: testTime1, | |||
| ValidatorsHash: []byte("Tendermint"), | |||
| } | |||
| func TestValidateBlock(t *testing.T) { | |||
| tests := []struct { | |||
| block *types.Block | |||
| commit lite.Commit | |||
| wantErr string | |||
| }{ | |||
| { | |||
| block: nil, wantErr: "non-nil Block", | |||
| }, | |||
| { | |||
| block: &types.Block{}, wantErr: "nil Header", | |||
| }, | |||
| { | |||
| block: &types.Block{Header: new(types.Header)}, | |||
| }, | |||
| // Start Header.Height mismatch test | |||
| { | |||
| block: &types.Block{Header: &types.Header{Height: 10}}, | |||
| commit: lite.Commit{Header: &types.Header{Height: 11}}, | |||
| wantErr: "don't match - 10 vs 11", | |||
| }, | |||
| { | |||
| block: &types.Block{Header: &types.Header{Height: 11}}, | |||
| commit: lite.Commit{Header: &types.Header{Height: 11}}, | |||
| }, | |||
| // End Header.Height mismatch test | |||
| // Start Header.Hash mismatch test | |||
| { | |||
| block: &types.Block{Header: hdrHeight11}, | |||
| commit: lite.Commit{Header: &types.Header{Height: 11}}, | |||
| wantErr: "Headers don't match", | |||
| }, | |||
| { | |||
| block: &types.Block{Header: hdrHeight11}, | |||
| commit: lite.Commit{Header: hdrHeight11}, | |||
| }, | |||
| // End Header.Hash mismatch test | |||
| // Start Header.Data hash mismatch test | |||
| { | |||
| block: &types.Block{ | |||
| Header: &types.Header{Height: 11}, | |||
| Data: &types.Data{Txs: []types.Tx{[]byte("0xDE"), []byte("AD")}}, | |||
| }, | |||
| commit: lite.Commit{ | |||
| Header: &types.Header{Height: 11}, | |||
| Commit: &types.Commit{BlockID: types.BlockID{Hash: []byte("0xDEADBEEF")}}, | |||
| }, | |||
| wantErr: "Data hash doesn't match header", | |||
| }, | |||
| { | |||
| block: &types.Block{ | |||
| Header: &types.Header{Height: 11, DataHash: deadBeefHash}, | |||
| Data: &types.Data{Txs: deadBeefTxs}, | |||
| }, | |||
| commit: lite.Commit{ | |||
| Header: &types.Header{Height: 11}, | |||
| Commit: &types.Commit{BlockID: types.BlockID{Hash: []byte("DEADBEEF")}}, | |||
| }, | |||
| }, | |||
| // End Header.Data hash mismatch test | |||
| } | |||
| for i, tt := range tests { | |||
| err := proxy.ValidateBlock(tt.block, tt.commit) | |||
| if tt.wantErr != "" { | |||
| if err == nil { | |||
| assert.FailNowf(t, "Unexpectedly passed", "#%d", i) | |||
| } else { | |||
| assert.Contains(t, err.Error(), tt.wantErr, "#%d should contain the substring\n\n", i) | |||
| } | |||
| continue | |||
| } | |||
| assert.Nil(t, err, "#%d: expecting a nil error", i) | |||
| } | |||
| } | |||
| func TestValidateBlockMeta(t *testing.T) { | |||
| tests := []struct { | |||
| meta *types.BlockMeta | |||
| commit lite.Commit | |||
| wantErr string | |||
| }{ | |||
| { | |||
| meta: nil, wantErr: "non-nil BlockMeta", | |||
| }, | |||
| { | |||
| meta: &types.BlockMeta{}, wantErr: "non-nil Header", | |||
| }, | |||
| { | |||
| meta: &types.BlockMeta{Header: new(types.Header)}, | |||
| }, | |||
| // Start Header.Height mismatch test | |||
| { | |||
| meta: &types.BlockMeta{Header: &types.Header{Height: 10}}, | |||
| commit: lite.Commit{Header: &types.Header{Height: 11}}, | |||
| wantErr: "don't match - 10 vs 11", | |||
| }, | |||
| { | |||
| meta: &types.BlockMeta{Header: &types.Header{Height: 11}}, | |||
| commit: lite.Commit{Header: &types.Header{Height: 11}}, | |||
| }, | |||
| // End Header.Height mismatch test | |||
| // Start Headers don't match test | |||
| { | |||
| meta: &types.BlockMeta{Header: hdrHeight11}, | |||
| commit: lite.Commit{Header: &types.Header{Height: 11}}, | |||
| wantErr: "Headers don't match", | |||
| }, | |||
| { | |||
| meta: &types.BlockMeta{Header: hdrHeight11}, | |||
| commit: lite.Commit{Header: hdrHeight11}, | |||
| }, | |||
| { | |||
| meta: &types.BlockMeta{ | |||
| Header: &types.Header{ | |||
| Height: 11, | |||
| ValidatorsHash: []byte("lite-test"), | |||
| // TODO: should be able to use empty time after Amino upgrade | |||
| Time: testTime1, | |||
| }, | |||
| }, | |||
| commit: lite.Commit{ | |||
| Header: &types.Header{Height: 11, DataHash: deadBeefHash}, | |||
| }, | |||
| wantErr: "Headers don't match", | |||
| }, | |||
| { | |||
| meta: &types.BlockMeta{ | |||
| Header: &types.Header{ | |||
| Height: 11, DataHash: deadBeefHash, | |||
| ValidatorsHash: []byte("Tendermint"), | |||
| Time: testTime1, | |||
| }, | |||
| }, | |||
| commit: lite.Commit{ | |||
| Header: &types.Header{ | |||
| Height: 11, DataHash: deadBeefHash, | |||
| ValidatorsHash: []byte("Tendermint"), | |||
| Time: testTime2, | |||
| }, | |||
| Commit: &types.Commit{BlockID: types.BlockID{Hash: []byte("DEADBEEF")}}, | |||
| }, | |||
| wantErr: "Headers don't match", | |||
| }, | |||
| { | |||
| meta: &types.BlockMeta{ | |||
| Header: &types.Header{ | |||
| Height: 11, DataHash: deadBeefHash, | |||
| ValidatorsHash: []byte("Tendermint"), | |||
| Time: testTime2, | |||
| }, | |||
| }, | |||
| commit: lite.Commit{ | |||
| Header: &types.Header{ | |||
| Height: 11, DataHash: deadBeefHash, | |||
| ValidatorsHash: []byte("Tendermint-x"), | |||
| Time: testTime2, | |||
| }, | |||
| Commit: &types.Commit{BlockID: types.BlockID{Hash: []byte("DEADBEEF")}}, | |||
| }, | |||
| wantErr: "Headers don't match", | |||
| }, | |||
| // End Headers don't match test | |||
| } | |||
| for i, tt := range tests { | |||
| err := proxy.ValidateBlockMeta(tt.meta, tt.commit) | |||
| if tt.wantErr != "" { | |||
| if err == nil { | |||
| assert.FailNowf(t, "Unexpectedly passed", "#%d: wanted error %q", i, tt.wantErr) | |||
| } else { | |||
| assert.Contains(t, err.Error(), tt.wantErr, "#%d should contain the substring\n\n", i) | |||
| } | |||
| continue | |||
| } | |||
| assert.Nil(t, err, "#%d: expecting a nil error", i) | |||
| } | |||
| } | |||
+ 21
- 19
node/node.go
View File
+ 4
- 4
p2p/base_reactor.go
View File
+ 1
- 2
p2p/conn/connection.go
View File
+ 3
- 5
p2p/conn/secret_connection.go
View File
+ 2
- 1
p2p/conn/secret_connection_test.go
View File
+ 72
- 0
p2p/dummy/peer.go
View File
| @ -0,0 +1,72 @@ | |||
| package dummy | |||
| import ( | |||
| p2p "github.com/tendermint/tendermint/p2p" | |||
| tmconn "github.com/tendermint/tendermint/p2p/conn" | |||
| cmn "github.com/tendermint/tmlibs/common" | |||
| ) | |||
| type peer struct { | |||
| cmn.BaseService | |||
| kv map[string]interface{} | |||
| } | |||
| var _ p2p.Peer = (*peer)(nil) | |||
| // NewPeer creates new dummy peer. | |||
| func NewPeer() *peer { | |||
| p := &peer{ | |||
| kv: make(map[string]interface{}), | |||
| } | |||
| p.BaseService = *cmn.NewBaseService(nil, "peer", p) | |||
| return p | |||
| } | |||
| // ID always returns dummy. | |||
| func (p *peer) ID() p2p.ID { | |||
| return p2p.ID("dummy") | |||
| } | |||
| // IsOutbound always returns false. | |||
| func (p *peer) IsOutbound() bool { | |||
| return false | |||
| } | |||
| // IsPersistent always returns false. | |||
| func (p *peer) IsPersistent() bool { | |||
| return false | |||
| } | |||
| // NodeInfo always returns empty node info. | |||
| func (p *peer) NodeInfo() p2p.NodeInfo { | |||
| return p2p.NodeInfo{} | |||
| } | |||
| // Status always returns empry connection status. | |||
| func (p *peer) Status() tmconn.ConnectionStatus { | |||
| return tmconn.ConnectionStatus{} | |||
| } | |||
| // Send does not do anything and just returns true. | |||
| func (p *peer) Send(byte, interface{}) bool { | |||
| return true | |||
| } | |||
| // TrySend does not do anything and just returns true. | |||
| func (p *peer) TrySend(byte, interface{}) bool { | |||
| return true | |||
| } | |||
| // Set records value under key specified in the map. | |||
| func (p *peer) Set(key string, value interface{}) { | |||
| p.kv[key] = value | |||
| } | |||
| // Get returns a value associated with the key. Nil is returned if no value | |||
| // found. | |||
| func (p *peer) Get(key string) interface{} { | |||
| if value, ok := p.kv[key]; ok { | |||
| return value | |||
| } | |||
| return nil | |||
| } | |||
+ 2
- 3
p2p/key.go
View File
+ 1
- 1
p2p/listener.go
View File
+ 26
- 15
p2p/netaddress.go
View File
+ 46
- 29
p2p/netaddress_test.go
View File
+ 1
- 0
p2p/node_info.go
View File
+ 3
- 1
p2p/peer.go
View File
+ 1
- 2
p2p/peer_set.go
View File
+ 1
- 1
p2p/peer_set_test.go
View File
+ 9
- 2
p2p/peer_test.go
View File
+ 140
- 13
p2p/pex/addrbook.go
View File
+ 125
- 0
p2p/pex/addrbook_test.go
View File
+ 1
- 1
p2p/pex/known_address.go
View File
+ 53
- 30
p2p/pex/pex_reactor.go
View File
+ 68
- 19
p2p/pex/pex_reactor_test.go
View File
+ 37
- 9
p2p/switch.go
View File
+ 59
- 12
p2p/switch_test.go
View File
+ 1
- 1
p2p/test_util.go
View File
+ 1
- 1
p2p/upnp/upnp.go
View File
+ 9
- 0
rpc/client/httpclient.go
View File
+ 1
- 0
rpc/client/interface.go
View File
+ 4
- 0
rpc/client/localclient.go
View File
+ 20
- 11
rpc/client/rpc_test.go
View File
+ 1
- 0
rpc/core/doc.go
View File
+ 31
- 0
rpc/core/health.go
View File
| @ -0,0 +1,31 @@ | |||
| package core | |||
| import ( | |||
| ctypes "github.com/tendermint/tendermint/rpc/core/types" | |||
| ) | |||
| // Get node health. Returns empty result (200 OK) on success, no response - in | |||
| // case of an error. | |||
| // | |||
| // ```shell | |||
| // curl 'localhost:46657/health' | |||
| // ``` | |||
| // | |||
| // ```go | |||
| // client := client.NewHTTP("tcp://0.0.0.0:46657", "/websocket") | |||
| // result, err := client.Health() | |||
| // ``` | |||
| // | |||
| // > The above command returns JSON structured like this: | |||
| // | |||
| // ```json | |||
| // { | |||
| // "error": "", | |||
| // "result": {}, | |||
| // "id": "", | |||
| // "jsonrpc": "2.0" | |||
| // } | |||
| // ``` | |||
| func Health() (*ctypes.ResultHealth, error) { | |||
| return &ctypes.ResultHealth{}, nil | |||
| } | |||
+ 2
- 0
rpc/core/net.go
View File
+ 2
- 2
rpc/core/pipe.go
View File
+ 1
- 0
rpc/core/routes.go
View File
+ 46
- 3
rpc/core/status.go
View File
+ 10
- 4
rpc/core/tx.go
View File
+ 16
- 7
rpc/core/types/responses.go
View File
+ 13
- 13
rpc/lib/client/ws_client.go
View File
+ 32
- 13
rpc/lib/server/http_server.go
View File
+ 1
- 2
rpc/lib/types/types.go
View File
+ 0
- 35
scripts/dep_utils/checkout.sh
View File
| @ -1,35 +0,0 @@ | |||
| #! /bin/bash | |||
| set -ex | |||
| set +u | |||
| if [[ "$DEP" == "" ]]; then | |||
| DEP=$GOPATH/src/github.com/tendermint/tendermint/Gopkg.lock | |||
| fi | |||
| set -u | |||
| set -u | |||
| function getVendoredVersion() { | |||
| grep -A100 "$LIB" "$DEP" | grep revision | head -n1 | grep -o '"[^"]\+"' | cut -d '"' -f 2 | |||
| } | |||
| # fetch and checkout vendored dep | |||
| lib=$1 | |||
| echo "----------------------------------" | |||
| echo "Getting $lib ..." | |||
| go get -t "github.com/tendermint/$lib/..." | |||
| VENDORED=$(getVendoredVersion "$lib") | |||
| cd "$GOPATH/src/github.com/tendermint/$lib" || exit | |||
| MASTER=$(git rev-parse origin/master) | |||
| if [[ "$VENDORED" != "$MASTER" ]]; then | |||
| echo "... VENDORED != MASTER ($VENDORED != $MASTER)" | |||
| echo "... Checking out commit $VENDORED" | |||
| git checkout "$VENDORED" &> /dev/null | |||
| fi | |||
+ 1
- 0
scripts/wal2json/main.go
View File
+ 2
- 2
state/state_test.go
View File
+ 90
- 51
state/txindex/kv/kv.go
View File
+ 31
- 2
state/txindex/kv/kv_test.go
View File
+ 0
- 4
test/README.md
View File
+ 0
- 34
test/test_libs.sh
View File
| @ -1,34 +0,0 @@ | |||
| #! /bin/bash | |||
| set -ex | |||
| export PATH="$GOBIN:$PATH" | |||
| # Get the parent directory of where this script is. | |||
| SOURCE="${BASH_SOURCE[0]}" | |||
| while [ -h "$SOURCE" ] ; do SOURCE="$(readlink "$SOURCE")"; done | |||
| DIR="$( cd -P "$( dirname "$SOURCE" )/.." && pwd )" | |||
| #################### | |||
| # libs we depend on | |||
| #################### | |||
| # All libs should define `make test` and `make get_vendor_deps` | |||
| LIBS=(tmlibs go-wire go-crypto abci) | |||
| for lib in "${LIBS[@]}"; do | |||
| # checkout vendored version of lib | |||
| bash scripts/dep_utils/checkout.sh "$lib" | |||
| echo "Testing $lib ..." | |||
| cd "$GOPATH/src/github.com/tendermint/$lib" | |||
| make get_tools | |||
| make get_vendor_deps | |||
| make test | |||
| if [[ "$?" != 0 ]]; then | |||
| echo "FAIL" | |||
| exit 1 | |||
| fi | |||
| cd "$DIR" | |||
| done | |||
| echo "" | |||
| echo "PASS" | |||
+ 9
- 5
types/block.go
View File
+ 15
- 1
types/block_test.go
View File
+ 1
- 1
types/event_bus.go
View File
+ 49
- 0
types/event_bus_test.go
View File
+ 1
- 1
types/evidence.go
View File
+ 11
- 1
types/genesis.go
View File
+ 13
- 17
types/part_set.go
View File
+ 238
- 0
types/priv_validator/sign_info.go
View File
| @ -0,0 +1,238 @@ | |||
| package types | |||
| import ( | |||
| "bytes" | |||
| "encoding/json" | |||
| "errors" | |||
| "fmt" | |||
| "time" | |||
| crypto "github.com/tendermint/go-crypto" | |||
| "github.com/tendermint/tendermint/types" | |||
| cmn "github.com/tendermint/tmlibs/common" | |||
| ) | |||
| // TODO: type ? | |||
| const ( | |||
| stepNone int8 = 0 // Used to distinguish the initial state | |||
| stepPropose int8 = 1 | |||
| stepPrevote int8 = 2 | |||
| stepPrecommit int8 = 3 | |||
| ) | |||
| func voteToStep(vote *types.Vote) int8 { | |||
| switch vote.Type { | |||
| case types.VoteTypePrevote: | |||
| return stepPrevote | |||
| case types.VoteTypePrecommit: | |||
| return stepPrecommit | |||
| default: | |||
| panic("Unknown vote type") | |||
| } | |||
| } | |||
| //------------------------------------- | |||
| // LastSignedInfo contains information about the latest | |||
| // data signed by a validator to help prevent double signing. | |||
| type LastSignedInfo struct { | |||
| Height int64 `json:"height"` | |||
| Round int `json:"round"` | |||
| Step int8 `json:"step"` | |||
| Signature crypto.Signature `json:"signature,omitempty"` // so we dont lose signatures | |||
| SignBytes cmn.HexBytes `json:"signbytes,omitempty"` // so we dont lose signatures | |||
| } | |||
| func NewLastSignedInfo() *LastSignedInfo { | |||
| return &LastSignedInfo{ | |||
| Step: stepNone, | |||
| } | |||
| } | |||
| func (lsi *LastSignedInfo) String() string { | |||
| return fmt.Sprintf("LH:%v, LR:%v, LS:%v", lsi.Height, lsi.Round, lsi.Step) | |||
| } | |||
| // Verify returns an error if there is a height/round/step regression | |||
| // or if the HRS matches but there are no LastSignBytes. | |||
| // It returns true if HRS matches exactly and the LastSignature exists. | |||
| // It panics if the HRS matches, the LastSignBytes are not empty, but the LastSignature is empty. | |||
| func (lsi LastSignedInfo) Verify(height int64, round int, step int8) (bool, error) { | |||
| if lsi.Height > height { | |||
| return false, errors.New("Height regression") | |||
| } | |||
| if lsi.Height == height { | |||
| if lsi.Round > round { | |||
| return false, errors.New("Round regression") | |||
| } | |||
| if lsi.Round == round { | |||
| if lsi.Step > step { | |||
| return false, errors.New("Step regression") | |||
| } else if lsi.Step == step { | |||
| if lsi.SignBytes != nil { | |||
| if lsi.Signature.Empty() { | |||
| panic("info: LastSignature is nil but LastSignBytes is not!") | |||
| } | |||
| return true, nil | |||
| } | |||
| return false, errors.New("No LastSignature found") | |||
| } | |||
| } | |||
| } | |||
| return false, nil | |||
| } | |||
| // Set height/round/step and signature on the info | |||
| func (lsi *LastSignedInfo) Set(height int64, round int, step int8, | |||
| signBytes []byte, sig crypto.Signature) { | |||
| lsi.Height = height | |||
| lsi.Round = round | |||
| lsi.Step = step | |||
| lsi.Signature = sig | |||
| lsi.SignBytes = signBytes | |||
| } | |||
| // Reset resets all the values. | |||
| // XXX: Unsafe. | |||
| func (lsi *LastSignedInfo) Reset() { | |||
| lsi.Height = 0 | |||
| lsi.Round = 0 | |||
| lsi.Step = 0 | |||
| lsi.Signature = crypto.Signature{} | |||
| lsi.SignBytes = nil | |||
| } | |||
| // SignVote checks the height/round/step (HRS) are greater than the latest state of the LastSignedInfo. | |||
| // If so, it signs the vote, updates the LastSignedInfo, and sets the signature on the vote. | |||
| // If the HRS are equal and the only thing changed is the timestamp, it sets the vote.Timestamp to the previous | |||
| // value and the Signature to the LastSignedInfo.Signature. | |||
| // Else it returns an error. | |||
| func (lsi *LastSignedInfo) SignVote(signer types.Signer, chainID string, vote *types.Vote) error { | |||
| height, round, step := vote.Height, vote.Round, voteToStep(vote) | |||
| signBytes := vote.SignBytes(chainID) | |||
| sameHRS, err := lsi.Verify(height, round, step) | |||
| if err != nil { | |||
| return err | |||
| } | |||
| // We might crash before writing to the wal, | |||
| // causing us to try to re-sign for the same HRS. | |||
| // If signbytes are the same, use the last signature. | |||
| // If they only differ by timestamp, use last timestamp and signature | |||
| // Otherwise, return error | |||
| if sameHRS { | |||
| if bytes.Equal(signBytes, lsi.SignBytes) { | |||
| vote.Signature = lsi.Signature | |||
| } else if timestamp, ok := checkVotesOnlyDifferByTimestamp(lsi.SignBytes, signBytes); ok { | |||
| vote.Timestamp = timestamp | |||
| vote.Signature = lsi.Signature | |||
| } else { | |||
| err = fmt.Errorf("Conflicting data") | |||
| } | |||
| return err | |||
| } | |||
| sig, err := signer.Sign(signBytes) | |||
| if err != nil { | |||
| return err | |||
| } | |||
| lsi.Set(height, round, step, signBytes, sig) | |||
| vote.Signature = sig | |||
| return nil | |||
| } | |||
| // SignProposal checks if the height/round/step (HRS) are greater than the latest state of the LastSignedInfo. | |||
| // If so, it signs the proposal, updates the LastSignedInfo, and sets the signature on the proposal. | |||
| // If the HRS are equal and the only thing changed is the timestamp, it sets the timestamp to the previous | |||
| // value and the Signature to the LastSignedInfo.Signature. | |||
| // Else it returns an error. | |||
| func (lsi *LastSignedInfo) SignProposal(signer types.Signer, chainID string, proposal *types.Proposal) error { | |||
| height, round, step := proposal.Height, proposal.Round, stepPropose | |||
| signBytes := proposal.SignBytes(chainID) | |||
| sameHRS, err := lsi.Verify(height, round, step) | |||
| if err != nil { | |||
| return err | |||
| } | |||
| // We might crash before writing to the wal, | |||
| // causing us to try to re-sign for the same HRS. | |||
| // If signbytes are the same, use the last signature. | |||
| // If they only differ by timestamp, use last timestamp and signature | |||
| // Otherwise, return error | |||
| if sameHRS { | |||
| if bytes.Equal(signBytes, lsi.SignBytes) { | |||
| proposal.Signature = lsi.Signature | |||
| } else if timestamp, ok := checkProposalsOnlyDifferByTimestamp(lsi.SignBytes, signBytes); ok { | |||
| proposal.Timestamp = timestamp | |||
| proposal.Signature = lsi.Signature | |||
| } else { | |||
| err = fmt.Errorf("Conflicting data") | |||
| } | |||
| return err | |||
| } | |||
| sig, err := signer.Sign(signBytes) | |||
| if err != nil { | |||
| return err | |||
| } | |||
| lsi.Set(height, round, step, signBytes, sig) | |||
| proposal.Signature = sig | |||
| return nil | |||
| } | |||
| //------------------------------------- | |||
| // returns the timestamp from the lastSignBytes. | |||
| // returns true if the only difference in the votes is their timestamp. | |||
| func checkVotesOnlyDifferByTimestamp(lastSignBytes, newSignBytes []byte) (time.Time, bool) { | |||
| var lastVote, newVote types.CanonicalJSONOnceVote | |||
| if err := json.Unmarshal(lastSignBytes, &lastVote); err != nil { | |||
| panic(fmt.Sprintf("LastSignBytes cannot be unmarshalled into vote: %v", err)) | |||
| } | |||
| if err := json.Unmarshal(newSignBytes, &newVote); err != nil { | |||
| panic(fmt.Sprintf("signBytes cannot be unmarshalled into vote: %v", err)) | |||
| } | |||
| lastTime, err := time.Parse(types.TimeFormat, lastVote.Vote.Timestamp) | |||
| if err != nil { | |||
| panic(err) | |||
| } | |||
| // set the times to the same value and check equality | |||
| now := types.CanonicalTime(time.Now()) | |||
| lastVote.Vote.Timestamp = now | |||
| newVote.Vote.Timestamp = now | |||
| lastVoteBytes, _ := json.Marshal(lastVote) | |||
| newVoteBytes, _ := json.Marshal(newVote) | |||
| return lastTime, bytes.Equal(newVoteBytes, lastVoteBytes) | |||
| } | |||
| // returns the timestamp from the lastSignBytes. | |||
| // returns true if the only difference in the proposals is their timestamp | |||
| func checkProposalsOnlyDifferByTimestamp(lastSignBytes, newSignBytes []byte) (time.Time, bool) { | |||
| var lastProposal, newProposal types.CanonicalJSONOnceProposal | |||
| if err := json.Unmarshal(lastSignBytes, &lastProposal); err != nil { | |||
| panic(fmt.Sprintf("LastSignBytes cannot be unmarshalled into proposal: %v", err)) | |||
| } | |||
| if err := json.Unmarshal(newSignBytes, &newProposal); err != nil { | |||
| panic(fmt.Sprintf("signBytes cannot be unmarshalled into proposal: %v", err)) | |||
| } | |||
| lastTime, err := time.Parse(types.TimeFormat, lastProposal.Proposal.Timestamp) | |||
| if err != nil { | |||
| panic(err) | |||
| } | |||
| // set the times to the same value and check equality | |||
| now := types.CanonicalTime(time.Now()) | |||
| lastProposal.Proposal.Timestamp = now | |||
| newProposal.Proposal.Timestamp = now | |||
| lastProposalBytes, _ := json.Marshal(lastProposal) | |||
| newProposalBytes, _ := json.Marshal(newProposal) | |||
| return lastTime, bytes.Equal(newProposalBytes, lastProposalBytes) | |||
| } | |||