carbon-js-sdk 0.2.14-dev.6 → 0.2.15

package/lib/provider/amino/types/admin.js

@@ -43,17 +43,6 @@ const TxTypes = {
     RemoveMinGasPrice: "fee/RemoveMinGasPrice",
     CreateValidator: "cosmos-sdk/MsgCreateValidator",
     EditValidator: "cosmos-sdk/MsgEditValidator",
-    AddRateStrategy: "cdp/AddRateStrategy",
-    UpdateRateStrategy: "cdp/UpdateRateStrategy",
-    RemoveRateStrategy: "cdp/RemoveRateStrategy",
-    AddAsset: "cdp/AddAsset",
-    UpdateAsset: "cdp/UpdateAsset",
-    SetLiquidationFee: "cdp/SetLiquidationFee",
-    SetInterestFee: "cdp/SetInterestFee",
-    SetStablecoinInterestRate: "cdp/SetStablecoinInterestRate",
-    SetCompleteLiquidationThreshold: "cdp/SetCompleteLiquidationThreshold",
-    SetMinimumCloseFactor: "cdp/SetMinimumCloseFactor",
-    SetSmallLiquidationSize: "cdp/SetSmallLiquidationSize",
 };
 const MsgCreateOracle = {
     aminoType: TxTypes.CreateOracle,
@@ -95,6 +84,12 @@ const MsgCreateMarket = {
         currentQuotePriceUsd: utils_1.ConvertEncType.Dec,
     },
 };
