carbon-js-sdk 0.6.2 → 0.6.3

package/lib/codec/liquiditypool/query.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.QueryClientImpl = exports.QueryAllPoolRouteAddressResponse_AddressesEntry = exports.QueryAllPoolRouteAddressResponse = exports.QueryAllPoolRouteAddressRequest = exports.QueryAllPoolRouteResponse = exports.QueryAllPoolRouteRequest = exports.QueryParamsResponse = exports.QueryParamsRequest = 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.QueryAllPoolAddressResponse_AddressesEntry = exports.QueryAllPoolAddressResponse = exports.QueryAllPoolAddressRequest = exports.QueryAllPoolResponse = exports.QueryAllPoolRequest = exports.QueryGetPoolResponse = exports.QueryGetPoolRequest = exports.protobufPackage = void 0;
+exports.QueryClientImpl = exports.QueryAllPoolRouteAddressResponse_AddressesEntry = exports.QueryAllPoolRouteAddressResponse = exports.QueryAllPoolRouteAddressRequest = exports.QueryAllPoolRouteResponse = exports.QueryAllPoolRouteRequest = exports.QueryParamsResponse = exports.QueryParamsRequest = exports.QueryClaimableRewardsResponse = exports.QueryClaimableRewardsRequest = exports.QueryAllTotalCommitmentResponse = exports.QueryAllTotalCommitmentRequest = exports.QueryTotalCommitmentResponse = exports.QueryTotalCommitmentRequest = exports.QueryRewardCurveResponse = exports.QueryRewardCurveRequest = exports.QueryCommitmentCurveResponse = exports.QueryCommitmentCurveRequest = exports.QueryAllCommitmentResponse = exports.QueryAllCommitmentRequest = exports.QueryCommitmentResponse = exports.QueryCommitmentRequest = exports.ExtendedPool = exports.QueryAllPoolAddressResponse_AddressesEntry = exports.QueryAllPoolAddressResponse = exports.QueryAllPoolAddressRequest = 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"));
@@ -412,85 +412,6 @@ exports.QueryAllPoolAddressResponse_AddressesEntry = {
         return message;
     },
 };
-const baseQueryRewardHistoryRequest = {
-    poolId: "",
-    startBlockHeight: "",
-};
-exports.QueryRewardHistoryRequest = {
-    encode(message, writer = minimal_1.default.Writer.create()) {
-        if (message.poolId !== "") {
-            writer.uint32(10).string(message.poolId);
-        }
-        if (message.startBlockHeight !== "") {
-            writer.uint32(18).string(message.startBlockHeight);
-        }
-        if (message.pagination !== undefined) {
-            pagination_1.PageRequest.encode(message.pagination, writer.uint32(26).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({}, baseQueryRewardHistoryRequest);
-        while (reader.pos < end) {
-            const tag = reader.uint32();
-            switch (tag >>> 3) {
-                case 1:
-                    message.poolId = reader.string();
-                    break;
-                case 2:
-                    message.startBlockHeight = reader.string();
-                    break;
-                case 3:
-                    message.pagination = pagination_1.PageRequest.decode(reader, reader.uint32());
-                    break;
-                default:
-                    reader.skipType(tag & 7);
-                    break;
-            }
-        }
-        return message;
-    },
-    fromJSON(object) {
-        const message = Object.assign({}, baseQueryRewardHistoryRequest);
-        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) {
-        const obj = {};
-        message.poolId !== undefined && (obj.poolId = message.poolId);
-        message.startBlockHeight !== undefined &&
-            (obj.startBlockHeight = message.startBlockHeight);
-        message.pagination !== undefined &&
-            (obj.pagination = message.pagination
-                ? pagination_1.PageRequest.toJSON(message.pagination)
-                : undefined);
-        return obj;
-    },
-    fromPartial(object) {
-        var _a, _b;
-        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 : "";
-        message.pagination =
-            object.pagination !== undefined && object.pagination !== null
-                ? pagination_1.PageRequest.fromPartial(object.pagination)
-                : undefined;
-        return message;
-    },
-};
 const baseExtendedPool = { rewardsWeight: "", totalCommitment: "" };
 exports.ExtendedPool = {
     encode(message, writer = minimal_1.default.Writer.create()) {
@@ -503,12 +424,16 @@ exports.ExtendedPool = {
         if (message.totalCommitment !== "") {
             writer.uint32(26).string(message.totalCommitment);
         }
+        for (const v of message.rewardPerCommitmentShare) {
+            coin_1.DecCoin.encode(v, writer.uint32(34).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({}, baseExtendedPool);
+        message.rewardPerCommitmentShare = [];
         while (reader.pos < end) {
             const tag = reader.uint32();
             switch (tag >>> 3) {
@@ -521,6 +446,9 @@ exports.ExtendedPool = {
                 case 3:
                     message.totalCommitment = reader.string();
                     break;
+                case 4:
+                    message.rewardPerCommitmentShare.push(coin_1.DecCoin.decode(reader, reader.uint32()));
+                    break;
                 default:
                     reader.skipType(tag & 7);
                     break;
@@ -529,6 +457,7 @@ exports.ExtendedPool = {
         return message;
     },
     fromJSON(object) {
+        var _a;
         const message = Object.assign({}, baseExtendedPool);
         message.pool =
             object.pool !== undefined && object.pool !== null
@@ -542,6 +471,7 @@ exports.ExtendedPool = {
             object.totalCommitment !== undefined && object.totalCommitment !== null
                 ? String(object.totalCommitment)
                 : "";
+        message.rewardPerCommitmentShare = ((_a = object.rewardPerCommitmentShare) !== null && _a !== void 0 ? _a : []).map((e) => coin_1.DecCoin.fromJSON(e));
         return message;
     },
     toJSON(message) {
@@ -552,10 +482,16 @@ exports.ExtendedPool = {
             (obj.rewardsWeight = message.rewardsWeight);
         message.totalCommitment !== undefined &&
             (obj.totalCommitment = message.totalCommitment);
+        if (message.rewardPerCommitmentShare) {
+            obj.rewardPerCommitmentShare = message.rewardPerCommitmentShare.map((e) => e ? coin_1.DecCoin.toJSON(e) : undefined);
+        }
+        else {
+            obj.rewardPerCommitmentShare = [];
+        }
         return obj;
     },
     fromPartial(object) {
-        var _a, _b;
+        var _a, _b, _c;
         const message = Object.assign({}, baseExtendedPool);
         message.pool =
             object.pool !== undefined && object.pool !== null
@@ -563,73 +499,7 @@ exports.ExtendedPool = {
                 : undefined;
         message.rewardsWeight = (_a = object.rewardsWeight) !== null && _a !== void 0 ? _a : "";
         message.totalCommitment = (_b = object.totalCommitment) !== null && _b !== void 0 ? _b : "";
-        return message;
-    },
-};
-const baseQueryRewardHistoryResponse = {};
-exports.QueryRewardHistoryResponse = {
-    encode(message, writer = minimal_1.default.Writer.create()) {
-        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();
-        }
-        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({}, baseQueryRewardHistoryResponse);
-        message.rewardHistories = [];
-        while (reader.pos < end) {
-            const tag = reader.uint32();
-            switch (tag >>> 3) {
-                case 1:
-                    message.rewardHistories.push(reward_1.RewardHistoryRecord.decode(reader, reader.uint32()));
-                    break;
-                case 2:
-                    message.pagination = pagination_1.PageResponse.decode(reader, reader.uint32());
-                    break;
-                default:
-                    reader.skipType(tag & 7);
-                    break;
-            }
-        }
-        return message;
-    },
-    fromJSON(object) {
-        var _a;
-        const message = Object.assign({}, baseQueryRewardHistoryResponse);
-        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.rewardHistories) {
-            obj.rewardHistories = message.rewardHistories.map((e) => e ? reward_1.RewardHistoryRecord.toJSON(e) : undefined);
-        }
-        else {
-            obj.rewardHistories = [];
-        }
-        message.pagination !== undefined &&
-            (obj.pagination = message.pagination
-                ? pagination_1.PageResponse.toJSON(message.pagination)
-                : undefined);
-        return obj;
-    },
-    fromPartial(object) {
-        var _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;
+        message.rewardPerCommitmentShare = ((_c = object.rewardPerCommitmentShare) !== null && _c !== void 0 ? _c : []).map((e) => coin_1.DecCoin.fromPartial(e));
         return message;
     },
 };
@@ -883,111 +753,6 @@ exports.QueryAllCommitmentResponse = {
         return message;
     },
 };
-const baseQueryLastClaimRequest = { poolId: "", address: "" };
-exports.QueryLastClaimRequest = {
-    encode(message, writer = minimal_1.default.Writer.create()) {
-        if (message.poolId !== "") {
-            writer.uint32(10).string(message.poolId);
-        }
-        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({}, baseQueryLastClaimRequest);
-        while (reader.pos < end) {
-            const tag = reader.uint32();
-            switch (tag >>> 3) {
-                case 1:
-                    message.poolId = reader.string();
-                    break;
-                case 2:
-                    message.address = reader.string();
-                    break;
-                default:
-                    reader.skipType(tag & 7);
-                    break;
-            }
-        }
-        return message;
-    },
-    fromJSON(object) {
-        const message = Object.assign({}, baseQueryLastClaimRequest);
-        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) {
-        const obj = {};
-        message.poolId !== undefined && (obj.poolId = message.poolId);
-        message.address !== undefined && (obj.address = message.address);
-        return obj;
-    },
-    fromPartial(object) {
-        var _a, _b;
-        const message = Object.assign({}, baseQueryLastClaimRequest);
-        message.poolId = (_a = object.poolId) !== null && _a !== void 0 ? _a : "";
-        message.address = (_b = object.address) !== null && _b !== void 0 ? _b : "";
-        return message;
-    },
-};
-const baseQueryLastClaimResponse = { lastClaim: long_1.default.ZERO };
-exports.QueryLastClaimResponse = {
-    encode(message, writer = minimal_1.default.Writer.create()) {
-        if (!message.lastClaim.isZero()) {
-            writer.uint32(8).int64(message.lastClaim);
-        }
-        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({}, baseQueryLastClaimResponse);
-        while (reader.pos < end) {
-            const tag = reader.uint32();
-            switch (tag >>> 3) {
-                case 1:
-                    message.lastClaim = reader.int64();
-                    break;
-                default:
-                    reader.skipType(tag & 7);
-                    break;
-            }
-        }
-        return message;
-    },
-    fromJSON(object) {
-        const message = Object.assign({}, baseQueryLastClaimResponse);
-        message.lastClaim =
-            object.lastClaim !== undefined && object.lastClaim !== null
-                ? long_1.default.fromString(object.lastClaim)
-                : long_1.default.ZERO;
-        return message;
-    },
-    toJSON(message) {
-        const obj = {};
-        message.lastClaim !== undefined &&
-            (obj.lastClaim = (message.lastClaim || long_1.default.ZERO).toString());
-        return obj;
-    },
-    fromPartial(object) {
-        const message = Object.assign({}, baseQueryLastClaimResponse);
-        message.lastClaim =
-            object.lastClaim !== undefined && object.lastClaim !== null
-                ? long_1.default.fromValue(object.lastClaim)
-                : long_1.default.ZERO;
-        return message;
-    },
-};
 const baseQueryCommitmentCurveRequest = {};
 exports.QueryCommitmentCurveRequest = {
     encode(_, writer = minimal_1.default.Writer.create()) {
@@ -1865,10 +1630,8 @@ class QueryClientImpl {
         this.PoolAddressAll = this.PoolAddressAll.bind(this);
         this.Pool = this.Pool.bind(this);
         this.PoolAll = this.PoolAll.bind(this);
-        this.RewardHistory = this.RewardHistory.bind(this);
         this.Commitment = this.Commitment.bind(this);
         this.CommitmentAll = this.CommitmentAll.bind(this);
-        this.LastClaim = this.LastClaim.bind(this);
         this.CommitmentCurve = this.CommitmentCurve.bind(this);
         this.RewardCurve = this.RewardCurve.bind(this);
         this.TotalCommitment = this.TotalCommitment.bind(this);
@@ -1893,11 +1656,6 @@ class QueryClientImpl {
         const promise = this.rpc.request("Switcheo.carbon.liquiditypool.Query", "PoolAll", data);
         return promise.then((data) => exports.QueryAllPoolResponse.decode(new minimal_1.default.Reader(data)));
     }
-    RewardHistory(request) {
-        const data = exports.QueryRewardHistoryRequest.encode(request).finish();
-        const promise = this.rpc.request("Switcheo.carbon.liquiditypool.Query", "RewardHistory", data);
-        return promise.then((data) => exports.QueryRewardHistoryResponse.decode(new minimal_1.default.Reader(data)));
-    }
     Commitment(request) {
         const data = exports.QueryCommitmentRequest.encode(request).finish();
         const promise = this.rpc.request("Switcheo.carbon.liquiditypool.Query", "Commitment", data);
@@ -1908,11 +1666,6 @@ class QueryClientImpl {
         const promise = this.rpc.request("Switcheo.carbon.liquiditypool.Query", "CommitmentAll", data);
         return promise.then((data) => exports.QueryAllCommitmentResponse.decode(new minimal_1.default.Reader(data)));
     }
-    LastClaim(request) {
-        const data = exports.QueryLastClaimRequest.encode(request).finish();
-        const promise = this.rpc.request("Switcheo.carbon.liquiditypool.Query", "LastClaim", data);
-        return promise.then((data) => exports.QueryLastClaimResponse.decode(new minimal_1.default.Reader(data)));
-    }
     CommitmentCurve(request) {
         const data = exports.QueryCommitmentCurveRequest.encode(request).finish();
         const promise = this.rpc.request("Switcheo.carbon.liquiditypool.Query", "CommitmentCurve", data);

package/lib/codec/liquiditypool/reward.d.ts

@@ -27,6 +27,7 @@ export interface Commitment {
     liquidity?: Coin;
     startTime?: Date;
     duration: Long;
+    rewardDebt: DecCoin[];
 }
 export interface CommitmentRecord {
     address: string;
@@ -49,14 +50,18 @@ export interface CommitmentResponse {
     commitmentPower: string;
     boostFactor: string;
 }
+/** Deprecated: use AccumulatedRewards */
 export interface RewardHistory {
     poolId: Long;
     rewards: DecCoin[];
     totalCommitment: string;
 }
-export interface RewardHistoryRecord {
-    height: Long;
-    rewardHistory?: RewardHistory;
+export interface AccumulatedRewards {
+    rewardPerCommitmentShare: DecCoin[];
+}
+export interface AccumulatedRewardsRecord {
+    poolId: Long;
+    accumulatedRewards?: AccumulatedRewards;
 }
 export interface CommitmentExpiry {
     poolId: Long;
@@ -69,11 +74,6 @@ export interface CommitmentExpiriesRecord {
     expiryTime: Long;
     commitmentExpiries?: CommitmentExpiries;
 }
-export interface LastClaimRecord {
-    address: string;
-    poolId: Long;
-    height: Long;
-}
 export interface AllocatedRewards {
     coins: DecCoin[];
 }
@@ -147,12 +147,19 @@ export declare const RewardHistory: {
     toJSON(message: RewardHistory): unknown;
     fromPartial(object: DeepPartial<RewardHistory>): RewardHistory;
 };
-export declare const RewardHistoryRecord: {
-    encode(message: RewardHistoryRecord, writer?: _m0.Writer): _m0.Writer;
-    decode(input: _m0.Reader | Uint8Array, length?: number | undefined): RewardHistoryRecord;
-    fromJSON(object: any): RewardHistoryRecord;
-    toJSON(message: RewardHistoryRecord): unknown;
-    fromPartial(object: DeepPartial<RewardHistoryRecord>): RewardHistoryRecord;
+export declare const AccumulatedRewards: {
+    encode(message: AccumulatedRewards, writer?: _m0.Writer): _m0.Writer;
+    decode(input: _m0.Reader | Uint8Array, length?: number | undefined): AccumulatedRewards;
+    fromJSON(object: any): AccumulatedRewards;
+    toJSON(message: AccumulatedRewards): unknown;
+    fromPartial(object: DeepPartial<AccumulatedRewards>): AccumulatedRewards;
+};
+export declare const AccumulatedRewardsRecord: {
+    encode(message: AccumulatedRewardsRecord, writer?: _m0.Writer): _m0.Writer;
+    decode(input: _m0.Reader | Uint8Array, length?: number | undefined): AccumulatedRewardsRecord;
+    fromJSON(object: any): AccumulatedRewardsRecord;
+    toJSON(message: AccumulatedRewardsRecord): unknown;
+    fromPartial(object: DeepPartial<AccumulatedRewardsRecord>): AccumulatedRewardsRecord;
 };
 export declare const CommitmentExpiry: {
     encode(message: CommitmentExpiry, writer?: _m0.Writer): _m0.Writer;
@@ -175,13 +182,6 @@ export declare const CommitmentExpiriesRecord: {
     toJSON(message: CommitmentExpiriesRecord): unknown;
     fromPartial(object: DeepPartial<CommitmentExpiriesRecord>): CommitmentExpiriesRecord;
 };
-export declare const LastClaimRecord: {
-    encode(message: LastClaimRecord, writer?: _m0.Writer): _m0.Writer;
-    decode(input: _m0.Reader | Uint8Array, length?: number | undefined): LastClaimRecord;
-    fromJSON(object: any): LastClaimRecord;
-    toJSON(message: LastClaimRecord): unknown;
-    fromPartial(object: DeepPartial<LastClaimRecord>): LastClaimRecord;
-};
 export declare const AllocatedRewards: {
     encode(message: AllocatedRewards, writer?: _m0.Writer): _m0.Writer;
     decode(input: _m0.Reader | Uint8Array, length?: number | undefined): AllocatedRewards;