Change genesis for x/incentives (#837)

proto/osmosis/incentives/genesis.proto

@@ -18,4 +18,5 @@ message GenesisState {
     (gogoproto.stdduration) = true,
     (gogoproto.moretags) = "yaml:\"lockable_durations\""
   ];
+  uint64 last_gauge_id = 4;
 }

x/incentives/keeper/gauge.go

@@ -115,7 +115,7 @@ func (k Keeper) CreateGauge(ctx sdk.Context, isPerpetual bool, owner sdk.AccAddr
 	}
 
 	gauge := types.Gauge{
-		Id:                k.getLastGaugeID(ctx) + 1,
+		Id:                k.GetLastGaugeID(ctx) + 1,
 		IsPerpetual:       isPerpetual,
 		DistributeTo:      distrTo,
 		Coins:             coins,
@@ -131,7 +131,7 @@ func (k Keeper) CreateGauge(ctx sdk.Context, isPerpetual bool, owner sdk.AccAddr
 	if err != nil {
 		return 0, err
 	}
-	k.setLastGaugeID(ctx, gauge.Id)
+	k.SetLastGaugeID(ctx, gauge.Id)
 
 	// TODO: Do we need to be concerned with case where this should be ActiveGauges?
 	combinedKeys := combineKeys(types.KeyPrefixUpcomingGauges, getTimeKey(gauge.StartTime))

x/incentives/keeper/store.go

@@ -8,8 +8,8 @@ import (
 	"github.com/osmosis-labs/osmosis/x/incentives/types"
 )
 
-// getLastGaugeID returns ID used last time
-func (k Keeper) getLastGaugeID(ctx sdk.Context) uint64 {
+// GetLastGaugeID returns ID used last time
+func (k Keeper) GetLastGaugeID(ctx sdk.Context) uint64 {
 	store := ctx.KVStore(k.storeKey)
 
 	bz := store.Get(types.KeyLastGaugeID)
@@ -20,8 +20,8 @@ func (k Keeper) getLastGaugeID(ctx sdk.Context) uint64 {
 	return sdk.BigEndianToUint64(bz)
 }
 
-// setLastGaugeID save ID used by last gauge
-func (k Keeper) setLastGaugeID(ctx sdk.Context, ID uint64) {
+// SetLastGaugeID save ID used by last gauge
+func (k Keeper) SetLastGaugeID(ctx sdk.Context, ID uint64) {
 	store := ctx.KVStore(k.storeKey)
 	store.Set(types.KeyLastGaugeID, sdk.Uint64ToBigEndian(ID))
 }

x/incentives/types/genesis.pb.go

@@ -33,6 +33,7 @@ type GenesisState struct {
 	Params            Params          `protobuf:"bytes,1,opt,name=params,proto3" json:"params"`
 	Gauges            []Gauge         `protobuf:"bytes,2,rep,name=gauges,proto3" json:"gauges"`
 	LockableDurations []time.Duration `protobuf:"bytes,3,rep,name=lockable_durations,json=lockableDurations,proto3,stdduration" json:"lockable_durations" yaml:"lockable_durations"`
+	LastGaugeId       uint64          `protobuf:"varint,4,opt,name=last_gauge_id,json=lastGaugeId,proto3" json:"last_gauge_id,omitempty"`
 }
 
 func (m *GenesisState) Reset()         { *m = GenesisState{} }
@@ -89,6 +90,13 @@ func (m *GenesisState) GetLockableDurations() []time.Duration {
 	return nil
 }
 
+func (m *GenesisState) GetLastGaugeId() uint64 {
+	if m != nil {
+		return m.LastGaugeId
+	}
+	return 0
+}
+
 func init() {
 	proto.RegisterType((*GenesisState)(nil), "osmosis.incentives.GenesisState")
 }
@@ -96,27 +104,29 @@ func init() {
 func init() { proto.RegisterFile("osmosis/incentives/genesis.proto", fileDescriptor_a288ccc95d977d2d) }
 
 var fileDescriptor_a288ccc95d977d2d = []byte{
-	// 312 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x90, 0xb1, 0x4e, 0xeb, 0x30,
-	0x14, 0x86, 0xe3, 0xdb, 0xab, 0x0e, 0x29, 0x0b, 0x16, 0x43, 0xdb, 0xc1, 0xa9, 0x2a, 0x21, 0x75,
-	0xc1, 0x96, 0xca, 0x00, 0x62, 0xac, 0x90, 0xba, 0x30, 0xa0, 0xb2, 0xb1, 0x20, 0xa7, 0x18, 0x63,
-	0x91, 0xe4, 0x54, 0x3d, 0x0e, 0xa2, 0x6f, 0xc1, 0xc8, 0x23, 0x75, 0xec, 0xc8, 0x54, 0x50, 0xfb,
-	0x06, 0x7d, 0x02, 0xd4, 0xd8, 0x16, 0x48, 0xcd, 0x96, 0xa3, 0xff, 0x3b, 0x5f, 0x7e, 0x9f, 0xb8,
-	0x07, 0x98, 0x03, 0x1a, 0x14, 0xa6, 0x98, 0xaa, 0xc2, 0x9a, 0x57, 0x85, 0x42, 0xab, 0x42, 0xa1,
-	0x41, 0x3e, 0x9b, 0x83, 0x05, 0x4a, 0x3d, 0xc1, 0x7f, 0x89, 0xee, 0x89, 0x06, 0x0d, 0x55, 0x2c,
-	0xf6, 0x5f, 0x8e, 0xec, 0x32, 0x0d, 0xa0, 0x33, 0x25, 0xaa, 0x29, 0x2d, 0x9f, 0xc4, 0x63, 0x39,
-	0x97, 0xd6, 0x40, 0xe1, 0xf3, 0xa4, 0xe6, 0x5f, 0x33, 0x39, 0x97, 0x39, 0x06, 0x41, 0x5d, 0x19,
-	0x59, 0x6a, 0xe5, 0xf2, 0xfe, 0x8e, 0xc4, 0x47, 0x63, 0x57, 0xee, 0xce, 0x4a, 0xab, 0xe8, 0x65,
-	0xdc, 0x74, 0x82, 0x36, 0xe9, 0x91, 0x41, 0x6b, 0xd8, 0xe5, 0x87, 0x65, 0xf9, 0x6d, 0x45, 0x8c,
-	0xfe, 0x2f, 0xd7, 0x49, 0x34, 0xf1, 0x3c, 0xbd, 0x88, 0x9b, 0x95, 0x19, 0xdb, 0xff, 0x7a, 0x8d,
-	0x41, 0x6b, 0xd8, 0xa9, 0xdb, 0x1c, 0xef, 0x89, 0xb0, 0xe8, 0x70, 0x0a, 0x31, 0xcd, 0x60, 0xfa,
-	0x22, 0xd3, 0x4c, 0x3d, 0x84, 0xf7, 0x61, 0xbb, 0xe1, 0x25, 0xee, 0x02, 0x3c, 0x5c, 0x80, 0x5f,
-	0x7b, 0x62, 0x74, 0xba, 0x97, 0xec, 0xd6, 0x49, 0x67, 0x21, 0xf3, 0xec, 0xaa, 0x7f, 0xa8, 0xe8,
-	0x7f, 0x7c, 0x25, 0x64, 0x72, 0x1c, 0x82, 0xb0, 0x88, 0xa3, 0x9b, 0xe5, 0x86, 0x91, 0xd5, 0x86,
-	0x91, 0xef, 0x0d, 0x23, 0xef, 0x5b, 0x16, 0xad, 0xb6, 0x2c, 0xfa, 0xdc, 0xb2, 0xe8, 0x7e, 0xa8,
-	0x8d, 0x7d, 0x2e, 0x53, 0x3e, 0x85, 0x5c, 0xf8, 0xf6, 0x67, 0x99, 0x4c, 0x31, 0x0c, 0xe2, 0xed,
-	0xef, 0x21, 0xed, 0x62, 0xa6, 0x30, 0x6d, 0x56, 0xd5, 0xce, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff,
-	0x8b, 0x2e, 0x6a, 0x36, 0xf8, 0x01, 0x00, 0x00,
+	// 338 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x90, 0xb1, 0x4e, 0xfb, 0x30,
+	0x10, 0xc6, 0xe3, 0xb6, 0xea, 0x90, 0xfe, 0xff, 0x03, 0x16, 0x43, 0xda, 0xc1, 0x89, 0x22, 0x21,
+	0x75, 0xc1, 0x96, 0xca, 0x00, 0x62, 0xac, 0x90, 0x2a, 0x24, 0x06, 0x54, 0x36, 0x96, 0xca, 0x69,
+	0x8d, 0xb1, 0x48, 0xe2, 0xaa, 0xe7, 0x20, 0xfa, 0x16, 0x4c, 0x88, 0x47, 0xea, 0xd8, 0x91, 0xa9,
+	0xa0, 0xf6, 0x0d, 0x78, 0x02, 0x14, 0x27, 0x16, 0x48, 0xed, 0xe6, 0xf3, 0xf7, 0xbb, 0xef, 0xbe,
+	0x3b, 0x3f, 0xd2, 0x90, 0x69, 0x50, 0xc0, 0x54, 0x3e, 0x15, 0xb9, 0x51, 0xcf, 0x02, 0x98, 0x14,
+	0xb9, 0x00, 0x05, 0x74, 0xbe, 0xd0, 0x46, 0x63, 0x5c, 0x13, 0xf4, 0x97, 0xe8, 0x1d, 0x4b, 0x2d,
+	0xb5, 0x95, 0x59, 0xf9, 0xaa, 0xc8, 0x1e, 0x91, 0x5a, 0xcb, 0x54, 0x30, 0x5b, 0x25, 0xc5, 0x03,
+	0x9b, 0x15, 0x0b, 0x6e, 0x94, 0xce, 0x6b, 0x3d, 0x3c, 0x30, 0x6b, 0xce, 0x17, 0x3c, 0x03, 0x67,
+	0x70, 0x28, 0x0c, 0x2f, 0xa4, 0xa8, 0xf4, 0xf8, 0xad, 0xe1, 0xff, 0x1b, 0x55, 0xe1, 0xee, 0x0c,
+	0x37, 0x02, 0x5f, 0xf8, 0xed, 0xca, 0x20, 0x40, 0x11, 0xea, 0x77, 0x06, 0x3d, 0xba, 0x1f, 0x96,
+	0xde, 0x5a, 0x62, 0xd8, 0x5a, 0x6d, 0x42, 0x6f, 0x5c, 0xf3, 0xf8, 0xdc, 0x6f, 0x5b, 0x67, 0x08,
+	0x1a, 0x51, 0xb3, 0xdf, 0x19, 0x74, 0x0f, 0x75, 0x8e, 0x4a, 0xc2, 0x35, 0x56, 0x38, 0xd6, 0x3e,
+	0x4e, 0xf5, 0xf4, 0x89, 0x27, 0xa9, 0x98, 0xb8, 0xfd, 0x20, 0x68, 0xd6, 0x26, 0xd5, 0x05, 0xa8,
+	0xbb, 0x00, 0xbd, 0xaa, 0x89, 0xe1, 0x49, 0x69, 0xf2, 0xbd, 0x09, 0xbb, 0x4b, 0x9e, 0xa5, 0x97,
+	0xf1, 0xbe, 0x45, 0xfc, 0xfe, 0x19, 0xa2, 0xf1, 0x91, 0x13, 0x5c, 0x23, 0xe0, 0xd8, 0xff, 0x9f,
+	0x72, 0x30, 0x13, 0x3b, 0x7f, 0xa2, 0x66, 0x41, 0x2b, 0x42, 0xfd, 0xd6, 0xb8, 0x53, 0x7e, 0xda,
+	0x80, 0xd7, 0xb3, 0xe1, 0xcd, 0x6a, 0x4b, 0xd0, 0x7a, 0x4b, 0xd0, 0xd7, 0x96, 0xa0, 0xd7, 0x1d,
+	0xf1, 0xd6, 0x3b, 0xe2, 0x7d, 0xec, 0x88, 0x77, 0x3f, 0x90, 0xca, 0x3c, 0x16, 0x09, 0x9d, 0xea,
+	0x8c, 0xd5, 0x1b, 0x9e, 0xa6, 0x3c, 0x01, 0x57, 0xb0, 0x97, 0xbf, 0xc7, 0x36, 0xcb, 0xb9, 0x80,
+	0xa4, 0x6d, 0xe3, 0x9f, 0xfd, 0x04, 0x00, 0x00, 0xff, 0xff, 0x72, 0xa5, 0x7b, 0x3a, 0x1c, 0x02,
+	0x00, 0x00,
 }
 
 func (m *GenesisState) Marshal() (dAtA []byte, err error) {
@@ -139,6 +149,11 @@ func (m *GenesisState) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	_ = i
 	var l int
 	_ = l
+	if m.LastGaugeId != 0 {
+		i = encodeVarintGenesis(dAtA, i, uint64(m.LastGaugeId))
+		i--
+		dAtA[i] = 0x20
+	}
 	if len(m.LockableDurations) > 0 {
 		for iNdEx := len(m.LockableDurations) - 1; iNdEx >= 0; iNdEx-- {
 			n, err := github_com_gogo_protobuf_types.StdDurationMarshalTo(m.LockableDurations[iNdEx], dAtA[i-github_com_gogo_protobuf_types.SizeOfStdDuration(m.LockableDurations[iNdEx]):])
@@ -209,6 +224,9 @@ func (m *GenesisState) Size() (n int) {
 			n += 1 + l + sovGenesis(uint64(l))
 		}
 	}
+	if m.LastGaugeId != 0 {
+		n += 1 + sovGenesis(uint64(m.LastGaugeId))
+	}
 	return n
 }
 
@@ -348,6 +366,25 @@ func (m *GenesisState) Unmarshal(dAtA []byte) error {
 				return err
 			}
 			iNdEx = postIndex
+		case 4:
+			if wireType != 0 {
+				return fmt.Errorf("proto: wrong wireType = %d for field LastGaugeId", wireType)
+			}
+			m.LastGaugeId = 0
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowGenesis
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				m.LastGaugeId |= uint64(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
 		default:
 			iNdEx = preIndex
 			skippy, err := skipGenesis(dAtA[iNdEx:])