carbon-js-sdk 0.4.20 → 0.4.21

package/lib/util/eip712.js

@@ -0,0 +1,195 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.constructEIP712Tx = void 0;
+const eip712_1 = require("../constant/eip712");
+const ethermint_1 = require("../util/ethermint");
+const codec_1 = require("../codec");
+const AminoTypesMap_1 = __importDefault(require("../provider/amino/AminoTypesMap"));
+const lodash_1 = require("lodash");
+function getTypes(msgs) {
+    let types = Object.assign({}, eip712_1.DEFAULT_EIP712_TYPES);
+    const includedTypes = [];
+    let valueIndex = 0;
+    msgs.forEach((msg, index) => {
+        const typeUrl = AminoTypesMap_1.default.fromAmino(msg).typeUrl;
+        const msgType = msg.type.split('/')[1];
+        const msgTypeIndex = getLatestMsgTypeIndex(`Type${msgType}`, types);
+        //cosmos-sdk/MsgSend => TypeMsgSend1
+        const typeKey = `Type${msgType}${msgTypeIndex}`;
+        if (!includedTypes.includes(msg.type)) {
+            types['Tx'] = [...types['Tx'], { name: `msg${index}`, type: typeKey }];
+            types[typeKey] = [{ name: 'value', type: `TypeValue${valueIndex}` }, { name: 'type', type: 'string' }];
+            //cosmos-sdk/MsgSend => Msg_Send
+            types = Object.assign(Object.assign({}, types), sortByNameDescending(getMsgValueType(typeUrl, msg.value, `TypeValue${valueIndex}`, valueIndex, types)));
+            includedTypes.push(msg.type);
+            valueIndex++;
+            return;
+        }
+        const typeFound = matchingType(msg, types);
+        if (typeFound) {
+            types['Tx'] = [...types['Tx'], { name: `msg${index}`, type: typeFound }];
+            return;
+        }
+        //same type, but different fields populated, so new type defnition is required
+        types['Tx'] = [...types['Tx'], { name: `msg${index}`, type: typeKey }];
+        types[typeKey] = [{ name: 'value', type: `TypeValue${valueIndex}` }, { name: 'type', type: 'string' }];
+        types = Object.assign(Object.assign({}, types), sortByNameDescending(getMsgValueType(typeUrl, msg.value, `TypeValue${valueIndex}`, valueIndex, types)));
+        valueIndex++;
+    });
+    return types;
+}
+function getLatestMsgTypeIndex(typeName, types) {
+    let index = 0;
+    Object.entries(types).forEach(([key, _]) => {
+        if (key.includes(typeName)) {
+            index++;
+        }
+    });
+    return index;
+}
+function sortByNameDescending(types) {
+    Object.entries(types).forEach(([key, _]) => {
+        types[key].sort((a, b) => b.name.localeCompare(a.name));
+    });
+    return types;
+}
+// Checks if there is a need to create new type for the same message type because of different populated fields 
+function matchingType(msg, eipTypes) {
+    const msgType = msg.type.split('/')[1];
+    let match = false;
+    for (const key in eipTypes) {
+        if (key.includes(msgType)) {
+            match = compareValues(msg, key, eipTypes);
+        }
+        if (match) {
+            return key;
+        }
+    }
+    return '';
+}
+function compareValues(msg, key, eipTypes) {
+    let match = true;
+    for (let { name, type } of eipTypes[key]) {
+        if (Object.keys(msg).length > eipTypes[key].length) {
+            return false;
+        }
+        let value = msg[name];
+        if (!isNonZeroField(value)) {
+            return false;
+        }
+        const typeIsArray = type.includes('[]');
+        if (typeIsArray) {
+            type = type.split('[]')[0];
+            //Assumption: Take first value in array to determine which fields are populated
+            value = value[0];
+        }
+        if (eipTypes[type]) {
+            match = compareValues(value, type, eipTypes);
+        }
+    }
+    return match;
+}
+function getMsgValueType(msgTypeUrl, msgValue, msgTypeName, msgTypeIndex, types, objectName, nestedType = false, msgTypeDefinitions = {}) {
+    const packageName = msgTypeUrl.split(".").slice(0, -1).join(".");
+    const msgFieldType = msgTypeUrl.split(".").pop();
+    const typeName = getTypeName(msgTypeName, msgTypeIndex, objectName, nestedType, false);
+    const fieldsDefinition = codec_1.EIP712Types[packageName][msgFieldType];
+    if (isNonZeroField(msgValue)) {
+        if (!msgTypeDefinitions[typeName]) {
+            msgTypeDefinitions[typeName] = [];
+        }
+        fieldsDefinition.forEach(({ packageName, name, type }) => {
+            if (Array.isArray(msgValue) && msgValue.length === 0) {
+                msgTypeDefinitions[typeName] = [...msgTypeDefinitions[typeName], { name, type: 'string[]' }];
+                return;
+            }
+            //Assumption: Take first value in array to determine which fields are populated
+            const fieldValue = Array.isArray(msgValue) && msgValue.length > 0 ? msgValue[0][name] : msgValue[name];
+            if (isNonZeroField(fieldValue)) {
+                //For nested structs
+                if (packageName) {
+                    const isArray = type.includes('[]') ? true : false;
+                    // TypeValue0 --> Value
+                    const objectName = typeName.split('Type')[1].split(`${msgTypeIndex}`)[0];
+                    const nestedTypeName = `Type${objectName ? objectName : ''}${name.split('_').map((subName) => lodash_1.capitalize(subName)).join('')}`;
+                    const nestedMsgTypeIndex = getLatestMsgTypeIndex(nestedTypeName, types);
+                    const nestedType = getTypeName(name, nestedMsgTypeIndex, objectName, true, isArray);
+                    msgTypeDefinitions[typeName] = [...msgTypeDefinitions[typeName], { name, type: nestedType }];
+                    //Special logic if nested struct is google protobuf's Any type
+                    if (isGoogleProtobufAnyPackage(packageName, type)) {
+                        const nestedAnyTypeName = isArray ? nestedType.split('[]')[0].split(`${msgTypeIndex}`)[0] : nestedType.split(`${msgTypeIndex}`)[0];
+                        const nestedMsgTypeIndex = getLatestMsgTypeIndex(`${nestedAnyTypeName}Value`, types);
+                        const nestedAnyValueType = `${nestedAnyTypeName}Value${nestedMsgTypeIndex}`;
+                        msgTypeDefinitions[`${nestedAnyTypeName}${msgTypeIndex}`] = [{ name: "type", type: "string" }, { name: "value", type: nestedAnyValueType }];
+                        const anyObjectTypeNameSplit = nestedAnyTypeName.split('Type')[1].split(`${msgTypeIndex}`)[0];
+                        const messageTypeUrl = AminoTypesMap_1.default.fromAmino(fieldValue).typeUrl;
+                        getMsgValueType(messageTypeUrl, fieldValue.value, "value", nestedMsgTypeIndex, types, anyObjectTypeNameSplit, true, msgTypeDefinitions);
+                    }
+                    else {
+                        const typeStructName = type.includes('[]') ? type.split('[]')[0].split(`${nestedMsgTypeIndex}`)[0] : type.split(`${nestedMsgTypeIndex}`)[0];
+                        const messageTypeUrl = `${packageName}.${typeStructName}`;
+                        getMsgValueType(messageTypeUrl, fieldValue, name, nestedMsgTypeIndex, types, objectName, true, msgTypeDefinitions);
+                    }
+                }
+                else {
+                    msgTypeDefinitions[typeName] = [...msgTypeDefinitions[typeName], { name, type: getGjsonPrimitiveType(fieldValue) }];
+                }
+            }
+        });
+    }
+    return msgTypeDefinitions;
+}
+function getGjsonPrimitiveType(value) {
+    if (typeof value === 'number') {
+        return 'int64';
+    }
+    if (typeof value === 'boolean') {
+        return 'bool';
+    }
+    return 'string';
+}
+function getTypeName(name, index, objectName, nestedType = false, isArray = false) {
+    if (nestedType) {
+        return `Type${objectName ? objectName : ''}${name.split('_').map(subName => lodash_1.capitalize(subName)).join('')}${index}${isArray ? '[]' : ''}`;
+    }
+    return name;
+}
+function isGoogleProtobufAnyPackage(packageName, type) {
+    return packageName === '/google.protobuf' && type == 'Any';
+}
+function isNonZeroField(fieldValue) {
+    // zero fields are considered falsey,except if it is string "0"
+    if (fieldValue == "0" && typeof fieldValue !== "string") {
+        return false;
+    }
+    // empty arrays are considered truthy
+    if (Array.isArray(fieldValue)) {
+        return fieldValue.length !== 0;
+    }
+    // empty objects are considered truthy
+    if (fieldValue && typeof fieldValue === 'object' && Object.keys(fieldValue).length === 0) {
+        return false;
+    }
+    return fieldValue;
+}
+function constructEIP712Tx(doc) {
+    const { account_number, chain_id, fee, memo, sequence } = doc;
+    const eip712Tx = {
+        types: getTypes(doc.msgs),
+        primaryType: "Tx",
+        domain: Object.assign(Object.assign({}, eip712_1.DEFAULT_CARBON_DOMAIN_FIELDS), { chainId: ethermint_1.parseChainId(doc.chain_id) }),
+        message: Object.assign({ account_number, chain_id, fee, memo, sequence }, convertMsgs(doc.msgs))
+    };
+    return eip712Tx;
+}
+exports.constructEIP712Tx = constructEIP712Tx;
+function convertMsgs(msgs) {
+    const convertedMsgs = {};
+    msgs.forEach((msg, index) => {
+        convertedMsgs[`msg${index}`] = msg;
+    });
+    return convertedMsgs;
+}

