carbon-js-sdk 0.3.45 → 0.3.47

package/lib/constant/ibc.js

@@ -148,6 +148,12 @@ exports.EmbedChainInfosInit = {
                 coinDecimals: 6,
                 coinGeckoId: "ion",
             },
+            {
+                coinDenom: "axlUSDC",
+                coinMinimalDenom: "ibc/D189335C6E4A68B513C10AB227BF1C1D38C746766278BA3EEB4FB14124F1D858",
+                coinDecimals: 6,
+                coinGeckoId: "usd-coin",
+            },
         ],
         feeCurrencies: [
             {

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/lib/modules/cosmwasm.d.ts

@@ -0,0 +1,16 @@
+import { SDKProvider } from "../provider";
+import { TypeUtils } from "../util";
+import BigNumber from "bignumber.js";
+import { QueryClientImpl as CosmWasmQueryClient } from "cosmjs-types/cosmwasm/wasm/v1/query";
+import BaseModule from "./base";
+export interface BalanceResponse {
+    contractAddress: string;
+    balance: BigNumber;
+}
+export declare class CosmWasmModule extends BaseModule {
+    private cosmWasmClient;
+    constructor(cosmClient: CosmWasmQueryClient, sdkProvider: SDKProvider);
+    static instance(tmRpcUrl: string, sdkProvider: SDKProvider): Promise<CosmWasmModule>;
+    queryCosmwasmBalance(walletAddress: string, contractAddr: string): Promise<BalanceResponse>;
+    queryCosmwasmBalances(walletAddress: string, contractAddresses: string[]): Promise<TypeUtils.SimpleMap<BigNumber>>;
+}

package/lib/modules/cosmwasm.js

@@ -0,0 +1,67 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CosmWasmModule = void 0;
+const util_1 = require("../util");
+const query_1 = require("cosmjs-types/cosmwasm/wasm/v1/query");
+const stargate_1 = require("@cosmjs/stargate");
+const tendermint_rpc_1 = require("@cosmjs/tendermint-rpc");
+const base_1 = __importDefault(require("./base"));
+class CosmWasmModule extends base_1.default {
+    constructor(cosmClient, sdkProvider) {
+        super(sdkProvider);
+        this.cosmWasmClient = cosmClient;
+    }
+    static instance(tmRpcUrl, sdkProvider) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const tmClient = util_1.GenericUtils.modifyTmClient(yield tendermint_rpc_1.Tendermint34Client.connect(tmRpcUrl));
+            const baseClient = new stargate_1.QueryClient(tmClient);
+            const rpcClient = stargate_1.createProtobufRpcClient(baseClient);
+            const cosmWasmClient = new query_1.QueryClientImpl(rpcClient);
+            return new CosmWasmModule(cosmWasmClient, sdkProvider);
+        });
+    }
+    queryCosmwasmBalance(walletAddress, contractAddr) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const finalResult = {
+                contractAddress: contractAddr,
+                balance: util_1.NumberUtils.BN_ZERO,
+            };
+            try {
+                const smartContract = yield this.cosmWasmClient.SmartContractState({
+                    address: contractAddr,
+                    queryData: Buffer.from(JSON.stringify({ balance: { address: walletAddress } }), 'utf-8'),
+                });
+                const result = Buffer.from(smartContract.data).toString("utf-8");
+                const balanceJson = JSON.parse(result);
+                finalResult.balance = util_1.NumberUtils.bnOrZero(balanceJson.balance);
+            }
+            catch (err) {
+                console.error(err);
+            }
+            return finalResult;
+        });
+    }
+    queryCosmwasmBalances(walletAddress, contractAddresses) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const balancesMap = yield Promise.all(contractAddresses.map((contractAddr) => this.queryCosmwasmBalance(walletAddress, contractAddr)));
+            return balancesMap.reduce((prev, balance) => {
+                prev[balance.contractAddress] = balance.balance;
+                return prev;
+            }, {});
+        });
+    }
+    ;
+}
+exports.CosmWasmModule = CosmWasmModule;

package/lib/util/ibc.js

@@ -31,9 +31,13 @@ exports.totalAssetObj = Object.values(exports.EmbedChainInfos).reduce((prev, cha
     const channelsObj = constant_1.swthChannels[chainInfo.chainId];
     chainInfo.currencies.forEach((currency) => {
         var _a;
-        const ibcAddr = currency.coinDenom.toLowerCase() === "swth"
+        let ibcAddr = currency.coinDenom.toLowerCase() === "swth"
             ? currency.coinMinimalDenom
             : makeIBCMinimalDenom((_a = channelsObj === null || channelsObj === void 0 ? void 0 : channelsObj.sourceChannel) !== null && _a !== void 0 ? _a : "channel-0", currency.coinMinimalDenom);
+        // TODO: Remove when implementing dynamic ibc chain info
+        if (currency.coinMinimalDenom === "ibc/D189335C6E4A68B513C10AB227BF1C1D38C746766278BA3EEB4FB14124F1D858") {
+            ibcAddr = "ibc/7FBDBEEEBA9C50C4BCDF7BF438EAB99E64360833D240B32655C96E319559E911";
+        }
         assetsObj[ibcAddr] = currency;
     });
     newAssetObj[chainInfo.chainId] = assetsObj;
@@ -76,6 +80,11 @@ exports.BlockchainMap = Object.values(exports.EmbedChainInfos).reduce((prev, cha
     const channelsObj = constant_1.swthChannels[chainInfo.chainId];
     chainInfo.currencies.forEach((currency) => {
         var _a;
+        // TODO: Remove when implementing dynamic ibc chain info
+        if (currency.coinMinimalDenom === "ibc/D189335C6E4A68B513C10AB227BF1C1D38C746766278BA3EEB4FB14124F1D858") {
+            newPrev["ibc/7FBDBEEEBA9C50C4BCDF7BF438EAB99E64360833D240B32655C96E319559E911"] = exports.ChainIdBlockchainMap[chainInfo.chainId];
+            return;
+        }
         if (currency.coinDenom.toLowerCase() === "swth") {
             newPrev[currency.coinMinimalDenom] = exports.ChainIdBlockchainMap[chainInfo.chainId];
         }

package/package.json

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