Browse Source
Merge pull request #1667 from tendermint/bucky/abci-11
Update ABCI for new PubKey type and changes to BeginBlock and InitChainpull/1371/merge
Ethan Buchman
7 years ago
committed by
GitHub
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
18 changed files with 342 additions and 182 deletions
Split View
Diff Options
-
+4 -10Gopkg.lock
-
+1 -1Gopkg.toml
-
+2 -5consensus/byzantine_test.go
-
+14 -9consensus/reactor_test.go
-
+9 -7consensus/replay.go
-
+1 -1consensus/replay_file.go
-
+8 -7consensus/replay_test.go
-
+1 -1consensus/wal_generator.go
-
+1 -1node/node.go
-
+54 -24state/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
-
+125 -29types/protobuf.go
+ 4
- 10
Gopkg.lock
View File
+ 1
- 1
Gopkg.toml
View File
+ 2
- 5
consensus/byzantine_test.go
View File
+ 14
- 9
consensus/reactor_test.go
View File
+ 9
- 7
consensus/replay.go
View File
+ 1
- 1
consensus/replay_file.go
View File
+ 8
- 7
consensus/replay_test.go
View File
+ 1
- 1
consensus/wal_generator.go
View File
+ 1
- 1
node/node.go
View File
+ 54
- 24
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
+ 125
- 29
types/protobuf.go
View File
| @ -1,71 +1,167 @@ | |||
| package types | |||
| import ( | |||
| "github.com/tendermint/abci/types" | |||
| "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" | |||
| ) | |||
| // TM2PB is used for converting Tendermint types to protobuf types. | |||
| const ( | |||
| ABCIPubKeyTypeEd25519 = "ed25519" | |||
| ABCIPubKeyTypeSecp256k1 = "secp256k1" | |||
| ) | |||
| //------------------------------------------------------- | |||
| // 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{ | |||
| 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 | |||
| LastBlockID: TM2PB.BlockID(header.LastBlockID), | |||
| LastCommitHash: header.LastCommitHash, | |||
| DataHash: header.DataHash, | |||
| 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), | |||
| } | |||
| } | |||
| func (tm2pb) PartSetHeader(partSetHeader PartSetHeader) types.PartSetHeader { | |||
| return types.PartSetHeader{ | |||
| Total: int32(partSetHeader.Total), // XXX: overflow | |||
| Hash: partSetHeader.Hash, | |||
| func (tm2pb) Validator(val *Validator) abci.Validator { | |||
| return abci.Validator{ | |||
| 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, | |||
| 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)) | |||
| 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. | |||
| 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) | |||
| } | |||
| abciEvidence := abci.Evidence{ | |||
| Validator: abci.Validator{ | |||
| Address: ev.Address(), | |||
| PubKey: TM2PB.PubKey(val.PubKey), | |||
| Power: val.VotingPower, | |||
| }, | |||
| Height: ev.Height(), | |||
| Time: evTime.Unix(), | |||
| TotalVotingPower: valSet.TotalVotingPower(), | |||
| } | |||
| // set type | |||
| switch ev.(type) { | |||
| case *DuplicateVoteEvidence: | |||
| abciEvidence.Type = ABCIEvidenceTypeDuplicateVote | |||
| case *MockGoodEvidence, MockGoodEvidence: | |||
| abciEvidence.Type = ABCIEvidenceTypeMockGood | |||
| default: | |||
| panic(fmt.Sprintf("Unknown evidence type: %v %v", ev, reflect.TypeOf(ev))) | |||
| } | |||
| return abciEvidence | |||
| } | |||
| 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) | |||
| } | |||
| } | |||