From 57b9d8e752e8339b319cfc06659af331a87c5a72 Mon Sep 17 00:00:00 2001 From: yoongbok lee Date: Wed, 25 May 2022 14:42:30 +0900 Subject: [PATCH 01/14] shield edits without proto gen --- x/shield/keeper/params.go | 11 +++++++++ x/shield/keeper/rewards.go | 36 ++++++++++++++++++++++++++++++ x/shield/types/expected_keepers.go | 1 + 3 files changed, 48 insertions(+) diff --git a/x/shield/keeper/params.go b/x/shield/keeper/params.go index 1adad42fb..47bf4e427 100644 --- a/x/shield/keeper/params.go +++ b/x/shield/keeper/params.go @@ -40,3 +40,14 @@ func (k Keeper) GetShieldStakingRate(ctx sdk.Context) (rate sdk.Dec) { func (k Keeper) SetShieldStakingRate(ctx sdk.Context, rate sdk.Dec) { k.paramSpace.Set(ctx, types.ParamStoreKeyStakingShieldRate, &rate) } + +// GetDistributionParams returns distribution parameters. +func (k Keeper) GetDistributionParams(ctx sdk.Context) (distrParams types.) { + k.paramSpace.Get(ctx, types.ParamStoreKeyStakingShieldRate, &rate) + return +} + +// SetDistributionParams sets distribution parameters. +func (k Keeper) SetDistributionParams(ctx sdk.Context, rate sdk.Dec) { + k.paramSpace.Set(ctx, types.ParamStoreKeyStakingShieldRate, &rate) +} diff --git a/x/shield/keeper/rewards.go b/x/shield/keeper/rewards.go index d9bbac8e4..57fe58c78 100644 --- a/x/shield/keeper/rewards.go +++ b/x/shield/keeper/rewards.go @@ -34,3 +34,39 @@ func (k Keeper) PayoutNativeRewards(ctx sdk.Context, addr sdk.AccAddress) (sdk.C } return ctkRewards, nil } + +// GetShieldBlockRewardRatio calculates the dynamic ratio for block rewards to shield module, based on total shield and total collateral. +func (k Keeper) GetShieldBlockRewardRatio(ctx sdk.Context) sdk.Dec { + totalShield := k.GetTotalShield(ctx) + totalCollateral := k.GetTotalCollateral(ctx) + totalBondedTokens := k.bk.GetAllBalances(ctx, k.sk.GetBondedPool(ctx).GetAddress()).AmountOf(k.BondDenom(ctx)).ToDec() // c + n + totalShieldDeposit := k.GetGlobalShieldStakingPool(ctx).ToDec() // d + + var leverage sdk.Dec // l = (total shield) / (total collateral) + if totalCollateral.IsZero() { + leverage = sdk.ZeroDec() + } else { + leverage = totalShield.ToDec().Quo(totalCollateral.ToDec()) + } + + blockRewardParams := k.GetDistributionParams(ctx) + modelParamA := blockRewardParams.ModelParamA // a + modelParamB := blockRewardParams.ModelParamB // b + targetLeverage := blockRewardParams.TargetLeverage // L + + /* The non-linear model: + * c+n l d + * r = -------- ( a + 2(b - a) * ------- + -----) + * c+n+d l + L c+n + */ + if leverage.Add(targetLeverage).IsZero() || totalBondedTokens.IsZero() { + return sdk.ZeroDec() + } else { + leading := totalBondedTokens.Quo(totalBondedTokens.Add(totalShieldDeposit)) // (c+n)/(c+n+d) + first := modelParamA // a + second := leverage.Quo(leverage.Add(targetLeverage)).Mul(modelParamB.Sub(modelParamA).MulInt64(2)) // 2(b-a)(l/l+L) + third := totalShieldDeposit.Quo(totalBondedTokens) // d/(c+n) + inner := first.Add(second).Add(third) + return leading.Mul(inner) + } +} diff --git a/x/shield/types/expected_keepers.go b/x/shield/types/expected_keepers.go index 069dc7a7f..0b1851639 100644 --- a/x/shield/types/expected_keepers.go +++ b/x/shield/types/expected_keepers.go @@ -62,6 +62,7 @@ type StakingKeeper interface { BondDenom(sdk.Context) string UnbondingTime(sdk.Context) time.Duration + GetBondedPool(ctx sdk.Context) authtypes.ModuleAccountI } // BankKeeper defines the expected bank keeper. From 2b73eb59c4ffce5d0fb72304cb14f0aef7071793 Mon Sep 17 00:00:00 2001 From: yoongbok lee Date: Wed, 25 May 2022 15:03:57 +0900 Subject: [PATCH 02/14] update proto files --- proto/shentu/shield/v1alpha1/genesis.proto | 1 - proto/shentu/shield/v1alpha1/shield.proto | 1 - x/shield/types/genesis.pb.go | 210 ++++++++++--------- x/shield/types/query.pb.go | 155 +++++++++++--- x/shield/types/query.pb.gw.go | 52 +---- x/shield/types/shield.pb.go | 229 ++++++++++++--------- x/shield/types/tx.pb.go | 140 ++++++++++--- 7 files changed, 485 insertions(+), 303 deletions(-) diff --git a/proto/shentu/shield/v1alpha1/genesis.proto b/proto/shentu/shield/v1alpha1/genesis.proto index 77840316f..c5b0fe3d2 100644 --- a/proto/shentu/shield/v1alpha1/genesis.proto +++ b/proto/shentu/shield/v1alpha1/genesis.proto @@ -5,7 +5,6 @@ import "gogoproto/gogo.proto"; import "cosmos/base/v1beta1/coin.proto"; import "google/protobuf/timestamp.proto"; import "google/protobuf/duration.proto"; -import "gogoproto/gogo.proto"; import "shentu/shield/v1alpha1/shield.proto"; option go_package = "github.com/certikfoundation/shentu/x/shield/types"; diff --git a/proto/shentu/shield/v1alpha1/shield.proto b/proto/shentu/shield/v1alpha1/shield.proto index cb3321301..0e6e7b650 100644 --- a/proto/shentu/shield/v1alpha1/shield.proto +++ b/proto/shentu/shield/v1alpha1/shield.proto @@ -5,7 +5,6 @@ import "gogoproto/gogo.proto"; import "cosmos/base/v1beta1/coin.proto"; import "cosmos_proto/cosmos.proto"; import "google/protobuf/timestamp.proto"; -import "gogoproto/gogo.proto"; option go_package = "github.com/certikfoundation/shentu/x/shield/types"; diff --git a/x/shield/types/genesis.pb.go b/x/shield/types/genesis.pb.go index 5009109d3..c26c105b6 100644 --- a/x/shield/types/genesis.pb.go +++ b/x/shield/types/genesis.pb.go @@ -301,101 +301,101 @@ func init() { } var fileDescriptor_c089c09a119aaa04 = []byte{ - // 1493 bytes of a gzipped FileDescriptorProto + // 1490 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x58, 0xcf, 0x6f, 0x1b, 0xc5, 0x17, 0xcf, 0xe6, 0x47, 0xbf, 0xcd, 0xd8, 0x49, 0xec, 0x71, 0x9a, 0xee, 0x37, 0x0d, 0x76, 0x34, 0x6d, 0x21, 0x12, 0xaa, 0x4d, 0xda, 0x03, 0xd0, 0x0b, 0xc2, 0x49, 0x0b, 0x81, 0x22, 0xa2, 0x0d, 0xa8, 0x08, 0x84, 0x96, 0xb1, 0x77, 0xe2, 0x8c, 0xb2, 0xbb, 0xb3, 0xda, 0x19, 0xa7, 0x8d, 0xe8, 0x09, 0x09, 0x89, 0x63, 0x2f, 0x48, 0x70, 0xeb, 0x11, 0x21, 0xf1, 0x7f, 0x54, 0xe2, 0xd2, 0x0b, - 0x08, 0x71, 0x48, 0x51, 0x7b, 0xe1, 0x9c, 0xbf, 0x00, 0xcd, 0x8f, 0xf5, 0xce, 0x26, 0x76, 0x5a, - 0x4b, 0x3d, 0x25, 0xf3, 0xe6, 0xbd, 0xcf, 0x67, 0xde, 0x9b, 0xf7, 0xde, 0xbc, 0x35, 0xb8, 0xc2, - 0xf7, 0x48, 0x2c, 0xfa, 0x2d, 0xbe, 0x47, 0x49, 0x18, 0xb4, 0x0e, 0xd6, 0x71, 0x98, 0xec, 0xe1, - 0xf5, 0x56, 0x8f, 0xc4, 0x84, 0x53, 0xde, 0x4c, 0x52, 0x26, 0x18, 0x5c, 0xd2, 0x5a, 0x4d, 0xad, - 0xd5, 0xcc, 0xb4, 0x96, 0x17, 0x7b, 0xac, 0xc7, 0x94, 0x4a, 0x4b, 0xfe, 0xa7, 0xb5, 0x97, 0xeb, - 0x5d, 0xc6, 0x23, 0xc6, 0x5b, 0x1d, 0xcc, 0x49, 0xeb, 0x60, 0xbd, 0x43, 0x04, 0x5e, 0x6f, 0x75, - 0x19, 0x8d, 0xcd, 0x7e, 0xa3, 0xc7, 0x58, 0x2f, 0x24, 0x2d, 0xb5, 0xea, 0xf4, 0x77, 0x5b, 0x82, - 0x46, 0x84, 0x0b, 0x1c, 0x25, 0x19, 0xc0, 0x49, 0x85, 0xa0, 0x9f, 0x62, 0x41, 0x59, 0x06, 0x30, - 0x9c, 0xf6, 0xf2, 0x08, 0x57, 0xcc, 0xa1, 0x95, 0x12, 0xfa, 0xa3, 0x0a, 0xca, 0x1f, 0x68, 0xdf, - 0x76, 0x04, 0x16, 0x04, 0xde, 0x04, 0x65, 0xad, 0xe0, 0xe3, 0x20, 0xa2, 0xb1, 0xeb, 0xac, 0x3a, - 0x6b, 0xb3, 0xed, 0x8b, 0xc7, 0x47, 0x8d, 0xda, 0x21, 0x8e, 0xc2, 0x9b, 0xc8, 0xde, 0x45, 0x5e, - 0x49, 0x2f, 0xdf, 0x97, 0x2b, 0xf8, 0x2e, 0x28, 0xc7, 0xe4, 0xbe, 0xf0, 0x13, 0xc6, 0x42, 0x9f, - 0x06, 0xee, 0xe4, 0xaa, 0xb3, 0x36, 0x6d, 0xdb, 0xda, 0xbb, 0xc8, 0x03, 0x72, 0xb9, 0xcd, 0x58, - 0xb8, 0x15, 0xc0, 0x5b, 0xa0, 0xa2, 0x37, 0xfb, 0x69, 0x77, 0x0f, 0x73, 0x22, 0xcd, 0xa7, 0x94, - 0xf9, 0xa5, 0xe3, 0xa3, 0xc6, 0x45, 0xdb, 0x3c, 0xd7, 0x40, 0xde, 0xbc, 0x82, 0x30, 0x92, 0xad, - 0x00, 0xfa, 0xa0, 0xa4, 0xe0, 0x13, 0x9c, 0xe2, 0x88, 0xbb, 0xd3, 0xab, 0xce, 0x5a, 0xe9, 0x3a, - 0x6a, 0x0e, 0xbf, 0xae, 0xa6, 0xe4, 0xde, 0x56, 0x9a, 0xed, 0xe5, 0xc7, 0x47, 0x8d, 0x89, 0xe3, - 0xa3, 0x06, 0xd4, 0x4c, 0x16, 0x08, 0xf2, 0x40, 0x32, 0xd0, 0x83, 0xdf, 0x3b, 0xe0, 0x42, 0x37, - 0xc4, 0x34, 0xf2, 0x93, 0x94, 0x25, 0x8c, 0xe3, 0x01, 0xd7, 0x8c, 0xe2, 0x7a, 0x73, 0x14, 0xd7, - 0x86, 0x34, 0xda, 0x36, 0x36, 0x86, 0xf4, 0x8a, 0x21, 0x5d, 0xd1, 0xa4, 0x43, 0x71, 0x91, 0x57, - 0xeb, 0x9e, 0x36, 0x85, 0x02, 0x54, 0x04, 0x13, 0x38, 0xf4, 0xbb, 0x2c, 0x0c, 0xb1, 0x20, 0x29, - 0x0e, 0xdd, 0x73, 0xea, 0xaa, 0xb6, 0x24, 0xe8, 0xdf, 0x47, 0x8d, 0xd7, 0x7b, 0x54, 0xec, 0xf5, - 0x3b, 0xcd, 0x2e, 0x8b, 0x5a, 0x26, 0x01, 0xf5, 0x9f, 0x6b, 0x3c, 0xd8, 0x6f, 0x89, 0xc3, 0x84, - 0xf0, 0xe6, 0x56, 0x2c, 0xf2, 0xe8, 0x9e, 0xc4, 0x43, 0xde, 0x82, 0x12, 0x6d, 0x0c, 0x24, 0xf0, - 0x1e, 0xa8, 0x6a, 0xad, 0x7b, 0x54, 0xec, 0x05, 0x29, 0xbe, 0x47, 0xe3, 0x9e, 0xfb, 0x3f, 0x45, - 0xfb, 0xd1, 0xd8, 0xb4, 0xae, 0x4d, 0x6b, 0x01, 0x22, 0x4f, 0xbb, 0x76, 0x37, 0x17, 0xc1, 0x3d, - 0x50, 0xd6, 0x7a, 0x3a, 0xac, 0xee, 0x79, 0xc5, 0x79, 0x6b, 0x6c, 0xce, 0x9a, 0xcd, 0xa9, 0xb1, - 0x90, 0x57, 0x52, 0xcb, 0x1d, 0xb5, 0x82, 0xfb, 0x60, 0xce, 0x04, 0x42, 0x46, 0x9d, 0x04, 0xee, - 0xac, 0xa2, 0xba, 0x3d, 0x36, 0xd5, 0x62, 0x21, 0xaa, 0x1a, 0x0c, 0x79, 0xda, 0x8d, 0x0d, 0xbd, - 0x84, 0x04, 0x94, 0x39, 0x49, 0x0f, 0x68, 0x97, 0xf8, 0xbb, 0x84, 0x70, 0x17, 0xa8, 0x1c, 0xba, - 0x3a, 0x2a, 0x87, 0x3e, 0xa1, 0xf7, 0x49, 0xb0, 0x49, 0xba, 0x1b, 0x8c, 0xc6, 0xbc, 0x7d, 0xc9, - 0x64, 0x4f, 0x56, 0x97, 0x16, 0x90, 0xac, 0x4b, 0xbd, 0xbc, 0x4d, 0x08, 0x87, 0xdf, 0x39, 0x60, - 0x29, 0x25, 0x11, 0xa6, 0x31, 0x8d, 0x7b, 0x7e, 0x81, 0xb1, 0x34, 0x0e, 0xe3, 0x55, 0xc3, 0xf8, - 0x9a, 0x66, 0x1c, 0x0e, 0x89, 0xbc, 0xc5, 0xc1, 0xc6, 0x8e, 0x75, 0x88, 0x0f, 0xc1, 0x8c, 0xac, - 0x23, 0xee, 0x96, 0x57, 0xa7, 0xd6, 0x4a, 0xd7, 0x57, 0xce, 0x2a, 0xca, 0xf6, 0xa2, 0x61, 0x2a, - 0xe7, 0xe5, 0xc8, 0x91, 0xa7, 0x01, 0xe0, 0x17, 0x60, 0x36, 0x49, 0xd9, 0x01, 0x0d, 0x48, 0xca, - 0xdd, 0x39, 0x85, 0xb6, 0x3a, 0x12, 0xcd, 0x28, 0xb6, 0x5d, 0x83, 0x58, 0x31, 0x88, 0x19, 0x00, - 0xf2, 0x72, 0x30, 0x48, 0xc0, 0xfc, 0xa0, 0xbd, 0x84, 0x94, 0x0b, 0xee, 0xce, 0x2b, 0xf8, 0x2b, - 0x23, 0xe1, 0x8d, 0xf6, 0x1d, 0xca, 0xc5, 0x29, 0x0a, 0xb3, 0xc7, 0x91, 0x37, 0x97, 0x58, 0x7a, - 0xca, 0x81, 0x2c, 0xdf, 0xb9, 0xbb, 0x70, 0xb6, 0x03, 0x59, 0x15, 0x9c, 0x44, 0x1f, 0x00, 0x20, - 0x2f, 0x07, 0x83, 0x14, 0x54, 0x42, 0xcc, 0x85, 0xdf, 0x4f, 0x02, 0x2c, 0x88, 0x2f, 0x1f, 0x12, - 0xb7, 0xa2, 0xae, 0x78, 0xb9, 0xa9, 0x1f, 0x91, 0x66, 0xf6, 0x88, 0x34, 0x3f, 0xcb, 0x5e, 0x99, - 0xf6, 0x65, 0x03, 0x6d, 0x1a, 0xc1, 0x49, 0x04, 0xf4, 0xf0, 0x69, 0xc3, 0xf1, 0xe6, 0xa5, 0xf8, - 0x73, 0x25, 0x95, 0x96, 0xf0, 0x01, 0xa8, 0x99, 0xa7, 0x80, 0x0b, 0xbc, 0x2f, 0xb3, 0x20, 0xc5, - 0x82, 0xb8, 0x55, 0x55, 0x2e, 0x77, 0xc6, 0x28, 0x97, 0x4d, 0xd2, 0x3d, 0x3e, 0x6a, 0x2c, 0x17, - 0x5e, 0x17, 0x1b, 0x12, 0x79, 0x55, 0x2d, 0xdd, 0xd1, 0x42, 0x4f, 0x3e, 0x53, 0x0f, 0x40, 0xad, - 0x17, 0xb2, 0x8e, 0xac, 0x62, 0xa3, 0x2a, 0x73, 0xc3, 0x85, 0x63, 0xb3, 0xeb, 0x62, 0x35, 0xec, - 0x43, 0x20, 0x91, 0x57, 0xd5, 0x52, 0xc3, 0x2e, 0xd3, 0x13, 0x72, 0x50, 0x95, 0x3a, 0xc4, 0xdf, - 0x65, 0xa9, 0x69, 0x23, 0xdc, 0xad, 0xa9, 0x8b, 0x1c, 0x59, 0x4a, 0x3b, 0xb6, 0x0f, 0xed, 0x55, - 0x13, 0x72, 0xd3, 0x04, 0x4f, 0xa1, 0x21, 0x6f, 0x41, 0xc9, 0x6e, 0xb3, 0x54, 0x1b, 0x72, 0x78, - 0x00, 0xaa, 0x2c, 0xa5, 0x3d, 0x1a, 0xe7, 0x27, 0xe4, 0xee, 0xa2, 0x22, 0x7d, 0x63, 0x14, 0xe9, - 0xa7, 0xc6, 0x60, 0x04, 0xed, 0x29, 0x3c, 0xe4, 0x55, 0x58, 0xd1, 0x84, 0xc3, 0x5f, 0x1c, 0x50, - 0xcf, 0x1e, 0xa5, 0xad, 0x4d, 0x3f, 0x25, 0x34, 0xea, 0xf4, 0x53, 0x4e, 0x22, 0x12, 0x0b, 0x3f, - 0xc1, 0x34, 0xe5, 0xee, 0x05, 0x75, 0x8a, 0x1b, 0x67, 0x14, 0xa1, 0xb1, 0xf6, 0x6c, 0xe3, 0x6d, - 0x4c, 0xd3, 0xf6, 0x35, 0x73, 0xa2, 0xab, 0x83, 0xba, 0x3c, 0x83, 0x08, 0x79, 0x2b, 0xc9, 0x68, - 0x2c, 0x7e, 0xf3, 0xfc, 0x0f, 0x8f, 0x1a, 0x13, 0xff, 0x3e, 0x6a, 0x4c, 0xa0, 0xdf, 0x1c, 0xb0, - 0x70, 0xc2, 0x79, 0xf8, 0x36, 0x28, 0xd9, 0xe3, 0x85, 0xa3, 0xc6, 0x8b, 0x25, 0xeb, 0xd1, 0xb7, - 0x27, 0x0b, 0x90, 0xe4, 0x53, 0xc5, 0x5d, 0x70, 0x0e, 0x47, 0xac, 0x1f, 0x0b, 0x35, 0xd1, 0xcc, - 0xb6, 0xdf, 0x1b, 0x3b, 0xbf, 0xe6, 0x34, 0x83, 0x46, 0x41, 0x9e, 0x81, 0xb3, 0xce, 0xfb, 0xbb, - 0x03, 0x2e, 0x9d, 0x11, 0x26, 0x75, 0xf6, 0x6c, 0x30, 0x18, 0x7a, 0xf6, 0x7c, 0x53, 0x9e, 0x3d, - 0x43, 0x0a, 0x20, 0x05, 0x73, 0x85, 0x40, 0x2a, 0x17, 0xce, 0x48, 0xd3, 0x02, 0x75, 0x7b, 0xc5, - 0xdc, 0xce, 0x62, 0xd6, 0xf1, 0xad, 0x4d, 0xe4, 0x15, 0x91, 0x2d, 0x6f, 0x7e, 0x9c, 0x04, 0x73, - 0x05, 0x20, 0xd8, 0x1d, 0x84, 0xd0, 0x51, 0xb9, 0xf2, 0xff, 0xa6, 0x8e, 0x54, 0x53, 0x0e, 0xc5, - 0x4d, 0x33, 0x14, 0x37, 0xe5, 0x33, 0xd3, 0x7e, 0x4b, 0x72, 0xfe, 0xfa, 0xb4, 0xb1, 0xf6, 0x12, - 0xd1, 0x55, 0xef, 0x52, 0x16, 0x4e, 0xf8, 0x0e, 0x28, 0x75, 0x48, 0x4c, 0x76, 0x69, 0x97, 0xe2, - 0xf4, 0xd0, 0x5c, 0x96, 0x15, 0x24, 0x6b, 0x13, 0x79, 0xb6, 0x2a, 0xfc, 0x0a, 0x94, 0x12, 0x7c, - 0xc8, 0xfa, 0x42, 0xb7, 0xcc, 0xa9, 0x17, 0xb6, 0xcc, 0xfa, 0x89, 0x79, 0x31, 0x37, 0xd6, 0xdd, - 0x12, 0x68, 0x89, 0x34, 0xb0, 0xe2, 0xf2, 0xe7, 0x34, 0x00, 0xf9, 0xd0, 0x09, 0x43, 0x50, 0x95, - 0xd0, 0xa4, 0x2b, 0x67, 0x79, 0x3f, 0x21, 0x29, 0x65, 0xfa, 0x6a, 0x65, 0x7c, 0x4e, 0x72, 0x6f, - 0x9a, 0x99, 0x7f, 0x30, 0x35, 0xba, 0x83, 0x9b, 0x2f, 0x22, 0xa0, 0x9f, 0xe4, 0x01, 0x2a, 0xb9, - 0x7c, 0x5b, 0x89, 0x21, 0x07, 0x15, 0xd3, 0x5d, 0xe5, 0x33, 0xad, 0xbb, 0xf5, 0xe4, 0xd8, 0x23, - 0xa3, 0xee, 0xd6, 0x17, 0x0b, 0xdd, 0x7a, 0x80, 0x87, 0xbc, 0x79, 0x2d, 0x92, 0x2f, 0xbe, 0xea, - 0xd3, 0xbb, 0x60, 0x21, 0x7b, 0x9d, 0x32, 0x07, 0xa7, 0x5e, 0xe4, 0x20, 0x32, 0x0e, 0x2e, 0x15, - 0x5f, 0xba, 0x82, 0x7b, 0xf3, 0x99, 0xd4, 0x38, 0x77, 0x00, 0xaa, 0x6a, 0x66, 0x37, 0x27, 0x0a, - 0x69, 0x44, 0x85, 0x1a, 0xff, 0xc7, 0x9b, 0x4c, 0xb5, 0x77, 0xae, 0xf5, 0x11, 0x60, 0x03, 0x22, - 0x6f, 0x41, 0xca, 0x74, 0x43, 0xbe, 0x23, 0x25, 0xf0, 0x5b, 0x50, 0x8b, 0x68, 0x9c, 0x69, 0x65, - 0x3d, 0xc3, 0x9d, 0x79, 0xf5, 0x49, 0x5e, 0x8d, 0x68, 0xac, 0x99, 0xb3, 0xa1, 0xc3, 0x4a, 0xac, - 0x9f, 0xa7, 0x41, 0x6d, 0xc8, 0x17, 0x06, 0xfc, 0x1a, 0x94, 0xcd, 0x57, 0xc5, 0x4b, 0x26, 0x57, - 0xa3, 0x38, 0x54, 0xda, 0xc6, 0x3a, 0xf0, 0x25, 0xfd, 0x35, 0xa2, 0xa3, 0xfe, 0x0d, 0x98, 0x33, - 0x99, 0x6f, 0xf0, 0x27, 0x5f, 0x84, 0xbf, 0x5a, 0x6c, 0x28, 0x05, 0x6b, 0x4d, 0x50, 0xd6, 0x32, - 0xc3, 0x10, 0x82, 0x92, 0x8c, 0x6f, 0x40, 0x12, 0xc6, 0xa9, 0x70, 0xa7, 0x5e, 0x7d, 0x5c, 0x41, - 0x44, 0xe3, 0x4d, 0x0d, 0x2f, 0x3f, 0x33, 0x0c, 0x93, 0x2e, 0x8f, 0xe9, 0xb1, 0x3f, 0x33, 0x74, - 0x02, 0x99, 0xe8, 0xd9, 0x58, 0xc8, 0x2b, 0x99, 0xa5, 0xaa, 0x0b, 0x1f, 0xcc, 0xe6, 0x55, 0x38, - 0xa3, 0x68, 0xda, 0x63, 0xd3, 0x98, 0x51, 0xd0, 0x2a, 0xbf, 0xf3, 0xbb, 0xa6, 0xf0, 0xf2, 0xdc, - 0x68, 0x7f, 0xfc, 0xf8, 0x59, 0xdd, 0x79, 0xf2, 0xac, 0xee, 0xfc, 0xf3, 0xac, 0xee, 0x3c, 0x7c, - 0x5e, 0x9f, 0x78, 0xf2, 0xbc, 0x3e, 0xf1, 0xd7, 0xf3, 0xfa, 0xc4, 0x97, 0xeb, 0x36, 0x13, 0x49, - 0x05, 0xdd, 0xdf, 0x65, 0xfd, 0x38, 0x50, 0x37, 0xd5, 0x32, 0xbf, 0x1e, 0xdc, 0xcf, 0x7e, 0x3f, - 0x50, 0xc4, 0x9d, 0x73, 0xea, 0x4a, 0x6f, 0xfc, 0x17, 0x00, 0x00, 0xff, 0xff, 0x1f, 0x39, 0x9b, - 0xd6, 0x28, 0x11, 0x00, 0x00, + 0x08, 0x71, 0x48, 0x51, 0x7b, 0xe1, 0x9c, 0xbf, 0x00, 0xcd, 0x8f, 0xf5, 0xce, 0x3a, 0x71, 0x5a, + 0x4b, 0x3d, 0x25, 0xf3, 0xe6, 0xbd, 0xcf, 0x67, 0xe6, 0xcd, 0xfb, 0xb5, 0x06, 0x57, 0xf8, 0x1e, + 0x89, 0x45, 0xbf, 0xc5, 0xf7, 0x28, 0x09, 0x83, 0xd6, 0xc1, 0x3a, 0x0e, 0x93, 0x3d, 0xbc, 0xde, + 0xea, 0x91, 0x98, 0x70, 0xca, 0x9b, 0x49, 0xca, 0x04, 0x83, 0x4b, 0x5a, 0xab, 0xa9, 0xb5, 0x9a, + 0x99, 0xd6, 0xf2, 0x62, 0x8f, 0xf5, 0x98, 0x52, 0x69, 0xc9, 0xff, 0xb4, 0xf6, 0x72, 0xbd, 0xcb, + 0x78, 0xc4, 0x78, 0xab, 0x83, 0x39, 0x69, 0x1d, 0xac, 0x77, 0x88, 0xc0, 0xeb, 0xad, 0x2e, 0xa3, + 0xb1, 0xd9, 0x6f, 0xf4, 0x18, 0xeb, 0x85, 0xa4, 0xa5, 0x56, 0x9d, 0xfe, 0x6e, 0x4b, 0xd0, 0x88, + 0x70, 0x81, 0xa3, 0x24, 0x03, 0x18, 0x56, 0x08, 0xfa, 0x29, 0x16, 0x94, 0x65, 0x00, 0x97, 0x47, + 0x1c, 0xda, 0x1c, 0x4f, 0x29, 0xa1, 0x3f, 0xaa, 0xa0, 0xfc, 0x81, 0xbe, 0xc5, 0x8e, 0xc0, 0x82, + 0xc0, 0x9b, 0xa0, 0xac, 0x15, 0x7c, 0x1c, 0x44, 0x34, 0x76, 0x9d, 0x55, 0x67, 0x6d, 0xb6, 0x7d, + 0xf1, 0xf8, 0xa8, 0x51, 0x3b, 0xc4, 0x51, 0x78, 0x13, 0xd9, 0xbb, 0xc8, 0x2b, 0xe9, 0xe5, 0xfb, + 0x72, 0x05, 0xdf, 0x05, 0xe5, 0x98, 0xdc, 0x17, 0x7e, 0xc2, 0x58, 0xe8, 0xd3, 0xc0, 0x9d, 0x5c, + 0x75, 0xd6, 0xa6, 0x6d, 0x5b, 0x7b, 0x17, 0x79, 0x40, 0x2e, 0xb7, 0x19, 0x0b, 0xb7, 0x02, 0x78, + 0x0b, 0x54, 0xf4, 0x66, 0x3f, 0xed, 0xee, 0x61, 0x4e, 0xa4, 0xf9, 0x94, 0x32, 0xbf, 0x74, 0x7c, + 0xd4, 0xb8, 0x68, 0x9b, 0xe7, 0x1a, 0xc8, 0x9b, 0x57, 0x10, 0x46, 0xb2, 0x15, 0x40, 0x1f, 0x94, + 0x14, 0x7c, 0x82, 0x53, 0x1c, 0x71, 0x77, 0x7a, 0xd5, 0x59, 0x2b, 0x5d, 0x47, 0xcd, 0xd3, 0x1f, + 0xa6, 0x29, 0xb9, 0xb7, 0x95, 0x66, 0x7b, 0xf9, 0xf1, 0x51, 0x63, 0xe2, 0xf8, 0xa8, 0x01, 0x35, + 0x93, 0x05, 0x82, 0x3c, 0x90, 0x0c, 0xf4, 0xe0, 0xf7, 0x0e, 0xb8, 0xd0, 0x0d, 0x31, 0x8d, 0xfc, + 0x24, 0x65, 0x09, 0xe3, 0x78, 0xc0, 0x35, 0xa3, 0xb8, 0xde, 0x1c, 0xc5, 0xb5, 0x21, 0x8d, 0xb6, + 0x8d, 0x8d, 0x21, 0xbd, 0x62, 0x48, 0x57, 0x34, 0xe9, 0xa9, 0xb8, 0xc8, 0xab, 0x75, 0x4f, 0x9a, + 0x42, 0x01, 0x2a, 0x82, 0x09, 0x1c, 0xfa, 0x5d, 0x16, 0x86, 0x58, 0x90, 0x14, 0x87, 0xee, 0x39, + 0xf5, 0x54, 0x5b, 0x12, 0xf4, 0xef, 0xa3, 0xc6, 0xeb, 0x3d, 0x2a, 0xf6, 0xfa, 0x9d, 0x66, 0x97, + 0x45, 0x2d, 0x13, 0x6a, 0xfa, 0xcf, 0x35, 0x1e, 0xec, 0xb7, 0xc4, 0x61, 0x42, 0x78, 0x73, 0x2b, + 0x16, 0xb9, 0x77, 0x87, 0xf1, 0x90, 0xb7, 0xa0, 0x44, 0x1b, 0x03, 0x09, 0xbc, 0x07, 0xaa, 0x5a, + 0xeb, 0x1e, 0x15, 0x7b, 0x41, 0x8a, 0xef, 0xd1, 0xb8, 0xe7, 0xfe, 0x4f, 0xd1, 0x7e, 0x34, 0x36, + 0xad, 0x6b, 0xd3, 0x5a, 0x80, 0xc8, 0xd3, 0x57, 0xbb, 0x9b, 0x8b, 0xe0, 0x1e, 0x28, 0x6b, 0x3d, + 0xed, 0x56, 0xf7, 0xbc, 0xe2, 0xbc, 0x35, 0x36, 0x67, 0xcd, 0xe6, 0xd4, 0x58, 0xc8, 0x2b, 0xa9, + 0xe5, 0x8e, 0x5a, 0xc1, 0x7d, 0x30, 0x67, 0x1c, 0x21, 0xbd, 0x4e, 0x02, 0x77, 0x56, 0x51, 0xdd, + 0x1e, 0x9b, 0x6a, 0xb1, 0xe0, 0x55, 0x0d, 0x86, 0x3c, 0x7d, 0x8d, 0x0d, 0xbd, 0x84, 0x04, 0x94, + 0x39, 0x49, 0x0f, 0x68, 0x97, 0xf8, 0xbb, 0x84, 0x70, 0x17, 0xa8, 0x18, 0xba, 0x3a, 0x2a, 0x86, + 0x3e, 0xa1, 0xf7, 0x49, 0xb0, 0x49, 0xba, 0x1b, 0x8c, 0xc6, 0xbc, 0x7d, 0xc9, 0x44, 0x4f, 0x96, + 0x97, 0x16, 0x90, 0xcc, 0x4b, 0xbd, 0xbc, 0x4d, 0x08, 0x87, 0xdf, 0x39, 0x60, 0x29, 0x25, 0x11, + 0xa6, 0x31, 0x8d, 0x7b, 0x7e, 0x81, 0xb1, 0x34, 0x0e, 0xe3, 0x55, 0xc3, 0xf8, 0x9a, 0x66, 0x3c, + 0x1d, 0x12, 0x79, 0x8b, 0x83, 0x8d, 0x1d, 0xeb, 0x10, 0x1f, 0x82, 0x19, 0x99, 0x47, 0xdc, 0x2d, + 0xaf, 0x4e, 0xad, 0x95, 0xae, 0xaf, 0x9c, 0x95, 0x94, 0xed, 0x45, 0xc3, 0x54, 0xce, 0xd3, 0x91, + 0x23, 0x4f, 0x03, 0xc0, 0x2f, 0xc0, 0x6c, 0x92, 0xb2, 0x03, 0x1a, 0x90, 0x94, 0xbb, 0x73, 0x0a, + 0x6d, 0x75, 0x24, 0x9a, 0x51, 0x6c, 0xbb, 0x06, 0xb1, 0x62, 0x10, 0x33, 0x00, 0xe4, 0xe5, 0x60, + 0x90, 0x80, 0xf9, 0x41, 0x79, 0x09, 0x29, 0x17, 0xdc, 0x9d, 0x57, 0xf0, 0x57, 0x46, 0xc2, 0x1b, + 0xed, 0x3b, 0x94, 0x8b, 0x13, 0x14, 0x66, 0x8f, 0x23, 0x6f, 0x2e, 0xb1, 0xf4, 0xd4, 0x05, 0xb2, + 0x78, 0xe7, 0xee, 0xc2, 0xd9, 0x17, 0xc8, 0xb2, 0x60, 0x18, 0x7d, 0x00, 0x80, 0xbc, 0x1c, 0x0c, + 0x52, 0x50, 0x09, 0x31, 0x17, 0x7e, 0x3f, 0x09, 0xb0, 0x20, 0xbe, 0x6c, 0x19, 0x6e, 0x45, 0x3d, + 0xf1, 0x72, 0x53, 0xb7, 0x8b, 0x66, 0xd6, 0x2e, 0x9a, 0x9f, 0x65, 0xfd, 0xa4, 0x7d, 0xd9, 0x40, + 0x9b, 0x42, 0x30, 0x8c, 0x80, 0x1e, 0x3e, 0x6d, 0x38, 0xde, 0xbc, 0x14, 0x7f, 0xae, 0xa4, 0xd2, + 0x12, 0x3e, 0x00, 0x35, 0xd3, 0x0a, 0xb8, 0xc0, 0xfb, 0x32, 0x0a, 0x52, 0x2c, 0x88, 0x5b, 0x55, + 0xe9, 0x72, 0x67, 0x8c, 0x74, 0xd9, 0x24, 0xdd, 0xe3, 0xa3, 0xc6, 0x72, 0xa1, 0xbb, 0xd8, 0x90, + 0xc8, 0xab, 0x6a, 0xe9, 0x8e, 0x16, 0x7a, 0xb2, 0x4d, 0x3d, 0x00, 0xb5, 0x5e, 0xc8, 0x3a, 0x32, + 0x8b, 0x8d, 0xaa, 0x8c, 0x0d, 0x17, 0x8e, 0xcd, 0xae, 0x93, 0xd5, 0xb0, 0x9f, 0x02, 0x89, 0xbc, + 0xaa, 0x96, 0x1a, 0x76, 0x19, 0x9e, 0x90, 0x83, 0xaa, 0xd4, 0x21, 0xfe, 0x2e, 0x4b, 0x4d, 0x19, + 0xe1, 0x6e, 0x4d, 0x3d, 0xe4, 0xc8, 0x54, 0xda, 0xb1, 0xef, 0xd0, 0x5e, 0x35, 0x2e, 0x37, 0x45, + 0xf0, 0x04, 0x1a, 0xf2, 0x16, 0x94, 0xec, 0x36, 0x4b, 0xb5, 0x21, 0x87, 0x07, 0xa0, 0xca, 0x52, + 0xda, 0xa3, 0x71, 0x7e, 0x42, 0xee, 0x2e, 0x2a, 0xd2, 0x37, 0x46, 0x91, 0x7e, 0x6a, 0x0c, 0x46, + 0xd0, 0x9e, 0xc0, 0x43, 0x5e, 0x85, 0x15, 0x4d, 0x38, 0xfc, 0xc5, 0x01, 0xf5, 0xac, 0x29, 0x6d, + 0x6d, 0xfa, 0x29, 0xa1, 0x51, 0xa7, 0x9f, 0x72, 0x12, 0x91, 0x58, 0xf8, 0x09, 0xa6, 0x29, 0x77, + 0x2f, 0xa8, 0x53, 0xdc, 0x38, 0x23, 0x09, 0x8d, 0xb5, 0x67, 0x1b, 0x6f, 0x63, 0x9a, 0xb6, 0xaf, + 0x99, 0x13, 0x5d, 0x1d, 0xe4, 0xe5, 0x19, 0x44, 0xc8, 0x5b, 0x49, 0x46, 0x63, 0xf1, 0x9b, 0xe7, + 0x7f, 0x78, 0xd4, 0x98, 0xf8, 0xf7, 0x51, 0x63, 0x02, 0xfd, 0xe6, 0x80, 0x85, 0xa1, 0xcb, 0xc3, + 0xb7, 0x41, 0xc9, 0x1e, 0x2f, 0x1c, 0x35, 0x5e, 0x2c, 0x59, 0x4d, 0xdf, 0x9e, 0x2c, 0x40, 0x92, + 0x4f, 0x15, 0x77, 0xc1, 0x39, 0x1c, 0xb1, 0x7e, 0x2c, 0xd4, 0x44, 0x33, 0xdb, 0x7e, 0x6f, 0xec, + 0xf8, 0x9a, 0xd3, 0x0c, 0x1a, 0x05, 0x79, 0x06, 0xce, 0x3a, 0xef, 0xef, 0x0e, 0xb8, 0x74, 0x86, + 0x9b, 0xd4, 0xd9, 0xb3, 0xc1, 0xe0, 0xd4, 0xb3, 0xe7, 0x9b, 0xf2, 0xec, 0x19, 0x52, 0x00, 0x29, + 0x98, 0x2b, 0x38, 0x52, 0x5d, 0xe1, 0x8c, 0x30, 0x2d, 0x50, 0xb7, 0x57, 0xcc, 0xeb, 0x2c, 0x66, + 0x15, 0xdf, 0xda, 0x44, 0x5e, 0x11, 0xd9, 0xba, 0xcd, 0x8f, 0x93, 0x60, 0xae, 0x00, 0x04, 0xbb, + 0x03, 0x17, 0x3a, 0x2a, 0x56, 0xfe, 0xdf, 0xd4, 0x9e, 0x6a, 0xca, 0xf1, 0xb7, 0x69, 0xc6, 0xdf, + 0xa6, 0x6c, 0x33, 0xed, 0xb7, 0x24, 0xe7, 0xaf, 0x4f, 0x1b, 0x6b, 0x2f, 0xe1, 0x5d, 0xd5, 0x97, + 0x32, 0x77, 0xc2, 0x77, 0x40, 0xa9, 0x43, 0x62, 0xb2, 0x4b, 0xbb, 0x14, 0xa7, 0x87, 0xe6, 0xb1, + 0x2c, 0x27, 0x59, 0x9b, 0xc8, 0xb3, 0x55, 0xe1, 0x57, 0xa0, 0x94, 0xe0, 0x43, 0xd6, 0x17, 0xba, + 0x64, 0x4e, 0xbd, 0xb0, 0x64, 0xd6, 0x87, 0xe6, 0xc5, 0xdc, 0x58, 0x57, 0x4b, 0xa0, 0x25, 0xd2, + 0xc0, 0xf2, 0xcb, 0x9f, 0xd3, 0x00, 0xe4, 0x43, 0x27, 0x0c, 0x41, 0x55, 0x42, 0x93, 0xae, 0x9c, + 0xda, 0xfd, 0x84, 0xa4, 0x94, 0xe9, 0xa7, 0x95, 0xfe, 0x19, 0xe6, 0xde, 0x34, 0xd3, 0xfd, 0x60, + 0x6a, 0x74, 0x07, 0x2f, 0x5f, 0x44, 0x40, 0x3f, 0xc9, 0x03, 0x54, 0x72, 0xf9, 0xb6, 0x12, 0x43, + 0x0e, 0x2a, 0xa6, 0xba, 0xca, 0x36, 0xad, 0xab, 0xf5, 0xe4, 0xd8, 0x23, 0xa3, 0xae, 0xd6, 0x17, + 0x0b, 0xd5, 0x7a, 0x80, 0x87, 0xbc, 0x79, 0x2d, 0x92, 0x1d, 0x5f, 0xd5, 0xe9, 0x5d, 0xb0, 0x90, + 0x75, 0xa7, 0xec, 0x82, 0x53, 0x2f, 0xba, 0x20, 0x32, 0x17, 0x5c, 0x2a, 0x76, 0xba, 0xc2, 0xf5, + 0xe6, 0x33, 0xa9, 0xb9, 0xdc, 0x01, 0xa8, 0xaa, 0x99, 0xdd, 0x9c, 0x28, 0xa4, 0x11, 0x15, 0x6a, + 0xfc, 0x1f, 0x6f, 0x32, 0xd5, 0xb7, 0x73, 0xad, 0x8f, 0x00, 0x1b, 0x10, 0x79, 0x0b, 0x52, 0xa6, + 0x0b, 0xf2, 0x1d, 0x29, 0x81, 0xdf, 0x82, 0x5a, 0x44, 0xe3, 0x4c, 0x2b, 0xab, 0x19, 0xee, 0xcc, + 0xab, 0x0f, 0xf2, 0x6a, 0x44, 0x63, 0xcd, 0x9c, 0x0d, 0x1d, 0x56, 0x60, 0xfd, 0x3c, 0x0d, 0x6a, + 0xa7, 0x7c, 0x61, 0xc0, 0xaf, 0x41, 0xd9, 0x7c, 0x55, 0xbc, 0x64, 0x70, 0x35, 0x8a, 0x43, 0xa5, + 0x6d, 0xac, 0x1d, 0x5f, 0xd2, 0x5f, 0x23, 0xda, 0xeb, 0xdf, 0x80, 0x39, 0x13, 0xf9, 0x06, 0x7f, + 0xf2, 0x45, 0xf8, 0xab, 0xc5, 0x82, 0x52, 0xb0, 0xd6, 0x04, 0x65, 0x2d, 0x33, 0x0c, 0x21, 0x28, + 0x49, 0xff, 0x06, 0x24, 0x61, 0x9c, 0x0a, 0x77, 0xea, 0xd5, 0xfb, 0x15, 0x44, 0x34, 0xde, 0xd4, + 0xf0, 0xf2, 0x33, 0xc3, 0x30, 0xe9, 0xf4, 0x98, 0x1e, 0xfb, 0x33, 0x43, 0x07, 0x90, 0xf1, 0x9e, + 0x8d, 0x85, 0xbc, 0x92, 0x59, 0xaa, 0xbc, 0xf0, 0xc1, 0x6c, 0x9e, 0x85, 0x33, 0x8a, 0xa6, 0x3d, + 0x36, 0x8d, 0x19, 0x05, 0xad, 0xf4, 0x3b, 0xbf, 0x6b, 0x12, 0x2f, 0x8f, 0x8d, 0xf6, 0xc7, 0x8f, + 0x9f, 0xd5, 0x9d, 0x27, 0xcf, 0xea, 0xce, 0x3f, 0xcf, 0xea, 0xce, 0xc3, 0xe7, 0xf5, 0x89, 0x27, + 0xcf, 0xeb, 0x13, 0x7f, 0x3d, 0xaf, 0x4f, 0x7c, 0xb9, 0x6e, 0x33, 0x91, 0x54, 0xd0, 0xfd, 0x5d, + 0xd6, 0x8f, 0x03, 0xf5, 0x52, 0x2d, 0xf3, 0xeb, 0xc1, 0xfd, 0xec, 0xf7, 0x03, 0x45, 0xdc, 0x39, + 0xa7, 0x9e, 0xf4, 0xc6, 0x7f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x7f, 0x66, 0x0e, 0xc9, 0x12, 0x11, + 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { @@ -1837,7 +1837,10 @@ func (m *GenesisState) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthGenesis + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthGenesis } if (iNdEx + skippy) > l { @@ -1940,7 +1943,10 @@ func (m *OriginalStaking) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthGenesis + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthGenesis } if (iNdEx + skippy) > l { @@ -2042,7 +2048,10 @@ func (m *ProposalIDReimbursementPair) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthGenesis + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthGenesis } if (iNdEx + skippy) > l { @@ -2191,7 +2200,10 @@ func (m *Reimbursement) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthGenesis + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthGenesis } if (iNdEx + skippy) > l { @@ -2409,7 +2421,10 @@ func (m *PoolParams) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthGenesis + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthGenesis } if (iNdEx + skippy) > l { @@ -2627,7 +2642,10 @@ func (m *ClaimProposalParams) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthGenesis + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthGenesis } if (iNdEx + skippy) > l { diff --git a/x/shield/types/query.pb.go b/x/shield/types/query.pb.go index 6170f5c6f..ef5106e1c 100644 --- a/x/shield/types/query.pb.go +++ b/x/shield/types/query.pb.go @@ -3556,7 +3556,10 @@ func (m *QueryPoolRequest) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthQuery + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthQuery } if (iNdEx + skippy) > l { @@ -3639,7 +3642,10 @@ func (m *QueryPoolResponse) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthQuery + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthQuery } if (iNdEx + skippy) > l { @@ -3721,7 +3727,10 @@ func (m *QuerySponsorRequest) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthQuery + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthQuery } if (iNdEx + skippy) > l { @@ -3805,7 +3814,10 @@ func (m *QuerySponsorResponse) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthQuery + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthQuery } if (iNdEx + skippy) > l { @@ -3855,7 +3867,10 @@ func (m *QueryPoolsRequest) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthQuery + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthQuery } if (iNdEx + skippy) > l { @@ -3939,7 +3954,10 @@ func (m *QueryPoolsResponse) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthQuery + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthQuery } if (iNdEx + skippy) > l { @@ -4008,7 +4026,10 @@ func (m *QueryPoolPurchaseListsRequest) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthQuery + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthQuery } if (iNdEx + skippy) > l { @@ -4090,7 +4111,10 @@ func (m *QueryPurchaseListsRequest) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthQuery + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthQuery } if (iNdEx + skippy) > l { @@ -4174,7 +4198,10 @@ func (m *QueryPurchaseListsResponse) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthQuery + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthQuery } if (iNdEx + skippy) > l { @@ -4275,7 +4302,10 @@ func (m *QueryPurchaseListRequest) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthQuery + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthQuery } if (iNdEx + skippy) > l { @@ -4358,7 +4388,10 @@ func (m *QueryPurchaseListResponse) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthQuery + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthQuery } if (iNdEx + skippy) > l { @@ -4408,7 +4441,10 @@ func (m *QueryPurchasesRequest) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthQuery + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthQuery } if (iNdEx + skippy) > l { @@ -4492,7 +4528,10 @@ func (m *QueryPurchasesResponse) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthQuery + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthQuery } if (iNdEx + skippy) > l { @@ -4574,7 +4613,10 @@ func (m *QueryProviderRequest) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthQuery + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthQuery } if (iNdEx + skippy) > l { @@ -4657,7 +4699,10 @@ func (m *QueryProviderResponse) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthQuery + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthQuery } if (iNdEx + skippy) > l { @@ -4707,7 +4752,10 @@ func (m *QueryProvidersRequest) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthQuery + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthQuery } if (iNdEx + skippy) > l { @@ -4791,7 +4839,10 @@ func (m *QueryProvidersResponse) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthQuery + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthQuery } if (iNdEx + skippy) > l { @@ -4841,7 +4892,10 @@ func (m *QueryPoolParamsRequest) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthQuery + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthQuery } if (iNdEx + skippy) > l { @@ -4924,7 +4978,10 @@ func (m *QueryPoolParamsResponse) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthQuery + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthQuery } if (iNdEx + skippy) > l { @@ -4974,7 +5031,10 @@ func (m *QueryClaimParamsRequest) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthQuery + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthQuery } if (iNdEx + skippy) > l { @@ -5057,7 +5117,10 @@ func (m *QueryClaimParamsResponse) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthQuery + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthQuery } if (iNdEx + skippy) > l { @@ -5107,7 +5170,10 @@ func (m *QueryShieldStatusRequest) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthQuery + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthQuery } if (iNdEx + skippy) > l { @@ -5359,7 +5425,10 @@ func (m *QueryShieldStatusResponse) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthQuery + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthQuery } if (iNdEx + skippy) > l { @@ -5460,7 +5529,10 @@ func (m *QueryShieldStakingRequest) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthQuery + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthQuery } if (iNdEx + skippy) > l { @@ -5543,7 +5615,10 @@ func (m *QueryShieldStakingResponse) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthQuery + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthQuery } if (iNdEx + skippy) > l { @@ -5593,7 +5668,10 @@ func (m *QueryShieldStakingRateRequest) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthQuery + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthQuery } if (iNdEx + skippy) > l { @@ -5677,7 +5755,10 @@ func (m *QueryShieldStakingRateResponse) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthQuery + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthQuery } if (iNdEx + skippy) > l { @@ -5746,7 +5827,10 @@ func (m *QueryReimbursementRequest) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthQuery + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthQuery } if (iNdEx + skippy) > l { @@ -5829,7 +5913,10 @@ func (m *QueryReimbursementResponse) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthQuery + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthQuery } if (iNdEx + skippy) > l { @@ -5879,7 +5966,10 @@ func (m *QueryReimbursementsRequest) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthQuery + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthQuery } if (iNdEx + skippy) > l { @@ -5963,7 +6053,10 @@ func (m *QueryReimbursementsResponse) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthQuery + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthQuery } if (iNdEx + skippy) > l { diff --git a/x/shield/types/query.pb.gw.go b/x/shield/types/query.pb.gw.go index 553e7fa4c..29e84a073 100644 --- a/x/shield/types/query.pb.gw.go +++ b/x/shield/types/query.pb.gw.go @@ -20,7 +20,6 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/grpclog" - "google.golang.org/grpc/metadata" "google.golang.org/grpc/status" ) @@ -31,7 +30,6 @@ var _ status.Status var _ = runtime.String var _ = utilities.NewDoubleArray var _ = descriptor.ForMessage -var _ = metadata.Join func request_Query_Pool_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq QueryPoolRequest @@ -656,14 +654,12 @@ func local_request_Query_Reimbursements_0(ctx context.Context, marshaler runtime // RegisterQueryHandlerServer registers the http handlers for service Query to "mux". // UnaryRPC :call QueryServer directly. // 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. +// Note that using this registration option will cause many gRPC library features (such as grpc.SendHeader, etc) to stop working. Consider using RegisterQueryHandlerFromEndpoint instead. func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, server QueryServer) error { mux.Handle("GET", pattern_Query_Pool_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() - var stream runtime.ServerTransportStream - ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req) if err != nil { @@ -671,7 +667,6 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv return } resp, md, err := local_request_Query_Pool_0(rctx, inboundMarshaler, server, req, pathParams) - md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) @@ -685,8 +680,6 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv mux.Handle("GET", pattern_Query_Sponsor_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() - var stream runtime.ServerTransportStream - ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req) if err != nil { @@ -694,7 +687,6 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv return } resp, md, err := local_request_Query_Sponsor_0(rctx, inboundMarshaler, server, req, pathParams) - md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) @@ -708,8 +700,6 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv mux.Handle("GET", pattern_Query_Pools_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() - var stream runtime.ServerTransportStream - ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req) if err != nil { @@ -717,7 +707,6 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv return } resp, md, err := local_request_Query_Pools_0(rctx, inboundMarshaler, server, req, pathParams) - md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) @@ -731,8 +720,6 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv mux.Handle("GET", pattern_Query_PoolPurchaseLists_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() - var stream runtime.ServerTransportStream - ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req) if err != nil { @@ -740,7 +727,6 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv return } resp, md, err := local_request_Query_PoolPurchaseLists_0(rctx, inboundMarshaler, server, req, pathParams) - md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) @@ -754,8 +740,6 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv mux.Handle("GET", pattern_Query_PurchaseLists_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() - var stream runtime.ServerTransportStream - ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req) if err != nil { @@ -763,7 +747,6 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv return } resp, md, err := local_request_Query_PurchaseLists_0(rctx, inboundMarshaler, server, req, pathParams) - md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) @@ -777,8 +760,6 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv mux.Handle("GET", pattern_Query_PurchaseList_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() - var stream runtime.ServerTransportStream - ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req) if err != nil { @@ -786,7 +767,6 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv return } resp, md, err := local_request_Query_PurchaseList_0(rctx, inboundMarshaler, server, req, pathParams) - md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) @@ -800,8 +780,6 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv mux.Handle("GET", pattern_Query_Purchases_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() - var stream runtime.ServerTransportStream - ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req) if err != nil { @@ -809,7 +787,6 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv return } resp, md, err := local_request_Query_Purchases_0(rctx, inboundMarshaler, server, req, pathParams) - md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) @@ -823,8 +800,6 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv mux.Handle("GET", pattern_Query_Provider_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() - var stream runtime.ServerTransportStream - ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req) if err != nil { @@ -832,7 +807,6 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv return } resp, md, err := local_request_Query_Provider_0(rctx, inboundMarshaler, server, req, pathParams) - md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) @@ -846,8 +820,6 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv mux.Handle("GET", pattern_Query_Providers_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() - var stream runtime.ServerTransportStream - ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req) if err != nil { @@ -855,7 +827,6 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv return } resp, md, err := local_request_Query_Providers_0(rctx, inboundMarshaler, server, req, pathParams) - md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) @@ -869,8 +840,6 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv mux.Handle("GET", pattern_Query_PoolParams_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() - var stream runtime.ServerTransportStream - ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req) if err != nil { @@ -878,7 +847,6 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv return } resp, md, err := local_request_Query_PoolParams_0(rctx, inboundMarshaler, server, req, pathParams) - md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) @@ -892,8 +860,6 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv mux.Handle("GET", pattern_Query_ClaimParams_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() - var stream runtime.ServerTransportStream - ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req) if err != nil { @@ -901,7 +867,6 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv return } resp, md, err := local_request_Query_ClaimParams_0(rctx, inboundMarshaler, server, req, pathParams) - md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) @@ -915,8 +880,6 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv mux.Handle("GET", pattern_Query_ShieldStatus_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() - var stream runtime.ServerTransportStream - ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req) if err != nil { @@ -924,7 +887,6 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv return } resp, md, err := local_request_Query_ShieldStatus_0(rctx, inboundMarshaler, server, req, pathParams) - md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) @@ -938,8 +900,6 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv mux.Handle("GET", pattern_Query_ShieldStaking_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() - var stream runtime.ServerTransportStream - ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req) if err != nil { @@ -947,7 +907,6 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv return } resp, md, err := local_request_Query_ShieldStaking_0(rctx, inboundMarshaler, server, req, pathParams) - md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) @@ -961,8 +920,6 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv mux.Handle("GET", pattern_Query_ShieldStakingRate_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() - var stream runtime.ServerTransportStream - ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req) if err != nil { @@ -970,7 +927,6 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv return } resp, md, err := local_request_Query_ShieldStakingRate_0(rctx, inboundMarshaler, server, req, pathParams) - md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) @@ -984,8 +940,6 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv mux.Handle("GET", pattern_Query_Reimbursement_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() - var stream runtime.ServerTransportStream - ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req) if err != nil { @@ -993,7 +947,6 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv return } resp, md, err := local_request_Query_Reimbursement_0(rctx, inboundMarshaler, server, req, pathParams) - md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) @@ -1007,8 +960,6 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv mux.Handle("GET", pattern_Query_Reimbursements_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() - var stream runtime.ServerTransportStream - ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req) if err != nil { @@ -1016,7 +967,6 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv return } resp, md, err := local_request_Query_Reimbursements_0(rctx, inboundMarshaler, server, req, pathParams) - md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) diff --git a/x/shield/types/shield.pb.go b/x/shield/types/shield.pb.go index 49dd6c47c..91c08cc0e 100644 --- a/x/shield/types/shield.pb.go +++ b/x/shield/types/shield.pb.go @@ -609,89 +609,89 @@ func init() { } var fileDescriptor_d5263cf0ba18829d = []byte{ - // 1300 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x57, 0x4f, 0x6f, 0x1b, 0x45, - 0x14, 0xf7, 0xc6, 0xae, 0x93, 0x8c, 0xe3, 0xb6, 0x99, 0x54, 0xc1, 0x0d, 0xe0, 0x8d, 0x06, 0x51, + // 1299 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x57, 0xcf, 0x6f, 0x1b, 0x45, + 0x14, 0xf6, 0xc6, 0xae, 0x93, 0x8c, 0xe3, 0xb6, 0x99, 0x54, 0xc1, 0x0d, 0xe0, 0x8d, 0x06, 0x51, 0x05, 0x95, 0x7a, 0x9b, 0xf4, 0x00, 0x8a, 0x90, 0xaa, 0x3a, 0x2d, 0x52, 0xd4, 0x20, 0x85, 0x2d, - 0x28, 0x12, 0x17, 0x6b, 0xb2, 0x33, 0xb1, 0x47, 0x59, 0xef, 0x98, 0x9d, 0x71, 0xfa, 0xe7, 0xcc, - 0x81, 0x63, 0x8f, 0x9c, 0x50, 0xcf, 0x9c, 0xf9, 0x02, 0x70, 0xea, 0x05, 0x51, 0x71, 0x42, 0x1c, - 0x5c, 0x94, 0x5e, 0xb8, 0xe2, 0x0f, 0x80, 0xd0, 0xcc, 0xce, 0x78, 0xc7, 0x26, 0x25, 0x71, 0xd5, - 0x9e, 0x76, 0xde, 0xbc, 0xff, 0xf3, 0x7e, 0xef, 0xcd, 0x2c, 0x78, 0x4f, 0x74, 0x68, 0x22, 0xfb, - 0x81, 0xe8, 0x30, 0x1a, 0x93, 0xe0, 0x68, 0x1d, 0xc7, 0xbd, 0x0e, 0x5e, 0x37, 0x74, 0xa3, 0x97, - 0x72, 0xc9, 0xe1, 0x72, 0x26, 0xd4, 0x30, 0x9b, 0x56, 0x68, 0xe5, 0x52, 0x9b, 0xb7, 0xb9, 0x16, - 0x09, 0xd4, 0x2a, 0x93, 0x5e, 0xa9, 0x47, 0x5c, 0x74, 0xb9, 0x08, 0xf6, 0xb1, 0xa0, 0xc1, 0xd1, - 0xfa, 0x3e, 0x95, 0x78, 0x3d, 0x88, 0x38, 0x4b, 0x0c, 0xff, 0x72, 0xc6, 0x6f, 0x65, 0x8a, 0x19, - 0x61, 0x58, 0x7e, 0x9b, 0xf3, 0x76, 0x4c, 0x03, 0x4d, 0xed, 0xf7, 0x0f, 0x02, 0xc9, 0xba, 0x54, - 0x48, 0xdc, 0xed, 0x19, 0x81, 0x13, 0x3d, 0xa2, 0x63, 0x0f, 0x80, 0xcf, 0xd8, 0x03, 0x4a, 0xb6, - 0x38, 0x4b, 0x04, 0x8c, 0x40, 0x39, 0xc1, 0x92, 0x1d, 0xd1, 0x9a, 0xb7, 0x5a, 0x5c, 0xab, 0x6c, - 0x5c, 0x6e, 0x18, 0x27, 0x2a, 0xa2, 0x86, 0x89, 0xa8, 0xa1, 0x64, 0x9b, 0xd7, 0x9f, 0x0e, 0xfc, - 0xc2, 0x0f, 0xcf, 0xfd, 0xb5, 0x36, 0x93, 0x9d, 0xfe, 0x7e, 0x23, 0xe2, 0x5d, 0x13, 0x91, 0xf9, - 0x5c, 0x13, 0xe4, 0x30, 0x90, 0x0f, 0x7b, 0x54, 0x68, 0x05, 0x11, 0x1a, 0xd3, 0x90, 0x82, 0xd9, - 0x03, 0x9e, 0x52, 0xd6, 0x4e, 0x6a, 0x33, 0xaf, 0xdf, 0x8b, 0xb5, 0xbd, 0x39, 0xf7, 0xed, 0x13, - 0xbf, 0xf0, 0xd7, 0x13, 0xbf, 0x80, 0xfe, 0xf6, 0x40, 0x55, 0x27, 0x79, 0x9b, 0x46, 0x59, 0x9e, - 0x6c, 0x22, 0xcf, 0x77, 0x4e, 0x8c, 0xc0, 0x88, 0x37, 0x6f, 0x98, 0x20, 0xae, 0x9e, 0x21, 0x08, - 0xeb, 0x62, 0x94, 0xed, 0xe1, 0x64, 0xb6, 0x6f, 0xc0, 0xd7, 0x09, 0x39, 0xff, 0x54, 0x04, 0xa5, - 0x5d, 0xce, 0x63, 0xf8, 0x2e, 0x98, 0x61, 0xa4, 0xe6, 0xad, 0x7a, 0x6b, 0xa5, 0x66, 0x75, 0x38, - 0xf0, 0xe7, 0x1f, 0xe2, 0x6e, 0xbc, 0x89, 0x18, 0x41, 0xe1, 0x0c, 0x23, 0xf0, 0x63, 0x50, 0x21, - 0x54, 0x44, 0x29, 0xeb, 0x49, 0xc6, 0x55, 0x88, 0xde, 0xda, 0x7c, 0x73, 0x79, 0x38, 0xf0, 0x61, - 0x26, 0xe7, 0x30, 0x51, 0xe8, 0x8a, 0xc2, 0x0f, 0xc1, 0xac, 0xe8, 0xf1, 0x44, 0xf0, 0xb4, 0x56, - 0xd4, 0x5a, 0x70, 0x38, 0xf0, 0xcf, 0x67, 0x5a, 0x86, 0x81, 0x42, 0x2b, 0x02, 0x37, 0xc1, 0x82, - 0x59, 0xb6, 0x30, 0x21, 0x69, 0xad, 0xa4, 0x55, 0xde, 0x1a, 0x0e, 0xfc, 0xa5, 0x31, 0x15, 0xcd, - 0x45, 0x61, 0xc5, 0x90, 0xb7, 0x08, 0x49, 0x61, 0x07, 0x2c, 0x64, 0xfd, 0xd3, 0x8a, 0x59, 0x97, - 0xc9, 0xda, 0x39, 0xad, 0x7b, 0x47, 0x9d, 0xd4, 0x1f, 0x03, 0xff, 0xca, 0x19, 0x4e, 0x6a, 0x3b, - 0x91, 0x8e, 0x27, 0xc7, 0x96, 0xf2, 0xa4, 0xc9, 0x1d, 0x45, 0xc1, 0x0f, 0x40, 0x19, 0x47, 0x1a, - 0x17, 0xe5, 0x55, 0x6f, 0x6d, 0xae, 0xb9, 0x38, 0x1c, 0xf8, 0xd5, 0x4c, 0x2b, 0xdb, 0x47, 0xa1, - 0x11, 0x80, 0x7b, 0xa0, 0x9c, 0x69, 0xd6, 0x66, 0x75, 0x38, 0x37, 0xa7, 0x0e, 0xa7, 0xea, 0x86, - 0x83, 0x42, 0x63, 0xce, 0xa9, 0xe1, 0xf7, 0x25, 0x30, 0xb7, 0xdb, 0x4f, 0xa3, 0x0e, 0x16, 0x14, - 0x7e, 0x04, 0x2a, 0x3d, 0xb3, 0x6e, 0x8d, 0x0a, 0xea, 0x14, 0xca, 0x61, 0xa2, 0x10, 0x58, 0x6a, - 0x9b, 0xc0, 0x14, 0x2c, 0xa9, 0x5e, 0xa7, 0x91, 0xaa, 0x5a, 0x8b, 0x26, 0xa4, 0xa5, 0x46, 0x83, - 0xae, 0x74, 0x65, 0x63, 0xa5, 0x91, 0xcd, 0x8d, 0x86, 0x9d, 0x1b, 0x8d, 0x2f, 0xec, 0xdc, 0x68, - 0x5e, 0x51, 0x19, 0x0d, 0x07, 0xfe, 0x8a, 0x71, 0xf0, 0x5f, 0x23, 0xe8, 0xf1, 0x73, 0xdf, 0x0b, - 0x17, 0x73, 0xce, 0x9d, 0x84, 0x28, 0x7d, 0x88, 0x41, 0x95, 0xd0, 0x98, 0x6a, 0x61, 0xed, 0xad, - 0x78, 0xaa, 0xb7, 0x55, 0xe3, 0xed, 0x92, 0xc5, 0x9d, 0xa3, 0x9e, 0xf9, 0x59, 0xb0, 0x7b, 0xda, - 0xc5, 0x04, 0x70, 0x4b, 0x67, 0x07, 0x6e, 0x5e, 0xb9, 0x73, 0xaf, 0xb5, 0x72, 0x90, 0x82, 0x05, - 0x41, 0xd3, 0x23, 0x16, 0xd1, 0xd6, 0x01, 0xa5, 0x42, 0x63, 0xa8, 0xb2, 0xf1, 0x7e, 0xe3, 0xe4, - 0x3b, 0xa0, 0x31, 0x36, 0x92, 0x9a, 0x6f, 0x9b, 0xfc, 0x2d, 0x48, 0x1d, 0x43, 0x0a, 0xa4, 0x19, - 0xf9, 0x29, 0xa5, 0xc2, 0x01, 0xc8, 0x2f, 0x1e, 0x58, 0xb0, 0x00, 0xd9, 0x61, 0x42, 0xc2, 0xab, - 0x60, 0xb6, 0xc7, 0x79, 0x9c, 0x03, 0xc4, 0xe9, 0x49, 0xc3, 0x40, 0x61, 0x59, 0xad, 0xb6, 0x09, - 0xdc, 0x00, 0xf3, 0x16, 0x26, 0xa9, 0x69, 0xfc, 0x4b, 0xc3, 0x81, 0x7f, 0x71, 0x1c, 0x4f, 0x29, - 0x0a, 0x73, 0x31, 0x18, 0x82, 0x59, 0x9a, 0xc8, 0x94, 0x51, 0x51, 0x2b, 0xea, 0x69, 0xb6, 0xfa, - 0xb2, 0xec, 0x6c, 0x5c, 0xcd, 0x65, 0x93, 0x98, 0x09, 0xc3, 0xa8, 0xa3, 0xd0, 0x1a, 0x72, 0xf2, - 0xf9, 0x59, 0x01, 0x3e, 0xe5, 0x47, 0x8c, 0xd0, 0x54, 0xcd, 0x17, 0x35, 0x0b, 0xa8, 0x10, 0x3a, - 0x97, 0xb1, 0xf9, 0x62, 0x18, 0x28, 0xb4, 0x22, 0x30, 0x01, 0x8b, 0x0a, 0x1e, 0x6d, 0xac, 0x41, - 0xb3, 0xcf, 0x13, 0x42, 0x89, 0x49, 0xea, 0xd6, 0xd4, 0xf5, 0xbd, 0x30, 0x42, 0xbc, 0x0e, 0x05, - 0x85, 0x17, 0x73, 0xdb, 0x4d, 0x6d, 0x1a, 0x46, 0x00, 0x44, 0x3c, 0x8e, 0xb1, 0xa4, 0x29, 0x8e, - 0xcd, 0x00, 0xdc, 0x9a, 0xda, 0xd1, 0x62, 0xe6, 0x28, 0xb7, 0x84, 0x42, 0xc7, 0xac, 0x1a, 0x7c, - 0x92, 0x4b, 0x1c, 0xb7, 0x62, 0x1e, 0x1d, 0x52, 0x62, 0x40, 0xfe, 0xca, 0x83, 0xcf, 0xb5, 0x85, - 0xc2, 0x8a, 0x26, 0x77, 0x34, 0x05, 0x0f, 0x40, 0xe5, 0x3e, 0x93, 0x1d, 0x92, 0xe2, 0xfb, 0x2c, - 0x69, 0x9b, 0xc6, 0xb8, 0x3d, 0xb5, 0x23, 0xd3, 0x7b, 0x8e, 0x29, 0x14, 0xba, 0x86, 0xe1, 0x1e, - 0x98, 0x4d, 0xe9, 0x7d, 0x9c, 0x92, 0x29, 0xbb, 0x63, 0x02, 0x44, 0xc6, 0x06, 0x0a, 0xad, 0x35, - 0x07, 0x44, 0x8f, 0x40, 0x55, 0x5d, 0x7c, 0xbb, 0x23, 0xcc, 0xbe, 0xe9, 0xa6, 0x70, 0x7c, 0xef, - 0x01, 0x38, 0xe6, 0x7b, 0x17, 0xb3, 0x54, 0xc0, 0x5b, 0xe0, 0x5c, 0x4f, 0x2d, 0xcc, 0x63, 0xe3, - 0xa5, 0x29, 0x8f, 0xa9, 0x36, 0x4b, 0x2a, 0xe5, 0x30, 0xd3, 0x44, 0xdf, 0xcc, 0x80, 0xb9, 0x3d, - 0x73, 0x8e, 0x53, 0x76, 0xc6, 0x1e, 0x28, 0xe3, 0x2e, 0xef, 0x27, 0xd2, 0xa4, 0xf3, 0xca, 0xe3, - 0x2e, 0xb3, 0xa2, 0x6e, 0x40, 0xbd, 0x80, 0x6d, 0x70, 0x21, 0xe2, 0xdd, 0xde, 0x74, 0x63, 0x1e, - 0x99, 0x42, 0x2e, 0x5b, 0xe4, 0x8f, 0x19, 0xc8, 0x06, 0xfd, 0xf9, 0x7c, 0x57, 0x29, 0x3a, 0xe7, - 0xfb, 0x39, 0x98, 0xb7, 0xa7, 0x20, 0xe0, 0x6d, 0x30, 0x6f, 0xa1, 0x65, 0x8f, 0xf6, 0xa5, 0xd3, - 0xc8, 0x6a, 0x99, 0x53, 0xcd, 0x15, 0xd1, 0xaf, 0x33, 0xa0, 0x7a, 0x4f, 0x4b, 0xdf, 0x93, 0xf8, - 0x50, 0x61, 0xf4, 0x8d, 0x0f, 0xd1, 0xbc, 0x22, 0xc5, 0xd7, 0x5b, 0x91, 0x47, 0x00, 0xda, 0xc4, - 0x5a, 0x29, 0xfd, 0xba, 0x4f, 0x85, 0x1c, 0x4d, 0x8d, 0xbb, 0x53, 0x3b, 0xb9, 0x3c, 0xde, 0xcc, - 0xb9, 0x45, 0x14, 0x2e, 0xda, 0xcd, 0xd0, 0xee, 0x39, 0x45, 0x6a, 0x81, 0xf3, 0x3b, 0x58, 0xc8, - 0x2f, 0x7b, 0x04, 0x4b, 0xaa, 0xef, 0xea, 0x2d, 0x50, 0xd2, 0xf0, 0xf0, 0x4e, 0x85, 0xc7, 0xd2, - 0x70, 0xe0, 0x57, 0xcc, 0xb4, 0x1a, 0xe1, 0x41, 0x2b, 0x3b, 0x0e, 0xfe, 0x29, 0x82, 0xa5, 0xac, - 0x64, 0x5b, 0x31, 0x66, 0xdd, 0xdd, 0x94, 0xf7, 0xb8, 0xc0, 0xb1, 0x7e, 0x22, 0x99, 0xf5, 0xc9, - 0x4f, 0xa4, 0x9c, 0xa9, 0x9e, 0x48, 0x86, 0xda, 0x26, 0x6e, 0xc5, 0x67, 0x4e, 0xad, 0xf8, 0xc4, - 0x43, 0xac, 0x78, 0xe6, 0x87, 0x58, 0x02, 0x4a, 0x31, 0x17, 0xa2, 0x56, 0x3a, 0xed, 0xa7, 0xe7, - 0xa6, 0xe9, 0x11, 0x73, 0x10, 0x4a, 0x09, 0x4d, 0xf5, 0x0f, 0xa4, 0xfd, 0xc0, 0x00, 0xcc, 0x51, - 0x75, 0x7f, 0x25, 0x11, 0x35, 0x03, 0x7d, 0x29, 0xbf, 0xdb, 0x2c, 0x07, 0x85, 0x23, 0xa1, 0xc9, - 0x27, 0x55, 0xf9, 0xec, 0x4f, 0xaa, 0x00, 0xcc, 0x65, 0xc7, 0x49, 0x53, 0xf3, 0x1c, 0x5e, 0x1a, - 0xbb, 0x46, 0x35, 0x07, 0x85, 0x23, 0xa1, 0xcd, 0x4f, 0x54, 0x31, 0xbf, 0x7b, 0xe2, 0x17, 0x7e, - 0xfb, 0xf1, 0xda, 0xf5, 0xff, 0xcd, 0xeb, 0x41, 0xd0, 0xe6, 0x47, 0xa3, 0xec, 0x12, 0x49, 0x13, - 0xd9, 0xbc, 0xfb, 0xf4, 0xb8, 0xee, 0x3d, 0x3b, 0xae, 0x7b, 0x7f, 0x1e, 0xd7, 0xbd, 0xc7, 0x2f, - 0xea, 0x85, 0x67, 0x2f, 0xea, 0x85, 0xdf, 0x5f, 0xd4, 0x0b, 0x5f, 0xad, 0xbb, 0xb6, 0x68, 0x2a, - 0xd9, 0xe1, 0x01, 0xef, 0x27, 0x44, 0xdf, 0xdc, 0x81, 0xf9, 0x61, 0x7f, 0x60, 0x7f, 0xd9, 0xb5, - 0xd1, 0xfd, 0xb2, 0x86, 0xe1, 0x8d, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0x45, 0x95, 0xd5, 0x3b, - 0xd0, 0x0f, 0x00, 0x00, + 0x28, 0x12, 0x17, 0x6b, 0xb2, 0x33, 0xb1, 0x47, 0x59, 0xef, 0x98, 0x9d, 0x71, 0xfa, 0xe3, 0xcc, + 0x81, 0x63, 0x8f, 0x9c, 0x50, 0xcf, 0x9c, 0xf9, 0x07, 0xe0, 0xd4, 0x0b, 0xa2, 0xe2, 0x84, 0x38, + 0xb8, 0x28, 0xbd, 0x70, 0xc5, 0x7f, 0x00, 0x42, 0x33, 0x3b, 0xe3, 0x1d, 0x9b, 0x94, 0xc4, 0x55, + 0x7b, 0xf2, 0xcc, 0xbe, 0xf7, 0xbe, 0x6f, 0xde, 0xbc, 0x6f, 0xde, 0x8c, 0xc1, 0x7b, 0xa2, 0x43, + 0x13, 0xd9, 0x0f, 0x44, 0x87, 0xd1, 0x98, 0x04, 0x47, 0xeb, 0x38, 0xee, 0x75, 0xf0, 0xba, 0x99, + 0x37, 0x7a, 0x29, 0x97, 0x1c, 0x2e, 0x67, 0x4e, 0x0d, 0xf3, 0xd1, 0x3a, 0xad, 0x5c, 0x6a, 0xf3, + 0x36, 0xd7, 0x2e, 0x81, 0x1a, 0x65, 0xde, 0x2b, 0xf5, 0x88, 0x8b, 0x2e, 0x17, 0xc1, 0x3e, 0x16, + 0x34, 0x38, 0x5a, 0xdf, 0xa7, 0x12, 0xaf, 0x07, 0x11, 0x67, 0x89, 0xb1, 0x5f, 0xce, 0xec, 0xad, + 0x2c, 0x30, 0x9b, 0x18, 0x93, 0xdf, 0xe6, 0xbc, 0x1d, 0xd3, 0x40, 0xcf, 0xf6, 0xfb, 0x07, 0x81, + 0x64, 0x5d, 0x2a, 0x24, 0xee, 0xf6, 0x32, 0x07, 0x74, 0xec, 0x01, 0xf0, 0x19, 0x7b, 0x40, 0xc9, + 0x16, 0x67, 0x89, 0x80, 0x11, 0x28, 0x27, 0x58, 0xb2, 0x23, 0x5a, 0xf3, 0x56, 0x8b, 0x6b, 0x95, + 0x8d, 0xcb, 0x0d, 0x03, 0xa7, 0xb8, 0x1b, 0x86, 0xbb, 0xa1, 0x7c, 0x9b, 0xd7, 0x9f, 0x0e, 0xfc, + 0xc2, 0x0f, 0xcf, 0xfd, 0xb5, 0x36, 0x93, 0x9d, 0xfe, 0x7e, 0x23, 0xe2, 0x5d, 0xc3, 0x6d, 0x7e, + 0xae, 0x09, 0x72, 0x18, 0xc8, 0x87, 0x3d, 0x2a, 0x74, 0x80, 0x08, 0x0d, 0x34, 0xa4, 0x60, 0xf6, + 0x80, 0xa7, 0x94, 0xb5, 0x93, 0xda, 0xcc, 0xeb, 0x67, 0xb1, 0xd8, 0x9b, 0x73, 0xdf, 0x3e, 0xf1, + 0x0b, 0x7f, 0x3d, 0xf1, 0x0b, 0xe8, 0x6f, 0x0f, 0x54, 0x75, 0x92, 0xb7, 0x69, 0x94, 0xe5, 0xc9, + 0x26, 0xf2, 0x7c, 0xe7, 0xc4, 0x15, 0x18, 0xf7, 0xe6, 0x0d, 0xb3, 0x88, 0xab, 0x67, 0x58, 0x84, + 0xa5, 0x18, 0x65, 0x7b, 0x38, 0x99, 0xed, 0x1b, 0xe0, 0x3a, 0x21, 0xe7, 0x9f, 0x8a, 0xa0, 0xb4, + 0xcb, 0x79, 0x0c, 0xdf, 0x05, 0x33, 0x8c, 0xd4, 0xbc, 0x55, 0x6f, 0xad, 0xd4, 0xac, 0x0e, 0x07, + 0xfe, 0xfc, 0x43, 0xdc, 0x8d, 0x37, 0x11, 0x23, 0x28, 0x9c, 0x61, 0x04, 0x7e, 0x0c, 0x2a, 0x84, + 0x8a, 0x28, 0x65, 0x3d, 0xc9, 0xb8, 0x5a, 0xa2, 0xb7, 0x36, 0xdf, 0x5c, 0x1e, 0x0e, 0x7c, 0x98, + 0xf9, 0x39, 0x46, 0x14, 0xba, 0xae, 0xf0, 0x43, 0x30, 0x2b, 0x7a, 0x3c, 0x11, 0x3c, 0xad, 0x15, + 0x75, 0x14, 0x1c, 0x0e, 0xfc, 0xf3, 0x59, 0x94, 0x31, 0xa0, 0xd0, 0xba, 0xc0, 0x4d, 0xb0, 0x60, + 0x86, 0x2d, 0x4c, 0x48, 0x5a, 0x2b, 0xe9, 0x90, 0xb7, 0x86, 0x03, 0x7f, 0x69, 0x2c, 0x44, 0x5b, + 0x51, 0x58, 0x31, 0xd3, 0x5b, 0x84, 0xa4, 0xb0, 0x03, 0x16, 0xb2, 0x93, 0xd2, 0x8a, 0x59, 0x97, + 0xc9, 0xda, 0x39, 0x1d, 0x7b, 0x47, 0xed, 0xd4, 0x1f, 0x03, 0xff, 0xca, 0x19, 0x76, 0x6a, 0x3b, + 0x91, 0x0e, 0x93, 0x83, 0xa5, 0x98, 0xf4, 0x74, 0x47, 0xcd, 0xe0, 0x07, 0xa0, 0x8c, 0x23, 0xad, + 0x8b, 0xf2, 0xaa, 0xb7, 0x36, 0xd7, 0x5c, 0x1c, 0x0e, 0xfc, 0x6a, 0x16, 0x95, 0x7d, 0x47, 0xa1, + 0x71, 0x80, 0x7b, 0xa0, 0x9c, 0x45, 0xd6, 0x66, 0xf5, 0x72, 0x6e, 0x4e, 0xbd, 0x9c, 0xaa, 0xbb, + 0x1c, 0x14, 0x1a, 0x38, 0xa7, 0x86, 0xdf, 0x97, 0xc0, 0xdc, 0x6e, 0x3f, 0x8d, 0x3a, 0x58, 0x50, + 0xf8, 0x11, 0xa8, 0xf4, 0xcc, 0xb8, 0x35, 0x2a, 0xa8, 0x53, 0x28, 0xc7, 0x88, 0x42, 0x60, 0x67, + 0xdb, 0x04, 0xa6, 0x60, 0x49, 0x9d, 0x75, 0x1a, 0xa9, 0xaa, 0xb5, 0x68, 0x42, 0x5a, 0xaa, 0x09, + 0xe8, 0x4a, 0x57, 0x36, 0x56, 0x1a, 0x59, 0x87, 0x68, 0xd8, 0x0e, 0xd1, 0xf8, 0xc2, 0x76, 0x88, + 0xe6, 0x15, 0x95, 0xd1, 0x70, 0xe0, 0xaf, 0x18, 0x82, 0xff, 0x82, 0xa0, 0xc7, 0xcf, 0x7d, 0x2f, + 0x5c, 0xcc, 0x2d, 0x77, 0x12, 0xa2, 0xe2, 0x21, 0x06, 0x55, 0x42, 0x63, 0xaa, 0x9d, 0x35, 0x5b, + 0xf1, 0x54, 0xb6, 0x55, 0xc3, 0x76, 0xc9, 0xea, 0xce, 0x09, 0xcf, 0x78, 0x16, 0xec, 0x37, 0x4d, + 0x31, 0x21, 0xdc, 0xd2, 0xd9, 0x85, 0x9b, 0x57, 0xee, 0xdc, 0x6b, 0xad, 0x1c, 0xa4, 0x60, 0x41, + 0xd0, 0xf4, 0x88, 0x45, 0xb4, 0x75, 0x40, 0xa9, 0xd0, 0x1a, 0xaa, 0x6c, 0xbc, 0xdf, 0x38, 0xb9, + 0xdb, 0x37, 0xc6, 0x5a, 0x52, 0xf3, 0x6d, 0x93, 0xbf, 0x15, 0xa9, 0x03, 0xa4, 0x44, 0x9a, 0x4d, + 0x3f, 0xa5, 0x54, 0x38, 0x02, 0xf9, 0xc5, 0x03, 0x0b, 0x56, 0x20, 0x3b, 0x4c, 0x48, 0x78, 0x15, + 0xcc, 0xf6, 0x38, 0x8f, 0x73, 0x81, 0x38, 0x67, 0xd2, 0x18, 0x50, 0x58, 0x56, 0xa3, 0x6d, 0x02, + 0x37, 0xc0, 0xbc, 0x95, 0x49, 0x6a, 0x0e, 0xfe, 0xa5, 0xe1, 0xc0, 0xbf, 0x38, 0xae, 0xa7, 0x14, + 0x85, 0xb9, 0x1b, 0x0c, 0xc1, 0x2c, 0x4d, 0x64, 0xca, 0xa8, 0xa8, 0x15, 0x75, 0x37, 0x5b, 0x7d, + 0x59, 0x76, 0x76, 0x5d, 0xcd, 0x65, 0x93, 0x98, 0x59, 0x86, 0x09, 0x47, 0xa1, 0x05, 0x72, 0xf2, + 0xf9, 0x59, 0x09, 0x3e, 0xe5, 0x47, 0x8c, 0xd0, 0x54, 0xf5, 0x17, 0xd5, 0x0b, 0xa8, 0x10, 0x3a, + 0x97, 0xb1, 0xfe, 0x62, 0x0c, 0x28, 0xb4, 0x2e, 0x30, 0x01, 0x8b, 0x4a, 0x1e, 0x6d, 0xac, 0x45, + 0xb3, 0xcf, 0x13, 0x42, 0x89, 0x49, 0xea, 0xd6, 0xd4, 0xf5, 0xbd, 0x30, 0x52, 0xbc, 0x5e, 0x0a, + 0x0a, 0x2f, 0xe6, 0xd8, 0x4d, 0x0d, 0x0d, 0x23, 0x00, 0x22, 0x1e, 0xc7, 0x58, 0xd2, 0x14, 0xc7, + 0xa6, 0x01, 0x6e, 0x4d, 0x4d, 0xb4, 0x98, 0x11, 0xe5, 0x48, 0x28, 0x74, 0x60, 0x55, 0xe3, 0x93, + 0x5c, 0xe2, 0xb8, 0x15, 0xf3, 0xe8, 0x90, 0x12, 0x23, 0xf2, 0x57, 0x6e, 0x7c, 0x2e, 0x16, 0x0a, + 0x2b, 0x7a, 0xba, 0xa3, 0x67, 0xf0, 0x00, 0x54, 0xee, 0x33, 0xd9, 0x21, 0x29, 0xbe, 0xcf, 0x92, + 0xb6, 0x39, 0x18, 0xb7, 0xa7, 0x26, 0x32, 0x67, 0xcf, 0x81, 0x42, 0xa1, 0x0b, 0x0c, 0xf7, 0xc0, + 0x6c, 0x4a, 0xef, 0xe3, 0x94, 0x4c, 0x79, 0x3a, 0x26, 0x44, 0x64, 0x30, 0x50, 0x68, 0xd1, 0x1c, + 0x11, 0x3d, 0x02, 0x55, 0x75, 0xf1, 0xed, 0x8e, 0x34, 0xfb, 0xa6, 0x0f, 0x85, 0xc3, 0xbd, 0x07, + 0xe0, 0x18, 0xf7, 0x2e, 0x66, 0xa9, 0x80, 0xb7, 0xc0, 0xb9, 0x9e, 0x1a, 0x98, 0xc7, 0xc6, 0x4b, + 0x53, 0x1e, 0x0b, 0x6d, 0x96, 0x54, 0xca, 0x61, 0x16, 0x89, 0xbe, 0x99, 0x01, 0x73, 0x7b, 0x66, + 0x1f, 0xa7, 0x3c, 0x19, 0x7b, 0xa0, 0x8c, 0xbb, 0xbc, 0x9f, 0x48, 0x93, 0xce, 0x2b, 0xb7, 0xbb, + 0x0c, 0x45, 0xdd, 0x80, 0x7a, 0x00, 0xdb, 0xe0, 0x42, 0xc4, 0xbb, 0xbd, 0xe9, 0xda, 0x3c, 0x32, + 0x85, 0x5c, 0xb6, 0xca, 0x1f, 0x03, 0xc8, 0x1a, 0xfd, 0xf9, 0xfc, 0xab, 0x0a, 0x74, 0xf6, 0xf7, + 0x73, 0x30, 0x6f, 0x77, 0x41, 0xc0, 0xdb, 0x60, 0xde, 0x4a, 0xcb, 0x6e, 0xed, 0x4b, 0xbb, 0x91, + 0x8d, 0x32, 0xbb, 0x9a, 0x07, 0xa2, 0x5f, 0x67, 0x40, 0xf5, 0x9e, 0xf6, 0xbe, 0x27, 0xf1, 0xa1, + 0xd2, 0xe8, 0x1b, 0x6f, 0xa2, 0x79, 0x45, 0x8a, 0xaf, 0xb7, 0x22, 0x8f, 0x00, 0xb4, 0x89, 0xb5, + 0x52, 0xfa, 0x75, 0x9f, 0x0a, 0x39, 0xea, 0x1a, 0x77, 0xa7, 0x26, 0xb9, 0x3c, 0x7e, 0x98, 0x73, + 0x44, 0x14, 0x2e, 0xda, 0x8f, 0xa1, 0xfd, 0xe6, 0x14, 0xa9, 0x05, 0xce, 0xef, 0x60, 0x21, 0xbf, + 0xec, 0x11, 0x2c, 0xa9, 0xbe, 0xab, 0xb7, 0x40, 0x49, 0xcb, 0xc3, 0x3b, 0x55, 0x1e, 0x4b, 0xc3, + 0x81, 0x5f, 0x31, 0xdd, 0x6a, 0xa4, 0x07, 0x1d, 0xec, 0x10, 0xfc, 0x53, 0x04, 0x4b, 0x59, 0xc9, + 0xb6, 0x62, 0xcc, 0xba, 0xbb, 0x29, 0xef, 0x71, 0x81, 0x63, 0xfd, 0x44, 0x32, 0xe3, 0x93, 0x9f, + 0x48, 0xb9, 0x51, 0x3d, 0x91, 0xcc, 0x6c, 0x9b, 0xb8, 0x15, 0x9f, 0x39, 0xb5, 0xe2, 0x13, 0x0f, + 0xb1, 0xe2, 0x99, 0x1f, 0x62, 0x09, 0x28, 0xc5, 0x5c, 0x88, 0x5a, 0xe9, 0xb4, 0x3f, 0x3d, 0x37, + 0xcd, 0x19, 0x31, 0x1b, 0xa1, 0x82, 0xd0, 0x54, 0xff, 0x81, 0x34, 0x0f, 0x0c, 0xc0, 0x1c, 0x55, + 0xf7, 0x57, 0x12, 0x51, 0xd3, 0xd0, 0x97, 0xf2, 0xbb, 0xcd, 0x5a, 0x50, 0x38, 0x72, 0x9a, 0x7c, + 0x52, 0x95, 0xcf, 0xfe, 0xa4, 0x0a, 0xc0, 0x5c, 0xb6, 0x9d, 0x34, 0x35, 0xcf, 0xe1, 0xa5, 0xb1, + 0x6b, 0x54, 0x5b, 0x50, 0x38, 0x72, 0xda, 0xfc, 0x44, 0x15, 0xf3, 0xbb, 0x27, 0x7e, 0xe1, 0xb7, + 0x1f, 0xaf, 0x5d, 0xff, 0xdf, 0xbc, 0x1e, 0x04, 0x6d, 0x7e, 0x34, 0xca, 0x2e, 0x91, 0x34, 0x91, + 0xcd, 0xbb, 0x4f, 0x8f, 0xeb, 0xde, 0xb3, 0xe3, 0xba, 0xf7, 0xe7, 0x71, 0xdd, 0x7b, 0xfc, 0xa2, + 0x5e, 0x78, 0xf6, 0xa2, 0x5e, 0xf8, 0xfd, 0x45, 0xbd, 0xf0, 0xd5, 0xba, 0x8b, 0x45, 0x53, 0xc9, + 0x0e, 0x0f, 0x78, 0x3f, 0x21, 0xfa, 0xe6, 0x0e, 0xcc, 0x5f, 0xf3, 0x07, 0xf6, 0xcf, 0xb9, 0x06, + 0xdd, 0x2f, 0x6b, 0x19, 0xde, 0xf8, 0x37, 0x00, 0x00, 0xff, 0xff, 0x4c, 0x6b, 0x97, 0xc9, 0xba, + 0x0f, 0x00, 0x00, } func (m *MixedCoins) Marshal() (dAtA []byte, err error) { @@ -1787,7 +1787,10 @@ func (m *MixedCoins) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthShield + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthShield } if (iNdEx + skippy) > l { @@ -1905,7 +1908,10 @@ func (m *MixedDecCoins) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthShield + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthShield } if (iNdEx + skippy) > l { @@ -2158,7 +2164,10 @@ func (m *Pool) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthShield + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthShield } if (iNdEx + skippy) > l { @@ -2392,7 +2401,10 @@ func (m *Purchase) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthShield + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthShield } if (iNdEx + skippy) > l { @@ -2527,7 +2539,10 @@ func (m *PurchaseList) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthShield + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthShield } if (iNdEx + skippy) > l { @@ -2778,7 +2793,10 @@ func (m *Provider) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthShield + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthShield } if (iNdEx + skippy) > l { @@ -2879,7 +2897,10 @@ func (m *PoolPurchaser) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthShield + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthShield } if (iNdEx + skippy) > l { @@ -2963,7 +2984,10 @@ func (m *PoolPurchaserPairs) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthShield + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthShield } if (iNdEx + skippy) > l { @@ -3112,7 +3136,10 @@ func (m *Withdraw) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthShield + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthShield } if (iNdEx + skippy) > l { @@ -3196,7 +3223,10 @@ func (m *Withdraws) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthShield + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthShield } if (iNdEx + skippy) > l { @@ -3365,7 +3395,10 @@ func (m *ShieldStaking) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthShield + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthShield } if (iNdEx + skippy) > l { @@ -3451,7 +3484,10 @@ func (m *LastUpdateTime) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthShield + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthShield } if (iNdEx + skippy) > l { @@ -3688,7 +3724,10 @@ func (m *ShieldClaimProposal) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthShield + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthShield } if (iNdEx + skippy) > l { diff --git a/x/shield/types/tx.pb.go b/x/shield/types/tx.pb.go index 32738c9f1..254f88370 100644 --- a/x/shield/types/tx.pb.go +++ b/x/shield/types/tx.pb.go @@ -3423,7 +3423,10 @@ func (m *MsgCreatePool) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthTx + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthTx } if (iNdEx + skippy) > l { @@ -3473,7 +3476,10 @@ func (m *MsgCreatePoolResponse) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthTx + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthTx } if (iNdEx + skippy) > l { @@ -3707,7 +3713,10 @@ func (m *MsgUpdatePool) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthTx + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthTx } if (iNdEx + skippy) > l { @@ -3757,7 +3766,10 @@ func (m *MsgUpdatePoolResponse) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthTx + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthTx } if (iNdEx + skippy) > l { @@ -3858,7 +3870,10 @@ func (m *MsgPausePool) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthTx + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthTx } if (iNdEx + skippy) > l { @@ -3908,7 +3923,10 @@ func (m *MsgPausePoolResponse) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthTx + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthTx } if (iNdEx + skippy) > l { @@ -4009,7 +4027,10 @@ func (m *MsgResumePool) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthTx + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthTx } if (iNdEx + skippy) > l { @@ -4059,7 +4080,10 @@ func (m *MsgResumePoolResponse) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthTx + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthTx } if (iNdEx + skippy) > l { @@ -4175,7 +4199,10 @@ func (m *MsgDepositCollateral) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthTx + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthTx } if (iNdEx + skippy) > l { @@ -4225,7 +4252,10 @@ func (m *MsgDepositCollateralResponse) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthTx + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthTx } if (iNdEx + skippy) > l { @@ -4341,7 +4371,10 @@ func (m *MsgWithdrawCollateral) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthTx + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthTx } if (iNdEx + skippy) > l { @@ -4391,7 +4424,10 @@ func (m *MsgWithdrawCollateralResponse) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthTx + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthTx } if (iNdEx + skippy) > l { @@ -4473,7 +4509,10 @@ func (m *MsgWithdrawRewards) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthTx + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthTx } if (iNdEx + skippy) > l { @@ -4523,7 +4562,10 @@ func (m *MsgWithdrawRewardsResponse) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthTx + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthTx } if (iNdEx + skippy) > l { @@ -4669,7 +4711,10 @@ func (m *MsgWithdrawForeignRewards) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthTx + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthTx } if (iNdEx + skippy) > l { @@ -4719,7 +4764,10 @@ func (m *MsgWithdrawForeignRewardsResponse) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthTx + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthTx } if (iNdEx + skippy) > l { @@ -4833,7 +4881,10 @@ func (m *MsgClearPayouts) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthTx + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthTx } if (iNdEx + skippy) > l { @@ -4883,7 +4934,10 @@ func (m *MsgClearPayoutsResponse) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthTx + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthTx } if (iNdEx + skippy) > l { @@ -5050,7 +5104,10 @@ func (m *MsgPurchaseShield) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthTx + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthTx } if (iNdEx + skippy) > l { @@ -5100,7 +5157,10 @@ func (m *MsgPurchaseShieldResponse) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthTx + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthTx } if (iNdEx + skippy) > l { @@ -5201,7 +5261,10 @@ func (m *MsgWithdrawReimbursement) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthTx + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthTx } if (iNdEx + skippy) > l { @@ -5251,7 +5314,10 @@ func (m *MsgWithdrawReimbursementResponse) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthTx + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthTx } if (iNdEx + skippy) > l { @@ -5418,7 +5484,10 @@ func (m *MsgStakeForShield) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthTx + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthTx } if (iNdEx + skippy) > l { @@ -5468,7 +5537,10 @@ func (m *MsgStakeForShieldResponse) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthTx + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthTx } if (iNdEx + skippy) > l { @@ -5603,7 +5675,10 @@ func (m *MsgUnstakeFromShield) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthTx + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthTx } if (iNdEx + skippy) > l { @@ -5653,7 +5728,10 @@ func (m *MsgUnstakeFromShieldResponse) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthTx + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthTx } if (iNdEx + skippy) > l { @@ -5818,7 +5896,10 @@ func (m *MsgUpdateSponsor) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthTx + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthTx } if (iNdEx + skippy) > l { @@ -5868,7 +5949,10 @@ func (m *MsgUpdateSponsorResponse) Unmarshal(dAtA []byte) error { if err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { + if skippy < 0 { + return ErrInvalidLengthTx + } + if (iNdEx + skippy) < 0 { return ErrInvalidLengthTx } if (iNdEx + skippy) > l { From 809ca19b0f7ddcbd3f945db4c41aed4995750470 Mon Sep 17 00:00:00 2001 From: yoongbok lee Date: Wed, 25 May 2022 15:22:56 +0900 Subject: [PATCH 03/14] add proto files --- proto/shentu/shield/v1alpha1/genesis.proto | 45 +- x/shield/keeper/params.go | 6 +- x/shield/types/genesis.pb.go | 651 +++++++++++++++------ x/shield/types/params.go | 1 + 4 files changed, 517 insertions(+), 186 deletions(-) diff --git a/proto/shentu/shield/v1alpha1/genesis.proto b/proto/shentu/shield/v1alpha1/genesis.proto index c5b0fe3d2..7a7e2b3f4 100644 --- a/proto/shentu/shield/v1alpha1/genesis.proto +++ b/proto/shentu/shield/v1alpha1/genesis.proto @@ -18,23 +18,24 @@ message GenesisState { uint64 next_pool_id = 2 [ (gogoproto.moretags) = "yaml:\"next_pool_id\"" ]; uint64 next_purchase_id = 3 [ (gogoproto.moretags) = "yaml:\"next_purchase_id\"" ]; PoolParams pool_params = 4 [ (gogoproto.moretags) = "yaml:\"pool_params\"", (gogoproto.nullable) = false ]; - ClaimProposalParams claim_proposal_params = 5 [ (gogoproto.moretags) = "yaml:\"claim_proposal_params\"", (gogoproto.nullable) = false ]; - string total_collateral = 6 [ (gogoproto.moretags) = "yaml:\"total_collateral\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.nullable) = false ]; - string total_withdrawing = 7 [ (gogoproto.moretags) = "yaml:\"total_withdrawing\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.nullable) = false ]; - string total_shield = 8 [ (gogoproto.moretags) = "yaml:\"total_shield\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.nullable) = false ]; - string total_claimed = 9 [ (gogoproto.moretags) = "yaml:\"total_claimed\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.nullable) = false ]; - MixedDecCoins service_fees = 10 [ (gogoproto.moretags) = "yaml:\"service_fees\"", (gogoproto.nullable) = false ]; - MixedDecCoins remaining_service_fees = 11 [ (gogoproto.moretags) = "yaml:\"remaining_service_fees\"", (gogoproto.nullable) = false ]; - repeated Pool pools = 12 [ (gogoproto.moretags) = "yaml:\"pools\"", (gogoproto.nullable) = false ]; - repeated Provider providers = 13 [ (gogoproto.moretags) = "yaml:\"providers\"", (gogoproto.nullable) = false ]; - repeated PurchaseList purchase_lists = 14 [ (gogoproto.moretags) = "yaml:\"purchases\"", (gogoproto.nullable) = false ]; - repeated Withdraw withdraws = 15 [ (gogoproto.moretags) = "yaml:\"withdraws\"", (gogoproto.nullable) = false ]; - google.protobuf.Timestamp last_update_time = 16 [(gogoproto.stdtime) = true, (gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"last_update_time\""]; - string shield_staking_rate = 17 [ (gogoproto.moretags) = "yaml:\"shield_staking_rate\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false ]; - string global_staking_pool = 18 [ (gogoproto.moretags) = "yaml:\"global_staking_pool\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.nullable) = false ]; - repeated ShieldStaking stake_for_shields = 19 [ (gogoproto.moretags) = "yaml:\"stake_for_shields\"", (gogoproto.nullable) = false ]; - repeated OriginalStaking original_stakings = 20 [ (gogoproto.moretags) = "yaml:\"original_stakings\"", (gogoproto.nullable) = false ]; - repeated ProposalIDReimbursementPair proposalID_reimbursement_pairs = 21 [ (gogoproto.moretags) = "yaml:\"proposalID_reimbursement_pairs\"", (gogoproto.nullable) = false ]; + ClaimProposalParams claim_proposal_params = 5 [ (gogoproto.moretags) = "yaml:\"claim_proposal_params\"", (gogoproto.nullable) = false ]; + BlockRewardParams block_reward_params = 6 [ (gogoproto.moretags) = "yaml:\"block_reward_params\"", (gogoproto.nullable) = false ]; + string total_collateral = 7 [ (gogoproto.moretags) = "yaml:\"total_collateral\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.nullable) = false ]; + string total_withdrawing = 8 [ (gogoproto.moretags) = "yaml:\"total_withdrawing\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.nullable) = false ]; + string total_shield = 9 [ (gogoproto.moretags) = "yaml:\"total_shield\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.nullable) = false ]; + string total_claimed = 10 [ (gogoproto.moretags) = "yaml:\"total_claimed\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.nullable) = false ]; + MixedDecCoins service_fees = 11 [ (gogoproto.moretags) = "yaml:\"service_fees\"", (gogoproto.nullable) = false ]; + MixedDecCoins remaining_service_fees = 12 [ (gogoproto.moretags) = "yaml:\"remaining_service_fees\"", (gogoproto.nullable) = false ]; + repeated Pool pools = 13 [ (gogoproto.moretags) = "yaml:\"pools\"", (gogoproto.nullable) = false ]; + repeated Provider providers = 14 [ (gogoproto.moretags) = "yaml:\"providers\"", (gogoproto.nullable) = false ]; + repeated PurchaseList purchase_lists = 15 [ (gogoproto.moretags) = "yaml:\"purchases\"", (gogoproto.nullable) = false ]; + repeated Withdraw withdraws = 16 [ (gogoproto.moretags) = "yaml:\"withdraws\"", (gogoproto.nullable) = false ]; + google.protobuf.Timestamp last_update_time = 17 [(gogoproto.stdtime) = true, (gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"last_update_time\""]; + string shield_staking_rate = 18 [ (gogoproto.moretags) = "yaml:\"shield_staking_rate\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false ]; + string global_staking_pool = 19 [ (gogoproto.moretags) = "yaml:\"global_staking_pool\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.nullable) = false ]; + repeated ShieldStaking stake_for_shields = 20 [ (gogoproto.moretags) = "yaml:\"stake_for_shields\"", (gogoproto.nullable) = false ]; + repeated OriginalStaking original_stakings = 21 [ (gogoproto.moretags) = "yaml:\"original_stakings\"", (gogoproto.nullable) = false ]; + repeated ProposalIDReimbursementPair proposalID_reimbursement_pairs = 22 [ (gogoproto.moretags) = "yaml:\"proposalID_reimbursement_pairs\"", (gogoproto.nullable) = false ]; } message OriginalStaking { @@ -85,3 +86,13 @@ message ClaimProposalParams { string deposit_rate = 4 [ (gogoproto.moretags) = "yaml:\"deposit_rate\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false ]; string fees_rate = 5 [ (gogoproto.moretags) = "yaml:\"fees_rate\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false ]; } + +// BlockRewardParams defines the parameters for shield block reward. +message BlockRewardParams { + option (gogoproto.equal) = false; + option (gogoproto.goproto_getters) = false; + + string model_param_a = 1 [ (gogoproto.moretags) = "yaml:\"model_param_a\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false ]; + string model_param_b = 2 [ (gogoproto.moretags) = "yaml:\"model_param_b\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false ]; + string target_leverage = 3 [ (gogoproto.moretags) = "yaml:\"target_leverage\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false ]; +} diff --git a/x/shield/keeper/params.go b/x/shield/keeper/params.go index 47bf4e427..51ee76cfb 100644 --- a/x/shield/keeper/params.go +++ b/x/shield/keeper/params.go @@ -43,11 +43,11 @@ func (k Keeper) SetShieldStakingRate(ctx sdk.Context, rate sdk.Dec) { // GetDistributionParams returns distribution parameters. func (k Keeper) GetDistributionParams(ctx sdk.Context) (distrParams types.) { - k.paramSpace.Get(ctx, types.ParamStoreKeyStakingShieldRate, &rate) + k.paramSpace.Get(ctx, types.ParamStoreKeyDistribution, &distrParams) return } // SetDistributionParams sets distribution parameters. -func (k Keeper) SetDistributionParams(ctx sdk.Context, rate sdk.Dec) { - k.paramSpace.Set(ctx, types.ParamStoreKeyStakingShieldRate, &rate) +func (k Keeper) SetDistributionParams(ctx sdk.Context, distrParams types.D) { + k.paramSpace.Set(ctx, types.ParamStoreKeyDistribution, &rate) } diff --git a/x/shield/types/genesis.pb.go b/x/shield/types/genesis.pb.go index c26c105b6..944c6db47 100644 --- a/x/shield/types/genesis.pb.go +++ b/x/shield/types/genesis.pb.go @@ -37,22 +37,23 @@ type GenesisState struct { NextPurchaseId uint64 `protobuf:"varint,3,opt,name=next_purchase_id,json=nextPurchaseId,proto3" json:"next_purchase_id,omitempty" yaml:"next_purchase_id"` PoolParams PoolParams `protobuf:"bytes,4,opt,name=pool_params,json=poolParams,proto3" json:"pool_params" yaml:"pool_params"` ClaimProposalParams ClaimProposalParams `protobuf:"bytes,5,opt,name=claim_proposal_params,json=claimProposalParams,proto3" json:"claim_proposal_params" yaml:"claim_proposal_params"` - TotalCollateral github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,6,opt,name=total_collateral,json=totalCollateral,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"total_collateral" yaml:"total_collateral"` - TotalWithdrawing github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,7,opt,name=total_withdrawing,json=totalWithdrawing,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"total_withdrawing" yaml:"total_withdrawing"` - TotalShield github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,8,opt,name=total_shield,json=totalShield,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"total_shield" yaml:"total_shield"` - TotalClaimed github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,9,opt,name=total_claimed,json=totalClaimed,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"total_claimed" yaml:"total_claimed"` - ServiceFees MixedDecCoins `protobuf:"bytes,10,opt,name=service_fees,json=serviceFees,proto3" json:"service_fees" yaml:"service_fees"` - RemainingServiceFees MixedDecCoins `protobuf:"bytes,11,opt,name=remaining_service_fees,json=remainingServiceFees,proto3" json:"remaining_service_fees" yaml:"remaining_service_fees"` - Pools []Pool `protobuf:"bytes,12,rep,name=pools,proto3" json:"pools" yaml:"pools"` - Providers []Provider `protobuf:"bytes,13,rep,name=providers,proto3" json:"providers" yaml:"providers"` - PurchaseLists []PurchaseList `protobuf:"bytes,14,rep,name=purchase_lists,json=purchaseLists,proto3" json:"purchase_lists" yaml:"purchases"` - Withdraws []Withdraw `protobuf:"bytes,15,rep,name=withdraws,proto3" json:"withdraws" yaml:"withdraws"` - LastUpdateTime time.Time `protobuf:"bytes,16,opt,name=last_update_time,json=lastUpdateTime,proto3,stdtime" json:"last_update_time" yaml:"last_update_time"` - ShieldStakingRate github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,17,opt,name=shield_staking_rate,json=shieldStakingRate,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"shield_staking_rate" yaml:"shield_staking_rate"` - GlobalStakingPool github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,18,opt,name=global_staking_pool,json=globalStakingPool,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"global_staking_pool" yaml:"global_staking_pool"` - StakeForShields []ShieldStaking `protobuf:"bytes,19,rep,name=stake_for_shields,json=stakeForShields,proto3" json:"stake_for_shields" yaml:"stake_for_shields"` - OriginalStakings []OriginalStaking `protobuf:"bytes,20,rep,name=original_stakings,json=originalStakings,proto3" json:"original_stakings" yaml:"original_stakings"` - ProposalIDReimbursementPairs []ProposalIDReimbursementPair `protobuf:"bytes,21,rep,name=proposalID_reimbursement_pairs,json=proposalIDReimbursementPairs,proto3" json:"proposalID_reimbursement_pairs" yaml:"proposalID_reimbursement_pairs"` + BlockRewardParams BlockRewardParams `protobuf:"bytes,6,opt,name=block_reward_params,json=blockRewardParams,proto3" json:"block_reward_params" yaml:"block_reward_params"` + TotalCollateral github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,7,opt,name=total_collateral,json=totalCollateral,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"total_collateral" yaml:"total_collateral"` + TotalWithdrawing github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,8,opt,name=total_withdrawing,json=totalWithdrawing,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"total_withdrawing" yaml:"total_withdrawing"` + TotalShield github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,9,opt,name=total_shield,json=totalShield,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"total_shield" yaml:"total_shield"` + TotalClaimed github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,10,opt,name=total_claimed,json=totalClaimed,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"total_claimed" yaml:"total_claimed"` + ServiceFees MixedDecCoins `protobuf:"bytes,11,opt,name=service_fees,json=serviceFees,proto3" json:"service_fees" yaml:"service_fees"` + RemainingServiceFees MixedDecCoins `protobuf:"bytes,12,opt,name=remaining_service_fees,json=remainingServiceFees,proto3" json:"remaining_service_fees" yaml:"remaining_service_fees"` + Pools []Pool `protobuf:"bytes,13,rep,name=pools,proto3" json:"pools" yaml:"pools"` + Providers []Provider `protobuf:"bytes,14,rep,name=providers,proto3" json:"providers" yaml:"providers"` + PurchaseLists []PurchaseList `protobuf:"bytes,15,rep,name=purchase_lists,json=purchaseLists,proto3" json:"purchase_lists" yaml:"purchases"` + Withdraws []Withdraw `protobuf:"bytes,16,rep,name=withdraws,proto3" json:"withdraws" yaml:"withdraws"` + LastUpdateTime time.Time `protobuf:"bytes,17,opt,name=last_update_time,json=lastUpdateTime,proto3,stdtime" json:"last_update_time" yaml:"last_update_time"` + ShieldStakingRate github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,18,opt,name=shield_staking_rate,json=shieldStakingRate,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"shield_staking_rate" yaml:"shield_staking_rate"` + GlobalStakingPool github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,19,opt,name=global_staking_pool,json=globalStakingPool,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"global_staking_pool" yaml:"global_staking_pool"` + StakeForShields []ShieldStaking `protobuf:"bytes,20,rep,name=stake_for_shields,json=stakeForShields,proto3" json:"stake_for_shields" yaml:"stake_for_shields"` + OriginalStakings []OriginalStaking `protobuf:"bytes,21,rep,name=original_stakings,json=originalStakings,proto3" json:"original_stakings" yaml:"original_stakings"` + ProposalIDReimbursementPairs []ProposalIDReimbursementPair `protobuf:"bytes,22,rep,name=proposalID_reimbursement_pairs,json=proposalIDReimbursementPairs,proto3" json:"proposalID_reimbursement_pairs" yaml:"proposalID_reimbursement_pairs"` } func (m *GenesisState) Reset() { *m = GenesisState{} } @@ -287,6 +288,46 @@ func (m *ClaimProposalParams) XXX_DiscardUnknown() { var xxx_messageInfo_ClaimProposalParams proto.InternalMessageInfo +// BlockRewardParams defines the parameters for shield block reward. +type BlockRewardParams struct { + ModelParamA github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,1,opt,name=model_param_a,json=modelParamA,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"model_param_a" yaml:"model_param_a"` + ModelParamB github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,2,opt,name=model_param_b,json=modelParamB,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"model_param_b" yaml:"model_param_b"` + TargetLeverage github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,3,opt,name=target_leverage,json=targetLeverage,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"target_leverage" yaml:"target_leverage"` +} + +func (m *BlockRewardParams) Reset() { *m = BlockRewardParams{} } +func (m *BlockRewardParams) String() string { return proto.CompactTextString(m) } +func (*BlockRewardParams) ProtoMessage() {} +func (*BlockRewardParams) Descriptor() ([]byte, []int) { + return fileDescriptor_c089c09a119aaa04, []int{6} +} +func (m *BlockRewardParams) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *BlockRewardParams) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_BlockRewardParams.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *BlockRewardParams) XXX_Merge(src proto.Message) { + xxx_messageInfo_BlockRewardParams.Merge(m, src) +} +func (m *BlockRewardParams) XXX_Size() int { + return m.Size() +} +func (m *BlockRewardParams) XXX_DiscardUnknown() { + xxx_messageInfo_BlockRewardParams.DiscardUnknown(m) +} + +var xxx_messageInfo_BlockRewardParams proto.InternalMessageInfo + func init() { proto.RegisterType((*GenesisState)(nil), "shentu.shield.v1alpha1.GenesisState") proto.RegisterType((*OriginalStaking)(nil), "shentu.shield.v1alpha1.OriginalStaking") @@ -294,6 +335,7 @@ func init() { proto.RegisterType((*Reimbursement)(nil), "shentu.shield.v1alpha1.Reimbursement") proto.RegisterType((*PoolParams)(nil), "shentu.shield.v1alpha1.PoolParams") proto.RegisterType((*ClaimProposalParams)(nil), "shentu.shield.v1alpha1.ClaimProposalParams") + proto.RegisterType((*BlockRewardParams)(nil), "shentu.shield.v1alpha1.BlockRewardParams") } func init() { @@ -301,101 +343,108 @@ func init() { } var fileDescriptor_c089c09a119aaa04 = []byte{ - // 1490 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x58, 0xcf, 0x6f, 0x1b, 0xc5, - 0x17, 0xcf, 0xe6, 0x47, 0xbf, 0xcd, 0xd8, 0x49, 0xec, 0x71, 0x9a, 0xee, 0x37, 0x0d, 0x76, 0x34, - 0x6d, 0x21, 0x12, 0xaa, 0x4d, 0xda, 0x03, 0xd0, 0x0b, 0xc2, 0x49, 0x0b, 0x81, 0x22, 0xa2, 0x0d, - 0xa8, 0x08, 0x84, 0x96, 0xb1, 0x77, 0xe2, 0x8c, 0xb2, 0xbb, 0xb3, 0xda, 0x19, 0xa7, 0x8d, 0xe8, - 0x09, 0x09, 0x89, 0x63, 0x2f, 0x48, 0x70, 0xeb, 0x11, 0x21, 0xf1, 0x7f, 0x54, 0xe2, 0xd2, 0x0b, - 0x08, 0x71, 0x48, 0x51, 0x7b, 0xe1, 0x9c, 0xbf, 0x00, 0xcd, 0x8f, 0xf5, 0xce, 0x3a, 0x71, 0x5a, - 0x4b, 0x3d, 0x25, 0xf3, 0xe6, 0xbd, 0xcf, 0x67, 0xe6, 0xcd, 0xfb, 0xb5, 0x06, 0x57, 0xf8, 0x1e, - 0x89, 0x45, 0xbf, 0xc5, 0xf7, 0x28, 0x09, 0x83, 0xd6, 0xc1, 0x3a, 0x0e, 0x93, 0x3d, 0xbc, 0xde, - 0xea, 0x91, 0x98, 0x70, 0xca, 0x9b, 0x49, 0xca, 0x04, 0x83, 0x4b, 0x5a, 0xab, 0xa9, 0xb5, 0x9a, - 0x99, 0xd6, 0xf2, 0x62, 0x8f, 0xf5, 0x98, 0x52, 0x69, 0xc9, 0xff, 0xb4, 0xf6, 0x72, 0xbd, 0xcb, - 0x78, 0xc4, 0x78, 0xab, 0x83, 0x39, 0x69, 0x1d, 0xac, 0x77, 0x88, 0xc0, 0xeb, 0xad, 0x2e, 0xa3, - 0xb1, 0xd9, 0x6f, 0xf4, 0x18, 0xeb, 0x85, 0xa4, 0xa5, 0x56, 0x9d, 0xfe, 0x6e, 0x4b, 0xd0, 0x88, - 0x70, 0x81, 0xa3, 0x24, 0x03, 0x18, 0x56, 0x08, 0xfa, 0x29, 0x16, 0x94, 0x65, 0x00, 0x97, 0x47, - 0x1c, 0xda, 0x1c, 0x4f, 0x29, 0xa1, 0x3f, 0xaa, 0xa0, 0xfc, 0x81, 0xbe, 0xc5, 0x8e, 0xc0, 0x82, - 0xc0, 0x9b, 0xa0, 0xac, 0x15, 0x7c, 0x1c, 0x44, 0x34, 0x76, 0x9d, 0x55, 0x67, 0x6d, 0xb6, 0x7d, - 0xf1, 0xf8, 0xa8, 0x51, 0x3b, 0xc4, 0x51, 0x78, 0x13, 0xd9, 0xbb, 0xc8, 0x2b, 0xe9, 0xe5, 0xfb, - 0x72, 0x05, 0xdf, 0x05, 0xe5, 0x98, 0xdc, 0x17, 0x7e, 0xc2, 0x58, 0xe8, 0xd3, 0xc0, 0x9d, 0x5c, - 0x75, 0xd6, 0xa6, 0x6d, 0x5b, 0x7b, 0x17, 0x79, 0x40, 0x2e, 0xb7, 0x19, 0x0b, 0xb7, 0x02, 0x78, - 0x0b, 0x54, 0xf4, 0x66, 0x3f, 0xed, 0xee, 0x61, 0x4e, 0xa4, 0xf9, 0x94, 0x32, 0xbf, 0x74, 0x7c, - 0xd4, 0xb8, 0x68, 0x9b, 0xe7, 0x1a, 0xc8, 0x9b, 0x57, 0x10, 0x46, 0xb2, 0x15, 0x40, 0x1f, 0x94, - 0x14, 0x7c, 0x82, 0x53, 0x1c, 0x71, 0x77, 0x7a, 0xd5, 0x59, 0x2b, 0x5d, 0x47, 0xcd, 0xd3, 0x1f, - 0xa6, 0x29, 0xb9, 0xb7, 0x95, 0x66, 0x7b, 0xf9, 0xf1, 0x51, 0x63, 0xe2, 0xf8, 0xa8, 0x01, 0x35, - 0x93, 0x05, 0x82, 0x3c, 0x90, 0x0c, 0xf4, 0xe0, 0xf7, 0x0e, 0xb8, 0xd0, 0x0d, 0x31, 0x8d, 0xfc, - 0x24, 0x65, 0x09, 0xe3, 0x78, 0xc0, 0x35, 0xa3, 0xb8, 0xde, 0x1c, 0xc5, 0xb5, 0x21, 0x8d, 0xb6, - 0x8d, 0x8d, 0x21, 0xbd, 0x62, 0x48, 0x57, 0x34, 0xe9, 0xa9, 0xb8, 0xc8, 0xab, 0x75, 0x4f, 0x9a, - 0x42, 0x01, 0x2a, 0x82, 0x09, 0x1c, 0xfa, 0x5d, 0x16, 0x86, 0x58, 0x90, 0x14, 0x87, 0xee, 0x39, - 0xf5, 0x54, 0x5b, 0x12, 0xf4, 0xef, 0xa3, 0xc6, 0xeb, 0x3d, 0x2a, 0xf6, 0xfa, 0x9d, 0x66, 0x97, - 0x45, 0x2d, 0x13, 0x6a, 0xfa, 0xcf, 0x35, 0x1e, 0xec, 0xb7, 0xc4, 0x61, 0x42, 0x78, 0x73, 0x2b, - 0x16, 0xb9, 0x77, 0x87, 0xf1, 0x90, 0xb7, 0xa0, 0x44, 0x1b, 0x03, 0x09, 0xbc, 0x07, 0xaa, 0x5a, - 0xeb, 0x1e, 0x15, 0x7b, 0x41, 0x8a, 0xef, 0xd1, 0xb8, 0xe7, 0xfe, 0x4f, 0xd1, 0x7e, 0x34, 0x36, - 0xad, 0x6b, 0xd3, 0x5a, 0x80, 0xc8, 0xd3, 0x57, 0xbb, 0x9b, 0x8b, 0xe0, 0x1e, 0x28, 0x6b, 0x3d, - 0xed, 0x56, 0xf7, 0xbc, 0xe2, 0xbc, 0x35, 0x36, 0x67, 0xcd, 0xe6, 0xd4, 0x58, 0xc8, 0x2b, 0xa9, - 0xe5, 0x8e, 0x5a, 0xc1, 0x7d, 0x30, 0x67, 0x1c, 0x21, 0xbd, 0x4e, 0x02, 0x77, 0x56, 0x51, 0xdd, - 0x1e, 0x9b, 0x6a, 0xb1, 0xe0, 0x55, 0x0d, 0x86, 0x3c, 0x7d, 0x8d, 0x0d, 0xbd, 0x84, 0x04, 0x94, - 0x39, 0x49, 0x0f, 0x68, 0x97, 0xf8, 0xbb, 0x84, 0x70, 0x17, 0xa8, 0x18, 0xba, 0x3a, 0x2a, 0x86, - 0x3e, 0xa1, 0xf7, 0x49, 0xb0, 0x49, 0xba, 0x1b, 0x8c, 0xc6, 0xbc, 0x7d, 0xc9, 0x44, 0x4f, 0x96, - 0x97, 0x16, 0x90, 0xcc, 0x4b, 0xbd, 0xbc, 0x4d, 0x08, 0x87, 0xdf, 0x39, 0x60, 0x29, 0x25, 0x11, - 0xa6, 0x31, 0x8d, 0x7b, 0x7e, 0x81, 0xb1, 0x34, 0x0e, 0xe3, 0x55, 0xc3, 0xf8, 0x9a, 0x66, 0x3c, - 0x1d, 0x12, 0x79, 0x8b, 0x83, 0x8d, 0x1d, 0xeb, 0x10, 0x1f, 0x82, 0x19, 0x99, 0x47, 0xdc, 0x2d, - 0xaf, 0x4e, 0xad, 0x95, 0xae, 0xaf, 0x9c, 0x95, 0x94, 0xed, 0x45, 0xc3, 0x54, 0xce, 0xd3, 0x91, - 0x23, 0x4f, 0x03, 0xc0, 0x2f, 0xc0, 0x6c, 0x92, 0xb2, 0x03, 0x1a, 0x90, 0x94, 0xbb, 0x73, 0x0a, - 0x6d, 0x75, 0x24, 0x9a, 0x51, 0x6c, 0xbb, 0x06, 0xb1, 0x62, 0x10, 0x33, 0x00, 0xe4, 0xe5, 0x60, - 0x90, 0x80, 0xf9, 0x41, 0x79, 0x09, 0x29, 0x17, 0xdc, 0x9d, 0x57, 0xf0, 0x57, 0x46, 0xc2, 0x1b, - 0xed, 0x3b, 0x94, 0x8b, 0x13, 0x14, 0x66, 0x8f, 0x23, 0x6f, 0x2e, 0xb1, 0xf4, 0xd4, 0x05, 0xb2, - 0x78, 0xe7, 0xee, 0xc2, 0xd9, 0x17, 0xc8, 0xb2, 0x60, 0x18, 0x7d, 0x00, 0x80, 0xbc, 0x1c, 0x0c, - 0x52, 0x50, 0x09, 0x31, 0x17, 0x7e, 0x3f, 0x09, 0xb0, 0x20, 0xbe, 0x6c, 0x19, 0x6e, 0x45, 0x3d, - 0xf1, 0x72, 0x53, 0xb7, 0x8b, 0x66, 0xd6, 0x2e, 0x9a, 0x9f, 0x65, 0xfd, 0xa4, 0x7d, 0xd9, 0x40, - 0x9b, 0x42, 0x30, 0x8c, 0x80, 0x1e, 0x3e, 0x6d, 0x38, 0xde, 0xbc, 0x14, 0x7f, 0xae, 0xa4, 0xd2, - 0x12, 0x3e, 0x00, 0x35, 0xd3, 0x0a, 0xb8, 0xc0, 0xfb, 0x32, 0x0a, 0x52, 0x2c, 0x88, 0x5b, 0x55, - 0xe9, 0x72, 0x67, 0x8c, 0x74, 0xd9, 0x24, 0xdd, 0xe3, 0xa3, 0xc6, 0x72, 0xa1, 0xbb, 0xd8, 0x90, - 0xc8, 0xab, 0x6a, 0xe9, 0x8e, 0x16, 0x7a, 0xb2, 0x4d, 0x3d, 0x00, 0xb5, 0x5e, 0xc8, 0x3a, 0x32, - 0x8b, 0x8d, 0xaa, 0x8c, 0x0d, 0x17, 0x8e, 0xcd, 0xae, 0x93, 0xd5, 0xb0, 0x9f, 0x02, 0x89, 0xbc, - 0xaa, 0x96, 0x1a, 0x76, 0x19, 0x9e, 0x90, 0x83, 0xaa, 0xd4, 0x21, 0xfe, 0x2e, 0x4b, 0x4d, 0x19, - 0xe1, 0x6e, 0x4d, 0x3d, 0xe4, 0xc8, 0x54, 0xda, 0xb1, 0xef, 0xd0, 0x5e, 0x35, 0x2e, 0x37, 0x45, - 0xf0, 0x04, 0x1a, 0xf2, 0x16, 0x94, 0xec, 0x36, 0x4b, 0xb5, 0x21, 0x87, 0x07, 0xa0, 0xca, 0x52, - 0xda, 0xa3, 0x71, 0x7e, 0x42, 0xee, 0x2e, 0x2a, 0xd2, 0x37, 0x46, 0x91, 0x7e, 0x6a, 0x0c, 0x46, - 0xd0, 0x9e, 0xc0, 0x43, 0x5e, 0x85, 0x15, 0x4d, 0x38, 0xfc, 0xc5, 0x01, 0xf5, 0xac, 0x29, 0x6d, - 0x6d, 0xfa, 0x29, 0xa1, 0x51, 0xa7, 0x9f, 0x72, 0x12, 0x91, 0x58, 0xf8, 0x09, 0xa6, 0x29, 0x77, - 0x2f, 0xa8, 0x53, 0xdc, 0x38, 0x23, 0x09, 0x8d, 0xb5, 0x67, 0x1b, 0x6f, 0x63, 0x9a, 0xb6, 0xaf, - 0x99, 0x13, 0x5d, 0x1d, 0xe4, 0xe5, 0x19, 0x44, 0xc8, 0x5b, 0x49, 0x46, 0x63, 0xf1, 0x9b, 0xe7, - 0x7f, 0x78, 0xd4, 0x98, 0xf8, 0xf7, 0x51, 0x63, 0x02, 0xfd, 0xe6, 0x80, 0x85, 0xa1, 0xcb, 0xc3, - 0xb7, 0x41, 0xc9, 0x1e, 0x2f, 0x1c, 0x35, 0x5e, 0x2c, 0x59, 0x4d, 0xdf, 0x9e, 0x2c, 0x40, 0x92, - 0x4f, 0x15, 0x77, 0xc1, 0x39, 0x1c, 0xb1, 0x7e, 0x2c, 0xd4, 0x44, 0x33, 0xdb, 0x7e, 0x6f, 0xec, - 0xf8, 0x9a, 0xd3, 0x0c, 0x1a, 0x05, 0x79, 0x06, 0xce, 0x3a, 0xef, 0xef, 0x0e, 0xb8, 0x74, 0x86, - 0x9b, 0xd4, 0xd9, 0xb3, 0xc1, 0xe0, 0xd4, 0xb3, 0xe7, 0x9b, 0xf2, 0xec, 0x19, 0x52, 0x00, 0x29, - 0x98, 0x2b, 0x38, 0x52, 0x5d, 0xe1, 0x8c, 0x30, 0x2d, 0x50, 0xb7, 0x57, 0xcc, 0xeb, 0x2c, 0x66, - 0x15, 0xdf, 0xda, 0x44, 0x5e, 0x11, 0xd9, 0xba, 0xcd, 0x8f, 0x93, 0x60, 0xae, 0x00, 0x04, 0xbb, - 0x03, 0x17, 0x3a, 0x2a, 0x56, 0xfe, 0xdf, 0xd4, 0x9e, 0x6a, 0xca, 0xf1, 0xb7, 0x69, 0xc6, 0xdf, - 0xa6, 0x6c, 0x33, 0xed, 0xb7, 0x24, 0xe7, 0xaf, 0x4f, 0x1b, 0x6b, 0x2f, 0xe1, 0x5d, 0xd5, 0x97, - 0x32, 0x77, 0xc2, 0x77, 0x40, 0xa9, 0x43, 0x62, 0xb2, 0x4b, 0xbb, 0x14, 0xa7, 0x87, 0xe6, 0xb1, - 0x2c, 0x27, 0x59, 0x9b, 0xc8, 0xb3, 0x55, 0xe1, 0x57, 0xa0, 0x94, 0xe0, 0x43, 0xd6, 0x17, 0xba, - 0x64, 0x4e, 0xbd, 0xb0, 0x64, 0xd6, 0x87, 0xe6, 0xc5, 0xdc, 0x58, 0x57, 0x4b, 0xa0, 0x25, 0xd2, - 0xc0, 0xf2, 0xcb, 0x9f, 0xd3, 0x00, 0xe4, 0x43, 0x27, 0x0c, 0x41, 0x55, 0x42, 0x93, 0xae, 0x9c, - 0xda, 0xfd, 0x84, 0xa4, 0x94, 0xe9, 0xa7, 0x95, 0xfe, 0x19, 0xe6, 0xde, 0x34, 0xd3, 0xfd, 0x60, - 0x6a, 0x74, 0x07, 0x2f, 0x5f, 0x44, 0x40, 0x3f, 0xc9, 0x03, 0x54, 0x72, 0xf9, 0xb6, 0x12, 0x43, - 0x0e, 0x2a, 0xa6, 0xba, 0xca, 0x36, 0xad, 0xab, 0xf5, 0xe4, 0xd8, 0x23, 0xa3, 0xae, 0xd6, 0x17, - 0x0b, 0xd5, 0x7a, 0x80, 0x87, 0xbc, 0x79, 0x2d, 0x92, 0x1d, 0x5f, 0xd5, 0xe9, 0x5d, 0xb0, 0x90, - 0x75, 0xa7, 0xec, 0x82, 0x53, 0x2f, 0xba, 0x20, 0x32, 0x17, 0x5c, 0x2a, 0x76, 0xba, 0xc2, 0xf5, - 0xe6, 0x33, 0xa9, 0xb9, 0xdc, 0x01, 0xa8, 0xaa, 0x99, 0xdd, 0x9c, 0x28, 0xa4, 0x11, 0x15, 0x6a, - 0xfc, 0x1f, 0x6f, 0x32, 0xd5, 0xb7, 0x73, 0xad, 0x8f, 0x00, 0x1b, 0x10, 0x79, 0x0b, 0x52, 0xa6, - 0x0b, 0xf2, 0x1d, 0x29, 0x81, 0xdf, 0x82, 0x5a, 0x44, 0xe3, 0x4c, 0x2b, 0xab, 0x19, 0xee, 0xcc, - 0xab, 0x0f, 0xf2, 0x6a, 0x44, 0x63, 0xcd, 0x9c, 0x0d, 0x1d, 0x56, 0x60, 0xfd, 0x3c, 0x0d, 0x6a, - 0xa7, 0x7c, 0x61, 0xc0, 0xaf, 0x41, 0xd9, 0x7c, 0x55, 0xbc, 0x64, 0x70, 0x35, 0x8a, 0x43, 0xa5, - 0x6d, 0xac, 0x1d, 0x5f, 0xd2, 0x5f, 0x23, 0xda, 0xeb, 0xdf, 0x80, 0x39, 0x13, 0xf9, 0x06, 0x7f, - 0xf2, 0x45, 0xf8, 0xab, 0xc5, 0x82, 0x52, 0xb0, 0xd6, 0x04, 0x65, 0x2d, 0x33, 0x0c, 0x21, 0x28, - 0x49, 0xff, 0x06, 0x24, 0x61, 0x9c, 0x0a, 0x77, 0xea, 0xd5, 0xfb, 0x15, 0x44, 0x34, 0xde, 0xd4, - 0xf0, 0xf2, 0x33, 0xc3, 0x30, 0xe9, 0xf4, 0x98, 0x1e, 0xfb, 0x33, 0x43, 0x07, 0x90, 0xf1, 0x9e, - 0x8d, 0x85, 0xbc, 0x92, 0x59, 0xaa, 0xbc, 0xf0, 0xc1, 0x6c, 0x9e, 0x85, 0x33, 0x8a, 0xa6, 0x3d, - 0x36, 0x8d, 0x19, 0x05, 0xad, 0xf4, 0x3b, 0xbf, 0x6b, 0x12, 0x2f, 0x8f, 0x8d, 0xf6, 0xc7, 0x8f, - 0x9f, 0xd5, 0x9d, 0x27, 0xcf, 0xea, 0xce, 0x3f, 0xcf, 0xea, 0xce, 0xc3, 0xe7, 0xf5, 0x89, 0x27, - 0xcf, 0xeb, 0x13, 0x7f, 0x3d, 0xaf, 0x4f, 0x7c, 0xb9, 0x6e, 0x33, 0x91, 0x54, 0xd0, 0xfd, 0x5d, - 0xd6, 0x8f, 0x03, 0xf5, 0x52, 0x2d, 0xf3, 0xeb, 0xc1, 0xfd, 0xec, 0xf7, 0x03, 0x45, 0xdc, 0x39, - 0xa7, 0x9e, 0xf4, 0xc6, 0x7f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x7f, 0x66, 0x0e, 0xc9, 0x12, 0x11, - 0x00, 0x00, + // 1615 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x58, 0x4f, 0x6f, 0x1b, 0xc7, + 0x15, 0x17, 0xf5, 0xc7, 0xb5, 0x86, 0xa4, 0x44, 0x0e, 0x65, 0x79, 0x2b, 0xab, 0xa4, 0x30, 0xb6, + 0x5b, 0x15, 0x85, 0xc9, 0xca, 0x3e, 0xb4, 0xf5, 0xa5, 0xf0, 0x4a, 0x56, 0xad, 0x56, 0x45, 0x85, + 0x51, 0x0b, 0x17, 0x2d, 0x8a, 0xed, 0x90, 0x3b, 0xa2, 0x26, 0xda, 0xdd, 0xd9, 0xec, 0x2c, 0x25, + 0x0b, 0x71, 0x2e, 0x01, 0x02, 0xe4, 0xe8, 0x4b, 0x80, 0xe4, 0xe6, 0x63, 0x10, 0x20, 0xdf, 0xc3, + 0x40, 0x2e, 0x3e, 0x04, 0x41, 0x90, 0x83, 0x1c, 0xd8, 0x17, 0x9f, 0xfd, 0x09, 0x82, 0xf9, 0xb3, + 0xe4, 0x2c, 0x45, 0xca, 0x26, 0xe0, 0x93, 0x34, 0x6f, 0xdf, 0xfb, 0xfd, 0xde, 0xbc, 0x79, 0xef, + 0xcd, 0x1b, 0x82, 0x1b, 0xe2, 0x90, 0x46, 0x69, 0xaf, 0x25, 0x0e, 0x19, 0x0d, 0xfc, 0xd6, 0xf1, + 0x06, 0x09, 0xe2, 0x43, 0xb2, 0xd1, 0xea, 0xd2, 0x88, 0x0a, 0x26, 0x9a, 0x71, 0xc2, 0x53, 0x0e, + 0x97, 0xb5, 0x56, 0x53, 0x6b, 0x35, 0x33, 0xad, 0x95, 0xa5, 0x2e, 0xef, 0x72, 0xa5, 0xd2, 0x92, + 0xff, 0x69, 0xed, 0x95, 0x7a, 0x87, 0x8b, 0x90, 0x8b, 0x56, 0x9b, 0x08, 0xda, 0x3a, 0xde, 0x68, + 0xd3, 0x94, 0x6c, 0xb4, 0x3a, 0x9c, 0x45, 0xe6, 0x7b, 0xa3, 0xcb, 0x79, 0x37, 0xa0, 0x2d, 0xb5, + 0x6a, 0xf7, 0x0e, 0x5a, 0x29, 0x0b, 0xa9, 0x48, 0x49, 0x18, 0x67, 0x00, 0xc3, 0x0a, 0x7e, 0x2f, + 0x21, 0x29, 0xe3, 0x19, 0xc0, 0xf5, 0x31, 0x4e, 0x1b, 0xf7, 0x94, 0x12, 0xfa, 0x0e, 0x82, 0xd2, + 0x5f, 0xf4, 0x2e, 0xf6, 0x53, 0x92, 0x52, 0x78, 0x17, 0x94, 0xb4, 0x82, 0x47, 0xfc, 0x90, 0x45, + 0x4e, 0x61, 0xad, 0xb0, 0x3e, 0xef, 0x5e, 0x7d, 0x73, 0xd6, 0xa8, 0x9d, 0x92, 0x30, 0xb8, 0x8b, + 0xec, 0xaf, 0x08, 0x17, 0xf5, 0xf2, 0x9e, 0x5c, 0xc1, 0x3f, 0x81, 0x52, 0x44, 0x1f, 0xa5, 0x5e, + 0xcc, 0x79, 0xe0, 0x31, 0xdf, 0x99, 0x5e, 0x2b, 0xac, 0xcf, 0xda, 0xb6, 0xf6, 0x57, 0x84, 0x81, + 0x5c, 0xee, 0x71, 0x1e, 0xec, 0xf8, 0xf0, 0x3e, 0xa8, 0xe8, 0x8f, 0xbd, 0xa4, 0x73, 0x48, 0x04, + 0x95, 0xe6, 0x33, 0xca, 0xfc, 0xda, 0x9b, 0xb3, 0xc6, 0x55, 0xdb, 0x7c, 0xa0, 0x81, 0xf0, 0x82, + 0x82, 0x30, 0x92, 0x1d, 0x1f, 0x7a, 0xa0, 0xa8, 0xe0, 0x63, 0x92, 0x90, 0x50, 0x38, 0xb3, 0x6b, + 0x85, 0xf5, 0xe2, 0x6d, 0xd4, 0x1c, 0x7d, 0x30, 0x4d, 0xc9, 0xbd, 0xa7, 0x34, 0xdd, 0x95, 0x67, + 0x67, 0x8d, 0xa9, 0x37, 0x67, 0x0d, 0xa8, 0x99, 0x2c, 0x10, 0x84, 0x41, 0xdc, 0xd7, 0x83, 0x9f, + 0x16, 0xc0, 0x95, 0x4e, 0x40, 0x58, 0xe8, 0xc5, 0x09, 0x8f, 0xb9, 0x20, 0x7d, 0xae, 0x39, 0xc5, + 0xf5, 0xbb, 0x71, 0x5c, 0x9b, 0xd2, 0x68, 0xcf, 0xd8, 0x18, 0xd2, 0x1b, 0x86, 0x74, 0x55, 0x93, + 0x8e, 0xc4, 0x45, 0xb8, 0xd6, 0x39, 0x6f, 0x0a, 0x3f, 0x06, 0xb5, 0x76, 0xc0, 0x3b, 0x47, 0x5e, + 0x42, 0x4f, 0x48, 0xe2, 0x67, 0x4e, 0x5c, 0x52, 0x4e, 0xfc, 0x76, 0x9c, 0x13, 0xae, 0x34, 0xc1, + 0xca, 0xc2, 0xb8, 0x80, 0x8c, 0x0b, 0x2b, 0xda, 0x85, 0x11, 0x98, 0x08, 0x57, 0xdb, 0xc3, 0x66, + 0x30, 0x05, 0x95, 0x94, 0xa7, 0x24, 0xf0, 0x3a, 0x3c, 0x08, 0x48, 0x4a, 0x13, 0x12, 0x38, 0xbf, + 0x50, 0x99, 0xb2, 0x23, 0x01, 0x7f, 0x3c, 0x6b, 0xfc, 0xba, 0xcb, 0xd2, 0xc3, 0x5e, 0xbb, 0xd9, + 0xe1, 0x61, 0xcb, 0x64, 0xba, 0xfe, 0x73, 0x4b, 0xf8, 0x47, 0xad, 0xf4, 0x34, 0xa6, 0xa2, 0xb9, + 0x13, 0xa5, 0x83, 0xc3, 0x1d, 0xc6, 0x43, 0x78, 0x51, 0x89, 0x36, 0xfb, 0x12, 0x78, 0x02, 0xaa, + 0x5a, 0xeb, 0x84, 0xa5, 0x87, 0x7e, 0x42, 0x4e, 0x58, 0xd4, 0x75, 0x2e, 0x2b, 0xda, 0xbf, 0x4e, + 0x4c, 0xeb, 0xd8, 0xb4, 0x16, 0x20, 0xc2, 0x7a, 0x6b, 0x0f, 0x07, 0x22, 0x78, 0x08, 0x4a, 0x5a, + 0x4f, 0x07, 0xd4, 0x99, 0x57, 0x9c, 0xf7, 0x27, 0xe6, 0xac, 0xd9, 0x9c, 0x1a, 0x0b, 0xe1, 0xa2, + 0x5a, 0xee, 0xab, 0x15, 0x3c, 0x02, 0x65, 0x13, 0x08, 0x79, 0xe8, 0xd4, 0x77, 0x80, 0xa2, 0xda, + 0x9e, 0x98, 0x6a, 0x29, 0x17, 0x55, 0x0d, 0x86, 0xb0, 0xde, 0xc6, 0xa6, 0x5e, 0x42, 0x0a, 0x4a, + 0x82, 0x26, 0xc7, 0xac, 0x43, 0xbd, 0x03, 0x4a, 0x85, 0x53, 0x54, 0xd9, 0x73, 0x73, 0x5c, 0xf6, + 0xfc, 0x9d, 0x3d, 0xa2, 0xfe, 0x16, 0xed, 0x6c, 0x72, 0x16, 0x09, 0xf7, 0x9a, 0xc9, 0x9c, 0xac, + 0x2d, 0x58, 0x40, 0xb2, 0x2d, 0xe8, 0xe5, 0x36, 0xa5, 0x02, 0x7e, 0x52, 0x00, 0xcb, 0x09, 0x0d, + 0x09, 0x8b, 0x58, 0xd4, 0xf5, 0x72, 0x8c, 0xa5, 0x49, 0x18, 0x6f, 0x1a, 0xc6, 0x5f, 0x69, 0xc6, + 0xd1, 0x90, 0x08, 0x2f, 0xf5, 0x3f, 0xec, 0x5b, 0x4e, 0x3c, 0x00, 0x73, 0xb2, 0x8c, 0x85, 0x53, + 0x5e, 0x9b, 0x59, 0x2f, 0xde, 0x5e, 0xbd, 0xa8, 0x27, 0xb8, 0x4b, 0x86, 0xa9, 0x34, 0xe8, 0x06, + 0x02, 0x61, 0x0d, 0x00, 0xff, 0x0d, 0xe6, 0xe3, 0x84, 0x1f, 0x33, 0x9f, 0x26, 0xc2, 0x59, 0x50, + 0x68, 0x6b, 0x63, 0xd1, 0x8c, 0xa2, 0xeb, 0x18, 0xc4, 0x8a, 0x41, 0xcc, 0x00, 0x10, 0x1e, 0x80, + 0x41, 0x0a, 0x16, 0xfa, 0xdd, 0x2d, 0x60, 0x22, 0x15, 0xce, 0xa2, 0x82, 0xbf, 0x31, 0x16, 0xde, + 0x68, 0xef, 0x32, 0x91, 0x9e, 0xa3, 0x30, 0xdf, 0x04, 0xc2, 0xe5, 0xd8, 0xd2, 0x53, 0x1b, 0xc8, + 0xf2, 0x5d, 0x38, 0x95, 0x8b, 0x37, 0x90, 0x55, 0xc1, 0x30, 0x7a, 0x1f, 0x00, 0xe1, 0x01, 0x18, + 0x64, 0xa0, 0x12, 0x10, 0x91, 0x7a, 0xbd, 0xd8, 0x27, 0x29, 0xf5, 0xe4, 0x8d, 0xe5, 0x54, 0xd5, + 0x11, 0xaf, 0x34, 0xf5, 0x6d, 0xd5, 0xcc, 0x6e, 0xab, 0xe6, 0x3f, 0xb3, 0xeb, 0xcc, 0xbd, 0x6e, + 0xa0, 0x4d, 0x23, 0x18, 0x46, 0x40, 0x4f, 0x5e, 0x34, 0x0a, 0x78, 0x41, 0x8a, 0xff, 0xa5, 0xa4, + 0xd2, 0x12, 0x3e, 0x06, 0x35, 0x73, 0x13, 0x89, 0x94, 0x1c, 0xc9, 0x2c, 0x48, 0x48, 0x4a, 0x1d, + 0xa8, 0xca, 0x65, 0x77, 0x82, 0x72, 0xd9, 0xa2, 0x9d, 0x41, 0xff, 0x1b, 0x01, 0x89, 0x70, 0x55, + 0x4b, 0xf7, 0xb5, 0x10, 0xcb, 0x5b, 0xf2, 0x31, 0xa8, 0x75, 0x03, 0xde, 0x96, 0x55, 0x6c, 0x54, + 0x65, 0x6e, 0x38, 0xb5, 0x89, 0xd9, 0x75, 0xb1, 0x1a, 0xf6, 0x11, 0x90, 0x08, 0x57, 0xb5, 0xd4, + 0xb0, 0xcb, 0xf4, 0x84, 0x02, 0x54, 0xa5, 0x0e, 0xf5, 0x0e, 0x78, 0x62, 0xda, 0x88, 0x70, 0x96, + 0xd4, 0x41, 0x8e, 0x2d, 0xa5, 0x7d, 0x7b, 0x0f, 0xee, 0x9a, 0x09, 0xb9, 0x69, 0x82, 0xe7, 0xd0, + 0x10, 0x5e, 0x54, 0xb2, 0x6d, 0x9e, 0x68, 0x43, 0x01, 0x8f, 0x41, 0x95, 0x27, 0xac, 0xcb, 0xa2, + 0x81, 0x87, 0xc2, 0xb9, 0xa2, 0x48, 0x7f, 0x33, 0x8e, 0xf4, 0x1f, 0xc6, 0x60, 0x0c, 0xed, 0x39, + 0x3c, 0x84, 0x2b, 0x3c, 0x6f, 0x22, 0xe0, 0x57, 0x05, 0x50, 0xcf, 0xee, 0xc4, 0x9d, 0x2d, 0x2f, + 0xa1, 0x2c, 0x6c, 0xf7, 0x12, 0x41, 0x43, 0x1a, 0xa5, 0x5e, 0x4c, 0x58, 0x22, 0x9c, 0x65, 0xe5, + 0xc5, 0x9d, 0x0b, 0x8a, 0xd0, 0x58, 0x63, 0xdb, 0x78, 0x8f, 0xb0, 0xc4, 0xbd, 0x65, 0x3c, 0xba, + 0xd9, 0xaf, 0xcb, 0x0b, 0x88, 0x10, 0x5e, 0x8d, 0xc7, 0x63, 0x89, 0xbb, 0x97, 0x3f, 0x7b, 0xda, + 0x98, 0x7a, 0xfd, 0xb4, 0x31, 0x85, 0xbe, 0x29, 0x80, 0xc5, 0xa1, 0xcd, 0xc3, 0x3f, 0x80, 0xa2, + 0x3d, 0xdd, 0x14, 0xd4, 0x74, 0xb3, 0x6c, 0xcd, 0x1c, 0xf6, 0x60, 0x03, 0xe2, 0xc1, 0x50, 0xf3, + 0x10, 0x5c, 0x22, 0x21, 0xef, 0x45, 0xa9, 0x1a, 0xa8, 0xe6, 0xdd, 0x3f, 0x4f, 0x9c, 0x5f, 0x65, + 0xcd, 0xa0, 0x51, 0x10, 0x36, 0x70, 0x96, 0xbf, 0xdf, 0x16, 0xc0, 0xb5, 0x0b, 0xc2, 0xa4, 0x7c, + 0xcf, 0xe6, 0x92, 0x91, 0xbe, 0x0f, 0x3e, 0x4a, 0xdf, 0x33, 0x24, 0x1f, 0x32, 0x50, 0xce, 0x05, + 0x52, 0x6d, 0xe1, 0x82, 0x34, 0xcd, 0x51, 0xbb, 0xab, 0xe6, 0x74, 0x96, 0xb2, 0x8e, 0x6f, 0x7d, + 0x44, 0x38, 0x8f, 0x6c, 0xed, 0xe6, 0xf3, 0x69, 0x50, 0xce, 0x01, 0xc1, 0x4e, 0x3f, 0x84, 0x05, + 0x95, 0x2b, 0xbf, 0x6c, 0xea, 0x48, 0x35, 0xe5, 0xf4, 0xdd, 0x34, 0xd3, 0x77, 0x53, 0x5e, 0x33, + 0xee, 0xef, 0x25, 0xe7, 0xd7, 0x2f, 0x1a, 0xeb, 0xef, 0x10, 0x5d, 0x75, 0x2f, 0x65, 0xe1, 0x84, + 0x7f, 0x04, 0xc5, 0x36, 0x8d, 0xe8, 0x01, 0xeb, 0x30, 0x92, 0x9c, 0x9a, 0xc3, 0xb2, 0x82, 0x64, + 0x7d, 0x44, 0xd8, 0x56, 0x85, 0xff, 0x05, 0xc5, 0x98, 0x9c, 0xf2, 0x5e, 0xaa, 0x5b, 0xe6, 0xcc, + 0x5b, 0x5b, 0x66, 0x7d, 0x68, 0x5c, 0x1d, 0x18, 0xeb, 0x6e, 0x09, 0xb4, 0x44, 0x1a, 0x58, 0x71, + 0xf9, 0x7e, 0x16, 0x80, 0xc1, 0xcc, 0x0b, 0x03, 0x50, 0x95, 0xd0, 0xb4, 0x23, 0x1f, 0x0d, 0x5e, + 0x4c, 0x13, 0xc6, 0xf5, 0xd1, 0xca, 0xf8, 0x0c, 0x73, 0x6f, 0x99, 0xc7, 0x45, 0x7f, 0x68, 0x75, + 0xfa, 0x27, 0x9f, 0x47, 0x40, 0x5f, 0x48, 0x07, 0x2a, 0x03, 0xf9, 0x9e, 0x12, 0x43, 0x01, 0x2a, + 0xa6, 0xbb, 0xca, 0x6b, 0x5a, 0x77, 0xeb, 0xe9, 0x89, 0x47, 0x46, 0xdd, 0xad, 0xaf, 0xe6, 0xba, + 0x75, 0x1f, 0x0f, 0xe1, 0x05, 0x2d, 0x92, 0x37, 0xbe, 0xea, 0xd3, 0x07, 0x60, 0x31, 0xbb, 0x9d, + 0xb2, 0x0d, 0xce, 0xbc, 0x6d, 0x83, 0xd9, 0x48, 0xbc, 0x9c, 0xbf, 0xe9, 0x72, 0xdb, 0x5b, 0xc8, + 0xa4, 0x66, 0x73, 0xc7, 0xa0, 0xaa, 0x9e, 0x0c, 0xc6, 0xa3, 0x80, 0x85, 0x2c, 0x55, 0xaf, 0x8f, + 0xc9, 0x26, 0x53, 0xbd, 0x3b, 0xc7, 0x7a, 0x83, 0xd8, 0x80, 0x08, 0x2f, 0x4a, 0x99, 0x6e, 0xc8, + 0xbb, 0x52, 0x02, 0x3f, 0x02, 0xb5, 0x90, 0x45, 0x99, 0x56, 0xd6, 0x33, 0x9c, 0xb9, 0xf7, 0x9f, + 0xe4, 0xd5, 0x90, 0x45, 0x9a, 0x39, 0x1b, 0x3a, 0xac, 0xc4, 0xfa, 0x72, 0x16, 0xd4, 0x46, 0x3c, + 0x70, 0xe0, 0xff, 0x40, 0xc9, 0x3c, 0x6a, 0xde, 0x31, 0xb9, 0x1a, 0xf9, 0xa1, 0xd2, 0x36, 0xd6, + 0x81, 0x2f, 0xea, 0xc7, 0x90, 0x8e, 0xfa, 0xff, 0x41, 0xd9, 0x64, 0xbe, 0xc1, 0x9f, 0x7e, 0x1b, + 0xfe, 0x5a, 0xbe, 0xa1, 0xe4, 0xac, 0x35, 0x41, 0x49, 0xcb, 0x0c, 0x43, 0x00, 0x8a, 0x32, 0xbe, + 0x3e, 0x8d, 0xb9, 0x60, 0xa9, 0x33, 0xf3, 0xfe, 0xe3, 0x0a, 0x42, 0x16, 0x6d, 0x69, 0x78, 0xf9, + 0xcc, 0x30, 0x4c, 0xba, 0x3c, 0x66, 0x27, 0x7e, 0x66, 0xe8, 0x04, 0x32, 0xd1, 0xb3, 0xb1, 0x10, + 0x2e, 0x9a, 0xa5, 0xaa, 0x0b, 0x0f, 0xcc, 0x0f, 0xaa, 0x70, 0x4e, 0xd1, 0xb8, 0x13, 0xd3, 0x98, + 0x51, 0xd0, 0x2a, 0xbf, 0xcb, 0x07, 0xa6, 0xf0, 0xac, 0xdc, 0x78, 0x3d, 0x0d, 0xaa, 0xe7, 0xde, + 0x9d, 0xf0, 0x03, 0x50, 0x0e, 0xb9, 0x4f, 0xcd, 0x2b, 0xd7, 0x23, 0xe6, 0x77, 0x86, 0xed, 0x89, + 0x9d, 0x30, 0x27, 0x99, 0x03, 0x43, 0xb8, 0xa8, 0xd6, 0x8a, 0xeb, 0xde, 0x30, 0x57, 0xdb, 0xb4, + 0x9d, 0xf7, 0xc2, 0xd5, 0xce, 0x71, 0xb9, 0xf0, 0x43, 0xb0, 0x98, 0x92, 0xa4, 0x4b, 0x53, 0x2f, + 0xa0, 0xc7, 0x34, 0x21, 0x5d, 0xdd, 0xcd, 0xe7, 0xdd, 0x07, 0x13, 0xb3, 0x99, 0xfe, 0x33, 0x04, + 0x87, 0xf0, 0x82, 0x96, 0xec, 0x1a, 0xc1, 0x20, 0xd4, 0xee, 0xdf, 0x9e, 0xbd, 0xac, 0x17, 0x9e, + 0xbf, 0xac, 0x17, 0x7e, 0x7a, 0x59, 0x2f, 0x3c, 0x79, 0x55, 0x9f, 0x7a, 0xfe, 0xaa, 0x3e, 0xf5, + 0xc3, 0xab, 0xfa, 0xd4, 0x7f, 0x36, 0x6c, 0x56, 0x9a, 0xa4, 0xec, 0xe8, 0x80, 0xf7, 0x22, 0x5f, + 0x15, 0x45, 0xcb, 0xfc, 0x4e, 0xf4, 0x28, 0xfb, 0xa5, 0x48, 0x39, 0xd1, 0xbe, 0xa4, 0xaa, 0xe7, + 0xce, 0xcf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x01, 0x04, 0xd1, 0xd5, 0xfc, 0x12, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { @@ -431,7 +480,7 @@ func (m *GenesisState) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x1 i-- - dAtA[i] = 0xaa + dAtA[i] = 0xb2 } } if len(m.OriginalStakings) > 0 { @@ -447,7 +496,7 @@ func (m *GenesisState) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x1 i-- - dAtA[i] = 0xa2 + dAtA[i] = 0xaa } } if len(m.StakeForShields) > 0 { @@ -463,7 +512,7 @@ func (m *GenesisState) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x1 i-- - dAtA[i] = 0x9a + dAtA[i] = 0xa2 } } { @@ -477,7 +526,7 @@ func (m *GenesisState) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x1 i-- - dAtA[i] = 0x92 + dAtA[i] = 0x9a { size := m.ShieldStakingRate.Size() i -= size @@ -489,7 +538,7 @@ func (m *GenesisState) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x1 i-- - dAtA[i] = 0x8a + dAtA[i] = 0x92 n1, err1 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.LastUpdateTime, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.LastUpdateTime):]) if err1 != nil { return 0, err1 @@ -499,7 +548,7 @@ func (m *GenesisState) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x1 i-- - dAtA[i] = 0x82 + dAtA[i] = 0x8a if len(m.Withdraws) > 0 { for iNdEx := len(m.Withdraws) - 1; iNdEx >= 0; iNdEx-- { { @@ -511,7 +560,9 @@ func (m *GenesisState) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintGenesis(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x7a + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x82 } } if len(m.PurchaseLists) > 0 { @@ -525,7 +576,7 @@ func (m *GenesisState) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintGenesis(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x72 + dAtA[i] = 0x7a } } if len(m.Providers) > 0 { @@ -539,7 +590,7 @@ func (m *GenesisState) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintGenesis(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x6a + dAtA[i] = 0x72 } } if len(m.Pools) > 0 { @@ -553,7 +604,7 @@ func (m *GenesisState) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintGenesis(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x62 + dAtA[i] = 0x6a } } { @@ -565,7 +616,7 @@ func (m *GenesisState) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintGenesis(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x5a + dAtA[i] = 0x62 { size, err := m.ServiceFees.MarshalToSizedBuffer(dAtA[:i]) if err != nil { @@ -575,7 +626,7 @@ func (m *GenesisState) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintGenesis(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x52 + dAtA[i] = 0x5a { size := m.TotalClaimed.Size() i -= size @@ -585,7 +636,7 @@ func (m *GenesisState) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintGenesis(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x4a + dAtA[i] = 0x52 { size := m.TotalShield.Size() i -= size @@ -595,7 +646,7 @@ func (m *GenesisState) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintGenesis(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x42 + dAtA[i] = 0x4a { size := m.TotalWithdrawing.Size() i -= size @@ -605,7 +656,7 @@ func (m *GenesisState) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintGenesis(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x3a + dAtA[i] = 0x42 { size := m.TotalCollateral.Size() i -= size @@ -615,6 +666,16 @@ func (m *GenesisState) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintGenesis(dAtA, i, uint64(size)) } i-- + dAtA[i] = 0x3a + { + size, err := m.BlockRewardParams.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintGenesis(dAtA, i, uint64(size)) + } + i-- dAtA[i] = 0x32 { size, err := m.ClaimProposalParams.MarshalToSizedBuffer(dAtA[:i]) @@ -752,12 +813,12 @@ func (m *Reimbursement) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - n7, err7 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.PayoutTime, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.PayoutTime):]) - if err7 != nil { - return 0, err7 + n8, err8 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.PayoutTime, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.PayoutTime):]) + if err8 != nil { + return 0, err8 } - i -= n7 - i = encodeVarintGenesis(dAtA, i, uint64(n7)) + i -= n8 + i = encodeVarintGenesis(dAtA, i, uint64(n8)) i-- dAtA[i] = 0x1a if len(m.Beneficiary) > 0 { @@ -828,12 +889,12 @@ func (m *PoolParams) MarshalToSizedBuffer(dAtA []byte) (int, error) { } i-- dAtA[i] = 0x22 - n8, err8 := github_com_gogo_protobuf_types.StdDurationMarshalTo(m.WithdrawPeriod, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdDuration(m.WithdrawPeriod):]) - if err8 != nil { - return 0, err8 + n9, err9 := github_com_gogo_protobuf_types.StdDurationMarshalTo(m.WithdrawPeriod, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdDuration(m.WithdrawPeriod):]) + if err9 != nil { + return 0, err9 } - i -= n8 - i = encodeVarintGenesis(dAtA, i, uint64(n8)) + i -= n9 + i = encodeVarintGenesis(dAtA, i, uint64(n9)) i-- dAtA[i] = 0x1a { @@ -846,12 +907,12 @@ func (m *PoolParams) MarshalToSizedBuffer(dAtA []byte) (int, error) { } i-- dAtA[i] = 0x12 - n9, err9 := github_com_gogo_protobuf_types.StdDurationMarshalTo(m.ProtectionPeriod, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdDuration(m.ProtectionPeriod):]) - if err9 != nil { - return 0, err9 + n10, err10 := github_com_gogo_protobuf_types.StdDurationMarshalTo(m.ProtectionPeriod, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdDuration(m.ProtectionPeriod):]) + if err10 != nil { + return 0, err10 } - i -= n9 - i = encodeVarintGenesis(dAtA, i, uint64(n9)) + i -= n10 + i = encodeVarintGenesis(dAtA, i, uint64(n10)) i-- dAtA[i] = 0xa return len(dAtA) - i, nil @@ -911,21 +972,74 @@ func (m *ClaimProposalParams) MarshalToSizedBuffer(dAtA []byte) (int, error) { dAtA[i] = 0x1a } } - n10, err10 := github_com_gogo_protobuf_types.StdDurationMarshalTo(m.PayoutPeriod, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdDuration(m.PayoutPeriod):]) - if err10 != nil { - return 0, err10 - } - i -= n10 - i = encodeVarintGenesis(dAtA, i, uint64(n10)) - i-- - dAtA[i] = 0x12 - n11, err11 := github_com_gogo_protobuf_types.StdDurationMarshalTo(m.ClaimPeriod, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdDuration(m.ClaimPeriod):]) + n11, err11 := github_com_gogo_protobuf_types.StdDurationMarshalTo(m.PayoutPeriod, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdDuration(m.PayoutPeriod):]) if err11 != nil { return 0, err11 } i -= n11 i = encodeVarintGenesis(dAtA, i, uint64(n11)) i-- + dAtA[i] = 0x12 + n12, err12 := github_com_gogo_protobuf_types.StdDurationMarshalTo(m.ClaimPeriod, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdDuration(m.ClaimPeriod):]) + if err12 != nil { + return 0, err12 + } + i -= n12 + i = encodeVarintGenesis(dAtA, i, uint64(n12)) + i-- + dAtA[i] = 0xa + return len(dAtA) - i, nil +} + +func (m *BlockRewardParams) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *BlockRewardParams) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *BlockRewardParams) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + { + size := m.TargetLeverage.Size() + i -= size + if _, err := m.TargetLeverage.MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + i = encodeVarintGenesis(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x1a + { + size := m.ModelParamB.Size() + i -= size + if _, err := m.ModelParamB.MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + i = encodeVarintGenesis(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 + { + size := m.ModelParamA.Size() + i -= size + if _, err := m.ModelParamA.MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + i = encodeVarintGenesis(dAtA, i, uint64(size)) + } + i-- dAtA[i] = 0xa return len(dAtA) - i, nil } @@ -961,6 +1075,8 @@ func (m *GenesisState) Size() (n int) { n += 1 + l + sovGenesis(uint64(l)) l = m.ClaimProposalParams.Size() n += 1 + l + sovGenesis(uint64(l)) + l = m.BlockRewardParams.Size() + n += 1 + l + sovGenesis(uint64(l)) l = m.TotalCollateral.Size() n += 1 + l + sovGenesis(uint64(l)) l = m.TotalWithdrawing.Size() @@ -994,7 +1110,7 @@ func (m *GenesisState) Size() (n int) { if len(m.Withdraws) > 0 { for _, e := range m.Withdraws { l = e.Size() - n += 1 + l + sovGenesis(uint64(l)) + n += 2 + l + sovGenesis(uint64(l)) } } l = github_com_gogo_protobuf_types.SizeOfStdTime(m.LastUpdateTime) @@ -1119,6 +1235,21 @@ func (m *ClaimProposalParams) Size() (n int) { return n } +func (m *BlockRewardParams) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = m.ModelParamA.Size() + n += 1 + l + sovGenesis(uint64(l)) + l = m.ModelParamB.Size() + n += 1 + l + sovGenesis(uint64(l)) + l = m.TargetLeverage.Size() + n += 1 + l + sovGenesis(uint64(l)) + return n +} + func sovGenesis(x uint64) (n int) { return (math_bits.Len64(x|1) + 6) / 7 } @@ -1291,6 +1422,39 @@ func (m *GenesisState) Unmarshal(dAtA []byte) error { } iNdEx = postIndex case 6: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field BlockRewardParams", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGenesis + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthGenesis + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthGenesis + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if err := m.BlockRewardParams.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 7: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field TotalCollateral", wireType) } @@ -1324,7 +1488,7 @@ func (m *GenesisState) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 7: + case 8: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field TotalWithdrawing", wireType) } @@ -1358,7 +1522,7 @@ func (m *GenesisState) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 8: + case 9: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field TotalShield", wireType) } @@ -1392,7 +1556,7 @@ func (m *GenesisState) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 9: + case 10: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field TotalClaimed", wireType) } @@ -1426,7 +1590,7 @@ func (m *GenesisState) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 10: + case 11: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field ServiceFees", wireType) } @@ -1459,7 +1623,7 @@ func (m *GenesisState) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 11: + case 12: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field RemainingServiceFees", wireType) } @@ -1492,7 +1656,7 @@ func (m *GenesisState) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 12: + case 13: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Pools", wireType) } @@ -1526,7 +1690,7 @@ func (m *GenesisState) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 13: + case 14: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Providers", wireType) } @@ -1560,7 +1724,7 @@ func (m *GenesisState) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 14: + case 15: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field PurchaseLists", wireType) } @@ -1594,7 +1758,7 @@ func (m *GenesisState) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 15: + case 16: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Withdraws", wireType) } @@ -1628,7 +1792,7 @@ func (m *GenesisState) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 16: + case 17: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field LastUpdateTime", wireType) } @@ -1661,7 +1825,7 @@ func (m *GenesisState) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 17: + case 18: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field ShieldStakingRate", wireType) } @@ -1695,7 +1859,7 @@ func (m *GenesisState) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 18: + case 19: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field GlobalStakingPool", wireType) } @@ -1729,7 +1893,7 @@ func (m *GenesisState) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 19: + case 20: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field StakeForShields", wireType) } @@ -1763,7 +1927,7 @@ func (m *GenesisState) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 20: + case 21: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field OriginalStakings", wireType) } @@ -1797,7 +1961,7 @@ func (m *GenesisState) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 21: + case 22: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field ProposalIDReimbursementPairs", wireType) } @@ -2660,6 +2824,161 @@ func (m *ClaimProposalParams) Unmarshal(dAtA []byte) error { } return nil } +func (m *BlockRewardParams) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGenesis + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: BlockRewardParams: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: BlockRewardParams: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ModelParamA", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGenesis + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthGenesis + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthGenesis + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if err := m.ModelParamA.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ModelParamB", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGenesis + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthGenesis + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthGenesis + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if err := m.ModelParamB.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field TargetLeverage", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGenesis + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthGenesis + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthGenesis + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if err := m.TargetLeverage.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipGenesis(dAtA[iNdEx:]) + if err != nil { + return err + } + if skippy < 0 { + return ErrInvalidLengthGenesis + } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthGenesis + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} func skipGenesis(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 diff --git a/x/shield/types/params.go b/x/shield/types/params.go index ef518da1e..4298acc04 100644 --- a/x/shield/types/params.go +++ b/x/shield/types/params.go @@ -35,6 +35,7 @@ var ( ParamStoreKeyPoolParams = []byte("shieldpoolparams") ParamStoreKeyClaimProposalParams = []byte("claimproposalparams") ParamStoreKeyStakingShieldRate = []byte("stakingshieldrateparams") + ParamStoreKeyDistribution = []byte("distributionparams") ) // ParamKeyTable is the key declaration for parameters. From f6e82c6996c15f5c6315081947fae66d87bf0bbf Mon Sep 17 00:00:00 2001 From: yoongbok lee Date: Wed, 25 May 2022 15:22:56 +0900 Subject: [PATCH 04/14] add proto files --- proto/shentu/shield/v1alpha1/genesis.proto | 45 +- x/shield/keeper/params.go | 8 +- x/shield/types/genesis.pb.go | 649 +++++++++++++++------ x/shield/types/params.go | 1 + 4 files changed, 517 insertions(+), 186 deletions(-) diff --git a/proto/shentu/shield/v1alpha1/genesis.proto b/proto/shentu/shield/v1alpha1/genesis.proto index c5b0fe3d2..6007b6e5f 100644 --- a/proto/shentu/shield/v1alpha1/genesis.proto +++ b/proto/shentu/shield/v1alpha1/genesis.proto @@ -18,23 +18,24 @@ message GenesisState { uint64 next_pool_id = 2 [ (gogoproto.moretags) = "yaml:\"next_pool_id\"" ]; uint64 next_purchase_id = 3 [ (gogoproto.moretags) = "yaml:\"next_purchase_id\"" ]; PoolParams pool_params = 4 [ (gogoproto.moretags) = "yaml:\"pool_params\"", (gogoproto.nullable) = false ]; - ClaimProposalParams claim_proposal_params = 5 [ (gogoproto.moretags) = "yaml:\"claim_proposal_params\"", (gogoproto.nullable) = false ]; - string total_collateral = 6 [ (gogoproto.moretags) = "yaml:\"total_collateral\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.nullable) = false ]; - string total_withdrawing = 7 [ (gogoproto.moretags) = "yaml:\"total_withdrawing\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.nullable) = false ]; - string total_shield = 8 [ (gogoproto.moretags) = "yaml:\"total_shield\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.nullable) = false ]; - string total_claimed = 9 [ (gogoproto.moretags) = "yaml:\"total_claimed\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.nullable) = false ]; - MixedDecCoins service_fees = 10 [ (gogoproto.moretags) = "yaml:\"service_fees\"", (gogoproto.nullable) = false ]; - MixedDecCoins remaining_service_fees = 11 [ (gogoproto.moretags) = "yaml:\"remaining_service_fees\"", (gogoproto.nullable) = false ]; - repeated Pool pools = 12 [ (gogoproto.moretags) = "yaml:\"pools\"", (gogoproto.nullable) = false ]; - repeated Provider providers = 13 [ (gogoproto.moretags) = "yaml:\"providers\"", (gogoproto.nullable) = false ]; - repeated PurchaseList purchase_lists = 14 [ (gogoproto.moretags) = "yaml:\"purchases\"", (gogoproto.nullable) = false ]; - repeated Withdraw withdraws = 15 [ (gogoproto.moretags) = "yaml:\"withdraws\"", (gogoproto.nullable) = false ]; - google.protobuf.Timestamp last_update_time = 16 [(gogoproto.stdtime) = true, (gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"last_update_time\""]; - string shield_staking_rate = 17 [ (gogoproto.moretags) = "yaml:\"shield_staking_rate\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false ]; - string global_staking_pool = 18 [ (gogoproto.moretags) = "yaml:\"global_staking_pool\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.nullable) = false ]; - repeated ShieldStaking stake_for_shields = 19 [ (gogoproto.moretags) = "yaml:\"stake_for_shields\"", (gogoproto.nullable) = false ]; - repeated OriginalStaking original_stakings = 20 [ (gogoproto.moretags) = "yaml:\"original_stakings\"", (gogoproto.nullable) = false ]; - repeated ProposalIDReimbursementPair proposalID_reimbursement_pairs = 21 [ (gogoproto.moretags) = "yaml:\"proposalID_reimbursement_pairs\"", (gogoproto.nullable) = false ]; + ClaimProposalParams claim_proposal_params = 5 [ (gogoproto.moretags) = "yaml:\"claim_proposal_params\"", (gogoproto.nullable) = false ]; + DistributionParams distribution_params = 6 [ (gogoproto.moretags) = "yaml:\"distribution_params\"", (gogoproto.nullable) = false ]; + string total_collateral = 7 [ (gogoproto.moretags) = "yaml:\"total_collateral\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.nullable) = false ]; + string total_withdrawing = 8 [ (gogoproto.moretags) = "yaml:\"total_withdrawing\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.nullable) = false ]; + string total_shield = 9 [ (gogoproto.moretags) = "yaml:\"total_shield\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.nullable) = false ]; + string total_claimed = 10 [ (gogoproto.moretags) = "yaml:\"total_claimed\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.nullable) = false ]; + MixedDecCoins service_fees = 11 [ (gogoproto.moretags) = "yaml:\"service_fees\"", (gogoproto.nullable) = false ]; + MixedDecCoins remaining_service_fees = 12 [ (gogoproto.moretags) = "yaml:\"remaining_service_fees\"", (gogoproto.nullable) = false ]; + repeated Pool pools = 13 [ (gogoproto.moretags) = "yaml:\"pools\"", (gogoproto.nullable) = false ]; + repeated Provider providers = 14 [ (gogoproto.moretags) = "yaml:\"providers\"", (gogoproto.nullable) = false ]; + repeated PurchaseList purchase_lists = 15 [ (gogoproto.moretags) = "yaml:\"purchases\"", (gogoproto.nullable) = false ]; + repeated Withdraw withdraws = 16 [ (gogoproto.moretags) = "yaml:\"withdraws\"", (gogoproto.nullable) = false ]; + google.protobuf.Timestamp last_update_time = 17 [(gogoproto.stdtime) = true, (gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"last_update_time\""]; + string shield_staking_rate = 18 [ (gogoproto.moretags) = "yaml:\"shield_staking_rate\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false ]; + string global_staking_pool = 19 [ (gogoproto.moretags) = "yaml:\"global_staking_pool\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.nullable) = false ]; + repeated ShieldStaking stake_for_shields = 20 [ (gogoproto.moretags) = "yaml:\"stake_for_shields\"", (gogoproto.nullable) = false ]; + repeated OriginalStaking original_stakings = 21 [ (gogoproto.moretags) = "yaml:\"original_stakings\"", (gogoproto.nullable) = false ]; + repeated ProposalIDReimbursementPair proposalID_reimbursement_pairs = 22 [ (gogoproto.moretags) = "yaml:\"proposalID_reimbursement_pairs\"", (gogoproto.nullable) = false ]; } message OriginalStaking { @@ -85,3 +86,13 @@ message ClaimProposalParams { string deposit_rate = 4 [ (gogoproto.moretags) = "yaml:\"deposit_rate\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false ]; string fees_rate = 5 [ (gogoproto.moretags) = "yaml:\"fees_rate\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false ]; } + +// BlockRewardParams defines the parameters for shield block reward. +message DistributionParams { + option (gogoproto.equal) = false; + option (gogoproto.goproto_getters) = false; + + string model_param_a = 1 [ (gogoproto.moretags) = "yaml:\"model_param_a\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false ]; + string model_param_b = 2 [ (gogoproto.moretags) = "yaml:\"model_param_b\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false ]; + string target_leverage = 3 [ (gogoproto.moretags) = "yaml:\"target_leverage\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false ]; +} diff --git a/x/shield/keeper/params.go b/x/shield/keeper/params.go index 47bf4e427..ea80229c6 100644 --- a/x/shield/keeper/params.go +++ b/x/shield/keeper/params.go @@ -42,12 +42,12 @@ func (k Keeper) SetShieldStakingRate(ctx sdk.Context, rate sdk.Dec) { } // GetDistributionParams returns distribution parameters. -func (k Keeper) GetDistributionParams(ctx sdk.Context) (distrParams types.) { - k.paramSpace.Get(ctx, types.ParamStoreKeyStakingShieldRate, &rate) +func (k Keeper) GetDistributionParams(ctx sdk.Context) (distrParams types.DistributionParams) { + k.paramSpace.Get(ctx, types.ParamStoreKeyDistribution, &distrParams) return } // SetDistributionParams sets distribution parameters. -func (k Keeper) SetDistributionParams(ctx sdk.Context, rate sdk.Dec) { - k.paramSpace.Set(ctx, types.ParamStoreKeyStakingShieldRate, &rate) +func (k Keeper) SetDistributionParams(ctx sdk.Context, distrParams types.D) { + k.paramSpace.Set(ctx, types.ParamStoreKeyDistribution, &rate) } diff --git a/x/shield/types/genesis.pb.go b/x/shield/types/genesis.pb.go index c26c105b6..13a83cdde 100644 --- a/x/shield/types/genesis.pb.go +++ b/x/shield/types/genesis.pb.go @@ -37,22 +37,23 @@ type GenesisState struct { NextPurchaseId uint64 `protobuf:"varint,3,opt,name=next_purchase_id,json=nextPurchaseId,proto3" json:"next_purchase_id,omitempty" yaml:"next_purchase_id"` PoolParams PoolParams `protobuf:"bytes,4,opt,name=pool_params,json=poolParams,proto3" json:"pool_params" yaml:"pool_params"` ClaimProposalParams ClaimProposalParams `protobuf:"bytes,5,opt,name=claim_proposal_params,json=claimProposalParams,proto3" json:"claim_proposal_params" yaml:"claim_proposal_params"` - TotalCollateral github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,6,opt,name=total_collateral,json=totalCollateral,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"total_collateral" yaml:"total_collateral"` - TotalWithdrawing github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,7,opt,name=total_withdrawing,json=totalWithdrawing,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"total_withdrawing" yaml:"total_withdrawing"` - TotalShield github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,8,opt,name=total_shield,json=totalShield,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"total_shield" yaml:"total_shield"` - TotalClaimed github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,9,opt,name=total_claimed,json=totalClaimed,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"total_claimed" yaml:"total_claimed"` - ServiceFees MixedDecCoins `protobuf:"bytes,10,opt,name=service_fees,json=serviceFees,proto3" json:"service_fees" yaml:"service_fees"` - RemainingServiceFees MixedDecCoins `protobuf:"bytes,11,opt,name=remaining_service_fees,json=remainingServiceFees,proto3" json:"remaining_service_fees" yaml:"remaining_service_fees"` - Pools []Pool `protobuf:"bytes,12,rep,name=pools,proto3" json:"pools" yaml:"pools"` - Providers []Provider `protobuf:"bytes,13,rep,name=providers,proto3" json:"providers" yaml:"providers"` - PurchaseLists []PurchaseList `protobuf:"bytes,14,rep,name=purchase_lists,json=purchaseLists,proto3" json:"purchase_lists" yaml:"purchases"` - Withdraws []Withdraw `protobuf:"bytes,15,rep,name=withdraws,proto3" json:"withdraws" yaml:"withdraws"` - LastUpdateTime time.Time `protobuf:"bytes,16,opt,name=last_update_time,json=lastUpdateTime,proto3,stdtime" json:"last_update_time" yaml:"last_update_time"` - ShieldStakingRate github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,17,opt,name=shield_staking_rate,json=shieldStakingRate,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"shield_staking_rate" yaml:"shield_staking_rate"` - GlobalStakingPool github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,18,opt,name=global_staking_pool,json=globalStakingPool,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"global_staking_pool" yaml:"global_staking_pool"` - StakeForShields []ShieldStaking `protobuf:"bytes,19,rep,name=stake_for_shields,json=stakeForShields,proto3" json:"stake_for_shields" yaml:"stake_for_shields"` - OriginalStakings []OriginalStaking `protobuf:"bytes,20,rep,name=original_stakings,json=originalStakings,proto3" json:"original_stakings" yaml:"original_stakings"` - ProposalIDReimbursementPairs []ProposalIDReimbursementPair `protobuf:"bytes,21,rep,name=proposalID_reimbursement_pairs,json=proposalIDReimbursementPairs,proto3" json:"proposalID_reimbursement_pairs" yaml:"proposalID_reimbursement_pairs"` + DistributionParams DistributionParams `protobuf:"bytes,6,opt,name=distribution_params,json=distributionParams,proto3" json:"distribution_params" yaml:"distribution_params"` + TotalCollateral github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,7,opt,name=total_collateral,json=totalCollateral,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"total_collateral" yaml:"total_collateral"` + TotalWithdrawing github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,8,opt,name=total_withdrawing,json=totalWithdrawing,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"total_withdrawing" yaml:"total_withdrawing"` + TotalShield github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,9,opt,name=total_shield,json=totalShield,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"total_shield" yaml:"total_shield"` + TotalClaimed github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,10,opt,name=total_claimed,json=totalClaimed,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"total_claimed" yaml:"total_claimed"` + ServiceFees MixedDecCoins `protobuf:"bytes,11,opt,name=service_fees,json=serviceFees,proto3" json:"service_fees" yaml:"service_fees"` + RemainingServiceFees MixedDecCoins `protobuf:"bytes,12,opt,name=remaining_service_fees,json=remainingServiceFees,proto3" json:"remaining_service_fees" yaml:"remaining_service_fees"` + Pools []Pool `protobuf:"bytes,13,rep,name=pools,proto3" json:"pools" yaml:"pools"` + Providers []Provider `protobuf:"bytes,14,rep,name=providers,proto3" json:"providers" yaml:"providers"` + PurchaseLists []PurchaseList `protobuf:"bytes,15,rep,name=purchase_lists,json=purchaseLists,proto3" json:"purchase_lists" yaml:"purchases"` + Withdraws []Withdraw `protobuf:"bytes,16,rep,name=withdraws,proto3" json:"withdraws" yaml:"withdraws"` + LastUpdateTime time.Time `protobuf:"bytes,17,opt,name=last_update_time,json=lastUpdateTime,proto3,stdtime" json:"last_update_time" yaml:"last_update_time"` + ShieldStakingRate github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,18,opt,name=shield_staking_rate,json=shieldStakingRate,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"shield_staking_rate" yaml:"shield_staking_rate"` + GlobalStakingPool github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,19,opt,name=global_staking_pool,json=globalStakingPool,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"global_staking_pool" yaml:"global_staking_pool"` + StakeForShields []ShieldStaking `protobuf:"bytes,20,rep,name=stake_for_shields,json=stakeForShields,proto3" json:"stake_for_shields" yaml:"stake_for_shields"` + OriginalStakings []OriginalStaking `protobuf:"bytes,21,rep,name=original_stakings,json=originalStakings,proto3" json:"original_stakings" yaml:"original_stakings"` + ProposalIDReimbursementPairs []ProposalIDReimbursementPair `protobuf:"bytes,22,rep,name=proposalID_reimbursement_pairs,json=proposalIDReimbursementPairs,proto3" json:"proposalID_reimbursement_pairs" yaml:"proposalID_reimbursement_pairs"` } func (m *GenesisState) Reset() { *m = GenesisState{} } @@ -287,6 +288,46 @@ func (m *ClaimProposalParams) XXX_DiscardUnknown() { var xxx_messageInfo_ClaimProposalParams proto.InternalMessageInfo +// BlockRewardParams defines the parameters for shield block reward. +type DistributionParams struct { + ModelParamA github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,1,opt,name=model_param_a,json=modelParamA,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"model_param_a" yaml:"model_param_a"` + ModelParamB github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,2,opt,name=model_param_b,json=modelParamB,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"model_param_b" yaml:"model_param_b"` + TargetLeverage github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,3,opt,name=target_leverage,json=targetLeverage,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"target_leverage" yaml:"target_leverage"` +} + +func (m *DistributionParams) Reset() { *m = DistributionParams{} } +func (m *DistributionParams) String() string { return proto.CompactTextString(m) } +func (*DistributionParams) ProtoMessage() {} +func (*DistributionParams) Descriptor() ([]byte, []int) { + return fileDescriptor_c089c09a119aaa04, []int{6} +} +func (m *DistributionParams) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *DistributionParams) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_DistributionParams.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *DistributionParams) XXX_Merge(src proto.Message) { + xxx_messageInfo_DistributionParams.Merge(m, src) +} +func (m *DistributionParams) XXX_Size() int { + return m.Size() +} +func (m *DistributionParams) XXX_DiscardUnknown() { + xxx_messageInfo_DistributionParams.DiscardUnknown(m) +} + +var xxx_messageInfo_DistributionParams proto.InternalMessageInfo + func init() { proto.RegisterType((*GenesisState)(nil), "shentu.shield.v1alpha1.GenesisState") proto.RegisterType((*OriginalStaking)(nil), "shentu.shield.v1alpha1.OriginalStaking") @@ -294,6 +335,7 @@ func init() { proto.RegisterType((*Reimbursement)(nil), "shentu.shield.v1alpha1.Reimbursement") proto.RegisterType((*PoolParams)(nil), "shentu.shield.v1alpha1.PoolParams") proto.RegisterType((*ClaimProposalParams)(nil), "shentu.shield.v1alpha1.ClaimProposalParams") + proto.RegisterType((*DistributionParams)(nil), "shentu.shield.v1alpha1.DistributionParams") } func init() { @@ -301,101 +343,108 @@ func init() { } var fileDescriptor_c089c09a119aaa04 = []byte{ - // 1490 bytes of a gzipped FileDescriptorProto + // 1606 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x58, 0xcf, 0x6f, 0x1b, 0xc5, - 0x17, 0xcf, 0xe6, 0x47, 0xbf, 0xcd, 0xd8, 0x49, 0xec, 0x71, 0x9a, 0xee, 0x37, 0x0d, 0x76, 0x34, - 0x6d, 0x21, 0x12, 0xaa, 0x4d, 0xda, 0x03, 0xd0, 0x0b, 0xc2, 0x49, 0x0b, 0x81, 0x22, 0xa2, 0x0d, - 0xa8, 0x08, 0x84, 0x96, 0xb1, 0x77, 0xe2, 0x8c, 0xb2, 0xbb, 0xb3, 0xda, 0x19, 0xa7, 0x8d, 0xe8, - 0x09, 0x09, 0x89, 0x63, 0x2f, 0x48, 0x70, 0xeb, 0x11, 0x21, 0xf1, 0x7f, 0x54, 0xe2, 0xd2, 0x0b, - 0x08, 0x71, 0x48, 0x51, 0x7b, 0xe1, 0x9c, 0xbf, 0x00, 0xcd, 0x8f, 0xf5, 0xce, 0x3a, 0x71, 0x5a, - 0x4b, 0x3d, 0x25, 0xf3, 0xe6, 0xbd, 0xcf, 0x67, 0xe6, 0xcd, 0xfb, 0xb5, 0x06, 0x57, 0xf8, 0x1e, - 0x89, 0x45, 0xbf, 0xc5, 0xf7, 0x28, 0x09, 0x83, 0xd6, 0xc1, 0x3a, 0x0e, 0x93, 0x3d, 0xbc, 0xde, - 0xea, 0x91, 0x98, 0x70, 0xca, 0x9b, 0x49, 0xca, 0x04, 0x83, 0x4b, 0x5a, 0xab, 0xa9, 0xb5, 0x9a, - 0x99, 0xd6, 0xf2, 0x62, 0x8f, 0xf5, 0x98, 0x52, 0x69, 0xc9, 0xff, 0xb4, 0xf6, 0x72, 0xbd, 0xcb, - 0x78, 0xc4, 0x78, 0xab, 0x83, 0x39, 0x69, 0x1d, 0xac, 0x77, 0x88, 0xc0, 0xeb, 0xad, 0x2e, 0xa3, - 0xb1, 0xd9, 0x6f, 0xf4, 0x18, 0xeb, 0x85, 0xa4, 0xa5, 0x56, 0x9d, 0xfe, 0x6e, 0x4b, 0xd0, 0x88, - 0x70, 0x81, 0xa3, 0x24, 0x03, 0x18, 0x56, 0x08, 0xfa, 0x29, 0x16, 0x94, 0x65, 0x00, 0x97, 0x47, - 0x1c, 0xda, 0x1c, 0x4f, 0x29, 0xa1, 0x3f, 0xaa, 0xa0, 0xfc, 0x81, 0xbe, 0xc5, 0x8e, 0xc0, 0x82, - 0xc0, 0x9b, 0xa0, 0xac, 0x15, 0x7c, 0x1c, 0x44, 0x34, 0x76, 0x9d, 0x55, 0x67, 0x6d, 0xb6, 0x7d, - 0xf1, 0xf8, 0xa8, 0x51, 0x3b, 0xc4, 0x51, 0x78, 0x13, 0xd9, 0xbb, 0xc8, 0x2b, 0xe9, 0xe5, 0xfb, - 0x72, 0x05, 0xdf, 0x05, 0xe5, 0x98, 0xdc, 0x17, 0x7e, 0xc2, 0x58, 0xe8, 0xd3, 0xc0, 0x9d, 0x5c, - 0x75, 0xd6, 0xa6, 0x6d, 0x5b, 0x7b, 0x17, 0x79, 0x40, 0x2e, 0xb7, 0x19, 0x0b, 0xb7, 0x02, 0x78, - 0x0b, 0x54, 0xf4, 0x66, 0x3f, 0xed, 0xee, 0x61, 0x4e, 0xa4, 0xf9, 0x94, 0x32, 0xbf, 0x74, 0x7c, - 0xd4, 0xb8, 0x68, 0x9b, 0xe7, 0x1a, 0xc8, 0x9b, 0x57, 0x10, 0x46, 0xb2, 0x15, 0x40, 0x1f, 0x94, - 0x14, 0x7c, 0x82, 0x53, 0x1c, 0x71, 0x77, 0x7a, 0xd5, 0x59, 0x2b, 0x5d, 0x47, 0xcd, 0xd3, 0x1f, - 0xa6, 0x29, 0xb9, 0xb7, 0x95, 0x66, 0x7b, 0xf9, 0xf1, 0x51, 0x63, 0xe2, 0xf8, 0xa8, 0x01, 0x35, - 0x93, 0x05, 0x82, 0x3c, 0x90, 0x0c, 0xf4, 0xe0, 0xf7, 0x0e, 0xb8, 0xd0, 0x0d, 0x31, 0x8d, 0xfc, - 0x24, 0x65, 0x09, 0xe3, 0x78, 0xc0, 0x35, 0xa3, 0xb8, 0xde, 0x1c, 0xc5, 0xb5, 0x21, 0x8d, 0xb6, - 0x8d, 0x8d, 0x21, 0xbd, 0x62, 0x48, 0x57, 0x34, 0xe9, 0xa9, 0xb8, 0xc8, 0xab, 0x75, 0x4f, 0x9a, - 0x42, 0x01, 0x2a, 0x82, 0x09, 0x1c, 0xfa, 0x5d, 0x16, 0x86, 0x58, 0x90, 0x14, 0x87, 0xee, 0x39, - 0xf5, 0x54, 0x5b, 0x12, 0xf4, 0xef, 0xa3, 0xc6, 0xeb, 0x3d, 0x2a, 0xf6, 0xfa, 0x9d, 0x66, 0x97, - 0x45, 0x2d, 0x13, 0x6a, 0xfa, 0xcf, 0x35, 0x1e, 0xec, 0xb7, 0xc4, 0x61, 0x42, 0x78, 0x73, 0x2b, - 0x16, 0xb9, 0x77, 0x87, 0xf1, 0x90, 0xb7, 0xa0, 0x44, 0x1b, 0x03, 0x09, 0xbc, 0x07, 0xaa, 0x5a, - 0xeb, 0x1e, 0x15, 0x7b, 0x41, 0x8a, 0xef, 0xd1, 0xb8, 0xe7, 0xfe, 0x4f, 0xd1, 0x7e, 0x34, 0x36, - 0xad, 0x6b, 0xd3, 0x5a, 0x80, 0xc8, 0xd3, 0x57, 0xbb, 0x9b, 0x8b, 0xe0, 0x1e, 0x28, 0x6b, 0x3d, - 0xed, 0x56, 0xf7, 0xbc, 0xe2, 0xbc, 0x35, 0x36, 0x67, 0xcd, 0xe6, 0xd4, 0x58, 0xc8, 0x2b, 0xa9, - 0xe5, 0x8e, 0x5a, 0xc1, 0x7d, 0x30, 0x67, 0x1c, 0x21, 0xbd, 0x4e, 0x02, 0x77, 0x56, 0x51, 0xdd, - 0x1e, 0x9b, 0x6a, 0xb1, 0xe0, 0x55, 0x0d, 0x86, 0x3c, 0x7d, 0x8d, 0x0d, 0xbd, 0x84, 0x04, 0x94, - 0x39, 0x49, 0x0f, 0x68, 0x97, 0xf8, 0xbb, 0x84, 0x70, 0x17, 0xa8, 0x18, 0xba, 0x3a, 0x2a, 0x86, - 0x3e, 0xa1, 0xf7, 0x49, 0xb0, 0x49, 0xba, 0x1b, 0x8c, 0xc6, 0xbc, 0x7d, 0xc9, 0x44, 0x4f, 0x96, - 0x97, 0x16, 0x90, 0xcc, 0x4b, 0xbd, 0xbc, 0x4d, 0x08, 0x87, 0xdf, 0x39, 0x60, 0x29, 0x25, 0x11, - 0xa6, 0x31, 0x8d, 0x7b, 0x7e, 0x81, 0xb1, 0x34, 0x0e, 0xe3, 0x55, 0xc3, 0xf8, 0x9a, 0x66, 0x3c, - 0x1d, 0x12, 0x79, 0x8b, 0x83, 0x8d, 0x1d, 0xeb, 0x10, 0x1f, 0x82, 0x19, 0x99, 0x47, 0xdc, 0x2d, - 0xaf, 0x4e, 0xad, 0x95, 0xae, 0xaf, 0x9c, 0x95, 0x94, 0xed, 0x45, 0xc3, 0x54, 0xce, 0xd3, 0x91, - 0x23, 0x4f, 0x03, 0xc0, 0x2f, 0xc0, 0x6c, 0x92, 0xb2, 0x03, 0x1a, 0x90, 0x94, 0xbb, 0x73, 0x0a, - 0x6d, 0x75, 0x24, 0x9a, 0x51, 0x6c, 0xbb, 0x06, 0xb1, 0x62, 0x10, 0x33, 0x00, 0xe4, 0xe5, 0x60, - 0x90, 0x80, 0xf9, 0x41, 0x79, 0x09, 0x29, 0x17, 0xdc, 0x9d, 0x57, 0xf0, 0x57, 0x46, 0xc2, 0x1b, - 0xed, 0x3b, 0x94, 0x8b, 0x13, 0x14, 0x66, 0x8f, 0x23, 0x6f, 0x2e, 0xb1, 0xf4, 0xd4, 0x05, 0xb2, - 0x78, 0xe7, 0xee, 0xc2, 0xd9, 0x17, 0xc8, 0xb2, 0x60, 0x18, 0x7d, 0x00, 0x80, 0xbc, 0x1c, 0x0c, - 0x52, 0x50, 0x09, 0x31, 0x17, 0x7e, 0x3f, 0x09, 0xb0, 0x20, 0xbe, 0x6c, 0x19, 0x6e, 0x45, 0x3d, - 0xf1, 0x72, 0x53, 0xb7, 0x8b, 0x66, 0xd6, 0x2e, 0x9a, 0x9f, 0x65, 0xfd, 0xa4, 0x7d, 0xd9, 0x40, - 0x9b, 0x42, 0x30, 0x8c, 0x80, 0x1e, 0x3e, 0x6d, 0x38, 0xde, 0xbc, 0x14, 0x7f, 0xae, 0xa4, 0xd2, - 0x12, 0x3e, 0x00, 0x35, 0xd3, 0x0a, 0xb8, 0xc0, 0xfb, 0x32, 0x0a, 0x52, 0x2c, 0x88, 0x5b, 0x55, - 0xe9, 0x72, 0x67, 0x8c, 0x74, 0xd9, 0x24, 0xdd, 0xe3, 0xa3, 0xc6, 0x72, 0xa1, 0xbb, 0xd8, 0x90, - 0xc8, 0xab, 0x6a, 0xe9, 0x8e, 0x16, 0x7a, 0xb2, 0x4d, 0x3d, 0x00, 0xb5, 0x5e, 0xc8, 0x3a, 0x32, - 0x8b, 0x8d, 0xaa, 0x8c, 0x0d, 0x17, 0x8e, 0xcd, 0xae, 0x93, 0xd5, 0xb0, 0x9f, 0x02, 0x89, 0xbc, - 0xaa, 0x96, 0x1a, 0x76, 0x19, 0x9e, 0x90, 0x83, 0xaa, 0xd4, 0x21, 0xfe, 0x2e, 0x4b, 0x4d, 0x19, - 0xe1, 0x6e, 0x4d, 0x3d, 0xe4, 0xc8, 0x54, 0xda, 0xb1, 0xef, 0xd0, 0x5e, 0x35, 0x2e, 0x37, 0x45, - 0xf0, 0x04, 0x1a, 0xf2, 0x16, 0x94, 0xec, 0x36, 0x4b, 0xb5, 0x21, 0x87, 0x07, 0xa0, 0xca, 0x52, - 0xda, 0xa3, 0x71, 0x7e, 0x42, 0xee, 0x2e, 0x2a, 0xd2, 0x37, 0x46, 0x91, 0x7e, 0x6a, 0x0c, 0x46, - 0xd0, 0x9e, 0xc0, 0x43, 0x5e, 0x85, 0x15, 0x4d, 0x38, 0xfc, 0xc5, 0x01, 0xf5, 0xac, 0x29, 0x6d, - 0x6d, 0xfa, 0x29, 0xa1, 0x51, 0xa7, 0x9f, 0x72, 0x12, 0x91, 0x58, 0xf8, 0x09, 0xa6, 0x29, 0x77, - 0x2f, 0xa8, 0x53, 0xdc, 0x38, 0x23, 0x09, 0x8d, 0xb5, 0x67, 0x1b, 0x6f, 0x63, 0x9a, 0xb6, 0xaf, - 0x99, 0x13, 0x5d, 0x1d, 0xe4, 0xe5, 0x19, 0x44, 0xc8, 0x5b, 0x49, 0x46, 0x63, 0xf1, 0x9b, 0xe7, - 0x7f, 0x78, 0xd4, 0x98, 0xf8, 0xf7, 0x51, 0x63, 0x02, 0xfd, 0xe6, 0x80, 0x85, 0xa1, 0xcb, 0xc3, - 0xb7, 0x41, 0xc9, 0x1e, 0x2f, 0x1c, 0x35, 0x5e, 0x2c, 0x59, 0x4d, 0xdf, 0x9e, 0x2c, 0x40, 0x92, - 0x4f, 0x15, 0x77, 0xc1, 0x39, 0x1c, 0xb1, 0x7e, 0x2c, 0xd4, 0x44, 0x33, 0xdb, 0x7e, 0x6f, 0xec, - 0xf8, 0x9a, 0xd3, 0x0c, 0x1a, 0x05, 0x79, 0x06, 0xce, 0x3a, 0xef, 0xef, 0x0e, 0xb8, 0x74, 0x86, - 0x9b, 0xd4, 0xd9, 0xb3, 0xc1, 0xe0, 0xd4, 0xb3, 0xe7, 0x9b, 0xf2, 0xec, 0x19, 0x52, 0x00, 0x29, - 0x98, 0x2b, 0x38, 0x52, 0x5d, 0xe1, 0x8c, 0x30, 0x2d, 0x50, 0xb7, 0x57, 0xcc, 0xeb, 0x2c, 0x66, - 0x15, 0xdf, 0xda, 0x44, 0x5e, 0x11, 0xd9, 0xba, 0xcd, 0x8f, 0x93, 0x60, 0xae, 0x00, 0x04, 0xbb, - 0x03, 0x17, 0x3a, 0x2a, 0x56, 0xfe, 0xdf, 0xd4, 0x9e, 0x6a, 0xca, 0xf1, 0xb7, 0x69, 0xc6, 0xdf, - 0xa6, 0x6c, 0x33, 0xed, 0xb7, 0x24, 0xe7, 0xaf, 0x4f, 0x1b, 0x6b, 0x2f, 0xe1, 0x5d, 0xd5, 0x97, - 0x32, 0x77, 0xc2, 0x77, 0x40, 0xa9, 0x43, 0x62, 0xb2, 0x4b, 0xbb, 0x14, 0xa7, 0x87, 0xe6, 0xb1, - 0x2c, 0x27, 0x59, 0x9b, 0xc8, 0xb3, 0x55, 0xe1, 0x57, 0xa0, 0x94, 0xe0, 0x43, 0xd6, 0x17, 0xba, - 0x64, 0x4e, 0xbd, 0xb0, 0x64, 0xd6, 0x87, 0xe6, 0xc5, 0xdc, 0x58, 0x57, 0x4b, 0xa0, 0x25, 0xd2, - 0xc0, 0xf2, 0xcb, 0x9f, 0xd3, 0x00, 0xe4, 0x43, 0x27, 0x0c, 0x41, 0x55, 0x42, 0x93, 0xae, 0x9c, - 0xda, 0xfd, 0x84, 0xa4, 0x94, 0xe9, 0xa7, 0x95, 0xfe, 0x19, 0xe6, 0xde, 0x34, 0xd3, 0xfd, 0x60, - 0x6a, 0x74, 0x07, 0x2f, 0x5f, 0x44, 0x40, 0x3f, 0xc9, 0x03, 0x54, 0x72, 0xf9, 0xb6, 0x12, 0x43, - 0x0e, 0x2a, 0xa6, 0xba, 0xca, 0x36, 0xad, 0xab, 0xf5, 0xe4, 0xd8, 0x23, 0xa3, 0xae, 0xd6, 0x17, - 0x0b, 0xd5, 0x7a, 0x80, 0x87, 0xbc, 0x79, 0x2d, 0x92, 0x1d, 0x5f, 0xd5, 0xe9, 0x5d, 0xb0, 0x90, - 0x75, 0xa7, 0xec, 0x82, 0x53, 0x2f, 0xba, 0x20, 0x32, 0x17, 0x5c, 0x2a, 0x76, 0xba, 0xc2, 0xf5, - 0xe6, 0x33, 0xa9, 0xb9, 0xdc, 0x01, 0xa8, 0xaa, 0x99, 0xdd, 0x9c, 0x28, 0xa4, 0x11, 0x15, 0x6a, - 0xfc, 0x1f, 0x6f, 0x32, 0xd5, 0xb7, 0x73, 0xad, 0x8f, 0x00, 0x1b, 0x10, 0x79, 0x0b, 0x52, 0xa6, - 0x0b, 0xf2, 0x1d, 0x29, 0x81, 0xdf, 0x82, 0x5a, 0x44, 0xe3, 0x4c, 0x2b, 0xab, 0x19, 0xee, 0xcc, - 0xab, 0x0f, 0xf2, 0x6a, 0x44, 0x63, 0xcd, 0x9c, 0x0d, 0x1d, 0x56, 0x60, 0xfd, 0x3c, 0x0d, 0x6a, - 0xa7, 0x7c, 0x61, 0xc0, 0xaf, 0x41, 0xd9, 0x7c, 0x55, 0xbc, 0x64, 0x70, 0x35, 0x8a, 0x43, 0xa5, - 0x6d, 0xac, 0x1d, 0x5f, 0xd2, 0x5f, 0x23, 0xda, 0xeb, 0xdf, 0x80, 0x39, 0x13, 0xf9, 0x06, 0x7f, - 0xf2, 0x45, 0xf8, 0xab, 0xc5, 0x82, 0x52, 0xb0, 0xd6, 0x04, 0x65, 0x2d, 0x33, 0x0c, 0x21, 0x28, - 0x49, 0xff, 0x06, 0x24, 0x61, 0x9c, 0x0a, 0x77, 0xea, 0xd5, 0xfb, 0x15, 0x44, 0x34, 0xde, 0xd4, - 0xf0, 0xf2, 0x33, 0xc3, 0x30, 0xe9, 0xf4, 0x98, 0x1e, 0xfb, 0x33, 0x43, 0x07, 0x90, 0xf1, 0x9e, - 0x8d, 0x85, 0xbc, 0x92, 0x59, 0xaa, 0xbc, 0xf0, 0xc1, 0x6c, 0x9e, 0x85, 0x33, 0x8a, 0xa6, 0x3d, - 0x36, 0x8d, 0x19, 0x05, 0xad, 0xf4, 0x3b, 0xbf, 0x6b, 0x12, 0x2f, 0x8f, 0x8d, 0xf6, 0xc7, 0x8f, - 0x9f, 0xd5, 0x9d, 0x27, 0xcf, 0xea, 0xce, 0x3f, 0xcf, 0xea, 0xce, 0xc3, 0xe7, 0xf5, 0x89, 0x27, - 0xcf, 0xeb, 0x13, 0x7f, 0x3d, 0xaf, 0x4f, 0x7c, 0xb9, 0x6e, 0x33, 0x91, 0x54, 0xd0, 0xfd, 0x5d, - 0xd6, 0x8f, 0x03, 0xf5, 0x52, 0x2d, 0xf3, 0xeb, 0xc1, 0xfd, 0xec, 0xf7, 0x03, 0x45, 0xdc, 0x39, - 0xa7, 0x9e, 0xf4, 0xc6, 0x7f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x7f, 0x66, 0x0e, 0xc9, 0x12, 0x11, - 0x00, 0x00, + 0x17, 0x8f, 0xf3, 0xa3, 0xdf, 0x66, 0x6c, 0x27, 0xf6, 0x38, 0x4d, 0xf7, 0x9b, 0xe6, 0x6b, 0x47, + 0xd3, 0xf6, 0x4b, 0x04, 0xaa, 0x4d, 0xda, 0x03, 0xd0, 0x0b, 0xaa, 0x93, 0x86, 0x06, 0x82, 0x88, + 0x36, 0xa0, 0x22, 0x10, 0x5a, 0xc6, 0xde, 0x89, 0x33, 0x64, 0x77, 0x67, 0xd9, 0x19, 0xa7, 0x8d, + 0xa8, 0x84, 0x84, 0x84, 0xc4, 0xb1, 0x17, 0x24, 0xb8, 0xf5, 0x88, 0x90, 0xf8, 0x3f, 0x2a, 0x71, + 0xe9, 0xa9, 0x42, 0x1c, 0x52, 0xd4, 0x5e, 0xe0, 0xda, 0xbf, 0x00, 0xcd, 0x8f, 0xb5, 0x67, 0x1d, + 0x3b, 0xad, 0xa5, 0x9e, 0x92, 0x79, 0xfb, 0xde, 0xe7, 0xf3, 0xe6, 0xcd, 0x7b, 0x6f, 0xde, 0x18, + 0x5c, 0xe2, 0xfb, 0x24, 0x12, 0xdd, 0x06, 0xdf, 0xa7, 0x24, 0xf0, 0x1b, 0x87, 0x6b, 0x38, 0x88, + 0xf7, 0xf1, 0x5a, 0xa3, 0x43, 0x22, 0xc2, 0x29, 0xaf, 0xc7, 0x09, 0x13, 0x0c, 0x2e, 0x6a, 0xad, + 0xba, 0xd6, 0xaa, 0xa7, 0x5a, 0x4b, 0x0b, 0x1d, 0xd6, 0x61, 0x4a, 0xa5, 0x21, 0xff, 0xd3, 0xda, + 0x4b, 0xd5, 0x36, 0xe3, 0x21, 0xe3, 0x8d, 0x16, 0xe6, 0xa4, 0x71, 0xb8, 0xd6, 0x22, 0x02, 0xaf, + 0x35, 0xda, 0x8c, 0x46, 0xe6, 0x7b, 0xad, 0xc3, 0x58, 0x27, 0x20, 0x0d, 0xb5, 0x6a, 0x75, 0xf7, + 0x1a, 0x82, 0x86, 0x84, 0x0b, 0x1c, 0xc6, 0x29, 0xc0, 0xa0, 0x82, 0xdf, 0x4d, 0xb0, 0xa0, 0x2c, + 0x05, 0xb8, 0x38, 0xc2, 0x69, 0xe3, 0x9e, 0x52, 0x42, 0x8f, 0x21, 0x28, 0xbc, 0xa7, 0x77, 0xb1, + 0x2b, 0xb0, 0x20, 0xf0, 0x3a, 0x28, 0x68, 0x05, 0x0f, 0xfb, 0x21, 0x8d, 0x9c, 0xdc, 0x4a, 0x6e, + 0x75, 0xb6, 0x79, 0xfe, 0xf9, 0x71, 0xad, 0x72, 0x84, 0xc3, 0xe0, 0x3a, 0xb2, 0xbf, 0x22, 0x37, + 0xaf, 0x97, 0x37, 0xe4, 0x0a, 0xbe, 0x03, 0x0a, 0x11, 0xb9, 0x2b, 0xbc, 0x98, 0xb1, 0xc0, 0xa3, + 0xbe, 0x33, 0xb9, 0x92, 0x5b, 0x9d, 0xb6, 0x6d, 0xed, 0xaf, 0xc8, 0x05, 0x72, 0xb9, 0xc3, 0x58, + 0xb0, 0xe5, 0xc3, 0x9b, 0xa0, 0xa4, 0x3f, 0x76, 0x93, 0xf6, 0x3e, 0xe6, 0x44, 0x9a, 0x4f, 0x29, + 0xf3, 0x0b, 0xcf, 0x8f, 0x6b, 0xe7, 0x6d, 0xf3, 0xbe, 0x06, 0x72, 0xe7, 0x14, 0x84, 0x91, 0x6c, + 0xf9, 0xd0, 0x03, 0x79, 0x05, 0x1f, 0xe3, 0x04, 0x87, 0xdc, 0x99, 0x5e, 0xc9, 0xad, 0xe6, 0xaf, + 0xa2, 0xfa, 0xf0, 0x83, 0xa9, 0x4b, 0xee, 0x1d, 0xa5, 0xd9, 0x5c, 0x7a, 0x78, 0x5c, 0x9b, 0x78, + 0x7e, 0x5c, 0x83, 0x9a, 0xc9, 0x02, 0x41, 0x2e, 0x88, 0x7b, 0x7a, 0xf0, 0xfb, 0x1c, 0x38, 0xd7, + 0x0e, 0x30, 0x0d, 0xbd, 0x38, 0x61, 0x31, 0xe3, 0xb8, 0xc7, 0x35, 0xa3, 0xb8, 0xde, 0x18, 0xc5, + 0xb5, 0x2e, 0x8d, 0x76, 0x8c, 0x8d, 0x21, 0xbd, 0x64, 0x48, 0x97, 0x35, 0xe9, 0x50, 0x5c, 0xe4, + 0x56, 0xda, 0x27, 0x4d, 0xe1, 0xb7, 0xa0, 0xe2, 0x53, 0x2e, 0x12, 0xda, 0xea, 0xca, 0x23, 0x4f, + 0x9d, 0x38, 0xa3, 0x9c, 0x78, 0x7d, 0x94, 0x13, 0x1b, 0x96, 0x89, 0xf1, 0x01, 0x19, 0x1f, 0x96, + 0xb4, 0x0f, 0x43, 0x40, 0x91, 0x0b, 0xfd, 0x13, 0x76, 0x50, 0x80, 0x92, 0x60, 0x02, 0x07, 0x5e, + 0x9b, 0x05, 0x01, 0x16, 0x24, 0xc1, 0x81, 0xf3, 0x1f, 0x95, 0x2b, 0x5b, 0x12, 0xf1, 0xcf, 0xe3, + 0xda, 0xff, 0x3b, 0x54, 0xec, 0x77, 0x5b, 0xf5, 0x36, 0x0b, 0x1b, 0x26, 0xd7, 0xf5, 0x9f, 0x2b, + 0xdc, 0x3f, 0x68, 0x88, 0xa3, 0x98, 0xf0, 0xfa, 0x56, 0x24, 0xfa, 0xc7, 0x3b, 0x88, 0x87, 0xdc, + 0x79, 0x25, 0x5a, 0xef, 0x49, 0xe0, 0x1d, 0x50, 0xd6, 0x5a, 0x77, 0xa8, 0xd8, 0xf7, 0x13, 0x7c, + 0x87, 0x46, 0x1d, 0xe7, 0xac, 0xa2, 0x7d, 0x7f, 0x6c, 0x5a, 0xc7, 0xa6, 0xb5, 0x00, 0x91, 0xab, + 0xb7, 0x76, 0xbb, 0x2f, 0x82, 0xfb, 0xa0, 0xa0, 0xf5, 0x74, 0x48, 0x9d, 0x59, 0xc5, 0x79, 0x73, + 0x6c, 0xce, 0x8a, 0xcd, 0xa9, 0xb1, 0x90, 0x9b, 0x57, 0xcb, 0x5d, 0xb5, 0x82, 0x07, 0xa0, 0x68, + 0x02, 0x21, 0x8f, 0x9d, 0xf8, 0x0e, 0x50, 0x54, 0x9b, 0x63, 0x53, 0x2d, 0x64, 0xa2, 0xaa, 0xc1, + 0x90, 0xab, 0xb7, 0xb1, 0xae, 0x97, 0x90, 0x80, 0x02, 0x27, 0xc9, 0x21, 0x6d, 0x13, 0x6f, 0x8f, + 0x10, 0xee, 0xe4, 0x55, 0xfe, 0x5c, 0x1e, 0x95, 0x3f, 0x1f, 0xd2, 0xbb, 0xc4, 0xdf, 0x20, 0xed, + 0x75, 0x46, 0x23, 0xde, 0xbc, 0x60, 0x52, 0x27, 0x6d, 0x0c, 0x16, 0x90, 0x6c, 0x0c, 0x7a, 0xb9, + 0x49, 0x08, 0x87, 0xdf, 0xe5, 0xc0, 0x62, 0x42, 0x42, 0x4c, 0x23, 0x1a, 0x75, 0xbc, 0x0c, 0x63, + 0x61, 0x1c, 0xc6, 0xcb, 0x86, 0xf1, 0x7f, 0x9a, 0x71, 0x38, 0x24, 0x72, 0x17, 0x7a, 0x1f, 0x76, + 0x2d, 0x27, 0x6e, 0x81, 0x19, 0x59, 0xc8, 0xdc, 0x29, 0xae, 0x4c, 0xad, 0xe6, 0xaf, 0x2e, 0x9f, + 0xd6, 0x15, 0x9a, 0x0b, 0x86, 0xa9, 0xd0, 0xef, 0x07, 0x1c, 0xb9, 0x1a, 0x00, 0x7e, 0x0a, 0x66, + 0xe3, 0x84, 0x1d, 0x52, 0x9f, 0x24, 0xdc, 0x99, 0x53, 0x68, 0x2b, 0x23, 0xd1, 0x8c, 0x62, 0xd3, + 0x31, 0x88, 0x25, 0x83, 0x98, 0x02, 0x20, 0xb7, 0x0f, 0x06, 0x09, 0x98, 0xeb, 0xf5, 0xb7, 0x80, + 0x72, 0xc1, 0x9d, 0x79, 0x05, 0x7f, 0x69, 0x24, 0xbc, 0xd1, 0xde, 0xa6, 0x5c, 0x9c, 0xa0, 0x30, + 0xdf, 0x38, 0x72, 0x8b, 0xb1, 0xa5, 0xa7, 0x36, 0x90, 0xe6, 0x3b, 0x77, 0x4a, 0xa7, 0x6f, 0x20, + 0xad, 0x82, 0x41, 0xf4, 0x1e, 0x00, 0x72, 0xfb, 0x60, 0x90, 0x82, 0x52, 0x80, 0xb9, 0xf0, 0xba, + 0xb1, 0x8f, 0x05, 0xf1, 0xe4, 0x9d, 0xe5, 0x94, 0xd5, 0x11, 0x2f, 0xd5, 0xf5, 0x7d, 0x55, 0x4f, + 0xef, 0xab, 0xfa, 0xc7, 0xe9, 0x85, 0xd6, 0xbc, 0x68, 0xa0, 0x4d, 0x23, 0x18, 0x44, 0x40, 0xf7, + 0x9f, 0xd4, 0x72, 0xee, 0x9c, 0x14, 0x7f, 0xa2, 0xa4, 0xd2, 0x12, 0xde, 0x03, 0x15, 0x73, 0x17, + 0x71, 0x81, 0x0f, 0x64, 0x16, 0x24, 0x58, 0x10, 0x07, 0xaa, 0x72, 0xd9, 0x1e, 0xa3, 0x5c, 0x36, + 0x48, 0xbb, 0xdf, 0x00, 0x87, 0x40, 0x22, 0xb7, 0xac, 0xa5, 0xbb, 0x5a, 0xe8, 0xca, 0x7b, 0xf2, + 0x1e, 0xa8, 0x74, 0x02, 0xd6, 0x92, 0x55, 0x6c, 0x54, 0x65, 0x6e, 0x38, 0x95, 0xb1, 0xd9, 0x75, + 0xb1, 0x1a, 0xf6, 0x21, 0x90, 0xc8, 0x2d, 0x6b, 0xa9, 0x61, 0x97, 0xe9, 0x09, 0x39, 0x28, 0x4b, + 0x1d, 0xe2, 0xed, 0xb1, 0xc4, 0xb4, 0x11, 0xee, 0x2c, 0xa8, 0x83, 0x1c, 0x59, 0x4a, 0xbb, 0xf6, + 0x1e, 0x9a, 0x2b, 0x26, 0xe4, 0xa6, 0x09, 0x9e, 0x40, 0x43, 0xee, 0xbc, 0x92, 0x6d, 0xb2, 0x44, + 0x1b, 0x72, 0x78, 0x08, 0xca, 0x2c, 0xa1, 0x1d, 0x1a, 0xf5, 0x3d, 0xe4, 0xce, 0x39, 0x45, 0xfa, + 0xda, 0x28, 0xd2, 0x8f, 0x8c, 0xc1, 0x08, 0xda, 0x13, 0x78, 0xc8, 0x2d, 0xb1, 0xac, 0x09, 0x87, + 0xbf, 0xe4, 0x40, 0x35, 0xbd, 0x15, 0xb7, 0x36, 0xbc, 0x84, 0xd0, 0xb0, 0xd5, 0x4d, 0x38, 0x09, + 0x49, 0x24, 0xbc, 0x18, 0xd3, 0x84, 0x3b, 0x8b, 0xca, 0x8b, 0x6b, 0xa7, 0x14, 0xa1, 0xb1, 0x76, + 0x6d, 0xe3, 0x1d, 0x4c, 0x93, 0xe6, 0x15, 0xe3, 0xd1, 0xe5, 0x5e, 0x5d, 0x9e, 0x42, 0x84, 0xdc, + 0xe5, 0x78, 0x34, 0x16, 0xbf, 0x7e, 0xf6, 0x87, 0x07, 0xb5, 0x89, 0xbf, 0x1f, 0xd4, 0x26, 0xd0, + 0x6f, 0x39, 0x30, 0x3f, 0xb0, 0x79, 0xf8, 0x16, 0xc8, 0xdb, 0xf3, 0x4d, 0x4e, 0xcd, 0x37, 0x8b, + 0xd6, 0xd4, 0x61, 0x8f, 0x36, 0x20, 0xee, 0x8f, 0x35, 0xb7, 0xc1, 0x19, 0x1c, 0xb2, 0x6e, 0x24, + 0xd4, 0x48, 0x35, 0xdb, 0x7c, 0x77, 0xec, 0xfc, 0x2a, 0x6a, 0x06, 0x8d, 0x82, 0x5c, 0x03, 0x67, + 0xf9, 0xfb, 0x7b, 0x0e, 0x5c, 0x38, 0x25, 0x4c, 0xca, 0xf7, 0x74, 0x32, 0x19, 0xea, 0x7b, 0xff, + 0xa3, 0xf4, 0x3d, 0x45, 0xf2, 0x21, 0x05, 0xc5, 0x4c, 0x20, 0xd5, 0x16, 0x4e, 0x49, 0xd3, 0x0c, + 0x75, 0x73, 0xd9, 0x9c, 0xce, 0x42, 0xda, 0xf1, 0xad, 0x8f, 0xc8, 0xcd, 0x22, 0x5b, 0xbb, 0xf9, + 0x71, 0x12, 0x14, 0x33, 0x40, 0xb0, 0xdd, 0x0b, 0x61, 0x4e, 0xe5, 0xca, 0x7f, 0xeb, 0x3a, 0x52, + 0x75, 0x39, 0x7f, 0xd7, 0xcd, 0xfc, 0x5d, 0x97, 0xd7, 0x4c, 0xf3, 0x4d, 0xc9, 0xf9, 0xeb, 0x93, + 0xda, 0xea, 0x4b, 0x44, 0x57, 0xdd, 0x4b, 0x69, 0x38, 0xe1, 0xdb, 0x20, 0xdf, 0x22, 0x11, 0xd9, + 0xa3, 0x6d, 0x8a, 0x93, 0x23, 0x73, 0x58, 0x56, 0x90, 0xac, 0x8f, 0xc8, 0xb5, 0x55, 0xe1, 0xe7, + 0x20, 0x1f, 0xe3, 0x23, 0xd6, 0x15, 0xba, 0x65, 0x4e, 0xbd, 0xb0, 0x65, 0x56, 0x07, 0x06, 0xd6, + 0xbe, 0xb1, 0xee, 0x96, 0x40, 0x4b, 0xa4, 0x81, 0x15, 0x97, 0xc7, 0xd3, 0x00, 0xf4, 0xa7, 0x5e, + 0x18, 0x80, 0xb2, 0x84, 0x26, 0x6d, 0x3d, 0xee, 0x91, 0x84, 0x32, 0x7d, 0xb4, 0x32, 0x3e, 0x83, + 0xdc, 0x1b, 0xe6, 0x79, 0xd1, 0x1b, 0x5b, 0x9d, 0xde, 0xc9, 0x67, 0x11, 0xd0, 0x4f, 0xd2, 0x81, + 0x52, 0x5f, 0xbe, 0xa3, 0xc4, 0x90, 0x83, 0x92, 0xe9, 0xae, 0xf2, 0x9a, 0xd6, 0xdd, 0x7a, 0x72, + 0xec, 0x91, 0x51, 0x77, 0xeb, 0xf3, 0x99, 0x6e, 0xdd, 0xc3, 0x43, 0xee, 0x9c, 0x16, 0xc9, 0x1b, + 0x5f, 0xf5, 0xe9, 0x3d, 0x30, 0x9f, 0xde, 0x4e, 0xe9, 0x06, 0xa7, 0x5e, 0xb4, 0xc1, 0x74, 0x26, + 0x5e, 0xcc, 0xde, 0x74, 0x99, 0xed, 0xcd, 0xa5, 0x52, 0xb3, 0xb9, 0x43, 0x50, 0x56, 0x8f, 0x06, + 0xe3, 0x51, 0x40, 0x43, 0x2a, 0xd4, 0xfb, 0x63, 0xbc, 0xc9, 0x54, 0xef, 0xce, 0xb1, 0x5e, 0x21, + 0x36, 0x20, 0x72, 0xe7, 0xa5, 0x4c, 0x37, 0xe4, 0x6d, 0x29, 0x81, 0xdf, 0x80, 0x4a, 0x48, 0xa3, + 0x54, 0x2b, 0xed, 0x19, 0xce, 0xcc, 0xab, 0x4f, 0xf2, 0x72, 0x48, 0x23, 0xcd, 0x9c, 0x0e, 0x1d, + 0x56, 0x62, 0xfd, 0x3c, 0x0d, 0x2a, 0x43, 0x9e, 0x38, 0xf0, 0x0b, 0x50, 0x30, 0xcf, 0x9a, 0x97, + 0x4c, 0xae, 0x5a, 0x76, 0xa8, 0xb4, 0x8d, 0x75, 0xe0, 0xf3, 0xfa, 0x39, 0xa4, 0xa3, 0xfe, 0x25, + 0x28, 0x9a, 0xcc, 0x37, 0xf8, 0x93, 0x2f, 0xc2, 0x5f, 0xc9, 0x36, 0x94, 0x8c, 0xb5, 0x26, 0x28, + 0x68, 0x99, 0x61, 0x08, 0x40, 0x5e, 0xc6, 0xd7, 0x27, 0x31, 0xe3, 0x54, 0x38, 0x53, 0xaf, 0x3e, + 0xae, 0x20, 0xa4, 0xd1, 0x86, 0x86, 0x97, 0xcf, 0x0c, 0xc3, 0xa4, 0xcb, 0x63, 0x7a, 0xec, 0x67, + 0x86, 0x4e, 0x20, 0x13, 0x3d, 0x1b, 0x0b, 0xb9, 0x79, 0xb3, 0x54, 0x75, 0xe1, 0x81, 0xd9, 0x7e, + 0x15, 0xce, 0x28, 0x9a, 0xe6, 0xd8, 0x34, 0x66, 0x14, 0xb4, 0xca, 0xef, 0xec, 0x9e, 0x29, 0x3c, + 0x2b, 0x37, 0xfe, 0x99, 0x04, 0xf0, 0xe4, 0xcb, 0x13, 0x7e, 0x05, 0x8a, 0x21, 0xf3, 0x89, 0x79, + 0xe8, 0x7a, 0xd8, 0xfc, 0xd4, 0xb0, 0x39, 0xb6, 0x17, 0xe6, 0x28, 0x33, 0x60, 0xc8, 0xcd, 0xab, + 0xb5, 0xe2, 0xba, 0x31, 0xc8, 0xd5, 0x32, 0x7d, 0xe7, 0x95, 0x70, 0xb5, 0x32, 0x5c, 0x4d, 0xf8, + 0x35, 0x98, 0x17, 0x38, 0xe9, 0x10, 0xe1, 0x05, 0xe4, 0x90, 0x24, 0xb8, 0xa3, 0xdb, 0xf9, 0x6c, + 0xf3, 0xd6, 0xd8, 0x6c, 0xa6, 0x01, 0x0d, 0xc0, 0x21, 0x77, 0x4e, 0x4b, 0xb6, 0x8d, 0xa0, 0x1f, + 0xeb, 0xe6, 0x07, 0x0f, 0x9f, 0x56, 0x73, 0x8f, 0x9e, 0x56, 0x73, 0x7f, 0x3d, 0xad, 0xe6, 0xee, + 0x3f, 0xab, 0x4e, 0x3c, 0x7a, 0x56, 0x9d, 0xf8, 0xe3, 0x59, 0x75, 0xe2, 0xb3, 0x35, 0x9b, 0x95, + 0x24, 0x82, 0x1e, 0xec, 0xb1, 0x6e, 0xe4, 0xab, 0xaa, 0x68, 0x98, 0x9f, 0x8a, 0xee, 0xa6, 0x3f, + 0x16, 0x29, 0x27, 0x5a, 0x67, 0x54, 0xf9, 0x5c, 0xfb, 0x37, 0x00, 0x00, 0xff, 0xff, 0xa6, 0x51, + 0xb1, 0x5e, 0xff, 0x12, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { @@ -431,7 +480,7 @@ func (m *GenesisState) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x1 i-- - dAtA[i] = 0xaa + dAtA[i] = 0xb2 } } if len(m.OriginalStakings) > 0 { @@ -447,7 +496,7 @@ func (m *GenesisState) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x1 i-- - dAtA[i] = 0xa2 + dAtA[i] = 0xaa } } if len(m.StakeForShields) > 0 { @@ -463,7 +512,7 @@ func (m *GenesisState) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x1 i-- - dAtA[i] = 0x9a + dAtA[i] = 0xa2 } } { @@ -477,7 +526,7 @@ func (m *GenesisState) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x1 i-- - dAtA[i] = 0x92 + dAtA[i] = 0x9a { size := m.ShieldStakingRate.Size() i -= size @@ -489,7 +538,7 @@ func (m *GenesisState) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x1 i-- - dAtA[i] = 0x8a + dAtA[i] = 0x92 n1, err1 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.LastUpdateTime, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.LastUpdateTime):]) if err1 != nil { return 0, err1 @@ -499,7 +548,7 @@ func (m *GenesisState) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x1 i-- - dAtA[i] = 0x82 + dAtA[i] = 0x8a if len(m.Withdraws) > 0 { for iNdEx := len(m.Withdraws) - 1; iNdEx >= 0; iNdEx-- { { @@ -511,7 +560,9 @@ func (m *GenesisState) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintGenesis(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x7a + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x82 } } if len(m.PurchaseLists) > 0 { @@ -525,7 +576,7 @@ func (m *GenesisState) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintGenesis(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x72 + dAtA[i] = 0x7a } } if len(m.Providers) > 0 { @@ -539,7 +590,7 @@ func (m *GenesisState) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintGenesis(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x6a + dAtA[i] = 0x72 } } if len(m.Pools) > 0 { @@ -553,7 +604,7 @@ func (m *GenesisState) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintGenesis(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x62 + dAtA[i] = 0x6a } } { @@ -565,7 +616,7 @@ func (m *GenesisState) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintGenesis(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x5a + dAtA[i] = 0x62 { size, err := m.ServiceFees.MarshalToSizedBuffer(dAtA[:i]) if err != nil { @@ -575,7 +626,7 @@ func (m *GenesisState) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintGenesis(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x52 + dAtA[i] = 0x5a { size := m.TotalClaimed.Size() i -= size @@ -585,7 +636,7 @@ func (m *GenesisState) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintGenesis(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x4a + dAtA[i] = 0x52 { size := m.TotalShield.Size() i -= size @@ -595,7 +646,7 @@ func (m *GenesisState) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintGenesis(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x42 + dAtA[i] = 0x4a { size := m.TotalWithdrawing.Size() i -= size @@ -605,7 +656,7 @@ func (m *GenesisState) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintGenesis(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x3a + dAtA[i] = 0x42 { size := m.TotalCollateral.Size() i -= size @@ -615,6 +666,16 @@ func (m *GenesisState) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintGenesis(dAtA, i, uint64(size)) } i-- + dAtA[i] = 0x3a + { + size, err := m.DistributionParams.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintGenesis(dAtA, i, uint64(size)) + } + i-- dAtA[i] = 0x32 { size, err := m.ClaimProposalParams.MarshalToSizedBuffer(dAtA[:i]) @@ -752,12 +813,12 @@ func (m *Reimbursement) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - n7, err7 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.PayoutTime, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.PayoutTime):]) - if err7 != nil { - return 0, err7 + n8, err8 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.PayoutTime, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.PayoutTime):]) + if err8 != nil { + return 0, err8 } - i -= n7 - i = encodeVarintGenesis(dAtA, i, uint64(n7)) + i -= n8 + i = encodeVarintGenesis(dAtA, i, uint64(n8)) i-- dAtA[i] = 0x1a if len(m.Beneficiary) > 0 { @@ -828,12 +889,12 @@ func (m *PoolParams) MarshalToSizedBuffer(dAtA []byte) (int, error) { } i-- dAtA[i] = 0x22 - n8, err8 := github_com_gogo_protobuf_types.StdDurationMarshalTo(m.WithdrawPeriod, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdDuration(m.WithdrawPeriod):]) - if err8 != nil { - return 0, err8 + n9, err9 := github_com_gogo_protobuf_types.StdDurationMarshalTo(m.WithdrawPeriod, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdDuration(m.WithdrawPeriod):]) + if err9 != nil { + return 0, err9 } - i -= n8 - i = encodeVarintGenesis(dAtA, i, uint64(n8)) + i -= n9 + i = encodeVarintGenesis(dAtA, i, uint64(n9)) i-- dAtA[i] = 0x1a { @@ -846,12 +907,12 @@ func (m *PoolParams) MarshalToSizedBuffer(dAtA []byte) (int, error) { } i-- dAtA[i] = 0x12 - n9, err9 := github_com_gogo_protobuf_types.StdDurationMarshalTo(m.ProtectionPeriod, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdDuration(m.ProtectionPeriod):]) - if err9 != nil { - return 0, err9 + n10, err10 := github_com_gogo_protobuf_types.StdDurationMarshalTo(m.ProtectionPeriod, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdDuration(m.ProtectionPeriod):]) + if err10 != nil { + return 0, err10 } - i -= n9 - i = encodeVarintGenesis(dAtA, i, uint64(n9)) + i -= n10 + i = encodeVarintGenesis(dAtA, i, uint64(n10)) i-- dAtA[i] = 0xa return len(dAtA) - i, nil @@ -911,21 +972,74 @@ func (m *ClaimProposalParams) MarshalToSizedBuffer(dAtA []byte) (int, error) { dAtA[i] = 0x1a } } - n10, err10 := github_com_gogo_protobuf_types.StdDurationMarshalTo(m.PayoutPeriod, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdDuration(m.PayoutPeriod):]) - if err10 != nil { - return 0, err10 - } - i -= n10 - i = encodeVarintGenesis(dAtA, i, uint64(n10)) - i-- - dAtA[i] = 0x12 - n11, err11 := github_com_gogo_protobuf_types.StdDurationMarshalTo(m.ClaimPeriod, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdDuration(m.ClaimPeriod):]) + n11, err11 := github_com_gogo_protobuf_types.StdDurationMarshalTo(m.PayoutPeriod, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdDuration(m.PayoutPeriod):]) if err11 != nil { return 0, err11 } i -= n11 i = encodeVarintGenesis(dAtA, i, uint64(n11)) i-- + dAtA[i] = 0x12 + n12, err12 := github_com_gogo_protobuf_types.StdDurationMarshalTo(m.ClaimPeriod, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdDuration(m.ClaimPeriod):]) + if err12 != nil { + return 0, err12 + } + i -= n12 + i = encodeVarintGenesis(dAtA, i, uint64(n12)) + i-- + dAtA[i] = 0xa + return len(dAtA) - i, nil +} + +func (m *DistributionParams) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *DistributionParams) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *DistributionParams) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + { + size := m.TargetLeverage.Size() + i -= size + if _, err := m.TargetLeverage.MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + i = encodeVarintGenesis(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x1a + { + size := m.ModelParamB.Size() + i -= size + if _, err := m.ModelParamB.MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + i = encodeVarintGenesis(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 + { + size := m.ModelParamA.Size() + i -= size + if _, err := m.ModelParamA.MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + i = encodeVarintGenesis(dAtA, i, uint64(size)) + } + i-- dAtA[i] = 0xa return len(dAtA) - i, nil } @@ -961,6 +1075,8 @@ func (m *GenesisState) Size() (n int) { n += 1 + l + sovGenesis(uint64(l)) l = m.ClaimProposalParams.Size() n += 1 + l + sovGenesis(uint64(l)) + l = m.DistributionParams.Size() + n += 1 + l + sovGenesis(uint64(l)) l = m.TotalCollateral.Size() n += 1 + l + sovGenesis(uint64(l)) l = m.TotalWithdrawing.Size() @@ -994,7 +1110,7 @@ func (m *GenesisState) Size() (n int) { if len(m.Withdraws) > 0 { for _, e := range m.Withdraws { l = e.Size() - n += 1 + l + sovGenesis(uint64(l)) + n += 2 + l + sovGenesis(uint64(l)) } } l = github_com_gogo_protobuf_types.SizeOfStdTime(m.LastUpdateTime) @@ -1119,6 +1235,21 @@ func (m *ClaimProposalParams) Size() (n int) { return n } +func (m *DistributionParams) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = m.ModelParamA.Size() + n += 1 + l + sovGenesis(uint64(l)) + l = m.ModelParamB.Size() + n += 1 + l + sovGenesis(uint64(l)) + l = m.TargetLeverage.Size() + n += 1 + l + sovGenesis(uint64(l)) + return n +} + func sovGenesis(x uint64) (n int) { return (math_bits.Len64(x|1) + 6) / 7 } @@ -1291,6 +1422,39 @@ func (m *GenesisState) Unmarshal(dAtA []byte) error { } iNdEx = postIndex case 6: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field DistributionParams", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGenesis + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthGenesis + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthGenesis + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if err := m.DistributionParams.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 7: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field TotalCollateral", wireType) } @@ -1324,7 +1488,7 @@ func (m *GenesisState) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 7: + case 8: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field TotalWithdrawing", wireType) } @@ -1358,7 +1522,7 @@ func (m *GenesisState) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 8: + case 9: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field TotalShield", wireType) } @@ -1392,7 +1556,7 @@ func (m *GenesisState) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 9: + case 10: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field TotalClaimed", wireType) } @@ -1426,7 +1590,7 @@ func (m *GenesisState) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 10: + case 11: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field ServiceFees", wireType) } @@ -1459,7 +1623,7 @@ func (m *GenesisState) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 11: + case 12: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field RemainingServiceFees", wireType) } @@ -1492,7 +1656,7 @@ func (m *GenesisState) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 12: + case 13: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Pools", wireType) } @@ -1526,7 +1690,7 @@ func (m *GenesisState) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 13: + case 14: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Providers", wireType) } @@ -1560,7 +1724,7 @@ func (m *GenesisState) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 14: + case 15: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field PurchaseLists", wireType) } @@ -1594,7 +1758,7 @@ func (m *GenesisState) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 15: + case 16: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Withdraws", wireType) } @@ -1628,7 +1792,7 @@ func (m *GenesisState) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 16: + case 17: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field LastUpdateTime", wireType) } @@ -1661,7 +1825,7 @@ func (m *GenesisState) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 17: + case 18: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field ShieldStakingRate", wireType) } @@ -1695,7 +1859,7 @@ func (m *GenesisState) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 18: + case 19: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field GlobalStakingPool", wireType) } @@ -1729,7 +1893,7 @@ func (m *GenesisState) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 19: + case 20: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field StakeForShields", wireType) } @@ -1763,7 +1927,7 @@ func (m *GenesisState) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 20: + case 21: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field OriginalStakings", wireType) } @@ -1797,7 +1961,7 @@ func (m *GenesisState) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 21: + case 22: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field ProposalIDReimbursementPairs", wireType) } @@ -2660,6 +2824,161 @@ func (m *ClaimProposalParams) Unmarshal(dAtA []byte) error { } return nil } +func (m *DistributionParams) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGenesis + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: DistributionParams: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: DistributionParams: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ModelParamA", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGenesis + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthGenesis + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthGenesis + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if err := m.ModelParamA.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ModelParamB", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGenesis + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthGenesis + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthGenesis + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if err := m.ModelParamB.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field TargetLeverage", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGenesis + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthGenesis + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthGenesis + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if err := m.TargetLeverage.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipGenesis(dAtA[iNdEx:]) + if err != nil { + return err + } + if skippy < 0 { + return ErrInvalidLengthGenesis + } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthGenesis + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} func skipGenesis(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 diff --git a/x/shield/types/params.go b/x/shield/types/params.go index ef518da1e..4298acc04 100644 --- a/x/shield/types/params.go +++ b/x/shield/types/params.go @@ -35,6 +35,7 @@ var ( ParamStoreKeyPoolParams = []byte("shieldpoolparams") ParamStoreKeyClaimProposalParams = []byte("claimproposalparams") ParamStoreKeyStakingShieldRate = []byte("stakingshieldrateparams") + ParamStoreKeyDistribution = []byte("distributionparams") ) // ParamKeyTable is the key declaration for parameters. From 4dac560790ae82fe28857e334b03510fa3eba0e0 Mon Sep 17 00:00:00 2001 From: yoongbok lee Date: Wed, 25 May 2022 15:30:34 +0900 Subject: [PATCH 05/14] add distribution params --- proto/shentu/shield/v1alpha1/genesis.proto | 2 +- x/shield/genesis.go | 4 +- x/shield/keeper/params.go | 4 +- x/shield/types/genesis.go | 4 +- x/shield/types/genesis.pb.go | 219 ++++++++++----------- x/shield/types/params.go | 50 +++++ 6 files changed, 168 insertions(+), 115 deletions(-) diff --git a/proto/shentu/shield/v1alpha1/genesis.proto b/proto/shentu/shield/v1alpha1/genesis.proto index 6007b6e5f..1831829cc 100644 --- a/proto/shentu/shield/v1alpha1/genesis.proto +++ b/proto/shentu/shield/v1alpha1/genesis.proto @@ -94,5 +94,5 @@ message DistributionParams { string model_param_a = 1 [ (gogoproto.moretags) = "yaml:\"model_param_a\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false ]; string model_param_b = 2 [ (gogoproto.moretags) = "yaml:\"model_param_b\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false ]; - string target_leverage = 3 [ (gogoproto.moretags) = "yaml:\"target_leverage\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false ]; + string max_leverage = 3 [ (gogoproto.moretags) = "yaml:\"max_leverage\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false ]; } diff --git a/x/shield/genesis.go b/x/shield/genesis.go index 9c2407085..0523e2641 100644 --- a/x/shield/genesis.go +++ b/x/shield/genesis.go @@ -15,6 +15,7 @@ import ( func InitGenesis(ctx sdk.Context, k keeper.Keeper, data types.GenesisState) []abci.ValidatorUpdate { k.SetPoolParams(ctx, data.PoolParams) k.SetClaimProposalParams(ctx, data.ClaimProposalParams) + k.SetDistributionParams(ctx, data.DistributionParams) adminAddr := sdk.AccAddress{} var err error @@ -77,6 +78,7 @@ func InitGenesis(ctx sdk.Context, k keeper.Keeper, data types.GenesisState) []ab func ExportGenesis(ctx sdk.Context, k keeper.Keeper) types.GenesisState { poolParams := k.GetPoolParams(ctx) claimProposalParams := k.GetClaimProposalParams(ctx) + distrParams := k.GetDistributionParams(ctx) shieldAdmin := k.GetAdmin(ctx) totalCollateral := k.GetTotalCollateral(ctx) totalWithdrawing := k.GetTotalWithdrawing(ctx) @@ -97,7 +99,7 @@ func ExportGenesis(ctx sdk.Context, k keeper.Keeper) types.GenesisState { originalStaking := k.GetAllOriginalStakings(ctx) reimbursements := k.GetAllProposalIDReimbursementPairs(ctx) - return types.NewGenesisState(shieldAdmin, nextPoolID, nextPurchaseID, poolParams, claimProposalParams, + return types.NewGenesisState(shieldAdmin, nextPoolID, nextPurchaseID, poolParams, claimProposalParams, distrParams, totalCollateral, totalWithdrawing, totalShield, totalClaimed, serviceFees, remainingServiceFees, pools, providers, purchaseLists, withdraws, lastUpdateTime, stakingPurchaseRate, globalStakingPool, stakingPurchases, originalStaking, reimbursements) } diff --git a/x/shield/keeper/params.go b/x/shield/keeper/params.go index ea80229c6..6e7622f37 100644 --- a/x/shield/keeper/params.go +++ b/x/shield/keeper/params.go @@ -48,6 +48,6 @@ func (k Keeper) GetDistributionParams(ctx sdk.Context) (distrParams types.Distri } // SetDistributionParams sets distribution parameters. -func (k Keeper) SetDistributionParams(ctx sdk.Context, distrParams types.D) { - k.paramSpace.Set(ctx, types.ParamStoreKeyDistribution, &rate) +func (k Keeper) SetDistributionParams(ctx sdk.Context, dp types.DistributionParams) { + k.paramSpace.Set(ctx, types.ParamStoreKeyDistribution, &dp) } diff --git a/x/shield/types/genesis.go b/x/shield/types/genesis.go index adf9fe0a9..4e2b66cbd 100644 --- a/x/shield/types/genesis.go +++ b/x/shield/types/genesis.go @@ -11,7 +11,7 @@ import ( // NewGenesisState creates a new genesis state. func NewGenesisState(shieldAdmin sdk.AccAddress, nextPoolID, nextPurchaseID uint64, poolParams PoolParams, - claimProposalParams ClaimProposalParams, totalCollateral, totalWithdrawing, totalShield, totalClaimed sdk.Int, serviceFees, remainingServiceFees MixedDecCoins, + claimProposalParams ClaimProposalParams, distrParams DistributionParams, totalCollateral, totalWithdrawing, totalShield, totalClaimed sdk.Int, serviceFees, remainingServiceFees MixedDecCoins, pools []Pool, providers []Provider, purchase []PurchaseList, withdraws []Withdraw, lastUpdateTime time.Time, sSRate sdk.Dec, globalStakingPool sdk.Int, stakingPurchases []ShieldStaking, originalStaking []OriginalStaking, proposalIDReimbursementPairs []ProposalIDReimbursementPair) GenesisState { return GenesisState{ @@ -20,6 +20,7 @@ func NewGenesisState(shieldAdmin sdk.AccAddress, nextPoolID, nextPurchaseID uint NextPurchaseId: nextPurchaseID, PoolParams: poolParams, ClaimProposalParams: claimProposalParams, + DistributionParams: distrParams, TotalCollateral: totalCollateral, TotalWithdrawing: totalWithdrawing, TotalShield: totalShield, @@ -46,6 +47,7 @@ func DefaultGenesisState() *GenesisState { NextPurchaseId: uint64(1), PoolParams: DefaultPoolParams(), ClaimProposalParams: DefaultClaimProposalParams(), + DistributionParams: DefaultDistributionParams(),, TotalCollateral: sdk.ZeroInt(), TotalWithdrawing: sdk.ZeroInt(), TotalShield: sdk.ZeroInt(), diff --git a/x/shield/types/genesis.pb.go b/x/shield/types/genesis.pb.go index 13a83cdde..e7fa13342 100644 --- a/x/shield/types/genesis.pb.go +++ b/x/shield/types/genesis.pb.go @@ -290,9 +290,9 @@ var xxx_messageInfo_ClaimProposalParams proto.InternalMessageInfo // BlockRewardParams defines the parameters for shield block reward. type DistributionParams struct { - ModelParamA github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,1,opt,name=model_param_a,json=modelParamA,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"model_param_a" yaml:"model_param_a"` - ModelParamB github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,2,opt,name=model_param_b,json=modelParamB,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"model_param_b" yaml:"model_param_b"` - TargetLeverage github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,3,opt,name=target_leverage,json=targetLeverage,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"target_leverage" yaml:"target_leverage"` + ModelParamA github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,1,opt,name=model_param_a,json=modelParamA,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"model_param_a" yaml:"model_param_a"` + ModelParamB github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,2,opt,name=model_param_b,json=modelParamB,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"model_param_b" yaml:"model_param_b"` + MaxLeverage github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,3,opt,name=max_leverage,json=maxLeverage,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"max_leverage" yaml:"max_leverage"` } func (m *DistributionParams) Reset() { *m = DistributionParams{} } @@ -343,108 +343,107 @@ func init() { } var fileDescriptor_c089c09a119aaa04 = []byte{ - // 1606 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x58, 0xcf, 0x6f, 0x1b, 0xc5, - 0x17, 0x8f, 0xf3, 0xa3, 0xdf, 0x66, 0x6c, 0x27, 0xf6, 0x38, 0x4d, 0xf7, 0x9b, 0xe6, 0x6b, 0x47, - 0xd3, 0xf6, 0x4b, 0x04, 0xaa, 0x4d, 0xda, 0x03, 0xd0, 0x0b, 0xaa, 0x93, 0x86, 0x06, 0x82, 0x88, - 0x36, 0xa0, 0x22, 0x10, 0x5a, 0xc6, 0xde, 0x89, 0x33, 0x64, 0x77, 0x67, 0xd9, 0x19, 0xa7, 0x8d, - 0xa8, 0x84, 0x84, 0x84, 0xc4, 0xb1, 0x17, 0x24, 0xb8, 0xf5, 0x88, 0x90, 0xf8, 0x3f, 0x2a, 0x71, - 0xe9, 0xa9, 0x42, 0x1c, 0x52, 0xd4, 0x5e, 0xe0, 0xda, 0xbf, 0x00, 0xcd, 0x8f, 0xb5, 0x67, 0x1d, - 0x3b, 0xad, 0xa5, 0x9e, 0x92, 0x79, 0xfb, 0xde, 0xe7, 0xf3, 0xe6, 0xcd, 0x7b, 0x6f, 0xde, 0x18, - 0x5c, 0xe2, 0xfb, 0x24, 0x12, 0xdd, 0x06, 0xdf, 0xa7, 0x24, 0xf0, 0x1b, 0x87, 0x6b, 0x38, 0x88, - 0xf7, 0xf1, 0x5a, 0xa3, 0x43, 0x22, 0xc2, 0x29, 0xaf, 0xc7, 0x09, 0x13, 0x0c, 0x2e, 0x6a, 0xad, - 0xba, 0xd6, 0xaa, 0xa7, 0x5a, 0x4b, 0x0b, 0x1d, 0xd6, 0x61, 0x4a, 0xa5, 0x21, 0xff, 0xd3, 0xda, - 0x4b, 0xd5, 0x36, 0xe3, 0x21, 0xe3, 0x8d, 0x16, 0xe6, 0xa4, 0x71, 0xb8, 0xd6, 0x22, 0x02, 0xaf, - 0x35, 0xda, 0x8c, 0x46, 0xe6, 0x7b, 0xad, 0xc3, 0x58, 0x27, 0x20, 0x0d, 0xb5, 0x6a, 0x75, 0xf7, - 0x1a, 0x82, 0x86, 0x84, 0x0b, 0x1c, 0xc6, 0x29, 0xc0, 0xa0, 0x82, 0xdf, 0x4d, 0xb0, 0xa0, 0x2c, - 0x05, 0xb8, 0x38, 0xc2, 0x69, 0xe3, 0x9e, 0x52, 0x42, 0x8f, 0x21, 0x28, 0xbc, 0xa7, 0x77, 0xb1, - 0x2b, 0xb0, 0x20, 0xf0, 0x3a, 0x28, 0x68, 0x05, 0x0f, 0xfb, 0x21, 0x8d, 0x9c, 0xdc, 0x4a, 0x6e, - 0x75, 0xb6, 0x79, 0xfe, 0xf9, 0x71, 0xad, 0x72, 0x84, 0xc3, 0xe0, 0x3a, 0xb2, 0xbf, 0x22, 0x37, - 0xaf, 0x97, 0x37, 0xe4, 0x0a, 0xbe, 0x03, 0x0a, 0x11, 0xb9, 0x2b, 0xbc, 0x98, 0xb1, 0xc0, 0xa3, - 0xbe, 0x33, 0xb9, 0x92, 0x5b, 0x9d, 0xb6, 0x6d, 0xed, 0xaf, 0xc8, 0x05, 0x72, 0xb9, 0xc3, 0x58, - 0xb0, 0xe5, 0xc3, 0x9b, 0xa0, 0xa4, 0x3f, 0x76, 0x93, 0xf6, 0x3e, 0xe6, 0x44, 0x9a, 0x4f, 0x29, - 0xf3, 0x0b, 0xcf, 0x8f, 0x6b, 0xe7, 0x6d, 0xf3, 0xbe, 0x06, 0x72, 0xe7, 0x14, 0x84, 0x91, 0x6c, - 0xf9, 0xd0, 0x03, 0x79, 0x05, 0x1f, 0xe3, 0x04, 0x87, 0xdc, 0x99, 0x5e, 0xc9, 0xad, 0xe6, 0xaf, - 0xa2, 0xfa, 0xf0, 0x83, 0xa9, 0x4b, 0xee, 0x1d, 0xa5, 0xd9, 0x5c, 0x7a, 0x78, 0x5c, 0x9b, 0x78, - 0x7e, 0x5c, 0x83, 0x9a, 0xc9, 0x02, 0x41, 0x2e, 0x88, 0x7b, 0x7a, 0xf0, 0xfb, 0x1c, 0x38, 0xd7, - 0x0e, 0x30, 0x0d, 0xbd, 0x38, 0x61, 0x31, 0xe3, 0xb8, 0xc7, 0x35, 0xa3, 0xb8, 0xde, 0x18, 0xc5, - 0xb5, 0x2e, 0x8d, 0x76, 0x8c, 0x8d, 0x21, 0xbd, 0x64, 0x48, 0x97, 0x35, 0xe9, 0x50, 0x5c, 0xe4, - 0x56, 0xda, 0x27, 0x4d, 0xe1, 0xb7, 0xa0, 0xe2, 0x53, 0x2e, 0x12, 0xda, 0xea, 0xca, 0x23, 0x4f, - 0x9d, 0x38, 0xa3, 0x9c, 0x78, 0x7d, 0x94, 0x13, 0x1b, 0x96, 0x89, 0xf1, 0x01, 0x19, 0x1f, 0x96, - 0xb4, 0x0f, 0x43, 0x40, 0x91, 0x0b, 0xfd, 0x13, 0x76, 0x50, 0x80, 0x92, 0x60, 0x02, 0x07, 0x5e, - 0x9b, 0x05, 0x01, 0x16, 0x24, 0xc1, 0x81, 0xf3, 0x1f, 0x95, 0x2b, 0x5b, 0x12, 0xf1, 0xcf, 0xe3, - 0xda, 0xff, 0x3b, 0x54, 0xec, 0x77, 0x5b, 0xf5, 0x36, 0x0b, 0x1b, 0x26, 0xd7, 0xf5, 0x9f, 0x2b, - 0xdc, 0x3f, 0x68, 0x88, 0xa3, 0x98, 0xf0, 0xfa, 0x56, 0x24, 0xfa, 0xc7, 0x3b, 0x88, 0x87, 0xdc, - 0x79, 0x25, 0x5a, 0xef, 0x49, 0xe0, 0x1d, 0x50, 0xd6, 0x5a, 0x77, 0xa8, 0xd8, 0xf7, 0x13, 0x7c, - 0x87, 0x46, 0x1d, 0xe7, 0xac, 0xa2, 0x7d, 0x7f, 0x6c, 0x5a, 0xc7, 0xa6, 0xb5, 0x00, 0x91, 0xab, - 0xb7, 0x76, 0xbb, 0x2f, 0x82, 0xfb, 0xa0, 0xa0, 0xf5, 0x74, 0x48, 0x9d, 0x59, 0xc5, 0x79, 0x73, - 0x6c, 0xce, 0x8a, 0xcd, 0xa9, 0xb1, 0x90, 0x9b, 0x57, 0xcb, 0x5d, 0xb5, 0x82, 0x07, 0xa0, 0x68, - 0x02, 0x21, 0x8f, 0x9d, 0xf8, 0x0e, 0x50, 0x54, 0x9b, 0x63, 0x53, 0x2d, 0x64, 0xa2, 0xaa, 0xc1, - 0x90, 0xab, 0xb7, 0xb1, 0xae, 0x97, 0x90, 0x80, 0x02, 0x27, 0xc9, 0x21, 0x6d, 0x13, 0x6f, 0x8f, - 0x10, 0xee, 0xe4, 0x55, 0xfe, 0x5c, 0x1e, 0x95, 0x3f, 0x1f, 0xd2, 0xbb, 0xc4, 0xdf, 0x20, 0xed, - 0x75, 0x46, 0x23, 0xde, 0xbc, 0x60, 0x52, 0x27, 0x6d, 0x0c, 0x16, 0x90, 0x6c, 0x0c, 0x7a, 0xb9, - 0x49, 0x08, 0x87, 0xdf, 0xe5, 0xc0, 0x62, 0x42, 0x42, 0x4c, 0x23, 0x1a, 0x75, 0xbc, 0x0c, 0x63, - 0x61, 0x1c, 0xc6, 0xcb, 0x86, 0xf1, 0x7f, 0x9a, 0x71, 0x38, 0x24, 0x72, 0x17, 0x7a, 0x1f, 0x76, - 0x2d, 0x27, 0x6e, 0x81, 0x19, 0x59, 0xc8, 0xdc, 0x29, 0xae, 0x4c, 0xad, 0xe6, 0xaf, 0x2e, 0x9f, - 0xd6, 0x15, 0x9a, 0x0b, 0x86, 0xa9, 0xd0, 0xef, 0x07, 0x1c, 0xb9, 0x1a, 0x00, 0x7e, 0x0a, 0x66, - 0xe3, 0x84, 0x1d, 0x52, 0x9f, 0x24, 0xdc, 0x99, 0x53, 0x68, 0x2b, 0x23, 0xd1, 0x8c, 0x62, 0xd3, - 0x31, 0x88, 0x25, 0x83, 0x98, 0x02, 0x20, 0xb7, 0x0f, 0x06, 0x09, 0x98, 0xeb, 0xf5, 0xb7, 0x80, - 0x72, 0xc1, 0x9d, 0x79, 0x05, 0x7f, 0x69, 0x24, 0xbc, 0xd1, 0xde, 0xa6, 0x5c, 0x9c, 0xa0, 0x30, - 0xdf, 0x38, 0x72, 0x8b, 0xb1, 0xa5, 0xa7, 0x36, 0x90, 0xe6, 0x3b, 0x77, 0x4a, 0xa7, 0x6f, 0x20, - 0xad, 0x82, 0x41, 0xf4, 0x1e, 0x00, 0x72, 0xfb, 0x60, 0x90, 0x82, 0x52, 0x80, 0xb9, 0xf0, 0xba, - 0xb1, 0x8f, 0x05, 0xf1, 0xe4, 0x9d, 0xe5, 0x94, 0xd5, 0x11, 0x2f, 0xd5, 0xf5, 0x7d, 0x55, 0x4f, - 0xef, 0xab, 0xfa, 0xc7, 0xe9, 0x85, 0xd6, 0xbc, 0x68, 0xa0, 0x4d, 0x23, 0x18, 0x44, 0x40, 0xf7, - 0x9f, 0xd4, 0x72, 0xee, 0x9c, 0x14, 0x7f, 0xa2, 0xa4, 0xd2, 0x12, 0xde, 0x03, 0x15, 0x73, 0x17, - 0x71, 0x81, 0x0f, 0x64, 0x16, 0x24, 0x58, 0x10, 0x07, 0xaa, 0x72, 0xd9, 0x1e, 0xa3, 0x5c, 0x36, - 0x48, 0xbb, 0xdf, 0x00, 0x87, 0x40, 0x22, 0xb7, 0xac, 0xa5, 0xbb, 0x5a, 0xe8, 0xca, 0x7b, 0xf2, - 0x1e, 0xa8, 0x74, 0x02, 0xd6, 0x92, 0x55, 0x6c, 0x54, 0x65, 0x6e, 0x38, 0x95, 0xb1, 0xd9, 0x75, - 0xb1, 0x1a, 0xf6, 0x21, 0x90, 0xc8, 0x2d, 0x6b, 0xa9, 0x61, 0x97, 0xe9, 0x09, 0x39, 0x28, 0x4b, - 0x1d, 0xe2, 0xed, 0xb1, 0xc4, 0xb4, 0x11, 0xee, 0x2c, 0xa8, 0x83, 0x1c, 0x59, 0x4a, 0xbb, 0xf6, - 0x1e, 0x9a, 0x2b, 0x26, 0xe4, 0xa6, 0x09, 0x9e, 0x40, 0x43, 0xee, 0xbc, 0x92, 0x6d, 0xb2, 0x44, - 0x1b, 0x72, 0x78, 0x08, 0xca, 0x2c, 0xa1, 0x1d, 0x1a, 0xf5, 0x3d, 0xe4, 0xce, 0x39, 0x45, 0xfa, - 0xda, 0x28, 0xd2, 0x8f, 0x8c, 0xc1, 0x08, 0xda, 0x13, 0x78, 0xc8, 0x2d, 0xb1, 0xac, 0x09, 0x87, - 0xbf, 0xe4, 0x40, 0x35, 0xbd, 0x15, 0xb7, 0x36, 0xbc, 0x84, 0xd0, 0xb0, 0xd5, 0x4d, 0x38, 0x09, - 0x49, 0x24, 0xbc, 0x18, 0xd3, 0x84, 0x3b, 0x8b, 0xca, 0x8b, 0x6b, 0xa7, 0x14, 0xa1, 0xb1, 0x76, - 0x6d, 0xe3, 0x1d, 0x4c, 0x93, 0xe6, 0x15, 0xe3, 0xd1, 0xe5, 0x5e, 0x5d, 0x9e, 0x42, 0x84, 0xdc, - 0xe5, 0x78, 0x34, 0x16, 0xbf, 0x7e, 0xf6, 0x87, 0x07, 0xb5, 0x89, 0xbf, 0x1f, 0xd4, 0x26, 0xd0, - 0x6f, 0x39, 0x30, 0x3f, 0xb0, 0x79, 0xf8, 0x16, 0xc8, 0xdb, 0xf3, 0x4d, 0x4e, 0xcd, 0x37, 0x8b, - 0xd6, 0xd4, 0x61, 0x8f, 0x36, 0x20, 0xee, 0x8f, 0x35, 0xb7, 0xc1, 0x19, 0x1c, 0xb2, 0x6e, 0x24, - 0xd4, 0x48, 0x35, 0xdb, 0x7c, 0x77, 0xec, 0xfc, 0x2a, 0x6a, 0x06, 0x8d, 0x82, 0x5c, 0x03, 0x67, - 0xf9, 0xfb, 0x7b, 0x0e, 0x5c, 0x38, 0x25, 0x4c, 0xca, 0xf7, 0x74, 0x32, 0x19, 0xea, 0x7b, 0xff, - 0xa3, 0xf4, 0x3d, 0x45, 0xf2, 0x21, 0x05, 0xc5, 0x4c, 0x20, 0xd5, 0x16, 0x4e, 0x49, 0xd3, 0x0c, - 0x75, 0x73, 0xd9, 0x9c, 0xce, 0x42, 0xda, 0xf1, 0xad, 0x8f, 0xc8, 0xcd, 0x22, 0x5b, 0xbb, 0xf9, - 0x71, 0x12, 0x14, 0x33, 0x40, 0xb0, 0xdd, 0x0b, 0x61, 0x4e, 0xe5, 0xca, 0x7f, 0xeb, 0x3a, 0x52, - 0x75, 0x39, 0x7f, 0xd7, 0xcd, 0xfc, 0x5d, 0x97, 0xd7, 0x4c, 0xf3, 0x4d, 0xc9, 0xf9, 0xeb, 0x93, - 0xda, 0xea, 0x4b, 0x44, 0x57, 0xdd, 0x4b, 0x69, 0x38, 0xe1, 0xdb, 0x20, 0xdf, 0x22, 0x11, 0xd9, - 0xa3, 0x6d, 0x8a, 0x93, 0x23, 0x73, 0x58, 0x56, 0x90, 0xac, 0x8f, 0xc8, 0xb5, 0x55, 0xe1, 0xe7, - 0x20, 0x1f, 0xe3, 0x23, 0xd6, 0x15, 0xba, 0x65, 0x4e, 0xbd, 0xb0, 0x65, 0x56, 0x07, 0x06, 0xd6, - 0xbe, 0xb1, 0xee, 0x96, 0x40, 0x4b, 0xa4, 0x81, 0x15, 0x97, 0xc7, 0xd3, 0x00, 0xf4, 0xa7, 0x5e, - 0x18, 0x80, 0xb2, 0x84, 0x26, 0x6d, 0x3d, 0xee, 0x91, 0x84, 0x32, 0x7d, 0xb4, 0x32, 0x3e, 0x83, - 0xdc, 0x1b, 0xe6, 0x79, 0xd1, 0x1b, 0x5b, 0x9d, 0xde, 0xc9, 0x67, 0x11, 0xd0, 0x4f, 0xd2, 0x81, - 0x52, 0x5f, 0xbe, 0xa3, 0xc4, 0x90, 0x83, 0x92, 0xe9, 0xae, 0xf2, 0x9a, 0xd6, 0xdd, 0x7a, 0x72, - 0xec, 0x91, 0x51, 0x77, 0xeb, 0xf3, 0x99, 0x6e, 0xdd, 0xc3, 0x43, 0xee, 0x9c, 0x16, 0xc9, 0x1b, - 0x5f, 0xf5, 0xe9, 0x3d, 0x30, 0x9f, 0xde, 0x4e, 0xe9, 0x06, 0xa7, 0x5e, 0xb4, 0xc1, 0x74, 0x26, - 0x5e, 0xcc, 0xde, 0x74, 0x99, 0xed, 0xcd, 0xa5, 0x52, 0xb3, 0xb9, 0x43, 0x50, 0x56, 0x8f, 0x06, - 0xe3, 0x51, 0x40, 0x43, 0x2a, 0xd4, 0xfb, 0x63, 0xbc, 0xc9, 0x54, 0xef, 0xce, 0xb1, 0x5e, 0x21, - 0x36, 0x20, 0x72, 0xe7, 0xa5, 0x4c, 0x37, 0xe4, 0x6d, 0x29, 0x81, 0xdf, 0x80, 0x4a, 0x48, 0xa3, - 0x54, 0x2b, 0xed, 0x19, 0xce, 0xcc, 0xab, 0x4f, 0xf2, 0x72, 0x48, 0x23, 0xcd, 0x9c, 0x0e, 0x1d, - 0x56, 0x62, 0xfd, 0x3c, 0x0d, 0x2a, 0x43, 0x9e, 0x38, 0xf0, 0x0b, 0x50, 0x30, 0xcf, 0x9a, 0x97, - 0x4c, 0xae, 0x5a, 0x76, 0xa8, 0xb4, 0x8d, 0x75, 0xe0, 0xf3, 0xfa, 0x39, 0xa4, 0xa3, 0xfe, 0x25, - 0x28, 0x9a, 0xcc, 0x37, 0xf8, 0x93, 0x2f, 0xc2, 0x5f, 0xc9, 0x36, 0x94, 0x8c, 0xb5, 0x26, 0x28, - 0x68, 0x99, 0x61, 0x08, 0x40, 0x5e, 0xc6, 0xd7, 0x27, 0x31, 0xe3, 0x54, 0x38, 0x53, 0xaf, 0x3e, - 0xae, 0x20, 0xa4, 0xd1, 0x86, 0x86, 0x97, 0xcf, 0x0c, 0xc3, 0xa4, 0xcb, 0x63, 0x7a, 0xec, 0x67, - 0x86, 0x4e, 0x20, 0x13, 0x3d, 0x1b, 0x0b, 0xb9, 0x79, 0xb3, 0x54, 0x75, 0xe1, 0x81, 0xd9, 0x7e, - 0x15, 0xce, 0x28, 0x9a, 0xe6, 0xd8, 0x34, 0x66, 0x14, 0xb4, 0xca, 0xef, 0xec, 0x9e, 0x29, 0x3c, - 0x2b, 0x37, 0xfe, 0x99, 0x04, 0xf0, 0xe4, 0xcb, 0x13, 0x7e, 0x05, 0x8a, 0x21, 0xf3, 0x89, 0x79, - 0xe8, 0x7a, 0xd8, 0xfc, 0xd4, 0xb0, 0x39, 0xb6, 0x17, 0xe6, 0x28, 0x33, 0x60, 0xc8, 0xcd, 0xab, - 0xb5, 0xe2, 0xba, 0x31, 0xc8, 0xd5, 0x32, 0x7d, 0xe7, 0x95, 0x70, 0xb5, 0x32, 0x5c, 0x4d, 0xf8, - 0x35, 0x98, 0x17, 0x38, 0xe9, 0x10, 0xe1, 0x05, 0xe4, 0x90, 0x24, 0xb8, 0xa3, 0xdb, 0xf9, 0x6c, - 0xf3, 0xd6, 0xd8, 0x6c, 0xa6, 0x01, 0x0d, 0xc0, 0x21, 0x77, 0x4e, 0x4b, 0xb6, 0x8d, 0xa0, 0x1f, - 0xeb, 0xe6, 0x07, 0x0f, 0x9f, 0x56, 0x73, 0x8f, 0x9e, 0x56, 0x73, 0x7f, 0x3d, 0xad, 0xe6, 0xee, - 0x3f, 0xab, 0x4e, 0x3c, 0x7a, 0x56, 0x9d, 0xf8, 0xe3, 0x59, 0x75, 0xe2, 0xb3, 0x35, 0x9b, 0x95, - 0x24, 0x82, 0x1e, 0xec, 0xb1, 0x6e, 0xe4, 0xab, 0xaa, 0x68, 0x98, 0x9f, 0x8a, 0xee, 0xa6, 0x3f, - 0x16, 0x29, 0x27, 0x5a, 0x67, 0x54, 0xf9, 0x5c, 0xfb, 0x37, 0x00, 0x00, 0xff, 0xff, 0xa6, 0x51, - 0xb1, 0x5e, 0xff, 0x12, 0x00, 0x00, + // 1598 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x58, 0x4f, 0x6f, 0x5b, 0xc5, + 0x16, 0x8f, 0xf3, 0xa7, 0xaf, 0x19, 0xdb, 0x89, 0x3d, 0x4e, 0xd3, 0xfb, 0xd2, 0x3c, 0x3b, 0x9a, + 0xb6, 0xef, 0x45, 0x0f, 0xd5, 0x26, 0xed, 0x02, 0xe8, 0x06, 0xd5, 0x49, 0x03, 0x81, 0x20, 0xa2, + 0x1b, 0x50, 0x11, 0x08, 0x5d, 0xc6, 0xbe, 0x13, 0x67, 0xc8, 0xbd, 0x77, 0xae, 0xee, 0x8c, 0xd3, + 0x44, 0x54, 0x42, 0x42, 0x42, 0x62, 0xd9, 0x0d, 0x12, 0xec, 0xba, 0x44, 0x48, 0x7c, 0x8f, 0x4a, + 0x6c, 0xba, 0xaa, 0x10, 0x8b, 0xb4, 0x6a, 0x37, 0xac, 0xfb, 0x09, 0xd0, 0xfc, 0xb9, 0xf6, 0x5c, + 0xc7, 0x4e, 0x6b, 0xd1, 0x55, 0x32, 0xe7, 0x9e, 0xf3, 0xfb, 0x9d, 0x39, 0x73, 0xce, 0x99, 0x33, + 0x06, 0x57, 0xf8, 0x3e, 0x89, 0x44, 0xb7, 0xc1, 0xf7, 0x29, 0x09, 0xfc, 0xc6, 0xe1, 0x1a, 0x0e, + 0xe2, 0x7d, 0xbc, 0xd6, 0xe8, 0x90, 0x88, 0x70, 0xca, 0xeb, 0x71, 0xc2, 0x04, 0x83, 0x8b, 0x5a, + 0xab, 0xae, 0xb5, 0xea, 0xa9, 0xd6, 0xd2, 0x42, 0x87, 0x75, 0x98, 0x52, 0x69, 0xc8, 0xff, 0xb4, + 0xf6, 0x52, 0xb5, 0xcd, 0x78, 0xc8, 0x78, 0xa3, 0x85, 0x39, 0x69, 0x1c, 0xae, 0xb5, 0x88, 0xc0, + 0x6b, 0x8d, 0x36, 0xa3, 0x91, 0xf9, 0x5e, 0xeb, 0x30, 0xd6, 0x09, 0x48, 0x43, 0xad, 0x5a, 0xdd, + 0xbd, 0x86, 0xa0, 0x21, 0xe1, 0x02, 0x87, 0x71, 0x0a, 0x30, 0xa8, 0xe0, 0x77, 0x13, 0x2c, 0x28, + 0x4b, 0x01, 0x2e, 0x8f, 0x70, 0xda, 0xb8, 0xa7, 0x94, 0xd0, 0x63, 0x08, 0x0a, 0xef, 0xe9, 0x5d, + 0xec, 0x0a, 0x2c, 0x08, 0xbc, 0x09, 0x0a, 0x5a, 0xc1, 0xc3, 0x7e, 0x48, 0x23, 0x27, 0xb7, 0x92, + 0x5b, 0x9d, 0x6d, 0x5e, 0x7c, 0x71, 0x52, 0xab, 0x1c, 0xe3, 0x30, 0xb8, 0x89, 0xec, 0xaf, 0xc8, + 0xcd, 0xeb, 0xe5, 0x2d, 0xb9, 0x82, 0xef, 0x80, 0x42, 0x44, 0x8e, 0x84, 0x17, 0x33, 0x16, 0x78, + 0xd4, 0x77, 0x26, 0x57, 0x72, 0xab, 0xd3, 0xb6, 0xad, 0xfd, 0x15, 0xb9, 0x40, 0x2e, 0x77, 0x18, + 0x0b, 0xb6, 0x7c, 0x78, 0x1b, 0x94, 0xf4, 0xc7, 0x6e, 0xd2, 0xde, 0xc7, 0x9c, 0x48, 0xf3, 0x29, + 0x65, 0x7e, 0xe9, 0xc5, 0x49, 0xed, 0xa2, 0x6d, 0xde, 0xd7, 0x40, 0xee, 0x9c, 0x82, 0x30, 0x92, + 0x2d, 0x1f, 0x7a, 0x20, 0xaf, 0xe0, 0x63, 0x9c, 0xe0, 0x90, 0x3b, 0xd3, 0x2b, 0xb9, 0xd5, 0xfc, + 0x75, 0x54, 0x1f, 0x7e, 0x30, 0x75, 0xc9, 0xbd, 0xa3, 0x34, 0x9b, 0x4b, 0x0f, 0x4f, 0x6a, 0x13, + 0x2f, 0x4e, 0x6a, 0x50, 0x33, 0x59, 0x20, 0xc8, 0x05, 0x71, 0x4f, 0x0f, 0x7e, 0x9f, 0x03, 0x17, + 0xda, 0x01, 0xa6, 0xa1, 0x17, 0x27, 0x2c, 0x66, 0x1c, 0xf7, 0xb8, 0x66, 0x14, 0xd7, 0x1b, 0xa3, + 0xb8, 0xd6, 0xa5, 0xd1, 0x8e, 0xb1, 0x31, 0xa4, 0x57, 0x0c, 0xe9, 0xb2, 0x26, 0x1d, 0x8a, 0x8b, + 0xdc, 0x4a, 0xfb, 0xb4, 0x29, 0xfc, 0x16, 0x54, 0x7c, 0xca, 0x45, 0x42, 0x5b, 0x5d, 0x79, 0xe4, + 0xa9, 0x13, 0xe7, 0x94, 0x13, 0xff, 0x1f, 0xe5, 0xc4, 0x86, 0x65, 0x62, 0x7c, 0x40, 0xc6, 0x87, + 0x25, 0xed, 0xc3, 0x10, 0x50, 0xe4, 0x42, 0xff, 0x94, 0x1d, 0x14, 0xa0, 0x24, 0x98, 0xc0, 0x81, + 0xd7, 0x66, 0x41, 0x80, 0x05, 0x49, 0x70, 0xe0, 0xfc, 0x4b, 0xe5, 0xca, 0x96, 0x44, 0xfc, 0xf3, + 0xa4, 0xf6, 0xdf, 0x0e, 0x15, 0xfb, 0xdd, 0x56, 0xbd, 0xcd, 0xc2, 0x86, 0xc9, 0x75, 0xfd, 0xe7, + 0x1a, 0xf7, 0x0f, 0x1a, 0xe2, 0x38, 0x26, 0xbc, 0xbe, 0x15, 0x89, 0xfe, 0xf1, 0x0e, 0xe2, 0x21, + 0x77, 0x5e, 0x89, 0xd6, 0x7b, 0x12, 0x78, 0x17, 0x94, 0xb5, 0xd6, 0x5d, 0x2a, 0xf6, 0xfd, 0x04, + 0xdf, 0xa5, 0x51, 0xc7, 0x39, 0xaf, 0x68, 0x3f, 0x18, 0x9b, 0xd6, 0xb1, 0x69, 0x2d, 0x40, 0xe4, + 0xea, 0xad, 0xdd, 0xe9, 0x8b, 0xe0, 0x3e, 0x28, 0x68, 0x3d, 0x1d, 0x52, 0x67, 0x56, 0x71, 0xde, + 0x1e, 0x9b, 0xb3, 0x62, 0x73, 0x6a, 0x2c, 0xe4, 0xe6, 0xd5, 0x72, 0x57, 0xad, 0xe0, 0x01, 0x28, + 0x9a, 0x40, 0xc8, 0x63, 0x27, 0xbe, 0x03, 0x14, 0xd5, 0xe6, 0xd8, 0x54, 0x0b, 0x99, 0xa8, 0x6a, + 0x30, 0xe4, 0xea, 0x6d, 0xac, 0xeb, 0x25, 0x24, 0xa0, 0xc0, 0x49, 0x72, 0x48, 0xdb, 0xc4, 0xdb, + 0x23, 0x84, 0x3b, 0x79, 0x95, 0x3f, 0x57, 0x47, 0xe5, 0xcf, 0x47, 0xf4, 0x88, 0xf8, 0x1b, 0xa4, + 0xbd, 0xce, 0x68, 0xc4, 0x9b, 0x97, 0x4c, 0xea, 0xa4, 0x8d, 0xc1, 0x02, 0x92, 0x8d, 0x41, 0x2f, + 0x37, 0x09, 0xe1, 0xf0, 0xbb, 0x1c, 0x58, 0x4c, 0x48, 0x88, 0x69, 0x44, 0xa3, 0x8e, 0x97, 0x61, + 0x2c, 0x8c, 0xc3, 0x78, 0xd5, 0x30, 0xfe, 0x47, 0x33, 0x0e, 0x87, 0x44, 0xee, 0x42, 0xef, 0xc3, + 0xae, 0xe5, 0xc4, 0xfb, 0x60, 0x46, 0x16, 0x32, 0x77, 0x8a, 0x2b, 0x53, 0xab, 0xf9, 0xeb, 0xcb, + 0x67, 0x75, 0x85, 0xe6, 0x82, 0x61, 0x2a, 0xf4, 0xfb, 0x01, 0x47, 0xae, 0x06, 0x80, 0x9f, 0x81, + 0xd9, 0x38, 0x61, 0x87, 0xd4, 0x27, 0x09, 0x77, 0xe6, 0x14, 0xda, 0xca, 0x48, 0x34, 0xa3, 0xd8, + 0x74, 0x0c, 0x62, 0xc9, 0x20, 0xa6, 0x00, 0xc8, 0xed, 0x83, 0x41, 0x02, 0xe6, 0x7a, 0xfd, 0x2d, + 0xa0, 0x5c, 0x70, 0x67, 0x5e, 0xc1, 0x5f, 0x19, 0x09, 0x6f, 0xb4, 0xb7, 0x29, 0x17, 0xa7, 0x28, + 0xcc, 0x37, 0x8e, 0xdc, 0x62, 0x6c, 0xe9, 0xa9, 0x0d, 0xa4, 0xf9, 0xce, 0x9d, 0xd2, 0xd9, 0x1b, + 0x48, 0xab, 0x60, 0x10, 0xbd, 0x07, 0x80, 0xdc, 0x3e, 0x18, 0xa4, 0xa0, 0x14, 0x60, 0x2e, 0xbc, + 0x6e, 0xec, 0x63, 0x41, 0x3c, 0x79, 0x67, 0x39, 0x65, 0x75, 0xc4, 0x4b, 0x75, 0x7d, 0x5f, 0xd5, + 0xd3, 0xfb, 0xaa, 0xfe, 0x49, 0x7a, 0xa1, 0x35, 0x2f, 0x1b, 0x68, 0xd3, 0x08, 0x06, 0x11, 0xd0, + 0xfd, 0x27, 0xb5, 0x9c, 0x3b, 0x27, 0xc5, 0x9f, 0x2a, 0xa9, 0xb4, 0x84, 0xf7, 0x40, 0xc5, 0xdc, + 0x45, 0x5c, 0xe0, 0x03, 0x99, 0x05, 0x09, 0x16, 0xc4, 0x81, 0xaa, 0x5c, 0xb6, 0xc7, 0x28, 0x97, + 0x0d, 0xd2, 0xee, 0x37, 0xc0, 0x21, 0x90, 0xc8, 0x2d, 0x6b, 0xe9, 0xae, 0x16, 0xba, 0xf2, 0x9e, + 0xbc, 0x07, 0x2a, 0x9d, 0x80, 0xb5, 0x64, 0x15, 0x1b, 0x55, 0x99, 0x1b, 0x4e, 0x65, 0x6c, 0x76, + 0x5d, 0xac, 0x86, 0x7d, 0x08, 0x24, 0x72, 0xcb, 0x5a, 0x6a, 0xd8, 0x65, 0x7a, 0x42, 0x0e, 0xca, + 0x52, 0x87, 0x78, 0x7b, 0x2c, 0x31, 0x6d, 0x84, 0x3b, 0x0b, 0xea, 0x20, 0x47, 0x96, 0xd2, 0xae, + 0xbd, 0x87, 0xe6, 0x8a, 0x09, 0xb9, 0x69, 0x82, 0xa7, 0xd0, 0x90, 0x3b, 0xaf, 0x64, 0x9b, 0x2c, + 0xd1, 0x86, 0x1c, 0x1e, 0x82, 0x32, 0x4b, 0x68, 0x87, 0x46, 0x7d, 0x0f, 0xb9, 0x73, 0x41, 0x91, + 0xfe, 0x6f, 0x14, 0xe9, 0xc7, 0xc6, 0x60, 0x04, 0xed, 0x29, 0x3c, 0xe4, 0x96, 0x58, 0xd6, 0x84, + 0xc3, 0x5f, 0x72, 0xa0, 0x9a, 0xde, 0x8a, 0x5b, 0x1b, 0x5e, 0x42, 0x68, 0xd8, 0xea, 0x26, 0x9c, + 0x84, 0x24, 0x12, 0x5e, 0x8c, 0x69, 0xc2, 0x9d, 0x45, 0xe5, 0xc5, 0x8d, 0x33, 0x8a, 0xd0, 0x58, + 0xbb, 0xb6, 0xf1, 0x0e, 0xa6, 0x49, 0xf3, 0x9a, 0xf1, 0xe8, 0x6a, 0xaf, 0x2e, 0xcf, 0x20, 0x42, + 0xee, 0x72, 0x3c, 0x1a, 0x8b, 0xdf, 0x3c, 0xff, 0xc3, 0x83, 0xda, 0xc4, 0x5f, 0x0f, 0x6a, 0x13, + 0xe8, 0xb7, 0x1c, 0x98, 0x1f, 0xd8, 0x3c, 0x7c, 0x0b, 0xe4, 0xed, 0xf9, 0x26, 0xa7, 0xe6, 0x9b, + 0x45, 0x6b, 0xea, 0xb0, 0x47, 0x1b, 0x10, 0xf7, 0xc7, 0x9a, 0x3b, 0xe0, 0x1c, 0x0e, 0x59, 0x37, + 0x12, 0x6a, 0xa4, 0x9a, 0x6d, 0xbe, 0x3b, 0x76, 0x7e, 0x15, 0x35, 0x83, 0x46, 0x41, 0xae, 0x81, + 0xb3, 0xfc, 0xfd, 0x3d, 0x07, 0x2e, 0x9d, 0x11, 0x26, 0xe5, 0x7b, 0x3a, 0x99, 0x0c, 0xf5, 0xbd, + 0xff, 0x51, 0xfa, 0x9e, 0x22, 0xf9, 0x90, 0x82, 0x62, 0x26, 0x90, 0x6a, 0x0b, 0x67, 0xa4, 0x69, + 0x86, 0xba, 0xb9, 0x6c, 0x4e, 0x67, 0x21, 0xed, 0xf8, 0xd6, 0x47, 0xe4, 0x66, 0x91, 0xad, 0xdd, + 0xfc, 0x38, 0x09, 0x8a, 0x19, 0x20, 0xd8, 0xee, 0x85, 0x30, 0xa7, 0x72, 0xe5, 0xdf, 0x75, 0x1d, + 0xa9, 0xba, 0x9c, 0xbf, 0xeb, 0x66, 0xfe, 0xae, 0xcb, 0x6b, 0xa6, 0xf9, 0xa6, 0xe4, 0xfc, 0xf5, + 0x49, 0x6d, 0xf5, 0x15, 0xa2, 0xab, 0xee, 0xa5, 0x34, 0x9c, 0xf0, 0x6d, 0x90, 0x6f, 0x91, 0x88, + 0xec, 0xd1, 0x36, 0xc5, 0xc9, 0xb1, 0x39, 0x2c, 0x2b, 0x48, 0xd6, 0x47, 0xe4, 0xda, 0xaa, 0xf0, + 0x0b, 0x90, 0x8f, 0xf1, 0x31, 0xeb, 0x0a, 0xdd, 0x32, 0xa7, 0x5e, 0xda, 0x32, 0xab, 0x03, 0x03, + 0x6b, 0xdf, 0x58, 0x77, 0x4b, 0xa0, 0x25, 0xd2, 0xc0, 0x8a, 0xcb, 0xe3, 0x69, 0x00, 0xfa, 0x53, + 0x2f, 0x0c, 0x40, 0x59, 0x42, 0x93, 0xb6, 0x1e, 0xf7, 0x48, 0x42, 0x99, 0x3e, 0x5a, 0x19, 0x9f, + 0x41, 0xee, 0x0d, 0xf3, 0xbc, 0xe8, 0x8d, 0xad, 0x4e, 0xef, 0xe4, 0xb3, 0x08, 0xe8, 0x27, 0xe9, + 0x40, 0xa9, 0x2f, 0xdf, 0x51, 0x62, 0xc8, 0x41, 0xc9, 0x74, 0x57, 0x79, 0x4d, 0xeb, 0x6e, 0x3d, + 0x39, 0xf6, 0xc8, 0xa8, 0xbb, 0xf5, 0xc5, 0x4c, 0xb7, 0xee, 0xe1, 0x21, 0x77, 0x4e, 0x8b, 0xe4, + 0x8d, 0xaf, 0xfa, 0xf4, 0x1e, 0x98, 0x4f, 0x6f, 0xa7, 0x74, 0x83, 0x53, 0x2f, 0xdb, 0x60, 0x3a, + 0x13, 0x2f, 0x66, 0x6f, 0xba, 0xcc, 0xf6, 0xe6, 0x52, 0xa9, 0xd9, 0xdc, 0x21, 0x28, 0xab, 0x47, + 0x83, 0xf1, 0x28, 0xa0, 0x21, 0x15, 0xea, 0xfd, 0x31, 0xde, 0x64, 0xaa, 0x77, 0xe7, 0x58, 0xaf, + 0x10, 0x1b, 0x10, 0xb9, 0xf3, 0x52, 0xa6, 0x1b, 0xf2, 0xb6, 0x94, 0xc0, 0x6f, 0x40, 0x25, 0xa4, + 0x51, 0xaa, 0x95, 0xf6, 0x0c, 0x67, 0xe6, 0xf5, 0x27, 0x79, 0x39, 0xa4, 0x91, 0x66, 0x4e, 0x87, + 0x0e, 0x2b, 0xb1, 0x7e, 0x9e, 0x06, 0x95, 0x21, 0x4f, 0x1c, 0xf8, 0x25, 0x28, 0x98, 0x67, 0xcd, + 0x2b, 0x26, 0x57, 0x2d, 0x3b, 0x54, 0xda, 0xc6, 0x3a, 0xf0, 0x79, 0xfd, 0x1c, 0xd2, 0x51, 0xff, + 0x0a, 0x14, 0x4d, 0xe6, 0x1b, 0xfc, 0xc9, 0x97, 0xe1, 0xaf, 0x64, 0x1b, 0x4a, 0xc6, 0x5a, 0x13, + 0x14, 0xb4, 0xcc, 0x30, 0x04, 0x20, 0x2f, 0xe3, 0xeb, 0x93, 0x98, 0x71, 0x2a, 0x9c, 0xa9, 0xd7, + 0x1f, 0x57, 0x10, 0xd2, 0x68, 0x43, 0xc3, 0xcb, 0x67, 0x86, 0x61, 0xd2, 0xe5, 0x31, 0x3d, 0xf6, + 0x33, 0x43, 0x27, 0x90, 0x89, 0x9e, 0x8d, 0x85, 0xdc, 0xbc, 0x59, 0xaa, 0xba, 0xf0, 0xc0, 0x6c, + 0xbf, 0x0a, 0x67, 0x14, 0x4d, 0x73, 0x6c, 0x1a, 0x33, 0x0a, 0x5a, 0xe5, 0x77, 0x7e, 0xcf, 0x14, + 0x9e, 0x95, 0x1b, 0x4f, 0x27, 0x01, 0x3c, 0xfd, 0xf2, 0x84, 0x5f, 0x83, 0x62, 0xc8, 0x7c, 0x62, + 0x1e, 0xba, 0x1e, 0x36, 0x3f, 0x35, 0x6c, 0x8e, 0xed, 0x85, 0x39, 0xca, 0x0c, 0x18, 0x72, 0xf3, + 0x6a, 0xad, 0xb8, 0x6e, 0x0d, 0x72, 0xb5, 0x4c, 0xdf, 0x79, 0x2d, 0x5c, 0xad, 0x0c, 0x57, 0x53, + 0x9e, 0x61, 0x88, 0x8f, 0xbc, 0x80, 0x1c, 0x92, 0x04, 0x77, 0x74, 0x2f, 0xff, 0x07, 0x67, 0x68, + 0x63, 0x49, 0x26, 0x7c, 0xb4, 0x6d, 0x56, 0xfd, 0x10, 0x37, 0x3f, 0x7c, 0xf8, 0xac, 0x9a, 0x7b, + 0xf4, 0xac, 0x9a, 0x7b, 0xfa, 0xac, 0x9a, 0xbb, 0xff, 0xbc, 0x3a, 0xf1, 0xe8, 0x79, 0x75, 0xe2, + 0x8f, 0xe7, 0xd5, 0x89, 0xcf, 0xd7, 0x6c, 0x3e, 0x92, 0x08, 0x7a, 0xb0, 0xc7, 0xba, 0x91, 0xaf, + 0x8a, 0xa1, 0x61, 0x7e, 0x21, 0x3a, 0x4a, 0x7f, 0x23, 0x52, 0xf4, 0xad, 0x73, 0xaa, 0x6a, 0x6e, + 0xfc, 0x1d, 0x00, 0x00, 0xff, 0xff, 0xb3, 0x31, 0x41, 0x36, 0xf6, 0x12, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { @@ -1012,9 +1011,9 @@ func (m *DistributionParams) MarshalToSizedBuffer(dAtA []byte) (int, error) { var l int _ = l { - size := m.TargetLeverage.Size() + size := m.MaxLeverage.Size() i -= size - if _, err := m.TargetLeverage.MarshalTo(dAtA[i:]); err != nil { + if _, err := m.MaxLeverage.MarshalTo(dAtA[i:]); err != nil { return 0, err } i = encodeVarintGenesis(dAtA, i, uint64(size)) @@ -1245,7 +1244,7 @@ func (m *DistributionParams) Size() (n int) { n += 1 + l + sovGenesis(uint64(l)) l = m.ModelParamB.Size() n += 1 + l + sovGenesis(uint64(l)) - l = m.TargetLeverage.Size() + l = m.MaxLeverage.Size() n += 1 + l + sovGenesis(uint64(l)) return n } @@ -2923,7 +2922,7 @@ func (m *DistributionParams) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 3: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field TargetLeverage", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field MaxLeverage", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -2951,7 +2950,7 @@ func (m *DistributionParams) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if err := m.TargetLeverage.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.MaxLeverage.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex diff --git a/x/shield/types/params.go b/x/shield/types/params.go index 4298acc04..06a5d6aad 100644 --- a/x/shield/types/params.go +++ b/x/shield/types/params.go @@ -26,6 +26,11 @@ var ( DefaultClaimProposalDepositRate = sdk.NewDecWithPrec(10, 2) // 10% DefaultClaimProposalFeesRate = sdk.NewDecWithPrec(1, 2) // 1% + // default distribution parameters + DefaultA = sdk.NewDecWithPrec(10, 2) // 0.1 + DefaultB = sdk.NewDecWithPrec(30, 2) // 0.3 + DefaultL = sdk.NewDecWithPrec(1, 0) // 1 + // default value for staking-shield rate parameter DefaultStakingShieldRate = sdk.NewDec(2) ) @@ -148,6 +153,51 @@ func DefaultStakingShieldRateParams() sdk.Dec { return sdk.NewDec(2) } +// NewDistributionParams creates a new DistributionParams instance. +func NewDistributionParams(a, b, L sdk.Dec) DistributionParams { + return DistributionParams{ + ModelParamA: a, + ModelParamB: b, + TargetLeverage: L, + } +} + +// DefaultDistributionParams returns a default DistributionParams instance. +func DefaultDistributionParams() DistributionParams { + return NewDistributionParams(DefaultA, DefaultB, DefaultL) +} + +func validateDistributionParams(i interface{}) error { + v, ok := i.(DistributionParams) + if !ok { + return fmt.Errorf("invalid parameter type: %T", i) + } + claimPeriod := v.ModelParamA + claimPeriod := v.ModelParamB + claimPeriod := v.TargetLeverage + + if claimPeriod <= 0 { + return fmt.Errorf("claim period must be positive: %s", claimPeriod) + } + if payoutPeriod <= 0 { + return fmt.Errorf("payout period must be positive: %s", payoutPeriod) + } + if !minDeposit.IsValid() { + return fmt.Errorf("minimum deposit amount must be a valid sdk.Coins amount, is %s", + minDeposit.String()) + } + if depositRate.IsNegative() || depositRate.GT(sdk.OneDec()) { + return fmt.Errorf("deposit rate should be positive and less or equal to one but is %s", + depositRate.String()) + } + if feesRate.IsNegative() || feesRate.GT(sdk.OneDec()) { + return fmt.Errorf("fees rate should be positive and less or equal to one but is %s", + feesRate.String()) + } + + return nil +} + func validateStakingShieldRateParams(i interface{}) error { v, ok := i.(sdk.Dec) if !ok { From 0dbcfa0f3773dfb46b94e29bd74599020eb3ffda Mon Sep 17 00:00:00 2001 From: yoongbok lee Date: Wed, 25 May 2022 15:34:02 +0900 Subject: [PATCH 06/14] buildable first commit --- x/shield/keeper/rewards.go | 6 +++--- x/shield/types/genesis.go | 2 +- x/shield/types/params.go | 34 +++++++++++++--------------------- 3 files changed, 17 insertions(+), 25 deletions(-) diff --git a/x/shield/keeper/rewards.go b/x/shield/keeper/rewards.go index 57fe58c78..c2e45ae2b 100644 --- a/x/shield/keeper/rewards.go +++ b/x/shield/keeper/rewards.go @@ -50,9 +50,9 @@ func (k Keeper) GetShieldBlockRewardRatio(ctx sdk.Context) sdk.Dec { } blockRewardParams := k.GetDistributionParams(ctx) - modelParamA := blockRewardParams.ModelParamA // a - modelParamB := blockRewardParams.ModelParamB // b - targetLeverage := blockRewardParams.TargetLeverage // L + modelParamA := blockRewardParams.ModelParamA // a + modelParamB := blockRewardParams.ModelParamB // b + targetLeverage := blockRewardParams.MaxLeverage // L /* The non-linear model: * c+n l d diff --git a/x/shield/types/genesis.go b/x/shield/types/genesis.go index 4e2b66cbd..209321260 100644 --- a/x/shield/types/genesis.go +++ b/x/shield/types/genesis.go @@ -47,7 +47,7 @@ func DefaultGenesisState() *GenesisState { NextPurchaseId: uint64(1), PoolParams: DefaultPoolParams(), ClaimProposalParams: DefaultClaimProposalParams(), - DistributionParams: DefaultDistributionParams(),, + DistributionParams: DefaultDistributionParams(), TotalCollateral: sdk.ZeroInt(), TotalWithdrawing: sdk.ZeroInt(), TotalShield: sdk.ZeroInt(), diff --git a/x/shield/types/params.go b/x/shield/types/params.go index 06a5d6aad..d20405d86 100644 --- a/x/shield/types/params.go +++ b/x/shield/types/params.go @@ -49,6 +49,7 @@ func ParamKeyTable() paramtypes.KeyTable { paramtypes.NewParamSetPair(ParamStoreKeyPoolParams, PoolParams{}, validatePoolParams), paramtypes.NewParamSetPair(ParamStoreKeyClaimProposalParams, ClaimProposalParams{}, validateClaimProposalParams), paramtypes.NewParamSetPair(ParamStoreKeyStakingShieldRate, sdk.Dec{}, validateStakingShieldRateParams), + paramtypes.NewParamSetPair(ParamStoreKeyDistribution, DistributionParams{}, validateDistributionParams), ) } @@ -156,9 +157,9 @@ func DefaultStakingShieldRateParams() sdk.Dec { // NewDistributionParams creates a new DistributionParams instance. func NewDistributionParams(a, b, L sdk.Dec) DistributionParams { return DistributionParams{ - ModelParamA: a, - ModelParamB: b, - TargetLeverage: L, + ModelParamA: a, + ModelParamB: b, + MaxLeverage: L, } } @@ -172,27 +173,18 @@ func validateDistributionParams(i interface{}) error { if !ok { return fmt.Errorf("invalid parameter type: %T", i) } - claimPeriod := v.ModelParamA - claimPeriod := v.ModelParamB - claimPeriod := v.TargetLeverage + a := v.ModelParamA + b := v.ModelParamB + L := v.MaxLeverage - if claimPeriod <= 0 { - return fmt.Errorf("claim period must be positive: %s", claimPeriod) - } - if payoutPeriod <= 0 { - return fmt.Errorf("payout period must be positive: %s", payoutPeriod) + if a.LT(sdk.ZeroDec()) || a.GT(sdk.OneDec()) { + return fmt.Errorf("invalid value for a: %s", a.String()) } - if !minDeposit.IsValid() { - return fmt.Errorf("minimum deposit amount must be a valid sdk.Coins amount, is %s", - minDeposit.String()) + if b.LT(sdk.ZeroDec()) || b.GT(sdk.OneDec()) { + return fmt.Errorf("invalid value for b: %s", b.String()) } - if depositRate.IsNegative() || depositRate.GT(sdk.OneDec()) { - return fmt.Errorf("deposit rate should be positive and less or equal to one but is %s", - depositRate.String()) - } - if feesRate.IsNegative() || feesRate.GT(sdk.OneDec()) { - return fmt.Errorf("fees rate should be positive and less or equal to one but is %s", - feesRate.String()) + if L.LT(sdk.ZeroDec()) { + return fmt.Errorf("invalid value for L: %s", b.String()) } return nil From 19ab62c9d458c372b07323e559fa457b78573dd2 Mon Sep 17 00:00:00 2001 From: yoongbok lee Date: Thu, 26 May 2022 12:16:14 +0900 Subject: [PATCH 07/14] add migration handler --- x/shield/keeper/migrations.go | 24 ++++++++++++++++++++++++ x/shield/legacy/v231/store.go | 20 ++++++++++++++++++++ x/shield/module.go | 6 ++++++ 3 files changed, 50 insertions(+) create mode 100644 x/shield/keeper/migrations.go create mode 100644 x/shield/legacy/v231/store.go diff --git a/x/shield/keeper/migrations.go b/x/shield/keeper/migrations.go new file mode 100644 index 000000000..2f50a6674 --- /dev/null +++ b/x/shield/keeper/migrations.go @@ -0,0 +1,24 @@ +package keeper + +import ( + v231 "github.com/certikfoundation/shentu/v2/x/shield/legacy/v231" + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/gogo/protobuf/grpc" +) + +// Migrator is a struct for handling in-place store migrations. +type Migrator struct { + keeper Keeper + queryServer grpc.Server +} + +// NewMigrator returns a new Migrator. +func NewMigrator(keeper Keeper, queryServer grpc.Server) Migrator { + return Migrator{keeper: keeper, queryServer: queryServer} +} + +// Migrate1to2 migrates from version 1 to 2. +func (m Migrator) Migrate1to2(ctx sdk.Context) error { + v231.MigrateStore(ctx, m.keeper.paramSpace) + return nil +} diff --git a/x/shield/legacy/v231/store.go b/x/shield/legacy/v231/store.go new file mode 100644 index 000000000..faf9d34b8 --- /dev/null +++ b/x/shield/legacy/v231/store.go @@ -0,0 +1,20 @@ +package v231 + +import ( + sdk "github.com/cosmos/cosmos-sdk/types" + + "github.com/certikfoundation/shentu/v2/x/shield/types" +) + +// MigrateStore performs in-place store migrations from v2.3.1/v2.3.2 to v2.4.0. +// The migration includes: +// +// - Setting the MinCommissionRate param in the paramstore +func MigrateStore(ctx sdk.Context, paramstore types.ParamSubspace) { + migrateParamsStore(ctx, paramstore) +} + +func migrateParamsStore(ctx sdk.Context, paramstore types.ParamSubspace) { + blockRewardParams := types.DefaultDistributionParams() + paramstore.Set(ctx, types.ParamStoreKeyDistribution, &blockRewardParams) +} diff --git a/x/shield/module.go b/x/shield/module.go index 88907a839..7129ac4f4 100644 --- a/x/shield/module.go +++ b/x/shield/module.go @@ -141,6 +141,12 @@ func (am AppModule) LegacyQuerierHandler(legacyQuerierCdc *codec.LegacyAmino) sd func (am AppModule) RegisterServices(cfg module.Configurator) { types.RegisterMsgServer(cfg.MsgServer(), keeper.NewMsgServerImpl(am.keeper)) types.RegisterQueryServer(cfg.QueryServer(), am.keeper) + + m := keeper.NewMigrator(am.keeper, cfg.QueryServer()) + err := cfg.RegisterMigration(types.ModuleName, 1, m.Migrate1to2) + if err != nil { + panic(err) + } } // InitGenesis performs genesis initialization for the shield module. From e876f85bf443382eb50344a4c0034cacc5605276 Mon Sep 17 00:00:00 2001 From: yoongbok lee Date: Thu, 26 May 2022 13:58:52 +0900 Subject: [PATCH 08/14] update shield module consensus version --- x/shield/module.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x/shield/module.go b/x/shield/module.go index 7129ac4f4..1086b19a0 100644 --- a/x/shield/module.go +++ b/x/shield/module.go @@ -163,7 +163,7 @@ func (am AppModule) ExportGenesis(ctx sdk.Context, cdc codec.JSONCodec) json.Raw } // ConsensusVersion implements AppModule/ConsensusVersion. -func (AppModule) ConsensusVersion() uint64 { return 1 } +func (AppModule) ConsensusVersion() uint64 { return 2 } // BeginBlock returns the begin blocker for the shield module. func (am AppModule) BeginBlock(ctx sdk.Context, rbb abci.RequestBeginBlock) { From 3b2df17fde875cb73e624a7cf2fada30bc1c8800 Mon Sep 17 00:00:00 2001 From: Raveen Senanayake <75823786+Raveen-Senanayake@users.noreply.github.com> Date: Thu, 26 May 2022 18:43:20 +1000 Subject: [PATCH 09/14] Add upgrade handler shield v2 (#382) * added upgrade handler to yoongbooks pr shield: implement distirbution params * remove unwanted spaces * fix imports * remove unwanted comments --- app/app.go | 3 ++- app/upgrade_handler.go | 40 +++++++++++++++++++++++++++++++---- x/gov/types/gov.pb.go | 2 +- x/gov/types/query.pb.go | 2 +- x/gov/types/query.pb.gw.go | 2 +- x/shield/keeper/migrations.go | 3 ++- 6 files changed, 43 insertions(+), 9 deletions(-) diff --git a/app/app.go b/app/app.go index e5167fa8e..9d9b99def 100644 --- a/app/app.go +++ b/app/app.go @@ -570,7 +570,8 @@ func NewShentuApp(logger log.Logger, db dbm.DB, traceStore io.Writer, loadLatest app.SetBeginBlocker(app.BeginBlocker) app.SetEndBlocker(app.EndBlocker) - app.setUpgradeHandler() + app.setv230UpgradeHandler() + app.setShieldV2UpgradeHandler() if loadLatest { if err := app.LoadLatestVersion(); err != nil { diff --git a/app/upgrade_handler.go b/app/upgrade_handler.go index 2ae04f991..ab5bb1d3d 100644 --- a/app/upgrade_handler.go +++ b/app/upgrade_handler.go @@ -14,13 +14,18 @@ import ( upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" ibcconnectiontypes "github.com/cosmos/ibc-go/v2/modules/core/03-connection/types" + + shieldtypes "github.com/certikfoundation/shentu/v2/x/shield/types" ) -const upgradeName = "Shentu-v230" +const ( + v230Upgrade = "Shentu-v230" + shieldv2 = "Shield-V2" +) -func (app ShentuApp) setUpgradeHandler() { +func (app ShentuApp) setv230UpgradeHandler() { app.upgradeKeeper.SetUpgradeHandler( - upgradeName, + v230Upgrade, func(ctx sdk.Context, _ upgradetypes.Plan, _ module.VersionMap) (module.VersionMap, error) { app.ibcKeeper.ConnectionKeeper.SetParams(ctx, ibcconnectiontypes.DefaultParams()) @@ -50,7 +55,7 @@ func (app ShentuApp) setUpgradeHandler() { panic(fmt.Sprintf("failed to read upgrade info from disk %s", err)) } - if upgradeInfo.Name == upgradeName && !app.upgradeKeeper.IsSkipHeight(upgradeInfo.Height) { + if upgradeInfo.Name == v230Upgrade && !app.upgradeKeeper.IsSkipHeight(upgradeInfo.Height) { storeUpgrades := storetypes.StoreUpgrades{ Added: []string{authz.ModuleName, feegrant.ModuleName}, } @@ -59,3 +64,30 @@ func (app ShentuApp) setUpgradeHandler() { app.SetStoreLoader(upgradetypes.UpgradeStoreLoader(upgradeInfo.Height, &storeUpgrades)) } } + +func (app ShentuApp) setShieldV2UpgradeHandler() { + app.upgradeKeeper.SetUpgradeHandler( + shieldv2, + func(ctx sdk.Context, _ upgradetypes.Plan, _ module.VersionMap) (module.VersionMap, error) { + fromVM := make(map[string]uint64) + for moduleName := range app.mm.Modules { + fromVM[moduleName] = 2 + } + + fromVM[shieldtypes.ModuleName] = 1 + return app.mm.RunMigrations(ctx, app.configurator, fromVM) + }, + ) + + upgradeInfo, err := app.upgradeKeeper.ReadUpgradeInfoFromDisk() + if err != nil { + panic(fmt.Sprintf("failed to read upgrade info from disk %s", err)) + } + + if upgradeInfo.Name == shieldv2 && !app.upgradeKeeper.IsSkipHeight(upgradeInfo.Height) { + storeUpgrades := storetypes.StoreUpgrades{} + + // configure store loader that checks if version == upgradeHeight and applies store upgrades + app.SetStoreLoader(upgradetypes.UpgradeStoreLoader(upgradeInfo.Height, &storeUpgrades)) + } +} diff --git a/x/gov/types/gov.pb.go b/x/gov/types/gov.pb.go index f17774a58..2f240c44c 100644 --- a/x/gov/types/gov.pb.go +++ b/x/gov/types/gov.pb.go @@ -1947,4 +1947,4 @@ var ( ErrInvalidLengthGov = fmt.Errorf("proto: negative length found during unmarshaling") ErrIntOverflowGov = fmt.Errorf("proto: integer overflow") ErrUnexpectedEndOfGroupGov = fmt.Errorf("proto: unexpected end of group") -) \ No newline at end of file +) diff --git a/x/gov/types/query.pb.go b/x/gov/types/query.pb.go index 7f6060609..b44d67fb5 100644 --- a/x/gov/types/query.pb.go +++ b/x/gov/types/query.pb.go @@ -3907,4 +3907,4 @@ var ( ErrInvalidLengthQuery = fmt.Errorf("proto: negative length found during unmarshaling") ErrIntOverflowQuery = fmt.Errorf("proto: integer overflow") ErrUnexpectedEndOfGroupQuery = fmt.Errorf("proto: unexpected end of group") -) \ No newline at end of file +) diff --git a/x/gov/types/query.pb.gw.go b/x/gov/types/query.pb.gw.go index da5424f3d..d18705ab8 100644 --- a/x/gov/types/query.pb.gw.go +++ b/x/gov/types/query.pb.gw.go @@ -928,4 +928,4 @@ var ( forward_Query_Deposits_0 = runtime.ForwardResponseMessage forward_Query_TallyResult_0 = runtime.ForwardResponseMessage -) \ No newline at end of file +) diff --git a/x/shield/keeper/migrations.go b/x/shield/keeper/migrations.go index 2f50a6674..b831a2e14 100644 --- a/x/shield/keeper/migrations.go +++ b/x/shield/keeper/migrations.go @@ -1,9 +1,10 @@ package keeper import ( - v231 "github.com/certikfoundation/shentu/v2/x/shield/legacy/v231" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/gogo/protobuf/grpc" + + v231 "github.com/certikfoundation/shentu/v2/x/shield/legacy/v231" ) // Migrator is a struct for handling in-place store migrations. From 45481cae3ce75ac22be070f88855b6e41086f453 Mon Sep 17 00:00:00 2001 From: yoongbok lee Date: Thu, 26 May 2022 18:16:49 +0900 Subject: [PATCH 10/14] add querying commands/endpoints --- proto/shentu/shield/v1alpha1/query.proto | 12 + x/shield/client/cli/query.go | 27 ++ x/shield/keeper/grpc_query.go | 10 + x/shield/keeper/querier.go | 16 + x/shield/types/querier.go | 1 + x/shield/types/query.pb.go | 550 ++++++++++++++++++----- x/shield/types/query.pb.gw.go | 62 +++ 7 files changed, 571 insertions(+), 107 deletions(-) diff --git a/proto/shentu/shield/v1alpha1/query.proto b/proto/shentu/shield/v1alpha1/query.proto index 5f0b55f59..1e7d2f757 100644 --- a/proto/shentu/shield/v1alpha1/query.proto +++ b/proto/shentu/shield/v1alpha1/query.proto @@ -55,6 +55,10 @@ service Query { option (google.api.http).get = "/shentu/shield/v1alpha1/claim_params"; } + rpc DistrParams(QueryDistrParamsRequest) returns (QueryDistrParamsResponse) { + option (google.api.http).get = "/shentu/shield/v1alpha1/distr_params"; + } + rpc ShieldStatus(QueryShieldStatusRequest) returns (QueryShieldStatusResponse) { option (google.api.http).get = "/shentu/shield/v1alpha1/status"; } @@ -162,6 +166,14 @@ message QueryClaimParamsResponse { ClaimProposalParams params = 1 [(gogoproto.nullable) = false]; } +message QueryDistrParamsRequest { +} + +message QueryDistrParamsResponse { + DistributionParams params = 1 [(gogoproto.nullable) = false]; +} + + message QueryShieldStatusRequest { } diff --git a/x/shield/client/cli/query.go b/x/shield/client/cli/query.go index 4bb1aabc6..da4557d3b 100644 --- a/x/shield/client/cli/query.go +++ b/x/shield/client/cli/query.go @@ -36,6 +36,7 @@ func GetQueryCmd() *cobra.Command { GetCmdProviders(), GetCmdPoolParams(), GetCmdClaimParams(), + GetCmdDistrParams(), GetCmdStatus(), GetCmdStaking(), GetCmdShieldStakingRate(), @@ -391,6 +392,32 @@ func GetCmdClaimParams() *cobra.Command { return cmd } +// GetCmdDistrParams returns the command for querying distribution parameters. +func GetCmdDistrParams() *cobra.Command { + cmd := &cobra.Command{ + Use: "distr-params", + Short: "get distribution parameters", + Args: cobra.ExactArgs(0), + RunE: func(cmd *cobra.Command, args []string) error { + cliCtx, err := client.GetClientQueryContext(cmd) + if err != nil { + return err + } + queryClient := types.NewQueryClient(cliCtx) + + res, err := queryClient.DistrParams(cmd.Context(), &types.QueryDistrParamsRequest{}) + if err != nil { + return err + } + + return cliCtx.PrintProto(res) + }, + } + + flags.AddQueryFlagsToCmd(cmd) + return cmd +} + // GetCmdStatus returns the command for querying shield status. func GetCmdStatus() *cobra.Command { cmd := &cobra.Command{ diff --git a/x/shield/keeper/grpc_query.go b/x/shield/keeper/grpc_query.go index 21d6bbc49..f30cada06 100644 --- a/x/shield/keeper/grpc_query.go +++ b/x/shield/keeper/grpc_query.go @@ -164,6 +164,16 @@ func (q Keeper) ClaimParams(c context.Context, req *types.QueryClaimParamsReques return &types.QueryClaimParamsResponse{Params: q.GetClaimProposalParams(ctx)}, nil } +// DistrParams queries shield distribution parameters. +func (q Keeper) DistrParams(c context.Context, req *types.QueryDistrParamsRequest) (*types.QueryDistrParamsResponse, error) { + if req == nil { + return nil, status.Error(codes.InvalidArgument, "invalid request") + } + ctx := sdk.UnwrapSDKContext(c) + + return &types.QueryDistrParamsResponse{Params: q.GetDistributionParams(ctx)}, nil +} + // ShieldStatus queries the global status of the shield module. func (q Keeper) ShieldStatus(c context.Context, req *types.QueryShieldStatusRequest) (*types.QueryShieldStatusResponse, error) { if req == nil { diff --git a/x/shield/keeper/querier.go b/x/shield/keeper/querier.go index c7349db8c..174dfd979 100644 --- a/x/shield/keeper/querier.go +++ b/x/shield/keeper/querier.go @@ -38,6 +38,8 @@ func NewQuerier(k Keeper, legacyQuerierCdc *codec.LegacyAmino) sdk.Querier { return queryPoolParams(ctx, path[1:], k, legacyQuerierCdc) case types.QueryClaimParams: return queryClaimParams(ctx, path[1:], k, legacyQuerierCdc) + case types.QueryDistrParams: + return queryDistrParams(ctx, path[1:], k, legacyQuerierCdc) case types.QueryStatus: return queryGlobalState(ctx, path[1:], k, legacyQuerierCdc) case types.QueryStakedForShield: @@ -251,6 +253,20 @@ func queryClaimParams(ctx sdk.Context, path []string, k Keeper, legacyQuerierCdc return res, nil } +func queryDistrParams(ctx sdk.Context, path []string, k Keeper, legacyQuerierCdc *codec.LegacyAmino) (res []byte, err error) { + if err := validatePathLength(path, 0); err != nil { + return nil, err + } + + params := k.GetDistributionParams(ctx) + + res, err = codec.MarshalJSONIndent(legacyQuerierCdc, params) + if err != nil { + return nil, sdkerrors.Wrap(sdkerrors.ErrJSONMarshal, err.Error()) + } + return res, nil +} + func queryGlobalState(ctx sdk.Context, path []string, k Keeper, legacyQuerierCdc *codec.LegacyAmino) (res []byte, err error) { if err := validatePathLength(path, 0); err != nil { return nil, err diff --git a/x/shield/types/querier.go b/x/shield/types/querier.go index 1acd1578d..f6ab7836d 100644 --- a/x/shield/types/querier.go +++ b/x/shield/types/querier.go @@ -17,6 +17,7 @@ const ( QueryProviders = "providers" QueryPoolParams = "pool_params" QueryClaimParams = "claim_params" + QueryDistrParams = "distr_params" QueryStatus = "status" QueryStakedForShield = "staked_for_shield" QueryShieldStakingRate = "shield_staking_rate" diff --git a/x/shield/types/query.pb.go b/x/shield/types/query.pb.go index ef5106e1c..49d2b5359 100644 --- a/x/shield/types/query.pb.go +++ b/x/shield/types/query.pb.go @@ -923,6 +923,86 @@ func (m *QueryClaimParamsResponse) GetParams() ClaimProposalParams { return ClaimProposalParams{} } +type QueryDistrParamsRequest struct { +} + +func (m *QueryDistrParamsRequest) Reset() { *m = QueryDistrParamsRequest{} } +func (m *QueryDistrParamsRequest) String() string { return proto.CompactTextString(m) } +func (*QueryDistrParamsRequest) ProtoMessage() {} +func (*QueryDistrParamsRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_1cb9aa5f07f44644, []int{21} +} +func (m *QueryDistrParamsRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *QueryDistrParamsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QueryDistrParamsRequest.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *QueryDistrParamsRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryDistrParamsRequest.Merge(m, src) +} +func (m *QueryDistrParamsRequest) XXX_Size() int { + return m.Size() +} +func (m *QueryDistrParamsRequest) XXX_DiscardUnknown() { + xxx_messageInfo_QueryDistrParamsRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_QueryDistrParamsRequest proto.InternalMessageInfo + +type QueryDistrParamsResponse struct { + Params DistributionParams `protobuf:"bytes,1,opt,name=params,proto3" json:"params"` +} + +func (m *QueryDistrParamsResponse) Reset() { *m = QueryDistrParamsResponse{} } +func (m *QueryDistrParamsResponse) String() string { return proto.CompactTextString(m) } +func (*QueryDistrParamsResponse) ProtoMessage() {} +func (*QueryDistrParamsResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_1cb9aa5f07f44644, []int{22} +} +func (m *QueryDistrParamsResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *QueryDistrParamsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QueryDistrParamsResponse.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *QueryDistrParamsResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryDistrParamsResponse.Merge(m, src) +} +func (m *QueryDistrParamsResponse) XXX_Size() int { + return m.Size() +} +func (m *QueryDistrParamsResponse) XXX_DiscardUnknown() { + xxx_messageInfo_QueryDistrParamsResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_QueryDistrParamsResponse proto.InternalMessageInfo + +func (m *QueryDistrParamsResponse) GetParams() DistributionParams { + if m != nil { + return m.Params + } + return DistributionParams{} +} + type QueryShieldStatusRequest struct { } @@ -930,7 +1010,7 @@ func (m *QueryShieldStatusRequest) Reset() { *m = QueryShieldStatusReque func (m *QueryShieldStatusRequest) String() string { return proto.CompactTextString(m) } func (*QueryShieldStatusRequest) ProtoMessage() {} func (*QueryShieldStatusRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_1cb9aa5f07f44644, []int{21} + return fileDescriptor_1cb9aa5f07f44644, []int{23} } func (m *QueryShieldStatusRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -972,7 +1052,7 @@ func (m *QueryShieldStatusResponse) Reset() { *m = QueryShieldStatusResp func (m *QueryShieldStatusResponse) String() string { return proto.CompactTextString(m) } func (*QueryShieldStatusResponse) ProtoMessage() {} func (*QueryShieldStatusResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_1cb9aa5f07f44644, []int{22} + return fileDescriptor_1cb9aa5f07f44644, []int{24} } func (m *QueryShieldStatusResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1024,7 +1104,7 @@ func (m *QueryShieldStakingRequest) Reset() { *m = QueryShieldStakingReq func (m *QueryShieldStakingRequest) String() string { return proto.CompactTextString(m) } func (*QueryShieldStakingRequest) ProtoMessage() {} func (*QueryShieldStakingRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_1cb9aa5f07f44644, []int{23} + return fileDescriptor_1cb9aa5f07f44644, []int{25} } func (m *QueryShieldStakingRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1075,7 +1155,7 @@ func (m *QueryShieldStakingResponse) Reset() { *m = QueryShieldStakingRe func (m *QueryShieldStakingResponse) String() string { return proto.CompactTextString(m) } func (*QueryShieldStakingResponse) ProtoMessage() {} func (*QueryShieldStakingResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_1cb9aa5f07f44644, []int{24} + return fileDescriptor_1cb9aa5f07f44644, []int{26} } func (m *QueryShieldStakingResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1118,7 +1198,7 @@ func (m *QueryShieldStakingRateRequest) Reset() { *m = QueryShieldStakin func (m *QueryShieldStakingRateRequest) String() string { return proto.CompactTextString(m) } func (*QueryShieldStakingRateRequest) ProtoMessage() {} func (*QueryShieldStakingRateRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_1cb9aa5f07f44644, []int{25} + return fileDescriptor_1cb9aa5f07f44644, []int{27} } func (m *QueryShieldStakingRateRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1155,7 +1235,7 @@ func (m *QueryShieldStakingRateResponse) Reset() { *m = QueryShieldStaki func (m *QueryShieldStakingRateResponse) String() string { return proto.CompactTextString(m) } func (*QueryShieldStakingRateResponse) ProtoMessage() {} func (*QueryShieldStakingRateResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_1cb9aa5f07f44644, []int{26} + return fileDescriptor_1cb9aa5f07f44644, []int{28} } func (m *QueryShieldStakingRateResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1192,7 +1272,7 @@ func (m *QueryReimbursementRequest) Reset() { *m = QueryReimbursementReq func (m *QueryReimbursementRequest) String() string { return proto.CompactTextString(m) } func (*QueryReimbursementRequest) ProtoMessage() {} func (*QueryReimbursementRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_1cb9aa5f07f44644, []int{27} + return fileDescriptor_1cb9aa5f07f44644, []int{29} } func (m *QueryReimbursementRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1236,7 +1316,7 @@ func (m *QueryReimbursementResponse) Reset() { *m = QueryReimbursementRe func (m *QueryReimbursementResponse) String() string { return proto.CompactTextString(m) } func (*QueryReimbursementResponse) ProtoMessage() {} func (*QueryReimbursementResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_1cb9aa5f07f44644, []int{28} + return fileDescriptor_1cb9aa5f07f44644, []int{30} } func (m *QueryReimbursementResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1279,7 +1359,7 @@ func (m *QueryReimbursementsRequest) Reset() { *m = QueryReimbursementsR func (m *QueryReimbursementsRequest) String() string { return proto.CompactTextString(m) } func (*QueryReimbursementsRequest) ProtoMessage() {} func (*QueryReimbursementsRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_1cb9aa5f07f44644, []int{29} + return fileDescriptor_1cb9aa5f07f44644, []int{31} } func (m *QueryReimbursementsRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1316,7 +1396,7 @@ func (m *QueryReimbursementsResponse) Reset() { *m = QueryReimbursements func (m *QueryReimbursementsResponse) String() string { return proto.CompactTextString(m) } func (*QueryReimbursementsResponse) ProtoMessage() {} func (*QueryReimbursementsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_1cb9aa5f07f44644, []int{30} + return fileDescriptor_1cb9aa5f07f44644, []int{32} } func (m *QueryReimbursementsResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1374,6 +1454,8 @@ func init() { proto.RegisterType((*QueryPoolParamsResponse)(nil), "shentu.shield.v1alpha1.QueryPoolParamsResponse") proto.RegisterType((*QueryClaimParamsRequest)(nil), "shentu.shield.v1alpha1.QueryClaimParamsRequest") proto.RegisterType((*QueryClaimParamsResponse)(nil), "shentu.shield.v1alpha1.QueryClaimParamsResponse") + proto.RegisterType((*QueryDistrParamsRequest)(nil), "shentu.shield.v1alpha1.QueryDistrParamsRequest") + proto.RegisterType((*QueryDistrParamsResponse)(nil), "shentu.shield.v1alpha1.QueryDistrParamsResponse") proto.RegisterType((*QueryShieldStatusRequest)(nil), "shentu.shield.v1alpha1.QueryShieldStatusRequest") proto.RegisterType((*QueryShieldStatusResponse)(nil), "shentu.shield.v1alpha1.QueryShieldStatusResponse") proto.RegisterType((*QueryShieldStakingRequest)(nil), "shentu.shield.v1alpha1.QueryShieldStakingRequest") @@ -1391,103 +1473,106 @@ func init() { } var fileDescriptor_1cb9aa5f07f44644 = []byte{ - // 1532 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x98, 0xcf, 0x6f, 0xd4, 0xc6, - 0x17, 0xc0, 0x63, 0x48, 0x02, 0x99, 0x24, 0x7c, 0xc9, 0x90, 0x2f, 0x59, 0x96, 0xb0, 0x1b, 0x26, - 0x24, 0x02, 0x42, 0xd6, 0x6c, 0x52, 0x28, 0xa5, 0x50, 0x55, 0x49, 0x5a, 0x29, 0xa5, 0x3f, 0x82, - 0x73, 0xa8, 0x54, 0xa4, 0xae, 0x26, 0xbb, 0xc3, 0xc6, 0xc2, 0xeb, 0x31, 0x1e, 0x6f, 0x00, 0xa5, - 0xb9, 0x20, 0xf5, 0xd2, 0x5e, 0x90, 0xaa, 0xaa, 0x52, 0x91, 0x7a, 0xef, 0xb5, 0x97, 0xf6, 0xd0, - 0xde, 0x39, 0x22, 0xf5, 0x52, 0xf5, 0x10, 0x55, 0xd0, 0xbf, 0x00, 0xa9, 0xf7, 0xca, 0x33, 0xcf, - 0x5e, 0x7b, 0x63, 0xaf, 0xbd, 0xe5, 0x94, 0x78, 0xde, 0xaf, 0xcf, 0x7b, 0x9e, 0xe7, 0x79, 0xb3, - 0x88, 0x88, 0x6d, 0x66, 0x7b, 0x6d, 0x5d, 0x6c, 0x9b, 0xcc, 0x6a, 0xe8, 0x3b, 0x55, 0x6a, 0x39, - 0xdb, 0xb4, 0xaa, 0xdf, 0x6f, 0x33, 0xf7, 0x51, 0xc5, 0x71, 0xb9, 0xc7, 0xf1, 0x49, 0xa5, 0x53, - 0x51, 0x3a, 0x95, 0x40, 0xa7, 0x78, 0xb1, 0xce, 0x45, 0x8b, 0x0b, 0x7d, 0x8b, 0x0a, 0xa6, 0x0c, - 0xf4, 0x9d, 0xea, 0x16, 0xf3, 0x68, 0x55, 0x77, 0x68, 0xd3, 0xb4, 0xa9, 0x67, 0x72, 0x5b, 0xf9, - 0x28, 0x4e, 0x36, 0x79, 0x93, 0xcb, 0x7f, 0x75, 0xff, 0x3f, 0x58, 0x9d, 0x6e, 0x72, 0xde, 0xb4, - 0x98, 0x4e, 0x1d, 0x53, 0xa7, 0xb6, 0xcd, 0x3d, 0x69, 0x22, 0x40, 0x3a, 0x9b, 0xc2, 0x06, 0x1c, - 0x4a, 0xe9, 0x5c, 0x8a, 0x52, 0x93, 0xd9, 0x4c, 0x98, 0xe0, 0x8a, 0x2c, 0xa0, 0xe3, 0xb7, 0x7d, - 0xc0, 0x0d, 0xce, 0x2d, 0x83, 0xdd, 0x6f, 0x33, 0xe1, 0xe1, 0x29, 0x74, 0xc4, 0xe1, 0xdc, 0xaa, - 0x99, 0x8d, 0x82, 0x36, 0xa3, 0x9d, 0x1f, 0x34, 0x86, 0xfd, 0xc7, 0xf5, 0x06, 0xb9, 0x85, 0x26, - 0x22, 0xca, 0xc2, 0xe1, 0xb6, 0x60, 0xf8, 0x2a, 0x1a, 0xf4, 0xc5, 0x52, 0x75, 0x74, 0x69, 0xba, - 0x92, 0x5c, 0x93, 0x8a, 0x6f, 0xb3, 0x32, 0xf8, 0x6c, 0xbf, 0x3c, 0x60, 0x48, 0x7d, 0xa2, 0xa3, - 0x13, 0xd2, 0xd9, 0xa6, 0xef, 0x86, 0xbb, 0x41, 0xf0, 0x02, 0x3a, 0x22, 0xd4, 0x8a, 0xf4, 0x38, - 0x62, 0x04, 0x8f, 0x64, 0x03, 0x4d, 0xc6, 0x0d, 0x00, 0xe0, 0x1a, 0x1a, 0xf2, 0x1d, 0x8a, 0x82, - 0x36, 0x73, 0x38, 0x27, 0x81, 0x32, 0x20, 0x27, 0x22, 0xf9, 0x08, 0x00, 0x20, 0x1f, 0x23, 0x1c, - 0x5d, 0x7c, 0xed, 0x20, 0xd7, 0xd0, 0x99, 0xd0, 0xdf, 0x46, 0xdb, 0xad, 0x6f, 0x53, 0xc1, 0x3e, - 0x34, 0x85, 0x27, 0x32, 0xcb, 0xfd, 0x16, 0x3a, 0xa5, 0x2c, 0x93, 0xac, 0xa6, 0xd1, 0x88, 0x03, - 0xeb, 0x41, 0xa5, 0x3a, 0x0b, 0x84, 0xa3, 0x62, 0x92, 0x29, 0x24, 0x73, 0x1b, 0x1d, 0x0b, 0x54, - 0x6b, 0x96, 0x2f, 0x81, 0xac, 0xce, 0xa5, 0x66, 0x15, 0x71, 0x03, 0xd9, 0x8d, 0x3b, 0x51, 0xd7, - 0xe4, 0x36, 0x2a, 0x1c, 0x08, 0x98, 0x95, 0x60, 0x3c, 0x87, 0x43, 0xdd, 0x39, 0x58, 0x09, 0xe9, - 0x87, 0x29, 0x7c, 0x82, 0xc6, 0x63, 0x29, 0xc0, 0xf6, 0xeb, 0x27, 0x83, 0xb1, 0x68, 0x06, 0x64, - 0x0a, 0xfd, 0x3f, 0x16, 0x2d, 0xdc, 0x0f, 0x9f, 0xa3, 0x93, 0xdd, 0x02, 0x60, 0x58, 0xeb, 0xe0, - 0x07, 0x15, 0x9c, 0xc9, 0x8a, 0x0f, 0xb1, 0x3b, 0x86, 0xe4, 0x32, 0x6c, 0xeb, 0x0d, 0x97, 0xef, - 0x98, 0x0d, 0x16, 0x6d, 0x04, 0xda, 0x68, 0xb8, 0x4c, 0x88, 0xa0, 0x11, 0xe0, 0x91, 0xdc, 0x09, - 0x50, 0x43, 0x0b, 0x00, 0x5a, 0x41, 0x47, 0x1d, 0x58, 0x83, 0x7a, 0xa4, 0xf3, 0x80, 0x1e, 0xf0, - 0x84, 0x76, 0x9d, 0x3a, 0xc0, 0xc2, 0xc1, 0x3a, 0x74, 0x04, 0x91, 0x3a, 0x04, 0x8b, 0x99, 0x75, - 0x88, 0xc7, 0xed, 0x18, 0x92, 0x42, 0xe0, 0xdf, 0xef, 0x13, 0xea, 0xd2, 0x56, 0x18, 0xf9, 0x0e, - 0x9a, 0x3a, 0x20, 0x81, 0xd0, 0xef, 0xa2, 0x61, 0x47, 0xae, 0x40, 0xbe, 0xa4, 0x57, 0x5f, 0x2a, - 0x5b, 0x88, 0x0c, 0x76, 0xe4, 0x14, 0x38, 0x5f, 0xb5, 0xa8, 0xd9, 0x8a, 0xc7, 0x65, 0xb0, 0xa7, - 0x63, 0x22, 0x08, 0xbc, 0xde, 0x15, 0x78, 0x21, 0x2d, 0xb0, 0x32, 0x76, 0xb9, 0xc3, 0x05, 0x4d, - 0x26, 0x28, 0x42, 0x98, 0x4d, 0x69, 0xb9, 0xe9, 0x51, 0xaf, 0x1d, 0x22, 0x7c, 0x35, 0x0c, 0x4d, - 0x10, 0x17, 0x02, 0x84, 0x87, 0x8e, 0x7b, 0xdc, 0xa3, 0x56, 0xad, 0xce, 0x2d, 0x8b, 0x7a, 0xcc, - 0xa5, 0xea, 0x33, 0x3c, 0xb2, 0xb2, 0xee, 0x47, 0xf8, 0x73, 0xbf, 0x3c, 0xdf, 0x34, 0xbd, 0xed, - 0xf6, 0x56, 0xa5, 0xce, 0x5b, 0x3a, 0x1c, 0x4a, 0xea, 0xcf, 0xa2, 0x68, 0xdc, 0xd3, 0xbd, 0x47, - 0x0e, 0x13, 0x95, 0x75, 0xdb, 0x7b, 0xb5, 0x5f, 0x9e, 0x7a, 0x44, 0x5b, 0xd6, 0x75, 0xd2, 0xed, - 0x8f, 0x18, 0xff, 0x93, 0x4b, 0xab, 0xe1, 0x0a, 0xde, 0x46, 0x63, 0x4a, 0x4b, 0xa5, 0xaa, 0x1a, - 0x77, 0xe5, 0xbd, 0xbe, 0x23, 0x9e, 0x88, 0x46, 0x54, 0xbe, 0x88, 0x31, 0x2a, 0x1f, 0x55, 0xb6, - 0xf8, 0x01, 0x9a, 0x50, 0xd2, 0x07, 0xa6, 0xb7, 0xdd, 0x70, 0xe9, 0x03, 0xd3, 0x6e, 0x16, 0x0e, - 0xcb, 0x70, 0x1f, 0xf4, 0x1d, 0xae, 0x10, 0x0d, 0x17, 0x71, 0x48, 0x0c, 0x55, 0xc4, 0x4f, 0x3b, - 0x4b, 0xf8, 0x0b, 0x34, 0x59, 0x6f, 0xbb, 0x2e, 0xb3, 0xbd, 0x9a, 0x60, 0xee, 0x8e, 0x59, 0x67, - 0xb5, 0xbb, 0x8c, 0x89, 0xc2, 0xa0, 0x7c, 0xd7, 0x73, 0x69, 0xef, 0xfa, 0x23, 0xf3, 0x21, 0x6b, - 0xac, 0xb1, 0xfa, 0x2a, 0x37, 0x6d, 0xb1, 0x32, 0xeb, 0x23, 0xbe, 0xda, 0x2f, 0x9f, 0x56, 0x81, - 0x93, 0x1c, 0x12, 0x03, 0xc3, 0xf2, 0xa6, 0x5a, 0x7d, 0x9f, 0x31, 0x81, 0x1f, 0x6b, 0xe8, 0xa4, - 0xcb, 0x5a, 0xd4, 0xb4, 0x4d, 0xbb, 0x19, 0x07, 0x18, 0xea, 0x07, 0x60, 0x0e, 0x00, 0xce, 0x28, - 0x80, 0x64, 0x97, 0xc4, 0x98, 0x0c, 0x05, 0x51, 0x88, 0x27, 0x1a, 0x2a, 0x36, 0x2d, 0xbe, 0x15, - 0xbe, 0x9b, 0x9a, 0xf0, 0xe8, 0x3d, 0xdf, 0x5a, 0x9e, 0xf6, 0xc3, 0xf2, 0x2d, 0x6c, 0xf6, 0xfd, - 0x16, 0xce, 0x2a, 0x96, 0x74, 0xcf, 0xc4, 0x98, 0x52, 0xc2, 0x70, 0xc7, 0xfb, 0xa2, 0x0d, 0x29, - 0xe9, 0xee, 0x05, 0x5f, 0xf2, 0x9a, 0x87, 0x8c, 0x03, 0x07, 0x65, 0x97, 0x4f, 0x68, 0x30, 0x03, - 0x1d, 0x8b, 0x23, 0x42, 0xb7, 0xa7, 0xbe, 0x80, 0x98, 0x9b, 0xe0, 0xa4, 0x14, 0xd1, 0x45, 0x52, - 0x86, 0x79, 0x20, 0x1e, 0x91, 0x7a, 0x2c, 0xe8, 0x79, 0x81, 0x4a, 0x69, 0x0a, 0xe1, 0xf9, 0x3d, - 0xe8, 0x52, 0x8f, 0x41, 0xaf, 0xdf, 0xec, 0xe3, 0x25, 0xac, 0xb1, 0xfa, 0xab, 0xfd, 0xf2, 0x28, - 0x6c, 0x08, 0xea, 0x31, 0x62, 0x48, 0x57, 0xe4, 0x06, 0xd4, 0xd6, 0x60, 0x66, 0x6b, 0xab, 0xed, - 0x0a, 0xd6, 0x62, 0x76, 0x78, 0x80, 0x97, 0xd1, 0xa8, 0x03, 0x5f, 0xb0, 0x4e, 0x7d, 0x51, 0xb0, - 0xb4, 0xde, 0x08, 0xc7, 0x8d, 0x2e, 0xeb, 0x10, 0x77, 0xdc, 0x8d, 0x0a, 0xb2, 0x8a, 0x18, 0xf3, - 0x12, 0x14, 0x31, 0xe6, 0x81, 0x4c, 0x27, 0x05, 0x0c, 0xbf, 0x9a, 0x36, 0x3a, 0x9d, 0x28, 0x0d, - 0x67, 0x87, 0x21, 0x87, 0x9a, 0xe1, 0x59, 0xb5, 0xdc, 0xe3, 0xac, 0x52, 0x09, 0xae, 0xc5, 0x1c, - 0x6d, 0x50, 0xd3, 0x0d, 0x47, 0x3c, 0xdf, 0xcf, 0xd2, 0x3f, 0x93, 0x68, 0x48, 0x06, 0xc4, 0x5f, - 0x6b, 0x68, 0xd0, 0xdf, 0xab, 0xf8, 0x7c, 0x9a, 0xd3, 0xee, 0x69, 0xbb, 0x78, 0x21, 0x87, 0xa6, - 0x02, 0x27, 0x95, 0xc7, 0xbf, 0xff, 0xfd, 0xcd, 0xa1, 0xf3, 0x78, 0x5e, 0x4f, 0x99, 0xed, 0xfd, - 0x2d, 0xaf, 0xef, 0x42, 0x1f, 0xec, 0xe1, 0xef, 0x34, 0x74, 0x04, 0xa6, 0x65, 0xbc, 0xd0, 0x33, - 0x4c, 0x7c, 0x08, 0x2f, 0x5e, 0xca, 0xa7, 0x0c, 0x58, 0x55, 0x89, 0xb5, 0x80, 0x2f, 0xa4, 0x61, - 0xc1, 0x04, 0xaf, 0xef, 0xc2, 0x3f, 0x7b, 0xf8, 0x4b, 0x0d, 0x0d, 0xc9, 0x01, 0x1b, 0x67, 0xa7, - 0x1f, 0xbc, 0xd6, 0xe2, 0xc5, 0x3c, 0xaa, 0xc0, 0x34, 0x27, 0x99, 0xca, 0xf8, 0x4c, 0xaf, 0x52, - 0x09, 0xfc, 0x9b, 0x86, 0x26, 0x0e, 0x0c, 0xe6, 0xf8, 0x4a, 0x66, 0xa0, 0xa4, 0x91, 0xbc, 0xb8, - 0xd4, 0xdb, 0x2c, 0x69, 0x14, 0x27, 0x37, 0x25, 0xe7, 0x9b, 0xf8, 0x4a, 0x2f, 0xce, 0x5a, 0x7c, - 0x5a, 0x8f, 0xbc, 0xe1, 0x9f, 0x34, 0x34, 0x1e, 0x67, 0xaf, 0xf6, 0x03, 0xf1, 0xdf, 0xb9, 0xaf, - 0x4b, 0xee, 0x37, 0xf0, 0x52, 0x2a, 0x77, 0x37, 0x72, 0xf0, 0xc9, 0xdd, 0xc3, 0xbf, 0x68, 0x68, - 0x2c, 0xea, 0x15, 0x5f, 0xce, 0x0d, 0x10, 0x20, 0x57, 0xfb, 0xb0, 0x00, 0xe2, 0x55, 0x49, 0x7c, - 0x13, 0xbf, 0x9d, 0x8b, 0xb8, 0x53, 0xe3, 0x18, 0xfa, 0xb7, 0x1a, 0x1a, 0x09, 0x2f, 0x02, 0x78, - 0x31, 0x17, 0x45, 0x58, 0xe7, 0x4a, 0x5e, 0x75, 0x20, 0xbe, 0x20, 0x89, 0x67, 0xf1, 0xd9, 0x2c, - 0x62, 0x81, 0x9f, 0x6a, 0xe8, 0x68, 0x30, 0x5a, 0xe3, 0xde, 0xdd, 0xdb, 0x75, 0xcf, 0x28, 0x2e, - 0xe6, 0xd4, 0x06, 0xa8, 0x25, 0x09, 0x75, 0x09, 0x5f, 0x4c, 0x85, 0x02, 0x0b, 0x7d, 0x17, 0xee, - 0x2b, 0x50, 0xb5, 0x60, 0xd0, 0xc7, 0xf9, 0x02, 0xe6, 0xad, 0x5a, 0xf7, 0x6d, 0x24, 0x47, 0xd5, - 0x42, 0x92, 0xef, 0x35, 0x84, 0x3a, 0x17, 0x03, 0x5c, 0xc9, 0x6e, 0xfb, 0xe8, 0xfd, 0xa0, 0xa8, - 0xe7, 0xd6, 0x07, 0xb4, 0x05, 0x89, 0x36, 0x87, 0x67, 0x7b, 0x37, 0xbb, 0xa2, 0xf9, 0x41, 0x43, - 0xa3, 0x91, 0x9b, 0x07, 0xee, 0x1d, 0xed, 0xe0, 0xf5, 0xa5, 0x78, 0x39, 0xbf, 0x01, 0xf0, 0x5d, - 0x92, 0x7c, 0xf3, 0xf8, 0x5c, 0x1a, 0x5f, 0xdd, 0x37, 0x0a, 0x00, 0x9f, 0x6a, 0x68, 0x2c, 0x7a, - 0x2d, 0xc9, 0x68, 0xe3, 0x84, 0xeb, 0x4d, 0x46, 0x1b, 0x27, 0xdd, 0x79, 0xc8, 0xbc, 0x64, 0x9c, - 0xc1, 0xa5, 0xd4, 0xc3, 0x46, 0xc1, 0xfc, 0xaa, 0xa1, 0xf1, 0xd8, 0x04, 0x85, 0x73, 0x06, 0x8b, - 0x0c, 0x95, 0x19, 0x5f, 0xc6, 0xc4, 0x99, 0x91, 0xac, 0x49, 0xc0, 0x77, 0xf0, 0x0d, 0xbd, 0xe7, - 0xaf, 0x74, 0xc1, 0x44, 0x99, 0xf2, 0xa1, 0xf9, 0x59, 0x43, 0x13, 0x07, 0x06, 0xc0, 0x8c, 0x83, - 0x29, 0x6d, 0xa2, 0x2c, 0x5e, 0xed, 0xd7, 0x0c, 0x52, 0x59, 0x96, 0xa9, 0x2c, 0xe2, 0x85, 0x7c, - 0xa9, 0xd4, 0xfc, 0x49, 0x52, 0x16, 0x3e, 0x36, 0x2f, 0x65, 0x14, 0x3e, 0x69, 0xe2, 0xcc, 0x28, - 0x7c, 0xe2, 0x98, 0x99, 0x5d, 0xf8, 0x60, 0x60, 0xd5, 0x77, 0x23, 0xd3, 0xec, 0x9e, 0x1e, 0x9b, - 0x2c, 0xf1, 0x8f, 0x1a, 0x3a, 0x16, 0x9f, 0x1b, 0x71, 0x1f, 0x30, 0xe1, 0xce, 0x5e, 0xee, 0xcb, - 0x26, 0xef, 0x7c, 0x17, 0x43, 0x15, 0x2b, 0xb7, 0x9e, 0xbd, 0x28, 0x69, 0xcf, 0x5f, 0x94, 0xb4, - 0xbf, 0x5e, 0x94, 0xb4, 0x27, 0x2f, 0x4b, 0x03, 0xcf, 0x5f, 0x96, 0x06, 0xfe, 0x78, 0x59, 0x1a, - 0xf8, 0xac, 0x1a, 0xbd, 0x0b, 0x30, 0xd7, 0x33, 0xef, 0xdd, 0xe5, 0x6d, 0xbb, 0x21, 0x7f, 0x45, - 0x0e, 0x9c, 0x3f, 0x0c, 0xdc, 0xcb, 0xab, 0xc1, 0xd6, 0xb0, 0xfc, 0x41, 0x78, 0xf9, 0xdf, 0x00, - 0x00, 0x00, 0xff, 0xff, 0x2f, 0x40, 0xe9, 0x06, 0xf9, 0x16, 0x00, 0x00, + // 1579 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x98, 0xcf, 0x6f, 0x13, 0xc7, + 0x17, 0xc0, 0xb3, 0x90, 0x04, 0x32, 0x49, 0xf8, 0x92, 0x21, 0xdf, 0xc4, 0x98, 0x60, 0x87, 0x09, + 0x89, 0x20, 0x21, 0x5e, 0x9c, 0x7c, 0xe1, 0x4b, 0x29, 0x54, 0x55, 0x92, 0x56, 0x4d, 0xe9, 0x8f, + 0xe0, 0x1c, 0x2a, 0x15, 0xa9, 0xd6, 0xd8, 0x1e, 0xec, 0x15, 0xf6, 0xee, 0xb2, 0xb3, 0x0e, 0xa0, + 0x34, 0x17, 0xa4, 0x5e, 0xda, 0x0b, 0x52, 0xd5, 0x56, 0x2a, 0x52, 0xef, 0xbd, 0xf6, 0xd2, 0x1e, + 0xda, 0x3b, 0x47, 0xa4, 0x5e, 0xaa, 0x1e, 0xa2, 0x0a, 0xfa, 0x17, 0xf0, 0x17, 0x54, 0x3b, 0xf3, + 0x76, 0xbd, 0x63, 0xef, 0x7a, 0xd7, 0xe5, 0x94, 0xec, 0xbc, 0x5f, 0x9f, 0xf7, 0x76, 0x66, 0xe7, + 0x3d, 0x23, 0xc2, 0x1b, 0xcc, 0x74, 0xdb, 0x3a, 0x6f, 0x18, 0xac, 0x59, 0xd3, 0xf7, 0x8a, 0xb4, + 0x69, 0x37, 0x68, 0x51, 0xbf, 0xdf, 0x66, 0xce, 0xa3, 0x82, 0xed, 0x58, 0xae, 0x85, 0x67, 0xa4, + 0x4e, 0x41, 0xea, 0x14, 0x7c, 0x9d, 0xec, 0x72, 0xd5, 0xe2, 0x2d, 0x8b, 0xeb, 0x15, 0xca, 0x99, + 0x34, 0xd0, 0xf7, 0x8a, 0x15, 0xe6, 0xd2, 0xa2, 0x6e, 0xd3, 0xba, 0x61, 0x52, 0xd7, 0xb0, 0x4c, + 0xe9, 0x23, 0x3b, 0x5d, 0xb7, 0xea, 0x96, 0xf8, 0x57, 0xf7, 0xfe, 0x83, 0xd5, 0xb9, 0xba, 0x65, + 0xd5, 0x9b, 0x4c, 0xa7, 0xb6, 0xa1, 0x53, 0xd3, 0xb4, 0x5c, 0x61, 0xc2, 0x41, 0xba, 0x10, 0xc3, + 0x06, 0x1c, 0x52, 0xe9, 0x7c, 0x8c, 0x52, 0x9d, 0x99, 0x8c, 0x1b, 0xe0, 0x8a, 0xac, 0xa0, 0x93, + 0xb7, 0x3d, 0xc0, 0x1d, 0xcb, 0x6a, 0x96, 0xd8, 0xfd, 0x36, 0xe3, 0x2e, 0x9e, 0x45, 0xc7, 0x6c, + 0xcb, 0x6a, 0x96, 0x8d, 0x5a, 0x46, 0x9b, 0xd7, 0x2e, 0x0c, 0x97, 0x46, 0xbd, 0xc7, 0xed, 0x1a, + 0xb9, 0x85, 0xa6, 0x42, 0xca, 0xdc, 0xb6, 0x4c, 0xce, 0xf0, 0x55, 0x34, 0xec, 0x89, 0x85, 0xea, + 0xf8, 0xda, 0x5c, 0x21, 0xba, 0x26, 0x05, 0xcf, 0x66, 0x63, 0xf8, 0xd9, 0x61, 0x7e, 0xa8, 0x24, + 0xf4, 0x89, 0x8e, 0x4e, 0x09, 0x67, 0xbb, 0x9e, 0x1b, 0xcb, 0xf1, 0x83, 0x67, 0xd0, 0x31, 0x2e, + 0x57, 0x84, 0xc7, 0xb1, 0x92, 0xff, 0x48, 0x76, 0xd0, 0xb4, 0x6a, 0x00, 0x00, 0xd7, 0xd0, 0x88, + 0xe7, 0x90, 0x67, 0xb4, 0xf9, 0xa3, 0x29, 0x09, 0xa4, 0x01, 0x39, 0x15, 0xca, 0x87, 0x03, 0x00, + 0xf9, 0x08, 0xe1, 0xf0, 0xe2, 0x6b, 0x07, 0xb9, 0x86, 0xce, 0x06, 0xfe, 0x76, 0xda, 0x4e, 0xb5, + 0x41, 0x39, 0xfb, 0xc0, 0xe0, 0x2e, 0x4f, 0x2c, 0xf7, 0x1b, 0xe8, 0xb4, 0xb4, 0x8c, 0xb2, 0x9a, + 0x43, 0x63, 0x36, 0xac, 0xfb, 0x95, 0xea, 0x2c, 0x10, 0x0b, 0x65, 0xa3, 0x4c, 0x21, 0x99, 0xdb, + 0xe8, 0x84, 0xaf, 0x5a, 0x6e, 0x7a, 0x12, 0xc8, 0xea, 0x7c, 0x6c, 0x56, 0x21, 0x37, 0x90, 0xdd, + 0xa4, 0x1d, 0x76, 0x4d, 0x6e, 0xa3, 0x4c, 0x4f, 0xc0, 0xa4, 0x04, 0xd5, 0x1c, 0x8e, 0x74, 0xe7, + 0xd0, 0x8c, 0x48, 0x3f, 0x48, 0xe1, 0x63, 0x34, 0xa9, 0xa4, 0x00, 0xdb, 0x6f, 0x90, 0x0c, 0x26, + 0xc2, 0x19, 0x90, 0x59, 0xf4, 0x5f, 0x25, 0x5a, 0xb0, 0x1f, 0x3e, 0x43, 0x33, 0xdd, 0x02, 0x60, + 0xd8, 0xea, 0xe0, 0xfb, 0x15, 0x9c, 0x4f, 0x8a, 0x0f, 0xb1, 0x3b, 0x86, 0xe4, 0x32, 0x6c, 0xeb, + 0x1d, 0xc7, 0xda, 0x33, 0x6a, 0x2c, 0x7c, 0x10, 0x68, 0xad, 0xe6, 0x30, 0xce, 0xfd, 0x83, 0x00, + 0x8f, 0xe4, 0x8e, 0x8f, 0x1a, 0x58, 0x00, 0xd0, 0x06, 0x3a, 0x6e, 0xc3, 0x1a, 0xd4, 0x23, 0x9e, + 0x07, 0xf4, 0x80, 0x27, 0xb0, 0xeb, 0xd4, 0x01, 0x16, 0x7a, 0xeb, 0xd0, 0x11, 0x84, 0xea, 0xe0, + 0x2f, 0x26, 0xd6, 0x41, 0x8d, 0xdb, 0x31, 0x24, 0x19, 0xdf, 0xbf, 0x77, 0x4e, 0xa8, 0x43, 0x5b, + 0x41, 0xe4, 0x3b, 0x68, 0xb6, 0x47, 0x02, 0xa1, 0xdf, 0x46, 0xa3, 0xb6, 0x58, 0x81, 0x7c, 0x49, + 0xbf, 0x73, 0x29, 0x6d, 0x21, 0x32, 0xd8, 0x91, 0xd3, 0xe0, 0x7c, 0xb3, 0x49, 0x8d, 0x96, 0x1a, + 0x97, 0xc1, 0x9e, 0x56, 0x44, 0x10, 0x78, 0xbb, 0x2b, 0xf0, 0x4a, 0x5c, 0x60, 0x69, 0xec, 0x58, + 0xb6, 0xc5, 0x69, 0x7f, 0x82, 0x2d, 0x83, 0xbb, 0x8e, 0x4a, 0x50, 0x03, 0x02, 0x45, 0x04, 0x04, + 0xef, 0x75, 0x11, 0x2c, 0xc7, 0x11, 0x08, 0x63, 0xa3, 0xd2, 0xf6, 0x6e, 0x90, 0x48, 0x80, 0x2c, + 0x44, 0xd9, 0x15, 0x86, 0xbb, 0x2e, 0x75, 0xdb, 0x01, 0xc1, 0x97, 0xa3, 0x70, 0x0a, 0x55, 0x21, + 0x30, 0xb8, 0xe8, 0xa4, 0x6b, 0xb9, 0xb4, 0x59, 0xae, 0x5a, 0xcd, 0x26, 0x75, 0x99, 0x43, 0xe5, + 0x3d, 0x30, 0xb6, 0xb1, 0xed, 0x45, 0xf8, 0xf3, 0x30, 0xbf, 0x54, 0x37, 0xdc, 0x46, 0xbb, 0x52, + 0xa8, 0x5a, 0x2d, 0x1d, 0x6e, 0x45, 0xf9, 0x67, 0x95, 0xd7, 0xee, 0xe9, 0xee, 0x23, 0x9b, 0xf1, + 0xc2, 0xb6, 0xe9, 0xbe, 0x3a, 0xcc, 0xcf, 0x3e, 0xa2, 0xad, 0xe6, 0x75, 0xd2, 0xed, 0x8f, 0x94, + 0xfe, 0x23, 0x96, 0x36, 0x83, 0x15, 0xdc, 0x40, 0x13, 0x52, 0x4b, 0x66, 0x2a, 0xbf, 0x1c, 0x1b, + 0xef, 0x0c, 0x1c, 0xf1, 0x54, 0x38, 0xa2, 0xf4, 0x45, 0x4a, 0xe3, 0xe2, 0x51, 0x66, 0x8b, 0x1f, + 0xa0, 0x29, 0x29, 0x7d, 0x60, 0xb8, 0x8d, 0x9a, 0x43, 0x1f, 0x18, 0x66, 0x3d, 0x73, 0x54, 0x84, + 0x7b, 0x7f, 0xe0, 0x70, 0x99, 0x70, 0xb8, 0x90, 0x43, 0x52, 0x92, 0x45, 0xfc, 0xa4, 0xb3, 0x84, + 0x3f, 0x47, 0xd3, 0xd5, 0xb6, 0xe3, 0x30, 0xd3, 0x2d, 0x73, 0xe6, 0xec, 0x19, 0x55, 0x56, 0xbe, + 0xcb, 0x18, 0xcf, 0x0c, 0x8b, 0x57, 0xbd, 0x18, 0xf7, 0xaa, 0x3f, 0x34, 0x1e, 0xb2, 0xda, 0x16, + 0xab, 0x6e, 0x5a, 0x86, 0xc9, 0x37, 0x16, 0x3c, 0xc4, 0x57, 0x87, 0xf9, 0x33, 0x32, 0x70, 0x94, + 0x43, 0x52, 0xc2, 0xb0, 0xbc, 0x2b, 0x57, 0xdf, 0x65, 0x8c, 0xe3, 0xc7, 0x1a, 0x9a, 0x71, 0x58, + 0x8b, 0x1a, 0xa6, 0x61, 0xd6, 0x55, 0x80, 0x91, 0x41, 0x00, 0x16, 0x01, 0xe0, 0xac, 0x04, 0x88, + 0x76, 0x49, 0x4a, 0xd3, 0x81, 0x20, 0x0c, 0xf1, 0x44, 0x43, 0xd9, 0x7a, 0xd3, 0xaa, 0x04, 0xef, + 0xa6, 0xcc, 0x5d, 0x7a, 0xcf, 0xb3, 0x16, 0xed, 0xc6, 0xa8, 0x78, 0x0b, 0xbb, 0x03, 0xbf, 0x85, + 0x73, 0x92, 0x25, 0xde, 0x33, 0x29, 0xcd, 0x4a, 0x61, 0xb0, 0xe3, 0x3d, 0xd1, 0x8e, 0x90, 0x74, + 0x9f, 0x05, 0x4f, 0xf2, 0x9a, 0xb7, 0x9c, 0x0d, 0x37, 0x75, 0x97, 0x4f, 0x38, 0x60, 0x25, 0x74, + 0x42, 0x45, 0x84, 0xc3, 0x1e, 0xfb, 0x02, 0x14, 0x37, 0xfe, 0x55, 0xcd, 0xc3, 0x8b, 0x24, 0x0f, + 0x0d, 0x89, 0x1a, 0x91, 0xba, 0xcc, 0x3f, 0xf3, 0x1c, 0xe5, 0xe2, 0x14, 0x82, 0x06, 0x62, 0xd8, + 0xa1, 0x2e, 0x83, 0xb3, 0x7e, 0x73, 0x80, 0x97, 0xb0, 0xc5, 0xaa, 0xaf, 0x0e, 0xf3, 0xe3, 0xb0, + 0x21, 0xa8, 0xcb, 0x48, 0x49, 0xb8, 0x22, 0x37, 0xa0, 0xb6, 0x25, 0x66, 0xb4, 0x2a, 0x6d, 0x87, + 0xb3, 0x16, 0x33, 0x83, 0x0e, 0x22, 0x8f, 0xc6, 0x6d, 0xf8, 0x84, 0x76, 0xea, 0x8b, 0xfc, 0xa5, + 0xed, 0x5a, 0xd0, 0xef, 0x74, 0x59, 0x07, 0xb8, 0x93, 0x4e, 0x58, 0x90, 0x54, 0x44, 0xc5, 0x8b, + 0x5f, 0x44, 0xc5, 0x03, 0x99, 0x8b, 0x0a, 0x18, 0x7c, 0x35, 0x4d, 0x74, 0x26, 0x52, 0x1a, 0x34, + 0x2f, 0x23, 0x36, 0x35, 0x82, 0xcb, 0x72, 0xbd, 0xcf, 0x65, 0x29, 0x13, 0xdc, 0x52, 0x1c, 0xed, + 0x50, 0xc3, 0x09, 0x7a, 0x4c, 0xcf, 0xcf, 0xda, 0xb7, 0x33, 0x68, 0x44, 0x04, 0xc4, 0x5f, 0x69, + 0x68, 0xd8, 0xdb, 0xab, 0xf8, 0x42, 0x9c, 0xd3, 0xee, 0x76, 0x3f, 0x7b, 0x31, 0x85, 0xa6, 0x04, + 0x27, 0x85, 0xc7, 0xbf, 0xff, 0xfd, 0xf5, 0x91, 0x0b, 0x78, 0x49, 0x8f, 0x19, 0x2e, 0xbc, 0x2d, + 0xaf, 0xef, 0xc3, 0x39, 0x38, 0xc0, 0xdf, 0x69, 0xe8, 0x18, 0xb4, 0xeb, 0x78, 0xa5, 0x6f, 0x18, + 0x75, 0x0a, 0xc8, 0x5e, 0x4a, 0xa7, 0x0c, 0x58, 0x45, 0x81, 0xb5, 0x82, 0x2f, 0xc6, 0x61, 0xc1, + 0x08, 0xa1, 0xef, 0xc3, 0x3f, 0x07, 0xf8, 0x0b, 0x0d, 0x8d, 0x88, 0x0e, 0x1f, 0x27, 0xa7, 0xef, + 0xbf, 0xd6, 0xec, 0x72, 0x1a, 0x55, 0x60, 0x5a, 0x14, 0x4c, 0x79, 0x7c, 0xb6, 0x5f, 0xa9, 0x38, + 0xfe, 0x4d, 0x43, 0x53, 0x3d, 0x93, 0x01, 0xbe, 0x92, 0x18, 0x28, 0x6a, 0x26, 0xc8, 0xae, 0xf5, + 0x37, 0x8b, 0x9a, 0x05, 0xc8, 0x4d, 0xc1, 0xf9, 0x7f, 0x7c, 0xa5, 0x1f, 0x67, 0x59, 0x1d, 0x17, + 0x42, 0x6f, 0xf8, 0x27, 0x0d, 0x4d, 0xaa, 0xec, 0xc5, 0x41, 0x20, 0xfe, 0x3d, 0xf7, 0x75, 0xc1, + 0xfd, 0x3f, 0xbc, 0x16, 0xcb, 0xdd, 0x8d, 0xec, 0x7f, 0x72, 0x0f, 0xf0, 0x2f, 0x1a, 0x9a, 0x08, + 0x7b, 0xc5, 0x97, 0x53, 0x03, 0xf8, 0xc8, 0xc5, 0x01, 0x2c, 0x80, 0x78, 0x53, 0x10, 0xdf, 0xc4, + 0x6f, 0xa6, 0x22, 0xee, 0xd4, 0x58, 0x41, 0xff, 0x46, 0x43, 0x63, 0xc1, 0x24, 0x82, 0x57, 0x53, + 0x51, 0x04, 0x75, 0x2e, 0xa4, 0x55, 0x07, 0xe2, 0x8b, 0x82, 0x78, 0x01, 0x9f, 0x4b, 0x22, 0xe6, + 0xf8, 0xa9, 0x86, 0x8e, 0xfb, 0xbd, 0x3d, 0xee, 0x7f, 0x7a, 0xbb, 0x06, 0x9d, 0xec, 0x6a, 0x4a, + 0x6d, 0x80, 0x5a, 0x13, 0x50, 0x97, 0xf0, 0x72, 0x2c, 0x14, 0x58, 0xe8, 0xfb, 0x30, 0x30, 0x41, + 0xd5, 0xfc, 0x49, 0x03, 0xa7, 0x0b, 0x98, 0xb6, 0x6a, 0xdd, 0xe3, 0x50, 0x8a, 0xaa, 0x05, 0x24, + 0xdf, 0x6b, 0x08, 0x75, 0x26, 0x13, 0x5c, 0x48, 0x3e, 0xf6, 0xe1, 0xf1, 0x20, 0xab, 0xa7, 0xd6, + 0x07, 0xb4, 0x15, 0x81, 0xb6, 0x88, 0x17, 0xfa, 0x1f, 0x76, 0x49, 0xf3, 0x83, 0x86, 0xc6, 0x43, + 0xa3, 0x0f, 0xee, 0x1f, 0xad, 0x77, 0x7e, 0xca, 0x5e, 0x4e, 0x6f, 0x00, 0x7c, 0x97, 0x04, 0xdf, + 0x12, 0x3e, 0x1f, 0xc7, 0x57, 0xf5, 0x8c, 0xc2, 0x80, 0xa1, 0xc9, 0x28, 0x01, 0xb0, 0x77, 0xbc, + 0x4a, 0x00, 0x8c, 0x18, 0xba, 0x92, 0x01, 0x6b, 0x9e, 0x91, 0x0f, 0xf8, 0x54, 0x43, 0x13, 0xe1, + 0xb9, 0x29, 0xe1, 0x3b, 0x13, 0x31, 0x7f, 0x25, 0x7c, 0x67, 0xa2, 0x86, 0x32, 0xb2, 0x24, 0x18, + 0xe7, 0x71, 0x2e, 0xf6, 0x36, 0x94, 0x30, 0xbf, 0x6a, 0x68, 0x52, 0x69, 0xf1, 0x70, 0xca, 0x60, + 0xa1, 0xae, 0x37, 0xe1, 0xd3, 0x1d, 0xd9, 0xd4, 0x92, 0x2d, 0x01, 0xf8, 0x16, 0xbe, 0xa1, 0xf7, + 0xfd, 0x1d, 0xd3, 0x6f, 0x79, 0x63, 0xbe, 0x84, 0x3f, 0x6b, 0x68, 0xaa, 0xa7, 0x43, 0x4d, 0xb8, + 0x39, 0xe3, 0x5a, 0xde, 0xec, 0xd5, 0x41, 0xcd, 0x20, 0x95, 0x75, 0x91, 0xca, 0x2a, 0x5e, 0x49, + 0x97, 0x4a, 0xd9, 0x6b, 0x75, 0x45, 0xe1, 0x95, 0x86, 0x2e, 0xa1, 0xf0, 0x51, 0x2d, 0x71, 0x42, + 0xe1, 0x23, 0xfb, 0xe0, 0xe4, 0xc2, 0xfb, 0x1d, 0xb5, 0xbe, 0x1f, 0x6a, 0xb7, 0x0f, 0x74, 0xa5, + 0xf5, 0xc5, 0x3f, 0x6a, 0xe8, 0x84, 0xda, 0xd8, 0xe2, 0x01, 0x60, 0x82, 0x9d, 0xbd, 0x3e, 0x90, + 0x4d, 0xda, 0x06, 0x54, 0x41, 0xe5, 0x1b, 0xb7, 0x9e, 0xbd, 0xc8, 0x69, 0xcf, 0x5f, 0xe4, 0xb4, + 0xbf, 0x5e, 0xe4, 0xb4, 0x27, 0x2f, 0x73, 0x43, 0xcf, 0x5f, 0xe6, 0x86, 0xfe, 0x78, 0x99, 0x1b, + 0xfa, 0xb4, 0x18, 0x1e, 0x56, 0x98, 0xe3, 0x1a, 0xf7, 0xee, 0x5a, 0x6d, 0xb3, 0x26, 0x7e, 0x67, + 0xf7, 0x9d, 0x3f, 0xf4, 0xdd, 0x8b, 0xd9, 0xa5, 0x32, 0x2a, 0x7e, 0x32, 0x5f, 0xff, 0x27, 0x00, + 0x00, 0xff, 0xff, 0x55, 0x61, 0x27, 0xc7, 0x1b, 0x18, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -1513,6 +1598,7 @@ type QueryClient interface { Providers(ctx context.Context, in *QueryProvidersRequest, opts ...grpc.CallOption) (*QueryProvidersResponse, error) PoolParams(ctx context.Context, in *QueryPoolParamsRequest, opts ...grpc.CallOption) (*QueryPoolParamsResponse, error) ClaimParams(ctx context.Context, in *QueryClaimParamsRequest, opts ...grpc.CallOption) (*QueryClaimParamsResponse, error) + DistrParams(ctx context.Context, in *QueryDistrParamsRequest, opts ...grpc.CallOption) (*QueryDistrParamsResponse, error) ShieldStatus(ctx context.Context, in *QueryShieldStatusRequest, opts ...grpc.CallOption) (*QueryShieldStatusResponse, error) ShieldStaking(ctx context.Context, in *QueryShieldStakingRequest, opts ...grpc.CallOption) (*QueryShieldStakingResponse, error) ShieldStakingRate(ctx context.Context, in *QueryShieldStakingRateRequest, opts ...grpc.CallOption) (*QueryShieldStakingRateResponse, error) @@ -1627,6 +1713,15 @@ func (c *queryClient) ClaimParams(ctx context.Context, in *QueryClaimParamsReque return out, nil } +func (c *queryClient) DistrParams(ctx context.Context, in *QueryDistrParamsRequest, opts ...grpc.CallOption) (*QueryDistrParamsResponse, error) { + out := new(QueryDistrParamsResponse) + err := c.cc.Invoke(ctx, "/shentu.shield.v1alpha1.Query/DistrParams", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + func (c *queryClient) ShieldStatus(ctx context.Context, in *QueryShieldStatusRequest, opts ...grpc.CallOption) (*QueryShieldStatusResponse, error) { out := new(QueryShieldStatusResponse) err := c.cc.Invoke(ctx, "/shentu.shield.v1alpha1.Query/ShieldStatus", in, out, opts...) @@ -1685,6 +1780,7 @@ type QueryServer interface { Providers(context.Context, *QueryProvidersRequest) (*QueryProvidersResponse, error) PoolParams(context.Context, *QueryPoolParamsRequest) (*QueryPoolParamsResponse, error) ClaimParams(context.Context, *QueryClaimParamsRequest) (*QueryClaimParamsResponse, error) + DistrParams(context.Context, *QueryDistrParamsRequest) (*QueryDistrParamsResponse, error) ShieldStatus(context.Context, *QueryShieldStatusRequest) (*QueryShieldStatusResponse, error) ShieldStaking(context.Context, *QueryShieldStakingRequest) (*QueryShieldStakingResponse, error) ShieldStakingRate(context.Context, *QueryShieldStakingRateRequest) (*QueryShieldStakingRateResponse, error) @@ -1729,6 +1825,9 @@ func (*UnimplementedQueryServer) PoolParams(ctx context.Context, req *QueryPoolP func (*UnimplementedQueryServer) ClaimParams(ctx context.Context, req *QueryClaimParamsRequest) (*QueryClaimParamsResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method ClaimParams not implemented") } +func (*UnimplementedQueryServer) DistrParams(ctx context.Context, req *QueryDistrParamsRequest) (*QueryDistrParamsResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method DistrParams not implemented") +} func (*UnimplementedQueryServer) ShieldStatus(ctx context.Context, req *QueryShieldStatusRequest) (*QueryShieldStatusResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method ShieldStatus not implemented") } @@ -1947,6 +2046,24 @@ func _Query_ClaimParams_Handler(srv interface{}, ctx context.Context, dec func(i return interceptor(ctx, in, info, handler) } +func _Query_DistrParams_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(QueryDistrParamsRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(QueryServer).DistrParams(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/shentu.shield.v1alpha1.Query/DistrParams", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(QueryServer).DistrParams(ctx, req.(*QueryDistrParamsRequest)) + } + return interceptor(ctx, in, info, handler) +} + func _Query_ShieldStatus_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(QueryShieldStatusRequest) if err := dec(in); err != nil { @@ -2085,6 +2202,10 @@ var _Query_serviceDesc = grpc.ServiceDesc{ MethodName: "ClaimParams", Handler: _Query_ClaimParams_Handler, }, + { + MethodName: "DistrParams", + Handler: _Query_DistrParams_Handler, + }, { MethodName: "ShieldStatus", Handler: _Query_ShieldStatus_Handler, @@ -2756,6 +2877,62 @@ func (m *QueryClaimParamsResponse) MarshalToSizedBuffer(dAtA []byte) (int, error return len(dAtA) - i, nil } +func (m *QueryDistrParamsRequest) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *QueryDistrParamsRequest) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *QueryDistrParamsRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + return len(dAtA) - i, nil +} + +func (m *QueryDistrParamsResponse) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *QueryDistrParamsResponse) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *QueryDistrParamsResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + { + size, err := m.Params.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintQuery(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa + return len(dAtA) - i, nil +} + func (m *QueryShieldStatusRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -3372,6 +3549,26 @@ func (m *QueryClaimParamsResponse) Size() (n int) { return n } +func (m *QueryDistrParamsRequest) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + return n +} + +func (m *QueryDistrParamsResponse) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = m.Params.Size() + n += 1 + l + sovQuery(uint64(l)) + return n +} + func (m *QueryShieldStatusRequest) Size() (n int) { if m == nil { return 0 @@ -5135,6 +5332,145 @@ func (m *QueryClaimParamsResponse) Unmarshal(dAtA []byte) error { } return nil } +func (m *QueryDistrParamsRequest) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: QueryDistrParamsRequest: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: QueryDistrParamsRequest: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + default: + iNdEx = preIndex + skippy, err := skipQuery(dAtA[iNdEx:]) + if err != nil { + return err + } + if skippy < 0 { + return ErrInvalidLengthQuery + } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthQuery + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *QueryDistrParamsResponse) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: QueryDistrParamsResponse: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: QueryDistrParamsResponse: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Params", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthQuery + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthQuery + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if err := m.Params.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipQuery(dAtA[iNdEx:]) + if err != nil { + return err + } + if skippy < 0 { + return ErrInvalidLengthQuery + } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthQuery + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} func (m *QueryShieldStatusRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 diff --git a/x/shield/types/query.pb.gw.go b/x/shield/types/query.pb.gw.go index 29e84a073..1496837c6 100644 --- a/x/shield/types/query.pb.gw.go +++ b/x/shield/types/query.pb.gw.go @@ -467,6 +467,24 @@ func local_request_Query_ClaimParams_0(ctx context.Context, marshaler runtime.Ma } +func request_Query_DistrParams_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryDistrParamsRequest + var metadata runtime.ServerMetadata + + msg, err := client.DistrParams(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + +} + +func local_request_Query_DistrParams_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryDistrParamsRequest + var metadata runtime.ServerMetadata + + msg, err := server.DistrParams(ctx, &protoReq) + return msg, metadata, err + +} + func request_Query_ShieldStatus_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq QueryShieldStatusRequest var metadata runtime.ServerMetadata @@ -877,6 +895,26 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv }) + mux.Handle("GET", pattern_Query_DistrParams_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := local_request_Query_DistrParams_0(rctx, inboundMarshaler, server, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_Query_DistrParams_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + mux.Handle("GET", pattern_Query_ShieldStatus_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() @@ -1238,6 +1276,26 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie }) + mux.Handle("GET", pattern_Query_DistrParams_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := request_Query_DistrParams_0(rctx, inboundMarshaler, client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_Query_DistrParams_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + mux.Handle("GET", pattern_Query_ShieldStatus_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() @@ -1364,6 +1422,8 @@ var ( pattern_Query_ClaimParams_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"shentu", "shield", "v1alpha1", "claim_params"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_DistrParams_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"shentu", "shield", "v1alpha1", "distr_params"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_ShieldStatus_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"shentu", "shield", "v1alpha1", "status"}, "", runtime.AssumeColonVerbOpt(true))) pattern_Query_ShieldStaking_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4, 1, 0, 4, 1, 5, 5}, []string{"shentu", "shield", "v1alpha1", "shield_staking", "pool_id", "purchaser"}, "", runtime.AssumeColonVerbOpt(true))) @@ -1398,6 +1458,8 @@ var ( forward_Query_ClaimParams_0 = runtime.ForwardResponseMessage + forward_Query_DistrParams_0 = runtime.ForwardResponseMessage + forward_Query_ShieldStatus_0 = runtime.ForwardResponseMessage forward_Query_ShieldStaking_0 = runtime.ForwardResponseMessage From 308ca1a32ceef69b51c7d545608a930502209f25 Mon Sep 17 00:00:00 2001 From: yoongbok lee Date: Wed, 1 Jun 2022 09:35:58 +0900 Subject: [PATCH 11/14] fix test params --- x/mint/abci_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x/mint/abci_test.go b/x/mint/abci_test.go index f7ccb76e4..e6608b9f2 100644 --- a/x/mint/abci_test.go +++ b/x/mint/abci_test.go @@ -18,7 +18,7 @@ func TestBeginBlocker(t *testing.T) { ctx := app.BaseApp.NewContext(false, tmproto.Header{Time: time.Now().UTC()}) k := app.MintKeeper - p := minttypes.DefaultParams() + p := mint.DefaultGenesisState().GetParams() k.SetParams(ctx, p) type args struct { minter minttypes.Minter From 6b1c7780528be5f3bb1f743b15627184805c1b47 Mon Sep 17 00:00:00 2001 From: yoongbok lee Date: Wed, 1 Jun 2022 23:02:09 +0900 Subject: [PATCH 12/14] add tests & rename to v232 --- x/shield/keeper/migrations.go | 4 +- x/shield/legacy/{v231 => v232}/store.go | 2 +- x/shield/legacy/v232/store_test.go | 61 +++++++++++++++++++++++++ 3 files changed, 64 insertions(+), 3 deletions(-) rename x/shield/legacy/{v231 => v232}/store.go (97%) create mode 100644 x/shield/legacy/v232/store_test.go diff --git a/x/shield/keeper/migrations.go b/x/shield/keeper/migrations.go index b831a2e14..c5859c308 100644 --- a/x/shield/keeper/migrations.go +++ b/x/shield/keeper/migrations.go @@ -4,7 +4,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/gogo/protobuf/grpc" - v231 "github.com/certikfoundation/shentu/v2/x/shield/legacy/v231" + "github.com/certikfoundation/shentu/v2/x/shield/legacy/v232" ) // Migrator is a struct for handling in-place store migrations. @@ -20,6 +20,6 @@ func NewMigrator(keeper Keeper, queryServer grpc.Server) Migrator { // Migrate1to2 migrates from version 1 to 2. func (m Migrator) Migrate1to2(ctx sdk.Context) error { - v231.MigrateStore(ctx, m.keeper.paramSpace) + v232.MigrateStore(ctx, m.keeper.paramSpace) return nil } diff --git a/x/shield/legacy/v231/store.go b/x/shield/legacy/v232/store.go similarity index 97% rename from x/shield/legacy/v231/store.go rename to x/shield/legacy/v232/store.go index faf9d34b8..1cfab6017 100644 --- a/x/shield/legacy/v231/store.go +++ b/x/shield/legacy/v232/store.go @@ -1,4 +1,4 @@ -package v231 +package v232 import ( sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/shield/legacy/v232/store_test.go b/x/shield/legacy/v232/store_test.go new file mode 100644 index 000000000..3bfd9df8a --- /dev/null +++ b/x/shield/legacy/v232/store_test.go @@ -0,0 +1,61 @@ +package v232_test + +import ( + "testing" + "time" + + "github.com/stretchr/testify/suite" + + tmproto "github.com/tendermint/tendermint/proto/tendermint/types" + + sdk "github.com/cosmos/cosmos-sdk/types" + + "github.com/certikfoundation/shentu/v2/simapp" + "github.com/certikfoundation/shentu/v2/x/shield/keeper" + "github.com/certikfoundation/shentu/v2/x/shield/types" +) + +//shared test +type MigrationTestSuite struct { + suite.Suite + + app *simapp.SimApp + ctx sdk.Context + keeper keeper.Keeper +} + +func (suite *MigrationTestSuite) SetupTest() { + suite.app = simapp.Setup(false) + suite.ctx = suite.app.BaseApp.NewContext(false, tmproto.Header{Time: time.Now().UTC()}) + suite.keeper = suite.app.ShieldKeeper +} + +func (suite *MigrationTestSuite) TestMigrateParams() { + tests := []struct { + name string + description string + newParams types.DistributionParams + expectedError bool + }{ + { + name: "Zero for all", + description: "Set all parameter constants to zero", + newParams: types.NewDistributionParams(sdk.ZeroDec(), sdk.ZeroDec(), sdk.ZeroDec()), + }, + { + name: "One for all", + description: "Set all parameter constants to one", + newParams: types.NewDistributionParams(sdk.OneDec(), sdk.OneDec(), sdk.OneDec()), + }, + } + + for _, tc := range tests { + suite.keeper.SetDistributionParams(suite.ctx, tc.newParams) + actual := suite.keeper.GetDistributionParams(suite.ctx) + suite.Require().Equal(actual, tc.newParams) + } +} + +func TestPoolTestSuite(t *testing.T) { + suite.Run(t, new(MigrationTestSuite)) +} From 5f16e721c86bdb3ef06081aff49e00897edc4b41 Mon Sep 17 00:00:00 2001 From: yoongbok lee Date: Wed, 1 Jun 2022 23:07:34 +0900 Subject: [PATCH 13/14] run lint --- .golangci.yml | 2 +- x/shield/keeper/migrations.go | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index 5835257f8..8ccaa0af1 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -70,7 +70,7 @@ linters: - prealloc - scopelint - structcheck - - typecheck + # - typecheck - unconvert - unparam - varcheck diff --git a/x/shield/keeper/migrations.go b/x/shield/keeper/migrations.go index c5859c308..4a2624847 100644 --- a/x/shield/keeper/migrations.go +++ b/x/shield/keeper/migrations.go @@ -1,9 +1,10 @@ package keeper import ( - sdk "github.com/cosmos/cosmos-sdk/types" "github.com/gogo/protobuf/grpc" + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/certikfoundation/shentu/v2/x/shield/legacy/v232" ) From 397f771f264e844d4d5d1d13bc4518e5ac03e5dc Mon Sep 17 00:00:00 2001 From: yoongbok lee Date: Wed, 1 Jun 2022 23:41:01 +0900 Subject: [PATCH 14/14] add log message while migrating params --- x/shield/legacy/v232/store.go | 1 + 1 file changed, 1 insertion(+) diff --git a/x/shield/legacy/v232/store.go b/x/shield/legacy/v232/store.go index 1cfab6017..668de23c7 100644 --- a/x/shield/legacy/v232/store.go +++ b/x/shield/legacy/v232/store.go @@ -15,6 +15,7 @@ func MigrateStore(ctx sdk.Context, paramstore types.ParamSubspace) { } func migrateParamsStore(ctx sdk.Context, paramstore types.ParamSubspace) { + ctx.Logger().Info("Adding Additional Shield Params..") blockRewardParams := types.DefaultDistributionParams() paramstore.Set(ctx, types.ParamStoreKeyDistribution, &blockRewardParams) }