package/lib/util/ethermint.d.ts

@@ -0,0 +1,8 @@
+import CarbonSDK from "../CarbonSDK";
+import { Any } from "../codec";
+import { ethers } from "ethers";
+export declare const ETH_SECP256K1_TYPE = "/ethermint.crypto.v1.ethsecp256k1.PubKey";
+export declare const PUBLIC_KEY_SIGNING_TEXT = "Sign your public key to merge your Carbon account: ";
+export declare function encodeAnyEthSecp256k1PubKey(pubkey: Uint8Array): Any;
+export declare function parseChainId(evmChainId: string): string;
+export declare function populateEvmTransactionDetails(api: CarbonSDK, req: ethers.providers.TransactionRequest): Promise<ethers.providers.TransactionRequest>;

package/lib/util/ethermint.js

@@ -0,0 +1,68 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.populateEvmTransactionDetails = exports.parseChainId = exports.encodeAnyEthSecp256k1PubKey = exports.PUBLIC_KEY_SIGNING_TEXT = exports.ETH_SECP256K1_TYPE = void 0;
+const codec_1 = require("../codec");
+const keys_1 = require("../codec/ethermint/crypto/v1/ethsecp256k1/keys");
+exports.ETH_SECP256K1_TYPE = '/ethermint.crypto.v1.ethsecp256k1.PubKey';
+exports.PUBLIC_KEY_SIGNING_TEXT = 'Sign your public key to merge your Carbon account: ';
+function encodeAnyEthSecp256k1PubKey(pubkey) {
+    const ethPubKey = keys_1.PubKey.fromPartial({
+        key: pubkey,
+    });
+    return codec_1.Any.fromPartial({
+        typeUrl: exports.ETH_SECP256K1_TYPE,
+        value: keys_1.PubKey.encode(ethPubKey).finish(),
+    });
+}
+exports.encodeAnyEthSecp256k1PubKey = encodeAnyEthSecp256k1PubKey;
+function parseChainId(evmChainId) {
+    const chainId = evmChainId.trim();
+    if (chainId.length > 48) {
+        throw new Error(`chain-id '${chainId}' cannot exceed 48 chars`);
+    }
+    if (!chainId.match(/^[a-z]+_\d+-\d+$/)) {
+        throw new Error(`chain-id '${chainId}' does not conform to the required format`);
+    }
+    return chainId.split("_")[1].split("-")[0];
+}
+exports.parseChainId = parseChainId;
+function populateEvmTransactionDetails(api, req) {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
+    return __awaiter(this, void 0, void 0, function* () {
+        const provider = api.evmJsonRpc;
+        const evmHexAddress = (_b = (_a = api.wallet) === null || _a === void 0 ? void 0 : _a.evmHexAddress) !== null && _b !== void 0 ? _b : '';
+        let request = {
+            to: (_c = req.to) !== null && _c !== void 0 ? _c : '',
+            from: (_d = req.from) !== null && _d !== void 0 ? _d : (_e = api.wallet) === null || _e === void 0 ? void 0 : _e.evmHexAddress,
+            nonce: (_f = req.nonce) !== null && _f !== void 0 ? _f : (yield provider.getTransactionCount(evmHexAddress)),
+            data: req.data,
+            value: `0x${Number(req.value).toString(16)}`,
+            chainId: (_g = req.chainId) !== null && _g !== void 0 ? _g : Number(parseChainId(yield ((_h = api.wallet) === null || _h === void 0 ? void 0 : _h.getEvmChainId()))),
+            // type = 0, 1 or 2 where 0 = legacyTx, 1 = AccessListTx, 2 = DynamicTx. Defaults to DynamicTx 
+            type: (_j = req.type) !== null && _j !== void 0 ? _j : 2,
+            accessList: req.accessList,
+        };
+        const gasLimit = (yield provider.estimateGas(request)).toHexString();
+        const gasFee = yield provider.getFeeData();
+        if (!req.gasPrice) {
+            // Dynamic Tx
+            return Object.assign(Object.assign({}, request), { maxPriorityFeePerGas: (_k = req.maxPriorityFeePerGas) !== null && _k !== void 0 ? _k : (_l = gasFee.maxPriorityFeePerGas) === null || _l === void 0 ? void 0 : _l.toHexString(), maxFeePerGas: (_m = req.maxFeePerGas) !== null && _m !== void 0 ? _m : (_o = gasFee.maxFeePerGas) === null || _o === void 0 ? void 0 : _o.toHexString(), gasLimit, type: 2 });
+        }
+        if (req.accessList) {
+            // AccessList Tx 
+            return Object.assign(Object.assign({}, request), { gasLimit, type: 1 });
+        }
+        // LegacyTx
+        return Object.assign(Object.assign({}, request), { gasLimit, type: 0 });
+    });
+}
+exports.populateEvmTransactionDetails = populateEvmTransactionDetails;

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/legacyEIP712.d.ts

