carbon-js-sdk 0.3.59 → 0.4.1

package/lib/clients/CarbonQueryClient.js

@@ -47,7 +47,7 @@ class CarbonQueryClient {
     constructor(tmClient) {
         this.tmClient = tmClient;
         this.baseClient = new stargate_1.QueryClient(this.tmClient);
-        const rpcClient = (0, stargate_1.createProtobufRpcClient)(this.baseClient);
+        const rpcClient = stargate_1.createProtobufRpcClient(this.baseClient);
         this.chain = BlockchainClient_1.default.connectWithTm(this.tmClient);
         this.adl = new query_1.QueryClientImpl(rpcClient);
         this.book = new query_2.QueryClientImpl(rpcClient);
@@ -91,7 +91,7 @@ class CarbonQueryClient {
         };
     }
     getProtobufRpcClient() {
-        return (0, stargate_1.createProtobufRpcClient)(this.baseClient);
+        return stargate_1.createProtobufRpcClient(this.baseClient);
     }
 }
 exports.default = CarbonQueryClient;

package/lib/clients/ETHClient.js

@@ -39,13 +39,13 @@ class ETHClient {
         return __awaiter(this, void 0, void 0, function* () {
             const tokenQueryResults = yield api.token.getAllTokens();
             const lockProxyAddress = this.getLockProxyAddress().toLowerCase();
-            const tokens = tokenQueryResults.filter((token) => (0, blockchain_1.blockchainForChainId)(token.chainId.toNumber(), api.network) == this.blockchain &&
+            const tokens = tokenQueryResults.filter((token) => blockchain_1.blockchainForChainId(token.chainId.toNumber(), api.network) == this.blockchain &&
                 token.tokenAddress.length == 40 &&
-                token.bridgeAddress.toLowerCase() == (0, generic_1.stripHexPrefix)(lockProxyAddress) &&
+                token.bridgeAddress.toLowerCase() == generic_1.stripHexPrefix(lockProxyAddress) &&
                 (!whitelistDenoms || whitelistDenoms.includes(token.denom)) &&
-                this.verifyChecksum((0, generic_1.appendHexPrefix)(token.tokenAddress)));
+                this.verifyChecksum(generic_1.appendHexPrefix(token.tokenAddress)));
             const assetIds = tokens.map((token) => {
-                return this.verifyChecksum((0, generic_1.appendHexPrefix)(token.tokenAddress));
+                return this.verifyChecksum(generic_1.appendHexPrefix(token.tokenAddress));
             });
             const provider = this.getProvider();
             const contractAddress = this.getBalanceReaderAddress();
@@ -96,14 +96,14 @@ class ETHClient {
             }
             const carbonNetwork = networkConfig.network;
             const fromTokenId = fromToken.id;
-            const fromTokenAddress = (0, generic_1.appendHexPrefix)(fromToken.tokenAddress);
+            const fromTokenAddress = generic_1.appendHexPrefix(fromToken.tokenAddress);
             const toTokenDenom = toToken.denom;
             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 = (0, generic_1.appendHexPrefix)(networkConfig.feeAddress);
+            const feeAddress = generic_1.appendHexPrefix(networkConfig.feeAddress);
             const tokenCreator = fromToken.creator;
             const targetAddressBytes = util_1.AddressUtils.SWTHAddress.getAddressBytes(tokenCreator, carbonNetwork);
             const targetProxyHash = ethers_1.ethers.utils.hexlify(targetAddressBytes);
@@ -138,9 +138,9 @@ class ETHClient {
                 throw new Error("Minimum gas required: 150,000");
             }
             const networkConfig = this.getNetworkConfig();
-            const assetId = (0, generic_1.appendHexPrefix)(token.tokenAddress);
-            const targetProxyHash = (0, generic_1.appendHexPrefix)(this.getTargetProxyHash(token));
-            const feeAddress = (0, generic_1.appendHexPrefix)(networkConfig.feeAddress);
+            const assetId = generic_1.appendHexPrefix(token.tokenAddress);
+            const targetProxyHash = generic_1.appendHexPrefix(this.getTargetProxyHash(token));
+            const feeAddress = generic_1.appendHexPrefix(networkConfig.feeAddress);
             const toAssetHash = ethers_1.ethers.utils.hexlify(ethers_1.ethers.utils.toUtf8Bytes(token.id));
             const swthAddress = ethers_1.ethers.utils.hexlify(address);
             const contractAddress = this.getLockProxyAddress();
@@ -191,16 +191,16 @@ class ETHClient {
                 return "insufficient balance";
             }
             const networkConfig = this.getNetworkConfig();
-            const assetId = (0, generic_1.appendHexPrefix)(tokenWithExternalBalances.tokenAddress);
-            const targetProxyHash = (0, generic_1.appendHexPrefix)(this.getTargetProxyHash(tokenWithExternalBalances));
-            const feeAddress = (0, generic_1.appendHexPrefix)(networkConfig.feeAddress);
+            const assetId = generic_1.appendHexPrefix(tokenWithExternalBalances.tokenAddress);
+            const targetProxyHash = generic_1.appendHexPrefix(this.getTargetProxyHash(tokenWithExternalBalances));
+            const feeAddress = generic_1.appendHexPrefix(networkConfig.feeAddress);
             const toAssetHash = ethers_1.ethers.utils.hexlify(ethers_1.ethers.utils.toUtf8Bytes(tokenWithExternalBalances.id));
             const nonce = Math.floor(Math.random() * 1000000000); // random nonce to prevent replay attacks
             const message = ethers_1.ethers.utils.solidityKeccak256(["string", "address", "bytes", "bytes", "bytes", "uint256", "uint256", "uint256"], ["sendTokens", assetId, targetProxyHash, toAssetHash, feeAddress, amount, feeAmount, nonce]);
             // logger("sendDeposit message", message)
             let signatureResult;
             const { address, signature } = yield getSignatureCallback(message);
-            const signatureBytes = ethers_1.ethers.utils.arrayify((0, generic_1.appendHexPrefix)(signature));
+            const signatureBytes = ethers_1.ethers.utils.arrayify(generic_1.appendHexPrefix(signature));
             const rsv = ethers_1.ethers.utils.splitSignature(signatureBytes);
             // logger("sign result", address, signature)
             signatureResult = {
@@ -239,7 +239,7 @@ class ETHClient {
             if (!feeInfo.deposit_fee) {
                 throw new Error("unsupported token");
             }
-            if ((0, blockchain_1.blockchainForChainId)(token.chainId.toNumber(), this.configProvider.getConfig().network) !== this.blockchain) {
+            if (blockchain_1.blockchainForChainId(token.chainId.toNumber(), this.configProvider.getConfig().network) !== this.blockchain) {
                 throw new Error("unsupported token");
             }
             let feeAmount = ethers_1.ethers.BigNumber.from(feeInfo.deposit_fee);
@@ -305,7 +305,7 @@ class ETHClient {
     getTargetProxyHash(token) {
         const networkConfig = this.getNetworkConfig();
         const addressBytes = address_1.SWTHAddress.getAddressBytes(token.creator, networkConfig.network);
-        const addressHex = (0, generic_1.stripHexPrefix)(ethers_1.ethers.utils.hexlify(addressBytes));
+        const addressHex = generic_1.stripHexPrefix(ethers_1.ethers.utils.hexlify(addressBytes));
         return addressHex;
     }
     getProvider() {

package/lib/clients/HydrogenClient.js

@@ -29,7 +29,7 @@ exports.HydrogenEndpoints = {
 const formatDateField = (value) => {
     if (typeof value !== "string")
         return null;
-    return (0, dayjs_1.default)(value);
+    return dayjs_1.default(value);
 };
 // temporary function to parse okt/okc blockchain
 // to remove when automatic deposit/withdraw feature is deployed

package/lib/clients/NEOClient.js

@@ -64,13 +64,13 @@ class NEOClient {
         return __awaiter(this, void 0, void 0, function* () {
             const tokenQueryResults = yield sdk.token.getAllTokens();
             const account = new Neon.wallet.Account(address);
-            const tokens = tokenQueryResults.filter((token) => (0, blockchain_1.blockchainForChainId)(token.chainId.toNumber(), sdk.network) == this.blockchain &&
+            const tokens = tokenQueryResults.filter((token) => blockchain_1.blockchainForChainId(token.chainId.toNumber(), sdk.network) == this.blockchain &&
                 token.tokenAddress.length == 40 &&
                 token.bridgeAddress.length == 40);
             const client = new Neon.rpc.RPCClient(url, "2.5.2"); // TODO: should we change the RPC version??
             // NOTE: fetching of tokens is chunked in sets of 15 as we may hit
             // the gas limit on the RPC node and error out otherwise
-            const promises = (0, lodash_1.chunk)(tokens, 75).map((partition) => __awaiter(this, void 0, void 0, function* () {
+            const promises = lodash_1.chunk(tokens, 75).map((partition) => __awaiter(this, void 0, void 0, function* () {
                 var _a, _b, _c;
                 let acc = {};
                 for (const token of partition) {
@@ -112,8 +112,8 @@ class NEOClient {
             const targetProxyHash = this.getTargetProxyHash(token);
             const toAssetHash = Neon.u.str2hexstring(token.id);
             const addressBytes = address_1.SWTHAddress.getAddressBytes(swthAddress, networkConfig.network);
-            const toAddress = (0, generic_1.stripHexPrefix)(ethers_1.ethers.utils.hexlify(addressBytes));
-            const zeroAddressHex = (0, generic_1.stripHexPrefix)(ethers_1.ethers.utils.hexlify(constant_1.ZeroAddress));
+            const toAddress = generic_1.stripHexPrefix(ethers_1.ethers.utils.hexlify(addressBytes));
+            const zeroAddressHex = generic_1.stripHexPrefix(ethers_1.ethers.utils.hexlify(constant_1.ZeroAddress));
             const amount = ethers_1.ethers.BigNumber.from(token.externalBalance);
             const feeAmount = ethers_1.ethers.BigNumber.from(feeAmountInput !== null && feeAmountInput !== void 0 ? feeAmountInput : "100000000");
             const feeAddress = feeAmount.isZero() ? zeroAddressHex : networkConfig.feeAddress;
@@ -160,7 +160,7 @@ class NEOClient {
             const fromAddress = util_1.AddressUtils.NEOAddress.publicKeyToAddress(publicKeyOutput.publicKey);
             const targetProxyHash = this.getTargetProxyHash(token);
             const toAssetHash = Neon.u.str2hexstring(token.id);
-            const toAddress = (0, generic_1.stripHexPrefix)(ethers_1.ethers.utils.hexlify(address));
+            const toAddress = generic_1.stripHexPrefix(ethers_1.ethers.utils.hexlify(address));
             const nonce = Math.floor(Math.random() * 1000000);
             if (amount.lt(feeAmount)) {
                 throw new Error("Invalid amount");
@@ -196,7 +196,7 @@ class NEOClient {
             const fromAddress = ledger.scriptHash;
             const targetProxyHash = this.getTargetProxyHash(token);
             const toAssetHash = Neon.u.str2hexstring(token.id);
-            const toAddress = (0, generic_1.stripHexPrefix)(ethers_1.ethers.utils.hexlify(address));
+            const toAddress = generic_1.stripHexPrefix(ethers_1.ethers.utils.hexlify(address));
             const feeAddress = networkConfig.feeAddress;
             const nonce = Math.floor(Math.random() * 1000000);
             if (amount.lt(feeAmount)) {
@@ -316,7 +316,7 @@ class NEOClient {
     getTargetProxyHash(token) {
         const networkConfig = this.getNetworkConfig();
         const addressBytes = address_1.SWTHAddress.getAddressBytes(token.creator, networkConfig.network);
-        const addressHex = (0, generic_1.stripHexPrefix)(ethers_1.ethers.utils.hexlify(addressBytes));
+        const addressHex = generic_1.stripHexPrefix(ethers_1.ethers.utils.hexlify(addressBytes));
         return addressHex;
     }
     getNetworkConfig() {

package/lib/clients/TokenClient.js

@@ -459,7 +459,7 @@ class TokenClient {
     processTokenPrices(tokenPrices) {
         return tokenPrices.reduce((prevPrices, price) => {
             const newPrev = prevPrices;
-            newPrev[price.denom] = (0, number_1.bnOrZero)(price.twap).shiftedBy(-constant_1.decTypeDecimals);
+            newPrev[price.denom] = number_1.bnOrZero(price.twap).shiftedBy(-constant_1.decTypeDecimals);
             return newPrev;
         }, {});
     }

package/lib/clients/ZILClient.js

@@ -72,12 +72,12 @@ class ZILClient {
     getExternalBalances(sdk, address, whitelistDenoms) {
         return __awaiter(this, void 0, void 0, function* () {
             const tokenQueryResults = yield sdk.token.getAllTokens();
-            const tokens = tokenQueryResults.filter((token) => (0, blockchain_1.blockchainForChainId)(token.chainId.toNumber(), sdk.network) == this.blockchain &&
+            const tokens = tokenQueryResults.filter((token) => blockchain_1.blockchainForChainId(token.chainId.toNumber(), sdk.network) == this.blockchain &&
                 token.tokenAddress.length == 40 &&
                 (!whitelistDenoms || whitelistDenoms.includes(token.denom)));
             const requests = tokens.map((token) => token.tokenAddress === zeroAddress
-                ? (0, exports.balanceBatchRequest)(address.replace(/^0x/i, ""))
-                : (0, exports.tokenBalanceBatchRequest)(token.tokenAddress, address));
+                ? exports.balanceBatchRequest(address.replace(/^0x/i, ""))
+                : exports.tokenBalanceBatchRequest(token.tokenAddress, address));
             const response = yield fetch(this.getProviderUrl(), {
                 method: "post",
                 headers: { "content-type": "application/json" },
@@ -102,7 +102,7 @@ class ZILClient {
             // if (!isValidAddress) {
             //   throw new Error("invalid address")
             // }
-            return (0, zilliqa_1.fromBech32Address)(bech32Address).toLowerCase().substr(2);
+            return zilliqa_1.fromBech32Address(bech32Address).toLowerCase().substr(2);
         });
     }
     // see examplesV2/zil_client.ts on how to confirm the transactions
@@ -148,7 +148,7 @@ class ZILClient {
                 zilliqa = new zilliqa_1.Zilliqa(this.getProviderUrl());
             }
             const deployedContract = (this.walletProvider || zilliqa).contracts.at(contractAddress);
-            const balanceAndNonceResp = yield zilliqa.blockchain.getBalance((0, generic_1.stripHexPrefix)(zilAddress));
+            const balanceAndNonceResp = yield zilliqa.blockchain.getBalance(generic_1.stripHexPrefix(zilAddress));
             if (balanceAndNonceResp.error !== undefined) {
                 throw new Error(balanceAndNonceResp.error.message);
             }
@@ -166,7 +166,7 @@ class ZILClient {
                     vname: "spender",
                     type: "ByStr20",
                     // TODO: Check if bridgeAddress corresponds to carbon token lock_proxy_hash
-                    value: spenderAddress !== null && spenderAddress !== void 0 ? spenderAddress : (0, generic_1.appendHexPrefix)(token.bridgeAddress),
+                    value: spenderAddress !== null && spenderAddress !== void 0 ? spenderAddress : generic_1.appendHexPrefix(token.bridgeAddress),
                 },
                 {
                     vname: "amount",
@@ -184,7 +184,7 @@ class ZILClient {
     }
     checkAllowanceZRC2(token, owner, spender) {
         return __awaiter(this, void 0, void 0, function* () {
-            const contractAddress = (0, generic_1.appendHexPrefix)(token.tokenAddress);
+            const contractAddress = generic_1.appendHexPrefix(token.tokenAddress);
             const zilliqa = new zilliqa_1.Zilliqa(this.getProviderUrl());
             const resp = yield zilliqa.blockchain.getSmartContractSubState(contractAddress, "allowances", [owner, spender]);
             if (resp.error !== undefined) {
@@ -206,13 +206,13 @@ class ZILClient {
             }
             const carbonNetwork = networkConfig.network;
             const fromTokenId = fromToken.id;
-            const fromTokenAddr = (0, generic_1.appendHexPrefix)(fromToken.tokenAddress);
+            const fromTokenAddr = generic_1.appendHexPrefix(fromToken.tokenAddress);
             const toTokenDenom = toToken.denom;
-            const targetProxyHash = (0, generic_1.appendHexPrefix)(this.getTargetProxyHash(fromToken));
+            const targetProxyHash = generic_1.appendHexPrefix(this.getTargetProxyHash(fromToken));
             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 = (0, generic_1.appendHexPrefix)(networkConfig.feeAddress);
+            const feeAddress = generic_1.appendHexPrefix(networkConfig.feeAddress);
             const contractAddress = this.getBridgeEntranceAddr();
             let zilliqa;
             if (typeof signer === "string") {
@@ -227,7 +227,7 @@ class ZILClient {
                 zilliqa = new zilliqa_1.Zilliqa(this.getProviderUrl());
             }
             const deployedContract = (this.walletProvider || zilliqa).contracts.at(contractAddress);
-            const balanceAndNonceResp = yield zilliqa.blockchain.getBalance((0, generic_1.stripHexPrefix)(fromAddress));
+            const balanceAndNonceResp = yield zilliqa.blockchain.getBalance(generic_1.stripHexPrefix(fromAddress));
             if (balanceAndNonceResp.error !== undefined) {
                 throw new Error(balanceAndNonceResp.error.message);
             }
@@ -304,13 +304,13 @@ class ZILClient {
         return __awaiter(this, void 0, void 0, function* () {
             const { address, amount, token, gasPrice, gasLimit, zilAddress, signer } = params;
             const networkConfig = this.getNetworkConfig();
-            const assetId = (0, generic_1.appendHexPrefix)(token.tokenAddress);
-            const targetProxyHash = (0, generic_1.appendHexPrefix)(this.getTargetProxyHash(token));
-            const feeAddress = (0, generic_1.appendHexPrefix)(networkConfig.feeAddress);
+            const assetId = generic_1.appendHexPrefix(token.tokenAddress);
+            const targetProxyHash = generic_1.appendHexPrefix(this.getTargetProxyHash(token));
+            const feeAddress = generic_1.appendHexPrefix(networkConfig.feeAddress);
             const toAssetHash = ethers_1.ethers.utils.hexlify(ethers_1.ethers.utils.toUtf8Bytes(token.id));
             const swthAddress = ethers_1.ethers.utils.hexlify(address);
             // TODO: Check if bridgeAddress corresponds to carbon token lock_proxy_hash
-            const contractAddress = (0, generic_1.appendHexPrefix)(token.bridgeAddress);
+            const contractAddress = generic_1.appendHexPrefix(token.bridgeAddress);
             let zilliqa;
             if (typeof signer === "string") {
                 zilliqa = new zilliqa_1.Zilliqa(this.getProviderUrl());
@@ -324,7 +324,7 @@ class ZILClient {
                 zilliqa = new zilliqa_1.Zilliqa(this.getProviderUrl());
             }
             const deployedContract = (this.walletProvider || zilliqa).contracts.at(contractAddress);
-            const balanceAndNonceResp = yield zilliqa.blockchain.getBalance((0, generic_1.stripHexPrefix)(zilAddress));
+            const balanceAndNonceResp = yield zilliqa.blockchain.getBalance(generic_1.stripHexPrefix(zilAddress));
             if (balanceAndNonceResp.error !== undefined) {
                 throw new Error(balanceAndNonceResp.error.message);
             }
@@ -409,7 +409,7 @@ class ZILClient {
     getTargetProxyHash(token) {
         const networkConfig = this.getNetworkConfig();
         const addressBytes = address_1.SWTHAddress.getAddressBytes(token.creator, networkConfig.network);
-        const addressHex = (0, generic_1.stripHexPrefix)(ethers_1.ethers.utils.hexlify(addressBytes));
+        const addressHex = generic_1.stripHexPrefix(ethers_1.ethers.utils.hexlify(addressBytes));
         return addressHex;
     }
     getNetworkConfig() {

package/lib/codec/bank/query.d.ts

@@ -1,6 +1,6 @@
 import Long from "long";
 import _m0 from "protobufjs/minimal";
-import { PageRequest, PageResponse } from "../query/pagination";
+import { PageRequest, PageResponse } from "../cosmos/base/query/v1beta1/pagination";
 export declare const protobufPackage = "Switcheo.carbon.bank";
 export interface InternalTransfer {
     sender: string;

package/lib/codec/bank/query.js

@@ -7,7 +7,7 @@ exports.QueryClientImpl = exports.QueryInternalTransfersResponse = exports.Query
 /* eslint-disable */
 const long_1 = __importDefault(require("long"));
 const minimal_1 = __importDefault(require("protobufjs/minimal"));
-const pagination_1 = require("../query/pagination");
+const pagination_1 = require("../cosmos/base/query/v1beta1/pagination");
 exports.protobufPackage = "Switcheo.carbon.bank";
 const baseInternalTransfer = {
     sender: "",

package/lib/codec/broker/query.d.ts

@@ -1,6 +1,6 @@
 import Long from "long";
 import _m0 from "protobufjs/minimal";
-import { PageRequest, PageResponse } from "../query/pagination";
+import { PageRequest, PageResponse } from "../cosmos/base/query/v1beta1/pagination";
 import { MinMaxBoundary } from "./pagination";
 import { Candlestick } from "./candlestick";
 import { TradeEvent } from "./event";
@@ -17,10 +17,8 @@ export interface QueryCandlesticksResponse {
 export interface QueryTradesRequest {
     address: string;
     market: string;
-    limit: Long;
     beforeId: Long;
     afterId: Long;
-    orderBy: string;
     orderId: string;
     afterBlock: Long;
     beforeBlock: Long;
@@ -35,7 +33,6 @@ export interface QueryTradesForPositionRequest {
     address: string;
     market: string;
     openedBlockHeight: Long;
-    orderBy: string;
     pagination?: PageRequest;
 }
 export interface QueryTradesForPositionResponse {

package/lib/codec/broker/query.js

@@ -7,7 +7,7 @@ exports.QueryClientImpl = exports.QueryTradesForPositionResponse = exports.Query
 /* eslint-disable */
 const long_1 = __importDefault(require("long"));
 const minimal_1 = __importDefault(require("protobufjs/minimal"));
-const pagination_1 = require("../query/pagination");
+const pagination_1 = require("../cosmos/base/query/v1beta1/pagination");
 const pagination_2 = require("./pagination");
 const candlestick_1 = require("./candlestick");
 const event_1 = require("./event");
@@ -162,10 +162,8 @@ exports.QueryCandlesticksResponse = {
 const baseQueryTradesRequest = {
     address: "",
     market: "",
-    limit: long_1.default.UZERO,
     beforeId: long_1.default.UZERO,
     afterId: long_1.default.UZERO,
-    orderBy: "",
     orderId: "",
     afterBlock: long_1.default.UZERO,
     beforeBlock: long_1.default.UZERO,
@@ -178,18 +176,12 @@ exports.QueryTradesRequest = {
         if (message.market !== "") {
             writer.uint32(18).string(message.market);
         }
-        if (!message.limit.isZero()) {
-            writer.uint32(24).uint64(message.limit);
-        }
         if (!message.beforeId.isZero()) {
             writer.uint32(32).uint64(message.beforeId);
         }
         if (!message.afterId.isZero()) {
             writer.uint32(40).uint64(message.afterId);
         }
-        if (message.orderBy !== "") {
-            writer.uint32(50).string(message.orderBy);
-        }
         if (message.orderId !== "") {
             writer.uint32(58).string(message.orderId);
         }
@@ -217,18 +209,12 @@ exports.QueryTradesRequest = {
                 case 2:
                     message.market = reader.string();
                     break;
-                case 3:
-                    message.limit = reader.uint64();
-                    break;
                 case 4:
                     message.beforeId = reader.uint64();
                     break;
                 case 5:
                     message.afterId = reader.uint64();
                     break;
-                case 6:
-                    message.orderBy = reader.string();
-                    break;
                 case 7:
                     message.orderId = reader.string();
                     break;
@@ -258,10 +244,6 @@ exports.QueryTradesRequest = {
             object.market !== undefined && object.market !== null
                 ? String(object.market)
                 : "";
-        message.limit =
-            object.limit !== undefined && object.limit !== null
-                ? long_1.default.fromString(object.limit)
-                : long_1.default.UZERO;
         message.beforeId =
             object.beforeId !== undefined && object.beforeId !== null
                 ? long_1.default.fromString(object.beforeId)
@@ -270,10 +252,6 @@ exports.QueryTradesRequest = {
             object.afterId !== undefined && object.afterId !== null
                 ? long_1.default.fromString(object.afterId)
                 : long_1.default.UZERO;
-        message.orderBy =
-            object.orderBy !== undefined && object.orderBy !== null
-                ? String(object.orderBy)
-                : "";
         message.orderId =
             object.orderId !== undefined && object.orderId !== null
                 ? String(object.orderId)
@@ -296,13 +274,10 @@ exports.QueryTradesRequest = {
         const obj = {};
         message.address !== undefined && (obj.address = message.address);
         message.market !== undefined && (obj.market = message.market);
-        message.limit !== undefined &&
-            (obj.limit = (message.limit || long_1.default.UZERO).toString());
         message.beforeId !== undefined &&
             (obj.beforeId = (message.beforeId || long_1.default.UZERO).toString());
         message.afterId !== undefined &&
             (obj.afterId = (message.afterId || long_1.default.UZERO).toString());
-        message.orderBy !== undefined && (obj.orderBy = message.orderBy);
         message.orderId !== undefined && (obj.orderId = message.orderId);
         message.afterBlock !== undefined &&
             (obj.afterBlock = (message.afterBlock || long_1.default.UZERO).toString());
@@ -315,14 +290,10 @@ exports.QueryTradesRequest = {
         return obj;
     },
     fromPartial(object) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c;
         const message = Object.assign({}, baseQueryTradesRequest);
         message.address = (_a = object.address) !== null && _a !== void 0 ? _a : "";
         message.market = (_b = object.market) !== null && _b !== void 0 ? _b : "";
-        message.limit =
-            object.limit !== undefined && object.limit !== null
-                ? long_1.default.fromValue(object.limit)
-                : long_1.default.UZERO;
         message.beforeId =
             object.beforeId !== undefined && object.beforeId !== null
                 ? long_1.default.fromValue(object.beforeId)
@@ -331,8 +302,7 @@ exports.QueryTradesRequest = {
             object.afterId !== undefined && object.afterId !== null
                 ? long_1.default.fromValue(object.afterId)
                 : long_1.default.UZERO;
-        message.orderBy = (_c = object.orderBy) !== null && _c !== void 0 ? _c : "";
-        message.orderId = (_d = object.orderId) !== null && _d !== void 0 ? _d : "";
+        message.orderId = (_c = object.orderId) !== null && _c !== void 0 ? _c : "";
         message.afterBlock =
             object.afterBlock !== undefined && object.afterBlock !== null
                 ? long_1.default.fromValue(object.afterBlock)
@@ -437,7 +407,6 @@ const baseQueryTradesForPositionRequest = {
     address: "",
     market: "",
     openedBlockHeight: long_1.default.UZERO,
-    orderBy: "",
 };
 exports.QueryTradesForPositionRequest = {
     encode(message, writer = minimal_1.default.Writer.create()) {
@@ -450,9 +419,6 @@ exports.QueryTradesForPositionRequest = {
         if (!message.openedBlockHeight.isZero()) {
             writer.uint32(24).uint64(message.openedBlockHeight);
         }
-        if (message.orderBy !== "") {
-            writer.uint32(34).string(message.orderBy);
-        }
         if (message.pagination !== undefined) {
             pagination_1.PageRequest.encode(message.pagination, writer.uint32(42).fork()).ldelim();
         }
@@ -474,9 +440,6 @@ exports.QueryTradesForPositionRequest = {
                 case 3:
                     message.openedBlockHeight = reader.uint64();
                     break;
-                case 4:
-                    message.orderBy = reader.string();
-                    break;
                 case 5:
                     message.pagination = pagination_1.PageRequest.decode(reader, reader.uint32());
                     break;
@@ -502,10 +465,6 @@ exports.QueryTradesForPositionRequest = {
                 object.openedBlockHeight !== null
                 ? long_1.default.fromString(object.openedBlockHeight)
                 : long_1.default.UZERO;
-        message.orderBy =
-            object.orderBy !== undefined && object.orderBy !== null
-                ? String(object.orderBy)
-                : "";
         message.pagination =
             object.pagination !== undefined && object.pagination !== null
                 ? pagination_1.PageRequest.fromJSON(object.pagination)
@@ -518,7 +477,6 @@ exports.QueryTradesForPositionRequest = {
         message.market !== undefined && (obj.market = message.market);
         message.openedBlockHeight !== undefined &&
             (obj.openedBlockHeight = (message.openedBlockHeight || long_1.default.UZERO).toString());
-        message.orderBy !== undefined && (obj.orderBy = message.orderBy);
         message.pagination !== undefined &&
             (obj.pagination = message.pagination
                 ? pagination_1.PageRequest.toJSON(message.pagination)
@@ -526,7 +484,7 @@ exports.QueryTradesForPositionRequest = {
         return obj;
     },
     fromPartial(object) {
-        var _a, _b, _c;
+        var _a, _b;
         const message = Object.assign({}, baseQueryTradesForPositionRequest);
         message.address = (_a = object.address) !== null && _a !== void 0 ? _a : "";
         message.market = (_b = object.market) !== null && _b !== void 0 ? _b : "";
@@ -535,7 +493,6 @@ exports.QueryTradesForPositionRequest = {
                 object.openedBlockHeight !== null
                 ? long_1.default.fromValue(object.openedBlockHeight)
                 : long_1.default.UZERO;
-        message.orderBy = (_c = object.orderBy) !== null && _c !== void 0 ? _c : "";
         message.pagination =
             object.pagination !== undefined && object.pagination !== null
                 ? pagination_1.PageRequest.fromPartial(object.pagination)

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

@@ -35,8 +35,10 @@ export interface SetLiquidationFeeEvent {
     type: string;
 }
 export interface SetStablecoinInterestRateEvent {
+    /** Deprecated for stablecoin_interest_rate_dec */
     stablecoinInterestRate: string;
     type: string;
+    stablecoinInterestRateDec: string;
 }
 export interface SetStablecoinMintCapEvent {
     stablecoinMintCap: string;

package/lib/codec/cdp/event.js

@@ -453,6 +453,7 @@ exports.SetLiquidationFeeEvent = {
 const baseSetStablecoinInterestRateEvent = {
     stablecoinInterestRate: "",
     type: "",
+    stablecoinInterestRateDec: "",
 };
 exports.SetStablecoinInterestRateEvent = {
     encode(message, writer = minimal_1.default.Writer.create()) {
@@ -462,6 +463,9 @@ exports.SetStablecoinInterestRateEvent = {
         if (message.type !== "") {
             writer.uint32(18).string(message.type);
         }
+        if (message.stablecoinInterestRateDec !== "") {
+            writer.uint32(26).string(message.stablecoinInterestRateDec);
+        }
         return writer;
     },
     decode(input, length) {
@@ -477,6 +481,9 @@ exports.SetStablecoinInterestRateEvent = {
                 case 2:
                     message.type = reader.string();
                     break;
+                case 3:
+                    message.stablecoinInterestRateDec = reader.string();
+                    break;
                 default:
                     reader.skipType(tag & 7);
                     break;
@@ -495,6 +502,11 @@ exports.SetStablecoinInterestRateEvent = {
             object.type !== undefined && object.type !== null
                 ? String(object.type)
                 : "";
+        message.stablecoinInterestRateDec =
+            object.stablecoinInterestRateDec !== undefined &&
+                object.stablecoinInterestRateDec !== null
+                ? String(object.stablecoinInterestRateDec)
+                : "";
         return message;
     },
     toJSON(message) {
@@ -502,13 +514,16 @@ exports.SetStablecoinInterestRateEvent = {
         message.stablecoinInterestRate !== undefined &&
             (obj.stablecoinInterestRate = message.stablecoinInterestRate);
         message.type !== undefined && (obj.type = message.type);
+        message.stablecoinInterestRateDec !== undefined &&
+            (obj.stablecoinInterestRateDec = message.stablecoinInterestRateDec);
         return obj;
     },
     fromPartial(object) {
-        var _a, _b;
+        var _a, _b, _c;
         const message = Object.assign({}, baseSetStablecoinInterestRateEvent);
         message.stablecoinInterestRate = (_a = object.stablecoinInterestRate) !== null && _a !== void 0 ? _a : "";
         message.type = (_b = object.type) !== null && _b !== void 0 ? _b : "";
+        message.stablecoinInterestRateDec = (_c = object.stablecoinInterestRateDec) !== null && _c !== void 0 ? _c : "";
         return message;
     },
 };

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

@@ -2,6 +2,7 @@ import Long from "long";
 import _m0 from "protobufjs/minimal";
 import { Params } from "./params";
 import { StablecoinDebtInfo } from "./stablecoin_debt_info";
+import { StablecoinInterestInfo } from "./stablecoin_interest_info";
 import { RateStrategyParams } from "./rate_strategy_params";
 import { AssetParams } from "./asset_params";
 import { DebtInfo } from "./debt_info";
@@ -31,10 +32,11 @@ export interface GenesisState {
     accountToStablecoinInitialCumulativeInterestMultiplier: {
         [key: string]: Uint8Array;
     };
-    /** this line is used by starport scaffolding # genesis/proto/state */
     accountToRewardDebt: {
         [key: string]: Uint8Array;
     };
+    /** this line is used by starport scaffolding # genesis/proto/state */
+    stablecoinInterestInfo?: StablecoinInterestInfo;
 }
 export interface GenesisState_AccountToCollateralizedEntry {
     key: string;