carbon-js-sdk 0.0.2 → 0.0.3

package/lib/codec/liquiditypool/query.js

@@ -3,13 +3,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.QueryClientImpl = exports.QueryClaimableRewardsResponse = exports.QueryClaimableRewardsRequest = exports.QueryAllTotalCommitmentResponse = exports.QueryAllTotalCommitmentRequest = exports.QueryTotalCommitmentResponse = exports.QueryTotalCommitmentRequest = exports.QueryRewardCurveResponse = exports.QueryRewardCurveRequest = exports.QueryCommitmentCurveResponse = exports.QueryCommitmentCurveRequest = exports.QueryLastClaimResponse = exports.QueryLastClaimRequest = exports.QueryAllCommitmentResponse = exports.QueryAllCommitmentRequest = exports.QueryCommitmentResponse = exports.QueryCommitmentRequest = exports.QuerierRewardHistory = exports.QueryRewardHistoryResponse = exports.ExtendedPool = exports.QueryRewardHistoryRequest = exports.QueryAllPoolResponse = exports.QueryAllPoolRequest = exports.QueryGetPoolResponse = exports.QueryGetPoolRequest = exports.protobufPackage = void 0;
+exports.QueryClientImpl = exports.QueryClaimableRewardsResponse = exports.QueryClaimableRewardsRequest = exports.QueryAllTotalCommitmentResponse = exports.QueryAllTotalCommitmentRequest = exports.QueryTotalCommitmentResponse = exports.QueryTotalCommitmentRequest = exports.QueryRewardCurveResponse = exports.QueryRewardCurveRequest = exports.QueryCommitmentCurveResponse = exports.QueryCommitmentCurveRequest = exports.QueryLastClaimResponse = exports.QueryLastClaimRequest = exports.QueryAllCommitmentResponse = exports.QueryAllCommitmentRequest = exports.QueryCommitmentResponse = exports.QueryCommitmentRequest = exports.QueryRewardHistoryResponse = exports.ExtendedPool = exports.QueryRewardHistoryRequest = exports.QueryAllPoolResponse = exports.QueryAllPoolRequest = exports.QueryGetPoolResponse = exports.QueryGetPoolRequest = exports.protobufPackage = void 0;
 /* eslint-disable */
 const long_1 = __importDefault(require("long"));
 const minimal_1 = __importDefault(require("protobufjs/minimal"));
 const pagination_1 = require("../cosmos/base/query/v1beta1/pagination");
 const liquiditypool_1 = require("../liquiditypool/liquiditypool");
 const reward_1 = require("../liquiditypool/reward");
+const timestamp_1 = require("../google/protobuf/timestamp");
 const coin_1 = require("../cosmos/base/v1beta1/coin");
 exports.protobufPackage = "Switcheo.carbon.liquiditypool";
 const baseQueryGetPoolRequest = { id: long_1.default.UZERO };
