carbon-js-sdk 0.6.1 → 0.6.2-beta.1

package/lib/CarbonSDK.d.ts

@@ -49,6 +49,7 @@ declare class CarbonSDK {
         CDPToken: string;
     };
     readonly query: CarbonQueryClient;
+    readonly useTmAbciQuery: boolean;
     insights: InsightsQueryClient;
     hydrogen: HydrogenClient;
     wallet?: CarbonWallet;

package/lib/CarbonSDK.js

@@ -62,17 +62,18 @@ const DEFAULT_SDK_INIT_OPTS = {
  */
 class CarbonSDK {
     constructor(opts) {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
         this.network = (_a = opts.network) !== null && _a !== void 0 ? _a : constant_1.DEFAULT_NETWORK;
         this.configOverride = (_b = opts.config) !== null && _b !== void 0 ? _b : {};
         this.networkConfig = util_1.GenericUtils.overrideConfig(constant_1.NetworkConfigs[this.network], this.configOverride);
+        this.useTmAbciQuery = (_c = opts.useTmAbciQuery) !== null && _c !== void 0 ? _c : false;
         this.tmClient = opts.tmClient;
-        this.chainId = (_d = (_c = opts.chainId) !== null && _c !== void 0 ? _c : constant_1.CarbonChainIDs[this.network]) !== null && _d !== void 0 ? _d : constant_1.CarbonChainIDs[constant_1.Network.MainNet];
-        this.evmChainId = (_f = (_e = opts.evmChainId) !== null && _e !== void 0 ? _e : constant_1.CarbonEvmChainIDs[this.network]) !== null && _f !== void 0 ? _f : constant_1.CarbonEvmChainIDs[constant_1.Network.MainNet];
+        this.chainId = (_e = (_d = opts.chainId) !== null && _d !== void 0 ? _d : constant_1.CarbonChainIDs[this.network]) !== null && _e !== void 0 ? _e : constant_1.CarbonChainIDs[constant_1.Network.MainNet];
+        this.evmChainId = (_g = (_f = opts.evmChainId) !== null && _f !== void 0 ? _f : constant_1.CarbonEvmChainIDs[this.network]) !== null && _g !== void 0 ? _g : constant_1.CarbonEvmChainIDs[constant_1.Network.MainNet];
         let grpcClient;
         if (opts.useTmAbciQuery !== true && this.networkConfig.grpcUrl) {
             const transport = typeof window === "undefined" ? grpc_web_node_http_transport_1.NodeHttpTransport() : undefined;
-            grpcClient = (_g = opts.grpcQueryClient) !== null && _g !== void 0 ? _g : new GrpcQueryClient_1.default(this.networkConfig.grpcWebUrl, {
+            grpcClient = (_h = opts.grpcQueryClient) !== null && _h !== void 0 ? _h : new GrpcQueryClient_1.default(this.networkConfig.grpcWebUrl, {
                 transport,
             });
         }
@@ -81,7 +82,7 @@ class CarbonSDK {
             grpcClient,
         });
         this.insights = new clients_1.InsightsQueryClient(this.networkConfig);
-        this.token = (_h = opts.token) !== null && _h !== void 0 ? _h : clients_1.TokenClient.instance(this.query, this);
+        this.token = (_j = opts.token) !== null && _j !== void 0 ? _j : clients_1.TokenClient.instance(this.query, this);
         this.hydrogen = new clients_1.HydrogenClient(this.networkConfig, this.token);
         this.hydrogen = clients_1.HydrogenClient.instance(this.networkConfig, this.token);
         this.admin = new modules_1.AdminModule(this);
@@ -238,6 +239,7 @@ class CarbonSDK {
             config: this.configOverride,
             tmClient: this.tmClient,
             chainId: this.chainId,
+            useTmAbciQuery: this.useTmAbciQuery,
         };
     }
     connect(wallet) {

package/lib/clients/ETHClient.d.ts

@@ -41,6 +41,7 @@ export interface LockParams extends ETHTxParams {
 export interface ApproveERC20Params extends ETHTxParams {
     token: Models.Token;
     spenderAddress?: string;
+    amount?: BigNumber;
     signCompleteCallback?: () => void;
 }
 export interface EthersTransactionResponse extends ethers.Transaction {

package/lib/clients/ETHClient.js

@@ -70,12 +70,12 @@ class ETHClient {
     }
     approveERC20(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { token, gasPriceGwei, gasLimit, ethAddress, spenderAddress, signer } = params;
+            const { token, gasPriceGwei, gasLimit, ethAddress, spenderAddress, signer, amount } = params;
             const contractAddress = token.tokenAddress;
             const rpcProvider = this.getProvider();
             const contract = new ethers_1.ethers.Contract(contractAddress, eth_1.ABIs.erc20, rpcProvider);
             const nonce = yield this.getTxNonce(ethAddress, params.nonce, rpcProvider);
-            const approveResultTx = yield contract.connect(signer).approve(spenderAddress !== null && spenderAddress !== void 0 ? spenderAddress : token.bridgeAddress, ethers_1.ethers.constants.MaxUint256, Object.assign(Object.assign({ nonce }, gasPriceGwei && ({ gasPrice: gasPriceGwei.shiftedBy(9).toString(10) })), gasLimit && ({ gasLimit: gasLimit.toString(10) })));
+            const approveResultTx = yield contract.connect(signer).approve(spenderAddress !== null && spenderAddress !== void 0 ? spenderAddress : token.bridgeAddress, amount !== null && amount !== void 0 ? amount : ethers_1.ethers.constants.MaxUint256, Object.assign(Object.assign({ nonce }, gasPriceGwei && ({ gasPrice: gasPriceGwei.shiftedBy(9).toString(10) })), gasLimit && ({ gasLimit: gasLimit.toString(10) })));
             return approveResultTx;
         });
     }

package/lib/clients/NEOClient.js

@@ -32,7 +32,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NEOClient = void 0;
-const CarbonSDK_1 = __importDefault(require("../CarbonSDK"));
 const constant_1 = require("../constant");
 const util_1 = require("../util");
 const address_1 = require("../util/address");
@@ -139,9 +138,7 @@ class NEOClient {
                 nonce,
             ]);
             const rpcUrl = yield this.getProviderUrl();
-            const apiProvider = networkConfig.network === CarbonSDK_1.default.Network.MainNet
-                ? new neon_js_1.api.neonDB.instance("https://api.switcheo.network")
-                : new neon_js_1.api.neoCli.instance(rpcUrl);
+            const apiProvider = new neon_js_1.api.neoCli.instance(rpcUrl);
             return neon_js_1.api.doInvoke({
                 api: apiProvider,
                 url: rpcUrl,
@@ -221,9 +218,7 @@ class NEOClient {
             ];
             sb.emitAppCall(scriptHash, "lock", data);
             const rpcUrl = yield this.getProviderUrl();
-            const apiProvider = networkConfig.network === CarbonSDK_1.default.Network.MainNet
-                ? new neon_js_1.api.neonDB.instance("https://api.switcheo.network")
-                : new neon_js_1.api.neoCli.instance(rpcUrl);
+            const apiProvider = new neon_js_1.api.neoCli.instance(rpcUrl);
             let invokeTxConfig = {
                 account: Object.assign(Object.assign({}, new Neon.wallet.Account("")), { 
                     // overwrite the address and public key to values provided by the ledger.
@@ -285,10 +280,7 @@ class NEOClient {
                 args: [],
             };
             const script = Neon.sc.createScript(props);
-            const networkConfig = this.getNetworkConfig();
-            const apiProvider = networkConfig.network === CarbonSDK_1.default.Network.MainNet
-                ? new neon_js_1.api.neonDB.instance("https://api.switcheo.network")
-                : new neon_js_1.api.neoCli.instance(rpcUrl);
+            const apiProvider = new neon_js_1.api.neoCli.instance(rpcUrl);
             const config = {
                 api: apiProvider,
                 url: rpcUrl,

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

@@ -41,6 +41,10 @@ export interface WithdrawFromPoolEvent {
     shareAmount: string;
     withdrawer: string;
 }
+export interface UpdateMarketUtilizationMultiplierEvent {
+    market: string;
+    multiplier: string;
+}
 export declare const SetPoolEvent: {
     encode(message: SetPoolEvent, writer?: _m0.Writer): _m0.Writer;
     decode(input: _m0.Reader | Uint8Array, length?: number | undefined): SetPoolEvent;
@@ -97,6 +101,13 @@ export declare const WithdrawFromPoolEvent: {
     toJSON(message: WithdrawFromPoolEvent): unknown;
     fromPartial(object: DeepPartial<WithdrawFromPoolEvent>): WithdrawFromPoolEvent;
 };
+export declare const UpdateMarketUtilizationMultiplierEvent: {
+    encode(message: UpdateMarketUtilizationMultiplierEvent, writer?: _m0.Writer): _m0.Writer;
+    decode(input: _m0.Reader | Uint8Array, length?: number | undefined): UpdateMarketUtilizationMultiplierEvent;
+    fromJSON(object: any): UpdateMarketUtilizationMultiplierEvent;
+    toJSON(message: UpdateMarketUtilizationMultiplierEvent): unknown;
+    fromPartial(object: DeepPartial<UpdateMarketUtilizationMultiplierEvent>): UpdateMarketUtilizationMultiplierEvent;
+};
 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/perpsliquidity/event.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.WithdrawFromPoolEvent = exports.DepositToPoolEvent = exports.SetMarketConfigEvent = exports.DeregisterFromPoolEvent = exports.RegisterToPoolEvent = exports.UpdatePoolEvent = exports.NewPoolEvent = exports.SetPoolEvent = exports.protobufPackage = void 0;
+exports.UpdateMarketUtilizationMultiplierEvent = exports.WithdrawFromPoolEvent = exports.DepositToPoolEvent = exports.SetMarketConfigEvent = exports.DeregisterFromPoolEvent = exports.RegisterToPoolEvent = exports.UpdatePoolEvent = exports.NewPoolEvent = exports.SetPoolEvent = exports.protobufPackage = void 0;
 /* eslint-disable */
 const long_1 = __importDefault(require("long"));
 const minimal_1 = __importDefault(require("protobufjs/minimal"));
@@ -591,6 +591,66 @@ exports.WithdrawFromPoolEvent = {
         return message;
     },
 };
+const baseUpdateMarketUtilizationMultiplierEvent = {
+    market: "",
+    multiplier: "",
+};
+exports.UpdateMarketUtilizationMultiplierEvent = {
+    encode(message, writer = minimal_1.default.Writer.create()) {
+        if (message.market !== "") {
+            writer.uint32(10).string(message.market);
+        }
+        if (message.multiplier !== "") {
+            writer.uint32(18).string(message.multiplier);
+        }
+        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({}, baseUpdateMarketUtilizationMultiplierEvent);
+        while (reader.pos < end) {
+            const tag = reader.uint32();
+            switch (tag >>> 3) {
+                case 1:
+                    message.market = reader.string();
+                    break;
+                case 2:
+                    message.multiplier = reader.string();
+                    break;
+                default:
+                    reader.skipType(tag & 7);
+                    break;
+            }
+        }
+        return message;
+    },
+    fromJSON(object) {
+        const message = Object.assign({}, baseUpdateMarketUtilizationMultiplierEvent);
+        message.market =
+            object.market !== undefined && object.market !== null
+                ? String(object.market)
+                : "";
+        message.multiplier =
+            object.multiplier !== undefined && object.multiplier !== null
+                ? String(object.multiplier)
+                : "";
+        return message;
+    },
+    toJSON(message) {
+        const obj = {};
+        message.market !== undefined && (obj.market = message.market);
+        message.multiplier !== undefined && (obj.multiplier = message.multiplier);
+        return obj;
+    },
+    fromPartial(object) {
+        var _a, _b;
+        const message = Object.assign({}, baseUpdateMarketUtilizationMultiplierEvent);
+        message.market = (_a = object.market) !== null && _a !== void 0 ? _a : "";
+        message.multiplier = (_b = object.multiplier) !== null && _b !== void 0 ? _b : "";
+        return message;
+    },
+};
 if (minimal_1.default.util.Long !== long_1.default) {
     minimal_1.default.util.Long = long_1.default;
     minimal_1.default.configure();

package/lib/codec/perpsliquidity/market.d.ts

@@ -38,6 +38,10 @@ export interface TWAMarketUtilizationRate {
     lastUpdatedAt?: Date;
     twaUtilizationRate: string;
 }
+export interface MarketUtilizationMultiplier {
+    market: string;
+    multiplier: string;
+}
 export declare const Quote: {
     encode(message: Quote, writer?: _m0.Writer): _m0.Writer;
     decode(input: _m0.Reader | Uint8Array, length?: number | undefined): Quote;
@@ -66,6 +70,13 @@ export declare const TWAMarketUtilizationRate: {
     toJSON(message: TWAMarketUtilizationRate): unknown;
     fromPartial(object: DeepPartial<TWAMarketUtilizationRate>): TWAMarketUtilizationRate;
 };
+export declare const MarketUtilizationMultiplier: {
+    encode(message: MarketUtilizationMultiplier, writer?: _m0.Writer): _m0.Writer;
+    decode(input: _m0.Reader | Uint8Array, length?: number | undefined): MarketUtilizationMultiplier;
+    fromJSON(object: any): MarketUtilizationMultiplier;
+    toJSON(message: MarketUtilizationMultiplier): unknown;
+    fromPartial(object: DeepPartial<MarketUtilizationMultiplier>): MarketUtilizationMultiplier;
+};
 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/perpsliquidity/market.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.TWAMarketUtilizationRate = exports.UpdateMarketConfigParams = exports.MarketConfig = exports.Quote = exports.protobufPackage = void 0;
+exports.MarketUtilizationMultiplier = exports.TWAMarketUtilizationRate = exports.UpdateMarketConfigParams = exports.MarketConfig = exports.Quote = exports.protobufPackage = void 0;
 /* eslint-disable */
 const long_1 = __importDefault(require("long"));
 const minimal_1 = __importDefault(require("protobufjs/minimal"));
@@ -344,6 +344,63 @@ exports.TWAMarketUtilizationRate = {
         return message;
     },
 };
+const baseMarketUtilizationMultiplier = { market: "", multiplier: "" };
+exports.MarketUtilizationMultiplier = {
+    encode(message, writer = minimal_1.default.Writer.create()) {
+        if (message.market !== "") {
+            writer.uint32(10).string(message.market);
+        }
+        if (message.multiplier !== "") {
+            writer.uint32(18).string(message.multiplier);
+        }
+        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({}, baseMarketUtilizationMultiplier);
+        while (reader.pos < end) {
+            const tag = reader.uint32();
+            switch (tag >>> 3) {
+                case 1:
+                    message.market = reader.string();
+                    break;
+                case 2:
+                    message.multiplier = reader.string();
+                    break;
+                default:
+                    reader.skipType(tag & 7);
+                    break;
+            }
+        }
+        return message;
+    },
+    fromJSON(object) {
+        const message = Object.assign({}, baseMarketUtilizationMultiplier);
+        message.market =
+            object.market !== undefined && object.market !== null
+                ? String(object.market)
+                : "";
+        message.multiplier =
+            object.multiplier !== undefined && object.multiplier !== null
+                ? String(object.multiplier)
+                : "";
+        return message;
+    },
+    toJSON(message) {
+        const obj = {};
+        message.market !== undefined && (obj.market = message.market);
+        message.multiplier !== undefined && (obj.multiplier = message.multiplier);
+        return obj;
+    },
+    fromPartial(object) {
+        var _a, _b;
+        const message = Object.assign({}, baseMarketUtilizationMultiplier);
+        message.market = (_a = object.market) !== null && _a !== void 0 ? _a : "";
+        message.multiplier = (_b = object.multiplier) !== null && _b !== void 0 ? _b : "";
+        return message;
+    },
+};
 function toTimestamp(date) {
     const seconds = numberToLong(date.getTime() / 1000);
     const nanos = (date.getTime() % 1000) * 1000000;

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

@@ -1,9 +1,17 @@
 import Long from "long";
 import _m0 from "protobufjs/minimal";
+import { PageRequest, PageResponse } from "../cosmos/base/query/v1beta1/pagination";
 import { Params } from "./params";
 import { PoolDetails } from "./pool";
-import { PageRequest, PageResponse } from "../cosmos/base/query/v1beta1/pagination";
+import { MarketUtilizationMultiplier } from "./market";
 export declare const protobufPackage = "Switcheo.carbon.perpsliquidity";
+export interface QueryAllPlPoolMarketUtilizationMultiplierRequest {
+    pagination?: PageRequest;
+}
+export interface QueryAllPlPoolMarketUtilizationMultiplierResponse {
+    marketsUtilizationMultiplier: MarketUtilizationMultiplier[];
+    pagination?: PageResponse;
+}
 /** QueryParamsRequest is request type for the Query/Params RPC method. */
 export interface QueryParamsRequest {
 }
@@ -68,6 +76,20 @@ export interface QueryAllPLPoolInfoResponse {
     pools: QueryPLPoolInfoResponse[];
     pagination?: PageResponse;
 }
+export declare const QueryAllPlPoolMarketUtilizationMultiplierRequest: {
+    encode(message: QueryAllPlPoolMarketUtilizationMultiplierRequest, writer?: _m0.Writer): _m0.Writer;
+    decode(input: _m0.Reader | Uint8Array, length?: number | undefined): QueryAllPlPoolMarketUtilizationMultiplierRequest;
+    fromJSON(object: any): QueryAllPlPoolMarketUtilizationMultiplierRequest;
+    toJSON(message: QueryAllPlPoolMarketUtilizationMultiplierRequest): unknown;
+    fromPartial(object: DeepPartial<QueryAllPlPoolMarketUtilizationMultiplierRequest>): QueryAllPlPoolMarketUtilizationMultiplierRequest;
+};
+export declare const QueryAllPlPoolMarketUtilizationMultiplierResponse: {
+    encode(message: QueryAllPlPoolMarketUtilizationMultiplierResponse, writer?: _m0.Writer): _m0.Writer;
+    decode(input: _m0.Reader | Uint8Array, length?: number | undefined): QueryAllPlPoolMarketUtilizationMultiplierResponse;
+    fromJSON(object: any): QueryAllPlPoolMarketUtilizationMultiplierResponse;
+    toJSON(message: QueryAllPlPoolMarketUtilizationMultiplierResponse): unknown;
+    fromPartial(object: DeepPartial<QueryAllPlPoolMarketUtilizationMultiplierResponse>): QueryAllPlPoolMarketUtilizationMultiplierResponse;
+};
 export declare const QueryParamsRequest: {
     encode(_: QueryParamsRequest, writer?: _m0.Writer): _m0.Writer;
     decode(input: _m0.Reader | Uint8Array, length?: number | undefined): QueryParamsRequest;
@@ -191,14 +213,16 @@ export interface Query {
      * Get statistical amounts for a particular pool id
      */
     PoolInfoAll(request: QueryAllPLPoolInfoRequest): Promise<QueryAllPLPoolInfoResponse>;
+    /** Get addresses for all plp pools */
+    PoolAddressAll(request: QueryAllPlPoolAddressRequest): Promise<QueryAllPlPoolAddressResponse>;
+    /** Get markets utilization multiplier for all plp pools-linked markets */
+    PoolMarketUtilizationMultiplierAll(request: QueryAllPlPoolMarketUtilizationMultiplierRequest): Promise<QueryAllPlPoolMarketUtilizationMultiplierResponse>;
     /** Get Pool details for a particular id */
     Pool(request: QueryGetPlPoolRequest): Promise<QueryGetPlPoolResponse>;
     /** Get all Pool details */
     PoolAll(request: QueryAllPlPoolsRequest): Promise<QueryAllPlPoolsResponse>;
     /** Get denom => pool_id mappings */
     PoolMappings(request: QueryPlPoolMappingsRequest): Promise<QueryPlPoolMappingsResponse>;
-    /** Get addresses for all plp pools */
-    PoolAddressAll(request: QueryAllPlPoolAddressRequest): Promise<QueryAllPlPoolAddressResponse>;
 }
 export declare class QueryClientImpl implements Query {
     private readonly rpc;
@@ -206,10 +230,11 @@ export declare class QueryClientImpl implements Query {
     Params(request: QueryParamsRequest): Promise<QueryParamsResponse>;
     PoolInfo(request: QueryPLPoolInfoRequest): Promise<QueryPLPoolInfoResponse>;
     PoolInfoAll(request: QueryAllPLPoolInfoRequest): Promise<QueryAllPLPoolInfoResponse>;
+    PoolAddressAll(request: QueryAllPlPoolAddressRequest): Promise<QueryAllPlPoolAddressResponse>;
+    PoolMarketUtilizationMultiplierAll(request: QueryAllPlPoolMarketUtilizationMultiplierRequest): Promise<QueryAllPlPoolMarketUtilizationMultiplierResponse>;
     Pool(request: QueryGetPlPoolRequest): Promise<QueryGetPlPoolResponse>;
     PoolAll(request: QueryAllPlPoolsRequest): Promise<QueryAllPlPoolsResponse>;
     PoolMappings(request: QueryPlPoolMappingsRequest): Promise<QueryPlPoolMappingsResponse>;
-    PoolAddressAll(request: QueryAllPlPoolAddressRequest): Promise<QueryAllPlPoolAddressResponse>;
 }
 interface Rpc {
     request(service: string, method: string, data: Uint8Array): Promise<Uint8Array>;

package/lib/codec/perpsliquidity/query.js

@@ -3,14 +3,133 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.QueryClientImpl = exports.QueryAllPLPoolInfoResponse = exports.QueryAllPLPoolInfoRequest = exports.QueryPLPoolInfoResponse = exports.QueryPLPoolInfoRequest = exports.QueryAllPlPoolAddressResponse_AddressesEntry = exports.QueryAllPlPoolAddressResponse = exports.QueryAllPlPoolAddressRequest = exports.QueryPlPoolMappingsResponse_PoolMappingsEntry = exports.QueryPlPoolMappingsResponse = exports.QueryPlPoolMappingsRequest = exports.QueryAllPlPoolsResponse = exports.QueryAllPlPoolsRequest = exports.QueryGetPlPoolResponse = exports.QueryGetPlPoolRequest = exports.QueryParamsResponse = exports.QueryParamsRequest = exports.protobufPackage = void 0;
+exports.QueryClientImpl = exports.QueryAllPLPoolInfoResponse = exports.QueryAllPLPoolInfoRequest = exports.QueryPLPoolInfoResponse = exports.QueryPLPoolInfoRequest = exports.QueryAllPlPoolAddressResponse_AddressesEntry = exports.QueryAllPlPoolAddressResponse = exports.QueryAllPlPoolAddressRequest = exports.QueryPlPoolMappingsResponse_PoolMappingsEntry = exports.QueryPlPoolMappingsResponse = exports.QueryPlPoolMappingsRequest = exports.QueryAllPlPoolsResponse = exports.QueryAllPlPoolsRequest = exports.QueryGetPlPoolResponse = exports.QueryGetPlPoolRequest = exports.QueryParamsResponse = exports.QueryParamsRequest = exports.QueryAllPlPoolMarketUtilizationMultiplierResponse = exports.QueryAllPlPoolMarketUtilizationMultiplierRequest = exports.protobufPackage = void 0;
 /* eslint-disable */
 const long_1 = __importDefault(require("long"));
 const minimal_1 = __importDefault(require("protobufjs/minimal"));
+const pagination_1 = require("../cosmos/base/query/v1beta1/pagination");
 const params_1 = require("./params");
 const pool_1 = require("./pool");
-const pagination_1 = require("../cosmos/base/query/v1beta1/pagination");
+const market_1 = require("./market");
 exports.protobufPackage = "Switcheo.carbon.perpsliquidity";
+const baseQueryAllPlPoolMarketUtilizationMultiplierRequest = {};
+exports.QueryAllPlPoolMarketUtilizationMultiplierRequest = {
+    encode(message, writer = minimal_1.default.Writer.create()) {
+        if (message.pagination !== undefined) {
+            pagination_1.PageRequest.encode(message.pagination, writer.uint32(10).fork()).ldelim();
+        }
+        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({}, baseQueryAllPlPoolMarketUtilizationMultiplierRequest);
+        while (reader.pos < end) {
+            const tag = reader.uint32();
+            switch (tag >>> 3) {
+                case 1:
+                    message.pagination = pagination_1.PageRequest.decode(reader, reader.uint32());
+                    break;
+                default:
+                    reader.skipType(tag & 7);
+                    break;
+            }
+        }
+        return message;
+    },
+    fromJSON(object) {
+        const message = Object.assign({}, baseQueryAllPlPoolMarketUtilizationMultiplierRequest);
+        message.pagination =
+            object.pagination !== undefined && object.pagination !== null
+                ? pagination_1.PageRequest.fromJSON(object.pagination)
+                : undefined;
+        return message;
+    },
+    toJSON(message) {
+        const obj = {};
+        message.pagination !== undefined &&
+            (obj.pagination = message.pagination
+                ? pagination_1.PageRequest.toJSON(message.pagination)
+                : undefined);
+        return obj;
+    },
+    fromPartial(object) {
+        const message = Object.assign({}, baseQueryAllPlPoolMarketUtilizationMultiplierRequest);
+        message.pagination =
+            object.pagination !== undefined && object.pagination !== null
+                ? pagination_1.PageRequest.fromPartial(object.pagination)
+                : undefined;
+        return message;
+    },
+};
+const baseQueryAllPlPoolMarketUtilizationMultiplierResponse = {};
+exports.QueryAllPlPoolMarketUtilizationMultiplierResponse = {
+    encode(message, writer = minimal_1.default.Writer.create()) {
+        for (const v of message.marketsUtilizationMultiplier) {
+            market_1.MarketUtilizationMultiplier.encode(v, writer.uint32(10).fork()).ldelim();
+        }
+        if (message.pagination !== undefined) {
+            pagination_1.PageResponse.encode(message.pagination, writer.uint32(18).fork()).ldelim();
+        }
+        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({}, baseQueryAllPlPoolMarketUtilizationMultiplierResponse);
+        message.marketsUtilizationMultiplier = [];
+        while (reader.pos < end) {
+            const tag = reader.uint32();
+            switch (tag >>> 3) {
+                case 1:
+                    message.marketsUtilizationMultiplier.push(market_1.MarketUtilizationMultiplier.decode(reader, reader.uint32()));
+                    break;
+                case 2:
+                    message.pagination = pagination_1.PageResponse.decode(reader, reader.uint32());
+                    break;
+                default:
+                    reader.skipType(tag & 7);
+                    break;
+            }
+        }
+        return message;
+    },
+    fromJSON(object) {
+        var _a;
+        const message = Object.assign({}, baseQueryAllPlPoolMarketUtilizationMultiplierResponse);
+        message.marketsUtilizationMultiplier = ((_a = object.marketsUtilizationMultiplier) !== null && _a !== void 0 ? _a : []).map((e) => market_1.MarketUtilizationMultiplier.fromJSON(e));
+        message.pagination =
+            object.pagination !== undefined && object.pagination !== null
+                ? pagination_1.PageResponse.fromJSON(object.pagination)
+                : undefined;
+        return message;
+    },
+    toJSON(message) {
+        const obj = {};
+        if (message.marketsUtilizationMultiplier) {
+            obj.marketsUtilizationMultiplier =
+                message.marketsUtilizationMultiplier.map((e) => e ? market_1.MarketUtilizationMultiplier.toJSON(e) : undefined);
+        }
+        else {
+            obj.marketsUtilizationMultiplier = [];
+        }
+        message.pagination !== undefined &&
+            (obj.pagination = message.pagination
+                ? pagination_1.PageResponse.toJSON(message.pagination)
+                : undefined);
+        return obj;
+    },
+    fromPartial(object) {
+        var _a;
+        const message = Object.assign({}, baseQueryAllPlPoolMarketUtilizationMultiplierResponse);
+        message.marketsUtilizationMultiplier = ((_a = object.marketsUtilizationMultiplier) !== null && _a !== void 0 ? _a : []).map((e) => market_1.MarketUtilizationMultiplier.fromPartial(e));
+        message.pagination =
+            object.pagination !== undefined && object.pagination !== null
+                ? pagination_1.PageResponse.fromPartial(object.pagination)
+                : undefined;
+        return message;
+    },
+};
 const baseQueryParamsRequest = {};
 exports.QueryParamsRequest = {
     encode(_, writer = minimal_1.default.Writer.create()) {
@@ -951,10 +1070,12 @@ class QueryClientImpl {
         this.Params = this.Params.bind(this);
         this.PoolInfo = this.PoolInfo.bind(this);
         this.PoolInfoAll = this.PoolInfoAll.bind(this);
+        this.PoolAddressAll = this.PoolAddressAll.bind(this);
+        this.PoolMarketUtilizationMultiplierAll =
+            this.PoolMarketUtilizationMultiplierAll.bind(this);
         this.Pool = this.Pool.bind(this);
         this.PoolAll = this.PoolAll.bind(this);
         this.PoolMappings = this.PoolMappings.bind(this);
-        this.PoolAddressAll = this.PoolAddressAll.bind(this);
     }
     Params(request) {
         const data = exports.QueryParamsRequest.encode(request).finish();
@@ -971,6 +1092,16 @@ class QueryClientImpl {
         const promise = this.rpc.request("Switcheo.carbon.perpsliquidity.Query", "PoolInfoAll", data);
         return promise.then((data) => exports.QueryAllPLPoolInfoResponse.decode(new minimal_1.default.Reader(data)));
     }
+    PoolAddressAll(request) {
+        const data = exports.QueryAllPlPoolAddressRequest.encode(request).finish();
+        const promise = this.rpc.request("Switcheo.carbon.perpsliquidity.Query", "PoolAddressAll", data);
+        return promise.then((data) => exports.QueryAllPlPoolAddressResponse.decode(new minimal_1.default.Reader(data)));
+    }
+    PoolMarketUtilizationMultiplierAll(request) {
+        const data = exports.QueryAllPlPoolMarketUtilizationMultiplierRequest.encode(request).finish();
+        const promise = this.rpc.request("Switcheo.carbon.perpsliquidity.Query", "PoolMarketUtilizationMultiplierAll", data);
+        return promise.then((data) => exports.QueryAllPlPoolMarketUtilizationMultiplierResponse.decode(new minimal_1.default.Reader(data)));
+    }
     Pool(request) {
         const data = exports.QueryGetPlPoolRequest.encode(request).finish();
         const promise = this.rpc.request("Switcheo.carbon.perpsliquidity.Query", "Pool", data);
@@ -986,11 +1117,6 @@ class QueryClientImpl {
         const promise = this.rpc.request("Switcheo.carbon.perpsliquidity.Query", "PoolMappings", data);
         return promise.then((data) => exports.QueryPlPoolMappingsResponse.decode(new minimal_1.default.Reader(data)));
     }
-    PoolAddressAll(request) {
-        const data = exports.QueryAllPlPoolAddressRequest.encode(request).finish();
-        const promise = this.rpc.request("Switcheo.carbon.perpsliquidity.Query", "PoolAddressAll", data);
-        return promise.then((data) => exports.QueryAllPlPoolAddressResponse.decode(new minimal_1.default.Reader(data)));
-    }
 }
 exports.QueryClientImpl = QueryClientImpl;
 if (minimal_1.default.util.Long !== long_1.default) {

package/lib/codec/subaccount/legacy.d.ts

@@ -0,0 +1,19 @@
+import Long from "long";
+import _m0 from "protobufjs/minimal";
+export declare const protobufPackage = "Switcheo.carbon.subaccount";
+export interface SubaccountV2260 {
+    mainAccount: string;
+    active: boolean;
+}
+export declare const SubaccountV2260: {
+    encode(message: SubaccountV2260, writer?: _m0.Writer): _m0.Writer;
+    decode(input: _m0.Reader | Uint8Array, length?: number | undefined): SubaccountV2260;
+    fromJSON(object: any): SubaccountV2260;
+    toJSON(message: SubaccountV2260): unknown;
+    fromPartial(object: DeepPartial<SubaccountV2260>): SubaccountV2260;
+};
+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]>;
+} : Partial<T>;
+export {};

package/lib/codec/subaccount/legacy.js

@@ -0,0 +1,72 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SubaccountV2260 = exports.protobufPackage = void 0;
+/* eslint-disable */
+const long_1 = __importDefault(require("long"));
+const minimal_1 = __importDefault(require("protobufjs/minimal"));
+exports.protobufPackage = "Switcheo.carbon.subaccount";
+const baseSubaccountV2260 = { mainAccount: "", active: false };
+exports.SubaccountV2260 = {
+    encode(message, writer = minimal_1.default.Writer.create()) {
+        if (message.mainAccount !== "") {
+            writer.uint32(10).string(message.mainAccount);
+        }
+        if (message.active === true) {
+            writer.uint32(16).bool(message.active);
+        }
+        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({}, baseSubaccountV2260);
+        while (reader.pos < end) {
+            const tag = reader.uint32();
+            switch (tag >>> 3) {
+                case 1:
+                    message.mainAccount = reader.string();
+                    break;
+                case 2:
+                    message.active = reader.bool();
+                    break;
+                default:
+                    reader.skipType(tag & 7);
+                    break;
+            }
+        }
+        return message;
+    },
+    fromJSON(object) {
+        const message = Object.assign({}, baseSubaccountV2260);
+        message.mainAccount =
+            object.mainAccount !== undefined && object.mainAccount !== null
+                ? String(object.mainAccount)
+                : "";
+        message.active =
+            object.active !== undefined && object.active !== null
+                ? Boolean(object.active)
+                : false;
+        return message;
+    },
+    toJSON(message) {
+        const obj = {};
+        message.mainAccount !== undefined &&
+            (obj.mainAccount = message.mainAccount);
+        message.active !== undefined && (obj.active = message.active);
+        return obj;
+    },
+    fromPartial(object) {
+        var _a, _b;
+        const message = Object.assign({}, baseSubaccountV2260);
+        message.mainAccount = (_a = object.mainAccount) !== null && _a !== void 0 ? _a : "";
+        message.active = (_b = object.active) !== null && _b !== void 0 ? _b : false;
+        return message;
+    },
+};
+if (minimal_1.default.util.Long !== long_1.default) {
+    minimal_1.default.util.Long = long_1.default;
+    minimal_1.default.configure();
+}

package/lib/modules/erc20.d.ts

@@ -10,10 +10,14 @@ export declare namespace ERC20Module {
     interface ConvertCoinParams {
         denom: string;
         amount: string;
+        receiverAddress?: string;
+        senderAddress?: string;
     }
     interface ConvertERC20Params {
         contractAddress: string;
         amount: string;
+        receiverAddress?: string;
+        senderAddress?: string;
     }
     interface RegisterTokenParams {
         creator: string;

package/lib/modules/erc20.js

@@ -17,6 +17,7 @@ const __1 = require("..");
 const base_1 = __importDefault(require("./base"));
 class ERC20Module extends base_1.default {
     convertCoin(params, opts) {
+        var _a, _b, _c, _d;
         return __awaiter(this, void 0, void 0, function* () {
             const wallet = this.getWallet();
             const coin = {
@@ -25,8 +26,8 @@ class ERC20Module extends base_1.default {
             };
             const value = __1.Models.MsgConvertCoin.fromPartial({
                 coin,
-                receiver: wallet.evmHexAddress.toLowerCase(),
-                sender: wallet.bech32Address.toLowerCase(),
+                receiver: (_b = (_a = params.receiverAddress) === null || _a === void 0 ? void 0 : _a.toLowerCase()) !== null && _b !== void 0 ? _b : wallet.evmHexAddress.toLowerCase(),
+                sender: (_d = (_c = params.senderAddress) === null || _c === void 0 ? void 0 : _c.toLowerCase()) !== null && _d !== void 0 ? _d : wallet.bech32Address.toLowerCase(),
             });
             return yield wallet.sendTx({
                 typeUrl: __1.CarbonTx.Types.MsgConvertCoin,
@@ -35,13 +36,14 @@ class ERC20Module extends base_1.default {
         });
     }
     convertERC20(params, opts) {
+        var _a, _b, _c, _d;
         return __awaiter(this, void 0, void 0, function* () {
             const wallet = this.getWallet();
             const value = __1.Models.MsgConvertERC20.fromPartial({
                 contractAddress: params.contractAddress,
                 amount: params.amount,
-                receiver: wallet.bech32Address.toLowerCase(),
-                sender: wallet.bech32Address.toLowerCase(),
+                receiver: (_b = (_a = params.receiverAddress) === null || _a === void 0 ? void 0 : _a.toLowerCase()) !== null && _b !== void 0 ? _b : wallet.bech32Address.toLowerCase(),
+                sender: (_d = (_c = params.senderAddress) === null || _c === void 0 ? void 0 : _c.toLowerCase()) !== null && _d !== void 0 ? _d : wallet.bech32Address.toLowerCase(),
             });
             return yield wallet.sendTx({
                 typeUrl: __1.CarbonTx.Types.MsgConvertERC20,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "carbon-js-sdk",
-  "version": "0.6.1",
+  "version": "0.6.2-beta.1+e1024bcc",
   "description": "TypeScript SDK for Carbon blockchain",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",