Skip to content
GitLab
Commit 495ee2bd authored by mattverse's avatar mattverse
Browse files

Change comments and proto field name

parent a0f6297f
Hide whitespace changes
Inline Side-by-side
Showing
with 76 additions and 106 deletions
+76 -106
proto/osmosis/incentives/gauge.proto
+ 2
- 2
View file @ 495ee2bd
......@@ -43,7 +43,7 @@ message LockableDurationsInfo {
];
}
// HistoricalReward stores the accumulator value for rewards
// HistoricalReward stores the accumulator value for rewards, indexed by lockDuration + denom + epochNumber combination
message HistoricalReward {
// Reward per share for each denom
repeated cosmos.base.v1beta1.DecCoin cumulative_reward_ratio = 1 [
......@@ -67,7 +67,7 @@ message CurrentReward {
(gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"
];
// denom of share
string denom = 4;
string lock_denom = 4;
google.protobuf.Duration lock_duration = 5 [
(gogoproto.stdduration) = true,
(gogoproto.nullable) = false,
......
x/gamm/types/query.pb.gw.go
+ 1
- 33
View file @ 495ee2bd
......@@ -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
var (
filter_Query_Pools_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)}
......@@ -540,14 +538,12 @@ func local_request_Query_EstimateSwapExactAmountOut_0(ctx context.Context, marsh
// 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_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 {
......@@ -555,7 +551,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)
......@@ -569,8 +564,6 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv
mux.Handle("GET", pattern_Query_NumPools_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 {
......@@ -578,7 +571,6 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv
return
}
resp, md, err := local_request_Query_NumPools_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)
......@@ -592,8 +584,6 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv
mux.Handle("GET", pattern_Query_TotalLiquidity_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 {
......@@ -601,7 +591,6 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv
return
}
resp, md, err := local_request_Query_TotalLiquidity_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)
......@@ -615,8 +604,6 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv
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 {
......@@ -624,7 +611,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)
......@@ -638,8 +624,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 {
......@@ -647,7 +631,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)
......@@ -661,8 +644,6 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv
mux.Handle("GET", pattern_Query_TotalShares_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 {
......@@ -670,7 +651,6 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv
return
}
resp, md, err := local_request_Query_TotalShares_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)
......@@ -684,8 +664,6 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv
mux.Handle("GET", pattern_Query_PoolAssets_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 {
......@@ -693,7 +671,6 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv
return
}
resp, md, err := local_request_Query_PoolAssets_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)
......@@ -707,8 +684,6 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv
mux.Handle("GET", pattern_Query_SpotPrice_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 {
......@@ -716,7 +691,6 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv
return
}
resp, md, err := local_request_Query_SpotPrice_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)
......@@ -730,8 +704,6 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv
mux.Handle("GET", pattern_Query_EstimateSwapExactAmountIn_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 {
......@@ -739,7 +711,6 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv
return
}
resp, md, err := local_request_Query_EstimateSwapExactAmountIn_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)
......@@ -753,8 +724,6 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv
mux.Handle("GET", pattern_Query_EstimateSwapExactAmountOut_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 {
......@@ -762,7 +731,6 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv
return
}
resp, md, err := local_request_Query_EstimateSwapExactAmountOut_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)
......
x/incentives/genesis.go
+ 3
- 3
View file @ 495ee2bd
......@@ -21,7 +21,7 @@ func InitGenesis(ctx sdk.Context, k keeper.Keeper, genState types.GenesisState)
}
for _, genesisReward := range genState.GenesisReward {
currentReward := genesisReward.CurrentReward
denom := currentReward.Denom
denom := currentReward.LockDenom
duration := currentReward.LockDuration
err := k.SetCurrentReward(ctx, currentReward, denom, duration)
if err != nil {
......@@ -56,7 +56,7 @@ func ExportGenesis(ctx sdk.Context, k keeper.Keeper) *types.GenesisState {
func GetGenesisRewards(ctx sdk.Context, k keeper.Keeper) []types.GenesisReward {
var genesisRewards []types.GenesisReward
for _, currentReward := range k.GetAllCurrentReward(ctx) {
denom := currentReward.Denom
denom := currentReward.LockDenom
duration := currentReward.LockDuration
genesisReward := types.GenesisReward{}
genesisReward.CurrentReward = currentReward
......@@ -70,7 +70,7 @@ func GetGenesisRewards(ctx sdk.Context, k keeper.Keeper) []types.GenesisReward {
}
historicalRewards = append(historicalRewards, historicalReward)
latestEpoch, err = k.GetLatestEpochForHistoricalReward(ctx, currentReward.Denom, currentReward.LockDuration, latestEpoch)
latestEpoch, err = k.GetLatestEpochForHistoricalReward(ctx, currentReward.LockDenom, currentReward.LockDuration, latestEpoch)
if err != nil {
panic(fmt.Sprintf("unable to retrieve historical reward for denom(%v) d(%v) period(%v)", denom, duration, latestEpoch))
}
......
x/incentives/genesis_test.go
+ 1
- 1
View file @ 495ee2bd
......@@ -55,7 +55,7 @@ func TestIncentivesExportGenesis(t *testing.T) {
currentReward := types.CurrentReward{
LastProcessedEpoch: 5,
TotalShares: sdk.NewCoin("stake", sdk.NewInt(10)),
Denom: denom,
LockDenom: denom,
LockDuration: duration,
}
app.IncentivesKeeper.SetCurrentReward(ctx, currentReward, denom, duration)
......
x/incentives/keeper/f1_test.go
+ 2
- 0
View file @ 495ee2bd
package keeper_test
import (
"fmt"
"time"
sdk "github.com/cosmos/cosmos-sdk/types"
......@@ -240,6 +241,7 @@ func (suite *KeeperTestSuite) TestLockAndUnlockFor14Days() {
estLockReward, err := suite.app.IncentivesKeeper.EstimateLockReward(suite.ctx, *lock)
suite.Require().NoError(err)
fmt.Println(i)
suite.Require().Equal(reward, estLockReward.Rewards)
}
......
x/incentives/keeper/grpc_query_test.go
+ 2
- 2
View file @ 495ee2bd
......@@ -334,7 +334,7 @@ func (suite *KeeperTestSuite) TestGRPCCurrentReward() {
LastProcessedEpoch: 1,
TotalShares: sdk.NewInt64Coin("stake", 100),
Rewards: sdk.Coins{sdk.NewInt64Coin("reward", 100)},
Denom: denom,
LockDenom: denom,
LockDuration: duration,
}
......@@ -399,7 +399,7 @@ func (suite *KeeperTestSuite) TestGRPCRewards() {
LastProcessedEpoch: 1,
TotalShares: sdk.NewInt64Coin("lptoken", 100),
Rewards: sdk.Coins{sdk.NewInt64Coin("reward", 100)},
Denom: denom,
LockDenom: denom,
LockDuration: duration,
}
......
x/incentives/keeper/reward.go
+ 1
- 1
View file @ 495ee2bd
......@@ -51,7 +51,7 @@ func (k Keeper) SetCurrentReward(ctx sdk.Context, currentReward types.CurrentRew
store := ctx.KVStore(k.storeKey)
rewardKey := combineKeys(types.KeyCurrentReward, []byte(denom+"/"+lockDuration.String()))
currentReward.Denom = denom
currentReward.LockDenom = denom
currentReward.LockDuration = lockDuration
bz, err := proto.Marshal(&currentReward)
if err != nil {
......
x/incentives/types/gauge.pb.go
+ 64
- 64
View file @ 495ee2bd
......@@ -233,7 +233,7 @@ func (m *HistoricalReward) GetEpoch() int64 {
return 0
}
// CurrentReward stores reward at the most recent epoch for each denom + lockDuration
// CurrentReward stores reward at the latest reward for each denom + lockDuration
type CurrentReward struct {
LastProcessedEpoch int64 `protobuf:"varint,1,opt,name=last_processed_epoch,json=lastProcessedEpoch,proto3" json:"last_processed_epoch,omitempty"`
// total shares locked for the denom + lockDuration
......@@ -241,7 +241,7 @@ type CurrentReward struct {
// total reward that is to be distributed
Rewards github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,3,rep,name=rewards,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"rewards"`
// denom of share
Denom string `protobuf:"bytes,4,opt,name=denom,proto3" json:"denom,omitempty"`
LockDenom string `protobuf:"bytes,4,opt,name=lock_denom,json=lockDenom,proto3" json:"lock_denom,omitempty"`
LockDuration time.Duration `protobuf:"bytes,5,opt,name=lock_duration,json=lockDuration,proto3,stdduration" json:"lock_duration" yaml:"duration"`
}
......@@ -299,9 +299,9 @@ func (m *CurrentReward) GetRewards() github_com_cosmos_cosmos_sdk_types.Coins {
return nil
}
func (m *CurrentReward) GetDenom() string {
func (m *CurrentReward) GetLockDenom() string {
if m != nil {
return m.Denom
return m.LockDenom
}
return ""
}
......@@ -447,60 +447,60 @@ func init() {
func init() { proto.RegisterFile("osmosis/incentives/gauge.proto", fileDescriptor_c0304e2bb0159901) }
var fileDescriptor_c0304e2bb0159901 = []byte{
// 836 bytes of a gzipped FileDescriptorProto
// 846 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x55, 0x4f, 0x6f, 0xdc, 0x44,
0x14, 0xcf, 0xec, 0x6e, 0x92, 0x76, 0xb2, 0x81, 0x64, 0x94, 0xaa, 0x4e, 0x00, 0xef, 0xe2, 0x0a,
0xb1, 0x12, 0xaa, 0xdd, 0xa6, 0x07, 0x24, 0x6e, 0x6c, 0x52, 0x41, 0xa4, 0x48, 0x04, 0xd3, 0x03,
0x82, 0x83, 0x35, 0xb6, 0x27, 0xce, 0x28, 0x63, 0x8f, 0x35, 0x33, 0x0e, 0xcd, 0x37, 0x00, 0x4e,
0x15, 0x27, 0x3e, 0x03, 0x07, 0x4e, 0x7c, 0x88, 0x1e, 0x7b, 0xe4, 0xd4, 0xa2, 0xe4, 0x1b, 0x70,
0x47, 0x42, 0xf3, 0x2f, 0xbb, 0x24, 0x28, 0xca, 0x21, 0x3d, 0xd9, 0x33, 0xbf, 0x79, 0xef, 0xfd,
0xde, 0xef, 0xfd, 0xc6, 0x86, 0x21, 0x97, 0x35, 0x97, 0x54, 0x26, 0xb4, 0x29, 0x48, 0xa3, 0xe8,
0x09, 0x91, 0x49, 0x85, 0xbb, 0x8a, 0xc4, 0xad, 0xe0, 0x8a, 0x23, 0xe4, 0xf0, 0x78, 0x86, 0x6f,
0x6d, 0x54, 0xbc, 0xe2, 0x06, 0x4e, 0xf4, 0x9b, 0x3d, 0xb9, 0x15, 0x56, 0x9c, 0x57, 0x8c, 0x24,
0x66, 0x95, 0x77, 0x87, 0x49, 0xd9, 0x09, 0xac, 0x28, 0x6f, 0x1c, 0x3e, 0xba, 0x8c, 0x2b, 0x5a,
0x13, 0xa9, 0x70, 0xdd, 0xfa, 0x04, 0x85, 0xa9, 0x95, 0xe4, 0x58, 0x92, 0xe4, 0xe4, 0x71, 0x4e,
0x14, 0x7e, 0x9c, 0x14, 0x9c, 0xfa, 0x04, 0x9b, 0x9e, 0x2a, 0xe3, 0xc5, 0x71, 0xd7, 0x9a, 0x87,
0x85, 0xa2, 0x5f, 0x06, 0x70, 0xf1, 0x0b, 0xcd, 0x1a, 0xbd, 0x03, 0x7b, 0xb4, 0x0c, 0xc0, 0x18,
0x4c, 0x06, 0x69, 0x8f, 0x96, 0xe8, 0x43, 0x38, 0xa4, 0x32, 0x6b, 0x89, 0x68, 0x89, 0xea, 0x30,
0x0b, 0x7a, 0x63, 0x30, 0xb9, 0x93, 0xae, 0x50, 0x79, 0xe0, 0xb7, 0xd0, 0x1e, 0x5c, 0x2d, 0xa9,
0x54, 0x82, 0xe6, 0x9d, 0x22, 0x99, 0xe2, 0x41, 0x7f, 0x0c, 0x26, 0x2b, 0xdb, 0x61, 0xec, 0x5b,
0xb7, 0xf5, 0xe2, 0xaf, 0x3b, 0x22, 0x4e, 0x77, 0x78, 0x53, 0x52, 0xdd, 0xd5, 0x74, 0xf0, 0xf2,
0xf5, 0x68, 0x21, 0x1d, 0xce, 0x42, 0x9f, 0x71, 0x84, 0xe1, 0xa2, 0x26, 0x2c, 0x83, 0xc1, 0xb8,
0x3f, 0x59, 0xd9, 0xde, 0x8c, 0x6d, 0x4b, 0xb1, 0x6e, 0x29, 0x76, 0x2d, 0xc5, 0x3b, 0x9c, 0x36,
0xd3, 0x47, 0x3a, 0xfa, 0xb7, 0x37, 0xa3, 0x49, 0x45, 0xd5, 0x51, 0x97, 0xc7, 0x05, 0xaf, 0x13,
0xd7, 0xbf, 0x7d, 0x3c, 0x94, 0xe5, 0x71, 0xa2, 0x4e, 0x5b, 0x22, 0x4d, 0x80, 0x4c, 0x6d, 0x66,
0xf4, 0x2d, 0x84, 0x52, 0x61, 0xa1, 0x32, 0x2d, 0x5f, 0xb0, 0x68, 0xa8, 0x6e, 0xc5, 0x56, 0xdb,
0xd8, 0x6b, 0x1b, 0x3f, 0xf3, 0xda, 0x4e, 0x3f, 0xd0, 0x85, 0xfe, 0x7e, 0x3d, 0x5a, 0x3f, 0xc5,
0x35, 0xfb, 0x2c, 0x9a, 0xc5, 0x46, 0x2f, 0xde, 0x8c, 0x40, 0x7a, 0xd7, 0x6c, 0xe8, 0xe3, 0x28,
0x81, 0x1b, 0x4d, 0x57, 0x67, 0xa4, 0xe5, 0xc5, 0x91, 0xcc, 0x5a, 0x4c, 0xcb, 0x8c, 0x9f, 0x10,
0x11, 0x2c, 0x19, 0x31, 0xd7, 0x9b, 0xae, 0x7e, 0x6a, 0xa0, 0x03, 0x4c, 0xcb, 0xaf, 0x4e, 0x88,
0x40, 0x0f, 0xe0, 0xea, 0x21, 0x65, 0x8c, 0x94, 0x2e, 0x26, 0x58, 0x36, 0x27, 0x87, 0x76, 0xd3,
0x1e, 0x46, 0xcf, 0xe1, 0xfa, 0x4c, 0xa2, 0x32, 0xb3, 0xf2, 0xdc, 0xb9, 0x7d, 0x79, 0xd6, 0xe6,
0xaa, 0x98, 0x9d, 0xe8, 0x47, 0x00, 0xef, 0xed, 0xf3, 0xe2, 0x18, 0xe7, 0x8c, 0xec, 0x3a, 0x2f,
0xca, 0xbd, 0xe6, 0x90, 0x23, 0x0e, 0x11, 0x73, 0x40, 0xe6, 0x5d, 0x2a, 0x03, 0xe0, 0x48, 0x5d,
0xd6, 0xd2, 0xc7, 0x4e, 0x3f, 0x72, 0x52, 0x6e, 0x5a, 0x29, 0xaf, 0xa6, 0x88, 0x7e, 0xd5, 0x92,
0xae, 0xb3, 0xcb, 0x45, 0xa3, 0x3f, 0x00, 0x5c, 0xfb, 0x92, 0x4a, 0xc5, 0x05, 0x2d, 0x30, 0x4b,
0xc9, 0x0f, 0x58, 0x94, 0xe8, 0x27, 0x00, 0xef, 0x17, 0x5d, 0xdd, 0x31, 0xac, 0xaf, 0x55, 0x26,
0xcc, 0x6e, 0x66, 0x42, 0x1c, 0x97, 0xf7, 0xff, 0x57, 0xa0, 0x5d, 0x52, 0x18, 0x8d, 0x9e, 0x38,
0x8d, 0x3e, 0xb9, 0x81, 0x46, 0x2e, 0x46, 0xa6, 0xf7, 0x66, 0x15, 0x2d, 0x8d, 0x54, 0xd7, 0x43,
0x1b, 0x70, 0xd1, 0xcc, 0xd0, 0xdc, 0x8f, 0x7e, 0x6a, 0x17, 0xd1, 0xcf, 0x7d, 0xb8, 0xba, 0xd3,
0x09, 0x41, 0x1a, 0xe5, 0x38, 0x3f, 0x82, 0x1b, 0x0c, 0x4b, 0x95, 0xb5, 0x82, 0x17, 0x44, 0x4a,
0x3f, 0x7a, 0x73, 0xe1, 0xfa, 0x29, 0xd2, 0xd8, 0x81, 0x87, 0x8c, 0x01, 0x50, 0x0d, 0x87, 0x8a,
0x2b, 0xcc, 0x32, 0x79, 0x84, 0x05, 0x91, 0xa6, 0xc0, 0xb5, 0xa3, 0x4f, 0x5c, 0x5b, 0x1f, 0xdf,
0x70, 0xf4, 0xe9, 0x8a, 0xc9, 0xff, 0x8d, 0x49, 0x8f, 0x08, 0x5c, 0xb6, 0x42, 0xca, 0xa0, 0x7f,
0xfb, 0x26, 0xf3, 0xb9, 0xb5, 0x5e, 0x25, 0x69, 0x78, 0x1d, 0x0c, 0xc6, 0x60, 0x72, 0x37, 0xb5,
0x0b, 0xf4, 0x3d, 0x5c, 0xd5, 0xb3, 0xbf, 0x30, 0x84, 0xbb, 0x9e, 0xd7, 0x58, 0xea, 0x3d, 0x67,
0xa9, 0x77, 0xad, 0xa5, 0x7c, 0xa0, 0x35, 0xd2, 0x50, 0x27, 0xf3, 0x47, 0xa3, 0xdf, 0x01, 0x7c,
0xb0, 0x8f, 0xa5, 0x7a, 0xca, 0x68, 0x45, 0x73, 0x46, 0x8c, 0xbc, 0xd3, 0x53, 0x8f, 0x7f, 0xde,
0x94, 0xbb, 0x86, 0xc4, 0x05, 0x35, 0x70, 0x2d, 0xb5, 0xde, 0xed, 0x51, 0x9b, 0xb9, 0xa7, 0x3f,
0xef, 0x9e, 0x7f, 0x00, 0x5c, 0x3b, 0x20, 0x82, 0xf2, 0x52, 0xdf, 0x42, 0x67, 0xa0, 0xfb, 0x70,
0xd9, 0xf0, 0xb8, 0xf8, 0x48, 0x2f, 0xe9, 0xe5, 0x5e, 0x39, 0x3f, 0xb8, 0xde, 0x5b, 0x1c, 0x1c,
0x75, 0x06, 0x26, 0x4e, 0x45, 0xff, 0xe9, 0xb2, 0x66, 0xf9, 0x34, 0xbe, 0xfa, 0xbb, 0x8b, 0x6f,
0x20, 0xba, 0x75, 0xfe, 0x7f, 0x0e, 0xc9, 0xe9, 0xfe, 0xcb, 0xb3, 0x10, 0xbc, 0x3a, 0x0b, 0xc1,
0x5f, 0x67, 0x21, 0x78, 0x71, 0x1e, 0x2e, 0xbc, 0x3a, 0x0f, 0x17, 0xfe, 0x3c, 0x0f, 0x17, 0xbe,
0xdb, 0x9e, 0xe3, 0xed, 0x0a, 0x3e, 0x64, 0x38, 0x97, 0x7e, 0x91, 0x3c, 0x9f, 0xff, 0x1d, 0x9b,
0x3e, 0xf2, 0x25, 0x33, 0xa1, 0x27, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0x69, 0x6d, 0x2a, 0x78,
0xb1, 0x07, 0x00, 0x00,
0x14, 0xcf, 0xec, 0x9f, 0xa4, 0x99, 0x6c, 0x20, 0x19, 0x6d, 0x55, 0x27, 0x50, 0xef, 0xb2, 0x15,
0x62, 0x25, 0x54, 0xbb, 0x4d, 0x0f, 0x48, 0xdc, 0xd8, 0xa4, 0x82, 0x48, 0x91, 0x08, 0xa6, 0x07,
0x04, 0x07, 0x6b, 0x6c, 0x4f, 0x9c, 0x51, 0xc6, 0x1e, 0x6b, 0x66, 0x1c, 0x9a, 0x6f, 0x00, 0xb7,
0x0a, 0x2e, 0x7c, 0x06, 0x0e, 0x9c, 0xf8, 0x10, 0x3d, 0xf6, 0xc8, 0xa9, 0x45, 0xc9, 0x37, 0xe0,
0x8e, 0x84, 0xe6, 0x1f, 0xbb, 0x24, 0x28, 0xca, 0x21, 0x3d, 0xd9, 0xf3, 0xde, 0xbc, 0xf7, 0x7e,
0xef, 0xf7, 0x7e, 0xcf, 0x86, 0x21, 0x97, 0x15, 0x97, 0x54, 0xc6, 0xb4, 0xce, 0x49, 0xad, 0xe8,
0x29, 0x91, 0x71, 0x89, 0xdb, 0x92, 0x44, 0x8d, 0xe0, 0x8a, 0x23, 0xe4, 0xfc, 0xd1, 0xdc, 0xbf,
0x3d, 0x2c, 0x79, 0xc9, 0x8d, 0x3b, 0xd6, 0x6f, 0xf6, 0xe6, 0x76, 0x58, 0x72, 0x5e, 0x32, 0x12,
0x9b, 0x53, 0xd6, 0x1e, 0xc5, 0x45, 0x2b, 0xb0, 0xa2, 0xbc, 0x76, 0xfe, 0xd1, 0x65, 0xbf, 0xa2,
0x15, 0x91, 0x0a, 0x57, 0x8d, 0x4f, 0x90, 0x9b, 0x5a, 0x71, 0x86, 0x25, 0x89, 0x4f, 0x1f, 0x67,
0x44, 0xe1, 0xc7, 0x71, 0xce, 0xa9, 0x4f, 0xb0, 0xe5, 0xa1, 0x32, 0x9e, 0x9f, 0xb4, 0x8d, 0x79,
0x58, 0xd7, 0xe4, 0xa7, 0x1e, 0xec, 0x7f, 0xae, 0x51, 0xa3, 0x77, 0x60, 0x87, 0x16, 0x01, 0x18,
0x83, 0x69, 0x2f, 0xe9, 0xd0, 0x02, 0x7d, 0x00, 0x07, 0x54, 0xa6, 0x0d, 0x11, 0x0d, 0x51, 0x2d,
0x66, 0x41, 0x67, 0x0c, 0xa6, 0x77, 0x92, 0x35, 0x2a, 0x0f, 0xbd, 0x09, 0xed, 0xc3, 0xf5, 0x82,
0x4a, 0x25, 0x68, 0xd6, 0x2a, 0x92, 0x2a, 0x1e, 0x74, 0xc7, 0x60, 0xba, 0xb6, 0x13, 0x46, 0xbe,
0x75, 0x5b, 0x2f, 0xfa, 0xaa, 0x25, 0xe2, 0x6c, 0x97, 0xd7, 0x05, 0xd5, 0x5d, 0xcd, 0x7a, 0x2f,
0x5f, 0x8f, 0x96, 0x92, 0xc1, 0x3c, 0xf4, 0x19, 0x47, 0x18, 0xf6, 0x35, 0x60, 0x19, 0xf4, 0xc6,
0xdd, 0xe9, 0xda, 0xce, 0x56, 0x64, 0x5b, 0x8a, 0x74, 0x4b, 0x91, 0x6b, 0x29, 0xda, 0xe5, 0xb4,
0x9e, 0x3d, 0xd2, 0xd1, 0xbf, 0xbe, 0x19, 0x4d, 0x4b, 0xaa, 0x8e, 0xdb, 0x2c, 0xca, 0x79, 0x15,
0xbb, 0xfe, 0xed, 0xe3, 0xa1, 0x2c, 0x4e, 0x62, 0x75, 0xd6, 0x10, 0x69, 0x02, 0x64, 0x62, 0x33,
0xa3, 0x6f, 0x20, 0x94, 0x0a, 0x0b, 0x95, 0x6a, 0xfa, 0x82, 0xbe, 0x81, 0xba, 0x1d, 0x59, 0x6e,
0x23, 0xcf, 0x6d, 0xf4, 0xcc, 0x73, 0x3b, 0xbb, 0xaf, 0x0b, 0xfd, 0xf5, 0x7a, 0xb4, 0x79, 0x86,
0x2b, 0xf6, 0xe9, 0x64, 0x1e, 0x3b, 0x79, 0xf1, 0x66, 0x04, 0x92, 0x55, 0x63, 0xd0, 0xd7, 0x51,
0x0c, 0x87, 0x75, 0x5b, 0xa5, 0xa4, 0xe1, 0xf9, 0xb1, 0x4c, 0x1b, 0x4c, 0x8b, 0x94, 0x9f, 0x12,
0x11, 0x2c, 0x1b, 0x32, 0x37, 0xeb, 0xb6, 0x7a, 0x6a, 0x5c, 0x87, 0x98, 0x16, 0x5f, 0x9e, 0x12,
0x81, 0x1e, 0xc0, 0xf5, 0x23, 0xca, 0x18, 0x29, 0x5c, 0x4c, 0xb0, 0x62, 0x6e, 0x0e, 0xac, 0xd1,
0x5e, 0x46, 0xcf, 0xe1, 0xe6, 0x9c, 0xa2, 0x22, 0xb5, 0xf4, 0xdc, 0xb9, 0x7d, 0x7a, 0x36, 0x16,
0xaa, 0x18, 0xcb, 0xe4, 0x07, 0x00, 0xef, 0x1e, 0xf0, 0xfc, 0x04, 0x67, 0x8c, 0xec, 0x39, 0x2d,
0xca, 0xfd, 0xfa, 0x88, 0x23, 0x0e, 0x11, 0x73, 0x8e, 0xd4, 0xab, 0x54, 0x06, 0xc0, 0x81, 0xba,
0xcc, 0xa5, 0x8f, 0x9d, 0x7d, 0xe8, 0xa8, 0xdc, 0xb2, 0x54, 0x5e, 0x4d, 0x31, 0xf9, 0x45, 0x53,
0xba, 0xc9, 0x2e, 0x17, 0x9d, 0xfc, 0x0e, 0xe0, 0xc6, 0x17, 0x54, 0x2a, 0x2e, 0x68, 0x8e, 0x59,
0x42, 0xbe, 0xc7, 0xa2, 0x40, 0x3f, 0x02, 0x78, 0x2f, 0x6f, 0xab, 0x96, 0x61, 0xbd, 0x56, 0xa9,
0x30, 0xd6, 0xd4, 0x84, 0x38, 0x2c, 0xef, 0xff, 0x2f, 0x41, 0x7b, 0x24, 0x37, 0x1c, 0x3d, 0x71,
0x1c, 0x7d, 0x7c, 0x03, 0x8e, 0x5c, 0x8c, 0x4c, 0xee, 0xce, 0x2b, 0x5a, 0x18, 0x89, 0xae, 0x87,
0x86, 0xb0, 0x6f, 0x66, 0x68, 0xf6, 0xa3, 0x9b, 0xd8, 0xc3, 0xe4, 0xe7, 0x2e, 0x5c, 0xdf, 0x6d,
0x85, 0x20, 0xb5, 0x72, 0x98, 0x1f, 0xc1, 0x21, 0xc3, 0x52, 0xa5, 0x8d, 0xe0, 0x39, 0x91, 0xd2,
0x8f, 0xde, 0x2c, 0x5c, 0x37, 0x41, 0xda, 0x77, 0xe8, 0x5d, 0x46, 0x00, 0xa8, 0x82, 0x03, 0xc5,
0x15, 0x66, 0xa9, 0x3c, 0xc6, 0x82, 0x48, 0x53, 0xe0, 0xda, 0xd1, 0xc7, 0xae, 0xad, 0x8f, 0x6e,
0x38, 0xfa, 0x64, 0xcd, 0xe4, 0xff, 0xda, 0xa4, 0x47, 0x04, 0xae, 0x58, 0x22, 0x65, 0xd0, 0xbd,
0x7d, 0x91, 0xf9, 0xdc, 0xe8, 0x3e, 0x84, 0x7a, 0xca, 0x69, 0x41, 0x6a, 0x5e, 0x05, 0xbd, 0x31,
0x98, 0xae, 0x26, 0xab, 0xda, 0xb2, 0xa7, 0x0d, 0xe8, 0x3b, 0xb8, 0x6e, 0xdd, 0x4e, 0x01, 0x6e,
0x4f, 0xaf, 0xd1, 0xd6, 0x7b, 0x4e, 0x5b, 0xef, 0x5a, 0x6d, 0xf9, 0x40, 0xab, 0xa8, 0x81, 0xc9,
0xec, 0x4d, 0xbf, 0x01, 0xf8, 0xe0, 0x00, 0x4b, 0xf5, 0x94, 0xd1, 0x92, 0x66, 0x8c, 0x18, 0x9e,
0x67, 0x67, 0xde, 0xff, 0x59, 0x5d, 0x58, 0x10, 0x43, 0xd8, 0xb7, 0xf0, 0x80, 0x81, 0x67, 0x0f,
0x57, 0xa1, 0x75, 0x6e, 0x0f, 0xda, 0x5c, 0x46, 0xdd, 0x45, 0x19, 0xfd, 0x0d, 0xe0, 0xc6, 0x21,
0x11, 0x94, 0x17, 0x7a, 0x1d, 0x9d, 0x92, 0xee, 0xc1, 0x15, 0x83, 0xe3, 0xdf, 0xaf, 0xf5, 0xb2,
0x3e, 0xee, 0x17, 0x8b, 0x13, 0xec, 0xbc, 0xc5, 0x09, 0x52, 0xa7, 0x64, 0xe2, 0x58, 0xf4, 0xdf,
0x30, 0xab, 0x9a, 0x4f, 0xa2, 0xab, 0xff, 0xbd, 0xe8, 0x06, 0xa4, 0xdb, 0x15, 0xf8, 0xcf, 0x25,
0x39, 0x3b, 0x78, 0x79, 0x1e, 0x82, 0x57, 0xe7, 0x21, 0xf8, 0xf3, 0x3c, 0x04, 0x2f, 0x2e, 0xc2,
0xa5, 0x57, 0x17, 0xe1, 0xd2, 0x1f, 0x17, 0xe1, 0xd2, 0xb7, 0x3b, 0x0b, 0xb8, 0x5d, 0xc1, 0x87,
0x0c, 0x67, 0xd2, 0x1f, 0xe2, 0xe7, 0x8b, 0xff, 0x65, 0xd3, 0x47, 0xb6, 0x6c, 0x26, 0xf4, 0xe4,
0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x58, 0x8b, 0xe4, 0x8f, 0xba, 0x07, 0x00, 0x00,
}
func (m *Gauge) Marshal() (dAtA []byte, err error) {
......@@ -702,10 +702,10 @@ func (m *CurrentReward) MarshalToSizedBuffer(dAtA []byte) (int, error) {
i = encodeVarintGauge(dAtA, i, uint64(n3))
i--
dAtA[i] = 0x2a
if len(m.Denom) > 0 {
i -= len(m.Denom)
copy(dAtA[i:], m.Denom)
i = encodeVarintGauge(dAtA, i, uint64(len(m.Denom)))
if len(m.LockDenom) > 0 {
i -= len(m.LockDenom)
copy(dAtA[i:], m.LockDenom)
i = encodeVarintGauge(dAtA, i, uint64(len(m.LockDenom)))
i--
dAtA[i] = 0x22
}
......@@ -938,7 +938,7 @@ func (m *CurrentReward) Size() (n int) {
n += 1 + l + sovGauge(uint64(l))
}
}
l = len(m.Denom)
l = len(m.LockDenom)
if l > 0 {
n += 1 + l + sovGauge(uint64(l))
}
......@@ -1560,7 +1560,7 @@ func (m *CurrentReward) Unmarshal(dAtA []byte) error {
iNdEx = postIndex
case 4:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field Denom", wireType)
return fmt.Errorf("proto: wrong wireType = %d for field LockDenom", wireType)
}
var stringLen uint64
for shift := uint(0); ; shift += 7 {
......@@ -1588,7 +1588,7 @@ func (m *CurrentReward) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
m.Denom = string(dAtA[iNdEx:postIndex])
m.LockDenom = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
case 5:
if wireType != 2 {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment