carbon-js-sdk 0.3.2 → 0.3.3

package/lib/clients/TokenClient.js

@@ -379,8 +379,10 @@ class TokenClient {
         return swthTokens;
     }
     getCdpUnderlyingToken(cdpDenom) {
-        if (!this.cdpTokens[cdpDenom])
-            throw new Error("not a CDP denom");
+        if (!this.cdpTokens[cdpDenom]) {
+            console.error("not a CDP denom");
+            return undefined;
+        }
         const tokenDenom = cdpDenom.replace(regexCdpDenom, "");
         return this.tokenForDenom(tokenDenom);
     }

package/lib/codec/cdp/tx.d.ts

@@ -222,13 +222,6 @@ export interface MsgCreateRewardScheme {
     createRewardSchemeParams?: CreateRewardSchemeParams;
 }
 export interface MsgCreateRewardSchemeResponse {
-    id: Long;
-    rewardDenom: string;
-    assetDenom: string;
-    rewardType: string;
-    rewardAmountPerSecond: string;
-    startTime?: Date;
-    endTime?: Date;
 }
 export interface MsgUpdateRewardScheme {
     updator: string;
@@ -653,11 +646,11 @@ export declare const MsgCreateRewardScheme: {
     fromPartial(object: DeepPartial<MsgCreateRewardScheme>): MsgCreateRewardScheme;
 };
 export declare const MsgCreateRewardSchemeResponse: {
-    encode(message: MsgCreateRewardSchemeResponse, writer?: _m0.Writer): _m0.Writer;
+    encode(_: MsgCreateRewardSchemeResponse, writer?: _m0.Writer): _m0.Writer;
     decode(input: _m0.Reader | Uint8Array, length?: number | undefined): MsgCreateRewardSchemeResponse;
-    fromJSON(object: any): MsgCreateRewardSchemeResponse;
-    toJSON(message: MsgCreateRewardSchemeResponse): unknown;
-    fromPartial(object: DeepPartial<MsgCreateRewardSchemeResponse>): MsgCreateRewardSchemeResponse;
+    fromJSON(_: any): MsgCreateRewardSchemeResponse;
+    toJSON(_: MsgCreateRewardSchemeResponse): unknown;
+    fromPartial(_: DeepPartial<MsgCreateRewardSchemeResponse>): MsgCreateRewardSchemeResponse;
 };
 export declare const MsgUpdateRewardScheme: {
     encode(message: MsgUpdateRewardScheme, writer?: _m0.Writer): _m0.Writer;

package/lib/codec/cdp/tx.js

@@ -11,7 +11,6 @@ const minimal_1 = __importDefault(require("protobufjs/minimal"));
 const rate_strategy_params_1 = require("./rate_strategy_params");
 const asset_params_1 = require("./asset_params");
 const reward_scheme_1 = require("./reward_scheme");
-const timestamp_1 = require("../google/protobuf/timestamp");
 exports.protobufPackage = "Switcheo.carbon.cdp";
 const baseMsgAddRateStrategy = { creator: "" };
 exports.MsgAddRateStrategy = {
@@ -3288,36 +3287,9 @@ exports.MsgCreateRewardScheme = {
         return message;
     },
 };
-const baseMsgCreateRewardSchemeResponse = {
-    id: long_1.default.UZERO,
-    rewardDenom: "",
-    assetDenom: "",
-    rewardType: "",
-    rewardAmountPerSecond: "",
-};
+const baseMsgCreateRewardSchemeResponse = {};
 exports.MsgCreateRewardSchemeResponse = {
-    encode(message, writer = minimal_1.default.Writer.create()) {
-        if (!message.id.isZero()) {
-            writer.uint32(8).uint64(message.id);
-        }
-        if (message.rewardDenom !== "") {
-            writer.uint32(18).string(message.rewardDenom);
-        }
-        if (message.assetDenom !== "") {
-            writer.uint32(26).string(message.assetDenom);
-        }
-        if (message.rewardType !== "") {
-            writer.uint32(34).string(message.rewardType);
-        }
-        if (message.rewardAmountPerSecond !== "") {
-            writer.uint32(42).string(message.rewardAmountPerSecond);
-        }
-        if (message.startTime !== undefined) {
-            timestamp_1.Timestamp.encode(toTimestamp(message.startTime), writer.uint32(50).fork()).ldelim();
-        }
-        if (message.endTime !== undefined) {
-            timestamp_1.Timestamp.encode(toTimestamp(message.endTime), writer.uint32(58).fork()).ldelim();
-        }
+    encode(_, writer = minimal_1.default.Writer.create()) {
         return writer;
     },
     decode(input, length) {
@@ -3327,27 +3299,6 @@ exports.MsgCreateRewardSchemeResponse = {
         while (reader.pos < end) {
             const tag = reader.uint32();
             switch (tag >>> 3) {
-                case 1:
-                    message.id = reader.uint64();
-                    break;
-                case 2:
-                    message.rewardDenom = reader.string();
-                    break;
-                case 3:
-                    message.assetDenom = reader.string();
-                    break;
-                case 4:
-                    message.rewardType = reader.string();
-                    break;
-                case 5:
-                    message.rewardAmountPerSecond = reader.string();
-                    break;
-                case 6:
-                    message.startTime = fromTimestamp(timestamp_1.Timestamp.decode(reader, reader.uint32()));
-                    break;
-                case 7:
-                    message.endTime = fromTimestamp(timestamp_1.Timestamp.decode(reader, reader.uint32()));
-                    break;
                 default:
                     reader.skipType(tag & 7);
                     break;
@@ -3355,68 +3306,16 @@ exports.MsgCreateRewardSchemeResponse = {
         }
         return message;
     },
-    fromJSON(object) {
+    fromJSON(_) {
         const message = Object.assign({}, baseMsgCreateRewardSchemeResponse);
-        message.id =
-            object.id !== undefined && object.id !== null
-                ? long_1.default.fromString(object.id)
-                : long_1.default.UZERO;
-        message.rewardDenom =
-            object.rewardDenom !== undefined && object.rewardDenom !== null
-                ? String(object.rewardDenom)
-                : "";
-        message.assetDenom =
-            object.assetDenom !== undefined && object.assetDenom !== null
-                ? String(object.assetDenom)
-                : "";
-        message.rewardType =
-            object.rewardType !== undefined && object.rewardType !== null
-                ? String(object.rewardType)
-                : "";
-        message.rewardAmountPerSecond =
-            object.rewardAmountPerSecond !== undefined &&
-                object.rewardAmountPerSecond !== null
-                ? String(object.rewardAmountPerSecond)
-                : "";
-        message.startTime =
-            object.startTime !== undefined && object.startTime !== null
-                ? fromJsonTimestamp(object.startTime)
-                : undefined;
-        message.endTime =
-            object.endTime !== undefined && object.endTime !== null
-                ? fromJsonTimestamp(object.endTime)
-                : undefined;
         return message;
     },
-    toJSON(message) {
+    toJSON(_) {
         const obj = {};
-        message.id !== undefined &&
-            (obj.id = (message.id || long_1.default.UZERO).toString());
-        message.rewardDenom !== undefined &&
-            (obj.rewardDenom = message.rewardDenom);
-        message.assetDenom !== undefined && (obj.assetDenom = message.assetDenom);
-        message.rewardType !== undefined && (obj.rewardType = message.rewardType);
-        message.rewardAmountPerSecond !== undefined &&
-            (obj.rewardAmountPerSecond = message.rewardAmountPerSecond);
-        message.startTime !== undefined &&
-            (obj.startTime = message.startTime.toISOString());
-        message.endTime !== undefined &&
-            (obj.endTime = message.endTime.toISOString());
         return obj;
     },
-    fromPartial(object) {
-        var _a, _b, _c, _d, _e, _f;
+    fromPartial(_) {
         const message = Object.assign({}, baseMsgCreateRewardSchemeResponse);
-        message.id =
-            object.id !== undefined && object.id !== null
-                ? long_1.default.fromValue(object.id)
-                : long_1.default.UZERO;
-        message.rewardDenom = (_a = object.rewardDenom) !== null && _a !== void 0 ? _a : "";
-        message.assetDenom = (_b = object.assetDenom) !== null && _b !== void 0 ? _b : "";
-        message.rewardType = (_c = object.rewardType) !== null && _c !== void 0 ? _c : "";
-        message.rewardAmountPerSecond = (_d = object.rewardAmountPerSecond) !== null && _d !== void 0 ? _d : "";
-        message.startTime = (_e = object.startTime) !== null && _e !== void 0 ? _e : undefined;
-        message.endTime = (_f = object.endTime) !== null && _f !== void 0 ? _f : undefined;
         return message;
     },
 };
@@ -3987,30 +3886,6 @@ class MsgClientImpl {
     }
 }
 exports.MsgClientImpl = MsgClientImpl;
-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();

package/lib/modules/cdp.d.ts

@@ -47,7 +47,10 @@ export declare class CDPModule extends BaseModule {
     calculateAPY(denom: string, debtInfo?: DebtInfo, assetParams?: AssetParams, rateStrategyParams?: RateStrategyParams): Promise<BigNumber>;
     static calculateInterestForTimePeriod(apy: BigNumber, start: Date, end: Date): BigNumber;
     calculateLendAPY(denom: string, borrowInterest?: BigNumber, debtInfo?: DebtInfo, params?: Params): Promise<BigNumber>;
-    recalculateCIM(denom: string, debtInfo?: DebtInfo): Promise<BigNumber>;
+    recalculateCIM(denom: string, debtInfo?: DebtInfo): Promise<{
+        cim: BigNumber;
+        interest: BigNumber;
+    }>;
     recalculateStablecoinCIM(debtInfo?: StablecoinDebtInfo): Promise<BigNumber>;
     getMaxCollateralForUnlock(account: string, cdpDenom: string): Promise<BigNumber | undefined>;
     getCdpModuleAddress(): string;

package/lib/modules/cdp.js

@@ -516,12 +516,15 @@ class CDPModule extends base_1.default {
             }
             if (!debtInfo)
                 throw new Error("unable to retrieve debt info");
+            const cimRsp = yield this.recalculateCIM(denom, debtInfo);
+            const newInterestRate = cimRsp.interest;
             const principal = (0, number_1.bnOrZero)(debtInfo.totalPrincipal);
-            const interest = principal.multipliedBy((0, number_1.bnOrZero)(debtInfo.cumulativeInterestMultiplier).shiftedBy(-18).minus(1));
+            const accumInterest = (0, number_1.bnOrZero)(debtInfo.totalAccumulatedInterest);
+            const newInterest = principal.times(newInterestRate).plus(accumInterest.times(number_1.BN_ONE.plus(newInterestRate)));
             const cdpParamsRsp = yield this.sdkProvider.query.cdp.Params(query_1.QueryParamsRequest.fromPartial({}));
             const interestFee = (0, number_1.bnOrZero)((_a = cdpParamsRsp.params) === null || _a === void 0 ? void 0 : _a.interestFee);
-            const interestWithoutFee = interest.times(number_1.BN_10000.minus(interestFee)).dividedToIntegerBy(number_1.BN_10000);
-            return principal.plus(interestWithoutFee);
+            const interest = newInterest.times(number_1.BN_10000.minus(interestFee)).dividedToIntegerBy(number_1.BN_10000);
+            return principal.plus(interest);
         });
     }
     getTotalAccountTokenDebt(account, denom, debt, debtInfo) {
@@ -541,7 +544,8 @@ class CDPModule extends base_1.default {
             const initialCIM = (0, number_1.bnOrZero)(debt === null || debt === void 0 ? void 0 : debt.initialCumulativeInterestMultiplier);
             if (principalAmount.isZero() || initialCIM.isZero())
                 return number_1.BN_ZERO;
-            const cim = yield this.recalculateCIM(denom, debtInfo);
+            const cimRsp = yield this.recalculateCIM(denom, debtInfo);
+            const cim = cimRsp.cim;
             if (!cim)
                 throw new Error("unable to retrieve account debt");
             // TODO: change to round up
@@ -642,14 +646,14 @@ class CDPModule extends base_1.default {
                 const debtInfoResponse = yield sdk.query.cdp.TokenDebt(query_1.QueryTokenDebtRequest.fromPartial({ denom }));
                 debtInfo = debtInfoResponse.debtInfo;
                 if (!debtInfo) {
-                    return number_1.BN_ZERO;
+                    return { cim: number_1.BN_ZERO, interest: number_1.BN_ZERO };
                 }
             }
             const cim = (0, number_1.bnOrZero)(debtInfo.cumulativeInterestMultiplier);
             const apy = yield this.calculateAPY(denom, debtInfo);
-            const interest = CDPModule.calculateInterestForTimePeriod(apy, (_a = debtInfo.lastUpdatedTime) !== null && _a !== void 0 ? _a : new Date(0), new Date());
-            const newCIM = cim.times(interest.plus(1));
-            return newCIM;
+            const newInterest = CDPModule.calculateInterestForTimePeriod(apy, (_a = debtInfo.lastUpdatedTime) !== null && _a !== void 0 ? _a : new Date(0), new Date());
+            const newCIM = cim.times(newInterest.plus(1));
+            return { cim: newCIM, interest: newInterest };
         });
     }
     recalculateStablecoinCIM(debtInfo) {

package/lib/util/tx.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="node" />
 import * as CosmosModels from "../codec/cosmos-models";
 import { StdFee } from "@cosmjs/amino";
-import { SignerData } from "@cosmjs/stargate";
+import { DeliverTxResponse, SignerData } from "@cosmjs/stargate";
 import { SWTHAddressOptions } from "./address";
 export { StdSignDoc } from "@cosmjs/amino";
 export interface TxBody extends Omit<CosmosModels.Tx.TxBody, "messages"> {
@@ -47,6 +47,10 @@ export interface TxResponse {
     code?: number;
     codespace?: string;
 }
+export declare class CarbonTxError extends Error {
+    readonly response: DeliverTxResponse;
+    constructor(msg: string, response: DeliverTxResponse);
+}
 export declare const Types: {
     MsgSetTradingFlag: string;
     MsgSetTradingFlagResponse: string;

package/lib/util/tx.js

@@ -19,7 +19,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TxGasCostTypeMap = exports.TxMinGasPriceTypeDefaultKey = exports.TxGasCostTypeDefaultKey = exports.DEFAULT_SIGN_OPTS = exports.Types = exports.BroadcastTxMode = exports.getSender = exports.decode = void 0;
+exports.TxGasCostTypeMap = exports.TxMinGasPriceTypeDefaultKey = exports.TxGasCostTypeDefaultKey = exports.DEFAULT_SIGN_OPTS = exports.Types = exports.CarbonTxError = exports.BroadcastTxMode = exports.getSender = exports.decode = void 0;
 const codec_1 = require("../codec");
 const CosmosModels = __importStar(require("../codec/cosmos-models"));
 const constant_1 = require("../constant");
@@ -104,6 +104,13 @@ var BroadcastTxMode;
     BroadcastTxMode["BroadcastTxSync"] = "sync";
     BroadcastTxMode["BroadcastTxBlock"] = "block";
 })(BroadcastTxMode = exports.BroadcastTxMode || (exports.BroadcastTxMode = {}));
+class CarbonTxError extends Error {
+    constructor(msg, response) {
+        super(msg);
+        this.response = response;
+    }
+}
+exports.CarbonTxError = CarbonTxError;
 exports.Types = codec_1.TxTypes;
 exports.DEFAULT_SIGN_OPTS = {
     fee: constant_1.DEFAULT_FEE,

package/lib/wallet/CarbonWallet.js

@@ -168,7 +168,7 @@ class CarbonWallet {
             const response = yield carbonClient.broadcastTx(tx, timeoutMs, pollIntervalMs);
             if ((0, stargate_1.isDeliverTxFailure)(response)) {
                 // tx failed
-                throw new Error(`[${response.code}] ${response.rawLog}`);
+                throw new tx_1.CarbonTxError(`[${response.code}] ${response.rawLog}`, response);
             }
             return response;
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "carbon-js-sdk",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "description": "TypeScript SDK for Carbon blockchain",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",