carbon-js-sdk 0.0.2 → 0.1.2

package/lib/codec/liquiditypool/reward.js

@@ -3,170 +3,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TotalCommitment = exports.AllocatedRewards = exports.CommitmentKeys = exports.LastClaimedWithKey = exports.RewardHistoryWithKey = exports.CommitmentTotalWithKey = exports.CommitmentWithKey = exports.CommitmentExpiryIndex = exports.CommitmentResponse = exports.RewardHistory = exports.WrappedRewardWeights = exports.WrappedRewardWeight = exports.CommitmentCurve = exports.RewardCurve = exports.TotalCommitmentShares = exports.Commitment = exports.protobufPackage = void 0;
+exports.AllocatedRewards = exports.LastClaimRecord = exports.CommitmentExpiriesRecord = exports.CommitmentExpiries = exports.CommitmentExpiry = exports.RewardHistoryRecord = exports.RewardHistory = exports.CommitmentResponse = exports.TotalCommitmentRecord = exports.TotalCommitment = exports.CommitmentRecord = exports.Commitment = exports.RewardWeights = exports.RewardWeight = exports.CommitmentCurve = exports.RewardCurve = exports.protobufPackage = void 0;
 /* eslint-disable */
 const long_1 = __importDefault(require("long"));
 const minimal_1 = __importDefault(require("protobufjs/minimal"));
 const coin_1 = require("../cosmos/base/v1beta1/coin");
 const timestamp_1 = require("../google/protobuf/timestamp");
 exports.protobufPackage = "Switcheo.carbon.liquiditypool";
