From e2e50bc0fcf81a8580f664a695b425727d90e510 Mon Sep 17 00:00:00 2001 From: Zach Ramsay Date: Wed, 11 Oct 2017 10:35:22 -0400 Subject: [PATCH 01/11] rpc: use /iavl repo in test (#713) --- glide.lock | 6 ++---- glide.yaml | 4 ++-- rpc/client/rpc_test.go | 6 +++--- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/glide.lock b/glide.lock index a7a2bb5a4..147ee21a0 100644 --- a/glide.lock +++ b/glide.lock @@ -118,10 +118,8 @@ imports: subpackages: - data - data/base58 -- name: github.com/tendermint/merkleeyes - version: 2a93256d2c6fbcc3b55673c0d2b96a7e32c6238b - subpackages: - - iavl +- name: github.com/tendermint/iavl + version: 9233811d241ac8d4441a7223a4e79b83931dfae0 - name: github.com/tendermint/tmlibs version: 096dcb90e60aa00b748b3fe49a4b95e48ebf1e13 subpackages: diff --git a/glide.yaml b/glide.yaml index 27b6cc395..5335837ea 100644 --- a/glide.yaml +++ b/glide.yaml @@ -25,8 +25,8 @@ import: version: ~0.6.2 subpackages: - data -- package: github.com/tendermint/merkleeyes - version: master +- package: github.com/tendermint/iavl + version: develop subpackages: - iavl - package: github.com/tendermint/tmlibs diff --git a/rpc/client/rpc_test.go b/rpc/client/rpc_test.go index 9bcd3de45..b1f9656fc 100644 --- a/rpc/client/rpc_test.go +++ b/rpc/client/rpc_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/tendermint/merkleeyes/iavl" //TODO use tendermint/iavl ? + "github.com/tendermint/iavl" "github.com/tendermint/tendermint/rpc/client" rpctest "github.com/tendermint/tendermint/rpc/test" "github.com/tendermint/tendermint/types" @@ -174,13 +174,13 @@ func TestAppCalls(t *testing.T) { // and we got a proof that works! pres, err := c.ABCIQuery("/key", k, true) if assert.Nil(err) && assert.True(pres.Code.IsOK()) { - proof, err := iavl.ReadProof(pres.Proof) + proof, err := iavl.ReadKeyExistsProof(pres.Proof) if assert.Nil(err) { key := pres.Key value := pres.Value assert.EqualValues(appHash, proof.RootHash) valid := proof.Verify(key, value, appHash) - assert.True(valid) + assert.Nil(valid) } } } From 5f218a43fdad9674c00bc41170602730f034187d Mon Sep 17 00:00:00 2001 From: Emmanuel Odeke Date: Fri, 13 Oct 2017 00:11:20 -0600 Subject: [PATCH 02/11] rpc/client: use compile time assertions instead of methods --- rpc/client/httpclient.go | 21 ++++++--------------- rpc/client/localclient.go | 11 ++++------- rpc/client/mock/abci.go | 16 +++++----------- rpc/client/mock/client.go | 4 +--- rpc/client/mock/status.go | 11 ++++------- 5 files changed, 20 insertions(+), 43 deletions(-) diff --git a/rpc/client/httpclient.go b/rpc/client/httpclient.go index b00c97d23..2b78e9767 100644 --- a/rpc/client/httpclient.go +++ b/rpc/client/httpclient.go @@ -39,17 +39,12 @@ func NewHTTP(remote, wsEndpoint string) *HTTP { } } -func (c *HTTP) _assertIsClient() Client { - return c -} - -func (c *HTTP) _assertIsNetworkClient() NetworkClient { - return c -} - -func (c *HTTP) _assertIsEventSwitch() types.EventSwitch { - return c -} +var ( + _ Client = (*HTTP)(nil) + _ NetworkClient = (*HTTP)(nil) + _ types.EventSwitch = (*HTTP)(nil) + _ types.EventSwitch = (*WSEvents)(nil) +) func (c *HTTP) Status() (*ctypes.ResultStatus, error) { result := new(ctypes.ResultStatus) @@ -216,10 +211,6 @@ func newWSEvents(remote, endpoint string) *WSEvents { } } -func (w *WSEvents) _assertIsEventSwitch() types.EventSwitch { - return w -} - // Start is the only way I could think the extend OnStart from // events.eventSwitch. If only it wasn't private... // BaseService.Start -> eventSwitch.OnStart -> WSEvents.Start diff --git a/rpc/client/localclient.go b/rpc/client/localclient.go index 134f935ca..d12a5a84f 100644 --- a/rpc/client/localclient.go +++ b/rpc/client/localclient.go @@ -41,13 +41,10 @@ func NewLocal(node *nm.Node) Local { } } -func (c Local) _assertIsClient() Client { - return c -} - -func (c Local) _assertIsNetworkClient() NetworkClient { - return c -} +var ( + _ Client = Local{} + _ NetworkClient = Local{} +) func (c Local) Status() (*ctypes.ResultStatus, error) { return core.Status() diff --git a/rpc/client/mock/abci.go b/rpc/client/mock/abci.go index db3fa4f1d..a02971342 100644 --- a/rpc/client/mock/abci.go +++ b/rpc/client/mock/abci.go @@ -16,9 +16,11 @@ type ABCIApp struct { App abci.Application } -func (a ABCIApp) _assertABCIClient() client.ABCIClient { - return a -} +var ( + _ client.ABCIClient = ABCIApp{} + _ client.ABCIClient = ABCIMock{} + _ client.ABCIClient = (*ABCIRecorder)(nil) +) func (a ABCIApp) ABCIInfo() (*ctypes.ResultABCIInfo, error) { return &ctypes.ResultABCIInfo{a.App.Info(abci.RequestInfo{version.Version})}, nil @@ -67,10 +69,6 @@ type ABCIMock struct { Broadcast Call } -func (m ABCIMock) _assertABCIClient() client.ABCIClient { - return m -} - func (m ABCIMock) ABCIInfo() (*ctypes.ResultABCIInfo, error) { res, err := m.Info.GetResponse(nil) if err != nil { @@ -126,10 +124,6 @@ func NewABCIRecorder(client client.ABCIClient) *ABCIRecorder { } } -func (r *ABCIRecorder) _assertABCIClient() client.ABCIClient { - return r -} - type QueryArgs struct { Path string Data data.Bytes diff --git a/rpc/client/mock/client.go b/rpc/client/mock/client.go index f32694edd..fd02ebdf2 100644 --- a/rpc/client/mock/client.go +++ b/rpc/client/mock/client.go @@ -37,9 +37,7 @@ type Client struct { types.EventSwitch } -func (c Client) _assertIsClient() client.Client { - return c -} +var _ client.Client = Client{} // Call is used by recorders to save a call and response. // It can also be used to configure mock responses. diff --git a/rpc/client/mock/status.go b/rpc/client/mock/status.go index af0f5335d..58b29d573 100644 --- a/rpc/client/mock/status.go +++ b/rpc/client/mock/status.go @@ -10,9 +10,10 @@ type StatusMock struct { Call } -func (m *StatusMock) _assertStatusClient() client.StatusClient { - return m -} +var ( + _ client.StatusClient = (*StatusMock)(nil) + _ client.StatusClient = (*StatusRecorder)(nil) +) func (m *StatusMock) Status() (*ctypes.ResultStatus, error) { res, err := m.GetResponse(nil) @@ -36,10 +37,6 @@ func NewStatusRecorder(client client.StatusClient) *StatusRecorder { } } -func (r *StatusRecorder) _assertStatusClient() client.StatusClient { - return r -} - func (r *StatusRecorder) addCall(call Call) { r.Calls = append(r.Calls, call) } From 75b78bfb72a5e378c756f100678f01d7d13d8fba Mon Sep 17 00:00:00 2001 From: Anton Kaliaev Date: Tue, 17 Oct 2017 13:33:57 +0400 Subject: [PATCH 03/11] panic on marshal/unmarshal failures for genesisDoc --- node/node.go | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/node/node.go b/node/node.go index e99cedae9..9dfe617db 100644 --- a/node/node.go +++ b/node/node.go @@ -143,10 +143,7 @@ func NewNode(config *cfg.Config, } // save genesis doc to prevent a certain class of user errors (e.g. when it // was changed, accidentally or not). Also good for audit trail. - err = saveGenesisDoc(stateDB, genDoc) - if err != nil { - return nil, fmt.Errorf("Failed to save genesis doc: %v", err) - } + saveGenesisDoc(stateDB, genDoc) } state := sm.LoadState(stateDB) @@ -552,6 +549,7 @@ var ( genesisDocKey = []byte("genesisDoc") ) +// panics if failed to unmarshal bytes func loadGenesisDoc(db dbm.DB) (*types.GenesisDoc, error) { bytes := db.Get(genesisDocKey) if len(bytes) == 0 { @@ -559,15 +557,18 @@ func loadGenesisDoc(db dbm.DB) (*types.GenesisDoc, error) { } else { var genDoc *types.GenesisDoc err := json.Unmarshal(bytes, &genDoc) - return genDoc, err + if err != nil { + cmn.PanicCrisis(fmt.Sprintf("Failed to load genesis doc due to unmarshaling error: %v (bytes: %X)", err, bytes)) + } + return genDoc, nil } } -func saveGenesisDoc(db dbm.DB, genDoc *types.GenesisDoc) error { +// panics if failed to marshal the given genesis document +func saveGenesisDoc(db dbm.DB, genDoc *types.GenesisDoc) { bytes, err := json.Marshal(genDoc) if err != nil { - return err + cmn.PanicCrisis(fmt.Sprintf("Failed to save genesis doc due to marshaling error: %v", err)) } db.SetSync(genesisDocKey, bytes) - return nil } From 3e3d53daef8132b5b009bee180a64130ef9e46cb Mon Sep 17 00:00:00 2001 From: Silas Davis Date: Sun, 22 Oct 2017 15:14:21 +0100 Subject: [PATCH 04/11] Make RPCError an actual error and don't swallow its companion data --- rpc/lib/client/http_client.go | 2 +- rpc/lib/client/ws_client.go | 2 +- rpc/lib/types/types.go | 9 ++++++++- rpc/lib/types/types_test.go | 17 +++++++++++++++++ 4 files changed, 27 insertions(+), 3 deletions(-) diff --git a/rpc/lib/client/http_client.go b/rpc/lib/client/http_client.go index 1fbaedfae..4c40117e9 100644 --- a/rpc/lib/client/http_client.go +++ b/rpc/lib/client/http_client.go @@ -147,7 +147,7 @@ func unmarshalResponseBytes(responseBytes []byte, result interface{}) (interface return nil, errors.Errorf("Error unmarshalling rpc response: %v", err) } if response.Error != nil { - return nil, errors.Errorf("Response error: %v", response.Error.Message) + return nil, errors.Errorf("Response error: %v", response.Error) } // unmarshal the RawMessage into the result err = json.Unmarshal(*response.Result, result) diff --git a/rpc/lib/client/ws_client.go b/rpc/lib/client/ws_client.go index 2bdfa5c9a..d233004b6 100644 --- a/rpc/lib/client/ws_client.go +++ b/rpc/lib/client/ws_client.go @@ -437,7 +437,7 @@ func (c *WSClient) readRoutine() { continue } if response.Error != nil { - c.ErrorsCh <- errors.New(response.Error.Message) + c.ErrorsCh <- response.Error continue } c.Logger.Info("got response", "resp", response.Result) diff --git a/rpc/lib/types/types.go b/rpc/lib/types/types.go index 07a8e5683..86f9264dd 100644 --- a/rpc/lib/types/types.go +++ b/rpc/lib/types/types.go @@ -6,7 +6,6 @@ import ( "strings" "github.com/pkg/errors" - events "github.com/tendermint/tmlibs/events" ) @@ -60,6 +59,14 @@ type RPCError struct { Data string `json:"data,omitempty"` } +func (err RPCError) Error() string { + const baseFormat = "RPC error %v - %s" + if err.Data != "" { + return fmt.Sprintf(baseFormat+": %s", err.Code, err.Message, err.Data) + } + return fmt.Sprintf(baseFormat, err.Code, err.Message) +} + type RPCResponse struct { JSONRPC string `json:"jsonrpc"` ID string `json:"id"` diff --git a/rpc/lib/types/types_test.go b/rpc/lib/types/types_test.go index bab42124a..60f7b2213 100644 --- a/rpc/lib/types/types_test.go +++ b/rpc/lib/types/types_test.go @@ -4,6 +4,8 @@ import ( "encoding/json" "testing" + "fmt" + "github.com/pkg/errors" "github.com/stretchr/testify/assert" ) @@ -30,3 +32,18 @@ func TestResponses(t *testing.T) { i := `{"jsonrpc":"2.0","id":"2","error":{"code":-32601,"message":"Method not found"}}` assert.Equal(string(h), string(i)) } + +func TestRPCError(t *testing.T) { + assert.Equal(t, "RPC error 12 - Badness: One worse than a code 11", + fmt.Sprintf("%v", &RPCError{ + Code: 12, + Message: "Badness", + Data: "One worse than a code 11", + })) + + assert.Equal(t, "RPC error 12 - Badness", + fmt.Sprintf("%v", &RPCError{ + Code: 12, + Message: "Badness", + })) +} From fd60621a8e463ffd1eac8742ac9dde6893b56356 Mon Sep 17 00:00:00 2001 From: Ethan Buchman Date: Mon, 23 Oct 2017 10:03:54 -0400 Subject: [PATCH 05/11] update cswal test --- consensus/common_test.go | 12 ++- consensus/replay_test.go | 6 +- consensus/test_data/build.sh | 56 ++++++------ consensus/test_data/empty_block.cswal | 18 ++-- consensus/test_data/many_blocks.cswal | 118 ++++++++++++------------- consensus/test_data/small_block1.cswal | 18 ++-- consensus/test_data/small_block2.cswal | 26 +++--- node/node.go | 19 ++-- 8 files changed, 141 insertions(+), 132 deletions(-) diff --git a/consensus/common_test.go b/consensus/common_test.go index 33b613a0c..9810024d4 100644 --- a/consensus/common_test.go +++ b/consensus/common_test.go @@ -347,7 +347,11 @@ func randConsensusNet(nValidators int, testName string, tickerFunc func() Timeou opt(thisConfig) } ensureDir(path.Dir(thisConfig.Consensus.WalFile()), 0700) // dir for wal - css[i] = newConsensusStateWithConfig(thisConfig, state, privVals[i], appFunc()) + app := appFunc() + vals := types.TM2PB.Validators(state.Validators) + app.InitChain(abci.RequestInitChain{Validators: vals}) + + css[i] = newConsensusStateWithConfig(thisConfig, state, privVals[i], app) css[i].SetLogger(logger.With("validator", i)) css[i].SetTimeoutTicker(tickerFunc()) } @@ -373,7 +377,11 @@ func randConsensusNetWithPeers(nValidators, nPeers int, testName string, tickerF privVal = types.GenPrivValidatorFS(tempFilePath) } - css[i] = newConsensusStateWithConfig(thisConfig, state, privVal, appFunc()) + app := appFunc() + vals := types.TM2PB.Validators(state.Validators) + app.InitChain(abci.RequestInitChain{Validators: vals}) + + css[i] = newConsensusStateWithConfig(thisConfig, state, privVal, app) css[i].SetLogger(log.TestingLogger()) css[i].SetTimeoutTicker(tickerFunc()) } diff --git a/consensus/replay_test.go b/consensus/replay_test.go index c478a0958..97dac0c44 100644 --- a/consensus/replay_test.go +++ b/consensus/replay_test.go @@ -58,9 +58,9 @@ var baseStepChanges = []int{3, 6, 8} // test recovery from each line in each testCase var testCases = []*testCase{ - newTestCase("empty_block", baseStepChanges), // empty block (has 1 block part) - newTestCase("small_block1", baseStepChanges), // small block with txs in 1 block part - newTestCase("small_block2", []int{3, 11, 13}), // small block with txs across 6 smaller block parts + newTestCase("empty_block", baseStepChanges), // empty block (has 1 block part) + newTestCase("small_block1", baseStepChanges), // small block with txs in 1 block part + newTestCase("small_block2", []int{3, 9, 11}), // small block with txs across 6 smaller block parts } type testCase struct { diff --git a/consensus/test_data/build.sh b/consensus/test_data/build.sh index d50c26296..bbcb810f5 100755 --- a/consensus/test_data/build.sh +++ b/consensus/test_data/build.sh @@ -6,7 +6,7 @@ cd "$GOPATH/src/github.com/tendermint/tendermint" || exit 1 # Make sure we have a tendermint command. if ! hash tendermint 2>/dev/null; then - make install + make install fi # specify a dir to copy @@ -14,13 +14,14 @@ fi DIR_TO_COPY=$HOME/.tendermint_test/consensus_state_test TMHOME="$HOME/.tendermint" -rm -rf "$TMHOME" -cp -r "$DIR_TO_COPY" "$TMHOME" -cp $TMHOME/config.toml $TMHOME/config.toml.bak +#rm -rf "$TMHOME" +#cp -r "$DIR_TO_COPY" "$TMHOME" +#mv $TMHOME/config.toml $TMHOME/config.toml.bak +cp $TMHOME/genesis.json $TMHOME/genesis.json.bak function reset(){ - tendermint unsafe_reset_all - cp $TMHOME/config.toml.bak $TMHOME/config.toml +tendermint unsafe_reset_all +cp $TMHOME/genesis.json.bak $TMHOME/genesis.json } reset @@ -34,6 +35,7 @@ killall tendermint # /q would print up to and including the match, then quit. # /Q doesn't include the match. # http://unix.stackexchange.com/questions/11305/grep-show-all-the-file-up-to-the-match +# note on macbook we need `gnu-sed` for Q to work sed '/ENDHEIGHT: 1/Q' ~/.tendermint/data/cs.wal/wal > consensus/test_data/empty_block.cswal reset @@ -44,7 +46,7 @@ function many_blocks(){ bash scripts/txs/random.sh 1000 36657 &> /dev/null & PID=$! tendermint node --proxy_app=persistent_dummy &> /dev/null & -sleep 7 +sleep 10 killall tendermint kill -9 $PID @@ -71,12 +73,12 @@ reset # small block 2 (part size = 512) function small_block2(){ -echo "" >> ~/.tendermint/config.toml -echo "block_part_size = 512" >> ~/.tendermint/config.toml +cat ~/.tendermint/genesis.json | jq '. + {"consensus_params": {"block_size_params": {"max_bytes":1000000}, "block_gossip_params": {"block_part_size_bytes":512}}}' > genesis.json.new +mv genesis.json.new ~/.tendermint/genesis.json bash scripts/txs/random.sh 1000 36657 &> /dev/null & PID=$! tendermint node --proxy_app=persistent_dummy &> /dev/null & -sleep 5 +sleep 10 killall tendermint kill -9 $PID @@ -88,23 +90,23 @@ reset case "$1" in - "small_block1") - small_block1 - ;; - "small_block2") - small_block2 - ;; - "empty_block") - empty_block - ;; - "many_blocks") - many_blocks - ;; - *) - small_block1 - small_block2 - empty_block - many_blocks + "small_block1") + small_block1 + ;; + "small_block2") + small_block2 + ;; + "empty_block") + empty_block + ;; + "many_blocks") + many_blocks + ;; + *) + small_block1 + small_block2 + empty_block + many_blocks esac diff --git a/consensus/test_data/empty_block.cswal b/consensus/test_data/empty_block.cswal index a7e5e79e4..e8021312a 100644 --- a/consensus/test_data/empty_block.cswal +++ b/consensus/test_data/empty_block.cswal @@ -1,10 +1,10 @@ #ENDHEIGHT: 0 -{"time":"2017-04-27T22:24:01.346Z","msg":[3,{"duration":972946821,"height":1,"round":0,"step":1}]} -{"time":"2017-04-27T22:24:01.349Z","msg":[1,{"height":1,"round":0,"step":"RoundStepPropose"}]} -{"time":"2017-04-27T22:24:01.349Z","msg":[2,{"msg":[17,{"Proposal":{"height":1,"round":0,"block_parts_header":{"total":1,"hash":"ACED4A95DDEBD24E66A681F7EAB4CA22C4B8546D"},"pol_round":-1,"pol_block_id":{"hash":"","parts":{"total":0,"hash":""}},"signature":[1,"E785764AED6D92D7CC65C0A3A4ED9C8465198A05142C3E6C7F3EF601FDCD3A604900B77B7B87C046221EF99FD038A960398385BD5BBAA50EE4F86DE757B8F704"]}}],"peer_key":""}]} -{"time":"2017-04-27T22:24:01.350Z","msg":[2,{"msg":[19,{"Height":1,"Round":0,"Part":{"index":0,"bytes":"0101010F74656E6465726D696E745F74657374010114B96165CF4496C00000000000000114354594CBFC1A7BCA1AD0050ED6AA010023EADA390001000100000000","proof":{"aunts":[]}}}],"peer_key":""}]} -{"time":"2017-04-27T22:24:01.351Z","msg":[1,{"height":1,"round":0,"step":"RoundStepPrevote"}]} -{"time":"2017-04-27T22:24:01.351Z","msg":[2,{"msg":[20,{"Vote":{"validator_address":"D028C9981F7A87F3093672BF0D5B0E2A1B3ED456","validator_index":0,"height":1,"round":0,"type":1,"block_id":{"hash":"F3BBFBE7E4A5D619E2C498C3D1B912883786DD71","parts":{"total":1,"hash":"ACED4A95DDEBD24E66A681F7EAB4CA22C4B8546D"}},"signature":[1,"35C937C78D061ECDC3770982A1330C9AA7F6FEF00835C43DEB50B8FCF69A3EEF221E675EE5E469114F64E4FBBABA414EB9170E1025FC47D3F0EADE46767D2E00"]}}],"peer_key":""}]} -{"time":"2017-04-27T22:24:01.352Z","msg":[1,{"height":1,"round":0,"step":"RoundStepPrecommit"}]} -{"time":"2017-04-27T22:24:01.352Z","msg":[2,{"msg":[20,{"Vote":{"validator_address":"D028C9981F7A87F3093672BF0D5B0E2A1B3ED456","validator_index":0,"height":1,"round":0,"type":2,"block_id":{"hash":"F3BBFBE7E4A5D619E2C498C3D1B912883786DD71","parts":{"total":1,"hash":"ACED4A95DDEBD24E66A681F7EAB4CA22C4B8546D"}},"signature":[1,"D1A7D27FCD5D352F3A3EDA8DE368520BC5B796662E32BCD8D91CDB8209A88DAF37CB7C4C93143D3C12B37C1435229268098CFFD0AD1400D88DA7606454692301"]}}],"peer_key":""}]} -{"time":"2017-04-27T22:24:01.352Z","msg":[1,{"height":1,"round":0,"step":"RoundStepCommit"}]} +{"time":"2017-10-23T13:26:49.706Z","msg":[3,{"duration":-2002813432,"height":1,"round":0,"step":1}]} +{"time":"2017-10-23T13:26:49.708Z","msg":[1,{"height":1,"round":0,"step":"RoundStepPropose"}]} +{"time":"2017-10-23T13:26:49.708Z","msg":[2,{"msg":[17,{"Proposal":{"height":1,"round":0,"block_parts_header":{"total":1,"hash":"4595668C5D5D0A3670EBD56FB9D5A0F0B3252C07"},"pol_round":-1,"pol_block_id":{"hash":"","parts":{"total":0,"hash":""}},"signature":[1,"452FC4AC6B6313F2815671BE51EA6E56C267C18357655B960CC353CA73BE64A393D2840A36B48B73B01466C174F13CADD1AADCBFADA953D322BCDF00BD185C06"]}}],"peer_key":""}]} +{"time":"2017-10-23T13:26:49.708Z","msg":[2,{"msg":[19,{"Height":1,"Round":0,"Part":{"index":0,"bytes":"0101010F74656E6465726D696E745F74657374010114F035F6E5FE6E8000000000000001147297262C6CD96190E46846C9A0DE1227E76077CF0001000100000000","proof":{"aunts":[]}}}],"peer_key":""}]} +{"time":"2017-10-23T13:26:49.709Z","msg":[1,{"height":1,"round":0,"step":"RoundStepPrevote"}]} +{"time":"2017-10-23T13:26:49.709Z","msg":[2,{"msg":[20,{"Vote":{"validator_address":"D028C9981F7A87F3093672BF0D5B0E2A1B3ED456","validator_index":0,"height":1,"round":0,"type":1,"block_id":{"hash":"717AD9D244E7BA9C76300185BC51D727D50E24AF","parts":{"total":1,"hash":"4595668C5D5D0A3670EBD56FB9D5A0F0B3252C07"}},"signature":[1,"3E7B4AF836F5A63A9636C5704155559607D25684DDF6C29D2E746942A6C828C8A5979909D7C393A46BB92AF99FCE258CCD7B8E1E59DE296FF7159E04C8D0F40B"]}}],"peer_key":""}]} +{"time":"2017-10-23T13:26:49.710Z","msg":[1,{"height":1,"round":0,"step":"RoundStepPrecommit"}]} +{"time":"2017-10-23T13:26:49.710Z","msg":[2,{"msg":[20,{"Vote":{"validator_address":"D028C9981F7A87F3093672BF0D5B0E2A1B3ED456","validator_index":0,"height":1,"round":0,"type":2,"block_id":{"hash":"717AD9D244E7BA9C76300185BC51D727D50E24AF","parts":{"total":1,"hash":"4595668C5D5D0A3670EBD56FB9D5A0F0B3252C07"}},"signature":[1,"B7106616D0C2173AB31A6D844AD0C01A4506287D6B88EC9EB91283FDE99232F1DADE2C44B8C67C46B154EA57E456AF82661FE61590C566560C202526BD971F09"]}}],"peer_key":""}]} +{"time":"2017-10-23T13:26:49.711Z","msg":[1,{"height":1,"round":0,"step":"RoundStepCommit"}]} diff --git a/consensus/test_data/many_blocks.cswal b/consensus/test_data/many_blocks.cswal index 9ceee2cfd..cf6822809 100644 --- a/consensus/test_data/many_blocks.cswal +++ b/consensus/test_data/many_blocks.cswal @@ -1,65 +1,65 @@ #ENDHEIGHT: 0 -{"time":"2017-04-27T22:24:06.395Z","msg":[3,{"duration":974643085,"height":1,"round":0,"step":1}]} -{"time":"2017-04-27T22:24:06.397Z","msg":[1,{"height":1,"round":0,"step":"RoundStepPropose"}]} -{"time":"2017-04-27T22:24:06.397Z","msg":[2,{"msg":[17,{"Proposal":{"height":1,"round":0,"block_parts_header":{"total":1,"hash":"218DFAADA5F4A3E0DC3060379E80C45FBB5A0442"},"pol_round":-1,"pol_block_id":{"hash":"","parts":{"total":0,"hash":""}},"signature":[1,"B361A5602D9C36058CFE7C5F2E1B6E9DA6D1FAD5F1FBD50F03C1DCA3B80F8374018D04B8785AEC8B464E792189F832BFF5C0B82CCE93D6B3F9B04DE8DBCA1D09"]}}],"peer_key":""}]} -{"time":"2017-04-27T22:24:06.397Z","msg":[2,{"msg":[19,{"Height":1,"Round":0,"Part":{"index":0,"bytes":"0101010F74656E6465726D696E745F74657374010114B96166FC26F4C0015F0000000001140830F265BD1DF6413337508DE45DB36552AE9A520114354594CBFC1A7BCA1AD0050ED6AA010023EADA390001015F011636313632363336343339334436343633363236313339011A3631363236333634333133303344363436333632363133313330011A3631363236333634333133313344363436333632363133313331011A3631363236333634333133323344363436333632363133313332011A3631363236333634333133333344363436333632363133313333011A3631363236333634333133343344363436333632363133313334011A3631363236333634333133353344363436333632363133313335011A3631363236333634333133363344363436333632363133313336011A3631363236333634333133373344363436333632363133313337011A3631363236333634333133383344363436333632363133313338011A3631363236333634333133393344363436333632363133313339011A3631363236333634333233303344363436333632363133323330011A3631363236333634333233313344363436333632363133323331011A3631363236333634333233323344363436333632363133323332011A3631363236333634333233333344363436333632363133323333011A3631363236333634333233343344363436333632363133323334011A3631363236333634333233353344363436333632363133323335011A3631363236333634333233363344363436333632363133323336011A3631363236333634333233373344363436333632363133323337011A3631363236333634333233383344363436333632363133323338011A3631363236333634333233393344363436333632363133323339011A3631363236333634333333303344363436333632363133333330011A3631363236333634333333313344363436333632363133333331011A3631363236333634333333323344363436333632363133333332011A3631363236333634333333333344363436333632363133333333011A3631363236333634333333343344363436333632363133333334011A3631363236333634333333353344363436333632363133333335011A3631363236333634333333363344363436333632363133333336011A3631363236333634333333373344363436333632363133333337011A3631363236333634333333383344363436333632363133333338011A3631363236333634333333393344363436333632363133333339011A3631363236333634333433303344363436333632363133343330011A3631363236333634333433313344363436333632363133343331011A3631363236333634333433323344363436333632363133343332011A3631363236333634333433333344363436333632363133343333011A3631363236333634333433343344363436333632363133343334011A3631363236333634333433353344363436333632363133343335011A3631363236333634333433363344363436333632363133343336011A3631363236333634333433373344363436333632363133343337011A3631363236333634333433383344363436333632363133343338011A3631363236333634333433393344363436333632363133343339011A3631363236333634333533303344363436333632363133353330011A3631363236333634333533313344363436333632363133353331011A3631363236333634333533323344363436333632363133353332011A3631363236333634333533333344363436333632363133353333011A3631363236333634333533343344363436333632363133353334011A3631363236333634333533353344363436333632363133353335011A3631363236333634333533363344363436333632363133353336011A3631363236333634333533373344363436333632363133353337011A3631363236333634333533383344363436333632363133353338011A3631363236333634333533393344363436333632363133353339011A3631363236333634333633303344363436333632363133363330011A3631363236333634333633313344363436333632363133363331011A3631363236333634333633323344363436333632363133363332011A3631363236333634333633333344363436333632363133363333011A3631363236333634333633343344363436333632363133363334011A3631363236333634333633353344363436333632363133363335011A3631363236333634333633363344363436333632363133363336011A3631363236333634333633373344363436333632363133363337011A3631363236333634333633383344363436333632363133363338011A3631363236333634333633393344363436333632363133363339011A3631363236333634333733303344363436333632363133373330011A3631363236333634333733313344363436333632363133373331011A3631363236333634333733323344363436333632363133373332011A3631363236333634333733333344363436333632363133373333011A3631363236333634333733343344363436333632363133373334011A3631363236333634333733353344363436333632363133373335011A3631363236333634333733363344363436333632363133373336011A3631363236333634333733373344363436333632363133373337011A3631363236333634333733383344363436333632363133373338011A3631363236333634333733393344363436333632363133373339011A3631363236333634333833303344363436333632363133383330011A3631363236333634333833313344363436333632363133383331011A3631363236333634333833323344363436333632363133383332011A3631363236333634333833333344363436333632363133383333011A3631363236333634333833343344363436333632363133383334011A3631363236333634333833353344363436333632363133383335011A3631363236333634333833363344363436333632363133383336011A3631363236333634333833373344363436333632363133383337011A3631363236333634333833383344363436333632363133383338011A3631363236333634333833393344363436333632363133383339011A3631363236333634333933303344363436333632363133393330011A3631363236333634333933313344363436333632363133393331011A3631363236333634333933323344363436333632363133393332011A3631363236333634333933333344363436333632363133393333011A3631363236333634333933343344363436333632363133393334011A3631363236333634333933353344363436333632363133393335011A3631363236333634333933363344363436333632363133393336011A3631363236333634333933373344363436333632363133393337011A3631363236333634333933383344363436333632363133393338011A3631363236333634333933393344363436333632363133393339011E363136323633363433313330333033443634363336323631333133303330011E363136323633363433313330333133443634363336323631333133303331011E363136323633363433313330333233443634363336323631333133303332011E3631363236333634333133303333334436343633363236313331333033330100000000","proof":{"aunts":[]}}}],"peer_key":""}]} -{"time":"2017-04-27T22:24:06.399Z","msg":[1,{"height":1,"round":0,"step":"RoundStepPrevote"}]} -{"time":"2017-04-27T22:24:06.399Z","msg":[2,{"msg":[20,{"Vote":{"validator_address":"D028C9981F7A87F3093672BF0D5B0E2A1B3ED456","validator_index":0,"height":1,"round":0,"type":1,"block_id":{"hash":"B83D2AF62DBCA00412CD21152645411609DB51D4","parts":{"total":1,"hash":"218DFAADA5F4A3E0DC3060379E80C45FBB5A0442"}},"signature":[1,"50FC03CD17799A619D2AD2AE1004D44DDB774D37D1CBB085240C28E08791FCCC8DBAFACEE4BA967681D331B32E88AC6DE4862DD20D39999C20C6D0DFAF155C02"]}}],"peer_key":""}]} -{"time":"2017-04-27T22:24:06.400Z","msg":[1,{"height":1,"round":0,"step":"RoundStepPrecommit"}]} -{"time":"2017-04-27T22:24:06.400Z","msg":[2,{"msg":[20,{"Vote":{"validator_address":"D028C9981F7A87F3093672BF0D5B0E2A1B3ED456","validator_index":0,"height":1,"round":0,"type":2,"block_id":{"hash":"B83D2AF62DBCA00412CD21152645411609DB51D4","parts":{"total":1,"hash":"218DFAADA5F4A3E0DC3060379E80C45FBB5A0442"}},"signature":[1,"BD9AE0AE7B54DB3C7D4913FFEC54A29E3AC11DFFF77F59CF0411C47ADB863C1C2D44BB3B84EA1093ED01E6C19063294CA3E36D1920CD627A60F934216D2B3B02"]}}],"peer_key":""}]} -{"time":"2017-04-27T22:24:06.401Z","msg":[1,{"height":1,"round":0,"step":"RoundStepCommit"}]} +{"time":"2017-10-23T13:26:54.768Z","msg":[3,{"duration":-2003763150,"height":1,"round":0,"step":1}]} +{"time":"2017-10-23T13:26:54.769Z","msg":[1,{"height":1,"round":0,"step":"RoundStepPropose"}]} +{"time":"2017-10-23T13:26:54.770Z","msg":[2,{"msg":[17,{"Proposal":{"height":1,"round":0,"block_parts_header":{"total":1,"hash":"60EC1BBCD363321BB4F052A1BB3186EF51E2C445"},"pol_round":-1,"pol_block_id":{"hash":"","parts":{"total":0,"hash":""}},"signature":[1,"E602895032E445489FA5FEDE71674D9A71FAA96965C5BF3ED0B735545441550ED4DD93F82E871D3DA8777173AE343C2FDEF1CDAD01AB3F88AB57684485A6E206"]}}],"peer_key":""}]} +{"time":"2017-10-23T13:26:54.770Z","msg":[2,{"msg":[19,{"Height":1,"Round":0,"Part":{"index":0,"bytes":"0101010F74656E6465726D696E745F74657374010114F035F813B66C0000000000000001147297262C6CD96190E46846C9A0DE1227E76077CF0001000100000000","proof":{"aunts":[]}}}],"peer_key":""}]} +{"time":"2017-10-23T13:26:54.771Z","msg":[1,{"height":1,"round":0,"step":"RoundStepPrevote"}]} +{"time":"2017-10-23T13:26:54.771Z","msg":[2,{"msg":[20,{"Vote":{"validator_address":"D028C9981F7A87F3093672BF0D5B0E2A1B3ED456","validator_index":0,"height":1,"round":0,"type":1,"block_id":{"hash":"EA34E735247F464303DAA09F70B76AA48543909C","parts":{"total":1,"hash":"60EC1BBCD363321BB4F052A1BB3186EF51E2C445"}},"signature":[1,"E2BF9B7ADCE13257BDDCE85E86101ADDD013D645E5EF796A46B29ECB228E3EFE28B05F3E78754226460D941175E4A46449E70E7D3A6633BEA42330748CE92A0E"]}}],"peer_key":""}]} +{"time":"2017-10-23T13:26:54.772Z","msg":[1,{"height":1,"round":0,"step":"RoundStepPrecommit"}]} +{"time":"2017-10-23T13:26:54.772Z","msg":[2,{"msg":[20,{"Vote":{"validator_address":"D028C9981F7A87F3093672BF0D5B0E2A1B3ED456","validator_index":0,"height":1,"round":0,"type":2,"block_id":{"hash":"EA34E735247F464303DAA09F70B76AA48543909C","parts":{"total":1,"hash":"60EC1BBCD363321BB4F052A1BB3186EF51E2C445"}},"signature":[1,"D4E0353B40535B623B47B07656BE0B1D54C85E64DCC0635D607CA2E6A4BB2BF41F286BDE15ECF8B5C9B96B9F11C50A1C3E63DC417196EDF1578B2F0D6DAEFA02"]}}],"peer_key":""}]} +{"time":"2017-10-23T13:26:54.772Z","msg":[1,{"height":1,"round":0,"step":"RoundStepCommit"}]} #ENDHEIGHT: 1 -{"time":"2017-04-27T22:24:06.406Z","msg":[1,{"height":2,"round":0,"step":"RoundStepNewHeight"}]} -{"time":"2017-04-27T22:24:07.401Z","msg":[3,{"duration":994141766,"height":2,"round":0,"step":1}]} -{"time":"2017-04-27T22:24:07.402Z","msg":[1,{"height":2,"round":0,"step":"RoundStepPropose"}]} -{"time":"2017-04-27T22:24:07.403Z","msg":[2,{"msg":[17,{"Proposal":{"height":2,"round":0,"block_parts_header":{"total":1,"hash":"C693ABE80F5819FA5DA4666CBB74B7C865CE3C70"},"pol_round":-1,"pol_block_id":{"hash":"","parts":{"total":0,"hash":""}},"signature":[1,"C2E469C27D63A29609ABA5D3A74BEC10E6D6CD6310FBFAF50E0989AEBEBD7EF86A7EBEF7028662BA97A8402E899588E047F784D642D19852ED01B46CD8240C01"]}}],"peer_key":""}]} -{"time":"2017-04-27T22:24:07.403Z","msg":[2,{"msg":[19,{"Height":2,"Round":0,"Part":{"index":0,"bytes":"0101010F74656E6465726D696E745F74657374010214B96167381D4C4001690114B83D2AF62DBCA00412CD21152645411609DB51D401010114218DFAADA5F4A3E0DC3060379E80C45FBB5A04420114F737D0E2D410564390CFEC68118549248848A5DA011417B6D1FF1D4D334EA682CF10572C9682866F6D840114354594CBFC1A7BCA1AD0050ED6AA010023EADA39011455F568A46B4C2A3816103A3AA8845222C0941FDE010169011E363136323633363433313330333433443634363336323631333133303334011E363136323633363433313330333533443634363336323631333133303335011E363136323633363433313330333633443634363336323631333133303336011E363136323633363433313330333733443634363336323631333133303337011E363136323633363433313330333833443634363336323631333133303338011E363136323633363433313330333933443634363336323631333133303339011E363136323633363433313331333033443634363336323631333133313330011E363136323633363433313331333133443634363336323631333133313331011E363136323633363433313331333233443634363336323631333133313332011E363136323633363433313331333333443634363336323631333133313333011E363136323633363433313331333433443634363336323631333133313334011E363136323633363433313331333533443634363336323631333133313335011E363136323633363433313331333633443634363336323631333133313336011E363136323633363433313331333733443634363336323631333133313337011E363136323633363433313331333833443634363336323631333133313338011E363136323633363433313331333933443634363336323631333133313339011E363136323633363433313332333033443634363336323631333133323330011E363136323633363433313332333133443634363336323631333133323331011E363136323633363433313332333233443634363336323631333133323332011E363136323633363433313332333333443634363336323631333133323333011E363136323633363433313332333433443634363336323631333133323334011E363136323633363433313332333533443634363336323631333133323335011E363136323633363433313332333633443634363336323631333133323336011E363136323633363433313332333733443634363336323631333133323337011E363136323633363433313332333833443634363336323631333133323338011E363136323633363433313332333933443634363336323631333133323339011E363136323633363433313333333033443634363336323631333133333330011E363136323633363433313333333133443634363336323631333133333331011E363136323633363433313333333233443634363336323631333133333332011E363136323633363433313333333333443634363336323631333133333333011E363136323633363433313333333433443634363336323631333133333334011E363136323633363433313333333533443634363336323631333133333335011E363136323633363433313333333633443634363336323631333133333336011E363136323633363433313333333733443634363336323631333133333337011E363136323633363433313333333833443634363336323631333133333338011E363136323633363433313333333933443634363336323631333133333339011E363136323633363433313334333033443634363336323631333133343330011E363136323633363433313334333133443634363336323631333133343331011E363136323633363433313334333233443634363336323631333133343332011E363136323633363433313334333333443634363336323631333133343333011E363136323633363433313334333433443634363336323631333133343334011E363136323633363433313334333533443634363336323631333133343335011E363136323633363433313334333633443634363336323631333133343336011E363136323633363433313334333733443634363336323631333133343337011E363136323633363433313334333833443634363336323631333133343338011E363136323633363433313334333933443634363336323631333133343339011E363136323633363433313335333033443634363336323631333133353330011E363136323633363433313335333133443634363336323631333133353331011E363136323633363433313335333233443634363336323631333133353332011E363136323633363433313335333333443634363336323631333133353333011E363136323633363433313335333433443634363336323631333133353334011E363136323633363433313335333533443634363336323631333133353335011E363136323633363433313335333633443634363336323631333133353336011E363136323633363433313335333733443634363336323631333133353337011E363136323633363433313335333833443634363336323631333133353338011E363136323633363433313335333933443634363336323631333133353339011E363136323633363433313336333033443634363336323631333133363330011E363136323633363433313336333133443634363336323631333133363331011E363136323633363433313336333233443634363336323631333133363332011E363136323633363433313336333333443634363336323631333133363333011E363136323633363433313336333433443634363336323631333133363334011E363136323633363433313336333533443634363336323631333133363335011E363136323633363433313336333633443634363336323631333133363336011E363136323633363433313336333733443634363336323631333133363337011E363136323633363433313336333833443634363336323631333133363338011E363136323633363433313336333933443634363336323631333133363339011E363136323633363433313337333033443634363336323631333133373330011E363136323633363433313337333133443634363336323631333133373331011E363136323633363433313337333233443634363336323631333133373332011E363136323633363433313337333333443634363336323631333133373333011E363136323633363433313337333433443634363336323631333133373334011E363136323633363433313337333533443634363336323631333133373335011E363136323633363433313337333633443634363336323631333133373336011E363136323633363433313337333733443634363336323631333133373337011E363136323633363433313337333833443634363336323631333133373338011E363136323633363433313337333933443634363336323631333133373339011E363136323633363433313338333033443634363336323631333133383330011E363136323633363433313338333133443634363336323631333133383331011E363136323633363433313338333233443634363336323631333133383332011E363136323633363433313338333333443634363336323631333133383333011E363136323633363433313338333433443634363336323631333133383334011E363136323633363433313338333533443634363336323631333133383335011E363136323633363433313338333633443634363336323631333133383336011E363136323633363433313338333733443634363336323631333133383337011E363136323633363433313338333833443634363336323631333133383338011E363136323633363433313338333933443634363336323631333133383339011E363136323633363433313339333033443634363336323631333133393330011E363136323633363433313339333133443634363336323631333133393331011E363136323633363433313339333233443634363336323631333133393332011E363136323633363433313339333333443634363336323631333133393333011E363136323633363433313339333433443634363336323631333133393334011E363136323633363433313339333533443634363336323631333133393335011E363136323633363433313339333633443634363336323631333133393336011E363136323633363433313339333733443634363336323631333133393337011E363136323633363433313339333833443634363336323631333133393338011E363136323633363433313339333933443634363336323631333133393339011E363136323633363433323330333033443634363336323631333233303330011E363136323633363433323330333133443634363336323631333233303331011E363136323633363433323330333233443634363336323631333233303332011E363136323633363433323330333333443634363336323631333233303333011E363136323633363433323330333433443634363336323631333233303334011E363136323633363433323330333533443634363336323631333233303335011E363136323633363433323330333633443634363336323631333233303336011E363136323633363433323330333733443634363336323631333233303337011E363136323633363433323330333833443634363336323631333233303338010114B83D2AF62DBCA00412CD21152645411609DB51D401010114218DFAADA5F4A3E0DC3060379E80C45FBB5A04420101010114D028C9981F7A87F3093672BF0D5B0E2A1B3ED45600010100020114B83D2AF62DBCA00412CD21152645411609DB51D401010114218DFAADA5F4A3E0DC3060379E80C45FBB5A044201BD9AE0AE7B54DB3C7D4913FFEC54A29E3AC11DFFF77F59CF0411C47ADB863C1C2D44BB3B84EA1093ED01E6C19063294CA3E36D1920CD627A60F934216D2B3B02","proof":{"aunts":[]}}}],"peer_key":""}]} -{"time":"2017-04-27T22:24:07.405Z","msg":[1,{"height":2,"round":0,"step":"RoundStepPrevote"}]} -{"time":"2017-04-27T22:24:07.405Z","msg":[2,{"msg":[20,{"Vote":{"validator_address":"D028C9981F7A87F3093672BF0D5B0E2A1B3ED456","validator_index":0,"height":2,"round":0,"type":1,"block_id":{"hash":"BDB3BB45AF3B0CD2373E3690A684A00008A65526","parts":{"total":1,"hash":"C693ABE80F5819FA5DA4666CBB74B7C865CE3C70"}},"signature":[1,"FBBDB1360C3A2196A4149AEBB0E23512CF032FE9E98CB18EEA8CC71BB1F5482D4936B97B7D91965D6C00C230A54CA4CE4C6339716550D3B70E2DE79EE8DB0006"]}}],"peer_key":""}]} -{"time":"2017-04-27T22:24:07.406Z","msg":[1,{"height":2,"round":0,"step":"RoundStepPrecommit"}]} -{"time":"2017-04-27T22:24:07.406Z","msg":[2,{"msg":[20,{"Vote":{"validator_address":"D028C9981F7A87F3093672BF0D5B0E2A1B3ED456","validator_index":0,"height":2,"round":0,"type":2,"block_id":{"hash":"BDB3BB45AF3B0CD2373E3690A684A00008A65526","parts":{"total":1,"hash":"C693ABE80F5819FA5DA4666CBB74B7C865CE3C70"}},"signature":[1,"84FC5E25CECBCBB85D30E3B8BD6BAD674DB2D452EC53E04BB890C2FDC1DEE8EC4FA00234D64F4CD74DE4574DE7061B9985D4655009410FF40AD7CE7515215004"]}}],"peer_key":""}]} -{"time":"2017-04-27T22:24:07.407Z","msg":[1,{"height":2,"round":0,"step":"RoundStepCommit"}]} +{"time":"2017-10-23T13:26:54.774Z","msg":[1,{"height":2,"round":0,"step":"RoundStepNewHeight"}]} +{"time":"2017-10-23T13:26:55.772Z","msg":[3,{"duration":998078430,"height":2,"round":0,"step":1}]} +{"time":"2017-10-23T13:26:55.774Z","msg":[1,{"height":2,"round":0,"step":"RoundStepPropose"}]} +{"time":"2017-10-23T13:26:55.774Z","msg":[2,{"msg":[17,{"Proposal":{"height":2,"round":0,"block_parts_header":{"total":1,"hash":"A7102B4B22D886B403206ABFE6C85B7A4CE50531"},"pol_round":-1,"pol_block_id":{"hash":"","parts":{"total":0,"hash":""}},"signature":[1,"8E1ED7323DE473D1CB881FBE6DCAA6628F34BBFA8451E6E405F58D37C790655769D042EFD40AC889812954641B6FD24672F108F4C45DE844A7E83E9C3F6CF40A"]}}],"peer_key":""}]} +{"time":"2017-10-23T13:26:55.775Z","msg":[2,{"msg":[19,{"Height":2,"Round":0,"Part":{"index":0,"bytes":"0101010F74656E6465726D696E745F74657374010214F035F84FACC380000114EA34E735247F464303DAA09F70B76AA48543909C0101011460EC1BBCD363321BB4F052A1BB3186EF51E2C4450114F1A449467F49E11FCF43F16A4B1A6D958CB404550001147297262C6CD96190E46846C9A0DE1227E76077CF01147C2D453D301AD298FD45CCC559FF3D356F0875E10100010114EA34E735247F464303DAA09F70B76AA48543909C0101011460EC1BBCD363321BB4F052A1BB3186EF51E2C4450101010114D028C9981F7A87F3093672BF0D5B0E2A1B3ED45600010100020114EA34E735247F464303DAA09F70B76AA48543909C0101011460EC1BBCD363321BB4F052A1BB3186EF51E2C44501D4E0353B40535B623B47B07656BE0B1D54C85E64DCC0635D607CA2E6A4BB2BF41F286BDE15ECF8B5C9B96B9F11C50A1C3E63DC417196EDF1578B2F0D6DAEFA02","proof":{"aunts":[]}}}],"peer_key":""}]} +{"time":"2017-10-23T13:26:55.776Z","msg":[1,{"height":2,"round":0,"step":"RoundStepPrevote"}]} +{"time":"2017-10-23T13:26:55.776Z","msg":[2,{"msg":[20,{"Vote":{"validator_address":"D028C9981F7A87F3093672BF0D5B0E2A1B3ED456","validator_index":0,"height":2,"round":0,"type":1,"block_id":{"hash":"70DB0912D66F907E477115D8B44C6350A417A9C1","parts":{"total":1,"hash":"A7102B4B22D886B403206ABFE6C85B7A4CE50531"}},"signature":[1,"E98C3F3E0B5F21303F7E98235AB94C0387332289B0EA4772C5584C03ABB13F1A42593C94CFA3F5B478316C2CC92C53ED0708D5C0CA1873AF4995F97CC6212602"]}}],"peer_key":""}]} +{"time":"2017-10-23T13:26:55.778Z","msg":[1,{"height":2,"round":0,"step":"RoundStepPrecommit"}]} +{"time":"2017-10-23T13:26:55.779Z","msg":[2,{"msg":[20,{"Vote":{"validator_address":"D028C9981F7A87F3093672BF0D5B0E2A1B3ED456","validator_index":0,"height":2,"round":0,"type":2,"block_id":{"hash":"70DB0912D66F907E477115D8B44C6350A417A9C1","parts":{"total":1,"hash":"A7102B4B22D886B403206ABFE6C85B7A4CE50531"}},"signature":[1,"16C0A729E7C4A2FE4F84E9DAA4FC7AE42B6FBA1D8FC01202CA4545C45A4C45EE31665848C8EFCECBE5F5C7A294ED5660969EB80AECCF725BD462366C5C250C0C"]}}],"peer_key":""}]} +{"time":"2017-10-23T13:26:55.779Z","msg":[1,{"height":2,"round":0,"step":"RoundStepCommit"}]} #ENDHEIGHT: 2 -{"time":"2017-04-27T22:24:07.418Z","msg":[1,{"height":3,"round":0,"step":"RoundStepNewHeight"}]} -{"time":"2017-04-27T22:24:08.407Z","msg":[3,{"duration":988837269,"height":3,"round":0,"step":1}]} -{"time":"2017-04-27T22:24:08.408Z","msg":[1,{"height":3,"round":0,"step":"RoundStepPropose"}]} -{"time":"2017-04-27T22:24:08.408Z","msg":[2,{"msg":[17,{"Proposal":{"height":3,"round":0,"block_parts_header":{"total":1,"hash":"F2291A94D838F8E222FEFA8550B57D64CE1383B1"},"pol_round":-1,"pol_block_id":{"hash":"","parts":{"total":0,"hash":""}},"signature":[1,"389595237F4AFD5DAADA25139227AA54C38DB653ADAB9062BEF3450DAB9A9FF359776C24A8B983600D83118A74906778331BF783927F2C00BE21FC956633EF04"]}}],"peer_key":""}]} -{"time":"2017-04-27T22:24:08.408Z","msg":[2,{"msg":[19,{"Height":3,"Round":0,"Part":{"index":0,"bytes":"0101010F74656E6465726D696E745F74657374010314B961677413A3C0015C0114BDB3BB45AF3B0CD2373E3690A684A00008A6552601010114C693ABE80F5819FA5DA4666CBB74B7C865CE3C70011448506FCD69C61430F5E1F7854303F93AE49A63440114EBCA4C0F8D8B0BFB8AB6C6CADCD1ECC6F086B8C90114354594CBFC1A7BCA1AD0050ED6AA010023EADA390114D71F486E836237FDDFFA4EEFDAD138F8298D6FF701015C011E363136323633363433323330333933443634363336323631333233303339011E363136323633363433323331333033443634363336323631333233313330011E363136323633363433323331333133443634363336323631333233313331011E363136323633363433323331333233443634363336323631333233313332011E363136323633363433323331333333443634363336323631333233313333011E363136323633363433323331333433443634363336323631333233313334011E363136323633363433323331333533443634363336323631333233313335011E363136323633363433323331333633443634363336323631333233313336011E363136323633363433323331333733443634363336323631333233313337011E363136323633363433323331333833443634363336323631333233313338011E363136323633363433323331333933443634363336323631333233313339011E363136323633363433323332333033443634363336323631333233323330011E363136323633363433323332333133443634363336323631333233323331011E363136323633363433323332333233443634363336323631333233323332011E363136323633363433323332333333443634363336323631333233323333011E363136323633363433323332333433443634363336323631333233323334011E363136323633363433323332333533443634363336323631333233323335011E363136323633363433323332333633443634363336323631333233323336011E363136323633363433323332333733443634363336323631333233323337011E363136323633363433323332333833443634363336323631333233323338011E363136323633363433323332333933443634363336323631333233323339011E363136323633363433323333333033443634363336323631333233333330011E363136323633363433323333333133443634363336323631333233333331011E363136323633363433323333333233443634363336323631333233333332011E363136323633363433323333333333443634363336323631333233333333011E363136323633363433323333333433443634363336323631333233333334011E363136323633363433323333333533443634363336323631333233333335011E363136323633363433323333333633443634363336323631333233333336011E363136323633363433323333333733443634363336323631333233333337011E363136323633363433323333333833443634363336323631333233333338011E363136323633363433323333333933443634363336323631333233333339011E363136323633363433323334333033443634363336323631333233343330011E363136323633363433323334333133443634363336323631333233343331011E363136323633363433323334333233443634363336323631333233343332011E363136323633363433323334333333443634363336323631333233343333011E363136323633363433323334333433443634363336323631333233343334011E363136323633363433323334333533443634363336323631333233343335011E363136323633363433323334333633443634363336323631333233343336011E363136323633363433323334333733443634363336323631333233343337011E363136323633363433323334333833443634363336323631333233343338011E363136323633363433323334333933443634363336323631333233343339011E363136323633363433323335333033443634363336323631333233353330011E363136323633363433323335333133443634363336323631333233353331011E363136323633363433323335333233443634363336323631333233353332011E363136323633363433323335333333443634363336323631333233353333011E363136323633363433323335333433443634363336323631333233353334011E363136323633363433323335333533443634363336323631333233353335011E363136323633363433323335333633443634363336323631333233353336011E363136323633363433323335333733443634363336323631333233353337011E363136323633363433323335333833443634363336323631333233353338011E363136323633363433323335333933443634363336323631333233353339011E363136323633363433323336333033443634363336323631333233363330011E363136323633363433323336333133443634363336323631333233363331011E363136323633363433323336333233443634363336323631333233363332011E363136323633363433323336333333443634363336323631333233363333011E363136323633363433323336333433443634363336323631333233363334011E363136323633363433323336333533443634363336323631333233363335011E363136323633363433323336333633443634363336323631333233363336011E363136323633363433323336333733443634363336323631333233363337011E363136323633363433323336333833443634363336323631333233363338011E363136323633363433323336333933443634363336323631333233363339011E363136323633363433323337333033443634363336323631333233373330011E363136323633363433323337333133443634363336323631333233373331011E363136323633363433323337333233443634363336323631333233373332011E363136323633363433323337333333443634363336323631333233373333011E363136323633363433323337333433443634363336323631333233373334011E363136323633363433323337333533443634363336323631333233373335011E363136323633363433323337333633443634363336323631333233373336011E363136323633363433323337333733443634363336323631333233373337011E363136323633363433323337333833443634363336323631333233373338011E363136323633363433323337333933443634363336323631333233373339011E363136323633363433323338333033443634363336323631333233383330011E363136323633363433323338333133443634363336323631333233383331011E363136323633363433323338333233443634363336323631333233383332011E363136323633363433323338333333443634363336323631333233383333011E363136323633363433323338333433443634363336323631333233383334011E363136323633363433323338333533443634363336323631333233383335011E363136323633363433323338333633443634363336323631333233383336011E363136323633363433323338333733443634363336323631333233383337011E363136323633363433323338333833443634363336323631333233383338011E363136323633363433323338333933443634363336323631333233383339011E363136323633363433323339333033443634363336323631333233393330011E363136323633363433323339333133443634363336323631333233393331011E363136323633363433323339333233443634363336323631333233393332011E363136323633363433323339333333443634363336323631333233393333011E363136323633363433323339333433443634363336323631333233393334011E363136323633363433323339333533443634363336323631333233393335011E363136323633363433323339333633443634363336323631333233393336011E363136323633363433323339333733443634363336323631333233393337011E363136323633363433323339333833443634363336323631333233393338011E363136323633363433323339333933443634363336323631333233393339011E363136323633363433333330333033443634363336323631333333303330010114BDB3BB45AF3B0CD2373E3690A684A00008A6552601010114C693ABE80F5819FA5DA4666CBB74B7C865CE3C700101010114D028C9981F7A87F3093672BF0D5B0E2A1B3ED45600010200020114BDB3BB45AF3B0CD2373E3690A684A00008A6552601010114C693ABE80F5819FA5DA4666CBB74B7C865CE3C700184FC5E25CECBCBB85D30E3B8BD6BAD674DB2D452EC53E04BB890C2FDC1DEE8EC4FA00234D64F4CD74DE4574DE7061B9985D4655009410FF40AD7CE7515215004","proof":{"aunts":[]}}}],"peer_key":""}]} -{"time":"2017-04-27T22:24:08.409Z","msg":[1,{"height":3,"round":0,"step":"RoundStepPrevote"}]} -{"time":"2017-04-27T22:24:08.409Z","msg":[2,{"msg":[20,{"Vote":{"validator_address":"D028C9981F7A87F3093672BF0D5B0E2A1B3ED456","validator_index":0,"height":3,"round":0,"type":1,"block_id":{"hash":"A3B20D0D88B8A58ABC78F145D3A499C8FA178377","parts":{"total":1,"hash":"F2291A94D838F8E222FEFA8550B57D64CE1383B1"}},"signature":[1,"BB4CC7A065FE45E9C65ECD4EC8A3A6ED8873128AA2A386B359782EEAAFD58832261E5F365D31428D24DDC311972A7C8410570357D52E23E68F55B821B136D204"]}}],"peer_key":""}]} -{"time":"2017-04-27T22:24:08.410Z","msg":[1,{"height":3,"round":0,"step":"RoundStepPrecommit"}]} -{"time":"2017-04-27T22:24:08.410Z","msg":[2,{"msg":[20,{"Vote":{"validator_address":"D028C9981F7A87F3093672BF0D5B0E2A1B3ED456","validator_index":0,"height":3,"round":0,"type":2,"block_id":{"hash":"A3B20D0D88B8A58ABC78F145D3A499C8FA178377","parts":{"total":1,"hash":"F2291A94D838F8E222FEFA8550B57D64CE1383B1"}},"signature":[1,"280EE69579077AAD01C686F04FEFE839D5025DF5CFC646DDD177632966E16F0CB59E9C26ED850D8F8E6EDE4D0E7A1CC13AF418608F77C5E6B55B3966E8A69D02"]}}],"peer_key":""}]} -{"time":"2017-04-27T22:24:08.410Z","msg":[1,{"height":3,"round":0,"step":"RoundStepCommit"}]} +{"time":"2017-10-23T13:26:55.781Z","msg":[1,{"height":3,"round":0,"step":"RoundStepNewHeight"}]} +{"time":"2017-10-23T13:26:56.779Z","msg":[3,{"duration":997745170,"height":3,"round":0,"step":1}]} +{"time":"2017-10-23T13:26:56.781Z","msg":[1,{"height":3,"round":0,"step":"RoundStepPropose"}]} +{"time":"2017-10-23T13:26:56.781Z","msg":[2,{"msg":[17,{"Proposal":{"height":3,"round":0,"block_parts_header":{"total":1,"hash":"51492C95481DB288C2FD6CE40EA5F99E4471398A"},"pol_round":-1,"pol_block_id":{"hash":"","parts":{"total":0,"hash":""}},"signature":[1,"2BAEDF4745F7F863AED4E14B32F8074C875E05265FDFBF970520247C6773CF3589251973EFD6534EC784457B5DB2FD8272B4B75DFCFE4EA1ABFA877D86AD4107"]}}],"peer_key":""}]} +{"time":"2017-10-23T13:26:56.782Z","msg":[2,{"msg":[19,{"Height":3,"Round":0,"Part":{"index":0,"bytes":"0101010F74656E6465726D696E745F74657374010314F035F88BB25D4000011470DB0912D66F907E477115D8B44C6350A417A9C101010114A7102B4B22D886B403206ABFE6C85B7A4CE505310114977FF9E319ECE08E8358F6BEE2B79A948C1BE1620001147297262C6CD96190E46846C9A0DE1227E76077CF01147C2D453D301AD298FD45CCC559FF3D356F0875E1010001011470DB0912D66F907E477115D8B44C6350A417A9C101010114A7102B4B22D886B403206ABFE6C85B7A4CE505310101010114D028C9981F7A87F3093672BF0D5B0E2A1B3ED4560001020002011470DB0912D66F907E477115D8B44C6350A417A9C101010114A7102B4B22D886B403206ABFE6C85B7A4CE505310116C0A729E7C4A2FE4F84E9DAA4FC7AE42B6FBA1D8FC01202CA4545C45A4C45EE31665848C8EFCECBE5F5C7A294ED5660969EB80AECCF725BD462366C5C250C0C","proof":{"aunts":[]}}}],"peer_key":""}]} +{"time":"2017-10-23T13:26:56.783Z","msg":[1,{"height":3,"round":0,"step":"RoundStepPrevote"}]} +{"time":"2017-10-23T13:26:56.783Z","msg":[2,{"msg":[20,{"Vote":{"validator_address":"D028C9981F7A87F3093672BF0D5B0E2A1B3ED456","validator_index":0,"height":3,"round":0,"type":1,"block_id":{"hash":"075B22C89B4386AA47A41F14F7F04168BE9954DE","parts":{"total":1,"hash":"51492C95481DB288C2FD6CE40EA5F99E4471398A"}},"signature":[1,"2B14089FD835640154152E83460861DBEA43CB5D3F5E625B6ED4C515766638F797402785EF6E1960F3492538A20A73BF11392E3B6C406A4708CB080B93610A07"]}}],"peer_key":""}]} +{"time":"2017-10-23T13:26:56.784Z","msg":[1,{"height":3,"round":0,"step":"RoundStepPrecommit"}]} +{"time":"2017-10-23T13:26:56.784Z","msg":[2,{"msg":[20,{"Vote":{"validator_address":"D028C9981F7A87F3093672BF0D5B0E2A1B3ED456","validator_index":0,"height":3,"round":0,"type":2,"block_id":{"hash":"075B22C89B4386AA47A41F14F7F04168BE9954DE","parts":{"total":1,"hash":"51492C95481DB288C2FD6CE40EA5F99E4471398A"}},"signature":[1,"3EED0D783B5603A4B07A00024C5FB7C7AB2210A8BD749DB620E0348ED285D181920EE3D8B378A7D7FC2C8053139DA2A90374B16EF04639B238B5C4475D4C4C03"]}}],"peer_key":""}]} +{"time":"2017-10-23T13:26:56.785Z","msg":[1,{"height":3,"round":0,"step":"RoundStepCommit"}]} #ENDHEIGHT: 3 -{"time":"2017-04-27T22:24:08.416Z","msg":[1,{"height":4,"round":0,"step":"RoundStepNewHeight"}]} -{"time":"2017-04-27T22:24:09.410Z","msg":[3,{"duration":994206152,"height":4,"round":0,"step":1}]} -{"time":"2017-04-27T22:24:09.412Z","msg":[1,{"height":4,"round":0,"step":"RoundStepPropose"}]} -{"time":"2017-04-27T22:24:09.412Z","msg":[2,{"msg":[17,{"Proposal":{"height":4,"round":0,"block_parts_header":{"total":1,"hash":"ACB46B8913F0203EB579A9977AF6AF85B6E89705"},"pol_round":-1,"pol_block_id":{"hash":"","parts":{"total":0,"hash":""}},"signature":[1,"7DA37CE6B6BA2FE24C702D00B13B2A15505B0E364FD0824ED16EFD38B196381E9CA1F7BFAC649A978C0851D2DB4CD146FA0E43E5F1D2EAF21E5B58335840200E"]}}],"peer_key":""}]} -{"time":"2017-04-27T22:24:09.412Z","msg":[2,{"msg":[19,{"Height":4,"Round":0,"Part":{"index":0,"bytes":"0101010F74656E6465726D696E745F74657374010414B96167AFDC3480016E0114A3B20D0D88B8A58ABC78F145D3A499C8FA17837701010114F2291A94D838F8E222FEFA8550B57D64CE1383B101142B23CB9F3751854AB6B5D0DDF931F437274D25CD011450FE04FF5EE5EB1132C047965AE65A4BA54ED79E0114354594CBFC1A7BCA1AD0050ED6AA010023EADA3901148A5CA2966F0F895BF9664CB052DEA4B76DE51FA101016E011E363136323633363433333330333133443634363336323631333333303331011E363136323633363433333330333233443634363336323631333333303332011E363136323633363433333330333333443634363336323631333333303333011E363136323633363433333330333433443634363336323631333333303334011E363136323633363433333330333533443634363336323631333333303335011E363136323633363433333330333633443634363336323631333333303336011E363136323633363433333330333733443634363336323631333333303337011E363136323633363433333330333833443634363336323631333333303338011E363136323633363433333330333933443634363336323631333333303339011E363136323633363433333331333033443634363336323631333333313330011E363136323633363433333331333133443634363336323631333333313331011E363136323633363433333331333233443634363336323631333333313332011E363136323633363433333331333333443634363336323631333333313333011E363136323633363433333331333433443634363336323631333333313334011E363136323633363433333331333533443634363336323631333333313335011E363136323633363433333331333633443634363336323631333333313336011E363136323633363433333331333733443634363336323631333333313337011E363136323633363433333331333833443634363336323631333333313338011E363136323633363433333331333933443634363336323631333333313339011E363136323633363433333332333033443634363336323631333333323330011E363136323633363433333332333133443634363336323631333333323331011E363136323633363433333332333233443634363336323631333333323332011E363136323633363433333332333333443634363336323631333333323333011E363136323633363433333332333433443634363336323631333333323334011E363136323633363433333332333533443634363336323631333333323335011E363136323633363433333332333633443634363336323631333333323336011E363136323633363433333332333733443634363336323631333333323337011E363136323633363433333332333833443634363336323631333333323338011E363136323633363433333332333933443634363336323631333333323339011E363136323633363433333333333033443634363336323631333333333330011E363136323633363433333333333133443634363336323631333333333331011E363136323633363433333333333233443634363336323631333333333332011E363136323633363433333333333333443634363336323631333333333333011E363136323633363433333333333433443634363336323631333333333334011E363136323633363433333333333533443634363336323631333333333335011E363136323633363433333333333633443634363336323631333333333336011E363136323633363433333333333733443634363336323631333333333337011E363136323633363433333333333833443634363336323631333333333338011E363136323633363433333333333933443634363336323631333333333339011E363136323633363433333334333033443634363336323631333333343330011E363136323633363433333334333133443634363336323631333333343331011E363136323633363433333334333233443634363336323631333333343332011E363136323633363433333334333333443634363336323631333333343333011E363136323633363433333334333433443634363336323631333333343334011E363136323633363433333334333533443634363336323631333333343335011E363136323633363433333334333633443634363336323631333333343336011E363136323633363433333334333733443634363336323631333333343337011E363136323633363433333334333833443634363336323631333333343338011E363136323633363433333334333933443634363336323631333333343339011E363136323633363433333335333033443634363336323631333333353330011E363136323633363433333335333133443634363336323631333333353331011E363136323633363433333335333233443634363336323631333333353332011E363136323633363433333335333333443634363336323631333333353333011E363136323633363433333335333433443634363336323631333333353334011E363136323633363433333335333533443634363336323631333333353335011E363136323633363433333335333633443634363336323631333333353336011E363136323633363433333335333733443634363336323631333333353337011E363136323633363433333335333833443634363336323631333333353338011E363136323633363433333335333933443634363336323631333333353339011E363136323633363433333336333033443634363336323631333333363330011E363136323633363433333336333133443634363336323631333333363331011E363136323633363433333336333233443634363336323631333333363332011E363136323633363433333336333333443634363336323631333333363333011E363136323633363433333336333433443634363336323631333333363334011E363136323633363433333336333533443634363336323631333333363335011E363136323633363433333336333633443634363336323631333333363336011E363136323633363433333336333733443634363336323631333333363337011E363136323633363433333336333833443634363336323631333333363338011E363136323633363433333336333933443634363336323631333333363339011E363136323633363433333337333033443634363336323631333333373330011E363136323633363433333337333133443634363336323631333333373331011E363136323633363433333337333233443634363336323631333333373332011E363136323633363433333337333333443634363336323631333333373333011E363136323633363433333337333433443634363336323631333333373334011E363136323633363433333337333533443634363336323631333333373335011E363136323633363433333337333633443634363336323631333333373336011E363136323633363433333337333733443634363336323631333333373337011E363136323633363433333337333833443634363336323631333333373338011E363136323633363433333337333933443634363336323631333333373339011E363136323633363433333338333033443634363336323631333333383330011E363136323633363433333338333133443634363336323631333333383331011E363136323633363433333338333233443634363336323631333333383332011E363136323633363433333338333333443634363336323631333333383333011E363136323633363433333338333433443634363336323631333333383334011E363136323633363433333338333533443634363336323631333333383335011E363136323633363433333338333633443634363336323631333333383336011E363136323633363433333338333733443634363336323631333333383337011E363136323633363433333338333833443634363336323631333333383338011E363136323633363433333338333933443634363336323631333333383339011E363136323633363433333339333033443634363336323631333333393330011E363136323633363433333339333133443634363336323631333333393331011E363136323633363433333339333233443634363336323631333333393332011E363136323633363433333339333333443634363336323631333333393333011E363136323633363433333339333433443634363336323631333333393334011E363136323633363433333339333533443634363336323631333333393335011E363136323633363433333339333633443634363336323631333333393336011E363136323633363433333339333733443634363336323631333333393337011E363136323633363433333339333833443634363336323631333333393338011E363136323633363433333339333933443634363336323631333333393339011E363136323633363433343330333033443634363336323631333433303330011E363136323633363433343330333133443634363336323631333433303331011E363136323633363433343330333233443634363336323631333433303332011E363136323633363433343330333333443634363336323631333433303333011E363136323633363433343330333433443634363336323631333433303334011E363136323633363433343330333533443634363336323631333433303335011E363136323633363433343330333633443634363336323631333433303336011E363136323633363433343330333733443634363336323631333433303337011E363136323633363433343330333833443634363336323631333433303338011E363136323633363433343330333933443634363336323631333433303339011E363136323633363433343331333033443634363336323631333433313330010114A3B20D0D88B8A58ABC78F145D3A499C8FA17837701010114F2291A94D838F8E222FEFA8550B57D64CE1383B10101010114D028C9981F7A87F3093672BF0D5B0E2A1B3ED45600010300020114A3B20D0D88B8A58ABC78F145D3A499C8FA17837701010114F2291A94D838F8E222FEFA8550B57D64CE1383B101280EE69579077AAD01C686F04FEFE839D5025DF5CFC646DDD177632966E16F0CB59E9C26ED850D8F8E6EDE4D0E7A1CC13AF418608F77C5E6B55B3966E8A69D02","proof":{"aunts":[]}}}],"peer_key":""}]} -{"time":"2017-04-27T22:24:09.414Z","msg":[1,{"height":4,"round":0,"step":"RoundStepPrevote"}]} -{"time":"2017-04-27T22:24:09.414Z","msg":[2,{"msg":[20,{"Vote":{"validator_address":"D028C9981F7A87F3093672BF0D5B0E2A1B3ED456","validator_index":0,"height":4,"round":0,"type":1,"block_id":{"hash":"C3918AEACFA8BECF3695D10CC738D6182276CCEA","parts":{"total":1,"hash":"ACB46B8913F0203EB579A9977AF6AF85B6E89705"}},"signature":[1,"2ACD2A20D31464F1A39F82E02EA023C63C5BBBAF12320652CE09A94B07956950B6425C576675E5E3A0BF2E41312527434CD03E7A255F71999D56310AD665EC04"]}}],"peer_key":""}]} -{"time":"2017-04-27T22:24:09.416Z","msg":[1,{"height":4,"round":0,"step":"RoundStepPrecommit"}]} -{"time":"2017-04-27T22:24:09.416Z","msg":[2,{"msg":[20,{"Vote":{"validator_address":"D028C9981F7A87F3093672BF0D5B0E2A1B3ED456","validator_index":0,"height":4,"round":0,"type":2,"block_id":{"hash":"C3918AEACFA8BECF3695D10CC738D6182276CCEA","parts":{"total":1,"hash":"ACB46B8913F0203EB579A9977AF6AF85B6E89705"}},"signature":[1,"B9E1E611ADE3C020AC6041DB974D7A124CC0BCDF580517697D01B07D7B90AAA186F2F237C0D048BFE384EC75EFA65E56B8E9BE086AEBED74B1C5132CFA119207"]}}],"peer_key":""}]} -{"time":"2017-04-27T22:24:09.417Z","msg":[1,{"height":4,"round":0,"step":"RoundStepCommit"}]} +{"time":"2017-10-23T13:26:56.787Z","msg":[1,{"height":4,"round":0,"step":"RoundStepNewHeight"}]} +{"time":"2017-10-23T13:26:57.789Z","msg":[3,{"duration":997601959,"height":4,"round":0,"step":1}]} +{"time":"2017-10-23T13:26:57.791Z","msg":[1,{"height":4,"round":0,"step":"RoundStepPropose"}]} +{"time":"2017-10-23T13:26:57.791Z","msg":[2,{"msg":[17,{"Proposal":{"height":4,"round":0,"block_parts_header":{"total":1,"hash":"ED86401C47C3CBAE63524258BA4C527543241336"},"pol_round":-1,"pol_block_id":{"hash":"","parts":{"total":0,"hash":""}},"signature":[1,"E78CB54EAE42741630C3D34DFEE94A0DD145C282C793C1B2FC9921C6136B25A0555C6A629B8D8571B45E077769B541180972CC647F5721EFB9B345346A47F500"]}}],"peer_key":""}]} +{"time":"2017-10-23T13:26:57.791Z","msg":[2,{"msg":[19,{"Height":4,"Round":0,"Part":{"index":0,"bytes":"0101010F74656E6465726D696E745F74657374010414F035F8C7D67B80000114075B22C89B4386AA47A41F14F7F04168BE9954DE0101011451492C95481DB288C2FD6CE40EA5F99E4471398A0114B9810489E21F63E5A75B4EEC6FECB59D63F9E5F10001147297262C6CD96190E46846C9A0DE1227E76077CF01147C2D453D301AD298FD45CCC559FF3D356F0875E10100010114075B22C89B4386AA47A41F14F7F04168BE9954DE0101011451492C95481DB288C2FD6CE40EA5F99E4471398A0101010114D028C9981F7A87F3093672BF0D5B0E2A1B3ED45600010300020114075B22C89B4386AA47A41F14F7F04168BE9954DE0101011451492C95481DB288C2FD6CE40EA5F99E4471398A013EED0D783B5603A4B07A00024C5FB7C7AB2210A8BD749DB620E0348ED285D181920EE3D8B378A7D7FC2C8053139DA2A90374B16EF04639B238B5C4475D4C4C03","proof":{"aunts":[]}}}],"peer_key":""}]} +{"time":"2017-10-23T13:26:57.792Z","msg":[1,{"height":4,"round":0,"step":"RoundStepPrevote"}]} +{"time":"2017-10-23T13:26:57.792Z","msg":[2,{"msg":[20,{"Vote":{"validator_address":"D028C9981F7A87F3093672BF0D5B0E2A1B3ED456","validator_index":0,"height":4,"round":0,"type":1,"block_id":{"hash":"FC433CFC3A72E8A65AA91090CF5B5B9FC103BBF9","parts":{"total":1,"hash":"ED86401C47C3CBAE63524258BA4C527543241336"}},"signature":[1,"37F83A87FD81CB5D69C2073CF68AB7214E6D25D2CC27BF60A119A2D94C24A725034E9C643276BA968D80DD233DDD52CE78F73F9695D40FED29FBA49B554E7A0A"]}}],"peer_key":""}]} +{"time":"2017-10-23T13:26:57.794Z","msg":[1,{"height":4,"round":0,"step":"RoundStepPrecommit"}]} +{"time":"2017-10-23T13:26:57.794Z","msg":[2,{"msg":[20,{"Vote":{"validator_address":"D028C9981F7A87F3093672BF0D5B0E2A1B3ED456","validator_index":0,"height":4,"round":0,"type":2,"block_id":{"hash":"FC433CFC3A72E8A65AA91090CF5B5B9FC103BBF9","parts":{"total":1,"hash":"ED86401C47C3CBAE63524258BA4C527543241336"}},"signature":[1,"87630CE114A0BF7C6B4633C01916849B5CB158BFAD5CBF375E1315311E2835380A1ADA15120FC0E3D4D17F7DB121D308815B85D2421D12DD1F33EC9A29D18E0B"]}}],"peer_key":""}]} +{"time":"2017-10-23T13:26:57.794Z","msg":[1,{"height":4,"round":0,"step":"RoundStepCommit"}]} #ENDHEIGHT: 4 -{"time":"2017-04-27T22:24:09.431Z","msg":[1,{"height":5,"round":0,"step":"RoundStepNewHeight"}]} -{"time":"2017-04-27T22:24:10.417Z","msg":[3,{"duration":985803235,"height":5,"round":0,"step":1}]} -{"time":"2017-04-27T22:24:10.418Z","msg":[1,{"height":5,"round":0,"step":"RoundStepPropose"}]} -{"time":"2017-04-27T22:24:10.418Z","msg":[2,{"msg":[17,{"Proposal":{"height":5,"round":0,"block_parts_header":{"total":1,"hash":"DC0AAD92EA45834EB90563B51F5FCB8F6CE6A6B2"},"pol_round":-1,"pol_block_id":{"hash":"","parts":{"total":0,"hash":""}},"signature":[1,"F7799D9885B354FF90772DA770768624E311398DA0FEF0E28C02934AAE32D0D183BEEB304022EC721FED3FE429C7F184F1A22EE6E83E1DC5D5C66500C138EF05"]}}],"peer_key":""}]} -{"time":"2017-04-27T22:24:10.419Z","msg":[2,{"msg":[19,{"Height":5,"Round":0,"Part":{"index":0,"bytes":"0101010F74656E6465726D696E745F74657374010514B96167EBE1CE40016B0114C3918AEACFA8BECF3695D10CC738D6182276CCEA01010114ACB46B8913F0203EB579A9977AF6AF85B6E897050114D4A14D12F28D02E3B707954EE2D8B1794C45FBDB0114EB7BE3102D05EFCE8D70D4033995393C3D6A6ECA0114354594CBFC1A7BCA1AD0050ED6AA010023EADA3901145DC8B2DF900A8E6A1DC37B2EE9D4B8860070759A01016B011E363136323633363433343331333133443634363336323631333433313331011E363136323633363433343331333233443634363336323631333433313332011E363136323633363433343331333333443634363336323631333433313333011E363136323633363433343331333433443634363336323631333433313334011E363136323633363433343331333533443634363336323631333433313335011E363136323633363433343331333633443634363336323631333433313336011E363136323633363433343331333733443634363336323631333433313337011E363136323633363433343331333833443634363336323631333433313338011E363136323633363433343331333933443634363336323631333433313339011E363136323633363433343332333033443634363336323631333433323330011E363136323633363433343332333133443634363336323631333433323331011E363136323633363433343332333233443634363336323631333433323332011E363136323633363433343332333333443634363336323631333433323333011E363136323633363433343332333433443634363336323631333433323334011E363136323633363433343332333533443634363336323631333433323335011E363136323633363433343332333633443634363336323631333433323336011E363136323633363433343332333733443634363336323631333433323337011E363136323633363433343332333833443634363336323631333433323338011E363136323633363433343332333933443634363336323631333433323339011E363136323633363433343333333033443634363336323631333433333330011E363136323633363433343333333133443634363336323631333433333331011E363136323633363433343333333233443634363336323631333433333332011E363136323633363433343333333333443634363336323631333433333333011E363136323633363433343333333433443634363336323631333433333334011E363136323633363433343333333533443634363336323631333433333335011E363136323633363433343333333633443634363336323631333433333336011E363136323633363433343333333733443634363336323631333433333337011E363136323633363433343333333833443634363336323631333433333338011E363136323633363433343333333933443634363336323631333433333339011E363136323633363433343334333033443634363336323631333433343330011E363136323633363433343334333133443634363336323631333433343331011E363136323633363433343334333233443634363336323631333433343332011E363136323633363433343334333333443634363336323631333433343333011E363136323633363433343334333433443634363336323631333433343334011E363136323633363433343334333533443634363336323631333433343335011E363136323633363433343334333633443634363336323631333433343336011E363136323633363433343334333733443634363336323631333433343337011E363136323633363433343334333833443634363336323631333433343338011E363136323633363433343334333933443634363336323631333433343339011E363136323633363433343335333033443634363336323631333433353330011E363136323633363433343335333133443634363336323631333433353331011E363136323633363433343335333233443634363336323631333433353332011E363136323633363433343335333333443634363336323631333433353333011E363136323633363433343335333433443634363336323631333433353334011E363136323633363433343335333533443634363336323631333433353335011E363136323633363433343335333633443634363336323631333433353336011E363136323633363433343335333733443634363336323631333433353337011E363136323633363433343335333833443634363336323631333433353338011E363136323633363433343335333933443634363336323631333433353339011E363136323633363433343336333033443634363336323631333433363330011E363136323633363433343336333133443634363336323631333433363331011E363136323633363433343336333233443634363336323631333433363332011E363136323633363433343336333333443634363336323631333433363333011E363136323633363433343336333433443634363336323631333433363334011E363136323633363433343336333533443634363336323631333433363335011E363136323633363433343336333633443634363336323631333433363336011E363136323633363433343336333733443634363336323631333433363337011E363136323633363433343336333833443634363336323631333433363338011E363136323633363433343336333933443634363336323631333433363339011E363136323633363433343337333033443634363336323631333433373330011E363136323633363433343337333133443634363336323631333433373331011E363136323633363433343337333233443634363336323631333433373332011E363136323633363433343337333333443634363336323631333433373333011E363136323633363433343337333433443634363336323631333433373334011E363136323633363433343337333533443634363336323631333433373335011E363136323633363433343337333633443634363336323631333433373336011E363136323633363433343337333733443634363336323631333433373337011E363136323633363433343337333833443634363336323631333433373338011E363136323633363433343337333933443634363336323631333433373339011E363136323633363433343338333033443634363336323631333433383330011E363136323633363433343338333133443634363336323631333433383331011E363136323633363433343338333233443634363336323631333433383332011E363136323633363433343338333333443634363336323631333433383333011E363136323633363433343338333433443634363336323631333433383334011E363136323633363433343338333533443634363336323631333433383335011E363136323633363433343338333633443634363336323631333433383336011E363136323633363433343338333733443634363336323631333433383337011E363136323633363433343338333833443634363336323631333433383338011E363136323633363433343338333933443634363336323631333433383339011E363136323633363433343339333033443634363336323631333433393330011E363136323633363433343339333133443634363336323631333433393331011E363136323633363433343339333233443634363336323631333433393332011E363136323633363433343339333333443634363336323631333433393333011E363136323633363433343339333433443634363336323631333433393334011E363136323633363433343339333533443634363336323631333433393335011E363136323633363433343339333633443634363336323631333433393336011E363136323633363433343339333733443634363336323631333433393337011E363136323633363433343339333833443634363336323631333433393338011E363136323633363433343339333933443634363336323631333433393339011E363136323633363433353330333033443634363336323631333533303330011E363136323633363433353330333133443634363336323631333533303331011E363136323633363433353330333233443634363336323631333533303332011E363136323633363433353330333333443634363336323631333533303333011E363136323633363433353330333433443634363336323631333533303334011E363136323633363433353330333533443634363336323631333533303335011E363136323633363433353330333633443634363336323631333533303336011E363136323633363433353330333733443634363336323631333533303337011E363136323633363433353330333833443634363336323631333533303338011E363136323633363433353330333933443634363336323631333533303339011E363136323633363433353331333033443634363336323631333533313330011E363136323633363433353331333133443634363336323631333533313331011E363136323633363433353331333233443634363336323631333533313332011E363136323633363433353331333333443634363336323631333533313333011E363136323633363433353331333433443634363336323631333533313334011E363136323633363433353331333533443634363336323631333533313335011E363136323633363433353331333633443634363336323631333533313336011E363136323633363433353331333733443634363336323631333533313337010114C3918AEACFA8BECF3695D10CC738D6182276CCEA01010114ACB46B8913F0203EB579A9977AF6AF85B6E897050101010114D028C9981F7A87F3093672BF0D5B0E2A1B3ED45600010400020114C3918AEACFA8BECF3695D10CC738D6182276CCEA01010114ACB46B8913F0203EB579A9977AF6AF85B6E8970501B9E1E611ADE3C020AC6041DB974D7A124CC0BCDF580517697D01B07D7B90AAA186F2F237C0D048BFE384EC75EFA65E56B8E9BE086AEBED74B1C5132CFA119207","proof":{"aunts":[]}}}],"peer_key":""}]} -{"time":"2017-04-27T22:24:10.420Z","msg":[1,{"height":5,"round":0,"step":"RoundStepPrevote"}]} -{"time":"2017-04-27T22:24:10.420Z","msg":[2,{"msg":[20,{"Vote":{"validator_address":"D028C9981F7A87F3093672BF0D5B0E2A1B3ED456","validator_index":0,"height":5,"round":0,"type":1,"block_id":{"hash":"29C2401351653BDD300FDA82FF670747DEE0D6BD","parts":{"total":1,"hash":"DC0AAD92EA45834EB90563B51F5FCB8F6CE6A6B2"}},"signature":[1,"3C5A5D4A84520A495F1239FD3B166C1F38226578C0BEF7F7953B2995BF274C5A5A7A222E2433BE8DA08321F838C69C4FDC8A3767D072D3CCD260F435F4065E0E"]}}],"peer_key":""}]} -{"time":"2017-04-27T22:24:10.421Z","msg":[1,{"height":5,"round":0,"step":"RoundStepPrecommit"}]} -{"time":"2017-04-27T22:24:10.421Z","msg":[2,{"msg":[20,{"Vote":{"validator_address":"D028C9981F7A87F3093672BF0D5B0E2A1B3ED456","validator_index":0,"height":5,"round":0,"type":2,"block_id":{"hash":"29C2401351653BDD300FDA82FF670747DEE0D6BD","parts":{"total":1,"hash":"DC0AAD92EA45834EB90563B51F5FCB8F6CE6A6B2"}},"signature":[1,"5FFD69406ABEE706DD424F69E6D2A94A7ED8566D4A2A936A160BF7C574B7371C53CDC75B739D173EC456ECBBC84A4745CAAAB55D9CEA0BD4AD91FB04A8300406"]}}],"peer_key":""}]} -{"time":"2017-04-27T22:24:10.422Z","msg":[1,{"height":5,"round":0,"step":"RoundStepCommit"}]} +{"time":"2017-10-23T13:26:57.796Z","msg":[1,{"height":5,"round":0,"step":"RoundStepNewHeight"}]} +{"time":"2017-10-23T13:26:58.797Z","msg":[3,{"duration":998115855,"height":5,"round":0,"step":1}]} +{"time":"2017-10-23T13:26:58.800Z","msg":[1,{"height":5,"round":0,"step":"RoundStepPropose"}]} +{"time":"2017-10-23T13:26:58.800Z","msg":[2,{"msg":[17,{"Proposal":{"height":5,"round":0,"block_parts_header":{"total":1,"hash":"BEB616914C7F74DE8D298018D1F7ACD130BCD979"},"pol_round":-1,"pol_block_id":{"hash":"","parts":{"total":0,"hash":""}},"signature":[1,"7E4B48A04EB4DAE193CF5A96C9CEF47C0E41240544305DEE1CD1449EE29C34B4E4DF730D10D0A22DB1808DBED38AAF734DABD315C5CA2C4A0A670D65D336B304"]}}],"peer_key":""}]} +{"time":"2017-10-23T13:26:58.800Z","msg":[2,{"msg":[19,{"Height":5,"Round":0,"Part":{"index":0,"bytes":"0101010F74656E6465726D696E745F74657374010514F035F903EB5780000114FC433CFC3A72E8A65AA91090CF5B5B9FC103BBF901010114ED86401C47C3CBAE63524258BA4C52754324133601142C139D2478F2B571ABB8BF08AA3FC233B5DEA7000001147297262C6CD96190E46846C9A0DE1227E76077CF01147C2D453D301AD298FD45CCC559FF3D356F0875E10100010114FC433CFC3A72E8A65AA91090CF5B5B9FC103BBF901010114ED86401C47C3CBAE63524258BA4C5275432413360101010114D028C9981F7A87F3093672BF0D5B0E2A1B3ED45600010400020114FC433CFC3A72E8A65AA91090CF5B5B9FC103BBF901010114ED86401C47C3CBAE63524258BA4C5275432413360187630CE114A0BF7C6B4633C01916849B5CB158BFAD5CBF375E1315311E2835380A1ADA15120FC0E3D4D17F7DB121D308815B85D2421D12DD1F33EC9A29D18E0B","proof":{"aunts":[]}}}],"peer_key":""}]} +{"time":"2017-10-23T13:26:58.802Z","msg":[1,{"height":5,"round":0,"step":"RoundStepPrevote"}]} +{"time":"2017-10-23T13:26:58.802Z","msg":[2,{"msg":[20,{"Vote":{"validator_address":"D028C9981F7A87F3093672BF0D5B0E2A1B3ED456","validator_index":0,"height":5,"round":0,"type":1,"block_id":{"hash":"13C6DF9E728891E1EEB58009C2FB8B42D52199E5","parts":{"total":1,"hash":"BEB616914C7F74DE8D298018D1F7ACD130BCD979"}},"signature":[1,"660DC17E0E0770882A9401A70B1A3ACE189D190DC6AE1F1F971444007BDDA267F7844DED873A96C780349F2387CE2C31E9EDBB14BF6675F2E1E1FF0BFE34D508"]}}],"peer_key":""}]} +{"time":"2017-10-23T13:26:58.804Z","msg":[1,{"height":5,"round":0,"step":"RoundStepPrecommit"}]} +{"time":"2017-10-23T13:26:58.804Z","msg":[2,{"msg":[20,{"Vote":{"validator_address":"D028C9981F7A87F3093672BF0D5B0E2A1B3ED456","validator_index":0,"height":5,"round":0,"type":2,"block_id":{"hash":"13C6DF9E728891E1EEB58009C2FB8B42D52199E5","parts":{"total":1,"hash":"BEB616914C7F74DE8D298018D1F7ACD130BCD979"}},"signature":[1,"C9A693D874346ACAC0633ED4B1EAC20B68B2C3FC93C3A09BEB9379712F7EBB71CA623214B7CAC2E8AF3D9EC7EBB6F9395CB7BA4BDC572797B2FD469F0AF01002"]}}],"peer_key":""}]} +{"time":"2017-10-23T13:26:58.804Z","msg":[1,{"height":5,"round":0,"step":"RoundStepCommit"}]} #ENDHEIGHT: 5 -{"time":"2017-04-27T22:24:10.432Z","msg":[1,{"height":6,"round":0,"step":"RoundStepNewHeight"}]} -{"time":"2017-04-27T22:24:11.422Z","msg":[3,{"duration":989935903,"height":6,"round":0,"step":1}]} -{"time":"2017-04-27T22:24:11.424Z","msg":[1,{"height":6,"round":0,"step":"RoundStepPropose"}]} -{"time":"2017-04-27T22:24:11.424Z","msg":[2,{"msg":[17,{"Proposal":{"height":6,"round":0,"block_parts_header":{"total":1,"hash":"37436A7FCDB02F18074E8D2C90E9F004BBCB534E"},"pol_round":-1,"pol_block_id":{"hash":"","parts":{"total":0,"hash":""}},"signature":[1,"11204470769A82145069D6F08BF1B5C62E86EB0016E820FC2B4BDDA283F1B9CD4A35DA897E7624AC35D48026A1D73FDBAA19F5E43E89D63310C16168A5E7460D"]}}],"peer_key":""}]} -{"time":"2017-04-27T22:24:11.424Z","msg":[2,{"msg":[19,{"Height":6,"Round":0,"Part":{"index":0,"bytes":"0101010F74656E6465726D696E745F74657374010614B9616827C8E3800171011429C2401351653BDD300FDA82FF670747DEE0D6BD01010114DC0AAD92EA45834EB90563B51F5FCB8F6CE6A6B201147EF9A4B59129B957565C5AEA8F67911AD0672C3C011463CBE710CCF92C056DECC32112CC3A64F3F191560114354594CBFC1A7BCA1AD0050ED6AA010023EADA3901141EF14BB9890DC775E68CB57C86BA2A9118573099010171011E363136323633363433353331333833443634363336323631333533313338011E363136323633363433353331333933443634363336323631333533313339011E363136323633363433353332333033443634363336323631333533323330011E363136323633363433353332333133443634363336323631333533323331011E363136323633363433353332333233443634363336323631333533323332011E363136323633363433353332333333443634363336323631333533323333011E363136323633363433353332333433443634363336323631333533323334011E363136323633363433353332333533443634363336323631333533323335011E363136323633363433353332333633443634363336323631333533323336011E363136323633363433353332333733443634363336323631333533323337011E363136323633363433353332333833443634363336323631333533323338011E363136323633363433353332333933443634363336323631333533323339011E363136323633363433353333333033443634363336323631333533333330011E363136323633363433353333333133443634363336323631333533333331011E363136323633363433353333333233443634363336323631333533333332011E363136323633363433353333333333443634363336323631333533333333011E363136323633363433353333333433443634363336323631333533333334011E363136323633363433353333333533443634363336323631333533333335011E363136323633363433353333333633443634363336323631333533333336011E363136323633363433353333333733443634363336323631333533333337011E363136323633363433353333333833443634363336323631333533333338011E363136323633363433353333333933443634363336323631333533333339011E363136323633363433353334333033443634363336323631333533343330011E363136323633363433353334333133443634363336323631333533343331011E363136323633363433353334333233443634363336323631333533343332011E363136323633363433353334333333443634363336323631333533343333011E363136323633363433353334333433443634363336323631333533343334011E363136323633363433353334333533443634363336323631333533343335011E363136323633363433353334333633443634363336323631333533343336011E363136323633363433353334333733443634363336323631333533343337011E363136323633363433353334333833443634363336323631333533343338011E363136323633363433353334333933443634363336323631333533343339011E363136323633363433353335333033443634363336323631333533353330011E363136323633363433353335333133443634363336323631333533353331011E363136323633363433353335333233443634363336323631333533353332011E363136323633363433353335333333443634363336323631333533353333011E363136323633363433353335333433443634363336323631333533353334011E363136323633363433353335333533443634363336323631333533353335011E363136323633363433353335333633443634363336323631333533353336011E363136323633363433353335333733443634363336323631333533353337011E363136323633363433353335333833443634363336323631333533353338011E363136323633363433353335333933443634363336323631333533353339011E363136323633363433353336333033443634363336323631333533363330011E363136323633363433353336333133443634363336323631333533363331011E363136323633363433353336333233443634363336323631333533363332011E363136323633363433353336333333443634363336323631333533363333011E363136323633363433353336333433443634363336323631333533363334011E363136323633363433353336333533443634363336323631333533363335011E363136323633363433353336333633443634363336323631333533363336011E363136323633363433353336333733443634363336323631333533363337011E363136323633363433353336333833443634363336323631333533363338011E363136323633363433353336333933443634363336323631333533363339011E363136323633363433353337333033443634363336323631333533373330011E363136323633363433353337333133443634363336323631333533373331011E363136323633363433353337333233443634363336323631333533373332011E363136323633363433353337333333443634363336323631333533373333011E363136323633363433353337333433443634363336323631333533373334011E363136323633363433353337333533443634363336323631333533373335011E363136323633363433353337333633443634363336323631333533373336011E363136323633363433353337333733443634363336323631333533373337011E363136323633363433353337333833443634363336323631333533373338011E363136323633363433353337333933443634363336323631333533373339011E363136323633363433353338333033443634363336323631333533383330011E363136323633363433353338333133443634363336323631333533383331011E363136323633363433353338333233443634363336323631333533383332011E363136323633363433353338333333443634363336323631333533383333011E363136323633363433353338333433443634363336323631333533383334011E363136323633363433353338333533443634363336323631333533383335011E363136323633363433353338333633443634363336323631333533383336011E363136323633363433353338333733443634363336323631333533383337011E363136323633363433353338333833443634363336323631333533383338011E363136323633363433353338333933443634363336323631333533383339011E363136323633363433353339333033443634363336323631333533393330011E363136323633363433353339333133443634363336323631333533393331011E363136323633363433353339333233443634363336323631333533393332011E363136323633363433353339333333443634363336323631333533393333011E363136323633363433353339333433443634363336323631333533393334011E363136323633363433353339333533443634363336323631333533393335011E363136323633363433353339333633443634363336323631333533393336011E363136323633363433353339333733443634363336323631333533393337011E363136323633363433353339333833443634363336323631333533393338011E363136323633363433353339333933443634363336323631333533393339011E363136323633363433363330333033443634363336323631333633303330011E363136323633363433363330333133443634363336323631333633303331011E363136323633363433363330333233443634363336323631333633303332011E363136323633363433363330333333443634363336323631333633303333011E363136323633363433363330333433443634363336323631333633303334011E363136323633363433363330333533443634363336323631333633303335011E363136323633363433363330333633443634363336323631333633303336011E363136323633363433363330333733443634363336323631333633303337011E363136323633363433363330333833443634363336323631333633303338011E363136323633363433363330333933443634363336323631333633303339011E363136323633363433363331333033443634363336323631333633313330011E363136323633363433363331333133443634363336323631333633313331011E363136323633363433363331333233443634363336323631333633313332011E363136323633363433363331333333443634363336323631333633313333011E363136323633363433363331333433443634363336323631333633313334011E363136323633363433363331333533443634363336323631333633313335011E363136323633363433363331333633443634363336323631333633313336011E363136323633363433363331333733443634363336323631333633313337011E363136323633363433363331333833443634363336323631333633313338011E363136323633363433363331333933443634363336323631333633313339011E363136323633363433363332333033443634363336323631333633323330011E363136323633363433363332333133443634363336323631333633323331011E363136323633363433363332333233443634363336323631333633323332011E363136323633363433363332333333443634363336323631333633323333011E363136323633363433363332333433443634363336323631333633323334011E363136323633363433363332333533443634363336323631333633323335011E363136323633363433363332333633443634363336323631333633323336011E363136323633363433363332333733443634363336323631333633323337011E363136323633363433363332333833443634363336323631333633323338011E363136323633363433363332333933443634363336323631333633323339011E36313632363336343336333333303344363436333632363133363333333001011429C2401351653BDD300FDA82FF670747DEE0D6BD01010114DC0AAD92EA45834EB90563B51F5FCB8F6CE6A6B20101010114D028C9981F7A87F3093672BF0D5B0E2A1B3ED4560001050002011429C2401351653BDD300FDA82FF670747DEE0D6BD01010114DC0AAD92EA45834EB90563B51F5FCB8F6CE6A6B2015FFD69406ABEE706DD424F69E6D2A94A7ED8566D4A2A936A160BF7C574B7371C53CDC75B739D173EC456ECBBC84A4745CAAAB55D9CEA0BD4AD91FB04A8300406","proof":{"aunts":[]}}}],"peer_key":""}]} -{"time":"2017-04-27T22:24:11.425Z","msg":[1,{"height":6,"round":0,"step":"RoundStepPrevote"}]} -{"time":"2017-04-27T22:24:11.425Z","msg":[2,{"msg":[20,{"Vote":{"validator_address":"D028C9981F7A87F3093672BF0D5B0E2A1B3ED456","validator_index":0,"height":6,"round":0,"type":1,"block_id":{"hash":"01CA8EA6995CA94535B20FFD04123D5CB68C0469","parts":{"total":1,"hash":"37436A7FCDB02F18074E8D2C90E9F004BBCB534E"}},"signature":[1,"F5C420BC1E1A6C6A9715756B0D71AF5481893150BCBA3F7702B1EB60D5077E66128B432064331C8B8AA46366C383666BDC5AFE56502233E9CAD0B6A6FB1BFF01"]}}],"peer_key":""}]} -{"time":"2017-04-27T22:24:11.427Z","msg":[1,{"height":6,"round":0,"step":"RoundStepPrecommit"}]} -{"time":"2017-04-27T22:24:11.427Z","msg":[2,{"msg":[20,{"Vote":{"validator_address":"D028C9981F7A87F3093672BF0D5B0E2A1B3ED456","validator_index":0,"height":6,"round":0,"type":2,"block_id":{"hash":"01CA8EA6995CA94535B20FFD04123D5CB68C0469","parts":{"total":1,"hash":"37436A7FCDB02F18074E8D2C90E9F004BBCB534E"}},"signature":[1,"43C023CF88559C0BEA31FB11DD304279389373B856A5FEB56CB1BCDFCED9E01E1F46251753CE57E76EEF2616DE2F7511148A14B14B389D43CF224B2BD4571B00"]}}],"peer_key":""}]} -{"time":"2017-04-27T22:24:11.427Z","msg":[1,{"height":6,"round":0,"step":"RoundStepCommit"}]} +{"time":"2017-10-23T13:26:58.807Z","msg":[1,{"height":6,"round":0,"step":"RoundStepNewHeight"}]} +{"time":"2017-10-23T13:26:59.806Z","msg":[3,{"duration":997614468,"height":6,"round":0,"step":1}]} +{"time":"2017-10-23T13:26:59.808Z","msg":[1,{"height":6,"round":0,"step":"RoundStepPropose"}]} +{"time":"2017-10-23T13:26:59.808Z","msg":[2,{"msg":[17,{"Proposal":{"height":6,"round":0,"block_parts_header":{"total":1,"hash":"8E0E9FFAAB54FD93DF8597731D613A50D3CD5654"},"pol_round":-1,"pol_block_id":{"hash":"","parts":{"total":0,"hash":""}},"signature":[1,"FD33C4AF3E6675AAAC23D1D31572C84AFE8361C28B508C2A74D49467EC688C61495E133436BBB72E432E959207ECE5FFB427DCFD2120ADF6F6D21497BC426900"]}}],"peer_key":""}]} +{"time":"2017-10-23T13:26:59.809Z","msg":[2,{"msg":[19,{"Height":6,"Round":0,"Part":{"index":0,"bytes":"0101010F74656E6465726D696E745F74657374010614F035F9400F75C000011413C6DF9E728891E1EEB58009C2FB8B42D52199E501010114BEB616914C7F74DE8D298018D1F7ACD130BCD9790114ADCBFFDABD379EE9666B35D4ABD4CC70AC21EA140001147297262C6CD96190E46846C9A0DE1227E76077CF01147C2D453D301AD298FD45CCC559FF3D356F0875E1010001011413C6DF9E728891E1EEB58009C2FB8B42D52199E501010114BEB616914C7F74DE8D298018D1F7ACD130BCD9790101010114D028C9981F7A87F3093672BF0D5B0E2A1B3ED4560001050002011413C6DF9E728891E1EEB58009C2FB8B42D52199E501010114BEB616914C7F74DE8D298018D1F7ACD130BCD97901C9A693D874346ACAC0633ED4B1EAC20B68B2C3FC93C3A09BEB9379712F7EBB71CA623214B7CAC2E8AF3D9EC7EBB6F9395CB7BA4BDC572797B2FD469F0AF01002","proof":{"aunts":[]}}}],"peer_key":""}]} +{"time":"2017-10-23T13:26:59.810Z","msg":[1,{"height":6,"round":0,"step":"RoundStepPrevote"}]} +{"time":"2017-10-23T13:26:59.811Z","msg":[2,{"msg":[20,{"Vote":{"validator_address":"D028C9981F7A87F3093672BF0D5B0E2A1B3ED456","validator_index":0,"height":6,"round":0,"type":1,"block_id":{"hash":"118ED0A8B32E1DAABE06FF4D701B20826C3B9BFB","parts":{"total":1,"hash":"8E0E9FFAAB54FD93DF8597731D613A50D3CD5654"}},"signature":[1,"DE3E282B7B49DDEDC810B568C118B47D55A8F2DFB63F6C4BC521D283C9FDAD3FA3BB6A1BEEA43C2B416B1EDBE7FCE5D500BF26C99CC27FC602D8FAE08FADC40E"]}}],"peer_key":""}]} +{"time":"2017-10-23T13:26:59.812Z","msg":[1,{"height":6,"round":0,"step":"RoundStepPrecommit"}]} +{"time":"2017-10-23T13:26:59.812Z","msg":[2,{"msg":[20,{"Vote":{"validator_address":"D028C9981F7A87F3093672BF0D5B0E2A1B3ED456","validator_index":0,"height":6,"round":0,"type":2,"block_id":{"hash":"118ED0A8B32E1DAABE06FF4D701B20826C3B9BFB","parts":{"total":1,"hash":"8E0E9FFAAB54FD93DF8597731D613A50D3CD5654"}},"signature":[1,"9CECA34991E232992D283ABD15E396EA699C12CE057288B407D37DFE6BCE2932B8A3919FAE1325FB77DA96882153C74AC2EB57D23BC21D18CA187E62E6B28C05"]}}],"peer_key":""}]} +{"time":"2017-10-23T13:26:59.813Z","msg":[1,{"height":6,"round":0,"step":"RoundStepCommit"}]} diff --git a/consensus/test_data/small_block1.cswal b/consensus/test_data/small_block1.cswal index 94ccf712b..6705b8a8a 100644 --- a/consensus/test_data/small_block1.cswal +++ b/consensus/test_data/small_block1.cswal @@ -1,10 +1,10 @@ #ENDHEIGHT: 0 -{"time":"2017-04-27T22:23:46.268Z","msg":[3,{"duration":972111736,"height":1,"round":0,"step":1}]} -{"time":"2017-04-27T22:23:46.270Z","msg":[1,{"height":1,"round":0,"step":"RoundStepPropose"}]} -{"time":"2017-04-27T22:23:46.270Z","msg":[2,{"msg":[17,{"Proposal":{"height":1,"round":0,"block_parts_header":{"total":1,"hash":"368323AC043A67ACFCF02877D0117F487B6728C2"},"pol_round":-1,"pol_block_id":{"hash":"","parts":{"total":0,"hash":""}},"signature":[1,"3948300A68131AD851E79F09EAF809AAD46C5EC1D2CFC65706F226A78E3C55B093A4AF6C57AFB43C512D818C733C7D273ED7241C4CC16F0E90A30D15730D9209"]}}],"peer_key":""}]} -{"time":"2017-04-27T22:23:46.270Z","msg":[2,{"msg":[19,{"Height":1,"Round":0,"Part":{"index":0,"bytes":"0101010F74656E6465726D696E745F74657374010114B961624C7D4F000167000000000114F075CC9E65D85ECBEA8E4603DC7DB96E881CEEB60114354594CBFC1A7BCA1AD0050ED6AA010023EADA3900010167011A3631363236333634333133303344363436333632363133313330011A3631363236333634333133313344363436333632363133313331011A3631363236333634333133323344363436333632363133313332011A3631363236333634333133333344363436333632363133313333011A3631363236333634333133343344363436333632363133313334011A3631363236333634333133353344363436333632363133313335011A3631363236333634333133363344363436333632363133313336011A3631363236333634333133373344363436333632363133313337011A3631363236333634333133383344363436333632363133313338011A3631363236333634333133393344363436333632363133313339011A3631363236333634333233303344363436333632363133323330011A3631363236333634333233313344363436333632363133323331011A3631363236333634333233323344363436333632363133323332011A3631363236333634333233333344363436333632363133323333011A3631363236333634333233343344363436333632363133323334011A3631363236333634333233353344363436333632363133323335011A3631363236333634333233363344363436333632363133323336011A3631363236333634333233373344363436333632363133323337011A3631363236333634333233383344363436333632363133323338011A3631363236333634333233393344363436333632363133323339011A3631363236333634333333303344363436333632363133333330011A3631363236333634333333313344363436333632363133333331011A3631363236333634333333323344363436333632363133333332011A3631363236333634333333333344363436333632363133333333011A3631363236333634333333343344363436333632363133333334011A3631363236333634333333353344363436333632363133333335011A3631363236333634333333363344363436333632363133333336011A3631363236333634333333373344363436333632363133333337011A3631363236333634333333383344363436333632363133333338011A3631363236333634333333393344363436333632363133333339011A3631363236333634333433303344363436333632363133343330011A3631363236333634333433313344363436333632363133343331011A3631363236333634333433323344363436333632363133343332011A3631363236333634333433333344363436333632363133343333011A3631363236333634333433343344363436333632363133343334011A3631363236333634333433353344363436333632363133343335011A3631363236333634333433363344363436333632363133343336011A3631363236333634333433373344363436333632363133343337011A3631363236333634333433383344363436333632363133343338011A3631363236333634333433393344363436333632363133343339011A3631363236333634333533303344363436333632363133353330011A3631363236333634333533313344363436333632363133353331011A3631363236333634333533323344363436333632363133353332011A3631363236333634333533333344363436333632363133353333011A3631363236333634333533343344363436333632363133353334011A3631363236333634333533353344363436333632363133353335011A3631363236333634333533363344363436333632363133353336011A3631363236333634333533373344363436333632363133353337011A3631363236333634333533383344363436333632363133353338011A3631363236333634333533393344363436333632363133353339011A3631363236333634333633303344363436333632363133363330011A3631363236333634333633313344363436333632363133363331011A3631363236333634333633323344363436333632363133363332011A3631363236333634333633333344363436333632363133363333011A3631363236333634333633343344363436333632363133363334011A3631363236333634333633353344363436333632363133363335011A3631363236333634333633363344363436333632363133363336011A3631363236333634333633373344363436333632363133363337011A3631363236333634333633383344363436333632363133363338011A3631363236333634333633393344363436333632363133363339011A3631363236333634333733303344363436333632363133373330011A3631363236333634333733313344363436333632363133373331011A3631363236333634333733323344363436333632363133373332011A3631363236333634333733333344363436333632363133373333011A3631363236333634333733343344363436333632363133373334011A3631363236333634333733353344363436333632363133373335011A3631363236333634333733363344363436333632363133373336011A3631363236333634333733373344363436333632363133373337011A3631363236333634333733383344363436333632363133373338011A3631363236333634333733393344363436333632363133373339011A3631363236333634333833303344363436333632363133383330011A3631363236333634333833313344363436333632363133383331011A3631363236333634333833323344363436333632363133383332011A3631363236333634333833333344363436333632363133383333011A3631363236333634333833343344363436333632363133383334011A3631363236333634333833353344363436333632363133383335011A3631363236333634333833363344363436333632363133383336011A3631363236333634333833373344363436333632363133383337011A3631363236333634333833383344363436333632363133383338011A3631363236333634333833393344363436333632363133383339011A3631363236333634333933303344363436333632363133393330011A3631363236333634333933313344363436333632363133393331011A3631363236333634333933323344363436333632363133393332011A3631363236333634333933333344363436333632363133393333011A3631363236333634333933343344363436333632363133393334011A3631363236333634333933353344363436333632363133393335011A3631363236333634333933363344363436333632363133393336011A3631363236333634333933373344363436333632363133393337011A3631363236333634333933383344363436333632363133393338011A3631363236333634333933393344363436333632363133393339011E363136323633363433313330333033443634363336323631333133303330011E363136323633363433313330333133443634363336323631333133303331011E363136323633363433313330333233443634363336323631333133303332011E363136323633363433313330333333443634363336323631333133303333011E363136323633363433313330333433443634363336323631333133303334011E363136323633363433313330333533443634363336323631333133303335011E363136323633363433313330333633443634363336323631333133303336011E363136323633363433313330333733443634363336323631333133303337011E363136323633363433313330333833443634363336323631333133303338011E363136323633363433313330333933443634363336323631333133303339011E363136323633363433313331333033443634363336323631333133313330011E363136323633363433313331333133443634363336323631333133313331011E3631363236333634333133313332334436343633363236313331333133320100000000","proof":{"aunts":[]}}}],"peer_key":""}]} -{"time":"2017-04-27T22:23:46.271Z","msg":[1,{"height":1,"round":0,"step":"RoundStepPrevote"}]} -{"time":"2017-04-27T22:23:46.271Z","msg":[2,{"msg":[20,{"Vote":{"validator_address":"D028C9981F7A87F3093672BF0D5B0E2A1B3ED456","validator_index":0,"height":1,"round":0,"type":1,"block_id":{"hash":"FC7032C1A475C288FE30ED57BD4131AFE03DDC16","parts":{"total":1,"hash":"368323AC043A67ACFCF02877D0117F487B6728C2"}},"signature":[1,"78DD4C7854DED0D76C3B9783DD535B967E795E93ACD1947B362B418C99DB3AB271BF20546628ECDF523C839C6C5D1BF3605DA552CBCFB9C8BB7A74594BAB8F01"]}}],"peer_key":""}]} -{"time":"2017-04-27T22:23:46.273Z","msg":[1,{"height":1,"round":0,"step":"RoundStepPrecommit"}]} -{"time":"2017-04-27T22:23:46.273Z","msg":[2,{"msg":[20,{"Vote":{"validator_address":"D028C9981F7A87F3093672BF0D5B0E2A1B3ED456","validator_index":0,"height":1,"round":0,"type":2,"block_id":{"hash":"FC7032C1A475C288FE30ED57BD4131AFE03DDC16","parts":{"total":1,"hash":"368323AC043A67ACFCF02877D0117F487B6728C2"}},"signature":[1,"A1C01F36B87CA1CBCE87560FBE297B6820A421F86F80C88DAD6CAD6204A11C573CDCC60796F958F52E5AF04F54DB5321AC6F38BD19E8CF069771C9F899D0220B"]}}],"peer_key":""}]} -{"time":"2017-04-27T22:23:46.273Z","msg":[1,{"height":1,"round":0,"step":"RoundStepCommit"}]} +{"time":"2017-10-23T13:26:29.560Z","msg":[3,{"duration":-2002220818,"height":1,"round":0,"step":1}]} +{"time":"2017-10-23T13:26:29.561Z","msg":[1,{"height":1,"round":0,"step":"RoundStepPropose"}]} +{"time":"2017-10-23T13:26:29.562Z","msg":[2,{"msg":[17,{"Proposal":{"height":1,"round":0,"block_parts_header":{"total":1,"hash":"B8A47B357210D59E0170747FF4ACDB366C706D57"},"pol_round":-1,"pol_block_id":{"hash":"","parts":{"total":0,"hash":""}},"signature":[1,"AFCEA71535E0DF9E5D58DEE0F412903AC87C4DD09FCED3FC0267FCDE9E6069758C42B5C934DF514E898C7D30BA68815245005E99DDD9924BC182C11C5447180A"]}}],"peer_key":""}]} +{"time":"2017-10-23T13:26:29.562Z","msg":[2,{"msg":[19,{"Height":1,"Round":0,"Part":{"index":0,"bytes":"0101010F74656E6465726D696E745F74657374010114F035F23542204000000000000001147297262C6CD96190E46846C9A0DE1227E76077CF0001000100000000","proof":{"aunts":[]}}}],"peer_key":""}]} +{"time":"2017-10-23T13:26:29.563Z","msg":[1,{"height":1,"round":0,"step":"RoundStepPrevote"}]} +{"time":"2017-10-23T13:26:29.563Z","msg":[2,{"msg":[20,{"Vote":{"validator_address":"D028C9981F7A87F3093672BF0D5B0E2A1B3ED456","validator_index":0,"height":1,"round":0,"type":1,"block_id":{"hash":"B2ABE6C01E098186990295E19E2F80B23A6B3D97","parts":{"total":1,"hash":"B8A47B357210D59E0170747FF4ACDB366C706D57"}},"signature":[1,"2CC40A3B6E88DAE48C86F13A4A43713C9857909095976FA5809B2EFDDCB2F18936E22E0F220694BB7AD122218384A4BE1D9B4EF84F0CAE5789321BEF4854180C"]}}],"peer_key":""}]} +{"time":"2017-10-23T13:26:29.564Z","msg":[1,{"height":1,"round":0,"step":"RoundStepPrecommit"}]} +{"time":"2017-10-23T13:26:29.564Z","msg":[2,{"msg":[20,{"Vote":{"validator_address":"D028C9981F7A87F3093672BF0D5B0E2A1B3ED456","validator_index":0,"height":1,"round":0,"type":2,"block_id":{"hash":"B2ABE6C01E098186990295E19E2F80B23A6B3D97","parts":{"total":1,"hash":"B8A47B357210D59E0170747FF4ACDB366C706D57"}},"signature":[1,"E08C7C03E44B8A2DE4807BCD16C35688AA042ED7AE46FA3572759B9CBAE3E14DB6FD7AD14954BAAFCFB080DC6B45075602C865C123E77799DB0896DF07869103"]}}],"peer_key":""}]} +{"time":"2017-10-23T13:26:29.565Z","msg":[1,{"height":1,"round":0,"step":"RoundStepCommit"}]} diff --git a/consensus/test_data/small_block2.cswal b/consensus/test_data/small_block2.cswal index e3cfaad32..5177f1b20 100644 --- a/consensus/test_data/small_block2.cswal +++ b/consensus/test_data/small_block2.cswal @@ -1,15 +1,13 @@ #ENDHEIGHT: 0 -{"time":"2017-04-27T22:23:56.310Z","msg":[3,{"duration":969732098,"height":1,"round":0,"step":1}]} -{"time":"2017-04-27T22:23:56.312Z","msg":[1,{"height":1,"round":0,"step":"RoundStepPropose"}]} -{"time":"2017-04-27T22:23:56.312Z","msg":[2,{"msg":[17,{"Proposal":{"height":1,"round":0,"block_parts_header":{"total":6,"hash":"A3C176F13F5CBC7C48EE27A472800410C9D487DC"},"pol_round":-1,"pol_block_id":{"hash":"","parts":{"total":0,"hash":""}},"signature":[1,"7624F6E943B7A207E16D1FA87EA099BD924E930F98E7DECBC01DB37735C619409588A67C2EABA9845FD6B80FDB65ECFCDA5F0DEFCEF74B8C34DB8E0540480203"]}}],"peer_key":""}]} -{"time":"2017-04-27T22:23:56.312Z","msg":[2,{"msg":[19,{"Height":1,"Round":0,"Part":{"index":0,"bytes":"0101010F74656E6465726D696E745F74657374010114B96164A30A118001620000000001141F6753D22BACA2180B1EADD722434EB28444D91D0114354594CBFC1A7BCA1AD0050ED6AA010023EADA3900010162011A3631363236333634333133303344363436333632363133313330011A3631363236333634333133313344363436333632363133313331011A3631363236333634333133323344363436333632363133313332011A3631363236333634333133333344363436333632363133313333011A3631363236333634333133343344363436333632363133313334011A3631363236333634333133353344363436333632363133313335011A3631363236333634333133363344363436333632363133313336011A3631363236333634333133373344363436333632363133313337011A3631363236333634333133383344363436333632363133313338011A3631363236333634333133393344363436333632363133313339011A3631363236333634333233303344363436333632363133323330011A3631363236333634333233313344363436333632363133323331011A3631363236333634333233323344363436333632363133323332011A3631363236333634333233333344363436333632363133323333011A3631363236333634333233343344363436333632363133323334011A36313632363336","proof":{"aunts":["49F4B71E3D7C457415069E2EA916DB12F67AA8D0","D35A72BEDAAAAC17045D7BFAAFA94C2EC0B0A4C2","705BC647374F3495EE73C3F44C21E9BDB4731738"]}}}],"peer_key":""}]} -{"time":"2017-04-27T22:23:56.312Z","msg":[2,{"msg":[19,{"Height":1,"Round":0,"Part":{"index":1,"bytes":"34333233353344363436333632363133323335011A3631363236333634333233363344363436333632363133323336011A3631363236333634333233373344363436333632363133323337011A3631363236333634333233383344363436333632363133323338011A3631363236333634333233393344363436333632363133323339011A3631363236333634333333303344363436333632363133333330011A3631363236333634333333313344363436333632363133333331011A3631363236333634333333323344363436333632363133333332011A3631363236333634333333333344363436333632363133333333011A3631363236333634333333343344363436333632363133333334011A3631363236333634333333353344363436333632363133333335011A3631363236333634333333363344363436333632363133333336011A3631363236333634333333373344363436333632363133333337011A3631363236333634333333383344363436333632363133333338011A3631363236333634333333393344363436333632363133333339011A3631363236333634333433303344363436333632363133343330011A3631363236333634333433313344363436333632363133343331011A3631363236333634333433323344363436333632363133343332011A363136323633363433343333334436","proof":{"aunts":["5AD2A9A1A49A1FD6EF83F05FA4588F800B29DEF1","D35A72BEDAAAAC17045D7BFAAFA94C2EC0B0A4C2","705BC647374F3495EE73C3F44C21E9BDB4731738"]}}}],"peer_key":""}]} -{"time":"2017-04-27T22:23:56.312Z","msg":[2,{"msg":[19,{"Height":1,"Round":0,"Part":{"index":2,"bytes":"3436333632363133343333011A3631363236333634333433343344363436333632363133343334011A3631363236333634333433353344363436333632363133343335011A3631363236333634333433363344363436333632363133343336011A3631363236333634333433373344363436333632363133343337011A3631363236333634333433383344363436333632363133343338011A3631363236333634333433393344363436333632363133343339011A3631363236333634333533303344363436333632363133353330011A3631363236333634333533313344363436333632363133353331011A3631363236333634333533323344363436333632363133353332011A3631363236333634333533333344363436333632363133353333011A3631363236333634333533343344363436333632363133353334011A3631363236333634333533353344363436333632363133353335011A3631363236333634333533363344363436333632363133353336011A3631363236333634333533373344363436333632363133353337011A3631363236333634333533383344363436333632363133353338011A3631363236333634333533393344363436333632363133353339011A3631363236333634333633303344363436333632363133363330011A3631363236333634333633313344363436333632363133","proof":{"aunts":["8B5786C3D871EE37B0F4B2DECAC39E157340DFBE","705BC647374F3495EE73C3F44C21E9BDB4731738"]}}}],"peer_key":""}]} -{"time":"2017-04-27T22:23:56.312Z","msg":[2,{"msg":[19,{"Height":1,"Round":0,"Part":{"index":3,"bytes":"363331011A3631363236333634333633323344363436333632363133363332011A3631363236333634333633333344363436333632363133363333011A3631363236333634333633343344363436333632363133363334011A3631363236333634333633353344363436333632363133363335011A3631363236333634333633363344363436333632363133363336011A3631363236333634333633373344363436333632363133363337011A3631363236333634333633383344363436333632363133363338011A3631363236333634333633393344363436333632363133363339011A3631363236333634333733303344363436333632363133373330011A3631363236333634333733313344363436333632363133373331011A3631363236333634333733323344363436333632363133373332011A3631363236333634333733333344363436333632363133373333011A3631363236333634333733343344363436333632363133373334011A3631363236333634333733353344363436333632363133373335011A3631363236333634333733363344363436333632363133373336011A3631363236333634333733373344363436333632363133373337011A3631363236333634333733383344363436333632363133373338011A3631363236333634333733393344363436333632363133373339011A363136","proof":{"aunts":["56097661A1B2707588100586B3B1C2C8A51057D1","6DE889147DF528EEB5F7422E95DC45900CAFB619","247C721D5CEB90BB1FE389BA74C43DF0955E1647"]}}}],"peer_key":""}]} -{"time":"2017-04-27T22:23:56.312Z","msg":[2,{"msg":[19,{"Height":1,"Round":0,"Part":{"index":4,"bytes":"3236333634333833303344363436333632363133383330011A3631363236333634333833313344363436333632363133383331011A3631363236333634333833323344363436333632363133383332011A3631363236333634333833333344363436333632363133383333011A3631363236333634333833343344363436333632363133383334011A3631363236333634333833353344363436333632363133383335011A3631363236333634333833363344363436333632363133383336011A3631363236333634333833373344363436333632363133383337011A3631363236333634333833383344363436333632363133383338011A3631363236333634333833393344363436333632363133383339011A3631363236333634333933303344363436333632363133393330011A3631363236333634333933313344363436333632363133393331011A3631363236333634333933323344363436333632363133393332011A3631363236333634333933333344363436333632363133393333011A3631363236333634333933343344363436333632363133393334011A3631363236333634333933353344363436333632363133393335011A3631363236333634333933363344363436333632363133393336011A3631363236333634333933373344363436333632363133393337011A3631363236333634333933","proof":{"aunts":["081D3DC5F11850851D5F0D760B98EE87BFA6B8B0","6DE889147DF528EEB5F7422E95DC45900CAFB619","247C721D5CEB90BB1FE389BA74C43DF0955E1647"]}}}],"peer_key":""}]} -{"time":"2017-04-27T22:23:56.313Z","msg":[2,{"msg":[19,{"Height":1,"Round":0,"Part":{"index":5,"bytes":"383344363436333632363133393338011A3631363236333634333933393344363436333632363133393339011E363136323633363433313330333033443634363336323631333133303330011E363136323633363433313330333133443634363336323631333133303331011E363136323633363433313330333233443634363336323631333133303332011E363136323633363433313330333333443634363336323631333133303333011E363136323633363433313330333433443634363336323631333133303334011E363136323633363433313330333533443634363336323631333133303335011E363136323633363433313330333633443634363336323631333133303336011E3631363236333634333133303337334436343633363236313331333033370100000000","proof":{"aunts":["6AA912328C2B52EFA0ECE71F523E137E400EC484","247C721D5CEB90BB1FE389BA74C43DF0955E1647"]}}}],"peer_key":""}]} -{"time":"2017-04-27T22:23:56.314Z","msg":[1,{"height":1,"round":0,"step":"RoundStepPrevote"}]} -{"time":"2017-04-27T22:23:56.314Z","msg":[2,{"msg":[20,{"Vote":{"validator_address":"D028C9981F7A87F3093672BF0D5B0E2A1B3ED456","validator_index":0,"height":1,"round":0,"type":1,"block_id":{"hash":"62371CF72F8662378691706DB256C833CF1AF81B","parts":{"total":6,"hash":"A3C176F13F5CBC7C48EE27A472800410C9D487DC"}},"signature":[1,"255906FAAA50C84E85DABF7DE73468E4F95DB4E46F598848145926E2FAD77CA682BF07E09E2F3EC81FFBD9A036B67914A3C02F819B69248D777AEBA792725907"]}}],"peer_key":""}]} -{"time":"2017-04-27T22:23:56.315Z","msg":[1,{"height":1,"round":0,"step":"RoundStepPrecommit"}]} -{"time":"2017-04-27T22:23:56.315Z","msg":[2,{"msg":[20,{"Vote":{"validator_address":"D028C9981F7A87F3093672BF0D5B0E2A1B3ED456","validator_index":0,"height":1,"round":0,"type":2,"block_id":{"hash":"62371CF72F8662378691706DB256C833CF1AF81B","parts":{"total":6,"hash":"A3C176F13F5CBC7C48EE27A472800410C9D487DC"}},"signature":[1,"056CC15C748434D0A59B64B45CB56EDC1A437A426E68FA63DC7D61A7C17B0F768F207D81340D129A57C5A64195F8AFDD03B6BF28D7B2286290D61BCE88FCA304"]}}],"peer_key":""}]} -{"time":"2017-04-27T22:23:56.316Z","msg":[1,{"height":1,"round":0,"step":"RoundStepCommit"}]} +{"time":"2017-10-23T13:52:43.764Z","msg":[3,{"duration":-1002188229,"height":1,"round":0,"step":1}]} +{"time":"2017-10-23T13:52:43.766Z","msg":[1,{"height":1,"round":0,"step":"RoundStepPropose"}]} +{"time":"2017-10-23T13:52:43.766Z","msg":[2,{"msg":[17,{"Proposal":{"height":1,"round":0,"block_parts_header":{"total":4,"hash":"6675CB6BFC1FA7C968167B59BC014D39BE9B34F7"},"pol_round":-1,"pol_block_id":{"hash":"","parts":{"total":0,"hash":""}},"signature":[1,"02579FC60A63CF9AB5E3130B2047EA89E7DEDA413216F59EFF4C848A25EBBC33F240678873950E79D8404F6AAB9951048E3B5EB80BE97E451D5176DBA1A39507"]}}],"peer_key":""}]} +{"time":"2017-10-23T13:52:43.767Z","msg":[2,{"msg":[19,{"Height":1,"Round":0,"Part":{"index":0,"bytes":"0101010F74656E6465726D696E745F74657374010114F03760BB20E740017D00000000011439C793C92947F72D2E8966AE78E2867D6F0C50BA01147297262C6CD96190E46846C9A0DE1227E76077CF0001017D01087173CC16D9C0814A010CF20FDCCC1A5008B6F7993D33010CCBEE27B6B61EC1F485B33D34010CE427B2156CAD6E33386D3D35010CA199811DF5F7B29FC2473D3601055008D2BD7E010CDDC5A7FC7219747F980C3D38010C41973343FF3C0C9FACD03D39010DE20B823051A13A44FDF93D3130010C05FFE6A2F801CA5FD63D3131010D4830C1161B5B3C709D1C3D3132010DB4EA30086C4B0B5DD2723D3133010DDC9CE184674F8AE2C0EE3D3134010D6DE2ED95A1FC134B72D83D3135010D2293CFCE30C7612B6BA33D3136010DDEF4CEC7B546DA1539873D3137010DA63163F6F5DF6DD597EA3D3138010DAE3E756C4A67C6C193743D3139010D80196F7DBC7BAB885ABF3D3230010D269E5D80BA2B6BB449813D3231010DD590809C748158BE500F3D3232010DE38FD2021F8790BE31CA3D3233010DF6F3F3535ACDE33353893D3234010D406E0D85452EF05962543D3235010DB04C3D5203081FCBE4223D3236010D2CE3B7DA3647C64324D23D3237010D838BC6F8243ED6820B6A3D3238010DB98AFAEC0214B014BAE73D3239010DA0177349241C6F8581923D3330010D5643D684E3D3C979F3113D33","proof":{"aunts":["20F9BC2E0A99F7873C9E0E7590511D5625286F72","1E0E084FD092EBF0543348B48A235A1211D4FA93"]}}}],"peer_key":""}]} +{"time":"2017-10-23T13:52:43.767Z","msg":[2,{"msg":[19,{"Height":1,"Round":0,"Part":{"index":1,"bytes":"3101033F0C56010D7B9B7BEE694B44EE81DD3D3333010CD6D3FAC782E251E45B3D3334010DEDF9B2B01CB717F0D4C63D3335010DBF0B1E93BD59C2EB230F3D3336010D66FBEF89AFAFCD6404F53D3337010D62379E91BCB215C004553D3338010D7337BF0281C85102D8F93D3339010C8AB5CB54B33BA2A6943D3430010DE0FE457D49AEE62E9CAB3D3431010D8882A50FCBCBC5E82B053D3432010D7703E3AD68607D1FC0A23D3433010C554B8281D22B749F4D3D3434010DA2CCAB661F40E85B61B93D343501052D70D2B077010C48FD771077B60D5A5E3D3437010CFD802EF9120EF968433D3438010DFD47F9B09218DD2F5D1D3D3439010D36DA6A808CD5E3BE8CA43D353001063272D269831E010D1A3FBEA427C90BB0DD553D35320108AB62E0A985116AB3010D4681027946A5DC5062B63D3534010DA7C0CDA742526C4CAFDB3D353501054EBDAF666F010D3028F736EE74ECEE9ADB3D3537010D8F9B82545F308ED3E8823D3538010D7345C8F5F56A270C40E83D3539010CADC20F1C4F889953623D3630010DE8032EDAA15EE4C2B3363D3631010DA18EC123561C02FFFEDA3D3632010D77CBACC0D1E1839194943D3633010DCC125243339AE2B804BC3D3634010DC087D1AAAE8722CE78193D3635010DF13259547F734882F2893D3636010D342F53A6AB5A0CDB794E3D3637010D3311FB75B3159EBAE6DE3D3638","proof":{"aunts":["FC15B0F6649B8EE1B09B55D94A17AEF4618D6E24","1E0E084FD092EBF0543348B48A235A1211D4FA93"]}}}],"peer_key":""}]} +{"time":"2017-10-23T13:52:43.767Z","msg":[2,{"msg":[19,{"Height":1,"Round":0,"Part":{"index":2,"bytes":"010DA5AC3ACBD625E4AD6FBC3D3639010D142407FB6A91BA5D37E43D3730010DA34474DA8FD7E6EA81223D373101035D1D6B010DDDA37772953A2C8711FF3D3733010DA5ADCD38B9AB04FB53EC3D3734010CF19AE3CB7FC1DB766B3D3735010DDCC478D15149D0860CEF3D3736010D4C8EC65D0C0CEFB590AA3D3737010D9EAD73CB8FACB8392DEB3D37380108E4DA75D207146E920108CD339E193F162F5A010D529A51FEE9543803C5863D3831010DFE163440021CBF4E1F5C3D3832010D1FCA879072372487B7EA3D3833010D010DD579CA8543E714D43D3834010DF93DC09D60BA5F98045B3D3835010DEB2591C922EF1B3F3D653D3836010D66853A5F89E2D66D64343D3837010D98D0324472BE65F03E683D3838010DA202B986F80C5CC5B1993D3839010D4303125AE24AFDCFEB973D3930010DAA4C06FE5F06692AAF1F3D3931010D4D35E54FD3E3BD2266BE3D3932010D85EB155492DF9B42FEBD3D3933010D7DAB013468659C38E35D3D3934010D06C753CD41C31504AB3F3D3935010D93DC53BE7B84DDF2E26F3D3936010DB77767CFD59CB5D7DFEF3D3937010D99F6F9BC169A806C1A2D3D3938010D9B5E50A811CBFCE80B573D3939010D95B1B5C5A5ED60C96F3D313030010E90BD73C572B5FE324E963D313031010E7FFCC15A910D3CCC12A93D313032010E4E7214975DBDFADD01213D313033010EACEE55","proof":{"aunts":["45E2A8ACB043850B9A56FA5110ED5738B42B5AD4","34424C5B5321189CF133D2ED3CECFB0F1C1DAC0E"]}}}],"peer_key":""}]} +{"time":"2017-10-23T13:52:43.767Z","msg":[2,{"msg":[19,{"Height":1,"Round":0,"Part":{"index":3,"bytes":"F959F3FBB6A4D03D313034010D10AF79248E1C042A4D3D313035010E6A726EE9F664CA5228FF3D313036010EE490AF97552CAC083DD63D313037010EE18C71EC7159061713723D313038010E760E8663BFB2361607243D313039010E5FE47423F99EF78E93943D313130010E289EBA536A1F0FDEA57F3D313131010E680557784E3E13E0C1403D313132010EBFC86F58B0B6F00670D33D313133010EE7B7ACE102C48E9B8F743D313134010155010EDEEE7E9BE623C7482A463D313136010E29A53D807945BAEB49EF3D31313701050FE9C1DCB5010EA74CEB55E025ADD5AA683D313139010E84929712FF032B1B6DA33D313230010E9884326AF3AFB43CE9453D313231010E0C8E66526C05AD32282C3D313232010E1FD329B55358E376BB483D313233010EC159D142BEA977A6E8553D3132340105A2DFD0E176010EB84DD5EACD7074AF54803D3132360100000000","proof":{"aunts":["8D2111512C3EDA85DB8D1F5D807976814A040EC2","34424C5B5321189CF133D2ED3CECFB0F1C1DAC0E"]}}}],"peer_key":""}]} +{"time":"2017-10-23T13:52:43.769Z","msg":[1,{"height":1,"round":0,"step":"RoundStepPrevote"}]} +{"time":"2017-10-23T13:52:43.769Z","msg":[2,{"msg":[20,{"Vote":{"validator_address":"D028C9981F7A87F3093672BF0D5B0E2A1B3ED456","validator_index":0,"height":1,"round":0,"type":1,"block_id":{"hash":"CB6E7845598FAC92F2AE92DD8BEAB16EEA181600","parts":{"total":4,"hash":"6675CB6BFC1FA7C968167B59BC014D39BE9B34F7"}},"signature":[1,"D4C1B17B4818584752AD5EF4282396A8C6B4E2C2A243688AA707EC93114277129FA8361D06848E9AA8DC473EB2446D1C2AC350343D0EE5BE252C81D22BC68B0B"]}}],"peer_key":""}]} +{"time":"2017-10-23T13:52:43.770Z","msg":[1,{"height":1,"round":0,"step":"RoundStepPrecommit"}]} +{"time":"2017-10-23T13:52:43.770Z","msg":[2,{"msg":[20,{"Vote":{"validator_address":"D028C9981F7A87F3093672BF0D5B0E2A1B3ED456","validator_index":0,"height":1,"round":0,"type":2,"block_id":{"hash":"CB6E7845598FAC92F2AE92DD8BEAB16EEA181600","parts":{"total":4,"hash":"6675CB6BFC1FA7C968167B59BC014D39BE9B34F7"}},"signature":[1,"E0E079B157BE09B0C5F8CAAE98B9378927F6C21DA3E54FA010FF8E570378DABE4BA5537680B41A9C403CFB3307054028B80A29A72CD12098A3C844383DEDA50E"]}}],"peer_key":""}]} +{"time":"2017-10-23T13:52:43.771Z","msg":[1,{"height":1,"round":0,"step":"RoundStepCommit"}]} diff --git a/node/node.go b/node/node.go index 824a0926c..1b1a76643 100644 --- a/node/node.go +++ b/node/node.go @@ -308,6 +308,16 @@ func NewNode(config *cfg.Config, // OnStart starts the Node. It implements cmn.Service. func (n *Node) OnStart() error { + // Run the RPC server first + // so we can eg. receive txs for the first block + if n.config.RPC.ListenAddress != "" { + listeners, err := n.startRPC() + if err != nil { + return err + } + n.rpcListeners = listeners + } + // Create & add listener protocol, address := cmn.ProtocolAndAddress(n.config.P2P.ListenAddress) l := p2p.NewDefaultListener(protocol, address, n.config.P2P.SkipUPNP, n.Logger.With("module", "p2p")) @@ -330,15 +340,6 @@ func (n *Node) OnStart() error { } } - // Run the RPC server - if n.config.RPC.ListenAddress != "" { - listeners, err := n.startRPC() - if err != nil { - return err - } - n.rpcListeners = listeners - } - return nil } From f188366e262c1bc3415bfb3b35d96450a6d45e25 Mon Sep 17 00:00:00 2001 From: Ethan Buchman Date: Mon, 23 Oct 2017 10:04:00 -0400 Subject: [PATCH 06/11] update glide --- glide.lock | 81 +++++++++++++++++++++++++++++------------------------- glide.yaml | 4 +-- 2 files changed, 46 insertions(+), 39 deletions(-) diff --git a/glide.lock b/glide.lock index 147ee21a0..a806e1f96 100644 --- a/glide.lock +++ b/glide.lock @@ -1,18 +1,16 @@ -hash: 816d84782ab66637e02bd0a3c7f652a9a31f9b88e3ae11438c5bf641cf585f19 -updated: 2017-10-02T23:32:49.162422718-04:00 +hash: 9867fa4543ca4daea1a96a3883a7f483819c067ca34ed6d3aa67aace4a289e93 +updated: 2017-10-23T10:01:08.326324082-04:00 imports: - name: github.com/btcsuite/btcd - version: b8df516b4b267acf2de46be593a9d948d1d2c420 + version: c7588cbf7690cd9f047a28efa2dcd8f2435a4e5e subpackages: - btcec -- name: github.com/btcsuite/fastsha256 - version: 637e656429416087660c84436a2a035d69d54e2e - name: github.com/ebuchman/fail-test version: 95f809107225be108efcf10a3509e4ea6ceef3c4 - name: github.com/fsnotify/fsnotify version: 4da3e2cfbabc9f751898f250b49f2439785783a1 - name: github.com/go-kit/kit - version: d67bb4c202e3b91377d1079b110a6c9ce23ab2f8 + version: e2b298466b32c7cd5579a9b9b07e968fc9d9452c subpackages: - log - log/level @@ -20,28 +18,31 @@ imports: - name: github.com/go-logfmt/logfmt version: 390ab7935ee28ec6b286364bba9b4dd6410cb3d5 - name: github.com/go-playground/locales - version: 1e5f1161c6416a5ff48840eb8724a394e48cc534 + version: e4cbcb5d0652150d40ad0646651076b6bd2be4f6 subpackages: - currency - name: github.com/go-playground/universal-translator version: 71201497bace774495daed26a3874fd339e0b538 - name: github.com/go-stack/stack - version: 100eb0c0a9c5b306ca2fb4f165df21d80ada4b82 + version: 817915b46b97fd7bb80e8ab6b69f01a53ac3eebf - name: github.com/gogo/protobuf - version: f7f1376d9d231a646d4e62fe1075623ced6db327 + version: 117892bf1866fbaa2318c03e50e40564c8845457 subpackages: - proto - name: github.com/golang/protobuf - version: 18c9bb3261723cd5401db4d0c9fbc5c3b6c70fe8 + version: 1643683e1b54a9e88ad26d98f81400c8c9d9f4f9 subpackages: - proto + - ptypes - ptypes/any + - ptypes/duration + - ptypes/timestamp - name: github.com/golang/snappy version: 553a641470496b2327abcac10b36396bd98e45c9 - name: github.com/gorilla/websocket - version: a91eba7f97777409bc2c443f5534d41dd20c5720 + version: 71fa72d4842364bc5f74185f4161e0099ea3624a - name: github.com/hashicorp/hcl - version: 392dba7d905ed5d04a5794ba89f558b27e2ba1ca + version: 23c074d0eceb2b8a5bfdbb271ab780cde70f05a8 subpackages: - hcl/ast - hcl/parser @@ -58,33 +59,31 @@ imports: - name: github.com/kr/logfmt version: b84e30acd515aadc4b783ad4ff83aff3299bdfe0 - name: github.com/magiconair/properties - version: 51463bfca2576e06c62a8504b5c0f06d61312647 + version: 8d7837e64d3c1ee4e54a880c5a920ab4316fc90a - name: github.com/mitchellh/mapstructure - version: cc8532a8e9a55ea36402aa21efdf403a60d34096 -- name: github.com/pelletier/go-buffruneio - version: c37440a7cf42ac63b919c752ca73a85067e05992 + version: 06020f85339e21b2478f756a78e295255ffa4d6a - name: github.com/pelletier/go-toml - version: 13d49d4606eb801b8f01ae542b4afc4c6ee3d84a + version: 8c31c2ec65b208cc2ad1608bf25a3ff91adf1944 - name: github.com/pkg/errors version: 645ef00459ed84a119197bfb8d8205042c6df63d - name: github.com/rcrowley/go-metrics version: 1f30fe9094a513ce4c700b9a54458bbb0c96996c - name: github.com/spf13/afero - version: 9be650865eab0c12963d8753212f4f9c66cdcf12 + version: 5660eeed305fe5f69c8fc6cf899132a459a97064 subpackages: - mem - name: github.com/spf13/cast version: acbeb36b902d72a7a4c18e8f3241075e7ab763e4 - name: github.com/spf13/cobra - version: 4cdb38c072b86bf795d2c81de50784d9fdd6eb77 + version: 7b2c5ac9fc04fc5efafb60700713d4fa609b777b - name: github.com/spf13/jwalterweatherman - version: 8f07c835e5cc1450c082fe3a439cf87b0cbb2d99 + version: 12bd96e66386c1960ab0f74ced1362f66f552f7b - name: github.com/spf13/pflag - version: e57e3eeb33f795204c1ca35f56c44f83227c6e66 + version: 97afa5e7ca8a08a383cb259e06636b5e2cc7897f - name: github.com/spf13/viper - version: 0967fc9aceab2ce9da34061253ac10fb99bba5b2 + version: 8ef37cbca71638bf32f3d5e194117d4cb46da163 - name: github.com/syndtr/goleveldb - version: 8c81ea47d4c41a385645e133e15510fc6a2a74b4 + version: b89cc31ef7977104127d34c1bd31ebd1a9db2199 subpackages: - leveldb - leveldb/cache @@ -99,7 +98,7 @@ imports: - leveldb/table - leveldb/util - name: github.com/tendermint/abci - version: 191c4b6d176169ffc7f9972d490fa362a3b7d940 + version: bb9bb4aa465a31fd6a272765be381888e6898c74 subpackages: - client - example/counter @@ -119,9 +118,11 @@ imports: - data - data/base58 - name: github.com/tendermint/iavl - version: 9233811d241ac8d4441a7223a4e79b83931dfae0 + version: 721710e7aa59f61dbfbf558943a207ba3fe6b926 + subpackages: + - iavl - name: github.com/tendermint/tmlibs - version: 096dcb90e60aa00b748b3fe49a4b95e48ebf1e13 + version: 8e5266a9ef2527e68a1571f932db8228a331b556 subpackages: - autofile - cli @@ -135,7 +136,7 @@ imports: - merkle - test - name: golang.org/x/crypto - version: c7af5bf2638a1164f2eb5467c39c6cffbd13a02e + version: edd5e9b0879d13ee6970a50153d85b8fec9f7686 subpackages: - curve25519 - nacl/box @@ -146,7 +147,7 @@ imports: - ripemd160 - salsa20/salsa - name: golang.org/x/net - version: feeb485667d1fdabe727840fe00adc22431bc86e + version: cd69bc3fc700721b709c3a59e16e24c67b58f6ff subpackages: - context - http2 @@ -156,43 +157,49 @@ imports: - lex/httplex - trace - name: golang.org/x/sys - version: e62c3de784db939836898e5c19ffd41bece347da + version: 8dbc5d05d6edcc104950cc299a1ce6641235bc86 subpackages: - unix - name: golang.org/x/text - version: 470f45bf29f4147d6fbd7dfd0a02a848e49f5bf4 + version: c01e4764d870b77f8abe5096ee19ad20d80e8075 subpackages: - secure/bidirule - transform - unicode/bidi - unicode/norm - name: google.golang.org/genproto - version: 411e09b969b1170a9f0c467558eb4c4c110d9c77 + version: f676e0f3ac6395ff1a529ae59a6670878a8371a6 subpackages: - googleapis/rpc/status - name: google.golang.org/grpc - version: 844f573616520565fdc6fb4db242321b5456fd6d + version: a5986a5c88227370a9c0a82e5277167229c034cd subpackages: + - balancer + - balancer/roundrobin - codes + - connectivity - credentials - - grpclb/grpc_lb_v1 + - grpclb/grpc_lb_v1/messages - grpclog - internal - keepalive - metadata - naming - peer + - resolver + - resolver/dns + - resolver/passthrough - stats - status - tap - transport - name: gopkg.in/go-playground/validator.v9 - version: 6d8c18553ea1ac493d049edd6f102f52e618f085 + version: 1304298bf10d085adec514b076772a79c9cadb6b - name: gopkg.in/yaml.v2 - version: cd8b52f8269e0feb286dfeef29f8fe4d5b397e0b + version: eb3733d160e74a9c7e442f435eb3bea458e1d19f testImports: - name: github.com/davecgh/go-spew - version: 6d212800a42e8ab5c146b8ace3490ee17e5225f9 + version: 04cdfd42973bb9c8589fd6a731800cf222fde1a9 subpackages: - spew - name: github.com/pmezard/go-difflib @@ -200,7 +207,7 @@ testImports: subpackages: - difflib - name: github.com/stretchr/testify - version: 69483b4bd14f5845b5a1e55bca19e954e827f1d0 + version: 2aa2c176b9dab406a6970f6a55f513e8a8c8b18f subpackages: - assert - require diff --git a/glide.yaml b/glide.yaml index 5335837ea..a74870ab2 100644 --- a/glide.yaml +++ b/glide.yaml @@ -14,7 +14,7 @@ import: - package: github.com/spf13/cobra - package: github.com/spf13/viper - package: github.com/tendermint/abci - version: ~0.6.0 + version: develop subpackages: - client - example/dummy @@ -30,7 +30,7 @@ import: subpackages: - iavl - package: github.com/tendermint/tmlibs - version: ~0.3.2 + version: develop subpackages: - autofile - cli From f908dd0e55e34bf932f8a8aa0574c33f37059c38 Mon Sep 17 00:00:00 2001 From: Anton Kaliaev Date: Wed, 18 Oct 2017 16:38:52 +0400 Subject: [PATCH 07/11] only notify when there are some txs (Refs #753) --- mempool/mempool.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mempool/mempool.go b/mempool/mempool.go index 07b267c4d..dde59eb88 100644 --- a/mempool/mempool.go +++ b/mempool/mempool.go @@ -269,7 +269,10 @@ func (mem *Mempool) resCbRecheck(req *abci.Request, res *abci.Response) { atomic.StoreInt32(&mem.rechecking, 0) mem.logger.Info("Done rechecking txs") - mem.notifyTxsAvailable() + // incase the recheck removed all txs + if mem.Size() > 0 { + mem.notifyTxsAvailable() + } } default: // ignore other messages From 782a836db0d97437db1b7a13e42c6114467b2719 Mon Sep 17 00:00:00 2001 From: Adrian Brink Date: Mon, 16 Oct 2017 16:01:32 +0200 Subject: [PATCH 08/11] Cleanup of code and code docs This cleans up some of the code in the state package --- mempool/mempool.go | 14 ++-- rpc/lib/client/http_client.go | 4 +- state/state.go | 117 ++++++++++++++++++++-------------- state/state_test.go | 39 ++++++++---- state/txindex/indexer.go | 19 +++--- state/txindex/kv/kv.go | 8 ++- state/txindex/null/null.go | 4 +- types/block.go | 6 +- 8 files changed, 127 insertions(+), 84 deletions(-) diff --git a/mempool/mempool.go b/mempool/mempool.go index 07b267c4d..c1130d9dd 100644 --- a/mempool/mempool.go +++ b/mempool/mempool.go @@ -50,9 +50,10 @@ TODO: Better handle abci client errors. (make it automatically handle connection const cacheSize = 100000 -// Mempool is an ordered in-memory pool for transactions before they are proposed in a consensus round. -// Transaction validity is checked using the CheckTx abci message before the transaction is added to the pool. -// The Mempool uses a concurrent list structure for storing transactions that can be efficiently accessed by multiple concurrent readers. +// Mempool is an ordered in-memory pool for transactions before they are proposed in a consensus +// round. Transaction validity is checked using the CheckTx abci message before the transaction is +// added to the pool. The Mempool uses a concurrent list structure for storing transactions that +// can be efficiently accessed by multiple concurrent readers. type Mempool struct { config *cfg.MempoolConfig @@ -78,6 +79,7 @@ type Mempool struct { } // NewMempool returns a new Mempool with the given configuration and connection to an application. +// TODO: Extract logger into arguments. func NewMempool(config *cfg.MempoolConfig, proxyAppConn proxy.AppConnMempool, height int) *Mempool { mempool := &Mempool{ config: config, @@ -162,7 +164,7 @@ func (mem *Mempool) TxsFrontWait() *clist.CElement { // It blocks if we're waiting on Update() or Reap(). // cb: A callback from the CheckTx command. // It gets called from another goroutine. -// CONTRACT: Either cb will get called, or err returned. +// NOTE: Either cb will get called, or err returned. func (mem *Mempool) CheckTx(tx types.Tx, cb func(*abci.Response)) (err error) { mem.proxyMtx.Lock() defer mem.proxyMtx.Unlock() @@ -287,9 +289,7 @@ func (mem *Mempool) notifyTxsAvailable() { if mem.Size() == 0 { panic("notified txs available but mempool is empty!") } - if mem.txsAvailable != nil && - !mem.notifiedTxsAvailable { - + if mem.txsAvailable != nil && !mem.notifiedTxsAvailable { mem.notifiedTxsAvailable = true mem.txsAvailable <- mem.height + 1 } diff --git a/rpc/lib/client/http_client.go b/rpc/lib/client/http_client.go index 1fbaedfae..df0e175ea 100644 --- a/rpc/lib/client/http_client.go +++ b/rpc/lib/client/http_client.go @@ -12,6 +12,7 @@ import ( "strings" "github.com/pkg/errors" + types "github.com/tendermint/tendermint/rpc/lib/types" ) @@ -60,12 +61,13 @@ func makeHTTPClient(remoteAddr string) (string, *http.Client) { //------------------------------------------------------------------------------------ -// JSON rpc takes params as a slice +// JSONRPCClient takes params as a slice type JSONRPCClient struct { address string client *http.Client } +// NewJSONRPCClient takes an address and returns a pointer to an instance of JSONRPCClient func NewJSONRPCClient(remote string) *JSONRPCClient { address, client := makeHTTPClient(remote) return &JSONRPCClient{ diff --git a/state/state.go b/state/state.go index d3646cf18..801101d75 100644 --- a/state/state.go +++ b/state/state.go @@ -8,11 +8,13 @@ import ( "time" abci "github.com/tendermint/abci/types" + cmn "github.com/tendermint/tmlibs/common" dbm "github.com/tendermint/tmlibs/db" "github.com/tendermint/tmlibs/log" wire "github.com/tendermint/go-wire" + "github.com/tendermint/tendermint/state/txindex" "github.com/tendermint/tendermint/state/txindex/null" "github.com/tendermint/tendermint/types" @@ -50,18 +52,18 @@ type State struct { LastBlockTime time.Time Validators *types.ValidatorSet LastValidators *types.ValidatorSet - - // AppHash is updated after Commit - AppHash []byte - - TxIndexer txindex.TxIndexer `json:"-"` // Transaction indexer - // When a block returns a validator set change via EndBlock, // the change only applies to the next block. // So, if s.LastBlockHeight causes a valset change, // we set s.LastHeightValidatorsChanged = s.LastBlockHeight + 1 LastHeightValidatorsChanged int + // AppHash is updated after Commit + AppHash []byte + + // TxIndexer indexes transactions + TxIndexer txindex.TxIndexer `json:"-"` + logger log.Logger } @@ -88,19 +90,21 @@ func LoadState(db dbm.DB) *State { } func loadState(db dbm.DB, key []byte) *State { - s := &State{db: db, TxIndexer: &null.TxIndex{}} buf := db.Get(key) if len(buf) == 0 { return nil - } else { - r, n, err := bytes.NewReader(buf), new(int), new(error) - wire.ReadBinaryPtr(&s, r, 0, n, err) - if *err != nil { - // DATA HAS BEEN CORRUPTED OR THE SPEC HAS CHANGED - cmn.Exit(cmn.Fmt("LoadState: Data has been corrupted or its spec has changed: %v\n", *err)) - } - // TODO: ensure that buf is completely read. } + + s := &State{db: db, TxIndexer: &null.TxIndex{}} + r, n, err := bytes.NewReader(buf), new(int), new(error) + wire.ReadBinaryPtr(&s, r, 0, n, err) + if *err != nil { + // DATA HAS BEEN CORRUPTED OR THE SPEC HAS CHANGED + cmn.Exit(cmn.Fmt(`LoadState: Data has been corrupted or its spec has changed: + %v\n`, *err)) + } + // TODO: ensure that buf is completely read. + return s } @@ -110,6 +114,8 @@ func (s *State) SetLogger(l log.Logger) { } // Copy makes a copy of the State for mutating. +// NOTE: Does not create a copy of TxIndexer. It creates a new pointer that points to the same +// underlying TxIndexer. func (s *State) Copy() *State { return &State{ db: s.db, @@ -119,7 +125,7 @@ func (s *State) Copy() *State { Validators: s.Validators.Copy(), LastValidators: s.LastValidators.Copy(), AppHash: s.AppHash, - TxIndexer: s.TxIndexer, // pointer here, not value + TxIndexer: s.TxIndexer, LastHeightValidatorsChanged: s.LastHeightValidatorsChanged, logger: s.logger, ChainID: s.ChainID, @@ -131,6 +137,7 @@ func (s *State) Copy() *State { func (s *State) Save() { s.mtx.Lock() defer s.mtx.Unlock() + s.saveValidatorsInfo() s.db.SetSync(stateKey, s.Bytes()) } @@ -142,38 +149,43 @@ func (s *State) SaveABCIResponses(abciResponses *ABCIResponses) { } // LoadABCIResponses loads the ABCIResponses from the database. +// This is useful for recovering from crashes where we called app.Commit and before we called +// s.Save() func (s *State) LoadABCIResponses() *ABCIResponses { - abciResponses := new(ABCIResponses) - buf := s.db.Get(abciResponsesKey) - if len(buf) != 0 { - r, n, err := bytes.NewReader(buf), new(int), new(error) - wire.ReadBinaryPtr(abciResponses, r, 0, n, err) - if *err != nil { - // DATA HAS BEEN CORRUPTED OR THE SPEC HAS CHANGED - cmn.Exit(cmn.Fmt("LoadABCIResponses: Data has been corrupted or its spec has changed: %v\n", *err)) - } - // TODO: ensure that buf is completely read. + if len(buf) == 0 { + return nil } + + abciResponses := new(ABCIResponses) + r, n, err := bytes.NewReader(buf), new(int), new(error) + wire.ReadBinaryPtr(abciResponses, r, 0, n, err) + if *err != nil { + // DATA HAS BEEN CORRUPTED OR THE SPEC HAS CHANGED + cmn.Exit(cmn.Fmt(`LoadABCIResponses: Data has been corrupted or its spec has + changed: %v\n`, *err)) + } + // TODO: ensure that buf is completely read. + return abciResponses } // LoadValidators loads the ValidatorSet for a given height. func (s *State) LoadValidators(height int) (*types.ValidatorSet, error) { - v := s.loadValidators(height) - if v == nil { + valInfo := s.loadValidators(height) + if valInfo == nil { return nil, ErrNoValSetForHeight{height} } - if v.ValidatorSet == nil { - v = s.loadValidators(v.LastHeightChanged) - if v == nil { - cmn.PanicSanity(fmt.Sprintf(`Couldn't find validators at - height %d as last changed from height %d`, v.LastHeightChanged, height)) + if valInfo.ValidatorSet == nil { + valInfo = s.loadValidators(valInfo.LastHeightChanged) + if valInfo == nil { + cmn.PanicSanity(fmt.Sprintf(`Couldn't find validators at height %d as + last changed from height %d`, valInfo.LastHeightChanged, height)) } } - return v.ValidatorSet, nil + return valInfo.ValidatorSet, nil } func (s *State) loadValidators(height int) *ValidatorsInfo { @@ -187,9 +199,11 @@ func (s *State) loadValidators(height int) *ValidatorsInfo { wire.ReadBinaryPtr(v, r, 0, n, err) if *err != nil { // DATA HAS BEEN CORRUPTED OR THE SPEC HAS CHANGED - cmn.Exit(cmn.Fmt("LoadValidators: Data has been corrupted or its spec has changed: %v\n", *err)) + cmn.Exit(cmn.Fmt(`LoadValidators: Data has been corrupted or its spec has changed: + %v\n`, *err)) } // TODO: ensure that buf is completely read. + return v } @@ -200,13 +214,13 @@ func (s *State) loadValidators(height int) *ValidatorsInfo { func (s *State) saveValidatorsInfo() { changeHeight := s.LastHeightValidatorsChanged nextHeight := s.LastBlockHeight + 1 - vi := &ValidatorsInfo{ + valInfo := &ValidatorsInfo{ LastHeightChanged: changeHeight, } if changeHeight == nextHeight { - vi.ValidatorSet = s.Validators + valInfo.ValidatorSet = s.Validators } - s.db.SetSync(calcValidatorsKey(nextHeight), vi.Bytes()) + s.db.SetSync(calcValidatorsKey(nextHeight), valInfo.Bytes()) } // Equals returns true if the States are identical. @@ -219,8 +233,10 @@ func (s *State) Bytes() []byte { return wire.BinaryBytes(s) } -// SetBlockAndValidators mutates State variables to update block and validators after running EndBlock. -func (s *State) SetBlockAndValidators(header *types.Header, blockPartsHeader types.PartSetHeader, abciResponses *ABCIResponses) { +// SetBlockAndValidators mutates State variables to update block and validators after running +// EndBlock. +func (s *State) SetBlockAndValidators(header *types.Header, blockPartsHeader types.PartSetHeader, + abciResponses *ABCIResponses) { // copy the valset so we can apply changes from EndBlock // and update s.LastValidators and s.Validators @@ -248,8 +264,7 @@ func (s *State) SetBlockAndValidators(header *types.Header, blockPartsHeader typ } -func (s *State) setBlockAndValidators( - height int, blockID types.BlockID, blockTime time.Time, +func (s *State) setBlockAndValidators(height int, blockID types.BlockID, blockTime time.Time, prevValSet, nextValSet *types.ValidatorSet) { s.LastBlockHeight = height @@ -260,10 +275,17 @@ func (s *State) setBlockAndValidators( } // GetValidators returns the last and current validator sets. -func (s *State) GetValidators() (*types.ValidatorSet, *types.ValidatorSet) { +func (s *State) GetValidators() (last *types.ValidatorSet, current *types.ValidatorSet) { return s.LastValidators, s.Validators } +// Params returns the consensus parameters used for validating blocks +func (s *State) Params() types.ConsensusParams { + // TODO: this should move into the State proper + // when we allow the app to change it + return *s.GenesisDoc.ConsensusParams +} + //------------------------------------------------------------------------ // ABCIResponses retains the responses of the various ABCI calls during block processing. @@ -293,15 +315,15 @@ func (a *ABCIResponses) Bytes() []byte { //----------------------------------------------------------------------------- -// ValidatorsInfo represents the latest validator set, or the last time it changed +// ValidatorsInfo represents the latest validator set, or the last height it changed type ValidatorsInfo struct { ValidatorSet *types.ValidatorSet LastHeightChanged int } // Bytes serializes the ValidatorsInfo using go-wire -func (vi *ValidatorsInfo) Bytes() []byte { - return wire.BinaryBytes(*vi) +func (valInfo *ValidatorsInfo) Bytes() []byte { + return wire.BinaryBytes(*valInfo) } //------------------------------------------------------------------------ @@ -353,6 +375,7 @@ func MakeGenesisState(db dbm.DB, genDoc *types.GenesisDoc) (*State, error) { } } + // we do not need indexer during replay and in tests return &State{ db: db, @@ -365,7 +388,7 @@ func MakeGenesisState(db dbm.DB, genDoc *types.GenesisDoc) (*State, error) { Validators: types.NewValidatorSet(validators), LastValidators: types.NewValidatorSet(nil), AppHash: genDoc.AppHash, - TxIndexer: &null.TxIndex{}, // we do not need indexer during replay and in tests + TxIndexer: &null.TxIndex{}, LastHeightValidatorsChanged: 1, }, nil } diff --git a/state/state_test.go b/state/state_test.go index 8ac2eada0..7bb43afa2 100644 --- a/state/state_test.go +++ b/state/state_test.go @@ -7,15 +7,16 @@ import ( "github.com/stretchr/testify/assert" - cfg "github.com/tendermint/tendermint/config" - "github.com/tendermint/tendermint/types" - abci "github.com/tendermint/abci/types" + crypto "github.com/tendermint/go-crypto" cmn "github.com/tendermint/tmlibs/common" dbm "github.com/tendermint/tmlibs/db" "github.com/tendermint/tmlibs/log" + + cfg "github.com/tendermint/tendermint/config" + "github.com/tendermint/tendermint/types" ) // setupTestCase does setup common to all test cases @@ -31,22 +32,29 @@ func setupTestCase(t *testing.T) (func(t *testing.T), dbm.DB, *State) { return tearDown, stateDB, state } +// TestStateCopy tests the correct copying behaviour of State. func TestStateCopy(t *testing.T) { tearDown, _, state := setupTestCase(t) defer tearDown(t) + // nolint: vetshadow assert := assert.New(t) stateCopy := state.Copy() assert.True(state.Equals(stateCopy), - cmn.Fmt("expected state and its copy to be identical. got %v\n expected %v\n", stateCopy, state)) + cmn.Fmt(`expected state and its copy to be identical. got %v\n expected %v\n`, + stateCopy, state)) + stateCopy.LastBlockHeight++ - assert.False(state.Equals(stateCopy), cmn.Fmt("expected states to be different. got same %v", state)) + assert.False(state.Equals(stateCopy), cmn.Fmt(`expected states to be different. got same + %v`, state)) } +// TestStateSaveLoad tests saving and loading State from a db. func TestStateSaveLoad(t *testing.T) { tearDown, stateDB, state := setupTestCase(t) defer tearDown(t) + // nolint: vetshadow assert := assert.New(t) state.LastBlockHeight++ @@ -54,12 +62,15 @@ func TestStateSaveLoad(t *testing.T) { loadedState := LoadState(stateDB) assert.True(state.Equals(loadedState), - cmn.Fmt("expected state and its copy to be identical. got %v\n expected %v\n", loadedState, state)) + cmn.Fmt(`expected state and its copy to be identical. got %v\n expected %v\n`, + loadedState, state)) } +// TestABCIResponsesSaveLoad tests saving and loading ABCIResponses. func TestABCIResponsesSaveLoad(t *testing.T) { tearDown, _, state := setupTestCase(t) defer tearDown(t) + // nolint: vetshadow assert := assert.New(t) state.LastBlockHeight++ @@ -78,17 +89,20 @@ func TestABCIResponsesSaveLoad(t *testing.T) { abciResponses.txs = nil state.SaveABCIResponses(abciResponses) - abciResponses2 := state.LoadABCIResponses() - assert.Equal(abciResponses, abciResponses2, - cmn.Fmt("ABCIResponses don't match: Got %v, Expected %v", abciResponses2, abciResponses)) + loadedAbciResponses := state.LoadABCIResponses() + assert.Equal(abciResponses, loadedAbciResponses, + cmn.Fmt(`ABCIResponses don't match: Got %v, Expected %v`, loadedAbciResponses, + abciResponses)) } +// TestValidatorSimpleSaveLoad tests saving and loading validators. func TestValidatorSimpleSaveLoad(t *testing.T) { tearDown, _, state := setupTestCase(t) defer tearDown(t) + // nolint: vetshadow assert := assert.New(t) - // cant load anything for height 0 + // can't load anything for height 0 v, err := state.LoadValidators(0) assert.IsType(ErrNoValSetForHeight{}, err, "expected err at height 0") @@ -116,9 +130,11 @@ func TestValidatorSimpleSaveLoad(t *testing.T) { assert.IsType(ErrNoValSetForHeight{}, err, "expected err at unknown height") } +// TestValidatorChangesSaveLoad tests saving and loading a validator set with changes. func TestValidatorChangesSaveLoad(t *testing.T) { tearDown, _, state := setupTestCase(t) defer tearDown(t) + // nolint: vetshadow assert := assert.New(t) // change vals at these heights @@ -171,7 +187,8 @@ func TestValidatorChangesSaveLoad(t *testing.T) { assert.Equal(v.Size(), 1, "validator set size is greater than 1: %d", v.Size()) addr, _ := v.GetByIndex(0) - assert.Equal(addr, testCase.vals.Address(), fmt.Sprintf("unexpected pubkey at height %d", testCase.height)) + assert.Equal(addr, testCase.vals.Address(), fmt.Sprintf(`unexpected pubkey at + height %d`, testCase.height)) } } diff --git a/state/txindex/indexer.go b/state/txindex/indexer.go index 1c311830a..20bbbf1df 100644 --- a/state/txindex/indexer.go +++ b/state/txindex/indexer.go @@ -6,17 +6,17 @@ import ( "github.com/tendermint/tendermint/types" ) -// Indexer interface defines methods to index and search transactions. +// TxIndexer interface defines methods to index and search transactions. +// TODO: Add the ability to create an independent TxIndexer. type TxIndexer interface { - // Batch analyzes, indexes or stores a batch of transactions. - // - // NOTE We do not specify Index method for analyzing a single transaction + // AddBatch analyzes, indexes or stores a batch of transactions. + // NOTE: We do not specify Index method for analyzing a single transaction // here because it bears heavy perfomance loses. Almost all advanced indexers // support batching. AddBatch(b *Batch) error - // Tx returns specified transaction or nil if the transaction is not indexed + // Get return the transaction specified by hash or nil if the transaction is not indexed // or stored. Get(hash []byte) (*types.TxResult, error) } @@ -24,10 +24,9 @@ type TxIndexer interface { //---------------------------------------------------- // Txs are written as a batch -// A Batch groups together multiple Index operations you would like performed -// at the same time. The Batch structure is NOT thread-safe. You should only -// perform operations on a batch from a single thread at a time. Once batch -// execution has started, you may not modify it. +// Batch groups together multiple Index operations you would like performed +// at the same time. +// NOTE: Bach is NOT thread-safe and should not be modified after starting its execution. type Batch struct { Ops []types.TxResult } @@ -39,7 +38,7 @@ func NewBatch(n int) *Batch { } } -// Index adds or updates entry for the given result.Index. +// Add or update an entry for the given result.Index. func (b *Batch) Add(result types.TxResult) error { b.Ops[result.Index] = result return nil diff --git a/state/txindex/kv/kv.go b/state/txindex/kv/kv.go index 8f684c4a9..db075e547 100644 --- a/state/txindex/kv/kv.go +++ b/state/txindex/kv/kv.go @@ -4,14 +4,16 @@ import ( "bytes" "fmt" - db "github.com/tendermint/tmlibs/db" "github.com/tendermint/go-wire" + + db "github.com/tendermint/tmlibs/db" + "github.com/tendermint/tendermint/state/txindex" "github.com/tendermint/tendermint/types" ) // TxIndex is the simplest possible indexer, backed by Key-Value storage (levelDB). -// It could only index transaction by its identifier. +// It can only index transaction by its identifier. type TxIndex struct { store db.DB } @@ -44,7 +46,7 @@ func (txi *TxIndex) Get(hash []byte) (*types.TxResult, error) { return txResult, nil } -// Batch writes a batch of transactions into the TxIndex storage. +// AddBatch writes a batch of transactions into the TxIndex storage. func (txi *TxIndex) AddBatch(b *txindex.Batch) error { storeBatch := txi.store.NewBatch() for _, result := range b.Ops { diff --git a/state/txindex/null/null.go b/state/txindex/null/null.go index 4999bbdeb..38027883d 100644 --- a/state/txindex/null/null.go +++ b/state/txindex/null/null.go @@ -10,12 +10,12 @@ import ( // TxIndex acts as a /dev/null. type TxIndex struct{} -// Tx panics. +// Get with a hash panics. func (txi *TxIndex) Get(hash []byte) (*types.TxResult, error) { return nil, errors.New(`Indexing is disabled (set 'tx_index = "kv"' in config)`) } -// Batch returns nil. +// AddBatch returns nil. func (txi *TxIndex) AddBatch(batch *txindex.Batch) error { return nil } diff --git a/types/block.go b/types/block.go index c8cdf81a9..984aaf5de 100644 --- a/types/block.go +++ b/types/block.go @@ -14,15 +14,15 @@ import ( "github.com/tendermint/tmlibs/merkle" ) -// Block defines the atomic unit of a Tendermint blockchain +// Block defines the atomic unit of a Tendermint blockchain. type Block struct { *Header `json:"header"` *Data `json:"data"` LastCommit *Commit `json:"last_commit"` } -// MakeBlock returns a new block and corresponding part set from the given information -// TODO: version +// MakeBlock returns a new block and corresponding part set from the given information. +// TODO: Add version information to the Block struct. func MakeBlock(height int, chainID string, txs []Tx, commit *Commit, prevBlockID BlockID, valHash, appHash []byte, partSize int) (*Block, *PartSet) { block := &Block{ From 036d3b59a363f26596cac4ed24b45049dee8bf13 Mon Sep 17 00:00:00 2001 From: Adrian Brink Date: Tue, 17 Oct 2017 09:59:05 +0200 Subject: [PATCH 09/11] Address reviews --- CHANGELOG.md | 2 ++ rpc/lib/client/http_client.go | 5 +++-- state/state.go | 4 ++-- state/txindex/indexer.go | 5 ++--- state/txindex/null/null.go | 4 ++-- types/block.go | 2 +- 6 files changed, 12 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c48d0850b..6b97fe659 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ BREAKING CHANGES: - Better support for injecting randomness - Pass evidence/voteInfo through ABCI - Upgrade consensus for more real-time use of evidence +- func(s *State) LoadABCIResponses() *ABCIResponses now returns nil if now ABCIResponses could be loaded from the database. + Previously it would return a pointer to an ABCIResponses object if it didn't find anything in the database. FEATURES: - Peer reputation management diff --git a/rpc/lib/client/http_client.go b/rpc/lib/client/http_client.go index df0e175ea..7154d952a 100644 --- a/rpc/lib/client/http_client.go +++ b/rpc/lib/client/http_client.go @@ -42,7 +42,8 @@ func makeHTTPDialer(remoteAddr string) (string, func(string, string) (net.Conn, protocol = "tcp" } - trimmedAddress := strings.Replace(address, "/", ".", -1) // replace / with . for http requests (dummy domain) + // replace / with . for http requests (dummy domain) + trimmedAddress := strings.Replace(address, "/", ".", -1) return trimmedAddress, func(proto, addr string) (net.Conn, error) { return net.Dial(protocol, address) } @@ -67,7 +68,7 @@ type JSONRPCClient struct { client *http.Client } -// NewJSONRPCClient takes an address and returns a pointer to an instance of JSONRPCClient +// NewJSONRPCClient returns a JSONRPCClient pointed at the given address. func NewJSONRPCClient(remote string) *JSONRPCClient { address, client := makeHTTPClient(remote) return &JSONRPCClient{ diff --git a/state/state.go b/state/state.go index 801101d75..752fbff1d 100644 --- a/state/state.go +++ b/state/state.go @@ -233,8 +233,8 @@ func (s *State) Bytes() []byte { return wire.BinaryBytes(s) } -// SetBlockAndValidators mutates State variables to update block and validators after running -// EndBlock. +// SetBlockAndValidators mutates State variables +// to update block and validators after running EndBlock. func (s *State) SetBlockAndValidators(header *types.Header, blockPartsHeader types.PartSetHeader, abciResponses *ABCIResponses) { diff --git a/state/txindex/indexer.go b/state/txindex/indexer.go index 20bbbf1df..e17f21355 100644 --- a/state/txindex/indexer.go +++ b/state/txindex/indexer.go @@ -24,9 +24,8 @@ type TxIndexer interface { //---------------------------------------------------- // Txs are written as a batch -// Batch groups together multiple Index operations you would like performed -// at the same time. -// NOTE: Bach is NOT thread-safe and should not be modified after starting its execution. +// Batch groups together multiple Index operations to be performed at the same time. +// NOTE: Batch is NOT thread-safe and must not be modified after starting its execution. type Batch struct { Ops []types.TxResult } diff --git a/state/txindex/null/null.go b/state/txindex/null/null.go index 38027883d..4939d6d82 100644 --- a/state/txindex/null/null.go +++ b/state/txindex/null/null.go @@ -10,12 +10,12 @@ import ( // TxIndex acts as a /dev/null. type TxIndex struct{} -// Get with a hash panics. +// Get on a TxIndex is disabled and panics when invoked. func (txi *TxIndex) Get(hash []byte) (*types.TxResult, error) { return nil, errors.New(`Indexing is disabled (set 'tx_index = "kv"' in config)`) } -// AddBatch returns nil. +// AddBatch is a noop and always returns nil. func (txi *TxIndex) AddBatch(batch *txindex.Batch) error { return nil } diff --git a/types/block.go b/types/block.go index 984aaf5de..24e0f7445 100644 --- a/types/block.go +++ b/types/block.go @@ -21,7 +21,7 @@ type Block struct { LastCommit *Commit `json:"last_commit"` } -// MakeBlock returns a new block and corresponding part set from the given information. +// MakeBlock returns a new block and corresponding partset from the given information. // TODO: Add version information to the Block struct. func MakeBlock(height int, chainID string, txs []Tx, commit *Commit, prevBlockID BlockID, valHash, appHash []byte, partSize int) (*Block, *PartSet) { From 819f81f702227e8a4f042e14e642ce67d2add1d8 Mon Sep 17 00:00:00 2001 From: Adrian Brink Date: Tue, 17 Oct 2017 14:34:54 +0200 Subject: [PATCH 10/11] Change NOTE to CONTRACT --- mempool/mempool.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mempool/mempool.go b/mempool/mempool.go index c1130d9dd..f75e53d57 100644 --- a/mempool/mempool.go +++ b/mempool/mempool.go @@ -164,7 +164,7 @@ func (mem *Mempool) TxsFrontWait() *clist.CElement { // It blocks if we're waiting on Update() or Reap(). // cb: A callback from the CheckTx command. // It gets called from another goroutine. -// NOTE: Either cb will get called, or err returned. +// CONTRACT: Either cb will get called, or err returned. func (mem *Mempool) CheckTx(tx types.Tx, cb func(*abci.Response)) (err error) { mem.proxyMtx.Lock() defer mem.proxyMtx.Unlock() From c2803b80e8ba7206d6b3cffe3280f50230593894 Mon Sep 17 00:00:00 2001 From: Ethan Buchman Date: Mon, 23 Oct 2017 11:05:20 -0400 Subject: [PATCH 11/11] update changelog; fixes from rebase --- CHANGELOG.md | 4 ++-- state/state.go | 7 ------- state/txindex/indexer.go | 3 +-- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6b97fe659..df87c1633 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,8 +7,6 @@ BREAKING CHANGES: - Better support for injecting randomness - Pass evidence/voteInfo through ABCI - Upgrade consensus for more real-time use of evidence -- func(s *State) LoadABCIResponses() *ABCIResponses now returns nil if now ABCIResponses could be loaded from the database. - Previously it would return a pointer to an ABCIResponses object if it didn't find anything in the database. FEATURES: - Peer reputation management @@ -30,6 +28,8 @@ BUG FIXES: - Graceful handling/recovery for apps that have non-determinism or fail to halt - Graceful handling/recovery for violations of safety, or liveness +## 0.12.0 (TBA) + ## 0.11.1 (October 10, 2017) IMPROVEMENTS: diff --git a/state/state.go b/state/state.go index 752fbff1d..4241f9de6 100644 --- a/state/state.go +++ b/state/state.go @@ -279,13 +279,6 @@ func (s *State) GetValidators() (last *types.ValidatorSet, current *types.Valida return s.LastValidators, s.Validators } -// Params returns the consensus parameters used for validating blocks -func (s *State) Params() types.ConsensusParams { - // TODO: this should move into the State proper - // when we allow the app to change it - return *s.GenesisDoc.ConsensusParams -} - //------------------------------------------------------------------------ // ABCIResponses retains the responses of the various ABCI calls during block processing. diff --git a/state/txindex/indexer.go b/state/txindex/indexer.go index e17f21355..66897905c 100644 --- a/state/txindex/indexer.go +++ b/state/txindex/indexer.go @@ -7,7 +7,6 @@ import ( ) // TxIndexer interface defines methods to index and search transactions. -// TODO: Add the ability to create an independent TxIndexer. type TxIndexer interface { // AddBatch analyzes, indexes or stores a batch of transactions. @@ -16,7 +15,7 @@ type TxIndexer interface { // support batching. AddBatch(b *Batch) error - // Get return the transaction specified by hash or nil if the transaction is not indexed + // Get returns the transaction specified by hash or nil if the transaction is not indexed // or stored. Get(hash []byte) (*types.TxResult, error) }