diff --git a/proto/palomachain/paloma/consensus/consensus_queue.proto b/proto/palomachain/paloma/consensus/consensus_queue.proto index 8db928c4..49c04e5b 100644 --- a/proto/palomachain/paloma/consensus/consensus_queue.proto +++ b/proto/palomachain/paloma/consensus/consensus_queue.proto @@ -64,6 +64,7 @@ message PublicAccessData { bytes valAddress = 1 [ (gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.ValAddress" ]; bytes data = 2; + uint64 valsetID = 3; } message ErrorData { diff --git a/proto/palomachain/paloma/consensus/query.proto b/proto/palomachain/paloma/consensus/query.proto index e6cf1f0e..398b8c43 100644 --- a/proto/palomachain/paloma/consensus/query.proto +++ b/proto/palomachain/paloma/consensus/query.proto @@ -103,6 +103,7 @@ message MessageWithSignatures { bytes publicAccessData = 6; bytes errorData = 7; repeated Evidence evidence = 8; + uint64 valsetID = 9; } message QueryMessageByIDRequest { diff --git a/proto/palomachain/paloma/consensus/tx.proto b/proto/palomachain/paloma/consensus/tx.proto index b091e863..fe6fd2f5 100644 --- a/proto/palomachain/paloma/consensus/tx.proto +++ b/proto/palomachain/paloma/consensus/tx.proto @@ -58,6 +58,7 @@ message MsgSetPublicAccessData { bytes data = 4; palomachain.paloma.valset.MsgMetadata metadata = 5 [ (gogoproto.nullable) = false ]; + uint64 valsetID = 6; } message MsgSetPublicAccessDataResponse {} diff --git a/x/consensus/keeper/concensus_keeper.go b/x/consensus/keeper/concensus_keeper.go index 5c53dbc5..736c1d4d 100644 --- a/x/consensus/keeper/concensus_keeper.go +++ b/x/consensus/keeper/concensus_keeper.go @@ -509,6 +509,7 @@ func (k Keeper) SetMessagePublicAccessData( payload := &types.PublicAccessData{ ValAddress: valAddr, Data: msg.GetData(), + ValsetID: msg.GetValsetID(), } err = cq.SetPublicAccessData(sdkCtx, msg.GetMessageID(), payload) if err != nil { diff --git a/x/consensus/keeper/consensus/consensus.go b/x/consensus/keeper/consensus/consensus.go index 409a3be3..671afd22 100644 --- a/x/consensus/keeper/consensus/consensus.go +++ b/x/consensus/keeper/consensus/consensus.go @@ -473,9 +473,11 @@ func ToMessageWithSignatures(msg types.QueuedSignedMessageI, cdc codec.BinaryCod } var publicAccessData []byte + var valsetID uint64 if msg.GetPublicAccessData() != nil { publicAccessData = msg.GetPublicAccessData().GetData() + valsetID = msg.GetPublicAccessData().GetValsetID() } var errorData []byte @@ -491,6 +493,7 @@ func ToMessageWithSignatures(msg types.QueuedSignedMessageI, cdc codec.BinaryCod BytesToSign: msg.GetBytesToSign(), SignData: []*types.ValidatorSignature{}, PublicAccessData: publicAccessData, + ValsetID: valsetID, ErrorData: errorData, } for _, signData := range msg.GetSignData() { diff --git a/x/consensus/types/consensus_queue.pb.go b/x/consensus/types/consensus_queue.pb.go index ca031c60..94b2fd87 100644 --- a/x/consensus/types/consensus_queue.pb.go +++ b/x/consensus/types/consensus_queue.pb.go @@ -378,6 +378,7 @@ func (m *Evidence) GetProof() *types.Any { type PublicAccessData struct { ValAddress github_com_cosmos_cosmos_sdk_types.ValAddress `protobuf:"bytes,1,opt,name=valAddress,proto3,casttype=github.com/cosmos/cosmos-sdk/types.ValAddress" json:"valAddress,omitempty"` Data []byte `protobuf:"bytes,2,opt,name=data,proto3" json:"data,omitempty"` + ValsetID uint64 `protobuf:"varint,3,opt,name=valsetID,proto3" json:"valsetID,omitempty"` } func (m *PublicAccessData) Reset() { *m = PublicAccessData{} } @@ -427,6 +428,13 @@ func (m *PublicAccessData) GetData() []byte { return nil } +func (m *PublicAccessData) GetValsetID() uint64 { + if m != nil { + return m.ValsetID + } + return 0 +} + type ErrorData struct { ValAddress github_com_cosmos_cosmos_sdk_types.ValAddress `protobuf:"bytes,1,opt,name=valAddress,proto3,casttype=github.com/cosmos/cosmos-sdk/types.ValAddress" json:"valAddress,omitempty"` Data []byte `protobuf:"bytes,2,opt,name=data,proto3" json:"data,omitempty"` @@ -494,54 +502,55 @@ func init() { } var fileDescriptor_3a5520bff1a7c91d = []byte{ - // 739 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x55, 0xbf, 0x6f, 0xd3, 0x40, - 0x14, 0xce, 0xe5, 0x47, 0x9b, 0x5c, 0x2a, 0xd4, 0x1e, 0x05, 0xdc, 0xaa, 0x4a, 0xac, 0x0c, 0xc5, - 0xaa, 0xa8, 0x0d, 0x45, 0x62, 0x60, 0x40, 0x8a, 0xa1, 0x12, 0x15, 0x42, 0x50, 0xb7, 0x62, 0xe8, - 0x12, 0x5d, 0x7c, 0x57, 0xc7, 0xaa, 0xed, 0x4b, 0x7d, 0xe7, 0xaa, 0xf9, 0x13, 0xd8, 0x3a, 0x32, - 0xb2, 0xc1, 0xc8, 0xc0, 0x1f, 0xd1, 0xb1, 0x62, 0x42, 0x0c, 0x01, 0xb5, 0x03, 0x23, 0x3b, 0x13, - 0xf2, 0xd9, 0x4e, 0x42, 0xd2, 0x1f, 0x2c, 0x65, 0x69, 0x5f, 0xde, 0xfb, 0xbe, 0x77, 0xdf, 0xdd, - 0xfb, 0x9e, 0x0c, 0xd7, 0xba, 0xd8, 0x63, 0x3e, 0xb6, 0x3b, 0xd8, 0x0d, 0x8c, 0x24, 0x36, 0x6c, - 0x16, 0x70, 0x1a, 0xf0, 0x88, 0x0f, 0xa3, 0xd6, 0x7e, 0x44, 0x23, 0xaa, 0x77, 0x43, 0x26, 0x18, - 0x5a, 0x1a, 0xe1, 0xe8, 0x49, 0xac, 0x0f, 0x90, 0x8b, 0x0b, 0x0e, 0x63, 0x8e, 0x47, 0x0d, 0x89, - 0x6d, 0x47, 0xbb, 0x06, 0x0e, 0x7a, 0x09, 0x71, 0x71, 0xde, 0x61, 0x0e, 0x93, 0xa1, 0x11, 0x47, - 0x69, 0xb6, 0x3e, 0x4e, 0x10, 0xae, 0x4f, 0xb9, 0xc0, 0x7e, 0x37, 0x05, 0x2c, 0xd8, 0x8c, 0xfb, - 0x8c, 0xb7, 0x12, 0x66, 0xf2, 0x23, 0x2d, 0xcd, 0x61, 0xdf, 0x0d, 0x98, 0x21, 0xff, 0x26, 0xa9, - 0xc6, 0x87, 0x12, 0xbc, 0xb9, 0x19, 0xab, 0x25, 0x5b, 0xae, 0x13, 0x50, 0xf2, 0x92, 0x72, 0x8e, - 0x1d, 0x8a, 0x6e, 0xc0, 0xbc, 0x4b, 0x14, 0xa0, 0x02, 0xad, 0x68, 0xe5, 0x5d, 0x82, 0x74, 0x88, - 0x30, 0x21, 0x94, 0x34, 0x85, 0xe9, 0x31, 0x7b, 0xef, 0x39, 0x75, 0x9d, 0x8e, 0x50, 0xf2, 0x2a, - 0xd0, 0x0a, 0xd6, 0x39, 0x15, 0xf4, 0x04, 0x4e, 0xa7, 0x59, 0xa5, 0xa0, 0x02, 0xad, 0xba, 0xb6, - 0xa8, 0x27, 0xc2, 0xf5, 0x4c, 0xb8, 0xbe, 0x9d, 0x09, 0x37, 0xcb, 0xc7, 0xfd, 0x7a, 0xee, 0xe8, - 0x7b, 0x1d, 0x58, 0x19, 0x09, 0x2d, 0xc3, 0x82, 0xcf, 0x1d, 0xa5, 0x28, 0xb9, 0xf3, 0x13, 0xdc, - 0x66, 0xd0, 0xb3, 0x62, 0x00, 0x52, 0x61, 0xb5, 0xdd, 0x13, 0x94, 0x6f, 0xb3, 0x58, 0xbf, 0x52, - 0x52, 0x81, 0x36, 0x63, 0x8d, 0xa6, 0x90, 0x09, 0xcb, 0xdc, 0x75, 0x82, 0x67, 0x58, 0x60, 0x65, - 0x4a, 0x2d, 0x68, 0xd5, 0xb5, 0x65, 0xfd, 0xb2, 0x91, 0xe8, 0x5b, 0x29, 0xda, 0x1a, 0xf0, 0xe2, - 0x1e, 0xf4, 0xc0, 0x25, 0x34, 0xb0, 0xa9, 0x32, 0xfd, 0x2f, 0x3d, 0xd6, 0x53, 0xb4, 0x35, 0xe0, - 0xa1, 0x1d, 0x38, 0xdb, 0x8d, 0xda, 0x9e, 0x6b, 0x37, 0x6d, 0x9b, 0x72, 0x2e, 0xf5, 0x94, 0xe5, - 0xf5, 0xf4, 0xcb, 0x7b, 0xbd, 0x1e, 0x63, 0x59, 0x13, 0x7d, 0xd0, 0x3d, 0x38, 0x17, 0xd2, 0xfd, - 0xc8, 0x0d, 0x69, 0x2c, 0x1e, 0x8b, 0x28, 0xa4, 0x5c, 0xa9, 0xa8, 0x40, 0x2b, 0x5b, 0x93, 0x05, - 0xb4, 0x0e, 0x2b, 0x34, 0x0c, 0x59, 0x28, 0x25, 0x40, 0x29, 0xe1, 0xee, 0x15, 0xd7, 0xc9, 0xe0, - 0xd6, 0x90, 0x89, 0x1c, 0x78, 0xa7, 0x83, 0x03, 0xe2, 0x51, 0xd2, 0xc2, 0xa2, 0xd5, 0x8e, 0x87, - 0xdf, 0xea, 0x24, 0xbe, 0xa8, 0xaa, 0x40, 0xab, 0x98, 0xf7, 0x8f, 0xfb, 0x75, 0xf0, 0xad, 0x5f, - 0xbf, 0x95, 0x98, 0x90, 0x93, 0x3d, 0xdd, 0x65, 0x86, 0x8f, 0x45, 0x47, 0xdf, 0x08, 0xc4, 0x97, - 0xcf, 0xab, 0x30, 0x75, 0xe7, 0x46, 0x20, 0x3e, 0xfe, 0xfc, 0xb4, 0x02, 0xac, 0xf9, 0xb4, 0xe1, - 0x5f, 0x5e, 0x7a, 0x5c, 0x7c, 0xf7, 0xbe, 0x9e, 0x6b, 0x98, 0x50, 0x31, 0xb1, 0xb0, 0x3b, 0xaf, - 0x76, 0x9f, 0x66, 0xba, 0x52, 0xb3, 0xf2, 0xcc, 0x2d, 0xe0, 0x0a, 0xb7, 0x34, 0xb6, 0x60, 0x49, - 0xf6, 0x40, 0x1a, 0x2c, 0xfa, 0xdc, 0xe1, 0x0a, 0x90, 0xc3, 0x3c, 0x9f, 0x21, 0x11, 0xe3, 0x06, - 0xcb, 0x4f, 0x18, 0xac, 0xf1, 0x0b, 0xc0, 0x72, 0xe6, 0x19, 0xb4, 0x09, 0xe1, 0x01, 0xf6, 0x9a, - 0x84, 0x84, 0x94, 0x73, 0x29, 0x68, 0xc6, 0x7c, 0xf0, 0xbb, 0x5f, 0x5f, 0x75, 0x5c, 0xd1, 0x89, - 0xda, 0xba, 0xcd, 0xfc, 0x74, 0x27, 0xd3, 0x7f, 0xab, 0x9c, 0xec, 0x19, 0xa2, 0xd7, 0xa5, 0x5c, - 0x7f, 0x33, 0x20, 0x5a, 0x23, 0x4d, 0xd0, 0x12, 0xac, 0xf0, 0x6c, 0x78, 0xe9, 0xf9, 0xc3, 0x44, - 0x5c, 0xa5, 0x87, 0x22, 0xc4, 0x72, 0x98, 0x85, 0xa4, 0x3a, 0x48, 0xa0, 0x47, 0xf0, 0x36, 0x3d, - 0x14, 0x34, 0x0c, 0xb0, 0xd7, 0xb4, 0x6d, 0x16, 0x05, 0x22, 0x93, 0x16, 0x6f, 0x56, 0xc5, 0xba, - 0xa0, 0x1a, 0x77, 0x4d, 0x4c, 0xf6, 0x82, 0xf6, 0xd2, 0xa5, 0x1a, 0x26, 0x1a, 0x6f, 0x01, 0x2c, - 0x67, 0x0e, 0xbf, 0x8e, 0x1b, 0xaf, 0xc0, 0x52, 0x37, 0x64, 0x6c, 0x57, 0xde, 0xf6, 0xa2, 0xf1, - 0x24, 0x90, 0x46, 0x0f, 0xce, 0x8e, 0x2f, 0xc8, 0x75, 0x48, 0x42, 0xb0, 0x48, 0xe2, 0x17, 0x4e, - 0xde, 0x5f, 0xc6, 0x8d, 0x10, 0x56, 0x06, 0x8b, 0xf1, 0x9f, 0xce, 0x34, 0x37, 0x8e, 0x4f, 0x6b, - 0xe0, 0xe4, 0xb4, 0x06, 0x7e, 0x9c, 0xd6, 0xc0, 0xd1, 0x59, 0x2d, 0x77, 0x72, 0x56, 0xcb, 0x7d, - 0x3d, 0xab, 0xe5, 0x76, 0x8c, 0x91, 0x83, 0xce, 0xf9, 0x4c, 0x1d, 0x8e, 0x7c, 0xa8, 0xe4, 0xa9, - 0xed, 0x29, 0xf9, 0x9c, 0x0f, 0xff, 0x04, 0x00, 0x00, 0xff, 0xff, 0xc2, 0x30, 0x9e, 0x48, 0xd5, - 0x06, 0x00, 0x00, + // 761 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x55, 0x3d, 0x6f, 0xdb, 0x48, + 0x10, 0xd5, 0xea, 0xc3, 0x96, 0x56, 0xc6, 0xc1, 0xde, 0xf3, 0xdd, 0xd1, 0x82, 0x21, 0x11, 0x2a, + 0x7c, 0x84, 0x71, 0x26, 0xef, 0x7c, 0xc0, 0x15, 0x57, 0x04, 0x10, 0x63, 0x03, 0x11, 0x82, 0x20, + 0x31, 0x6d, 0xa4, 0x70, 0x23, 0xac, 0xb8, 0x6b, 0x8a, 0x30, 0xc9, 0x95, 0xb9, 0x4b, 0xc3, 0xfa, + 0x09, 0xe9, 0xdc, 0x04, 0x48, 0x99, 0x2e, 0x29, 0x53, 0xe4, 0x47, 0xb8, 0x34, 0x52, 0x05, 0x29, + 0x94, 0xc0, 0x2e, 0x52, 0xa6, 0x4f, 0x15, 0x70, 0x49, 0x4a, 0x8a, 0xe4, 0x8f, 0x34, 0x4e, 0x23, + 0x0d, 0x67, 0xde, 0x1b, 0xbe, 0xdd, 0x79, 0x03, 0xc2, 0xcd, 0x3e, 0xf6, 0x98, 0x8f, 0xed, 0x1e, + 0x76, 0x03, 0x23, 0x89, 0x0d, 0x9b, 0x05, 0x9c, 0x06, 0x3c, 0xe2, 0xe3, 0xa8, 0x73, 0x14, 0xd1, + 0x88, 0xea, 0xfd, 0x90, 0x09, 0x86, 0x56, 0x27, 0x38, 0x7a, 0x12, 0xeb, 0x23, 0x64, 0x6d, 0xc5, + 0x61, 0xcc, 0xf1, 0xa8, 0x21, 0xb1, 0xdd, 0xe8, 0xc0, 0xc0, 0xc1, 0x20, 0x21, 0xd6, 0x96, 0x1d, + 0xe6, 0x30, 0x19, 0x1a, 0x71, 0x94, 0x66, 0x1b, 0xd3, 0x04, 0xe1, 0xfa, 0x94, 0x0b, 0xec, 0xf7, + 0x53, 0xc0, 0x8a, 0xcd, 0xb8, 0xcf, 0x78, 0x27, 0x61, 0x26, 0x0f, 0x69, 0x69, 0x09, 0xfb, 0x6e, + 0xc0, 0x0c, 0xf9, 0x9b, 0xa4, 0x9a, 0xaf, 0x4a, 0xf0, 0xd7, 0x9d, 0x58, 0x2d, 0xd9, 0x75, 0x9d, + 0x80, 0x92, 0x47, 0x94, 0x73, 0xec, 0x50, 0xf4, 0x0b, 0xcc, 0xbb, 0x44, 0x01, 0x2a, 0xd0, 0x8a, + 0x56, 0xde, 0x25, 0x48, 0x87, 0x08, 0x13, 0x42, 0x49, 0x4b, 0x98, 0x1e, 0xb3, 0x0f, 0x1f, 0x50, + 0xd7, 0xe9, 0x09, 0x25, 0xaf, 0x02, 0xad, 0x60, 0x5d, 0x51, 0x41, 0xf7, 0xe0, 0x7c, 0x9a, 0x55, + 0x0a, 0x2a, 0xd0, 0xaa, 0x9b, 0x35, 0x3d, 0x11, 0xae, 0x67, 0xc2, 0xf5, 0xbd, 0x4c, 0xb8, 0x59, + 0x3e, 0x1b, 0x36, 0x72, 0xa7, 0x1f, 0x1b, 0xc0, 0xca, 0x48, 0x68, 0x0d, 0x16, 0x7c, 0xee, 0x28, + 0x45, 0xc9, 0x5d, 0x9e, 0xe1, 0xb6, 0x82, 0x81, 0x15, 0x03, 0x90, 0x0a, 0xab, 0xdd, 0x81, 0xa0, + 0x7c, 0x8f, 0xc5, 0xfa, 0x95, 0x92, 0x0a, 0xb4, 0x05, 0x6b, 0x32, 0x85, 0x4c, 0x58, 0xe6, 0xae, + 0x13, 0x6c, 0x61, 0x81, 0x95, 0x39, 0xb5, 0xa0, 0x55, 0x37, 0xd7, 0xf4, 0x9b, 0x46, 0xa2, 0xef, + 0xa6, 0x68, 0x6b, 0xc4, 0x8b, 0x7b, 0xd0, 0x63, 0x97, 0xd0, 0xc0, 0xa6, 0xca, 0xfc, 0x8f, 0xf4, + 0xd8, 0x4e, 0xd1, 0xd6, 0x88, 0x87, 0xf6, 0xe1, 0x62, 0x3f, 0xea, 0x7a, 0xae, 0xdd, 0xb2, 0x6d, + 0xca, 0xb9, 0xd4, 0x53, 0x96, 0xc7, 0xd3, 0x6f, 0xee, 0xf5, 0x64, 0x8a, 0x65, 0xcd, 0xf4, 0x41, + 0x7f, 0xc1, 0xa5, 0x90, 0x1e, 0x45, 0x6e, 0x48, 0x63, 0xf1, 0x58, 0x44, 0x21, 0xe5, 0x4a, 0x45, + 0x05, 0x5a, 0xd9, 0x9a, 0x2d, 0xa0, 0x6d, 0x58, 0xa1, 0x61, 0xc8, 0x42, 0x29, 0x01, 0x4a, 0x09, + 0x7f, 0xde, 0x72, 0x9c, 0x0c, 0x6e, 0x8d, 0x99, 0xc8, 0x81, 0x7f, 0xf4, 0x70, 0x40, 0x3c, 0x4a, + 0x3a, 0x58, 0x74, 0xba, 0xf1, 0xf0, 0x3b, 0xbd, 0xc4, 0x17, 0x55, 0x15, 0x68, 0x15, 0xf3, 0xef, + 0xb3, 0x61, 0x03, 0x7c, 0x18, 0x36, 0x7e, 0x4b, 0x4c, 0xc8, 0xc9, 0xa1, 0xee, 0x32, 0xc3, 0xc7, + 0xa2, 0xa7, 0xb7, 0x03, 0xf1, 0xee, 0xed, 0x06, 0x4c, 0xdd, 0xd9, 0x0e, 0xc4, 0xeb, 0xcf, 0x6f, + 0xd6, 0x81, 0xb5, 0x9c, 0x36, 0xfc, 0xce, 0x4b, 0xff, 0x17, 0x5f, 0xbc, 0x6c, 0xe4, 0x9a, 0x26, + 0x54, 0x4c, 0x2c, 0xec, 0xde, 0xe3, 0x83, 0xfb, 0x99, 0xae, 0xd4, 0xac, 0x3c, 0x73, 0x0b, 0xb8, + 0xc5, 0x2d, 0xcd, 0x5d, 0x58, 0x92, 0x3d, 0x90, 0x06, 0x8b, 0x3e, 0x77, 0xb8, 0x02, 0xe4, 0x30, + 0xaf, 0x66, 0x48, 0xc4, 0xb4, 0xc1, 0xf2, 0x33, 0x06, 0x6b, 0x7e, 0x01, 0xb0, 0x9c, 0x79, 0x06, + 0xed, 0x40, 0x78, 0x8c, 0xbd, 0x16, 0x21, 0x21, 0xe5, 0x5c, 0x0a, 0x5a, 0x30, 0xff, 0xf9, 0x3a, + 0x6c, 0x6c, 0x38, 0xae, 0xe8, 0x45, 0x5d, 0xdd, 0x66, 0x7e, 0xba, 0x93, 0xe9, 0xdf, 0x06, 0x27, + 0x87, 0x86, 0x18, 0xf4, 0x29, 0xd7, 0x9f, 0x8e, 0x88, 0xd6, 0x44, 0x13, 0xb4, 0x0a, 0x2b, 0x3c, + 0x1b, 0x5e, 0xfa, 0xfe, 0x71, 0x22, 0xae, 0xd2, 0x13, 0x11, 0x62, 0x39, 0xcc, 0x42, 0x52, 0x1d, + 0x25, 0xd0, 0x7f, 0xf0, 0x77, 0x7a, 0x22, 0x68, 0x18, 0x60, 0xaf, 0x65, 0xdb, 0x2c, 0x0a, 0x44, + 0x26, 0x2d, 0xde, 0xac, 0x8a, 0x75, 0x4d, 0x35, 0xee, 0x9a, 0x98, 0xec, 0x21, 0x1d, 0xa4, 0x4b, + 0x35, 0x4e, 0x34, 0x9f, 0x01, 0x58, 0xce, 0x1c, 0x7e, 0x17, 0x27, 0x5e, 0x87, 0xa5, 0x7e, 0xc8, + 0xd8, 0x81, 0x3c, 0xed, 0x75, 0xe3, 0x49, 0x20, 0xcd, 0xe7, 0x00, 0x2e, 0x4e, 0x6f, 0xc8, 0x5d, + 0x68, 0x42, 0xb0, 0x48, 0xe2, 0x2b, 0x4e, 0x06, 0x20, 0x63, 0x54, 0x83, 0xe5, 0x63, 0xec, 0x71, + 0x2a, 0xda, 0x5b, 0xf2, 0xea, 0x8b, 0xd6, 0xe8, 0xb9, 0x19, 0xc2, 0xca, 0x68, 0x6b, 0x7e, 0x92, + 0x1e, 0xb3, 0x7d, 0x76, 0x51, 0x07, 0xe7, 0x17, 0x75, 0xf0, 0xe9, 0xa2, 0x0e, 0x4e, 0x2f, 0xeb, + 0xb9, 0xf3, 0xcb, 0x7a, 0xee, 0xfd, 0x65, 0x3d, 0xb7, 0x6f, 0x4c, 0xbc, 0xe8, 0x8a, 0x6f, 0xd8, + 0xc9, 0xc4, 0x57, 0x4c, 0xbe, 0xb5, 0x3b, 0x27, 0xef, 0xfa, 0xdf, 0x6f, 0x01, 0x00, 0x00, 0xff, + 0xff, 0xfa, 0x1b, 0xa6, 0xec, 0xf2, 0x06, 0x00, 0x00, } func (m *QueuedSignedMessage) Marshal() (dAtA []byte, err error) { @@ -877,6 +886,11 @@ func (m *PublicAccessData) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if m.ValsetID != 0 { + i = encodeVarintConsensusQueue(dAtA, i, uint64(m.ValsetID)) + i-- + dAtA[i] = 0x18 + } if len(m.Data) > 0 { i -= len(m.Data) copy(dAtA[i:], m.Data) @@ -1086,6 +1100,9 @@ func (m *PublicAccessData) Size() (n int) { if l > 0 { n += 1 + l + sovConsensusQueue(uint64(l)) } + if m.ValsetID != 0 { + n += 1 + sovConsensusQueue(uint64(m.ValsetID)) + } return n } @@ -2138,6 +2155,25 @@ func (m *PublicAccessData) Unmarshal(dAtA []byte) error { m.Data = []byte{} } iNdEx = postIndex + case 3: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field ValsetID", wireType) + } + m.ValsetID = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowConsensusQueue + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.ValsetID |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } default: iNdEx = preIndex skippy, err := skipConsensusQueue(dAtA[iNdEx:]) diff --git a/x/consensus/types/query.pb.go b/x/consensus/types/query.pb.go index b692ff01..857f7f6d 100644 --- a/x/consensus/types/query.pb.go +++ b/x/consensus/types/query.pb.go @@ -6,10 +6,6 @@ package types import ( context "context" fmt "fmt" - io "io" - math "math" - math_bits "math/bits" - types "github.com/cosmos/cosmos-sdk/codec/types" github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" _ "github.com/cosmos/gogoproto/gogoproto" @@ -19,14 +15,15 @@ import ( grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" + io "io" + math "math" + math_bits "math/bits" ) // Reference imports to suppress errors if they are not otherwise used. -var ( - _ = proto.Marshal - _ = fmt.Errorf - _ = math.Inf -) +var _ = proto.Marshal +var _ = fmt.Errorf +var _ = math.Inf // This is a compile-time assertion to ensure that this generated file // is compatible with the proto package it is being compiled against. @@ -35,7 +32,8 @@ var ( const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // QueryParamsRequest is request type for the Query/Params RPC method. -type QueryParamsRequest struct{} +type QueryParamsRequest struct { +} func (m *QueryParamsRequest) Reset() { *m = QueryParamsRequest{} } func (m *QueryParamsRequest) String() string { return proto.CompactTextString(m) } @@ -43,11 +41,9 @@ func (*QueryParamsRequest) ProtoMessage() {} func (*QueryParamsRequest) Descriptor() ([]byte, []int) { return fileDescriptor_186b66ae011355e3, []int{0} } - func (m *QueryParamsRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *QueryParamsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_QueryParamsRequest.Marshal(b, m, deterministic) @@ -60,15 +56,12 @@ func (m *QueryParamsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, return b[:n], nil } } - func (m *QueryParamsRequest) XXX_Merge(src proto.Message) { xxx_messageInfo_QueryParamsRequest.Merge(m, src) } - func (m *QueryParamsRequest) XXX_Size() int { return m.Size() } - func (m *QueryParamsRequest) XXX_DiscardUnknown() { xxx_messageInfo_QueryParamsRequest.DiscardUnknown(m) } @@ -87,11 +80,9 @@ func (*QueryParamsResponse) ProtoMessage() {} func (*QueryParamsResponse) Descriptor() ([]byte, []int) { return fileDescriptor_186b66ae011355e3, []int{1} } - func (m *QueryParamsResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *QueryParamsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_QueryParamsResponse.Marshal(b, m, deterministic) @@ -104,15 +95,12 @@ func (m *QueryParamsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, return b[:n], nil } } - func (m *QueryParamsResponse) XXX_Merge(src proto.Message) { xxx_messageInfo_QueryParamsResponse.Merge(m, src) } - func (m *QueryParamsResponse) XXX_Size() int { return m.Size() } - func (m *QueryParamsResponse) XXX_DiscardUnknown() { xxx_messageInfo_QueryParamsResponse.DiscardUnknown(m) } @@ -137,11 +125,9 @@ func (*QueryQueuedMessagesForSigningRequest) ProtoMessage() {} func (*QueryQueuedMessagesForSigningRequest) Descriptor() ([]byte, []int) { return fileDescriptor_186b66ae011355e3, []int{2} } - func (m *QueryQueuedMessagesForSigningRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *QueryQueuedMessagesForSigningRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_QueryQueuedMessagesForSigningRequest.Marshal(b, m, deterministic) @@ -154,15 +140,12 @@ func (m *QueryQueuedMessagesForSigningRequest) XXX_Marshal(b []byte, determinist return b[:n], nil } } - func (m *QueryQueuedMessagesForSigningRequest) XXX_Merge(src proto.Message) { xxx_messageInfo_QueryQueuedMessagesForSigningRequest.Merge(m, src) } - func (m *QueryQueuedMessagesForSigningRequest) XXX_Size() int { return m.Size() } - func (m *QueryQueuedMessagesForSigningRequest) XXX_DiscardUnknown() { xxx_messageInfo_QueryQueuedMessagesForSigningRequest.DiscardUnknown(m) } @@ -193,11 +176,9 @@ func (*QueryQueuedMessagesForSigningResponse) ProtoMessage() {} func (*QueryQueuedMessagesForSigningResponse) Descriptor() ([]byte, []int) { return fileDescriptor_186b66ae011355e3, []int{3} } - func (m *QueryQueuedMessagesForSigningResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *QueryQueuedMessagesForSigningResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_QueryQueuedMessagesForSigningResponse.Marshal(b, m, deterministic) @@ -210,15 +191,12 @@ func (m *QueryQueuedMessagesForSigningResponse) XXX_Marshal(b []byte, determinis return b[:n], nil } } - func (m *QueryQueuedMessagesForSigningResponse) XXX_Merge(src proto.Message) { xxx_messageInfo_QueryQueuedMessagesForSigningResponse.Merge(m, src) } - func (m *QueryQueuedMessagesForSigningResponse) XXX_Size() int { return m.Size() } - func (m *QueryQueuedMessagesForSigningResponse) XXX_DiscardUnknown() { xxx_messageInfo_QueryQueuedMessagesForSigningResponse.DiscardUnknown(m) } @@ -245,11 +223,9 @@ func (*MessageToSign) ProtoMessage() {} func (*MessageToSign) Descriptor() ([]byte, []int) { return fileDescriptor_186b66ae011355e3, []int{4} } - func (m *MessageToSign) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *MessageToSign) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_MessageToSign.Marshal(b, m, deterministic) @@ -262,15 +238,12 @@ func (m *MessageToSign) XXX_Marshal(b []byte, deterministic bool) ([]byte, error return b[:n], nil } } - func (m *MessageToSign) XXX_Merge(src proto.Message) { xxx_messageInfo_MessageToSign.Merge(m, src) } - func (m *MessageToSign) XXX_Size() int { return m.Size() } - func (m *MessageToSign) XXX_DiscardUnknown() { xxx_messageInfo_MessageToSign.DiscardUnknown(m) } @@ -319,11 +292,9 @@ func (*ValidatorSignature) ProtoMessage() {} func (*ValidatorSignature) Descriptor() ([]byte, []int) { return fileDescriptor_186b66ae011355e3, []int{5} } - func (m *ValidatorSignature) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *ValidatorSignature) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_ValidatorSignature.Marshal(b, m, deterministic) @@ -336,15 +307,12 @@ func (m *ValidatorSignature) XXX_Marshal(b []byte, deterministic bool) ([]byte, return b[:n], nil } } - func (m *ValidatorSignature) XXX_Merge(src proto.Message) { xxx_messageInfo_ValidatorSignature.Merge(m, src) } - func (m *ValidatorSignature) XXX_Size() int { return m.Size() } - func (m *ValidatorSignature) XXX_DiscardUnknown() { xxx_messageInfo_ValidatorSignature.DiscardUnknown(m) } @@ -395,6 +363,7 @@ type MessageWithSignatures struct { PublicAccessData []byte `protobuf:"bytes,6,opt,name=publicAccessData,proto3" json:"publicAccessData,omitempty"` ErrorData []byte `protobuf:"bytes,7,opt,name=errorData,proto3" json:"errorData,omitempty"` Evidence []*Evidence `protobuf:"bytes,8,rep,name=evidence,proto3" json:"evidence,omitempty"` + ValsetID uint64 `protobuf:"varint,9,opt,name=valsetID,proto3" json:"valsetID,omitempty"` } func (m *MessageWithSignatures) Reset() { *m = MessageWithSignatures{} } @@ -403,11 +372,9 @@ func (*MessageWithSignatures) ProtoMessage() {} func (*MessageWithSignatures) Descriptor() ([]byte, []int) { return fileDescriptor_186b66ae011355e3, []int{6} } - func (m *MessageWithSignatures) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *MessageWithSignatures) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_MessageWithSignatures.Marshal(b, m, deterministic) @@ -420,15 +387,12 @@ func (m *MessageWithSignatures) XXX_Marshal(b []byte, deterministic bool) ([]byt return b[:n], nil } } - func (m *MessageWithSignatures) XXX_Merge(src proto.Message) { xxx_messageInfo_MessageWithSignatures.Merge(m, src) } - func (m *MessageWithSignatures) XXX_Size() int { return m.Size() } - func (m *MessageWithSignatures) XXX_DiscardUnknown() { xxx_messageInfo_MessageWithSignatures.DiscardUnknown(m) } @@ -491,6 +455,13 @@ func (m *MessageWithSignatures) GetEvidence() []*Evidence { return nil } +func (m *MessageWithSignatures) GetValsetID() uint64 { + if m != nil { + return m.ValsetID + } + return 0 +} + type QueryMessageByIDRequest struct { QueueTypeName string `protobuf:"bytes,1,opt,name=queueTypeName,proto3" json:"queueTypeName,omitempty"` Id uint64 `protobuf:"varint,2,opt,name=id,proto3" json:"id,omitempty"` @@ -502,11 +473,9 @@ func (*QueryMessageByIDRequest) ProtoMessage() {} func (*QueryMessageByIDRequest) Descriptor() ([]byte, []int) { return fileDescriptor_186b66ae011355e3, []int{7} } - func (m *QueryMessageByIDRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *QueryMessageByIDRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_QueryMessageByIDRequest.Marshal(b, m, deterministic) @@ -519,15 +488,12 @@ func (m *QueryMessageByIDRequest) XXX_Marshal(b []byte, deterministic bool) ([]b return b[:n], nil } } - func (m *QueryMessageByIDRequest) XXX_Merge(src proto.Message) { xxx_messageInfo_QueryMessageByIDRequest.Merge(m, src) } - func (m *QueryMessageByIDRequest) XXX_Size() int { return m.Size() } - func (m *QueryMessageByIDRequest) XXX_DiscardUnknown() { xxx_messageInfo_QueryMessageByIDRequest.DiscardUnknown(m) } @@ -559,11 +525,9 @@ func (*QueryMessagesInQueueRequest) ProtoMessage() {} func (*QueryMessagesInQueueRequest) Descriptor() ([]byte, []int) { return fileDescriptor_186b66ae011355e3, []int{8} } - func (m *QueryMessagesInQueueRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *QueryMessagesInQueueRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_QueryMessagesInQueueRequest.Marshal(b, m, deterministic) @@ -576,15 +540,12 @@ func (m *QueryMessagesInQueueRequest) XXX_Marshal(b []byte, deterministic bool) return b[:n], nil } } - func (m *QueryMessagesInQueueRequest) XXX_Merge(src proto.Message) { xxx_messageInfo_QueryMessagesInQueueRequest.Merge(m, src) } - func (m *QueryMessagesInQueueRequest) XXX_Size() int { return m.Size() } - func (m *QueryMessagesInQueueRequest) XXX_DiscardUnknown() { xxx_messageInfo_QueryMessagesInQueueRequest.DiscardUnknown(m) } @@ -615,11 +576,9 @@ func (*QueryMessagesInQueueResponse) ProtoMessage() {} func (*QueryMessagesInQueueResponse) Descriptor() ([]byte, []int) { return fileDescriptor_186b66ae011355e3, []int{9} } - func (m *QueryMessagesInQueueResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *QueryMessagesInQueueResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_QueryMessagesInQueueResponse.Marshal(b, m, deterministic) @@ -632,15 +591,12 @@ func (m *QueryMessagesInQueueResponse) XXX_Marshal(b []byte, deterministic bool) return b[:n], nil } } - func (m *QueryMessagesInQueueResponse) XXX_Merge(src proto.Message) { xxx_messageInfo_QueryMessagesInQueueResponse.Merge(m, src) } - func (m *QueryMessagesInQueueResponse) XXX_Size() int { return m.Size() } - func (m *QueryMessagesInQueueResponse) XXX_DiscardUnknown() { xxx_messageInfo_QueryMessagesInQueueResponse.DiscardUnknown(m) } @@ -665,11 +621,9 @@ func (*QueryQueuedMessagesForRelayingRequest) ProtoMessage() {} func (*QueryQueuedMessagesForRelayingRequest) Descriptor() ([]byte, []int) { return fileDescriptor_186b66ae011355e3, []int{10} } - func (m *QueryQueuedMessagesForRelayingRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *QueryQueuedMessagesForRelayingRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_QueryQueuedMessagesForRelayingRequest.Marshal(b, m, deterministic) @@ -682,15 +636,12 @@ func (m *QueryQueuedMessagesForRelayingRequest) XXX_Marshal(b []byte, determinis return b[:n], nil } } - func (m *QueryQueuedMessagesForRelayingRequest) XXX_Merge(src proto.Message) { xxx_messageInfo_QueryQueuedMessagesForRelayingRequest.Merge(m, src) } - func (m *QueryQueuedMessagesForRelayingRequest) XXX_Size() int { return m.Size() } - func (m *QueryQueuedMessagesForRelayingRequest) XXX_DiscardUnknown() { xxx_messageInfo_QueryQueuedMessagesForRelayingRequest.DiscardUnknown(m) } @@ -723,11 +674,9 @@ func (*QueryQueuedMessagesForRelayingResponse) ProtoMessage() {} func (*QueryQueuedMessagesForRelayingResponse) Descriptor() ([]byte, []int) { return fileDescriptor_186b66ae011355e3, []int{11} } - func (m *QueryQueuedMessagesForRelayingResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *QueryQueuedMessagesForRelayingResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_QueryQueuedMessagesForRelayingResponse.Marshal(b, m, deterministic) @@ -740,15 +689,12 @@ func (m *QueryQueuedMessagesForRelayingResponse) XXX_Marshal(b []byte, determini return b[:n], nil } } - func (m *QueryQueuedMessagesForRelayingResponse) XXX_Merge(src proto.Message) { xxx_messageInfo_QueryQueuedMessagesForRelayingResponse.Merge(m, src) } - func (m *QueryQueuedMessagesForRelayingResponse) XXX_Size() int { return m.Size() } - func (m *QueryQueuedMessagesForRelayingResponse) XXX_DiscardUnknown() { xxx_messageInfo_QueryQueuedMessagesForRelayingResponse.DiscardUnknown(m) } @@ -775,11 +721,9 @@ func (*QueryQueuedMessagesForAttestingRequest) ProtoMessage() {} func (*QueryQueuedMessagesForAttestingRequest) Descriptor() ([]byte, []int) { return fileDescriptor_186b66ae011355e3, []int{12} } - func (m *QueryQueuedMessagesForAttestingRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *QueryQueuedMessagesForAttestingRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_QueryQueuedMessagesForAttestingRequest.Marshal(b, m, deterministic) @@ -792,15 +736,12 @@ func (m *QueryQueuedMessagesForAttestingRequest) XXX_Marshal(b []byte, determini return b[:n], nil } } - func (m *QueryQueuedMessagesForAttestingRequest) XXX_Merge(src proto.Message) { xxx_messageInfo_QueryQueuedMessagesForAttestingRequest.Merge(m, src) } - func (m *QueryQueuedMessagesForAttestingRequest) XXX_Size() int { return m.Size() } - func (m *QueryQueuedMessagesForAttestingRequest) XXX_DiscardUnknown() { xxx_messageInfo_QueryQueuedMessagesForAttestingRequest.DiscardUnknown(m) } @@ -833,11 +774,9 @@ func (*QueryQueuedMessagesForAttestingResponse) ProtoMessage() {} func (*QueryQueuedMessagesForAttestingResponse) Descriptor() ([]byte, []int) { return fileDescriptor_186b66ae011355e3, []int{13} } - func (m *QueryQueuedMessagesForAttestingResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *QueryQueuedMessagesForAttestingResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_QueryQueuedMessagesForAttestingResponse.Marshal(b, m, deterministic) @@ -850,15 +789,12 @@ func (m *QueryQueuedMessagesForAttestingResponse) XXX_Marshal(b []byte, determin return b[:n], nil } } - func (m *QueryQueuedMessagesForAttestingResponse) XXX_Merge(src proto.Message) { xxx_messageInfo_QueryQueuedMessagesForAttestingResponse.Merge(m, src) } - func (m *QueryQueuedMessagesForAttestingResponse) XXX_Size() int { return m.Size() } - func (m *QueryQueuedMessagesForAttestingResponse) XXX_DiscardUnknown() { xxx_messageInfo_QueryQueuedMessagesForAttestingResponse.DiscardUnknown(m) } @@ -872,7 +808,8 @@ func (m *QueryQueuedMessagesForAttestingResponse) GetMessages() []MessageWithSig return nil } -type QueryGetAllQueueNamesRequest struct{} +type QueryGetAllQueueNamesRequest struct { +} func (m *QueryGetAllQueueNamesRequest) Reset() { *m = QueryGetAllQueueNamesRequest{} } func (m *QueryGetAllQueueNamesRequest) String() string { return proto.CompactTextString(m) } @@ -880,11 +817,9 @@ func (*QueryGetAllQueueNamesRequest) ProtoMessage() {} func (*QueryGetAllQueueNamesRequest) Descriptor() ([]byte, []int) { return fileDescriptor_186b66ae011355e3, []int{14} } - func (m *QueryGetAllQueueNamesRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *QueryGetAllQueueNamesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_QueryGetAllQueueNamesRequest.Marshal(b, m, deterministic) @@ -897,15 +832,12 @@ func (m *QueryGetAllQueueNamesRequest) XXX_Marshal(b []byte, deterministic bool) return b[:n], nil } } - func (m *QueryGetAllQueueNamesRequest) XXX_Merge(src proto.Message) { xxx_messageInfo_QueryGetAllQueueNamesRequest.Merge(m, src) } - func (m *QueryGetAllQueueNamesRequest) XXX_Size() int { return m.Size() } - func (m *QueryGetAllQueueNamesRequest) XXX_DiscardUnknown() { xxx_messageInfo_QueryGetAllQueueNamesRequest.DiscardUnknown(m) } @@ -922,11 +854,9 @@ func (*QueryGetAllQueueNamesResponse) ProtoMessage() {} func (*QueryGetAllQueueNamesResponse) Descriptor() ([]byte, []int) { return fileDescriptor_186b66ae011355e3, []int{15} } - func (m *QueryGetAllQueueNamesResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *QueryGetAllQueueNamesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_QueryGetAllQueueNamesResponse.Marshal(b, m, deterministic) @@ -939,15 +869,12 @@ func (m *QueryGetAllQueueNamesResponse) XXX_Marshal(b []byte, deterministic bool return b[:n], nil } } - func (m *QueryGetAllQueueNamesResponse) XXX_Merge(src proto.Message) { xxx_messageInfo_QueryGetAllQueueNamesResponse.Merge(m, src) } - func (m *QueryGetAllQueueNamesResponse) XXX_Size() int { return m.Size() } - func (m *QueryGetAllQueueNamesResponse) XXX_DiscardUnknown() { xxx_messageInfo_QueryGetAllQueueNamesResponse.DiscardUnknown(m) } @@ -985,82 +912,81 @@ func init() { } var fileDescriptor_186b66ae011355e3 = []byte{ - // 1074 bytes of a gzipped FileDescriptorProto + // 1089 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x57, 0xcf, 0x6f, 0xdc, 0x44, - 0x14, 0xce, 0x6c, 0x36, 0x4b, 0xf2, 0xb6, 0x81, 0x6a, 0x08, 0x65, 0x6b, 0xc2, 0x76, 0x65, 0x85, - 0x10, 0x7e, 0xd4, 0x26, 0x89, 0x00, 0xa5, 0x01, 0xa1, 0xdd, 0xa6, 0x54, 0x11, 0x14, 0x1a, 0x53, - 0x8a, 0xe0, 0xb2, 0x9a, 0xb5, 0xa7, 0x8e, 0x55, 0xaf, 0x67, 0xe3, 0xb1, 0xab, 0x2c, 0x55, 0x54, - 0xc4, 0x5f, 0x80, 0xc4, 0x91, 0x03, 0xf0, 0x87, 0x70, 0xe1, 0x80, 0xca, 0xad, 0x88, 0x0b, 0xa7, - 0x08, 0x25, 0x88, 0x03, 0x07, 0xee, 0x70, 0x42, 0x1e, 0x8f, 0x1d, 0xef, 0x6e, 0xf6, 0x47, 0x36, - 0x44, 0xea, 0x29, 0xde, 0x99, 0x79, 0x9f, 0xbf, 0xef, 0x7b, 0x6f, 0x9e, 0x5f, 0x60, 0xa9, 0x45, - 0x5c, 0xd6, 0x24, 0xe6, 0x36, 0x71, 0x3c, 0x3d, 0x7e, 0xd6, 0x4d, 0xe6, 0x71, 0xea, 0xf1, 0x90, - 0xeb, 0x3b, 0x21, 0xf5, 0xdb, 0x5a, 0xcb, 0x67, 0x01, 0xc3, 0xf3, 0x99, 0x93, 0x5a, 0xfc, 0xac, - 0xa5, 0x27, 0x95, 0x39, 0x9b, 0xd9, 0x4c, 0x1c, 0xd4, 0xa3, 0xa7, 0x38, 0x46, 0x99, 0xb7, 0x19, - 0xb3, 0x5d, 0xaa, 0x93, 0x96, 0xa3, 0x13, 0xcf, 0x63, 0x01, 0x09, 0x1c, 0xe6, 0x71, 0xb9, 0xbb, - 0x32, 0xf0, 0xdd, 0xe9, 0x53, 0x7d, 0x27, 0xa4, 0x21, 0x95, 0x31, 0x2f, 0x0d, 0x8c, 0x69, 0x11, - 0x9f, 0x34, 0x13, 0xf8, 0x8b, 0xf2, 0xe5, 0xe2, 0x57, 0x23, 0xbc, 0xa3, 0x13, 0x4f, 0x6a, 0x51, - 0xe7, 0x00, 0x6f, 0x45, 0xd2, 0x6e, 0x8a, 0xf3, 0x06, 0xdd, 0x09, 0x29, 0x0f, 0xd4, 0x4f, 0xe1, - 0xe9, 0x8e, 0x55, 0xde, 0x8a, 0x80, 0x71, 0x0d, 0x0a, 0x31, 0x6e, 0x09, 0x55, 0xd0, 0x52, 0x71, - 0x65, 0x41, 0x1b, 0xe4, 0x84, 0x16, 0x47, 0xd7, 0xf2, 0x0f, 0xf7, 0x2f, 0x4d, 0x18, 0x32, 0x52, - 0xfd, 0x16, 0xc1, 0x82, 0xc0, 0xde, 0x8a, 0xb4, 0x58, 0x37, 0x28, 0xe7, 0xc4, 0xa6, 0xfc, 0x5d, - 0xe6, 0x7f, 0xe4, 0xd8, 0x9e, 0xe3, 0xd9, 0x92, 0x03, 0xde, 0x02, 0xb8, 0x47, 0xdc, 0xaa, 0x65, - 0xf9, 0x94, 0xc7, 0x2f, 0x3c, 0x57, 0x5b, 0xfe, 0x77, 0xff, 0xd2, 0x65, 0xdb, 0x09, 0xb6, 0xc3, - 0x86, 0x66, 0xb2, 0xa6, 0x6e, 0x32, 0xde, 0x64, 0x5c, 0xfe, 0xb9, 0xcc, 0xad, 0xbb, 0x7a, 0xd0, - 0x6e, 0x51, 0xae, 0xdd, 0x4e, 0x03, 0x8d, 0x0c, 0x08, 0x5e, 0x80, 0x59, 0xe1, 0xe0, 0xad, 0x76, - 0x8b, 0x7e, 0x40, 0x9a, 0xb4, 0x94, 0xab, 0xa0, 0xa5, 0x19, 0xa3, 0x73, 0x51, 0xfd, 0x1c, 0x5e, - 0x18, 0x42, 0x50, 0xda, 0xb1, 0x05, 0xb3, 0xcd, 0x78, 0xf7, 0x16, 0x8b, 0xf6, 0x4a, 0xa8, 0x32, - 0xb9, 0x54, 0x5c, 0x79, 0x65, 0xb0, 0x2b, 0x37, 0xb2, 0x21, 0x46, 0x27, 0x82, 0xfa, 0x00, 0x66, - 0x3b, 0xf6, 0xf1, 0x1c, 0x4c, 0x79, 0xcc, 0x33, 0x69, 0x6c, 0x80, 0x11, 0xff, 0xc0, 0x4f, 0x42, - 0xce, 0xb1, 0x04, 0xfb, 0xbc, 0x91, 0x73, 0x2c, 0x5c, 0x81, 0x62, 0xa3, 0x1d, 0x50, 0x2e, 0x79, - 0x4c, 0x8a, 0xb3, 0xd9, 0x25, 0xbc, 0x08, 0x93, 0x4d, 0x6e, 0x97, 0xf2, 0x22, 0x6f, 0x73, 0x5a, - 0x5c, 0x10, 0x5a, 0x52, 0x10, 0x5a, 0xd5, 0x6b, 0x1b, 0xd1, 0x01, 0xf5, 0x1f, 0x04, 0xf8, 0x36, - 0x71, 0x1d, 0x8b, 0x04, 0xb1, 0x60, 0x12, 0x84, 0x3e, 0x3d, 0x8b, 0x64, 0xcc, 0xc3, 0x0c, 0x4f, - 0xf0, 0x85, 0x94, 0x73, 0xc6, 0xd1, 0x42, 0xb4, 0x4b, 0x77, 0x03, 0x9f, 0x6c, 0x90, 0x80, 0x48, - 0x3d, 0x47, 0x0b, 0xf8, 0x0d, 0xb8, 0x40, 0x77, 0x03, 0xea, 0x7b, 0xc4, 0xad, 0x9a, 0x26, 0x0b, - 0xbd, 0x20, 0xa1, 0x96, 0x17, 0x19, 0xed, 0xb3, 0x1b, 0xa1, 0xb6, 0xc2, 0x86, 0xeb, 0x98, 0xef, - 0xd1, 0x76, 0x69, 0x2a, 0x46, 0x4d, 0x17, 0xd4, 0xc3, 0x1c, 0x3c, 0x23, 0xdd, 0xff, 0xc4, 0x09, - 0xb6, 0x53, 0xf5, 0x7c, 0xc4, 0x2c, 0x48, 0x8f, 0x27, 0x87, 0x78, 0x8c, 0xdf, 0x87, 0xe9, 0x48, - 0xa8, 0x90, 0x96, 0x17, 0x25, 0xf3, 0xda, 0xe0, 0x92, 0xe9, 0x4d, 0x88, 0x91, 0x22, 0x74, 0xe7, - 0x7e, 0xaa, 0x37, 0xf7, 0x2f, 0xc3, 0xf9, 0x58, 0x64, 0xd5, 0x34, 0x29, 0xe7, 0xe2, 0xbd, 0x05, - 0x71, 0xac, 0x67, 0x5d, 0xf8, 0xee, 0xfb, 0xcc, 0x17, 0x87, 0x9e, 0x90, 0xbe, 0x27, 0x0b, 0xb8, - 0x06, 0xd3, 0xf4, 0x9e, 0x63, 0xd1, 0xc8, 0x8a, 0x69, 0xc1, 0x7c, 0x71, 0x30, 0xf3, 0x6b, 0xf2, - 0xb4, 0x91, 0xc6, 0xa9, 0x1f, 0xc2, 0xb3, 0xe2, 0x7a, 0x49, 0xa7, 0x6b, 0xed, 0xcd, 0x8d, 0xe4, - 0xca, 0xf7, 0xdc, 0x4f, 0x74, 0xcc, 0xfd, 0xec, 0xb6, 0x5d, 0xfd, 0x11, 0xc1, 0x73, 0x59, 0x44, - 0xbe, 0xe9, 0x89, 0xab, 0x7b, 0x32, 0xd4, 0x3d, 0xa8, 0xf0, 0xbb, 0x4e, 0x2b, 0x21, 0x7c, 0xd3, - 0x67, 0xd1, 0x93, 0x55, 0x6b, 0x1f, 0x95, 0x6f, 0x5c, 0xa5, 0xe3, 0xd4, 0xfd, 0x50, 0x68, 0x35, - 0x84, 0xf9, 0xe3, 0x35, 0xc8, 0x5e, 0xf3, 0x31, 0x4c, 0xcb, 0x4e, 0xc1, 0x65, 0x9b, 0x59, 0x1d, - 0xa9, 0xcd, 0x74, 0x16, 0xb2, 0xec, 0xc5, 0x29, 0x94, 0xfa, 0x1d, 0xea, 0xd7, 0xec, 0x0c, 0xea, - 0x92, 0x76, 0xa6, 0x1d, 0x8f, 0xe6, 0x62, 0x67, 0x9f, 0xc8, 0xfd, 0x0f, 0x7d, 0x42, 0x7d, 0x00, - 0x8b, 0xc3, 0x18, 0x9e, 0xad, 0x47, 0xdf, 0xa3, 0x7e, 0x0c, 0xaa, 0x41, 0x40, 0x79, 0xf0, 0x38, - 0x98, 0xf4, 0x05, 0x82, 0x17, 0x87, 0x72, 0x3c, 0x5b, 0x9b, 0xca, 0xb2, 0x82, 0xaf, 0xd3, 0xa0, - 0xea, 0xba, 0x82, 0x47, 0xa4, 0x36, 0x9d, 0x29, 0xde, 0x84, 0xe7, 0xfb, 0xec, 0x4b, 0x5e, 0x17, - 0xa0, 0x20, 0x7c, 0x8a, 0x59, 0xcd, 0x18, 0xf2, 0xd7, 0xca, 0xcf, 0x45, 0x98, 0x12, 0x91, 0xf8, - 0x1b, 0x04, 0x85, 0x78, 0xa8, 0xc0, 0x43, 0x3a, 0x66, 0xef, 0x4c, 0xa3, 0x2c, 0x9f, 0x20, 0x22, - 0x66, 0xa4, 0xbe, 0xfa, 0xe5, 0xaf, 0x7f, 0x7c, 0x9d, 0x5b, 0xc4, 0x0b, 0xfa, 0x08, 0xb3, 0x16, - 0xfe, 0x13, 0x41, 0xa9, 0xdf, 0xcc, 0x80, 0x6b, 0x23, 0xbc, 0x7d, 0xc8, 0x44, 0xa4, 0x5c, 0x3d, - 0x15, 0x86, 0xd4, 0x54, 0x15, 0x9a, 0xd6, 0xf1, 0x9a, 0x3e, 0x6c, 0xde, 0x0d, 0xa9, 0x55, 0x4f, - 0xb2, 0x5b, 0xbf, 0xc3, 0xfc, 0x3a, 0x97, 0x5a, 0xfe, 0x42, 0x70, 0xb1, 0xef, 0x6d, 0xc4, 0x63, - 0xb1, 0xec, 0xea, 0x36, 0xca, 0xc6, 0xe9, 0x40, 0xa4, 0xd6, 0x9a, 0xd0, 0xfa, 0x16, 0xbe, 0x72, - 0x72, 0xad, 0x7e, 0x22, 0xe7, 0x6f, 0x04, 0x4a, 0xff, 0x4b, 0x85, 0xc7, 0x22, 0xda, 0xdd, 0x37, - 0x94, 0x6b, 0xa7, 0x44, 0x91, 0x7a, 0xaf, 0x0a, 0xbd, 0x6f, 0xe3, 0xf5, 0x93, 0xeb, 0x25, 0xa9, - 0xa2, 0x5f, 0x10, 0x3c, 0xd5, 0xf5, 0x15, 0xc2, 0x6b, 0x23, 0xf0, 0x3b, 0xfe, 0xeb, 0xab, 0x5c, - 0x19, 0x27, 0x54, 0xea, 0xb9, 0x2e, 0xf4, 0x54, 0xf1, 0x3b, 0x83, 0xf5, 0xa4, 0x42, 0x1c, 0x2f, - 0xfe, 0x0f, 0x49, 0xbf, 0xdf, 0xd1, 0x70, 0xf7, 0xf0, 0x0f, 0x08, 0x8a, 0x99, 0x79, 0x03, 0xbf, - 0x3e, 0x3a, 0xa9, 0xcc, 0x7c, 0xa2, 0x8c, 0xd3, 0x27, 0x47, 0x2d, 0xc2, 0x2e, 0xca, 0x89, 0x28, - 0xfd, 0xbe, 0x63, 0xed, 0xe1, 0x9f, 0x10, 0x9c, 0xef, 0xee, 0x9b, 0x78, 0x14, 0x67, 0xfb, 0x34, - 0x63, 0x65, 0x7d, 0xac, 0x58, 0x99, 0x96, 0x35, 0xa1, 0x68, 0x15, 0x2f, 0x0f, 0x56, 0x64, 0xd3, - 0xa0, 0x4e, 0x5c, 0x37, 0x4e, 0x49, 0xdd, 0x8b, 0x20, 0x6a, 0x9b, 0x0f, 0x0f, 0xca, 0xe8, 0xd1, - 0x41, 0x19, 0xfd, 0x7e, 0x50, 0x46, 0x5f, 0x1d, 0x96, 0x27, 0x1e, 0x1d, 0x96, 0x27, 0x7e, 0x3b, - 0x2c, 0x4f, 0x7c, 0xa6, 0x67, 0x3e, 0x7e, 0xc7, 0xc0, 0xee, 0x66, 0x80, 0xc5, 0x97, 0xb0, 0x51, - 0x10, 0x83, 0xf5, 0xea, 0x7f, 0x01, 0x00, 0x00, 0xff, 0xff, 0xa0, 0x1f, 0x5b, 0xbd, 0xb8, 0x0f, - 0x00, 0x00, + 0x14, 0xce, 0x6c, 0x7e, 0x90, 0xbc, 0x34, 0x50, 0x0d, 0xa1, 0x6c, 0x4d, 0xd8, 0x46, 0x56, 0x08, + 0xe1, 0x47, 0x6d, 0x92, 0x08, 0x50, 0x1a, 0x10, 0xda, 0x6d, 0x4a, 0x15, 0x41, 0xa1, 0x31, 0xa5, + 0x08, 0x2e, 0xab, 0x59, 0x7b, 0xea, 0x58, 0xf5, 0x7a, 0x36, 0x9e, 0x71, 0x94, 0xa5, 0x8a, 0x8a, + 0xf8, 0x0b, 0x90, 0x38, 0x72, 0x00, 0xfe, 0x10, 0x2e, 0x1c, 0x50, 0xb9, 0x15, 0x71, 0xe1, 0x54, + 0xa1, 0x04, 0x71, 0xe0, 0xc0, 0x1d, 0x2e, 0x20, 0x8f, 0xc7, 0x8e, 0x77, 0x37, 0xfb, 0x23, 0x1b, + 0x22, 0x71, 0x5a, 0x7b, 0x66, 0xde, 0x37, 0xdf, 0xf7, 0xbd, 0x99, 0xe7, 0xb7, 0xb0, 0xd4, 0x20, + 0x3e, 0xab, 0x13, 0x7b, 0x9b, 0x78, 0x81, 0x99, 0x3c, 0x9b, 0x36, 0x0b, 0x38, 0x0d, 0x78, 0xc4, + 0xcd, 0x9d, 0x88, 0x86, 0x4d, 0xa3, 0x11, 0x32, 0xc1, 0xf0, 0x5c, 0x6e, 0xa5, 0x91, 0x3c, 0x1b, + 0xd9, 0x4a, 0x6d, 0xd6, 0x65, 0x2e, 0x93, 0x0b, 0xcd, 0xf8, 0x29, 0x89, 0xd1, 0xe6, 0x5c, 0xc6, + 0x5c, 0x9f, 0x9a, 0xa4, 0xe1, 0x99, 0x24, 0x08, 0x98, 0x20, 0xc2, 0x63, 0x01, 0x57, 0xb3, 0x2b, + 0x3d, 0xf7, 0xce, 0x9e, 0xaa, 0x3b, 0x11, 0x8d, 0xa8, 0x8a, 0x79, 0xa1, 0x67, 0x4c, 0x83, 0x84, + 0xa4, 0x9e, 0xc2, 0x5f, 0x54, 0x9b, 0xcb, 0xb7, 0x5a, 0x74, 0xc7, 0x24, 0x81, 0xd2, 0xa2, 0xcf, + 0x02, 0xde, 0x8a, 0xa5, 0xdd, 0x94, 0xeb, 0x2d, 0xba, 0x13, 0x51, 0x2e, 0xf4, 0x8f, 0xe1, 0xc9, + 0x96, 0x51, 0xde, 0x88, 0x81, 0x71, 0x05, 0x26, 0x12, 0xdc, 0x22, 0x9a, 0x47, 0x4b, 0xd3, 0x2b, + 0x0b, 0x46, 0x2f, 0x27, 0x8c, 0x24, 0xba, 0x32, 0xf6, 0xe0, 0xd1, 0xa5, 0x11, 0x4b, 0x45, 0xea, + 0x5f, 0x23, 0x58, 0x90, 0xd8, 0x5b, 0xb1, 0x16, 0xe7, 0x06, 0xe5, 0x9c, 0xb8, 0x94, 0xbf, 0xcd, + 0xc2, 0x0f, 0x3c, 0x37, 0xf0, 0x02, 0x57, 0x71, 0xc0, 0x5b, 0x00, 0xbb, 0xc4, 0x2f, 0x3b, 0x4e, + 0x48, 0x79, 0xb2, 0xe1, 0xb9, 0xca, 0xf2, 0xdf, 0x8f, 0x2e, 0x5d, 0x76, 0x3d, 0xb1, 0x1d, 0xd5, + 0x0c, 0x9b, 0xd5, 0x4d, 0x9b, 0xf1, 0x3a, 0xe3, 0xea, 0xe7, 0x32, 0x77, 0xee, 0x9a, 0xa2, 0xd9, + 0xa0, 0xdc, 0xb8, 0x9d, 0x05, 0x5a, 0x39, 0x10, 0xbc, 0x00, 0x33, 0xd2, 0xc1, 0x5b, 0xcd, 0x06, + 0x7d, 0x8f, 0xd4, 0x69, 0xb1, 0x30, 0x8f, 0x96, 0xa6, 0xac, 0xd6, 0x41, 0xfd, 0x53, 0x78, 0xae, + 0x0f, 0x41, 0x65, 0xc7, 0x16, 0xcc, 0xd4, 0x93, 0xd9, 0x5b, 0x2c, 0x9e, 0x2b, 0xa2, 0xf9, 0xd1, + 0xa5, 0xe9, 0x95, 0x97, 0x7a, 0xbb, 0x72, 0x23, 0x1f, 0x62, 0xb5, 0x22, 0xe8, 0xf7, 0x61, 0xa6, + 0x65, 0x1e, 0xcf, 0xc2, 0x78, 0xc0, 0x02, 0x9b, 0x26, 0x06, 0x58, 0xc9, 0x0b, 0x7e, 0x1c, 0x0a, + 0x9e, 0x23, 0xd9, 0x8f, 0x59, 0x05, 0xcf, 0xc1, 0xf3, 0x30, 0x5d, 0x6b, 0x0a, 0xca, 0x15, 0x8f, + 0x51, 0xb9, 0x36, 0x3f, 0x84, 0x17, 0x61, 0xb4, 0xce, 0xdd, 0xe2, 0x98, 0xcc, 0xdb, 0xac, 0x91, + 0x1c, 0x08, 0x23, 0x3d, 0x10, 0x46, 0x39, 0x68, 0x5a, 0xf1, 0x02, 0xfd, 0x2f, 0x04, 0xf8, 0x36, + 0xf1, 0x3d, 0x87, 0x88, 0x44, 0x30, 0x11, 0x51, 0x48, 0xcf, 0x22, 0x19, 0x73, 0x30, 0xc5, 0x53, + 0x7c, 0x29, 0xe5, 0x9c, 0x75, 0x34, 0x10, 0xcf, 0xd2, 0x3d, 0x11, 0x92, 0x0d, 0x22, 0x88, 0xd2, + 0x73, 0x34, 0x80, 0x5f, 0x83, 0x0b, 0x74, 0x4f, 0xd0, 0x30, 0x20, 0x7e, 0xd9, 0xb6, 0x59, 0x14, + 0x88, 0x94, 0xda, 0x98, 0xcc, 0x68, 0x97, 0xd9, 0x18, 0xb5, 0x11, 0xd5, 0x7c, 0xcf, 0x7e, 0x87, + 0x36, 0x8b, 0xe3, 0x09, 0x6a, 0x36, 0xa0, 0xff, 0x53, 0x80, 0xa7, 0x94, 0xfb, 0x1f, 0x79, 0x62, + 0x3b, 0x53, 0xcf, 0x07, 0xcc, 0x82, 0xf2, 0x78, 0xb4, 0x8f, 0xc7, 0xf8, 0x5d, 0x98, 0x8c, 0x85, + 0x4a, 0x69, 0x63, 0xf2, 0xc8, 0xbc, 0xd2, 0xfb, 0xc8, 0x74, 0x26, 0xc4, 0xca, 0x10, 0xda, 0x73, + 0x3f, 0xde, 0x99, 0xfb, 0x17, 0xe1, 0x7c, 0x22, 0xb2, 0x6c, 0xdb, 0x94, 0x73, 0xb9, 0xef, 0x84, + 0x5c, 0xd6, 0x31, 0x2e, 0x7d, 0x0f, 0x43, 0x16, 0xca, 0x45, 0x8f, 0x29, 0xdf, 0xd3, 0x01, 0x5c, + 0x81, 0x49, 0xba, 0xeb, 0x39, 0x34, 0xb6, 0x62, 0x52, 0x32, 0x5f, 0xec, 0xcd, 0xfc, 0x9a, 0x5a, + 0x6d, 0x65, 0x71, 0x58, 0x83, 0xc9, 0x5d, 0xe2, 0x73, 0x2a, 0x36, 0x37, 0x8a, 0x53, 0xd2, 0xbb, + 0xec, 0x5d, 0x7f, 0x1f, 0x9e, 0x96, 0x57, 0x4f, 0x65, 0xa1, 0xd2, 0xdc, 0xdc, 0x48, 0xcb, 0x41, + 0xc7, 0xdd, 0x45, 0xc7, 0xdc, 0xdd, 0xf6, 0x94, 0xe8, 0xdf, 0x23, 0x78, 0x26, 0x8f, 0xc8, 0x37, + 0x03, 0x79, 0xad, 0x4f, 0x86, 0xba, 0x0f, 0xf3, 0xfc, 0xae, 0xd7, 0x48, 0xc5, 0xdc, 0x0c, 0x59, + 0xfc, 0xe4, 0x54, 0x9a, 0x47, 0x47, 0x3b, 0x39, 0xc1, 0xc3, 0xdc, 0x89, 0xbe, 0xd0, 0x7a, 0x04, + 0x73, 0xc7, 0x6b, 0x50, 0x75, 0xe8, 0x43, 0x98, 0x54, 0x55, 0x84, 0xab, 0x12, 0xb4, 0x3a, 0x50, + 0x09, 0x6a, 0x3d, 0xe4, 0xaa, 0x4e, 0x67, 0x50, 0xfa, 0x37, 0xa8, 0x5b, 0x21, 0xb4, 0xa8, 0x4f, + 0x9a, 0xb9, 0x52, 0x3d, 0x98, 0x8b, 0xad, 0x35, 0xa4, 0xf0, 0x1f, 0xd4, 0x10, 0xfd, 0x3e, 0x2c, + 0xf6, 0x63, 0x78, 0xb6, 0x1e, 0x7d, 0x8b, 0xba, 0x31, 0x28, 0x0b, 0x41, 0xb9, 0xf8, 0x3f, 0x98, + 0xf4, 0x19, 0x82, 0xe7, 0xfb, 0x72, 0x3c, 0x5b, 0x9b, 0x4a, 0xea, 0x04, 0x5f, 0xa7, 0xa2, 0xec, + 0xfb, 0x92, 0x47, 0xac, 0x36, 0xeb, 0x37, 0x5e, 0x87, 0x67, 0xbb, 0xcc, 0x2b, 0x5e, 0x17, 0x60, + 0x42, 0xfa, 0x94, 0xb0, 0x9a, 0xb2, 0xd4, 0xdb, 0xca, 0x8f, 0xd3, 0x30, 0x2e, 0x23, 0xf1, 0x57, + 0x08, 0x26, 0x92, 0x86, 0x03, 0xf7, 0xa9, 0xa6, 0x9d, 0xfd, 0x8e, 0xb6, 0x7c, 0x82, 0x88, 0x84, + 0x91, 0xfe, 0xf2, 0xe7, 0x3f, 0xff, 0xf6, 0x65, 0x61, 0x11, 0x2f, 0x98, 0x03, 0xf4, 0x61, 0xf8, + 0x77, 0x04, 0xc5, 0x6e, 0xfd, 0x04, 0xae, 0x0c, 0xb0, 0x7b, 0x9f, 0x6e, 0x49, 0xbb, 0x7a, 0x2a, + 0x0c, 0xa5, 0xa9, 0x2c, 0x35, 0xad, 0xe3, 0x35, 0xb3, 0x5f, 0x2f, 0x1c, 0x51, 0xa7, 0x9a, 0x66, + 0xb7, 0x7a, 0x87, 0x85, 0x55, 0xae, 0xb4, 0xfc, 0x81, 0xe0, 0x62, 0xd7, 0xdb, 0x88, 0x87, 0x62, + 0xd9, 0x56, 0x6d, 0xb4, 0x8d, 0xd3, 0x81, 0x28, 0xad, 0x15, 0xa9, 0xf5, 0x0d, 0x7c, 0xe5, 0xe4, + 0x5a, 0xc3, 0x54, 0xce, 0x9f, 0x08, 0xb4, 0xee, 0x97, 0x0a, 0x0f, 0x45, 0xb4, 0xbd, 0x6e, 0x68, + 0xd7, 0x4e, 0x89, 0xa2, 0xf4, 0x5e, 0x95, 0x7a, 0xdf, 0xc4, 0xeb, 0x27, 0xd7, 0x4b, 0x32, 0x45, + 0x3f, 0x21, 0x78, 0xa2, 0xed, 0x2b, 0x84, 0xd7, 0x06, 0xe0, 0x77, 0xfc, 0xd7, 0x57, 0xbb, 0x32, + 0x4c, 0xa8, 0xd2, 0x73, 0x5d, 0xea, 0x29, 0xe3, 0xb7, 0x7a, 0xeb, 0xc9, 0x84, 0x78, 0x41, 0xf2, + 0xef, 0xc9, 0xbc, 0xd7, 0x52, 0x70, 0xf7, 0xf1, 0x77, 0x08, 0xa6, 0x73, 0xfd, 0x06, 0x7e, 0x75, + 0x70, 0x52, 0xb9, 0xfe, 0x44, 0x1b, 0xa6, 0x4e, 0x0e, 0x7a, 0x08, 0xdb, 0x28, 0xa7, 0xa2, 0xcc, + 0x7b, 0x9e, 0xb3, 0x8f, 0x7f, 0x40, 0x70, 0xbe, 0xbd, 0x6e, 0xe2, 0x41, 0x9c, 0xed, 0x52, 0x8c, + 0xb5, 0xf5, 0xa1, 0x62, 0x55, 0x5a, 0xd6, 0xa4, 0xa2, 0x55, 0xbc, 0xdc, 0x5b, 0x91, 0x4b, 0x45, + 0x95, 0xf8, 0x7e, 0x92, 0x92, 0x6a, 0x10, 0x43, 0x54, 0x36, 0x1f, 0x1c, 0x94, 0xd0, 0xc3, 0x83, + 0x12, 0xfa, 0xf5, 0xa0, 0x84, 0xbe, 0x38, 0x2c, 0x8d, 0x3c, 0x3c, 0x2c, 0x8d, 0xfc, 0x72, 0x58, + 0x1a, 0xf9, 0xc4, 0xcc, 0x7d, 0xfc, 0x8e, 0x81, 0xdd, 0xcb, 0x01, 0xcb, 0x2f, 0x61, 0x6d, 0x42, + 0x36, 0xdd, 0xab, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0x87, 0x9e, 0xaa, 0x43, 0xd4, 0x0f, 0x00, + 0x00, } // Reference imports to suppress errors if they are not otherwise used. -var ( - _ context.Context - _ grpc.ClientConn -) +var _ context.Context +var _ grpc.ClientConn // This is a compile-time assertion to ensure that this generated file // is compatible with the grpc package it is being compiled against. @@ -1176,32 +1102,27 @@ type QueryServer interface { } // UnimplementedQueryServer can be embedded to have forward compatible implementations. -type UnimplementedQueryServer struct{} +type UnimplementedQueryServer struct { +} func (*UnimplementedQueryServer) Params(ctx context.Context, req *QueryParamsRequest) (*QueryParamsResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method Params not implemented") } - func (*UnimplementedQueryServer) QueuedMessagesForSigning(ctx context.Context, req *QueryQueuedMessagesForSigningRequest) (*QueryQueuedMessagesForSigningResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method QueuedMessagesForSigning not implemented") } - func (*UnimplementedQueryServer) QueuedMessagesForRelaying(ctx context.Context, req *QueryQueuedMessagesForRelayingRequest) (*QueryQueuedMessagesForRelayingResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method QueuedMessagesForRelaying not implemented") } - func (*UnimplementedQueryServer) QueuedMessagesForAttesting(ctx context.Context, req *QueryQueuedMessagesForAttestingRequest) (*QueryQueuedMessagesForAttestingResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method QueuedMessagesForAttesting not implemented") } - func (*UnimplementedQueryServer) MessagesInQueue(ctx context.Context, req *QueryMessagesInQueueRequest) (*QueryMessagesInQueueResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method MessagesInQueue not implemented") } - func (*UnimplementedQueryServer) MessageByID(ctx context.Context, req *QueryMessageByIDRequest) (*MessageWithSignatures, error) { return nil, status.Errorf(codes.Unimplemented, "method MessageByID not implemented") } - func (*UnimplementedQueryServer) GetAllQueueNames(ctx context.Context, req *QueryGetAllQueueNamesRequest) (*QueryGetAllQueueNamesResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method GetAllQueueNames not implemented") } @@ -1635,6 +1556,11 @@ func (m *MessageWithSignatures) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if m.ValsetID != 0 { + i = encodeVarintQuery(dAtA, i, uint64(m.ValsetID)) + i-- + dAtA[i] = 0x48 + } if len(m.Evidence) > 0 { for iNdEx := len(m.Evidence) - 1; iNdEx >= 0; iNdEx-- { { @@ -2034,7 +1960,6 @@ func encodeVarintQuery(dAtA []byte, offset int, v uint64) int { dAtA[offset] = uint8(v) return base } - func (m *QueryParamsRequest) Size() (n int) { if m == nil { return 0 @@ -2181,6 +2106,9 @@ func (m *MessageWithSignatures) Size() (n int) { n += 1 + l + sovQuery(uint64(l)) } } + if m.ValsetID != 0 { + n += 1 + sovQuery(uint64(m.ValsetID)) + } return n } @@ -2323,11 +2251,9 @@ func (m *QueryGetAllQueueNamesResponse) Size() (n int) { func sovQuery(x uint64) (n int) { return (math_bits.Len64(x|1) + 6) / 7 } - func sozQuery(x uint64) (n int) { return sovQuery(uint64((x << 1) ^ uint64((int64(x) >> 63)))) } - func (m *QueryParamsRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -2378,7 +2304,6 @@ func (m *QueryParamsRequest) Unmarshal(dAtA []byte) error { } return nil } - func (m *QueryParamsResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -2462,7 +2387,6 @@ func (m *QueryParamsResponse) Unmarshal(dAtA []byte) error { } return nil } - func (m *QueryQueuedMessagesForSigningRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -2579,7 +2503,6 @@ func (m *QueryQueuedMessagesForSigningRequest) Unmarshal(dAtA []byte) error { } return nil } - func (m *QueryQueuedMessagesForSigningResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -2664,7 +2587,6 @@ func (m *QueryQueuedMessagesForSigningResponse) Unmarshal(dAtA []byte) error { } return nil } - func (m *MessageToSign) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -2838,7 +2760,6 @@ func (m *MessageToSign) Unmarshal(dAtA []byte) error { } return nil } - func (m *ValidatorSignature) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -3057,7 +2978,6 @@ func (m *ValidatorSignature) Unmarshal(dAtA []byte) error { } return nil } - func (m *MessageWithSignatures) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -3346,6 +3266,25 @@ func (m *MessageWithSignatures) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex + case 9: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field ValsetID", wireType) + } + m.ValsetID = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.ValsetID |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } default: iNdEx = preIndex skippy, err := skipQuery(dAtA[iNdEx:]) @@ -3367,7 +3306,6 @@ func (m *MessageWithSignatures) Unmarshal(dAtA []byte) error { } return nil } - func (m *QueryMessageByIDRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -3469,7 +3407,6 @@ func (m *QueryMessageByIDRequest) Unmarshal(dAtA []byte) error { } return nil } - func (m *QueryMessagesInQueueRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -3586,7 +3523,6 @@ func (m *QueryMessagesInQueueRequest) Unmarshal(dAtA []byte) error { } return nil } - func (m *QueryMessagesInQueueResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -3671,7 +3607,6 @@ func (m *QueryMessagesInQueueResponse) Unmarshal(dAtA []byte) error { } return nil } - func (m *QueryQueuedMessagesForRelayingRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -3788,7 +3723,6 @@ func (m *QueryQueuedMessagesForRelayingRequest) Unmarshal(dAtA []byte) error { } return nil } - func (m *QueryQueuedMessagesForRelayingResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -3873,7 +3807,6 @@ func (m *QueryQueuedMessagesForRelayingResponse) Unmarshal(dAtA []byte) error { } return nil } - func (m *QueryQueuedMessagesForAttestingRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -3990,7 +3923,6 @@ func (m *QueryQueuedMessagesForAttestingRequest) Unmarshal(dAtA []byte) error { } return nil } - func (m *QueryQueuedMessagesForAttestingResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -4075,7 +4007,6 @@ func (m *QueryQueuedMessagesForAttestingResponse) Unmarshal(dAtA []byte) error { } return nil } - func (m *QueryGetAllQueueNamesRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -4126,7 +4057,6 @@ func (m *QueryGetAllQueueNamesRequest) Unmarshal(dAtA []byte) error { } return nil } - func (m *QueryGetAllQueueNamesResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -4209,7 +4139,6 @@ func (m *QueryGetAllQueueNamesResponse) Unmarshal(dAtA []byte) error { } return nil } - func skipQuery(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 diff --git a/x/consensus/types/query.pb.gw.go b/x/consensus/types/query.pb.gw.go index bff900b5..5c30f818 100644 --- a/x/consensus/types/query.pb.gw.go +++ b/x/consensus/types/query.pb.gw.go @@ -25,15 +25,13 @@ import ( ) // Suppress "imported and not used" errors -var ( - _ codes.Code - _ io.Reader - _ status.Status - _ = runtime.String - _ = utilities.NewDoubleArray - _ = descriptor.ForMessage - _ = metadata.Join -) +var _ codes.Code +var _ io.Reader +var _ status.Status +var _ = runtime.String +var _ = utilities.NewDoubleArray +var _ = descriptor.ForMessage +var _ = metadata.Join func request_Query_Params_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq QueryParamsRequest @@ -41,6 +39,7 @@ func request_Query_Params_0(ctx context.Context, marshaler runtime.Marshaler, cl msg, err := client.Params(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err + } func local_request_Query_Params_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -49,9 +48,12 @@ func local_request_Query_Params_0(ctx context.Context, marshaler runtime.Marshal msg, err := server.Params(ctx, &protoReq) return msg, metadata, err + } -var filter_Query_QueuedMessagesForSigning_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)} +var ( + filter_Query_QueuedMessagesForSigning_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)} +) func request_Query_QueuedMessagesForSigning_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq QueryQueuedMessagesForSigningRequest @@ -66,6 +68,7 @@ func request_Query_QueuedMessagesForSigning_0(ctx context.Context, marshaler run msg, err := client.QueuedMessagesForSigning(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err + } func local_request_Query_QueuedMessagesForSigning_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -81,9 +84,12 @@ func local_request_Query_QueuedMessagesForSigning_0(ctx context.Context, marshal msg, err := server.QueuedMessagesForSigning(ctx, &protoReq) return msg, metadata, err + } -var filter_Query_QueuedMessagesForRelaying_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)} +var ( + filter_Query_QueuedMessagesForRelaying_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)} +) func request_Query_QueuedMessagesForRelaying_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq QueryQueuedMessagesForRelayingRequest @@ -98,6 +104,7 @@ func request_Query_QueuedMessagesForRelaying_0(ctx context.Context, marshaler ru msg, err := client.QueuedMessagesForRelaying(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err + } func local_request_Query_QueuedMessagesForRelaying_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -113,9 +120,12 @@ func local_request_Query_QueuedMessagesForRelaying_0(ctx context.Context, marsha msg, err := server.QueuedMessagesForRelaying(ctx, &protoReq) return msg, metadata, err + } -var filter_Query_QueuedMessagesForAttesting_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)} +var ( + filter_Query_QueuedMessagesForAttesting_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)} +) func request_Query_QueuedMessagesForAttesting_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq QueryQueuedMessagesForAttestingRequest @@ -130,6 +140,7 @@ func request_Query_QueuedMessagesForAttesting_0(ctx context.Context, marshaler r msg, err := client.QueuedMessagesForAttesting(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err + } func local_request_Query_QueuedMessagesForAttesting_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -145,9 +156,12 @@ func local_request_Query_QueuedMessagesForAttesting_0(ctx context.Context, marsh msg, err := server.QueuedMessagesForAttesting(ctx, &protoReq) return msg, metadata, err + } -var filter_Query_MessagesInQueue_0 = &utilities.DoubleArray{Encoding: map[string]int{"queueTypeName": 0}, Base: []int{1, 1, 0}, Check: []int{0, 1, 2}} +var ( + filter_Query_MessagesInQueue_0 = &utilities.DoubleArray{Encoding: map[string]int{"queueTypeName": 0}, Base: []int{1, 1, 0}, Check: []int{0, 1, 2}} +) func request_Query_MessagesInQueue_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq QueryMessagesInQueueRequest @@ -166,6 +180,7 @@ func request_Query_MessagesInQueue_0(ctx context.Context, marshaler runtime.Mars } protoReq.QueueTypeName, err = runtime.String(val) + if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "queueTypeName", err) } @@ -179,6 +194,7 @@ func request_Query_MessagesInQueue_0(ctx context.Context, marshaler runtime.Mars msg, err := client.MessagesInQueue(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err + } func local_request_Query_MessagesInQueue_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -198,6 +214,7 @@ func local_request_Query_MessagesInQueue_0(ctx context.Context, marshaler runtim } protoReq.QueueTypeName, err = runtime.String(val) + if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "queueTypeName", err) } @@ -211,6 +228,7 @@ func local_request_Query_MessagesInQueue_0(ctx context.Context, marshaler runtim msg, err := server.MessagesInQueue(ctx, &protoReq) return msg, metadata, err + } func request_Query_MessageByID_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -230,6 +248,7 @@ func request_Query_MessageByID_0(ctx context.Context, marshaler runtime.Marshale } protoReq.QueueTypeName, err = runtime.String(val) + if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "queueTypeName", err) } @@ -240,12 +259,14 @@ func request_Query_MessageByID_0(ctx context.Context, marshaler runtime.Marshale } protoReq.Id, err = runtime.Uint64(val) + if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "id", err) } msg, err := client.MessageByID(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err + } func local_request_Query_MessageByID_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -265,6 +286,7 @@ func local_request_Query_MessageByID_0(ctx context.Context, marshaler runtime.Ma } protoReq.QueueTypeName, err = runtime.String(val) + if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "queueTypeName", err) } @@ -275,12 +297,14 @@ func local_request_Query_MessageByID_0(ctx context.Context, marshaler runtime.Ma } protoReq.Id, err = runtime.Uint64(val) + if err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "id", err) } msg, err := server.MessageByID(ctx, &protoReq) return msg, metadata, err + } func request_Query_GetAllQueueNames_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -289,6 +313,7 @@ func request_Query_GetAllQueueNames_0(ctx context.Context, marshaler runtime.Mar msg, err := client.GetAllQueueNames(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err + } func local_request_Query_GetAllQueueNames_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -297,6 +322,7 @@ func local_request_Query_GetAllQueueNames_0(ctx context.Context, marshaler runti msg, err := server.GetAllQueueNames(ctx, &protoReq) return msg, metadata, err + } // RegisterQueryHandlerServer registers the http handlers for service Query to "mux". @@ -304,6 +330,7 @@ func local_request_Query_GetAllQueueNames_0(ctx context.Context, marshaler runti // StreamingRPC :currently unsupported pending https://github.com/grpc/grpc-go/issues/906. // Note that using this registration option will cause many gRPC library features to stop working. Consider using RegisterQueryHandlerFromEndpoint instead. func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, server QueryServer) error { + mux.Handle("GET", pattern_Query_Params_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() @@ -324,6 +351,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv } forward_Query_Params_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) mux.Handle("GET", pattern_Query_QueuedMessagesForSigning_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { @@ -346,6 +374,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv } forward_Query_QueuedMessagesForSigning_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) mux.Handle("GET", pattern_Query_QueuedMessagesForRelaying_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { @@ -368,6 +397,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv } forward_Query_QueuedMessagesForRelaying_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) mux.Handle("GET", pattern_Query_QueuedMessagesForAttesting_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { @@ -390,6 +420,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv } forward_Query_QueuedMessagesForAttesting_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) mux.Handle("GET", pattern_Query_MessagesInQueue_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { @@ -412,6 +443,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv } forward_Query_MessagesInQueue_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) mux.Handle("GET", pattern_Query_MessageByID_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { @@ -434,6 +466,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv } forward_Query_MessageByID_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) mux.Handle("GET", pattern_Query_GetAllQueueNames_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { @@ -456,6 +489,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv } forward_Query_GetAllQueueNames_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) return nil @@ -498,6 +532,7 @@ func RegisterQueryHandler(ctx context.Context, mux *runtime.ServeMux, conn *grpc // doesn't go through the normal gRPC flow (creating a gRPC client etc.) then it will be up to the passed in // "QueryClient" to call the correct interceptors. func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, client QueryClient) error { + mux.Handle("GET", pattern_Query_Params_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() @@ -515,6 +550,7 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie } forward_Query_Params_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) mux.Handle("GET", pattern_Query_QueuedMessagesForSigning_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { @@ -534,6 +570,7 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie } forward_Query_QueuedMessagesForSigning_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) mux.Handle("GET", pattern_Query_QueuedMessagesForRelaying_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { @@ -553,6 +590,7 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie } forward_Query_QueuedMessagesForRelaying_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) mux.Handle("GET", pattern_Query_QueuedMessagesForAttesting_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { @@ -572,6 +610,7 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie } forward_Query_QueuedMessagesForAttesting_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) mux.Handle("GET", pattern_Query_MessagesInQueue_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { @@ -591,6 +630,7 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie } forward_Query_MessagesInQueue_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) mux.Handle("GET", pattern_Query_MessageByID_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { @@ -610,6 +650,7 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie } forward_Query_MessageByID_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) mux.Handle("GET", pattern_Query_GetAllQueueNames_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { @@ -629,6 +670,7 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie } forward_Query_GetAllQueueNames_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + }) return nil diff --git a/x/consensus/types/tx.pb.go b/x/consensus/types/tx.pb.go index 0f4c3353..b88f4926 100644 --- a/x/consensus/types/tx.pb.go +++ b/x/consensus/types/tx.pb.go @@ -6,10 +6,6 @@ package types import ( context "context" fmt "fmt" - io "io" - math "math" - math_bits "math/bits" - types1 "github.com/cosmos/cosmos-sdk/codec/types" _ "github.com/cosmos/cosmos-sdk/types/msgservice" _ "github.com/cosmos/gogoproto/gogoproto" @@ -19,14 +15,15 @@ import ( grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" + io "io" + math "math" + math_bits "math/bits" ) // Reference imports to suppress errors if they are not otherwise used. -var ( - _ = proto.Marshal - _ = fmt.Errorf - _ = math.Inf -) +var _ = proto.Marshal +var _ = fmt.Errorf +var _ = math.Inf // This is a compile-time assertion to ensure that this generated file // is compatible with the proto package it is being compiled against. @@ -45,11 +42,9 @@ func (*MsgAddMessagesSignatures) ProtoMessage() {} func (*MsgAddMessagesSignatures) Descriptor() ([]byte, []int) { return fileDescriptor_9a053a9b8cda05fe, []int{0} } - func (m *MsgAddMessagesSignatures) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *MsgAddMessagesSignatures) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_MsgAddMessagesSignatures.Marshal(b, m, deterministic) @@ -62,15 +57,12 @@ func (m *MsgAddMessagesSignatures) XXX_Marshal(b []byte, deterministic bool) ([] return b[:n], nil } } - func (m *MsgAddMessagesSignatures) XXX_Merge(src proto.Message) { xxx_messageInfo_MsgAddMessagesSignatures.Merge(m, src) } - func (m *MsgAddMessagesSignatures) XXX_Size() int { return m.Size() } - func (m *MsgAddMessagesSignatures) XXX_DiscardUnknown() { xxx_messageInfo_MsgAddMessagesSignatures.DiscardUnknown(m) } @@ -104,11 +96,9 @@ func (*ConsensusMessageSignature) ProtoMessage() {} func (*ConsensusMessageSignature) Descriptor() ([]byte, []int) { return fileDescriptor_9a053a9b8cda05fe, []int{1} } - func (m *ConsensusMessageSignature) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *ConsensusMessageSignature) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_ConsensusMessageSignature.Marshal(b, m, deterministic) @@ -121,15 +111,12 @@ func (m *ConsensusMessageSignature) XXX_Marshal(b []byte, deterministic bool) ([ return b[:n], nil } } - func (m *ConsensusMessageSignature) XXX_Merge(src proto.Message) { xxx_messageInfo_ConsensusMessageSignature.Merge(m, src) } - func (m *ConsensusMessageSignature) XXX_Size() int { return m.Size() } - func (m *ConsensusMessageSignature) XXX_DiscardUnknown() { xxx_messageInfo_ConsensusMessageSignature.DiscardUnknown(m) } @@ -164,7 +151,8 @@ func (m *ConsensusMessageSignature) GetSignedByAddress() string { return "" } -type MsgAddMessagesSignaturesResponse struct{} +type MsgAddMessagesSignaturesResponse struct { +} func (m *MsgAddMessagesSignaturesResponse) Reset() { *m = MsgAddMessagesSignaturesResponse{} } func (m *MsgAddMessagesSignaturesResponse) String() string { return proto.CompactTextString(m) } @@ -172,11 +160,9 @@ func (*MsgAddMessagesSignaturesResponse) ProtoMessage() {} func (*MsgAddMessagesSignaturesResponse) Descriptor() ([]byte, []int) { return fileDescriptor_9a053a9b8cda05fe, []int{2} } - func (m *MsgAddMessagesSignaturesResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *MsgAddMessagesSignaturesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_MsgAddMessagesSignaturesResponse.Marshal(b, m, deterministic) @@ -189,15 +175,12 @@ func (m *MsgAddMessagesSignaturesResponse) XXX_Marshal(b []byte, deterministic b return b[:n], nil } } - func (m *MsgAddMessagesSignaturesResponse) XXX_Merge(src proto.Message) { xxx_messageInfo_MsgAddMessagesSignaturesResponse.Merge(m, src) } - func (m *MsgAddMessagesSignaturesResponse) XXX_Size() int { return m.Size() } - func (m *MsgAddMessagesSignaturesResponse) XXX_DiscardUnknown() { xxx_messageInfo_MsgAddMessagesSignaturesResponse.DiscardUnknown(m) } @@ -217,11 +200,9 @@ func (*MsgAddEvidence) ProtoMessage() {} func (*MsgAddEvidence) Descriptor() ([]byte, []int) { return fileDescriptor_9a053a9b8cda05fe, []int{3} } - func (m *MsgAddEvidence) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *MsgAddEvidence) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_MsgAddEvidence.Marshal(b, m, deterministic) @@ -234,15 +215,12 @@ func (m *MsgAddEvidence) XXX_Marshal(b []byte, deterministic bool) ([]byte, erro return b[:n], nil } } - func (m *MsgAddEvidence) XXX_Merge(src proto.Message) { xxx_messageInfo_MsgAddEvidence.Merge(m, src) } - func (m *MsgAddEvidence) XXX_Size() int { return m.Size() } - func (m *MsgAddEvidence) XXX_DiscardUnknown() { xxx_messageInfo_MsgAddEvidence.DiscardUnknown(m) } @@ -277,7 +255,8 @@ func (m *MsgAddEvidence) GetMetadata() types.MsgMetadata { return types.MsgMetadata{} } -type MsgAddEvidenceResponse struct{} +type MsgAddEvidenceResponse struct { +} func (m *MsgAddEvidenceResponse) Reset() { *m = MsgAddEvidenceResponse{} } func (m *MsgAddEvidenceResponse) String() string { return proto.CompactTextString(m) } @@ -285,11 +264,9 @@ func (*MsgAddEvidenceResponse) ProtoMessage() {} func (*MsgAddEvidenceResponse) Descriptor() ([]byte, []int) { return fileDescriptor_9a053a9b8cda05fe, []int{4} } - func (m *MsgAddEvidenceResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *MsgAddEvidenceResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_MsgAddEvidenceResponse.Marshal(b, m, deterministic) @@ -302,15 +279,12 @@ func (m *MsgAddEvidenceResponse) XXX_Marshal(b []byte, deterministic bool) ([]by return b[:n], nil } } - func (m *MsgAddEvidenceResponse) XXX_Merge(src proto.Message) { xxx_messageInfo_MsgAddEvidenceResponse.Merge(m, src) } - func (m *MsgAddEvidenceResponse) XXX_Size() int { return m.Size() } - func (m *MsgAddEvidenceResponse) XXX_DiscardUnknown() { xxx_messageInfo_MsgAddEvidenceResponse.DiscardUnknown(m) } @@ -322,6 +296,7 @@ type MsgSetPublicAccessData struct { QueueTypeName string `protobuf:"bytes,3,opt,name=queueTypeName,proto3" json:"queueTypeName,omitempty"` Data []byte `protobuf:"bytes,4,opt,name=data,proto3" json:"data,omitempty"` Metadata types.MsgMetadata `protobuf:"bytes,5,opt,name=metadata,proto3" json:"metadata"` + ValsetID uint64 `protobuf:"varint,6,opt,name=valsetID,proto3" json:"valsetID,omitempty"` } func (m *MsgSetPublicAccessData) Reset() { *m = MsgSetPublicAccessData{} } @@ -330,11 +305,9 @@ func (*MsgSetPublicAccessData) ProtoMessage() {} func (*MsgSetPublicAccessData) Descriptor() ([]byte, []int) { return fileDescriptor_9a053a9b8cda05fe, []int{5} } - func (m *MsgSetPublicAccessData) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *MsgSetPublicAccessData) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_MsgSetPublicAccessData.Marshal(b, m, deterministic) @@ -347,15 +320,12 @@ func (m *MsgSetPublicAccessData) XXX_Marshal(b []byte, deterministic bool) ([]by return b[:n], nil } } - func (m *MsgSetPublicAccessData) XXX_Merge(src proto.Message) { xxx_messageInfo_MsgSetPublicAccessData.Merge(m, src) } - func (m *MsgSetPublicAccessData) XXX_Size() int { return m.Size() } - func (m *MsgSetPublicAccessData) XXX_DiscardUnknown() { xxx_messageInfo_MsgSetPublicAccessData.DiscardUnknown(m) } @@ -390,7 +360,15 @@ func (m *MsgSetPublicAccessData) GetMetadata() types.MsgMetadata { return types.MsgMetadata{} } -type MsgSetPublicAccessDataResponse struct{} +func (m *MsgSetPublicAccessData) GetValsetID() uint64 { + if m != nil { + return m.ValsetID + } + return 0 +} + +type MsgSetPublicAccessDataResponse struct { +} func (m *MsgSetPublicAccessDataResponse) Reset() { *m = MsgSetPublicAccessDataResponse{} } func (m *MsgSetPublicAccessDataResponse) String() string { return proto.CompactTextString(m) } @@ -398,11 +376,9 @@ func (*MsgSetPublicAccessDataResponse) ProtoMessage() {} func (*MsgSetPublicAccessDataResponse) Descriptor() ([]byte, []int) { return fileDescriptor_9a053a9b8cda05fe, []int{6} } - func (m *MsgSetPublicAccessDataResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *MsgSetPublicAccessDataResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_MsgSetPublicAccessDataResponse.Marshal(b, m, deterministic) @@ -415,15 +391,12 @@ func (m *MsgSetPublicAccessDataResponse) XXX_Marshal(b []byte, deterministic boo return b[:n], nil } } - func (m *MsgSetPublicAccessDataResponse) XXX_Merge(src proto.Message) { xxx_messageInfo_MsgSetPublicAccessDataResponse.Merge(m, src) } - func (m *MsgSetPublicAccessDataResponse) XXX_Size() int { return m.Size() } - func (m *MsgSetPublicAccessDataResponse) XXX_DiscardUnknown() { xxx_messageInfo_MsgSetPublicAccessDataResponse.DiscardUnknown(m) } @@ -443,11 +416,9 @@ func (*MsgSetErrorData) ProtoMessage() {} func (*MsgSetErrorData) Descriptor() ([]byte, []int) { return fileDescriptor_9a053a9b8cda05fe, []int{7} } - func (m *MsgSetErrorData) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *MsgSetErrorData) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_MsgSetErrorData.Marshal(b, m, deterministic) @@ -460,15 +431,12 @@ func (m *MsgSetErrorData) XXX_Marshal(b []byte, deterministic bool) ([]byte, err return b[:n], nil } } - func (m *MsgSetErrorData) XXX_Merge(src proto.Message) { xxx_messageInfo_MsgSetErrorData.Merge(m, src) } - func (m *MsgSetErrorData) XXX_Size() int { return m.Size() } - func (m *MsgSetErrorData) XXX_DiscardUnknown() { xxx_messageInfo_MsgSetErrorData.DiscardUnknown(m) } @@ -503,7 +471,8 @@ func (m *MsgSetErrorData) GetMetadata() types.MsgMetadata { return types.MsgMetadata{} } -type MsgSetErrorDataResponse struct{} +type MsgSetErrorDataResponse struct { +} func (m *MsgSetErrorDataResponse) Reset() { *m = MsgSetErrorDataResponse{} } func (m *MsgSetErrorDataResponse) String() string { return proto.CompactTextString(m) } @@ -511,11 +480,9 @@ func (*MsgSetErrorDataResponse) ProtoMessage() {} func (*MsgSetErrorDataResponse) Descriptor() ([]byte, []int) { return fileDescriptor_9a053a9b8cda05fe, []int{8} } - func (m *MsgSetErrorDataResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } - func (m *MsgSetErrorDataResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { return xxx_messageInfo_MsgSetErrorDataResponse.Marshal(b, m, deterministic) @@ -528,15 +495,12 @@ func (m *MsgSetErrorDataResponse) XXX_Marshal(b []byte, deterministic bool) ([]b return b[:n], nil } } - func (m *MsgSetErrorDataResponse) XXX_Merge(src proto.Message) { xxx_messageInfo_MsgSetErrorDataResponse.Merge(m, src) } - func (m *MsgSetErrorDataResponse) XXX_Size() int { return m.Size() } - func (m *MsgSetErrorDataResponse) XXX_DiscardUnknown() { xxx_messageInfo_MsgSetErrorDataResponse.DiscardUnknown(m) } @@ -560,54 +524,53 @@ func init() { } var fileDescriptor_9a053a9b8cda05fe = []byte{ - // 628 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x55, 0x4f, 0x6f, 0xd3, 0x4e, - 0x10, 0xcd, 0x3a, 0xee, 0xef, 0xd7, 0x6e, 0xda, 0x14, 0x99, 0x42, 0x1d, 0xab, 0x32, 0x56, 0x04, - 0x55, 0x54, 0x81, 0x2d, 0xc2, 0x3f, 0x09, 0x21, 0xa4, 0x84, 0x56, 0xa2, 0x48, 0x41, 0xc8, 0xe5, - 0xc4, 0x05, 0x6d, 0xec, 0xed, 0xd6, 0x52, 0xec, 0x75, 0x3d, 0x76, 0xd4, 0x5c, 0xb9, 0x21, 0x21, - 0xc1, 0x95, 0x6f, 0xc1, 0xc7, 0xe8, 0xb1, 0xdc, 0x7a, 0x42, 0x28, 0x39, 0xc0, 0xc7, 0x40, 0xb1, - 0x63, 0x37, 0x09, 0x4e, 0xff, 0x49, 0x70, 0xe0, 0x94, 0xf1, 0xcc, 0x9b, 0xe7, 0xf7, 0x32, 0xe3, - 0x5d, 0x7c, 0xcb, 0x27, 0x1d, 0xee, 0x12, 0x6b, 0x8f, 0x38, 0x9e, 0x91, 0xc4, 0x86, 0xc5, 0x3d, - 0xa0, 0x1e, 0x44, 0x60, 0x84, 0x07, 0xba, 0x1f, 0xf0, 0x90, 0x4b, 0x6b, 0x63, 0x30, 0x3d, 0x89, - 0xf5, 0x0c, 0xa6, 0xac, 0x30, 0xce, 0x78, 0x0c, 0x34, 0x86, 0x51, 0xd2, 0xa3, 0xac, 0x5a, 0x1c, - 0x5c, 0x0e, 0x86, 0x0b, 0xcc, 0xe8, 0xde, 0x1d, 0xfe, 0x8c, 0x0a, 0x15, 0xc6, 0x39, 0xeb, 0x50, - 0x23, 0x7e, 0x6a, 0x47, 0xbb, 0x06, 0xf1, 0x7a, 0xa3, 0xd2, 0x7a, 0x8e, 0x9c, 0x2e, 0xe9, 0x00, - 0x0d, 0x0d, 0x8b, 0xbb, 0x2e, 0xf7, 0x12, 0x5c, 0x75, 0x80, 0xb0, 0xdc, 0x02, 0xd6, 0xb0, 0xed, - 0x16, 0x05, 0x20, 0x8c, 0xc2, 0x8e, 0xc3, 0x3c, 0x12, 0x46, 0x01, 0x05, 0xe9, 0x2d, 0x2e, 0x83, - 0xc3, 0x3c, 0x9a, 0xd5, 0x64, 0x41, 0x2b, 0xd6, 0x4a, 0xf5, 0x47, 0xfa, 0x69, 0x2e, 0xf4, 0x67, - 0x69, 0x34, 0x6a, 0xcb, 0x18, 0xcd, 0x29, 0x3a, 0xe9, 0x39, 0x9e, 0x77, 0x69, 0x48, 0x6c, 0x12, - 0x12, 0xb9, 0xa8, 0xa1, 0x5a, 0xa9, 0xbe, 0x9e, 0x47, 0x9d, 0x08, 0xd7, 0x5b, 0xc0, 0x5a, 0x23, - 0x74, 0x53, 0x3c, 0xfc, 0x76, 0xa3, 0x60, 0x66, 0xdd, 0x8f, 0x97, 0xde, 0xfd, 0xf8, 0xb2, 0x91, - 0x3d, 0xbe, 0x10, 0xe7, 0xd1, 0x15, 0xc1, 0xfc, 0xdf, 0x0a, 0x28, 0x09, 0x79, 0x50, 0xfd, 0x8c, - 0x70, 0x65, 0xa6, 0x2a, 0xa9, 0x8c, 0x05, 0xc7, 0x96, 0x91, 0x86, 0x6a, 0xa2, 0x29, 0x38, 0xb6, - 0x74, 0x13, 0x2f, 0xed, 0x47, 0x34, 0xa2, 0xaf, 0x7b, 0x3e, 0x7d, 0x49, 0x5c, 0x2a, 0x0b, 0x1a, - 0xaa, 0x2d, 0x98, 0x93, 0x49, 0x69, 0x0d, 0x2f, 0x40, 0x4a, 0x11, 0x8b, 0x5f, 0x34, 0x4f, 0x12, - 0x52, 0x0d, 0x2f, 0x27, 0x5e, 0x9b, 0xbd, 0x86, 0x6d, 0x07, 0x14, 0x40, 0x9e, 0x8b, 0x59, 0xa6, - 0xd3, 0xd5, 0x2a, 0xd6, 0x66, 0x0d, 0xc0, 0xa4, 0xe0, 0x0f, 0x55, 0x57, 0x7f, 0x22, 0x5c, 0x4e, - 0x40, 0x5b, 0x5d, 0xc7, 0xa6, 0x9e, 0x45, 0xa5, 0x0d, 0x3c, 0xe7, 0x07, 0x9c, 0xef, 0xc6, 0xe2, - 0x4a, 0xf5, 0x15, 0x3d, 0xd9, 0x05, 0x3d, 0xdd, 0x05, 0xbd, 0xe1, 0xf5, 0xcc, 0x04, 0x32, 0x94, - 0xea, 0x26, 0xe4, 0xdb, 0x9b, 0xb1, 0x54, 0xd1, 0x3c, 0x49, 0xfc, 0x6e, 0x57, 0xcc, 0xb3, 0x3b, - 0x3e, 0xaa, 0xb9, 0x3f, 0x38, 0x2a, 0x19, 0x5f, 0x9f, 0x74, 0x9a, 0xfd, 0x09, 0xc7, 0x28, 0x2e, - 0xed, 0xd0, 0xf0, 0x55, 0xd4, 0xee, 0x38, 0x56, 0xc3, 0xb2, 0x28, 0xc0, 0x26, 0x09, 0xc9, 0xa4, - 0x41, 0xe1, 0x4c, 0x83, 0xc5, 0x3c, 0x83, 0x12, 0x16, 0x63, 0x73, 0x62, 0x3c, 0xca, 0x38, 0xfe, - 0x6b, 0xa6, 0x35, 0xac, 0xe6, 0x3b, 0xcb, 0xcc, 0x7f, 0x45, 0x78, 0x39, 0x81, 0x6c, 0x05, 0x01, - 0x0f, 0xfe, 0x09, 0xd7, 0x15, 0xbc, 0x3a, 0x65, 0x29, 0xb5, 0x5b, 0xff, 0x20, 0xe2, 0x62, 0x0b, - 0x98, 0xf4, 0x11, 0xe1, 0x6b, 0xf9, 0x67, 0xd3, 0xc3, 0xd3, 0xcf, 0xa0, 0x59, 0x9f, 0x94, 0xf2, - 0xf4, 0x72, 0x7d, 0xa9, 0x32, 0x69, 0x1f, 0x97, 0xc6, 0x3f, 0xc3, 0xdb, 0xe7, 0xa1, 0x4b, 0xd1, - 0xca, 0xfd, 0x8b, 0xa0, 0xb3, 0x57, 0xbe, 0x47, 0xf8, 0x6a, 0xde, 0xd6, 0x9f, 0xcd, 0x96, 0xd3, - 0xa5, 0x3c, 0xb9, 0x4c, 0x57, 0xa6, 0x25, 0xc4, 0x8b, 0x13, 0x3b, 0x78, 0xe7, 0x3c, 0x6c, 0x19, - 0x5c, 0x79, 0x70, 0x21, 0x78, 0xfa, 0xd6, 0xe6, 0xf6, 0x61, 0x5f, 0x45, 0x47, 0x7d, 0x15, 0x7d, - 0xef, 0xab, 0xe8, 0xd3, 0x40, 0x2d, 0x1c, 0x0d, 0xd4, 0xc2, 0xf1, 0x40, 0x2d, 0xbc, 0x31, 0x98, - 0x13, 0xee, 0x45, 0x6d, 0xdd, 0xe2, 0xae, 0x91, 0x73, 0xe5, 0x1d, 0x8c, 0xdf, 0xc1, 0x3d, 0x9f, - 0x42, 0xfb, 0xbf, 0xf8, 0x80, 0xbc, 0xf7, 0x2b, 0x00, 0x00, 0xff, 0xff, 0xec, 0xd6, 0xf3, 0x3b, - 0xb0, 0x07, 0x00, 0x00, + // 647 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x55, 0x4d, 0x6b, 0xd4, 0x40, + 0x18, 0xde, 0xc9, 0xa6, 0xb5, 0x9d, 0xed, 0x87, 0x8c, 0xd5, 0xa6, 0xa1, 0xc4, 0xb0, 0x68, 0x59, + 0x8a, 0x26, 0xb8, 0x7e, 0x81, 0x88, 0xb0, 0xb5, 0x05, 0x2b, 0xac, 0x48, 0xea, 0xc9, 0x8b, 0xcc, + 0x26, 0xd3, 0x69, 0x60, 0x93, 0x49, 0x33, 0x49, 0xe9, 0x5e, 0xbd, 0x09, 0x82, 0x5e, 0xfd, 0x17, + 0xfe, 0x8c, 0x1e, 0xeb, 0xcd, 0x93, 0x48, 0xf7, 0xa0, 0x3f, 0xc0, 0x1f, 0x20, 0x3b, 0xb3, 0x49, + 0x77, 0x6b, 0xb6, 0xdb, 0x16, 0x3d, 0x78, 0xca, 0x3b, 0x33, 0xcf, 0xfb, 0xe4, 0x79, 0xde, 0x77, + 0x3e, 0xe0, 0xcd, 0x08, 0xb7, 0x59, 0x80, 0xdd, 0x1d, 0xec, 0x87, 0xb6, 0x8c, 0x6d, 0x97, 0x85, + 0x9c, 0x84, 0x3c, 0xe5, 0x76, 0xb2, 0x6f, 0x45, 0x31, 0x4b, 0x18, 0x5a, 0x1e, 0x80, 0x59, 0x32, + 0xb6, 0x72, 0x98, 0xbe, 0x40, 0x19, 0x65, 0x02, 0x68, 0xf7, 0x22, 0x99, 0xa3, 0x2f, 0xba, 0x8c, + 0x07, 0x8c, 0xdb, 0x01, 0xa7, 0xf6, 0xde, 0x9d, 0xde, 0xa7, 0xbf, 0xb0, 0x44, 0x19, 0xa3, 0x6d, + 0x62, 0x8b, 0x51, 0x2b, 0xdd, 0xb6, 0x71, 0xd8, 0xe9, 0x2f, 0xad, 0x14, 0xc8, 0xd9, 0xc3, 0x6d, + 0x4e, 0x12, 0xdb, 0x65, 0x41, 0xc0, 0x42, 0x89, 0xab, 0x76, 0x01, 0xd4, 0x9a, 0x9c, 0x36, 0x3c, + 0xaf, 0x49, 0x38, 0xc7, 0x94, 0xf0, 0x2d, 0x9f, 0x86, 0x38, 0x49, 0x63, 0xc2, 0xd1, 0x1b, 0x38, + 0xc7, 0x7d, 0x1a, 0x92, 0x7c, 0x4d, 0x53, 0xcc, 0x72, 0xad, 0x52, 0x7f, 0x68, 0x9d, 0xe6, 0xc2, + 0x7a, 0x9a, 0x45, 0xfd, 0xb4, 0x9c, 0xd1, 0x39, 0x41, 0x87, 0x9e, 0xc1, 0xa9, 0x80, 0x24, 0xd8, + 0xc3, 0x09, 0xd6, 0xca, 0x26, 0xa8, 0x55, 0xea, 0x2b, 0x45, 0xd4, 0x52, 0xb8, 0xd5, 0xe4, 0xb4, + 0xd9, 0x47, 0xaf, 0xa9, 0x07, 0xdf, 0xae, 0x97, 0x9c, 0x3c, 0xfb, 0xd1, 0xec, 0xdb, 0x1f, 0x9f, + 0x57, 0xf3, 0xe1, 0x73, 0x75, 0x0a, 0x5c, 0x56, 0x9c, 0x4b, 0x6e, 0x4c, 0x70, 0xc2, 0xe2, 0xea, + 0x27, 0x00, 0x97, 0x46, 0xaa, 0x42, 0x73, 0x50, 0xf1, 0x3d, 0x0d, 0x98, 0xa0, 0xa6, 0x3a, 0x8a, + 0xef, 0xa1, 0x1b, 0x70, 0x76, 0x37, 0x25, 0x29, 0x79, 0xd5, 0x89, 0xc8, 0x0b, 0x1c, 0x10, 0x4d, + 0x31, 0x41, 0x6d, 0xda, 0x19, 0x9e, 0x44, 0xcb, 0x70, 0x9a, 0x67, 0x14, 0x42, 0xfc, 0x8c, 0x73, + 0x3c, 0x81, 0x6a, 0x70, 0x5e, 0x7a, 0x5d, 0xeb, 0x34, 0x3c, 0x2f, 0x26, 0x9c, 0x6b, 0x13, 0x82, + 0xe5, 0xe4, 0x74, 0xb5, 0x0a, 0xcd, 0x51, 0x0d, 0x70, 0x08, 0x8f, 0x7a, 0xaa, 0xab, 0x3f, 0x01, + 0x9c, 0x93, 0xa0, 0x8d, 0x3d, 0xdf, 0x23, 0xa1, 0x4b, 0xd0, 0x2a, 0x9c, 0x88, 0x62, 0xc6, 0xb6, + 0x85, 0xb8, 0x4a, 0x7d, 0xc1, 0x92, 0x7b, 0xc1, 0xca, 0xf6, 0x82, 0xd5, 0x08, 0x3b, 0x8e, 0x84, + 0xf4, 0xa4, 0x06, 0x92, 0x7c, 0x73, 0x5d, 0x48, 0x55, 0x9d, 0xe3, 0x89, 0x3f, 0xed, 0xaa, 0x45, + 0x76, 0x07, 0x5b, 0x35, 0xf1, 0x0f, 0x5b, 0xa5, 0xc1, 0x6b, 0xc3, 0x4e, 0xf3, 0x22, 0xfc, 0x02, + 0x62, 0x69, 0x8b, 0x24, 0x2f, 0xd3, 0x56, 0xdb, 0x77, 0x1b, 0xae, 0x4b, 0x38, 0x5f, 0xc7, 0x09, + 0x1e, 0x36, 0xa8, 0x8c, 0x35, 0x58, 0x2e, 0x32, 0x88, 0xa0, 0x2a, 0xcc, 0xa9, 0xa2, 0x95, 0x22, + 0xfe, 0x7b, 0xa6, 0x91, 0x0e, 0xa7, 0x24, 0x6a, 0x73, 0x5d, 0x9b, 0x14, 0x02, 0xf3, 0xf1, 0x98, + 0x82, 0x98, 0xd0, 0x28, 0x76, 0x9d, 0x17, 0xe6, 0x0b, 0x80, 0xf3, 0x12, 0xb2, 0x11, 0xc7, 0x2c, + 0xfe, 0x3f, 0x2a, 0x32, 0xc6, 0xf5, 0x12, 0x5c, 0x3c, 0x61, 0x29, 0xb3, 0x5b, 0x7f, 0xaf, 0xc2, + 0x72, 0x93, 0x53, 0xf4, 0x01, 0xc0, 0xab, 0xc5, 0xf7, 0xd6, 0x83, 0xd3, 0xef, 0xa7, 0x51, 0xc7, + 0x4d, 0x7f, 0x72, 0xb1, 0xbc, 0x4c, 0x19, 0xda, 0x85, 0x95, 0xc1, 0x23, 0x7a, 0xeb, 0x2c, 0x74, + 0x19, 0x5a, 0xbf, 0x77, 0x1e, 0x74, 0xfe, 0xcb, 0x77, 0x00, 0x5e, 0x29, 0x3a, 0x11, 0xe3, 0xd9, + 0x0a, 0xb2, 0xf4, 0xc7, 0x17, 0xc9, 0xca, 0xb5, 0x24, 0x70, 0x66, 0x68, 0x0f, 0xde, 0x3e, 0x0b, + 0x5b, 0x0e, 0xd7, 0xef, 0x9f, 0x0b, 0x9e, 0xfd, 0x75, 0x6d, 0xf3, 0xe0, 0xc8, 0x00, 0x87, 0x47, + 0x06, 0xf8, 0x7e, 0x64, 0x80, 0x8f, 0x5d, 0xa3, 0x74, 0xd8, 0x35, 0x4a, 0x5f, 0xbb, 0x46, 0xe9, + 0xb5, 0x4d, 0xfd, 0x64, 0x27, 0x6d, 0x59, 0x2e, 0x0b, 0xec, 0x82, 0xe7, 0x70, 0x7f, 0xf0, 0x7d, + 0xee, 0x44, 0x84, 0xb7, 0x26, 0xc5, 0xe5, 0x79, 0xf7, 0x77, 0x00, 0x00, 0x00, 0xff, 0xff, 0xd8, + 0x9b, 0x24, 0x13, 0xcc, 0x07, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. -var ( - _ context.Context - _ grpc.ClientConn -) +var _ context.Context +var _ grpc.ClientConn // This is a compile-time assertion to ensure that this generated file // is compatible with the grpc package it is being compiled against. @@ -676,20 +639,18 @@ type MsgServer interface { } // UnimplementedMsgServer can be embedded to have forward compatible implementations. -type UnimplementedMsgServer struct{} +type UnimplementedMsgServer struct { +} func (*UnimplementedMsgServer) AddMessagesSignatures(ctx context.Context, req *MsgAddMessagesSignatures) (*MsgAddMessagesSignaturesResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method AddMessagesSignatures not implemented") } - func (*UnimplementedMsgServer) AddEvidence(ctx context.Context, req *MsgAddEvidence) (*MsgAddEvidenceResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method AddEvidence not implemented") } - func (*UnimplementedMsgServer) SetPublicAccessData(ctx context.Context, req *MsgSetPublicAccessData) (*MsgSetPublicAccessDataResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method SetPublicAccessData not implemented") } - func (*UnimplementedMsgServer) SetErrorData(ctx context.Context, req *MsgSetErrorData) (*MsgSetErrorDataResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method SetErrorData not implemented") } @@ -1014,6 +975,11 @@ func (m *MsgSetPublicAccessData) MarshalToSizedBuffer(dAtA []byte) (int, error) _ = i var l int _ = l + if m.ValsetID != 0 { + i = encodeVarintTx(dAtA, i, uint64(m.ValsetID)) + i-- + dAtA[i] = 0x30 + } { size, err := m.Metadata.MarshalToSizedBuffer(dAtA[:i]) if err != nil { @@ -1155,7 +1121,6 @@ func encodeVarintTx(dAtA []byte, offset int, v uint64) int { dAtA[offset] = uint8(v) return base } - func (m *MsgAddMessagesSignatures) Size() (n int) { if m == nil { return 0 @@ -1256,6 +1221,9 @@ func (m *MsgSetPublicAccessData) Size() (n int) { } l = m.Metadata.Size() n += 1 + l + sovTx(uint64(l)) + if m.ValsetID != 0 { + n += 1 + sovTx(uint64(m.ValsetID)) + } return n } @@ -1302,11 +1270,9 @@ func (m *MsgSetErrorDataResponse) Size() (n int) { func sovTx(x uint64) (n int) { return (math_bits.Len64(x|1) + 6) / 7 } - func sozTx(x uint64) (n int) { return sovTx(uint64((x << 1) ^ uint64((int64(x) >> 63)))) } - func (m *MsgAddMessagesSignatures) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -1424,7 +1390,6 @@ func (m *MsgAddMessagesSignatures) Unmarshal(dAtA []byte) error { } return nil } - func (m *ConsensusMessageSignature) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -1592,7 +1557,6 @@ func (m *ConsensusMessageSignature) Unmarshal(dAtA []byte) error { } return nil } - func (m *MsgAddMessagesSignaturesResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -1643,7 +1607,6 @@ func (m *MsgAddMessagesSignaturesResponse) Unmarshal(dAtA []byte) error { } return nil } - func (m *MsgAddEvidence) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -1814,7 +1777,6 @@ func (m *MsgAddEvidence) Unmarshal(dAtA []byte) error { } return nil } - func (m *MsgAddEvidenceResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -1865,7 +1827,6 @@ func (m *MsgAddEvidenceResponse) Unmarshal(dAtA []byte) error { } return nil } - func (m *MsgSetPublicAccessData) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -2013,6 +1974,25 @@ func (m *MsgSetPublicAccessData) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex + case 6: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field ValsetID", wireType) + } + m.ValsetID = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTx + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.ValsetID |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } default: iNdEx = preIndex skippy, err := skipTx(dAtA[iNdEx:]) @@ -2034,7 +2014,6 @@ func (m *MsgSetPublicAccessData) Unmarshal(dAtA []byte) error { } return nil } - func (m *MsgSetPublicAccessDataResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -2085,7 +2064,6 @@ func (m *MsgSetPublicAccessDataResponse) Unmarshal(dAtA []byte) error { } return nil } - func (m *MsgSetErrorData) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -2254,7 +2232,6 @@ func (m *MsgSetErrorData) Unmarshal(dAtA []byte) error { } return nil } - func (m *MsgSetErrorDataResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -2305,7 +2282,6 @@ func (m *MsgSetErrorDataResponse) Unmarshal(dAtA []byte) error { } return nil } - func skipTx(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 diff --git a/x/evm/keeper/attest.go b/x/evm/keeper/attest.go index 6742e506..3e7fffeb 100644 --- a/x/evm/keeper/attest.go +++ b/x/evm/keeper/attest.go @@ -168,19 +168,27 @@ func attestTransactionIntegrity( } var valset types.Valset - snapshot, err := k.Valset.GetLatestSnapshotOnChain(ctx, chainReferenceID) - // A snapshot may not yet exist if the chain is just being added, but we - // need to continue in case we're attesting to the initial compass - // deployment - if err != nil { - if !errors.Is(err, keeperutil.ErrNotFound) { - // There was some other error accessing the store, bail - return nil, err + var valsetID uint64 + + if publicAccessData := msg.GetPublicAccessData(); publicAccessData != nil { + valsetID = publicAccessData.GetValsetID() + } + + if valsetID != 0 { + snapshot, err := k.Valset.FindSnapshotByID(ctx, valsetID) + // A snapshot may not yet exist if the chain is just being added, but we + // need to continue in case we're attesting to the initial compass + // deployment + if err != nil { + if !errors.Is(err, keeperutil.ErrNotFound) { + // There was some other error accessing the store, bail + return nil, err + } + } else { + // There was no error, so convert the snapshot to valset + logger := liblog.FromSDKLogger(k.Logger(ctx)) + valset = transformSnapshotToCompass(snapshot, chainReferenceID, logger) } - } else { - // There was no error, so convert the snapshot to valset - logger := liblog.FromSDKLogger(k.Logger(ctx)) - valset = transformSnapshotToCompass(snapshot, chainReferenceID, logger) } err = verifyTx(ctx, tx, msg, &valset, compass) diff --git a/x/evm/keeper/attest_test.go b/x/evm/keeper/attest_test.go index d66b3be8..fac4f42f 100644 --- a/x/evm/keeper/attest_test.go +++ b/x/evm/keeper/attest_test.go @@ -153,6 +153,8 @@ var _ = g.Describe("attest router", func() { Return(uint64(100), nil).Maybe() ms.ValsetKeeper.On("GetLatestSnapshotOnChain", mock.Anything, mock.Anything). Return(createSnapshot(newChain), nil).Maybe() + ms.ValsetKeeper.On("FindSnapshotByID", mock.Anything, mock.Anything). + Return(createSnapshot(newChain), nil).Maybe() }) g.BeforeEach(func() { @@ -173,6 +175,9 @@ var _ = g.Describe("attest router", func() { ExternalAccountAddress: "addr2", Signature: sig, }}, + PublicAccessData: &consensustypes.PublicAccessData{ + ValsetID: 1, + }, } }) diff --git a/x/evm/types/eth_txable.go b/x/evm/types/eth_txable.go index 5ea1a7a0..4ebe4a70 100644 --- a/x/evm/types/eth_txable.go +++ b/x/evm/types/eth_txable.go @@ -69,7 +69,7 @@ func (m *SubmitLogicCall) VerifyAgainstTX( compass *SmartContract, ) error { logger := liblog.FromSDKLogger(sdk.UnwrapSDKContext(ctx).Logger()). - WithFields("tx_hash", tx.Hash().Hex()) + WithFields("tx_hash", tx.Hash().Hex(), "valset_id", valset.ValsetID) logger.Debug("SubmitLogicCall VerifyAgainstTX") @@ -119,7 +119,9 @@ func (m *UpdateValset) VerifyAgainstTX( compass *SmartContract, ) error { logger := liblog.FromSDKLogger(sdk.UnwrapSDKContext(ctx).Logger()). - WithFields("tx_hash", tx.Hash().Hex()) + WithFields("tx_hash", tx.Hash().Hex(), + "valset_id", valset.ValsetID, + "updated_valset_id", m.Valset.ValsetID) logger.Debug("UpdateValset VerifyAgainstTX") @@ -147,7 +149,7 @@ func (m *UpdateValset) VerifyAgainstTX( } if !bytes.Equal(tx.Data(), input) { - logger.Warn("SubmitLogicCall VerifyAgainstTX failed") + logger.Warn("UpdateValset VerifyAgainstTX failed") return ErrEthTxNotVerified }