carbon-js-sdk 0.3.20 → 0.3.21

package/lib/wallet/CarbonSigner.js

@@ -106,9 +106,9 @@ class CarbonLedgerSigner {
         return __awaiter(this, void 0, void 0, function* () {
             const account = yield this.retrieveAccount();
             const { pubkey } = account;
-            const msg = JSON.stringify(generic_1.sortObject(doc));
+            const msg = JSON.stringify((0, generic_1.sortObject)(doc));
             const signBytes = yield this.ledger.sign(msg);
-            const signature = amino_1.encodeSecp256k1Signature(pubkey, signBytes);
+            const signature = (0, amino_1.encodeSecp256k1Signature)(pubkey, signBytes);
             return {
                 signed: doc,
                 signature,

package/lib/wallet/CarbonSigningClient.js

@@ -87,7 +87,7 @@ class CarbonSigningClient extends stargate_1.StargateClient {
      */
     sign(signerAddress, messages, fee, memo, signerData) {
         return __awaiter(this, void 0, void 0, function* () {
-            return proto_signing_1.isOfflineDirectSigner(this.signer)
+            return (0, proto_signing_1.isOfflineDirectSigner)(this.signer)
                 ? this.signDirect(signerAddress, messages, fee, memo, signerData)
                 : this.signAmino(signerAddress, messages, fee, memo, signerData);
         });
@@ -99,7 +99,7 @@ class CarbonSigningClient extends stargate_1.StargateClient {
             if (!accountFromSigner) {
                 throw new Error("Failed to retrieve account from signer");
             }
-            const pubkey = proto_signing_1.encodePubkey(amino_1.encodeSecp256k1Pubkey(accountFromSigner.pubkey));
+            const pubkey = (0, proto_signing_1.encodePubkey)((0, amino_1.encodeSecp256k1Pubkey)(accountFromSigner.pubkey));
             const txBodyEncodeObject = {
                 typeUrl: "/cosmos.tx.v1beta1.TxBody",
                 value: Object.assign({ messages: messages, memo: memo }, timeoutHeight && {
@@ -108,13 +108,13 @@ class CarbonSigningClient extends stargate_1.StargateClient {
             };
             const txBodyBytes = this.registry.encode(txBodyEncodeObject);
             const gasLimit = math_1.Int53.fromString(fee.gas).toNumber();
-            const authInfoBytes = proto_signing_1.makeAuthInfoBytes([{ pubkey, sequence }], fee.amount, gasLimit);
-            const signDoc = proto_signing_1.makeSignDoc(txBodyBytes, authInfoBytes, chainId, accountNumber);
+            const authInfoBytes = (0, proto_signing_1.makeAuthInfoBytes)([{ pubkey, sequence }], fee.amount, gasLimit);
+            const signDoc = (0, proto_signing_1.makeSignDoc)(txBodyBytes, authInfoBytes, chainId, accountNumber);
             const { signature, signed } = yield signer.signDirect(signerAddress, signDoc);
             return tx_1.TxRaw.fromPartial({
                 bodyBytes: signed.bodyBytes,
                 authInfoBytes: signed.authInfoBytes,
-                signatures: [encoding_1.fromBase64(signature.signature)],
+                signatures: [(0, encoding_1.fromBase64)(signature.signature)],
             });
         });
     }
@@ -125,7 +125,7 @@ class CarbonSigningClient extends stargate_1.StargateClient {
             if (!accountFromSigner) {
                 throw new Error("Failed to retrieve account from signer");
             }
-            const pubkey = proto_signing_1.encodePubkey(amino_1.encodeSecp256k1Pubkey(accountFromSigner.pubkey));
+            const pubkey = (0, proto_signing_1.encodePubkey)((0, amino_1.encodeSecp256k1Pubkey)(accountFromSigner.pubkey));
             const signMode = SignMode.SIGN_MODE_LEGACY_AMINO_JSON;
             const msgs = messages.map((msg) => this.aminoTypes.toAmino(msg));
             const signDoc = makeSignDocAmino(msgs, fee, chainId, memo, accountNumber, sequence, timeoutHeight !== null && timeoutHeight !== void 0 ? timeoutHeight : 0);
@@ -140,11 +140,11 @@ class CarbonSigningClient extends stargate_1.StargateClient {
             const signedTxBodyBytes = this.registry.encode(signedTxBodyEncodeObject);
             const signedGasLimit = math_1.Int53.fromString(signed.fee.gas).toNumber();
             const signedSequence = math_1.Int53.fromString(signed.sequence).toNumber();
-            const signedAuthInfoBytes = proto_signing_1.makeAuthInfoBytes([{ pubkey, sequence: signedSequence }], signed.fee.amount, signedGasLimit, signMode);
+            const signedAuthInfoBytes = (0, proto_signing_1.makeAuthInfoBytes)([{ pubkey, sequence: signedSequence }], signed.fee.amount, signedGasLimit, signMode);
             return tx_1.TxRaw.fromPartial({
                 bodyBytes: signedTxBodyBytes,
                 authInfoBytes: signedAuthInfoBytes,
-                signatures: [encoding_1.fromBase64(signature.signature)],
+                signatures: [(0, encoding_1.fromBase64)(signature.signature)],
             });
         });
     }

package/lib/wallet/CarbonWallet.d.ts

@@ -10,7 +10,9 @@ import { EncodeObject, OfflineDirectSigner, OfflineSigner } from "@cosmjs/proto-
 import { Account, DeliverTxResponse } from "@cosmjs/stargate";
 import { Tendermint34Client } from "@cosmjs/tendermint-rpc";
 import { BroadcastTxSyncResponse } from "@cosmjs/tendermint-rpc/build/tendermint34/responses";
+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";
@@ -101,6 +103,7 @@ export declare class CarbonWallet {
     static withLedger(cosmosLedger: CosmosLedger, publicKeyBase64: string, opts?: Omit<CarbonWalletInitOpts, "signer">): CarbonWallet;
     static withSigner(signer: CarbonSigner, publicKeyBase64: string, opts?: Omit<CarbonWalletInitOpts, "signer">): CarbonWallet;
     static withKeplr(keplr: Keplr, chainInfo: ChainInfo, keplrKey: Key, opts?: Omit<CarbonWalletInitOpts, "signer">): CarbonWallet;
+    static withLeap(leap: Leap, chainId: string, leapKey: LeapKey, opts?: Omit<CarbonWalletInitOpts, "signer">): CarbonWallet;
     static withAddress(bech32Address: string, opts?: Partial<CarbonWalletInitOpts>): CarbonWallet;
     initialize(queryClient: CarbonQueryClient): Promise<CarbonWallet>;
     updateNetwork(network: Network): CarbonWallet;

package/lib/wallet/CarbonWallet.js

@@ -115,6 +115,12 @@ class CarbonWallet {
         const wallet = CarbonWallet.withSigner(signer, publicKeyBase64, opts);
         return wallet;
     }
+    static withLeap(leap, chainId, leapKey, opts = {}) {
+        const signer = provider_1.LeapAccount.createLeapSigner(leap, chainId);
+        const publicKeyBase64 = Buffer.from(leapKey.pubKey).toString("base64");
+        const wallet = CarbonWallet.withSigner(signer, publicKeyBase64, opts);
+        return wallet;
+    }
     static withAddress(bech32Address, opts = {}) {
         return new CarbonWallet(Object.assign(Object.assign({}, opts), { bech32Address }));
     }
@@ -148,7 +154,7 @@ class CarbonWallet {
                 const signerData = Object.assign({ accountNumber: this.accountInfo.accountNumber, chainId: this.getChainId(), sequence }, explicitSignerData);
                 const fee = (_a = opts === null || opts === void 0 ? void 0 : opts.fee) !== null && _a !== void 0 ? _a : this.estimateTxFee(messages, feeDenom);
                 const txRaw = yield signingClient.sign(signerAddress, messages, fee, memo, signerData);
-                signature = amino_1.encodeSecp256k1Signature(account.pubkey, txRaw.signatures[0]);
+                signature = (0, amino_1.encodeSecp256k1Signature)(account.pubkey, txRaw.signatures[0]);
                 return txRaw;
             }
             finally {
@@ -166,7 +172,7 @@ class CarbonWallet {
             const tx = CarbonWallet.TxRaw.encode(txRaw).finish();
             const carbonClient = this.getSigningClient();
             const response = yield carbonClient.broadcastTx(tx, timeoutMs, pollIntervalMs);
-            if (stargate_1.isDeliverTxFailure(response)) {
+            if ((0, stargate_1.isDeliverTxFailure)(response)) {
                 // tx failed
                 throw new tx_1.CarbonTxError(`[${response.code}] ${response.rawLog}`, response);
             }
@@ -205,9 +211,9 @@ class CarbonWallet {
             try {
                 if (!this.accountInfo || this.sequenceInvalidated)
                     yield this.reloadAccountSequence();
-                const heightResponse = yield fetch_1.fetch(`${this.networkConfig.tmRpcUrl}/blockchain?cache=${new Date().getTime()}`);
+                const heightResponse = yield (0, fetch_1.fetch)(`${this.networkConfig.tmRpcUrl}/blockchain?cache=${new Date().getTime()}`);
                 const heightRes = yield heightResponse.json();
-                const height = number_1.bnOrZero((_a = heightRes.result) === null || _a === void 0 ? void 0 : _a.last_height);
+                const height = (0, number_1.bnOrZero)((_a = heightRes.result) === null || _a === void 0 ? void 0 : _a.last_height);
                 const timeoutHeight = height.isZero() ? undefined : height.toNumber() + this.defaultTimeoutBlocks;
                 const sequence = this.accountInfo.sequence;
                 this.accountInfo = Object.assign(Object.assign({}, this.accountInfo), { sequence: sequence + 1 });
@@ -341,12 +347,12 @@ class CarbonWallet {
             const queryClient = this.getQueryClient();
             const { msgGasCosts } = yield queryClient.fee.MsgGasCostAll({});
             this.txGasCosts = msgGasCosts.reduce((result, item) => {
-                result[item.msgType] = number_1.bnOrZero(item.gasCost);
+                result[item.msgType] = (0, number_1.bnOrZero)(item.gasCost);
                 return result;
             }, {});
             const { minGasPrices } = yield queryClient.fee.MinGasPriceAll({});
             this.txGasPrices = minGasPrices.reduce((result, item) => {
-                result[item.denom] = number_1.bnOrZero(item.gasPrice).shiftedBy(-18); // sdk.Dec shifting
+                result[item.denom] = (0, number_1.bnOrZero)(item.gasPrice).shiftedBy(-18); // sdk.Dec shifting
                 return result;
             }, {});
             if (!this.txGasPrices[this.defaultFeeDenom]) {

package/lib/websocket/connector.js

@@ -171,7 +171,7 @@ class WSConnector {
             params = [params]; // eslint-disable-line no-param-reassign
         }
         for (const param of params) {
-            const channelId = channel_1.generateChannelId(param);
+            const channelId = (0, channel_1.generateChannelId)(param);
             const shouldSubscribe = this.channelHandlers[channelId] === undefined;
             this.channelHandlers[channelId] = handler;
             if (shouldSubscribe) {
@@ -193,7 +193,7 @@ class WSConnector {
         }
         const channelIds = [];
         for (const param of params) {
-            const channelId = channel_1.generateChannelId(param);
+            const channelId = (0, channel_1.generateChannelId)(param);
             const shouldUnsubscribe = this.channelHandlers[channelId] !== undefined;
             delete this.channelHandlers[channelId];
             if (shouldUnsubscribe) {
@@ -283,7 +283,7 @@ class WSConnector {
             if (!channelHandler) {
                 this.debugLog(`handler not found for channel: ${message.channel}`);
                 try {
-                    const params = channel_1.parseChannelId(message.channel);
+                    const params = (0, channel_1.parseChannelId)(message.channel);
                     this.unsubscribe({ channel: params.channel });
                 }
                 catch (error) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "carbon-js-sdk",
-  "version": "0.3.20",
+  "version": "0.3.21",
   "description": "TypeScript SDK for Carbon blockchain",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -38,13 +38,14 @@
   "dependencies": {
     "@cityofzion/neon-api": "^4.9.0",
     "@cityofzion/neon-core": "^4.9.0",
-    "@cityofzion/neon-js": "^4.9.0",
     "@cityofzion/neon-core-next": "npm:@cityofzion/neon-core@^5.0.0",
+    "@cityofzion/neon-js": "^4.9.0",
     "@cosmjs/proto-signing": "^0.28.10",
     "@cosmjs/stargate": "^0.28.10",
+    "@cosmos-kit/leap": "^0.13.14",
     "@grpc/grpc-js": "^1.3.2",
-    "@keplr-wallet/stores": "~0.9.12",
-    "@keplr-wallet/types": "~0.9.12",
+    "@keplr-wallet/stores": "^0.10.24",
+    "@keplr-wallet/types": "^0.10.24",
     "@ledgerhq/hw-app-eth": "^6.11.2",
     "@ledgerhq/hw-transport": "^6.3.0",
     "@ledgerhq/hw-transport-webhid": "^6.4.1",
@@ -58,6 +59,7 @@
     "dayjs": "^1.10.5",
     "eth-sig-util": "^3.0.0",
     "ethers": "^5.5.1",
+    "eventemitter3": "^5.0.0",
     "ledger-cosmos-js": "^2.1.8",
     "lodash": "^4.17.21",
     "neo-dapi": "^2.0.4",
@@ -67,6 +69,7 @@
     "ripemd160": "^2.0.2",
     "secp256k1": "^4.0.2",
     "secp256r1": "^0.0.3",
+    "semver": "^7.3.7",
     "tsc-alias": "^1.2.11",
     "typescript": "^4.3.5",
     "wif": "^2.0.6"
@@ -80,6 +83,7 @@
     "@types/node-fetch": "^2.5.12",
     "@types/ripemd160": "^2.0.0",
     "@types/secp256k1": "^4.0.2",
+    "@types/semver": "^7.3.13",
     "@types/w3c-web-hid": "^1.0.2",
     "@types/w3c-web-usb": "^1.0.5",
     "@types/websocket": "^1.0.4",