carbon-js-sdk 0.3.39 → 0.3.41-beta.1

package/lib/clients/ETHClient.js

@@ -13,7 +13,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ETHClient = exports.FEE_MULTIPLIER = void 0;
-const CarbonSDK_1 = __importDefault(require("../CarbonSDK"));
 const constant_1 = require("../constant");
 const eth_1 = require("../eth");
 const util_1 = require("../util");
@@ -91,20 +90,22 @@ class ETHClient {
             const { fromToken, toToken, amount, toAddress, fromAddress, recoveryAddress, signer, gasPriceGwei, gasLimit, feeAmount, signCompleteCallback, } = params;
             const networkConfig = this.getNetworkConfig();
             const rpcProvider = this.getProvider();
-            if (!recoveryAddress.match(/^swth[a-z0-9]{39}$/)) {
+            const recoveryAddrRegex = new RegExp(`^${networkConfig.Bech32Prefix}[a-z0-9]{39}$`);
+            if (!recoveryAddress.match(recoveryAddrRegex)) {
                 throw new Error("Invalid recovery address");
             }
+            const carbonNetwork = networkConfig.network;
             const fromTokenId = fromToken.id;
             const fromTokenAddress = generic_1.appendHexPrefix(fromToken.tokenAddress);
             const toTokenDenom = toToken.denom;
-            const recoveryAddressHex = ethers_1.ethers.utils.hexlify(util_1.AddressUtils.SWTHAddress.getAddressBytes(recoveryAddress, CarbonSDK_1.default.Network.MainNet));
+            const recoveryAddressHex = ethers_1.ethers.utils.hexlify(util_1.AddressUtils.SWTHAddress.getAddressBytes(recoveryAddress, carbonNetwork));
             const fromAssetHash = ethers_1.ethers.utils.hexlify(ethers_1.ethers.utils.toUtf8Bytes(fromTokenId));
             const toAssetHash = ethers_1.ethers.utils.hexlify(ethers_1.ethers.utils.toUtf8Bytes(toTokenDenom));
             const nonce = yield rpcProvider.getTransactionCount(fromAddress);
             const contract = new ethers_1.ethers.Contract(this.getBridgeEntranceAddr(), eth_1.ABIs.bridgeEntrance, rpcProvider);
             const feeAddress = generic_1.appendHexPrefix(networkConfig.feeAddress);
             const tokenCreator = fromToken.creator;
-            const targetAddressBytes = util_1.AddressUtils.SWTHAddress.getAddressBytes(tokenCreator, CarbonSDK_1.default.Network.MainNet);
+            const targetAddressBytes = util_1.AddressUtils.SWTHAddress.getAddressBytes(tokenCreator, carbonNetwork);
             const targetProxyHash = ethers_1.ethers.utils.hexlify(targetAddressBytes);
             const ethAmount = fromToken.tokenAddress === constant_1.NativeTokenHash ? amount : number_1.BN_ZERO;
             const bridgeResultTx = yield contract.connect(signer).lock(fromTokenAddress, // the asset to deposit (from) (0x00 if eth)

package/lib/clients/TokenClient.d.ts

@@ -1,4 +1,4 @@
-import { Token } from "../codec";
+import { Token, TokenPrice } from "../codec";
 import { NetworkConfigProvider } from "../constant";
 import { FeeQuote } from "../hydrogen/feeQuote";
 import { BlockchainUtils, TypeUtils } from "../util";
@@ -57,6 +57,8 @@ declare class TokenClient {
     reloadDenomGeckoMap(): Promise<void>;
     reloadUSDValues(denoms?: string[]): Promise<TypeUtils.SimpleMap<BigNumber>>;
     getUSDValuesFromCoinGecko(geckoIds: string[]): Promise<any>;
+    processTokenPrices(tokenPrices: TokenPrice[]): TypeUtils.SimpleMap<BigNumber>;
+    getUSDValuesFromPricingModule(): Promise<TypeUtils.SimpleMap<BigNumber>>;
     getDenomToGeckoIdMap(): Promise<TypeUtils.SimpleMap<string>>;
     setCommonAssetConfig(): void;
 }

package/lib/clients/TokenClient.js

@@ -81,6 +81,7 @@ class TokenClient {
     }
     getBlockchain(denom) {
         var _a, _b, _c;
+        const networkConfig = this.configProvider.getConfig();
         // chainId defaults to 3 so that blockchain will be undefined
         let chainId = (_c = (_b = (_a = this.tokens[denom]) === null || _a === void 0 ? void 0 : _a.chainId) === null || _b === void 0 ? void 0 : _b.toNumber()) !== null && _c !== void 0 ? _c : 3;
         if (this.isNativeToken(denom) || this.isNativeStablecoin(denom) || TokenClient.isPoolToken(denom) || TokenClient.isCdpToken(denom)) {
@@ -91,7 +92,7 @@ class TokenClient {
         if (TokenClient.isIBCDenom(denom)) {
             return util_1.IBCUtils.BlockchainMap[denom];
         }
-        const blockchain = util_1.BlockchainUtils.blockchainForChainId(chainId);
+        const blockchain = util_1.BlockchainUtils.blockchainForChainId(chainId, networkConfig.network);
         return blockchain;
     }
     getSymbol(denom) {
@@ -229,6 +230,7 @@ class TokenClient {
         return result;
     }
     getWrappedToken(denom, blockchain) {
+        const networkConfig = this.configProvider.getConfig();
         // if denom is already a wrapped denom or no blockchain was specified,
         // just return the input denom.
         if (this.wrapperMap[denom] || !blockchain) {
@@ -243,7 +245,7 @@ class TokenClient {
                 }
                 // check if wrapped denom is of correct blockchain
                 const token = this.tokens[wrappedDenom];
-                let tokenChain = util_1.BlockchainUtils.blockchainForChainId(token.chainId.toNumber());
+                let tokenChain = util_1.BlockchainUtils.blockchainForChainId(token.chainId.toNumber(), networkConfig.network);
                 if (TokenClient.isIBCDenom(wrappedDenom)) {
                     tokenChain = util_1.IBCUtils.BlockchainMap[wrappedDenom];
                 }
@@ -282,13 +284,14 @@ class TokenClient {
         return denom === "usc";
     }
     getDepositTokenFor(tokenDenom, chain) {
+        const networkConfig = this.configProvider.getConfig();
         const token = this.tokenForDenom(tokenDenom);
         if (!token) {
             console.error("getDepositTokenFor token not found for", tokenDenom);
             return;
         }
         // check if selected token is a source token
-        let targetChain = util_1.BlockchainUtils.blockchainForChainId(token.chainId.toNumber());
+        let targetChain = util_1.BlockchainUtils.blockchainForChainId(token.chainId.toNumber(), networkConfig.network);
         if (TokenClient.isIBCDenom(token.denom)) {
             targetChain = util_1.IBCUtils.BlockchainMap[token.denom];
         }
@@ -415,25 +418,30 @@ class TokenClient {
             this.usdValues.iusd = number_1.BN_ONE;
             //Get corresponding geckoId for denoms and removes any duplicated geckoIds (espeically for different wrapped tokens as they correspond to the same geckoId(same price))
             const geckoIds = denoms.reduce((coinIds, denom) => {
-                var _a;
-                const geckoId = (_a = this.geckoTokenNames[denom]) !== null && _a !== void 0 ? _a : denom;
+                // To ensure that ibc denoms are not added to the gecko ids list, the default is removed.
+                const geckoId = this.geckoTokenNames[denom];
                 if (geckoId && !coinIds.includes(geckoId)) {
                     coinIds.push(geckoId);
                 }
                 return coinIds;
             }, []);
             const geckoIdToUsdPriceMap = yield this.getUSDValuesFromCoinGecko(geckoIds);
+            const carbonTokenPrices = yield this.getUSDValuesFromPricingModule();
             const uscStablecoin = this.getNativeStablecoin();
             //store price based on denoms
             for (const denom of denoms) {
+                const carbonTokenPrice = carbonTokenPrices[denom];
+                // if token price in pricing module exists for denom, return that as usd price first
+                // else check coingecko
+                if (carbonTokenPrice) {
+                    this.usdValues[denom] = carbonTokenPrice;
+                    continue;
+                }
                 const coinId = (_a = this.geckoTokenNames[denom]) !== null && _a !== void 0 ? _a : denom;
                 const price = util_1.NumberUtils.bnOrZero((_b = geckoIdToUsdPriceMap === null || geckoIdToUsdPriceMap === void 0 ? void 0 : geckoIdToUsdPriceMap[coinId]) === null || _b === void 0 ? void 0 : _b.usd);
                 if (price.gt(0)) {
-                    if (denom === (uscStablecoin === null || uscStablecoin === void 0 ? void 0 : uscStablecoin.denom)) {
-                        this.usdValues[denom] = constant_1.uscUsdValue;
-                        continue;
-                    }
-                    this.usdValues[denom] = price;
+                    // if denom is usc, then return uscUsdValue, else return coingecko usd price
+                    this.usdValues[denom] = denom === (uscStablecoin === null || uscStablecoin === void 0 ? void 0 : uscStablecoin.denom) ? constant_1.uscUsdValue : price;
                 }
             }
             return this.usdValues;
@@ -441,10 +449,45 @@ class TokenClient {
     }
     getUSDValuesFromCoinGecko(geckoIds) {
         return __awaiter(this, void 0, void 0, function* () {
-            const response = yield util_1.FetchUtils.fetch(`https://coingecko-proxy.dem.exchange/price?ids=${geckoIds.join(",")}&vs_currencies=usd`);
+            const response = yield util_1.FetchUtils.fetch(`https://coingecko-proxy.dem.exchange/api/v3/simple/price?ids=${geckoIds.join(",")}&vs_currencies=usd`);
             return yield response.json();
         });
     }
+    processTokenPrices(tokenPrices) {
+        return tokenPrices.reduce((prevPrices, price) => {
+            const newPrev = prevPrices;
+            newPrev[price.denom] = number_1.bnOrZero(price.twap).shiftedBy(-constant_1.decTypeDecimals);
+            return newPrev;
+        }, {});
+    }
+    getUSDValuesFromPricingModule() {
+        var _a, _b, _c, _d;
+        return __awaiter(this, void 0, void 0, function* () {
+            const initTokenPrices = yield this.query.pricing.TokenPriceAll({
+                pagination: {
+                    limit: new long_1.default(10000),
+                    offset: new long_1.default(0),
+                    key: new Uint8Array(),
+                    countTotal: true,
+                    reverse: false,
+                },
+            });
+            if (((_a = initTokenPrices.pagination) === null || _a === void 0 ? void 0 : _a.total) && ((_b = initTokenPrices.pagination) === null || _b === void 0 ? void 0 : _b.total.lt(10000))) {
+                const tokenPricesMap = this.processTokenPrices(initTokenPrices.tokenPrices);
+                return tokenPricesMap;
+            }
+            const fullTokenPrices = yield this.query.pricing.TokenPriceAll({
+                pagination: {
+                    limit: (_d = (_c = initTokenPrices.pagination) === null || _c === void 0 ? void 0 : _c.total) !== null && _d !== void 0 ? _d : new long_1.default(0),
+                    offset: new long_1.default(0),
+                    key: new Uint8Array(),
+                    countTotal: true,
+                    reverse: false,
+                },
+            });
+            return this.processTokenPrices(fullTokenPrices.tokenPrices);
+        });
+    }
     getDenomToGeckoIdMap() {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {

package/lib/clients/ZILClient.js

@@ -13,7 +13,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ZILClient = exports.balanceBatchRequest = exports.tokenBalanceBatchRequest = exports.BatchRequestType = void 0;
-const CarbonSDK_1 = __importDefault(require("../CarbonSDK"));
 const index_1 = require("../index");
 const address_1 = require("../util/address");
 const blockchain_1 = require("../util/blockchain");
@@ -201,14 +200,16 @@ class ZILClient {
         return __awaiter(this, void 0, void 0, function* () {
             const { fromToken, toToken, amount, fromAddress, recoveryAddress, toAddress, signer, gasPrice, gasLimit, feeAmount, signCompleteCallback, } = params;
             const networkConfig = this.getNetworkConfig();
-            if (!recoveryAddress.match(/^swth[a-z0-9]{39}$/)) {
+            const recoveryAddrRegex = new RegExp(`^${networkConfig.Bech32Prefix}[a-z0-9]{39}$`);
+            if (!recoveryAddress.match(recoveryAddrRegex)) {
                 throw new Error("Invalid recovery address");
             }
+            const carbonNetwork = networkConfig.network;
             const fromTokenId = fromToken.id;
             const fromTokenAddr = generic_1.appendHexPrefix(fromToken.tokenAddress);
             const toTokenDenom = toToken.denom;
             const targetProxyHash = generic_1.appendHexPrefix(this.getTargetProxyHash(fromToken));
-            const recoveryAddressHex = ethers_1.ethers.utils.hexlify(index_1.AddressUtils.SWTHAddress.getAddressBytes(recoveryAddress, CarbonSDK_1.default.Network.MainNet));
+            const recoveryAddressHex = ethers_1.ethers.utils.hexlify(index_1.AddressUtils.SWTHAddress.getAddressBytes(recoveryAddress, carbonNetwork));
             const fromAssetHash = ethers_1.ethers.utils.hexlify(ethers_1.ethers.utils.toUtf8Bytes(fromTokenId));
             const toAssetHash = ethers_1.ethers.utils.hexlify(ethers_1.ethers.utils.toUtf8Bytes(toTokenDenom));
             const feeAddress = generic_1.appendHexPrefix(networkConfig.feeAddress);

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

@@ -3,6 +3,7 @@ import _m0 from "protobufjs/minimal";
 export declare const protobufPackage = "Switcheo.carbon.cdp";
 export interface AssetParams {
     denom: string;
+    /** deprecated: oracle_id is now on pricing */
     oracleId: string;
     rateStrategyName: string;
     allowRepayStablecoinInterestDebt: boolean;

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

@@ -290,6 +290,12 @@ export interface MsgLiquidateCollateralWithStablecoinAndInterestInCollateral {
 }
 export interface MsgLiquidateCollateralWithStablecoinAndInterestInCollateralResponse {
 }
+export interface MsgConvertTokenInCdpToGroupTokens {
+    creator: string;
+    denom: string;
+}
+export interface MsgConvertTokenInCdpToGroupTokensResponse {
+}
 export declare const MsgAddRateStrategy: {
     encode(message: MsgAddRateStrategy, writer?: _m0.Writer): _m0.Writer;
     decode(input: _m0.Reader | Uint8Array, length?: number | undefined): MsgAddRateStrategy;
@@ -808,6 +814,20 @@ export declare const MsgLiquidateCollateralWithStablecoinAndInterestInCollateral
     toJSON(_: MsgLiquidateCollateralWithStablecoinAndInterestInCollateralResponse): unknown;
     fromPartial(_: DeepPartial<MsgLiquidateCollateralWithStablecoinAndInterestInCollateralResponse>): MsgLiquidateCollateralWithStablecoinAndInterestInCollateralResponse;
 };
+export declare const MsgConvertTokenInCdpToGroupTokens: {
+    encode(message: MsgConvertTokenInCdpToGroupTokens, writer?: _m0.Writer): _m0.Writer;
+    decode(input: _m0.Reader | Uint8Array, length?: number | undefined): MsgConvertTokenInCdpToGroupTokens;
+    fromJSON(object: any): MsgConvertTokenInCdpToGroupTokens;
+    toJSON(message: MsgConvertTokenInCdpToGroupTokens): unknown;
+    fromPartial(object: DeepPartial<MsgConvertTokenInCdpToGroupTokens>): MsgConvertTokenInCdpToGroupTokens;
+};
+export declare const MsgConvertTokenInCdpToGroupTokensResponse: {
+    encode(_: MsgConvertTokenInCdpToGroupTokensResponse, writer?: _m0.Writer): _m0.Writer;
+    decode(input: _m0.Reader | Uint8Array, length?: number | undefined): MsgConvertTokenInCdpToGroupTokensResponse;
+    fromJSON(_: any): MsgConvertTokenInCdpToGroupTokensResponse;
+    toJSON(_: MsgConvertTokenInCdpToGroupTokensResponse): unknown;
+    fromPartial(_: DeepPartial<MsgConvertTokenInCdpToGroupTokensResponse>): MsgConvertTokenInCdpToGroupTokensResponse;
+};
 /** Msg defines the Msg service. */
 export interface Msg {
     AddRateStrategy(request: MsgAddRateStrategy): Promise<MsgAddRateStrategyResponse>;
@@ -846,8 +866,9 @@ export interface Msg {
     ReturnStablecoinWithInterestInCdpTokens(request: MsgReturnStablecoinWithInterestInCdpTokens): Promise<MsgReturnStablecoinWithInterestInCdpTokensResponse>;
     ReturnStablecoinWithInterestInCollateral(request: MsgReturnStablecoinWithInterestInCollateral): Promise<MsgReturnStablecoinWithInterestInCollateralResponse>;
     LiquidateCollateralWithStablecoinAndInterestInCdpTokens(request: MsgLiquidateCollateralWithStablecoinAndInterestInCdpTokens): Promise<MsgLiquidateCollateralWithStablecoinAndInterestInCdpTokensResponse>;
-    /** this line is used by starport scaffolding # proto/tx/rpc */
     LiquidateCollateralWithStablecoinAndInterestInCollateral(request: MsgLiquidateCollateralWithStablecoinAndInterestInCollateral): Promise<MsgLiquidateCollateralWithStablecoinAndInterestInCollateralResponse>;
+    /** this line is used by starport scaffolding # proto/tx/rpc */
+    ConvertTokenInCdpToGroupTokens(request: MsgConvertTokenInCdpToGroupTokens): Promise<MsgConvertTokenInCdpToGroupTokensResponse>;
 }
 export declare class MsgClientImpl implements Msg {
     private readonly rpc;
@@ -889,6 +910,7 @@ export declare class MsgClientImpl implements Msg {
     ReturnStablecoinWithInterestInCollateral(request: MsgReturnStablecoinWithInterestInCollateral): Promise<MsgReturnStablecoinWithInterestInCollateralResponse>;
     LiquidateCollateralWithStablecoinAndInterestInCdpTokens(request: MsgLiquidateCollateralWithStablecoinAndInterestInCdpTokens): Promise<MsgLiquidateCollateralWithStablecoinAndInterestInCdpTokensResponse>;
     LiquidateCollateralWithStablecoinAndInterestInCollateral(request: MsgLiquidateCollateralWithStablecoinAndInterestInCollateral): Promise<MsgLiquidateCollateralWithStablecoinAndInterestInCollateralResponse>;
+    ConvertTokenInCdpToGroupTokens(request: MsgConvertTokenInCdpToGroupTokens): Promise<MsgConvertTokenInCdpToGroupTokensResponse>;
 }
 interface Rpc {
     request(service: string, method: string, data: Uint8Array): Promise<Uint8Array>;

package/lib/codec/cdp/tx.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MsgSetSmallLiquidationSize = exports.MsgSetMinimumCloseFactorResponse = exports.MsgSetMinimumCloseFactor = exports.MsgSetCompleteLiquidationThresholdResponse = exports.MsgSetCompleteLiquidationThreshold = exports.MsgReturnStablecoinResponse = exports.MsgReturnStablecoin = exports.MsgMintStablecoinResponse = exports.MsgMintStablecoin = exports.MsgSetStablecoinMintCapResponse = exports.MsgSetStablecoinMintCap = exports.MsgSetStablecoinInterestRateResponse = exports.MsgSetStablecoinInterestRate = exports.MsgRepayAssetWithCollateralResponse = exports.MsgRepayAssetWithCollateral = exports.MsgRepayAssetWithCdpTokensResponse = exports.MsgRepayAssetWithCdpTokens = exports.MsgSetInterestFeeResponse = exports.MsgSetInterestFee = exports.MsgSetLiquidationFeeResponse = exports.MsgSetLiquidationFee = exports.MsgLiquidateCollateralResponse = exports.MsgLiquidateCollateral = exports.MsgUnlockCollateralAndWithdrawAssetResponse = exports.MsgUnlockCollateralAndWithdrawAsset = exports.MsgSupplyAssetAndLockCollateralResponse = exports.MsgSupplyAssetAndLockCollateral = exports.MsgRepayAssetResponse = exports.MsgRepayAsset = exports.MsgBorrowAssetResponse = exports.MsgBorrowAsset = exports.MsgUnlockCollateralResponse = exports.MsgUnlockCollateral = exports.MsgLockCollateralResponse = exports.MsgLockCollateral = exports.MsgWithdrawAssetResponse = exports.MsgWithdrawAsset = exports.MsgSupplyAssetResponse = exports.MsgSupplyAsset = exports.MsgUpdateAssetResponse = exports.MsgUpdateAsset = exports.MsgAddAssetResponse = exports.MsgAddAsset = exports.MsgRemoveRateStrategyResponse = exports.MsgRemoveRateStrategy = exports.MsgUpdateRateStrategyResponse = exports.MsgUpdateRateStrategy = exports.MsgAddRateStrategyResponse = exports.MsgAddRateStrategy = exports.protobufPackage = void 0;
-exports.MsgClientImpl = exports.MsgLiquidateCollateralWithStablecoinAndInterestInCollateralResponse = exports.MsgLiquidateCollateralWithStablecoinAndInterestInCollateral = exports.MsgLiquidateCollateralWithStablecoinAndInterestInCdpTokensResponse = exports.MsgLiquidateCollateralWithStablecoinAndInterestInCdpTokens = exports.MsgReturnStablecoinWithInterestInCdpTokensResponse = exports.MsgReturnStablecoinWithInterestInCdpTokens = exports.MsgReturnStablecoinWithInterestInCollateralResponse = exports.MsgReturnStablecoinWithInterestInCollateral = exports.MsgSetCdpPausedResponse = exports.MsgSetCdpPaused = exports.MsgSetStalePriceGracePeriodResponse = exports.MsgSetStalePriceGracePeriod = exports.MsgClaimRewardsResponse = exports.MsgClaimRewards = exports.MsgUpdateRewardSchemeResponse = exports.MsgUpdateRewardScheme = exports.MsgCreateRewardSchemeResponse = exports.MsgCreateRewardScheme = exports.MsgLiquidateCollateralWithStablecoinResponse = exports.MsgLiquidateCollateralWithStablecoin = exports.MsgLiquidateCollateralWithCollateralResponse = exports.MsgLiquidateCollateralWithCollateral = exports.MsgLiquidateCollateralWithCdpTokensResponse = exports.MsgLiquidateCollateralWithCdpTokens = exports.MsgSetSmallLiquidationSizeResponse = void 0;
+exports.MsgClientImpl = exports.MsgConvertTokenInCdpToGroupTokensResponse = exports.MsgConvertTokenInCdpToGroupTokens = exports.MsgLiquidateCollateralWithStablecoinAndInterestInCollateralResponse = exports.MsgLiquidateCollateralWithStablecoinAndInterestInCollateral = exports.MsgLiquidateCollateralWithStablecoinAndInterestInCdpTokensResponse = exports.MsgLiquidateCollateralWithStablecoinAndInterestInCdpTokens = exports.MsgReturnStablecoinWithInterestInCdpTokensResponse = exports.MsgReturnStablecoinWithInterestInCdpTokens = exports.MsgReturnStablecoinWithInterestInCollateralResponse = exports.MsgReturnStablecoinWithInterestInCollateral = exports.MsgSetCdpPausedResponse = exports.MsgSetCdpPaused = exports.MsgSetStalePriceGracePeriodResponse = exports.MsgSetStalePriceGracePeriod = exports.MsgClaimRewardsResponse = exports.MsgClaimRewards = exports.MsgUpdateRewardSchemeResponse = exports.MsgUpdateRewardScheme = exports.MsgCreateRewardSchemeResponse = exports.MsgCreateRewardScheme = exports.MsgLiquidateCollateralWithStablecoinResponse = exports.MsgLiquidateCollateralWithStablecoin = exports.MsgLiquidateCollateralWithCollateralResponse = exports.MsgLiquidateCollateralWithCollateral = exports.MsgLiquidateCollateralWithCdpTokensResponse = exports.MsgLiquidateCollateralWithCdpTokens = exports.MsgSetSmallLiquidationSizeResponse = void 0;
 /* eslint-disable */
 const long_1 = __importDefault(require("long"));
 const minimal_1 = __importDefault(require("protobufjs/minimal"));
@@ -4328,6 +4328,98 @@ exports.MsgLiquidateCollateralWithStablecoinAndInterestInCollateralResponse = {
         return message;
     },
 };
+const baseMsgConvertTokenInCdpToGroupTokens = {
+    creator: "",
+    denom: "",
+};
+exports.MsgConvertTokenInCdpToGroupTokens = {
+    encode(message, writer = minimal_1.default.Writer.create()) {
+        if (message.creator !== "") {
+            writer.uint32(10).string(message.creator);
+        }
+        if (message.denom !== "") {
+            writer.uint32(18).string(message.denom);
+        }
+        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({}, baseMsgConvertTokenInCdpToGroupTokens);
+        while (reader.pos < end) {
+            const tag = reader.uint32();
+            switch (tag >>> 3) {
+                case 1:
+                    message.creator = reader.string();
+                    break;
+                case 2:
+                    message.denom = reader.string();
+                    break;
+                default:
+                    reader.skipType(tag & 7);
+                    break;
+            }
+        }
+        return message;
+    },
+    fromJSON(object) {
+        const message = Object.assign({}, baseMsgConvertTokenInCdpToGroupTokens);
+        message.creator =
+            object.creator !== undefined && object.creator !== null
+                ? String(object.creator)
+                : "";
+        message.denom =
+            object.denom !== undefined && object.denom !== null
+                ? String(object.denom)
+                : "";
+        return message;
+    },
+    toJSON(message) {
+        const obj = {};
+        message.creator !== undefined && (obj.creator = message.creator);
+        message.denom !== undefined && (obj.denom = message.denom);
+        return obj;
+    },
+    fromPartial(object) {
+        var _a, _b;
+        const message = Object.assign({}, baseMsgConvertTokenInCdpToGroupTokens);
+        message.creator = (_a = object.creator) !== null && _a !== void 0 ? _a : "";
+        message.denom = (_b = object.denom) !== null && _b !== void 0 ? _b : "";
+        return message;
+    },
+};
+const baseMsgConvertTokenInCdpToGroupTokensResponse = {};
+exports.MsgConvertTokenInCdpToGroupTokensResponse = {
+    encode(_, writer = minimal_1.default.Writer.create()) {
+        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({}, baseMsgConvertTokenInCdpToGroupTokensResponse);
+        while (reader.pos < end) {
+            const tag = reader.uint32();
+            switch (tag >>> 3) {
+                default:
+                    reader.skipType(tag & 7);
+                    break;
+            }
+        }
+        return message;
+    },
+    fromJSON(_) {
+        const message = Object.assign({}, baseMsgConvertTokenInCdpToGroupTokensResponse);
+        return message;
+    },
+    toJSON(_) {
+        const obj = {};
+        return obj;
+    },
+    fromPartial(_) {
+        const message = Object.assign({}, baseMsgConvertTokenInCdpToGroupTokensResponse);
+        return message;
+    },
+};
 class MsgClientImpl {
     constructor(rpc) {
         this.rpc = rpc;
@@ -4378,6 +4470,8 @@ class MsgClientImpl {
             this.LiquidateCollateralWithStablecoinAndInterestInCdpTokens.bind(this);
         this.LiquidateCollateralWithStablecoinAndInterestInCollateral =
             this.LiquidateCollateralWithStablecoinAndInterestInCollateral.bind(this);
+        this.ConvertTokenInCdpToGroupTokens =
+            this.ConvertTokenInCdpToGroupTokens.bind(this);
     }
     AddRateStrategy(request) {
         const data = exports.MsgAddRateStrategy.encode(request).finish();
@@ -4564,6 +4658,11 @@ class MsgClientImpl {
         const promise = this.rpc.request("Switcheo.carbon.cdp.Msg", "LiquidateCollateralWithStablecoinAndInterestInCollateral", data);
         return promise.then((data) => exports.MsgLiquidateCollateralWithStablecoinAndInterestInCollateralResponse.decode(new minimal_1.default.Reader(data)));
     }
+    ConvertTokenInCdpToGroupTokens(request) {
+        const data = exports.MsgConvertTokenInCdpToGroupTokens.encode(request).finish();
+        const promise = this.rpc.request("Switcheo.carbon.cdp.Msg", "ConvertTokenInCdpToGroupTokens", data);
+        return promise.then((data) => exports.MsgConvertTokenInCdpToGroupTokensResponse.decode(new minimal_1.default.Reader(data)));
+    }
 }
 exports.MsgClientImpl = MsgClientImpl;
 if (minimal_1.default.util.Long !== long_1.default) {

package/lib/codec/coin/event.d.ts

@@ -1,6 +1,7 @@
 import Long from "long";
 import _m0 from "protobufjs/minimal";
 import { Token } from "./token";
+import { TokenGroup, GroupedTokenConfig } from "./group";
 export declare const protobufPackage = "Switcheo.carbon.coin";
 export interface NewTokenEvent {
     token?: Token;
@@ -20,6 +21,37 @@ export interface LinkTokenEvent {
     token?: Token;
     type: string;
 }
+export interface NewGroupEvent {
+    tokenGroup?: TokenGroup;
+}
+export interface UpdateGroupEvent {
+    tokenGroup?: TokenGroup;
+}
+export interface RegisterToGroupEvent {
+    groupId: Long;
+    denom: string;
+}
+export interface DeregisterFromGroupEvent {
+    groupId: Long;
+    denom: string;
+}
+export interface SetGroupedTokenConfigEvent {
+    groupedTokenConfig?: GroupedTokenConfig;
+}
+export interface DepositToGroupEvent {
+    groupId: Long;
+    denom: string;
+    amount: string;
+    chequeDenom: string;
+    chequeAmount: string;
+}
+export interface WithdrawFromGroupEvent {
+    groupId: Long;
+    denom: string;
+    amount: string;
+    chequeDenom: string;
+    chequeAmount: string;
+}
 export declare const NewTokenEvent: {
     encode(message: NewTokenEvent, writer?: _m0.Writer): _m0.Writer;
     decode(input: _m0.Reader | Uint8Array, length?: number | undefined): NewTokenEvent;
@@ -55,6 +87,55 @@ export declare const LinkTokenEvent: {
     toJSON(message: LinkTokenEvent): unknown;
     fromPartial(object: DeepPartial<LinkTokenEvent>): LinkTokenEvent;
 };
+export declare const NewGroupEvent: {
+    encode(message: NewGroupEvent, writer?: _m0.Writer): _m0.Writer;
+    decode(input: _m0.Reader | Uint8Array, length?: number | undefined): NewGroupEvent;
+    fromJSON(object: any): NewGroupEvent;
+    toJSON(message: NewGroupEvent): unknown;
+    fromPartial(object: DeepPartial<NewGroupEvent>): NewGroupEvent;
+};
+export declare const UpdateGroupEvent: {
+    encode(message: UpdateGroupEvent, writer?: _m0.Writer): _m0.Writer;
+    decode(input: _m0.Reader | Uint8Array, length?: number | undefined): UpdateGroupEvent;
+    fromJSON(object: any): UpdateGroupEvent;
+    toJSON(message: UpdateGroupEvent): unknown;
+    fromPartial(object: DeepPartial<UpdateGroupEvent>): UpdateGroupEvent;
+};
+export declare const RegisterToGroupEvent: {
+    encode(message: RegisterToGroupEvent, writer?: _m0.Writer): _m0.Writer;
+    decode(input: _m0.Reader | Uint8Array, length?: number | undefined): RegisterToGroupEvent;
+    fromJSON(object: any): RegisterToGroupEvent;
+    toJSON(message: RegisterToGroupEvent): unknown;
+    fromPartial(object: DeepPartial<RegisterToGroupEvent>): RegisterToGroupEvent;
+};
+export declare const DeregisterFromGroupEvent: {
+    encode(message: DeregisterFromGroupEvent, writer?: _m0.Writer): _m0.Writer;
+    decode(input: _m0.Reader | Uint8Array, length?: number | undefined): DeregisterFromGroupEvent;
+    fromJSON(object: any): DeregisterFromGroupEvent;
+    toJSON(message: DeregisterFromGroupEvent): unknown;
+    fromPartial(object: DeepPartial<DeregisterFromGroupEvent>): DeregisterFromGroupEvent;
+};
+export declare const SetGroupedTokenConfigEvent: {
+    encode(message: SetGroupedTokenConfigEvent, writer?: _m0.Writer): _m0.Writer;
+    decode(input: _m0.Reader | Uint8Array, length?: number | undefined): SetGroupedTokenConfigEvent;
+    fromJSON(object: any): SetGroupedTokenConfigEvent;
+    toJSON(message: SetGroupedTokenConfigEvent): unknown;
+    fromPartial(object: DeepPartial<SetGroupedTokenConfigEvent>): SetGroupedTokenConfigEvent;
+};
+export declare const DepositToGroupEvent: {
+    encode(message: DepositToGroupEvent, writer?: _m0.Writer): _m0.Writer;
+    decode(input: _m0.Reader | Uint8Array, length?: number | undefined): DepositToGroupEvent;
+    fromJSON(object: any): DepositToGroupEvent;
+    toJSON(message: DepositToGroupEvent): unknown;
+    fromPartial(object: DeepPartial<DepositToGroupEvent>): DepositToGroupEvent;
+};
+export declare const WithdrawFromGroupEvent: {
+    encode(message: WithdrawFromGroupEvent, writer?: _m0.Writer): _m0.Writer;
+    decode(input: _m0.Reader | Uint8Array, length?: number | undefined): WithdrawFromGroupEvent;
+    fromJSON(object: any): WithdrawFromGroupEvent;
+    toJSON(message: WithdrawFromGroupEvent): unknown;
+    fromPartial(object: DeepPartial<WithdrawFromGroupEvent>): WithdrawFromGroupEvent;
+};
 declare type Builtin = Date | Function | Uint8Array | string | number | boolean | undefined;
 export declare type DeepPartial<T> = T extends Builtin ? T : T extends Long ? string | number | Long : T extends Array<infer U> ? Array<DeepPartial<U>> : T extends ReadonlyArray<infer U> ? ReadonlyArray<DeepPartial<U>> : T extends {} ? {
     [K in keyof T]?: DeepPartial<T[K]>;