carbon-js-sdk 0.2.9 → 0.2.10

package/lib/util/address.js

@@ -96,13 +96,13 @@ const randomMnemonic = () => {
 };
 exports.randomMnemonic = randomMnemonic;
 const wifEncodePrivateKey = (privateKey, iter = 128) => {
-    const privateKeyBuf = (0, exports.stringOrBufferToBuffer)(privateKey);
+    const privateKeyBuf = exports.stringOrBufferToBuffer(privateKey);
     return wif.encode(iter, privateKeyBuf, true);
 };
 exports.wifEncodePrivateKey = wifEncodePrivateKey;
 exports.SWTHAddress = {
     newMnemonic: () => {
-        return (0, exports.randomMnemonic)();
+        return exports.randomMnemonic();
     },
     coinType: () => {
         return SWTH_COIN_TYPE;
@@ -112,10 +112,10 @@ exports.SWTHAddress = {
         return new BIP44Path(BIP44_PURPOSE, coinType).update(index, change, account).toArray();
     },
     publicKeyToScriptHash: (publicKey) => {
-        const pubKeyBuffer = (0, exports.stringOrBufferToBuffer)(publicKey);
+        const pubKeyBuffer = exports.stringOrBufferToBuffer(publicKey);
         const sha256Hash = ethers_1.ethers.utils.sha256(pubKeyBuffer);
         const ripemdHash = ethers_1.ethers.utils.ripemd160(sha256Hash);
-        return (0, generic_1.stripHexPrefix)(ripemdHash);
+        return generic_1.stripHexPrefix(ripemdHash);
     },
     publicKeyToAddress: (publicKey, opts) => {
         const scriptHash = exports.SWTHAddress.publicKeyToScriptHash(publicKey);
@@ -137,7 +137,7 @@ exports.SWTHAddress = {
         return privateKey;
     },
     privateToPublicKey: (privateKey) => {
-        const privateKeyBuff = (0, exports.stringOrBufferToBuffer)(privateKey);
+        const privateKeyBuff = exports.stringOrBufferToBuffer(privateKey);
         const publicKeyUint8Array = secp256k1.publicKeyCreate(privateKeyBuff, true);
         const publicKey = Buffer.from(publicKeyUint8Array);
         return publicKey;
@@ -148,7 +148,7 @@ exports.SWTHAddress = {
         return address;
     },
     encode: (hash, opts) => {
-        const hashBuff = (0, exports.stringOrBufferToBuffer)(hash, 'hex');
+        const hashBuff = exports.stringOrBufferToBuffer(hash, 'hex');
         const words = bech32.toWords(hashBuff.slice(0, 20));
         const addressPrefix = exports.SWTHAddress.getBech32Prefix(opts === null || opts === void 0 ? void 0 : opts.network, opts === null || opts === void 0 ? void 0 : opts.bech32Prefix, opts === null || opts === void 0 ? void 0 : opts.type);
         const address = bech32.encode(addressPrefix, words);
@@ -203,7 +203,7 @@ exports.NEOAddress = {
         ]);
         const sha256Hash = ethers_1.ethers.utils.sha256(addressScript);
         const ripemdHash = ethers_1.ethers.utils.ripemd160(sha256Hash);
-        return (0, generic_1.stripHexPrefix)(ripemdHash);
+        return generic_1.stripHexPrefix(ripemdHash);
     },
     publicKeyToAddress: (publicKey) => {
         const addressScript = exports.NEOAddress.publicKeyToScriptHash(publicKey);
@@ -211,7 +211,7 @@ exports.NEOAddress = {
         return address;
     },
     encodePublicKey: (unencodedPublicKey) => {
-        const unencPubKeyBuf = (0, exports.stringOrBufferToBuffer)(unencodedPublicKey);
+        const unencPubKeyBuf = exports.stringOrBufferToBuffer(unencodedPublicKey);
         if (unencPubKeyBuf.length <= 33) {
             // length indicates already encoded
             return unencPubKeyBuf;
@@ -236,7 +236,7 @@ exports.NEOAddress = {
         return privateKey;
     },
     privateToPublicKey: (privateKey) => {
-        const privateKeyBuff = (0, exports.stringOrBufferToBuffer)(privateKey);
+        const privateKeyBuff = exports.stringOrBufferToBuffer(privateKey);
         const publicKeyUint8Array = secp256r1.publicKeyCreate(privateKeyBuff, true);
         return Buffer.from(publicKeyUint8Array);
     },
@@ -254,7 +254,7 @@ exports.NEOAddress = {
     },
 };
 exports.N3Address = Object.assign(Object.assign({}, exports.NEOAddress), { publicKeyToScriptHash: (publicKey) => {
-        const publicKeyHex = (0, exports.stringOrBufferToBuffer)(publicKey).toString("hex");
+        const publicKeyHex = exports.stringOrBufferToBuffer(publicKey).toString("hex");
         return neon_core_next_1.wallet.getScriptHashFromPublicKey(publicKeyHex);
     }, publicKeyToAddress: (publicKey) => {
         const addressScript = exports.N3Address.publicKeyToScriptHash(publicKey);
@@ -280,11 +280,11 @@ exports.ETHAddress = {
         return ethers_1.ethers.utils.keccak256(encodedPublicKey);
     },
     publicKeyToAddress: (publicKey) => {
-        const publicKeyBuff = (0, exports.stringOrBufferToBuffer)(publicKey);
+        const publicKeyBuff = exports.stringOrBufferToBuffer(publicKey);
         return ethers_1.ethers.utils.computeAddress(publicKeyBuff);
     },
     encodePublicKey: (unencodedPublicKey) => {
-        const unencodedPublicKeyBuff = (0, exports.stringOrBufferToBuffer)(unencodedPublicKey);
+        const unencodedPublicKeyBuff = exports.stringOrBufferToBuffer(unencodedPublicKey);
         const publicKey = ethers_1.ethers.utils.computePublicKey(unencodedPublicKeyBuff, true);
         return Buffer.from(publicKey, "hex");
     },
@@ -296,7 +296,7 @@ exports.ETHAddress = {
         return Buffer.from((_a = wallet.privateKey) === null || _a === void 0 ? void 0 : _a.replace(/^0x/, ""), "hex");
     },
     privateToPublicKey: (privateKey) => {
-        const privateKeyBuff = (0, exports.stringOrBufferToBuffer)(privateKey);
+        const privateKeyBuff = exports.stringOrBufferToBuffer(privateKey);
         return Buffer.from(ethers_1.ethers.utils.computePublicKey(privateKeyBuff).replace(/^0x/, ""), "hex");
     },
     privateKeyToAddress: (privateKey) => {

package/lib/util/api.js

@@ -84,7 +84,7 @@ class HTTP {
          * Executes HTTP GET request with fetch
          */
         this.get = ({ url, headers }) => {
-            return (0, fetch_1.fetch)(url, {
+            return fetch_1.fetch(url, {
                 method: 'GET',
                 headers,
             });
@@ -93,7 +93,7 @@ class HTTP {
          * Executes HTTP POST request with fetch
          */
         this.post = (options) => {
-            return (0, fetch_1.fetch)(options.url, {
+            return fetch_1.fetch(options.url, {
                 method: 'POST',
                 headers: Object.assign({ 'Content-Type': options.content_type || 'application/json' }, options.headers),
                 body: JSON.stringify(options.body),
@@ -103,7 +103,7 @@ class HTTP {
          * Executes HTTP DELETE request with fetch
          */
         this.del = (options) => {
-            return (0, fetch_1.fetch)(options.url, {
+            return fetch_1.fetch(options.url, {
                 method: 'DELETE',
                 headers: Object.assign({ 'Content-Type': options.content_type || 'application/json' }, options.headers),
                 body: JSON.stringify(options.body),
@@ -114,7 +114,7 @@ class HTTP {
          */
         this.raw = (options) => {
             const { url } = options, otherOpts = __rest(options, ["url"]);
-            return (0, fetch_1.fetch)(url, otherOpts);
+            return fetch_1.fetch(url, otherOpts);
         };
         this.apiPrefix = apiPrefix;
         this.apiEndpoints = apiEndpoints;

package/lib/util/fetch.js

@@ -10,7 +10,7 @@ function fetch(url, init) {
         return window.fetch(url, Object.assign({}, init));
     }
     else {
-        return (0, node_fetch_1.default)(url, init);
+        return node_fetch_1.default(url, init);
     }
 }
 exports.fetch = fetch;

package/lib/util/generic.js

@@ -22,7 +22,7 @@ const overrideConfig = (defaults, override) => {
             continue;
         if (typeof member === "object") {
             // @ts-ignore
-            result[key] = (0, exports.overrideConfig)(result[key], member);
+            result[key] = exports.overrideConfig(result[key], member);
         }
         else {
             // @ts-ignore
@@ -41,7 +41,7 @@ const sortObject = (input) => {
     Object.keys(input)
         .sort()
         // @ts-ignore noImplicitAny
-        .forEach((key) => (output[key] = (0, exports.sortObject)(input[key])));
+        .forEach((key) => (output[key] = exports.sortObject(input[key])));
     return output;
 };
 exports.sortObject = sortObject;
@@ -56,7 +56,7 @@ exports.appendHexPrefix = appendHexPrefix;
 const computeTxHash = (bytes) => {
     if (!bytes)
         return bytes;
-    return (0, exports.toTxHash)((0, crypto_1.sha256)(bytes));
+    return exports.toTxHash(crypto_1.sha256(bytes));
 };
 exports.computeTxHash = computeTxHash;
 const toTxHash = (bytes) => {

package/lib/util/number.js

@@ -17,26 +17,26 @@ const parseBN = (input, defaultValue) => {
 };
 exports.parseBN = parseBN;
 const bnOrZero = (input, defaultValue = exports.BN_ZERO) => {
-    return (0, exports.parseBN)(input, defaultValue);
+    return exports.parseBN(input, defaultValue);
 };
 exports.bnOrZero = bnOrZero;
 const toHuman = (value, decimals) => {
     if (value === undefined || value === null)
         return undefined;
-    const valueBN = (0, exports.bnOrZero)(value);
+    const valueBN = exports.bnOrZero(value);
     if (!decimals)
         return valueBN; // decimals = 0 or nullish
-    const decimalsBN = (0, exports.bnOrZero)(decimals);
+    const decimalsBN = exports.bnOrZero(decimals);
     return valueBN.shiftedBy(decimalsBN.negated().toNumber());
 };
 exports.toHuman = toHuman;
 const toUnitless = (value, decimals) => {
     if (value === undefined || value === null)
         return undefined;
-    const valueBN = (0, exports.bnOrZero)(value);
+    const valueBN = exports.bnOrZero(value);
     if (!decimals)
         return valueBN; // decimals = 0 or nullish
-    const decimalsBN = (0, exports.bnOrZero)(decimals);
+    const decimalsBN = exports.bnOrZero(decimals);
     return valueBN.shiftedBy(decimalsBN.toNumber());
 };
 exports.toUnitless = toUnitless;

package/lib/wallet/CarbonSigner.js

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

package/lib/wallet/CarbonSigningClient.js

@@ -62,7 +62,7 @@ class CarbonSigningClient extends stargate_1.StargateClient {
      */
     sign(signerAddress, messages, fee, memo, signerData) {
         return __awaiter(this, void 0, void 0, function* () {
-            return (0, proto_signing_1.isOfflineDirectSigner)(this.signer)
+            return proto_signing_1.isOfflineDirectSigner(this.signer)
                 ? this.signDirect(signerAddress, messages, fee, memo, signerData)
                 : this.signAmino(signerAddress, messages, fee, memo, signerData);
         });
@@ -74,7 +74,7 @@ class CarbonSigningClient extends stargate_1.StargateClient {
             if (!accountFromSigner) {
                 throw new Error("Failed to retrieve account from signer");
             }
-            const pubkey = (0, proto_signing_1.encodePubkey)((0, amino_1.encodeSecp256k1Pubkey)(accountFromSigner.pubkey));
+            const pubkey = proto_signing_1.encodePubkey(amino_1.encodeSecp256k1Pubkey(accountFromSigner.pubkey));
             const txBodyEncodeObject = {
                 typeUrl: "/cosmos.tx.v1beta1.TxBody",
                 value: Object.assign({ messages: messages, memo: memo }, timeoutHeight && {
@@ -83,13 +83,13 @@ class CarbonSigningClient extends stargate_1.StargateClient {
             };
             const txBodyBytes = this.registry.encode(txBodyEncodeObject);
             const gasLimit = math_1.Int53.fromString(fee.gas).toNumber();
-            const authInfoBytes = (0, proto_signing_1.makeAuthInfoBytes)([{ pubkey, sequence }], fee.amount, gasLimit);
-            const signDoc = (0, proto_signing_1.makeSignDoc)(txBodyBytes, authInfoBytes, chainId, accountNumber);
+            const authInfoBytes = proto_signing_1.makeAuthInfoBytes([{ pubkey, sequence }], fee.amount, gasLimit);
+            const signDoc = 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: [(0, encoding_1.fromBase64)(signature.signature)],
+                signatures: [encoding_1.fromBase64(signature.signature)],
             });
         });
     }
@@ -100,7 +100,7 @@ class CarbonSigningClient extends stargate_1.StargateClient {
             if (!accountFromSigner) {
                 throw new Error("Failed to retrieve account from signer");
             }
-            const pubkey = (0, proto_signing_1.encodePubkey)((0, amino_1.encodeSecp256k1Pubkey)(accountFromSigner.pubkey));
+            const pubkey = proto_signing_1.encodePubkey(amino_1.encodeSecp256k1Pubkey(accountFromSigner.pubkey));
             const signMode = signing_1.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);
@@ -115,11 +115,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 = (0, proto_signing_1.makeAuthInfoBytes)([{ pubkey, sequence: signedSequence }], signed.fee.amount, signedGasLimit, signMode);
+            const signedAuthInfoBytes = proto_signing_1.makeAuthInfoBytes([{ pubkey, sequence: signedSequence }], signed.fee.amount, signedGasLimit, signMode);
             return tx_1.TxRaw.fromPartial({
                 bodyBytes: signedTxBodyBytes,
                 authInfoBytes: signedAuthInfoBytes,
-                signatures: [(0, encoding_1.fromBase64)(signature.signature)],
+                signatures: [encoding_1.fromBase64(signature.signature)],
             });
         });
     }

package/lib/wallet/CarbonWallet.js

@@ -148,7 +148,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 = (0, amino_1.encodeSecp256k1Signature)(account.pubkey, txRaw.signatures[0]);
+                signature = amino_1.encodeSecp256k1Signature(account.pubkey, txRaw.signatures[0]);
                 return txRaw;
             }
             finally {
@@ -166,7 +166,7 @@ class CarbonWallet {
             const tx = CarbonWallet.TxRaw.encode(txRaw).finish();
             const carbonClient = this.getSigningClient();
             const response = yield carbonClient.broadcastTx(tx, timeoutMs, pollIntervalMs);
-            if ((0, stargate_1.isDeliverTxFailure)(response)) {
+            if (stargate_1.isDeliverTxFailure(response)) {
                 // tx failed
                 console.error(response);
                 throw new Error(`[${response.code}] ${response.rawLog}`);
@@ -206,9 +206,9 @@ class CarbonWallet {
             try {
                 if (!this.accountInfo || this.sequenceInvalidated)
                     yield this.reloadAccountSequence();
-                const heightResponse = yield (0, fetch_1.fetch)(`${this.networkConfig.tmRpcUrl}/blockchain?cache=${new Date().getTime()}`);
+                const heightResponse = yield fetch_1.fetch(`${this.networkConfig.tmRpcUrl}/blockchain?cache=${new Date().getTime()}`);
                 const heightRes = yield heightResponse.json();
-                const height = (0, number_1.bnOrZero)((_a = heightRes.result) === null || _a === void 0 ? void 0 : _a.last_height);
+                const height = 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 });
@@ -342,12 +342,12 @@ class CarbonWallet {
             const queryClient = this.getQueryClient();
             const { msgGasCosts } = yield queryClient.fee.MsgGasCostAll({});
             this.txGasCosts = msgGasCosts.reduce((result, item) => {
-                result[item.msgType] = (0, number_1.bnOrZero)(item.gasCost);
+                result[item.msgType] = number_1.bnOrZero(item.gasCost);
                 return result;
             }, {});
             const { minGasPrices } = yield queryClient.fee.MinGasPriceAll({});
             this.txGasPrices = minGasPrices.reduce((result, item) => {
-                result[item.denom] = (0, number_1.bnOrZero)(item.gasPrice).shiftedBy(-18); // sdk.Dec shifting
+                result[item.denom] = 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 = (0, channel_1.generateChannelId)(param);
+            const channelId = 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 = (0, channel_1.generateChannelId)(param);
+            const channelId = channel_1.generateChannelId(param);
             delete this.channelHandlers[channelId];
         }
         this.send('unsubscribe', {
@@ -279,7 +279,7 @@ class WSConnector {
             if (!channelHandler) {
                 this.debugLog(`handler not found for channel: ${message.channel}`);
                 try {
-                    const params = (0, channel_1.parseChannelId)(message.channel);
+                    const params = 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.2.9",
+  "version": "0.2.10",
   "description": "TypeScript SDK for Carbon blockchain",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -38,6 +38,7 @@
   "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",
     "@cosmjs/proto-signing": "^0.28.10",
     "@cosmjs/stargate": "^0.28.10",