diff --git a/CHANGELOG.md b/CHANGELOG.md index 6bb091573a3..cbdbd98d0e8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -95,6 +95,7 @@ Cosmwasm bindings have been added, to make swapping and creating these new token * Cosmwasm builds on M1 macs * [#1435](https://github.com/osmosis-labs/osmosis/pull/1435) `x/tokenfactory` create denom fee for spam resistance * [#1253](https://github.com/osmosis-labs/osmosis/pull/1253) Add a message to increase the duration of a bonded lock. +* [#1632](https://github.com/osmosis-labs/osmosis/pull/1632) augment SuperfluidDelegationsByDelegator query, return osmo equivilent is staked via superfluid ## [v8.0.0 - Emergency proposals upgrade](https://github.com/osmosis-labs/osmosis/releases/tag/v8.0.0) diff --git a/docs/core/proto-docs.md b/docs/core/proto-docs.md index abb1a4f9445..d44afbaafdc 100644 --- a/docs/core/proto-docs.md +++ b/docs/core/proto-docs.md @@ -3247,6 +3247,7 @@ and OSMO tokens for superfluid staking | `delegator_address` | [string](#string) | | | | `validator_address` | [string](#string) | | | | `delegation_amount` | [cosmos.base.v1beta1.Coin](#cosmos.base.v1beta1.Coin) | | | +| `equivalent_staked_amount` | [cosmos.base.v1beta1.Coin](#cosmos.base.v1beta1.Coin) | | | @@ -3691,6 +3692,7 @@ assets | ----- | ---- | ----- | ----------- | | `superfluid_delegation_records` | [SuperfluidDelegationRecord](#osmosis.superfluid.SuperfluidDelegationRecord) | repeated | | | `total_delegated_coins` | [cosmos.base.v1beta1.Coin](#cosmos.base.v1beta1.Coin) | repeated | | +| `total_equivalent_staked_amount` | [cosmos.base.v1beta1.Coin](#cosmos.base.v1beta1.Coin) | | | diff --git a/proto/osmosis/superfluid/query.proto b/proto/osmosis/superfluid/query.proto index 3206fd38d51..4e0baba7d17 100644 --- a/proto/osmosis/superfluid/query.proto +++ b/proto/osmosis/superfluid/query.proto @@ -187,6 +187,10 @@ message SuperfluidDelegationsByDelegatorResponse { (gogoproto.nullable) = false, (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins" ]; + cosmos.base.v1beta1.Coin total_equivalent_staked_amount = 3 [ + (gogoproto.nullable) = false, + (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coin" + ]; } message SuperfluidUndelegationsByDelegatorRequest { diff --git a/proto/osmosis/superfluid/superfluid.proto b/proto/osmosis/superfluid/superfluid.proto index ee0d42df58e..805daa678ac 100644 --- a/proto/osmosis/superfluid/superfluid.proto +++ b/proto/osmosis/superfluid/superfluid.proto @@ -61,6 +61,8 @@ message SuperfluidDelegationRecord { (gogoproto.nullable) = false, (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coin" ]; + cosmos.base.v1beta1.Coin equivalent_staked_amount = 4 + [ (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coin" ]; } message LockIdIntermediaryAccountConnection { diff --git a/x/superfluid/keeper/grpc_query.go b/x/superfluid/keeper/grpc_query.go index d6596968f0c..b1983f08368 100644 --- a/x/superfluid/keeper/grpc_query.go +++ b/x/superfluid/keeper/grpc_query.go @@ -11,6 +11,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" + appparams "github.com/osmosis-labs/osmosis/v9/app/params" lockuptypes "github.com/osmosis-labs/osmosis/v9/x/lockup/types" "github.com/osmosis-labs/osmosis/v9/x/superfluid/types" ) @@ -195,6 +196,7 @@ func (q Querier) SuperfluidDelegationsByDelegator(goCtx context.Context, req *ty res := types.SuperfluidDelegationsByDelegatorResponse{ SuperfluidDelegationRecords: []types.SuperfluidDelegationRecord{}, TotalDelegatedCoins: sdk.NewCoins(), + TotalEquivalentStakedAmount: sdk.NewCoin(appparams.BaseCoinUnit, sdk.ZeroInt()), } syntheticLocks := q.Keeper.lk.GetAllSyntheticLockupsByAddr(ctx, delAddr) @@ -213,17 +215,25 @@ func (q Querier) SuperfluidDelegationsByDelegator(goCtx context.Context, req *ty baseDenom := periodLock.Coins.GetDenomByIndex(0) lockedCoins := sdk.NewCoin(baseDenom, periodLock.GetCoins().AmountOf(baseDenom)) valAddr, err := ValidatorAddressFromSyntheticDenom(syntheticLock.SynthDenom) + + // Find how many osmo tokens this delegation is worth at superfluids current risk adjustment + // and twap of the denom. + equivalentAmount := q.Keeper.GetSuperfluidOSMOTokens(ctx, baseDenom, lockedCoins.Amount) + coin := sdk.NewCoin(appparams.BaseCoinUnit, equivalentAmount) + if err != nil { return nil, err } res.SuperfluidDelegationRecords = append(res.SuperfluidDelegationRecords, types.SuperfluidDelegationRecord{ - DelegatorAddress: req.DelegatorAddress, - ValidatorAddress: valAddr, - DelegationAmount: lockedCoins, + DelegatorAddress: req.DelegatorAddress, + ValidatorAddress: valAddr, + DelegationAmount: lockedCoins, + EquivalentStakedAmount: &coin, }, ) res.TotalDelegatedCoins = res.TotalDelegatedCoins.Add(lockedCoins) + res.TotalEquivalentStakedAmount = res.TotalEquivalentStakedAmount.Add(coin) } return &res, nil diff --git a/x/superfluid/keeper/grpc_query_test.go b/x/superfluid/keeper/grpc_query_test.go index f5a383ca849..91e3c064dd1 100644 --- a/x/superfluid/keeper/grpc_query_test.go +++ b/x/superfluid/keeper/grpc_query_test.go @@ -77,12 +77,22 @@ func (suite *KeeperTestSuite) TestGRPCQuerySuperfluidDelegations() { res, err := suite.queryClient.SuperfluidDelegationsByDelegator(sdk.WrapSDKContext(suite.Ctx), &types.SuperfluidDelegationsByDelegatorRequest{ DelegatorAddress: delegator.String(), }) + + multiplier0 := suite.querier.Keeper.GetOsmoEquivalentMultiplier(suite.Ctx, denoms[0]) + multiplier1 := suite.querier.Keeper.GetOsmoEquivalentMultiplier(suite.Ctx, denoms[1]) + minRiskFactor := suite.querier.Keeper.GetParams(suite.Ctx).MinimumRiskFactor + + expectAmount0 := multiplier0.Mul(sdk.NewDec(1000000)).Sub(multiplier0.Mul(sdk.NewDec(1000000)).Mul(minRiskFactor)) + expectAmount1 := multiplier1.Mul(sdk.NewDec(1000000)).Sub(multiplier1.Mul(sdk.NewDec(1000000)).Mul(minRiskFactor)) + suite.Require().NoError(err) suite.Require().Len(res.SuperfluidDelegationRecords, 2) suite.Require().True(res.TotalDelegatedCoins.IsEqual(sdk.NewCoins( sdk.NewInt64Coin(denoms[0], 1000000), sdk.NewInt64Coin(denoms[1], 1000000), ))) + suite.Require().True(res.SuperfluidDelegationRecords[0].EquivalentStakedAmount.IsEqual(sdk.NewCoin("uosmo", expectAmount0.RoundInt()))) + suite.Require().True(res.SuperfluidDelegationRecords[1].EquivalentStakedAmount.IsEqual(sdk.NewCoin("uosmo", expectAmount1.RoundInt()))) } // for each validator denom pair, make sure they have 1 delegations diff --git a/x/superfluid/types/query.pb.go b/x/superfluid/types/query.pb.go index 116b7fa2a8c..b1290e110b1 100644 --- a/x/superfluid/types/query.pb.go +++ b/x/superfluid/types/query.pb.go @@ -850,6 +850,7 @@ func (m *SuperfluidDelegationsByDelegatorRequest) GetDelegatorAddress() string { type SuperfluidDelegationsByDelegatorResponse struct { SuperfluidDelegationRecords []SuperfluidDelegationRecord `protobuf:"bytes,1,rep,name=superfluid_delegation_records,json=superfluidDelegationRecords,proto3" json:"superfluid_delegation_records"` TotalDelegatedCoins github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,2,rep,name=total_delegated_coins,json=totalDelegatedCoins,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"total_delegated_coins"` + TotalEquivalentStakedAmount types.Coin `protobuf:"bytes,3,opt,name=total_equivalent_staked_amount,json=totalEquivalentStakedAmount,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coin" json:"total_equivalent_staked_amount"` } func (m *SuperfluidDelegationsByDelegatorResponse) Reset() { @@ -901,6 +902,13 @@ func (m *SuperfluidDelegationsByDelegatorResponse) GetTotalDelegatedCoins() gith return nil } +func (m *SuperfluidDelegationsByDelegatorResponse) GetTotalEquivalentStakedAmount() types.Coin { + if m != nil { + return m.TotalEquivalentStakedAmount + } + return types.Coin{} +} + type SuperfluidUndelegationsByDelegatorRequest struct { DelegatorAddress string `protobuf:"bytes,1,opt,name=delegator_address,json=delegatorAddress,proto3" json:"delegator_address,omitempty"` Denom string `protobuf:"bytes,2,opt,name=denom,proto3" json:"denom,omitempty"` @@ -1260,102 +1268,105 @@ func init() { func init() { proto.RegisterFile("osmosis/superfluid/query.proto", fileDescriptor_e3d9448e4ed3943f) } var fileDescriptor_e3d9448e4ed3943f = []byte{ - // 1516 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x58, 0xdd, 0x6f, 0x14, 0x55, - 0x14, 0xef, 0xdd, 0x42, 0x0b, 0x87, 0x04, 0xca, 0x05, 0x65, 0x19, 0x61, 0x0b, 0x53, 0x68, 0xd7, - 0x02, 0x33, 0x52, 0x2c, 0x54, 0x14, 0xc2, 0x96, 0x02, 0x36, 0x29, 0x16, 0x17, 0x5a, 0x12, 0x3f, - 0x32, 0x99, 0xdd, 0xb9, 0x2c, 0x13, 0x66, 0x67, 0xb6, 0x7b, 0x67, 0x2a, 0x1b, 0x42, 0x8c, 0x18, - 0x13, 0x89, 0x2f, 0x26, 0xfc, 0x03, 0xbe, 0x98, 0xa8, 0x0f, 0xc6, 0x3f, 0xc0, 0x17, 0xe3, 0x0b, - 0x89, 0x31, 0x21, 0xf1, 0xc5, 0xf8, 0x00, 0x06, 0x7c, 0xf5, 0xc5, 0x47, 0x7d, 0x31, 0x73, 0xef, - 0x9d, 0x8f, 0xed, 0xce, 0xcc, 0xee, 0x56, 0x84, 0xa7, 0x9d, 0xb9, 0xe7, 0xf3, 0x77, 0xce, 0xb9, - 0x67, 0xcf, 0x19, 0x28, 0x38, 0xb4, 0xee, 0x50, 0x93, 0xaa, 0xd4, 0x6b, 0x90, 0xe6, 0x35, 0xcb, - 0x33, 0x0d, 0x75, 0xc5, 0x23, 0xcd, 0x96, 0xd2, 0x68, 0x3a, 0xae, 0x83, 0xb1, 0xa0, 0x2b, 0x11, - 0x5d, 0xda, 0x59, 0x73, 0x6a, 0x0e, 0x23, 0xab, 0xfe, 0x13, 0xe7, 0x94, 0x0a, 0x55, 0xc6, 0xaa, - 0x56, 0x74, 0x4a, 0xd4, 0xd5, 0xa3, 0x15, 0xe2, 0xea, 0x47, 0xd5, 0xaa, 0x63, 0xda, 0x82, 0xbe, - 0xa7, 0xe6, 0x38, 0x35, 0x8b, 0xa8, 0x7a, 0xc3, 0x54, 0x75, 0xdb, 0x76, 0x5c, 0xdd, 0x35, 0x1d, - 0x9b, 0x0a, 0xea, 0xa8, 0xa0, 0xb2, 0xb7, 0x8a, 0x77, 0x4d, 0x75, 0xcd, 0x3a, 0xa1, 0xae, 0x5e, - 0x6f, 0x04, 0xea, 0xd7, 0x32, 0x18, 0x5e, 0x93, 0x69, 0x10, 0xf4, 0xb1, 0x04, 0x20, 0xd1, 0x63, - 0x60, 0x25, 0x81, 0xa9, 0xa1, 0x37, 0xf5, 0x7a, 0xe0, 0xc6, 0xee, 0x80, 0xc1, 0x72, 0xaa, 0x37, - 0xbc, 0x06, 0xfb, 0x11, 0xa4, 0xc9, 0x38, 0x3e, 0x16, 0xa2, 0x10, 0x65, 0x43, 0xaf, 0x99, 0x76, - 0xcc, 0x19, 0x79, 0x27, 0xe0, 0xb7, 0x7d, 0x8e, 0x4b, 0x4c, 0x77, 0x99, 0xac, 0x78, 0x84, 0xba, - 0xf2, 0x22, 0xec, 0x68, 0x3b, 0xa5, 0x0d, 0xc7, 0xa6, 0x04, 0xcf, 0xc0, 0x10, 0xf7, 0x21, 0x8f, - 0xf6, 0xa1, 0xe2, 0x96, 0x29, 0x49, 0xe9, 0x8c, 0xb9, 0xc2, 0x65, 0x66, 0x37, 0xdc, 0x7f, 0x38, - 0x3a, 0x50, 0x16, 0xfc, 0x72, 0x11, 0x46, 0x4a, 0x94, 0x12, 0xf7, 0x4a, 0xab, 0x41, 0x84, 0x11, - 0xbc, 0x13, 0x36, 0x1a, 0xc4, 0x76, 0xea, 0x4c, 0xd9, 0xe6, 0x32, 0x7f, 0x91, 0xdf, 0x85, 0xed, - 0x31, 0x4e, 0x61, 0xf8, 0x3c, 0x80, 0xee, 0x1f, 0x6a, 0x6e, 0xab, 0x41, 0x18, 0xff, 0xd6, 0xa9, - 0x89, 0x24, 0xe3, 0x97, 0xc3, 0xc7, 0x48, 0xc9, 0x66, 0x3d, 0x78, 0x94, 0x31, 0x8c, 0x94, 0x2c, - 0x8b, 0x91, 0x42, 0xac, 0xcb, 0xb0, 0x3d, 0x76, 0x26, 0x0c, 0x96, 0x60, 0x88, 0x49, 0xf9, 0x48, - 0x07, 0x8b, 0x5b, 0xa6, 0xc6, 0x7a, 0x30, 0x16, 0x40, 0xe6, 0x82, 0xb2, 0x02, 0x2f, 0xb2, 0xe3, - 0x8b, 0x9e, 0xe5, 0x9a, 0x0d, 0xcb, 0x24, 0xcd, 0x6c, 0xe0, 0x9f, 0x21, 0xd8, 0xd5, 0x21, 0x20, - 0xdc, 0x69, 0x80, 0xe4, 0xdb, 0xd7, 0xc8, 0x8a, 0x67, 0xae, 0xea, 0x16, 0xb1, 0x5d, 0xad, 0x1e, - 0x72, 0x89, 0x64, 0x4c, 0x25, 0xb9, 0xb8, 0x48, 0xeb, 0xce, 0xb9, 0x50, 0x28, 0xae, 0xb9, 0xea, - 0x34, 0x8d, 0x72, 0xde, 0x49, 0xa1, 0xcb, 0x77, 0x11, 0xec, 0x8f, 0xf0, 0xcd, 0xdb, 0x2e, 0x69, - 0xd6, 0x89, 0x61, 0xea, 0xcd, 0x56, 0xa9, 0x5a, 0x75, 0x3c, 0xdb, 0x9d, 0xb7, 0xaf, 0x39, 0xc9, - 0x48, 0xf0, 0x6e, 0xd8, 0xb4, 0xaa, 0x5b, 0x9a, 0x6e, 0x18, 0xcd, 0x7c, 0x8e, 0x11, 0x86, 0x57, - 0x75, 0xab, 0x64, 0x18, 0x4d, 0x9f, 0x54, 0xd3, 0xbd, 0x1a, 0xd1, 0x4c, 0x23, 0x3f, 0xb8, 0x0f, - 0x15, 0x37, 0x94, 0x87, 0xd9, 0xfb, 0xbc, 0x81, 0xf3, 0x30, 0xec, 0x4b, 0x10, 0x4a, 0xf3, 0x1b, - 0xb8, 0x90, 0x78, 0x95, 0xaf, 0x43, 0xa1, 0x64, 0x59, 0x09, 0x3e, 0x04, 0x39, 0xf4, 0xeb, 0x23, - 0xaa, 0x6c, 0x11, 0x8f, 0x71, 0x85, 0x5f, 0x03, 0xc5, 0xbf, 0x06, 0x0a, 0xef, 0x14, 0xe2, 0x1a, - 0x28, 0x97, 0xf4, 0x5a, 0x50, 0x86, 0xe5, 0x98, 0xa4, 0xfc, 0x23, 0x82, 0xd1, 0x54, 0x53, 0x22, - 0x17, 0x57, 0x61, 0x93, 0x2e, 0xce, 0x44, 0x71, 0x4c, 0x67, 0x17, 0x47, 0x4a, 0xf0, 0x44, 0xb9, - 0x84, 0xca, 0xf0, 0x85, 0x36, 0x10, 0x39, 0x06, 0x62, 0xa2, 0x2b, 0x08, 0xee, 0x55, 0x1b, 0x8a, - 0xd3, 0x30, 0x76, 0xd6, 0xb1, 0x6d, 0x52, 0x75, 0x49, 0x92, 0xf1, 0x20, 0x68, 0xbb, 0x60, 0xd8, - 0x6f, 0x1a, 0x7e, 0x2a, 0x10, 0x4b, 0xc5, 0x90, 0xff, 0x3a, 0x6f, 0xc8, 0x1f, 0xc0, 0x81, 0x6c, - 0x79, 0x11, 0x89, 0x45, 0x18, 0x16, 0xce, 0x8b, 0x90, 0xaf, 0x2f, 0x10, 0xe5, 0x40, 0x8b, 0x3c, - 0x06, 0xfb, 0xaf, 0x38, 0xae, 0x6e, 0x45, 0x22, 0x73, 0xc4, 0x22, 0x35, 0xde, 0x7e, 0x83, 0xfb, - 0xfa, 0x15, 0x02, 0x39, 0x8b, 0x4b, 0x38, 0xf7, 0x11, 0x82, 0x11, 0xd7, 0x67, 0x8b, 0x11, 0x79, - 0x99, 0xce, 0x2e, 0xf9, 0x81, 0xff, 0xed, 0xe1, 0xe8, 0x78, 0xcd, 0x74, 0xaf, 0x7b, 0x15, 0xa5, - 0xea, 0xd4, 0x55, 0xd1, 0x32, 0xf9, 0xcf, 0x11, 0x6a, 0xdc, 0x50, 0xfd, 0x56, 0x43, 0x95, 0x79, - 0xdb, 0xfd, 0xeb, 0xe1, 0xe8, 0x58, 0x4b, 0xaf, 0x5b, 0x27, 0x65, 0xa6, 0x4f, 0x8b, 0xb0, 0x69, - 0x46, 0xa4, 0x5b, 0x2e, 0x77, 0x98, 0x93, 0xef, 0xb5, 0x5d, 0xa2, 0x88, 0x52, 0xaa, 0xc7, 0xf3, - 0x70, 0x08, 0xb6, 0x0b, 0x3d, 0x4e, 0x53, 0x0b, 0xae, 0x00, 0xbf, 0x50, 0x23, 0x21, 0xa1, 0xc4, - 0xcf, 0x7d, 0xe6, 0x55, 0xdd, 0x32, 0x8d, 0x36, 0x66, 0x7e, 0xc9, 0x46, 0x42, 0x42, 0xc0, 0x1c, - 0x5e, 0xcf, 0xc1, 0x78, 0xa3, 0xb9, 0x8b, 0x40, 0xce, 0xf2, 0x4a, 0x04, 0xb0, 0x0a, 0x43, 0x7a, - 0x5d, 0x24, 0xd7, 0xaf, 0xf2, 0xdd, 0x6d, 0xa5, 0x18, 0x14, 0xe1, 0x59, 0xc7, 0xb4, 0x67, 0x5f, - 0xf1, 0x03, 0xfa, 0xcd, 0xa3, 0xd1, 0x62, 0x0f, 0x01, 0xf5, 0x05, 0x68, 0x59, 0xa8, 0x96, 0x97, - 0x61, 0x22, 0x31, 0x8d, 0xb3, 0xad, 0xb9, 0x00, 0xf9, 0x7a, 0xc2, 0x24, 0x7f, 0x99, 0x83, 0x62, - 0x77, 0xc5, 0x02, 0xe9, 0x4d, 0xd8, 0x9b, 0x98, 0x53, 0xad, 0xc9, 0xba, 0x64, 0x70, 0xcd, 0x95, - 0xec, 0xea, 0x8e, 0x8c, 0xf0, 0xe6, 0x2a, 0xee, 0xf7, 0x4b, 0x34, 0x95, 0x83, 0xe2, 0x0f, 0xe1, - 0x05, 0x5e, 0x53, 0xc2, 0x28, 0x31, 0x34, 0x7f, 0x0e, 0xf1, 0x33, 0xfa, 0xd4, 0x43, 0xbe, 0x23, - 0x5e, 0x9e, 0xc4, 0x60, 0x87, 0xb2, 0x0d, 0x2f, 0x47, 0x08, 0x96, 0x6c, 0xe3, 0xa9, 0x65, 0x20, - 0xaa, 0xbd, 0x5c, 0xbc, 0xf6, 0xfe, 0xce, 0xc1, 0x64, 0x2f, 0x06, 0x9f, 0x7b, 0x66, 0x3e, 0x46, - 0xb0, 0x8b, 0xa7, 0xc6, 0xb3, 0x9f, 0x41, 0x72, 0x78, 0x19, 0x2c, 0x45, 0xa6, 0xd8, 0x31, 0x5e, - 0x80, 0x6d, 0xb4, 0x65, 0xbb, 0xd7, 0x89, 0x6b, 0x56, 0x35, 0xbf, 0x3b, 0xd3, 0xfc, 0x20, 0x33, - 0xbe, 0x37, 0x44, 0xcc, 0xc7, 0x3f, 0xe5, 0x72, 0xc0, 0xb6, 0xe0, 0x54, 0x6f, 0x08, 0x80, 0x5b, - 0x69, 0xfc, 0x90, 0xca, 0x2b, 0x70, 0x38, 0xe5, 0x4e, 0x2c, 0x07, 0x9d, 0x63, 0xce, 0xcf, 0x52, - 0x2c, 0xdf, 0x9d, 0xbd, 0x06, 0x75, 0xeb, 0x35, 0x6d, 0xf9, 0xfe, 0x1a, 0xc1, 0x91, 0x1e, 0x6d, - 0x3e, 0xef, 0x94, 0xcb, 0xb7, 0x61, 0xe6, 0x1c, 0x75, 0xcd, 0xba, 0xee, 0x92, 0x0e, 0x45, 0xc4, - 0xe0, 0xdd, 0xf1, 0x7f, 0x0c, 0xd5, 0xf7, 0x08, 0x5e, 0x5b, 0x87, 0x7d, 0x11, 0xb6, 0xd4, 0x4e, - 0x82, 0x9e, 0x4d, 0x27, 0x99, 0xfa, 0x6e, 0x07, 0x6c, 0x64, 0x3b, 0x03, 0xfe, 0x04, 0xc1, 0x10, - 0x5f, 0x02, 0xf0, 0x78, 0x52, 0x96, 0x3a, 0xf7, 0x0d, 0x69, 0xa2, 0x2b, 0x1f, 0x87, 0x29, 0x4f, - 0xde, 0xf9, 0xe5, 0x8f, 0x7b, 0xb9, 0x03, 0x58, 0x56, 0x13, 0xf6, 0xa3, 0x68, 0xc9, 0x61, 0xc6, - 0x3f, 0x45, 0xb0, 0x39, 0xdc, 0x02, 0xf0, 0x81, 0x24, 0x13, 0x6b, 0x77, 0x12, 0xe9, 0x60, 0x17, - 0x2e, 0xe1, 0x86, 0xc2, 0xdc, 0x28, 0xe2, 0xf1, 0x2c, 0x37, 0xa2, 0x8d, 0x85, 0xbb, 0x12, 0x2c, - 0x19, 0x29, 0xae, 0xac, 0xd9, 0x4b, 0x52, 0x5c, 0x59, 0xbb, 0xa9, 0xf4, 0xe8, 0x8a, 0x65, 0x69, - 0x7c, 0x2d, 0xc1, 0x5f, 0x20, 0xd8, 0xb6, 0x66, 0xcd, 0xc0, 0x93, 0xa9, 0xa8, 0x3b, 0x96, 0x17, - 0xe9, 0x50, 0x4f, 0xbc, 0xc2, 0xb9, 0x57, 0x99, 0x73, 0x0a, 0x3e, 0xdc, 0x3d, 0x4e, 0xd1, 0x3e, - 0x83, 0x7f, 0xf0, 0x37, 0xa1, 0xe4, 0x29, 0x1c, 0x4f, 0xa5, 0x44, 0x25, 0x63, 0x3b, 0x90, 0x8e, - 0xf5, 0x25, 0x23, 0x5c, 0x3f, 0xc5, 0x5c, 0x3f, 0x81, 0xa7, 0xbb, 0xc5, 0xd5, 0x8c, 0x69, 0xd1, - 0xc2, 0x61, 0xfe, 0x11, 0x82, 0x3d, 0x59, 0x43, 0x34, 0x3e, 0x91, 0xe4, 0x54, 0x0f, 0x63, 0xbb, - 0x34, 0xd3, 0xbf, 0xa0, 0x80, 0xb4, 0xc0, 0x20, 0x9d, 0xc7, 0x73, 0x59, 0x90, 0xaa, 0x81, 0xa6, - 0x44, 0x60, 0xea, 0x2d, 0xb1, 0x32, 0xdc, 0xc6, 0x3f, 0x21, 0x90, 0xd2, 0xe7, 0x70, 0x9c, 0xb8, - 0x0b, 0x74, 0x9d, 0xee, 0xa5, 0xe3, 0xfd, 0x8a, 0x09, 0x6c, 0xa7, 0x19, 0xb6, 0x19, 0x7c, 0xbc, - 0x5b, 0xba, 0x92, 0xa7, 0x77, 0xfc, 0x33, 0x02, 0x29, 0x7d, 0x28, 0xc6, 0xd3, 0xbd, 0xfe, 0xdd, - 0xb4, 0x8d, 0xf6, 0xc9, 0x68, 0xba, 0xcf, 0xde, 0xf2, 0x19, 0x86, 0xe6, 0x24, 0x9e, 0xc9, 0x42, - 0x93, 0xfc, 0x37, 0xc9, 0x07, 0x6b, 0xfc, 0x27, 0x82, 0x7d, 0xdd, 0x06, 0x60, 0xfc, 0x7a, 0xaf, - 0xee, 0x25, 0x4c, 0x83, 0xd2, 0x1b, 0xeb, 0x13, 0x16, 0x08, 0xdf, 0x62, 0x08, 0xdf, 0xc4, 0xe7, - 0xfb, 0x46, 0x48, 0xd5, 0x5b, 0x1d, 0x53, 0xe8, 0x6d, 0x7c, 0x27, 0x17, 0x5f, 0x6a, 0xd2, 0x06, - 0x4b, 0x7c, 0x2a, 0xdb, 0xe9, 0x2e, 0x13, 0xb0, 0x74, 0x7a, 0xbd, 0xe2, 0x02, 0xf5, 0xfb, 0x0c, - 0xf5, 0x55, 0xbc, 0xd4, 0x23, 0x6a, 0x2f, 0xae, 0x50, 0xab, 0xb4, 0xb4, 0x10, 0x79, 0x62, 0x10, - 0xfe, 0x41, 0x70, 0xb0, 0xa7, 0x69, 0x0b, 0x9f, 0xe9, 0x23, 0x79, 0x89, 0x13, 0x8f, 0x54, 0xfa, - 0x0f, 0x1a, 0x44, 0x34, 0x2e, 0xb2, 0x68, 0x5c, 0xc0, 0xe7, 0xfa, 0xaf, 0x01, 0x3f, 0x16, 0xd1, - 0xc0, 0xc5, 0x3f, 0x3b, 0x7d, 0x9b, 0x83, 0xa3, 0x7d, 0x0f, 0x50, 0x78, 0x21, 0x09, 0xc7, 0x7a, - 0xe7, 0x40, 0xe9, 0xe2, 0x53, 0xd2, 0x26, 0x22, 0xf4, 0x1e, 0x8b, 0xd0, 0x32, 0xbe, 0x92, 0x15, - 0x21, 0x22, 0xd4, 0x6b, 0x59, 0x0d, 0x21, 0x21, 0x60, 0xb3, 0x8b, 0xf7, 0x1f, 0x17, 0xd0, 0x83, - 0xc7, 0x05, 0xf4, 0xfb, 0xe3, 0x02, 0xfa, 0xfc, 0x49, 0x61, 0xe0, 0xc1, 0x93, 0xc2, 0xc0, 0xaf, - 0x4f, 0x0a, 0x03, 0xef, 0x4c, 0xc7, 0x66, 0x41, 0x61, 0xf9, 0x88, 0xa5, 0x57, 0x68, 0xe8, 0xc6, - 0xea, 0x09, 0xf5, 0x66, 0xdc, 0x17, 0x36, 0x1e, 0x56, 0x86, 0xd8, 0x37, 0xe5, 0x63, 0xff, 0x06, - 0x00, 0x00, 0xff, 0xff, 0xd7, 0xc7, 0xdc, 0x64, 0xab, 0x17, 0x00, 0x00, + // 1554 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x58, 0xcf, 0x6f, 0x14, 0x55, + 0x1c, 0xef, 0x6b, 0xa1, 0x85, 0x2f, 0x09, 0x94, 0x07, 0xca, 0x32, 0xc0, 0x16, 0xa6, 0xd0, 0xae, + 0x05, 0x66, 0xa4, 0x58, 0xa8, 0x28, 0x84, 0x2d, 0x05, 0x6c, 0x52, 0x2c, 0x2e, 0xb4, 0x24, 0xfe, + 0xc8, 0x64, 0x76, 0xe7, 0xb1, 0x4c, 0x3a, 0x3b, 0xb3, 0xdd, 0x37, 0x53, 0xd9, 0x10, 0x62, 0xc4, + 0x98, 0x48, 0x3c, 0x68, 0xc2, 0x3f, 0xe0, 0x51, 0x3d, 0x18, 0x6f, 0x5e, 0xbc, 0x18, 0x2f, 0x24, + 0xc6, 0x84, 0xc4, 0x8b, 0xf1, 0x00, 0x06, 0xbc, 0x7a, 0xf1, 0xa8, 0x17, 0x33, 0xef, 0xbd, 0xf9, + 0xb1, 0xdd, 0x99, 0xd9, 0xdd, 0x8a, 0x70, 0xda, 0x99, 0xf7, 0xfd, 0xf9, 0xf9, 0xfe, 0x78, 0xf3, + 0xfd, 0x2e, 0xe4, 0x1d, 0x5a, 0x73, 0xa8, 0x49, 0x55, 0xea, 0xd5, 0x49, 0xe3, 0xba, 0xe5, 0x99, + 0x86, 0xba, 0xe2, 0x91, 0x46, 0x53, 0xa9, 0x37, 0x1c, 0xd7, 0xc1, 0x58, 0xd0, 0x95, 0x88, 0x2e, + 0xed, 0xac, 0x3a, 0x55, 0x87, 0x91, 0x55, 0xff, 0x89, 0x73, 0x4a, 0xf9, 0x0a, 0x63, 0x55, 0xcb, + 0x3a, 0x25, 0xea, 0xea, 0xb1, 0x32, 0x71, 0xf5, 0x63, 0x6a, 0xc5, 0x31, 0x6d, 0x41, 0xdf, 0x5b, + 0x75, 0x9c, 0xaa, 0x45, 0x54, 0xbd, 0x6e, 0xaa, 0xba, 0x6d, 0x3b, 0xae, 0xee, 0x9a, 0x8e, 0x4d, + 0x05, 0x75, 0x44, 0x50, 0xd9, 0x5b, 0xd9, 0xbb, 0xae, 0xba, 0x66, 0x8d, 0x50, 0x57, 0xaf, 0xd5, + 0x03, 0xf5, 0x6b, 0x19, 0x0c, 0xaf, 0xc1, 0x34, 0x08, 0xfa, 0x68, 0x02, 0x90, 0xe8, 0x31, 0xb0, + 0x92, 0xc0, 0x54, 0xd7, 0x1b, 0x7a, 0x2d, 0x70, 0x63, 0x77, 0xc0, 0x60, 0x39, 0x95, 0x65, 0xaf, + 0xce, 0x7e, 0x04, 0x69, 0x22, 0x8e, 0x8f, 0x85, 0x28, 0x44, 0x59, 0xd7, 0xab, 0xa6, 0x1d, 0x73, + 0x46, 0xde, 0x09, 0xf8, 0x2d, 0x9f, 0xe3, 0x32, 0xd3, 0x5d, 0x22, 0x2b, 0x1e, 0xa1, 0xae, 0xbc, + 0x00, 0x3b, 0x5a, 0x4e, 0x69, 0xdd, 0xb1, 0x29, 0xc1, 0xd3, 0x30, 0xc8, 0x7d, 0xc8, 0xa1, 0xfd, + 0xa8, 0xb0, 0x65, 0x52, 0x52, 0xda, 0x63, 0xae, 0x70, 0x99, 0x99, 0x0d, 0xf7, 0x1f, 0x8e, 0xf4, + 0x95, 0x04, 0xbf, 0x5c, 0x80, 0xe1, 0x22, 0xa5, 0xc4, 0xbd, 0xda, 0xac, 0x13, 0x61, 0x04, 0xef, + 0x84, 0x8d, 0x06, 0xb1, 0x9d, 0x1a, 0x53, 0xb6, 0xb9, 0xc4, 0x5f, 0xe4, 0x77, 0x60, 0x7b, 0x8c, + 0x53, 0x18, 0xbe, 0x00, 0xa0, 0xfb, 0x87, 0x9a, 0xdb, 0xac, 0x13, 0xc6, 0xbf, 0x75, 0x72, 0x3c, + 0xc9, 0xf8, 0x95, 0xf0, 0x31, 0x52, 0xb2, 0x59, 0x0f, 0x1e, 0x65, 0x0c, 0xc3, 0x45, 0xcb, 0x62, + 0xa4, 0x10, 0xeb, 0x12, 0x6c, 0x8f, 0x9d, 0x09, 0x83, 0x45, 0x18, 0x64, 0x52, 0x3e, 0xd2, 0x81, + 0xc2, 0x96, 0xc9, 0xd1, 0x2e, 0x8c, 0x05, 0x90, 0xb9, 0xa0, 0xac, 0xc0, 0x8b, 0xec, 0xf8, 0x92, + 0x67, 0xb9, 0x66, 0xdd, 0x32, 0x49, 0x23, 0x1b, 0xf8, 0xa7, 0x08, 0x76, 0xb5, 0x09, 0x08, 0x77, + 0xea, 0x20, 0xf9, 0xf6, 0x35, 0xb2, 0xe2, 0x99, 0xab, 0xba, 0x45, 0x6c, 0x57, 0xab, 0x85, 0x5c, + 0x22, 0x19, 0x93, 0x49, 0x2e, 0x2e, 0xd0, 0x9a, 0x73, 0x3e, 0x14, 0x8a, 0x6b, 0xae, 0x38, 0x0d, + 0xa3, 0x94, 0x73, 0x52, 0xe8, 0xf2, 0x5d, 0x04, 0x07, 0x22, 0x7c, 0x73, 0xb6, 0x4b, 0x1a, 0x35, + 0x62, 0x98, 0x7a, 0xa3, 0x59, 0xac, 0x54, 0x1c, 0xcf, 0x76, 0xe7, 0xec, 0xeb, 0x4e, 0x32, 0x12, + 0xbc, 0x1b, 0x36, 0xad, 0xea, 0x96, 0xa6, 0x1b, 0x46, 0x23, 0xd7, 0xcf, 0x08, 0x43, 0xab, 0xba, + 0x55, 0x34, 0x8c, 0x86, 0x4f, 0xaa, 0xea, 0x5e, 0x95, 0x68, 0xa6, 0x91, 0x1b, 0xd8, 0x8f, 0x0a, + 0x1b, 0x4a, 0x43, 0xec, 0x7d, 0xce, 0xc0, 0x39, 0x18, 0xf2, 0x25, 0x08, 0xa5, 0xb9, 0x0d, 0x5c, + 0x48, 0xbc, 0xca, 0x37, 0x20, 0x5f, 0xb4, 0xac, 0x04, 0x1f, 0x82, 0x1c, 0xfa, 0xf5, 0x11, 0x55, + 0xb6, 0x88, 0xc7, 0x98, 0xc2, 0xdb, 0x40, 0xf1, 0xdb, 0x40, 0xe1, 0x37, 0x85, 0x68, 0x03, 0xe5, + 0xb2, 0x5e, 0x0d, 0xca, 0xb0, 0x14, 0x93, 0x94, 0x7f, 0x44, 0x30, 0x92, 0x6a, 0x4a, 0xe4, 0xe2, + 0x1a, 0x6c, 0xd2, 0xc5, 0x99, 0x28, 0x8e, 0xa9, 0xec, 0xe2, 0x48, 0x09, 0x9e, 0x28, 0x97, 0x50, + 0x19, 0xbe, 0xd8, 0x02, 0xa2, 0x9f, 0x81, 0x18, 0xef, 0x08, 0x82, 0x7b, 0xd5, 0x82, 0xe2, 0x0c, + 0x8c, 0x9e, 0x73, 0x6c, 0x9b, 0x54, 0x5c, 0x92, 0x64, 0x3c, 0x08, 0xda, 0x2e, 0x18, 0xf2, 0x2f, + 0x0d, 0x3f, 0x15, 0x88, 0xa5, 0x62, 0xd0, 0x7f, 0x9d, 0x33, 0xe4, 0xf7, 0xe1, 0x60, 0xb6, 0xbc, + 0x88, 0xc4, 0x02, 0x0c, 0x09, 0xe7, 0x45, 0xc8, 0xd7, 0x17, 0x88, 0x52, 0xa0, 0x45, 0x1e, 0x85, + 0x03, 0x57, 0x1d, 0x57, 0xb7, 0x22, 0x91, 0x59, 0x62, 0x91, 0x2a, 0xbf, 0x7e, 0x83, 0x7e, 0xfd, + 0x12, 0x81, 0x9c, 0xc5, 0x25, 0x9c, 0xfb, 0x10, 0xc1, 0xb0, 0xeb, 0xb3, 0xc5, 0x88, 0xbc, 0x4c, + 0x67, 0x16, 0xfd, 0xc0, 0xff, 0xf6, 0x70, 0x64, 0xac, 0x6a, 0xba, 0x37, 0xbc, 0xb2, 0x52, 0x71, + 0x6a, 0xaa, 0xb8, 0x32, 0xf9, 0xcf, 0x51, 0x6a, 0x2c, 0xab, 0xfe, 0x55, 0x43, 0x95, 0x39, 0xdb, + 0xfd, 0xeb, 0xe1, 0xc8, 0x68, 0x53, 0xaf, 0x59, 0xa7, 0x64, 0xa6, 0x4f, 0x8b, 0xb0, 0x69, 0x46, + 0xa4, 0x5b, 0x2e, 0xb5, 0x99, 0x93, 0xef, 0xb5, 0x34, 0x51, 0x44, 0x29, 0xd6, 0xe2, 0x79, 0x38, + 0x0c, 0xdb, 0x85, 0x1e, 0xa7, 0xa1, 0x05, 0x2d, 0xc0, 0x1b, 0x6a, 0x38, 0x24, 0x14, 0xf9, 0xb9, + 0xcf, 0xbc, 0xaa, 0x5b, 0xa6, 0xd1, 0xc2, 0xcc, 0x9b, 0x6c, 0x38, 0x24, 0x04, 0xcc, 0x61, 0x7b, + 0x0e, 0xc4, 0x2f, 0x9a, 0xbb, 0x08, 0xe4, 0x2c, 0xaf, 0x44, 0x00, 0x2b, 0x30, 0xa8, 0xd7, 0x44, + 0x72, 0xfd, 0x2a, 0xdf, 0xdd, 0x52, 0x8a, 0x41, 0x11, 0x9e, 0x73, 0x4c, 0x7b, 0xe6, 0x65, 0x3f, + 0xa0, 0x5f, 0x3f, 0x1a, 0x29, 0x74, 0x11, 0x50, 0x5f, 0x80, 0x96, 0x84, 0x6a, 0x79, 0x09, 0xc6, + 0x13, 0xd3, 0x38, 0xd3, 0x9c, 0x0d, 0x90, 0xaf, 0x27, 0x4c, 0xf2, 0x77, 0x03, 0x50, 0xe8, 0xac, + 0x58, 0x20, 0xbd, 0x09, 0xfb, 0x12, 0x73, 0xaa, 0x35, 0xd8, 0x2d, 0x19, 0xb4, 0xb9, 0x92, 0x5d, + 0xdd, 0x91, 0x11, 0x7e, 0xb9, 0x8a, 0xfe, 0xde, 0x43, 0x53, 0x39, 0x28, 0xfe, 0x00, 0x5e, 0xe0, + 0x35, 0x25, 0x8c, 0x12, 0x43, 0xf3, 0xe7, 0x10, 0x3f, 0xa3, 0x4f, 0x3d, 0xe4, 0x3b, 0xe2, 0xe5, + 0x49, 0x0c, 0x76, 0x88, 0x3f, 0x43, 0x90, 0xe7, 0x1e, 0xc4, 0x3e, 0x2d, 0xd4, 0xd5, 0x97, 0x89, + 0xa1, 0x89, 0xec, 0x0f, 0xb0, 0xd6, 0xce, 0x70, 0x45, 0x15, 0xae, 0x8c, 0x77, 0xe9, 0x4a, 0x69, + 0x0f, 0xb3, 0x18, 0x7d, 0x76, 0xae, 0x30, 0x7b, 0xbc, 0xfc, 0x64, 0x1b, 0x5e, 0x8a, 0x62, 0xba, + 0x68, 0x1b, 0x4f, 0xad, 0x26, 0xa2, 0x6e, 0xe8, 0x8f, 0x77, 0xc3, 0xdf, 0xfd, 0x30, 0xd1, 0x8d, + 0xc1, 0xe7, 0x5e, 0x2b, 0x1f, 0x21, 0xd8, 0xc5, 0x53, 0xe5, 0xd9, 0xcf, 0xa0, 0x5c, 0x78, 0x61, + 0x2e, 0x46, 0xa6, 0x78, 0xc1, 0xcc, 0xc3, 0x36, 0xda, 0xb4, 0xdd, 0x1b, 0xc4, 0x35, 0x2b, 0x9a, + 0xff, 0xbd, 0xa0, 0xb9, 0x01, 0x66, 0x7c, 0x5f, 0x88, 0x98, 0x0f, 0xa4, 0xca, 0x95, 0x80, 0x6d, + 0xde, 0xa9, 0x2c, 0x0b, 0x80, 0x5b, 0x69, 0xfc, 0x90, 0xca, 0x2b, 0x70, 0x24, 0xa5, 0x4b, 0x97, + 0x82, 0xbb, 0x6c, 0xd6, 0xcf, 0x52, 0x2c, 0xdf, 0xed, 0xb7, 0x1f, 0xea, 0x74, 0xfb, 0xb5, 0xe4, + 0xfb, 0x2b, 0x04, 0x47, 0xbb, 0xb4, 0xf9, 0xbc, 0x53, 0x2e, 0xdf, 0x86, 0xe9, 0xf3, 0xd4, 0x35, + 0x6b, 0xba, 0x4b, 0xda, 0x14, 0x05, 0x0d, 0xf3, 0x3f, 0x86, 0xea, 0x7b, 0x04, 0xaf, 0xae, 0xc3, + 0xbe, 0x08, 0x5b, 0xea, 0xdd, 0x86, 0x9e, 0xcd, 0xdd, 0x36, 0xf9, 0xed, 0x0e, 0xd8, 0xc8, 0xb6, + 0x18, 0xfc, 0x31, 0x82, 0x41, 0xbe, 0x96, 0xe0, 0xb1, 0xa4, 0x2c, 0xb5, 0x6f, 0x40, 0xd2, 0x78, + 0x47, 0x3e, 0x0e, 0x53, 0x9e, 0xb8, 0xf3, 0xcb, 0x1f, 0xf7, 0xfa, 0x0f, 0x62, 0x59, 0x4d, 0xd8, + 0xd8, 0xa2, 0xb5, 0x8b, 0x19, 0xff, 0x04, 0xc1, 0xe6, 0x70, 0x2f, 0xc1, 0x07, 0x93, 0x4c, 0xac, + 0xdd, 0x92, 0xa4, 0x43, 0x1d, 0xb8, 0x84, 0x1b, 0x0a, 0x73, 0xa3, 0x80, 0xc7, 0xb2, 0xdc, 0x88, + 0x76, 0x28, 0xee, 0x4a, 0xb0, 0xf6, 0xa4, 0xb8, 0xb2, 0x66, 0x53, 0x4a, 0x71, 0x65, 0xed, 0xee, + 0xd4, 0xa5, 0x2b, 0x96, 0xa5, 0xf1, 0x45, 0x09, 0x7f, 0x81, 0x60, 0xdb, 0x9a, 0xc5, 0x07, 0x4f, + 0xa4, 0xa2, 0x6e, 0x5b, 0xa7, 0xa4, 0xc3, 0x5d, 0xf1, 0x0a, 0xe7, 0x5e, 0x61, 0xce, 0x29, 0xf8, + 0x48, 0xe7, 0x38, 0x45, 0x1b, 0x16, 0xfe, 0xc1, 0xdf, 0xcd, 0x92, 0xf7, 0x02, 0x3c, 0x99, 0x12, + 0x95, 0x8c, 0x7d, 0x45, 0x3a, 0xde, 0x93, 0x8c, 0x70, 0xfd, 0x34, 0x73, 0xfd, 0x24, 0x9e, 0xea, + 0x14, 0x57, 0x33, 0xa6, 0x45, 0x0b, 0xd7, 0x8b, 0x47, 0x08, 0xf6, 0x66, 0x8d, 0xf5, 0xf8, 0x64, + 0x92, 0x53, 0x5d, 0x2c, 0x12, 0xd2, 0x74, 0xef, 0x82, 0x02, 0xd2, 0x3c, 0x83, 0x74, 0x01, 0xcf, + 0x66, 0x41, 0xaa, 0x04, 0x9a, 0x12, 0x81, 0xa9, 0xb7, 0xc4, 0x12, 0x73, 0x1b, 0xff, 0x84, 0x40, + 0x4a, 0xdf, 0x0c, 0x70, 0xe2, 0x76, 0xd2, 0x71, 0xdf, 0x90, 0x4e, 0xf4, 0x2a, 0x26, 0xb0, 0x9d, + 0x61, 0xd8, 0xa6, 0xf1, 0x89, 0x4e, 0xe9, 0x4a, 0xde, 0x27, 0xf0, 0xcf, 0x08, 0xa4, 0xf4, 0x31, + 0x1d, 0x4f, 0x75, 0xfb, 0xb9, 0x69, 0x59, 0x36, 0x92, 0xd1, 0x74, 0xde, 0x06, 0xe4, 0xb3, 0x0c, + 0xcd, 0x29, 0x3c, 0x9d, 0x85, 0x26, 0xf9, 0x33, 0xc9, 0xe7, 0x48, 0xfc, 0x27, 0x82, 0xfd, 0x9d, + 0x46, 0x72, 0xfc, 0x5a, 0xb7, 0xee, 0x25, 0x4c, 0x83, 0xd2, 0xeb, 0xeb, 0x13, 0x16, 0x08, 0xdf, + 0x64, 0x08, 0xdf, 0xc0, 0x17, 0x7a, 0x46, 0x48, 0xd5, 0x5b, 0x6d, 0x53, 0xe8, 0x6d, 0x7c, 0xa7, + 0x3f, 0xbe, 0x66, 0xa5, 0x0d, 0x96, 0xf8, 0x74, 0xb6, 0xd3, 0x1d, 0x26, 0x60, 0xe9, 0xcc, 0x7a, + 0xc5, 0x05, 0xea, 0xf7, 0x18, 0xea, 0x6b, 0x78, 0xb1, 0x4b, 0xd4, 0x5e, 0x5c, 0xa1, 0x56, 0x6e, + 0x6a, 0x21, 0xf2, 0xc4, 0x20, 0xfc, 0x83, 0xe0, 0x50, 0x57, 0xd3, 0x16, 0x3e, 0xdb, 0x43, 0xf2, + 0x12, 0x27, 0x1e, 0xa9, 0xf8, 0x1f, 0x34, 0x88, 0x68, 0x5c, 0x62, 0xd1, 0xb8, 0x88, 0xcf, 0xf7, + 0x5e, 0x03, 0x7e, 0x2c, 0xa2, 0x81, 0x8b, 0xff, 0x11, 0xf6, 0x4d, 0x3f, 0x1c, 0xeb, 0x79, 0x80, + 0xc2, 0xf3, 0x49, 0x38, 0xd6, 0x3b, 0x07, 0x4a, 0x97, 0x9e, 0x92, 0x36, 0x11, 0xa1, 0x77, 0x59, + 0x84, 0x96, 0xf0, 0xd5, 0xac, 0x08, 0x11, 0xa1, 0x5e, 0xcb, 0xba, 0x10, 0x12, 0x02, 0x36, 0xb3, + 0x70, 0xff, 0x71, 0x1e, 0x3d, 0x78, 0x9c, 0x47, 0xbf, 0x3f, 0xce, 0xa3, 0xcf, 0x9f, 0xe4, 0xfb, + 0x1e, 0x3c, 0xc9, 0xf7, 0xfd, 0xfa, 0x24, 0xdf, 0xf7, 0xf6, 0x54, 0x6c, 0x16, 0x14, 0x96, 0x8f, + 0x5a, 0x7a, 0x99, 0x86, 0x6e, 0xac, 0x9e, 0x54, 0x6f, 0xc6, 0x7d, 0x61, 0xe3, 0x61, 0x79, 0x90, + 0xfd, 0xcb, 0x7d, 0xfc, 0xdf, 0x00, 0x00, 0x00, 0xff, 0xff, 0xa2, 0xbf, 0x9a, 0x5a, 0x3d, 0x18, + 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -2488,6 +2499,16 @@ func (m *SuperfluidDelegationsByDelegatorResponse) MarshalToSizedBuffer(dAtA []b _ = i var l int _ = l + { + size, err := m.TotalEquivalentStakedAmount.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintQuery(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x1a if len(m.TotalDelegatedCoins) > 0 { for iNdEx := len(m.TotalDelegatedCoins) - 1; iNdEx >= 0; iNdEx-- { { @@ -3043,6 +3064,8 @@ func (m *SuperfluidDelegationsByDelegatorResponse) Size() (n int) { n += 1 + l + sovQuery(uint64(l)) } } + l = m.TotalEquivalentStakedAmount.Size() + n += 1 + l + sovQuery(uint64(l)) return n } @@ -4815,6 +4838,39 @@ func (m *SuperfluidDelegationsByDelegatorResponse) Unmarshal(dAtA []byte) error return err } iNdEx = postIndex + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field TotalEquivalentStakedAmount", 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.TotalEquivalentStakedAmount.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipQuery(dAtA[iNdEx:]) diff --git a/x/superfluid/types/superfluid.pb.go b/x/superfluid/types/superfluid.pb.go index 7d12be810e5..101d80007d4 100644 --- a/x/superfluid/types/superfluid.pb.go +++ b/x/superfluid/types/superfluid.pb.go @@ -218,9 +218,10 @@ func (m *OsmoEquivalentMultiplierRecord) GetDenom() string { // SuperfluidDelegationRecord takes the role of intermediary between LP token // and OSMO tokens for superfluid staking type SuperfluidDelegationRecord struct { - DelegatorAddress string `protobuf:"bytes,1,opt,name=delegator_address,json=delegatorAddress,proto3" json:"delegator_address,omitempty"` - ValidatorAddress string `protobuf:"bytes,2,opt,name=validator_address,json=validatorAddress,proto3" json:"validator_address,omitempty"` - DelegationAmount types.Coin `protobuf:"bytes,3,opt,name=delegation_amount,json=delegationAmount,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coin" json:"delegation_amount"` + DelegatorAddress string `protobuf:"bytes,1,opt,name=delegator_address,json=delegatorAddress,proto3" json:"delegator_address,omitempty"` + ValidatorAddress string `protobuf:"bytes,2,opt,name=validator_address,json=validatorAddress,proto3" json:"validator_address,omitempty"` + DelegationAmount types.Coin `protobuf:"bytes,3,opt,name=delegation_amount,json=delegationAmount,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coin" json:"delegation_amount"` + EquivalentStakedAmount *types.Coin `protobuf:"bytes,4,opt,name=equivalent_staked_amount,json=equivalentStakedAmount,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coin" json:"equivalent_staked_amount,omitempty"` } func (m *SuperfluidDelegationRecord) Reset() { *m = SuperfluidDelegationRecord{} } @@ -277,6 +278,13 @@ func (m *SuperfluidDelegationRecord) GetDelegationAmount() types.Coin { return types.Coin{} } +func (m *SuperfluidDelegationRecord) GetEquivalentStakedAmount() *types.Coin { + if m != nil { + return m.EquivalentStakedAmount + } + return nil +} + type LockIdIntermediaryAccountConnection struct { LockId uint64 `protobuf:"varint,1,opt,name=lock_id,json=lockId,proto3" json:"lock_id,omitempty"` IntermediaryAccount string `protobuf:"bytes,2,opt,name=intermediary_account,json=intermediaryAccount,proto3" json:"intermediary_account,omitempty"` @@ -388,49 +396,51 @@ func init() { } var fileDescriptor_79d3c29d82dbb734 = []byte{ - // 664 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x54, 0xcf, 0x4f, 0xd4, 0x4e, - 0x14, 0x6f, 0x59, 0xbe, 0xc0, 0x0e, 0xdf, 0xe8, 0x52, 0x88, 0xc2, 0x26, 0xb4, 0x58, 0x12, 0xd9, - 0x60, 0x68, 0x03, 0xc6, 0x98, 0x70, 0x5b, 0x40, 0x13, 0x12, 0x04, 0x52, 0x34, 0x26, 0x5c, 0x36, - 0xd3, 0xce, 0xd0, 0x9d, 0xec, 0xb4, 0x53, 0x3a, 0xd3, 0xea, 0xfe, 0x07, 0x1c, 0xfd, 0x13, 0x48, - 0xbc, 0xf9, 0x47, 0x78, 0xe6, 0xc8, 0xd1, 0x78, 0x40, 0x03, 0x17, 0x6f, 0x26, 0xfe, 0x05, 0xa6, - 0xd3, 0x6e, 0xb7, 0xc2, 0x9a, 0x78, 0xea, 0x7b, 0xef, 0xf3, 0xde, 0xe7, 0xfd, 0x9c, 0x82, 0x65, - 0xc6, 0x03, 0xc6, 0x09, 0xb7, 0x79, 0x12, 0xe1, 0xf8, 0x84, 0x26, 0x04, 0x55, 0x44, 0x2b, 0x8a, - 0x99, 0x60, 0x9a, 0x56, 0x38, 0x59, 0x43, 0xa4, 0x39, 0xe7, 0x33, 0x9f, 0x49, 0xd8, 0xce, 0xa4, - 0xdc, 0xb3, 0xa9, 0xfb, 0x8c, 0xf9, 0x14, 0xdb, 0x52, 0x73, 0x93, 0x13, 0x1b, 0x25, 0x31, 0x14, - 0x84, 0x85, 0x05, 0x6e, 0xdc, 0xc6, 0x05, 0x09, 0x30, 0x17, 0x30, 0x88, 0x06, 0x04, 0x9e, 0xcc, - 0x65, 0xbb, 0x90, 0x63, 0x3b, 0x5d, 0x77, 0xb1, 0x80, 0xeb, 0xb6, 0xc7, 0x48, 0x41, 0x60, 0xf6, - 0xc1, 0xfd, 0xa3, 0xb2, 0x88, 0x36, 0xe7, 0x58, 0x68, 0x73, 0xe0, 0x3f, 0x84, 0x43, 0x16, 0xcc, - 0xab, 0x4b, 0x6a, 0xab, 0xee, 0xe4, 0x8a, 0xf6, 0x12, 0x00, 0x98, 0xc1, 0x1d, 0xd1, 0x8f, 0xf0, - 0xfc, 0xd8, 0x92, 0xda, 0xba, 0xb7, 0xb1, 0x62, 0xdd, 0x6d, 0xc4, 0xba, 0x45, 0xf7, 0xba, 0x1f, - 0x61, 0xa7, 0x0e, 0x07, 0xe2, 0xe6, 0xd4, 0xd9, 0xb9, 0xa1, 0xfc, 0x38, 0x37, 0x54, 0xb3, 0x07, - 0x16, 0x87, 0xbe, 0xbb, 0xa1, 0xc0, 0x71, 0x80, 0x11, 0x81, 0x71, 0xbf, 0xed, 0x79, 0x2c, 0x09, - 0xff, 0x56, 0xc8, 0x02, 0x98, 0x4a, 0x21, 0xed, 0x40, 0x84, 0x62, 0x59, 0x46, 0xdd, 0x99, 0x4c, - 0x21, 0x6d, 0x23, 0x14, 0x67, 0x90, 0x0f, 0x13, 0x1f, 0x77, 0x08, 0x9a, 0xaf, 0x2d, 0xa9, 0xad, - 0x71, 0x67, 0x52, 0xea, 0xbb, 0xc8, 0xfc, 0xac, 0x02, 0xfd, 0x80, 0x07, 0xec, 0xc5, 0x69, 0x42, - 0x52, 0x48, 0x71, 0x28, 0x5e, 0x25, 0x54, 0x90, 0x88, 0x12, 0x1c, 0x3b, 0xd8, 0x63, 0x31, 0xd2, - 0x1e, 0x81, 0xff, 0x71, 0xc4, 0xbc, 0x6e, 0x27, 0x4c, 0x02, 0x17, 0xc7, 0x32, 0x6b, 0xcd, 0x99, - 0x96, 0xb6, 0x7d, 0x69, 0x1a, 0x56, 0x34, 0x56, 0xad, 0xc8, 0x03, 0x20, 0x28, 0xc9, 0x64, 0xe2, - 0xfa, 0xd6, 0xf6, 0xc5, 0x95, 0xa1, 0x7c, 0xbd, 0x32, 0x1e, 0xfb, 0x44, 0x74, 0x13, 0xd7, 0xf2, - 0x58, 0x60, 0x17, 0xab, 0xc8, 0x3f, 0x6b, 0x1c, 0xf5, 0xec, 0x6c, 0x96, 0xdc, 0xda, 0xc1, 0xde, - 0xaf, 0x2b, 0x63, 0xa6, 0x0f, 0x03, 0xba, 0x69, 0x0e, 0x99, 0x4c, 0xa7, 0x42, 0x6b, 0xfe, 0x54, - 0x41, 0x73, 0x38, 0xae, 0x1d, 0x4c, 0xb1, 0x2f, 0x0f, 0xa1, 0x28, 0xfe, 0x09, 0x98, 0x41, 0xb9, - 0x8d, 0xc5, 0x72, 0x36, 0x98, 0xf3, 0x62, 0x6e, 0x8d, 0x12, 0x68, 0xe7, 0xf6, 0xcc, 0x39, 0x85, - 0x94, 0xa0, 0x3f, 0x9c, 0xf3, 0x96, 0x1a, 0x25, 0x30, 0x70, 0x7e, 0x57, 0x32, 0x13, 0x16, 0x76, - 0x60, 0x90, 0xad, 0x46, 0x36, 0x39, 0xbd, 0xb1, 0x60, 0xe5, 0xbd, 0x58, 0xd9, 0x75, 0x59, 0xc5, - 0x75, 0x59, 0xdb, 0x8c, 0x84, 0x5b, 0x76, 0xd6, 0xff, 0xa7, 0x6f, 0xc6, 0xca, 0x3f, 0xf4, 0x9f, - 0x05, 0x94, 0x55, 0x12, 0x16, 0xb6, 0x65, 0x0e, 0xf3, 0x14, 0x2c, 0xef, 0x31, 0xaf, 0xb7, 0x3b, - 0xea, 0x36, 0xb6, 0x59, 0x18, 0x62, 0x2f, 0x73, 0xd6, 0x1e, 0x82, 0x49, 0xca, 0xbc, 0x5e, 0xb6, - 0x73, 0x55, 0xee, 0x7c, 0x82, 0xca, 0x28, 0x6d, 0x1d, 0xcc, 0x91, 0x4a, 0x64, 0x07, 0xe6, 0xa1, - 0x45, 0xa3, 0xb3, 0xe4, 0x2e, 0xab, 0xb9, 0x0a, 0x1e, 0xbc, 0x09, 0x23, 0xc6, 0xe8, 0xdb, 0x2e, - 0x11, 0x98, 0x12, 0x2e, 0x30, 0x3a, 0x64, 0x8c, 0x72, 0xad, 0x01, 0x6a, 0x04, 0x65, 0x13, 0xad, - 0xb5, 0xc6, 0x9d, 0x4c, 0x5c, 0x3d, 0x06, 0xb3, 0x23, 0x4e, 0x5d, 0x5b, 0x04, 0x0b, 0x23, 0xcc, - 0xfb, 0x50, 0x90, 0x14, 0x37, 0x14, 0x4d, 0xaf, 0x6e, 0xb1, 0x84, 0xf7, 0x0e, 0x8f, 0xba, 0x30, - 0xc6, 0x0d, 0xb5, 0x39, 0x7e, 0xf6, 0x51, 0x57, 0xb6, 0x0e, 0x2e, 0xae, 0x75, 0xf5, 0xf2, 0x5a, - 0x57, 0xbf, 0x5f, 0xeb, 0xea, 0x87, 0x1b, 0x5d, 0xb9, 0xbc, 0xd1, 0x95, 0x2f, 0x37, 0xba, 0x72, - 0xfc, 0xac, 0x32, 0xcf, 0xe2, 0xf1, 0xad, 0x51, 0xe8, 0xf2, 0x81, 0x62, 0xa7, 0xcf, 0xed, 0xf7, - 0xd5, 0x9f, 0x8f, 0x1c, 0xb1, 0x3b, 0x21, 0x5f, 0xfb, 0xd3, 0xdf, 0x01, 0x00, 0x00, 0xff, 0xff, - 0xf3, 0x9f, 0x25, 0x7c, 0x9f, 0x04, 0x00, 0x00, + // 694 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x54, 0x4f, 0x4f, 0xd4, 0x40, + 0x14, 0xdf, 0xb2, 0x2b, 0xb0, 0x83, 0xd1, 0xa5, 0x10, 0x5c, 0x36, 0xa1, 0x8b, 0x25, 0x91, 0x0d, + 0x84, 0x36, 0x60, 0x8c, 0x09, 0xb7, 0x05, 0x34, 0x21, 0x41, 0x20, 0x45, 0x63, 0xc2, 0x65, 0x33, + 0xed, 0x0c, 0xdd, 0xc9, 0x4e, 0x3b, 0xa5, 0x33, 0xad, 0xee, 0xcd, 0x23, 0x47, 0x3f, 0x02, 0x89, + 0x37, 0x3f, 0x84, 0x67, 0x8e, 0x1c, 0x8d, 0x07, 0x34, 0x70, 0xf1, 0xcc, 0x27, 0x30, 0x9d, 0x76, + 0xbb, 0x15, 0x30, 0xea, 0xa9, 0x33, 0xef, 0xf7, 0xde, 0xef, 0xfd, 0xde, 0x9f, 0x0e, 0x58, 0x60, + 0xdc, 0x63, 0x9c, 0x70, 0x93, 0x47, 0x01, 0x0e, 0x8f, 0x68, 0x44, 0x50, 0xe1, 0x68, 0x04, 0x21, + 0x13, 0x4c, 0x55, 0x33, 0x27, 0x63, 0x88, 0x34, 0xa6, 0x5d, 0xe6, 0x32, 0x09, 0x9b, 0xc9, 0x29, + 0xf5, 0x6c, 0x68, 0x2e, 0x63, 0x2e, 0xc5, 0xa6, 0xbc, 0xd9, 0xd1, 0x91, 0x89, 0xa2, 0x10, 0x0a, + 0xc2, 0xfc, 0x0c, 0x6f, 0xde, 0xc4, 0x05, 0xf1, 0x30, 0x17, 0xd0, 0x0b, 0x06, 0x04, 0x8e, 0xcc, + 0x65, 0xda, 0x90, 0x63, 0x33, 0x5e, 0xb5, 0xb1, 0x80, 0xab, 0xa6, 0xc3, 0x48, 0x46, 0xa0, 0xf7, + 0xc1, 0xc3, 0x83, 0x5c, 0x44, 0x9b, 0x73, 0x2c, 0xd4, 0x69, 0x70, 0x0f, 0x61, 0x9f, 0x79, 0x75, + 0x65, 0x5e, 0x69, 0x55, 0xad, 0xf4, 0xa2, 0xbe, 0x04, 0x00, 0x26, 0x70, 0x47, 0xf4, 0x03, 0x5c, + 0x1f, 0x99, 0x57, 0x5a, 0x0f, 0xd6, 0x16, 0x8d, 0xdb, 0x85, 0x18, 0x37, 0xe8, 0x5e, 0xf7, 0x03, + 0x6c, 0x55, 0xe1, 0xe0, 0xb8, 0x3e, 0x7e, 0x72, 0xda, 0x2c, 0xfd, 0x3c, 0x6d, 0x2a, 0x7a, 0x0f, + 0xcc, 0x0d, 0x7d, 0xb7, 0x7d, 0x81, 0x43, 0x0f, 0x23, 0x02, 0xc3, 0x7e, 0xdb, 0x71, 0x58, 0xe4, + 0xff, 0x49, 0xc8, 0x2c, 0x18, 0x8f, 0x21, 0xed, 0x40, 0x84, 0x42, 0x29, 0xa3, 0x6a, 0x8d, 0xc5, + 0x90, 0xb6, 0x11, 0x0a, 0x13, 0xc8, 0x85, 0x91, 0x8b, 0x3b, 0x04, 0xd5, 0xcb, 0xf3, 0x4a, 0xab, + 0x62, 0x8d, 0xc9, 0xfb, 0x36, 0xd2, 0xbf, 0x28, 0x40, 0xdb, 0xe3, 0x1e, 0x7b, 0x71, 0x1c, 0x91, + 0x18, 0x52, 0xec, 0x8b, 0x57, 0x11, 0x15, 0x24, 0xa0, 0x04, 0x87, 0x16, 0x76, 0x58, 0x88, 0xd4, + 0xc7, 0xe0, 0x3e, 0x0e, 0x98, 0xd3, 0xed, 0xf8, 0x91, 0x67, 0xe3, 0x50, 0x66, 0x2d, 0x5b, 0x13, + 0xd2, 0xb6, 0x2b, 0x4d, 0x43, 0x45, 0x23, 0x45, 0x45, 0x0e, 0x00, 0x5e, 0x4e, 0x26, 0x13, 0x57, + 0x37, 0x36, 0xcf, 0x2e, 0x9a, 0xa5, 0x6f, 0x17, 0xcd, 0x27, 0x2e, 0x11, 0xdd, 0xc8, 0x36, 0x1c, + 0xe6, 0x99, 0xd9, 0x28, 0xd2, 0xcf, 0x0a, 0x47, 0x3d, 0x33, 0xe9, 0x25, 0x37, 0xb6, 0xb0, 0x73, + 0x7d, 0xd1, 0x9c, 0xec, 0x43, 0x8f, 0xae, 0xeb, 0x43, 0x26, 0xdd, 0x2a, 0xd0, 0xea, 0xd7, 0x23, + 0xa0, 0x31, 0x6c, 0xd7, 0x16, 0xa6, 0xd8, 0x95, 0x8b, 0x90, 0x89, 0x5f, 0x06, 0x93, 0x28, 0xb5, + 0xb1, 0x50, 0xf6, 0x06, 0x73, 0x9e, 0xf5, 0xad, 0x96, 0x03, 0xed, 0xd4, 0x9e, 0x38, 0xc7, 0x90, + 0x12, 0xf4, 0x9b, 0x73, 0x5a, 0x52, 0x2d, 0x07, 0x06, 0xce, 0xef, 0x72, 0x66, 0xc2, 0xfc, 0x0e, + 0xf4, 0x92, 0xd1, 0xc8, 0x22, 0x27, 0xd6, 0x66, 0x8d, 0xb4, 0x16, 0x23, 0xd9, 0x2e, 0x23, 0xdb, + 0x2e, 0x63, 0x93, 0x11, 0x7f, 0xc3, 0x4c, 0xea, 0xff, 0xfc, 0xbd, 0xb9, 0xf8, 0x0f, 0xf5, 0x27, + 0x01, 0xb9, 0x4a, 0xc2, 0xfc, 0xb6, 0xcc, 0xa1, 0x7e, 0x50, 0x40, 0x1d, 0xe7, 0xe3, 0xea, 0x70, + 0x01, 0x7b, 0x18, 0x0d, 0x04, 0x54, 0xfe, 0x26, 0x60, 0xf9, 0x7f, 0x92, 0xcf, 0x0c, 0xf3, 0x1c, + 0xc8, 0x34, 0xa9, 0x04, 0xfd, 0x18, 0x2c, 0xec, 0x30, 0xa7, 0xb7, 0x7d, 0xd7, 0x7a, 0x6e, 0x32, + 0xdf, 0xc7, 0x4e, 0xa2, 0x57, 0x7d, 0x04, 0xc6, 0x28, 0x73, 0x7a, 0xc9, 0xda, 0x29, 0x72, 0xed, + 0x46, 0xa9, 0x8c, 0x52, 0x57, 0xc1, 0x34, 0x29, 0x44, 0x76, 0x60, 0x1a, 0x9a, 0xf5, 0x7a, 0x8a, + 0xdc, 0x66, 0xd5, 0x97, 0xc0, 0xcc, 0x1b, 0x3f, 0x60, 0x8c, 0xbe, 0xed, 0x12, 0x81, 0x29, 0xe1, + 0x02, 0xa3, 0x7d, 0xc6, 0x28, 0x57, 0x6b, 0xa0, 0x4c, 0x50, 0x32, 0xd4, 0x72, 0xab, 0x62, 0x25, + 0xc7, 0xa5, 0x43, 0x30, 0x75, 0xc7, 0xdf, 0xa6, 0xce, 0x81, 0xd9, 0x3b, 0xcc, 0xbb, 0x50, 0x90, + 0x18, 0xd7, 0x4a, 0xaa, 0x56, 0x5c, 0xa4, 0x1c, 0xde, 0xd9, 0x3f, 0xe8, 0xc2, 0x10, 0xd7, 0x94, + 0x46, 0xe5, 0xe4, 0x93, 0x56, 0xda, 0xd8, 0x3b, 0xbb, 0xd4, 0x94, 0xf3, 0x4b, 0x4d, 0xf9, 0x71, + 0xa9, 0x29, 0x1f, 0xaf, 0xb4, 0xd2, 0xf9, 0x95, 0x56, 0xfa, 0x7a, 0xa5, 0x95, 0x0e, 0x9f, 0x15, + 0xba, 0x9a, 0xfd, 0xff, 0x2b, 0x14, 0xda, 0x7c, 0x70, 0x31, 0xe3, 0xe7, 0xe6, 0xfb, 0xe2, 0xfb, + 0x27, 0x1b, 0x6d, 0x8f, 0xca, 0x07, 0xe7, 0xe9, 0xaf, 0x00, 0x00, 0x00, 0xff, 0xff, 0xc1, 0xfb, + 0xa8, 0x75, 0x22, 0x05, 0x00, 0x00, } func (this *SuperfluidAsset) Equal(that interface{}) bool { @@ -602,6 +612,18 @@ func (m *SuperfluidDelegationRecord) MarshalToSizedBuffer(dAtA []byte) (int, err _ = i var l int _ = l + if m.EquivalentStakedAmount != nil { + { + size, err := m.EquivalentStakedAmount.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintSuperfluid(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x22 + } { size, err := m.DelegationAmount.MarshalToSizedBuffer(dAtA[:i]) if err != nil { @@ -685,20 +707,20 @@ func (m *UnpoolWhitelistedPools) MarshalToSizedBuffer(dAtA []byte) (int, error) var l int _ = l if len(m.Ids) > 0 { - dAtA3 := make([]byte, len(m.Ids)*10) - var j2 int + dAtA4 := make([]byte, len(m.Ids)*10) + var j3 int for _, num := range m.Ids { for num >= 1<<7 { - dAtA3[j2] = uint8(uint64(num)&0x7f | 0x80) + dAtA4[j3] = uint8(uint64(num)&0x7f | 0x80) num >>= 7 - j2++ + j3++ } - dAtA3[j2] = uint8(num) - j2++ + dAtA4[j3] = uint8(num) + j3++ } - i -= j2 - copy(dAtA[i:], dAtA3[:j2]) - i = encodeVarintSuperfluid(dAtA, i, uint64(j2)) + i -= j3 + copy(dAtA[i:], dAtA4[:j3]) + i = encodeVarintSuperfluid(dAtA, i, uint64(j3)) i-- dAtA[i] = 0xa } @@ -786,6 +808,10 @@ func (m *SuperfluidDelegationRecord) Size() (n int) { } l = m.DelegationAmount.Size() n += 1 + l + sovSuperfluid(uint64(l)) + if m.EquivalentStakedAmount != nil { + l = m.EquivalentStakedAmount.Size() + n += 1 + l + sovSuperfluid(uint64(l)) + } return n } @@ -1322,6 +1348,42 @@ func (m *SuperfluidDelegationRecord) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex + case 4: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field EquivalentStakedAmount", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowSuperfluid + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthSuperfluid + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthSuperfluid + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.EquivalentStakedAmount == nil { + m.EquivalentStakedAmount = &types.Coin{} + } + if err := m.EquivalentStakedAmount.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipSuperfluid(dAtA[iNdEx:])