From f4640539acaa31d6f73882cf04327e50fa6ded2e Mon Sep 17 00:00:00 2001 From: Matt Witkowski Date: Wed, 17 Jan 2024 15:55:40 -0500 Subject: [PATCH] Update protos, documentation, and naming for NAVs (#1814) * Update CHANGELOG. * Update protos to use mills and update cli. * Update links in spec. * Update types and constructors to use UsdMills rather than UsdCents. * Fix added header. * Revert flag usage to previous example since it was correct. * Fix typo in changelog. * Move changelog entry to bugs. * Add usd_cents and deprecate it. * Update links in spec to include deprecated field. * Additional renaming of cents to mills. --- CHANGELOG.md | 1 + docs/proto-docs.md | 6 +- proto/provenance/marker/v1/tx.proto | 6 +- x/marker/client/cli/cli_test.go | 20 +- x/marker/client/cli/tx.go | 18 +- x/marker/keeper/msg_server.go | 4 +- x/marker/keeper/msg_server_test.go | 4 +- x/marker/spec/03_messages.md | 8 +- x/marker/types/marker_test.go | 4 +- x/marker/types/msg.go | 9 +- x/marker/types/tx.pb.go | 321 +++++++++++++++++----------- 11 files changed, 240 insertions(+), 161 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7f0305b056..ba5f4174c4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -50,6 +50,7 @@ Ref: https://keepachangelog.com/en/1.0.0/ ### Bug Fixes * Remove deleted marker send deny entries [#1666](https://github.com/provenance-io/provenance/issues/1666). +* Update protos, naming, and documentation to use mills [#1813](https://github.com/provenance-io/provenance/issues/1813). ### Dependencies diff --git a/docs/proto-docs.md b/docs/proto-docs.md index b6bd486d97..2d29b883b1 100644 --- a/docs/proto-docs.md +++ b/docs/proto-docs.md @@ -4623,8 +4623,9 @@ MsgAddFinalizeActivateMarkerRequest defines the Msg/AddFinalizeActivateMarker re | `allow_governance_control` | [bool](#bool) | | | | `allow_forced_transfer` | [bool](#bool) | | | | `required_attributes` | [string](#string) | repeated | | -| `usd_cents` | [uint64](#uint64) | | | +| `usd_cents` | [uint64](#uint64) | | **Deprecated.** | | `volume` | [uint64](#uint64) | | | +| `usd_mills` | [uint64](#uint64) | | | @@ -4660,8 +4661,9 @@ If being provided as a governance proposal, set the from_address to the gov modu | `allow_governance_control` | [bool](#bool) | | | | `allow_forced_transfer` | [bool](#bool) | | | | `required_attributes` | [string](#string) | repeated | | -| `usd_cents` | [uint64](#uint64) | | | +| `usd_cents` | [uint64](#uint64) | | **Deprecated.** | | `volume` | [uint64](#uint64) | | | +| `usd_mills` | [uint64](#uint64) | | | diff --git a/proto/provenance/marker/v1/tx.proto b/proto/provenance/marker/v1/tx.proto index cad727ba4e..f249866409 100644 --- a/proto/provenance/marker/v1/tx.proto +++ b/proto/provenance/marker/v1/tx.proto @@ -96,8 +96,9 @@ message MsgAddMarkerRequest { bool allow_governance_control = 9; bool allow_forced_transfer = 10; repeated string required_attributes = 11; - uint64 usd_cents = 12; + uint64 usd_cents = 12 [deprecated = true]; uint64 volume = 13; + uint64 usd_mills = 14; } // MsgAddMarkerResponse defines the Msg/AddMarker response type @@ -229,8 +230,9 @@ message MsgAddFinalizeActivateMarkerRequest { bool allow_governance_control = 8; bool allow_forced_transfer = 9; repeated string required_attributes = 10; - uint64 usd_cents = 11; + uint64 usd_cents = 11 [deprecated = true]; uint64 volume = 12; + uint64 usd_mills = 13; } // MsgAddFinalizeActivateMarkerResponse defines the Msg/AddFinalizeActivateMarker response type diff --git a/x/marker/client/cli/cli_test.go b/x/marker/client/cli/cli_test.go index 041306667a..03c8c45a4c 100644 --- a/x/marker/client/cli/cli_test.go +++ b/x/marker/client/cli/cli_test.go @@ -1968,7 +1968,7 @@ func TestParseNewMarkerFlags(t *testing.T) { argGov := "--" + markercli.FlagAllowGovernanceControl argForce := "--" + markercli.FlagAllowForceTransfer argRequiredAtt := "--" + markercli.FlagRequiredAttributes - argUsdCents := "--" + markercli.FlagUsdCents + argUsdMills := "--" + markercli.FlagUsdMills argVolume := "--" + markercli.FlagVolume tests := []struct { @@ -2155,10 +2155,10 @@ func TestParseNewMarkerFlags(t *testing.T) { }, }, { - name: "usd cents present without volume", + name: "usd mills present without volume", cmd: getTestCmd(), - args: []string{argUsdCents + "=10"}, - expErr: []string{"incorrect value for volume flag. Must be positive number if usd-cents flag has been set to positive value"}, + args: []string{argUsdMills + "=10"}, + expErr: []string{"incorrect value for volume flag. Must be positive number if usd-mills flag has been set to positive value"}, }, { name: "volume present", @@ -2170,35 +2170,35 @@ func TestParseNewMarkerFlags(t *testing.T) { AllowGovControl: false, AllowForceTransfer: false, RequiredAttributes: []string{}, - UsdCents: 0, + UsdMills: 0, Volume: 11, }, }, { - name: "usd-cents and volume present", + name: "usd-mills and volume present", cmd: getTestCmd(), - args: []string{argVolume + "=11", argUsdCents + "=1"}, + args: []string{argVolume + "=11", argUsdMills + "=1"}, exp: &markercli.NewMarkerFlagValues{ MarkerType: types.MarkerType_Coin, SupplyFixed: false, AllowGovControl: false, AllowForceTransfer: false, RequiredAttributes: []string{}, - UsdCents: 1, + UsdMills: 1, Volume: 11, }, }, { name: "everything", cmd: getTestCmd(), - args: []string{argForce, argGov, argType, "RESTRICTED", argFixed, argRequiredAtt, "jack.the.cat.io,george.the.dog.io", argUsdCents, "10", argVolume, "12"}, + args: []string{argForce, argGov, argType, "RESTRICTED", argFixed, argRequiredAtt, "jack.the.cat.io,george.the.dog.io", argUsdMills, "10", argVolume, "12"}, exp: &markercli.NewMarkerFlagValues{ MarkerType: types.MarkerType_RestrictedCoin, SupplyFixed: true, AllowGovControl: true, AllowForceTransfer: true, RequiredAttributes: []string{"jack.the.cat.io", "george.the.dog.io"}, - UsdCents: 10, + UsdMills: 10, Volume: 12, }, }, diff --git a/x/marker/client/cli/tx.go b/x/marker/client/cli/tx.go index eb8e1f2fc6..d912bbb45f 100644 --- a/x/marker/client/cli/tx.go +++ b/x/marker/client/cli/tx.go @@ -50,7 +50,7 @@ const ( FlagAdd = "add" FlagRemove = "remove" FlagGovProposal = "gov-proposal" - FlagUsdCents = "usd-cents" + FlagUsdMills = "usd-mills" FlagVolume = "volume" ) @@ -151,7 +151,7 @@ with the given supply amount and denomination provided in the coin argument flagVals.AllowGovControl, flagVals.AllowForceTransfer, flagVals.RequiredAttributes, - flagVals.UsdCents, + flagVals.UsdMills, flagVals.Volume, ) @@ -870,7 +870,7 @@ with the given supply amount and denomination provided in the coin argument msg := types.NewMsgAddFinalizeActivateMarkerRequest( coin.Denom, coin.Amount, callerAddr, callerAddr, flagVals.MarkerType, flagVals.SupplyFixed, flagVals.AllowGovControl, - flagVals.AllowForceTransfer, flagVals.RequiredAttributes, accessGrants, flagVals.UsdCents, flagVals.Volume, + flagVals.AllowForceTransfer, flagVals.RequiredAttributes, accessGrants, flagVals.UsdMills, flagVals.Volume, ) return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), msg) @@ -1146,7 +1146,7 @@ func AddNewMarkerFlags(cmd *cobra.Command) { cmd.Flags().Bool(FlagAllowGovernanceControl, false, "Indicates that governance control is allowed") cmd.Flags().Bool(FlagAllowForceTransfer, false, "Indicates that force transfer is allowed") cmd.Flags().StringSlice(FlagRequiredAttributes, []string{}, "comma delimited list of required attributes needed for a restricted marker to have send authority") - cmd.Flags().Uint64(FlagUsdCents, 0, "Indicates the net asset value of marker in usd cents, i.e. 1234 = $1.234") + cmd.Flags().Uint64(FlagUsdMills, 0, "Indicates the net asset value of marker in usd mills, i.e. 1234 = $1.234") cmd.Flags().Uint64(FlagVolume, 0, "Indicates the volume of the net asset value") } @@ -1157,7 +1157,7 @@ type NewMarkerFlagValues struct { AllowGovControl bool AllowForceTransfer bool RequiredAttributes []string - UsdCents uint64 + UsdMills uint64 Volume uint64 } @@ -1198,9 +1198,9 @@ func ParseNewMarkerFlags(cmd *cobra.Command) (*NewMarkerFlagValues, error) { return nil, fmt.Errorf("incorrect value for %s flag. Accepted: comma delimited list of attributes Error: %w", FlagRequiredAttributes, err) } - rv.UsdCents, err = cmd.Flags().GetUint64(FlagUsdCents) + rv.UsdMills, err = cmd.Flags().GetUint64(FlagUsdMills) if err != nil { - return nil, fmt.Errorf("incorrect value for %s flag. Accepted: 0 or greater value Error: %w", FlagUsdCents, err) + return nil, fmt.Errorf("incorrect value for %s flag. Accepted: 0 or greater value Error: %w", FlagUsdMills, err) } rv.Volume, err = cmd.Flags().GetUint64(FlagVolume) @@ -1208,8 +1208,8 @@ func ParseNewMarkerFlags(cmd *cobra.Command) (*NewMarkerFlagValues, error) { return nil, fmt.Errorf("incorrect value for %s flag. Accepted: 0 or greater value Error: %w", FlagVolume, err) } - if rv.UsdCents > 0 && rv.Volume == 0 { - return nil, fmt.Errorf("incorrect value for %s flag. Must be positive number if %s flag has been set to positive value", FlagVolume, FlagUsdCents) + if rv.UsdMills > 0 && rv.Volume == 0 { + return nil, fmt.Errorf("incorrect value for %s flag. Must be positive number if %s flag has been set to positive value", FlagVolume, FlagUsdMills) } return rv, nil diff --git a/x/marker/keeper/msg_server.go b/x/marker/keeper/msg_server.go index 1daaece7f6..71d814f441 100644 --- a/x/marker/keeper/msg_server.go +++ b/x/marker/keeper/msg_server.go @@ -113,7 +113,7 @@ func (k msgServer) AddMarker(goCtx context.Context, msg *types.MsgAddMarkerReque return nil, sdkerrors.ErrInvalidRequest.Wrap(err.Error()) } - nav := types.NewNetAssetValue(sdk.NewInt64Coin(types.UsdDenom, int64(msg.UsdCents)), msg.Volume) + nav := types.NewNetAssetValue(sdk.NewInt64Coin(types.UsdDenom, int64(msg.UsdMills)), msg.Volume) err = k.AddSetNetAssetValues(ctx, ma, []types.NetAssetValue{nav}, types.ModuleName) if err != nil { return nil, sdkerrors.ErrInvalidRequest.Wrap(err.Error()) @@ -601,7 +601,7 @@ func (k msgServer) AddFinalizeActivateMarker(goCtx context.Context, msg *types.M normalizedReqAttrs, ) - err = k.AddSetNetAssetValues(ctx, ma, []types.NetAssetValue{types.NewNetAssetValue(sdk.NewInt64Coin(types.UsdDenom, int64(msg.UsdCents)), msg.Volume)}, types.ModuleName) + err = k.AddSetNetAssetValues(ctx, ma, []types.NetAssetValue{types.NewNetAssetValue(sdk.NewInt64Coin(types.UsdDenom, int64(msg.UsdMills)), msg.Volume)}, types.ModuleName) if err != nil { return nil, sdkerrors.ErrInvalidRequest.Wrap(err.Error()) } diff --git a/x/marker/keeper/msg_server_test.go b/x/marker/keeper/msg_server_test.go index f63e9fcdec..e4a692bc34 100644 --- a/x/marker/keeper/msg_server_test.go +++ b/x/marker/keeper/msg_server_test.go @@ -140,7 +140,7 @@ func (s *MsgServerTestSuite) TestMsgAddMarkerRequest() { SupplyFixed: true, AllowGovernanceControl: true, AllowForcedTransfer: false, - UsdCents: 1, + UsdMills: 1, Volume: 0, }, expErr: `cannot set net asset value : marker net asset value volume must be positive value: invalid request`, @@ -156,7 +156,7 @@ func (s *MsgServerTestSuite) TestMsgAddMarkerRequest() { SupplyFixed: true, AllowGovernanceControl: true, AllowForcedTransfer: false, - UsdCents: 1, + UsdMills: 1, Volume: 10, }, expEvent: []proto.Message{ diff --git a/x/marker/spec/03_messages.md b/x/marker/spec/03_messages.md index 38f9438aa0..2377c1efd2 100644 --- a/x/marker/spec/03_messages.md +++ b/x/marker/spec/03_messages.md @@ -34,9 +34,9 @@ A marker is created using the Add Marker service message. The created marker can not be directly added in an Active (or Cancelled/Destroyed) status. Markers must have a valid supply and denomination value. -+++ https://github.com/provenance-io/provenance/blob/22740319ba4b3ba268b3720d4bee36d6c6b06b40/proto/provenance/marker/v1/tx.proto#L77-L93 ++++ https://github.com/provenance-io/provenance/blob/d999e7acefea1d77e2d5ce86ea89524dbf2692f8/proto/provenance/marker/v1/tx.proto#L83-L102 -+++ https://github.com/provenance-io/provenance/blob/22740319ba4b3ba268b3720d4bee36d6c6b06b40/proto/provenance/marker/v1/tx.proto#L95-96 ++++ https://github.com/provenance-io/provenance/blob/d999e7acefea1d77e2d5ce86ea89524dbf2692f8/proto/provenance/marker/v1/tx.proto#L104-L105 This service message is expected to fail if: @@ -297,9 +297,9 @@ This service message is expected to fail if: AddFinalizeActivate requested is used for adding, finalizing, and activating a marker in a single request. -+++ https://github.com/provenance-io/provenance/blob/22740319ba4b3ba268b3720d4bee36d6c6b06b40/proto/provenance/marker/v1/tx.proto#L212-L224 ++++ https://github.com/provenance-io/provenance/blob/d999e7acefea1d77e2d5ce86ea89524dbf2692f8/proto/provenance/marker/v1/tx.proto#L221-L236 -+++ https://github.com/provenance-io/provenance/blob/22740319ba4b3ba268b3720d4bee36d6c6b06b40/proto/provenance/marker/v1/tx.proto#L226-L227 ++++ https://github.com/provenance-io/provenance/blob/d999e7acefea1d77e2d5ce86ea89524dbf2692f8/proto/provenance/marker/v1/tx.proto#L238-L239 This service message is expected to fail if: diff --git a/x/marker/types/marker_test.go b/x/marker/types/marker_test.go index 90247ada16..f8cb28e0f1 100644 --- a/x/marker/types/marker_test.go +++ b/x/marker/types/marker_test.go @@ -440,7 +440,7 @@ func TestNetAssetValueValidate(t *testing.T) { { name: "volume must be positive if value is greater than 1", nav: NetAssetValue{ - Price: sdk.NewInt64Coin("usdcents", 1), + Price: sdk.NewInt64Coin("usdmills", 1), Volume: 0, }, expErr: "marker net asset value volume must be positive value", @@ -448,7 +448,7 @@ func TestNetAssetValueValidate(t *testing.T) { { name: "successful with 0 volume and coin", nav: NetAssetValue{ - Price: sdk.NewInt64Coin("usdcents", 0), + Price: sdk.NewInt64Coin("usdmills", 0), Volume: 0, }, }, diff --git a/x/marker/types/msg.go b/x/marker/types/msg.go index 7b96c759e7..85c6307d44 100644 --- a/x/marker/types/msg.go +++ b/x/marker/types/msg.go @@ -52,7 +52,7 @@ func NewMsgAddMarkerRequest( allowGovernanceControl bool, allowForcedTransfer bool, requiredAttributes []string, - usdCentValue uint64, + usdMills uint64, volume uint64, ) *MsgAddMarkerRequest { return &MsgAddMarkerRequest{ @@ -65,7 +65,7 @@ func NewMsgAddMarkerRequest( AllowGovernanceControl: allowGovernanceControl, AllowForcedTransfer: allowForcedTransfer, RequiredAttributes: requiredAttributes, - UsdCents: usdCentValue, + UsdMills: usdMills, Volume: volume, } } @@ -478,6 +478,7 @@ func (msg MsgGrantAllowanceRequest) GetSigners() []sdk.AccAddress { return []sdk.AccAddress{sdk.MustAccAddressFromBech32(msg.Administrator)} } +// NewMsgAddFinalizeActivateMarkerRequest creates a new MsgAddFinalizeActivateMarkerRequest. func NewMsgAddFinalizeActivateMarkerRequest( denom string, totalSupply sdkmath.Int, @@ -489,7 +490,7 @@ func NewMsgAddFinalizeActivateMarkerRequest( allowForcedTransfer bool, requiredAttributes []string, accessGrants []AccessGrant, - usdCentsValue uint64, + usdMills uint64, netAssetVolume uint64, ) *MsgAddFinalizeActivateMarkerRequest { return &MsgAddFinalizeActivateMarkerRequest{ @@ -502,7 +503,7 @@ func NewMsgAddFinalizeActivateMarkerRequest( AccessList: accessGrants, AllowForcedTransfer: allowForcedTransfer, RequiredAttributes: requiredAttributes, - UsdCents: usdCentsValue, + UsdMills: usdMills, Volume: netAssetVolume, } } diff --git a/x/marker/types/tx.pb.go b/x/marker/types/tx.pb.go index 006462f093..1d18434780 100644 --- a/x/marker/types/tx.pb.go +++ b/x/marker/types/tx.pb.go @@ -159,8 +159,9 @@ type MsgAddMarkerRequest struct { AllowGovernanceControl bool `protobuf:"varint,9,opt,name=allow_governance_control,json=allowGovernanceControl,proto3" json:"allow_governance_control,omitempty"` AllowForcedTransfer bool `protobuf:"varint,10,opt,name=allow_forced_transfer,json=allowForcedTransfer,proto3" json:"allow_forced_transfer,omitempty"` RequiredAttributes []string `protobuf:"bytes,11,rep,name=required_attributes,json=requiredAttributes,proto3" json:"required_attributes,omitempty"` - UsdCents uint64 `protobuf:"varint,12,opt,name=usd_cents,json=usdCents,proto3" json:"usd_cents,omitempty"` + UsdCents uint64 `protobuf:"varint,12,opt,name=usd_cents,json=usdCents,proto3" json:"usd_cents,omitempty"` // Deprecated: Do not use. Volume uint64 `protobuf:"varint,13,opt,name=volume,proto3" json:"volume,omitempty"` + UsdMills uint64 `protobuf:"varint,14,opt,name=usd_mills,json=usdMills,proto3" json:"usd_mills,omitempty"` } func (m *MsgAddMarkerRequest) Reset() { *m = MsgAddMarkerRequest{} } @@ -259,6 +260,7 @@ func (m *MsgAddMarkerRequest) GetRequiredAttributes() []string { return nil } +// Deprecated: Do not use. func (m *MsgAddMarkerRequest) GetUsdCents() uint64 { if m != nil { return m.UsdCents @@ -273,6 +275,13 @@ func (m *MsgAddMarkerRequest) GetVolume() uint64 { return 0 } +func (m *MsgAddMarkerRequest) GetUsdMills() uint64 { + if m != nil { + return m.UsdMills + } + return 0 +} + // MsgAddMarkerResponse defines the Msg/AddMarker response type type MsgAddMarkerResponse struct { } @@ -1414,8 +1423,9 @@ type MsgAddFinalizeActivateMarkerRequest struct { AllowGovernanceControl bool `protobuf:"varint,8,opt,name=allow_governance_control,json=allowGovernanceControl,proto3" json:"allow_governance_control,omitempty"` AllowForcedTransfer bool `protobuf:"varint,9,opt,name=allow_forced_transfer,json=allowForcedTransfer,proto3" json:"allow_forced_transfer,omitempty"` RequiredAttributes []string `protobuf:"bytes,10,rep,name=required_attributes,json=requiredAttributes,proto3" json:"required_attributes,omitempty"` - UsdCents uint64 `protobuf:"varint,11,opt,name=usd_cents,json=usdCents,proto3" json:"usd_cents,omitempty"` + UsdCents uint64 `protobuf:"varint,11,opt,name=usd_cents,json=usdCents,proto3" json:"usd_cents,omitempty"` // Deprecated: Do not use. Volume uint64 `protobuf:"varint,12,opt,name=volume,proto3" json:"volume,omitempty"` + UsdMills uint64 `protobuf:"varint,13,opt,name=usd_mills,json=usdMills,proto3" json:"usd_mills,omitempty"` } func (m *MsgAddFinalizeActivateMarkerRequest) Reset() { *m = MsgAddFinalizeActivateMarkerRequest{} } @@ -1507,6 +1517,7 @@ func (m *MsgAddFinalizeActivateMarkerRequest) GetRequiredAttributes() []string { return nil } +// Deprecated: Do not use. func (m *MsgAddFinalizeActivateMarkerRequest) GetUsdCents() uint64 { if m != nil { return m.UsdCents @@ -1521,6 +1532,13 @@ func (m *MsgAddFinalizeActivateMarkerRequest) GetVolume() uint64 { return 0 } +func (m *MsgAddFinalizeActivateMarkerRequest) GetUsdMills() uint64 { + if m != nil { + return m.UsdMills + } + return 0 +} + // MsgAddFinalizeActivateMarkerResponse defines the Msg/AddFinalizeActivateMarker response type type MsgAddFinalizeActivateMarkerResponse struct { } @@ -2223,128 +2241,129 @@ func init() { func init() { proto.RegisterFile("provenance/marker/v1/tx.proto", fileDescriptor_bcb203fb73175ed3) } var fileDescriptor_bcb203fb73175ed3 = []byte{ - // 1928 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x59, 0xcf, 0x6f, 0x1b, 0x59, - 0x1d, 0xef, 0x34, 0x89, 0x1b, 0x7f, 0xdd, 0xa6, 0xcd, 0xab, 0x93, 0x4c, 0xa6, 0xc4, 0x71, 0xdc, - 0x5f, 0xde, 0x65, 0xe3, 0x69, 0xbc, 0x10, 0x76, 0x23, 0x24, 0xe4, 0x24, 0xb4, 0x54, 0xe0, 0x55, - 0xe5, 0x2c, 0x20, 0xb8, 0x58, 0xe3, 0x99, 0x97, 0xe9, 0x28, 0xf6, 0x3c, 0x77, 0xde, 0xb3, 0xdb, - 0xac, 0xb4, 0x17, 0x38, 0xed, 0x09, 0xd4, 0x03, 0x07, 0xb8, 0x70, 0xe6, 0x80, 0x38, 0xac, 0x40, - 0xfc, 0x07, 0xab, 0x3d, 0xad, 0x56, 0x1c, 0x10, 0x87, 0x65, 0xd5, 0x1e, 0x40, 0xfc, 0x07, 0xdc, - 0xd0, 0xbc, 0xf7, 0x66, 0xc6, 0x63, 0xcf, 0x4c, 0x9c, 0xae, 0x55, 0xe0, 0x94, 0xbc, 0xf7, 0xfd, - 0xfd, 0xe3, 0xbd, 0xf7, 0xf9, 0x8e, 0x61, 0xa3, 0xef, 0x91, 0x21, 0x76, 0x0d, 0xd7, 0xc4, 0x7a, - 0xcf, 0xf0, 0x4e, 0xb0, 0xa7, 0x0f, 0x77, 0x74, 0xf6, 0xac, 0xd6, 0xf7, 0x08, 0x23, 0xa8, 0x18, - 0x91, 0x6b, 0x82, 0x5c, 0x1b, 0xee, 0x68, 0xeb, 0x36, 0x21, 0x76, 0x17, 0xeb, 0x9c, 0xa7, 0x33, - 0x38, 0xd6, 0x0d, 0xf7, 0x54, 0x08, 0x68, 0xeb, 0x26, 0xa1, 0x3d, 0x42, 0xdb, 0x7c, 0xa5, 0x8b, - 0x85, 0x24, 0x15, 0x6d, 0x62, 0x13, 0xb1, 0xef, 0xff, 0x27, 0x77, 0x4b, 0x82, 0x47, 0xef, 0x18, - 0x14, 0xeb, 0xc3, 0x9d, 0x0e, 0x66, 0xc6, 0x8e, 0x6e, 0x12, 0xc7, 0x9d, 0xa0, 0xbb, 0x27, 0x21, - 0xdd, 0x5f, 0x48, 0xfa, 0x9a, 0xa4, 0xf7, 0xa8, 0xed, 0x7b, 0xde, 0xa3, 0xb6, 0x24, 0xdc, 0x76, - 0x3a, 0xa6, 0x6e, 0xf4, 0xfb, 0x5d, 0xc7, 0x34, 0x98, 0x43, 0x5c, 0xaa, 0x33, 0xcf, 0x70, 0xe9, - 0x71, 0x3c, 0x42, 0x6d, 0x2b, 0x31, 0x01, 0x32, 0x56, 0xc1, 0x72, 0x27, 0x91, 0xc5, 0x30, 0x4d, - 0x4c, 0xa9, 0xed, 0x19, 0x2e, 0x13, 0x7c, 0x95, 0x3f, 0x29, 0xa0, 0x36, 0xa9, 0xfd, 0xc0, 0xdf, - 0x6a, 0x74, 0xbb, 0xe4, 0xa9, 0x2f, 0xd1, 0xc2, 0x4f, 0x06, 0x98, 0x32, 0x54, 0x84, 0x05, 0x0b, - 0xbb, 0xa4, 0xa7, 0x2a, 0x65, 0xa5, 0x9a, 0x6f, 0x89, 0x05, 0xba, 0x05, 0x57, 0x0c, 0xab, 0xe7, - 0xb8, 0x0e, 0x65, 0x9e, 0xc1, 0x88, 0xa7, 0x5e, 0xe4, 0xd4, 0xf8, 0x26, 0x52, 0xe1, 0x12, 0xb7, - 0x83, 0xb1, 0x3a, 0xc7, 0xe9, 0xc1, 0x12, 0x7d, 0x17, 0xf2, 0x46, 0x60, 0x49, 0x9d, 0x2f, 0x2b, - 0xd5, 0x42, 0xbd, 0x58, 0x13, 0xd5, 0xa9, 0x05, 0xd5, 0xa9, 0x35, 0xdc, 0xd3, 0xfd, 0xe5, 0x4f, - 0x3f, 0xde, 0xbe, 0x72, 0x1f, 0xe3, 0xd0, 0xaf, 0x87, 0xad, 0x48, 0xb2, 0x72, 0x03, 0xd6, 0x13, - 0x1c, 0xa7, 0x7d, 0xe2, 0x52, 0x5c, 0xf9, 0x68, 0x01, 0xae, 0x37, 0xa9, 0xdd, 0xb0, 0xac, 0x26, - 0x0f, 0x3e, 0x88, 0xa8, 0x03, 0x39, 0xa3, 0x47, 0x06, 0x2e, 0xe3, 0x21, 0x15, 0xea, 0xeb, 0x35, - 0x59, 0x6e, 0xbf, 0x94, 0x35, 0x59, 0xaa, 0xda, 0x01, 0x71, 0xdc, 0x7d, 0xfd, 0x93, 0x2f, 0x36, - 0x2f, 0xfc, 0xed, 0x8b, 0xcd, 0xbb, 0xb6, 0xc3, 0x1e, 0x0f, 0x3a, 0x35, 0x93, 0xf4, 0x64, 0x6f, - 0xc8, 0x3f, 0xdb, 0xd4, 0x3a, 0xd1, 0xd9, 0x69, 0x1f, 0x53, 0x2e, 0xd0, 0x92, 0x9a, 0xfd, 0xc8, - 0x7b, 0x86, 0x6b, 0xd8, 0xd8, 0x0b, 0x22, 0x97, 0x4b, 0xb4, 0x05, 0x97, 0x8f, 0x3d, 0xd2, 0x6b, - 0x1b, 0x96, 0xe5, 0x61, 0x4a, 0x79, 0xf0, 0xf9, 0x56, 0xc1, 0xdf, 0x6b, 0x88, 0x2d, 0xb4, 0x07, - 0x39, 0xca, 0x0c, 0x36, 0xa0, 0xea, 0x42, 0x59, 0xa9, 0x2e, 0xd5, 0x2b, 0xb5, 0xa4, 0x6e, 0xae, - 0x89, 0xa8, 0x8e, 0x38, 0x67, 0x4b, 0x4a, 0xa0, 0x06, 0x14, 0x04, 0x47, 0xdb, 0xf7, 0x4a, 0xcd, - 0x71, 0x05, 0xe5, 0x2c, 0x05, 0xef, 0x9f, 0xf6, 0x71, 0x0b, 0x7a, 0xe1, 0xff, 0xe8, 0x7b, 0x50, - 0x10, 0x3d, 0xd2, 0xee, 0x3a, 0x94, 0xa9, 0x97, 0xca, 0x73, 0xd5, 0x42, 0x7d, 0x2b, 0x59, 0x45, - 0x83, 0x33, 0xf2, 0x02, 0xec, 0xcf, 0xfb, 0xc9, 0x6a, 0x81, 0x90, 0xfd, 0x81, 0x43, 0x99, 0x1f, - 0x2b, 0x1d, 0xf4, 0xfb, 0xdd, 0xd3, 0xf6, 0xb1, 0xf3, 0x0c, 0x5b, 0xea, 0x62, 0x59, 0xa9, 0x2e, - 0xb6, 0x0a, 0x62, 0xef, 0xbe, 0xbf, 0x85, 0xde, 0x01, 0x95, 0x97, 0xb3, 0x6d, 0x93, 0x21, 0xf6, - 0xb8, 0xfa, 0xb6, 0x49, 0x5c, 0xe6, 0x91, 0xae, 0x9a, 0xe7, 0xec, 0xab, 0x9c, 0xfe, 0x20, 0x24, - 0x1f, 0x08, 0x2a, 0xaa, 0xc3, 0x8a, 0x90, 0x3c, 0x26, 0x9e, 0x89, 0xad, 0x76, 0x70, 0x4a, 0x54, - 0xe0, 0x62, 0xd7, 0x39, 0xf1, 0x3e, 0xa7, 0xbd, 0x2f, 0x49, 0x48, 0x87, 0xeb, 0x1e, 0x7e, 0x32, - 0x70, 0x3c, 0x6c, 0xb5, 0x0d, 0xc6, 0x3c, 0xa7, 0x33, 0x60, 0x98, 0xaa, 0x85, 0xf2, 0x5c, 0x35, - 0xdf, 0x42, 0x01, 0xa9, 0x11, 0x52, 0xd0, 0x0d, 0xc8, 0x0f, 0xa8, 0xd5, 0x36, 0xb1, 0xcb, 0xa8, - 0x7a, 0xb9, 0xac, 0x54, 0xe7, 0x5b, 0x8b, 0x03, 0x6a, 0x1d, 0xf8, 0x6b, 0xb4, 0x0a, 0xb9, 0x21, - 0xe9, 0x0e, 0x7a, 0x58, 0xbd, 0xc2, 0x29, 0x72, 0xb5, 0xb7, 0xfc, 0xb3, 0x7f, 0xfc, 0xe1, 0xcd, - 0x58, 0x95, 0x2b, 0xab, 0x50, 0x8c, 0xb7, 0xa2, 0xec, 0xd1, 0xe7, 0x4a, 0xd0, 0xa3, 0x22, 0x93, - 0xb3, 0x38, 0x75, 0xdf, 0x81, 0x9c, 0xa8, 0x81, 0x3a, 0x77, 0xbe, 0xd2, 0x49, 0xb1, 0xc8, 0xd9, - 0xc0, 0x27, 0xe9, 0xec, 0x87, 0xb0, 0xda, 0xa4, 0xf6, 0x21, 0xee, 0x62, 0x86, 0x67, 0xe7, 0xee, - 0x5d, 0xb8, 0xea, 0xe1, 0x1e, 0x19, 0xfa, 0x25, 0x91, 0x67, 0x42, 0x1c, 0x99, 0x25, 0xb9, 0x2d, - 0x8f, 0x45, 0x65, 0x1d, 0xd6, 0x26, 0xcc, 0x4b, 0xcf, 0x1e, 0x01, 0x6a, 0x52, 0xfb, 0xbe, 0xe3, - 0x1a, 0x5d, 0xe7, 0x83, 0x59, 0x5c, 0x5d, 0x95, 0x15, 0x5e, 0x97, 0x48, 0x63, 0xcc, 0x50, 0xc3, - 0x64, 0xce, 0xd0, 0x60, 0x33, 0x34, 0x14, 0x69, 0x94, 0x86, 0xde, 0x83, 0x6b, 0x4d, 0x6a, 0x1f, - 0xf8, 0x35, 0xeb, 0xce, 0xc2, 0xcc, 0x75, 0x58, 0x1e, 0xd1, 0x17, 0x33, 0x22, 0x32, 0x3a, 0x3b, - 0x23, 0x81, 0x3e, 0x69, 0xe4, 0xd7, 0x0a, 0x2c, 0x35, 0xa9, 0xdd, 0x74, 0x5c, 0xf6, 0x3a, 0x6f, - 0xe0, 0xe9, 0x3c, 0x5e, 0x86, 0xab, 0xa1, 0x6f, 0x71, 0x7f, 0xf7, 0x07, 0x9e, 0xfb, 0xbf, 0xea, - 0xaf, 0xf0, 0x4d, 0xfa, 0xfb, 0x17, 0x85, 0xf7, 0xe4, 0x8f, 0x1d, 0xf6, 0xd8, 0xf2, 0x8c, 0xa7, - 0xb3, 0x38, 0x92, 0x1b, 0x00, 0x8c, 0x8c, 0x9d, 0xc6, 0x3c, 0x23, 0xc1, 0xfb, 0x64, 0x86, 0xe9, - 0x98, 0xe7, 0x17, 0x4c, 0x46, 0x3a, 0xee, 0xf9, 0xe9, 0xf8, 0xdd, 0xdf, 0x37, 0xab, 0x53, 0xa6, - 0x83, 0x06, 0xf9, 0x90, 0xe7, 0x22, 0x8a, 0x4a, 0x46, 0xfb, 0xa5, 0x88, 0x36, 0xb8, 0xd1, 0xff, - 0xab, 0x15, 0x9a, 0x4b, 0xca, 0xdd, 0x14, 0xef, 0x7b, 0x3c, 0xbd, 0x0b, 0x63, 0xe9, 0x95, 0x91, - 0x47, 0x11, 0xca, 0xc8, 0x3f, 0x57, 0x60, 0xa5, 0x49, 0xed, 0x87, 0x1d, 0x73, 0x3c, 0xf8, 0xe7, - 0x0a, 0x2c, 0x86, 0xaf, 0x9f, 0x88, 0xff, 0x8d, 0x9a, 0xd3, 0x31, 0x6b, 0xa3, 0x28, 0xb2, 0x16, - 0x70, 0xf0, 0x97, 0x3f, 0xd2, 0xbf, 0xff, 0x7d, 0x99, 0x8f, 0x83, 0xc9, 0x7c, 0x38, 0x1d, 0x73, - 0xdb, 0x26, 0xfa, 0x70, 0x57, 0xef, 0x11, 0x6b, 0xd0, 0xc5, 0xd4, 0xc7, 0xa5, 0x23, 0x78, 0x54, - 0x24, 0x69, 0xd4, 0xd9, 0xd0, 0x8f, 0x29, 0xfb, 0x59, 0xe5, 0x4f, 0x4a, 0x2c, 0x26, 0x19, 0xee, - 0x9f, 0x15, 0xd0, 0x9a, 0xd4, 0x3e, 0xc2, 0xec, 0xd0, 0xef, 0xdc, 0x26, 0x66, 0x86, 0x65, 0x30, - 0x23, 0x88, 0x79, 0x00, 0x8b, 0x3d, 0xb9, 0x25, 0x43, 0xde, 0x88, 0x4a, 0xee, 0x9e, 0x84, 0x25, - 0x0f, 0xe4, 0xf6, 0xf7, 0x64, 0x98, 0xf5, 0xcc, 0xb2, 0x3f, 0x13, 0x78, 0x5d, 0x06, 0x16, 0xd8, - 0x0c, 0x4d, 0x4d, 0x19, 0xd5, 0x06, 0xdc, 0x48, 0x74, 0x5d, 0x86, 0xf6, 0xe9, 0x3c, 0xdc, 0x14, - 0x0f, 0x6c, 0xf0, 0xbe, 0x04, 0xd7, 0xff, 0xff, 0x19, 0x50, 0x1d, 0x03, 0x9b, 0x0b, 0x5f, 0x1d, - 0x6c, 0xe6, 0x66, 0x07, 0x36, 0x2f, 0x9d, 0x0f, 0x6c, 0x2e, 0xbe, 0x1a, 0xd8, 0xcc, 0x9f, 0x1b, - 0x6c, 0xc2, 0x74, 0x60, 0xb3, 0x90, 0x0a, 0x36, 0x2f, 0x8f, 0x82, 0xcd, 0xca, 0x1d, 0xb8, 0x95, - 0xdd, 0x4b, 0xb2, 0xe9, 0xfe, 0xad, 0x40, 0xd9, 0x6f, 0x4a, 0x9e, 0x8e, 0x87, 0xae, 0xe9, 0x61, - 0x83, 0xe2, 0x47, 0x1e, 0xe9, 0x13, 0x6a, 0x74, 0x5f, 0x67, 0xc7, 0xdd, 0x86, 0x25, 0x66, 0x78, - 0x36, 0x66, 0x61, 0x67, 0xc9, 0x33, 0x24, 0x76, 0x83, 0xde, 0xda, 0x85, 0xbc, 0x31, 0x60, 0x8f, - 0x89, 0xe7, 0xb0, 0x53, 0xd1, 0x9a, 0xfb, 0xea, 0xe7, 0x1f, 0x6f, 0x17, 0xa5, 0x43, 0x92, 0xed, - 0x88, 0x79, 0x8e, 0x6b, 0xb7, 0x22, 0xd6, 0x3d, 0xf4, 0xcf, 0xdf, 0x6e, 0x2a, 0x3e, 0x00, 0x8f, - 0xf6, 0x2a, 0x37, 0x61, 0x2b, 0x23, 0x74, 0x99, 0xa0, 0x5f, 0x5d, 0x84, 0x4a, 0x93, 0xda, 0x3f, - 0xec, 0x5b, 0x12, 0xd9, 0xc5, 0xab, 0x93, 0xfd, 0xae, 0x7e, 0x1b, 0x34, 0x81, 0x56, 0xdb, 0x49, - 0x25, 0xbf, 0xc8, 0x4b, 0xae, 0x0a, 0x8e, 0x49, 0xd5, 0x68, 0x17, 0xd6, 0x0c, 0xcb, 0x4a, 0x14, - 0x9d, 0xe3, 0xa2, 0x2b, 0x86, 0x65, 0x25, 0xc8, 0x3d, 0x00, 0x14, 0x34, 0x62, 0x3b, 0x4a, 0xd6, - 0xfc, 0x19, 0xc9, 0x5a, 0x0e, 0x64, 0x1a, 0x61, 0xd2, 0x6e, 0x04, 0x49, 0x4b, 0xd0, 0x57, 0xb9, - 0xcd, 0x6f, 0xab, 0xf4, 0xbc, 0xc8, 0xfc, 0xfd, 0x51, 0x81, 0x52, 0xc8, 0x17, 0x3f, 0x0a, 0xd9, - 0xb9, 0x4b, 0x3d, 0x5b, 0x17, 0xd3, 0xcf, 0xd6, 0x2c, 0xbb, 0x63, 0x0b, 0x36, 0x53, 0xfd, 0x0e, - 0x3e, 0x25, 0x88, 0x2f, 0x24, 0x47, 0x98, 0x35, 0x4c, 0xd3, 0xef, 0xe2, 0xc3, 0x91, 0xa7, 0x28, - 0x39, 0xaa, 0x22, 0x2c, 0x0c, 0x8d, 0xee, 0x00, 0xcb, 0xee, 0x16, 0x0b, 0x74, 0x0f, 0x72, 0xd4, - 0xb1, 0xdd, 0xe0, 0xb6, 0xcd, 0x70, 0x5a, 0xf2, 0xed, 0x5d, 0x0d, 0x3c, 0x96, 0x1b, 0xf2, 0x9b, - 0xc7, 0xb8, 0x2b, 0xd2, 0xd1, 0x7f, 0x29, 0xf0, 0xb5, 0x30, 0x98, 0x23, 0xec, 0x5a, 0x87, 0xd8, - 0x3d, 0xf5, 0xaf, 0xc7, 0x6c, 0x67, 0x77, 0x61, 0x4d, 0xb6, 0xaf, 0x85, 0x5d, 0x27, 0x9a, 0xc4, - 0xc2, 0xde, 0x5d, 0x11, 0xe4, 0x43, 0x4e, 0x6d, 0x04, 0x44, 0x74, 0x0f, 0x8a, 0x7e, 0xe3, 0x4e, - 0x08, 0x89, 0xae, 0x45, 0x86, 0x65, 0x8d, 0x4b, 0xc4, 0x0a, 0x37, 0xff, 0xd5, 0x0a, 0xb7, 0x09, - 0x1b, 0x29, 0xb1, 0xca, 0x6c, 0xfc, 0x5e, 0xe1, 0x0f, 0x71, 0xc3, 0xb2, 0xde, 0xc3, 0xac, 0x41, - 0x29, 0x66, 0x3f, 0xf2, 0xab, 0x30, 0x93, 0xb1, 0xf5, 0x08, 0xae, 0xb9, 0xfe, 0x1d, 0xe6, 0x6b, - 0x6d, 0xf3, 0xe2, 0x06, 0xf3, 0xf6, 0xcd, 0xe4, 0xd7, 0x2b, 0xe6, 0x82, 0x7c, 0xbf, 0x96, 0xdc, - 0x98, 0x5f, 0x95, 0x12, 0xaf, 0x5e, 0x82, 0xbf, 0x22, 0xa0, 0xfa, 0x6f, 0x10, 0xcc, 0x35, 0xa9, - 0x8d, 0xda, 0xb0, 0x18, 0x5c, 0xf7, 0xa8, 0x9a, 0xf2, 0xde, 0x4e, 0xcc, 0xc3, 0xda, 0x1b, 0x53, - 0x70, 0x0a, 0x43, 0xbe, 0x81, 0xe0, 0x1d, 0xc9, 0x30, 0x30, 0x36, 0x07, 0x67, 0x18, 0x18, 0x9f, - 0x6f, 0xd1, 0x4f, 0x20, 0x27, 0x86, 0x51, 0x74, 0x27, 0x55, 0x28, 0x36, 0xfd, 0x6a, 0x77, 0xcf, - 0xe4, 0x8b, 0x54, 0x8b, 0x11, 0x34, 0x43, 0x75, 0x6c, 0xe6, 0xcd, 0x50, 0x1d, 0x9f, 0x65, 0xd1, - 0x11, 0xcc, 0xfb, 0xb3, 0x22, 0xba, 0x95, 0x2a, 0x30, 0x32, 0xe6, 0x6a, 0xb7, 0xcf, 0xe0, 0x8a, - 0x94, 0xfa, 0x03, 0x5d, 0x86, 0xd2, 0x91, 0x59, 0x34, 0x43, 0xe9, 0xe8, 0x54, 0x88, 0x3a, 0x90, - 0x0f, 0x3f, 0xe0, 0xa0, 0x8c, 0xba, 0x8c, 0x7d, 0x78, 0xd2, 0xde, 0x9c, 0x86, 0x55, 0xda, 0x38, - 0x81, 0xcb, 0xa3, 0x5f, 0x63, 0xd0, 0x5b, 0x67, 0xa4, 0x31, 0x6e, 0x69, 0x7b, 0x4a, 0xee, 0xa8, - 0x23, 0x83, 0x61, 0x30, 0xa3, 0x23, 0xc7, 0xa6, 0xe0, 0x8c, 0x8e, 0x1c, 0x9f, 0x2c, 0x65, 0xc6, - 0x04, 0x6a, 0xca, 0xce, 0x58, 0x0c, 0xa5, 0x67, 0x67, 0x2c, 0x0e, 0xc2, 0xfc, 0x20, 0xc2, 0x27, - 0x2c, 0x3d, 0x88, 0xb1, 0x67, 0x33, 0x23, 0x88, 0xf1, 0x87, 0x0a, 0x3d, 0x86, 0xc2, 0xc8, 0x30, - 0x85, 0xbe, 0x9e, 0x2a, 0x39, 0x39, 0x46, 0x6a, 0x6f, 0x4d, 0xc7, 0x2c, 0x2d, 0x3d, 0x85, 0x6b, - 0xe3, 0x03, 0x0e, 0xba, 0x97, 0xaa, 0x21, 0x65, 0x8c, 0xd3, 0x76, 0xce, 0x21, 0x21, 0x0d, 0x3f, - 0x81, 0xa5, 0xf8, 0x07, 0x7f, 0x54, 0x4b, 0x55, 0x92, 0xf8, 0x93, 0x86, 0xa6, 0x4f, 0xcd, 0x2f, - 0x4d, 0x3e, 0x57, 0x60, 0x3d, 0x15, 0x61, 0xa3, 0x77, 0xb3, 0x1a, 0x20, 0x73, 0xc2, 0xd3, 0xf6, - 0x5e, 0x45, 0x54, 0x3a, 0xf5, 0x91, 0x02, 0xab, 0xc9, 0x90, 0x16, 0xed, 0xa6, 0x67, 0x35, 0x0b, - 0xfe, 0x6b, 0xdf, 0x3a, 0xb7, 0x9c, 0xf4, 0xe5, 0x17, 0x0a, 0xa8, 0x69, 0x00, 0x11, 0xbd, 0x93, - 0xaa, 0xf5, 0x0c, 0xac, 0xad, 0xbd, 0xfb, 0x0a, 0x92, 0xd2, 0xa3, 0x9f, 0x2b, 0x50, 0x4c, 0x82, - 0x74, 0xe8, 0x1b, 0x67, 0xe8, 0x4c, 0x44, 0xae, 0xda, 0x37, 0xcf, 0x29, 0x15, 0xf5, 0x6a, 0x1c, - 0xa8, 0x65, 0xf4, 0x6a, 0x22, 0xb8, 0xcc, 0xe8, 0xd5, 0x64, 0x04, 0x88, 0x3e, 0x04, 0x34, 0x89, - 0x88, 0x50, 0xfd, 0x0c, 0xff, 0x13, 0xa0, 0xa2, 0xf6, 0xf6, 0xb9, 0x64, 0xa4, 0xf9, 0x0f, 0x60, - 0x79, 0x02, 0xbe, 0xa0, 0x9d, 0xac, 0x36, 0x4f, 0x84, 0x66, 0x5a, 0xfd, 0x3c, 0x22, 0xc2, 0xf6, - 0xbe, 0xfd, 0xc9, 0x8b, 0x92, 0xf2, 0xd9, 0x8b, 0x92, 0xf2, 0xe5, 0x8b, 0x92, 0xf2, 0xcb, 0x97, - 0xa5, 0x0b, 0x9f, 0xbd, 0x2c, 0x5d, 0xf8, 0xeb, 0xcb, 0xd2, 0x05, 0x58, 0x73, 0x48, 0xa2, 0xbe, - 0x47, 0xca, 0x4f, 0x47, 0xbf, 0x07, 0x45, 0x2c, 0xdb, 0x0e, 0x19, 0x59, 0xe9, 0xcf, 0x82, 0xdf, - 0x4f, 0xf9, 0x3c, 0xdb, 0xc9, 0xf1, 0x9f, 0x28, 0xdf, 0xfe, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, - 0xa9, 0xa6, 0x30, 0xde, 0x85, 0x1e, 0x00, 0x00, + // 1952 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x59, 0xcb, 0x6f, 0x1b, 0xc7, + 0x19, 0xf7, 0x5a, 0x0f, 0x8b, 0x1f, 0x6d, 0xd9, 0x1a, 0x53, 0xd2, 0x6a, 0x5d, 0x51, 0x14, 0xfd, + 0x62, 0xd2, 0x88, 0x6b, 0x31, 0xad, 0x9a, 0x08, 0x05, 0x0a, 0x52, 0xaa, 0x5d, 0xa3, 0x65, 0x60, + 0x50, 0x69, 0x8b, 0xf6, 0x42, 0x2c, 0x77, 0x47, 0xeb, 0x85, 0xc8, 0x1d, 0x7a, 0x67, 0x48, 0x5b, + 0x01, 0x72, 0x69, 0x4f, 0x39, 0xb5, 0xf0, 0xa1, 0x87, 0xf6, 0xd2, 0x73, 0x0e, 0x45, 0x0f, 0x41, + 0x8b, 0xfe, 0x07, 0x41, 0x4f, 0x41, 0xd0, 0x43, 0xd1, 0x43, 0x1a, 0xd8, 0x87, 0x16, 0xed, 0x5f, + 0xd0, 0x5b, 0xb1, 0x33, 0xb3, 0xbb, 0x5c, 0x72, 0x77, 0x45, 0x39, 0x44, 0xda, 0x9c, 0xa4, 0x99, + 0xef, 0xfd, 0x98, 0x99, 0xdf, 0xb7, 0x84, 0xcd, 0xbe, 0x47, 0x86, 0xd8, 0x35, 0x5c, 0x13, 0xeb, + 0x3d, 0xc3, 0x3b, 0xc1, 0x9e, 0x3e, 0xdc, 0xd5, 0xd9, 0xb3, 0x6a, 0xdf, 0x23, 0x8c, 0xa0, 0x42, + 0x44, 0xae, 0x0a, 0x72, 0x75, 0xb8, 0xab, 0x6d, 0xd8, 0x84, 0xd8, 0x5d, 0xac, 0x73, 0x9e, 0xce, + 0xe0, 0x58, 0x37, 0xdc, 0x53, 0x21, 0xa0, 0x6d, 0x98, 0x84, 0xf6, 0x08, 0x6d, 0xf3, 0x95, 0x2e, + 0x16, 0x92, 0x54, 0xb0, 0x89, 0x4d, 0xc4, 0xbe, 0xff, 0x9f, 0xdc, 0x2d, 0x0a, 0x1e, 0xbd, 0x63, + 0x50, 0xac, 0x0f, 0x77, 0x3b, 0x98, 0x19, 0xbb, 0xba, 0x49, 0x1c, 0x77, 0x82, 0xee, 0x9e, 0x84, + 0x74, 0x7f, 0x21, 0xe9, 0xeb, 0x92, 0xde, 0xa3, 0xb6, 0xef, 0x79, 0x8f, 0xda, 0x92, 0x70, 0xdb, + 0xe9, 0x98, 0xba, 0xd1, 0xef, 0x77, 0x1d, 0xd3, 0x60, 0x0e, 0x71, 0xa9, 0xce, 0x3c, 0xc3, 0xa5, + 0xc7, 0xf1, 0x08, 0xb5, 0xed, 0xc4, 0x04, 0xc8, 0x58, 0x05, 0xcb, 0x9d, 0x44, 0x16, 0xc3, 0x34, + 0x31, 0xa5, 0xb6, 0x67, 0xb8, 0x4c, 0xf0, 0x95, 0xff, 0xa8, 0x80, 0xda, 0xa4, 0xf6, 0x03, 0x7f, + 0xab, 0xde, 0xed, 0x92, 0xa7, 0xbe, 0x44, 0x0b, 0x3f, 0x19, 0x60, 0xca, 0x50, 0x01, 0x16, 0x2c, + 0xec, 0x92, 0x9e, 0xaa, 0x94, 0x94, 0x4a, 0xae, 0x25, 0x16, 0xe8, 0x16, 0x5c, 0x31, 0xac, 0x9e, + 0xe3, 0x3a, 0x94, 0x79, 0x06, 0x23, 0x9e, 0x7a, 0x91, 0x53, 0xe3, 0x9b, 0x48, 0x85, 0x4b, 0xdc, + 0x0e, 0xc6, 0xea, 0x1c, 0xa7, 0x07, 0x4b, 0xf4, 0x5d, 0xc8, 0x19, 0x81, 0x25, 0x75, 0xbe, 0xa4, + 0x54, 0xf2, 0xb5, 0x42, 0x55, 0x54, 0xa7, 0x1a, 0x54, 0xa7, 0x5a, 0x77, 0x4f, 0x1b, 0x2b, 0x7f, + 0xfe, 0x68, 0xe7, 0xca, 0x7d, 0x8c, 0x43, 0xbf, 0x1e, 0xb6, 0x22, 0xc9, 0xf2, 0x0d, 0xd8, 0x48, + 0x70, 0x9c, 0xf6, 0x89, 0x4b, 0x71, 0xf9, 0xc3, 0x05, 0xb8, 0xde, 0xa4, 0x76, 0xdd, 0xb2, 0x9a, + 0x3c, 0xf8, 0x20, 0xa2, 0x0e, 0x2c, 0x1a, 0x3d, 0x32, 0x70, 0x19, 0x0f, 0x29, 0x5f, 0xdb, 0xa8, + 0xca, 0x72, 0xfb, 0xa5, 0xac, 0xca, 0x52, 0x55, 0x0f, 0x88, 0xe3, 0x36, 0xf4, 0x8f, 0x3f, 0xdb, + 0xba, 0xf0, 0xb7, 0xcf, 0xb6, 0xee, 0xda, 0x0e, 0x7b, 0x3c, 0xe8, 0x54, 0x4d, 0xd2, 0x93, 0xbd, + 0x21, 0xff, 0xec, 0x50, 0xeb, 0x44, 0x67, 0xa7, 0x7d, 0x4c, 0xb9, 0x40, 0x4b, 0x6a, 0xf6, 0x23, + 0xef, 0x19, 0xae, 0x61, 0x63, 0x2f, 0x88, 0x5c, 0x2e, 0xd1, 0x36, 0x5c, 0x3e, 0xf6, 0x48, 0xaf, + 0x6d, 0x58, 0x96, 0x87, 0x29, 0xe5, 0xc1, 0xe7, 0x5a, 0x79, 0x7f, 0xaf, 0x2e, 0xb6, 0xd0, 0x3e, + 0x2c, 0x52, 0x66, 0xb0, 0x01, 0x55, 0x17, 0x4a, 0x4a, 0x65, 0xb9, 0x56, 0xae, 0x26, 0x75, 0x73, + 0x55, 0x44, 0x75, 0xc4, 0x39, 0x5b, 0x52, 0x02, 0xd5, 0x21, 0x2f, 0x38, 0xda, 0xbe, 0x57, 0xea, + 0x22, 0x57, 0x50, 0xca, 0x52, 0xf0, 0xee, 0x69, 0x1f, 0xb7, 0xa0, 0x17, 0xfe, 0x8f, 0xbe, 0x07, + 0x79, 0xd1, 0x23, 0xed, 0xae, 0x43, 0x99, 0x7a, 0xa9, 0x34, 0x57, 0xc9, 0xd7, 0xb6, 0x93, 0x55, + 0xd4, 0x39, 0x23, 0x2f, 0x40, 0x63, 0xde, 0x4f, 0x56, 0x0b, 0x84, 0xec, 0x0f, 0x1c, 0xca, 0xfc, + 0x58, 0xe9, 0xa0, 0xdf, 0xef, 0x9e, 0xb6, 0x8f, 0x9d, 0x67, 0xd8, 0x52, 0x97, 0x4a, 0x4a, 0x65, + 0xa9, 0x95, 0x17, 0x7b, 0xf7, 0xfd, 0x2d, 0xf4, 0x16, 0xa8, 0xbc, 0x9c, 0x6d, 0x9b, 0x0c, 0xb1, + 0xc7, 0xd5, 0xb7, 0x4d, 0xe2, 0x32, 0x8f, 0x74, 0xd5, 0x1c, 0x67, 0x5f, 0xe3, 0xf4, 0x07, 0x21, + 0xf9, 0x40, 0x50, 0x51, 0x0d, 0x56, 0x85, 0xe4, 0x31, 0xf1, 0x4c, 0x6c, 0xb5, 0x83, 0x53, 0xa2, + 0x02, 0x17, 0xbb, 0xce, 0x89, 0xf7, 0x39, 0xed, 0x5d, 0x49, 0x42, 0x3a, 0x5c, 0xf7, 0xf0, 0x93, + 0x81, 0xe3, 0x61, 0xab, 0x6d, 0x30, 0xe6, 0x39, 0x9d, 0x01, 0xc3, 0x54, 0xcd, 0x97, 0xe6, 0x2a, + 0xb9, 0x16, 0x0a, 0x48, 0xf5, 0x90, 0x82, 0xb6, 0x20, 0x37, 0xa0, 0x56, 0xdb, 0xc4, 0x2e, 0xa3, + 0xea, 0xe5, 0x92, 0x52, 0x99, 0x6f, 0x5c, 0x54, 0x95, 0xd6, 0xd2, 0x80, 0x5a, 0x07, 0xfe, 0x1e, + 0x5a, 0x83, 0xc5, 0x21, 0xe9, 0x0e, 0x7a, 0x58, 0xbd, 0xe2, 0x53, 0x5b, 0x72, 0x85, 0x6e, 0x08, + 0xc1, 0x9e, 0xd3, 0xed, 0x52, 0x75, 0x99, 0x93, 0x7c, 0xa1, 0xa6, 0xbf, 0xde, 0x5f, 0xf9, 0xd9, + 0x3f, 0x7e, 0xff, 0x7a, 0xac, 0x0d, 0xca, 0x6b, 0x50, 0x88, 0xf7, 0xaa, 0x6c, 0xe2, 0xe7, 0x4a, + 0xd0, 0xc4, 0x22, 0xd5, 0xb3, 0x38, 0x96, 0xdf, 0x81, 0x45, 0x51, 0x24, 0x75, 0xee, 0x7c, 0xb5, + 0x95, 0x62, 0x91, 0xb3, 0x81, 0x4f, 0xd2, 0xd9, 0xf7, 0x61, 0xad, 0x49, 0xed, 0x43, 0xdc, 0xc5, + 0x0c, 0xcf, 0xce, 0xdd, 0xbb, 0x70, 0xd5, 0xc3, 0x3d, 0x32, 0xf4, 0x6b, 0x26, 0x0f, 0x8d, 0x38, + 0x53, 0xcb, 0x72, 0x5b, 0x9e, 0x9b, 0xf2, 0x06, 0xac, 0x4f, 0x98, 0x97, 0x9e, 0x3d, 0x02, 0xd4, + 0xa4, 0xf6, 0x7d, 0xc7, 0x35, 0xba, 0xce, 0x7b, 0xb3, 0xb8, 0xdb, 0xca, 0xab, 0xbc, 0x2e, 0x91, + 0xc6, 0x98, 0xa1, 0xba, 0xc9, 0x9c, 0xa1, 0xc1, 0x66, 0x68, 0x28, 0xd2, 0x28, 0x0d, 0xbd, 0x03, + 0xd7, 0x9a, 0xd4, 0x3e, 0xf0, 0x6b, 0xd6, 0x9d, 0x85, 0x99, 0xeb, 0xb0, 0x32, 0xa2, 0x2f, 0x66, + 0x44, 0x64, 0x74, 0x76, 0x46, 0x02, 0x7d, 0xd2, 0xc8, 0xaf, 0x15, 0x58, 0x6e, 0x52, 0xbb, 0xe9, + 0xb8, 0xec, 0xcb, 0xbc, 0xa2, 0xa7, 0xf3, 0x78, 0x05, 0xae, 0x86, 0xbe, 0xc5, 0xfd, 0x6d, 0x0c, + 0x3c, 0xf7, 0xff, 0xd5, 0x5f, 0xe1, 0x9b, 0xf4, 0xf7, 0x2f, 0x0a, 0xef, 0xc9, 0x1f, 0x3b, 0xec, + 0xb1, 0xe5, 0x19, 0x4f, 0x67, 0x71, 0x24, 0x37, 0x01, 0x18, 0x19, 0x3b, 0x8d, 0x39, 0x46, 0x82, + 0x07, 0xcc, 0x0c, 0xd3, 0x31, 0xcf, 0x2f, 0x98, 0x8c, 0x74, 0xdc, 0xf3, 0xd3, 0xf1, 0xe1, 0xdf, + 0xb7, 0x2a, 0x53, 0xa6, 0x83, 0x06, 0xf9, 0x90, 0xe7, 0x22, 0x8a, 0x4a, 0x46, 0xfb, 0xb9, 0x88, + 0x36, 0xb8, 0xf2, 0xff, 0xa7, 0x15, 0x9a, 0x4b, 0xca, 0xdd, 0x14, 0x00, 0x20, 0x9e, 0xde, 0x85, + 0xb1, 0xf4, 0xca, 0xc8, 0xa3, 0x08, 0x65, 0xe4, 0x9f, 0x2a, 0xb0, 0xda, 0xa4, 0xf6, 0xc3, 0x8e, + 0x39, 0x1e, 0xfc, 0x73, 0x05, 0x96, 0xc2, 0xe7, 0x51, 0xc4, 0xff, 0x5a, 0xd5, 0xe9, 0x98, 0xd5, + 0x51, 0x98, 0x59, 0x0d, 0x38, 0x38, 0x34, 0x88, 0xf4, 0x37, 0xbe, 0x2f, 0xf3, 0x71, 0x30, 0x99, + 0x0f, 0xa7, 0x63, 0xee, 0xd8, 0x44, 0x1f, 0xee, 0xe9, 0x3d, 0x62, 0x0d, 0xba, 0x98, 0xfa, 0xc0, + 0x75, 0x04, 0xb0, 0x8a, 0x24, 0x8d, 0x3a, 0x1b, 0xfa, 0x31, 0x65, 0x3f, 0xab, 0xfc, 0x49, 0x89, + 0xc5, 0x24, 0xc3, 0xfd, 0x93, 0x02, 0x5a, 0x93, 0xda, 0x47, 0x98, 0x1d, 0xfa, 0x9d, 0xdb, 0xc4, + 0xcc, 0xb0, 0x0c, 0x66, 0x04, 0x31, 0x0f, 0x60, 0xa9, 0x27, 0xb7, 0x64, 0xc8, 0x9b, 0x51, 0xc9, + 0xdd, 0x93, 0xb0, 0xe4, 0x81, 0x5c, 0x63, 0x5f, 0x86, 0x59, 0xcb, 0x2c, 0xfb, 0x33, 0x01, 0xe8, + 0x65, 0x60, 0x81, 0xcd, 0xd0, 0xd4, 0x94, 0x51, 0x6d, 0xc2, 0x8d, 0x44, 0xd7, 0x65, 0x68, 0xff, + 0x9e, 0x87, 0x9b, 0xe2, 0x81, 0x0d, 0xde, 0x97, 0xe0, 0xfa, 0xff, 0x8a, 0x21, 0xd9, 0x31, 0x34, + 0xba, 0xf0, 0xc5, 0xd1, 0xe8, 0xe2, 0xec, 0xd0, 0xe8, 0xa5, 0xf3, 0xa1, 0xd1, 0xa5, 0x57, 0x43, + 0xa3, 0xb9, 0x73, 0xa3, 0x51, 0x98, 0x0e, 0x8d, 0xe6, 0x33, 0xd1, 0xe8, 0xe5, 0x74, 0x34, 0x7a, + 0x25, 0x8e, 0x46, 0xcb, 0x77, 0xe0, 0x56, 0x76, 0xb3, 0xc9, 0xae, 0xfc, 0x8f, 0x02, 0x25, 0xbf, + 0x6b, 0x79, 0xbe, 0x1e, 0xba, 0xa6, 0x87, 0x0d, 0x8a, 0x1f, 0x79, 0xa4, 0x4f, 0xa8, 0xd1, 0xfd, + 0x32, 0x5b, 0xf2, 0x36, 0x2c, 0x33, 0xc3, 0xb3, 0x31, 0x0b, 0x5b, 0x4f, 0x1e, 0x32, 0xb1, 0x1b, + 0x34, 0xdf, 0x1e, 0xe4, 0x8c, 0x01, 0x7b, 0x4c, 0x3c, 0x87, 0x9d, 0x8a, 0xde, 0x6d, 0xa8, 0x9f, + 0x7e, 0xb4, 0x53, 0x90, 0x0e, 0x49, 0xb6, 0x23, 0xe6, 0x39, 0xae, 0xdd, 0x8a, 0x58, 0xf7, 0xd1, + 0x3f, 0x7f, 0xbb, 0xa5, 0xf8, 0x08, 0x3d, 0xda, 0x2b, 0xdf, 0x84, 0xed, 0x8c, 0xd0, 0x65, 0x82, + 0x7e, 0x75, 0x11, 0xca, 0x4d, 0x6a, 0xff, 0xb0, 0x6f, 0x49, 0xe8, 0x17, 0x2f, 0x5f, 0xf6, 0xc3, + 0xfb, 0x6d, 0xd0, 0x04, 0x9c, 0x6d, 0x27, 0xf5, 0xc4, 0x45, 0xde, 0x13, 0xaa, 0xe0, 0x98, 0x54, + 0x8d, 0xf6, 0x60, 0xdd, 0xb0, 0xac, 0x44, 0xd1, 0x39, 0x2e, 0xba, 0x6a, 0x58, 0x56, 0x82, 0xdc, + 0x03, 0x40, 0x41, 0xa7, 0xb6, 0xa3, 0x64, 0xcd, 0x9f, 0x91, 0xac, 0x95, 0x40, 0xa6, 0x1e, 0x26, + 0xed, 0x46, 0x90, 0xb4, 0x04, 0x7d, 0xe5, 0xdb, 0xfc, 0x3a, 0x4b, 0xcf, 0x8b, 0xcc, 0xdf, 0x1f, + 0x14, 0x28, 0x86, 0x7c, 0xf1, 0xb3, 0x92, 0x9d, 0xbb, 0xd4, 0xc3, 0x77, 0x31, 0xfd, 0xf0, 0xcd, + 0xb2, 0x3b, 0xb6, 0x61, 0x2b, 0xd5, 0x6f, 0x19, 0xdb, 0x07, 0xe2, 0x1b, 0xcb, 0x11, 0x66, 0x75, + 0xd3, 0xf4, 0xbb, 0xf8, 0x70, 0xe4, 0xad, 0x4a, 0x8e, 0xaa, 0x00, 0x0b, 0x43, 0xa3, 0x3b, 0xc0, + 0xb2, 0xbb, 0xc5, 0x02, 0xdd, 0x83, 0x45, 0xea, 0xd8, 0x6e, 0x70, 0x1d, 0x67, 0x38, 0x2d, 0xf9, + 0xf6, 0xaf, 0x06, 0x1e, 0xcb, 0x0d, 0xf9, 0xd5, 0x64, 0xdc, 0x15, 0xe9, 0xe8, 0xbf, 0x14, 0xf8, + 0x5a, 0x18, 0xcc, 0x11, 0x76, 0xad, 0x43, 0xec, 0x9e, 0xfa, 0xf7, 0x67, 0xb6, 0xb3, 0x7b, 0xb0, + 0x2e, 0xdb, 0xd7, 0xc2, 0xae, 0x13, 0x8d, 0x6a, 0x61, 0xef, 0xae, 0x0a, 0xf2, 0x21, 0xa7, 0xd6, + 0x03, 0x22, 0xba, 0x07, 0x05, 0xbf, 0x71, 0x27, 0x84, 0x44, 0xd7, 0x22, 0xc3, 0xb2, 0xc6, 0x25, + 0x62, 0x85, 0x9b, 0xff, 0x62, 0x85, 0xdb, 0x82, 0xcd, 0x94, 0x58, 0x65, 0x36, 0x7e, 0xa7, 0xf0, + 0x97, 0xba, 0x6e, 0x59, 0xef, 0x60, 0x56, 0xa7, 0x14, 0xb3, 0x1f, 0xf9, 0x55, 0x98, 0xc9, 0x5c, + 0x7b, 0x04, 0xd7, 0x5c, 0xff, 0x0e, 0xf3, 0xb5, 0xb6, 0x79, 0x71, 0x83, 0x81, 0xfc, 0x66, 0xf2, + 0xf3, 0x16, 0x73, 0x41, 0x3e, 0x70, 0xcb, 0x6e, 0xcc, 0xaf, 0x72, 0x91, 0x57, 0x2f, 0xc1, 0x5f, + 0x11, 0x50, 0xed, 0x37, 0x08, 0xe6, 0x9a, 0xd4, 0x46, 0x6d, 0x58, 0x0a, 0xae, 0x7b, 0x54, 0x49, + 0x79, 0x90, 0x27, 0x06, 0x66, 0xed, 0xb5, 0x29, 0x38, 0x85, 0x21, 0xdf, 0x40, 0xf0, 0x8e, 0x64, + 0x18, 0x18, 0x1b, 0x94, 0x33, 0x0c, 0x8c, 0x0f, 0xc0, 0xe8, 0x27, 0xb0, 0x28, 0xa6, 0x55, 0x74, + 0x27, 0x55, 0x28, 0x36, 0x1e, 0x6b, 0x77, 0xcf, 0xe4, 0x8b, 0x54, 0x8b, 0x19, 0x35, 0x43, 0x75, + 0x6c, 0x28, 0xce, 0x50, 0x1d, 0x1f, 0x76, 0xd1, 0x11, 0xcc, 0xfb, 0xc3, 0x24, 0xba, 0x95, 0x2a, + 0x30, 0x32, 0x07, 0x6b, 0xb7, 0xcf, 0xe0, 0x8a, 0x94, 0xfa, 0x13, 0x5f, 0x86, 0xd2, 0x91, 0x61, + 0x35, 0x43, 0xe9, 0xe8, 0xd8, 0x88, 0x3a, 0x90, 0x0b, 0xbf, 0xf0, 0xa0, 0x8c, 0xba, 0x8c, 0x7d, + 0x99, 0xd2, 0x5e, 0x9f, 0x86, 0x55, 0xda, 0x38, 0x81, 0xcb, 0xa3, 0x9f, 0x6b, 0xd0, 0x1b, 0x67, + 0xa4, 0x31, 0x6e, 0x69, 0x67, 0x4a, 0xee, 0xa8, 0x23, 0x83, 0x69, 0x31, 0xa3, 0x23, 0xc7, 0xc6, + 0xe4, 0x8c, 0x8e, 0x1c, 0x1f, 0x3d, 0x65, 0xc6, 0x04, 0x6a, 0xca, 0xce, 0x58, 0x0c, 0xc6, 0x67, + 0x67, 0x2c, 0x0e, 0xc2, 0xfc, 0x20, 0xc2, 0x27, 0x2c, 0x3d, 0x88, 0xb1, 0x67, 0x33, 0x23, 0x88, + 0xf1, 0x87, 0x0a, 0x3d, 0x86, 0xfc, 0xc8, 0xb4, 0x85, 0xbe, 0x9e, 0x2a, 0x39, 0x39, 0x67, 0x6a, + 0x6f, 0x4c, 0xc7, 0x2c, 0x2d, 0x3d, 0x85, 0x6b, 0xe3, 0x13, 0x10, 0xba, 0x97, 0xaa, 0x21, 0x65, + 0xce, 0xd3, 0x76, 0xcf, 0x21, 0x21, 0x0d, 0x3f, 0x81, 0xe5, 0xf8, 0x4f, 0x06, 0xa8, 0x9a, 0xaa, + 0x24, 0xf1, 0x47, 0x11, 0x4d, 0x9f, 0x9a, 0x5f, 0x9a, 0x7c, 0xae, 0xc0, 0x46, 0x2a, 0xc2, 0x46, + 0x6f, 0x67, 0x35, 0x40, 0xe6, 0x08, 0xa8, 0xed, 0xbf, 0x8a, 0xa8, 0x74, 0xea, 0x03, 0x05, 0xd6, + 0x92, 0x21, 0x2d, 0xda, 0x4b, 0xcf, 0x6a, 0x16, 0xfc, 0xd7, 0xbe, 0x75, 0x6e, 0x39, 0xe9, 0xcb, + 0x2f, 0x14, 0x50, 0xd3, 0x00, 0x22, 0x7a, 0x2b, 0x55, 0xeb, 0x19, 0x58, 0x5b, 0x7b, 0xfb, 0x15, + 0x24, 0xa5, 0x47, 0x3f, 0x57, 0xa0, 0x90, 0x04, 0xe9, 0xd0, 0x37, 0xce, 0xd0, 0x99, 0x88, 0x5c, + 0xb5, 0x6f, 0x9e, 0x53, 0x2a, 0xea, 0xd5, 0x38, 0x50, 0xcb, 0xe8, 0xd5, 0x44, 0x70, 0x99, 0xd1, + 0xab, 0xc9, 0x08, 0x10, 0xbd, 0x0f, 0x68, 0x12, 0x11, 0xa1, 0xda, 0x19, 0xfe, 0x27, 0x40, 0x45, + 0xed, 0xcd, 0x73, 0xc9, 0x48, 0xf3, 0xef, 0xc1, 0xca, 0x04, 0x7c, 0x41, 0xbb, 0x59, 0x6d, 0x9e, + 0x08, 0xcd, 0xb4, 0xda, 0x79, 0x44, 0x84, 0xed, 0x86, 0xfd, 0xf1, 0x8b, 0xa2, 0xf2, 0xc9, 0x8b, + 0xa2, 0xf2, 0xf9, 0x8b, 0xa2, 0xf2, 0xcb, 0x97, 0xc5, 0x0b, 0x9f, 0xbc, 0x2c, 0x5e, 0xf8, 0xeb, + 0xcb, 0xe2, 0x05, 0x58, 0x77, 0x48, 0xa2, 0xbe, 0x47, 0xca, 0x4f, 0x47, 0x3f, 0x18, 0x45, 0x2c, + 0x3b, 0x0e, 0x19, 0x59, 0xe9, 0xcf, 0x82, 0x5f, 0x60, 0xf9, 0x3c, 0xdb, 0x59, 0xe4, 0x3f, 0x72, + 0xbe, 0xf9, 0xdf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x65, 0x86, 0x7a, 0x1f, 0xc7, 0x1e, 0x00, 0x00, } func (this *MsgSupplyIncreaseProposalRequest) Equal(that interface{}) bool { @@ -3469,6 +3488,11 @@ func (m *MsgAddMarkerRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if m.UsdMills != 0 { + i = encodeVarintTx(dAtA, i, uint64(m.UsdMills)) + i-- + dAtA[i] = 0x70 + } if m.Volume != 0 { i = encodeVarintTx(dAtA, i, uint64(m.Volume)) i-- @@ -4403,6 +4427,11 @@ func (m *MsgAddFinalizeActivateMarkerRequest) MarshalToSizedBuffer(dAtA []byte) _ = i var l int _ = l + if m.UsdMills != 0 { + i = encodeVarintTx(dAtA, i, uint64(m.UsdMills)) + i-- + dAtA[i] = 0x68 + } if m.Volume != 0 { i = encodeVarintTx(dAtA, i, uint64(m.Volume)) i-- @@ -5052,6 +5081,9 @@ func (m *MsgAddMarkerRequest) Size() (n int) { if m.Volume != 0 { n += 1 + sovTx(uint64(m.Volume)) } + if m.UsdMills != 0 { + n += 1 + sovTx(uint64(m.UsdMills)) + } return n } @@ -5440,6 +5472,9 @@ func (m *MsgAddFinalizeActivateMarkerRequest) Size() (n int) { if m.Volume != 0 { n += 1 + sovTx(uint64(m.Volume)) } + if m.UsdMills != 0 { + n += 1 + sovTx(uint64(m.UsdMills)) + } return n } @@ -6213,6 +6248,25 @@ func (m *MsgAddMarkerRequest) Unmarshal(dAtA []byte) error { break } } + case 14: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field UsdMills", wireType) + } + m.UsdMills = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTx + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.UsdMills |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } default: iNdEx = preIndex skippy, err := skipTx(dAtA[iNdEx:]) @@ -8762,6 +8816,25 @@ func (m *MsgAddFinalizeActivateMarkerRequest) Unmarshal(dAtA []byte) error { break } } + case 13: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field UsdMills", wireType) + } + m.UsdMills = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTx + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.UsdMills |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } default: iNdEx = preIndex skippy, err := skipTx(dAtA[iNdEx:])