carbon-js-sdk 0.3.45 → 0.3.46

package/lib/modules/cdp.d.ts

@@ -1,10 +1,10 @@
 /// <reference types="long" />
 import { AssetParams, DebtInfo, RateStrategyParams, StablecoinDebtInfo } from "../codec";
+import { Params } from "../codec/cdp/params";
 import { CarbonTx } from "../util";
 import { BigNumber } from "bignumber.js";
 import { Debt } from "./../codec/cdp/query";
 import BaseModule from "./base";
-import { Params } from "../codec/cdp/params";
 export declare class CDPModule extends BaseModule {
     private cdpModuleAddress;
     supplyAsset(params: CDPModule.SupplyAssetParams, opts?: CarbonTx.SignTxOpts): Promise<import("@cosmjs/stargate").DeliverTxResponse>;
@@ -12,13 +12,19 @@ export declare class CDPModule extends BaseModule {
     lockCollateral(params: CDPModule.LockCollateralParams, opts?: CarbonTx.SignTxOpts): Promise<import("@cosmjs/stargate").DeliverTxResponse>;
     unlockCollateral(params: CDPModule.UnlockCollateralParams, opts?: CarbonTx.SignTxOpts): Promise<import("@cosmjs/stargate").DeliverTxResponse>;
     borrowAsset(params: CDPModule.BorrowAssetParams, opts?: CarbonTx.SignTxOpts): Promise<import("@cosmjs/stargate").DeliverTxResponse>;
-    repayAsset(params: CDPModule.RepayAssetParams, opts?: CarbonTx.SignTxOpts): Promise<import("@cosmjs/stargate").DeliverTxResponse>;
     supplyAssetAndLockCollateral(params: CDPModule.SupplyAssetAndLockCollateralParams, opts?: CarbonTx.SignTxOpts): Promise<import("@cosmjs/stargate").DeliverTxResponse>;
     unlockCollateralAndWithdrawAsset(params: CDPModule.UnlockCollateralAndWithdrawAssetParams, opts?: CarbonTx.SignTxOpts): Promise<import("@cosmjs/stargate").DeliverTxResponse>;
     liquidateCollateral(params: CDPModule.LiquidateCollateralParams, opts?: CarbonTx.SignTxOpts): Promise<import("@cosmjs/stargate").DeliverTxResponse>;
     liquidateCollateralWithCdpTokens(params: CDPModule.LiquidateCollateralWithCdpTokensParams, opts?: CarbonTx.SignTxOpts): Promise<import("@cosmjs/stargate").DeliverTxResponse>;
     liquidateCollateralWithCollateral(params: CDPModule.LiquidateCollateralWithCollateralParams, opts?: CarbonTx.SignTxOpts): Promise<import("@cosmjs/stargate").DeliverTxResponse>;
     liquidateCollateralWithStablecoin(params: CDPModule.LiquidateCollateralWithStablecoinParams, opts?: CarbonTx.SignTxOpts): Promise<import("@cosmjs/stargate").DeliverTxResponse>;
+    repayAsset(params: CDPModule.RepayAssetParams, opts?: CarbonTx.SignTxOpts): Promise<import("@cosmjs/stargate").DeliverTxResponse>;
+    /**
+     * Uses grouped token balance to repay for existing CDP asset debt.
+     * Calls 2 msg in 1 tx, MsgWithdrawFromGroup and MsgRepayAsset.
+     * Ensure that grouped token balance is sufficient.
+     */
+    repayAssetWithGroupedToken(params: CDPModule.RepayAssetWithGroupedToken, opts?: CarbonTx.SignTxOpts): Promise<import("@cosmjs/stargate").DeliverTxResponse>;
     repayAssetWithCdpTokens(params: CDPModule.RepayAssetWithCdpTokensParams, opts?: CarbonTx.SignTxOpts): Promise<import("@cosmjs/stargate").DeliverTxResponse>;
     repayAssetWithCollateral(params: CDPModule.RepayAssetWithCollateralParams, opts?: CarbonTx.SignTxOpts): Promise<import("@cosmjs/stargate").DeliverTxResponse>;
     mintStablecoin(params: CDPModule.MintStablecoinParams, opts?: CarbonTx.SignTxOpts): Promise<import("@cosmjs/stargate").DeliverTxResponse>;
@@ -162,6 +168,11 @@ export declare namespace CDPModule {
         cdpDenom: string;
         cdpAmount: BigNumber;
     }
+    interface RepayAssetWithGroupedToken {
+        denom: string;
+        amount: BigNumber;
+        debtor?: string;
+    }
     interface RepayAssetWithCollateralParams {
         debtor?: string;
         debtDenom: string;

package/lib/modules/cdp.js

@@ -13,18 +13,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CDPModule = void 0;
+const TokenClient_1 = __importDefault(require("../clients/TokenClient"));
 const codec_1 = require("../codec");
 const query_1 = require("../codec/cdp/query");
 const tx_1 = require("../codec/cdp/tx");
 const query_2 = require("../codec/cosmos/bank/v1beta1/query");
+const constant_1 = require("../constant");
 const util_1 = require("../util");
+const address_1 = require("../util/address");
 const number_1 = require("../util/number");
 const bignumber_js_1 = require("bignumber.js");
 const query_3 = require("./../codec/cdp/query");
 const base_1 = __importDefault(require("./base"));
-const constant_1 = require("../constant");
-const TokenClient_1 = __importDefault(require("../clients/TokenClient"));
-const address_1 = require("../util/address");
 class CDPModule extends base_1.default {
     supplyAsset(params, opts) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -96,21 +96,6 @@ class CDPModule extends base_1.default {
             }, opts);
         });
     }
