carbon-js-sdk 0.7.13 → 0.7.16

package/lib/modules/admin.js

@@ -706,7 +706,7 @@ function transfromSetMinGasPriceParams(msg) {
 exports.transfromSetMinGasPriceParams = transfromSetMinGasPriceParams;
 function transformSetSettlementPriceParams(msg) {
     return {
-        market: msg.market,
+        marketId: msg.marketId,
         settlementPrice: new bignumber_js_1.default(msg.settlementPrice).shiftedBy(18).toString(10),
     };
 }

package/lib/modules/cdp.js

@@ -24,6 +24,7 @@ const address_1 = require("../util/address");
 const number_1 = require("../util/number");
 const bignumber_js_1 = require("bignumber.js");
 const long_1 = __importDefault(require("long"));
+const query_3 = require("./../codec/Switcheo/carbon/cdp/query");
 const base_1 = __importDefault(require("./base"));
 class CDPModule extends base_1.default {
     supplyAsset(params, opts) {
@@ -356,7 +357,7 @@ class CDPModule extends base_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             const wallet = this.getWallet();
             const value = CarbonSDK_1.Carbon.Cdp.MsgUpdateRewardScheme.fromPartial({
-                updator: wallet.bech32Address,
+                updater: wallet.bech32Address,
                 updateRewardSchemeParams: {
                     rewardSchemeId: params.rewardSchemeId,
                     rewardDenom: params.rewardDenom,
@@ -681,13 +682,13 @@ class CDPModule extends base_1.default {
             const collateralPoolAddress = address_1.SWTHAddress.getModuleAddress("collateral_pool", network);
             const cdpModuleBalancesAddress = this.getCdpModuleAddress();
             const maxPageLimit = { pagination: pagination_1.PageRequest.fromPartial({ limit: new long_1.default(10000) }) };
-            const collateralPoolBalancePromise = sdk.query.bank.AllBalances(Object.assign(Object.assign({}, maxPageLimit), { address: collateralPoolAddress }));
-            const cdpModuleBalancesPromise = sdk.query.bank.AllBalances(Object.assign(Object.assign({}, maxPageLimit), { address: cdpModuleBalancesAddress }));
+            const collateralPoolBalancePromise = sdk.query.bank.AllBalances(Object.assign(Object.assign({}, maxPageLimit), { address: collateralPoolAddress, resolveDenom: false }));
+            const cdpModuleBalancesPromise = sdk.query.bank.AllBalances(Object.assign(Object.assign({}, maxPageLimit), { address: cdpModuleBalancesAddress, resolveDenom: false }));
             const totalSupplyPromise = sdk.query.bank.TotalSupply(query_2.QueryTotalSupplyRequest.fromPartial(Object.assign({}, maxPageLimit)));
-            const cdpParamsPromise = sdk.query.cdp.Params(CarbonSDK_1.Carbon.Cdp.QueryParamsRequest.fromPartial({}));
+            const cdpParamsPromise = sdk.query.cdp.Params(query_1.QueryParamsRequest.fromPartial({}));
             const tokenPriceAllPromise = sdk.query.pricing.TokenPriceAll(CarbonSDK_1.Carbon.Pricing.QueryTokenPriceAllRequest.fromPartial(Object.assign({}, maxPageLimit)));
-            const debtInfosPromise = sdk.query.cdp.TokenDebtAll(CarbonSDK_1.Carbon.Cdp.QueryTokenDebtAllRequest.fromPartial(Object.assign({}, maxPageLimit)));
-            const assetParamsPromise = sdk.query.cdp.AssetAll(CarbonSDK_1.Carbon.Cdp.QueryAssetAllRequest.fromPartial(Object.assign({}, maxPageLimit)));
+            const debtInfosPromise = sdk.query.cdp.TokenDebtAll(query_3.QueryTokenDebtAllRequest.fromPartial(Object.assign({}, maxPageLimit)));
+            const assetParamsPromise = sdk.query.cdp.AssetAll(query_3.QueryAssetAllRequest.fromPartial(Object.assign({}, maxPageLimit)));
             const rateStrategyPromise = sdk.query.cdp.RateStrategyAll(CarbonSDK_1.Carbon.Cdp.QueryRateStrategyAllRequest.fromPartial(Object.assign({}, maxPageLimit)));
             const [collateralPoolBalances, totalSupply, cdpParams, tokenPriceAll, debtInfosAll, assetParamsAll, rateStrategies, cdpModuleBalances] = yield Promise.all([collateralPoolBalancePromise, totalSupplyPromise, cdpParamsPromise, tokenPriceAllPromise, debtInfosPromise, assetParamsPromise, rateStrategyPromise, cdpModuleBalancesPromise]);
             const interestFee = number_1.bnOrZero((_a = cdpParams.params) === null || _a === void 0 ? void 0 : _a.interestFee);
@@ -704,23 +705,22 @@ class CDPModule extends base_1.default {
             }, {});
             const cdpTokenBalances = ((_b = collateralPoolBalances === null || collateralPoolBalances === void 0 ? void 0 : collateralPoolBalances.balances) !== null && _b !== void 0 ? _b : []).filter(balance => TokenClient_1.default.isCdpToken(balance.denom));
             const cdpTokensBalancePromises = cdpTokenBalances.map(token => {
-                var _a, _b, _c;
+                var _a, _b;
                 const underlyingDenom = this.getUnderlyingDenom(token.denom);
                 const tokenPrice = tokenPrices.find((price) => price.denom === underlyingDenom);
                 const supply = (_a = totalSupply.supply.find((supply) => supply.denom === token.denom)) === null || _a === void 0 ? void 0 : _a.amount;
-                const balance = (_b = moduleBalancesMap[underlyingDenom]) === null || _b === void 0 ? void 0 : _b.amount;
+                const balance = moduleBalancesMap[underlyingDenom].amount;
                 const debtInfo = debtInfosAll.debtInfosAll.find((debtInfo) => debtInfo.denom === underlyingDenom);
                 const assetParam = assetParamsAll.assetParamsAll.find((assetParam) => assetParam.denom === underlyingDenom);
                 const rateStrategy = rateStrategies.rateStrategyParamsAll.find((rateStrategy) => rateStrategy.name === (assetParam === null || assetParam === void 0 ? void 0 : assetParam.rateStrategyName));
-                if (!debtInfo || !supply || !tokenPrice || !rateStrategy)
+                if (!debtInfo || !supply || !tokenPrice || !rateStrategy || !balance)
                     throw new Error("unable to retrieve token info");
                 const apy = CDPModule.calculateInterestAPY(debtInfo, rateStrategy);
-                const newInterestRate = CDPModule.calculateInterestForTimePeriod(apy, (_c = debtInfo.lastUpdatedTime) !== null && _c !== void 0 ? _c : new Date(0), new Date());
+                const newInterestRate = CDPModule.calculateInterestForTimePeriod(apy, (_b = debtInfo.lastUpdatedTime) !== null && _b !== void 0 ? _b : new Date(0), new Date());
                 return this.getTotalTokenDebt(underlyingDenom, debtInfo, interestFee, newInterestRate)
                     .then((totalDebt) => {
-                    const denominator = number_1.bnOrZero(balance).plus(number_1.bnOrZero(totalDebt));
-                    const ratio = denominator.isZero() ? number_1.BN_ZERO : number_1.bnOrZero(supply).div(denominator);
-                    const actualAmount = ratio.isZero() ? number_1.BN_ZERO : number_1.bnOrZero(token.amount).div(ratio);
+                    const ratio = number_1.bnOrZero(supply).div(number_1.bnOrZero(balance).plus(number_1.bnOrZero(totalDebt)));
+                    const actualAmount = number_1.bnOrZero(token.amount).div(ratio);
                     return this.getTokenUsdVal(underlyingDenom, actualAmount, tokenPrice);
                 });
             });

package/lib/modules/evm.d.ts

@@ -6,6 +6,7 @@ import BaseModule from "./base";
 export declare type TxData = LegacyTx | AccessListTx | DynamicFeeTx;
 export declare class EvmModule extends BaseModule {
     sendEvmTx(req: ethers.providers.TransactionRequest, opts?: CarbonTx.SignTxOpts): Promise<import("..").CarbonWallet.SendTxResponse>;
+    updateParams(p: EvmModule.UpdateParams, opts?: CarbonTx.SignTxOpts): Promise<import("..").CarbonWallet.SendTxResponse>;
 }
 export declare function constructTxDataAny(req: ethers.providers.TransactionRequest): Any;
 export declare namespace EvmModule {

package/lib/modules/evm.js

@@ -14,10 +14,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.constructTxDataAny = exports.EvmModule = void 0;
 const codec_1 = require("../codec");
+const evm_1 = require("../codec/ethermint/evm/v1/evm");
 const tx_1 = require("../codec/ethermint/evm/v1/tx");
 const util_1 = require("../util");
 const utils_1 = require("ethers/lib/utils");
 const base_1 = __importDefault(require("./base"));
+const tx_2 = require("../codec/ethermint/evm/v1/tx");
 class EvmModule extends base_1.default {
     sendEvmTx(req, opts) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -26,7 +28,47 @@ class EvmModule extends base_1.default {
                 data: constructTxDataAny(req),
             });
             return yield wallet.sendTx({
-                typeUrl: util_1.CarbonTx.Types.MsgEvmEthereumTx,
+                typeUrl: util_1.CarbonTx.Types.MsgEthereumTx,
+                value,
+            }, opts);
+        });
+    }
+    updateParams(p, opts) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const wallet = this.getWallet();
+            const value = tx_1.MsgUpdateParams.fromPartial({
+                authority: p.creator,
+                params: evm_1.Params.fromPartial({
+                    evmDenom: p.params.evmDenom,
+                    enableCreate: p.params.enableCreate,
+                    enableCall: p.params.enableCall,
+                    extraEips: p.params.extraEIPs,
+                    allowUnprotectedTxs: p.params.allowUnprotectedTxs,
+                    chainConfig: evm_1.ChainConfig.fromPartial({
+                        homesteadBlock: p.chainConfig.homesteadBlock.toString(10),
+                        daoForkBlock: p.chainConfig.daoForkBlock.toString(10),
+                        daoForkSupport: p.chainConfig.daoForkSupport,
+                        eip150Block: p.chainConfig.eip150Block.toString(10),
+                        eip150Hash: p.chainConfig.eip150Hash,
+                        eip155Block: p.chainConfig.eip155Block.toString(10),
+                        eip158Block: p.chainConfig.eip158Block.toString(10),
+                        byzantiumBlock: p.chainConfig.byzantiumBlock.toString(10),
+                        constantinopleBlock: p.chainConfig.constantinopleBlock.toString(10),
+                        petersburgBlock: p.chainConfig.petersburgBlock.toString(10),
+                        istanbulBlock: p.chainConfig.istanbulBlock.toString(10),
+                        muirGlacierBlock: p.chainConfig.muirGlacierBlock.toString(10),
+                        berlinBlock: p.chainConfig.berlinBlock.toString(10),
+                        londonBlock: p.chainConfig.londonBlock.toString(10),
+                        arrowGlacierBlock: p.chainConfig.arrowGlacierBlock.toString(10),
+                        grayGlacierBlock: p.chainConfig.grayGlacierBlock.toString(10),
+                        mergeNetsplitBlock: p.chainConfig.mergeNetsplitBlock.toString(10),
+                        shanghaiBlock: p.chainConfig.shanghaiBlock.toString(10),
+                        cancunBlock: p.chainConfig.cancunBlock.toString(10),
+                    }),
+                }),
+            });
+            return yield wallet.sendTx({
+                typeUrl: util_1.CarbonTx.Types.MsgEvmUpdateParams,
                 value,
             }, opts);
         });
@@ -36,7 +78,7 @@ exports.EvmModule = EvmModule;
 // Referenced from ethermint v0.21.0 Switcheo/ethermint/x/evm/types/msg.go 
 function constructTxDataAny(req) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5;
-    const accessList = (req === null || req === void 0 ? void 0 : req.accessList) ? utils_1.accessListify(req.accessList).length > 0 : false;
+    const accessList = (req === null || req === void 0 ? void 0 : req.accessList) && req.accessList.length > 0;
     let txData = tx_1.LegacyTx.fromPartial({});
     let txType = "";
     if (!accessList) {
@@ -78,7 +120,7 @@ function constructTxDataAny(req) {
         txType = 'AccessListTx';
     }
     return codec_1.registry.encodeAsAny({
-        typeUrl: `/${tx_1.protobufPackage}.${txType}`,
+        typeUrl: `/${tx_2.protobufPackage}.${txType}`,
         value: txData,
     });
 }

package/lib/modules/evmmerge.d.ts

@@ -1,7 +1,7 @@
 import { CarbonTx } from "../util";
 import BaseModule from "./base";
 export declare class EvmMergeModule extends BaseModule {
-    mergeAccount(params: EvmMergeModule.MergeAccountParams, opts?: CarbonTx.SignTxOpts): Promise<import("../CarbonSDK").CarbonWallet.SendTxResponse>;
+    mergeAccount(params: EvmMergeModule.MergeAccountParams, opts?: CarbonTx.SignTxOpts): Promise<import("..").CarbonWallet.SendTxResponse>;
 }
 export declare namespace EvmMergeModule {
     interface MergeAccountParams {

package/lib/modules/evmmerge.js

@@ -13,14 +13,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EvmMergeModule = void 0;
+const tx_1 = require("../codec/Switcheo/carbon/evmmerge/tx");
 const util_1 = require("../util");
-const CarbonSDK_1 = require("../CarbonSDK");
 const base_1 = __importDefault(require("./base"));
 class EvmMergeModule extends base_1.default {
     mergeAccount(params, opts) {
         return __awaiter(this, void 0, void 0, function* () {
             const wallet = this.getWallet();
-            const value = CarbonSDK_1.Carbon.Evmmerge.MsgMergeAccount.fromPartial({
+            const value = tx_1.MsgMergeAccount.fromPartial({
                 creator: params.creator,
                 pubKey: params.pubKey,
                 pubKeySig: params.pubKeySig,

package/lib/modules/feemarket.d.ts

@@ -2,7 +2,7 @@ import { CarbonTx } from "../util";
 import BigNumber from "bignumber.js";
 import BaseModule from "./base";
 export declare class FeemarketModule extends BaseModule {
-    updateParams(params: FeemarketModule.UpdateParams, opts?: CarbonTx.SignTxOpts): Promise<import("@cosmjs/stargate").DeliverTxResponse>;
+    updateParams(params: FeemarketModule.UpdateParams, opts?: CarbonTx.SignTxOpts): Promise<import("..").CarbonWallet.SendTxResponse>;
 }
 export declare namespace FeemarketModule {
     interface UpdateParams {

package/lib/modules/feemarket.js

@@ -32,8 +32,8 @@ class FeemarketModule extends base_1.default {
                     minGasPrice: params.minGasPrice.toString(10),
                     minGasMultiplier: params.minGasMulitplier.toString(10),
                     gasLimitPerBlock: params.gasLimitPerBlock.toString(10),
-                    maxBaseFee: params.maxBaseFee.toString(10)
-                })
+                    maxBaseFee: params.maxBaseFee.toString(10),
+                }),
             });
             return yield wallet.sendTx({
                 typeUrl: util_1.CarbonTx.Types.MsgUpdateParams,

package/lib/modules/gov.js

@@ -147,11 +147,11 @@ class GovModule extends base_1.default {
                 return proposal_3.UpdatePoolProposal.encode(updatePoolProposalMsg).finish();
             }
             case "UpdateMarketProposal": {
-                const updateMarketProposalMsg = {
+                const updateMarketProposalMsg = proposal_4.UpdateMarketProposal.fromPartial({
                     title: title,
                     description: description,
                     msg: market_1.transfromUpdateMarketParams(msg),
-                };
+                });
                 return proposal_4.UpdateMarketProposal.encode(updateMarketProposalMsg).finish();
             }
             case "CreateOracleProposal": {

package/lib/modules/grant.d.ts

@@ -0,0 +1,33 @@
+import { CarbonTx } from "../util";
+import BaseModule from "./base";
+export declare class GrantModule extends BaseModule {
+    grantAuthAndAllowance(params: GrantModule.GrantParams, opts?: CarbonTx.SignTxOpts): Promise<import("..").CarbonWallet.SendTxResponse>;
+    revokeAuthAndAllowance(params: GrantModule.RevokeGrantParams, opts?: CarbonTx.SignTxOpts): Promise<import("..").CarbonWallet.SendTxResponse>;
+    grantAllowance(params: GrantModule.GrantParams, opts?: CarbonTx.SignTxOpts): Promise<import("..").CarbonWallet.SendTxResponse>;
+    grantAuth(params: GrantModule.GrantParams, opts?: CarbonTx.SignTxOpts): Promise<import("..").CarbonWallet.SendTxResponse>;
+    queryGranteeDetails(params: GrantModule.QueryGrantParams): Promise<import("../codec/cosmos/authz/v1beta1/query").QueryGrantsResponse>;
+    queryGranteeAllowance(params: GrantModule.QueryAllowanceParams): Promise<import("../codec/cosmos/feegrant/v1beta1/query").QueryAllowanceResponse>;
+}
+export declare namespace GrantModule {
+    interface GrantParams {
+        grantee: string;
+        granter?: string;
+        expiry: Date;
+        existingGrantee?: boolean;
+        selectedMsgs?: string[];
+    }
+    interface RevokeGrantParams {
+        grantee: string;
+        granter?: string;
+        existingGrantee?: boolean;
+    }
+    interface QueryGrantParams {
+        grantee?: string;
+        granter?: string;
+        msgTypeUrl?: string;
+    }
+    interface QueryAllowanceParams {
+        grantee?: string;
+        granter?: string;
+    }
+}

package/lib/modules/grant.js

@@ -0,0 +1,196 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GrantModule = void 0;
+const tx_1 = require("../codec/cosmos/authz/v1beta1/tx");
+const util_1 = require("../util");
+const authz_1 = require("../codec/cosmos/authz/v1beta1/authz");
+const feegrant_1 = require("../codec/cosmos/feegrant/v1beta1/feegrant");
+const tx_2 = require("../codec/cosmos/feegrant/v1beta1/tx");
+const grant_1 = require("../provider/amino/types/grant");
+const base_1 = __importDefault(require("./base"));
+class GrantModule extends base_1.default {
+    grantAuthAndAllowance(params, opts) {
+        var _a, _b, _c;
+        return __awaiter(this, void 0, void 0, function* () {
+            const wallet = this.getWallet();
+            const authorizedSignlessMsgs = (_a = wallet.authorizedMsgs) !== null && _a !== void 0 ? _a : [];
+            const encodedGrantMsgs = authorizedSignlessMsgs === null || authorizedSignlessMsgs === void 0 ? void 0 : authorizedSignlessMsgs.map((msg) => {
+                var _a;
+                const grantMsg = tx_1.MsgGrant.fromPartial({
+                    granter: (_a = params.granter) !== null && _a !== void 0 ? _a : wallet.bech32Address,
+                    grantee: params.grantee,
+                    grant: {
+                        authorization: {
+                            typeUrl: grant_1.GrantTypes.GenericAuthorization,
+                            value: authz_1.GenericAuthorization.encode(authz_1.GenericAuthorization.fromPartial({
+                                msg,
+                            })).finish(),
+                        },
+                        expiration: params.expiry,
+                    },
+                });
+                return {
+                    typeUrl: util_1.CarbonTx.Types.MsgGrant, value: grantMsg,
+                };
+            });
+            let messages = encodedGrantMsgs;
+            if (params.existingGrantee) {
+                const encodedRevokeAllowanceMsg = [{
+                        typeUrl: util_1.CarbonTx.Types.MsgRevokeAllowance,
+                        value: tx_2.MsgRevokeAllowance.fromPartial({
+                            granter: (_b = params.granter) !== null && _b !== void 0 ? _b : wallet.bech32Address,
+                            grantee: params.grantee,
+                        }),
+                    }];
+                messages = messages.concat(encodedRevokeAllowanceMsg);
+            }
+            const encodedAllowanceMsg = [{
+                    typeUrl: util_1.CarbonTx.Types.MsgGrantAllowance,
+                    value: tx_2.MsgGrantAllowance.fromPartial({
+                        granter: (_c = params.granter) !== null && _c !== void 0 ? _c : wallet.bech32Address,
+                        grantee: params.grantee,
+                        allowance: {
+                            typeUrl: grant_1.GrantTypes.AllowedMsgAllowance,
+                            value: feegrant_1.AllowedMsgAllowance.encode(feegrant_1.AllowedMsgAllowance.fromPartial({
+                                allowance: {
+                                    typeUrl: grant_1.GrantTypes.BasicAllowance,
+                                    value: feegrant_1.BasicAllowance.encode(feegrant_1.BasicAllowance.fromPartial({
+                                        expiration: params.expiry,
+                                    })).finish(),
+                                },
+                                allowedMessages: [util_1.CarbonTx.Types.MsgExec],
+                            })).finish(),
+                        },
+                    }),
+                }];
+            messages = messages.concat(encodedAllowanceMsg);
+            const result = yield wallet.sendTxs(messages, opts);
+            return result;
+        });
+    }
+    revokeAuthAndAllowance(params, opts) {
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            const wallet = this.getWallet();
+            const authorizedSignlessMsgs = (_a = wallet.authorizedMsgs) !== null && _a !== void 0 ? _a : [];
+            const encodedRevokeGrantMsgs = authorizedSignlessMsgs.map((msg) => {
+                var _a;
+                const revokeMsg = tx_1.MsgRevoke.fromPartial({
+                    granter: (_a = params.granter) !== null && _a !== void 0 ? _a : wallet.bech32Address,
+                    grantee: params.grantee,
+                    msgTypeUrl: msg,
+                });
+                return {
+                    typeUrl: util_1.CarbonTx.Types.MsgRevoke,
+                    value: revokeMsg,
+                };
+            });
+            const result = yield wallet.sendTxs(encodedRevokeGrantMsgs, opts);
+            return result;
+        });
+    }
+    grantAllowance(params, opts) {
+        var _a, _b;
+        return __awaiter(this, void 0, void 0, function* () {
+            const wallet = this.getWallet();
+            const encodedAllowanceMsg = [{
+                    typeUrl: util_1.CarbonTx.Types.MsgGrantAllowance,
+                    value: tx_2.MsgGrantAllowance.fromPartial({
+                        granter: (_a = params.granter) !== null && _a !== void 0 ? _a : wallet.bech32Address,
+                        grantee: params.grantee,
+                        allowance: {
+                            typeUrl: grant_1.GrantTypes.AllowedMsgAllowance,
+                            value: feegrant_1.AllowedMsgAllowance.encode(feegrant_1.AllowedMsgAllowance.fromPartial({
+                                allowance: {
+                                    typeUrl: grant_1.GrantTypes.BasicAllowance,
+                                    value: feegrant_1.BasicAllowance.encode(feegrant_1.BasicAllowance.fromPartial({
+                                        expiration: params.expiry,
+                                    })).finish(),
+                                },
+                                allowedMessages: [util_1.CarbonTx.Types.MsgExec],
+                            })).finish(),
+                        },
+                    }),
+                }];
+            let messages = encodedAllowanceMsg;
+            if (params.existingGrantee) {
+                const encodedRevokeAllowanceMsg = [{
+                        typeUrl: util_1.CarbonTx.Types.MsgRevokeAllowance,
+                        value: tx_2.MsgRevokeAllowance.fromPartial({
+                            granter: (_b = params.granter) !== null && _b !== void 0 ? _b : wallet.bech32Address,
+                            grantee: params.grantee,
+                        }),
+                    }];
+                messages = encodedRevokeAllowanceMsg.concat(messages);
+            }
+            const result = yield wallet.sendTxs(messages, opts);
+            return result;
+        });
+    }
+    grantAuth(params, opts) {
+        var _a, _b, _c;
+        return __awaiter(this, void 0, void 0, function* () {
+            const wallet = this.getWallet();
+            const authorizedSignlessMsgs = (_a = wallet.authorizedMsgs) !== null && _a !== void 0 ? _a : [];
+            const encodedGrantMsgs = (_c = ((_b = params.selectedMsgs) !== null && _b !== void 0 ? _b : authorizedSignlessMsgs)) === null || _c === void 0 ? void 0 : _c.map((msg) => {
+                var _a;
+                const grantMsg = tx_1.MsgGrant.fromPartial({
+                    granter: (_a = params.granter) !== null && _a !== void 0 ? _a : wallet.bech32Address,
+                    grantee: params.grantee,
+                    grant: {
+                        authorization: {
+                            typeUrl: grant_1.GrantTypes.GenericAuthorization,
+                            value: authz_1.GenericAuthorization.encode(authz_1.GenericAuthorization.fromPartial({
+                                msg,
+                            })).finish(),
+                        },
+                        expiration: params.expiry,
+                    },
+                });
+                return {
+                    typeUrl: util_1.CarbonTx.Types.MsgGrant, value: grantMsg,
+                };
+            });
+            const result = yield wallet.sendTxs(encodedGrantMsgs, opts);
+            return result;
+        });
+    }
+    queryGranteeDetails(params) {
+        var _a, _b, _c;
+        return __awaiter(this, void 0, void 0, function* () {
+            const wallet = this.getWallet();
+            const queryParams = {
+                grantee: (_a = params.grantee) !== null && _a !== void 0 ? _a : '',
+                granter: (_b = params.granter) !== null && _b !== void 0 ? _b : wallet.bech32Address,
+                msgTypeUrl: (_c = params.msgTypeUrl) !== null && _c !== void 0 ? _c : '',
+            };
+            const response = yield this.sdkProvider.query.grant.Grants(queryParams);
+            return response;
+        });
+    }
+    queryGranteeAllowance(params) {
+        var _a, _b;
+        return __awaiter(this, void 0, void 0, function* () {
+            const wallet = this.getWallet();
+            const queryParams = {
+                grantee: (_a = params.grantee) !== null && _a !== void 0 ? _a : '',
+                granter: (_b = params.granter) !== null && _b !== void 0 ? _b : wallet.bech32Address,
+            };
+            const response = yield this.sdkProvider.query.feegrant.Allowance(queryParams);
+            return response;
+        });
+    }
+}
+exports.GrantModule = GrantModule;

package/lib/modules/index.d.ts

@@ -19,5 +19,6 @@ export * from "./subaccount";
 export * from "./xchain";
 export * from "./evm";
 export * from "./evmmerge";
+export * from "./feemarket";
 export * from "./perpspool";
 export * from "./erc20";

package/lib/modules/index.js

@@ -31,5 +31,6 @@ __exportStar(require("./subaccount"), exports);
 __exportStar(require("./xchain"), exports);
 __exportStar(require("./evm"), exports);
 __exportStar(require("./evmmerge"), exports);
+__exportStar(require("./feemarket"), exports);
 __exportStar(require("./perpspool"), exports);
 __exportStar(require("./erc20"), exports);

package/lib/modules/leverage.js

@@ -22,7 +22,7 @@ class LeverageModule extends base_1.default {
             const wallet = this.getWallet();
             const value = tx_1.MsgSetLeverage.fromPartial({
                 creator: wallet.bech32Address,
-                market: params.market,
+                marketId: params.market,
                 leverage: params.leverage.shiftedBy(18).toString(10),
             });
             return yield wallet.sendTx({
@@ -37,7 +37,7 @@ class LeverageModule extends base_1.default {
             const msgs = params.map((param) => {
                 const value = tx_1.MsgSetLeverage.fromPartial({
                     creator: wallet.bech32Address,
-                    market: param.market,
+                    marketId: param.market,
                     leverage: param.leverage.shiftedBy(18).toString(10),
                 });
                 return {

package/lib/modules/market.js

@@ -22,7 +22,7 @@ class MarketModule extends base_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             const fetchDataResponse = yield this.sdkProvider.query.market.FeeTiers({
                 marketType: marketType,
-                marketName: '',
+                marketId: '',
                 userAddress: '',
             });
             return (_a = fetchDataResponse === null || fetchDataResponse === void 0 ? void 0 : fetchDataResponse.feeTiers) !== null && _a !== void 0 ? _a : [];
@@ -32,7 +32,7 @@ class MarketModule extends base_1.default {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const fetchDataResponse = yield this.sdkProvider.query.market.TradingFees({
-                marketName: marketName,
+                marketId: marketName,
                 userAddress: userAddress,
             });
             return (_a = fetchDataResponse === null || fetchDataResponse === void 0 ? void 0 : fetchDataResponse.fees) !== null && _a !== void 0 ? _a : { takerFee: '', makerFee: '' };
@@ -75,7 +75,7 @@ class MarketModule extends base_1.default {
             const wallet = this.getWallet();
             const value = tx_1.MsgDisableSpotMarket.fromPartial({
                 creator: params.creator,
-                marketName: params.marketName,
+                marketId: params.marketName,
             });
             return yield wallet.sendTx({
                 typeUrl: util_1.CarbonTx.Types.MsgDisableSpotMarket,

package/lib/modules/order.d.ts

@@ -2,8 +2,8 @@ import { CarbonTx } from "../util";
 import { BigNumber } from "bignumber.js";
 import BaseModule from "./base";
 export declare class OrderModule extends BaseModule {
-    create(param: OrderModule.SetLeverageAndCreateOrderParams, opts?: CarbonTx.SignTxOpts): Promise<import("..").CarbonWallet.SendTxResponse>;
-    createOrders(params: (OrderModule.CreateOrderParams | OrderModule.SetLeverageParams)[], opts?: CarbonTx.SignTxOpts): Promise<import("..").CarbonWallet.SendTxResponse>;
+    create(params: OrderModule.CreateOrderParams, opts?: CarbonTx.SignTxOpts): Promise<import("..").CarbonWallet.SendTxResponse>;
+    createOrders(params: OrderModule.CreateOrderParams[], opts?: CarbonTx.SignTxOpts): Promise<import("..").CarbonWallet.SendTxResponse>;
     cancel(orderId: string, opts?: CarbonTx.SignTxOpts): Promise<import("..").CarbonWallet.SendTxResponse>;
     cancelOrders(orderIds: string[], opts?: CarbonTx.SignTxOpts): Promise<import("..").CarbonWallet.SendTxResponse>;
     edit(params: OrderModule.EditOrderParams, opts?: CarbonTx.SignTxOpts): Promise<import("..").CarbonWallet.SendTxResponse>;
@@ -27,13 +27,6 @@ export declare namespace OrderModule {
         referralCommission?: number;
         referralKickback?: number;
     }
-    interface SetLeverageParams {
-        market: string;
-        leverage: BigNumber;
-    }
-    interface SetLeverageAndCreateOrderParams extends CreateOrderParams {
-        setLeverage?: BigNumber;
-    }
     interface EditOrderParams {
         id: string;
         quantity: BigNumber;