carbon-js-sdk 0.5.1 → 0.5.3

package/lib/CarbonSDK.js

@@ -310,9 +310,15 @@ class CarbonSDK {
                 network: this.networkConfig.network,
                 bech32Prefix: this.networkConfig.Bech32Prefix
             };
+            let publicKeyBase64;
             const address = yield metamask.defaultAccount();
-            const publicKeyHex = yield metamask.getPublicKey(address, metamaskWalletOpts === null || metamaskWalletOpts === void 0 ? void 0 : metamaskWalletOpts.publicKeyMessage);
-            const publicKeyBase64 = Buffer.from(publicKeyHex, 'hex').toString('base64');
+            if (metamaskWalletOpts === null || metamaskWalletOpts === void 0 ? void 0 : metamaskWalletOpts.publicKeyBase64) {
+                publicKeyBase64 = metamaskWalletOpts === null || metamaskWalletOpts === void 0 ? void 0 : metamaskWalletOpts.publicKeyBase64;
+            }
+            else {
+                const publicKeyHex = yield metamask.getPublicKey(address, metamaskWalletOpts === null || metamaskWalletOpts === void 0 ? void 0 : metamaskWalletOpts.publicKeyMessage);
+                publicKeyBase64 = Buffer.from(publicKeyHex, 'hex').toString('base64');
+            }
             const wallet = wallet_1.CarbonWallet.withMetamask(metamask, evmChainId, publicKeyBase64, addressOptions, Object.assign(Object.assign({}, opts), { network: this.network, config: this.configOverride }));
             return this.connect(wallet);
         });

package/lib/clients/TokenClient.js

