carbon-js-sdk 0.7.1-beta.4 → 0.7.1-beta.6

package/lib/CarbonSDK.d.ts

@@ -17,9 +17,13 @@ export * as Carbon from "./codec/carbon-models";
 export interface CarbonSDKOpts {
     network: Network;
     tmClient: Tendermint34Client;
+    wallet?: CarbonWallet;
     chainId?: string;
     evmChainId?: string;
     token?: TokenClient;
+    query?: CarbonQueryClient;
+    hydrogen?: HydrogenClient;
+    insights?: InsightsQueryClient;
     config?: Partial<NetworkConfig>;
     grpcQueryClient?: GrpcQueryClient;
     useTmAbciQuery?: boolean;

package/lib/CarbonSDK.js

@@ -63,29 +63,33 @@ const DEFAULT_SDK_INIT_OPTS = {
  */
 class CarbonSDK {
     constructor(opts) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
         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.wallet = opts.wallet;
         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 = (_h = opts.grpcQueryClient) !== null && _h !== void 0 ? _h : new GrpcQueryClient_1.default(this.networkConfig.grpcWebUrl, {
-                transport,
+        let carbonQueryClient;
+        if (!opts.query) {
+            let grpcClient;
+            if (opts.useTmAbciQuery !== true && this.networkConfig.grpcUrl) {
+                const transport = typeof window === "undefined" ? grpc_web_node_http_transport_1.NodeHttpTransport() : undefined;
+                grpcClient = (_h = opts.grpcQueryClient) !== null && _h !== void 0 ? _h : new GrpcQueryClient_1.default(this.networkConfig.grpcWebUrl, {
+                    transport,
+                });
+            }
+            carbonQueryClient = new clients_1.CarbonQueryClient({
+                tmClient: this.tmClient,
+                grpcClient,
             });
         }
-        this.query = new clients_1.CarbonQueryClient({
-            tmClient: this.tmClient,
-            grpcClient,
-        });
-        this.insights = new clients_1.InsightsQueryClient(this.networkConfig);
-        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.query = ((_j = opts.query) !== null && _j !== void 0 ? _j : carbonQueryClient);
+        this.insights = (_k = opts.insights) !== null && _k !== void 0 ? _k : new clients_1.InsightsQueryClient(this.networkConfig);
+        this.token = (_l = opts.token) !== null && _l !== void 0 ? _l : clients_1.TokenClient.instance(this.query, this);
+        this.hydrogen = (_m = opts.hydrogen) !== null && _m !== void 0 ? _m : new clients_1.HydrogenClient(this.networkConfig, this.token);
         this.admin = new modules_1.AdminModule(this);
         this.alliance = new modules_1.AllianceModule(this);
         this.order = new modules_1.OrderModule(this);
@@ -250,9 +254,15 @@ class CarbonSDK {
         return {
             network: this.network,
             config: this.configOverride,
-            tmClient: this.tmClient,
             chainId: this.chainId,
+            evmChainId: this.evmChainId,
             useTmAbciQuery: this.useTmAbciQuery,
+            wallet: this.wallet,
+            tmClient: this.tmClient,
+            token: this.token,
+            query: this.query,
+            hydrogen: this.hydrogen,
+            insights: this.insights,
         };
     }
     connect(wallet) {
@@ -280,7 +290,9 @@ class CarbonSDK {
         if ((_a = this.wallet) === null || _a === void 0 ? void 0 : _a.isLedgerSigner()) {
             this.wallet.signer.ledger.disconnect();
         }
-        return new CarbonSDK(Object.assign(Object.assign({}, this), { wallet: null, skipInit: true }));
+        const opts = this.generateOpts();
+        delete opts.wallet;
+        return new CarbonSDK(opts);
     }
     connectWithPrivateKey(privateKey, opts) {
         return __awaiter(this, void 0, void 0, function* () {

package/lib/util/blockchain.d.ts

@@ -2,6 +2,13 @@ import { TokenClient } from '../clients';
 import { Coin } from '../codec/carbon-models';
 import { Network } from "../constant/network";
 import { SimpleMap } from "./type";
+export declare enum SmartWalletBlockchain {
+    Neo = "neo",
+    Ethereum = "eth",
+    BinanceSmartChain = "bsc",
+    Arbitrum = "arbitrum",
+    Polygon = "polygon"
+}
 export declare enum Blockchain {
     Neo = "neo",
     Ethereum = "eth",

package/lib/util/blockchain.js

@@ -1,8 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isEvmChain = exports.EvmChains = exports.blockchainForChainIdV2 = exports.getBlockchainFromChainV2 = exports.blockchainForChainId = exports.getBlockchainFromChain = exports.getChainFromID = exports.parseBlockchain = exports.chainIdsByBlockchain = exports.CHAIN_IDS_TEST = exports.CHAIN_IDS_DEV = exports.CHAIN_IDS = exports.ChainNames = exports.isIbcBridge = exports.BRIDGE_IDS = exports.BLOCKCHAIN_V2_TO_V1_MAPPING = exports.Blockchain = void 0;
+exports.isEvmChain = exports.EvmChains = exports.blockchainForChainIdV2 = exports.getBlockchainFromChainV2 = exports.blockchainForChainId = exports.getBlockchainFromChain = exports.getChainFromID = exports.parseBlockchain = exports.chainIdsByBlockchain = exports.CHAIN_IDS_TEST = exports.CHAIN_IDS_DEV = exports.CHAIN_IDS = exports.ChainNames = exports.isIbcBridge = exports.BRIDGE_IDS = exports.BLOCKCHAIN_V2_TO_V1_MAPPING = exports.Blockchain = exports.SmartWalletBlockchain = void 0;
 const network_1 = require("../constant/network");
 const ethermint_1 = require("./ethermint");
+var SmartWalletBlockchain;
+(function (SmartWalletBlockchain) {
+    SmartWalletBlockchain["Neo"] = "neo";
+    SmartWalletBlockchain["Ethereum"] = "eth";
+    SmartWalletBlockchain["BinanceSmartChain"] = "bsc";
+    SmartWalletBlockchain["Arbitrum"] = "arbitrum";
+    SmartWalletBlockchain["Polygon"] = "polygon";
+})(SmartWalletBlockchain = exports.SmartWalletBlockchain || (exports.SmartWalletBlockchain = {}));
 var Blockchain;
 (function (Blockchain) {
     Blockchain["Neo"] = "neo";

package/lib/wallet/CarbonWallet.d.ts

@@ -5,15 +5,16 @@ import { ProviderAgent } from "../constant/walletProvider";
 import { ChainInfo, CosmosLedger, Keplr, MetaMask } from "../provider";
 import { CarbonTx } from "../util";
 import { SWTHAddressOptions } from "../util/address";
+import { SmartWalletBlockchain } from "../util/blockchain";
 import { SimpleMap } from "../util/type";
 import { StdSignature } from "@cosmjs/amino";
 import { EncodeObject, OfflineDirectSigner, OfflineSigner } from "@cosmjs/proto-signing";
 import { Account, DeliverTxResponse } from "@cosmjs/stargate";
 import { Tendermint34Client } from "@cosmjs/tendermint-rpc";
 import { BroadcastTxSyncResponse } from "@cosmjs/tendermint-rpc/build/tendermint34/responses";
+import { Key as LeapKey } from "@cosmos-kit/core";
 import { Leap } from "@cosmos-kit/leap";
 import { Key } from "@keplr-wallet/types";
-import { Key as LeapKey } from "@cosmos-kit/core";
 import BigNumber from "bignumber.js";
 import { TxRaw as StargateTxRaw } from "cosmjs-types/cosmos/tx/v1beta1/tx";
 import { CarbonSigner, CarbonSignerTypes } from "./CarbonSigner";
@@ -166,7 +167,7 @@ export declare class CarbonWallet {
     isPrivateKeySigner(): boolean;
     isBrowserInjectedSigner(): boolean;
     isSmartWalletEnabled(): boolean;
-    getSmartWalletPrivateKey(): Buffer | null;
+    getSmartWalletPrivateKey(blockchain?: SmartWalletBlockchain): Buffer | null;
     getGasCost(msgTypeUrl: string): BigNumber;
     getGasPrice(denom: string): BigNumber;
     getFee(msgTypeUrl: string, denom?: string): BigNumber;

package/lib/wallet/CarbonWallet.js

@@ -10,11 +10,16 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CarbonWallet = void 0;
+const codec_1 = require("../codec");
+const auth_1 = require("../codec/cosmos/auth/v1beta1/auth");
+const web3_1 = require("../codec/ethermint/types/v1/web3");
 const constant_1 = require("../constant");
 const walletProvider_1 = require("../constant/walletProvider");
 const provider_1 = require("../provider");
 const util_1 = require("../util");
 const address_1 = require("../util/address");
+const blockchain_1 = require("../util/blockchain");
+const ethermint_1 = require("../util/ethermint");
 const fetch_1 = require("../util/fetch");
 const generic_1 = require("../util/generic");
 const number_1 = require("../util/number");
@@ -25,10 +30,6 @@ const tendermint_rpc_1 = require("@cosmjs/tendermint-rpc");
 const tx_2 = require("cosmjs-types/cosmos/tx/v1beta1/tx");
 const CarbonSigner_1 = require("./CarbonSigner");
 const CarbonSigningClient_1 = require("./CarbonSigningClient");
-const ethermint_1 = require("../util/ethermint");
-const web3_1 = require("../codec/ethermint/types/v1/web3");
-const auth_1 = require("../codec/cosmos/auth/v1beta1/auth");
-const codec_1 = require("../codec");
 class CarbonWallet {
     constructor(opts) {
         var _a, _b, _c, _d, _e;
@@ -426,9 +427,20 @@ class CarbonWallet {
     isSmartWalletEnabled() {
         return !!(this.mnemonic || this.privateKey);
     }
-    getSmartWalletPrivateKey() {
-        if (this.mnemonic)
-            return address_1.ETHAddress.mnemonicToPrivateKey(this.mnemonic);
+    getSmartWalletPrivateKey(blockchain = blockchain_1.SmartWalletBlockchain.Ethereum) {
+        if (this.mnemonic) {
+            switch (blockchain) {
+                case blockchain_1.SmartWalletBlockchain.Ethereum:
+                case blockchain_1.SmartWalletBlockchain.Arbitrum:
+                case blockchain_1.SmartWalletBlockchain.BinanceSmartChain:
+                case blockchain_1.SmartWalletBlockchain.Polygon:
+                    return address_1.ETHAddress.mnemonicToPrivateKey(this.mnemonic);
+                case blockchain_1.SmartWalletBlockchain.Neo:
+                    return address_1.NEOAddress.mnemonicToPrivateKey(this.mnemonic);
+                default:
+                    return null;
+            }
+        }
         if (this.privateKey)
             return this.privateKey;
         return null;

package/package.json

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