-    repayAsset(params, opts) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const wallet = this.getWallet();
-            const value = tx_1.MsgRepayAsset.fromPartial({
-                creator: wallet.bech32Address,
-                denom: params.denom,
-                amount: params.amount.toString(10),
-                debtor: params.debtor,
-            });
-            return yield wallet.sendTx({
-                typeUrl: util_1.CarbonTx.Types.MsgRepayAsset,
-                value,
-            }, opts);
-        });
-    }
     supplyAssetAndLockCollateral(params, opts) {
         return __awaiter(this, void 0, void 0, function* () {
             const wallet = this.getWallet();
@@ -215,6 +200,50 @@ class CDPModule extends base_1.default {
             }, opts);
         });
     }
+    repayAsset(params, opts) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const wallet = this.getWallet();
+            const value = tx_1.MsgRepayAsset.fromPartial({
+                creator: wallet.bech32Address,
+                denom: params.denom,
+                amount: params.amount.toString(10),
+                debtor: params.debtor,
+            });
+            return yield wallet.sendTx({
+                typeUrl: util_1.CarbonTx.Types.MsgRepayAsset,
+                value,
+            }, opts);
+        });
+    }
+    /**
+     * Uses grouped token balance to repay for existing CDP asset debt.
+     * Calls 2 msg in 1 tx, MsgWithdrawFromGroup and MsgRepayAsset.
+     * Ensure that grouped token balance is sufficient.
+     */
+    repayAssetWithGroupedToken(params, opts) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const wallet = this.getWallet();
+            const debtor = params.debtor ? params.debtor : wallet.bech32Address;
+            return yield wallet.sendTxs([{
+                    typeUrl: util_1.CarbonTx.Types.MsgWithdrawFromGroup,
+                    value: codec_1.MsgWithdrawFromGroup.fromPartial({
+                        creator: wallet.bech32Address,
+                        sourceCoin: {
+                            amount: params.amount.toString(10),
+                            denom: params.denom,
+                        },
+                    }),
+                }, {
+                    typeUrl: util_1.CarbonTx.Types.MsgRepayAsset,
+                    value: tx_1.MsgRepayAsset.fromPartial({
+                        creator: wallet.bech32Address,
+                        debtor: debtor,
+                        denom: params.denom,
+                        amount: params.amount.toString(10),
+                    }),
+                }], opts);
+        });
+    }
     repayAssetWithCdpTokens(params, opts) {
         return __awaiter(this, void 0, void 0, function* () {
             const wallet = this.getWallet();

package/package.json

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