Browse Source
Merge pull request #1703 from tendermint/release/v0.20.0
Release/v0.20.0pull/1718/merge v0.20.0
Ethan Buchman
7 years ago
committed by
GitHub
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
32 changed files with 723 additions and 244 deletions
Split View
Diff Options
-
+20 -0CHANGELOG.md
-
+5 -11Gopkg.lock
-
+1 -1Gopkg.toml
-
+4 -4cmd/tendermint/commands/reset_priv_validator.go
-
+2 -6config/config.go
-
+2 -5consensus/byzantine_test.go
-
+14 -9consensus/reactor_test.go
-
+26 -8consensus/replay.go
-
+1 -1consensus/replay_file.go
-
+59 -7consensus/replay_test.go
-
+1 -1consensus/wal_generator.go
-
+5 -1docs/install.rst
-
+31 -6docs/spec/blockchain/encoding.md
-
+33 -7docs/spec/consensus/abci.md
-
+2 -2node/node.go
-
+2 -1p2p/peer.go
-
+8 -4p2p/peer_test.go
-
+1 -1p2p/pex/pex_reactor.go
-
+10 -5p2p/switch.go
-
+54 -0scripts/install/install_tendermint_bsd.sh
-
+0 -0scripts/install/install_tendermint_ubuntu.sh
-
+66 -42state/execution.go
-
+64 -29state/execution_test.go
-
+4 -7state/state_test.go
-
+3 -2state/store.go
-
+17 -14state/validation.go
-
+1 -1state/validation_test.go
-
+28 -28types/evidence.go
-
+5 -6types/evidence_test.go
-
+182 -32types/protobuf.go
-
+69 -0types/protobuf_test.go
-
+3 -3version/version.go
+ 20
- 0
CHANGELOG.md
View File
+ 5
- 11
Gopkg.lock
View File
+ 1
- 1
Gopkg.toml
View File
+ 4
- 4
cmd/tendermint/commands/reset_priv_validator.go
View File
+ 2
- 6
config/config.go
View File
+ 2
- 5
consensus/byzantine_test.go
View File
+ 14
- 9
consensus/reactor_test.go
View File
+ 26
- 8
consensus/replay.go
View File
+ 1
- 1
consensus/replay_file.go
View File
+ 59
- 7
consensus/replay_test.go
View File
+ 1
- 1
consensus/wal_generator.go
View File
+ 5
- 1
docs/install.rst
View File
+ 31
- 6
docs/spec/blockchain/encoding.md
View File
+ 33
- 7
docs/spec/consensus/abci.md
View File
+ 2
- 2
node/node.go
View File
+ 2
- 1
p2p/peer.go
View File
+ 8
- 4
p2p/peer_test.go
View File
+ 1
- 1
p2p/pex/pex_reactor.go
View File
+ 10
- 5
p2p/switch.go
View File
+ 54
- 0
scripts/install/install_tendermint_bsd.sh
View File
| @ -0,0 +1,54 @@ | |||
| #!/usr/bin/tcsh | |||
| # XXX: this script is intended to be run from | |||
| # a fresh Digital Ocean droplet with FreeBSD | |||
| # Just run tcsh install_tendermint_bsd.sh | |||
| # upon its completion, you must either reset | |||
| # your terminal or run `source ~/.tcshrc` | |||
| # This assumes your installing it through tcsh as root. | |||
| # Change the relevant lines from tcsh to csh if your | |||
| # installing as a different user, along with changing the | |||
| # gopath. | |||
| # change this to a specific release or branch | |||
| set BRANCH=master | |||
| sudo pkg update | |||
| sudo pkg upgrade -y | |||
| sudo pkg install -y gmake | |||
| sudo pkg install -y git | |||
| # get and unpack golang | |||
| curl -O https://storage.googleapis.com/golang/go1.10.freebsd-amd64.tar.gz | |||
| tar -xvf go1.10.freebsd-amd64.tar.gz | |||
| # move go binary and add to path | |||
| mv go /usr/local | |||
| set path=($path /usr/local/go/bin) | |||
| # create the go directory, set GOPATH, and put it on PATH | |||
| mkdir go | |||
| echo "setenv GOPATH /root/go" >> ~/.tcshrc | |||
| setenv GOPATH /root/go | |||
| echo "set path=($path $GOPATH/bin)" >> ~/.tcshrc | |||
| source ~/.tcshrc | |||
| # get the code and move into repo | |||
| set REPO=github.com/tendermint/tendermint | |||
| go get $REPO | |||
| cd $GOPATH/src/$REPO | |||
| # build & install master | |||
| git checkout $BRANCH | |||
| gmake get_tools | |||
| gmake get_vendor_deps | |||
| gmake install | |||
| # the binary is located in $GOPATH/bin | |||
| # run `source ~/.profile` or reset your terminal | |||
| # to persist the changes | |||
scripts/install_tendermint.sh → scripts/install/install_tendermint_ubuntu.sh
View File
+ 66
- 42
state/execution.go
View File
+ 64
- 29
state/execution_test.go
View File
+ 4
- 7
state/state_test.go
View File
+ 3
- 2
state/store.go
View File
+ 17
- 14
state/validation.go
View File
+ 1
- 1
state/validation_test.go
View File
+ 28
- 28
types/evidence.go
View File
+ 5
- 6
types/evidence_test.go
View File
+ 182
- 32
types/protobuf.go
View File
| @ -1,71 +1,221 @@ | |||
| package types | |||
| import ( | |||
| "github.com/tendermint/abci/types" | |||
| "bytes" | |||
| "fmt" | |||
| "reflect" | |||
| "time" | |||
| abci "github.com/tendermint/abci/types" | |||
| crypto "github.com/tendermint/go-crypto" | |||
| ) | |||
| //------------------------------------------------------- | |||
| // Use strings to distinguish types in ABCI messages | |||
| const ( | |||
| ABCIEvidenceTypeDuplicateVote = "duplicate/vote" | |||
| ABCIEvidenceTypeMockGood = "mock/good" | |||
| ) | |||
| const ( | |||
| ABCIPubKeyTypeEd25519 = "ed25519" | |||
| ABCIPubKeyTypeSecp256k1 = "secp256k1" | |||
| ) | |||
| // TM2PB is used for converting Tendermint types to protobuf types. | |||
| //------------------------------------------------------- | |||
| // TM2PB is used for converting Tendermint ABCI to protobuf ABCI. | |||
| // UNSTABLE | |||
| var TM2PB = tm2pb{} | |||
| type tm2pb struct{} | |||
| func (tm2pb) Header(header *Header) types.Header { | |||
| return types.Header{ | |||
| ChainID: header.ChainID, | |||
| Height: header.Height, | |||
| Time: header.Time.Unix(), | |||
| NumTxs: int32(header.NumTxs), // XXX: overflow | |||
| LastBlockID: TM2PB.BlockID(header.LastBlockID), | |||
| LastCommitHash: header.LastCommitHash, | |||
| DataHash: header.DataHash, | |||
| func (tm2pb) Header(header *Header) abci.Header { | |||
| return abci.Header{ | |||
| ChainID: header.ChainID, | |||
| Height: header.Height, | |||
| Time: header.Time.Unix(), | |||
| NumTxs: int32(header.NumTxs), // XXX: overflow | |||
| TotalTxs: header.TotalTxs, | |||
| LastBlockHash: header.LastBlockID.Hash, | |||
| ValidatorsHash: header.ValidatorsHash, | |||
| AppHash: header.AppHash, | |||
| } | |||
| } | |||
| func (tm2pb) BlockID(blockID BlockID) types.BlockID { | |||
| return types.BlockID{ | |||
| Hash: blockID.Hash, | |||
| Parts: TM2PB.PartSetHeader(blockID.PartsHeader), | |||
| // Proposer: TODO | |||
| } | |||
| } | |||
| func (tm2pb) PartSetHeader(partSetHeader PartSetHeader) types.PartSetHeader { | |||
| return types.PartSetHeader{ | |||
| Total: int32(partSetHeader.Total), // XXX: overflow | |||
| Hash: partSetHeader.Hash, | |||
| // XXX: panics on unknown pubkey type | |||
| func (tm2pb) Validator(val *Validator) abci.Validator { | |||
| return abci.Validator{ | |||
| Address: val.PubKey.Address(), | |||
| PubKey: TM2PB.PubKey(val.PubKey), | |||
| Power: val.VotingPower, | |||
| } | |||
| } | |||
| func (tm2pb) Validator(val *Validator) types.Validator { | |||
| return types.Validator{ | |||
| PubKey: val.PubKey.Bytes(), | |||
| Power: val.VotingPower, | |||
| // XXX: panics on nil or unknown pubkey type | |||
| // TODO: add cases when new pubkey types are added to go-crypto | |||
| func (tm2pb) PubKey(pubKey crypto.PubKey) abci.PubKey { | |||
| switch pk := pubKey.(type) { | |||
| case crypto.PubKeyEd25519: | |||
| return abci.PubKey{ | |||
| Type: ABCIPubKeyTypeEd25519, | |||
| Data: pk[:], | |||
| } | |||
| case crypto.PubKeySecp256k1: | |||
| return abci.PubKey{ | |||
| Type: ABCIPubKeyTypeSecp256k1, | |||
| Data: pk[:], | |||
| } | |||
| default: | |||
| panic(fmt.Sprintf("unknown pubkey type: %v %v", pubKey, reflect.TypeOf(pubKey))) | |||
| } | |||
| } | |||
| func (tm2pb) Validators(vals *ValidatorSet) []types.Validator { | |||
| validators := make([]types.Validator, len(vals.Validators)) | |||
| // XXX: panics on nil or unknown pubkey type | |||
| func (tm2pb) Validators(vals *ValidatorSet) []abci.Validator { | |||
| validators := make([]abci.Validator, len(vals.Validators)) | |||
| for i, val := range vals.Validators { | |||
| validators[i] = TM2PB.Validator(val) | |||
| } | |||
| return validators | |||
| } | |||
| func (tm2pb) ConsensusParams(params *ConsensusParams) *types.ConsensusParams { | |||
| return &types.ConsensusParams{ | |||
| BlockSize: &types.BlockSize{ | |||
| func (tm2pb) ConsensusParams(params *ConsensusParams) *abci.ConsensusParams { | |||
| return &abci.ConsensusParams{ | |||
| BlockSize: &abci.BlockSize{ | |||
| MaxBytes: int32(params.BlockSize.MaxBytes), | |||
| MaxTxs: int32(params.BlockSize.MaxTxs), | |||
| MaxGas: params.BlockSize.MaxGas, | |||
| }, | |||
| TxSize: &types.TxSize{ | |||
| TxSize: &abci.TxSize{ | |||
| MaxBytes: int32(params.TxSize.MaxBytes), | |||
| MaxGas: params.TxSize.MaxGas, | |||
| }, | |||
| BlockGossip: &types.BlockGossip{ | |||
| BlockGossip: &abci.BlockGossip{ | |||
| BlockPartSizeBytes: int32(params.BlockGossip.BlockPartSizeBytes), | |||
| }, | |||
| } | |||
| } | |||
| // ABCI Evidence includes information from the past that's not included in the evidence itself | |||
| // so Evidence types stays compact. | |||
| // XXX: panics on nil or unknown pubkey type | |||
| func (tm2pb) Evidence(ev Evidence, valSet *ValidatorSet, evTime time.Time) abci.Evidence { | |||
| _, val := valSet.GetByAddress(ev.Address()) | |||
| if val == nil { | |||
| // should already have checked this | |||
| panic(val) | |||
| } | |||
| // set type | |||
| var evType string | |||
| switch ev.(type) { | |||
| case *DuplicateVoteEvidence: | |||
| evType = ABCIEvidenceTypeDuplicateVote | |||
| case MockGoodEvidence: | |||
| // XXX: not great to have test types in production paths ... | |||
| evType = ABCIEvidenceTypeMockGood | |||
| default: | |||
| panic(fmt.Sprintf("Unknown evidence type: %v %v", ev, reflect.TypeOf(ev))) | |||
| } | |||
| return abci.Evidence{ | |||
| Type: evType, | |||
| Validator: TM2PB.Validator(val), | |||
| Height: ev.Height(), | |||
| Time: evTime.Unix(), | |||
| TotalVotingPower: valSet.TotalVotingPower(), | |||
| } | |||
| } | |||
| // XXX: panics on nil or unknown pubkey type | |||
| func (tm2pb) ValidatorFromPubKeyAndPower(pubkey crypto.PubKey, power int64) abci.Validator { | |||
| pubkeyABCI := TM2PB.PubKey(pubkey) | |||
| return abci.Validator{ | |||
| Address: pubkey.Address(), | |||
| PubKey: pubkeyABCI, | |||
| Power: power, | |||
| } | |||
| } | |||
| //---------------------------------------------------------------------------- | |||
| // PB2TM is used for converting protobuf ABCI to Tendermint ABCI. | |||
| // UNSTABLE | |||
| var PB2TM = pb2tm{} | |||
| type pb2tm struct{} | |||
| func (pb2tm) PubKey(pubKey abci.PubKey) (crypto.PubKey, error) { | |||
| // TODO: define these in go-crypto and use them | |||
| sizeEd := 32 | |||
| sizeSecp := 33 | |||
| switch pubKey.Type { | |||
| case ABCIPubKeyTypeEd25519: | |||
| if len(pubKey.Data) != sizeEd { | |||
| return nil, fmt.Errorf("Invalid size for PubKeyEd25519. Got %d, expected %d", len(pubKey.Data), sizeEd) | |||
| } | |||
| var pk crypto.PubKeyEd25519 | |||
| copy(pk[:], pubKey.Data) | |||
| return pk, nil | |||
| case ABCIPubKeyTypeSecp256k1: | |||
| if len(pubKey.Data) != sizeSecp { | |||
| return nil, fmt.Errorf("Invalid size for PubKeyEd25519. Got %d, expected %d", len(pubKey.Data), sizeSecp) | |||
| } | |||
| var pk crypto.PubKeySecp256k1 | |||
| copy(pk[:], pubKey.Data) | |||
| return pk, nil | |||
| default: | |||
| return nil, fmt.Errorf("Unknown pubkey type %v", pubKey.Type) | |||
| } | |||
| } | |||
| func (pb2tm) Validators(vals []abci.Validator) ([]*Validator, error) { | |||
| tmVals := make([]*Validator, len(vals)) | |||
| for i, v := range vals { | |||
| pub, err := PB2TM.PubKey(v.PubKey) | |||
| if err != nil { | |||
| return nil, err | |||
| } | |||
| // If the app provided an address too, it must match. | |||
| // This is just a sanity check. | |||
| if len(v.Address) > 0 { | |||
| if !bytes.Equal(pub.Address(), v.Address) { | |||
| return nil, fmt.Errorf("Validator.Address (%X) does not match PubKey.Address (%X)", | |||
| v.Address, pub.Address()) | |||
| } | |||
| } | |||
| tmVals[i] = &Validator{ | |||
| Address: pub.Address(), | |||
| PubKey: pub, | |||
| VotingPower: v.Power, | |||
| } | |||
| } | |||
| return tmVals, nil | |||
| } | |||
| func (pb2tm) ConsensusParams(csp *abci.ConsensusParams) ConsensusParams { | |||
| return ConsensusParams{ | |||
| BlockSize: BlockSize{ | |||
| MaxBytes: int(csp.BlockSize.MaxBytes), // XXX | |||
| MaxTxs: int(csp.BlockSize.MaxTxs), // XXX | |||
| MaxGas: csp.BlockSize.MaxGas, | |||
| }, | |||
| TxSize: TxSize{ | |||
| MaxBytes: int(csp.TxSize.MaxBytes), // XXX | |||
| MaxGas: csp.TxSize.MaxGas, | |||
| }, | |||
| BlockGossip: BlockGossip{ | |||
| BlockPartSizeBytes: int(csp.BlockGossip.BlockPartSizeBytes), // XXX | |||
| }, | |||
| // TODO: EvidenceParams: EvidenceParams{ | |||
| // MaxAge: int(csp.Evidence.MaxAge), // XXX | |||
| // }, | |||
| } | |||
| } | |||
+ 69
- 0
types/protobuf_test.go
View File
| @ -0,0 +1,69 @@ | |||
| package types | |||
| import ( | |||
| "testing" | |||
| "github.com/stretchr/testify/assert" | |||
| abci "github.com/tendermint/abci/types" | |||
| crypto "github.com/tendermint/go-crypto" | |||
| ) | |||
| func TestABCIPubKey(t *testing.T) { | |||
| pkEd := crypto.GenPrivKeyEd25519().PubKey() | |||
| pkSecp := crypto.GenPrivKeySecp256k1().PubKey() | |||
| testABCIPubKey(t, pkEd, ABCIPubKeyTypeEd25519) | |||
| testABCIPubKey(t, pkSecp, ABCIPubKeyTypeSecp256k1) | |||
| } | |||
| func testABCIPubKey(t *testing.T, pk crypto.PubKey, typeStr string) { | |||
| abciPubKey := TM2PB.PubKey(pk) | |||
| pk2, err := PB2TM.PubKey(abciPubKey) | |||
| assert.Nil(t, err) | |||
| assert.Equal(t, pk, pk2) | |||
| } | |||
| func TestABCIValidators(t *testing.T) { | |||
| pkEd := crypto.GenPrivKeyEd25519().PubKey() | |||
| // correct validator | |||
| tmValExpected := &Validator{ | |||
| Address: pkEd.Address(), | |||
| PubKey: pkEd, | |||
| VotingPower: 10, | |||
| } | |||
| tmVal := &Validator{ | |||
| Address: pkEd.Address(), | |||
| PubKey: pkEd, | |||
| VotingPower: 10, | |||
| } | |||
| abciVal := TM2PB.Validator(tmVal) | |||
| tmVals, err := PB2TM.Validators([]abci.Validator{abciVal}) | |||
| assert.Nil(t, err) | |||
| assert.Equal(t, tmValExpected, tmVals[0]) | |||
| // val with address | |||
| tmVal.Address = pkEd.Address() | |||
| abciVal = TM2PB.Validator(tmVal) | |||
| tmVals, err = PB2TM.Validators([]abci.Validator{abciVal}) | |||
| assert.Nil(t, err) | |||
| assert.Equal(t, tmValExpected, tmVals[0]) | |||
| // val with incorrect address | |||
| abciVal = TM2PB.Validator(tmVal) | |||
| abciVal.Address = []byte("incorrect!") | |||
| tmVals, err = PB2TM.Validators([]abci.Validator{abciVal}) | |||
| assert.NotNil(t, err) | |||
| assert.Nil(t, tmVals) | |||
| } | |||
| func TestABCIConsensusParams(t *testing.T) { | |||
| cp := DefaultConsensusParams() | |||
| cp.EvidenceParams.MaxAge = 0 // TODO add this to ABCI | |||
| abciCP := TM2PB.ConsensusParams(cp) | |||
| cp2 := PB2TM.ConsensusParams(abciCP) | |||
| assert.Equal(t, *cp, cp2) | |||
| } | |||