-const baseCommitment = { poolId: long_1.default.UZERO, duration: long_1.default.UZERO };
-exports.Commitment = {
-    encode(message, writer = minimal_1.default.Writer.create()) {
-        if (!message.poolId.isZero()) {
-            writer.uint32(8).uint64(message.poolId);
-        }
-        if (message.liquidity !== undefined) {
-            coin_1.Coin.encode(message.liquidity, writer.uint32(18).fork()).ldelim();
-        }
-        if (message.startTime !== undefined) {
-            timestamp_1.Timestamp.encode(toTimestamp(message.startTime), writer.uint32(26).fork()).ldelim();
-        }
-        if (!message.duration.isZero()) {
-            writer.uint32(32).uint64(message.duration);
-        }
-        return writer;
-    },
-    decode(input, length) {
-        const reader = input instanceof minimal_1.default.Reader ? input : new minimal_1.default.Reader(input);
-        let end = length === undefined ? reader.len : reader.pos + length;
-        const message = Object.assign({}, baseCommitment);
-        while (reader.pos < end) {
-            const tag = reader.uint32();
-            switch (tag >>> 3) {
-                case 1:
-                    message.poolId = reader.uint64();
-                    break;
-                case 2:
-                    message.liquidity = coin_1.Coin.decode(reader, reader.uint32());
-                    break;
-                case 3:
-                    message.startTime = fromTimestamp(timestamp_1.Timestamp.decode(reader, reader.uint32()));
-                    break;
-                case 4:
-                    message.duration = reader.uint64();
-                    break;
-                default:
-                    reader.skipType(tag & 7);
-                    break;
-            }
-        }
-        return message;
-    },
-    fromJSON(object) {
-        const message = Object.assign({}, baseCommitment);
-        if (object.poolId !== undefined && object.poolId !== null) {
-            message.poolId = long_1.default.fromString(object.poolId);
-        }
-        else {
-            message.poolId = long_1.default.UZERO;
-        }
-        if (object.liquidity !== undefined && object.liquidity !== null) {
-            message.liquidity = coin_1.Coin.fromJSON(object.liquidity);
-        }
-        else {
-            message.liquidity = undefined;
-        }
-        if (object.startTime !== undefined && object.startTime !== null) {
-            message.startTime = fromJsonTimestamp(object.startTime);
-        }
-        else {
-            message.startTime = undefined;
-        }
-        if (object.duration !== undefined && object.duration !== null) {
-            message.duration = long_1.default.fromString(object.duration);
-        }
-        else {
-            message.duration = long_1.default.UZERO;
-        }
-        return message;
-    },
-    toJSON(message) {
-        const obj = {};
-        message.poolId !== undefined &&
-            (obj.poolId = (message.poolId || long_1.default.UZERO).toString());
-        message.liquidity !== undefined &&
-            (obj.liquidity = message.liquidity
-                ? coin_1.Coin.toJSON(message.liquidity)
-                : undefined);
-        message.startTime !== undefined &&
-            (obj.startTime = message.startTime.toISOString());
-        message.duration !== undefined &&
-            (obj.duration = (message.duration || long_1.default.UZERO).toString());
-        return obj;
-    },
-    fromPartial(object) {
-        var _a;
-        const message = Object.assign({}, baseCommitment);
-        if (object.poolId !== undefined && object.poolId !== null) {
-            message.poolId = object.poolId;
-        }
-        else {
-            message.poolId = long_1.default.UZERO;
-        }
-        if (object.liquidity !== undefined && object.liquidity !== null) {
-            message.liquidity = coin_1.Coin.fromPartial(object.liquidity);
-        }
-        else {
-            message.liquidity = undefined;
-        }
-        message.startTime = (_a = object.startTime) !== null && _a !== void 0 ? _a : undefined;
-        if (object.duration !== undefined && object.duration !== null) {
-            message.duration = object.duration;
-        }
-        else {
-            message.duration = long_1.default.UZERO;
-        }
-        return message;
-    },
-};
-const baseTotalCommitmentShares = { total: "" };
-exports.TotalCommitmentShares = {
-    encode(message, writer = minimal_1.default.Writer.create()) {
-        if (message.total !== "") {
-            writer.uint32(10).string(message.total);
-        }
-        return writer;
-    },
-    decode(input, length) {
-        const reader = input instanceof minimal_1.default.Reader ? input : new minimal_1.default.Reader(input);
-        let end = length === undefined ? reader.len : reader.pos + length;
-        const message = Object.assign({}, baseTotalCommitmentShares);
-        while (reader.pos < end) {
-            const tag = reader.uint32();
-            switch (tag >>> 3) {
-                case 1:
-                    message.total = reader.string();
-                    break;
-                default:
-                    reader.skipType(tag & 7);
-                    break;
-            }
-        }
-        return message;
-    },
-    fromJSON(object) {
-        const message = Object.assign({}, baseTotalCommitmentShares);
-        if (object.total !== undefined && object.total !== null) {
-            message.total = String(object.total);
-        }
-        else {
-            message.total = "";
-        }
-        return message;
-    },
-    toJSON(message) {
-        const obj = {};
-        message.total !== undefined && (obj.total = message.total);
-        return obj;
-    },
-    fromPartial(object) {
-        var _a;
-        const message = Object.assign({}, baseTotalCommitmentShares);
-        message.total = (_a = object.total) !== null && _a !== void 0 ? _a : "";
-        return message;
-    },
-};
 const baseRewardCurve = {
     initialReward: 0,
     interval: long_1.default.UZERO,
@@ -237,49 +80,35 @@ exports.RewardCurve = {
     },
     fromJSON(object) {
         const message = Object.assign({}, baseRewardCurve);
-        if (object.startTime !== undefined && object.startTime !== null) {
-            message.startTime = fromJsonTimestamp(object.startTime);
-        }
-        else {
-            message.startTime = undefined;
-        }
-        if (object.initialReward !== undefined && object.initialReward !== null) {
-            message.initialReward = Number(object.initialReward);
-        }
-        else {
-            message.initialReward = 0;
-        }
-        if (object.interval !== undefined && object.interval !== null) {
-            message.interval = long_1.default.fromString(object.interval);
-        }
-        else {
-            message.interval = long_1.default.UZERO;
-        }
-        if (object.numberOfReductions !== undefined &&
-            object.numberOfReductions !== null) {
-            message.numberOfReductions = Number(object.numberOfReductions);
-        }
-        else {
-            message.numberOfReductions = 0;
-        }
-        if (object.reduction !== undefined && object.reduction !== null) {
-            message.reduction = Number(object.reduction);
-        }
-        else {
-            message.reduction = 0;
-        }
-        if (object.finalReward !== undefined && object.finalReward !== null) {
-            message.finalReward = Number(object.finalReward);
-        }
-        else {
-            message.finalReward = 0;
-        }
-        if (object.reductionsMade !== undefined && object.reductionsMade !== null) {
-            message.reductionsMade = Number(object.reductionsMade);
-        }
-        else {
-            message.reductionsMade = 0;
-        }
+        message.startTime =
+            object.startTime !== undefined && object.startTime !== null
+                ? fromJsonTimestamp(object.startTime)
+                : undefined;
+        message.initialReward =
+            object.initialReward !== undefined && object.initialReward !== null
+                ? Number(object.initialReward)
+                : 0;
+        message.interval =
+            object.interval !== undefined && object.interval !== null
+                ? long_1.default.fromString(object.interval)
+                : long_1.default.UZERO;
+        message.numberOfReductions =
+            object.numberOfReductions !== undefined &&
+                object.numberOfReductions !== null
+                ? Number(object.numberOfReductions)
+                : 0;
+        message.reduction =
+            object.reduction !== undefined && object.reduction !== null
+                ? Number(object.reduction)
+                : 0;
+        message.finalReward =
+            object.finalReward !== undefined && object.finalReward !== null
+                ? Number(object.finalReward)
+                : 0;
+        message.reductionsMade =
+            object.reductionsMade !== undefined && object.reductionsMade !== null
+                ? Number(object.reductionsMade)
+                : 0;
         return message;
     },
     toJSON(message) {
@@ -304,12 +133,10 @@ exports.RewardCurve = {
         const message = Object.assign({}, baseRewardCurve);
         message.startTime = (_a = object.startTime) !== null && _a !== void 0 ? _a : undefined;
         message.initialReward = (_b = object.initialReward) !== null && _b !== void 0 ? _b : 0;
-        if (object.interval !== undefined && object.interval !== null) {
-            message.interval = object.interval;
-        }
-        else {
-            message.interval = long_1.default.UZERO;
-        }
+        message.interval =
+            object.interval !== undefined && object.interval !== null
+                ? long_1.default.fromValue(object.interval)
+                : long_1.default.UZERO;
         message.numberOfReductions = (_c = object.numberOfReductions) !== null && _c !== void 0 ? _c : 0;
         message.reduction = (_d = object.reduction) !== null && _d !== void 0 ? _d : 0;
         message.finalReward = (_e = object.finalReward) !== null && _e !== void 0 ? _e : 0;
@@ -353,20 +180,16 @@ exports.CommitmentCurve = {
     },
     fromJSON(object) {
         const message = Object.assign({}, baseCommitmentCurve);
-        if (object.maxCommitmentDuration !== undefined &&
-            object.maxCommitmentDuration !== null) {
-            message.maxCommitmentDuration = long_1.default.fromString(object.maxCommitmentDuration);
-        }
-        else {
-            message.maxCommitmentDuration = long_1.default.UZERO;
-        }
-        if (object.maxRewardMultiplier !== undefined &&
-            object.maxRewardMultiplier !== null) {
-            message.maxRewardMultiplier = Number(object.maxRewardMultiplier);
-        }
-        else {
-            message.maxRewardMultiplier = 0;
-        }
+        message.maxCommitmentDuration =
+            object.maxCommitmentDuration !== undefined &&
+                object.maxCommitmentDuration !== null
+                ? long_1.default.fromString(object.maxCommitmentDuration)
+                : long_1.default.UZERO;
+        message.maxRewardMultiplier =
+            object.maxRewardMultiplier !== undefined &&
+                object.maxRewardMultiplier !== null
+                ? Number(object.maxRewardMultiplier)
+                : 0;
         return message;
     },
     toJSON(message) {
@@ -380,19 +203,17 @@ exports.CommitmentCurve = {
     fromPartial(object) {
         var _a;
         const message = Object.assign({}, baseCommitmentCurve);
-        if (object.maxCommitmentDuration !== undefined &&
-            object.maxCommitmentDuration !== null) {
-            message.maxCommitmentDuration = object.maxCommitmentDuration;
-        }
-        else {
-            message.maxCommitmentDuration = long_1.default.UZERO;
-        }
+        message.maxCommitmentDuration =
+            object.maxCommitmentDuration !== undefined &&
+                object.maxCommitmentDuration !== null
+                ? long_1.default.fromValue(object.maxCommitmentDuration)
+                : long_1.default.UZERO;
         message.maxRewardMultiplier = (_a = object.maxRewardMultiplier) !== null && _a !== void 0 ? _a : 0;
         return message;
     },
 };
-const baseWrappedRewardWeight = { poolId: long_1.default.UZERO, weight: "" };
-exports.WrappedRewardWeight = {
+const baseRewardWeight = { poolId: long_1.default.UZERO, weight: "" };
+exports.RewardWeight = {
     encode(message, writer = minimal_1.default.Writer.create()) {
         if (!message.poolId.isZero()) {
             writer.uint32(8).uint64(message.poolId);
@@ -405,7 +226,7 @@ exports.WrappedRewardWeight = {
     decode(input, length) {
         const reader = input instanceof minimal_1.default.Reader ? input : new minimal_1.default.Reader(input);
         let end = length === undefined ? reader.len : reader.pos + length;
-        const message = Object.assign({}, baseWrappedRewardWeight);
+        const message = Object.assign({}, baseRewardWeight);
         while (reader.pos < end) {
             const tag = reader.uint32();
             switch (tag >>> 3) {
@@ -423,19 +244,15 @@ exports.WrappedRewardWeight = {
         return message;
     },
     fromJSON(object) {
-        const message = Object.assign({}, baseWrappedRewardWeight);
-        if (object.poolId !== undefined && object.poolId !== null) {
-            message.poolId = long_1.default.fromString(object.poolId);
-        }
-        else {
-            message.poolId = long_1.default.UZERO;
-        }
-        if (object.weight !== undefined && object.weight !== null) {
-            message.weight = String(object.weight);
-        }
-        else {
-            message.weight = "";
-        }
+        const message = Object.assign({}, baseRewardWeight);
+        message.poolId =
+            object.poolId !== undefined && object.poolId !== null
+                ? long_1.default.fromString(object.poolId)
+                : long_1.default.UZERO;
+        message.weight =
+            object.weight !== undefined && object.weight !== null
+                ? String(object.weight)
+                : "";
         return message;
     },
     toJSON(message) {
@@ -447,35 +264,33 @@ exports.WrappedRewardWeight = {
     },
     fromPartial(object) {
         var _a;
-        const message = Object.assign({}, baseWrappedRewardWeight);
-        if (object.poolId !== undefined && object.poolId !== null) {
-            message.poolId = object.poolId;
-        }
-        else {
-            message.poolId = long_1.default.UZERO;
-        }
+        const message = Object.assign({}, baseRewardWeight);
+        message.poolId =
+            object.poolId !== undefined && object.poolId !== null
+                ? long_1.default.fromValue(object.poolId)
+                : long_1.default.UZERO;
         message.weight = (_a = object.weight) !== null && _a !== void 0 ? _a : "";
         return message;
     },
 };
-const baseWrappedRewardWeights = {};
-exports.WrappedRewardWeights = {
+const baseRewardWeights = {};
+exports.RewardWeights = {
     encode(message, writer = minimal_1.default.Writer.create()) {
-        for (const v of message.wrappedRewardWeights) {
-            exports.WrappedRewardWeight.encode(v, writer.uint32(10).fork()).ldelim();
+        for (const v of message.weights) {
+            exports.RewardWeight.encode(v, writer.uint32(10).fork()).ldelim();
         }
         return writer;
     },
     decode(input, length) {
         const reader = input instanceof minimal_1.default.Reader ? input : new minimal_1.default.Reader(input);
         let end = length === undefined ? reader.len : reader.pos + length;
-        const message = Object.assign({}, baseWrappedRewardWeights);
-        message.wrappedRewardWeights = [];
+        const message = Object.assign({}, baseRewardWeights);
+        message.weights = [];
         while (reader.pos < end) {
             const tag = reader.uint32();
             switch (tag >>> 3) {
                 case 1:
-                    message.wrappedRewardWeights.push(exports.WrappedRewardWeight.decode(reader, reader.uint32()));
+                    message.weights.push(exports.RewardWeight.decode(reader, reader.uint32()));
                     break;
                 default:
                     reader.skipType(tag & 7);
@@ -485,57 +300,247 @@ exports.WrappedRewardWeights = {
         return message;
     },
     fromJSON(object) {
-        const message = Object.assign({}, baseWrappedRewardWeights);
-        message.wrappedRewardWeights = [];
-        if (object.wrappedRewardWeights !== undefined &&
-            object.wrappedRewardWeights !== null) {
-            for (const e of object.wrappedRewardWeights) {
-                message.wrappedRewardWeights.push(exports.WrappedRewardWeight.fromJSON(e));
-            }
-        }
+        var _a;
+        const message = Object.assign({}, baseRewardWeights);
+        message.weights = ((_a = object.weights) !== null && _a !== void 0 ? _a : []).map((e) => exports.RewardWeight.fromJSON(e));
         return message;
     },
     toJSON(message) {
         const obj = {};
-        if (message.wrappedRewardWeights) {
-            obj.wrappedRewardWeights = message.wrappedRewardWeights.map((e) => e ? exports.WrappedRewardWeight.toJSON(e) : undefined);
+        if (message.weights) {
+            obj.weights = message.weights.map((e) => e ? exports.RewardWeight.toJSON(e) : undefined);
         }
         else {
-            obj.wrappedRewardWeights = [];
+            obj.weights = [];
         }
         return obj;
     },
     fromPartial(object) {
-        const message = Object.assign({}, baseWrappedRewardWeights);
-        message.wrappedRewardWeights = [];
-        if (object.wrappedRewardWeights !== undefined &&
-            object.wrappedRewardWeights !== null) {
-            for (const e of object.wrappedRewardWeights) {
-                message.wrappedRewardWeights.push(exports.WrappedRewardWeight.fromPartial(e));
-            }
-        }
+        var _a;
+        const message = Object.assign({}, baseRewardWeights);
+        message.weights = ((_a = object.weights) !== null && _a !== void 0 ? _a : []).map((e) => exports.RewardWeight.fromPartial(e));
         return message;
     },
 };
-const baseRewardHistory = { poolId: long_1.default.UZERO, totalCommitment: "" };
-exports.RewardHistory = {
+const baseCommitment = { poolId: long_1.default.UZERO, duration: long_1.default.UZERO };
+exports.Commitment = {
     encode(message, writer = minimal_1.default.Writer.create()) {
         if (!message.poolId.isZero()) {
             writer.uint32(8).uint64(message.poolId);
         }
-        for (const v of message.rewards) {
-            coin_1.DecCoin.encode(v, writer.uint32(18).fork()).ldelim();
+        if (message.liquidity !== undefined) {
+            coin_1.Coin.encode(message.liquidity, writer.uint32(18).fork()).ldelim();
+        }
+        if (message.startTime !== undefined) {
+            timestamp_1.Timestamp.encode(toTimestamp(message.startTime), writer.uint32(26).fork()).ldelim();
+        }
+        if (!message.duration.isZero()) {
+            writer.uint32(32).uint64(message.duration);
+        }
+        return writer;
+    },
+    decode(input, length) {
+        const reader = input instanceof minimal_1.default.Reader ? input : new minimal_1.default.Reader(input);
+        let end = length === undefined ? reader.len : reader.pos + length;
+        const message = Object.assign({}, baseCommitment);
+        while (reader.pos < end) {
+            const tag = reader.uint32();
+            switch (tag >>> 3) {
+                case 1:
+                    message.poolId = reader.uint64();
+                    break;
+                case 2:
+                    message.liquidity = coin_1.Coin.decode(reader, reader.uint32());
+                    break;
+                case 3:
+                    message.startTime = fromTimestamp(timestamp_1.Timestamp.decode(reader, reader.uint32()));
+                    break;
+                case 4:
+                    message.duration = reader.uint64();
+                    break;
+                default:
+                    reader.skipType(tag & 7);
+                    break;
+            }
+        }
+        return message;
+    },
+    fromJSON(object) {
+        const message = Object.assign({}, baseCommitment);
+        message.poolId =
+            object.poolId !== undefined && object.poolId !== null
+                ? long_1.default.fromString(object.poolId)
+                : long_1.default.UZERO;
+        message.liquidity =
+            object.liquidity !== undefined && object.liquidity !== null
+                ? coin_1.Coin.fromJSON(object.liquidity)
+                : undefined;
+        message.startTime =
+            object.startTime !== undefined && object.startTime !== null
+                ? fromJsonTimestamp(object.startTime)
+                : undefined;
+        message.duration =
+            object.duration !== undefined && object.duration !== null
+                ? long_1.default.fromString(object.duration)
+                : long_1.default.UZERO;
+        return message;
+    },
+    toJSON(message) {
+        const obj = {};
+        message.poolId !== undefined &&
+            (obj.poolId = (message.poolId || long_1.default.UZERO).toString());
+        message.liquidity !== undefined &&
+            (obj.liquidity = message.liquidity
+                ? coin_1.Coin.toJSON(message.liquidity)
+                : undefined);
+        message.startTime !== undefined &&
+            (obj.startTime = message.startTime.toISOString());
+        message.duration !== undefined &&
+            (obj.duration = (message.duration || long_1.default.UZERO).toString());
+        return obj;
+    },
+    fromPartial(object) {
+        var _a;
+        const message = Object.assign({}, baseCommitment);
+        message.poolId =
+            object.poolId !== undefined && object.poolId !== null
+                ? long_1.default.fromValue(object.poolId)
+                : long_1.default.UZERO;
+        message.liquidity =
+            object.liquidity !== undefined && object.liquidity !== null
+                ? coin_1.Coin.fromPartial(object.liquidity)
+                : undefined;
+        message.startTime = (_a = object.startTime) !== null && _a !== void 0 ? _a : undefined;
+        message.duration =
+            object.duration !== undefined && object.duration !== null
+                ? long_1.default.fromValue(object.duration)
+                : long_1.default.UZERO;
+        return message;
+    },
+};
+const baseCommitmentRecord = { address: "" };
+exports.CommitmentRecord = {
+    encode(message, writer = minimal_1.default.Writer.create()) {
+        if (message.address !== "") {
+            writer.uint32(10).string(message.address);
+        }
+        if (message.commitment !== undefined) {
+            exports.Commitment.encode(message.commitment, writer.uint32(18).fork()).ldelim();
+        }
+        return writer;
+    },
+    decode(input, length) {
+        const reader = input instanceof minimal_1.default.Reader ? input : new minimal_1.default.Reader(input);
+        let end = length === undefined ? reader.len : reader.pos + length;
+        const message = Object.assign({}, baseCommitmentRecord);
+        while (reader.pos < end) {
+            const tag = reader.uint32();
+            switch (tag >>> 3) {
+                case 1:
+                    message.address = reader.string();
+                    break;
+                case 2:
+                    message.commitment = exports.Commitment.decode(reader, reader.uint32());
+                    break;
+                default:
+                    reader.skipType(tag & 7);
+                    break;
+            }
+        }
+        return message;
+    },
+    fromJSON(object) {
+        const message = Object.assign({}, baseCommitmentRecord);
+        message.address =
+            object.address !== undefined && object.address !== null
+                ? String(object.address)
+                : "";
+        message.commitment =
+            object.commitment !== undefined && object.commitment !== null
+                ? exports.Commitment.fromJSON(object.commitment)
+                : undefined;
+        return message;
+    },
+    toJSON(message) {
+        const obj = {};
+        message.address !== undefined && (obj.address = message.address);
+        message.commitment !== undefined &&
+            (obj.commitment = message.commitment
+                ? exports.Commitment.toJSON(message.commitment)
+                : undefined);
+        return obj;
+    },
+    fromPartial(object) {
+        var _a;
+        const message = Object.assign({}, baseCommitmentRecord);
+        message.address = (_a = object.address) !== null && _a !== void 0 ? _a : "";
+        message.commitment =
+            object.commitment !== undefined && object.commitment !== null
+                ? exports.Commitment.fromPartial(object.commitment)
+                : undefined;
+        return message;
+    },
+};
+const baseTotalCommitment = { total: "" };
+exports.TotalCommitment = {
+    encode(message, writer = minimal_1.default.Writer.create()) {
+        if (message.total !== "") {
+            writer.uint32(10).string(message.total);
+        }
+        return writer;
+    },
+    decode(input, length) {
+        const reader = input instanceof minimal_1.default.Reader ? input : new minimal_1.default.Reader(input);
+        let end = length === undefined ? reader.len : reader.pos + length;
+        const message = Object.assign({}, baseTotalCommitment);
+        while (reader.pos < end) {
+            const tag = reader.uint32();
+            switch (tag >>> 3) {
+                case 1:
+                    message.total = reader.string();
+                    break;
+                default:
+                    reader.skipType(tag & 7);
+                    break;
+            }
+        }
+        return message;
+    },
+    fromJSON(object) {
+        const message = Object.assign({}, baseTotalCommitment);
+        message.total =
+            object.total !== undefined && object.total !== null
+                ? String(object.total)
+                : "";
+        return message;
+    },
+    toJSON(message) {
+        const obj = {};
+        message.total !== undefined && (obj.total = message.total);
+        return obj;
+    },
+    fromPartial(object) {
+        var _a;
+        const message = Object.assign({}, baseTotalCommitment);
+        message.total = (_a = object.total) !== null && _a !== void 0 ? _a : "";
+        return message;
+    },
+};
+const baseTotalCommitmentRecord = { poolId: long_1.default.UZERO };
+exports.TotalCommitmentRecord = {
+    encode(message, writer = minimal_1.default.Writer.create()) {
+        if (!message.poolId.isZero()) {
+            writer.uint32(8).uint64(message.poolId);
         }
-        if (message.totalCommitment !== "") {
-            writer.uint32(26).string(message.totalCommitment);
+        if (message.totalCommitment !== undefined) {
+            exports.TotalCommitment.encode(message.totalCommitment, writer.uint32(18).fork()).ldelim();
         }
         return writer;
     },
     decode(input, length) {
         const reader = input instanceof minimal_1.default.Reader ? input : new minimal_1.default.Reader(input);
         let end = length === undefined ? reader.len : reader.pos + length;
-        const message = Object.assign({}, baseRewardHistory);
-        message.rewards = [];
+        const message = Object.assign({}, baseTotalCommitmentRecord);
         while (reader.pos < end) {
             const tag = reader.uint32();
             switch (tag >>> 3) {
@@ -543,10 +548,7 @@ exports.RewardHistory = {
                     message.poolId = reader.uint64();
                     break;
                 case 2:
-                    message.rewards.push(coin_1.DecCoin.decode(reader, reader.uint32()));
-                    break;
-                case 3:
-                    message.totalCommitment = reader.string();
+                    message.totalCommitment = exports.TotalCommitment.decode(reader, reader.uint32());
                     break;
                 default:
                     reader.skipType(tag & 7);
@@ -556,58 +558,37 @@ exports.RewardHistory = {
         return message;
     },
     fromJSON(object) {
-        const message = Object.assign({}, baseRewardHistory);
-        message.rewards = [];
-        if (object.poolId !== undefined && object.poolId !== null) {
-            message.poolId = long_1.default.fromString(object.poolId);
-        }
-        else {
-            message.poolId = long_1.default.UZERO;
-        }
-        if (object.rewards !== undefined && object.rewards !== null) {
-            for (const e of object.rewards) {
-                message.rewards.push(coin_1.DecCoin.fromJSON(e));
-            }
-        }
-        if (object.totalCommitment !== undefined &&
-            object.totalCommitment !== null) {
-            message.totalCommitment = String(object.totalCommitment);
-        }
-        else {
-            message.totalCommitment = "";
-        }
+        const message = Object.assign({}, baseTotalCommitmentRecord);
+        message.poolId =
+            object.poolId !== undefined && object.poolId !== null
+                ? long_1.default.fromString(object.poolId)
+                : long_1.default.UZERO;
+        message.totalCommitment =
+            object.totalCommitment !== undefined && object.totalCommitment !== null
+                ? exports.TotalCommitment.fromJSON(object.totalCommitment)
+                : undefined;
         return message;
     },
     toJSON(message) {
         const obj = {};
         message.poolId !== undefined &&
             (obj.poolId = (message.poolId || long_1.default.UZERO).toString());
-        if (message.rewards) {
-            obj.rewards = message.rewards.map((e) => e ? coin_1.DecCoin.toJSON(e) : undefined);
-        }
-        else {
-            obj.rewards = [];
-        }
         message.totalCommitment !== undefined &&
-            (obj.totalCommitment = message.totalCommitment);
+            (obj.totalCommitment = message.totalCommitment
+                ? exports.TotalCommitment.toJSON(message.totalCommitment)
+                : undefined);
         return obj;
     },
     fromPartial(object) {
-        var _a;
-        const message = Object.assign({}, baseRewardHistory);
-        if (object.poolId !== undefined && object.poolId !== null) {
-            message.poolId = object.poolId;
-        }
-        else {
-            message.poolId = long_1.default.UZERO;
-        }
-        message.rewards = [];
-        if (object.rewards !== undefined && object.rewards !== null) {
-            for (const e of object.rewards) {
-                message.rewards.push(coin_1.DecCoin.fromPartial(e));
-            }
-        }
-        message.totalCommitment = (_a = object.totalCommitment) !== null && _a !== void 0 ? _a : "";
+        const message = Object.assign({}, baseTotalCommitmentRecord);
+        message.poolId =
+            object.poolId !== undefined && object.poolId !== null
+                ? long_1.default.fromValue(object.poolId)
+                : long_1.default.UZERO;
+        message.totalCommitment =
+            object.totalCommitment !== undefined && object.totalCommitment !== null
+                ? exports.TotalCommitment.fromPartial(object.totalCommitment)
+                : undefined;
         return message;
     },
 };
@@ -687,55 +668,38 @@ exports.CommitmentResponse = {
     },
     fromJSON(object) {
         const message = Object.assign({}, baseCommitmentResponse);
-        if (object.denom !== undefined && object.denom !== null) {
-            message.denom = String(object.denom);
-        }
-        else {
-            message.denom = "";
-        }
-        if (object.amount !== undefined && object.amount !== null) {
-            message.amount = String(object.amount);
-        }
-        else {
-            message.amount = "";
-        }
-        if (object.startTime !== undefined && object.startTime !== null) {
-            message.startTime = fromJsonTimestamp(object.startTime);
-        }
-        else {
-            message.startTime = undefined;
-        }
-        if (object.endTime !== undefined && object.endTime !== null) {
-            message.endTime = fromJsonTimestamp(object.endTime);
-        }
-        else {
-            message.endTime = undefined;
-        }
-        if (object.duration !== undefined && object.duration !== null) {
-            message.duration = long_1.default.fromString(object.duration);
-        }
-        else {
-            message.duration = long_1.default.UZERO;
-        }
-        if (object.isLocked !== undefined && object.isLocked !== null) {
-            message.isLocked = Boolean(object.isLocked);
-        }
-        else {
-            message.isLocked = false;
-        }
-        if (object.commitmentPower !== undefined &&
-            object.commitmentPower !== null) {
-            message.commitmentPower = String(object.commitmentPower);
-        }
-        else {
-            message.commitmentPower = "";
-        }
-        if (object.boostFactor !== undefined && object.boostFactor !== null) {
-            message.boostFactor = String(object.boostFactor);
-        }
-        else {
-            message.boostFactor = "";
-        }
+        message.denom =
+            object.denom !== undefined && object.denom !== null
+                ? String(object.denom)
+                : "";
+        message.amount =
+            object.amount !== undefined && object.amount !== null
+                ? String(object.amount)
+                : "";
+        message.startTime =
+            object.startTime !== undefined && object.startTime !== null
+                ? fromJsonTimestamp(object.startTime)
+                : undefined;
+        message.endTime =
+            object.endTime !== undefined && object.endTime !== null
+                ? fromJsonTimestamp(object.endTime)
+                : undefined;
+        message.duration =
+            object.duration !== undefined && object.duration !== null
+                ? long_1.default.fromString(object.duration)
+                : long_1.default.UZERO;
+        message.isLocked =
+            object.isLocked !== undefined && object.isLocked !== null
+                ? Boolean(object.isLocked)
+                : false;
+        message.commitmentPower =
+            object.commitmentPower !== undefined && object.commitmentPower !== null
+                ? String(object.commitmentPower)
+                : "";
+        message.boostFactor =
+            object.boostFactor !== undefined && object.boostFactor !== null
+                ? String(object.boostFactor)
+                : "";
         return message;
     },
     toJSON(message) {
@@ -762,43 +726,46 @@ exports.CommitmentResponse = {
         message.amount = (_b = object.amount) !== null && _b !== void 0 ? _b : "";
         message.startTime = (_c = object.startTime) !== null && _c !== void 0 ? _c : undefined;
         message.endTime = (_d = object.endTime) !== null && _d !== void 0 ? _d : undefined;
-        if (object.duration !== undefined && object.duration !== null) {
-            message.duration = object.duration;
-        }
-        else {
-            message.duration = long_1.default.UZERO;
-        }
+        message.duration =
+            object.duration !== undefined && object.duration !== null
+                ? long_1.default.fromValue(object.duration)
+                : long_1.default.UZERO;
         message.isLocked = (_e = object.isLocked) !== null && _e !== void 0 ? _e : false;
         message.commitmentPower = (_f = object.commitmentPower) !== null && _f !== void 0 ? _f : "";
         message.boostFactor = (_g = object.boostFactor) !== null && _g !== void 0 ? _g : "";
         return message;
     },
 };
-const baseCommitmentExpiryIndex = {};
-exports.CommitmentExpiryIndex = {
+const baseRewardHistory = { poolId: long_1.default.UZERO, totalCommitment: "" };
+exports.RewardHistory = {
     encode(message, writer = minimal_1.default.Writer.create()) {
-        for (const v of message.commitmentKeys) {
-            writer.uint32(10).bytes(v);
+        if (!message.poolId.isZero()) {
+            writer.uint32(8).uint64(message.poolId);
+        }
+        for (const v of message.rewards) {
+            coin_1.DecCoin.encode(v, writer.uint32(18).fork()).ldelim();
         }
-        if (message.key.length !== 0) {
-            writer.uint32(18).bytes(message.key);
+        if (message.totalCommitment !== "") {
+            writer.uint32(26).string(message.totalCommitment);
         }
         return writer;
     },
     decode(input, length) {
         const reader = input instanceof minimal_1.default.Reader ? input : new minimal_1.default.Reader(input);
         let end = length === undefined ? reader.len : reader.pos + length;
-        const message = Object.assign({}, baseCommitmentExpiryIndex);
-        message.commitmentKeys = [];
-        message.key = new Uint8Array();
+        const message = Object.assign({}, baseRewardHistory);
+        message.rewards = [];
         while (reader.pos < end) {
             const tag = reader.uint32();
             switch (tag >>> 3) {
                 case 1:
-                    message.commitmentKeys.push(reader.bytes());
+                    message.poolId = reader.uint64();
                     break;
                 case 2:
-                    message.key = reader.bytes();
+                    message.rewards.push(coin_1.DecCoin.decode(reader, reader.uint32()));
+                    break;
+                case 3:
+                    message.totalCommitment = reader.string();
                     break;
                 default:
                     reader.skipType(tag & 7);
@@ -808,68 +775,68 @@ exports.CommitmentExpiryIndex = {
         return message;
     },
     fromJSON(object) {
-        const message = Object.assign({}, baseCommitmentExpiryIndex);
-        message.commitmentKeys = [];
-        message.key = new Uint8Array();
-        if (object.commitmentKeys !== undefined && object.commitmentKeys !== null) {
-            for (const e of object.commitmentKeys) {
-                message.commitmentKeys.push(bytesFromBase64(e));
-            }
-        }
-        if (object.key !== undefined && object.key !== null) {
-            message.key = bytesFromBase64(object.key);
-        }
+        var _a;
+        const message = Object.assign({}, baseRewardHistory);
+        message.poolId =
+            object.poolId !== undefined && object.poolId !== null
+                ? long_1.default.fromString(object.poolId)
+                : long_1.default.UZERO;
+        message.rewards = ((_a = object.rewards) !== null && _a !== void 0 ? _a : []).map((e) => coin_1.DecCoin.fromJSON(e));
+        message.totalCommitment =
+            object.totalCommitment !== undefined && object.totalCommitment !== null
+                ? String(object.totalCommitment)
+                : "";
         return message;
     },
     toJSON(message) {
         const obj = {};
-        if (message.commitmentKeys) {
-            obj.commitmentKeys = message.commitmentKeys.map((e) => base64FromBytes(e !== undefined ? e : new Uint8Array()));
+        message.poolId !== undefined &&
+            (obj.poolId = (message.poolId || long_1.default.UZERO).toString());
+        if (message.rewards) {
+            obj.rewards = message.rewards.map((e) => e ? coin_1.DecCoin.toJSON(e) : undefined);
         }
         else {
-            obj.commitmentKeys = [];
+            obj.rewards = [];
         }
-        message.key !== undefined &&
-            (obj.key = base64FromBytes(message.key !== undefined ? message.key : new Uint8Array()));
+        message.totalCommitment !== undefined &&
+            (obj.totalCommitment = message.totalCommitment);
         return obj;
     },
     fromPartial(object) {
-        var _a;
-        const message = Object.assign({}, baseCommitmentExpiryIndex);
-        message.commitmentKeys = [];
-        if (object.commitmentKeys !== undefined && object.commitmentKeys !== null) {
-            for (const e of object.commitmentKeys) {
-                message.commitmentKeys.push(e);
-            }
-        }
-        message.key = (_a = object.key) !== null && _a !== void 0 ? _a : new Uint8Array();
+        var _a, _b;
+        const message = Object.assign({}, baseRewardHistory);
+        message.poolId =
+            object.poolId !== undefined && object.poolId !== null
+                ? long_1.default.fromValue(object.poolId)
+                : long_1.default.UZERO;
+        message.rewards = ((_a = object.rewards) !== null && _a !== void 0 ? _a : []).map((e) => coin_1.DecCoin.fromPartial(e));
+        message.totalCommitment = (_b = object.totalCommitment) !== null && _b !== void 0 ? _b : "";
         return message;
     },
 };
-const baseCommitmentWithKey = {};
-exports.CommitmentWithKey = {
+const baseRewardHistoryRecord = { height: long_1.default.UZERO };
+exports.RewardHistoryRecord = {
     encode(message, writer = minimal_1.default.Writer.create()) {
-        if (message.commitment !== undefined) {
-            exports.Commitment.encode(message.commitment, writer.uint32(10).fork()).ldelim();
+        if (!message.height.isZero()) {
+            writer.uint32(8).uint64(message.height);
         }
-        if (message.key.length !== 0) {
-            writer.uint32(18).bytes(message.key);
+        if (message.rewardHistory !== undefined) {
+            exports.RewardHistory.encode(message.rewardHistory, writer.uint32(18).fork()).ldelim();
         }
         return writer;
     },
     decode(input, length) {
         const reader = input instanceof minimal_1.default.Reader ? input : new minimal_1.default.Reader(input);
         let end = length === undefined ? reader.len : reader.pos + length;
-        const message = Object.assign({}, baseCommitmentWithKey);
-        message.key = new Uint8Array();
+        const message = Object.assign({}, baseRewardHistoryRecord);
         while (reader.pos < end) {
             const tag = reader.uint32();
             switch (tag >>> 3) {
                 case 1:
-                    message.commitment = exports.Commitment.decode(reader, reader.uint32());
+                    message.height = reader.uint64();
                     break;
                 case 2:
-                    message.key = reader.bytes();
+                    message.rewardHistory = exports.RewardHistory.decode(reader, reader.uint32());
                     break;
                 default:
                     reader.skipType(tag & 7);
@@ -879,66 +846,63 @@ exports.CommitmentWithKey = {
         return message;
     },
     fromJSON(object) {
-        const message = Object.assign({}, baseCommitmentWithKey);
-        message.key = new Uint8Array();
-        if (object.commitment !== undefined && object.commitment !== null) {
-            message.commitment = exports.Commitment.fromJSON(object.commitment);
-        }
-        else {
-            message.commitment = undefined;
-        }
-        if (object.key !== undefined && object.key !== null) {
-            message.key = bytesFromBase64(object.key);
-        }
+        const message = Object.assign({}, baseRewardHistoryRecord);
+        message.height =
+            object.height !== undefined && object.height !== null
+                ? long_1.default.fromString(object.height)
+                : long_1.default.UZERO;
+        message.rewardHistory =
+            object.rewardHistory !== undefined && object.rewardHistory !== null
+                ? exports.RewardHistory.fromJSON(object.rewardHistory)
+                : undefined;
         return message;
     },
     toJSON(message) {
         const obj = {};
-        message.commitment !== undefined &&
-            (obj.commitment = message.commitment
-                ? exports.Commitment.toJSON(message.commitment)
+        message.height !== undefined &&
+            (obj.height = (message.height || long_1.default.UZERO).toString());
+        message.rewardHistory !== undefined &&
+            (obj.rewardHistory = message.rewardHistory
+                ? exports.RewardHistory.toJSON(message.rewardHistory)
                 : undefined);
-        message.key !== undefined &&
-            (obj.key = base64FromBytes(message.key !== undefined ? message.key : new Uint8Array()));
         return obj;
     },
     fromPartial(object) {
-        var _a;
-        const message = Object.assign({}, baseCommitmentWithKey);
-        if (object.commitment !== undefined && object.commitment !== null) {
-            message.commitment = exports.Commitment.fromPartial(object.commitment);
-        }
-        else {
-            message.commitment = undefined;
-        }
-        message.key = (_a = object.key) !== null && _a !== void 0 ? _a : new Uint8Array();
+        const message = Object.assign({}, baseRewardHistoryRecord);
+        message.height =
+            object.height !== undefined && object.height !== null
+                ? long_1.default.fromValue(object.height)
+                : long_1.default.UZERO;
+        message.rewardHistory =
+            object.rewardHistory !== undefined && object.rewardHistory !== null
+                ? exports.RewardHistory.fromPartial(object.rewardHistory)
+                : undefined;
         return message;
     },
 };
-const baseCommitmentTotalWithKey = { commitmentTotal: "" };
-exports.CommitmentTotalWithKey = {
+const baseCommitmentExpiry = { poolId: long_1.default.UZERO, address: "" };
+exports.CommitmentExpiry = {
     encode(message, writer = minimal_1.default.Writer.create()) {
-        if (message.commitmentTotal !== "") {
-            writer.uint32(10).string(message.commitmentTotal);
+        if (!message.poolId.isZero()) {
+            writer.uint32(8).uint64(message.poolId);
         }
-        if (message.key.length !== 0) {
-            writer.uint32(18).bytes(message.key);
+        if (message.address !== "") {
+            writer.uint32(18).string(message.address);
         }
         return writer;
     },
     decode(input, length) {
         const reader = input instanceof minimal_1.default.Reader ? input : new minimal_1.default.Reader(input);
         let end = length === undefined ? reader.len : reader.pos + length;
-        const message = Object.assign({}, baseCommitmentTotalWithKey);
-        message.key = new Uint8Array();
+        const message = Object.assign({}, baseCommitmentExpiry);
         while (reader.pos < end) {
             const tag = reader.uint32();
             switch (tag >>> 3) {
                 case 1:
-                    message.commitmentTotal = reader.string();
+                    message.poolId = reader.uint64();
                     break;
                 case 2:
-                    message.key = reader.bytes();
+                    message.address = reader.string();
                     break;
                 default:
                     reader.skipType(tag & 7);
@@ -948,60 +912,53 @@ exports.CommitmentTotalWithKey = {
         return message;
     },
     fromJSON(object) {
-        const message = Object.assign({}, baseCommitmentTotalWithKey);
-        message.key = new Uint8Array();
-        if (object.commitmentTotal !== undefined &&
-            object.commitmentTotal !== null) {
-            message.commitmentTotal = String(object.commitmentTotal);
-        }
-        else {
-            message.commitmentTotal = "";
-        }
-        if (object.key !== undefined && object.key !== null) {
-            message.key = bytesFromBase64(object.key);
-        }
+        const message = Object.assign({}, baseCommitmentExpiry);
+        message.poolId =
+            object.poolId !== undefined && object.poolId !== null
+                ? long_1.default.fromString(object.poolId)
+                : long_1.default.UZERO;
+        message.address =
+            object.address !== undefined && object.address !== null
+                ? String(object.address)
+                : "";
         return message;
     },
     toJSON(message) {
         const obj = {};
-        message.commitmentTotal !== undefined &&
-            (obj.commitmentTotal = message.commitmentTotal);
-        message.key !== undefined &&
-            (obj.key = base64FromBytes(message.key !== undefined ? message.key : new Uint8Array()));
+        message.poolId !== undefined &&
+            (obj.poolId = (message.poolId || long_1.default.UZERO).toString());
+        message.address !== undefined && (obj.address = message.address);
         return obj;
     },
     fromPartial(object) {
-        var _a, _b;
-        const message = Object.assign({}, baseCommitmentTotalWithKey);
-        message.commitmentTotal = (_a = object.commitmentTotal) !== null && _a !== void 0 ? _a : "";
-        message.key = (_b = object.key) !== null && _b !== void 0 ? _b : new Uint8Array();
+        var _a;
+        const message = Object.assign({}, baseCommitmentExpiry);
+        message.poolId =
+            object.poolId !== undefined && object.poolId !== null
+                ? long_1.default.fromValue(object.poolId)
+                : long_1.default.UZERO;
+        message.address = (_a = object.address) !== null && _a !== void 0 ? _a : "";
         return message;
     },
 };
-const baseRewardHistoryWithKey = {};
-exports.RewardHistoryWithKey = {
+const baseCommitmentExpiries = {};
+exports.CommitmentExpiries = {
     encode(message, writer = minimal_1.default.Writer.create()) {
-        if (message.rewardHistory !== undefined) {
-            exports.RewardHistory.encode(message.rewardHistory, writer.uint32(10).fork()).ldelim();
-        }
-        if (message.key.length !== 0) {
-            writer.uint32(18).bytes(message.key);
+        for (const v of message.commitmentExpiries) {
+            exports.CommitmentExpiry.encode(v, writer.uint32(10).fork()).ldelim();
         }
         return writer;
     },
     decode(input, length) {
         const reader = input instanceof minimal_1.default.Reader ? input : new minimal_1.default.Reader(input);
         let end = length === undefined ? reader.len : reader.pos + length;
-        const message = Object.assign({}, baseRewardHistoryWithKey);
-        message.key = new Uint8Array();
+        const message = Object.assign({}, baseCommitmentExpiries);
+        message.commitmentExpiries = [];
         while (reader.pos < end) {
             const tag = reader.uint32();
             switch (tag >>> 3) {
                 case 1:
-                    message.rewardHistory = exports.RewardHistory.decode(reader, reader.uint32());
-                    break;
-                case 2:
-                    message.key = reader.bytes();
+                    message.commitmentExpiries.push(exports.CommitmentExpiry.decode(reader, reader.uint32()));
                     break;
                 default:
                     reader.skipType(tag & 7);
@@ -1011,66 +968,51 @@ exports.RewardHistoryWithKey = {
         return message;
     },
     fromJSON(object) {
-        const message = Object.assign({}, baseRewardHistoryWithKey);
-        message.key = new Uint8Array();
-        if (object.rewardHistory !== undefined && object.rewardHistory !== null) {
-            message.rewardHistory = exports.RewardHistory.fromJSON(object.rewardHistory);
-        }
-        else {
-            message.rewardHistory = undefined;
-        }
-        if (object.key !== undefined && object.key !== null) {
-            message.key = bytesFromBase64(object.key);
-        }
+        var _a;
+        const message = Object.assign({}, baseCommitmentExpiries);
+        message.commitmentExpiries = ((_a = object.commitmentExpiries) !== null && _a !== void 0 ? _a : []).map((e) => exports.CommitmentExpiry.fromJSON(e));
         return message;
     },
     toJSON(message) {
         const obj = {};
-        message.rewardHistory !== undefined &&
-            (obj.rewardHistory = message.rewardHistory
-                ? exports.RewardHistory.toJSON(message.rewardHistory)
-                : undefined);
-        message.key !== undefined &&
-            (obj.key = base64FromBytes(message.key !== undefined ? message.key : new Uint8Array()));
+        if (message.commitmentExpiries) {
+            obj.commitmentExpiries = message.commitmentExpiries.map((e) => e ? exports.CommitmentExpiry.toJSON(e) : undefined);
+        }
+        else {
+            obj.commitmentExpiries = [];
+        }
         return obj;
     },
     fromPartial(object) {
         var _a;
-        const message = Object.assign({}, baseRewardHistoryWithKey);
-        if (object.rewardHistory !== undefined && object.rewardHistory !== null) {
-            message.rewardHistory = exports.RewardHistory.fromPartial(object.rewardHistory);
-        }
-        else {
-            message.rewardHistory = undefined;
-        }
-        message.key = (_a = object.key) !== null && _a !== void 0 ? _a : new Uint8Array();
+        const message = Object.assign({}, baseCommitmentExpiries);
+        message.commitmentExpiries = ((_a = object.commitmentExpiries) !== null && _a !== void 0 ? _a : []).map((e) => exports.CommitmentExpiry.fromPartial(e));
         return message;
     },
 };
-const baseLastClaimedWithKey = { height: long_1.default.UZERO };
-exports.LastClaimedWithKey = {
+const baseCommitmentExpiriesRecord = { expiryTime: long_1.default.UZERO };
+exports.CommitmentExpiriesRecord = {
     encode(message, writer = minimal_1.default.Writer.create()) {
-        if (!message.height.isZero()) {
-            writer.uint32(8).uint64(message.height);
+        if (!message.expiryTime.isZero()) {
+            writer.uint32(8).uint64(message.expiryTime);
         }
-        if (message.key.length !== 0) {
-            writer.uint32(18).bytes(message.key);
+        if (message.commitmentExpiries !== undefined) {
+            exports.CommitmentExpiries.encode(message.commitmentExpiries, writer.uint32(18).fork()).ldelim();
         }
         return writer;
     },
     decode(input, length) {
         const reader = input instanceof minimal_1.default.Reader ? input : new minimal_1.default.Reader(input);
         let end = length === undefined ? reader.len : reader.pos + length;
-        const message = Object.assign({}, baseLastClaimedWithKey);
-        message.key = new Uint8Array();
+        const message = Object.assign({}, baseCommitmentExpiriesRecord);
         while (reader.pos < end) {
             const tag = reader.uint32();
             switch (tag >>> 3) {
                 case 1:
-                    message.height = reader.uint64();
+                    message.expiryTime = reader.uint64();
                     break;
                 case 2:
-                    message.key = reader.bytes();
+                    message.commitmentExpiries = exports.CommitmentExpiries.decode(reader, reader.uint32());
                     break;
                 default:
                     reader.skipType(tag & 7);
@@ -1080,58 +1022,75 @@ exports.LastClaimedWithKey = {
         return message;
     },
     fromJSON(object) {
-        const message = Object.assign({}, baseLastClaimedWithKey);
-        message.key = new Uint8Array();
-        if (object.height !== undefined && object.height !== null) {
-            message.height = long_1.default.fromString(object.height);
-        }
-        else {
-            message.height = long_1.default.UZERO;
-        }
-        if (object.key !== undefined && object.key !== null) {
-            message.key = bytesFromBase64(object.key);
-        }
+        const message = Object.assign({}, baseCommitmentExpiriesRecord);
+        message.expiryTime =
+            object.expiryTime !== undefined && object.expiryTime !== null
+                ? long_1.default.fromString(object.expiryTime)
+                : long_1.default.UZERO;
+        message.commitmentExpiries =
+            object.commitmentExpiries !== undefined &&
+                object.commitmentExpiries !== null
+                ? exports.CommitmentExpiries.fromJSON(object.commitmentExpiries)
+                : undefined;
         return message;
     },
     toJSON(message) {
         const obj = {};
-        message.height !== undefined &&
-            (obj.height = (message.height || long_1.default.UZERO).toString());
-        message.key !== undefined &&
-            (obj.key = base64FromBytes(message.key !== undefined ? message.key : new Uint8Array()));
+        message.expiryTime !== undefined &&
+            (obj.expiryTime = (message.expiryTime || long_1.default.UZERO).toString());
+        message.commitmentExpiries !== undefined &&
+            (obj.commitmentExpiries = message.commitmentExpiries
+                ? exports.CommitmentExpiries.toJSON(message.commitmentExpiries)
+                : undefined);
         return obj;
     },
     fromPartial(object) {
-        var _a;
-        const message = Object.assign({}, baseLastClaimedWithKey);
-        if (object.height !== undefined && object.height !== null) {
-            message.height = object.height;
-        }
-        else {
-            message.height = long_1.default.UZERO;
-        }
-        message.key = (_a = object.key) !== null && _a !== void 0 ? _a : new Uint8Array();
+        const message = Object.assign({}, baseCommitmentExpiriesRecord);
+        message.expiryTime =
+            object.expiryTime !== undefined && object.expiryTime !== null
+                ? long_1.default.fromValue(object.expiryTime)
+                : long_1.default.UZERO;
+        message.commitmentExpiries =
+            object.commitmentExpiries !== undefined &&
+                object.commitmentExpiries !== null
+                ? exports.CommitmentExpiries.fromPartial(object.commitmentExpiries)
+                : undefined;
         return message;
     },
 };
-const baseCommitmentKeys = {};
-exports.CommitmentKeys = {
+const baseLastClaimRecord = {
+    address: "",
+    poolId: long_1.default.UZERO,
+    height: long_1.default.UZERO,
+};
+exports.LastClaimRecord = {
     encode(message, writer = minimal_1.default.Writer.create()) {
-        for (const v of message.commitmentKeys) {
-            writer.uint32(10).bytes(v);
+        if (message.address !== "") {
+            writer.uint32(10).string(message.address);
+        }
+        if (!message.poolId.isZero()) {
+            writer.uint32(16).uint64(message.poolId);
+        }
+        if (!message.height.isZero()) {
+            writer.uint32(24).uint64(message.height);
         }
         return writer;
     },
     decode(input, length) {
         const reader = input instanceof minimal_1.default.Reader ? input : new minimal_1.default.Reader(input);
         let end = length === undefined ? reader.len : reader.pos + length;
-        const message = Object.assign({}, baseCommitmentKeys);
-        message.commitmentKeys = [];
+        const message = Object.assign({}, baseLastClaimRecord);
         while (reader.pos < end) {
             const tag = reader.uint32();
             switch (tag >>> 3) {
                 case 1:
-                    message.commitmentKeys.push(reader.bytes());
+                    message.address = reader.string();
+                    break;
+                case 2:
+                    message.poolId = reader.uint64();
+                    break;
+                case 3:
+                    message.height = reader.uint64();
                     break;
                 default:
                     reader.skipType(tag & 7);
@@ -1141,41 +1100,50 @@ exports.CommitmentKeys = {
         return message;
     },
     fromJSON(object) {
-        const message = Object.assign({}, baseCommitmentKeys);
-        message.commitmentKeys = [];
-        if (object.commitmentKeys !== undefined && object.commitmentKeys !== null) {
-            for (const e of object.commitmentKeys) {
-                message.commitmentKeys.push(bytesFromBase64(e));
-            }
-        }
+        const message = Object.assign({}, baseLastClaimRecord);
+        message.address =
+            object.address !== undefined && object.address !== null
+                ? String(object.address)
+                : "";
+        message.poolId =
+            object.poolId !== undefined && object.poolId !== null
+                ? long_1.default.fromString(object.poolId)
+                : long_1.default.UZERO;
+        message.height =
+            object.height !== undefined && object.height !== null
+                ? long_1.default.fromString(object.height)
+                : long_1.default.UZERO;
         return message;
     },
     toJSON(message) {
         const obj = {};
-        if (message.commitmentKeys) {
-            obj.commitmentKeys = message.commitmentKeys.map((e) => base64FromBytes(e !== undefined ? e : new Uint8Array()));
-        }
-        else {
-            obj.commitmentKeys = [];
-        }
+        message.address !== undefined && (obj.address = message.address);
+        message.poolId !== undefined &&
+            (obj.poolId = (message.poolId || long_1.default.UZERO).toString());
+        message.height !== undefined &&
+            (obj.height = (message.height || long_1.default.UZERO).toString());
         return obj;
     },
     fromPartial(object) {
-        const message = Object.assign({}, baseCommitmentKeys);
-        message.commitmentKeys = [];
-        if (object.commitmentKeys !== undefined && object.commitmentKeys !== null) {
-            for (const e of object.commitmentKeys) {
-                message.commitmentKeys.push(e);
-            }
-        }
+        var _a;
+        const message = Object.assign({}, baseLastClaimRecord);
+        message.address = (_a = object.address) !== null && _a !== void 0 ? _a : "";
+        message.poolId =
+            object.poolId !== undefined && object.poolId !== null
+                ? long_1.default.fromValue(object.poolId)
+                : long_1.default.UZERO;
+        message.height =
+            object.height !== undefined && object.height !== null
+                ? long_1.default.fromValue(object.height)
+                : long_1.default.UZERO;
         return message;
     },
 };
 const baseAllocatedRewards = {};
 exports.AllocatedRewards = {
     encode(message, writer = minimal_1.default.Writer.create()) {
-        for (const v of message.outstanding) {
-            coin_1.DecCoin.encode(v, writer.uint32(18).fork()).ldelim();
+        for (const v of message.coins) {
+            coin_1.DecCoin.encode(v, writer.uint32(10).fork()).ldelim();
         }
         return writer;
     },
@@ -1183,12 +1151,12 @@ exports.AllocatedRewards = {
         const reader = input instanceof minimal_1.default.Reader ? input : new minimal_1.default.Reader(input);
         let end = length === undefined ? reader.len : reader.pos + length;
         const message = Object.assign({}, baseAllocatedRewards);
-        message.outstanding = [];
+        message.coins = [];
         while (reader.pos < end) {
             const tag = reader.uint32();
             switch (tag >>> 3) {
-                case 2:
-                    message.outstanding.push(coin_1.DecCoin.decode(reader, reader.uint32()));
+                case 1:
+                    message.coins.push(coin_1.DecCoin.decode(reader, reader.uint32()));
                     break;
                 default:
                     reader.skipType(tag & 7);
@@ -1198,135 +1166,28 @@ exports.AllocatedRewards = {
         return message;
     },
     fromJSON(object) {
+        var _a;
         const message = Object.assign({}, baseAllocatedRewards);
-        message.outstanding = [];
-        if (object.outstanding !== undefined && object.outstanding !== null) {
-            for (const e of object.outstanding) {
-                message.outstanding.push(coin_1.DecCoin.fromJSON(e));
-            }
-        }
+        message.coins = ((_a = object.coins) !== null && _a !== void 0 ? _a : []).map((e) => coin_1.DecCoin.fromJSON(e));
         return message;
     },
     toJSON(message) {
         const obj = {};
-        if (message.outstanding) {
-            obj.outstanding = message.outstanding.map((e) => e ? coin_1.DecCoin.toJSON(e) : undefined);
-        }
-        else {
-            obj.outstanding = [];
-        }
-        return obj;
-    },
-    fromPartial(object) {
-        const message = Object.assign({}, baseAllocatedRewards);
-        message.outstanding = [];
-        if (object.outstanding !== undefined && object.outstanding !== null) {
-            for (const e of object.outstanding) {
-                message.outstanding.push(coin_1.DecCoin.fromPartial(e));
-            }
-        }
-        return message;
-    },
-};
-const baseTotalCommitment = { poolId: long_1.default.UZERO, totalCommitment: "" };
-exports.TotalCommitment = {
-    encode(message, writer = minimal_1.default.Writer.create()) {
-        if (!message.poolId.isZero()) {
-            writer.uint32(8).uint64(message.poolId);
-        }
-        if (message.totalCommitment !== "") {
-            writer.uint32(18).string(message.totalCommitment);
-        }
-        return writer;
-    },
-    decode(input, length) {
-        const reader = input instanceof minimal_1.default.Reader ? input : new minimal_1.default.Reader(input);
-        let end = length === undefined ? reader.len : reader.pos + length;
-        const message = Object.assign({}, baseTotalCommitment);
-        while (reader.pos < end) {
-            const tag = reader.uint32();
-            switch (tag >>> 3) {
-                case 1:
-                    message.poolId = reader.uint64();
-                    break;
-                case 2:
-                    message.totalCommitment = reader.string();
-                    break;
-                default:
-                    reader.skipType(tag & 7);
-                    break;
-            }
-        }
-        return message;
-    },
-    fromJSON(object) {
-        const message = Object.assign({}, baseTotalCommitment);
-        if (object.poolId !== undefined && object.poolId !== null) {
-            message.poolId = long_1.default.fromString(object.poolId);
+        if (message.coins) {
+            obj.coins = message.coins.map((e) => (e ? coin_1.DecCoin.toJSON(e) : undefined));
         }
         else {
-            message.poolId = long_1.default.UZERO;
+            obj.coins = [];
         }
-        if (object.totalCommitment !== undefined &&
-            object.totalCommitment !== null) {
-            message.totalCommitment = String(object.totalCommitment);
-        }
-        else {
-            message.totalCommitment = "";
-        }
-        return message;
-    },
-    toJSON(message) {
-        const obj = {};
-        message.poolId !== undefined &&
-            (obj.poolId = (message.poolId || long_1.default.UZERO).toString());
-        message.totalCommitment !== undefined &&
-            (obj.totalCommitment = message.totalCommitment);
         return obj;
     },
     fromPartial(object) {
         var _a;
-        const message = Object.assign({}, baseTotalCommitment);
-        if (object.poolId !== undefined && object.poolId !== null) {
-            message.poolId = object.poolId;
-        }
-        else {
-            message.poolId = long_1.default.UZERO;
-        }
-        message.totalCommitment = (_a = object.totalCommitment) !== null && _a !== void 0 ? _a : "";
+        const message = Object.assign({}, baseAllocatedRewards);
+        message.coins = ((_a = object.coins) !== null && _a !== void 0 ? _a : []).map((e) => coin_1.DecCoin.fromPartial(e));
         return message;
     },
 };
-var globalThis = (() => {
-    if (typeof globalThis !== "undefined")
-        return globalThis;
-    if (typeof self !== "undefined")
-        return self;
-    if (typeof window !== "undefined")
-        return window;
-    if (typeof global !== "undefined")
-        return global;
-    throw "Unable to locate global object";
-})();
-const atob = globalThis.atob ||
-    ((b64) => globalThis.Buffer.from(b64, "base64").toString("binary"));
-function bytesFromBase64(b64) {
-    const bin = atob(b64);
-    const arr = new Uint8Array(bin.length);
-    for (let i = 0; i < bin.length; ++i) {
-        arr[i] = bin.charCodeAt(i);
-    }
-    return arr;
-}
-const btoa = globalThis.btoa ||
-    ((bin) => globalThis.Buffer.from(bin, "binary").toString("base64"));
-function base64FromBytes(arr) {
-    const bin = [];
-    for (const byte of arr) {
-        bin.push(String.fromCharCode(byte));
-    }
-    return btoa(bin.join(""));
-}
 function toTimestamp(date) {
     const seconds = numberToLong(date.getTime() / 1000);
     const nanos = (date.getTime() % 1000) * 1000000;