@firmachain/firma-js 0.2.21 → 0.2.25

package/dist/sdk/FirmaTokenService.js

@@ -44,7 +44,7 @@ var TokenService = /** @class */ (function () {
         this.config = config;
     }
     TokenService.prototype.getGasEstimationCreateToken = function (wallet, tokenName, tokenSymbol, tokenURI, totalSupply, decimal, isMintable, isBurnable, txMisc) {
-        if (txMisc === void 0) { txMisc = token_1.DefaultTxMisc; }
+        if (txMisc === void 0) { txMisc = FirmaUtil_1.DefaultTxMisc; }
         return __awaiter(this, void 0, void 0, function () {
             var newTotalSupply, txRaw, error_1;
             return __generator(this, function (_a) {
@@ -67,7 +67,7 @@ var TokenService = /** @class */ (function () {
         });
     };
     TokenService.prototype.getGasEstimationMint = function (wallet, tokenID, amount, decimal, toAddress, txMisc) {
-        if (txMisc === void 0) { txMisc = token_1.DefaultTxMisc; }
+        if (txMisc === void 0) { txMisc = FirmaUtil_1.DefaultTxMisc; }
         return __awaiter(this, void 0, void 0, function () {
             var newAmount, txRaw, error_2;
             return __generator(this, function (_a) {
@@ -90,7 +90,7 @@ var TokenService = /** @class */ (function () {
         });
     };
     TokenService.prototype.getGasEstimationBurn = function (wallet, tokenID, amount, decimal, txMisc) {
-        if (txMisc === void 0) { txMisc = token_1.DefaultTxMisc; }
+        if (txMisc === void 0) { txMisc = FirmaUtil_1.DefaultTxMisc; }
         return __awaiter(this, void 0, void 0, function () {
             var newAmount, txRaw, error_3;
             return __generator(this, function (_a) {
@@ -113,7 +113,7 @@ var TokenService = /** @class */ (function () {
         });
     };
     TokenService.prototype.getGasEstimationUpdateTokenURI = function (wallet, tokenID, tokenURI, txMisc) {
-        if (txMisc === void 0) { txMisc = token_1.DefaultTxMisc; }
+        if (txMisc === void 0) { txMisc = FirmaUtil_1.DefaultTxMisc; }
         return __awaiter(this, void 0, void 0, function () {
             var txRaw, error_4;
             return __generator(this, function (_a) {
@@ -135,7 +135,7 @@ var TokenService = /** @class */ (function () {
         });
     };
     TokenService.prototype.getSignedTxUpdateTokenURI = function (wallet, tokenID, tokenURI, txMisc) {
-        if (txMisc === void 0) { txMisc = token_1.DefaultTxMisc; }
+        if (txMisc === void 0) { txMisc = FirmaUtil_1.DefaultTxMisc; }
         return __awaiter(this, void 0, void 0, function () {
             var address, txClient, message, error_5;
             return __generator(this, function (_a) {
@@ -151,7 +151,7 @@ var TokenService = /** @class */ (function () {
                             tokenID: tokenID,
                             tokenURI: tokenURI
                         });
-                        return [4 /*yield*/, txClient.sign([message], token_1.getSignAndBroadcastOption(this.config.denom, txMisc))];
+                        return [4 /*yield*/, txClient.sign([message], FirmaUtil_1.getSignAndBroadcastOption(this.config.denom, txMisc))];
                     case 2: return [2 /*return*/, _a.sent()];
                     case 3:
                         error_5 = _a.sent();
@@ -163,7 +163,7 @@ var TokenService = /** @class */ (function () {
         });
     };
     TokenService.prototype.getSignedTxBurn = function (wallet, tokenID, amount, txMisc) {
-        if (txMisc === void 0) { txMisc = token_1.DefaultTxMisc; }
+        if (txMisc === void 0) { txMisc = FirmaUtil_1.DefaultTxMisc; }
         return __awaiter(this, void 0, void 0, function () {
             var address, txClient, message, error_6;
             return __generator(this, function (_a) {
@@ -179,7 +179,7 @@ var TokenService = /** @class */ (function () {
                             tokenID: tokenID,
                             amount: amount
                         });
-                        return [4 /*yield*/, txClient.sign([message], token_1.getSignAndBroadcastOption(this.config.denom, txMisc))];
+                        return [4 /*yield*/, txClient.sign([message], FirmaUtil_1.getSignAndBroadcastOption(this.config.denom, txMisc))];
                     case 2: return [2 /*return*/, _a.sent()];
                     case 3:
                         error_6 = _a.sent();
@@ -191,7 +191,7 @@ var TokenService = /** @class */ (function () {
         });
     };
     TokenService.prototype.getSignedTxMint = function (wallet, tokenID, amount, toAddress, txMisc) {
-        if (txMisc === void 0) { txMisc = token_1.DefaultTxMisc; }
+        if (txMisc === void 0) { txMisc = FirmaUtil_1.DefaultTxMisc; }
         return __awaiter(this, void 0, void 0, function () {
             var address, txClient, message, error_7;
             return __generator(this, function (_a) {
@@ -208,7 +208,7 @@ var TokenService = /** @class */ (function () {
                             amount: amount,
                             toAddress: toAddress
                         });
-                        return [4 /*yield*/, txClient.sign([message], token_1.getSignAndBroadcastOption(this.config.denom, txMisc))];
+                        return [4 /*yield*/, txClient.sign([message], FirmaUtil_1.getSignAndBroadcastOption(this.config.denom, txMisc))];
                     case 2: return [2 /*return*/, _a.sent()];
                     case 3:
                         error_7 = _a.sent();
@@ -220,7 +220,7 @@ var TokenService = /** @class */ (function () {
         });
     };
     TokenService.prototype.getSignedTxCreateToken = function (wallet, tokenName, tokenSymbol, tokenURI, totalSupply, decimal, isMintable, isBurnable, txMisc) {
-        if (txMisc === void 0) { txMisc = token_1.DefaultTxMisc; }
+        if (txMisc === void 0) { txMisc = FirmaUtil_1.DefaultTxMisc; }
         return __awaiter(this, void 0, void 0, function () {
             var address, txClient, message, error_8;
             return __generator(this, function (_a) {
@@ -241,7 +241,7 @@ var TokenService = /** @class */ (function () {
                             mintable: isMintable,
                             burnable: isBurnable
                         });
-                        return [4 /*yield*/, txClient.sign([message], token_1.getSignAndBroadcastOption(this.config.denom, txMisc))];
+                        return [4 /*yield*/, txClient.sign([message], FirmaUtil_1.getSignAndBroadcastOption(this.config.denom, txMisc))];
                     case 2: return [2 /*return*/, _a.sent()];
                     case 3:
                         error_8 = _a.sent();
@@ -254,7 +254,7 @@ var TokenService = /** @class */ (function () {
     };
     //./firmachaind tx token mint ukai 1000000 firma1jmg3kwy5hntx66nl93dyk2d92943394qsf6gcf  --from alice --fees 2000ufct --chain-id imperium-2
     TokenService.prototype.createToken = function (wallet, tokenName, tokenSymbol, tokenURI, totalSupply, decimal, isMintable, isBurnable, txMisc) {
-        if (txMisc === void 0) { txMisc = token_1.DefaultTxMisc; }
+        if (txMisc === void 0) { txMisc = FirmaUtil_1.DefaultTxMisc; }
         return __awaiter(this, void 0, void 0, function () {
             var newTotalSupply, txRaw, nftTxClient, error_9;
             return __generator(this, function (_a) {
@@ -278,7 +278,7 @@ var TokenService = /** @class */ (function () {
         });
     };
     TokenService.prototype.mint = function (wallet, tokenID, amount, decimal, toAddress, txMisc) {
-        if (txMisc === void 0) { txMisc = token_1.DefaultTxMisc; }
+        if (txMisc === void 0) { txMisc = FirmaUtil_1.DefaultTxMisc; }
         return __awaiter(this, void 0, void 0, function () {
             var newAmount, txRaw, nftTxClient, error_10;
             return __generator(this, function (_a) {
@@ -302,7 +302,7 @@ var TokenService = /** @class */ (function () {
         });
     };
     TokenService.prototype.burn = function (wallet, tokenID, amount, decimal, txMisc) {
-        if (txMisc === void 0) { txMisc = token_1.DefaultTxMisc; }
+        if (txMisc === void 0) { txMisc = FirmaUtil_1.DefaultTxMisc; }
         return __awaiter(this, void 0, void 0, function () {
             var newAmount, txRaw, nftTxClient, error_11;
             return __generator(this, function (_a) {
@@ -326,7 +326,7 @@ var TokenService = /** @class */ (function () {
         });
     };
     TokenService.prototype.updateTokenURI = function (wallet, tokenID, tokenURI, txMisc) {
-        if (txMisc === void 0) { txMisc = token_1.DefaultTxMisc; }
+        if (txMisc === void 0) { txMisc = FirmaUtil_1.DefaultTxMisc; }
         return __awaiter(this, void 0, void 0, function () {
             var txRaw, nftTxClient, error_12;
             return __generator(this, function (_a) {

package/dist/sdk/FirmaUtil.d.ts

@@ -1,10 +1,12 @@
 import { TxRaw } from "cosmjs-types/cosmos/tx/v1beta1/tx";
 import { FirmaConfig } from "./FirmaConfig";
 import { SignerData } from "./firmachain/common/LedgerSigningStargateClient";
+import { SignAndBroadcastOptions, TxMisc } from "./firmachain/common";
 export declare class FirmaUtil {
     static config: FirmaConfig;
     static readonly FctDecimal: number;
     constructor(firmaConfig: FirmaConfig);
+    static getSignAndBroadcastOption(denom: string, txMisc: TxMisc): SignAndBroadcastOptions;
     static getUTokenStringFromTokenStr(tokenAmount: string, decimal: number): string;
     static getTokenStringFromUTokenStr(uTokenAmount: string, decimal: number): string;
     static getUTokenStringFromToken(tokenAmount: number, decimal: number): string;
@@ -15,7 +17,9 @@ export declare class FirmaUtil {
     static getUFCTStringFromFCT(fctAmount: number): string;
     static getFCTStringFromUFCT(uFctAmount: number): string;
     static getFileHash(filePath: string): Promise<string>;
-    static getFileHashFromBuffer(buffer: Uint8Array): Promise<string>;
+    static getFileHashFromBuffer(buffer: Uint8Array): string;
+    static getSha1HashFromString(text: string): string;
+    static getHashFromString(text: string): string;
     static isValidAddress(address: string): boolean;
     static getValOperAddressFromAccAddress(address: string): string;
     static getAccAddressFromValOperAddress(address: string): string;
@@ -24,3 +28,10 @@ export declare class FirmaUtil {
     static estimateGasRaw(txRaw: Uint8Array): Promise<number>;
     static printLog(log: any): void;
 }
+export declare const DefaultTxMisc: {
+    memo: string;
+    fee: number;
+    gas: number;
+    feeGranter: string;
+};
+export declare const getSignAndBroadcastOption: typeof FirmaUtil.getSignAndBroadcastOption;

package/dist/sdk/FirmaUtil.js

@@ -36,19 +36,34 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FirmaUtil = void 0;
+exports.getSignAndBroadcastOption = exports.DefaultTxMisc = exports.FirmaUtil = void 0;
 var fs_1 = require("fs");
 var tx_1 = require("cosmjs-types/cosmos/tx/v1beta1/tx");
 var TendermintQueryClient_1 = require("./firmachain/common/TendermintQueryClient");
 var encoding_1 = require("@cosmjs/encoding");
 var LedgerSigningStargateClient_1 = require("./firmachain/common/LedgerSigningStargateClient");
 var CryptoJS = require("crypto-js");
+var sha1 = require("crypto-js/sha1");
 var sha256 = require("crypto-js/sha256");
 var encHex = require("crypto-js/enc-hex");
 var FirmaUtil = /** @class */ (function () {
     function FirmaUtil(firmaConfig) {
         FirmaUtil.config = firmaConfig;
     }
+    FirmaUtil.getSignAndBroadcastOption = function (denom, txMisc) {
+        if (txMisc.memo == null)
+            txMisc.memo = "";
+        // INFO: if fee or gas data is not set default, those value will be null. So we have to double check it.
+        if (txMisc.fee == 0 || txMisc.fee == null)
+            txMisc.fee = FirmaUtil.config.defaultFee;
+        if (txMisc.gas == 0 || txMisc.gas == null)
+            txMisc.gas = FirmaUtil.config.defaultGas;
+        if (txMisc.feeGranter == null)
+            txMisc.feeGranter = "";
+        var gasFeeAmount = { denom: denom, amount: txMisc.fee.toString() };
+        var defaultFee = { amount: [gasFeeAmount], gas: txMisc.gas.toString(), granter: txMisc.feeGranter };
+        return { fee: defaultFee, memo: txMisc.memo };
+    };
     FirmaUtil.getUTokenStringFromTokenStr = function (tokenAmount, decimal) {
         var fct = Number.parseFloat(tokenAmount);
         var decimalMutiplyer = Math.pow(10, decimal);
@@ -101,13 +116,16 @@ var FirmaUtil = /** @class */ (function () {
         });
     };
     FirmaUtil.getFileHashFromBuffer = function (buffer) {
-        return __awaiter(this, void 0, void 0, function () {
-            var data;
-            return __generator(this, function (_a) {
-                data = CryptoJS.lib.WordArray.create(buffer);
-                return [2 /*return*/, sha256(data).toString(encHex)];
-            });
-        });
+        var data = CryptoJS.lib.WordArray.create(buffer);
+        return sha256(data).toString(encHex);
+    };
+    FirmaUtil.getSha1HashFromString = function (text) {
+        var data = CryptoJS.lib.WordArray.create(text);
+        return sha1(data).toString(encHex);
+    };
+    FirmaUtil.getHashFromString = function (text) {
+        var data = CryptoJS.lib.WordArray.create(text);
+        return sha256(data).toString(encHex);
     };
     FirmaUtil.isValidAddress = function (address) {
         try {
@@ -208,3 +226,5 @@ var FirmaUtil = /** @class */ (function () {
     return FirmaUtil;
 }());
 exports.FirmaUtil = FirmaUtil;
+exports.DefaultTxMisc = { memo: "", fee: 0, gas: 0, feeGranter: "" };
+exports.getSignAndBroadcastOption = FirmaUtil.getSignAndBroadcastOption;

package/dist/sdk/firmachain/common/TxCommon.d.ts

@@ -28,13 +28,6 @@ export interface TxMisc {
     gas?: number;
     feeGranter?: string;
 }
-export declare function getSignAndBroadcastOption(denom: string, txMisc?: TxMisc): SignAndBroadcastOptions;
-export declare const DefaultTxMisc: {
-    memo: string;
-    fee: number;
-    gas: number;
-    feeGranter: string;
-};
 export interface SignAndBroadcastOptions {
     fee: StdFee;
     memo: string;

package/dist/sdk/firmachain/common/TxCommon.js

@@ -1,23 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.VotingOption = exports.DefaultTxMisc = exports.getSignAndBroadcastOption = exports.DefaultBasicFeeGrantOption = void 0;
+exports.VotingOption = exports.DefaultBasicFeeGrantOption = void 0;
 exports.DefaultBasicFeeGrantOption = { spendLimit: undefined, expiration: undefined };
-function getSignAndBroadcastOption(denom, txMisc) {
-    if (txMisc === void 0) { txMisc = exports.DefaultTxMisc; }
-    if (txMisc.memo == null)
-        txMisc.memo = "";
-    if (txMisc.fee == null)
-        txMisc.fee = 200000;
-    if (txMisc.gas == null)
-        txMisc.gas = 200000;
-    if (txMisc.feeGranter == null)
-        txMisc.feeGranter = "";
-    var gasFeeAmount = { denom: denom, amount: txMisc.fee.toString() };
-    var defaultFee = { amount: [gasFeeAmount], gas: txMisc.gas.toString(), granter: txMisc.feeGranter };
-    return { fee: defaultFee, memo: txMisc.memo };
-}
-exports.getSignAndBroadcastOption = getSignAndBroadcastOption;
-exports.DefaultTxMisc = { memo: "", fee: 200000, gas: 200000, feeGranter: "" };
 var VotingOption;
 (function (VotingOption) {
     /** VOTE_OPTION_UNSPECIFIED - VOTE_OPTION_UNSPECIFIED defines a no-op vote option. */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@firmachain/firma-js",
-  "version": "0.2.21",
+  "version": "0.2.25",
   "description": "The Official FirmaChain Javascript SDK written in Typescript",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -8,7 +8,7 @@
     "dist"
   ],
   "scripts": {
-    "test": "mocha test/**/*.test.ts -r ts-node/register --timeout 120000",
+    "test": "mocha test/**/*.test.ts -r ts-node/register --timeout 1200000",
     "lint": "eslint src test --ext .ts,.tsx",
     "nodemon": "nodemon",
     "dev": "ts-node ./test/test_index.ts",
@@ -40,7 +40,8 @@
     "cosmjs-types": "^0.2.0",
     "crypto-js": "^4.1.1",
     "ipfs-http-client": "^52.0.5",
-    "protobufjs": "^6.10.2"
+    "protobufjs": "^6.10.2",
+    "readline-sync": "^1.4.10"
   },
   "devDependencies": {
     "@types/chai": "^4.2.21",
@@ -52,4 +53,4 @@
     "ts-node": "^10.2.1",
     "typescript": "^4.3.5"
   }
-}
+}