From 410b857c743b636ce8331e02dc3d3a4dc195df53 Mon Sep 17 00:00:00 2001 From: Evan Forbes <42654277+evan-forbes@users.noreply.github.com> Date: Wed, 25 Aug 2021 17:49:02 -0500 Subject: [PATCH] Remove the DataAvailabilityHeader from the Proposal (#518) * remove the DAH from the proposal * fix hardcoded tests * remove uneccessary error in toproto method --- consensus/byzantine_test.go | 10 +- consensus/common_test.go | 7 +- consensus/msgs.go | 5 +- consensus/msgs_test.go | 17 +- consensus/replay_test.go | 20 +- consensus/state.go | 13 +- consensus/state_test.go | 15 +- privval/file_test.go | 10 +- privval/msgs_test.go | 8 +- privval/signer_client_test.go | 22 +- proto/tendermint/consensus/types.pb.go | 110 +++--- proto/tendermint/state/types.pb.go | 100 +++--- proto/tendermint/types/canonical.pb.go | 162 +++------ proto/tendermint/types/canonical.proto | 1 - proto/tendermint/types/types.pb.go | 320 +++++++----------- proto/tendermint/types/types.proto | 1 - .../internal/test_harness.go | 6 +- types/canonical.go | 1 - types/proposal.go | 37 +- types/proposal_test.go | 37 +- 20 files changed, 347 insertions(+), 555 deletions(-) diff --git a/consensus/byzantine_test.go b/consensus/byzantine_test.go index 9d53eff4d3..18fa8e5d18 100644 --- a/consensus/byzantine_test.go +++ b/consensus/byzantine_test.go @@ -380,9 +380,8 @@ func byzantineDecideProposalFunc(t *testing.T, height int64, round int32, cs *St // Create a new proposal block from state/txs from the mempool. block1, blockParts1 := cs.createProposalBlock() polRound, propBlockID := cs.ValidRound, types.BlockID{Hash: block1.Hash(), PartSetHeader: blockParts1.Header()} - proposal1 := types.NewProposal(height, round, polRound, propBlockID, &block1.DataAvailabilityHeader) - p1, err := proposal1.ToProto() - require.NoError(t, err) + proposal1 := types.NewProposal(height, round, polRound, propBlockID) + p1 := proposal1.ToProto() if err := cs.privValidator.SignProposal(cs.state.ChainID, p1); err != nil { t.Error(err) } @@ -395,9 +394,8 @@ func byzantineDecideProposalFunc(t *testing.T, height int64, round int32, cs *St // Create a new proposal block from state/txs from the mempool. block2, blockParts2 := cs.createProposalBlock() polRound, propBlockID = cs.ValidRound, types.BlockID{Hash: block2.Hash(), PartSetHeader: blockParts2.Header()} - proposal2 := types.NewProposal(height, round, polRound, propBlockID, &block2.DataAvailabilityHeader) - p2, err := proposal2.ToProto() - require.NoError(t, err) + proposal2 := types.NewProposal(height, round, polRound, propBlockID) + p2 := proposal2.ToProto() if err := cs.privValidator.SignProposal(cs.state.ChainID, p2); err != nil { t.Error(err) } diff --git a/consensus/common_test.go b/consensus/common_test.go index 01aa4e09e8..afb98ac108 100644 --- a/consensus/common_test.go +++ b/consensus/common_test.go @@ -200,11 +200,8 @@ func decideProposal( // Make proposal polRound, propBlockID := validRound, types.BlockID{Hash: block.Hash(), PartSetHeader: blockParts.Header()} - proposal = types.NewProposal(height, round, polRound, propBlockID, &block.DataAvailabilityHeader) - p, err := proposal.ToProto() - if err != nil { - panic(err) - } + proposal = types.NewProposal(height, round, polRound, propBlockID) + p := proposal.ToProto() if err := vs.SignProposal(chainID, p); err != nil { panic(err) } diff --git a/consensus/msgs.go b/consensus/msgs.go index a03b1926cf..da82d0f695 100644 --- a/consensus/msgs.go +++ b/consensus/msgs.go @@ -50,10 +50,7 @@ func MsgToProto(msg Message) (*tmcons.Message, error) { }, } case *ProposalMessage: - pbP, err := msg.Proposal.ToProto() - if err != nil { - return nil, err - } + pbP := msg.Proposal.ToProto() pb = tmcons.Message{ Sum: &tmcons.Message_Proposal{ diff --git a/consensus/msgs_test.go b/consensus/msgs_test.go index 6403b08d20..daf31a2b7a 100644 --- a/consensus/msgs_test.go +++ b/consensus/msgs_test.go @@ -11,14 +11,12 @@ import ( "github.com/stretchr/testify/require" "github.com/celestiaorg/celestia-core/crypto/merkle" - "github.com/celestiaorg/celestia-core/crypto/tmhash" "github.com/celestiaorg/celestia-core/libs/bits" tmrand "github.com/celestiaorg/celestia-core/libs/rand" "github.com/celestiaorg/celestia-core/p2p" tmcons "github.com/celestiaorg/celestia-core/proto/tendermint/consensus" tmproto "github.com/celestiaorg/celestia-core/proto/tendermint/types" "github.com/celestiaorg/celestia-core/types" - "github.com/celestiaorg/celestia-core/types/consts" ) func TestMsgToProto(t *testing.T) { @@ -48,8 +46,6 @@ func TestMsgToProto(t *testing.T) { pbParts, err := parts.ToProto() require.NoError(t, err) - roots, err := types.NmtRootsFromBytes([][]byte{tmrand.Bytes(2*consts.NamespaceSize + tmhash.Size)}) - require.NoError(t, err) proposal := types.Proposal{ Type: tmproto.ProposalType, Height: 1, @@ -58,13 +54,8 @@ func TestMsgToProto(t *testing.T) { BlockID: bi, Timestamp: time.Now(), Signature: tmrand.Bytes(20), - DAHeader: &types.DataAvailabilityHeader{ - RowsRoots: roots, - ColumnRoots: roots, - }, } - pbProposal, err := proposal.ToProto() - require.NoError(t, err) + pbProposal := proposal.ToProto() pv := types.NewMockPV() pk, err := pv.GetPubKey() @@ -361,10 +352,8 @@ func TestConsMsgsVectors(t *testing.T) { BlockID: bi, Timestamp: date, Signature: []byte("add_more_exclamation"), - DAHeader: &types.DataAvailabilityHeader{}, } - pbProposal, err := proposal.ToProto() - require.NoError(t, err) + pbProposal := proposal.ToProto() v := &types.Vote{ ValidatorAddress: []byte("add_more_exclamation"), @@ -401,7 +390,7 @@ func TestConsMsgsVectors(t *testing.T) { Height: 1, Round: 1, BlockPartSetHeader: pbPsh, BlockParts: pbBits, IsCommit: false}}}, "1231080110011a24080112206164645f6d6f72655f6578636c616d6174696f6e5f6d61726b735f636f64652d22050801120100"}, {"Proposal", &tmcons.Message{Sum: &tmcons.Message_Proposal{Proposal: &tmcons.Proposal{Proposal: *pbProposal}}}, - "1a740a7208201001180120012a480a206164645f6d6f72655f6578636c616d6174696f6e5f6d61726b735f636f64652d1224080112206164645f6d6f72655f6578636c616d6174696f6e5f6d61726b735f636f64652d320608c0b89fdc053a146164645f6d6f72655f6578636c616d6174696f6e4200"}, + "1a720a7008201001180120012a480a206164645f6d6f72655f6578636c616d6174696f6e5f6d61726b735f636f64652d1224080112206164645f6d6f72655f6578636c616d6174696f6e5f6d61726b735f636f64652d320608c0b89fdc053a146164645f6d6f72655f6578636c616d6174696f6e"}, {"ProposalPol", &tmcons.Message{Sum: &tmcons.Message_ProposalPol{ ProposalPol: &tmcons.ProposalPOL{Height: 1, ProposalPolRound: 1}}}, "2206080110011a00"}, diff --git a/consensus/replay_test.go b/consensus/replay_test.go index 3fa63b5d74..1491fd56b9 100644 --- a/consensus/replay_test.go +++ b/consensus/replay_test.go @@ -371,9 +371,8 @@ func TestSimulateValidatorsChange(t *testing.T) { propBlockParts := propBlock.MakePartSet(partSize) blockID := types.BlockID{Hash: propBlock.Hash(), PartSetHeader: propBlockParts.Header()} - proposal := types.NewProposal(vss[1].Height, round, -1, blockID, &propBlock.DataAvailabilityHeader) - p, err := proposal.ToProto() - require.NoError(t, err) + proposal := types.NewProposal(vss[1].Height, round, -1, blockID) + p := proposal.ToProto() if err := vss[1].SignProposal(config.ChainID(), p); err != nil { t.Fatal("failed to sign bad proposal", err) } @@ -402,9 +401,8 @@ func TestSimulateValidatorsChange(t *testing.T) { propBlockParts = propBlock.MakePartSet(partSize) blockID = types.BlockID{Hash: propBlock.Hash(), PartSetHeader: propBlockParts.Header()} - proposal = types.NewProposal(vss[2].Height, round, -1, blockID, &propBlock.DataAvailabilityHeader) - p, err = proposal.ToProto() - require.NoError(t, err) + proposal = types.NewProposal(vss[2].Height, round, -1, blockID) + p = proposal.ToProto() if err := vss[2].SignProposal(config.ChainID(), p); err != nil { t.Fatal("failed to sign bad proposal", err) } @@ -460,9 +458,8 @@ func TestSimulateValidatorsChange(t *testing.T) { selfIndex := valIndexFn(0) - proposal = types.NewProposal(vss[3].Height, round, -1, blockID, &propBlock.DataAvailabilityHeader) - p, err = proposal.ToProto() - require.NoError(t, err) + proposal = types.NewProposal(vss[3].Height, round, -1, blockID) + p = proposal.ToProto() if err := vss[3].SignProposal(config.ChainID(), p); err != nil { t.Fatal("failed to sign bad proposal", err) } @@ -520,9 +517,8 @@ func TestSimulateValidatorsChange(t *testing.T) { sort.Sort(ValidatorStubsByPower(newVss)) selfIndex = valIndexFn(0) - proposal = types.NewProposal(vss[1].Height, round, -1, blockID, &propBlock.DataAvailabilityHeader) - p, err = proposal.ToProto() - require.NoError(t, err) + proposal = types.NewProposal(vss[1].Height, round, -1, blockID) + p = proposal.ToProto() if err := vss[1].SignProposal(config.ChainID(), p); err != nil { t.Fatal("failed to sign bad proposal", err) } diff --git a/consensus/state.go b/consensus/state.go index d52933324c..ae2c7ffedb 100644 --- a/consensus/state.go +++ b/consensus/state.go @@ -1084,12 +1084,8 @@ func (cs *State) defaultDecideProposal(height int64, round int32) { // Make proposal propBlockID := types.BlockID{Hash: block.Hash(), PartSetHeader: blockParts.Header()} - proposal := types.NewProposal(height, round, cs.ValidRound, propBlockID, &block.DataAvailabilityHeader) - p, err := proposal.ToProto() - if err != nil { - cs.Logger.Error(fmt.Sprintf("can't serialize proposal: %s", err.Error())) - return - } + proposal := types.NewProposal(height, round, cs.ValidRound, propBlockID) + p := proposal.ToProto() if err := cs.privValidator.SignProposal(cs.state.ChainID, p); err == nil { proposal.Signature = p.Signature @@ -1739,10 +1735,7 @@ func (cs *State) defaultSetProposal(proposal *types.Proposal) error { return ErrInvalidProposalPOLRound } - p, err := proposal.ToProto() - if err != nil { - return err - } + p := proposal.ToProto() // Verify signature if !cs.Validators.GetProposer().PubKey.VerifySignature( diff --git a/consensus/state_test.go b/consensus/state_test.go index 683931d995..60c76e1a34 100644 --- a/consensus/state_test.go +++ b/consensus/state_test.go @@ -208,9 +208,8 @@ func TestStateBadProposal(t *testing.T) { propBlock.AppHash = stateHash propBlockParts := propBlock.MakePartSet(partSize) blockID := types.BlockID{Hash: propBlock.Hash(), PartSetHeader: propBlockParts.Header()} - proposal := types.NewProposal(vs2.Height, round, -1, blockID, &propBlock.DataAvailabilityHeader) - p, err := proposal.ToProto() - require.NoError(t, err) + proposal := types.NewProposal(vs2.Height, round, -1, blockID) + p := proposal.ToProto() if err := vs2.SignProposal(config.ChainID(), p); err != nil { t.Fatal("failed to sign bad proposal", err) } @@ -264,9 +263,8 @@ func TestStateOversizedBlock(t *testing.T) { propBlockParts := propBlock.MakePartSet(partSize) blockID := types.BlockID{Hash: propBlock.Hash(), PartSetHeader: propBlockParts.Header()} - proposal := types.NewProposal(height, round, -1, blockID, &propBlock.DataAvailabilityHeader) - p, err := proposal.ToProto() - require.NoError(t, err) + proposal := types.NewProposal(height, round, -1, blockID) + p := proposal.ToProto() if err := vs2.SignProposal(config.ChainID(), p); err != nil { t.Fatal("failed to sign bad proposal", err) } @@ -1095,9 +1093,8 @@ func TestStateLockPOLSafety2(t *testing.T) { round++ // moving to the next round // in round 2 we see the polkad block from round 0 - newProp := types.NewProposal(height, round, 0, propBlockID0, &propBlock0.DataAvailabilityHeader) - p, err := newProp.ToProto() - require.NoError(t, err) + newProp := types.NewProposal(height, round, 0, propBlockID0) + p := newProp.ToProto() if err := vs3.SignProposal(config.ChainID(), p); err != nil { t.Fatal(err) } diff --git a/privval/file_test.go b/privval/file_test.go index 3e5be7f94c..08d7102a63 100644 --- a/privval/file_test.go +++ b/privval/file_test.go @@ -236,8 +236,7 @@ func TestSignProposal(t *testing.T) { // sign a proposal for first time proposal := newProposal(height, round, block1) - pbp, err := proposal.ToProto() - require.NoError(t, err) + pbp := proposal.ToProto() err = privVal.SignProposal("mychainid", pbp) assert.NoError(err, "expected no error signing proposal") @@ -254,8 +253,7 @@ func TestSignProposal(t *testing.T) { } for _, c := range cases { - p, err := c.ToProto() - require.NoError(t, err) + p := c.ToProto() err = privVal.SignProposal("mychainid", p) assert.Error(err, "expected error on signing conflicting proposal") } @@ -284,8 +282,7 @@ func TestDifferByTimestamp(t *testing.T) { // test proposal { proposal := newProposal(height, round, block1) - pb, err := proposal.ToProto() - require.NoError(t, err) + pb := proposal.ToProto() err = privVal.SignProposal(chainID, pb) assert.NoError(t, err, "expected no error signing proposal") signBytes := types.ProposalSignBytes(chainID, pb) @@ -350,6 +347,5 @@ func newProposal(height int64, round int32, blockID types.BlockID) *types.Propos Round: round, BlockID: blockID, Timestamp: tmtime.Now(), - DAHeader: &types.DataAvailabilityHeader{}, } } diff --git a/privval/msgs_test.go b/privval/msgs_test.go index cd16ed9e6b..91433e810c 100644 --- a/privval/msgs_test.go +++ b/privval/msgs_test.go @@ -54,7 +54,6 @@ func exampleProposal() *types.Proposal { Hash: tmhash.Sum([]byte("blockID_part_set_header_hash")), }, }, - DAHeader: &types.DataAvailabilityHeader{}, } } @@ -70,8 +69,7 @@ func TestPrivvalVectors(t *testing.T) { // Generate a simple proposal proposal := exampleProposal() - proposalpb, err := proposal.ToProto() - require.NoError(t, err) + proposalpb := proposal.ToProto() // Create a Reuseable remote error remoteError := &privproto.RemoteSignerError{Code: 1, Description: "it's a error"} @@ -89,8 +87,8 @@ func TestPrivvalVectors(t *testing.T) { {"Vote Request", &privproto.SignVoteRequest{Vote: votepb}, "1a760a74080110031802224a0a208b01023386c371778ecb6368573e539afc3cc860ec3a2f614e54fe5652f4fc80122608c0843d122072db3d959635dff1bb567bedaa70573392c5159666a3f8caf11e413aac52207a2a0608f49a8ded0532146af1f4111082efb388211bc72c55bcd61e9ac3d538d5bb03"}, {"Vote Response", &privproto.SignedVoteResponse{Vote: *votepb, Error: nil}, "22760a74080110031802224a0a208b01023386c371778ecb6368573e539afc3cc860ec3a2f614e54fe5652f4fc80122608c0843d122072db3d959635dff1bb567bedaa70573392c5159666a3f8caf11e413aac52207a2a0608f49a8ded0532146af1f4111082efb388211bc72c55bcd61e9ac3d538d5bb03"}, {"Vote Response with error", &privproto.SignedVoteResponse{Vote: tmproto.Vote{}, Error: remoteError}, "22250a11220212002a0b088092b8c398feffffff0112100801120c697427732061206572726f72"}, - {"Proposal Request", &privproto.SignProposalRequest{Proposal: proposalpb}, "2a720a7008011003180220022a4a0a208b01023386c371778ecb6368573e539afc3cc860ec3a2f614e54fe5652f4fc80122608c0843d122072db3d959635dff1bb567bedaa70573392c5159666a3f8caf11e413aac52207a320608f49a8ded053a10697427732061207369676e61747572654200"}, - {"Proposal Response", &privproto.SignedProposalResponse{Proposal: *proposalpb, Error: nil}, "32720a7008011003180220022a4a0a208b01023386c371778ecb6368573e539afc3cc860ec3a2f614e54fe5652f4fc80122608c0843d122072db3d959635dff1bb567bedaa70573392c5159666a3f8caf11e413aac52207a320608f49a8ded053a10697427732061207369676e61747572654200"}, + {"Proposal Request", &privproto.SignProposalRequest{Proposal: proposalpb}, "2a700a6e08011003180220022a4a0a208b01023386c371778ecb6368573e539afc3cc860ec3a2f614e54fe5652f4fc80122608c0843d122072db3d959635dff1bb567bedaa70573392c5159666a3f8caf11e413aac52207a320608f49a8ded053a10697427732061207369676e6174757265"}, + {"Proposal Response", &privproto.SignedProposalResponse{Proposal: *proposalpb, Error: nil}, "32700a6e08011003180220022a4a0a208b01023386c371778ecb6368573e539afc3cc860ec3a2f614e54fe5652f4fc80122608c0843d122072db3d959635dff1bb567bedaa70573392c5159666a3f8caf11e413aac52207a320608f49a8ded053a10697427732061207369676e6174757265"}, {"Proposal Response with error", &privproto.SignedProposalResponse{Proposal: tmproto.Proposal{}, Error: remoteError}, "32250a112a021200320b088092b8c398feffffff0112100801120c697427732061206572726f72"}, } diff --git a/privval/signer_client_test.go b/privval/signer_client_test.go index af2cad2432..685b4e256d 100644 --- a/privval/signer_client_test.go +++ b/privval/signer_client_test.go @@ -125,7 +125,6 @@ func TestSignerProposal(t *testing.T) { POLRound: 2, BlockID: types.BlockID{Hash: hash, PartSetHeader: types.PartSetHeader{Hash: hash, Total: 2}}, Timestamp: ts, - DAHeader: &types.DataAvailabilityHeader{}, } want := &types.Proposal{ Type: tmproto.ProposalType, @@ -134,7 +133,6 @@ func TestSignerProposal(t *testing.T) { POLRound: 2, BlockID: types.BlockID{Hash: hash, PartSetHeader: types.PartSetHeader{Hash: hash, Total: 2}}, Timestamp: ts, - DAHeader: &types.DataAvailabilityHeader{}, } tc := tc @@ -149,13 +147,11 @@ func TestSignerProposal(t *testing.T) { } }) - p, err := want.ToProto() - require.NoError(t, err) - err = tc.mockPV.SignProposal(tc.chainID, p) + p := want.ToProto() + err := tc.mockPV.SignProposal(tc.chainID, p) require.NoError(t, err) - p, err = have.ToProto() - require.NoError(t, err) + p = have.ToProto() err = tc.signerClient.SignProposal(tc.chainID, p) require.NoError(t, err) @@ -342,21 +338,17 @@ func TestSignerSignProposalErrors(t *testing.T) { BlockID: types.BlockID{Hash: hash, PartSetHeader: types.PartSetHeader{Hash: hash, Total: 2}}, Timestamp: ts, Signature: []byte("signature"), - DAHeader: &types.DataAvailabilityHeader{}, } - p, err := proposal.ToProto() - require.NoError(t, err) - err = tc.signerClient.SignProposal(tc.chainID, p) + p := proposal.ToProto() + err := tc.signerClient.SignProposal(tc.chainID, p) require.Equal(t, err.(*RemoteSignerError).Description, types.ErroringMockPVErr.Error()) - p, err = proposal.ToProto() - require.NoError(t, err) + p = proposal.ToProto() err = tc.mockPV.SignProposal(tc.chainID, p) require.Error(t, err) - p, err = proposal.ToProto() - require.NoError(t, err) + p = proposal.ToProto() err = tc.signerClient.SignProposal(tc.chainID, p) require.Error(t, err) } diff --git a/proto/tendermint/consensus/types.pb.go b/proto/tendermint/consensus/types.pb.go index 98f0fec1e3..2b020a9095 100644 --- a/proto/tendermint/consensus/types.pb.go +++ b/proto/tendermint/consensus/types.pb.go @@ -801,61 +801,61 @@ func init() { func init() { proto.RegisterFile("tendermint/consensus/types.proto", fileDescriptor_81a22d2efc008981) } var fileDescriptor_81a22d2efc008981 = []byte{ - // 863 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x56, 0x4f, 0x8f, 0xdb, 0x44, - 0x14, 0xb7, 0x59, 0x67, 0x93, 0x7d, 0xde, 0x3f, 0x30, 0xda, 0x56, 0x61, 0x81, 0x6c, 0x30, 0x97, - 0x15, 0x02, 0x07, 0x65, 0x0f, 0x48, 0x15, 0x12, 0xc5, 0xfc, 0xa9, 0x5b, 0x35, 0x6d, 0xe4, 0x54, - 0x15, 0xea, 0xc5, 0x72, 0xe2, 0x91, 0x33, 0xd4, 0xf6, 0x58, 0x9e, 0x49, 0x96, 0x70, 0xe4, 0x13, - 0xf0, 0x01, 0xf8, 0x1a, 0x48, 0x7c, 0x84, 0x1e, 0x7b, 0xe4, 0x54, 0xa1, 0xec, 0x47, 0x40, 0x70, - 0x46, 0x33, 0x9e, 0x24, 0x13, 0xea, 0x2e, 0xec, 0x05, 0xa9, 0xb7, 0x99, 0xbc, 0xf7, 0x7e, 0xf3, - 0xde, 0xef, 0xbd, 0xf7, 0x8b, 0xa1, 0xcb, 0x71, 0x1e, 0xe3, 0x32, 0x23, 0x39, 0xef, 0x4d, 0x68, - 0xce, 0x70, 0xce, 0x66, 0xac, 0xc7, 0x17, 0x05, 0x66, 0x6e, 0x51, 0x52, 0x4e, 0xd1, 0xf1, 0xc6, - 0xc3, 0x5d, 0x7b, 0x9c, 0x1c, 0x27, 0x34, 0xa1, 0xd2, 0xa1, 0x27, 0x4e, 0x95, 0xef, 0xc9, 0xbb, - 0x1a, 0x9a, 0xc4, 0xd0, 0x91, 0x4e, 0xf4, 0xb7, 0x52, 0x32, 0x66, 0xbd, 0x31, 0xe1, 0x5b, 0x1e, - 0xce, 0x2f, 0x26, 0xec, 0x3f, 0xc0, 0x17, 0x01, 0x9d, 0xe5, 0xf1, 0x88, 0xe3, 0x02, 0xdd, 0x84, - 0xdd, 0x29, 0x26, 0xc9, 0x94, 0xb7, 0xcd, 0xae, 0x79, 0xb6, 0x13, 0xa8, 0x1b, 0x3a, 0x86, 0x46, - 0x29, 0x9c, 0xda, 0x6f, 0x74, 0xcd, 0xb3, 0x46, 0x50, 0x5d, 0x10, 0x02, 0x8b, 0x71, 0x5c, 0xb4, - 0x77, 0xba, 0xe6, 0xd9, 0x41, 0x20, 0xcf, 0xe8, 0x53, 0x68, 0x33, 0x3c, 0xa1, 0x79, 0xcc, 0x42, - 0x46, 0xf2, 0x09, 0x0e, 0x19, 0x8f, 0x4a, 0x1e, 0x72, 0x92, 0xe1, 0xb6, 0x25, 0x31, 0x6f, 0x28, - 0xfb, 0x48, 0x98, 0x47, 0xc2, 0xfa, 0x88, 0x64, 0x18, 0x7d, 0x08, 0x6f, 0xa5, 0x11, 0xe3, 0xe1, - 0x84, 0x66, 0x19, 0xe1, 0x61, 0xf5, 0x5c, 0x43, 0x3e, 0x77, 0x24, 0x0c, 0x5f, 0xca, 0xdf, 0x65, - 0xaa, 0xce, 0x9f, 0x26, 0x1c, 0x3c, 0xc0, 0x17, 0x8f, 0xa3, 0x94, 0xc4, 0x5e, 0x4a, 0x27, 0x4f, - 0xaf, 0x99, 0xf8, 0xb7, 0x70, 0x63, 0x2c, 0xc2, 0xc2, 0x42, 0xe4, 0xc6, 0x30, 0x0f, 0xa7, 0x38, - 0x8a, 0x71, 0x29, 0x2b, 0xb1, 0xfb, 0xa7, 0xae, 0xd6, 0x83, 0x8a, 0xaf, 0x61, 0x54, 0xf2, 0x11, - 0xe6, 0xbe, 0x74, 0xf3, 0xac, 0x67, 0x2f, 0x4e, 0x8d, 0x00, 0x49, 0x8c, 0x2d, 0x0b, 0xfa, 0x1c, - 0xec, 0x0d, 0x32, 0x93, 0x15, 0xdb, 0xfd, 0x8e, 0x8e, 0x27, 0x3a, 0xe1, 0x8a, 0x4e, 0xb8, 0x1e, - 0xe1, 0x5f, 0x94, 0x65, 0xb4, 0x08, 0x60, 0x0d, 0xc4, 0xd0, 0x3b, 0xb0, 0x47, 0x98, 0x22, 0x41, - 0x96, 0xdf, 0x0a, 0x5a, 0x84, 0x55, 0xc5, 0x3b, 0x3e, 0xb4, 0x86, 0x25, 0x2d, 0x28, 0x8b, 0x52, - 0xf4, 0x19, 0xb4, 0x0a, 0x75, 0x96, 0x35, 0xdb, 0xfd, 0x93, 0x9a, 0xb4, 0x95, 0x87, 0xca, 0x78, - 0x1d, 0xe1, 0xfc, 0x6c, 0x82, 0xbd, 0x32, 0x0e, 0x1f, 0xde, 0x7f, 0x25, 0x7f, 0x1f, 0x01, 0x5a, - 0xc5, 0x84, 0x05, 0x4d, 0x43, 0x9d, 0xcc, 0x37, 0x57, 0x96, 0x21, 0x4d, 0x65, 0x5f, 0xd0, 0x1d, - 0xd8, 0xd7, 0xbd, 0x15, 0x9d, 0xff, 0x52, 0xbe, 0xca, 0xcd, 0xd6, 0xd0, 0x9c, 0xa7, 0xb0, 0xe7, - 0xad, 0x38, 0xb9, 0x66, 0x6f, 0x3f, 0x01, 0x4b, 0x70, 0xaf, 0xde, 0xbe, 0x59, 0xdf, 0x4a, 0xf5, - 0xa6, 0xf4, 0x74, 0xfa, 0x60, 0x3d, 0xa6, 0x5c, 0x4c, 0xa0, 0x35, 0xa7, 0x1c, 0x2b, 0x36, 0x6b, - 0x22, 0x85, 0x57, 0x20, 0x7d, 0x9c, 0x1f, 0x4d, 0x68, 0xfa, 0x11, 0x93, 0x71, 0xd7, 0xcb, 0xef, - 0x1c, 0x2c, 0x81, 0x26, 0xf3, 0x3b, 0xac, 0x1b, 0xb5, 0x11, 0x49, 0x72, 0x1c, 0x0f, 0x58, 0xf2, - 0x68, 0x51, 0xe0, 0x40, 0x3a, 0x0b, 0x28, 0x92, 0xc7, 0xf8, 0x7b, 0x39, 0x50, 0x8d, 0xa0, 0xba, - 0x38, 0xbf, 0x9a, 0xb0, 0x2f, 0x32, 0x18, 0x61, 0x3e, 0x88, 0xbe, 0xeb, 0x9f, 0xff, 0x1f, 0x99, - 0x7c, 0x0d, 0xad, 0x6a, 0xc0, 0x49, 0xac, 0xa6, 0xfb, 0xed, 0x97, 0x03, 0x65, 0xef, 0xee, 0x7e, - 0xe5, 0x1d, 0x09, 0x96, 0x97, 0x2f, 0x4e, 0x9b, 0xea, 0x87, 0xa0, 0x29, 0x63, 0xef, 0xc6, 0xce, - 0x1f, 0x26, 0xd8, 0x2a, 0x75, 0x8f, 0x70, 0xf6, 0xfa, 0x64, 0x8e, 0x6e, 0x41, 0x43, 0x4c, 0x00, - 0x93, 0xcb, 0xf9, 0x5f, 0x87, 0xbb, 0x0a, 0x71, 0xfe, 0xb2, 0xa0, 0x39, 0xc0, 0x8c, 0x45, 0x09, - 0x46, 0xf7, 0xe0, 0x30, 0xc7, 0x17, 0xd5, 0x42, 0x85, 0x52, 0x46, 0xab, 0xb9, 0x73, 0xdc, 0xba, - 0x3f, 0x00, 0x57, 0x97, 0x69, 0xdf, 0x08, 0xf6, 0x73, 0x5d, 0xb6, 0x07, 0x70, 0x24, 0xb0, 0xe6, - 0x42, 0x0f, 0x43, 0x99, 0xa8, 0xe4, 0xcb, 0xee, 0x7f, 0xf0, 0x4a, 0xb0, 0x8d, 0x76, 0xfa, 0x46, - 0x70, 0x90, 0x6f, 0x89, 0xa9, 0x2e, 0x2d, 0x35, 0x2b, 0xbc, 0xc1, 0x59, 0x29, 0x88, 0xaf, 0x49, - 0x0b, 0xfa, 0xe6, 0x1f, 0x22, 0x50, 0x71, 0xfd, 0xfe, 0xd5, 0x08, 0xc3, 0x87, 0xf7, 0xfd, 0x6d, - 0x0d, 0x40, 0xb7, 0x01, 0x36, 0x52, 0xaa, 0xd8, 0x3e, 0xad, 0x47, 0x59, 0x6b, 0x85, 0x6f, 0x04, - 0x7b, 0x6b, 0x31, 0x15, 0x52, 0x20, 0x17, 0x7a, 0xf7, 0x65, 0x79, 0xdc, 0xc4, 0x8a, 0x29, 0xf4, - 0x8d, 0x6a, 0xad, 0xd1, 0x2d, 0x68, 0x4d, 0x23, 0x16, 0xca, 0xa8, 0xa6, 0x8c, 0x7a, 0xaf, 0x3e, - 0x4a, 0xed, 0xbe, 0x6f, 0x04, 0xcd, 0xa9, 0x92, 0x81, 0x7b, 0x70, 0x28, 0xe2, 0xe4, 0xdf, 0x49, - 0x26, 0xd6, 0xb1, 0xdd, 0xba, 0xaa, 0xa1, 0xfa, 0xe2, 0x8a, 0x86, 0xce, 0xf5, 0x45, 0xbe, 0x03, - 0x07, 0x6b, 0x2c, 0x31, 0x4f, 0xed, 0xbd, 0xab, 0x48, 0xd4, 0x16, 0x49, 0x90, 0x38, 0xdf, 0x5c, - 0xbd, 0x06, 0xec, 0xb0, 0x59, 0xe6, 0x3d, 0x79, 0xb6, 0xec, 0x98, 0xcf, 0x97, 0x1d, 0xf3, 0xf7, - 0x65, 0xc7, 0xfc, 0xe9, 0xb2, 0x63, 0x3c, 0xbf, 0xec, 0x18, 0xbf, 0x5d, 0x76, 0x8c, 0x27, 0xb7, - 0x13, 0xc2, 0xa7, 0xb3, 0xb1, 0x3b, 0xa1, 0x59, 0x2f, 0x8d, 0x7e, 0x58, 0xa4, 0x38, 0x4e, 0x70, - 0xa9, 0x1d, 0x3f, 0x9e, 0xd0, 0x12, 0xf7, 0xaa, 0x4f, 0x8f, 0xba, 0x8f, 0x97, 0xf1, 0xae, 0xb4, - 0x9d, 0xff, 0x1d, 0x00, 0x00, 0xff, 0xff, 0x08, 0xab, 0x10, 0x2c, 0xdb, 0x08, 0x00, 0x00, + // 862 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x56, 0xcd, 0x8e, 0xe3, 0x44, + 0x10, 0xb6, 0x19, 0x67, 0x92, 0x29, 0x4f, 0x66, 0xa0, 0x35, 0xbb, 0x0a, 0x01, 0x92, 0x60, 0x2e, + 0x23, 0x04, 0x0e, 0xca, 0x1c, 0x90, 0x56, 0x48, 0x0b, 0xe6, 0x67, 0xbd, 0xab, 0xcd, 0x6e, 0xe4, + 0xac, 0x56, 0xc0, 0xc5, 0x72, 0xec, 0x96, 0xd3, 0xac, 0xed, 0xb6, 0xdc, 0x9d, 0x0c, 0x73, 0xe5, + 0x09, 0x78, 0x00, 0x5e, 0x03, 0x89, 0x47, 0xd8, 0xe3, 0x1e, 0x39, 0xad, 0x50, 0xe6, 0x11, 0x10, + 0x9c, 0x51, 0xb7, 0x3b, 0x89, 0xc3, 0x7a, 0x06, 0xe6, 0x82, 0xc4, 0xad, 0x3b, 0x55, 0xf5, 0x75, + 0xd5, 0x57, 0x55, 0x5f, 0x0c, 0x03, 0x8e, 0xb3, 0x08, 0x17, 0x29, 0xc9, 0xf8, 0x30, 0xa4, 0x19, + 0xc3, 0x19, 0x5b, 0xb0, 0x21, 0xbf, 0xc8, 0x31, 0xb3, 0xf3, 0x82, 0x72, 0x8a, 0x4e, 0xb6, 0x1e, + 0xf6, 0xc6, 0xa3, 0x7b, 0x12, 0xd3, 0x98, 0x4a, 0x87, 0xa1, 0x38, 0x95, 0xbe, 0xdd, 0xb7, 0x2b, + 0x68, 0x12, 0xa3, 0x8a, 0xd4, 0xad, 0xbe, 0x95, 0x90, 0x19, 0x1b, 0xce, 0x08, 0xdf, 0xf1, 0xb0, + 0x7e, 0xd6, 0xe1, 0xf0, 0x11, 0x3e, 0xf7, 0xe8, 0x22, 0x8b, 0xa6, 0x1c, 0xe7, 0xe8, 0x36, 0xec, + 0xcf, 0x31, 0x89, 0xe7, 0xbc, 0xa3, 0x0f, 0xf4, 0xd3, 0x3d, 0x4f, 0xdd, 0xd0, 0x09, 0x34, 0x0a, + 0xe1, 0xd4, 0x79, 0x6d, 0xa0, 0x9f, 0x36, 0xbc, 0xf2, 0x82, 0x10, 0x18, 0x8c, 0xe3, 0xbc, 0xb3, + 0x37, 0xd0, 0x4f, 0xdb, 0x9e, 0x3c, 0xa3, 0x8f, 0xa1, 0xc3, 0x70, 0x48, 0xb3, 0x88, 0xf9, 0x8c, + 0x64, 0x21, 0xf6, 0x19, 0x0f, 0x0a, 0xee, 0x73, 0x92, 0xe2, 0x8e, 0x21, 0x31, 0x6f, 0x29, 0xfb, + 0x54, 0x98, 0xa7, 0xc2, 0xfa, 0x84, 0xa4, 0x18, 0xbd, 0x0f, 0x6f, 0x24, 0x01, 0xe3, 0x7e, 0x48, + 0xd3, 0x94, 0x70, 0xbf, 0x7c, 0xae, 0x21, 0x9f, 0x3b, 0x16, 0x86, 0xcf, 0xe5, 0xef, 0x32, 0x55, + 0xeb, 0x0f, 0x1d, 0xda, 0x8f, 0xf0, 0xf9, 0xd3, 0x20, 0x21, 0x91, 0x93, 0xd0, 0xf0, 0xd9, 0x0d, + 0x13, 0xff, 0x1a, 0x6e, 0xcd, 0x44, 0x98, 0x9f, 0x8b, 0xdc, 0x18, 0xe6, 0xfe, 0x1c, 0x07, 0x11, + 0x2e, 0x64, 0x25, 0xe6, 0xa8, 0x6f, 0x57, 0x7a, 0x50, 0xf2, 0x35, 0x09, 0x0a, 0x3e, 0xc5, 0xdc, + 0x95, 0x6e, 0x8e, 0xf1, 0xfc, 0x65, 0x5f, 0xf3, 0x90, 0xc4, 0xd8, 0xb1, 0xa0, 0xbb, 0x60, 0x6e, + 0x91, 0x99, 0xac, 0xd8, 0x1c, 0xf5, 0xaa, 0x78, 0xa2, 0x13, 0xb6, 0xe8, 0x84, 0xed, 0x10, 0xfe, + 0x59, 0x51, 0x04, 0x17, 0x1e, 0x6c, 0x80, 0x18, 0x7a, 0x0b, 0x0e, 0x08, 0x53, 0x24, 0xc8, 0xf2, + 0x5b, 0x5e, 0x8b, 0xb0, 0xb2, 0x78, 0xcb, 0x85, 0xd6, 0xa4, 0xa0, 0x39, 0x65, 0x41, 0x82, 0x3e, + 0x81, 0x56, 0xae, 0xce, 0xb2, 0x66, 0x73, 0xd4, 0xad, 0x49, 0x5b, 0x79, 0xa8, 0x8c, 0x37, 0x11, + 0xd6, 0x4f, 0x3a, 0x98, 0x6b, 0xe3, 0xe4, 0xf1, 0xc3, 0x2b, 0xf9, 0xfb, 0x00, 0xd0, 0x3a, 0xc6, + 0xcf, 0x69, 0xe2, 0x57, 0xc9, 0x7c, 0x7d, 0x6d, 0x99, 0xd0, 0x44, 0xf6, 0x05, 0xdd, 0x83, 0xc3, + 0xaa, 0xb7, 0xa2, 0xf3, 0x1f, 0xca, 0x57, 0xb9, 0x99, 0x15, 0x34, 0xeb, 0x19, 0x1c, 0x38, 0x6b, + 0x4e, 0x6e, 0xd8, 0xdb, 0x8f, 0xc0, 0x10, 0xdc, 0xab, 0xb7, 0x6f, 0xd7, 0xb7, 0x52, 0xbd, 0x29, + 0x3d, 0xad, 0x11, 0x18, 0x4f, 0x29, 0x17, 0x13, 0x68, 0x2c, 0x29, 0xc7, 0x8a, 0xcd, 0x9a, 0x48, + 0xe1, 0xe5, 0x49, 0x1f, 0xeb, 0x07, 0x1d, 0x9a, 0x6e, 0xc0, 0x64, 0xdc, 0xcd, 0xf2, 0x3b, 0x03, + 0x43, 0xa0, 0xc9, 0xfc, 0x8e, 0xea, 0x46, 0x6d, 0x4a, 0xe2, 0x0c, 0x47, 0x63, 0x16, 0x3f, 0xb9, + 0xc8, 0xb1, 0x27, 0x9d, 0x05, 0x14, 0xc9, 0x22, 0xfc, 0xbd, 0x1c, 0xa8, 0x86, 0x57, 0x5e, 0xac, + 0x5f, 0x74, 0x38, 0x14, 0x19, 0x4c, 0x31, 0x1f, 0x07, 0xdf, 0x8d, 0xce, 0xfe, 0x8b, 0x4c, 0xbe, + 0x84, 0x56, 0x39, 0xe0, 0x24, 0x52, 0xd3, 0xfd, 0xe6, 0xab, 0x81, 0xb2, 0x77, 0xf7, 0xbf, 0x70, + 0x8e, 0x05, 0xcb, 0xab, 0x97, 0xfd, 0xa6, 0xfa, 0xc1, 0x6b, 0xca, 0xd8, 0xfb, 0x91, 0xf5, 0xbb, + 0x0e, 0xa6, 0x4a, 0xdd, 0x21, 0x9c, 0xfd, 0x7f, 0x32, 0x47, 0x77, 0xa0, 0x21, 0x26, 0x80, 0xc9, + 0xe5, 0xfc, 0xb7, 0xc3, 0x5d, 0x86, 0x58, 0x7f, 0x1a, 0xd0, 0x1c, 0x63, 0xc6, 0x82, 0x18, 0xa3, + 0x07, 0x70, 0x94, 0xe1, 0xf3, 0x72, 0xa1, 0x7c, 0x29, 0xa3, 0xe5, 0xdc, 0x59, 0x76, 0xdd, 0x1f, + 0x80, 0x5d, 0x95, 0x69, 0x57, 0xf3, 0x0e, 0xb3, 0xaa, 0x6c, 0x8f, 0xe1, 0x58, 0x60, 0x2d, 0x85, + 0x1e, 0xfa, 0x32, 0x51, 0xc9, 0x97, 0x39, 0x7a, 0xef, 0x4a, 0xb0, 0xad, 0x76, 0xba, 0x9a, 0xd7, + 0xce, 0x76, 0xc4, 0xb4, 0x2a, 0x2d, 0x35, 0x2b, 0xbc, 0xc5, 0x59, 0x2b, 0x88, 0x5b, 0x91, 0x16, + 0xf4, 0xd5, 0xdf, 0x44, 0xa0, 0xe4, 0xfa, 0xdd, 0xeb, 0x11, 0x26, 0x8f, 0x1f, 0xba, 0xbb, 0x1a, + 0x80, 0x3e, 0x05, 0xd8, 0x4a, 0xa9, 0x62, 0xbb, 0x5f, 0x8f, 0xb2, 0xd1, 0x0a, 0x57, 0xf3, 0x0e, + 0x36, 0x62, 0x2a, 0xa4, 0x40, 0x2e, 0xf4, 0xfe, 0xab, 0xf2, 0xb8, 0x8d, 0x15, 0x53, 0xe8, 0x6a, + 0xe5, 0x5a, 0xa3, 0x3b, 0xd0, 0x9a, 0x07, 0xcc, 0x97, 0x51, 0x4d, 0x19, 0xf5, 0x4e, 0x7d, 0x94, + 0xda, 0x7d, 0x57, 0xf3, 0x9a, 0x73, 0x25, 0x03, 0x0f, 0xe0, 0x48, 0xc4, 0xc9, 0xbf, 0x93, 0x54, + 0xac, 0x63, 0xa7, 0x75, 0x5d, 0x43, 0xab, 0x8b, 0x2b, 0x1a, 0xba, 0xac, 0x2e, 0xf2, 0x3d, 0x68, + 0x6f, 0xb0, 0xc4, 0x3c, 0x75, 0x0e, 0xae, 0x23, 0xb1, 0xb2, 0x48, 0x82, 0xc4, 0xe5, 0xf6, 0xea, + 0x34, 0x60, 0x8f, 0x2d, 0x52, 0xe7, 0x9b, 0xe7, 0xab, 0x9e, 0xfe, 0x62, 0xd5, 0xd3, 0x7f, 0x5b, + 0xf5, 0xf4, 0x1f, 0x2f, 0x7b, 0xda, 0x8b, 0xcb, 0x9e, 0xf6, 0xeb, 0x65, 0x4f, 0xfb, 0xf6, 0x6e, + 0x4c, 0xf8, 0x7c, 0x31, 0xb3, 0x43, 0x9a, 0x0e, 0x43, 0x9c, 0x60, 0xc6, 0x49, 0x40, 0x8b, 0x78, + 0x73, 0xfe, 0x30, 0xa4, 0x05, 0x1e, 0x96, 0x5f, 0x1e, 0x75, 0xdf, 0x2e, 0xb3, 0x7d, 0x69, 0x3b, + 0xfb, 0x2b, 0x00, 0x00, 0xff, 0xff, 0x3d, 0xcd, 0x6a, 0x5c, 0xda, 0x08, 0x00, 0x00, } func (m *NewRoundStep) Marshal() (dAtA []byte, err error) { diff --git a/proto/tendermint/state/types.pb.go b/proto/tendermint/state/types.pb.go index 6ce6506b98..ba92fa28cf 100644 --- a/proto/tendermint/state/types.pb.go +++ b/proto/tendermint/state/types.pb.go @@ -422,56 +422,56 @@ func init() { func init() { proto.RegisterFile("tendermint/state/types.proto", fileDescriptor_ccfacf933f22bf93) } var fileDescriptor_ccfacf933f22bf93 = []byte{ - // 775 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x95, 0x4d, 0x4f, 0xeb, 0x46, - 0x14, 0x86, 0xe3, 0x06, 0x48, 0x32, 0x26, 0x09, 0x1d, 0xba, 0x30, 0xa1, 0x38, 0x21, 0xfd, 0x10, - 0xaa, 0x54, 0x47, 0xa2, 0xab, 0x4a, 0x15, 0x12, 0x4e, 0xaa, 0x12, 0x09, 0x55, 0x95, 0x41, 0x2c, - 0xba, 0xb1, 0x26, 0xf6, 0x60, 0x5b, 0x75, 0x6c, 0xcb, 0x33, 0x49, 0xa1, 0xfb, 0xee, 0xd9, 0xf6, - 0x1f, 0xb1, 0x64, 0x59, 0x75, 0x41, 0xdb, 0xf0, 0x47, 0xae, 0xe6, 0xc3, 0xce, 0x24, 0xb9, 0x48, - 0x5c, 0xdd, 0xdd, 0x78, 0xce, 0x7b, 0x9e, 0x79, 0xe7, 0xcc, 0x39, 0x32, 0xf8, 0x9c, 0xe2, 0xc4, - 0xc7, 0xf9, 0x34, 0x4a, 0xe8, 0x80, 0x50, 0x44, 0xf1, 0x80, 0xde, 0x67, 0x98, 0x58, 0x59, 0x9e, - 0xd2, 0x14, 0xee, 0x2d, 0xa3, 0x16, 0x8f, 0x76, 0x3e, 0x0b, 0xd2, 0x20, 0xe5, 0xc1, 0x01, 0x5b, - 0x09, 0x5d, 0xe7, 0x50, 0xa1, 0xa0, 0x89, 0x17, 0xa9, 0x90, 0x8e, 0x7a, 0x04, 0xdf, 0x5f, 0x89, - 0xf6, 0x36, 0xa2, 0x73, 0x14, 0x47, 0x3e, 0xa2, 0x69, 0x2e, 0x15, 0x47, 0x1b, 0x8a, 0x0c, 0xe5, - 0x68, 0x5a, 0x00, 0x4c, 0x25, 0x3c, 0xc7, 0x39, 0x89, 0xd2, 0x64, 0xe5, 0x80, 0x6e, 0x90, 0xa6, - 0x41, 0x8c, 0x07, 0xfc, 0x6b, 0x32, 0xbb, 0x1d, 0xd0, 0x68, 0x8a, 0x09, 0x45, 0xd3, 0x4c, 0x08, - 0xfa, 0xff, 0x68, 0xa0, 0x79, 0x6e, 0x0f, 0xc7, 0x0e, 0x26, 0x59, 0x9a, 0x10, 0x4c, 0xe0, 0x10, - 0xe8, 0x3e, 0x8e, 0xa3, 0x39, 0xce, 0x5d, 0x7a, 0x47, 0x0c, 0xad, 0x57, 0x3d, 0xd1, 0x4f, 0xfb, - 0x96, 0x52, 0x0c, 0x76, 0x49, 0xab, 0x48, 0x18, 0x09, 0xed, 0xf5, 0x9d, 0x03, 0xfc, 0x62, 0x49, - 0xe0, 0x19, 0x68, 0xe0, 0xc4, 0x77, 0x27, 0x71, 0xea, 0xfd, 0x66, 0x7c, 0xd2, 0xd3, 0x4e, 0xf4, - 0xd3, 0xe3, 0x57, 0x11, 0x3f, 0x26, 0xbe, 0xcd, 0x84, 0x4e, 0x1d, 0xcb, 0x15, 0x1c, 0x01, 0x7d, - 0x82, 0x83, 0x28, 0x91, 0x84, 0x2a, 0x27, 0x7c, 0xf1, 0x2a, 0xc1, 0x66, 0x5a, 0xc1, 0x00, 0x93, - 0x72, 0xdd, 0xff, 0x53, 0x03, 0xad, 0x9b, 0xa2, 0xa0, 0x64, 0x9c, 0xdc, 0xa6, 0x70, 0x08, 0x9a, - 0x65, 0x89, 0x5d, 0x82, 0xa9, 0xa1, 0x71, 0xb4, 0xa9, 0xa2, 0x45, 0x01, 0xcb, 0xc4, 0x2b, 0x4c, - 0x9d, 0xdd, 0xb9, 0xf2, 0x05, 0x2d, 0xb0, 0x1f, 0x23, 0x42, 0xdd, 0x10, 0x47, 0x41, 0x48, 0x5d, - 0x2f, 0x44, 0x49, 0x80, 0x7d, 0x7e, 0xcf, 0xaa, 0xf3, 0x29, 0x0b, 0x5d, 0xf0, 0xc8, 0x50, 0x04, - 0xfa, 0x7f, 0x69, 0x60, 0x7f, 0xc8, 0x7c, 0x26, 0x64, 0x46, 0x7e, 0xe1, 0xef, 0xc7, 0xcd, 0x38, - 0x60, 0xcf, 0x2b, 0xb6, 0x5d, 0xf1, 0xae, 0xd2, 0xcf, 0xf1, 0xa6, 0x9f, 0x35, 0x80, 0xbd, 0xf5, - 0xf8, 0xdc, 0xad, 0x38, 0x6d, 0x6f, 0x75, 0xfb, 0x83, 0xbd, 0x85, 0xa0, 0x76, 0x23, 0x1a, 0x07, - 0x9e, 0x83, 0x46, 0x49, 0x93, 0x3e, 0x8e, 0x54, 0x1f, 0xb2, 0xc1, 0x96, 0x4e, 0xa4, 0x87, 0x65, - 0x16, 0xec, 0x80, 0x3a, 0x49, 0x6f, 0xe9, 0xef, 0x28, 0xc7, 0xfc, 0xc8, 0x86, 0x53, 0x7e, 0xf7, - 0xff, 0xdf, 0x01, 0xdb, 0x57, 0x6c, 0x8e, 0xe0, 0xf7, 0xa0, 0x26, 0x59, 0xf2, 0x98, 0x03, 0x6b, - 0x7d, 0xd6, 0x2c, 0x69, 0x4a, 0x1e, 0x51, 0xe8, 0xe1, 0xd7, 0xa0, 0xee, 0x85, 0x28, 0x4a, 0xdc, - 0x48, 0xdc, 0xa9, 0x61, 0xeb, 0x8b, 0xe7, 0x6e, 0x6d, 0xc8, 0xf6, 0xc6, 0x23, 0xa7, 0xc6, 0x83, - 0x63, 0x1f, 0x7e, 0x05, 0x5a, 0x51, 0x12, 0xd1, 0x08, 0xc5, 0xb2, 0x12, 0x46, 0x8b, 0x57, 0xa0, - 0x29, 0x77, 0x45, 0x11, 0xe0, 0x37, 0x80, 0x97, 0x44, 0xb4, 0x59, 0xa1, 0xac, 0x72, 0x65, 0x9b, - 0x05, 0x78, 0x1f, 0x49, 0xad, 0x03, 0x9a, 0x8a, 0x36, 0xf2, 0x8d, 0xad, 0x4d, 0xef, 0xe2, 0xa9, - 0x78, 0xd6, 0x78, 0x64, 0xef, 0x33, 0xef, 0x8b, 0xe7, 0xae, 0x7e, 0x59, 0xa0, 0xc6, 0x23, 0x47, - 0x2f, 0xb9, 0x63, 0x1f, 0x5e, 0x82, 0xb6, 0xc2, 0x64, 0xc3, 0x69, 0x6c, 0x73, 0x6a, 0xc7, 0x12, - 0x93, 0x6b, 0x15, 0x93, 0x6b, 0x5d, 0x17, 0x93, 0x6b, 0xd7, 0x19, 0xf6, 0xe1, 0xdf, 0xae, 0xe6, - 0x34, 0x4b, 0x16, 0x8b, 0xc2, 0x9f, 0x40, 0x3b, 0xc1, 0x77, 0xd4, 0x2d, 0x9b, 0x95, 0x18, 0x3b, - 0x6f, 0x6a, 0xef, 0x16, 0x4b, 0x5b, 0x4e, 0x0a, 0x3c, 0x03, 0x40, 0x61, 0xd4, 0xde, 0xc4, 0x50, - 0x32, 0x98, 0x11, 0x7e, 0x2d, 0x05, 0x52, 0x7f, 0x9b, 0x11, 0x96, 0xa6, 0x18, 0x19, 0x02, 0x53, - 0xed, 0xe6, 0x25, 0xaf, 0x6c, 0xec, 0x06, 0x7f, 0xac, 0xc3, 0x65, 0x63, 0x2f, 0xb3, 0x65, 0x8b, - 0xbf, 0x77, 0xcc, 0xc0, 0x47, 0x8e, 0xd9, 0xcf, 0xe0, 0xcb, 0x95, 0x31, 0x5b, 0xe3, 0x97, 0xf6, - 0x74, 0x6e, 0xaf, 0xa7, 0xcc, 0xdd, 0x2a, 0xa8, 0xf0, 0x58, 0x34, 0x62, 0x8e, 0xc9, 0x2c, 0xa6, - 0xc4, 0x0d, 0x11, 0x09, 0x8d, 0xdd, 0x9e, 0x76, 0xb2, 0x2b, 0x1a, 0xd1, 0x11, 0xfb, 0x17, 0x88, - 0x84, 0xf0, 0x00, 0xd4, 0x51, 0x96, 0x09, 0x49, 0x93, 0x4b, 0x6a, 0x28, 0xcb, 0x58, 0xc8, 0xbe, - 0x79, 0x5c, 0x98, 0xda, 0xd3, 0xc2, 0xd4, 0xfe, 0x5b, 0x98, 0xda, 0xc3, 0x8b, 0x59, 0x79, 0x7a, - 0x31, 0x2b, 0x7f, 0xbf, 0x98, 0x95, 0x5f, 0x7f, 0x08, 0x22, 0x1a, 0xce, 0x26, 0x96, 0x97, 0x4e, - 0x07, 0x31, 0xfa, 0xe3, 0x3e, 0xc6, 0x7e, 0x80, 0x73, 0x65, 0xf9, 0xad, 0x97, 0xe6, 0xf2, 0x47, - 0x31, 0x58, 0xff, 0x2f, 0x4e, 0x76, 0xf8, 0xfe, 0x77, 0xef, 0x02, 0x00, 0x00, 0xff, 0xff, 0x42, - 0x7a, 0x07, 0x95, 0x32, 0x07, 0x00, 0x00, + // 776 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x95, 0xcd, 0x6e, 0xeb, 0x44, + 0x14, 0xc7, 0x63, 0x72, 0x6f, 0x93, 0x8c, 0x9b, 0xe4, 0x32, 0x65, 0xe1, 0x9b, 0x4b, 0x9d, 0x34, + 0x7c, 0xa8, 0x42, 0xc2, 0x91, 0xca, 0x0a, 0x21, 0x55, 0xaa, 0x13, 0x44, 0x23, 0x55, 0x08, 0xb9, + 0xa5, 0x0b, 0x36, 0xd6, 0xc4, 0x9e, 0xda, 0x23, 0x1c, 0xdb, 0xf2, 0x4c, 0x42, 0x79, 0x00, 0xf6, + 0xdd, 0xf2, 0x46, 0x5d, 0x76, 0x89, 0x58, 0x14, 0x48, 0x5f, 0x04, 0xcd, 0x87, 0x9d, 0x49, 0x42, + 0xa5, 0xa2, 0xbb, 0x1b, 0xcf, 0xf9, 0x9f, 0xdf, 0xfc, 0xe7, 0xcc, 0x39, 0x32, 0xf8, 0x98, 0xe1, + 0x34, 0xc4, 0xc5, 0x9c, 0xa4, 0x6c, 0x44, 0x19, 0x62, 0x78, 0xc4, 0x7e, 0xcd, 0x31, 0x75, 0xf2, + 0x22, 0x63, 0x19, 0x7c, 0xb3, 0x8e, 0x3a, 0x22, 0xda, 0xfb, 0x28, 0xca, 0xa2, 0x4c, 0x04, 0x47, + 0x7c, 0x25, 0x75, 0xbd, 0x77, 0x1a, 0x05, 0xcd, 0x02, 0xa2, 0x43, 0x7a, 0xfa, 0x11, 0x62, 0x7f, + 0x23, 0x3a, 0xd8, 0x89, 0x2e, 0x51, 0x42, 0x42, 0xc4, 0xb2, 0x42, 0x29, 0x0e, 0x77, 0x14, 0x39, + 0x2a, 0xd0, 0xbc, 0x04, 0xd8, 0x5a, 0x78, 0x89, 0x0b, 0x4a, 0xb2, 0x74, 0xe3, 0x80, 0x7e, 0x94, + 0x65, 0x51, 0x82, 0x47, 0xe2, 0x6b, 0xb6, 0xb8, 0x19, 0x31, 0x32, 0xc7, 0x94, 0xa1, 0x79, 0x2e, + 0x05, 0xc3, 0x3f, 0x0d, 0xd0, 0x3e, 0x73, 0xc7, 0x53, 0x0f, 0xd3, 0x3c, 0x4b, 0x29, 0xa6, 0x70, + 0x0c, 0xcc, 0x10, 0x27, 0x64, 0x89, 0x0b, 0x9f, 0xdd, 0x52, 0xcb, 0x18, 0xd4, 0x8f, 0xcd, 0x93, + 0xa1, 0xa3, 0x15, 0x83, 0x5f, 0xd2, 0x29, 0x13, 0x26, 0x52, 0x7b, 0x75, 0xeb, 0x81, 0xb0, 0x5c, + 0x52, 0x78, 0x0a, 0x5a, 0x38, 0x0d, 0xfd, 0x59, 0x92, 0x05, 0x3f, 0x5b, 0x1f, 0x0c, 0x8c, 0x63, + 0xf3, 0xe4, 0xe8, 0x59, 0xc4, 0xb7, 0x69, 0xe8, 0x72, 0xa1, 0xd7, 0xc4, 0x6a, 0x05, 0x27, 0xc0, + 0x9c, 0xe1, 0x88, 0xa4, 0x8a, 0x50, 0x17, 0x84, 0x4f, 0x9e, 0x25, 0xb8, 0x5c, 0x2b, 0x19, 0x60, + 0x56, 0xad, 0x87, 0xbf, 0x19, 0xa0, 0x73, 0x5d, 0x16, 0x94, 0x4e, 0xd3, 0x9b, 0x0c, 0x8e, 0x41, + 0xbb, 0x2a, 0xb1, 0x4f, 0x31, 0xb3, 0x0c, 0x81, 0xb6, 0x75, 0xb4, 0x2c, 0x60, 0x95, 0x78, 0x89, + 0x99, 0xb7, 0xbf, 0xd4, 0xbe, 0xa0, 0x03, 0x0e, 0x12, 0x44, 0x99, 0x1f, 0x63, 0x12, 0xc5, 0xcc, + 0x0f, 0x62, 0x94, 0x46, 0x38, 0x14, 0xf7, 0xac, 0x7b, 0x1f, 0xf2, 0xd0, 0xb9, 0x88, 0x8c, 0x65, + 0x60, 0xf8, 0xbb, 0x01, 0x0e, 0xc6, 0xdc, 0x67, 0x4a, 0x17, 0xf4, 0x07, 0xf1, 0x7e, 0xc2, 0x8c, + 0x07, 0xde, 0x04, 0xe5, 0xb6, 0x2f, 0xdf, 0x55, 0xf9, 0x39, 0xda, 0xf5, 0xb3, 0x05, 0x70, 0x5f, + 0xdd, 0x3f, 0xf6, 0x6b, 0x5e, 0x37, 0xd8, 0xdc, 0xfe, 0xdf, 0xde, 0x62, 0xd0, 0xb8, 0x96, 0x8d, + 0x03, 0xcf, 0x40, 0xab, 0xa2, 0x29, 0x1f, 0x87, 0xba, 0x0f, 0xd5, 0x60, 0x6b, 0x27, 0xca, 0xc3, + 0x3a, 0x0b, 0xf6, 0x40, 0x93, 0x66, 0x37, 0xec, 0x17, 0x54, 0x60, 0x71, 0x64, 0xcb, 0xab, 0xbe, + 0x87, 0xff, 0xec, 0x81, 0xd7, 0x97, 0x7c, 0x8e, 0xe0, 0xd7, 0xa0, 0xa1, 0x58, 0xea, 0x98, 0xb7, + 0xce, 0xf6, 0xac, 0x39, 0xca, 0x94, 0x3a, 0xa2, 0xd4, 0xc3, 0xcf, 0x41, 0x33, 0x88, 0x11, 0x49, + 0x7d, 0x22, 0xef, 0xd4, 0x72, 0xcd, 0xd5, 0x63, 0xbf, 0x31, 0xe6, 0x7b, 0xd3, 0x89, 0xd7, 0x10, + 0xc1, 0x69, 0x08, 0x3f, 0x03, 0x1d, 0x92, 0x12, 0x46, 0x50, 0xa2, 0x2a, 0x61, 0x75, 0x44, 0x05, + 0xda, 0x6a, 0x57, 0x16, 0x01, 0x7e, 0x01, 0x44, 0x49, 0x64, 0x9b, 0x95, 0xca, 0xba, 0x50, 0x76, + 0x79, 0x40, 0xf4, 0x91, 0xd2, 0x7a, 0xa0, 0xad, 0x69, 0x49, 0x68, 0xbd, 0xda, 0xf5, 0x2e, 0x9f, + 0x4a, 0x64, 0x4d, 0x27, 0xee, 0x01, 0xf7, 0xbe, 0x7a, 0xec, 0x9b, 0x17, 0x25, 0x6a, 0x3a, 0xf1, + 0xcc, 0x8a, 0x3b, 0x0d, 0xe1, 0x05, 0xe8, 0x6a, 0x4c, 0x3e, 0x9c, 0xd6, 0x6b, 0x41, 0xed, 0x39, + 0x72, 0x72, 0x9d, 0x72, 0x72, 0x9d, 0xab, 0x72, 0x72, 0xdd, 0x26, 0xc7, 0xde, 0xfd, 0xd5, 0x37, + 0xbc, 0x76, 0xc5, 0xe2, 0x51, 0xf8, 0x1d, 0xe8, 0xa6, 0xf8, 0x96, 0xf9, 0x55, 0xb3, 0x52, 0x6b, + 0xef, 0x45, 0xed, 0xdd, 0xe1, 0x69, 0xeb, 0x49, 0x81, 0xa7, 0x00, 0x68, 0x8c, 0xc6, 0x8b, 0x18, + 0x5a, 0x06, 0x37, 0x22, 0xae, 0xa5, 0x41, 0x9a, 0x2f, 0x33, 0xc2, 0xd3, 0x34, 0x23, 0x63, 0x60, + 0xeb, 0xdd, 0xbc, 0xe6, 0x55, 0x8d, 0xdd, 0x12, 0x8f, 0xf5, 0x6e, 0xdd, 0xd8, 0xeb, 0x6c, 0xd5, + 0xe2, 0xff, 0x39, 0x66, 0xe0, 0x3d, 0xc7, 0xec, 0x7b, 0xf0, 0xe9, 0xc6, 0x98, 0x6d, 0xf1, 0x2b, + 0x7b, 0xa6, 0xb0, 0x37, 0xd0, 0xe6, 0x6e, 0x13, 0x54, 0x7a, 0x2c, 0x1b, 0xb1, 0xc0, 0x74, 0x91, + 0x30, 0xea, 0xc7, 0x88, 0xc6, 0xd6, 0xfe, 0xc0, 0x38, 0xde, 0x97, 0x8d, 0xe8, 0xc9, 0xfd, 0x73, + 0x44, 0x63, 0xf8, 0x16, 0x34, 0x51, 0x9e, 0x4b, 0x49, 0x5b, 0x48, 0x1a, 0x28, 0xcf, 0x79, 0xc8, + 0xfd, 0xf1, 0x7e, 0x65, 0x1b, 0x0f, 0x2b, 0xdb, 0xf8, 0x7b, 0x65, 0x1b, 0x77, 0x4f, 0x76, 0xed, + 0xe1, 0xc9, 0xae, 0xfd, 0xf1, 0x64, 0xd7, 0x7e, 0xfa, 0x26, 0x22, 0x2c, 0x5e, 0xcc, 0x9c, 0x20, + 0x9b, 0x8f, 0x02, 0x9c, 0x60, 0xca, 0x08, 0xca, 0x8a, 0xa8, 0x5a, 0x7f, 0x19, 0x64, 0x85, 0xfa, + 0x4f, 0x8c, 0xb6, 0x7f, 0x8b, 0xb3, 0x3d, 0xb1, 0xff, 0xd5, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, + 0x41, 0x89, 0xf9, 0xf1, 0x31, 0x07, 0x00, 0x00, } func (m *ABCIResponses) Marshal() (dAtA []byte, err error) { diff --git a/proto/tendermint/types/canonical.pb.go b/proto/tendermint/types/canonical.pb.go index dfeb236a7a..21d582180f 100644 --- a/proto/tendermint/types/canonical.pb.go +++ b/proto/tendermint/types/canonical.pb.go @@ -133,14 +133,13 @@ func (m *CanonicalPartSetHeader) GetHash() []byte { } type CanonicalProposal struct { - Type SignedMsgType `protobuf:"varint,1,opt,name=type,proto3,enum=tendermint.types.SignedMsgType" json:"type,omitempty"` - Height int64 `protobuf:"fixed64,2,opt,name=height,proto3" json:"height,omitempty"` - Round int64 `protobuf:"fixed64,3,opt,name=round,proto3" json:"round,omitempty"` - POLRound int64 `protobuf:"varint,4,opt,name=pol_round,json=polRound,proto3" json:"pol_round,omitempty"` - BlockID *CanonicalBlockID `protobuf:"bytes,5,opt,name=block_id,json=blockId,proto3" json:"block_id,omitempty"` - Timestamp time.Time `protobuf:"bytes,6,opt,name=timestamp,proto3,stdtime" json:"timestamp"` - ChainID string `protobuf:"bytes,7,opt,name=chain_id,json=chainId,proto3" json:"chain_id,omitempty"` - DAHeader *DataAvailabilityHeader `protobuf:"bytes,8,opt,name=da_header,json=daHeader,proto3" json:"da_header,omitempty"` + Type SignedMsgType `protobuf:"varint,1,opt,name=type,proto3,enum=tendermint.types.SignedMsgType" json:"type,omitempty"` + Height int64 `protobuf:"fixed64,2,opt,name=height,proto3" json:"height,omitempty"` + Round int64 `protobuf:"fixed64,3,opt,name=round,proto3" json:"round,omitempty"` + POLRound int64 `protobuf:"varint,4,opt,name=pol_round,json=polRound,proto3" json:"pol_round,omitempty"` + BlockID *CanonicalBlockID `protobuf:"bytes,5,opt,name=block_id,json=blockId,proto3" json:"block_id,omitempty"` + Timestamp time.Time `protobuf:"bytes,6,opt,name=timestamp,proto3,stdtime" json:"timestamp"` + ChainID string `protobuf:"bytes,7,opt,name=chain_id,json=chainId,proto3" json:"chain_id,omitempty"` } func (m *CanonicalProposal) Reset() { *m = CanonicalProposal{} } @@ -225,13 +224,6 @@ func (m *CanonicalProposal) GetChainID() string { return "" } -func (m *CanonicalProposal) GetDAHeader() *DataAvailabilityHeader { - if m != nil { - return m.DAHeader - } - return nil -} - type CanonicalVote struct { Type SignedMsgType `protobuf:"varint,1,opt,name=type,proto3,enum=tendermint.types.SignedMsgType" json:"type,omitempty"` Height int64 `protobuf:"fixed64,2,opt,name=height,proto3" json:"height,omitempty"` @@ -326,41 +318,39 @@ func init() { func init() { proto.RegisterFile("tendermint/types/canonical.proto", fileDescriptor_8d1a1a84ff7267ed) } var fileDescriptor_8d1a1a84ff7267ed = []byte{ - // 533 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x94, 0x3d, 0x6f, 0xd3, 0x40, - 0x18, 0xc7, 0xe3, 0xe6, 0xcd, 0xb9, 0x36, 0x10, 0x4e, 0x55, 0x15, 0x45, 0xc8, 0xb6, 0x32, 0x20, - 0x33, 0x60, 0x4b, 0xed, 0xca, 0x52, 0x37, 0x03, 0x41, 0x20, 0xaa, 0x4b, 0x95, 0x81, 0x25, 0x3a, - 0xfb, 0x0e, 0xfb, 0xc4, 0xc5, 0x67, 0xd9, 0x17, 0xa4, 0x30, 0xf0, 0x19, 0xfa, 0x39, 0x18, 0xf8, - 0x1c, 0x1d, 0x3b, 0x32, 0x05, 0xe4, 0x7c, 0x11, 0xe4, 0xb3, 0xf3, 0xa2, 0x96, 0xb2, 0x80, 0x58, - 0xa2, 0xe7, 0xe5, 0x7f, 0xcf, 0xf3, 0xcf, 0xf3, 0x53, 0x02, 0x2c, 0x49, 0x63, 0x42, 0xd3, 0x39, - 0x8b, 0xa5, 0x2b, 0x97, 0x09, 0xcd, 0xdc, 0x00, 0xc7, 0x22, 0x66, 0x01, 0xe6, 0x4e, 0x92, 0x0a, - 0x29, 0x60, 0x6f, 0xa7, 0x70, 0x94, 0x62, 0x70, 0x1c, 0x8a, 0x50, 0xa8, 0xa6, 0x5b, 0x44, 0xa5, - 0x6e, 0xf0, 0xf4, 0xde, 0x24, 0xf5, 0x59, 0x75, 0xcd, 0x50, 0x88, 0x90, 0x53, 0x57, 0x65, 0xfe, - 0xe2, 0x83, 0x2b, 0xd9, 0x9c, 0x66, 0x12, 0xcf, 0x93, 0x52, 0x30, 0xfc, 0x02, 0x7a, 0x17, 0x9b, - 0xcd, 0x1e, 0x17, 0xc1, 0xc7, 0xf1, 0x08, 0x42, 0xd0, 0x88, 0x70, 0x16, 0xf5, 0x35, 0x4b, 0xb3, - 0x8f, 0x90, 0x8a, 0xe1, 0x14, 0x3c, 0x4e, 0x70, 0x2a, 0x67, 0x19, 0x95, 0xb3, 0x88, 0x62, 0x42, - 0xd3, 0xfe, 0x81, 0xa5, 0xd9, 0x87, 0xa7, 0xb6, 0x73, 0xd7, 0xa8, 0xb3, 0x1d, 0x78, 0x89, 0x53, - 0x39, 0xa1, 0xf2, 0x95, 0xd2, 0x7b, 0x8d, 0x9b, 0x95, 0x59, 0x43, 0xdd, 0x64, 0xbf, 0x38, 0xf4, - 0xc0, 0xc9, 0xef, 0xe5, 0xf0, 0x18, 0x34, 0xa5, 0x90, 0x98, 0x2b, 0x1b, 0x5d, 0x54, 0x26, 0x5b, - 0x6f, 0x07, 0x3b, 0x6f, 0xc3, 0x6f, 0x75, 0xf0, 0x64, 0x37, 0x24, 0x15, 0x89, 0xc8, 0x30, 0x87, - 0x67, 0xa0, 0x51, 0xd8, 0x51, 0xcf, 0x1f, 0x9d, 0x9a, 0xf7, 0x6d, 0x4e, 0x58, 0x18, 0x53, 0xf2, - 0x36, 0x0b, 0xaf, 0x96, 0x09, 0x45, 0x4a, 0x0c, 0x4f, 0x40, 0x2b, 0xa2, 0x2c, 0x8c, 0xa4, 0x5a, - 0xd0, 0x43, 0x55, 0x56, 0x98, 0x49, 0xc5, 0x22, 0x26, 0xfd, 0xba, 0x2a, 0x97, 0x09, 0x7c, 0x0e, - 0x3a, 0x89, 0xe0, 0xb3, 0xb2, 0xd3, 0xb0, 0x34, 0xbb, 0xee, 0x1d, 0xe5, 0x2b, 0x53, 0xbf, 0x7c, - 0xf7, 0x06, 0x15, 0x35, 0xa4, 0x27, 0x82, 0xab, 0x08, 0xbe, 0x06, 0xba, 0x5f, 0x9c, 0x77, 0xc6, - 0x48, 0xbf, 0xa9, 0x0e, 0x37, 0xfc, 0xc3, 0xe1, 0x2a, 0x12, 0xde, 0x61, 0xbe, 0x32, 0xdb, 0x55, - 0x82, 0xda, 0x6a, 0xc0, 0x98, 0x40, 0x0f, 0x74, 0xb6, 0x18, 0xfb, 0x2d, 0x35, 0x6c, 0xe0, 0x94, - 0xa0, 0x9d, 0x0d, 0x68, 0xe7, 0x6a, 0xa3, 0xf0, 0xf4, 0xe2, 0xee, 0xd7, 0x3f, 0x4c, 0x0d, 0xed, - 0x9e, 0xc1, 0x67, 0x40, 0x0f, 0x22, 0xcc, 0xe2, 0xc2, 0x4f, 0xdb, 0xd2, 0xec, 0x4e, 0xb9, 0xeb, - 0xa2, 0xa8, 0x15, 0xbb, 0x54, 0x73, 0x4c, 0xe0, 0x04, 0x74, 0x08, 0xde, 0x10, 0xd7, 0x1f, 0x22, - 0x3e, 0xc2, 0x12, 0x9f, 0x7f, 0xc2, 0x8c, 0x63, 0x9f, 0x71, 0x26, 0x97, 0x15, 0x71, 0x75, 0x8c, - 0xd1, 0x79, 0x99, 0x21, 0x9d, 0xe0, 0x0a, 0xfa, 0xd7, 0x03, 0xd0, 0xdd, 0x7e, 0xd7, 0xa9, 0x90, - 0xf4, 0x7f, 0xc0, 0xda, 0x27, 0xd0, 0xf8, 0x97, 0x04, 0x9a, 0x7f, 0x4f, 0xa0, 0xf5, 0x30, 0x01, - 0x6f, 0x7a, 0x93, 0x1b, 0xda, 0x6d, 0x6e, 0x68, 0x3f, 0x73, 0x43, 0xbb, 0x5e, 0x1b, 0xb5, 0xdb, - 0xb5, 0x51, 0xfb, 0xbe, 0x36, 0x6a, 0xef, 0x5f, 0x86, 0x4c, 0x46, 0x0b, 0xdf, 0x09, 0xc4, 0xdc, - 0xe5, 0xf8, 0xf3, 0x92, 0x53, 0x12, 0xd2, 0x74, 0x2f, 0x7c, 0x11, 0x88, 0xb4, 0xfa, 0xed, 0xbb, - 0x77, 0xff, 0x26, 0xfc, 0x96, 0xaa, 0x9f, 0xfd, 0x0a, 0x00, 0x00, 0xff, 0xff, 0x72, 0x3e, 0x7e, - 0x19, 0x8b, 0x04, 0x00, 0x00, + // 497 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x53, 0xc1, 0x6e, 0xd3, 0x40, + 0x10, 0x8d, 0x53, 0x27, 0x71, 0xb6, 0x0d, 0x84, 0x55, 0x55, 0x59, 0x11, 0xb2, 0x2d, 0x1f, 0x90, + 0x39, 0x60, 0x4b, 0xed, 0x91, 0x9b, 0xcb, 0x81, 0x20, 0x10, 0x95, 0x5b, 0x7a, 0xe0, 0x12, 0x6d, + 0xec, 0xc5, 0xb6, 0x70, 0x3c, 0xd6, 0x7a, 0x73, 0xe8, 0x85, 0x6f, 0xe8, 0x77, 0xf0, 0x25, 0x3d, + 0xf6, 0x08, 0x97, 0x80, 0x9c, 0x1f, 0x41, 0xbb, 0x76, 0x9c, 0xaa, 0x01, 0x2e, 0xa0, 0x5e, 0xac, + 0x99, 0x37, 0xcf, 0x6f, 0x9e, 0xde, 0x68, 0x91, 0xc5, 0x69, 0x1e, 0x51, 0xb6, 0x48, 0x73, 0xee, + 0xf1, 0xab, 0x82, 0x96, 0x5e, 0x48, 0x72, 0xc8, 0xd3, 0x90, 0x64, 0x6e, 0xc1, 0x80, 0x03, 0x1e, + 0x6f, 0x19, 0xae, 0x64, 0x4c, 0x0e, 0x63, 0x88, 0x41, 0x0e, 0x3d, 0x51, 0xd5, 0xbc, 0xc9, 0xd3, + 0x1d, 0x25, 0xf9, 0x6d, 0xa6, 0x66, 0x0c, 0x10, 0x67, 0xd4, 0x93, 0xdd, 0x7c, 0xf9, 0xc9, 0xe3, + 0xe9, 0x82, 0x96, 0x9c, 0x2c, 0x8a, 0x9a, 0x60, 0x7f, 0x41, 0xe3, 0xd3, 0xcd, 0x66, 0x3f, 0x83, + 0xf0, 0xf3, 0xf4, 0x15, 0xc6, 0x48, 0x4d, 0x48, 0x99, 0xe8, 0x8a, 0xa5, 0x38, 0x07, 0x81, 0xac, + 0xf1, 0x25, 0x7a, 0x5c, 0x10, 0xc6, 0x67, 0x25, 0xe5, 0xb3, 0x84, 0x92, 0x88, 0x32, 0xbd, 0x6b, + 0x29, 0xce, 0xfe, 0xb1, 0xe3, 0xde, 0x37, 0xea, 0xb6, 0x82, 0x67, 0x84, 0xf1, 0x73, 0xca, 0x5f, + 0x4b, 0xbe, 0xaf, 0xde, 0xac, 0xcc, 0x4e, 0x30, 0x2a, 0xee, 0x82, 0xb6, 0x8f, 0x8e, 0x7e, 0x4f, + 0xc7, 0x87, 0xa8, 0xc7, 0x81, 0x93, 0x4c, 0xda, 0x18, 0x05, 0x75, 0xd3, 0x7a, 0xeb, 0x6e, 0xbd, + 0xd9, 0xdf, 0xbb, 0xe8, 0xc9, 0x56, 0x84, 0x41, 0x01, 0x25, 0xc9, 0xf0, 0x09, 0x52, 0x85, 0x1d, + 0xf9, 0xfb, 0xa3, 0x63, 0x73, 0xd7, 0xe6, 0x79, 0x1a, 0xe7, 0x34, 0x7a, 0x57, 0xc6, 0x17, 0x57, + 0x05, 0x0d, 0x24, 0x19, 0x1f, 0xa1, 0x7e, 0x42, 0xd3, 0x38, 0xe1, 0x72, 0xc1, 0x38, 0x68, 0x3a, + 0x61, 0x86, 0xc1, 0x32, 0x8f, 0xf4, 0x3d, 0x09, 0xd7, 0x0d, 0x7e, 0x8e, 0x86, 0x05, 0x64, 0xb3, + 0x7a, 0xa2, 0x5a, 0x8a, 0xb3, 0xe7, 0x1f, 0x54, 0x2b, 0x53, 0x3b, 0x7b, 0xff, 0x36, 0x10, 0x58, + 0xa0, 0x15, 0x90, 0xc9, 0x0a, 0xbf, 0x41, 0xda, 0x5c, 0xc4, 0x3b, 0x4b, 0x23, 0xbd, 0x27, 0x83, + 0xb3, 0xff, 0x12, 0x5c, 0x73, 0x09, 0x7f, 0xbf, 0x5a, 0x99, 0x83, 0xa6, 0x09, 0x06, 0x52, 0x60, + 0x1a, 0x61, 0x1f, 0x0d, 0xdb, 0x33, 0xea, 0x7d, 0x29, 0x36, 0x71, 0xeb, 0x43, 0xbb, 0x9b, 0x43, + 0xbb, 0x17, 0x1b, 0x86, 0xaf, 0x89, 0xdc, 0xaf, 0x7f, 0x98, 0x4a, 0xb0, 0xfd, 0x0d, 0x3f, 0x43, + 0x5a, 0x98, 0x90, 0x34, 0x17, 0x7e, 0x06, 0x96, 0xe2, 0x0c, 0xeb, 0x5d, 0xa7, 0x02, 0x13, 0xbb, + 0xe4, 0x70, 0x1a, 0xd9, 0x5f, 0xbb, 0x68, 0xd4, 0xda, 0xba, 0x04, 0x4e, 0x1f, 0x22, 0xd7, 0xbb, + 0x61, 0xa9, 0xff, 0x33, 0xac, 0xde, 0xbf, 0x87, 0xd5, 0xff, 0x73, 0x58, 0xfe, 0x87, 0x9b, 0xca, + 0x50, 0x6e, 0x2b, 0x43, 0xf9, 0x59, 0x19, 0xca, 0xf5, 0xda, 0xe8, 0xdc, 0xae, 0x8d, 0xce, 0xb7, + 0xb5, 0xd1, 0xf9, 0xf8, 0x32, 0x4e, 0x79, 0xb2, 0x9c, 0xbb, 0x21, 0x2c, 0xbc, 0x90, 0x66, 0xb4, + 0xe4, 0x29, 0x01, 0x16, 0xb7, 0xf5, 0x8b, 0x10, 0x58, 0xf3, 0x4a, 0xbd, 0xfb, 0x0f, 0x7a, 0xde, + 0x97, 0xf8, 0xc9, 0xaf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x0b, 0x90, 0xcf, 0xb3, 0x35, 0x04, 0x00, + 0x00, } func (m *CanonicalBlockID) Marshal() (dAtA []byte, err error) { @@ -458,18 +448,6 @@ func (m *CanonicalProposal) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if m.DAHeader != nil { - { - size, err := m.DAHeader.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintCanonical(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x42 - } if len(m.ChainID) > 0 { i -= len(m.ChainID) copy(dAtA[i:], m.ChainID) @@ -477,12 +455,12 @@ func (m *CanonicalProposal) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x3a } - n3, err3 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Timestamp, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Timestamp):]) - if err3 != nil { - return 0, err3 + n2, err2 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Timestamp, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Timestamp):]) + if err2 != nil { + return 0, err2 } - i -= n3 - i = encodeVarintCanonical(dAtA, i, uint64(n3)) + i -= n2 + i = encodeVarintCanonical(dAtA, i, uint64(n2)) i-- dAtA[i] = 0x32 if m.BlockID != nil { @@ -549,12 +527,12 @@ func (m *CanonicalVote) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x32 } - n5, err5 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Timestamp, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Timestamp):]) - if err5 != nil { - return 0, err5 + n4, err4 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Timestamp, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Timestamp):]) + if err4 != nil { + return 0, err4 } - i -= n5 - i = encodeVarintCanonical(dAtA, i, uint64(n5)) + i -= n4 + i = encodeVarintCanonical(dAtA, i, uint64(n4)) i-- dAtA[i] = 0x2a if m.BlockID != nil { @@ -659,10 +637,6 @@ func (m *CanonicalProposal) Size() (n int) { if l > 0 { n += 1 + l + sovCanonical(uint64(l)) } - if m.DAHeader != nil { - l = m.DAHeader.Size() - n += 1 + l + sovCanonical(uint64(l)) - } return n } @@ -1114,42 +1088,6 @@ func (m *CanonicalProposal) Unmarshal(dAtA []byte) error { } m.ChainID = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex - case 8: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field DAHeader", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowCanonical - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthCanonical - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthCanonical - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.DAHeader == nil { - m.DAHeader = &DataAvailabilityHeader{} - } - if err := m.DAHeader.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipCanonical(dAtA[iNdEx:]) diff --git a/proto/tendermint/types/canonical.proto b/proto/tendermint/types/canonical.proto index ff86aa2f57..d643a3c8fa 100644 --- a/proto/tendermint/types/canonical.proto +++ b/proto/tendermint/types/canonical.proto @@ -25,7 +25,6 @@ message CanonicalProposal { CanonicalBlockID block_id = 5 [(gogoproto.customname) = "BlockID"]; google.protobuf.Timestamp timestamp = 6 [(gogoproto.nullable) = false, (gogoproto.stdtime) = true]; string chain_id = 7 [(gogoproto.customname) = "ChainID"]; - DataAvailabilityHeader da_header = 8 [(gogoproto.customname) = "DAHeader"]; } message CanonicalVote { diff --git a/proto/tendermint/types/types.pb.go b/proto/tendermint/types/types.pb.go index 2903453e77..101751ccf3 100644 --- a/proto/tendermint/types/types.pb.go +++ b/proto/tendermint/types/types.pb.go @@ -1231,14 +1231,13 @@ func (m *CommitSig) GetSignature() []byte { } type Proposal struct { - Type SignedMsgType `protobuf:"varint,1,opt,name=type,proto3,enum=tendermint.types.SignedMsgType" json:"type,omitempty"` - Height int64 `protobuf:"varint,2,opt,name=height,proto3" json:"height,omitempty"` - Round int32 `protobuf:"varint,3,opt,name=round,proto3" json:"round,omitempty"` - PolRound int32 `protobuf:"varint,4,opt,name=pol_round,json=polRound,proto3" json:"pol_round,omitempty"` - BlockID BlockID `protobuf:"bytes,5,opt,name=block_id,json=blockId,proto3" json:"block_id"` - Timestamp time.Time `protobuf:"bytes,6,opt,name=timestamp,proto3,stdtime" json:"timestamp"` - Signature []byte `protobuf:"bytes,7,opt,name=signature,proto3" json:"signature,omitempty"` - DAHeader *DataAvailabilityHeader `protobuf:"bytes,8,opt,name=da_header,json=daHeader,proto3" json:"da_header,omitempty"` + Type SignedMsgType `protobuf:"varint,1,opt,name=type,proto3,enum=tendermint.types.SignedMsgType" json:"type,omitempty"` + Height int64 `protobuf:"varint,2,opt,name=height,proto3" json:"height,omitempty"` + Round int32 `protobuf:"varint,3,opt,name=round,proto3" json:"round,omitempty"` + PolRound int32 `protobuf:"varint,4,opt,name=pol_round,json=polRound,proto3" json:"pol_round,omitempty"` + BlockID BlockID `protobuf:"bytes,5,opt,name=block_id,json=blockId,proto3" json:"block_id"` + Timestamp time.Time `protobuf:"bytes,6,opt,name=timestamp,proto3,stdtime" json:"timestamp"` + Signature []byte `protobuf:"bytes,7,opt,name=signature,proto3" json:"signature,omitempty"` } func (m *Proposal) Reset() { *m = Proposal{} } @@ -1323,13 +1322,6 @@ func (m *Proposal) GetSignature() []byte { return nil } -func (m *Proposal) GetDAHeader() *DataAvailabilityHeader { - if m != nil { - return m.DAHeader - } - return nil -} - type SignedHeader struct { Header *Header `protobuf:"bytes,1,opt,name=header,proto3" json:"header,omitempty"` Commit *Commit `protobuf:"bytes,2,opt,name=commit,proto3" json:"commit,omitempty"` @@ -1608,125 +1600,125 @@ func init() { func init() { proto.RegisterFile("tendermint/types/types.proto", fileDescriptor_d3a6e55e2345de56) } var fileDescriptor_d3a6e55e2345de56 = []byte{ - // 1879 bytes of a gzipped FileDescriptorProto + // 1874 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0x4b, 0x6f, 0x1b, 0xc9, - 0x11, 0xd6, 0xf0, 0x21, 0x92, 0x45, 0x52, 0xa2, 0x3a, 0x92, 0x4c, 0xc9, 0x36, 0xc5, 0x30, 0x8f, - 0xd5, 0xbe, 0x28, 0xc7, 0x1b, 0xe4, 0x01, 0x6c, 0x16, 0x4b, 0x4a, 0x5a, 0x9b, 0x59, 0x3d, 0x88, - 0xa1, 0x56, 0x79, 0x5c, 0x06, 0x4d, 0x4e, 0x9b, 0x9c, 0x78, 0x38, 0x3d, 0x98, 0x6e, 0xca, 0x92, - 0x8f, 0x39, 0x6d, 0x74, 0xf2, 0x1f, 0x10, 0x72, 0x48, 0x0e, 0xf9, 0x29, 0x7b, 0x09, 0xb0, 0xb7, - 0xe4, 0x12, 0x27, 0x91, 0x73, 0x08, 0x90, 0x3f, 0x11, 0xf4, 0x63, 0x86, 0x43, 0x91, 0x74, 0x1c, - 0x43, 0xd8, 0x0b, 0xc1, 0xae, 0xfa, 0xaa, 0xba, 0xaa, 0xba, 0xaa, 0xba, 0x7a, 0xe0, 0x1e, 0x27, - 0x9e, 0x4d, 0x82, 0xa1, 0xe3, 0xf1, 0x1d, 0x7e, 0xe1, 0x13, 0xa6, 0x7e, 0xeb, 0x7e, 0x40, 0x39, - 0x45, 0xa5, 0x31, 0xb7, 0x2e, 0xe9, 0x9b, 0xab, 0x7d, 0xda, 0xa7, 0x92, 0xb9, 0x23, 0xfe, 0x29, - 0xdc, 0xe6, 0x56, 0x9f, 0xd2, 0xbe, 0x4b, 0x76, 0xe4, 0xaa, 0x3b, 0x7a, 0xb2, 0xc3, 0x9d, 0x21, - 0x61, 0x1c, 0x0f, 0x7d, 0x0d, 0xb8, 0x1f, 0xdb, 0xa6, 0x17, 0x5c, 0xf8, 0x9c, 0x0a, 0x2c, 0x7d, - 0xa2, 0xd9, 0x95, 0x18, 0xfb, 0x8c, 0x04, 0xcc, 0xa1, 0x5e, 0xdc, 0x8e, 0xcd, 0xea, 0x94, 0x95, - 0x67, 0xd8, 0x75, 0x6c, 0xcc, 0x69, 0xa0, 0x10, 0xb5, 0x9f, 0x42, 0xb1, 0x8d, 0x03, 0xde, 0x21, - 0xfc, 0x31, 0xc1, 0x36, 0x09, 0xd0, 0x2a, 0xa4, 0x39, 0xe5, 0xd8, 0x2d, 0x1b, 0x55, 0x63, 0xbb, - 0x68, 0xaa, 0x05, 0x42, 0x90, 0x1a, 0x60, 0x36, 0x28, 0x27, 0xaa, 0xc6, 0x76, 0xc1, 0x94, 0xff, - 0x6b, 0x03, 0x48, 0x09, 0x51, 0x21, 0xe1, 0x78, 0x36, 0x39, 0x0f, 0x25, 0xe4, 0x42, 0x50, 0xbb, - 0x17, 0x9c, 0x30, 0x2d, 0xa2, 0x16, 0xe8, 0x87, 0x90, 0x96, 0xf6, 0x97, 0x93, 0x55, 0x63, 0x3b, - 0xff, 0xb0, 0x5c, 0x8f, 0x05, 0x4a, 0xf9, 0x57, 0x6f, 0x0b, 0x7e, 0x33, 0xf5, 0xd5, 0xcb, 0xad, - 0x05, 0x53, 0x81, 0x6b, 0x2e, 0x64, 0x9a, 0x2e, 0xed, 0x3d, 0x6d, 0xed, 0x45, 0x86, 0x18, 0x63, - 0x43, 0xd0, 0x21, 0x2c, 0xfb, 0x38, 0xe0, 0x16, 0x23, 0xdc, 0x1a, 0x48, 0x2f, 0xe4, 0xa6, 0xf9, - 0x87, 0x5b, 0xf5, 0x9b, 0xe7, 0x50, 0x9f, 0x70, 0x56, 0xef, 0x52, 0xf4, 0xe3, 0xc4, 0xda, 0xef, - 0xd3, 0xb0, 0xa8, 0x83, 0xf1, 0x33, 0xc8, 0xe8, 0xb0, 0xca, 0x0d, 0xf3, 0x0f, 0xef, 0xc7, 0x35, - 0x6a, 0x56, 0x7d, 0x97, 0x7a, 0x8c, 0x78, 0x6c, 0xc4, 0xb4, 0xbe, 0x50, 0x06, 0x7d, 0x1f, 0xb2, - 0xbd, 0x01, 0x76, 0x3c, 0xcb, 0xb1, 0xa5, 0x45, 0xb9, 0x66, 0xfe, 0xfa, 0xe5, 0x56, 0x66, 0x57, - 0xd0, 0x5a, 0x7b, 0x66, 0x46, 0x32, 0x5b, 0x36, 0x5a, 0x87, 0xc5, 0x01, 0x71, 0xfa, 0x03, 0x2e, - 0xc3, 0x92, 0x34, 0xf5, 0x0a, 0xfd, 0x04, 0x52, 0x22, 0x21, 0xca, 0x29, 0xb9, 0xf7, 0x66, 0x5d, - 0x65, 0x4b, 0x3d, 0xcc, 0x96, 0xfa, 0x49, 0x98, 0x2d, 0xcd, 0xac, 0xd8, 0xf8, 0xc5, 0xdf, 0xb7, - 0x0c, 0x53, 0x4a, 0xa0, 0x5d, 0x28, 0xba, 0x98, 0x71, 0xab, 0x2b, 0xc2, 0x26, 0xb6, 0x4f, 0x4b, - 0x15, 0x1b, 0xd3, 0x01, 0xd1, 0x81, 0xd5, 0xa6, 0xe7, 0x85, 0x94, 0x22, 0xd9, 0x68, 0x1b, 0x4a, - 0x52, 0x49, 0x8f, 0x0e, 0x87, 0x0e, 0xb7, 0x64, 0xdc, 0x17, 0x65, 0xdc, 0x97, 0x04, 0x7d, 0x57, - 0x92, 0x1f, 0x8b, 0x13, 0xf8, 0x31, 0x94, 0xbd, 0xd1, 0xd0, 0xa2, 0x81, 0xd3, 0x77, 0x3c, 0xec, - 0x5a, 0x36, 0xe6, 0xd8, 0x62, 0x03, 0x1c, 0x10, 0x56, 0xce, 0x54, 0x8d, 0xed, 0x94, 0xb9, 0xe6, - 0x8d, 0x86, 0xc7, 0x9a, 0xbd, 0x87, 0x39, 0xee, 0x48, 0x26, 0xba, 0x0b, 0x39, 0x89, 0x95, 0xba, - 0xb3, 0x52, 0x77, 0x56, 0x10, 0xa4, 0xd6, 0x77, 0x60, 0x39, 0x4a, 0x57, 0xa6, 0x20, 0x39, 0xb5, - 0xfd, 0x98, 0x2c, 0x81, 0x0f, 0x60, 0xd5, 0x23, 0xe7, 0xdc, 0xba, 0x89, 0x06, 0x89, 0x46, 0x82, - 0x77, 0x3a, 0x29, 0xf1, 0x3d, 0x58, 0xea, 0x85, 0xa7, 0xa6, 0xb0, 0x79, 0x89, 0x2d, 0x46, 0x54, - 0x09, 0xdb, 0x80, 0x2c, 0xf6, 0x7d, 0x05, 0x28, 0x48, 0x40, 0x06, 0xfb, 0xbe, 0x64, 0xbd, 0x07, - 0x2b, 0x32, 0x38, 0x01, 0x61, 0x23, 0x97, 0x6b, 0x25, 0x45, 0x89, 0x59, 0x16, 0x0c, 0x53, 0xd1, - 0x25, 0xf6, 0x3b, 0x50, 0x24, 0x67, 0x8e, 0x4d, 0xbc, 0x1e, 0x51, 0xb8, 0x25, 0x89, 0x2b, 0x84, - 0x44, 0x09, 0x7a, 0x17, 0x4a, 0x7e, 0x40, 0x7d, 0xca, 0x48, 0x60, 0x61, 0xdb, 0x0e, 0x08, 0x63, - 0xe5, 0x65, 0xa5, 0x2f, 0xa4, 0x37, 0x14, 0xb9, 0xf6, 0xdb, 0x04, 0xa4, 0x44, 0x10, 0x51, 0x09, - 0x92, 0xfc, 0x9c, 0x95, 0x8d, 0x6a, 0x72, 0xbb, 0x60, 0x8a, 0xbf, 0x68, 0x00, 0x65, 0xc7, 0xe3, - 0x24, 0x18, 0x12, 0xdb, 0xc1, 0x9c, 0x58, 0x8c, 0x8b, 0xdf, 0x80, 0x52, 0xce, 0x74, 0x51, 0x6c, - 0x4f, 0xe7, 0x40, 0x2b, 0x26, 0xd1, 0x11, 0x02, 0xa6, 0xc0, 0xeb, 0x94, 0x58, 0x77, 0x66, 0x72, - 0xd1, 0xa7, 0x90, 0x0d, 0xed, 0xd7, 0xd5, 0x5c, 0x99, 0xd6, 0xbc, 0xaf, 0x11, 0x07, 0x0e, 0xe3, - 0x5a, 0x5f, 0x24, 0x85, 0x3e, 0x86, 0xec, 0x90, 0x30, 0x86, 0xfb, 0x84, 0x45, 0x29, 0x3e, 0xa5, - 0xe1, 0x50, 0x23, 0x42, 0xe9, 0x50, 0xa2, 0xf6, 0x2f, 0x03, 0xb2, 0xa1, 0x7a, 0x84, 0xe1, 0x8e, - 0x3d, 0xf2, 0x5d, 0xa7, 0x27, 0xbc, 0x3d, 0xa3, 0x9c, 0x58, 0x91, 0x6d, 0xaa, 0x70, 0xdf, 0x99, - 0xd6, 0xbc, 0x17, 0x0a, 0x9c, 0x52, 0x4e, 0x42, 0x4d, 0x8f, 0x17, 0xcc, 0x35, 0x7b, 0x16, 0x03, - 0x79, 0x70, 0xcf, 0x15, 0x55, 0x69, 0xf5, 0x5c, 0x87, 0x78, 0xdc, 0xc2, 0x9c, 0xe3, 0xde, 0xd3, - 0xf1, 0x3e, 0x2a, 0xba, 0xef, 0x4f, 0xef, 0x73, 0x20, 0xa4, 0x76, 0xa5, 0x50, 0x43, 0xca, 0xc4, - 0xf6, 0xda, 0x70, 0xe7, 0x31, 0x9b, 0x69, 0x48, 0xb2, 0xd1, 0xb0, 0xf6, 0x22, 0x01, 0x6b, 0x33, - 0x2d, 0x45, 0x1f, 0xc2, 0xa2, 0xf4, 0x14, 0x6b, 0x17, 0xd7, 0xa7, 0xb7, 0x16, 0x78, 0x33, 0x2d, - 0x50, 0x8d, 0x08, 0xde, 0xd5, 0x96, 0xbe, 0x16, 0xde, 0x44, 0x1f, 0x00, 0x92, 0xad, 0x5f, 0x44, - 0xd3, 0xf1, 0xfa, 0x96, 0x4f, 0x9f, 0x91, 0x40, 0xf7, 0xa7, 0x92, 0xe4, 0x9c, 0x4a, 0x46, 0x5b, - 0xd0, 0x27, 0x4a, 0x55, 0x43, 0x53, 0x12, 0x3a, 0x2e, 0x55, 0x05, 0x6c, 0x42, 0x2e, 0xba, 0xe3, - 0x74, 0x53, 0x7a, 0xb3, 0xbe, 0x36, 0x16, 0xab, 0xfd, 0x39, 0x01, 0x1b, 0x73, 0x83, 0x8a, 0x5a, - 0xb0, 0xd2, 0xa3, 0xde, 0x13, 0xd7, 0xe9, 0x49, 0xbb, 0x65, 0x07, 0xd4, 0x11, 0xba, 0x37, 0xe7, - 0x70, 0x64, 0xc3, 0x33, 0x4b, 0x31, 0x31, 0x49, 0x11, 0x75, 0x2b, 0x7a, 0x1f, 0xf5, 0x2c, 0xdd, - 0x9e, 0x13, 0xd2, 0xa7, 0x82, 0x22, 0x3e, 0x56, 0x4d, 0xfa, 0x08, 0x56, 0xbb, 0x17, 0xcf, 0xb1, - 0xc7, 0x1d, 0x8f, 0xc4, 0x3a, 0x50, 0x39, 0x59, 0x4d, 0x6e, 0xe7, 0x1f, 0xde, 0x9d, 0x11, 0xe5, - 0x10, 0x63, 0x7e, 0x2b, 0x12, 0x1c, 0xb7, 0xa7, 0x39, 0x81, 0x4f, 0xcd, 0x09, 0xfc, 0x6d, 0xc4, - 0xf3, 0x00, 0x0a, 0xf1, 0x3a, 0x15, 0x75, 0x19, 0xab, 0x9e, 0xe4, 0xec, 0xba, 0x8c, 0xf2, 0xf4, - 0x46, 0x55, 0xd7, 0x3e, 0x81, 0xf5, 0xd9, 0xfd, 0x04, 0x7d, 0x17, 0x96, 0x02, 0xfc, 0x4c, 0x35, - 0x23, 0xcb, 0x75, 0x18, 0xd7, 0x8d, 0xab, 0x10, 0xe0, 0x67, 0x12, 0x21, 0x76, 0xaf, 0xfd, 0x1c, - 0xb2, 0x61, 0xcd, 0xa3, 0x4f, 0xa0, 0x18, 0xd6, 0xfb, 0x58, 0x60, 0xe6, 0x35, 0xa6, 0x45, 0xcc, - 0x42, 0x88, 0x97, 0xba, 0x3e, 0x85, 0x8c, 0x66, 0xa0, 0x6f, 0x43, 0xc1, 0xc3, 0x43, 0xc2, 0x7c, - 0xdc, 0x23, 0xe2, 0x42, 0x54, 0x03, 0x44, 0x3e, 0xa2, 0xb5, 0x6c, 0x31, 0x5b, 0x88, 0xbb, 0x27, - 0x1c, 0x72, 0xc4, 0xff, 0xda, 0x2f, 0x61, 0x5d, 0x74, 0xda, 0xc6, 0x19, 0x76, 0x5c, 0xdc, 0x75, - 0x5c, 0x87, 0x5f, 0xe8, 0xd9, 0xe0, 0x2e, 0xe4, 0x02, 0xaa, 0xbd, 0xd1, 0x8e, 0x64, 0x03, 0xaa, - 0x1c, 0x11, 0xbb, 0xf5, 0xa8, 0x3b, 0x1a, 0x7a, 0x51, 0xeb, 0x15, 0xfc, 0xbc, 0xa2, 0x49, 0x48, - 0xed, 0xdf, 0x09, 0x48, 0x89, 0x82, 0x43, 0x1f, 0x41, 0x4a, 0xf8, 0x20, 0x2d, 0x5a, 0x9a, 0x35, - 0xb3, 0x74, 0x9c, 0xbe, 0x47, 0xec, 0x43, 0xd6, 0x3f, 0xb9, 0xf0, 0x89, 0x29, 0xc1, 0xb1, 0x91, - 0x21, 0x31, 0x31, 0x32, 0xac, 0x42, 0x3a, 0xa0, 0x23, 0xcf, 0x96, 0x95, 0x9a, 0x36, 0xd5, 0x02, - 0xed, 0x43, 0x36, 0x9a, 0x04, 0x52, 0xff, 0x6b, 0x12, 0x58, 0x16, 0x07, 0x2a, 0xe6, 0x14, 0x4d, - 0x30, 0x33, 0x5d, 0x3d, 0x10, 0xdc, 0x42, 0xb2, 0xa1, 0xf7, 0x61, 0x65, 0xdc, 0x29, 0xc2, 0x7b, - 0x4e, 0x4d, 0x15, 0xa5, 0x88, 0xa1, 0x2f, 0xba, 0xc9, 0xb6, 0xa2, 0x86, 0xcc, 0x8c, 0xf4, 0x6b, - 0xdc, 0x56, 0x5a, 0x72, 0xda, 0xbc, 0x07, 0x39, 0xe6, 0xf4, 0x3d, 0xcc, 0x47, 0x01, 0xd1, 0x73, - 0xc4, 0x98, 0x50, 0xfb, 0xa7, 0x01, 0x8b, 0x6a, 0x5a, 0x89, 0xc5, 0xcd, 0x98, 0x1d, 0xb7, 0xc4, - 0xbc, 0xb8, 0x25, 0xdf, 0x3e, 0x6e, 0x0d, 0x80, 0xc8, 0x18, 0x71, 0xd5, 0xcd, 0x69, 0x0c, 0xca, - 0xc4, 0x8e, 0xd3, 0xd7, 0x35, 0x15, 0x13, 0x42, 0x5b, 0x90, 0x57, 0xa3, 0xad, 0x1a, 0x20, 0xd2, - 0xd2, 0x45, 0x50, 0x24, 0x31, 0x3e, 0xd4, 0xfe, 0x66, 0x40, 0x2e, 0x52, 0x80, 0x1a, 0x50, 0x0c, - 0x0d, 0xb7, 0x9e, 0xb8, 0xb8, 0xaf, 0x93, 0xeb, 0xfe, 0x5c, 0xeb, 0x3f, 0x73, 0x71, 0xdf, 0xcc, - 0x6b, 0x83, 0xc5, 0x62, 0xf6, 0x41, 0x25, 0xe6, 0x1c, 0xd4, 0x44, 0x66, 0x24, 0xdf, 0x2e, 0x33, - 0x26, 0xce, 0x30, 0x75, 0xf3, 0x0c, 0xbf, 0x4c, 0x42, 0xb6, 0x2d, 0xe7, 0x20, 0xec, 0x7e, 0x13, - 0x25, 0x73, 0x17, 0x72, 0x3e, 0x75, 0x2d, 0xc5, 0x49, 0x49, 0x4e, 0xd6, 0xa7, 0xae, 0x39, 0x95, - 0x17, 0xe9, 0x5b, 0xaa, 0xa7, 0xc5, 0x5b, 0x88, 0x5a, 0xe6, 0x46, 0xd4, 0x50, 0x47, 0xcc, 0xd7, - 0xe1, 0xa3, 0x28, 0x3b, 0x6f, 0xfe, 0x9b, 0xdd, 0xe1, 0x9a, 0x85, 0xeb, 0x97, 0x5b, 0xd9, 0xbd, - 0x86, 0x5a, 0x89, 0xb9, 0x5c, 0x3f, 0x90, 0x02, 0x28, 0xa8, 0xf8, 0xea, 0x4e, 0xf8, 0x40, 0x04, - 0x56, 0xee, 0x60, 0x4c, 0xbf, 0xea, 0xd4, 0x0e, 0x5a, 0x87, 0xc6, 0x09, 0x09, 0xf5, 0xa8, 0xd0, - 0xb3, 0x48, 0x79, 0x5e, 0x31, 0x98, 0x1a, 0x57, 0xfb, 0x8f, 0x01, 0x30, 0xbe, 0xab, 0xc5, 0xfb, - 0x86, 0x49, 0x13, 0xac, 0x89, 0x9d, 0x2b, 0xf3, 0x32, 0x41, 0xef, 0x5f, 0x60, 0x71, 0xbb, 0x77, - 0xa1, 0x38, 0xce, 0x70, 0x46, 0x42, 0x63, 0x2a, 0xaf, 0xb9, 0xb2, 0x3b, 0x84, 0x9b, 0x85, 0xb3, - 0xd8, 0x6a, 0x32, 0xc2, 0xc9, 0x5b, 0x8a, 0xf0, 0xef, 0x12, 0x90, 0x93, 0x8e, 0x1e, 0x12, 0x8e, - 0x27, 0xb2, 0xcd, 0x78, 0xfb, 0x6c, 0xbb, 0x0f, 0xa0, 0xd4, 0x30, 0xe7, 0x39, 0xd1, 0x35, 0x90, - 0x93, 0x94, 0x8e, 0xf3, 0x9c, 0xa0, 0x1f, 0x45, 0xa7, 0x98, 0x7c, 0xfd, 0x29, 0xea, 0xee, 0x14, - 0x9e, 0xe5, 0x1d, 0xc8, 0x88, 0xb7, 0x9f, 0x78, 0x87, 0xa8, 0x21, 0x65, 0xd1, 0x1b, 0x0d, 0x4f, - 0xce, 0x19, 0xda, 0x8f, 0x47, 0x26, 0xfd, 0xff, 0x45, 0x26, 0x16, 0x8b, 0xdf, 0x40, 0xe6, 0xe4, - 0x5c, 0x7e, 0x14, 0x50, 0x57, 0x2e, 0xd5, 0x2f, 0x51, 0x75, 0x81, 0x67, 0x05, 0x41, 0xbe, 0x9f, - 0x66, 0xdc, 0xde, 0xa8, 0xfe, 0x86, 0x9f, 0x1b, 0xf4, 0x87, 0x86, 0xf7, 0xfe, 0x62, 0x40, 0x3e, - 0xd6, 0x10, 0xd1, 0x0f, 0x60, 0xad, 0x79, 0x70, 0xbc, 0xfb, 0xb9, 0xd5, 0xda, 0xb3, 0x3e, 0x3b, - 0x68, 0x3c, 0xb2, 0xbe, 0x38, 0xfa, 0xfc, 0xe8, 0xf8, 0x17, 0x47, 0xa5, 0x85, 0xcd, 0xf5, 0xcb, - 0xab, 0x2a, 0x8a, 0x61, 0xbf, 0xf0, 0x9e, 0x7a, 0xf4, 0x99, 0x87, 0x76, 0x60, 0x75, 0x52, 0xa4, - 0xd1, 0xec, 0xec, 0x1f, 0x9d, 0x94, 0x8c, 0xcd, 0xb5, 0xcb, 0xab, 0xea, 0x4a, 0x4c, 0xa2, 0xd1, - 0x65, 0xc4, 0xe3, 0xd3, 0x02, 0xbb, 0xc7, 0x87, 0x87, 0xad, 0x93, 0x52, 0x62, 0x4a, 0x40, 0x5f, - 0x61, 0xef, 0xc2, 0xca, 0xa4, 0xc0, 0x51, 0xeb, 0xa0, 0x94, 0xdc, 0x44, 0x97, 0x57, 0xd5, 0xa5, - 0x18, 0xfa, 0xc8, 0x71, 0x37, 0xb3, 0x5f, 0xfe, 0xa1, 0xb2, 0xf0, 0xa7, 0x3f, 0x56, 0x0c, 0xe1, - 0x59, 0x71, 0xa2, 0x29, 0xa2, 0x0f, 0xe0, 0x4e, 0xa7, 0xf5, 0xe8, 0x68, 0x7f, 0xcf, 0x3a, 0xec, - 0x3c, 0xb2, 0x4e, 0x7e, 0xd5, 0xde, 0x8f, 0x79, 0xb7, 0x7c, 0x79, 0x55, 0xcd, 0x6b, 0x97, 0xe6, - 0xa1, 0xdb, 0xe6, 0xfe, 0xe9, 0xf1, 0xc9, 0x7e, 0xc9, 0x50, 0xe8, 0x76, 0x40, 0xc4, 0xcb, 0x41, - 0xa2, 0x1f, 0xc0, 0xc6, 0x0c, 0x74, 0xe4, 0xd8, 0xca, 0xe5, 0x55, 0xb5, 0xd8, 0x0e, 0x88, 0xaa, - 0x6d, 0x29, 0x51, 0x87, 0xf2, 0xb4, 0xc4, 0x71, 0xfb, 0xb8, 0xd3, 0x38, 0x28, 0x55, 0x37, 0x4b, - 0x97, 0x57, 0xd5, 0x42, 0xd8, 0xfd, 0x05, 0x7e, 0xec, 0x59, 0xf3, 0xf4, 0xab, 0xeb, 0x8a, 0xf1, - 0xf5, 0x75, 0xc5, 0xf8, 0xc7, 0x75, 0xc5, 0x78, 0xf1, 0xaa, 0xb2, 0xf0, 0xf5, 0xab, 0xca, 0xc2, - 0x5f, 0x5f, 0x55, 0x16, 0x7e, 0xfd, 0x71, 0xdf, 0xe1, 0x83, 0x51, 0xb7, 0xde, 0xa3, 0xc3, 0x1d, - 0x17, 0x3f, 0xbf, 0x70, 0x89, 0xdd, 0x27, 0x41, 0xec, 0xef, 0x87, 0x3d, 0x1a, 0xe8, 0x8f, 0x6f, - 0x3b, 0x37, 0xbf, 0x94, 0x75, 0x17, 0x25, 0xfd, 0xa3, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0xfb, - 0xec, 0xf0, 0x8b, 0xea, 0x13, 0x00, 0x00, + 0x11, 0xd6, 0xf0, 0x21, 0x92, 0x45, 0x52, 0xa2, 0x3a, 0x92, 0x4c, 0xd1, 0x36, 0xc5, 0x30, 0x8f, + 0xd5, 0xbe, 0x28, 0xc7, 0x1b, 0xe4, 0x81, 0x24, 0x8b, 0x25, 0x25, 0xad, 0xcd, 0xac, 0x1e, 0xc4, + 0x50, 0x76, 0x1e, 0x97, 0x41, 0x93, 0xd3, 0x26, 0x27, 0x1e, 0x4e, 0x0f, 0xa6, 0x9b, 0xb2, 0xe4, + 0x63, 0x4e, 0x89, 0x4e, 0xfe, 0x03, 0x42, 0x0e, 0xc9, 0x21, 0xf7, 0xfc, 0x89, 0xbd, 0x04, 0xd8, + 0x5b, 0x72, 0x89, 0x93, 0xc8, 0x39, 0x04, 0xc8, 0x9f, 0x08, 0xfa, 0x31, 0xc3, 0xa1, 0x48, 0x3a, + 0x1b, 0xc3, 0xd8, 0x0b, 0x31, 0x5d, 0xf5, 0x55, 0x75, 0x55, 0x75, 0x55, 0x75, 0x35, 0xe1, 0x0e, + 0x27, 0x9e, 0x4d, 0x82, 0x91, 0xe3, 0xf1, 0x5d, 0x7e, 0xe1, 0x13, 0xa6, 0x7e, 0x1b, 0x7e, 0x40, + 0x39, 0x45, 0xa5, 0x09, 0xb7, 0x21, 0xe9, 0x95, 0xf5, 0x01, 0x1d, 0x50, 0xc9, 0xdc, 0x15, 0x5f, + 0x0a, 0x57, 0xd9, 0x1e, 0x50, 0x3a, 0x70, 0xc9, 0xae, 0x5c, 0xf5, 0xc6, 0x4f, 0x76, 0xb9, 0x33, + 0x22, 0x8c, 0xe3, 0x91, 0xaf, 0x01, 0x77, 0x63, 0xdb, 0xf4, 0x83, 0x0b, 0x9f, 0x53, 0x81, 0xa5, + 0x4f, 0x34, 0xbb, 0x1a, 0x63, 0x9f, 0x91, 0x80, 0x39, 0xd4, 0x8b, 0xdb, 0x51, 0xa9, 0xcd, 0x58, + 0x79, 0x86, 0x5d, 0xc7, 0xc6, 0x9c, 0x06, 0x0a, 0x51, 0xff, 0x21, 0x14, 0x3b, 0x38, 0xe0, 0x5d, + 0xc2, 0x1f, 0x12, 0x6c, 0x93, 0x00, 0xad, 0x43, 0x9a, 0x53, 0x8e, 0xdd, 0xb2, 0x51, 0x33, 0x76, + 0x8a, 0xa6, 0x5a, 0x20, 0x04, 0xa9, 0x21, 0x66, 0xc3, 0x72, 0xa2, 0x66, 0xec, 0x14, 0x4c, 0xf9, + 0x5d, 0x1f, 0x42, 0x4a, 0x88, 0x0a, 0x09, 0xc7, 0xb3, 0xc9, 0x79, 0x28, 0x21, 0x17, 0x82, 0xda, + 0xbb, 0xe0, 0x84, 0x69, 0x11, 0xb5, 0x40, 0xdf, 0x85, 0xb4, 0xb4, 0xbf, 0x9c, 0xac, 0x19, 0x3b, + 0xf9, 0xfb, 0xe5, 0x46, 0x2c, 0x50, 0xca, 0xbf, 0x46, 0x47, 0xf0, 0x5b, 0xa9, 0xcf, 0x5f, 0x6e, + 0x2f, 0x99, 0x0a, 0x5c, 0x77, 0x21, 0xd3, 0x72, 0x69, 0xff, 0x69, 0x7b, 0x3f, 0x32, 0xc4, 0x98, + 0x18, 0x82, 0x8e, 0x60, 0xd5, 0xc7, 0x01, 0xb7, 0x18, 0xe1, 0xd6, 0x50, 0x7a, 0x21, 0x37, 0xcd, + 0xdf, 0xdf, 0x6e, 0xdc, 0x3c, 0x87, 0xc6, 0x94, 0xb3, 0x7a, 0x97, 0xa2, 0x1f, 0x27, 0xd6, 0x7f, + 0x97, 0x86, 0x65, 0x1d, 0x8c, 0x9f, 0x40, 0x46, 0x87, 0x55, 0x6e, 0x98, 0xbf, 0x7f, 0x37, 0xae, + 0x51, 0xb3, 0x1a, 0x7b, 0xd4, 0x63, 0xc4, 0x63, 0x63, 0xa6, 0xf5, 0x85, 0x32, 0xe8, 0xdb, 0x90, + 0xed, 0x0f, 0xb1, 0xe3, 0x59, 0x8e, 0x2d, 0x2d, 0xca, 0xb5, 0xf2, 0xd7, 0x2f, 0xb7, 0x33, 0x7b, + 0x82, 0xd6, 0xde, 0x37, 0x33, 0x92, 0xd9, 0xb6, 0xd1, 0x26, 0x2c, 0x0f, 0x89, 0x33, 0x18, 0x72, + 0x19, 0x96, 0xa4, 0xa9, 0x57, 0xe8, 0x07, 0x90, 0x12, 0x09, 0x51, 0x4e, 0xc9, 0xbd, 0x2b, 0x0d, + 0x95, 0x2d, 0x8d, 0x30, 0x5b, 0x1a, 0xa7, 0x61, 0xb6, 0xb4, 0xb2, 0x62, 0xe3, 0x17, 0x7f, 0xdf, + 0x36, 0x4c, 0x29, 0x81, 0xf6, 0xa0, 0xe8, 0x62, 0xc6, 0xad, 0x9e, 0x08, 0x9b, 0xd8, 0x3e, 0x2d, + 0x55, 0x6c, 0xcd, 0x06, 0x44, 0x07, 0x56, 0x9b, 0x9e, 0x17, 0x52, 0x8a, 0x64, 0xa3, 0x1d, 0x28, + 0x49, 0x25, 0x7d, 0x3a, 0x1a, 0x39, 0xdc, 0x92, 0x71, 0x5f, 0x96, 0x71, 0x5f, 0x11, 0xf4, 0x3d, + 0x49, 0x7e, 0x28, 0x4e, 0xe0, 0xfb, 0x50, 0xf6, 0xc6, 0x23, 0x8b, 0x06, 0xce, 0xc0, 0xf1, 0xb0, + 0x6b, 0xd9, 0x98, 0x63, 0x8b, 0x0d, 0x71, 0x40, 0x58, 0x39, 0x53, 0x33, 0x76, 0x52, 0xe6, 0x86, + 0x37, 0x1e, 0x9d, 0x68, 0xf6, 0x3e, 0xe6, 0xb8, 0x2b, 0x99, 0xe8, 0x36, 0xe4, 0x24, 0x56, 0xea, + 0xce, 0x4a, 0xdd, 0x59, 0x41, 0x90, 0x5a, 0xdf, 0x81, 0xd5, 0x28, 0x5d, 0x99, 0x82, 0xe4, 0xd4, + 0xf6, 0x13, 0xb2, 0x04, 0xde, 0x83, 0x75, 0x8f, 0x9c, 0x73, 0xeb, 0x26, 0x1a, 0x24, 0x1a, 0x09, + 0xde, 0xe3, 0x69, 0x89, 0x6f, 0xc1, 0x4a, 0x3f, 0x3c, 0x35, 0x85, 0xcd, 0x4b, 0x6c, 0x31, 0xa2, + 0x4a, 0xd8, 0x16, 0x64, 0xb1, 0xef, 0x2b, 0x40, 0x41, 0x02, 0x32, 0xd8, 0xf7, 0x25, 0xeb, 0x3d, + 0x58, 0x93, 0xc1, 0x09, 0x08, 0x1b, 0xbb, 0x5c, 0x2b, 0x29, 0x4a, 0xcc, 0xaa, 0x60, 0x98, 0x8a, + 0x2e, 0xb1, 0xdf, 0x80, 0x22, 0x39, 0x73, 0x6c, 0xe2, 0xf5, 0x89, 0xc2, 0xad, 0x48, 0x5c, 0x21, + 0x24, 0x4a, 0xd0, 0xbb, 0x50, 0xf2, 0x03, 0xea, 0x53, 0x46, 0x02, 0x0b, 0xdb, 0x76, 0x40, 0x18, + 0x2b, 0xaf, 0x2a, 0x7d, 0x21, 0xbd, 0xa9, 0xc8, 0xf5, 0x5f, 0x27, 0x20, 0x25, 0x82, 0x88, 0x4a, + 0x90, 0xe4, 0xe7, 0xac, 0x6c, 0xd4, 0x92, 0x3b, 0x05, 0x53, 0x7c, 0xa2, 0x21, 0x94, 0x1d, 0x8f, + 0x93, 0x60, 0x44, 0x6c, 0x07, 0x73, 0x62, 0x31, 0x2e, 0x7e, 0x03, 0x4a, 0x39, 0xd3, 0x45, 0xb1, + 0x33, 0x9b, 0x03, 0xed, 0x98, 0x44, 0x57, 0x08, 0x98, 0x02, 0xaf, 0x53, 0x62, 0xd3, 0x99, 0xcb, + 0x45, 0x9f, 0x40, 0x36, 0xb4, 0x5f, 0x57, 0x73, 0x75, 0x56, 0xf3, 0x81, 0x46, 0x1c, 0x3a, 0x8c, + 0x6b, 0x7d, 0x91, 0x14, 0xfa, 0x31, 0x64, 0x47, 0x84, 0x31, 0x3c, 0x20, 0x2c, 0x4a, 0xf1, 0x19, + 0x0d, 0x47, 0x1a, 0x11, 0x4a, 0x87, 0x12, 0xf5, 0x7f, 0x19, 0x90, 0x0d, 0xd5, 0x23, 0x0c, 0xb7, + 0xec, 0xb1, 0xef, 0x3a, 0x7d, 0xe1, 0xed, 0x19, 0xe5, 0xc4, 0x8a, 0x6c, 0x53, 0x85, 0xfb, 0xce, + 0xac, 0xe6, 0xfd, 0x50, 0xe0, 0x31, 0xe5, 0x24, 0xd4, 0xf4, 0x70, 0xc9, 0xdc, 0xb0, 0xe7, 0x31, + 0x90, 0x07, 0x77, 0x5c, 0x51, 0x95, 0x56, 0xdf, 0x75, 0x88, 0xc7, 0x2d, 0xcc, 0x39, 0xee, 0x3f, + 0x9d, 0xec, 0xa3, 0xa2, 0xfb, 0xfe, 0xec, 0x3e, 0x87, 0x42, 0x6a, 0x4f, 0x0a, 0x35, 0xa5, 0x4c, + 0x6c, 0xaf, 0x2d, 0x77, 0x11, 0xb3, 0x95, 0x86, 0x24, 0x1b, 0x8f, 0xea, 0x2f, 0x12, 0xb0, 0x31, + 0xd7, 0x52, 0xf4, 0x21, 0x2c, 0x4b, 0x4f, 0xb1, 0x76, 0x71, 0x73, 0x76, 0x6b, 0x81, 0x37, 0xd3, + 0x02, 0xd5, 0x8c, 0xe0, 0x3d, 0x6d, 0xe9, 0x6b, 0xe1, 0x2d, 0xf4, 0x01, 0x20, 0xd9, 0xfa, 0x45, + 0x34, 0x1d, 0x6f, 0x60, 0xf9, 0xf4, 0x19, 0x09, 0x74, 0x7f, 0x2a, 0x49, 0xce, 0x63, 0xc9, 0xe8, + 0x08, 0xfa, 0x54, 0xa9, 0x6a, 0x68, 0x4a, 0x42, 0x27, 0xa5, 0xaa, 0x80, 0x2d, 0xc8, 0x45, 0x77, + 0x9c, 0x6e, 0x4a, 0x5f, 0xae, 0xaf, 0x4d, 0xc4, 0xea, 0x7f, 0x4e, 0xc0, 0xd6, 0xc2, 0xa0, 0xa2, + 0x36, 0xac, 0xf5, 0xa9, 0xf7, 0xc4, 0x75, 0xfa, 0xd2, 0x6e, 0xd9, 0x01, 0x75, 0x84, 0xee, 0x2c, + 0x38, 0x1c, 0xd9, 0xf0, 0xcc, 0x52, 0x4c, 0x4c, 0x52, 0x44, 0xdd, 0x8a, 0xde, 0x47, 0x3d, 0x4b, + 0xb7, 0xe7, 0x84, 0xf4, 0xa9, 0xa0, 0x88, 0x0f, 0x55, 0x93, 0x3e, 0x86, 0xf5, 0xde, 0xc5, 0x73, + 0xec, 0x71, 0xc7, 0x23, 0xb1, 0x0e, 0x54, 0x4e, 0xd6, 0x92, 0x3b, 0xf9, 0xfb, 0xb7, 0xe7, 0x44, + 0x39, 0xc4, 0x98, 0x5f, 0x8b, 0x04, 0x27, 0xed, 0x69, 0x41, 0xe0, 0x53, 0x0b, 0x02, 0xff, 0x36, + 0xe2, 0x79, 0x08, 0x85, 0x78, 0x9d, 0x8a, 0xba, 0x8c, 0x55, 0x4f, 0x72, 0x7e, 0x5d, 0x46, 0x79, + 0x7a, 0xa3, 0xaa, 0xeb, 0x1f, 0xc3, 0xe6, 0xfc, 0x7e, 0x82, 0xbe, 0x09, 0x2b, 0x01, 0x7e, 0xa6, + 0x9a, 0x91, 0xe5, 0x3a, 0x8c, 0xeb, 0xc6, 0x55, 0x08, 0xf0, 0x33, 0x89, 0x10, 0xbb, 0xd7, 0x7f, + 0x0a, 0xd9, 0xb0, 0xe6, 0xd1, 0xc7, 0x50, 0x0c, 0xeb, 0x7d, 0x22, 0x30, 0xf7, 0x1a, 0xd3, 0x22, + 0x66, 0x21, 0xc4, 0x4b, 0x5d, 0x9f, 0x40, 0x46, 0x33, 0xd0, 0xd7, 0xa1, 0xe0, 0xe1, 0x11, 0x61, + 0x3e, 0xee, 0x13, 0x71, 0x21, 0xaa, 0x01, 0x22, 0x1f, 0xd1, 0xda, 0xb6, 0x98, 0x2d, 0xc4, 0xdd, + 0x13, 0x0e, 0x39, 0xe2, 0xbb, 0xfe, 0x73, 0xd8, 0x14, 0x9d, 0xb6, 0x79, 0x86, 0x1d, 0x17, 0xf7, + 0x1c, 0xd7, 0xe1, 0x17, 0x7a, 0x36, 0xb8, 0x0d, 0xb9, 0x80, 0x6a, 0x6f, 0xb4, 0x23, 0xd9, 0x80, + 0x2a, 0x47, 0xc4, 0x6e, 0x7d, 0xea, 0x8e, 0x47, 0x5e, 0xd4, 0x7a, 0x05, 0x3f, 0xaf, 0x68, 0x12, + 0x52, 0xff, 0x77, 0x02, 0x52, 0xa2, 0xe0, 0xd0, 0x47, 0x90, 0x12, 0x3e, 0x48, 0x8b, 0x56, 0xe6, + 0xcd, 0x2c, 0x5d, 0x67, 0xe0, 0x11, 0xfb, 0x88, 0x0d, 0x4e, 0x2f, 0x7c, 0x62, 0x4a, 0x70, 0x6c, + 0x64, 0x48, 0x4c, 0x8d, 0x0c, 0xeb, 0x90, 0x0e, 0xe8, 0xd8, 0xb3, 0x65, 0xa5, 0xa6, 0x4d, 0xb5, + 0x40, 0x07, 0x90, 0x8d, 0x26, 0x81, 0xd4, 0xff, 0x9a, 0x04, 0x56, 0xc5, 0x81, 0x8a, 0x39, 0x45, + 0x13, 0xcc, 0x4c, 0x4f, 0x0f, 0x04, 0x6f, 0x21, 0xd9, 0xd0, 0xfb, 0xb0, 0x36, 0xe9, 0x14, 0xe1, + 0x3d, 0xa7, 0xa6, 0x8a, 0x52, 0xc4, 0xd0, 0x17, 0xdd, 0x74, 0x5b, 0x51, 0x43, 0x66, 0x46, 0xfa, + 0x35, 0x69, 0x2b, 0x6d, 0x39, 0x6d, 0xde, 0x81, 0x1c, 0x73, 0x06, 0x1e, 0xe6, 0xe3, 0x80, 0xe8, + 0x39, 0x62, 0x42, 0xa8, 0xff, 0xd3, 0x80, 0x65, 0x35, 0xad, 0xc4, 0xe2, 0x66, 0xcc, 0x8f, 0x5b, + 0x62, 0x51, 0xdc, 0x92, 0x6f, 0x1e, 0xb7, 0x26, 0x40, 0x64, 0x8c, 0xb8, 0xea, 0x16, 0x34, 0x06, + 0x65, 0x62, 0xd7, 0x19, 0xe8, 0x9a, 0x8a, 0x09, 0xa1, 0x6d, 0xc8, 0xab, 0xd1, 0x56, 0x0d, 0x10, + 0x69, 0xe9, 0x22, 0x28, 0x92, 0x18, 0x1f, 0xea, 0x7f, 0x33, 0x20, 0x17, 0x29, 0x40, 0x4d, 0x28, + 0x86, 0x86, 0x5b, 0x4f, 0x5c, 0x3c, 0xd0, 0xc9, 0x75, 0x77, 0xa1, 0xf5, 0x9f, 0xba, 0x78, 0x60, + 0xe6, 0xb5, 0xc1, 0x62, 0x31, 0xff, 0xa0, 0x12, 0x0b, 0x0e, 0x6a, 0x2a, 0x33, 0x92, 0x6f, 0x96, + 0x19, 0x53, 0x67, 0x98, 0xba, 0x79, 0x86, 0x7f, 0x4a, 0x40, 0xb6, 0x23, 0xe7, 0x20, 0xec, 0x7e, + 0x15, 0x25, 0x73, 0x1b, 0x72, 0x3e, 0x75, 0x2d, 0xc5, 0x49, 0x49, 0x4e, 0xd6, 0xa7, 0xae, 0x39, + 0x93, 0x17, 0xe9, 0xb7, 0x54, 0x4f, 0xcb, 0x6f, 0x21, 0x6a, 0x99, 0x9b, 0x51, 0x0b, 0xa0, 0xa0, + 0x42, 0xa1, 0x9b, 0xd6, 0x3d, 0x11, 0x03, 0xf9, 0x42, 0x32, 0x66, 0x1f, 0x60, 0xca, 0x6c, 0x85, + 0x34, 0x35, 0x4e, 0x48, 0xa8, 0xf9, 0x5f, 0x8f, 0x0d, 0xe5, 0x45, 0x79, 0x6b, 0x6a, 0x5c, 0xfd, + 0x3f, 0x06, 0xc0, 0xe4, 0x5a, 0x15, 0x4f, 0x11, 0x26, 0x4d, 0xb0, 0xa6, 0x76, 0xae, 0x2e, 0x3a, + 0x34, 0xbd, 0x7f, 0x81, 0xc5, 0xed, 0xde, 0x83, 0xe2, 0x24, 0x19, 0x19, 0x09, 0x8d, 0xa9, 0xbe, + 0xe6, 0x76, 0xed, 0x12, 0x6e, 0x16, 0xce, 0x62, 0x2b, 0xd4, 0x15, 0x8f, 0x8d, 0xd0, 0x8a, 0xe4, + 0xa2, 0x61, 0x78, 0x7e, 0xbb, 0x6f, 0x15, 0xae, 0x5f, 0x6e, 0x67, 0xf7, 0x9b, 0xda, 0xba, 0xac, + 0x8d, 0xf5, 0x6b, 0xf1, 0xb7, 0x09, 0xc8, 0x49, 0x47, 0x8f, 0x08, 0xc7, 0x53, 0x89, 0x61, 0xbc, + 0x79, 0x62, 0xdc, 0x05, 0x50, 0x6a, 0x98, 0xf3, 0x9c, 0xe8, 0x74, 0xcd, 0x49, 0x4a, 0xd7, 0x79, + 0x4e, 0xd0, 0xf7, 0xa2, 0x53, 0x4c, 0xbe, 0xfe, 0x14, 0x75, 0x23, 0x09, 0xcf, 0xf2, 0x16, 0x64, + 0xc4, 0x33, 0x4d, 0x3c, 0x19, 0xd4, 0x3c, 0xb1, 0xec, 0x8d, 0x47, 0xa7, 0xe7, 0x0c, 0x1d, 0xc4, + 0x23, 0x93, 0xfe, 0xff, 0x22, 0x13, 0x8b, 0xc5, 0xaf, 0x20, 0x73, 0x7a, 0x2e, 0xdf, 0xef, 0xea, + 0x76, 0xa4, 0xfa, 0xd1, 0xa8, 0xee, 0xda, 0xac, 0x20, 0xc8, 0xa7, 0xce, 0x9c, 0x8b, 0x16, 0x35, + 0xbe, 0xe4, 0x3f, 0x03, 0xfa, 0x3f, 0x81, 0xf7, 0xfe, 0x62, 0x40, 0x3e, 0xd6, 0xbb, 0xd0, 0x77, + 0x60, 0xa3, 0x75, 0x78, 0xb2, 0xf7, 0x99, 0xd5, 0xde, 0xb7, 0x3e, 0x3d, 0x6c, 0x3e, 0xb0, 0x1e, + 0x1d, 0x7f, 0x76, 0x7c, 0xf2, 0xb3, 0xe3, 0xd2, 0x52, 0x65, 0xf3, 0xf2, 0xaa, 0x86, 0x62, 0xd8, + 0x47, 0xde, 0x53, 0x8f, 0x3e, 0xf3, 0xd0, 0x2e, 0xac, 0x4f, 0x8b, 0x34, 0x5b, 0xdd, 0x83, 0xe3, + 0xd3, 0x92, 0x51, 0xd9, 0xb8, 0xbc, 0xaa, 0xad, 0xc5, 0x24, 0x9a, 0x3d, 0x46, 0x3c, 0x3e, 0x2b, + 0xb0, 0x77, 0x72, 0x74, 0xd4, 0x3e, 0x2d, 0x25, 0x66, 0x04, 0xf4, 0x6d, 0xf3, 0x2e, 0xac, 0x4d, + 0x0b, 0x1c, 0xb7, 0x0f, 0x4b, 0xc9, 0x0a, 0xba, 0xbc, 0xaa, 0xad, 0xc4, 0xd0, 0xc7, 0x8e, 0x5b, + 0xc9, 0xfe, 0xe6, 0xf7, 0xd5, 0xa5, 0x3f, 0xfe, 0xa1, 0x6a, 0x08, 0xcf, 0x8a, 0x53, 0xfd, 0x0b, + 0x7d, 0x00, 0xb7, 0xba, 0xed, 0x07, 0xc7, 0x07, 0xfb, 0xd6, 0x51, 0xf7, 0x81, 0x75, 0xfa, 0x8b, + 0xce, 0x41, 0xcc, 0xbb, 0xd5, 0xcb, 0xab, 0x5a, 0x5e, 0xbb, 0xb4, 0x08, 0xdd, 0x31, 0x0f, 0x1e, + 0x9f, 0x9c, 0x1e, 0x94, 0x0c, 0x85, 0xee, 0x04, 0x44, 0x0c, 0xf9, 0x12, 0x7d, 0x0f, 0xb6, 0xe6, + 0xa0, 0x23, 0xc7, 0xd6, 0x2e, 0xaf, 0x6a, 0xc5, 0x4e, 0x40, 0x54, 0x6d, 0x4b, 0x89, 0x06, 0x94, + 0x67, 0x25, 0x4e, 0x3a, 0x27, 0xdd, 0xe6, 0x61, 0xa9, 0x56, 0x29, 0x5d, 0x5e, 0xd5, 0x0a, 0x61, + 0xa3, 0x16, 0xf8, 0x89, 0x67, 0xad, 0x47, 0x9f, 0x5f, 0x57, 0x8d, 0x2f, 0xae, 0xab, 0xc6, 0x3f, + 0xae, 0xab, 0xc6, 0x8b, 0x57, 0xd5, 0xa5, 0x2f, 0x5e, 0x55, 0x97, 0xfe, 0xfa, 0xaa, 0xba, 0xf4, + 0xcb, 0x1f, 0x0d, 0x1c, 0x3e, 0x1c, 0xf7, 0x1a, 0x7d, 0x3a, 0xda, 0xed, 0x13, 0x97, 0x30, 0xee, + 0x60, 0x1a, 0x0c, 0xa2, 0xef, 0x0f, 0xfb, 0x34, 0xd0, 0x7f, 0x93, 0xed, 0xde, 0xfc, 0x4f, 0xab, + 0xb7, 0x2c, 0xe9, 0x1f, 0xfd, 0x37, 0x00, 0x00, 0xff, 0xff, 0xb9, 0xdb, 0xbd, 0xf1, 0x94, 0x13, + 0x00, 0x00, } func (m *PartSetHeader) Marshal() (dAtA []byte, err error) { @@ -2641,18 +2633,6 @@ func (m *Proposal) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if m.DAHeader != nil { - { - size, err := m.DAHeader.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintTypes(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x42 - } if len(m.Signature) > 0 { i -= len(m.Signature) copy(dAtA[i:], m.Signature) @@ -2660,12 +2640,12 @@ func (m *Proposal) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x3a } - n21, err21 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Timestamp, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Timestamp):]) - if err21 != nil { - return 0, err21 + n20, err20 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Timestamp, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Timestamp):]) + if err20 != nil { + return 0, err20 } - i -= n21 - i = encodeVarintTypes(dAtA, i, uint64(n21)) + i -= n20 + i = encodeVarintTypes(dAtA, i, uint64(n20)) i-- dAtA[i] = 0x32 { @@ -3342,10 +3322,6 @@ func (m *Proposal) Size() (n int) { if l > 0 { n += 1 + l + sovTypes(uint64(l)) } - if m.DAHeader != nil { - l = m.DAHeader.Size() - n += 1 + l + sovTypes(uint64(l)) - } return n } @@ -6357,42 +6333,6 @@ func (m *Proposal) Unmarshal(dAtA []byte) error { m.Signature = []byte{} } iNdEx = postIndex - case 8: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field DAHeader", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTypes - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthTypes - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthTypes - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.DAHeader == nil { - m.DAHeader = &DataAvailabilityHeader{} - } - if err := m.DAHeader.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipTypes(dAtA[iNdEx:]) diff --git a/proto/tendermint/types/types.proto b/proto/tendermint/types/types.proto index bfeef6c942..33353f1b4b 100644 --- a/proto/tendermint/types/types.proto +++ b/proto/tendermint/types/types.proto @@ -194,7 +194,6 @@ message Proposal { google.protobuf.Timestamp timestamp = 6 [(gogoproto.nullable) = false, (gogoproto.stdtime) = true]; bytes signature = 7; - DataAvailabilityHeader da_header = 8 [(gogoproto.customname) = "DAHeader"]; } message SignedHeader { diff --git a/tools/tm-signer-harness/internal/test_harness.go b/tools/tm-signer-harness/internal/test_harness.go index bc9d94a46b..7c3fb0872c 100644 --- a/tools/tm-signer-harness/internal/test_harness.go +++ b/tools/tm-signer-harness/internal/test_harness.go @@ -228,12 +228,8 @@ func (th *TestHarness) TestSignProposal() error { }, }, Timestamp: time.Now(), - DAHeader: &types.DataAvailabilityHeader{}, - } - p, err := prop.ToProto() - if err != nil { - return err } + p := prop.ToProto() propBytes := types.ProposalSignBytes(th.chainID, p) if err := th.signerClient.SignProposal(th.chainID, p); err != nil { th.logger.Error("FAILED: Signing of proposal", "err", err) diff --git a/types/canonical.go b/types/canonical.go index 9ed4650f1c..f1aeea16fd 100644 --- a/types/canonical.go +++ b/types/canonical.go @@ -48,7 +48,6 @@ func CanonicalizeProposal(chainID string, proposal *tmproto.Proposal) tmproto.Ca BlockID: CanonicalizeBlockID(proposal.BlockID), Timestamp: proposal.Timestamp, ChainID: chainID, - DAHeader: proposal.DAHeader, } } diff --git a/types/proposal.go b/types/proposal.go index 7ae3f41ebc..1f72b7a5b2 100644 --- a/types/proposal.go +++ b/types/proposal.go @@ -24,18 +24,17 @@ var ( // If POLRound >= 0, then BlockID corresponds to the block that is locked in POLRound. type Proposal struct { Type tmproto.SignedMsgType - Height int64 `json:"height"` - Round int32 `json:"round"` // there can not be greater than 2_147_483_647 rounds - POLRound int32 `json:"pol_round"` // -1 if null. - BlockID BlockID `json:"block_id"` - Timestamp time.Time `json:"timestamp"` - Signature []byte `json:"signature"` - DAHeader *DataAvailabilityHeader `json:"da_header"` + Height int64 `json:"height"` + Round int32 `json:"round"` // there can not be greater than 2_147_483_647 rounds + POLRound int32 `json:"pol_round"` // -1 if null. + BlockID BlockID `json:"block_id"` + Timestamp time.Time `json:"timestamp"` + Signature []byte `json:"signature"` } // NewProposal returns a new Proposal. // If there is no POLRound, polRound should be -1. -func NewProposal(height int64, round int32, polRound int32, blockID BlockID, daH *DataAvailabilityHeader) *Proposal { +func NewProposal(height int64, round int32, polRound int32, blockID BlockID) *Proposal { return &Proposal{ Type: tmproto.ProposalType, Height: height, @@ -43,7 +42,6 @@ func NewProposal(height int64, round int32, polRound int32, blockID BlockID, daH BlockID: blockID, POLRound: polRound, Timestamp: tmtime.Now(), - DAHeader: daH, } } @@ -92,11 +90,10 @@ func (p *Proposal) ValidateBasic() error { // 7. timestamp // See BlockID#String. func (p *Proposal) String() string { - return fmt.Sprintf("Proposal{%v/%v (%v, %v, %v) %X @ %s}", + return fmt.Sprintf("Proposal{%v/%v (%v, %v) %X @ %s}", p.Height, p.Round, p.BlockID, - p.DAHeader, p.POLRound, tmbytes.Fingerprint(p.Signature), CanonicalTime(p.Timestamp)) @@ -121,14 +118,9 @@ func ProposalSignBytes(chainID string, p *tmproto.Proposal) []byte { } // ToProto converts Proposal to protobuf -func (p *Proposal) ToProto() (*tmproto.Proposal, error) { +func (p *Proposal) ToProto() *tmproto.Proposal { if p == nil { - return &tmproto.Proposal{}, nil - } - - pdah, err := p.DAHeader.ToProto() - if err != nil { - return nil, err + return &tmproto.Proposal{} } pb := new(tmproto.Proposal) @@ -139,8 +131,7 @@ func (p *Proposal) ToProto() (*tmproto.Proposal, error) { pb.PolRound = p.POLRound pb.Timestamp = p.Timestamp pb.Signature = p.Signature - pb.DAHeader = pdah - return pb, nil + return pb } // ProposalFromProto sets a protobuf Proposal to the given pointer. @@ -157,11 +148,6 @@ func ProposalFromProto(pp *tmproto.Proposal) (*Proposal, error) { return nil, err } - dah, err := DataAvailabilityHeaderFromProto(pp.DAHeader) - if err != nil { - return nil, err - } - p.BlockID = *blockID p.Type = pp.Type p.Height = pp.Height @@ -169,7 +155,6 @@ func ProposalFromProto(pp *tmproto.Proposal) (*Proposal, error) { p.POLRound = pp.PolRound p.Timestamp = pp.Timestamp p.Signature = pp.Signature - p.DAHeader = dah return p, p.ValidateBasic() } diff --git a/types/proposal_test.go b/types/proposal_test.go index bf3d13cc5d..59e2784625 100644 --- a/types/proposal_test.go +++ b/types/proposal_test.go @@ -21,9 +21,6 @@ var ( ) func init() { - rows, _ := NmtRootsFromBytes([][]byte{[]byte("HeHasBeenElected--June_15_2020_amino_was_removed")}) - clmns, _ := NmtRootsFromBytes([][]byte{[]byte("HeHasBeenElected--June_15_2020_amino_was_removed")}) - var stamp, err = time.Parse(TimeFormat, "2018-02-11T07:09:22.765Z") if err != nil { panic(err) @@ -35,15 +32,8 @@ func init() { PartSetHeader: PartSetHeader{Total: 111, Hash: []byte("--June_15_2020_amino_was_removed")}}, POLRound: -1, Timestamp: stamp, - DAHeader: &DataAvailabilityHeader{ - RowsRoots: rows, - ColumnRoots: clmns, - }, - } - pbp, err = testProposal.ToProto() - if err != nil { - panic(err) } + pbp = testProposal.ToProto() } func TestProposalSignable(t *testing.T) { @@ -58,7 +48,7 @@ func TestProposalSignable(t *testing.T) { func TestProposalString(t *testing.T) { str := testProposal.String() - expected := `Proposal{12345/23456 (2D2D4A756E655F31355F323032305F616D696E6F5F7761735F72656D6F766564:111:2D2D4A756E65, 1ACC82AE4B38A876BEC82CCC91873315063C374599BBCC4BF1E783D5A73B0E5A, -1) 000000000000 @ 2018-02-11T07:09:22.765Z}` //nolint:lll // ignore line length for tests + expected := `Proposal{12345/23456 (2D2D4A756E655F31355F323032305F616D696E6F5F7761735F72656D6F766564:111:2D2D4A756E65, -1) 000000000000 @ 2018-02-11T07:09:22.765Z}` //nolint:lll // ignore line length for tests if str != expected { t.Errorf("got unexpected string for Proposal. Expected:\n%v\nGot:\n%v", expected, str) } @@ -72,10 +62,8 @@ func TestProposalVerifySignature(t *testing.T) { prop := NewProposal( 4, 2, 2, BlockID{tmrand.Bytes(tmhash.Size), PartSetHeader{777, tmrand.Bytes(tmhash.Size)}}, - makeDAHeaderRandom(), ) - p, err := prop.ToProto() - require.NoError(t, err) + p := prop.ToProto() signBytes := ProposalSignBytes("test_chain_id", p) // sign it @@ -89,8 +77,7 @@ func TestProposalVerifySignature(t *testing.T) { // serialize, deserialize and verify again.... newProp := new(tmproto.Proposal) - pb, err := prop.ToProto() - require.NoError(t, err) + pb := prop.ToProto() bs, err := proto.Marshal(pb) require.NoError(t, err) @@ -159,15 +146,13 @@ func TestProposalValidateBasic(t *testing.T) { }, true}, } blockID := makeBlockID(tmhash.Sum([]byte("blockhash")), math.MaxInt32, tmhash.Sum([]byte("partshash"))) - dah := makeDAHeaderRandom() for _, tc := range testCases { tc := tc t.Run(tc.testName, func(t *testing.T) { - prop := NewProposal(4, 2, 2, blockID, dah) - p, err := prop.ToProto() - require.NoError(t, err) - err = privVal.SignProposal("test_chain_id", p) + prop := NewProposal(4, 2, 2, blockID) + p := prop.ToProto() + err := privVal.SignProposal("test_chain_id", p) prop.Signature = p.Signature require.NoError(t, err) tc.malleateProposal(prop) @@ -182,10 +167,9 @@ func TestProposalProtoBuf(t *testing.T) { 2, 3, makeBlockID([]byte("hash"), 2, []byte("part_set_hash")), - makeDAHeaderRandom(), ) proposal.Signature = []byte("sig") - proposal2 := NewProposal(1, 2, 3, BlockID{}, &DataAvailabilityHeader{}) + proposal2 := NewProposal(1, 2, 3, BlockID{}) testCases := []struct { msg string @@ -194,12 +178,11 @@ func TestProposalProtoBuf(t *testing.T) { }{ {"success", proposal, true}, {"success", proposal2, false}, // blockID cannot be empty - {"empty proposal failure validatebasic", &Proposal{DAHeader: &DataAvailabilityHeader{}}, false}, + {"empty proposal failure validatebasic", &Proposal{}, false}, {"nil proposal", nil, false}, } for _, tc := range testCases { - protoProposal, err := tc.p1.ToProto() - require.NoError(t, err) + protoProposal := tc.p1.ToProto() p, err := ProposalFromProto(protoProposal) if tc.expPass { require.NoError(t, err)