diff --git a/CHANGELOG.md b/CHANGELOG.md index c47306782f..b04b18a047 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ ### Chain +- (feat) [\#1873](https://github.com/bandprotocol/bandchain/pull/1873) Add `in-before-resolve` field in `Report` data structure. - (feat) [\#1875](https://github.com/bandprotocol/bandchain/pull/1875) Add CLI and REST query interface for request. - (chore) [\#1869](https://github.com/bandprotocol/bandchain/pull/1869) Update new schema and source code url for all oracle scripts - (chore) [\#1864](https://github.com/bandprotocol/bandchain/pull/1864) Remove unused query types. diff --git a/chain/x/oracle/handler.go b/chain/x/oracle/handler.go index 87f457b444..3f300fc862 100644 --- a/chain/x/oracle/handler.go +++ b/chain/x/oracle/handler.go @@ -133,7 +133,7 @@ func handleMsgReportData(ctx sdk.Context, k Keeper, m MsgReportData) (*sdk.Resul if !k.IsReporter(ctx, m.Validator, m.Reporter) { return nil, types.ErrReporterNotAuthorized } - err := k.AddReport(ctx, m.RequestID, types.NewReport(m.Validator, m.RawReports)) + err := k.AddReport(ctx, m.RequestID, types.NewReport(m.Validator, !k.HasResult(ctx, m.RequestID), m.RawReports)) if err != nil { return nil, err } diff --git a/chain/x/oracle/keeper/report_test.go b/chain/x/oracle/keeper/report_test.go index 2a60dba03e..ad20915ddb 100644 --- a/chain/x/oracle/keeper/report_test.go +++ b/chain/x/oracle/keeper/report_test.go @@ -15,7 +15,7 @@ func TestHasReport(t *testing.T) { // We should not have a report to request ID 42 from Alice without setting it. require.False(t, k.HasReport(ctx, 42, Alice.ValAddress)) // After we set it, we should be able to find it. - k.SetReport(ctx, 42, types.NewReport(Alice.ValAddress, nil)) + k.SetReport(ctx, 42, types.NewReport(Alice.ValAddress, true, nil)) require.True(t, k.HasReport(ctx, 42, Alice.ValAddress)) } @@ -26,14 +26,14 @@ func TestAddReportSuccess(t *testing.T) { k.SetRequest(ctx, 1, request) err := k.AddReport(ctx, 1, types.NewReport( - Validator1.ValAddress, []types.RawReport{ + Validator1.ValAddress, true, []types.RawReport{ types.NewRawReport(2, 1, []byte("data1/1")), types.NewRawReport(10, 0, []byte("data2/1")), }, )) require.NoError(t, err) - require.Equal(t, []types.Report{types.NewReport(Validator1.ValAddress, []types.RawReport{ + require.Equal(t, []types.Report{types.NewReport(Validator1.ValAddress, true, []types.RawReport{ types.NewRawReport(2, 1, []byte("data1/1")), types.NewRawReport(10, 0, []byte("data2/1")), })}, k.GetReports(ctx, 1)) @@ -46,7 +46,7 @@ func TestReportOnInvalidRequest(t *testing.T) { k.SetRequest(ctx, 1, request) err := k.AddReport(ctx, 2, types.NewReport( - Validator1.ValAddress, []types.RawReport{ + Validator1.ValAddress, true, []types.RawReport{ types.NewRawReport(2, 1, []byte("data1/1")), types.NewRawReport(10, 0, []byte("data2/1")), }, @@ -62,7 +62,7 @@ func TestReportByNotRequestedValidator(t *testing.T) { k.SetRequest(ctx, 1, request) err := k.AddReport(ctx, 1, types.NewReport( - Alice.ValAddress, []types.RawReport{ + Alice.ValAddress, true, []types.RawReport{ types.NewRawReport(2, 1, []byte("data1/1")), types.NewRawReport(10, 0, []byte("data2/1")), }, @@ -78,7 +78,7 @@ func TestDuplicateReport(t *testing.T) { k.SetRequest(ctx, 1, request) err := k.AddReport(ctx, 1, types.NewReport( - Validator1.ValAddress, []types.RawReport{ + Validator1.ValAddress, true, []types.RawReport{ types.NewRawReport(2, 1, []byte("data1/1")), types.NewRawReport(10, 0, []byte("data2/1")), }, @@ -86,7 +86,7 @@ func TestDuplicateReport(t *testing.T) { require.NoError(t, err) err = k.AddReport(ctx, 1, types.NewReport( - Validator1.ValAddress, []types.RawReport{ + Validator1.ValAddress, true, []types.RawReport{ types.NewRawReport(2, 0, []byte("new data 1")), types.NewRawReport(10, 0, []byte("new data 2")), }, @@ -101,7 +101,7 @@ func TestReportInvalidDataSourceCount(t *testing.T) { k.SetRequest(ctx, 1, request) err := k.AddReport(ctx, 1, types.NewReport( - Validator1.ValAddress, []types.RawReport{ + Validator1.ValAddress, true, []types.RawReport{ types.NewRawReport(2, 1, []byte("data1/1")), }, )) @@ -115,7 +115,7 @@ func TestReportInvalidExternalIDs(t *testing.T) { k.SetRequest(ctx, 1, request) err := k.AddReport(ctx, 1, types.NewReport( - Validator1.ValAddress, []types.RawReport{ + Validator1.ValAddress, true, []types.RawReport{ types.NewRawReport(2, 1, []byte("data1/1")), types.NewRawReport(11, 1, []byte("data1/1")), }, @@ -126,11 +126,11 @@ func TestReportInvalidExternalIDs(t *testing.T) { func TestGetReportCount(t *testing.T) { _, ctx, k := createTestInput() - k.SetReport(ctx, types.RequestID(1), types.NewReport(Validator1.ValAddress, []types.RawReport{})) - k.SetReport(ctx, types.RequestID(1), types.NewReport(Validator2.ValAddress, []types.RawReport{})) - k.SetReport(ctx, types.RequestID(2), types.NewReport(Alice.ValAddress, []types.RawReport{})) - k.SetReport(ctx, types.RequestID(2), types.NewReport(Bob.ValAddress, []types.RawReport{})) - k.SetReport(ctx, types.RequestID(2), types.NewReport(Carol.ValAddress, []types.RawReport{})) + k.SetReport(ctx, types.RequestID(1), types.NewReport(Validator1.ValAddress, true, []types.RawReport{})) + k.SetReport(ctx, types.RequestID(1), types.NewReport(Validator2.ValAddress, true, []types.RawReport{})) + k.SetReport(ctx, types.RequestID(2), types.NewReport(Alice.ValAddress, true, []types.RawReport{})) + k.SetReport(ctx, types.RequestID(2), types.NewReport(Bob.ValAddress, true, []types.RawReport{})) + k.SetReport(ctx, types.RequestID(2), types.NewReport(Carol.ValAddress, true, []types.RawReport{})) require.Equal(t, uint64(2), k.GetReportCount(ctx, types.RequestID(1))) require.Equal(t, uint64(3), k.GetReportCount(ctx, types.RequestID(2))) @@ -139,11 +139,11 @@ func TestGetReportCount(t *testing.T) { func TestDeleteReports(t *testing.T) { _, ctx, k := createTestInput() - k.SetReport(ctx, types.RequestID(1), types.NewReport(Validator1.ValAddress, []types.RawReport{})) - k.SetReport(ctx, types.RequestID(1), types.NewReport(Validator2.ValAddress, []types.RawReport{})) - k.SetReport(ctx, types.RequestID(2), types.NewReport(Alice.ValAddress, []types.RawReport{})) - k.SetReport(ctx, types.RequestID(2), types.NewReport(Bob.ValAddress, []types.RawReport{})) - k.SetReport(ctx, types.RequestID(2), types.NewReport(Carol.ValAddress, []types.RawReport{})) + k.SetReport(ctx, types.RequestID(1), types.NewReport(Validator1.ValAddress, true, []types.RawReport{})) + k.SetReport(ctx, types.RequestID(1), types.NewReport(Validator2.ValAddress, true, []types.RawReport{})) + k.SetReport(ctx, types.RequestID(2), types.NewReport(Alice.ValAddress, true, []types.RawReport{})) + k.SetReport(ctx, types.RequestID(2), types.NewReport(Bob.ValAddress, true, []types.RawReport{})) + k.SetReport(ctx, types.RequestID(2), types.NewReport(Carol.ValAddress, true, []types.RawReport{})) require.True(t, k.HasReport(ctx, types.RequestID(1), Validator1.ValAddress)) require.True(t, k.HasReport(ctx, types.RequestID(2), Alice.ValAddress)) @@ -165,11 +165,11 @@ func TestUpdateReportInfos(t *testing.T) { // 2 Validators report k.SetReport(ctx, types.RequestID(1), types.NewReport( - Validator1.ValAddress, []types.RawReport{}, + Validator1.ValAddress, true, []types.RawReport{}, )) k.SetReport(ctx, types.RequestID(1), types.NewReport( - Validator2.ValAddress, []types.RawReport{}, + Validator2.ValAddress, true, []types.RawReport{}, )) // Update report info @@ -190,7 +190,7 @@ func TestUpdateReportInfos(t *testing.T) { // Only Validator1 report k.SetReport(ctx, types.RequestID(2), types.NewReport( - Validator1.ValAddress, []types.RawReport{}, + Validator1.ValAddress, true, []types.RawReport{}, )) // Update report info @@ -210,7 +210,7 @@ func TestUpdateReportInfos(t *testing.T) { k.SetRequest(ctx, types.RequestID(3), request) // Only Validator2 report k.SetReport(ctx, types.RequestID(3), types.NewReport( - Validator2.ValAddress, []types.RawReport{}, + Validator2.ValAddress, true, []types.RawReport{}, )) // Update report info @@ -257,11 +257,11 @@ func TestGetJailedUpdateReportInfos(t *testing.T) { // 2 Validators report k.SetReport(ctx, types.RequestID(1), types.NewReport( - Validator1.ValAddress, []types.RawReport{}, + Validator1.ValAddress, true, []types.RawReport{}, )) k.SetReport(ctx, types.RequestID(1), types.NewReport( - Validator2.ValAddress, []types.RawReport{}, + Validator2.ValAddress, true, []types.RawReport{}, )) k.UpdateReportInfos(ctx, types.RequestID(1)) @@ -269,7 +269,7 @@ func TestGetJailedUpdateReportInfos(t *testing.T) { for i := 2; i <= 5; i++ { k.SetRequest(ctx, types.RequestID(i), request) k.SetReport(ctx, types.RequestID(i), types.NewReport( - Validator1.ValAddress, []types.RawReport{}, + Validator1.ValAddress, true, []types.RawReport{}, )) k.UpdateReportInfos(ctx, types.RequestID(i)) } diff --git a/chain/x/oracle/types/constructors.go b/chain/x/oracle/types/constructors.go index 3156e64092..66fc3ec1f6 100644 --- a/chain/x/oracle/types/constructors.go +++ b/chain/x/oracle/types/constructors.go @@ -259,11 +259,13 @@ func NewIBCInfo( func NewReport( Validator github_com_cosmos_cosmos_sdk_types.ValAddress, + InBeforeResolve bool, RawReports []RawReport, ) Report { return Report{ - Validator: Validator, - RawReports: RawReports, + Validator: Validator, + InBeforeResolve: InBeforeResolve, + RawReports: RawReports, } } diff --git a/chain/x/oracle/types/types.pb.go b/chain/x/oracle/types/types.pb.go index d03cb15ac6..807b3d9057 100644 --- a/chain/x/oracle/types/types.pb.go +++ b/chain/x/oracle/types/types.pb.go @@ -1315,8 +1315,9 @@ func (m *IBCInfo) GetSourceChannel() string { // Report is a report that contains operator address in struct type Report struct { - Validator github_com_cosmos_cosmos_sdk_types.ValAddress `protobuf:"bytes,1,opt,name=validator,proto3,casttype=github.com/cosmos/cosmos-sdk/types.ValAddress" json:"validator,omitempty"` - RawReports []RawReport `protobuf:"bytes,2,rep,name=raw_reports,json=rawReports,proto3" json:"raw_reports"` + Validator github_com_cosmos_cosmos_sdk_types.ValAddress `protobuf:"bytes,1,opt,name=validator,proto3,casttype=github.com/cosmos/cosmos-sdk/types.ValAddress" json:"validator,omitempty"` + InBeforeResolve bool `protobuf:"varint,2,opt,name=in_before_resolve,json=inBeforeResolve,proto3" json:"in_before_resolve,omitempty"` + RawReports []RawReport `protobuf:"bytes,3,rep,name=raw_reports,json=rawReports,proto3" json:"raw_reports"` } func (m *Report) Reset() { *m = Report{} } @@ -1359,6 +1360,13 @@ func (m *Report) GetValidator() github_com_cosmos_cosmos_sdk_types.ValAddress { return nil } +func (m *Report) GetInBeforeResolve() bool { + if m != nil { + return m.InBeforeResolve + } + return false +} + func (m *Report) GetRawReports() []RawReport { if m != nil { return m.RawReports @@ -1530,96 +1538,98 @@ func init() { func init() { proto.RegisterFile("x/oracle/types/types.proto", fileDescriptor_53e65fd95a58412c) } var fileDescriptor_53e65fd95a58412c = []byte{ - // 1423 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x58, 0x4b, 0x8f, 0x1b, 0xc5, - 0x16, 0x9e, 0xee, 0xf6, 0xf3, 0x78, 0xec, 0x4c, 0x2a, 0x8f, 0xeb, 0x3b, 0xb9, 0x72, 0xfb, 0x46, - 0x49, 0xe4, 0x1b, 0x29, 0xb6, 0x92, 0x8b, 0x90, 0x12, 0x09, 0x89, 0xf1, 0x4c, 0x12, 0x2c, 0x65, - 0xc8, 0xd0, 0x03, 0x41, 0x62, 0x63, 0x95, 0xbb, 0x2b, 0x76, 0x6b, 0xfa, 0x61, 0xaa, 0xda, 0x13, - 0x67, 0x09, 0x12, 0x1b, 0x56, 0x2c, 0x91, 0x60, 0x91, 0x3f, 0x00, 0x0b, 0x24, 0x90, 0x60, 0xc3, - 0x36, 0x12, 0x12, 0xca, 0x82, 0x05, 0x2b, 0x0b, 0x39, 0x1b, 0x96, 0xac, 0xb3, 0x42, 0xf5, 0x68, - 0x77, 0x3b, 0x13, 0x1c, 0x32, 0x38, 0x24, 0x6c, 0xec, 0x3e, 0xe7, 0x54, 0x55, 0x9f, 0xfa, 0xce, - 0x57, 0x5f, 0x55, 0x35, 0xac, 0x8f, 0x5b, 0x21, 0xc5, 0xb6, 0x47, 0x5a, 0xd1, 0xdd, 0x21, 0x61, - 0xf2, 0xb7, 0x39, 0xa4, 0x61, 0x14, 0xa2, 0x53, 0x3d, 0x1c, 0x38, 0xf6, 0x00, 0xbb, 0x41, 0x53, - 0xfe, 0x8e, 0x9b, 0xb2, 0x6d, 0x73, 0xff, 0xe2, 0xfa, 0xb9, 0x68, 0xe0, 0x52, 0xa7, 0x3b, 0xc4, - 0x34, 0xba, 0xdb, 0x12, 0xed, 0x5b, 0xfd, 0xb0, 0x1f, 0x26, 0x4f, 0x72, 0x90, 0xd3, 0x5f, 0xe9, - 0x50, 0xd9, 0x66, 0x7d, 0x8b, 0xbc, 0x3f, 0x22, 0x2c, 0xda, 0xc2, 0x11, 0x46, 0x6f, 0xc2, 0x9a, - 0x1c, 0xa7, 0xcb, 0x6c, 0xea, 0x0e, 0xa3, 0xae, 0xeb, 0x54, 0xb5, 0xba, 0xd6, 0x30, 0xda, 0x67, - 0xa6, 0x13, 0xb3, 0x72, 0x53, 0xc4, 0x76, 0x45, 0xa8, 0xb3, 0xf5, 0xe8, 0x80, 0xc7, 0xaa, 0x84, - 0x69, 0xdb, 0x41, 0xeb, 0x50, 0xb0, 0xb1, 0xe7, 0x39, 0x38, 0xc2, 0x55, 0xbd, 0xae, 0x35, 0x56, - 0xad, 0x99, 0x8d, 0x4e, 0x41, 0x11, 0xb3, 0xbd, 0xae, 0x1d, 0x8e, 0x82, 0xa8, 0x6a, 0xd4, 0xb5, - 0x46, 0xc6, 0x2a, 0x60, 0xb6, 0xb7, 0xc9, 0x6d, 0x1e, 0xf4, 0xdd, 0x40, 0x05, 0x33, 0x32, 0xe8, - 0xbb, 0x81, 0x0c, 0xfe, 0x0f, 0x8a, 0xb6, 0xe7, 0x92, 0x40, 0xa4, 0x97, 0xad, 0x6b, 0x8d, 0x62, - 0x7b, 0x75, 0x3a, 0x31, 0x0b, 0x9b, 0xc2, 0xd9, 0xd9, 0xb2, 0x0a, 0x32, 0xdc, 0x71, 0x50, 0x07, - 0x72, 0x8c, 0x04, 0x0e, 0xa1, 0xd5, 0x1c, 0x7f, 0x7d, 0xfb, 0xe2, 0xa3, 0x89, 0x79, 0xa1, 0xef, - 0x46, 0x83, 0x51, 0xaf, 0x69, 0x87, 0x7e, 0xcb, 0x0e, 0x99, 0x1f, 0x32, 0xf5, 0x77, 0x81, 0x39, - 0x7b, 0x0a, 0xe6, 0x0d, 0xdb, 0xde, 0x70, 0x1c, 0x4a, 0x18, 0xb3, 0xd4, 0x00, 0x57, 0x32, 0xbf, - 0xde, 0x33, 0xb5, 0xd3, 0xdf, 0xeb, 0x50, 0x16, 0xa0, 0x0d, 0x43, 0x2a, 0x31, 0xbb, 0x0c, 0x40, - 0x25, 0x84, 0x09, 0x5a, 0xeb, 0xd3, 0x89, 0x59, 0x54, 0xc0, 0x0a, 0xa0, 0x12, 0xc3, 0x2a, 0xaa, - 0xd6, 0x1d, 0x07, 0x6d, 0x43, 0x89, 0xe2, 0x3b, 0x5d, 0x2a, 0x06, 0x63, 0x55, 0xbd, 0x6e, 0x34, - 0x4a, 0x97, 0xce, 0x35, 0x17, 0x14, 0xb7, 0x69, 0xe1, 0x3b, 0xf2, 0xdd, 0xed, 0xcc, 0xfd, 0x89, - 0xb9, 0x62, 0x01, 0x8d, 0x1d, 0x0c, 0xdd, 0x84, 0xe2, 0x3e, 0xf6, 0x5c, 0x07, 0x47, 0x21, 0x15, - 0x88, 0xfe, 0xf9, 0xf9, 0xde, 0xc2, 0x5e, 0x3c, 0xdf, 0x64, 0x0c, 0xb4, 0x0d, 0x05, 0x99, 0x1b, - 0xa1, 0xa2, 0x08, 0x87, 0xc2, 0x6f, 0x36, 0x84, 0x42, 0xf0, 0x23, 0x1d, 0x8e, 0x6d, 0xb3, 0xfe, - 0x26, 0x25, 0x38, 0x22, 0x1c, 0xc1, 0xdd, 0x70, 0x44, 0x6d, 0x82, 0xae, 0x43, 0x36, 0xbc, 0x13, - 0x10, 0x2a, 0x20, 0x3c, 0xd4, 0x9b, 0x64, 0x7f, 0x84, 0x20, 0x13, 0x60, 0x9f, 0x08, 0xc2, 0x15, - 0x2d, 0xf1, 0x8c, 0xea, 0x50, 0x72, 0x88, 0xe4, 0xb4, 0x1b, 0x06, 0x02, 0x9c, 0xa2, 0x95, 0x76, - 0xa1, 0x1a, 0x00, 0x19, 0x13, 0x7b, 0x14, 0xe1, 0x9e, 0x47, 0xe4, 0x6c, 0xad, 0x94, 0x27, 0xc5, - 0xa4, 0xec, 0x72, 0x98, 0xf4, 0x83, 0x0e, 0x47, 0xb7, 0x59, 0xff, 0xaa, 0xe3, 0x46, 0x29, 0x14, - 0xae, 0x41, 0x85, 0xaf, 0x8e, 0x2e, 0x13, 0x66, 0xc2, 0xa8, 0xfa, 0x74, 0x62, 0xae, 0x26, 0xed, - 0x04, 0xa9, 0xe6, 0x6c, 0x6b, 0xd5, 0x49, 0x2c, 0x27, 0x41, 0x53, 0x5f, 0x12, 0x9a, 0xc6, 0x1f, - 0xa3, 0x99, 0x79, 0x1a, 0x9a, 0xd9, 0x05, 0x68, 0x2e, 0x69, 0x5d, 0xfe, 0xa8, 0xc3, 0x89, 0x19, - 0xab, 0xd2, 0xaa, 0xf4, 0xa2, 0x79, 0x85, 0x20, 0x63, 0x87, 0x4e, 0xcc, 0x28, 0xf1, 0x8c, 0x4e, - 0x42, 0x8e, 0xd9, 0x03, 0xe2, 0x63, 0xa9, 0x5e, 0x96, 0xb2, 0xd0, 0x65, 0x38, 0xa2, 0xea, 0xce, - 0x9b, 0x75, 0x47, 0xd4, 0x13, 0xf0, 0x14, 0xdb, 0x47, 0xa7, 0x13, 0xb3, 0x2c, 0x6b, 0xbb, 0x19, - 0x3a, 0xe4, 0x1d, 0xeb, 0x86, 0x55, 0x66, 0x89, 0x49, 0xbd, 0x14, 0xa0, 0xf9, 0xe5, 0x00, 0xfa, - 0xb9, 0x21, 0x96, 0x29, 0xa7, 0xe7, 0x1c, 0x9c, 0xcb, 0xde, 0x22, 0x5e, 0x30, 0x51, 0xe3, 0xf2, - 0x64, 0x9f, 0x58, 0x9e, 0xdc, 0xd3, 0xca, 0x93, 0x7f, 0xe6, 0xf2, 0x14, 0x96, 0x53, 0x9e, 0x6f, - 0x34, 0xb1, 0x79, 0x6f, 0x38, 0x8e, 0xa5, 0xe4, 0x75, 0x5e, 0xfe, 0xb5, 0x25, 0xcb, 0xbf, 0xbe, - 0x2c, 0xf9, 0xff, 0x56, 0x13, 0xb2, 0x67, 0x11, 0x3f, 0xdc, 0x27, 0xff, 0xb0, 0xdc, 0xbf, 0xd0, - 0x00, 0x5e, 0x9e, 0x1d, 0x6b, 0x1d, 0x0a, 0xb7, 0x5d, 0x8f, 0x88, 0x9e, 0x92, 0xd9, 0x33, 0x5b, - 0xe5, 0xfb, 0xa1, 0x0e, 0xab, 0x2f, 0x93, 0x16, 0x2e, 0xc8, 0xf8, 0x39, 0x68, 0xa2, 0x02, 0xe1, - 0x6b, 0x0d, 0x40, 0x9c, 0x9a, 0xc4, 0xa9, 0x0b, 0xbd, 0x06, 0x25, 0x32, 0x8e, 0x08, 0x0d, 0xb0, - 0x97, 0x48, 0xd7, 0x7f, 0xa6, 0x13, 0x13, 0xae, 0x2a, 0xb7, 0x90, 0xad, 0x94, 0xc5, 0x37, 0x2e, - 0xf5, 0xec, 0x3c, 0x61, 0x7f, 0xd6, 0x0f, 0xb5, 0x3f, 0xa7, 0x4f, 0xc6, 0xc6, 0xfc, 0xc9, 0x58, - 0xe5, 0xfd, 0x81, 0x06, 0xc5, 0xd9, 0x69, 0xef, 0xaf, 0xa6, 0x7d, 0x0a, 0x8a, 0x64, 0xec, 0x46, - 0x02, 0x43, 0x91, 0x71, 0xd9, 0x2a, 0x70, 0x07, 0x87, 0x8a, 0x17, 0x33, 0x95, 0x47, 0x26, 0x95, - 0xc3, 0x6f, 0x1a, 0xfc, 0x4b, 0x12, 0x48, 0xc1, 0xb7, 0x83, 0xed, 0x3d, 0x22, 0xcf, 0xbd, 0x73, - 0xa7, 0x70, 0x6d, 0xe1, 0x29, 0xfc, 0x49, 0x7b, 0x86, 0xbe, 0xa4, 0x6b, 0x85, 0xb1, 0xe8, 0x5a, - 0x91, 0x59, 0x74, 0xad, 0xc8, 0xce, 0x5f, 0x2b, 0xd4, 0x94, 0x7f, 0xd2, 0xa1, 0x1a, 0x4f, 0x99, - 0x0d, 0xc3, 0x80, 0x91, 0xc3, 0xcd, 0x79, 0xfe, 0x5a, 0xa0, 0x3f, 0xcb, 0xb5, 0x80, 0x4f, 0x21, - 0x60, 0x8f, 0xdd, 0x8c, 0x02, 0x26, 0xa7, 0xf0, 0x5f, 0x58, 0x8d, 0xc7, 0x8d, 0x5c, 0xb5, 0x8e, - 0x0c, 0xab, 0xa4, 0x7c, 0x6f, 0xbb, 0x3e, 0x91, 0x4d, 0x58, 0xe8, 0xed, 0x13, 0xd9, 0x24, 0x1b, - 0x37, 0x11, 0x3e, 0xd1, 0xe4, 0x2d, 0xa8, 0xc4, 0x4d, 0x58, 0x84, 0xa3, 0x11, 0x13, 0x8b, 0xaa, - 0x72, 0xe9, 0xfc, 0xe2, 0xcb, 0x87, 0xec, 0xb2, 0x2b, 0x7a, 0x58, 0x65, 0x9a, 0x36, 0xf9, 0x02, - 0xa6, 0x84, 0x8d, 0xbc, 0x48, 0x9e, 0x40, 0x2c, 0x65, 0x29, 0x58, 0x3f, 0xce, 0x40, 0x3e, 0x5e, - 0x82, 0x7f, 0xe7, 0x2d, 0xd3, 0x81, 0xe3, 0x0a, 0x1a, 0xe2, 0x74, 0x67, 0xdb, 0x03, 0xab, 0x1a, - 0x75, 0xe3, 0x70, 0x7b, 0xcc, 0xb1, 0xd9, 0x70, 0xb7, 0x66, 0xa3, 0x2d, 0xbe, 0xae, 0x9e, 0xe5, - 0x58, 0xcb, 0x8a, 0x0d, 0x88, 0xdb, 0x1f, 0x44, 0xaa, 0x20, 0x65, 0xe5, 0x7d, 0x43, 0x38, 0x0f, - 0x14, 0x36, 0x77, 0xb0, 0xb0, 0x73, 0xf4, 0xcb, 0x2f, 0xa4, 0xdf, 0x0d, 0x28, 0xb8, 0x3d, 0xbb, - 0xeb, 0x06, 0xb7, 0x43, 0x71, 0xe4, 0x28, 0x5d, 0x3a, 0xb3, 0xb0, 0xb4, 0x9d, 0xf6, 0x66, 0x27, - 0xb8, 0x1d, 0xb6, 0x4b, 0xd3, 0x89, 0x99, 0x57, 0x86, 0x95, 0x77, 0x7b, 0x36, 0x7f, 0x40, 0xd7, - 0xe1, 0x88, 0xbc, 0xa8, 0xc6, 0x84, 0x66, 0xd5, 0x62, 0xdd, 0x68, 0x18, 0x6d, 0x93, 0x8b, 0x70, - 0xa2, 0xae, 0x9d, 0x2d, 0xf6, 0x98, 0x08, 0x95, 0x69, 0x12, 0x74, 0x98, 0x22, 0xc3, 0xbb, 0x10, - 0xbf, 0x02, 0x99, 0x50, 0x52, 0x52, 0xca, 0x65, 0x4e, 0xae, 0x29, 0x0b, 0xa4, 0x6b, 0x87, 0x0b, - 0xdf, 0x59, 0xa8, 0xc4, 0xfa, 0x3f, 0xc0, 0x41, 0x40, 0x3c, 0xb5, 0xe7, 0xc4, 0x5a, 0x2f, 0x9d, - 0x6a, 0xe0, 0x2f, 0x35, 0xc8, 0x29, 0xc1, 0x7c, 0x0e, 0x27, 0x8a, 0x65, 0x5e, 0xd6, 0x55, 0xc2, - 0x9f, 0x69, 0x70, 0x6c, 0xc6, 0x23, 0x19, 0x12, 0xb0, 0x2c, 0x3d, 0xfb, 0x0b, 0x80, 0x6c, 0x2e, - 0x66, 0xf6, 0x28, 0x72, 0xf7, 0x49, 0xd7, 0x77, 0x19, 0x23, 0x52, 0x96, 0x32, 0xd6, 0xd1, 0x54, - 0x64, 0x5b, 0x04, 0x54, 0x76, 0xdf, 0xe9, 0x90, 0xdb, 0xc1, 0x14, 0xfb, 0x0c, 0x5d, 0x84, 0x13, - 0x3e, 0x1e, 0x77, 0xd3, 0x2c, 0x90, 0x6c, 0xd7, 0xc4, 0x10, 0xc8, 0xc7, 0xe3, 0x84, 0x06, 0x92, - 0xf7, 0xa7, 0xa1, 0xcc, 0xbb, 0x24, 0x6a, 0x2c, 0xdf, 0x56, 0xf2, 0xf1, 0x78, 0x23, 0x16, 0xe4, - 0x57, 0xe0, 0x24, 0x19, 0x0f, 0x5d, 0x8a, 0xf9, 0xf9, 0xa0, 0xdb, 0xf3, 0x42, 0x7b, 0xfe, 0x8b, - 0xd0, 0xf1, 0x24, 0xda, 0xe6, 0xc1, 0x59, 0x2f, 0x3e, 0xf2, 0x81, 0x09, 0x31, 0xb5, 0xf6, 0x8e, - 0xfb, 0x78, 0xbc, 0xf9, 0xd8, 0x9c, 0x18, 0x6a, 0xc0, 0x5a, 0x0f, 0x33, 0x32, 0xcb, 0xbf, 0x8f, - 0x99, 0xda, 0x03, 0x2a, 0xdc, 0xaf, 0x72, 0xbf, 0x8e, 0x19, 0xba, 0x0c, 0xff, 0x1e, 0x12, 0x9a, - 0xc8, 0xc5, 0x5c, 0x97, 0x9c, 0xe8, 0x72, 0x72, 0x48, 0x68, 0xaa, 0x70, 0x71, 0xd7, 0x2b, 0x85, - 0x4f, 0xef, 0x99, 0x2b, 0x1c, 0xbc, 0xf3, 0xaf, 0x43, 0x79, 0x4e, 0x2f, 0x51, 0x01, 0x32, 0x37, - 0x87, 0x24, 0x58, 0x5b, 0x41, 0x25, 0xc8, 0xef, 0x8e, 0x6c, 0x9b, 0x30, 0xb6, 0xa6, 0x71, 0xe3, - 0x1a, 0x76, 0xbd, 0x11, 0x25, 0x6b, 0x3a, 0x37, 0xae, 0xf2, 0x19, 0x13, 0x67, 0xcd, 0x68, 0xef, - 0xdc, 0x9f, 0xd6, 0xb4, 0x07, 0xd3, 0x9a, 0xf6, 0xcb, 0xb4, 0xa6, 0x7d, 0xf2, 0xb0, 0xb6, 0xf2, - 0xe0, 0x61, 0x6d, 0xe5, 0xe7, 0x87, 0xb5, 0x95, 0xf7, 0x5e, 0x4d, 0xf1, 0x80, 0x13, 0x50, 0x7c, - 0xd0, 0xb3, 0x43, 0xaf, 0x35, 0x63, 0x63, 0x4b, 0xfe, 0xce, 0x7f, 0x43, 0xec, 0xe5, 0x44, 0xc3, - 0xff, 0xff, 0x1e, 0x00, 0x00, 0xff, 0xff, 0xbc, 0x07, 0xb7, 0x7d, 0x5c, 0x14, 0x00, 0x00, + // 1449 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x58, 0xcb, 0x8f, 0x1b, 0x45, + 0x13, 0xdf, 0x99, 0xf1, 0xb3, 0xbc, 0x76, 0x76, 0x27, 0x8f, 0xcf, 0xdf, 0x06, 0x79, 0x4c, 0x94, + 0x44, 0x26, 0x52, 0x6c, 0x25, 0x20, 0xa4, 0x44, 0x42, 0x62, 0xbd, 0x9b, 0x04, 0x4b, 0x59, 0xb2, + 0xcc, 0x42, 0x90, 0xb8, 0x8c, 0xda, 0x33, 0xbd, 0xf6, 0x68, 0xe7, 0x61, 0xba, 0xc7, 0x1b, 0xe7, + 0x08, 0x12, 0x17, 0x4e, 0x1c, 0x91, 0xe0, 0x90, 0x7f, 0x80, 0x0b, 0x12, 0x48, 0x70, 0xe1, 0x1a, + 0x09, 0x09, 0xe5, 0xc0, 0x01, 0x71, 0xb0, 0x90, 0x73, 0xe1, 0xc8, 0x39, 0x27, 0xd4, 0x8f, 0xf1, + 0x8c, 0x77, 0x83, 0x43, 0x36, 0x86, 0x84, 0x8b, 0x3d, 0x55, 0xd5, 0xdd, 0x53, 0xf5, 0xab, 0xea, + 0x5f, 0x77, 0x0d, 0xac, 0x8d, 0x5a, 0x21, 0x41, 0xb6, 0x87, 0x5b, 0xd1, 0xdd, 0x01, 0xa6, 0xe2, + 0xb7, 0x39, 0x20, 0x61, 0x14, 0xea, 0xa7, 0xbb, 0x28, 0x70, 0xec, 0x3e, 0x72, 0x83, 0xa6, 0xf8, + 0x1d, 0x35, 0xc5, 0xd8, 0xe6, 0xfe, 0xa5, 0xb5, 0xf3, 0x51, 0xdf, 0x25, 0x8e, 0x35, 0x40, 0x24, + 0xba, 0xdb, 0xe2, 0xe3, 0x5b, 0xbd, 0xb0, 0x17, 0x26, 0x4f, 0x62, 0x91, 0x33, 0x5f, 0xab, 0x50, + 0xd9, 0xa2, 0x3d, 0x13, 0x7f, 0x38, 0xc4, 0x34, 0xda, 0x44, 0x11, 0xd2, 0xdf, 0x86, 0x15, 0xb1, + 0x8e, 0x45, 0x6d, 0xe2, 0x0e, 0x22, 0xcb, 0x75, 0xaa, 0x4a, 0x5d, 0x69, 0x68, 0xed, 0xb3, 0x93, + 0xb1, 0x51, 0xb9, 0xc5, 0x6d, 0x3b, 0xdc, 0xd4, 0xd9, 0x7c, 0x74, 0x48, 0x63, 0x56, 0xc2, 0xb4, + 0xec, 0xe8, 0x6b, 0x50, 0xb0, 0x91, 0xe7, 0x39, 0x28, 0x42, 0x55, 0xb5, 0xae, 0x34, 0x96, 0xcd, + 0xa9, 0xac, 0x9f, 0x86, 0x22, 0xa2, 0x7b, 0x96, 0x1d, 0x0e, 0x83, 0xa8, 0xaa, 0xd5, 0x95, 0x46, + 0xc6, 0x2c, 0x20, 0xba, 0xb7, 0xc1, 0x64, 0x66, 0xf4, 0xdd, 0x40, 0x1a, 0x33, 0xc2, 0xe8, 0xbb, + 0x81, 0x30, 0xbe, 0x02, 0x45, 0xdb, 0x73, 0x71, 0xc0, 0xdd, 0xcb, 0xd6, 0x95, 0x46, 0xb1, 0xbd, + 0x3c, 0x19, 0x1b, 0x85, 0x0d, 0xae, 0xec, 0x6c, 0x9a, 0x05, 0x61, 0xee, 0x38, 0x7a, 0x07, 0x72, + 0x14, 0x07, 0x0e, 0x26, 0xd5, 0x1c, 0x7b, 0x7d, 0xfb, 0xd2, 0xa3, 0xb1, 0x71, 0xb1, 0xe7, 0x46, + 0xfd, 0x61, 0xb7, 0x69, 0x87, 0x7e, 0xcb, 0x0e, 0xa9, 0x1f, 0x52, 0xf9, 0x77, 0x91, 0x3a, 0x7b, + 0x12, 0xe6, 0x75, 0xdb, 0x5e, 0x77, 0x1c, 0x82, 0x29, 0x35, 0xe5, 0x02, 0x57, 0x33, 0xbf, 0xdf, + 0x33, 0x94, 0x33, 0x3f, 0xa8, 0x50, 0xe6, 0xa0, 0x0d, 0x42, 0x22, 0x30, 0xbb, 0x02, 0x40, 0x04, + 0x84, 0x09, 0x5a, 0x6b, 0x93, 0xb1, 0x51, 0x94, 0xc0, 0x72, 0xa0, 0x12, 0xc1, 0x2c, 0xca, 0xd1, + 0x1d, 0x47, 0xdf, 0x82, 0x12, 0x41, 0x77, 0x2c, 0xc2, 0x17, 0xa3, 0x55, 0xb5, 0xae, 0x35, 0x4a, + 0x97, 0xcf, 0x37, 0xe7, 0x24, 0xb7, 0x69, 0xa2, 0x3b, 0xe2, 0xdd, 0xed, 0xcc, 0xfd, 0xb1, 0xb1, + 0x64, 0x02, 0x89, 0x15, 0x54, 0xbf, 0x05, 0xc5, 0x7d, 0xe4, 0xb9, 0x0e, 0x8a, 0x42, 0xc2, 0x11, + 0xfd, 0xfb, 0xf1, 0xde, 0x46, 0x5e, 0x1c, 0x6f, 0xb2, 0x86, 0xbe, 0x05, 0x05, 0xe1, 0x1b, 0x26, + 0x3c, 0x09, 0x47, 0xc2, 0x6f, 0xba, 0x84, 0x44, 0xf0, 0x13, 0x15, 0x8e, 0x6f, 0xd1, 0xde, 0x06, + 0xc1, 0x28, 0xc2, 0x0c, 0xc1, 0x9d, 0x70, 0x48, 0x6c, 0xac, 0xdf, 0x80, 0x6c, 0x78, 0x27, 0xc0, + 0x84, 0x43, 0x78, 0xa4, 0x37, 0x89, 0xf9, 0xba, 0x0e, 0x99, 0x00, 0xf9, 0x98, 0x17, 0x5c, 0xd1, + 0xe4, 0xcf, 0x7a, 0x1d, 0x4a, 0x0e, 0x16, 0x35, 0xed, 0x86, 0x01, 0x07, 0xa7, 0x68, 0xa6, 0x55, + 0x7a, 0x0d, 0x00, 0x8f, 0xb0, 0x3d, 0x8c, 0x50, 0xd7, 0xc3, 0x22, 0x5a, 0x33, 0xa5, 0x49, 0x55, + 0x52, 0x76, 0x31, 0x95, 0xf4, 0xa3, 0x0a, 0xab, 0x5b, 0xb4, 0x77, 0xcd, 0x71, 0xa3, 0x14, 0x0a, + 0xd7, 0xa1, 0xc2, 0x76, 0x87, 0x45, 0xb9, 0x98, 0x54, 0x54, 0x7d, 0x32, 0x36, 0x96, 0x93, 0x71, + 0xbc, 0xa8, 0x66, 0x64, 0x73, 0xd9, 0x49, 0x24, 0x27, 0x41, 0x53, 0x5d, 0x10, 0x9a, 0xda, 0x5f, + 0xa3, 0x99, 0x79, 0x12, 0x9a, 0xd9, 0x39, 0x68, 0x2e, 0x68, 0x5f, 0xfe, 0xa4, 0xc2, 0xc9, 0x69, + 0x55, 0xa5, 0x59, 0xe9, 0x79, 0xd7, 0x95, 0x0e, 0x19, 0x3b, 0x74, 0xe2, 0x8a, 0xe2, 0xcf, 0xfa, + 0x29, 0xc8, 0x51, 0xbb, 0x8f, 0x7d, 0x24, 0xd8, 0xcb, 0x94, 0x92, 0x7e, 0x05, 0x8e, 0xc9, 0xbc, + 0xb3, 0x61, 0xd6, 0x90, 0x78, 0x1c, 0x9e, 0x62, 0x7b, 0x75, 0x32, 0x36, 0xca, 0x22, 0xb7, 0x1b, + 0xa1, 0x83, 0xdf, 0x33, 0x6f, 0x9a, 0x65, 0x9a, 0x88, 0xc4, 0x4b, 0x01, 0x9a, 0x5f, 0x0c, 0xa0, + 0x5f, 0x6a, 0x7c, 0x9b, 0xb2, 0xf2, 0x9c, 0x81, 0x73, 0xd1, 0x47, 0xc4, 0x73, 0x2e, 0xd4, 0x38, + 0x3d, 0xd9, 0xc7, 0xa6, 0x27, 0xf7, 0xa4, 0xf4, 0xe4, 0x9f, 0x3a, 0x3d, 0x85, 0xc5, 0xa4, 0xe7, + 0x5b, 0x85, 0x1f, 0xde, 0xeb, 0x8e, 0x63, 0x4a, 0x7a, 0x9d, 0xa5, 0x7f, 0x65, 0xc1, 0xf4, 0xaf, + 0x2e, 0x8a, 0xfe, 0xbf, 0x53, 0x38, 0xed, 0x99, 0xd8, 0x0f, 0xf7, 0xf1, 0x7f, 0xcc, 0xf7, 0xaf, + 0x14, 0x80, 0x17, 0xe7, 0xc4, 0x5a, 0x83, 0xc2, 0xae, 0xeb, 0x61, 0x3e, 0x53, 0x54, 0xf6, 0x54, + 0x96, 0xfe, 0x7e, 0xac, 0xc2, 0xf2, 0x8b, 0xc4, 0x85, 0x73, 0x3c, 0xfe, 0x07, 0x38, 0x51, 0x82, + 0xf0, 0x8d, 0x02, 0xc0, 0x6f, 0x4d, 0xfc, 0xd6, 0xa5, 0xbf, 0x01, 0x25, 0x3c, 0x8a, 0x30, 0x09, + 0x90, 0x97, 0x50, 0xd7, 0x4b, 0x93, 0xb1, 0x01, 0xd7, 0xa4, 0x9a, 0xd3, 0x56, 0x4a, 0x62, 0x07, + 0x97, 0x7c, 0x76, 0x1e, 0x73, 0x3e, 0xab, 0x47, 0x3a, 0x9f, 0xd3, 0x37, 0x63, 0x6d, 0xf6, 0x66, + 0x2c, 0xfd, 0xfe, 0x48, 0x81, 0xe2, 0xf4, 0xb6, 0xf7, 0xac, 0x6e, 0x9f, 0x86, 0x22, 0x1e, 0xb9, + 0x11, 0xc7, 0x90, 0x7b, 0x5c, 0x36, 0x0b, 0x4c, 0xc1, 0xa0, 0x62, 0xc9, 0x4c, 0xf9, 0x91, 0x49, + 0xf9, 0xf0, 0x87, 0x02, 0xff, 0x13, 0x05, 0x24, 0xe1, 0xdb, 0x46, 0xf6, 0x1e, 0x16, 0xf7, 0xde, + 0x99, 0x5b, 0xb8, 0x32, 0xf7, 0x16, 0xfe, 0xb8, 0x33, 0x43, 0x5d, 0x50, 0x5b, 0xa1, 0xcd, 0x6b, + 0x2b, 0x32, 0xf3, 0xda, 0x8a, 0xec, 0x6c, 0x5b, 0x21, 0x43, 0xfe, 0x59, 0x85, 0x6a, 0x1c, 0x32, + 0x1d, 0x84, 0x01, 0xc5, 0x47, 0x8b, 0x79, 0xb6, 0x2d, 0x50, 0x9f, 0xa6, 0x2d, 0x60, 0x21, 0x04, + 0xf4, 0x40, 0x67, 0x14, 0x50, 0x11, 0xc2, 0xcb, 0xb0, 0x1c, 0xaf, 0x1b, 0xb9, 0x72, 0x1f, 0x69, + 0x66, 0x49, 0xea, 0xde, 0x75, 0x7d, 0x2c, 0x86, 0xd0, 0xd0, 0xdb, 0xc7, 0x62, 0x48, 0x36, 0x1e, + 0xc2, 0x75, 0x7c, 0xc8, 0x3b, 0x50, 0x89, 0x87, 0xd0, 0x08, 0x45, 0x43, 0xca, 0x37, 0x55, 0xe5, + 0xf2, 0x85, 0xf9, 0xcd, 0x87, 0x98, 0xb2, 0xc3, 0x67, 0x98, 0x65, 0x92, 0x16, 0xd9, 0x06, 0x26, + 0x98, 0x0e, 0xbd, 0x48, 0xdc, 0x40, 0x4c, 0x29, 0x49, 0x58, 0x3f, 0xcd, 0x40, 0x3e, 0xde, 0x82, + 0xff, 0x66, 0x97, 0xe9, 0xc0, 0x09, 0x09, 0x0d, 0x76, 0xac, 0xe9, 0xf1, 0x40, 0xab, 0x5a, 0x5d, + 0x3b, 0xda, 0x19, 0x73, 0x7c, 0xba, 0xdc, 0xed, 0xe9, 0x6a, 0xf3, 0xdb, 0xd5, 0x73, 0x0c, 0x6b, + 0x91, 0xb1, 0x3e, 0x76, 0x7b, 0xfd, 0x48, 0x26, 0xa4, 0x2c, 0xb5, 0x6f, 0x71, 0xe5, 0xa1, 0xc4, + 0xe6, 0x0e, 0x27, 0x76, 0xa6, 0xfc, 0xf2, 0x73, 0xcb, 0xef, 0x26, 0x14, 0xdc, 0xae, 0x6d, 0xb9, + 0xc1, 0x6e, 0xc8, 0xaf, 0x1c, 0xa5, 0xcb, 0x67, 0xe7, 0xa6, 0xb6, 0xd3, 0xde, 0xe8, 0x04, 0xbb, + 0x61, 0xbb, 0x34, 0x19, 0x1b, 0x79, 0x29, 0x98, 0x79, 0xb7, 0x6b, 0xb3, 0x07, 0xfd, 0x06, 0x1c, + 0x13, 0x8d, 0x6a, 0x5c, 0xd0, 0xb4, 0x5a, 0xac, 0x6b, 0x0d, 0xad, 0x6d, 0x30, 0x12, 0x4e, 0xd8, + 0xb5, 0xb3, 0x49, 0x0f, 0x90, 0x50, 0x99, 0x24, 0x46, 0x87, 0xca, 0x62, 0x78, 0x1f, 0xe2, 0x57, + 0xe8, 0x06, 0x94, 0x24, 0x95, 0x32, 0x9a, 0x13, 0x7b, 0xca, 0x04, 0xa1, 0xda, 0x66, 0xc4, 0x77, + 0x0e, 0x2a, 0x31, 0xff, 0xf7, 0x51, 0x10, 0x60, 0x4f, 0x9e, 0x39, 0x31, 0xd7, 0x0b, 0xa5, 0x5c, + 0xf8, 0x57, 0x05, 0x72, 0x92, 0x30, 0x17, 0x7e, 0xa3, 0xb8, 0x00, 0xab, 0x6e, 0x60, 0x75, 0xf1, + 0x6e, 0x48, 0xb0, 0x25, 0x4b, 0x9f, 0xfb, 0x52, 0x30, 0x8f, 0xb9, 0x41, 0x9b, 0xeb, 0xe5, 0x06, + 0x39, 0xd8, 0xd8, 0x6b, 0xcf, 0xd6, 0xd8, 0xcb, 0xe0, 0xbe, 0x50, 0xe0, 0xf8, 0xb4, 0xe6, 0x84, + 0x89, 0x43, 0xb8, 0xf0, 0x48, 0x2f, 0x82, 0x6e, 0x33, 0xe2, 0xb3, 0x87, 0x91, 0xbb, 0x8f, 0x2d, + 0xdf, 0xa5, 0x14, 0x0b, 0x0a, 0xcb, 0x98, 0xab, 0x29, 0xcb, 0x16, 0x37, 0x48, 0xef, 0xbe, 0x57, + 0x21, 0xb7, 0x8d, 0x08, 0xf2, 0xa9, 0x7e, 0x09, 0x4e, 0xfa, 0x68, 0x64, 0xa5, 0x2b, 0x46, 0xec, + 0x0c, 0x85, 0x2f, 0xa1, 0xfb, 0x68, 0x94, 0x94, 0x8c, 0xd8, 0x23, 0x67, 0xa0, 0xcc, 0xa6, 0x24, + 0xcc, 0x2d, 0xde, 0x56, 0xf2, 0xd1, 0x68, 0x3d, 0x26, 0xef, 0xd7, 0xe0, 0x14, 0x1e, 0x0d, 0x5c, + 0x82, 0xd8, 0x5d, 0xc2, 0xea, 0x7a, 0xa1, 0x3d, 0xfb, 0xf5, 0xe8, 0x44, 0x62, 0x6d, 0x33, 0xe3, + 0x74, 0x16, 0x5b, 0xf9, 0x50, 0x40, 0x54, 0xee, 0xd3, 0x13, 0x3e, 0x1a, 0x6d, 0x1c, 0x88, 0x89, + 0xea, 0x0d, 0x58, 0xe9, 0x22, 0x8a, 0xa7, 0xfe, 0xf7, 0x10, 0x95, 0xe7, 0x45, 0x85, 0xe9, 0xa5, + 0xef, 0x37, 0x10, 0xd5, 0xaf, 0xc0, 0xff, 0x07, 0x98, 0x24, 0xd4, 0x32, 0x33, 0x25, 0xc7, 0xa7, + 0x9c, 0x1a, 0x60, 0x92, 0x4a, 0x5c, 0x3c, 0xf5, 0x6a, 0xe1, 0xf3, 0x7b, 0xc6, 0x12, 0x03, 0xef, + 0xc2, 0x9b, 0x50, 0x9e, 0xe1, 0x56, 0xbd, 0x00, 0x99, 0x5b, 0x03, 0x1c, 0xac, 0x2c, 0xe9, 0x25, + 0xc8, 0xef, 0x0c, 0x6d, 0x1b, 0x53, 0xba, 0xa2, 0x30, 0xe1, 0x3a, 0x72, 0xbd, 0x21, 0xc1, 0x2b, + 0x2a, 0x13, 0xae, 0xb1, 0x88, 0xb1, 0xb3, 0xa2, 0xb5, 0xb7, 0xef, 0x4f, 0x6a, 0xca, 0x83, 0x49, + 0x4d, 0xf9, 0x6d, 0x52, 0x53, 0x3e, 0x7b, 0x58, 0x5b, 0x7a, 0xf0, 0xb0, 0xb6, 0xf4, 0xcb, 0xc3, + 0xda, 0xd2, 0x07, 0xaf, 0xa7, 0xea, 0x80, 0x15, 0x20, 0xff, 0xf8, 0x67, 0x87, 0x5e, 0x6b, 0x5a, + 0x8d, 0x2d, 0xf1, 0x3b, 0xfb, 0xbd, 0xb1, 0x9b, 0xe3, 0x03, 0x5f, 0xfd, 0x33, 0x00, 0x00, 0xff, + 0xff, 0xb0, 0xed, 0xdd, 0xe6, 0x88, 0x14, 0x00, 0x00, } func (this *MsgRequestData) Equal(that interface{}) bool { @@ -2232,6 +2242,9 @@ func (this *Report) Equal(that interface{}) bool { if !bytes.Equal(this.Validator, that1.Validator) { return false } + if this.InBeforeResolve != that1.InBeforeResolve { + return false + } if len(this.RawReports) != len(that1.RawReports) { return false } @@ -3242,8 +3255,18 @@ func (m *Report) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintTypes(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x12 + dAtA[i] = 0x1a + } + } + if m.InBeforeResolve { + i-- + if m.InBeforeResolve { + dAtA[i] = 1 + } else { + dAtA[i] = 0 } + i-- + dAtA[i] = 0x10 } if len(m.Validator) > 0 { i -= len(m.Validator) @@ -3809,6 +3832,9 @@ func (m *Report) Size() (n int) { if l > 0 { n += 1 + l + sovTypes(uint64(l)) } + if m.InBeforeResolve { + n += 2 + } if len(m.RawReports) > 0 { for _, e := range m.RawReports { l = e.Size() @@ -7125,6 +7151,26 @@ func (m *Report) Unmarshal(dAtA []byte) error { } iNdEx = postIndex case 2: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field InBeforeResolve", wireType) + } + var v int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTypes + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + v |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + m.InBeforeResolve = bool(v != 0) + case 3: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field RawReports", wireType) } diff --git a/chain/x/oracle/types/types.proto b/chain/x/oracle/types/types.proto index 455edce596..46f050f9f9 100644 --- a/chain/x/oracle/types/types.proto +++ b/chain/x/oracle/types/types.proto @@ -278,7 +278,8 @@ message Report { bytes validator = 1 [(gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.ValAddress"]; - repeated RawReport raw_reports = 2 [(gogoproto.nullable) = false]; + bool in_before_resolve = 2; + repeated RawReport raw_reports = 3 [(gogoproto.nullable) = false]; } // ValidatorReportInfo defines the report info for a validator