@@ -441,7 +441,7 @@ class TokenClient {
             });
             const ibcBridges = yield this.matchChainsWithDifferentChainIds(unmatchedIbcBridgeList);
             const polynetworkBridges = allBridges.bridges.reduce((prev, bridge) => {
-                if (!bridge.enabled || bridge.bridgeId.toNumber() !== blockchain_1.BRIDGE_IDS.polynetwork)
+                if (bridge.bridgeId.toNumber() !== blockchain_1.BRIDGE_IDS.polynetwork)
                     return prev;
                 prev.push(Object.assign(Object.assign({}, bridge), { isEvmChain: util_1.BlockchainUtils.isEvmChain(bridge.chainName) }));
                 return prev;

package/lib/modules/perpsliquidity.d.ts

@@ -1,10 +1,7 @@
 /// <reference types="long" />
-import { PoolDetails, QueryPLPoolInfoResponse } from "../codec";
-import { CarbonTx } from "..";
+import { CarbonTx } from "../util";
 import BaseModule from "./base";
 export declare class PerpsLiquidityModule extends BaseModule {
-    getPerpPools(): Promise<PoolDetails[]>;
-    getPerpPoolInfo(poolId: string): Promise<QueryPLPoolInfoResponse>;
     createPerpertualsPool(params: PerpsLiquidityModule.CreatePerpetualPoolParams, opts?: CarbonTx.SignTxOpts): Promise<import("@cosmjs/stargate").DeliverTxResponse>;
     updatePerpetualsPool(params: PerpsLiquidityModule.UpdatePerpetualPoolParams, opts?: CarbonTx.SignTxOpts): Promise<import("@cosmjs/stargate").DeliverTxResponse>;
     depositToPerpetualsPool(params: PerpsLiquidityModule.DepositToPerpetualsPoolParams, opts?: CarbonTx.SignTxOpts): Promise<import("@cosmjs/stargate").DeliverTxResponse>;

package/lib/modules/perpsliquidity.js

@@ -13,26 +13,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PerpsLiquidityModule = void 0;
-const __1 = require("..");
+const codec_1 = require("../codec");
+const util_1 = require("../util");
 const base_1 = __importDefault(require("./base"));
 class PerpsLiquidityModule extends base_1.default {
-    getPerpPools() {
-        var _a;
-        return __awaiter(this, void 0, void 0, function* () {
-            const fetchDataResponse = yield this.sdkProvider.query.perpsliquidity.PoolAll({});
-            return (_a = fetchDataResponse === null || fetchDataResponse === void 0 ? void 0 : fetchDataResponse.pools) !== null && _a !== void 0 ? _a : [];
-        });
-    }
-    getPerpPoolInfo(poolId) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const fetchDataResponse = yield this.sdkProvider.query.perpsliquidity.PoolInfo({ poolId });
-            return fetchDataResponse !== null && fetchDataResponse !== void 0 ? fetchDataResponse : [];
-        });
-    }
     createPerpertualsPool(params, opts) {
         return __awaiter(this, void 0, void 0, function* () {
             const wallet = this.getWallet();
-            const value = __1.Models.MsgCreatePlPool.fromPartial({
+            const value = codec_1.MsgCreatePlPool.fromPartial({
                 creator: wallet.bech32Address,
                 name: params.name,
                 depositDenom: params.depositDenom,
@@ -43,7 +31,7 @@ class PerpsLiquidityModule extends base_1.default {
                 borrowFeeBps: params.borrowFeeBps,
             });
             return yield wallet.sendTx({
-                typeUrl: __1.CarbonTx.Types.MsgCreatePlPool,
+                typeUrl: util_1.CarbonTx.Types.MsgCreatePlPool,
                 value,
             }, opts);
         });
@@ -57,13 +45,13 @@ class PerpsLiquidityModule extends base_1.default {
                 depositFeeBps: params.depositFeeBps,
                 withdrawalFeeBps: params.withdrawalFeeBps,
             };
-            const value = __1.Models.MsgUpdatePlPool.fromPartial({
+            const value = codec_1.MsgUpdatePlPool.fromPartial({
                 creator: wallet.bech32Address,
                 poolId: params.poolId,
                 updatePoolParams: updatePoolParam,
             });
             return yield wallet.sendTx({
-                typeUrl: __1.CarbonTx.Types.MsgUpdatePlPool,
+                typeUrl: util_1.CarbonTx.Types.MsgUpdatePlPool,
                 value,
             }, opts);
         });
@@ -71,14 +59,14 @@ class PerpsLiquidityModule extends base_1.default {
     depositToPerpetualsPool(params, opts) {
         return __awaiter(this, void 0, void 0, function* () {
             const wallet = this.getWallet();
-            const value = __1.Models.MsgDepositToPlPool.fromPartial({
+            const value = codec_1.MsgDepositToPlPool.fromPartial({
                 creator: wallet.bech32Address,
                 poolId: params.poolId,
                 depositAmount: params.depositAmount,
                 minShareAmount: params.minShareAmount,
             });
             return yield wallet.sendTx({
-                typeUrl: __1.CarbonTx.Types.MsgDepositToPlPool,
+                typeUrl: util_1.CarbonTx.Types.MsgDepositToPlPool,
                 value,
             }, opts);
         });
@@ -86,14 +74,14 @@ class PerpsLiquidityModule extends base_1.default {
     withdrawFromPerpetualsPool(params, opts) {
         return __awaiter(this, void 0, void 0, function* () {
             const wallet = this.getWallet();
-            const value = __1.Models.MsgWithdrawFromPlPool.fromPartial({
+            const value = codec_1.MsgWithdrawFromPlPool.fromPartial({
                 creator: wallet.bech32Address,
                 poolId: params.poolId,
                 shareAmount: params.shareAmount,
                 minReceiveAmount: params.minReceiveAmount,
             });
             return yield wallet.sendTx({
-                typeUrl: __1.CarbonTx.Types.MsgWithdrawFromPlPool,
+                typeUrl: util_1.CarbonTx.Types.MsgWithdrawFromPlPool,
                 value,
             }, opts);
         });
@@ -101,13 +89,13 @@ class PerpsLiquidityModule extends base_1.default {
     registerToPlPool(params, opts) {
         return __awaiter(this, void 0, void 0, function* () {
             const wallet = this.getWallet();
-            const value = __1.Models.MsgRegisterToPlPool.fromPartial({
+            const value = codec_1.MsgRegisterToPlPool.fromPartial({
                 creator: wallet.bech32Address,
                 poolId: params.poolId,
                 marketId: params.marketId,
             });
             return yield wallet.sendTx({
-                typeUrl: __1.CarbonTx.Types.MsgRegisterToPlPool,
+                typeUrl: util_1.CarbonTx.Types.MsgRegisterToPlPool,
                 value,
             }, opts);
         });
@@ -115,12 +103,12 @@ class PerpsLiquidityModule extends base_1.default {
     deregisterFromPlPool(params, opts) {
         return __awaiter(this, void 0, void 0, function* () {
             const wallet = this.getWallet();
-            const value = __1.Models.MsgDeregisterFromPlPool.fromPartial({
+            const value = codec_1.MsgDeregisterFromPlPool.fromPartial({
                 creator: wallet.bech32Address,
                 marketId: params.marketId,
             });
             return yield wallet.sendTx({
-                typeUrl: __1.CarbonTx.Types.MsgDeregisterFromPlPool,
+                typeUrl: util_1.CarbonTx.Types.MsgDeregisterFromPlPool,
                 value,
             }, opts);
         });

package/lib/wallet/CarbonWallet.d.ts

@@ -45,6 +45,7 @@ export interface CarbonWalletGenericOpts {
 }
 export interface MetaMaskWalletOpts {
     publicKeyMessage?: string;
+    publicKeyBase64?: string;
 }
 export declare type CarbonWalletInitOpts = CarbonWalletGenericOpts & ({
     mnemonic: string;

package/package.json

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