@@ -0,0 +1,20 @@
+import { StdSignDoc } from "@cosmjs/amino/build";
+import { TypedDataDomain, TypedDataField } from "@ethersproject/abstract-signer";
+import { TypeUtils } from ".";
+import { Coin } from "@cosmjs/proto-signing";
+export interface LegacyEIP712Tx {
+    readonly types: TypeUtils.SimpleMap<TypedDataField[]>;
+    readonly primaryType: string;
+    readonly domain: TypedDataDomain;
+    readonly message: LegacyEIP712StdSignDoc;
+}
+export declare type EIP712Fee = {
+    readonly amount: readonly Coin[];
+    readonly gas: string;
+    readonly feePayer: string;
+};
+declare type LegacyEIP712StdSignDoc = StdSignDoc & {
+    fee: EIP712Fee;
+};
+export declare function legacyConstructEIP712Tx(doc: LegacyEIP712StdSignDoc): LegacyEIP712Tx;
+export {};

package/lib/util/legacyEIP712.js

@@ -0,0 +1,98 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.legacyConstructEIP712Tx = void 0;
+const eip712_1 = require("../constant/eip712");
+const ethermint_1 = require("../util/ethermint");
+const codec_1 = require("../codec");
+const AminoTypesMap_1 = __importDefault(require("../provider/amino/AminoTypesMap"));
+const lodash_1 = require("lodash");
+function getTypes(msgTypeUrl, aminoMsgValue) {
+    return Object.assign(Object.assign({}, eip712_1.LEGACY_DEFAULT_EIP712_TYPES), getMsgValueType(msgTypeUrl, aminoMsgValue, "MsgValue"));
+}
+function getMsgValueType(msgTypeUrl, msgValue, msgTypeName, objectName, nestedType = false, msgTypeDefinitions = {}) {
+    const packageName = msgTypeUrl.split(".").slice(0, -1).join(".");
+    const msgFieldType = msgTypeUrl.split(".").pop();
+    const typeName = getTypeName(msgTypeName, objectName, nestedType, false);
+    const fieldsDefinition = codec_1.EIP712Types[packageName][msgFieldType];
+    if (isNonZeroField(msgValue)) {
+        if (!msgTypeDefinitions[typeName]) {
+            msgTypeDefinitions[typeName] = [];
+        }
+        fieldsDefinition.forEach(({ packageName, name, type }) => {
+            let fieldValue;
+            if (Array.isArray(msgValue)) {
+                //Assumption: Take first value in array to determine which fields are populated
+                fieldValue = msgValue.length > 0 ? msgValue[0][name] : [];
+            }
+            else {
+                fieldValue = msgValue[name];
+            }
+            if (isNonZeroField(fieldValue)) {
+                //For nested structs
+                if (packageName) {
+                    const isArray = type.includes('[]') ? true : false;
+                    const objectName = typeName === 'MsgValue' ? 'MsgValue' : typeName.split('Type')[1];
+                    const nestedType = getTypeName(name, objectName, true, isArray);
+                    msgTypeDefinitions[typeName] = [...msgTypeDefinitions[typeName], { name, type: nestedType }];
+                    //Special logic if nested struct is google protobuf's Any type
+                    if (isGoogleProtobufAnyPackage(packageName, type)) {
+                        const nestedAnyTypeName = isArray ? nestedType.split('[]')[0] : nestedType;
+                        const nestedAnyValueType = `${nestedAnyTypeName}Value`;
+                        msgTypeDefinitions[nestedAnyTypeName] = [{ name: "type", type: "string" }, { name: "value", type: nestedAnyValueType }];
+                        const anyObjectTypeNameSplit = nestedAnyTypeName.split('Type')[1];
+                        const messageTypeUrl = AminoTypesMap_1.default.fromAmino(fieldValue).typeUrl;
+                        getMsgValueType(messageTypeUrl, fieldValue.value, "value", anyObjectTypeNameSplit, true, msgTypeDefinitions);
+                    }
+                    else {
+                        const typeStructName = type.includes('[]') ? type.split('[]')[0] : type;
+                        const messageTypeUrl = `${packageName}.${typeStructName}`;
+                        getMsgValueType(messageTypeUrl, fieldValue, name, objectName, true, msgTypeDefinitions);
+                    }
+                }
+                else {
+                    msgTypeDefinitions[typeName] = [...msgTypeDefinitions[typeName], { name, type }];
+                }
+            }
+        });
+    }
+    return msgTypeDefinitions;
+}
+function getTypeName(name, objectName, nestedType = false, isArray = false) {
+    if (nestedType) {
+        return `Type${objectName === 'MsgValue' ? '' : objectName}${name.split('_').map(subName => lodash_1.capitalize(subName)).join('')}${isArray ? '[]' : ''}`;
+    }
+    return name;
+}
+function isGoogleProtobufAnyPackage(packageName, type) {
+    return packageName === '/google.protobuf' && type == 'Any';
+}
+function isNonZeroField(fieldValue) {
+    // zero fields are considered falsey
+    if (fieldValue == "0") {
+        return false;
+    }
+    // empty arrays are considered truthy
+    if (Array.isArray(fieldValue)) {
+        return fieldValue.length !== 0;
+    }
+    // empty objects are considered truthy
+    if (fieldValue && typeof fieldValue === 'object' && Object.keys(fieldValue).length === 0) {
+        return false;
+    }
+    return fieldValue;
+}
+function legacyConstructEIP712Tx(doc) {
+    // Legacy EIP-712 can only accept batch msgs of the same type
+    const msg = doc.msgs[0];
+    const eip712Tx = {
+        types: getTypes(AminoTypesMap_1.default.fromAmino(msg).typeUrl, msg.value),
+        primaryType: "Tx",
+        domain: Object.assign(Object.assign({}, eip712_1.DEFAULT_CARBON_DOMAIN_FIELDS), { chainId: ethermint_1.parseChainId(doc.chain_id) }),
+        message: doc
+    };
+    return eip712Tx;
+}
+exports.legacyConstructEIP712Tx = legacyConstructEIP712Tx;

package/lib/util/number.js

@@ -18,26 +18,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

@@ -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((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

@@ -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 (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);
         });
@@ -99,7 +99,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 && {
@@ -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 = (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)],
             });
         });
     }
@@ -125,7 +125,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 = 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 = (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

@@ -150,7 +150,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 {
@@ -168,7 +168,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
                 throw new tx_1.CarbonTxError(`[${response.code}] ${response.rawLog}`, response);
             }
@@ -207,9 +207,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 });
@@ -343,12 +343,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);
             const shouldUnsubscribe = this.channelHandlers[channelId] !== undefined;
             delete this.channelHandlers[channelId];
             if (shouldUnsubscribe) {
@@ -281,7 +281,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.4.20",
+  "version": "0.4.21",
   "description": "TypeScript SDK for Carbon blockchain",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",