Mehmet Gurevin
6 years ago
138 changed files with 3628 additions and 1567 deletions
Split View
Diff Options
-
+143 -0CHANGELOG.md
-
+13 -63CHANGELOG_PENDING.md
-
+39 -47Gopkg.lock
-
+1 -5Gopkg.toml
-
+3 -1Makefile
-
+1 -1README.md
-
+80 -0UPGRADING.md
-
+8 -1abci/example/kvstore/kvstore.go
-
+720 -312abci/types/types.pb.go
-
+16 -6abci/types/types.proto
-
+141 -17abci/types/typespb_test.go
-
+1 -1benchmarks/codec_test.go
-
+51 -2blockchain/reactor.go
-
+1 -0blockchain/reactor_test.go
-
+1 -1blockchain/store.go
-
+5 -0config/config.go
-
+1 -1config/toml.go
-
+5 -5consensus/byzantine_test.go
-
+7 -4consensus/common_test.go
-
+0 -1consensus/mempool_test.go
-
+203 -47consensus/reactor.go
-
+17 -7consensus/replay.go
-
+10 -8consensus/replay_test.go
-
+38 -38consensus/state.go
-
+193 -4consensus/state_test.go
-
+7 -0consensus/types/round_state.go
-
+2 -5consensus/types/round_state_test.go
-
+3 -1consensus/wal_generator.go
-
+16 -6crypto/crypto.go
-
+1 -1crypto/ed25519/ed25519.go
-
+8 -4crypto/merkle/proof.go
-
+2 -2crypto/merkle/proof_simple_value.go
-
+140 -0crypto/merkle/proof_test.go
-
+6 -6crypto/merkle/simple_map_test.go
-
+31 -11crypto/random.go
-
+25 -8crypto/tmhash/hash.go
-
+21 -2crypto/tmhash/hash_test.go
-
+6 -0docs/app-dev/ecosystem.json
-
+4 -4docs/architecture/adr-001-logging.md
-
+29 -22docs/architecture/adr-016-protocol-versions.md
-
+122 -0docs/architecture/adr-033-pubsub.md
-
+4 -0docs/architecture/adr-template.md
-
+16 -5docs/spec/abci/abci.md
-
+9 -9docs/spec/blockchain/blockchain.md
-
+6 -8docs/spec/blockchain/encoding.md
-
+2 -2docs/spec/blockchain/state.md
-
+9 -6docs/spec/reactors/consensus/consensus-reactor.md
-
+16 -17docs/spec/reactors/consensus/consensus.md
-
+1 -1evidence/pool.go
-
+1 -1evidence/pool_test.go
-
+22 -3evidence/reactor.go
-
+1 -1libs/common/errors_test.go
-
+78 -0libs/fail/fail.go
-
+3 -3libs/log/tmfmt_logger.go
-
+5 -5lite/dbprovider.go
-
+77 -46mempool/mempool.go
-
+24 -40mempool/mempool_test.go
-
+28 -7node/node.go
-
+22 -0node/node_test.go
-
+5 -5p2p/conn/connection.go
-
+19 -19p2p/conn/connection_test.go
-
+4 -4p2p/conn/secret_connection.go
-
+5 -0p2p/dummy/peer.go
-
+1 -2p2p/key.go
-
+16 -5p2p/node_info.go
-
+31 -3p2p/peer.go
-
+1 -0p2p/peer_set_test.go
-
+2 -2p2p/peer_test.go
-
+4 -0p2p/pex/addrbook.go
-
+8 -0p2p/pex/errors.go
-
+22 -6p2p/pex/pex_reactor.go
-
+1 -0p2p/pex/pex_reactor_test.go
-
+6 -3p2p/switch.go
-
+8 -6p2p/test_util.go
-
+15 -10p2p/transport.go
-
+2 -2p2p/transport_test.go
-
+6 -6privval/priv_validator.go
-
+8 -8privval/priv_validator_test.go
-
+2 -2privval/remote_signer.go
-
+1 -1proxy/app_conn_test.go
-
+15 -0proxy/version.go
-
+2 -2rpc/client/mock/abci.go
-
+2 -2rpc/core/abci.go
-
+1 -2rpc/lib/server/http_server.go
-
+16 -0scripts/authors.sh
-
+2 -2state/execution.go
-
+18 -30state/state.go
-
+4 -4state/state_test.go
-
+1 -1state/store.go
-
+23 -33state/validation.go
-
+7 -4test/docker/Dockerfile
-
+3 -6test/p2p/README.md
-
+0 -39test/p2p/data/mach1/core/config/genesis.json
-
+0 -6test/p2p/data/mach1/core/config/node_key.json
-
+0 -14test/p2p/data/mach1/core/config/priv_validator.json
-
+0 -39test/p2p/data/mach2/core/config/genesis.json
-
+0 -6test/p2p/data/mach2/core/config/node_key.json
-
+0 -14test/p2p/data/mach2/core/config/priv_validator.json
-
+0 -39test/p2p/data/mach3/core/config/genesis.json
-
+0 -6test/p2p/data/mach3/core/config/node_key.json
+ 143
- 0
CHANGELOG.md
View File
+ 13
- 63
CHANGELOG_PENDING.md
View File
| @ -1,81 +1,31 @@ | |||
| # Pending | |||
| ## v0.26.1 | |||
| *TBA* | |||
| Special thanks to external contributors on this release: | |||
| @goolAdapter, @bradyjoestar | |||
| BREAKING CHANGES: | |||
| Friendly reminder, we have a [bug bounty program](https://hackerone.com/tendermint). | |||
| ### BREAKING CHANGES: | |||
| * CLI/RPC/Config | |||
| * [config] \#2232 timeouts as time.Duration, not ints | |||
| * [config] \#2505 Remove Mempool.RecheckEmpty (it was effectively useless anyways) | |||
| * [config] `mempool.wal` is disabled by default | |||
| * [rpc] \#2298 `/abci_query` takes `prove` argument instead of `trusted` and switches the default | |||
| behaviour to `prove=false` | |||
| * [privval] \#2459 Split `SocketPVMsg`s implementations into Request and Response, where the Response may contain a error message (returned by the remote signer) | |||
| * [state] \#2644 Add Version field to State, breaking the format of State as | |||
| encoded on disk. | |||
| * [rpc] \#2654 Remove all `node_info.other.*_version` fields in `/status` and | |||
| `/net_info` | |||
| * Apps | |||
| * [abci] \#2298 ResponseQuery.Proof is now a structured merkle.Proof, not just | |||
| arbitrary bytes | |||
| * [abci] \#2644 Add Version to Header and shift all fields by one | |||
| * Go API | |||
| * [node] Remove node.RunForever | |||
| * [config] \#2232 timeouts as time.Duration, not ints | |||
| * [rpc/client] \#2298 `ABCIQueryOptions.Trusted` -> `ABCIQueryOptions.Prove` | |||
| * [types] \#2298 Remove `Index` and `Total` fields from `TxProof`. | |||
| * [crypto/merkle & lite] \#2298 Various changes to accomodate General Merkle trees | |||
| * [crypto/merkle] \#2595 Remove all Hasher objects in favor of byte slices | |||
| * [crypto/merkle] \#2635 merkle.SimpleHashFromTwoHashes is no longer exported | |||
| * [types] \#2598 `VoteTypeXxx` are now of type `SignedMsgType byte` and named `XxxType`, eg. `PrevoteType`, | |||
| `PrecommitType`. | |||
| * Blockchain Protocol | |||
| * [types] Update SignBytes for `Vote`/`Proposal`/`Heartbeat`: | |||
| * \#2459 Use amino encoding instead of JSON in `SignBytes`. | |||
| * \#2598 Reorder fields and use fixed sized encoding. | |||
| * \#2598 Change `Type` field fromt `string` to `byte` and use new | |||
| `SignedMsgType` to enumerate. | |||
| * [types] \#2512 Remove the pubkey field from the validator hash | |||
| * [types] \#2644 Add Version struct to Header | |||
| * [state] \#2587 Require block.Time of the fist block to be genesis time | |||
| * [state] \#2644 Require block.Version to match state.Version | |||
| * P2P Protocol | |||
| * [p2p] \#2654 Add `ProtocolVersion` struct with protocol versions to top of | |||
| DefaultNodeInfo and require `ProtocolVersion.Block` to match during peer handshake | |||
| ### FEATURES: | |||
| FEATURES: | |||
| - [crypto/merkle] \#2298 General Merkle Proof scheme for chaining various types of Merkle trees together | |||
| - [abci] \#2557 Add `Codespace` field to `Response{CheckTx, DeliverTx, Query}` | |||
| ### IMPROVEMENTS: | |||
| IMPROVEMENTS: | |||
| - Additional Metrics | |||
| - [consensus] [\#2169](https://github.com/cosmos/cosmos-sdk/issues/2169) | |||
| - [p2p] [\#2169](https://github.com/cosmos/cosmos-sdk/issues/2169) | |||
| - [config] \#2232 Added ValidateBasic method, which performs basic checks | |||
| - [crypto/ed25519] \#2558 Switch to use latest `golang.org/x/crypto` through our fork at | |||
| github.com/tendermint/crypto | |||
| - [tools] \#2238 Binary dependencies are now locked to a specific git commit | |||
| - [crypto] \#2099 make crypto random use chacha, and have forward secrecy of generated randomness | |||
| ### BUG FIXES: | |||
| BUG FIXES: | |||
| - [autofile] \#2428 Group.RotateFile need call Flush() before rename (@goolAdapter) | |||
| - [node] \#2434 Make node respond to signal interrupts while sleeping for genesis time | |||
| - [consensus] [\#1690](https://github.com/tendermint/tendermint/issues/1690) wait for | |||
| timeoutPrecommit before starting next round | |||
| - [consensus] [\#1745](https://github.com/tendermint/tendermint/issues/1745) wait for | |||
| Proposal or timeoutProposal before entering prevote | |||
| - [evidence] \#2515 fix db iter leak (@goolAdapter) | |||
| - [common/bit_array] Fixed a bug in the `Or` function | |||
| - [common/bit_array] Fixed a bug in the `Sub` function (@james-ray) | |||
| - [common] \#2534 Make bit array's PickRandom choose uniformly from true bits | |||
| - [consensus] \#1637 Limit the amount of evidence that can be included in a | |||
| block | |||
| - [p2p] \#2555 fix p2p switch FlushThrottle value (@goolAdapter) | |||
| - [libs/event] \#2518 fix event concurrency flaw (@goolAdapter) | |||
| - [state] \#2616 Pass nil to NewValidatorSet() when genesis file's Validators field is nil | |||
| - [crypto/merkle] [\#2756](https://github.com/tendermint/tendermint/issues/2756) Fix crypto/merkle ProofOperators.Verify to check bounds on keypath parts. | |||
| - [mempool] fix a bug where we create a WAL despite `wal_dir` being empty | |||
| - [p2p] \#2771 Fix `peer-id` label name in prometheus metrics | |||
+ 39
- 47
Gopkg.lock
View File
+ 1
- 5
Gopkg.toml
View File
+ 3
- 1
Makefile
View File
+ 1
- 1
README.md
View File
+ 80
- 0
UPGRADING.md
View File
+ 8
- 1
abci/example/kvstore/kvstore.go
View File
+ 720
- 312
abci/types/types.pb.go
File diff suppressed because it is too large
View File
+ 16
- 6
abci/types/types.proto
View File
+ 141
- 17
abci/types/typespb_test.go
View File
+ 1
- 1
benchmarks/codec_test.go
View File
+ 51
- 2
blockchain/reactor.go
View File
+ 1
- 0
blockchain/reactor_test.go
View File
+ 1
- 1
blockchain/store.go
View File
+ 5
- 0
config/config.go
View File
+ 1
- 1
config/toml.go
View File
+ 5
- 5
consensus/byzantine_test.go
View File
+ 7
- 4
consensus/common_test.go
View File
+ 0
- 1
consensus/mempool_test.go
View File
+ 203
- 47
consensus/reactor.go
View File
+ 17
- 7
consensus/replay.go
View File
+ 10
- 8
consensus/replay_test.go
View File
+ 38
- 38
consensus/state.go
View File
+ 193
- 4
consensus/state_test.go
View File
+ 7
- 0
consensus/types/round_state.go
View File
+ 2
- 5
consensus/types/round_state_test.go
View File
+ 3
- 1
consensus/wal_generator.go
View File
+ 16
- 6
crypto/crypto.go
View File
+ 1
- 1
crypto/ed25519/ed25519.go
View File
+ 8
- 4
crypto/merkle/proof.go
View File
+ 2
- 2
crypto/merkle/proof_simple_value.go
View File
+ 140
- 0
crypto/merkle/proof_test.go
View File
| @ -0,0 +1,140 @@ | |||
| package merkle | |||
| import ( | |||
| "testing" | |||
| "github.com/stretchr/testify/assert" | |||
| "github.com/tendermint/go-amino" | |||
| cmn "github.com/tendermint/tendermint/libs/common" | |||
| ) | |||
| const ProofOpDomino = "test:domino" | |||
| // Expects given input, produces given output. | |||
| // Like the game dominos. | |||
| type DominoOp struct { | |||
| key string // unexported, may be empty | |||
| Input string | |||
| Output string | |||
| } | |||
| func NewDominoOp(key, input, output string) DominoOp { | |||
| return DominoOp{ | |||
| key: key, | |||
| Input: input, | |||
| Output: output, | |||
| } | |||
| } | |||
| func DominoOpDecoder(pop ProofOp) (ProofOperator, error) { | |||
| if pop.Type != ProofOpDomino { | |||
| panic("unexpected proof op type") | |||
| } | |||
| var op DominoOp // a bit strange as we'll discard this, but it works. | |||
| err := amino.UnmarshalBinaryLengthPrefixed(pop.Data, &op) | |||
| if err != nil { | |||
| return nil, cmn.ErrorWrap(err, "decoding ProofOp.Data into SimpleValueOp") | |||
| } | |||
| return NewDominoOp(string(pop.Key), op.Input, op.Output), nil | |||
| } | |||
| func (dop DominoOp) ProofOp() ProofOp { | |||
| bz := amino.MustMarshalBinaryLengthPrefixed(dop) | |||
| return ProofOp{ | |||
| Type: ProofOpDomino, | |||
| Key: []byte(dop.key), | |||
| Data: bz, | |||
| } | |||
| } | |||
| func (dop DominoOp) Run(input [][]byte) (output [][]byte, err error) { | |||
| if len(input) != 1 { | |||
| return nil, cmn.NewError("Expected input of length 1") | |||
| } | |||
| if string(input[0]) != dop.Input { | |||
| return nil, cmn.NewError("Expected input %v, got %v", | |||
| dop.Input, string(input[0])) | |||
| } | |||
| return [][]byte{[]byte(dop.Output)}, nil | |||
| } | |||
| func (dop DominoOp) GetKey() []byte { | |||
| return []byte(dop.key) | |||
| } | |||
| //---------------------------------------- | |||
| func TestProofOperators(t *testing.T) { | |||
| var err error | |||
| // ProofRuntime setup | |||
| // TODO test this somehow. | |||
| // prt := NewProofRuntime() | |||
| // prt.RegisterOpDecoder(ProofOpDomino, DominoOpDecoder) | |||
| // ProofOperators setup | |||
| op1 := NewDominoOp("KEY1", "INPUT1", "INPUT2") | |||
| op2 := NewDominoOp("KEY2", "INPUT2", "INPUT3") | |||
| op3 := NewDominoOp("", "INPUT3", "INPUT4") | |||
| op4 := NewDominoOp("KEY4", "INPUT4", "OUTPUT4") | |||
| // Good | |||
| popz := ProofOperators([]ProofOperator{op1, op2, op3, op4}) | |||
| err = popz.Verify(bz("OUTPUT4"), "/KEY4/KEY2/KEY1", [][]byte{bz("INPUT1")}) | |||
| assert.Nil(t, err) | |||
| err = popz.VerifyValue(bz("OUTPUT4"), "/KEY4/KEY2/KEY1", bz("INPUT1")) | |||
| assert.Nil(t, err) | |||
| // BAD INPUT | |||
| err = popz.Verify(bz("OUTPUT4"), "/KEY4/KEY2/KEY1", [][]byte{bz("INPUT1_WRONG")}) | |||
| assert.NotNil(t, err) | |||
| err = popz.VerifyValue(bz("OUTPUT4"), "/KEY4/KEY2/KEY1", bz("INPUT1_WRONG")) | |||
| assert.NotNil(t, err) | |||
| // BAD KEY 1 | |||
| err = popz.Verify(bz("OUTPUT4"), "/KEY3/KEY2/KEY1", [][]byte{bz("INPUT1")}) | |||
| assert.NotNil(t, err) | |||
| // BAD KEY 2 | |||
| err = popz.Verify(bz("OUTPUT4"), "KEY4/KEY2/KEY1", [][]byte{bz("INPUT1")}) | |||
| assert.NotNil(t, err) | |||
| // BAD KEY 3 | |||
| err = popz.Verify(bz("OUTPUT4"), "/KEY4/KEY2/KEY1/", [][]byte{bz("INPUT1")}) | |||
| assert.NotNil(t, err) | |||
| // BAD KEY 4 | |||
| err = popz.Verify(bz("OUTPUT4"), "//KEY4/KEY2/KEY1", [][]byte{bz("INPUT1")}) | |||
| assert.NotNil(t, err) | |||
| // BAD KEY 5 | |||
| err = popz.Verify(bz("OUTPUT4"), "/KEY2/KEY1", [][]byte{bz("INPUT1")}) | |||
| assert.NotNil(t, err) | |||
| // BAD OUTPUT 1 | |||
| err = popz.Verify(bz("OUTPUT4_WRONG"), "/KEY4/KEY2/KEY1", [][]byte{bz("INPUT1")}) | |||
| assert.NotNil(t, err) | |||
| // BAD OUTPUT 2 | |||
| err = popz.Verify(bz(""), "/KEY4/KEY2/KEY1", [][]byte{bz("INPUT1")}) | |||
| assert.NotNil(t, err) | |||
| // BAD POPZ 1 | |||
| popz = []ProofOperator{op1, op2, op4} | |||
| err = popz.Verify(bz("OUTPUT4"), "/KEY4/KEY2/KEY1", [][]byte{bz("INPUT1")}) | |||
| assert.NotNil(t, err) | |||
| // BAD POPZ 2 | |||
| popz = []ProofOperator{op4, op3, op2, op1} | |||
| err = popz.Verify(bz("OUTPUT4"), "/KEY4/KEY2/KEY1", [][]byte{bz("INPUT1")}) | |||
| assert.NotNil(t, err) | |||
| // BAD POPZ 3 | |||
| popz = []ProofOperator{} | |||
| err = popz.Verify(bz("OUTPUT4"), "/KEY4/KEY2/KEY1", [][]byte{bz("INPUT1")}) | |||
| assert.NotNil(t, err) | |||
| } | |||
| func bz(s string) []byte { | |||
| return []byte(s) | |||
| } | |||
+ 6
- 6
crypto/merkle/simple_map_test.go
View File
+ 31
- 11
crypto/random.go
View File
+ 25
- 8
crypto/tmhash/hash.go
View File
+ 21
- 2
crypto/tmhash/hash_test.go
View File
+ 6
- 0
docs/app-dev/ecosystem.json
View File
+ 4
- 4
docs/architecture/adr-001-logging.md
View File
+ 29
- 22
docs/architecture/adr-016-protocol-versions.md
View File
+ 122
- 0
docs/architecture/adr-033-pubsub.md
View File
| @ -0,0 +1,122 @@ | |||
| # ADR 033: pubsub 2.0 | |||
| Author: Anton Kaliaev (@melekes) | |||
| ## Changelog | |||
| 02-10-2018: Initial draft | |||
| ## Context | |||
| Since the initial version of the pubsub, there's been a number of issues | |||
| raised: #951, #1879, #1880. Some of them are high-level issues questioning the | |||
| core design choices made. Others are minor and mostly about the interface of | |||
| `Subscribe()` / `Publish()` functions. | |||
| ### Sync vs Async | |||
| Now, when publishing a message to subscribers, we can do it in a goroutine: | |||
| _using channels for data transmission_ | |||
| ```go | |||
| for each subscriber { | |||
| out := subscriber.outc | |||
| go func() { | |||
| out <- msg | |||
| } | |||
| } | |||
| ``` | |||
| _by invoking callback functions_ | |||
| ```go | |||
| for each subscriber { | |||
| go subscriber.callbackFn() | |||
| } | |||
| ``` | |||
| This gives us greater performance and allows us to avoid "slow client problem" | |||
| (when other subscribers have to wait for a slow subscriber). A pool of | |||
| goroutines can be used to avoid uncontrolled memory growth. | |||
| In certain cases, this is what you want. But in our case, because we need | |||
| strict ordering of events (if event A was published before B, the guaranteed | |||
| delivery order will be A -> B), we can't use goroutines. | |||
| There is also a question whenever we should have a non-blocking send: | |||
| ```go | |||
| for each subscriber { | |||
| out := subscriber.outc | |||
| select { | |||
| case out <- msg: | |||
| default: | |||
| log("subscriber %v buffer is full, skipping...") | |||
| } | |||
| } | |||
| ``` | |||
| This fixes the "slow client problem", but there is no way for a slow client to | |||
| know if it had missed a message. On the other hand, if we're going to stick | |||
| with blocking send, **devs must always ensure subscriber's handling code does not | |||
| block**. As you can see, there is an implicit choice between ordering guarantees | |||
| and using goroutines. | |||
| The interim option is to run goroutines pool for a single message, wait for all | |||
| goroutines to finish. This will solve "slow client problem", but we'd still | |||
| have to wait `max(goroutine_X_time)` before we can publish the next message. | |||
| My opinion: not worth doing. | |||
| ### Channels vs Callbacks | |||
| Yet another question is whether we should use channels for message transmission or | |||
| call subscriber-defined callback functions. Callback functions give subscribers | |||
| more flexibility - you can use mutexes in there, channels, spawn goroutines, | |||
| anything you really want. But they also carry local scope, which can result in | |||
| memory leaks and/or memory usage increase. | |||
| Go channels are de-facto standard for carrying data between goroutines. | |||
| **Question: Is it worth switching to callback functions?** | |||
| ### Why `Subscribe()` accepts an `out` channel? | |||
| Because in our tests, we create buffered channels (cap: 1). Alternatively, we | |||
| can make capacity an argument. | |||
| ## Decision | |||
| Change Subscribe() function to return out channel: | |||
| ```go | |||
| // outCap can be used to set capacity of out channel (unbuffered by default). | |||
| Subscribe(ctx context.Context, clientID string, query Query, outCap... int) (out <-chan interface{}, err error) { | |||
| ``` | |||
| It's more idiomatic since we're closing it during Unsubscribe/UnsubscribeAll calls. | |||
| Also, we should make tags available to subscribers: | |||
| ```go | |||
| type MsgAndTags struct { | |||
| Msg interface{} | |||
| Tags TagMap | |||
| } | |||
| // outCap can be used to set capacity of out channel (unbuffered by default). | |||
| Subscribe(ctx context.Context, clientID string, query Query, outCap... int) (out <-chan MsgAndTags, err error) { | |||
| ``` | |||
| ## Status | |||
| In review | |||
| ## Consequences | |||
| ### Positive | |||
| - more idiomatic interface | |||
| - subscribers know what tags msg was published with | |||
| ### Negative | |||
| ### Neutral | |||
+ 4
- 0
docs/architecture/adr-template.md
View File
+ 16
- 5
docs/spec/abci/abci.md
View File
+ 9
- 9
docs/spec/blockchain/blockchain.md
View File
+ 6
- 8
docs/spec/blockchain/encoding.md
View File
+ 2
- 2
docs/spec/blockchain/state.md
View File
+ 9
- 6
docs/spec/reactors/consensus/consensus-reactor.md
View File
+ 16
- 17
docs/spec/reactors/consensus/consensus.md
View File
+ 1
- 1
evidence/pool.go
View File
+ 1
- 1
evidence/pool_test.go
View File
+ 22
- 3
evidence/reactor.go
View File
+ 1
- 1
libs/common/errors_test.go
View File
+ 78
- 0
libs/fail/fail.go
View File
| @ -0,0 +1,78 @@ | |||
| package fail | |||
| import ( | |||
| "fmt" | |||
| "math/rand" | |||
| "os" | |||
| "strconv" | |||
| ) | |||
| var callIndexToFail int | |||
| func init() { | |||
| callIndexToFailS := os.Getenv("FAIL_TEST_INDEX") | |||
| if callIndexToFailS == "" { | |||
| callIndexToFail = -1 | |||
| } else { | |||
| var err error | |||
| callIndexToFail, err = strconv.Atoi(callIndexToFailS) | |||
| if err != nil { | |||
| callIndexToFail = -1 | |||
| } | |||
| } | |||
| } | |||
| // Fail when FAIL_TEST_INDEX == callIndex | |||
| var ( | |||
| callIndex int //indexes Fail calls | |||
| callRandIndex int // indexes a run of FailRand calls | |||
| callRandIndexToFail = -1 // the callRandIndex to fail on in FailRand | |||
| ) | |||
| func Fail() { | |||
| if callIndexToFail < 0 { | |||
| return | |||
| } | |||
| if callIndex == callIndexToFail { | |||
| Exit() | |||
| } | |||
| callIndex += 1 | |||
| } | |||
| // FailRand should be called n successive times. | |||
| // It will fail on a random one of those calls | |||
| // n must be greater than 0 | |||
| func FailRand(n int) { | |||
| if callIndexToFail < 0 { | |||
| return | |||
| } | |||
| if callRandIndexToFail < 0 { | |||
| // first call in the loop, pick a random index to fail at | |||
| callRandIndexToFail = rand.Intn(n) | |||
| callRandIndex = 0 | |||
| } | |||
| if callIndex == callIndexToFail { | |||
| if callRandIndex == callRandIndexToFail { | |||
| Exit() | |||
| } | |||
| } | |||
| callRandIndex += 1 | |||
| if callRandIndex == n { | |||
| callIndex += 1 | |||
| } | |||
| } | |||
| func Exit() { | |||
| fmt.Printf("*** fail-test %d ***\n", callIndex) | |||
| proc, _ := os.FindProcess(os.Getpid()) | |||
| proc.Signal(os.Interrupt) | |||
| // panic(fmt.Sprintf("*** fail-test %d ***", callIndex)) | |||
| } | |||
+ 3
- 3
libs/log/tmfmt_logger.go
View File
+ 5
- 5
lite/dbprovider.go
View File
+ 77
- 46
mempool/mempool.go
View File
+ 24
- 40
mempool/mempool_test.go
View File
+ 28
- 7
node/node.go
View File
+ 22
- 0
node/node_test.go
View File
+ 5
- 5
p2p/conn/connection.go
View File
+ 19
- 19
p2p/conn/connection_test.go
View File
+ 4
- 4
p2p/conn/secret_connection.go
View File
+ 5
- 0
p2p/dummy/peer.go
View File
+ 1
- 2
p2p/key.go
View File
+ 16
- 5
p2p/node_info.go
View File
+ 31
- 3
p2p/peer.go
View File
+ 1
- 0
p2p/peer_set_test.go
View File
+ 2
- 2
p2p/peer_test.go
View File
+ 4
- 0
p2p/pex/addrbook.go
View File
+ 8
- 0
p2p/pex/errors.go
View File
+ 22
- 6
p2p/pex/pex_reactor.go
View File
+ 1
- 0
p2p/pex/pex_reactor_test.go
View File
+ 6
- 3
p2p/switch.go
View File
+ 8
- 6
p2p/test_util.go
View File
+ 15
- 10
p2p/transport.go
View File
+ 2
- 2
p2p/transport_test.go
View File
+ 6
- 6
privval/priv_validator.go
View File
+ 8
- 8
privval/priv_validator_test.go
View File
+ 2
- 2
privval/remote_signer.go
View File
+ 1
- 1
proxy/app_conn_test.go
View File
+ 15
- 0
proxy/version.go
View File
| @ -0,0 +1,15 @@ | |||
| package proxy | |||
| import ( | |||
| abci "github.com/tendermint/tendermint/abci/types" | |||
| "github.com/tendermint/tendermint/version" | |||
| ) | |||
| // RequestInfo contains all the information for sending | |||
| // the abci.RequestInfo message during handshake with the app. | |||
| // It contains only compile-time version information. | |||
| var RequestInfo = abci.RequestInfo{ | |||
| Version: version.Version, | |||
| BlockVersion: version.BlockProtocol.Uint64(), | |||
| P2PVersion: version.P2PProtocol.Uint64(), | |||
| } | |||
+ 2
- 2
rpc/client/mock/abci.go
View File
+ 2
- 2
rpc/core/abci.go
View File
+ 1
- 2
rpc/lib/server/http_server.go
View File
+ 16
- 0
scripts/authors.sh
View File
| @ -0,0 +1,16 @@ | |||
| #! /bin/bash | |||
| # Usage: | |||
| # `./authors.sh` | |||
| # Print a list of all authors who have committed to develop since master. | |||
| # | |||
| # `./authors.sh <email address>` | |||
| # Lookup the email address on Github and print the associated username | |||
| author=$1 | |||
| if [[ "$author" == "" ]]; then | |||
| git log master..develop | grep Author | sort | uniq | |||
| else | |||
| curl -s "https://api.github.com/search/users?q=$author+in%3Aemail&type=Users&utf8=%E2%9C%93" | jq .items[0].login | |||
| fi | |||
+ 2
- 2
state/execution.go
View File
+ 18
- 30
state/state.go
View File
+ 4
- 4
state/state_test.go
View File
+ 1
- 1
state/store.go
View File
+ 23
- 33
state/validation.go
View File
+ 7
- 4
test/docker/Dockerfile
View File
+ 3
- 6
test/p2p/README.md
View File
+ 0
- 39
test/p2p/data/mach1/core/config/genesis.json
View File
| @ -1,39 +0,0 @@ | |||
| { | |||
| "genesis_time": "2016-06-24T20:01:19.322Z", | |||
| "chain_id": "chain-9ujDWI", | |||
| "validators": [ | |||
| { | |||
| "pub_key": { | |||
| "type": "tendermint/PubKeyEd25519", | |||
| "value": "vokz3/FgDAJuNHGPF4Wkzeq5DDVpizlOOLaUeukd4RY=" | |||
| }, | |||
| "power": "1", | |||
| "name": "mach1" | |||
| }, | |||
| { | |||
| "pub_key": { | |||
| "type": "tendermint/PubKeyEd25519", | |||
| "value": "bcU0RlMjEmWH0qKpO1nWibcXBzsd6WiiWm7xPVlTGK0=" | |||
| }, | |||
| "power": "1", | |||
| "name": "mach2" | |||
| }, | |||
| { | |||
| "pub_key": { | |||
| "type": "tendermint/PubKeyEd25519", | |||
| "value": "rmesaX0TWqC0YB6lfqqz/r9Lqk8inEWlmMKYWxL80aE=" | |||
| }, | |||
| "power": "1", | |||
| "name": "mach3" | |||
| }, | |||
| { | |||
| "pub_key": { | |||
| "type": "tendermint/PubKeyEd25519", | |||
| "value": "nryPWM7UtG3NWrirpZHdJTzXy1A3Jz/aMrwLZGHE79k=" | |||
| }, | |||
| "power": "1", | |||
| "name": "mach4" | |||
| } | |||
| ], | |||
| "app_hash": "" | |||
| } | |||
+ 0
- 6
test/p2p/data/mach1/core/config/node_key.json
View File
| @ -1,6 +0,0 @@ | |||
| { | |||
| "priv_key": { | |||
| "type": "tendermint/PrivKeyEd25519", | |||
| "value": "BpYtFp8xSrudBa5aBLRuSPD72PGDAUm0dJORDL3Kd5YJbluUzRefVFrjwoHZv1yeDj2P9xkEi2L3hJCUz/qFkQ==" | |||
| } | |||
| } | |||
+ 0
- 14
test/p2p/data/mach1/core/config/priv_validator.json
View File
| @ -1,14 +0,0 @@ | |||
| { | |||
| "address": "AE47BBD4B3ACD80BFE17F6E0C66C5B8492A81AE4", | |||
| "pub_key": { | |||
| "type": "tendermint/PubKeyEd25519", | |||
| "value": "vokz3/FgDAJuNHGPF4Wkzeq5DDVpizlOOLaUeukd4RY=" | |||
| }, | |||
| "last_height": "0", | |||
| "last_round": "0", | |||
| "last_step": 0, | |||
| "priv_key": { | |||
| "type": "tendermint/PrivKeyEd25519", | |||
| "value": "VHqgfHqM4WxcsqQMbCbRWwoylgQQqfHqblC2NvGrOJq+iTPf8WAMAm40cY8XhaTN6rkMNWmLOU44tpR66R3hFg==" | |||
| } | |||
| } | |||
+ 0
- 39
test/p2p/data/mach2/core/config/genesis.json
View File
| @ -1,39 +0,0 @@ | |||
| { | |||
| "genesis_time": "2016-06-24T20:01:19.322Z", | |||
| "chain_id": "chain-9ujDWI", | |||
| "validators": [ | |||
| { | |||
| "pub_key": { | |||
| "type": "tendermint/PubKeyEd25519", | |||
| "value": "vokz3/FgDAJuNHGPF4Wkzeq5DDVpizlOOLaUeukd4RY=" | |||
| }, | |||
| "power": "1", | |||
| "name": "mach1" | |||
| }, | |||
| { | |||
| "pub_key": { | |||
| "type": "tendermint/PubKeyEd25519", | |||
| "value": "bcU0RlMjEmWH0qKpO1nWibcXBzsd6WiiWm7xPVlTGK0=" | |||
| }, | |||
| "power": "1", | |||
| "name": "mach2" | |||
| }, | |||
| { | |||
| "pub_key": { | |||
| "type": "tendermint/PubKeyEd25519", | |||
| "value": "rmesaX0TWqC0YB6lfqqz/r9Lqk8inEWlmMKYWxL80aE=" | |||
| }, | |||
| "power": "1", | |||
| "name": "mach3" | |||
| }, | |||
| { | |||
| "pub_key": { | |||
| "type": "tendermint/PubKeyEd25519", | |||
| "value": "nryPWM7UtG3NWrirpZHdJTzXy1A3Jz/aMrwLZGHE79k=" | |||
| }, | |||
| "power": "1", | |||
| "name": "mach4" | |||
| } | |||
| ], | |||
| "app_hash": "" | |||
| } | |||
+ 0
- 6
test/p2p/data/mach2/core/config/node_key.json
View File
| @ -1,6 +0,0 @@ | |||
| { | |||
| "priv_key": { | |||
| "type": "tendermint/PrivKeyEd25519", | |||
| "value": "uM6LDVE4wQIIUmq9rc6RxzX8zEGG4G4Jcuw15klzQopF68YfJM4bkbPSavurEcJ4nvBMusKBg2GcARFrZqnFKA==" | |||
| } | |||
| } | |||
+ 0
- 14
test/p2p/data/mach2/core/config/priv_validator.json
View File
| @ -1,14 +0,0 @@ | |||
| { | |||
| "address": "5D61EE46CCE91F579086522D7FD8CEC3F854E946", | |||
| "pub_key": { | |||
| "type": "tendermint/PubKeyEd25519", | |||
| "value": "bcU0RlMjEmWH0qKpO1nWibcXBzsd6WiiWm7xPVlTGK0=" | |||
| }, | |||
| "last_height": "0", | |||
| "last_round": "0", | |||
| "last_step": 0, | |||
| "priv_key": { | |||
| "type": "tendermint/PrivKeyEd25519", | |||
| "value": "0EeInmBQL8MSnQq38zSxg47Z7R7Nmcu5a3GtWr9agUNtxTRGUyMSZYfSoqk7WdaJtxcHOx3paKJabvE9WVMYrQ==" | |||
| } | |||
| } | |||
+ 0
- 39
test/p2p/data/mach3/core/config/genesis.json
View File
| @ -1,39 +0,0 @@ | |||
| { | |||
| "genesis_time": "2016-06-24T20:01:19.322Z", | |||
| "chain_id": "chain-9ujDWI", | |||
| "validators": [ | |||
| { | |||
| "pub_key": { | |||
| "type": "tendermint/PubKeyEd25519", | |||
| "value": "vokz3/FgDAJuNHGPF4Wkzeq5DDVpizlOOLaUeukd4RY=" | |||
| }, | |||
| "power": "1", | |||
| "name": "mach1" | |||
| }, | |||
| { | |||
| "pub_key": { | |||
| "type": "tendermint/PubKeyEd25519", | |||
| "value": "bcU0RlMjEmWH0qKpO1nWibcXBzsd6WiiWm7xPVlTGK0=" | |||
| }, | |||
| "power": "1", | |||
| "name": "mach2" | |||
| }, | |||
| { | |||
| "pub_key": { | |||
| "type": "tendermint/PubKeyEd25519", | |||
| "value": "rmesaX0TWqC0YB6lfqqz/r9Lqk8inEWlmMKYWxL80aE=" | |||
| }, | |||
| "power": "1", | |||
| "name": "mach3" | |||
| }, | |||
| { | |||
| "pub_key": { | |||
| "type": "tendermint/PubKeyEd25519", | |||
| "value": "nryPWM7UtG3NWrirpZHdJTzXy1A3Jz/aMrwLZGHE79k=" | |||
| }, | |||
| "power": "1", | |||
| "name": "mach4" | |||
| } | |||
| ], | |||
| "app_hash": "" | |||
| } | |||
+ 0
- 6
test/p2p/data/mach3/core/config/node_key.json
View File
| @ -1,6 +0,0 @@ | |||
| { | |||
| "priv_key": { | |||
| "type": "tendermint/PrivKeyEd25519", | |||
| "value": "kT3orG0YkipT9rAZbvAjtGk/7Pu1ZeCE8LSUF2jz2uiSs1rdlUVi/gccRlvCRLKvrtSicOyEkmk0FHPOGS3mgg==" | |||
| } | |||
| } | |||