@@ -39,12 +40,10 @@ exports.QueryGetPoolRequest = {
     },
     fromJSON(object) {
         const message = Object.assign({}, baseQueryGetPoolRequest);
-        if (object.id !== undefined && object.id !== null) {
-            message.id = long_1.default.fromString(object.id);
-        }
-        else {
-            message.id = long_1.default.UZERO;
-        }
+        message.id =
+            object.id !== undefined && object.id !== null
+                ? long_1.default.fromString(object.id)
+                : long_1.default.UZERO;
         return message;
     },
     toJSON(message) {
@@ -55,20 +54,18 @@ exports.QueryGetPoolRequest = {
     },
     fromPartial(object) {
         const message = Object.assign({}, baseQueryGetPoolRequest);
-        if (object.id !== undefined && object.id !== null) {
-            message.id = object.id;
-        }
-        else {
-            message.id = long_1.default.UZERO;
-        }
+        message.id =
+            object.id !== undefined && object.id !== null
+                ? long_1.default.fromValue(object.id)
+                : long_1.default.UZERO;
         return message;
     },
 };
 const baseQueryGetPoolResponse = {};
 exports.QueryGetPoolResponse = {
     encode(message, writer = minimal_1.default.Writer.create()) {
-        if (message.extendedPool !== undefined) {
-            exports.ExtendedPool.encode(message.extendedPool, writer.uint32(10).fork()).ldelim();
+        if (message.pool !== undefined) {
+            exports.ExtendedPool.encode(message.pool, writer.uint32(10).fork()).ldelim();
         }
         return writer;
     },
@@ -80,7 +77,7 @@ exports.QueryGetPoolResponse = {
             const tag = reader.uint32();
             switch (tag >>> 3) {
                 case 1:
-                    message.extendedPool = exports.ExtendedPool.decode(reader, reader.uint32());
+                    message.pool = exports.ExtendedPool.decode(reader, reader.uint32());
                     break;
                 default:
                     reader.skipType(tag & 7);
@@ -91,30 +88,24 @@ exports.QueryGetPoolResponse = {
     },
     fromJSON(object) {
         const message = Object.assign({}, baseQueryGetPoolResponse);
-        if (object.extendedPool !== undefined && object.extendedPool !== null) {
-            message.extendedPool = exports.ExtendedPool.fromJSON(object.extendedPool);
-        }
-        else {
-            message.extendedPool = undefined;
-        }
+        message.pool =
+            object.pool !== undefined && object.pool !== null
+                ? exports.ExtendedPool.fromJSON(object.pool)
+                : undefined;
         return message;
     },
     toJSON(message) {
         const obj = {};
-        message.extendedPool !== undefined &&
-            (obj.extendedPool = message.extendedPool
-                ? exports.ExtendedPool.toJSON(message.extendedPool)
-                : undefined);
+        message.pool !== undefined &&
+            (obj.pool = message.pool ? exports.ExtendedPool.toJSON(message.pool) : undefined);
         return obj;
     },
     fromPartial(object) {
         const message = Object.assign({}, baseQueryGetPoolResponse);
-        if (object.extendedPool !== undefined && object.extendedPool !== null) {
-            message.extendedPool = exports.ExtendedPool.fromPartial(object.extendedPool);
-        }
-        else {
-            message.extendedPool = undefined;
-        }
+        message.pool =
+            object.pool !== undefined && object.pool !== null
+                ? exports.ExtendedPool.fromPartial(object.pool)
+                : undefined;
         return message;
     },
 };
@@ -145,12 +136,10 @@ exports.QueryAllPoolRequest = {
     },
     fromJSON(object) {
         const message = Object.assign({}, baseQueryAllPoolRequest);
-        if (object.pagination !== undefined && object.pagination !== null) {
-            message.pagination = pagination_1.PageRequest.fromJSON(object.pagination);
-        }
-        else {
-            message.pagination = undefined;
-        }
+        message.pagination =
+            object.pagination !== undefined && object.pagination !== null
+                ? pagination_1.PageRequest.fromJSON(object.pagination)
+                : undefined;
         return message;
     },
     toJSON(message) {
@@ -163,19 +152,17 @@ exports.QueryAllPoolRequest = {
     },
     fromPartial(object) {
         const message = Object.assign({}, baseQueryAllPoolRequest);
-        if (object.pagination !== undefined && object.pagination !== null) {
-            message.pagination = pagination_1.PageRequest.fromPartial(object.pagination);
-        }
-        else {
-            message.pagination = undefined;
-        }
+        message.pagination =
+            object.pagination !== undefined && object.pagination !== null
+                ? pagination_1.PageRequest.fromPartial(object.pagination)
+                : undefined;
         return message;
     },
 };
 const baseQueryAllPoolResponse = {};
 exports.QueryAllPoolResponse = {
     encode(message, writer = minimal_1.default.Writer.create()) {
-        for (const v of message.extendedPools) {
+        for (const v of message.pools) {
             exports.ExtendedPool.encode(v, writer.uint32(10).fork()).ldelim();
         }
         if (message.pagination !== undefined) {
@@ -187,12 +174,12 @@ exports.QueryAllPoolResponse = {
         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({}, baseQueryAllPoolResponse);
-        message.extendedPools = [];
+        message.pools = [];
         while (reader.pos < end) {
             const tag = reader.uint32();
             switch (tag >>> 3) {
                 case 1:
-                    message.extendedPools.push(exports.ExtendedPool.decode(reader, reader.uint32()));
+                    message.pools.push(exports.ExtendedPool.decode(reader, reader.uint32()));
                     break;
                 case 2:
                     message.pagination = pagination_1.PageResponse.decode(reader, reader.uint32());
@@ -205,28 +192,22 @@ exports.QueryAllPoolResponse = {
         return message;
     },
     fromJSON(object) {
+        var _a;
         const message = Object.assign({}, baseQueryAllPoolResponse);
-        message.extendedPools = [];
-        if (object.extendedPools !== undefined && object.extendedPools !== null) {
-            for (const e of object.extendedPools) {
-                message.extendedPools.push(exports.ExtendedPool.fromJSON(e));
-            }
-        }
-        if (object.pagination !== undefined && object.pagination !== null) {
-            message.pagination = pagination_1.PageResponse.fromJSON(object.pagination);
-        }
-        else {
-            message.pagination = undefined;
-        }
+        message.pools = ((_a = object.pools) !== null && _a !== void 0 ? _a : []).map((e) => exports.ExtendedPool.fromJSON(e));
+        message.pagination =
+            object.pagination !== undefined && object.pagination !== null
+                ? pagination_1.PageResponse.fromJSON(object.pagination)
+                : undefined;
         return message;
     },
     toJSON(message) {
         const obj = {};
-        if (message.extendedPools) {
-            obj.extendedPools = message.extendedPools.map((e) => e ? exports.ExtendedPool.toJSON(e) : undefined);
+        if (message.pools) {
+            obj.pools = message.pools.map((e) => e ? exports.ExtendedPool.toJSON(e) : undefined);
         }
         else {
-            obj.extendedPools = [];
+            obj.pools = [];
         }
         message.pagination !== undefined &&
             (obj.pagination = message.pagination
@@ -235,19 +216,13 @@ exports.QueryAllPoolResponse = {
         return obj;
     },
     fromPartial(object) {
+        var _a;
         const message = Object.assign({}, baseQueryAllPoolResponse);
-        message.extendedPools = [];
-        if (object.extendedPools !== undefined && object.extendedPools !== null) {
-            for (const e of object.extendedPools) {
-                message.extendedPools.push(exports.ExtendedPool.fromPartial(e));
-            }
-        }
-        if (object.pagination !== undefined && object.pagination !== null) {
-            message.pagination = pagination_1.PageResponse.fromPartial(object.pagination);
-        }
-        else {
-            message.pagination = undefined;
-        }
+        message.pools = ((_a = object.pools) !== null && _a !== void 0 ? _a : []).map((e) => exports.ExtendedPool.fromPartial(e));
+        message.pagination =
+            object.pagination !== undefined && object.pagination !== null
+                ? pagination_1.PageResponse.fromPartial(object.pagination)
+                : undefined;
         return message;
     },
 };
@@ -293,25 +268,18 @@ exports.QueryRewardHistoryRequest = {
     },
     fromJSON(object) {
         const message = Object.assign({}, baseQueryRewardHistoryRequest);
-        if (object.poolId !== undefined && object.poolId !== null) {
-            message.poolId = String(object.poolId);
-        }
-        else {
-            message.poolId = "";
-        }
-        if (object.startBlockHeight !== undefined &&
-            object.startBlockHeight !== null) {
-            message.startBlockHeight = String(object.startBlockHeight);
-        }
-        else {
-            message.startBlockHeight = "";
-        }
-        if (object.pagination !== undefined && object.pagination !== null) {
-            message.pagination = pagination_1.PageRequest.fromJSON(object.pagination);
-        }
-        else {
-            message.pagination = undefined;
-        }
+        message.poolId =
+            object.poolId !== undefined && object.poolId !== null
+                ? String(object.poolId)
+                : "";
+        message.startBlockHeight =
+            object.startBlockHeight !== undefined && object.startBlockHeight !== null
+                ? String(object.startBlockHeight)
+                : "";
+        message.pagination =
+            object.pagination !== undefined && object.pagination !== null
+                ? pagination_1.PageRequest.fromJSON(object.pagination)
+                : undefined;
         return message;
     },
     toJSON(message) {
@@ -330,12 +298,10 @@ exports.QueryRewardHistoryRequest = {
         const message = Object.assign({}, baseQueryRewardHistoryRequest);
         message.poolId = (_a = object.poolId) !== null && _a !== void 0 ? _a : "";
         message.startBlockHeight = (_b = object.startBlockHeight) !== null && _b !== void 0 ? _b : "";
-        if (object.pagination !== undefined && object.pagination !== null) {
-            message.pagination = pagination_1.PageRequest.fromPartial(object.pagination);
-        }
-        else {
-            message.pagination = undefined;
-        }
+        message.pagination =
+            object.pagination !== undefined && object.pagination !== null
+                ? pagination_1.PageRequest.fromPartial(object.pagination)
+                : undefined;
         return message;
     },
 };
@@ -378,25 +344,18 @@ exports.ExtendedPool = {
     },
     fromJSON(object) {
         const message = Object.assign({}, baseExtendedPool);
-        if (object.pool !== undefined && object.pool !== null) {
-            message.pool = liquiditypool_1.Pool.fromJSON(object.pool);
-        }
-        else {
-            message.pool = undefined;
-        }
-        if (object.rewardsWeight !== undefined && object.rewardsWeight !== null) {
-            message.rewardsWeight = String(object.rewardsWeight);
-        }
-        else {
-            message.rewardsWeight = "";
-        }
-        if (object.totalCommitment !== undefined &&
-            object.totalCommitment !== null) {
-            message.totalCommitment = String(object.totalCommitment);
-        }
-        else {
-            message.totalCommitment = "";
-        }
+        message.pool =
+            object.pool !== undefined && object.pool !== null
+                ? liquiditypool_1.Pool.fromJSON(object.pool)
+                : undefined;
+        message.rewardsWeight =
+            object.rewardsWeight !== undefined && object.rewardsWeight !== null
+                ? String(object.rewardsWeight)
+                : "";
+        message.totalCommitment =
+            object.totalCommitment !== undefined && object.totalCommitment !== null
+                ? String(object.totalCommitment)
+                : "";
         return message;
     },
     toJSON(message) {
@@ -412,12 +371,10 @@ exports.ExtendedPool = {
     fromPartial(object) {
         var _a, _b;
         const message = Object.assign({}, baseExtendedPool);
-        if (object.pool !== undefined && object.pool !== null) {
-            message.pool = liquiditypool_1.Pool.fromPartial(object.pool);
-        }
-        else {
-            message.pool = undefined;
-        }
+        message.pool =
+            object.pool !== undefined && object.pool !== null
+                ? liquiditypool_1.Pool.fromPartial(object.pool)
+                : undefined;
         message.rewardsWeight = (_a = object.rewardsWeight) !== null && _a !== void 0 ? _a : "";
         message.totalCommitment = (_b = object.totalCommitment) !== null && _b !== void 0 ? _b : "";
         return message;
@@ -426,8 +383,8 @@ exports.ExtendedPool = {
 const baseQueryRewardHistoryResponse = {};
 exports.QueryRewardHistoryResponse = {
     encode(message, writer = minimal_1.default.Writer.create()) {
-        for (const v of message.querierRewardHistories) {
-            exports.QuerierRewardHistory.encode(v, writer.uint32(10).fork()).ldelim();
+        for (const v of message.rewardHistories) {
+            reward_1.RewardHistoryRecord.encode(v, writer.uint32(10).fork()).ldelim();
         }
         if (message.pagination !== undefined) {
             pagination_1.PageResponse.encode(message.pagination, writer.uint32(18).fork()).ldelim();
@@ -438,12 +395,12 @@ exports.QueryRewardHistoryResponse = {
         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({}, baseQueryRewardHistoryResponse);
-        message.querierRewardHistories = [];
+        message.rewardHistories = [];
         while (reader.pos < end) {
             const tag = reader.uint32();
             switch (tag >>> 3) {
                 case 1:
-                    message.querierRewardHistories.push(exports.QuerierRewardHistory.decode(reader, reader.uint32()));
+                    message.rewardHistories.push(reward_1.RewardHistoryRecord.decode(reader, reader.uint32()));
                     break;
                 case 2:
                     message.pagination = pagination_1.PageResponse.decode(reader, reader.uint32());
@@ -456,29 +413,22 @@ exports.QueryRewardHistoryResponse = {
         return message;
     },
     fromJSON(object) {
+        var _a;
         const message = Object.assign({}, baseQueryRewardHistoryResponse);
-        message.querierRewardHistories = [];
-        if (object.querierRewardHistories !== undefined &&
-            object.querierRewardHistories !== null) {
-            for (const e of object.querierRewardHistories) {
-                message.querierRewardHistories.push(exports.QuerierRewardHistory.fromJSON(e));
-            }
-        }
-        if (object.pagination !== undefined && object.pagination !== null) {
-            message.pagination = pagination_1.PageResponse.fromJSON(object.pagination);
-        }
-        else {
-            message.pagination = undefined;
-        }
+        message.rewardHistories = ((_a = object.rewardHistories) !== null && _a !== void 0 ? _a : []).map((e) => reward_1.RewardHistoryRecord.fromJSON(e));
+        message.pagination =
+            object.pagination !== undefined && object.pagination !== null
+                ? pagination_1.PageResponse.fromJSON(object.pagination)
+                : undefined;
         return message;
     },
     toJSON(message) {
         const obj = {};
-        if (message.querierRewardHistories) {
-            obj.querierRewardHistories = message.querierRewardHistories.map((e) => e ? exports.QuerierRewardHistory.toJSON(e) : undefined);
+        if (message.rewardHistories) {
+            obj.rewardHistories = message.rewardHistories.map((e) => e ? reward_1.RewardHistoryRecord.toJSON(e) : undefined);
         }
         else {
-            obj.querierRewardHistories = [];
+            obj.rewardHistories = [];
         }
         message.pagination !== undefined &&
             (obj.pagination = message.pagination
@@ -486,118 +436,14 @@ exports.QueryRewardHistoryResponse = {
                 : undefined);
         return obj;
     },
-    fromPartial(object) {
-        const message = Object.assign({}, baseQueryRewardHistoryResponse);
-        message.querierRewardHistories = [];
-        if (object.querierRewardHistories !== undefined &&
-            object.querierRewardHistories !== null) {
-            for (const e of object.querierRewardHistories) {
-                message.querierRewardHistories.push(exports.QuerierRewardHistory.fromPartial(e));
-            }
-        }
-        if (object.pagination !== undefined && object.pagination !== null) {
-            message.pagination = pagination_1.PageResponse.fromPartial(object.pagination);
-        }
-        else {
-            message.pagination = undefined;
-        }
-        return message;
-    },
-};
-const baseQuerierRewardHistory = {
-    blockHeight: long_1.default.UZERO,
-    totalCommitment: "",
-};
-exports.QuerierRewardHistory = {
-    encode(message, writer = minimal_1.default.Writer.create()) {
-        if (!message.blockHeight.isZero()) {
-            writer.uint32(8).uint64(message.blockHeight);
-        }
-        for (const v of message.rewards) {
-            coin_1.DecCoin.encode(v, writer.uint32(18).fork()).ldelim();
-        }
-        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({}, baseQuerierRewardHistory);
-        message.rewards = [];
-        while (reader.pos < end) {
-            const tag = reader.uint32();
-            switch (tag >>> 3) {
-                case 1:
-                    message.blockHeight = reader.uint64();
-                    break;
-                case 2:
-                    message.rewards.push(coin_1.DecCoin.decode(reader, reader.uint32()));
-                    break;
-                case 3:
-                    message.totalCommitment = reader.string();
-                    break;
-                default:
-                    reader.skipType(tag & 7);
-                    break;
-            }
-        }
-        return message;
-    },
-    fromJSON(object) {
-        const message = Object.assign({}, baseQuerierRewardHistory);
-        message.rewards = [];
-        if (object.blockHeight !== undefined && object.blockHeight !== null) {
-            message.blockHeight = long_1.default.fromString(object.blockHeight);
-        }
-        else {
-            message.blockHeight = 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 = "";
-        }
-        return message;
-    },
-    toJSON(message) {
-        const obj = {};
-        message.blockHeight !== undefined &&
-            (obj.blockHeight = (message.blockHeight || 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);
-        return obj;
-    },
     fromPartial(object) {
         var _a;
-        const message = Object.assign({}, baseQuerierRewardHistory);
-        if (object.blockHeight !== undefined && object.blockHeight !== null) {
-            message.blockHeight = object.blockHeight;
-        }
-        else {
-            message.blockHeight = 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({}, baseQueryRewardHistoryResponse);
+        message.rewardHistories = ((_a = object.rewardHistories) !== null && _a !== void 0 ? _a : []).map((e) => reward_1.RewardHistoryRecord.fromPartial(e));
+        message.pagination =
+            object.pagination !== undefined && object.pagination !== null
+                ? pagination_1.PageResponse.fromPartial(object.pagination)
+                : undefined;
         return message;
     },
 };
@@ -634,18 +480,14 @@ exports.QueryCommitmentRequest = {
     },
     fromJSON(object) {
         const message = Object.assign({}, baseQueryCommitmentRequest);
-        if (object.poolId !== undefined && object.poolId !== null) {
-            message.poolId = String(object.poolId);
-        }
-        else {
-            message.poolId = "";
-        }
-        if (object.address !== undefined && object.address !== null) {
-            message.address = String(object.address);
-        }
-        else {
-            message.address = "";
-        }
+        message.poolId =
+            object.poolId !== undefined && object.poolId !== null
+                ? String(object.poolId)
+                : "";
+        message.address =
+            object.address !== undefined && object.address !== null
+                ? String(object.address)
+                : "";
         return message;
     },
     toJSON(message) {
@@ -665,8 +507,8 @@ exports.QueryCommitmentRequest = {
 const baseQueryCommitmentResponse = {};
 exports.QueryCommitmentResponse = {
     encode(message, writer = minimal_1.default.Writer.create()) {
-        if (message.commitmentResponse !== undefined) {
-            reward_1.CommitmentResponse.encode(message.commitmentResponse, writer.uint32(10).fork()).ldelim();
+        if (message.commitment !== undefined) {
+            reward_1.CommitmentResponse.encode(message.commitment, writer.uint32(10).fork()).ldelim();
         }
         return writer;
     },
@@ -678,7 +520,7 @@ exports.QueryCommitmentResponse = {
             const tag = reader.uint32();
             switch (tag >>> 3) {
                 case 1:
-                    message.commitmentResponse = reward_1.CommitmentResponse.decode(reader, reader.uint32());
+                    message.commitment = reward_1.CommitmentResponse.decode(reader, reader.uint32());
                     break;
                 default:
                     reader.skipType(tag & 7);
@@ -689,32 +531,26 @@ exports.QueryCommitmentResponse = {
     },
     fromJSON(object) {
         const message = Object.assign({}, baseQueryCommitmentResponse);
-        if (object.commitmentResponse !== undefined &&
-            object.commitmentResponse !== null) {
-            message.commitmentResponse = reward_1.CommitmentResponse.fromJSON(object.commitmentResponse);
-        }
-        else {
-            message.commitmentResponse = undefined;
-        }
+        message.commitment =
+            object.commitment !== undefined && object.commitment !== null
+                ? reward_1.CommitmentResponse.fromJSON(object.commitment)
+                : undefined;
         return message;
     },
     toJSON(message) {
         const obj = {};
-        message.commitmentResponse !== undefined &&
-            (obj.commitmentResponse = message.commitmentResponse
-                ? reward_1.CommitmentResponse.toJSON(message.commitmentResponse)
+        message.commitment !== undefined &&
+            (obj.commitment = message.commitment
+                ? reward_1.CommitmentResponse.toJSON(message.commitment)
                 : undefined);
         return obj;
     },
     fromPartial(object) {
         const message = Object.assign({}, baseQueryCommitmentResponse);
-        if (object.commitmentResponse !== undefined &&
-            object.commitmentResponse !== null) {
-            message.commitmentResponse = reward_1.CommitmentResponse.fromPartial(object.commitmentResponse);
-        }
-        else {
-            message.commitmentResponse = undefined;
-        }
+        message.commitment =
+            object.commitment !== undefined && object.commitment !== null
+                ? reward_1.CommitmentResponse.fromPartial(object.commitment)
+                : undefined;
         return message;
     },
 };
@@ -751,18 +587,14 @@ exports.QueryAllCommitmentRequest = {
     },
     fromJSON(object) {
         const message = Object.assign({}, baseQueryAllCommitmentRequest);
-        if (object.address !== undefined && object.address !== null) {
-            message.address = String(object.address);
-        }
-        else {
-            message.address = "";
-        }
-        if (object.pagination !== undefined && object.pagination !== null) {
-            message.pagination = pagination_1.PageRequest.fromJSON(object.pagination);
-        }
-        else {
-            message.pagination = undefined;
-        }
+        message.address =
+            object.address !== undefined && object.address !== null
+                ? String(object.address)
+                : "";
+        message.pagination =
+            object.pagination !== undefined && object.pagination !== null
+                ? pagination_1.PageRequest.fromJSON(object.pagination)
+                : undefined;
         return message;
     },
     toJSON(message) {
@@ -778,12 +610,10 @@ exports.QueryAllCommitmentRequest = {
         var _a;
         const message = Object.assign({}, baseQueryAllCommitmentRequest);
         message.address = (_a = object.address) !== null && _a !== void 0 ? _a : "";
-        if (object.pagination !== undefined && object.pagination !== null) {
-            message.pagination = pagination_1.PageRequest.fromPartial(object.pagination);
-        }
-        else {
-            message.pagination = undefined;
-        }
+        message.pagination =
+            object.pagination !== undefined && object.pagination !== null
+                ? pagination_1.PageRequest.fromPartial(object.pagination)
+                : undefined;
         return message;
     },
 };
@@ -796,6 +626,9 @@ exports.QueryAllCommitmentResponse = {
         if (message.pagination !== undefined) {
             pagination_1.PageResponse.encode(message.pagination, writer.uint32(18).fork()).ldelim();
         }
+        if (message.blockTime !== undefined) {
+            timestamp_1.Timestamp.encode(toTimestamp(message.blockTime), writer.uint32(26).fork()).ldelim();
+        }
         return writer;
     },
     decode(input, length) {
@@ -812,6 +645,9 @@ exports.QueryAllCommitmentResponse = {
                 case 2:
                     message.pagination = pagination_1.PageResponse.decode(reader, reader.uint32());
                     break;
+                case 3:
+                    message.blockTime = fromTimestamp(timestamp_1.Timestamp.decode(reader, reader.uint32()));
+                    break;
                 default:
                     reader.skipType(tag & 7);
                     break;
@@ -820,19 +656,17 @@ exports.QueryAllCommitmentResponse = {
         return message;
     },
     fromJSON(object) {
+        var _a;
         const message = Object.assign({}, baseQueryAllCommitmentResponse);
-        message.commitments = [];
-        if (object.commitments !== undefined && object.commitments !== null) {
-            for (const e of object.commitments) {
-                message.commitments.push(reward_1.Commitment.fromJSON(e));
-            }
-        }
-        if (object.pagination !== undefined && object.pagination !== null) {
-            message.pagination = pagination_1.PageResponse.fromJSON(object.pagination);
-        }
-        else {
-            message.pagination = undefined;
-        }
+        message.commitments = ((_a = object.commitments) !== null && _a !== void 0 ? _a : []).map((e) => reward_1.Commitment.fromJSON(e));
+        message.pagination =
+            object.pagination !== undefined && object.pagination !== null
+                ? pagination_1.PageResponse.fromJSON(object.pagination)
+                : undefined;
+        message.blockTime =
+            object.blockTime !== undefined && object.blockTime !== null
+                ? fromJsonTimestamp(object.blockTime)
+                : undefined;
         return message;
     },
     toJSON(message) {
@@ -847,22 +681,19 @@ exports.QueryAllCommitmentResponse = {
             (obj.pagination = message.pagination
                 ? pagination_1.PageResponse.toJSON(message.pagination)
                 : undefined);
+        message.blockTime !== undefined &&
+            (obj.blockTime = message.blockTime.toISOString());
         return obj;
     },
     fromPartial(object) {
+        var _a, _b;
         const message = Object.assign({}, baseQueryAllCommitmentResponse);
-        message.commitments = [];
-        if (object.commitments !== undefined && object.commitments !== null) {
-            for (const e of object.commitments) {
-                message.commitments.push(reward_1.Commitment.fromPartial(e));
-            }
-        }
-        if (object.pagination !== undefined && object.pagination !== null) {
-            message.pagination = pagination_1.PageResponse.fromPartial(object.pagination);
-        }
-        else {
-            message.pagination = undefined;
-        }
+        message.commitments = ((_a = object.commitments) !== null && _a !== void 0 ? _a : []).map((e) => reward_1.Commitment.fromPartial(e));
+        message.pagination =
+            object.pagination !== undefined && object.pagination !== null
+                ? pagination_1.PageResponse.fromPartial(object.pagination)
+                : undefined;
+        message.blockTime = (_b = object.blockTime) !== null && _b !== void 0 ? _b : undefined;
         return message;
     },
 };
@@ -899,18 +730,14 @@ exports.QueryLastClaimRequest = {
     },
     fromJSON(object) {
         const message = Object.assign({}, baseQueryLastClaimRequest);
-        if (object.poolId !== undefined && object.poolId !== null) {
-            message.poolId = String(object.poolId);
-        }
-        else {
-            message.poolId = "";
-        }
-        if (object.address !== undefined && object.address !== null) {
-            message.address = String(object.address);
-        }
-        else {
-            message.address = "";
-        }
+        message.poolId =
+            object.poolId !== undefined && object.poolId !== null
+                ? String(object.poolId)
+                : "";
+        message.address =
+            object.address !== undefined && object.address !== null
+                ? String(object.address)
+                : "";
         return message;
     },
     toJSON(message) {
@@ -954,12 +781,10 @@ exports.QueryLastClaimResponse = {
     },
     fromJSON(object) {
         const message = Object.assign({}, baseQueryLastClaimResponse);
-        if (object.lastClaim !== undefined && object.lastClaim !== null) {
-            message.lastClaim = long_1.default.fromString(object.lastClaim);
-        }
-        else {
-            message.lastClaim = long_1.default.ZERO;
-        }
+        message.lastClaim =
+            object.lastClaim !== undefined && object.lastClaim !== null
+                ? long_1.default.fromString(object.lastClaim)
+                : long_1.default.ZERO;
         return message;
     },
     toJSON(message) {
@@ -970,12 +795,10 @@ exports.QueryLastClaimResponse = {
     },
     fromPartial(object) {
         const message = Object.assign({}, baseQueryLastClaimResponse);
-        if (object.lastClaim !== undefined && object.lastClaim !== null) {
-            message.lastClaim = object.lastClaim;
-        }
-        else {
-            message.lastClaim = long_1.default.ZERO;
-        }
+        message.lastClaim =
+            object.lastClaim !== undefined && object.lastClaim !== null
+                ? long_1.default.fromValue(object.lastClaim)
+                : long_1.default.ZERO;
         return message;
     },
 };
@@ -1038,13 +861,10 @@ exports.QueryCommitmentCurveResponse = {
     },
     fromJSON(object) {
         const message = Object.assign({}, baseQueryCommitmentCurveResponse);
-        if (object.commitmentCurve !== undefined &&
-            object.commitmentCurve !== null) {
-            message.commitmentCurve = reward_1.CommitmentCurve.fromJSON(object.commitmentCurve);
-        }
-        else {
-            message.commitmentCurve = undefined;
-        }
+        message.commitmentCurve =
+            object.commitmentCurve !== undefined && object.commitmentCurve !== null
+                ? reward_1.CommitmentCurve.fromJSON(object.commitmentCurve)
+                : undefined;
         return message;
     },
     toJSON(message) {
@@ -1057,13 +877,10 @@ exports.QueryCommitmentCurveResponse = {
     },
     fromPartial(object) {
         const message = Object.assign({}, baseQueryCommitmentCurveResponse);
-        if (object.commitmentCurve !== undefined &&
-            object.commitmentCurve !== null) {
-            message.commitmentCurve = reward_1.CommitmentCurve.fromPartial(object.commitmentCurve);
-        }
-        else {
-            message.commitmentCurve = undefined;
-        }
+        message.commitmentCurve =
+            object.commitmentCurve !== undefined && object.commitmentCurve !== null
+                ? reward_1.CommitmentCurve.fromPartial(object.commitmentCurve)
+                : undefined;
         return message;
     },
 };
@@ -1126,12 +943,10 @@ exports.QueryRewardCurveResponse = {
     },
     fromJSON(object) {
         const message = Object.assign({}, baseQueryRewardCurveResponse);
-        if (object.rewardCurve !== undefined && object.rewardCurve !== null) {
-            message.rewardCurve = reward_1.RewardCurve.fromJSON(object.rewardCurve);
-        }
-        else {
-            message.rewardCurve = undefined;
-        }
+        message.rewardCurve =
+            object.rewardCurve !== undefined && object.rewardCurve !== null
+                ? reward_1.RewardCurve.fromJSON(object.rewardCurve)
+                : undefined;
         return message;
     },
     toJSON(message) {
@@ -1144,12 +959,10 @@ exports.QueryRewardCurveResponse = {
     },
     fromPartial(object) {
         const message = Object.assign({}, baseQueryRewardCurveResponse);
-        if (object.rewardCurve !== undefined && object.rewardCurve !== null) {
-            message.rewardCurve = reward_1.RewardCurve.fromPartial(object.rewardCurve);
-        }
-        else {
-            message.rewardCurve = undefined;
-        }
+        message.rewardCurve =
+            object.rewardCurve !== undefined && object.rewardCurve !== null
+                ? reward_1.RewardCurve.fromPartial(object.rewardCurve)
+                : undefined;
         return message;
     },
 };
@@ -1180,12 +993,10 @@ exports.QueryTotalCommitmentRequest = {
     },
     fromJSON(object) {
         const message = Object.assign({}, baseQueryTotalCommitmentRequest);
-        if (object.poolId !== undefined && object.poolId !== null) {
-            message.poolId = long_1.default.fromString(object.poolId);
-        }
-        else {
-            message.poolId = long_1.default.UZERO;
-        }
+        message.poolId =
+            object.poolId !== undefined && object.poolId !== null
+                ? long_1.default.fromString(object.poolId)
+                : long_1.default.UZERO;
         return message;
     },
     toJSON(message) {
@@ -1196,12 +1007,10 @@ exports.QueryTotalCommitmentRequest = {
     },
     fromPartial(object) {
         const message = Object.assign({}, baseQueryTotalCommitmentRequest);
-        if (object.poolId !== undefined && object.poolId !== null) {
-            message.poolId = object.poolId;
-        }
-        else {
-            message.poolId = long_1.default.UZERO;
-        }
+        message.poolId =
+            object.poolId !== undefined && object.poolId !== null
+                ? long_1.default.fromValue(object.poolId)
+                : long_1.default.UZERO;
         return message;
     },
 };
@@ -1232,13 +1041,10 @@ exports.QueryTotalCommitmentResponse = {
     },
     fromJSON(object) {
         const message = Object.assign({}, baseQueryTotalCommitmentResponse);
-        if (object.totalCommitment !== undefined &&
-            object.totalCommitment !== null) {
-            message.totalCommitment = String(object.totalCommitment);
-        }
-        else {
-            message.totalCommitment = "";
-        }
+        message.totalCommitment =
+            object.totalCommitment !== undefined && object.totalCommitment !== null
+                ? String(object.totalCommitment)
+                : "";
         return message;
     },
     toJSON(message) {
@@ -1281,12 +1087,10 @@ exports.QueryAllTotalCommitmentRequest = {
     },
     fromJSON(object) {
         const message = Object.assign({}, baseQueryAllTotalCommitmentRequest);
-        if (object.pagination !== undefined && object.pagination !== null) {
-            message.pagination = pagination_1.PageRequest.fromJSON(object.pagination);
-        }
-        else {
-            message.pagination = undefined;
-        }
+        message.pagination =
+            object.pagination !== undefined && object.pagination !== null
+                ? pagination_1.PageRequest.fromJSON(object.pagination)
+                : undefined;
         return message;
     },
     toJSON(message) {
@@ -1299,12 +1103,10 @@ exports.QueryAllTotalCommitmentRequest = {
     },
     fromPartial(object) {
         const message = Object.assign({}, baseQueryAllTotalCommitmentRequest);
-        if (object.pagination !== undefined && object.pagination !== null) {
-            message.pagination = pagination_1.PageRequest.fromPartial(object.pagination);
-        }
-        else {
-            message.pagination = undefined;
-        }
+        message.pagination =
+            object.pagination !== undefined && object.pagination !== null
+                ? pagination_1.PageRequest.fromPartial(object.pagination)
+                : undefined;
         return message;
     },
 };
@@ -1312,7 +1114,7 @@ const baseQueryAllTotalCommitmentResponse = {};
 exports.QueryAllTotalCommitmentResponse = {
     encode(message, writer = minimal_1.default.Writer.create()) {
         for (const v of message.totalCommitments) {
-            reward_1.TotalCommitment.encode(v, writer.uint32(10).fork()).ldelim();
+            reward_1.TotalCommitmentRecord.encode(v, writer.uint32(10).fork()).ldelim();
         }
         if (message.pagination !== undefined) {
             pagination_1.PageResponse.encode(message.pagination, writer.uint32(18).fork()).ldelim();
@@ -1328,7 +1130,7 @@ exports.QueryAllTotalCommitmentResponse = {
             const tag = reader.uint32();
             switch (tag >>> 3) {
                 case 1:
-                    message.totalCommitments.push(reward_1.TotalCommitment.decode(reader, reader.uint32()));
+                    message.totalCommitments.push(reward_1.TotalCommitmentRecord.decode(reader, reader.uint32()));
                     break;
                 case 2:
                     message.pagination = pagination_1.PageResponse.decode(reader, reader.uint32());
@@ -1341,26 +1143,19 @@ exports.QueryAllTotalCommitmentResponse = {
         return message;
     },
     fromJSON(object) {
+        var _a;
         const message = Object.assign({}, baseQueryAllTotalCommitmentResponse);
-        message.totalCommitments = [];
-        if (object.totalCommitments !== undefined &&
-            object.totalCommitments !== null) {
-            for (const e of object.totalCommitments) {
-                message.totalCommitments.push(reward_1.TotalCommitment.fromJSON(e));
-            }
-        }
-        if (object.pagination !== undefined && object.pagination !== null) {
-            message.pagination = pagination_1.PageResponse.fromJSON(object.pagination);
-        }
-        else {
-            message.pagination = undefined;
-        }
+        message.totalCommitments = ((_a = object.totalCommitments) !== null && _a !== void 0 ? _a : []).map((e) => reward_1.TotalCommitmentRecord.fromJSON(e));
+        message.pagination =
+            object.pagination !== undefined && object.pagination !== null
+                ? pagination_1.PageResponse.fromJSON(object.pagination)
+                : undefined;
         return message;
     },
     toJSON(message) {
         const obj = {};
         if (message.totalCommitments) {
-            obj.totalCommitments = message.totalCommitments.map((e) => e ? reward_1.TotalCommitment.toJSON(e) : undefined);
+            obj.totalCommitments = message.totalCommitments.map((e) => e ? reward_1.TotalCommitmentRecord.toJSON(e) : undefined);
         }
         else {
             obj.totalCommitments = [];
@@ -1372,20 +1167,13 @@ exports.QueryAllTotalCommitmentResponse = {
         return obj;
     },
     fromPartial(object) {
+        var _a;
         const message = Object.assign({}, baseQueryAllTotalCommitmentResponse);
-        message.totalCommitments = [];
-        if (object.totalCommitments !== undefined &&
-            object.totalCommitments !== null) {
-            for (const e of object.totalCommitments) {
-                message.totalCommitments.push(reward_1.TotalCommitment.fromPartial(e));
-            }
-        }
-        if (object.pagination !== undefined && object.pagination !== null) {
-            message.pagination = pagination_1.PageResponse.fromPartial(object.pagination);
-        }
-        else {
-            message.pagination = undefined;
-        }
+        message.totalCommitments = ((_a = object.totalCommitments) !== null && _a !== void 0 ? _a : []).map((e) => reward_1.TotalCommitmentRecord.fromPartial(e));
+        message.pagination =
+            object.pagination !== undefined && object.pagination !== null
+                ? pagination_1.PageResponse.fromPartial(object.pagination)
+                : undefined;
         return message;
     },
 };
@@ -1425,18 +1213,14 @@ exports.QueryClaimableRewardsRequest = {
     },
     fromJSON(object) {
         const message = Object.assign({}, baseQueryClaimableRewardsRequest);
-        if (object.poolId !== undefined && object.poolId !== null) {
-            message.poolId = long_1.default.fromString(object.poolId);
-        }
-        else {
-            message.poolId = long_1.default.UZERO;
-        }
-        if (object.address !== undefined && object.address !== null) {
-            message.address = String(object.address);
-        }
-        else {
-            message.address = "";
-        }
+        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) {
@@ -1449,12 +1233,10 @@ exports.QueryClaimableRewardsRequest = {
     fromPartial(object) {
         var _a;
         const message = Object.assign({}, baseQueryClaimableRewardsRequest);
-        if (object.poolId !== undefined && object.poolId !== null) {
-            message.poolId = object.poolId;
-        }
-        else {
-            message.poolId = long_1.default.UZERO;
-        }
+        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;
     },
@@ -1486,13 +1268,9 @@ exports.QueryClaimableRewardsResponse = {
         return message;
     },
     fromJSON(object) {
+        var _a;
         const message = Object.assign({}, baseQueryClaimableRewardsResponse);
-        message.rewards = [];
-        if (object.rewards !== undefined && object.rewards !== null) {
-            for (const e of object.rewards) {
-                message.rewards.push(coin_1.DecCoin.fromJSON(e));
-            }
-        }
+        message.rewards = ((_a = object.rewards) !== null && _a !== void 0 ? _a : []).map((e) => coin_1.DecCoin.fromJSON(e));
         return message;
     },
     toJSON(message) {
@@ -1506,13 +1284,9 @@ exports.QueryClaimableRewardsResponse = {
         return obj;
     },
     fromPartial(object) {
+        var _a;
         const message = Object.assign({}, baseQueryClaimableRewardsResponse);
-        message.rewards = [];
-        if (object.rewards !== undefined && object.rewards !== null) {
-            for (const e of object.rewards) {
-                message.rewards.push(coin_1.DecCoin.fromPartial(e));
-            }
-        }
+        message.rewards = ((_a = object.rewards) !== null && _a !== void 0 ? _a : []).map((e) => coin_1.DecCoin.fromPartial(e));
         return message;
     },
 };
@@ -1588,6 +1362,30 @@ class QueryClientImpl {
     }
 }
 exports.QueryClientImpl = QueryClientImpl;
+function toTimestamp(date) {
+    const seconds = numberToLong(date.getTime() / 1000);
+    const nanos = (date.getTime() % 1000) * 1000000;
+    return { seconds, nanos };
+}
+function fromTimestamp(t) {
+    let millis = t.seconds.toNumber() * 1000;
+    millis += t.nanos / 1000000;
+    return new Date(millis);
+}
+function fromJsonTimestamp(o) {
+    if (o instanceof Date) {
+        return o;
+    }
+    else if (typeof o === "string") {
+        return new Date(o);
+    }
+    else {
+        return fromTimestamp(timestamp_1.Timestamp.fromJSON(o));
+    }
+}
+function numberToLong(number) {
+    return long_1.default.fromNumber(number);
+}
 if (minimal_1.default.util.Long !== long_1.default) {
     minimal_1.default.util.Long = long_1.default;
     minimal_1.default.configure();