+const MsgCreateVaultType = {
+    aminoType: TxTypes.CreateVaultType,
+    valueMap: {
+        collateralizationRatio: utils_1.ConvertEncType.Dec,
+    },
+};
 const MsgLinkPool = {
     aminoType: TxTypes.LinkPool,
     valueMap: {
@@ -182,56 +177,6 @@ const MsgEditValidator = {
         commissionRate: utils_1.ConvertEncType.Dec,
     },
 };
-const MsgAddRateStrategy = {
-    aminoType: TxTypes.AddRateStrategy,
-    valueMap: {},
-};
-const MsgUpdateRateStrategy = {
-    aminoType: TxTypes.UpdateRateStrategy,
-    valueMap: {},
-};
-const MsgRemoveRateStrategy = {
-    aminoType: TxTypes.RemoveRateStrategy,
-    valueMap: {},
-};
-const MsgAddAsset = {
-    aminoType: TxTypes.AddAsset,
-    valueMap: {},
-};
-const MsgUpdateAsset = {
-    aminoType: TxTypes.UpdateAsset,
-    valueMap: {},
-};
-const MsgSetLiquidationFee = {
-    aminoType: TxTypes.SetLiquidationFee,
-    valueMap: {},
-};
-const MsgSetInterestFee = {
-    aminoType: TxTypes.SetInterestFee,
-    valueMap: {},
-};
-const MsgSetStablecoinInterestRate = {
-    aminoType: TxTypes.SetStablecoinInterestRate,
-    valueMap: {},
-};
-const MsgSetCompleteLiquidationThreshold = {
-    aminoType: TxTypes.SetCompleteLiquidationThreshold,
-    valueMap: {
-        completeLiquidationThreshold: utils_1.ConvertEncType.Dec,
-    },
-};
-const MsgSetMinimumCloseFactor = {
-    aminoType: TxTypes.SetMinimumCloseFactor,
-    valueMap: {
-        minimumCloseFactor: utils_1.ConvertEncType.Dec,
-    },
-};
-const MsgSetSmallLiquidationSize = {
-    aminoType: TxTypes.SetSmallLiquidationSize,
-    valueMap: {
-        smallLiquidationSize: utils_1.ConvertEncType.Dec,
-    },
-};
 const AdminAmino = {
     [CarbonTx.Types.MsgCreateOracle]: (0, utils_1.generateAminoType)(MsgCreateOracle),
     [CarbonTx.Types.MsgBindToken]: (0, utils_1.generateAminoType)(MsgBindToken),
@@ -239,6 +184,7 @@ const AdminAmino = {
     [CarbonTx.Types.MsgLinkToken]: (0, utils_1.generateAminoType)(MsgLinkToken),
     [CarbonTx.Types.MsgSyncToken]: (0, utils_1.generateAminoType)(MsgSyncToken),
     [CarbonTx.Types.MsgCreateMarket]: (0, utils_1.generateAminoType)(MsgCreateMarket),
+    [CarbonTx.Types.MsgCreateVaultType]: (0, utils_1.generateAminoType)(MsgCreateVaultType),
     [CarbonTx.Types.MsgLinkPool]: (0, utils_1.generateAminoType)(MsgLinkPool),
     [CarbonTx.Types.MsgUnlinkPool]: (0, utils_1.generateAminoType)(MsgUnlinkPool),
     [CarbonTx.Types.MsgUpdatePool]: (0, utils_1.generateAminoType)(MsgUpdatePool),
@@ -252,16 +198,5 @@ const AdminAmino = {
     [CarbonTx.Types.MsgRemoveMinGasPrice]: (0, utils_1.generateAminoType)(MsgRemoveMinGasPrice),
     [CarbonTx.Types.MsgCreateValidator]: (0, utils_1.generateAminoType)(MsgCreateValidator),
     [CarbonTx.Types.MsgEditValidator]: (0, utils_1.generateAminoType)(MsgEditValidator),
-    [CarbonTx.Types.MsgAddRateStrategy]: (0, utils_1.generateAminoType)(MsgAddRateStrategy),
-    [CarbonTx.Types.MsgUpdateRateStrategy]: (0, utils_1.generateAminoType)(MsgUpdateRateStrategy),
-    [CarbonTx.Types.MsgRemoveRateStrategy]: (0, utils_1.generateAminoType)(MsgRemoveRateStrategy),
-    [CarbonTx.Types.MsgAddAsset]: (0, utils_1.generateAminoType)(MsgAddAsset),
-    [CarbonTx.Types.MsgUpdateAsset]: (0, utils_1.generateAminoType)(MsgUpdateAsset),
-    [CarbonTx.Types.MsgSetLiquidationFee]: (0, utils_1.generateAminoType)(MsgSetLiquidationFee),
-    [CarbonTx.Types.MsgSetInterestFee]: (0, utils_1.generateAminoType)(MsgSetInterestFee),
-    [CarbonTx.Types.MsgSetStablecoinInterestRate]: (0, utils_1.generateAminoType)(MsgSetStablecoinInterestRate),
-    [CarbonTx.Types.MsgSetCompleteLiquidationThreshold]: (0, utils_1.generateAminoType)(MsgSetCompleteLiquidationThreshold),
-    [CarbonTx.Types.MsgSetMinimumCloseFactor]: (0, utils_1.generateAminoType)(MsgSetMinimumCloseFactor),
-    [CarbonTx.Types.MsgSetSmallLiquidationSize]: (0, utils_1.generateAminoType)(MsgSetSmallLiquidationSize),
 };
 exports.default = AdminAmino;

package/lib/provider/amino/types/cdp.js

@@ -22,109 +22,39 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const CarbonTx = __importStar(require("../../../util/tx"));
 const utils_1 = require("../utils");
 const TxTypes = {
-    SupplyAsset: "cdp/SupplyAsset",
-    WithdrawAsset: "cdp/WithdrawAsset",
-    LockCollateral: "cdp/LockCollateral",
-    UnlockCollateral: "cdp/UnlockCollateral",
-    BorrowAsset: "cdp/BorrowAsset",
-    RepayAsset: "cdp/RepayAsset",
-    SupplyAssetAndLockCollateral: "cdp/SupplyAssetAndLockCollateral",
-    UnlockCollateralAndWithdrawAsset: "cdp/UnlockCollateralAndWithdrawAsset",
-    LiquidateCollateral: "cdp/LiquidateCollateral",
-    RepayAssetWithCdpTokens: "cdp/RepayAssetWithCdpTokens",
-    RepayAssetWithCollateral: "cdp/RepayAssetWithCollateral",
-    MintStablecoin: "cdp/MintStablecoin",
-    ReturnStablecoin: "cdp/ReturnStablecoin",
-    LiquidateCollateralWithCdpTokens: "cdp/LiquidateCollateralWithCdpTokens",
-    LiquidateCollateralWithCollateral: "cdp/LiquidateCollateralWithCollateral",
-    LiquidateCollateralWithStablecoin: "cdp/LiquidateCollateralWithStablecoin",
-    ClaimRewards: "cdp/ClaimRewards",
-};
-const MsgSupplyAsset = {
-    aminoType: TxTypes.SupplyAsset,
-    valueMap: {},
-};
-const MsgWithdrawAsset = {
-    aminoType: TxTypes.WithdrawAsset,
-    valueMap: {},
-};
-const MsgLockCollateral = {
-    aminoType: TxTypes.LockCollateral,
-    valueMap: {},
-};
-const MsgUnlockCollateral = {
-    aminoType: TxTypes.UnlockCollateral,
-    valueMap: {},
-};
-const MsgBorrowAsset = {
-    aminoType: TxTypes.BorrowAsset,
-    valueMap: {},
-};
-const MsgRepayAsset = {
-    aminoType: TxTypes.RepayAsset,
-    valueMap: {},
-};
-const MsgSupplyAssetAndLockCollateral = {
-    aminoType: TxTypes.SupplyAssetAndLockCollateral,
-    valueMap: {},
-};
-const MsgUnlockCollateralAndWithdrawAsset = {
-    aminoType: TxTypes.UnlockCollateralAndWithdrawAsset,
-    valueMap: {},
-};
-const MsgLiquidateCollateral = {
-    aminoType: TxTypes.LiquidateCollateral,
-    valueMap: {},
-};
-const MsgRepayAssetWithCdpTokens = {
-    aminoType: TxTypes.RepayAssetWithCdpTokens,
-    valueMap: {},
-};
-const MsgRepayAssetWithCollateral = {
-    aminoType: TxTypes.RepayAssetWithCollateral,
-    valueMap: {},
-};
-const MsgMintStablecoin = {
-    aminoType: TxTypes.MintStablecoin,
-    valueMap: {},
-};
-const MsgReturnStablecoin = {
-    aminoType: TxTypes.ReturnStablecoin,
-    valueMap: {},
-};
-const MsgLiquidateCollateralWithCdpTokens = {
-    aminoType: TxTypes.LiquidateCollateralWithCdpTokens,
-    valueMap: {},
-};
-const MsgLiquidateCollateralWithCollateral = {
-    aminoType: TxTypes.LiquidateCollateralWithCollateral,
-    valueMap: {},
-};
-const MsgLiquidateCollateralWithStablecoin = {
-    aminoType: TxTypes.LiquidateCollateralWithStablecoin,
-    valueMap: {},
-};
-const MsgClaimRewards = {
-    aminoType: TxTypes.ClaimRewards,
-    valueMap: {},
+    AddCollateral: "cdp/AddCollateral",
+    RemoveCollateral: "cdp/removeCollateral",
+    AddDebt: "cdp/AddDebt",
+    RemoveDebt: "cdp/RemoveDebt",
+};
+const MsgAddCollateral = {
+    aminoType: TxTypes.AddCollateral,
+    valueMap: {
+        vaultTypeId: utils_1.ConvertEncType.Long,
+    },
+};
+const MsgRemoveCollateral = {
+    aminoType: TxTypes.RemoveCollateral,
+    valueMap: {
+        vaultTypeId: utils_1.ConvertEncType.Long,
+    },
+};
+const MsgAddDebt = {
+    aminoType: TxTypes.AddDebt,
+    valueMap: {
+        vaultTypeId: utils_1.ConvertEncType.Long,
+    },
+};
+const MsgRemoveDebt = {
+    aminoType: TxTypes.RemoveDebt,
+    valueMap: {
+        vaultTypeId: utils_1.ConvertEncType.Long,
+    },
 };
 const CdpAmino = {
-    [CarbonTx.Types.MsgSupplyAsset]: (0, utils_1.generateAminoType)(MsgSupplyAsset),
-    [CarbonTx.Types.MsgWithdrawAsset]: (0, utils_1.generateAminoType)(MsgWithdrawAsset),
-    [CarbonTx.Types.MsgLockCollateral]: (0, utils_1.generateAminoType)(MsgLockCollateral),
-    [CarbonTx.Types.MsgUnlockCollateral]: (0, utils_1.generateAminoType)(MsgUnlockCollateral),
-    [CarbonTx.Types.MsgBorrowAsset]: (0, utils_1.generateAminoType)(MsgBorrowAsset),
-    [CarbonTx.Types.MsgRepayAsset]: (0, utils_1.generateAminoType)(MsgRepayAsset),
-    [CarbonTx.Types.MsgSupplyAssetAndLockCollateral]: (0, utils_1.generateAminoType)(MsgSupplyAssetAndLockCollateral),
-    [CarbonTx.Types.MsgUnlockCollateralAndWithdrawAsset]: (0, utils_1.generateAminoType)(MsgUnlockCollateralAndWithdrawAsset),
-    [CarbonTx.Types.MsgLiquidateCollateral]: (0, utils_1.generateAminoType)(MsgLiquidateCollateral),
-    [CarbonTx.Types.MsgRepayAssetWithCdpTokens]: (0, utils_1.generateAminoType)(MsgRepayAssetWithCdpTokens),
-    [CarbonTx.Types.MsgRepayAssetWithCollateral]: (0, utils_1.generateAminoType)(MsgRepayAssetWithCollateral),
-    [CarbonTx.Types.MsgMintStablecoin]: (0, utils_1.generateAminoType)(MsgMintStablecoin),
-    [CarbonTx.Types.MsgReturnStablecoin]: (0, utils_1.generateAminoType)(MsgReturnStablecoin),
-    [CarbonTx.Types.MsgLiquidateCollateralWithCdpTokens]: (0, utils_1.generateAminoType)(MsgLiquidateCollateralWithCdpTokens),
-    [CarbonTx.Types.MsgLiquidateCollateralWithCollateral]: (0, utils_1.generateAminoType)(MsgLiquidateCollateralWithCollateral),
-    [CarbonTx.Types.MsgLiquidateCollateralWithStablecoin]: (0, utils_1.generateAminoType)(MsgLiquidateCollateralWithStablecoin),
-    [CarbonTx.Types.MsgClaimRewards]: (0, utils_1.generateAminoType)(MsgClaimRewards),
+    [CarbonTx.Types.MsgAddCollateral]: (0, utils_1.generateAminoType)(MsgAddCollateral),
+    [CarbonTx.Types.MsgRemoveCollateral]: (0, utils_1.generateAminoType)(MsgRemoveCollateral),
+    [CarbonTx.Types.MsgAddDebt]: (0, utils_1.generateAminoType)(MsgAddDebt),
+    [CarbonTx.Types.MsgRemoveDebt]: (0, utils_1.generateAminoType)(MsgRemoveDebt),
 };
 exports.default = CdpAmino;

package/lib/util/address.d.ts

@@ -62,7 +62,6 @@ declare type SWTHAddressType = AddressBuilder<SWTHAddressOptions> & {
     getAddressBytes(bech32Address: string, networkConfig: Network): Uint8Array;
     keyDerivationPath(index?: number, change?: number, account?: number): number[];
     encode(hash: string | Buffer, opts?: SWTHAddressOptions): string;
-    getModuleAddress(moduleKey: string, network?: Network): string;
 };
 export declare const SWTHAddress: SWTHAddressType;
 declare type NEOAddressType = AddressBuilder<AddressOptions> & {

package/lib/util/address.js

@@ -18,9 +18,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ETHAddress = exports.N3Address = exports.NEOAddress = exports.SWTHAddress = exports.wifEncodePrivateKey = exports.randomMnemonic = exports.BIP44Path = exports.stringOrBufferToBuffer = void 0;
 const constant_1 = require("../constant");
@@ -29,7 +26,6 @@ const Base58Check = __importStar(require("base58check"));
 const bech32 = __importStar(require("bech32"));
 const BIP32 = __importStar(require("bip32"));
 const BIP39 = __importStar(require("bip39"));
-const crypto_js_1 = __importDefault(require("crypto-js"));
 const ethers_1 = require("ethers");
 const secp256k1 = __importStar(require("secp256k1"));
 const secp256r1 = __importStar(require("secp256r1"));
@@ -193,10 +189,6 @@ exports.SWTHAddress = {
         }
         return new Uint8Array(bech32.fromWords(words));
     },
-    getModuleAddress: (moduleKey, network = constant_1.Network.MainNet) => {
-        const addressHash = crypto_js_1.default.SHA256(moduleKey).toString(crypto_js_1.default.enc.Hex);
-        return exports.SWTHAddress.encode(addressHash, { network });
-    },
 };
 exports.NEOAddress = {
     coinType: () => {

package/lib/util/number.d.ts

@@ -1,7 +1,6 @@
 import BigNumber from "bignumber.js";
 export declare const BN_ONE: BigNumber;
 export declare const BN_ZERO: BigNumber;
-export declare const BN_10000: BigNumber;
 export declare const parseBN: (input?: string | number | BigNumber | null | undefined, defaultValue?: BigNumber | undefined) => BigNumber | undefined;
 export declare const bnOrZero: (input?: string | number | BigNumber | null | undefined, defaultValue?: BigNumber) => BigNumber;
 export declare const toHuman: (value?: string | number | BigNumber | null | undefined, decimals?: string | number | BigNumber | null | undefined) => BigNumber | undefined;

package/lib/util/number.js

@@ -3,11 +3,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateNonce = exports.toUnitless = exports.toHuman = exports.bnOrZero = exports.parseBN = exports.BN_10000 = exports.BN_ZERO = exports.BN_ONE = void 0;
+exports.generateNonce = exports.toUnitless = exports.toHuman = exports.bnOrZero = exports.parseBN = exports.BN_ZERO = exports.BN_ONE = void 0;
 const bignumber_js_1 = __importDefault(require("bignumber.js"));
 exports.BN_ONE = new bignumber_js_1.default(1);
 exports.BN_ZERO = new bignumber_js_1.default(0);
-exports.BN_10000 = new bignumber_js_1.default(10000);
 const parseBN = (input, defaultValue) => {
     if (!input && input !== 0)
         return defaultValue;

package/lib/util/tx.d.ts

@@ -57,68 +57,16 @@ export declare const Types: {
     MsgCancelOrderResponse: string;
     MsgCancelAll: string;
     MsgCancelAllResponse: string;
-    MsgAddRateStrategy: string;
-    MsgAddRateStrategyResponse: string;
-    MsgUpdateRateStrategy: string;
-    MsgUpdateRateStrategyResponse: string;
-    MsgRemoveRateStrategy: string;
-    MsgRemoveRateStrategyResponse: string;
-    MsgAddAsset: string;
-    MsgAddAssetResponse: string;
-    MsgUpdateAsset: string;
-    MsgUpdateAssetResponse: string;
-    MsgSupplyAsset: string;
-    MsgSupplyAssetResponse: string;
-    MsgWithdrawAsset: string;
-    MsgWithdrawAssetResponse: string;
-    MsgLockCollateral: string;
-    MsgLockCollateralResponse: string;
-    MsgUnlockCollateral: string;
-    MsgUnlockCollateralResponse: string;
-    MsgBorrowAsset: string;
-    MsgBorrowAssetResponse: string;
-    MsgRepayAsset: string;
-    MsgRepayAssetResponse: string;
-    MsgSupplyAssetAndLockCollateral: string;
-    MsgSupplyAssetAndLockCollateralResponse: string;
-    MsgUnlockCollateralAndWithdrawAsset: string;
-    MsgUnlockCollateralAndWithdrawAssetResponse: string;
-    MsgLiquidateCollateral: string;
-    MsgLiquidateCollateralResponse: string;
-    MsgSetLiquidationFee: string;
-    MsgSetLiquidationFeeResponse: string;
-    MsgSetInterestFee: string;
-    MsgSetInterestFeeResponse: string;
-    MsgRepayAssetWithCdpTokens: string;
-    MsgRepayAssetWithCdpTokensResponse: string;
-    MsgRepayAssetWithCollateral: string;
-    MsgRepayAssetWithCollateralResponse: string;
-    MsgSetStablecoinInterestRate: string;
-    MsgSetStablecoinInterestRateResponse: string;
-    MsgMintStablecoin: string;
-    MsgMintStablecoinResponse: string;
-    MsgReturnStablecoin: string;
-    MsgReturnStablecoinResponse: string;
-    MsgSetCompleteLiquidationThreshold: string;
-    MsgSetCompleteLiquidationThresholdResponse: string;
-    MsgSetMinimumCloseFactor: string;
-    MsgSetMinimumCloseFactorResponse: string;
-    MsgSetSmallLiquidationSize: string;
-    MsgSetSmallLiquidationSizeResponse: string;
-    MsgLiquidateCollateralWithCdpTokens: string;
-    MsgLiquidateCollateralWithCdpTokensResponse: string;
-    MsgLiquidateCollateralWithCollateral: string;
-    MsgLiquidateCollateralWithCollateralResponse: string;
-    MsgLiquidateCollateralWithStablecoin: string;
-    MsgLiquidateCollateralWithStablecoinResponse: string;
-    MsgCreateRewardScheme: string;
-    MsgCreateRewardSchemeResponse: string;
-    MsgUpdateRewardScheme: string;
-    MsgUpdateRewardSchemeResponse: string;
-    MsgAddRewardReserve: string;
-    MsgAddRewardReserveResponse: string;
-    MsgClaimRewards: string;
-    MsgClaimRewardsResponse: string;
+    MsgAddCollateral: string;
+    MsgAddCollateralResponse: string;
+    MsgRemoveCollateral: string;
+    MsgRemoveCollateralResponse: string;
+    MsgAddDebt: string;
+    MsgAddDebtResponse: string;
+    MsgRemoveDebt: string;
+    MsgRemoveDebtResponse: string;
+    MsgCreateVaultType: string;
+    MsgCreateVaultTypeResponse: string;
     MsgSyncGenesis: string;
     MsgSyncGenesisResponse: string;
     MsgSyncHeaders: string;
@@ -337,14 +285,6 @@ export declare const Types: {
     SetCommitmentCurveProposal: string;
     SetRewardsWeightsProposal: string;
     UpdatePoolProposal: string;
-    MsgSetBackfillTimeInterval: string;
-    MsgSetBackfillTimeIntervalResponse: string;
-    MsgSetSmoothenBand: string;
-    MsgSetSmoothenBandResponse: string;
-    MsgSetImpactBand: string;
-    MsgSetImpactBandResponse: string;
-    MsgSetStaleIndexAllowance: string;
-    MsgSetStaleIndexAllowanceResponse: string;
     SettlementPriceProposal: string;
     MsgSetWrapperMapping: string;
     MsgSetWrapperMappingResponse: string;

package/lib/wallet/CarbonWallet.js

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

package/lib/websocket/channel.js

@@ -72,84 +72,56 @@ const generateChannelId = (params) => {
             const { channel, address } = params;
             return [channel, address].join(':');
         }
-        case types_1.WSChannel.cdp_borrows: {
-            const { channel, address } = params;
-            return [channel, address].join(':');
-        }
-        case types_1.WSChannel.cdp_collaterals: {
-            const { channel, address } = params;
-            return [channel, address].join(':');
-        }
-        case types_1.WSChannel.cdp_liquidate_collaterals: {
-            const { channel } = params;
-            return [channel].join(':');
-        }
-        case types_1.WSChannel.cdp_all_token_debts: {
-            const { channel } = params;
-            return [channel].join(':');
-        }
-        case types_1.WSChannel.cdp_token_debt: {
-            const { channel, denom } = params;
-            return [channel, denom].join(':');
-        }
-        case types_1.WSChannel.cdp_reward_schemes: {
-            const { channel } = params;
-            return [channel].join(':');
-        }
-        case types_1.WSChannel.cdp_reward_debts: {
-            const { channel, address } = params;
-            return [channel, address].join(':');
-        }
         default:
             throw new Error(`invalid subscription channel: ${params.channel}`);
     }
 };
 exports.generateChannelId = generateChannelId;
 const parseChannelId = (rawChannelId) => {
-    const [channel, param0, param1] = rawChannelId.split(':');
+    const [channel, market, resolution, address, id] = rawChannelId.split(':');
     switch (channel) {
         case types_1.WSChannel.candlesticks:
             return {
                 channel,
-                market: param0,
-                resolution: param1,
+                market,
+                resolution,
             };
         case types_1.WSChannel.books:
             return {
                 channel,
-                market: param0,
+                market,
             };
         case types_1.WSChannel.recent_trades:
             return {
                 channel,
-                market: param0,
+                market,
             };
         case types_1.WSChannel.orders:
             return {
                 channel,
-                address: param0,
+                address,
             };
         case types_1.WSChannel.orders_by_market:
             return {
                 channel,
-                market: param0,
-                address: param1,
+                market,
+                address,
             };
         case types_1.WSChannel.balances:
             return {
                 channel,
-                address: param0,
+                address,
             };
         case types_1.WSChannel.account_trades:
             return {
                 channel,
-                address: param0,
+                address,
             };
         case types_1.WSChannel.account_trades_by_market:
             return {
                 channel,
-                market: param0,
-                address: param1,
+                market,
+                address,
             };
         case types_1.WSChannel.market_stats:
             return {
@@ -158,29 +130,29 @@ const parseChannelId = (rawChannelId) => {
         case types_1.WSChannel.market_stats_by_market:
             return {
                 channel,
-                market: param0,
+                market,
             };
         case types_1.WSChannel.leverages:
             return {
                 channel,
-                address: param0,
+                address,
             };
         case types_1.WSChannel.leverages_by_market:
             return {
                 channel,
-                market: param0,
-                address: param1,
+                market,
+                address,
             };
         case types_1.WSChannel.positions:
             return {
                 channel,
-                address: param0,
+                address,
             };
         case types_1.WSChannel.positions_by_market:
             return {
                 channel,
-                market: param0,
-                address: param1,
+                market,
+                address,
             };
         case types_1.WSChannel.pools:
             return {
@@ -189,44 +161,12 @@ const parseChannelId = (rawChannelId) => {
         case types_1.WSChannel.pools_by_id:
             return {
                 channel,
-                id: param0,
+                id,
             };
         case types_1.WSChannel.commitments:
             return {
                 channel,
-                address: param0,
-            };
-        case types_1.WSChannel.cdp_borrows:
-            return {
-                channel,
-                address: param0,
-            };
-        case types_1.WSChannel.cdp_collaterals:
-            return {
-                channel,
-                address: param0,
-            };
-        case types_1.WSChannel.cdp_liquidate_collaterals:
-            return {
-                channel,
-            };
-        case types_1.WSChannel.cdp_all_token_debts:
-            return {
-                channel,
-            };
-        case types_1.WSChannel.cdp_token_debt:
-            return {
-                channel,
-                denom: param0,
-            };
-        case types_1.WSChannel.cdp_reward_schemes:
-            return {
-                channel,
-            };
-        case types_1.WSChannel.cdp_reward_debts:
-            return {
-                channel,
-                address: param0,
+                address,
             };
         default:
             throw new Error('Error parsing channelId');