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

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

@@ -8,7 +8,7 @@ export interface AssetParams {
     allowRepayStablecoinInterestDebt: boolean;
     loanToValue: string;
     liquidationThreshold: string;
-    liquidationBonus: string;
+    liquidationDiscount: string;
     supplyCap: string;
     borrowCap: string;
 }

package/lib/codec/cdp/asset_params.js

@@ -15,7 +15,7 @@ const baseAssetParams = {
     allowRepayStablecoinInterestDebt: false,
     loanToValue: "",
     liquidationThreshold: "",
-    liquidationBonus: "",
+    liquidationDiscount: "",
     supplyCap: "",
     borrowCap: "",
 };
@@ -39,8 +39,8 @@ exports.AssetParams = {
         if (message.liquidationThreshold !== "") {
             writer.uint32(50).string(message.liquidationThreshold);
         }
-        if (message.liquidationBonus !== "") {
-            writer.uint32(58).string(message.liquidationBonus);
+        if (message.liquidationDiscount !== "") {
+            writer.uint32(58).string(message.liquidationDiscount);
         }
         if (message.supplyCap !== "") {
             writer.uint32(66).string(message.supplyCap);
@@ -76,7 +76,7 @@ exports.AssetParams = {
                     message.liquidationThreshold = reader.string();
                     break;
                 case 7:
-                    message.liquidationBonus = reader.string();
+                    message.liquidationDiscount = reader.string();
                     break;
                 case 8:
                     message.supplyCap = reader.string();
@@ -119,9 +119,10 @@ exports.AssetParams = {
                 object.liquidationThreshold !== null
                 ? String(object.liquidationThreshold)
                 : "";
-        message.liquidationBonus =
-            object.liquidationBonus !== undefined && object.liquidationBonus !== null
-                ? String(object.liquidationBonus)
+        message.liquidationDiscount =
+            object.liquidationDiscount !== undefined &&
+                object.liquidationDiscount !== null
+                ? String(object.liquidationDiscount)
                 : "";
         message.supplyCap =
             object.supplyCap !== undefined && object.supplyCap !== null
@@ -146,8 +147,8 @@ exports.AssetParams = {
             (obj.loanToValue = message.loanToValue);
         message.liquidationThreshold !== undefined &&
             (obj.liquidationThreshold = message.liquidationThreshold);
-        message.liquidationBonus !== undefined &&
-            (obj.liquidationBonus = message.liquidationBonus);
+        message.liquidationDiscount !== undefined &&
+            (obj.liquidationDiscount = message.liquidationDiscount);
         message.supplyCap !== undefined && (obj.supplyCap = message.supplyCap);
         message.borrowCap !== undefined && (obj.borrowCap = message.borrowCap);
         return obj;
@@ -162,7 +163,7 @@ exports.AssetParams = {
             (_d = object.allowRepayStablecoinInterestDebt) !== null && _d !== void 0 ? _d : false;
         message.loanToValue = (_e = object.loanToValue) !== null && _e !== void 0 ? _e : "";
         message.liquidationThreshold = (_f = object.liquidationThreshold) !== null && _f !== void 0 ? _f : "";
-        message.liquidationBonus = (_g = object.liquidationBonus) !== null && _g !== void 0 ? _g : "";
+        message.liquidationDiscount = (_g = object.liquidationDiscount) !== null && _g !== void 0 ? _g : "";
         message.supplyCap = (_h = object.supplyCap) !== null && _h !== void 0 ? _h : "";
         message.borrowCap = (_j = object.borrowCap) !== null && _j !== void 0 ? _j : "";
         return message;

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

@@ -5,6 +5,7 @@ import { StablecoinDebtInfo } from "./stablecoin_debt_info";
 import { RateStrategyParams } from "./rate_strategy_params";
 import { AssetParams } from "./asset_params";
 import { DebtInfo } from "./debt_info";
+import { RewardScheme } from "./reward_scheme";
 export declare const protobufPackage = "Switcheo.carbon.cdp";
 /** GenesisState defines the cdp module's genesis state. */
 export interface GenesisState {
@@ -12,6 +13,8 @@ export interface GenesisState {
     rateStrategies: RateStrategyParams[];
     assets: AssetParams[];
     debtInfos: DebtInfo[];
+    rewardSchemes: RewardScheme[];
+    sequenceNumber: Long;
     accountToCollateralized: {
         [key: string]: Uint8Array;
     };
@@ -25,10 +28,13 @@ export interface GenesisState {
     accountToPrincipalStablecoinDebt: {
         [key: string]: Uint8Array;
     };
-    /** this line is used by starport scaffolding # genesis/proto/state */
     accountToStablecoinInitialCumulativeInterestMultiplier: {
         [key: string]: Uint8Array;
     };
+    /** this line is used by starport scaffolding # genesis/proto/state */
+    accountToRewardDebt: {
+        [key: string]: Uint8Array;
+    };
 }
 export interface GenesisState_AccountToCollateralizedEntry {
     key: string;
@@ -50,6 +56,10 @@ export interface GenesisState_AccountToStablecoinInitialCumulativeInterestMultip
     key: string;
     value: Uint8Array;
 }
+export interface GenesisState_AccountToRewardDebtEntry {
+    key: string;
+    value: Uint8Array;
+}
 export declare const GenesisState: {
     encode(message: GenesisState, writer?: _m0.Writer): _m0.Writer;
     decode(input: _m0.Reader | Uint8Array, length?: number | undefined): GenesisState;
@@ -92,6 +102,13 @@ export declare const GenesisState_AccountToStablecoinInitialCumulativeInterestMu
     toJSON(message: GenesisState_AccountToStablecoinInitialCumulativeInterestMultiplierEntry): unknown;
     fromPartial(object: DeepPartial<GenesisState_AccountToStablecoinInitialCumulativeInterestMultiplierEntry>): GenesisState_AccountToStablecoinInitialCumulativeInterestMultiplierEntry;
 };
+export declare const GenesisState_AccountToRewardDebtEntry: {
+    encode(message: GenesisState_AccountToRewardDebtEntry, writer?: _m0.Writer): _m0.Writer;
+    decode(input: _m0.Reader | Uint8Array, length?: number | undefined): GenesisState_AccountToRewardDebtEntry;
+    fromJSON(object: any): GenesisState_AccountToRewardDebtEntry;
+    toJSON(message: GenesisState_AccountToRewardDebtEntry): unknown;
+    fromPartial(object: DeepPartial<GenesisState_AccountToRewardDebtEntry>): GenesisState_AccountToRewardDebtEntry;
+};
 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]>;

package/lib/codec/cdp/genesis.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.GenesisState_AccountToStablecoinInitialCumulativeInterestMultiplierEntry = exports.GenesisState_AccountToPrincipalStablecoinDebtEntry = exports.GenesisState_AccountToInitialCumulativeInterestMultiplierEntry = exports.GenesisState_AccountToPrincipalDebtEntry = exports.GenesisState_AccountToCollateralizedEntry = exports.GenesisState = exports.protobufPackage = void 0;
+exports.GenesisState_AccountToRewardDebtEntry = exports.GenesisState_AccountToStablecoinInitialCumulativeInterestMultiplierEntry = exports.GenesisState_AccountToPrincipalStablecoinDebtEntry = exports.GenesisState_AccountToInitialCumulativeInterestMultiplierEntry = exports.GenesisState_AccountToPrincipalDebtEntry = exports.GenesisState_AccountToCollateralizedEntry = exports.GenesisState = exports.protobufPackage = void 0;
 /* eslint-disable */
 const long_1 = __importDefault(require("long"));
 const minimal_1 = __importDefault(require("protobufjs/minimal"));
@@ -12,8 +12,9 @@ const stablecoin_debt_info_1 = require("./stablecoin_debt_info");
 const rate_strategy_params_1 = require("./rate_strategy_params");
 const asset_params_1 = require("./asset_params");
 const debt_info_1 = require("./debt_info");
+const reward_scheme_1 = require("./reward_scheme");
 exports.protobufPackage = "Switcheo.carbon.cdp";
-const baseGenesisState = {};
+const baseGenesisState = { sequenceNumber: long_1.default.UZERO };
 exports.GenesisState = {
     encode(message, writer = minimal_1.default.Writer.create()) {
         if (message.params !== undefined) {
@@ -28,23 +29,32 @@ exports.GenesisState = {
         for (const v of message.debtInfos) {
             debt_info_1.DebtInfo.encode(v, writer.uint32(34).fork()).ldelim();
         }
+        for (const v of message.rewardSchemes) {
+            reward_scheme_1.RewardScheme.encode(v, writer.uint32(42).fork()).ldelim();
+        }
+        if (!message.sequenceNumber.isZero()) {
+            writer.uint32(48).uint64(message.sequenceNumber);
+        }
         Object.entries(message.accountToCollateralized).forEach(([key, value]) => {
-            exports.GenesisState_AccountToCollateralizedEntry.encode({ key: key, value }, writer.uint32(42).fork()).ldelim();
+            exports.GenesisState_AccountToCollateralizedEntry.encode({ key: key, value }, writer.uint32(58).fork()).ldelim();
         });
         Object.entries(message.accountToPrincipalDebt).forEach(([key, value]) => {
-            exports.GenesisState_AccountToPrincipalDebtEntry.encode({ key: key, value }, writer.uint32(50).fork()).ldelim();
+            exports.GenesisState_AccountToPrincipalDebtEntry.encode({ key: key, value }, writer.uint32(66).fork()).ldelim();
         });
         Object.entries(message.accountToInitialCumulativeInterestMultiplier).forEach(([key, value]) => {
-            exports.GenesisState_AccountToInitialCumulativeInterestMultiplierEntry.encode({ key: key, value }, writer.uint32(58).fork()).ldelim();
+            exports.GenesisState_AccountToInitialCumulativeInterestMultiplierEntry.encode({ key: key, value }, writer.uint32(74).fork()).ldelim();
         });
         if (message.stablecoinDebtInfo !== undefined) {
-            stablecoin_debt_info_1.StablecoinDebtInfo.encode(message.stablecoinDebtInfo, writer.uint32(66).fork()).ldelim();
+            stablecoin_debt_info_1.StablecoinDebtInfo.encode(message.stablecoinDebtInfo, writer.uint32(82).fork()).ldelim();
         }
         Object.entries(message.accountToPrincipalStablecoinDebt).forEach(([key, value]) => {
-            exports.GenesisState_AccountToPrincipalStablecoinDebtEntry.encode({ key: key, value }, writer.uint32(74).fork()).ldelim();
+            exports.GenesisState_AccountToPrincipalStablecoinDebtEntry.encode({ key: key, value }, writer.uint32(90).fork()).ldelim();
         });
         Object.entries(message.accountToStablecoinInitialCumulativeInterestMultiplier).forEach(([key, value]) => {
-            exports.GenesisState_AccountToStablecoinInitialCumulativeInterestMultiplierEntry.encode({ key: key, value }, writer.uint32(82).fork()).ldelim();
+            exports.GenesisState_AccountToStablecoinInitialCumulativeInterestMultiplierEntry.encode({ key: key, value }, writer.uint32(98).fork()).ldelim();
+        });
+        Object.entries(message.accountToRewardDebt).forEach(([key, value]) => {
+            exports.GenesisState_AccountToRewardDebtEntry.encode({ key: key, value }, writer.uint32(106).fork()).ldelim();
         });
         return writer;
     },
@@ -55,11 +65,13 @@ exports.GenesisState = {
         message.rateStrategies = [];
         message.assets = [];
         message.debtInfos = [];
+        message.rewardSchemes = [];
         message.accountToCollateralized = {};
         message.accountToPrincipalDebt = {};
         message.accountToInitialCumulativeInterestMultiplier = {};
         message.accountToPrincipalStablecoinDebt = {};
         message.accountToStablecoinInitialCumulativeInterestMultiplier = {};
+        message.accountToRewardDebt = {};
         while (reader.pos < end) {
             const tag = reader.uint32();
             switch (tag >>> 3) {
@@ -76,37 +88,50 @@ exports.GenesisState = {
                     message.debtInfos.push(debt_info_1.DebtInfo.decode(reader, reader.uint32()));
                     break;
                 case 5:
-                    const entry5 = exports.GenesisState_AccountToCollateralizedEntry.decode(reader, reader.uint32());
-                    if (entry5.value !== undefined) {
-                        message.accountToCollateralized[entry5.key] = entry5.value;
-                    }
+                    message.rewardSchemes.push(reward_scheme_1.RewardScheme.decode(reader, reader.uint32()));
                     break;
                 case 6:
-                    const entry6 = exports.GenesisState_AccountToPrincipalDebtEntry.decode(reader, reader.uint32());
-                    if (entry6.value !== undefined) {
-                        message.accountToPrincipalDebt[entry6.key] = entry6.value;
-                    }
+                    message.sequenceNumber = reader.uint64();
                     break;
                 case 7:
-                    const entry7 = exports.GenesisState_AccountToInitialCumulativeInterestMultiplierEntry.decode(reader, reader.uint32());
+                    const entry7 = exports.GenesisState_AccountToCollateralizedEntry.decode(reader, reader.uint32());
                     if (entry7.value !== undefined) {
-                        message.accountToInitialCumulativeInterestMultiplier[entry7.key] =
-                            entry7.value;
+                        message.accountToCollateralized[entry7.key] = entry7.value;
                     }
                     break;
                 case 8:
-                    message.stablecoinDebtInfo = stablecoin_debt_info_1.StablecoinDebtInfo.decode(reader, reader.uint32());
+                    const entry8 = exports.GenesisState_AccountToPrincipalDebtEntry.decode(reader, reader.uint32());
+                    if (entry8.value !== undefined) {
+                        message.accountToPrincipalDebt[entry8.key] = entry8.value;
+                    }
                     break;
                 case 9:
-                    const entry9 = exports.GenesisState_AccountToPrincipalStablecoinDebtEntry.decode(reader, reader.uint32());
+                    const entry9 = exports.GenesisState_AccountToInitialCumulativeInterestMultiplierEntry.decode(reader, reader.uint32());
                     if (entry9.value !== undefined) {
-                        message.accountToPrincipalStablecoinDebt[entry9.key] = entry9.value;
+                        message.accountToInitialCumulativeInterestMultiplier[entry9.key] =
+                            entry9.value;
                     }
                     break;
                 case 10:
-                    const entry10 = exports.GenesisState_AccountToStablecoinInitialCumulativeInterestMultiplierEntry.decode(reader, reader.uint32());
-                    if (entry10.value !== undefined) {
-                        message.accountToStablecoinInitialCumulativeInterestMultiplier[entry10.key] = entry10.value;
+                    message.stablecoinDebtInfo = stablecoin_debt_info_1.StablecoinDebtInfo.decode(reader, reader.uint32());
+                    break;
+                case 11:
+                    const entry11 = exports.GenesisState_AccountToPrincipalStablecoinDebtEntry.decode(reader, reader.uint32());
+                    if (entry11.value !== undefined) {
+                        message.accountToPrincipalStablecoinDebt[entry11.key] =
+                            entry11.value;
+                    }
+                    break;
+                case 12:
+                    const entry12 = exports.GenesisState_AccountToStablecoinInitialCumulativeInterestMultiplierEntry.decode(reader, reader.uint32());
+                    if (entry12.value !== undefined) {
+                        message.accountToStablecoinInitialCumulativeInterestMultiplier[entry12.key] = entry12.value;
+                    }
+                    break;
+                case 13:
+                    const entry13 = exports.GenesisState_AccountToRewardDebtEntry.decode(reader, reader.uint32());
+                    if (entry13.value !== undefined) {
+                        message.accountToRewardDebt[entry13.key] = entry13.value;
                     }
                     break;
                 default:
@@ -117,7 +142,7 @@ exports.GenesisState = {
         return message;
     },
     fromJSON(object) {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
         const message = Object.assign({}, baseGenesisState);
         message.params =
             object.params !== undefined && object.params !== null
@@ -126,15 +151,20 @@ exports.GenesisState = {
         message.rateStrategies = ((_a = object.rateStrategies) !== null && _a !== void 0 ? _a : []).map((e) => rate_strategy_params_1.RateStrategyParams.fromJSON(e));
         message.assets = ((_b = object.assets) !== null && _b !== void 0 ? _b : []).map((e) => asset_params_1.AssetParams.fromJSON(e));
         message.debtInfos = ((_c = object.debtInfos) !== null && _c !== void 0 ? _c : []).map((e) => debt_info_1.DebtInfo.fromJSON(e));
-        message.accountToCollateralized = Object.entries((_d = object.accountToCollateralized) !== null && _d !== void 0 ? _d : {}).reduce((acc, [key, value]) => {
+        message.rewardSchemes = ((_d = object.rewardSchemes) !== null && _d !== void 0 ? _d : []).map((e) => reward_scheme_1.RewardScheme.fromJSON(e));
+        message.sequenceNumber =
+            object.sequenceNumber !== undefined && object.sequenceNumber !== null
+                ? long_1.default.fromString(object.sequenceNumber)
+                : long_1.default.UZERO;
+        message.accountToCollateralized = Object.entries((_e = object.accountToCollateralized) !== null && _e !== void 0 ? _e : {}).reduce((acc, [key, value]) => {
             acc[key] = bytesFromBase64(value);
             return acc;
         }, {});
-        message.accountToPrincipalDebt = Object.entries((_e = object.accountToPrincipalDebt) !== null && _e !== void 0 ? _e : {}).reduce((acc, [key, value]) => {
+        message.accountToPrincipalDebt = Object.entries((_f = object.accountToPrincipalDebt) !== null && _f !== void 0 ? _f : {}).reduce((acc, [key, value]) => {
             acc[key] = bytesFromBase64(value);
             return acc;
         }, {});
-        message.accountToInitialCumulativeInterestMultiplier = Object.entries((_f = object.accountToInitialCumulativeInterestMultiplier) !== null && _f !== void 0 ? _f : {}).reduce((acc, [key, value]) => {
+        message.accountToInitialCumulativeInterestMultiplier = Object.entries((_g = object.accountToInitialCumulativeInterestMultiplier) !== null && _g !== void 0 ? _g : {}).reduce((acc, [key, value]) => {
             acc[key] = bytesFromBase64(value);
             return acc;
         }, {});
@@ -143,15 +173,19 @@ exports.GenesisState = {
                 object.stablecoinDebtInfo !== null
                 ? stablecoin_debt_info_1.StablecoinDebtInfo.fromJSON(object.stablecoinDebtInfo)
                 : undefined;
-        message.accountToPrincipalStablecoinDebt = Object.entries((_g = object.accountToPrincipalStablecoinDebt) !== null && _g !== void 0 ? _g : {}).reduce((acc, [key, value]) => {
+        message.accountToPrincipalStablecoinDebt = Object.entries((_h = object.accountToPrincipalStablecoinDebt) !== null && _h !== void 0 ? _h : {}).reduce((acc, [key, value]) => {
             acc[key] = bytesFromBase64(value);
             return acc;
         }, {});
         message.accountToStablecoinInitialCumulativeInterestMultiplier =
-            Object.entries((_h = object.accountToStablecoinInitialCumulativeInterestMultiplier) !== null && _h !== void 0 ? _h : {}).reduce((acc, [key, value]) => {
+            Object.entries((_j = object.accountToStablecoinInitialCumulativeInterestMultiplier) !== null && _j !== void 0 ? _j : {}).reduce((acc, [key, value]) => {
                 acc[key] = bytesFromBase64(value);
                 return acc;
             }, {});
+        message.accountToRewardDebt = Object.entries((_k = object.accountToRewardDebt) !== null && _k !== void 0 ? _k : {}).reduce((acc, [key, value]) => {
+            acc[key] = bytesFromBase64(value);
+            return acc;
+        }, {});
         return message;
     },
     toJSON(message) {
@@ -176,6 +210,14 @@ exports.GenesisState = {
         else {
             obj.debtInfos = [];
         }
+        if (message.rewardSchemes) {
+            obj.rewardSchemes = message.rewardSchemes.map((e) => e ? reward_scheme_1.RewardScheme.toJSON(e) : undefined);
+        }
+        else {
+            obj.rewardSchemes = [];
+        }
+        message.sequenceNumber !== undefined &&
+            (obj.sequenceNumber = (message.sequenceNumber || long_1.default.UZERO).toString());
         obj.accountToCollateralized = {};
         if (message.accountToCollateralized) {
             Object.entries(message.accountToCollateralized).forEach(([k, v]) => {
@@ -212,10 +254,16 @@ exports.GenesisState = {
                     base64FromBytes(v);
             });
         }
+        obj.accountToRewardDebt = {};
+        if (message.accountToRewardDebt) {
+            Object.entries(message.accountToRewardDebt).forEach(([k, v]) => {
+                obj.accountToRewardDebt[k] = base64FromBytes(v);
+            });
+        }
         return obj;
     },
     fromPartial(object) {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
         const message = Object.assign({}, baseGenesisState);
         message.params =
             object.params !== undefined && object.params !== null
@@ -224,19 +272,24 @@ exports.GenesisState = {
         message.rateStrategies = ((_a = object.rateStrategies) !== null && _a !== void 0 ? _a : []).map((e) => rate_strategy_params_1.RateStrategyParams.fromPartial(e));
         message.assets = ((_b = object.assets) !== null && _b !== void 0 ? _b : []).map((e) => asset_params_1.AssetParams.fromPartial(e));
         message.debtInfos = ((_c = object.debtInfos) !== null && _c !== void 0 ? _c : []).map((e) => debt_info_1.DebtInfo.fromPartial(e));
-        message.accountToCollateralized = Object.entries((_d = object.accountToCollateralized) !== null && _d !== void 0 ? _d : {}).reduce((acc, [key, value]) => {
+        message.rewardSchemes = ((_d = object.rewardSchemes) !== null && _d !== void 0 ? _d : []).map((e) => reward_scheme_1.RewardScheme.fromPartial(e));
+        message.sequenceNumber =
+            object.sequenceNumber !== undefined && object.sequenceNumber !== null
+                ? long_1.default.fromValue(object.sequenceNumber)
+                : long_1.default.UZERO;
+        message.accountToCollateralized = Object.entries((_e = object.accountToCollateralized) !== null && _e !== void 0 ? _e : {}).reduce((acc, [key, value]) => {
             if (value !== undefined) {
                 acc[key] = value;
             }
             return acc;
         }, {});
-        message.accountToPrincipalDebt = Object.entries((_e = object.accountToPrincipalDebt) !== null && _e !== void 0 ? _e : {}).reduce((acc, [key, value]) => {
+        message.accountToPrincipalDebt = Object.entries((_f = object.accountToPrincipalDebt) !== null && _f !== void 0 ? _f : {}).reduce((acc, [key, value]) => {
             if (value !== undefined) {
                 acc[key] = value;
             }
             return acc;
         }, {});
-        message.accountToInitialCumulativeInterestMultiplier = Object.entries((_f = object.accountToInitialCumulativeInterestMultiplier) !== null && _f !== void 0 ? _f : {}).reduce((acc, [key, value]) => {
+        message.accountToInitialCumulativeInterestMultiplier = Object.entries((_g = object.accountToInitialCumulativeInterestMultiplier) !== null && _g !== void 0 ? _g : {}).reduce((acc, [key, value]) => {
             if (value !== undefined) {
                 acc[key] = value;
             }
@@ -247,19 +300,25 @@ exports.GenesisState = {
                 object.stablecoinDebtInfo !== null
                 ? stablecoin_debt_info_1.StablecoinDebtInfo.fromPartial(object.stablecoinDebtInfo)
                 : undefined;
-        message.accountToPrincipalStablecoinDebt = Object.entries((_g = object.accountToPrincipalStablecoinDebt) !== null && _g !== void 0 ? _g : {}).reduce((acc, [key, value]) => {
+        message.accountToPrincipalStablecoinDebt = Object.entries((_h = object.accountToPrincipalStablecoinDebt) !== null && _h !== void 0 ? _h : {}).reduce((acc, [key, value]) => {
             if (value !== undefined) {
                 acc[key] = value;
             }
             return acc;
         }, {});
         message.accountToStablecoinInitialCumulativeInterestMultiplier =
-            Object.entries((_h = object.accountToStablecoinInitialCumulativeInterestMultiplier) !== null && _h !== void 0 ? _h : {}).reduce((acc, [key, value]) => {
+            Object.entries((_j = object.accountToStablecoinInitialCumulativeInterestMultiplier) !== null && _j !== void 0 ? _j : {}).reduce((acc, [key, value]) => {
                 if (value !== undefined) {
                     acc[key] = value;
                 }
                 return acc;
             }, {});
+        message.accountToRewardDebt = Object.entries((_k = object.accountToRewardDebt) !== null && _k !== void 0 ? _k : {}).reduce((acc, [key, value]) => {
+            if (value !== undefined) {
+                acc[key] = value;
+            }
+            return acc;
+        }, {});
         return message;
     },
 };
@@ -552,6 +611,63 @@ exports.GenesisState_AccountToStablecoinInitialCumulativeInterestMultiplierEntry
         return message;
     },
 };
+const baseGenesisState_AccountToRewardDebtEntry = { key: "" };
+exports.GenesisState_AccountToRewardDebtEntry = {
+    encode(message, writer = minimal_1.default.Writer.create()) {
+        if (message.key !== "") {
+            writer.uint32(10).string(message.key);
+        }
+        if (message.value.length !== 0) {
+            writer.uint32(18).bytes(message.value);
+        }
+        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({}, baseGenesisState_AccountToRewardDebtEntry);
+        message.value = new Uint8Array();
+        while (reader.pos < end) {
+            const tag = reader.uint32();
+            switch (tag >>> 3) {
+                case 1:
+                    message.key = reader.string();
+                    break;
+                case 2:
+                    message.value = reader.bytes();
+                    break;
+                default:
+                    reader.skipType(tag & 7);
+                    break;
+            }
+        }
+        return message;
+    },
+    fromJSON(object) {
+        const message = Object.assign({}, baseGenesisState_AccountToRewardDebtEntry);
+        message.key =
+            object.key !== undefined && object.key !== null ? String(object.key) : "";
+        message.value =
+            object.value !== undefined && object.value !== null
+                ? bytesFromBase64(object.value)
+                : new Uint8Array();
+        return message;
+    },
+    toJSON(message) {
+        const obj = {};
+        message.key !== undefined && (obj.key = message.key);
+        message.value !== undefined &&
+            (obj.value = base64FromBytes(message.value !== undefined ? message.value : new Uint8Array()));
+        return obj;
+    },
+    fromPartial(object) {
+        var _a, _b;
+        const message = Object.assign({}, baseGenesisState_AccountToRewardDebtEntry);
+        message.key = (_a = object.key) !== null && _a !== void 0 ? _a : "";
+        message.value = (_b = object.value) !== null && _b !== void 0 ? _b : new Uint8Array();
+        return message;
+    },
+};
 var globalThis = (() => {
     if (typeof globalThis !== "undefined")
         return globalThis;

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

@@ -206,7 +206,6 @@ export interface MsgLiquidateCollateralWithStablecoin {
     minCollateralAmount: string;
     debtDenom: string;
     debtAmount: string;
-    principalAmount: string;
     interestDenom: string;
     interestAmount: string;
 }

package/lib/codec/cdp/tx.js

@@ -2961,7 +2961,6 @@ const baseMsgLiquidateCollateralWithStablecoin = {
     minCollateralAmount: "",
     debtDenom: "",
     debtAmount: "",
-    principalAmount: "",
     interestDenom: "",
     interestAmount: "",
 };
@@ -2985,14 +2984,11 @@ exports.MsgLiquidateCollateralWithStablecoin = {
         if (message.debtAmount !== "") {
             writer.uint32(50).string(message.debtAmount);
         }
-        if (message.principalAmount !== "") {
-            writer.uint32(58).string(message.principalAmount);
-        }
         if (message.interestDenom !== "") {
-            writer.uint32(66).string(message.interestDenom);
+            writer.uint32(58).string(message.interestDenom);
         }
         if (message.interestAmount !== "") {
-            writer.uint32(74).string(message.interestAmount);
+            writer.uint32(66).string(message.interestAmount);
         }
         return writer;
     },
@@ -3022,12 +3018,9 @@ exports.MsgLiquidateCollateralWithStablecoin = {
                     message.debtAmount = reader.string();
                     break;
                 case 7:
-                    message.principalAmount = reader.string();
-                    break;
-                case 8:
                     message.interestDenom = reader.string();
                     break;
-                case 9:
+                case 8:
                     message.interestAmount = reader.string();
                     break;
                 default:
@@ -3064,10 +3057,6 @@ exports.MsgLiquidateCollateralWithStablecoin = {
             object.debtAmount !== undefined && object.debtAmount !== null
                 ? String(object.debtAmount)
                 : "";
-        message.principalAmount =
-            object.principalAmount !== undefined && object.principalAmount !== null
-                ? String(object.principalAmount)
-                : "";
         message.interestDenom =
             object.interestDenom !== undefined && object.interestDenom !== null
                 ? String(object.interestDenom)
@@ -3088,8 +3077,6 @@ exports.MsgLiquidateCollateralWithStablecoin = {
             (obj.minCollateralAmount = message.minCollateralAmount);
         message.debtDenom !== undefined && (obj.debtDenom = message.debtDenom);
         message.debtAmount !== undefined && (obj.debtAmount = message.debtAmount);
-        message.principalAmount !== undefined &&
-            (obj.principalAmount = message.principalAmount);
         message.interestDenom !== undefined &&
             (obj.interestDenom = message.interestDenom);
         message.interestAmount !== undefined &&
@@ -3097,7 +3084,7 @@ exports.MsgLiquidateCollateralWithStablecoin = {
         return obj;
     },
     fromPartial(object) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+        var _a, _b, _c, _d, _e, _f, _g, _h;
         const message = Object.assign({}, baseMsgLiquidateCollateralWithStablecoin);
         message.creator = (_a = object.creator) !== null && _a !== void 0 ? _a : "";
         message.debtor = (_b = object.debtor) !== null && _b !== void 0 ? _b : "";
@@ -3105,9 +3092,8 @@ exports.MsgLiquidateCollateralWithStablecoin = {
         message.minCollateralAmount = (_d = object.minCollateralAmount) !== null && _d !== void 0 ? _d : "";
         message.debtDenom = (_e = object.debtDenom) !== null && _e !== void 0 ? _e : "";
         message.debtAmount = (_f = object.debtAmount) !== null && _f !== void 0 ? _f : "";
-        message.principalAmount = (_g = object.principalAmount) !== null && _g !== void 0 ? _g : "";
-        message.interestDenom = (_h = object.interestDenom) !== null && _h !== void 0 ? _h : "";
-        message.interestAmount = (_j = object.interestAmount) !== null && _j !== void 0 ? _j : "";
+        message.interestDenom = (_g = object.interestDenom) !== null && _g !== void 0 ? _g : "";
+        message.interestAmount = (_h = object.interestAmount) !== null && _h !== void 0 ? _h : "";
         return message;
     },
 };

package/lib/codec/cosmos/authz/v1beta1/genesis.d.ts

@@ -1,6 +1,6 @@
 import Long from "long";
 import _m0 from "protobufjs/minimal";
-import { GrantAuthorization } from "./authz";
+import { GrantAuthorization } from "../../../cosmos/authz/v1beta1/authz";
 export declare const protobufPackage = "cosmos.authz.v1beta1";
 /** Since: cosmos-sdk 0.43 */
 /** GenesisState defines the authz module's genesis state. */

package/lib/codec/cosmos/authz/v1beta1/genesis.js

@@ -7,7 +7,7 @@ exports.GenesisState = exports.protobufPackage = void 0;
 /* eslint-disable */
 const long_1 = __importDefault(require("long"));
 const minimal_1 = __importDefault(require("protobufjs/minimal"));
-const authz_1 = require("./authz");
+const authz_1 = require("../../../cosmos/authz/v1beta1/authz");
 exports.protobufPackage = "cosmos.authz.v1beta1";
 const baseGenesisState = {};
 exports.GenesisState = {

package/lib/codec/cosmos/authz/v1beta1/query.d.ts

@@ -1,7 +1,7 @@
 import Long from "long";
 import _m0 from "protobufjs/minimal";
 import { PageRequest, PageResponse } from "../../base/query/v1beta1/pagination";
-import { Grant, GrantAuthorization } from "./authz";
+import { Grant, GrantAuthorization } from "../../../cosmos/authz/v1beta1/authz";
 export declare const protobufPackage = "cosmos.authz.v1beta1";
 /** Since: cosmos-sdk 0.43 */
 /** QueryGrantsRequest is the request type for the Query/Grants RPC method. */

package/lib/codec/cosmos/authz/v1beta1/query.js

@@ -8,7 +8,7 @@ exports.QueryClientImpl = exports.QueryGranteeGrantsResponse = exports.QueryGran
 const long_1 = __importDefault(require("long"));
 const minimal_1 = __importDefault(require("protobufjs/minimal"));
 const pagination_1 = require("../../base/query/v1beta1/pagination");
-const authz_1 = require("./authz");
+const authz_1 = require("../../../cosmos/authz/v1beta1/authz");
 exports.protobufPackage = "cosmos.authz.v1beta1";
 const baseQueryGrantsRequest = {
     granter: "",

package/lib/codec/cosmos/tx/v1beta1/service.d.ts

@@ -2,7 +2,7 @@ import Long from "long";
 import _m0 from "protobufjs/minimal";
 import { PageRequest, PageResponse } from "../../base/query/v1beta1/pagination";
 import { TxResponse, GasInfo, Result } from "../../base/abci/v1beta1/abci";
-import { Tx } from "../../tx/v1beta1/tx";
+import { Tx } from "./tx";
 import { BlockID } from "../../../tendermint/types/types";
 import { Block } from "../../../tendermint/types/block";
 export declare const protobufPackage = "cosmos.tx.v1beta1";

package/lib/codec/cosmos/tx/v1beta1/service.js

@@ -9,7 +9,7 @@ const long_1 = __importDefault(require("long"));
 const minimal_1 = __importDefault(require("protobufjs/minimal"));
 const pagination_1 = require("../../base/query/v1beta1/pagination");
 const abci_1 = require("../../base/abci/v1beta1/abci");
-const tx_1 = require("../../tx/v1beta1/tx");
+const tx_1 = require("./tx");
 const types_1 = require("../../../tendermint/types/types");
 const block_1 = require("../../../tendermint/types/block");
 exports.protobufPackage = "cosmos.tx.v1beta1";

package/lib/codec/index.d.ts

@@ -406,4 +406,5 @@ export { MsgSetBackfillTimeInterval, MsgSetBackfillTimeIntervalResponse, MsgSetS
 export { Params as PricingParams, PriceSet, TokenPrice } from "./pricing/pricing";
 export { SettlementPriceProposal, SettlementPriceParams } from "./pricing/proposal";
 export { QueryPriceTokenRequest, QueryPriceTokenResponse, QueryPriceSetRequest, QueryPriceSetResponse, QueryAllPriceSetRequest, QueryAllPriceSetResponse, QueryRateRequest, QueryRateResponse, QueryParamsRequest as QueryPricingParamsRequest, QueryParamsResponse as QueryPricingParamsResponse, QueryTokenPriceRequest, QueryTokenPriceResponse, QueryTokenPriceAllRequest, QueryTokenPriceAllResponse } from "./pricing/query";
+export { ParamsV2130 } from "./pricing/legacy";
 export { PriceUpdateEvent, TokenPriceUpdateEvent, SetImpactBandEvent, SetSmoothenBandEvent, SetStaleIndexAllowanceEvent, SetBackfillTimeIntervalEvent } from "./pricing/event";

package/lib/codec/index.js

@@ -33,7 +33,7 @@ exports.MsgSetLeverageResponse = exports.MsgSetLeverage = exports.MarketLeverage
 exports.MarketParams = exports.Market = exports.ControlledParams = exports.MarketDefaultsParams = exports.UpdatePerpetualsFundingIntervalProposal = exports.UpdateMarketProposal = exports.CreateMarketProposal = exports.MsgUpdatePerpetualsFundingIntervalResponse = exports.MsgUpdatePerpetualsFundingInterval = exports.MsgUpdateMarketResponse = exports.MsgUpdateMarket = exports.MsgCreateMarketResponse = exports.MsgCreateMarket = exports.OrderBookEvent = exports.QueryAllBookResponse = exports.QueryAllBookRequest = exports.QueryGetBookResponse = exports.QueryGetBookRequest = exports.StopBook = exports.OrderBook = exports.OrderBookLevel = exports.GenesisSubAccount = exports.SubAccount = exports.QuerySubAccountPowerResponse = exports.QuerySubAccountPowerRequest = exports.QuerySubAccountStatusResponse = exports.QuerySubAccountStatusRequest = exports.QueryAllSubAccountResponse = exports.QueryAllSubAccountRequest = exports.QueryGetSubAccountResponse = exports.QueryGetSubAccountRequest = exports.MsgRemoveSubAccountResponse = exports.MsgRemoveSubAccount = exports.MsgActivateSubAccountResponse = exports.MsgActivateSubAccount = exports.MsgCreateSubAccountResponse = exports.MsgCreateSubAccount = exports.UpdateProfileEvent = exports.QueryAllProfileResponse = exports.QueryAllProfileRequest = exports.QueryGetProfileResponse = exports.QueryGetProfileRequest = exports.Profile = exports.MsgUpdateProfileResponse = exports.MsgUpdateProfile = exports.LeverageEvent = exports.QueryAllLeverageResponse = exports.QueryAllLeverageRequest = exports.QueryGetLeverageResponse = exports.QueryGetLeverageRequest = void 0;
 exports.RewardWeights = exports.RewardWeight = exports.CommitmentCurve = exports.RewardCurve = exports.MsgUpdatePoolResponse = exports.UpdatePoolParams = exports.MsgUpdatePool = exports.MsgSetCommitmentCurveResponse = exports.SetCommitmentCurveParams = exports.MsgSetCommitmentCurve = exports.MsgSetRewardCurveResponse = exports.SetRewardCurveParams = exports.MsgSetRewardCurve = exports.MsgClaimPoolRewardsResponse = exports.MsgClaimPoolRewards = exports.MsgUnstakePoolTokenResponse = exports.MsgUnstakePoolToken = exports.MsgStakePoolTokenResponse = exports.MsgStakePoolToken = exports.MsgSetRewardsWeightsResponse = exports.SetRewardsWeightsParams = exports.MsgSetRewardsWeights = exports.MsgUnlinkPoolResponse = exports.UnlinkPoolParams = exports.MsgUnlinkPool = exports.MsgLinkPoolResponse = exports.LinkPoolParams = exports.MsgLinkPool = exports.MsgRemoveLiquidityResponse = exports.MsgRemoveLiquidity = exports.MsgAddLiquidityResponse = exports.MsgAddLiquidity = exports.MsgCreatePoolWithLiquidityResponse = exports.MsgCreatePoolWithLiquidity = exports.MsgCreatePoolResponse = exports.MsgCreatePool = exports.PageResponse = exports.PageRequest = exports.QueryMintDataResponse = exports.QueryMintDataRequest = exports.MintData = exports.MarketEvent = exports.ParamsV280 = exports.ParamsV270 = exports.QueryMarketParamsResponse = exports.QueryMarketParamsRequest = exports.QueryAllMarketResponse = exports.QueryAllMarketRequest = exports.QueryGetMarketResponse = exports.QueryGetMarketRequest = void 0;
 exports.QueryLiquiditypoolParamsResponse = exports.QueryLiquiditypoolParamsRequest = exports.QueryClaimableRewardsResponse = exports.QueryClaimableRewardsRequest = exports.QueryAllTotalCommitmentResponse = exports.QueryAllTotalCommitmentRequest = exports.QueryTotalCommitmentResponse = exports.QueryTotalCommitmentRequest = exports.QueryRewardCurveResponse = exports.QueryRewardCurveRequest = exports.QueryCommitmentCurveResponse = exports.QueryCommitmentCurveRequest = exports.QueryLastClaimResponse = exports.QueryLastClaimRequest = exports.QueryAllCommitmentResponse = exports.QueryAllCommitmentRequest = exports.QueryCommitmentResponse = exports.QueryCommitmentRequest = exports.QueryRewardHistoryResponse = exports.ExtendedPool = exports.QueryRewardHistoryRequest = exports.QueryAllPoolResponse = exports.QueryAllPoolRequest = exports.QueryGetPoolResponse = exports.QueryGetPoolRequest = exports.UpdatePoolProposal = exports.SetRewardsWeightsProposal = exports.SetCommitmentCurveProposal = exports.SetRewardCurveProposal = exports.UnlinkPoolProposal = exports.LinkPoolProposal = exports.RemoveLiquidities = exports.RemoveLiquidity = exports.AddLiquidities = exports.AddLiquidity = exports.Pools = exports.Pool = exports.LiquiditypoolParams = exports.AllocatedRewards = exports.LastClaimRecord = exports.CommitmentExpiriesRecord = exports.CommitmentExpiries = exports.CommitmentExpiry = exports.RewardHistoryRecord = exports.RewardHistory = exports.CommitmentResponse = exports.TotalCommitmentRecord = exports.TotalCommitment = exports.CommitmentRecord = exports.Commitment = void 0;
-exports.SetBackfillTimeIntervalEvent = exports.SetStaleIndexAllowanceEvent = exports.SetSmoothenBandEvent = exports.SetImpactBandEvent = exports.TokenPriceUpdateEvent = exports.PriceUpdateEvent = exports.QueryTokenPriceAllResponse = exports.QueryTokenPriceAllRequest = exports.QueryTokenPriceResponse = exports.QueryTokenPriceRequest = exports.QueryPricingParamsResponse = exports.QueryPricingParamsRequest = exports.QueryRateResponse = exports.QueryRateRequest = exports.QueryAllPriceSetResponse = exports.QueryAllPriceSetRequest = exports.QueryPriceSetResponse = exports.QueryPriceSetRequest = exports.QueryPriceTokenResponse = exports.QueryPriceTokenRequest = exports.SettlementPriceParams = exports.SettlementPriceProposal = exports.TokenPrice = exports.PriceSet = exports.PricingParams = exports.MsgSetStaleIndexAllowanceResponse = exports.MsgSetStaleIndexAllowance = exports.MsgSetImpactBandResponse = exports.MsgSetImpactBand = exports.MsgSetSmoothenBandResponse = exports.MsgSetSmoothenBand = exports.MsgSetBackfillTimeIntervalResponse = exports.MsgSetBackfillTimeInterval = exports.Fund = exports.FundByMarket = exports.EventDataInsuranceFundTransfer = exports.QueryCoinBalancesResponse = exports.QueryCoinBalancesRequest = exports.CommitmentEvent = exports.CommitmentCurveEvent = exports.RewardsWeightChangeEvent = exports.TotalCommitmentChangeEvent = exports.PoolEvent = void 0;
+exports.SetBackfillTimeIntervalEvent = exports.SetStaleIndexAllowanceEvent = exports.SetSmoothenBandEvent = exports.SetImpactBandEvent = exports.TokenPriceUpdateEvent = exports.PriceUpdateEvent = exports.ParamsV2130 = exports.QueryTokenPriceAllResponse = exports.QueryTokenPriceAllRequest = exports.QueryTokenPriceResponse = exports.QueryTokenPriceRequest = exports.QueryPricingParamsResponse = exports.QueryPricingParamsRequest = exports.QueryRateResponse = exports.QueryRateRequest = exports.QueryAllPriceSetResponse = exports.QueryAllPriceSetRequest = exports.QueryPriceSetResponse = exports.QueryPriceSetRequest = exports.QueryPriceTokenResponse = exports.QueryPriceTokenRequest = exports.SettlementPriceParams = exports.SettlementPriceProposal = exports.TokenPrice = exports.PriceSet = exports.PricingParams = exports.MsgSetStaleIndexAllowanceResponse = exports.MsgSetStaleIndexAllowance = exports.MsgSetImpactBandResponse = exports.MsgSetImpactBand = exports.MsgSetSmoothenBandResponse = exports.MsgSetSmoothenBand = exports.MsgSetBackfillTimeIntervalResponse = exports.MsgSetBackfillTimeInterval = exports.Fund = exports.FundByMarket = exports.EventDataInsuranceFundTransfer = exports.QueryCoinBalancesResponse = exports.QueryCoinBalancesRequest = exports.CommitmentEvent = exports.CommitmentCurveEvent = exports.RewardsWeightChangeEvent = exports.TotalCommitmentChangeEvent = exports.PoolEvent = void 0;
 // GENERATED by scripts/generate-registry.sh
 const proto_signing_1 = require("@cosmjs/proto-signing");
 const tx_1 = require("./order/tx");
@@ -1376,6 +1376,8 @@ Object.defineProperty(exports, "QueryTokenPriceRequest", { enumerable: true, get
 Object.defineProperty(exports, "QueryTokenPriceResponse", { enumerable: true, get: function () { return query_20.QueryTokenPriceResponse; } });
 Object.defineProperty(exports, "QueryTokenPriceAllRequest", { enumerable: true, get: function () { return query_20.QueryTokenPriceAllRequest; } });
 Object.defineProperty(exports, "QueryTokenPriceAllResponse", { enumerable: true, get: function () { return query_20.QueryTokenPriceAllResponse; } });
+var legacy_2 = require("./pricing/legacy");
+Object.defineProperty(exports, "ParamsV2130", { enumerable: true, get: function () { return legacy_2.ParamsV2130; } });
 var event_15 = require("./pricing/event");
 Object.defineProperty(exports, "PriceUpdateEvent", { enumerable: true, get: function () { return event_15.PriceUpdateEvent; } });
 Object.defineProperty(exports, "TokenPriceUpdateEvent", { enumerable: true, get: function () { return event_15.TokenPriceUpdateEvent; } });

package/lib/codec/oracle/genesis.d.ts

@@ -1,6 +1,7 @@
 import Long from "long";
 import _m0 from "protobufjs/minimal";
 import { Params, Oracle, Result, Vote } from "./oracle";
+import { OracleVotesWindow, SlashCounter } from "./slashing";
 export declare const protobufPackage = "Switcheo.carbon.oracle";
 /** GenesisState defines the oracle module's genesis state. */
 export interface GenesisState {
@@ -10,6 +11,8 @@ export interface GenesisState {
     votes: Vote[];
     /** this line is used by starport scaffolding # ibc/genesis/proto */
     params?: Params;
+    allOracleVotesWindow: OracleVotesWindow[];
+    slashCounters: SlashCounter[];
 }
 export declare const GenesisState: {
     encode(message: GenesisState, writer?: _m0.Writer): _m0.Writer;

package/lib/codec/oracle/genesis.js

@@ -8,6 +8,7 @@ exports.GenesisState = exports.protobufPackage = void 0;
 const long_1 = __importDefault(require("long"));
 const minimal_1 = __importDefault(require("protobufjs/minimal"));
 const oracle_1 = require("./oracle");
+const slashing_1 = require("./slashing");
 exports.protobufPackage = "Switcheo.carbon.oracle";
 const baseGenesisState = {};
 exports.GenesisState = {
@@ -24,6 +25,12 @@ exports.GenesisState = {
         if (message.params !== undefined) {
             oracle_1.Params.encode(message.params, writer.uint32(42).fork()).ldelim();
         }
+        for (const v of message.allOracleVotesWindow) {
+            slashing_1.OracleVotesWindow.encode(v, writer.uint32(50).fork()).ldelim();
+        }
+        for (const v of message.slashCounters) {
+            slashing_1.SlashCounter.encode(v, writer.uint32(58).fork()).ldelim();
+        }
         return writer;
     },
     decode(input, length) {
@@ -33,6 +40,8 @@ exports.GenesisState = {
         message.oracles = [];
         message.results = [];
         message.votes = [];
+        message.allOracleVotesWindow = [];
+        message.slashCounters = [];
         while (reader.pos < end) {
             const tag = reader.uint32();
             switch (tag >>> 3) {
@@ -48,6 +57,12 @@ exports.GenesisState = {
                 case 5:
                     message.params = oracle_1.Params.decode(reader, reader.uint32());
                     break;
+                case 6:
+                    message.allOracleVotesWindow.push(slashing_1.OracleVotesWindow.decode(reader, reader.uint32()));
+                    break;
+                case 7:
+                    message.slashCounters.push(slashing_1.SlashCounter.decode(reader, reader.uint32()));
+                    break;
                 default:
                     reader.skipType(tag & 7);
                     break;
@@ -56,7 +71,7 @@ exports.GenesisState = {
         return message;
     },
     fromJSON(object) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d, _e;
         const message = Object.assign({}, baseGenesisState);
         message.oracles = ((_a = object.oracles) !== null && _a !== void 0 ? _a : []).map((e) => oracle_1.Oracle.fromJSON(e));
         message.results = ((_b = object.results) !== null && _b !== void 0 ? _b : []).map((e) => oracle_1.Result.fromJSON(e));
@@ -65,6 +80,8 @@ exports.GenesisState = {
             object.params !== undefined && object.params !== null
                 ? oracle_1.Params.fromJSON(object.params)
                 : undefined;
+        message.allOracleVotesWindow = ((_d = object.allOracleVotesWindow) !== null && _d !== void 0 ? _d : []).map((e) => slashing_1.OracleVotesWindow.fromJSON(e));
+        message.slashCounters = ((_e = object.slashCounters) !== null && _e !== void 0 ? _e : []).map((e) => slashing_1.SlashCounter.fromJSON(e));
         return message;
     },
     toJSON(message) {
@@ -89,10 +106,22 @@ exports.GenesisState = {
         }
         message.params !== undefined &&
             (obj.params = message.params ? oracle_1.Params.toJSON(message.params) : undefined);
+        if (message.allOracleVotesWindow) {
+            obj.allOracleVotesWindow = message.allOracleVotesWindow.map((e) => e ? slashing_1.OracleVotesWindow.toJSON(e) : undefined);
+        }
+        else {
+            obj.allOracleVotesWindow = [];
+        }
+        if (message.slashCounters) {
+            obj.slashCounters = message.slashCounters.map((e) => e ? slashing_1.SlashCounter.toJSON(e) : undefined);
+        }
+        else {
+            obj.slashCounters = [];
+        }
         return obj;
     },
     fromPartial(object) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d, _e;
         const message = Object.assign({}, baseGenesisState);
         message.oracles = ((_a = object.oracles) !== null && _a !== void 0 ? _a : []).map((e) => oracle_1.Oracle.fromPartial(e));
         message.results = ((_b = object.results) !== null && _b !== void 0 ? _b : []).map((e) => oracle_1.Result.fromPartial(e));
@@ -101,6 +130,8 @@ exports.GenesisState = {
             object.params !== undefined && object.params !== null
                 ? oracle_1.Params.fromPartial(object.params)
                 : undefined;
+        message.allOracleVotesWindow = ((_d = object.allOracleVotesWindow) !== null && _d !== void 0 ? _d : []).map((e) => slashing_1.OracleVotesWindow.fromPartial(e));
+        message.slashCounters = ((_e = object.slashCounters) !== null && _e !== void 0 ? _e : []).map((e) => slashing_1.SlashCounter.fromPartial(e));
         return message;
     },
 };

package/lib/codec/pricing/genesis.d.ts

@@ -9,7 +9,7 @@ export interface GenesisState {
      * this line is used by starport scaffolding # ibc/genesis/proto
      */
     prices: PriceSet[];
-    tokenPrice: TokenPrice[];
+    tokenPrices: TokenPrice[];
     params?: Params;
 }
 export declare const GenesisState: {

package/lib/codec/pricing/genesis.js

@@ -15,7 +15,7 @@ exports.GenesisState = {
         for (const v of message.prices) {
             pricing_1.PriceSet.encode(v, writer.uint32(10).fork()).ldelim();
         }
-        for (const v of message.tokenPrice) {
+        for (const v of message.tokenPrices) {
             pricing_1.TokenPrice.encode(v, writer.uint32(18).fork()).ldelim();
         }
         if (message.params !== undefined) {
@@ -28,7 +28,7 @@ exports.GenesisState = {
         let end = length === undefined ? reader.len : reader.pos + length;
         const message = Object.assign({}, baseGenesisState);
         message.prices = [];
-        message.tokenPrice = [];
+        message.tokenPrices = [];
         while (reader.pos < end) {
             const tag = reader.uint32();
             switch (tag >>> 3) {
@@ -36,7 +36,7 @@ exports.GenesisState = {
                     message.prices.push(pricing_1.PriceSet.decode(reader, reader.uint32()));
                     break;
                 case 2:
-                    message.tokenPrice.push(pricing_1.TokenPrice.decode(reader, reader.uint32()));
+                    message.tokenPrices.push(pricing_1.TokenPrice.decode(reader, reader.uint32()));
                     break;
                 case 3:
                     message.params = pricing_1.Params.decode(reader, reader.uint32());
@@ -52,7 +52,7 @@ exports.GenesisState = {
         var _a, _b;
         const message = Object.assign({}, baseGenesisState);
         message.prices = ((_a = object.prices) !== null && _a !== void 0 ? _a : []).map((e) => pricing_1.PriceSet.fromJSON(e));
-        message.tokenPrice = ((_b = object.tokenPrice) !== null && _b !== void 0 ? _b : []).map((e) => pricing_1.TokenPrice.fromJSON(e));
+        message.tokenPrices = ((_b = object.tokenPrices) !== null && _b !== void 0 ? _b : []).map((e) => pricing_1.TokenPrice.fromJSON(e));
         message.params =
             object.params !== undefined && object.params !== null
                 ? pricing_1.Params.fromJSON(object.params)
@@ -67,11 +67,11 @@ exports.GenesisState = {
         else {
             obj.prices = [];
         }
-        if (message.tokenPrice) {
-            obj.tokenPrice = message.tokenPrice.map((e) => e ? pricing_1.TokenPrice.toJSON(e) : undefined);
+        if (message.tokenPrices) {
+            obj.tokenPrices = message.tokenPrices.map((e) => e ? pricing_1.TokenPrice.toJSON(e) : undefined);
         }
         else {
-            obj.tokenPrice = [];
+            obj.tokenPrices = [];
         }
         message.params !== undefined &&
             (obj.params = message.params ? pricing_1.Params.toJSON(message.params) : undefined);
@@ -81,7 +81,7 @@ exports.GenesisState = {
         var _a, _b;
         const message = Object.assign({}, baseGenesisState);
         message.prices = ((_a = object.prices) !== null && _a !== void 0 ? _a : []).map((e) => pricing_1.PriceSet.fromPartial(e));
-        message.tokenPrice = ((_b = object.tokenPrice) !== null && _b !== void 0 ? _b : []).map((e) => pricing_1.TokenPrice.fromPartial(e));
+        message.tokenPrices = ((_b = object.tokenPrices) !== null && _b !== void 0 ? _b : []).map((e) => pricing_1.TokenPrice.fromPartial(e));
         message.params =
             object.params !== undefined && object.params !== null
                 ? pricing_1.Params.fromPartial(object.params)

package/lib/modules/admin.d.ts

@@ -212,7 +212,7 @@ export declare namespace AdminModule {
         rateStrategyName: string;
         loanToValue: BigNumber;
         liquidationThreshold: BigNumber;
-        liquidationBonus: BigNumber;
+        liquidationDiscount: BigNumber;
         supplyCap: BigNumber;
         borrowCap: BigNumber;
     }

package/lib/modules/admin.js

@@ -452,7 +452,7 @@ class AdminModule extends base_1.default {
                     rateStrategyName: params.asset.rateStrategyName,
                     loanToValue: params.asset.loanToValue.toString(10),
                     liquidationThreshold: params.asset.liquidationThreshold.toString(10),
-                    liquidationBonus: params.asset.liquidationBonus.toString(10),
+                    liquidationDiscount: params.asset.liquidationDiscount.toString(10),
                     supplyCap: params.asset.supplyCap.toString(10),
                     borrowCap: params.asset.borrowCap.toString(10),
                 }
@@ -474,7 +474,7 @@ class AdminModule extends base_1.default {
                     rateStrategyName: params.asset.rateStrategyName,
                     loanToValue: params.asset.loanToValue.toString(10),
                     liquidationThreshold: params.asset.liquidationThreshold.toString(10),
-                    liquidationBonus: params.asset.liquidationBonus.toString(10),
+                    liquidationDiscount: params.asset.liquidationDiscount.toString(10),
                     supplyCap: params.asset.supplyCap.toString(10),
                     borrowCap: params.asset.borrowCap.toString(10),
                 }

package/lib/modules/cdp.d.ts

@@ -23,6 +23,7 @@ export declare class CDPModule extends BaseModule {
     returnStablecoin(params: CDPModule.ReturnStablecoinParams, opts?: CarbonTx.SignTxOpts): Promise<import("@cosmjs/stargate").DeliverTxResponse>;
     updateRateStrategy(params: CDPModule.UpdateRateStrategyParams, opts?: CarbonTx.SignTxOpts): Promise<import("@cosmjs/stargate").DeliverTxResponse>;
     claimRewards(opts?: CarbonTx.SignTxOpts): Promise<import("@cosmjs/stargate").DeliverTxResponse>;
+    createRewardScheme(params: CDPModule.CreateRewardSchemeParams, opts?: CarbonTx.SignTxOpts): Promise<import("@cosmjs/stargate").DeliverTxResponse>;
     getAccountData(account: string): Promise<{
         TotalCollateralsUsd: BigNumber;
         AvailableBorrowsUsd: BigNumber;
@@ -50,6 +51,7 @@ export declare class CDPModule extends BaseModule {
     getCdpTokenPrice(cdpDenom: string): Promise<BigNumber>;
     getUnderlyingDenom(cdpDenom: string): string;
     getCollateralReceivableForLiquidation(debtDenom: string, debtAmount: BigNumber, cdpDenom: string): Promise<BigNumber>;
+    getCollateralReceivableForStablecoinLiq(cdpDenom: string, stablecoinRepayAmt: BigNumber, interestDenom: string, interestRepayAmt: BigNumber): Promise<BigNumber>;
 }
 export declare namespace CDPModule {
     interface SupplyAssetParams {
@@ -117,7 +119,6 @@ export declare namespace CDPModule {
         minCollateralAmount: BigNumber;
         debtDenom: string;
         debtAmount: BigNumber;
-        principalAmount: BigNumber;
         interestDenom: string;
         interestAmount: BigNumber;
     }
@@ -148,4 +149,12 @@ export declare namespace CDPModule {
         principalDebt: string;
         initialCumulativeInterestMultiplier: string;
     }
+    interface CreateRewardSchemeParams {
+        rewardDenom: string;
+        assetDenom: string;
+        rewardType: string;
+        rewardAmountPerSecond: BigNumber;
+        startTime: Date;
+        endTime: Date;
+    }
 }

package/lib/modules/cdp.js

@@ -205,7 +205,6 @@ class CDPModule extends base_1.default {
                 minCollateralAmount: params.minCollateralAmount.toString(10),
                 debtDenom: params.debtDenom,
                 debtAmount: params.debtAmount.toString(10),
-                principalAmount: params.principalAmount.toString(10),
                 interestDenom: params.interestDenom,
                 interestAmount: params.interestAmount.toString(10),
             });
@@ -302,6 +301,26 @@ class CDPModule extends base_1.default {
             }, opts);
         });
     }
+    createRewardScheme(params, opts) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const wallet = this.getWallet();
+            const value = tx_1.MsgCreateRewardScheme.fromPartial({
+                creator: wallet.bech32Address,
+                createRewardSchemeParams: {
+                    rewardDenom: params.rewardDenom,
+                    rewardType: params.rewardType,
+                    assetDenom: params.assetDenom,
+                    rewardAmountPerSecond: params.rewardAmountPerSecond.toString(10),
+                    startTime: params.startTime,
+                    endTime: params.endTime,
+                }
+            });
+            return yield wallet.sendTx({
+                typeUrl: util_1.CarbonTx.Types.MsgCreateRewardScheme,
+                value,
+            }, opts);
+        });
+    }
     // start of cdp calculations
     getAccountData(account) {
         var _a;
@@ -485,7 +504,7 @@ class CDPModule extends base_1.default {
             if (!priceResult.tokenPrice)
                 throw new Error("unable to retrieve token price for " + denom);
             const twap = (0, number_1.bnOrZero)(priceResult.tokenPrice.twap).shiftedBy(-18);
-            return amount.times(twap).shiftedBy(-decimals);
+            return amount.multipliedBy(twap).shiftedBy(-decimals);
         });
     }
     getTotalTokenDebt(denom, debtInfo) {
@@ -706,17 +725,18 @@ class CDPModule extends base_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             const sdk = this.sdkProvider;
             // get the discounted price for the cdp token
+            const cdpActualDenom = this.getUnderlyingDenom(cdpDenom);
             const asset = yield sdk.query.cdp.Asset({
-                denom: debtDenom
+                denom: cdpActualDenom
             });
             if (!asset.assetParams)
                 throw new Error("unable to retrieve asset param for " + debtDenom);
-            const bonus = (0, number_1.bnOrZero)(asset.assetParams.liquidationBonus).div(number_1.BN_10000);
+            const bonus = (0, number_1.bnOrZero)(asset.assetParams.liquidationDiscount).div(number_1.BN_10000);
             const cdpTokenPrice = yield this.getCdpTokenPrice(cdpDenom);
             const cdpTokenDiscountedPrice = cdpTokenPrice.multipliedBy(number_1.BN_ONE.minus(bonus));
             // get cdp tokens (discounted) that can be gained from the debt amount
             const debtValue = (_a = yield this.getTokenUsdVal(debtDenom, debtAmount)) !== null && _a !== void 0 ? _a : number_1.BN_ZERO;
-            const underlyingDenom = yield this.getUnderlyingDenom(cdpDenom);
+            const underlyingDenom = this.getUnderlyingDenom(cdpDenom);
             const cdpTokenDecimals = (_b = yield sdk.getTokenClient().getDecimals(underlyingDenom)) !== null && _b !== void 0 ? _b : 0;
             const cdpAmountWithDiscount = debtValue.div(cdpTokenDiscountedPrice).shiftedBy(cdpTokenDecimals);
             // get cdp tokens (not discounted) that can be gained from the debt amount
@@ -732,6 +752,45 @@ class CDPModule extends base_1.default {
             return cdpAmountWithDiscount.minus(feeAmount);
         });
     }
+    getCollateralReceivableForStablecoinLiq(cdpDenom, stablecoinRepayAmt, interestDenom, interestRepayAmt) {
+        var _a, _b, _c, _d;
+        return __awaiter(this, void 0, void 0, function* () {
+            const sdk = this.sdkProvider;
+            // get the discounted price for the cdp token
+            const cdpActualDenom = this.getUnderlyingDenom(cdpDenom);
+            const asset = yield sdk.query.cdp.Asset({
+                denom: cdpActualDenom
+            });
+            if (!asset.assetParams)
+                throw new Error("unable to retrieve asset param for " + cdpActualDenom);
+            const bonus = (0, number_1.bnOrZero)(asset.assetParams.liquidationDiscount).div(number_1.BN_10000);
+            const cdpTokenPrice = yield this.getCdpTokenPrice(cdpDenom);
+            const cdpTokenDiscountedPrice = cdpTokenPrice.multipliedBy(number_1.BN_ONE.minus(bonus));
+            // get value of stablecoin repayment + interest repayment
+            const debtInfoRsp = (_a = yield sdk.query.cdp.StablecoinDebt({})) !== null && _a !== void 0 ? _a : {};
+            if (!debtInfoRsp.stablecoinDebtInfo)
+                throw new Error("unable to retrieve stablecoin debt info");
+            const stablecoinDebtInfo = debtInfoRsp.stablecoinDebtInfo;
+            const stablecoinDecimals = (_b = yield this.sdkProvider.getTokenClient().getDecimals(stablecoinDebtInfo.denom)) !== null && _b !== void 0 ? _b : number_1.BN_ZERO;
+            const stablecoinRepaymentValue = stablecoinRepayAmt.shiftedBy(-stablecoinDecimals);
+            const interestRepaymentValue = (_c = yield this.getTokenUsdVal(interestDenom, interestRepayAmt)) !== null && _c !== void 0 ? _c : number_1.BN_ZERO;
+            const totalRepaymentValue = stablecoinRepaymentValue.plus(interestRepaymentValue);
+            // get cdp tokens (discounted) that can be gained from the debt amount
+            const cdpTokenDecimals = (_d = yield sdk.getTokenClient().getDecimals(cdpActualDenom)) !== null && _d !== void 0 ? _d : 0;
+            const cdpAmountWithDiscount = totalRepaymentValue.div(cdpTokenDiscountedPrice).shiftedBy(cdpTokenDecimals);
+            // get cdp tokens (not discounted) that can be gained from the debt amount
+            const cdpAmountWithoutDiscount = totalRepaymentValue.div(cdpTokenPrice).shiftedBy(cdpTokenDecimals);
+            // get fee amount
+            const cdpAmountProfit = cdpAmountWithDiscount.minus(cdpAmountWithoutDiscount);
+            const params = yield sdk.query.cdp.Params({});
+            if (!params.params)
+                throw new Error("unable to retrieve cdp params");
+            const feePercentage = (0, number_1.bnOrZero)(params.params.liquidationFee).div(number_1.BN_10000);
+            const feeAmount = cdpAmountProfit.multipliedBy(feePercentage);
+            // return collateral that can be received by liquidator
+            return cdpAmountWithDiscount.minus(feeAmount);
+        });
+    }
 }
 exports.CDPModule = CDPModule;
 ;

package/lib/websocket/models.d.ts

@@ -208,7 +208,7 @@ export interface AssetParams {
     allow_repay_stablecoin_interest_debt: boolean;
     loan_to_value: string;
     liquidation_threshold: string;
-    liquidation_bonus: string;
+    liquidation_discount: string;
     supply_cap: string;
     borrow_cap: string;
 }
@@ -294,7 +294,6 @@ export interface RewardScheme {
     reward_amount_per_second: string;
     start_time: string;
     end_time: string;
-    reward_reserve_amount: string;
     reward_per_share_last_updated_at: string;
     reward_per_share: string;
 }

package/package.json

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