@firmachain/firma-js 0.2.31 → 0.2.34

package/dist/sdk/FirmaStakingService.js

@@ -125,12 +125,12 @@ var FirmaStakingService = /** @class */ (function () {
                     case 1:
                         address = _a.sent();
                         sendAmount = { denom: this.config.denom, amount: FirmaUtil_1.FirmaUtil.getUFCTStringFromFCT(amount) };
-                        message = txClient.msgDelegate({
+                        message = staking_1.StakingTxClient.msgDelegate({
                             delegatorAddress: address,
                             validatorAddress: validatorAddres,
                             amount: sendAmount
                         });
-                        return [4 /*yield*/, txClient.sign([message], FirmaUtil_1.getSignAndBroadcastOption(this.config.denom, txMisc))];
+                        return [4 /*yield*/, txClient.sign([message], (0, FirmaUtil_1.getSignAndBroadcastOption)(this.config.denom, txMisc))];
                     case 2: return [2 /*return*/, _a.sent()];
                     case 3:
                         error_4 = _a.sent();
@@ -154,12 +154,12 @@ var FirmaStakingService = /** @class */ (function () {
                     case 1:
                         address = _a.sent();
                         sendAmount = { denom: this.config.denom, amount: FirmaUtil_1.FirmaUtil.getUFCTStringFromFCT(amount) };
-                        message = txClient.msgUndelegate({
+                        message = staking_1.StakingTxClient.msgUndelegate({
                             delegatorAddress: address,
                             validatorAddress: validatorAddres,
                             amount: sendAmount
                         });
-                        return [4 /*yield*/, txClient.sign([message], FirmaUtil_1.getSignAndBroadcastOption(this.config.denom, txMisc))];
+                        return [4 /*yield*/, txClient.sign([message], (0, FirmaUtil_1.getSignAndBroadcastOption)(this.config.denom, txMisc))];
                     case 2: return [2 /*return*/, _a.sent()];
                     case 3:
                         error_5 = _a.sent();
@@ -183,13 +183,13 @@ var FirmaStakingService = /** @class */ (function () {
                     case 1:
                         address = _a.sent();
                         sendAmount = { denom: this.config.denom, amount: FirmaUtil_1.FirmaUtil.getUFCTStringFromFCT(amount) };
-                        message = txClient.msgRedelegate({
+                        message = staking_1.StakingTxClient.msgRedelegate({
                             delegatorAddress: address,
                             validatorSrcAddress: validatorSrcAddress,
                             validatorDstAddress: validatorDstAddress,
                             amount: sendAmount
                         });
-                        return [4 /*yield*/, txClient.sign([message], FirmaUtil_1.getSignAndBroadcastOption(this.config.denom, txMisc))];
+                        return [4 /*yield*/, txClient.sign([message], (0, FirmaUtil_1.getSignAndBroadcastOption)(this.config.denom, txMisc))];
                     case 2: return [2 /*return*/, _a.sent()];
                     case 3:
                         error_6 = _a.sent();
@@ -209,7 +209,7 @@ var FirmaStakingService = /** @class */ (function () {
                     case 0:
                         _a.trys.push([0, 2, , 3]);
                         txClient = new staking_1.StakingTxClient(wallet, this.config.rpcAddress);
-                        message = txClient.msgCreateValidator({
+                        message = staking_1.StakingTxClient.msgCreateValidator({
                             description: validatorInfo.description,
                             commission: validatorInfo.commission,
                             minSelfDelegation: validatorInfo.minSelfDelegation,
@@ -218,7 +218,7 @@ var FirmaStakingService = /** @class */ (function () {
                             pubkey: validatorInfo.pubkey,
                             value: validatorInfo.value
                         });
-                        return [4 /*yield*/, txClient.sign([message], FirmaUtil_1.getSignAndBroadcastOption(this.config.denom, txMisc))];
+                        return [4 /*yield*/, txClient.sign([message], (0, FirmaUtil_1.getSignAndBroadcastOption)(this.config.denom, txMisc))];
                     case 1: return [2 /*return*/, _a.sent()];
                     case 2:
                         error_7 = _a.sent();
@@ -238,13 +238,13 @@ var FirmaStakingService = /** @class */ (function () {
                     case 0:
                         _a.trys.push([0, 2, , 3]);
                         txClient = new staking_1.StakingTxClient(wallet, this.config.rpcAddress);
-                        message = txClient.msgEditValidator({
+                        message = staking_1.StakingTxClient.msgEditValidator({
                             validatorAddress: validatorAddress,
                             description: description,
                             commissionRate: commissionRate,
                             minSelfDelegation: minSelfDelegation
                         });
-                        return [4 /*yield*/, txClient.sign([message], FirmaUtil_1.getSignAndBroadcastOption(this.config.denom, txMisc))];
+                        return [4 /*yield*/, txClient.sign([message], (0, FirmaUtil_1.getSignAndBroadcastOption)(this.config.denom, txMisc))];
                     case 1: return [2 /*return*/, _a.sent()];
                     case 2:
                         error_8 = _a.sent();
@@ -455,7 +455,8 @@ var FirmaStakingService = /** @class */ (function () {
             });
         });
     };
-    FirmaStakingService.prototype.getUndelegationListFromValidator = function (valoperAddress) {
+    FirmaStakingService.prototype.getUndelegationListFromValidator = function (valoperAddress, paginationKey) {
+        if (paginationKey === void 0) { paginationKey = ""; }
         return __awaiter(this, void 0, void 0, function () {
             var queryClient, result, error_18;
             return __generator(this, function (_a) {
@@ -463,7 +464,7 @@ var FirmaStakingService = /** @class */ (function () {
                     case 0:
                         _a.trys.push([0, 2, , 3]);
                         queryClient = new staking_1.StakingQueryClient(this.config.restApiAddress);
-                        return [4 /*yield*/, queryClient.queryGetUndelegationListFromValidator(valoperAddress)];
+                        return [4 /*yield*/, queryClient.queryGetUndelegationListFromValidator(valoperAddress, paginationKey)];
                     case 1:
                         result = _a.sent();
                         return [2 /*return*/, result];
@@ -476,7 +477,8 @@ var FirmaStakingService = /** @class */ (function () {
             });
         });
     };
-    FirmaStakingService.prototype.getDelegationListFromValidator = function (valoperAddress) {
+    FirmaStakingService.prototype.getDelegationListFromValidator = function (valoperAddress, paginationKey) {
+        if (paginationKey === void 0) { paginationKey = ""; }
         return __awaiter(this, void 0, void 0, function () {
             var queryClient, result, error_19;
             return __generator(this, function (_a) {
@@ -484,7 +486,7 @@ var FirmaStakingService = /** @class */ (function () {
                     case 0:
                         _a.trys.push([0, 2, , 3]);
                         queryClient = new staking_1.StakingQueryClient(this.config.restApiAddress);
-                        return [4 /*yield*/, queryClient.queryGetDelegateListFromValidator(valoperAddress)];
+                        return [4 /*yield*/, queryClient.queryGetDelegateListFromValidator(valoperAddress, paginationKey)];
                     case 1:
                         result = _a.sent();
                         return [2 /*return*/, result];
@@ -497,7 +499,8 @@ var FirmaStakingService = /** @class */ (function () {
             });
         });
     };
-    FirmaStakingService.prototype.getTotalDelegationInfo = function (address) {
+    FirmaStakingService.prototype.getTotalDelegationInfo = function (address, paginationKey) {
+        if (paginationKey === void 0) { paginationKey = ""; }
         return __awaiter(this, void 0, void 0, function () {
             var queryClient, result, error_20;
             return __generator(this, function (_a) {
@@ -505,7 +508,7 @@ var FirmaStakingService = /** @class */ (function () {
                     case 0:
                         _a.trys.push([0, 2, , 3]);
                         queryClient = new staking_1.StakingQueryClient(this.config.restApiAddress);
-                        return [4 /*yield*/, queryClient.queryGetTotalDelegationInfo(address)];
+                        return [4 /*yield*/, queryClient.queryGetTotalDelegationInfo(address, paginationKey)];
                     case 1:
                         result = _a.sent();
                         return [2 /*return*/, result];
@@ -581,7 +584,8 @@ var FirmaStakingService = /** @class */ (function () {
             });
         });
     };
-    FirmaStakingService.prototype.getValidatorList = function () {
+    FirmaStakingService.prototype.getValidatorList = function (paginationKey) {
+        if (paginationKey === void 0) { paginationKey = ""; }
         return __awaiter(this, void 0, void 0, function () {
             var queryClient, result, error_24;
             return __generator(this, function (_a) {
@@ -589,7 +593,7 @@ var FirmaStakingService = /** @class */ (function () {
                     case 0:
                         _a.trys.push([0, 2, , 3]);
                         queryClient = new staking_1.StakingQueryClient(this.config.restApiAddress);
-                        return [4 /*yield*/, queryClient.queryValidators()];
+                        return [4 /*yield*/, queryClient.queryValidators(paginationKey)];
                     case 1:
                         result = _a.sent();
                         return [2 /*return*/, result];

package/dist/sdk/FirmaTokenService.js

@@ -137,7 +137,7 @@ var TokenService = /** @class */ (function () {
     TokenService.prototype.getSignedTxUpdateTokenURI = function (wallet, tokenID, tokenURI, txMisc) {
         if (txMisc === void 0) { txMisc = FirmaUtil_1.DefaultTxMisc; }
         return __awaiter(this, void 0, void 0, function () {
-            var address, txClient, message, error_5;
+            var address, message, txClient, error_5;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -145,13 +145,13 @@ var TokenService = /** @class */ (function () {
                         return [4 /*yield*/, wallet.getAddress()];
                     case 1:
                         address = _a.sent();
-                        txClient = new token_1.TokenTxClient(wallet, this.config.rpcAddress);
-                        message = txClient.msgUpdateTokenURI({
+                        message = token_1.TokenTxClient.msgUpdateTokenURI({
                             owner: address,
                             tokenID: tokenID,
                             tokenURI: tokenURI
                         });
-                        return [4 /*yield*/, txClient.sign([message], FirmaUtil_1.getSignAndBroadcastOption(this.config.denom, txMisc))];
+                        txClient = new token_1.TokenTxClient(wallet, this.config.rpcAddress);
+                        return [4 /*yield*/, txClient.sign([message], (0, FirmaUtil_1.getSignAndBroadcastOption)(this.config.denom, txMisc))];
                     case 2: return [2 /*return*/, _a.sent()];
                     case 3:
                         error_5 = _a.sent();
@@ -165,7 +165,7 @@ var TokenService = /** @class */ (function () {
     TokenService.prototype.getSignedTxBurn = function (wallet, tokenID, amount, txMisc) {
         if (txMisc === void 0) { txMisc = FirmaUtil_1.DefaultTxMisc; }
         return __awaiter(this, void 0, void 0, function () {
-            var address, txClient, message, error_6;
+            var address, message, txClient, error_6;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -173,13 +173,13 @@ var TokenService = /** @class */ (function () {
                         return [4 /*yield*/, wallet.getAddress()];
                     case 1:
                         address = _a.sent();
-                        txClient = new token_1.TokenTxClient(wallet, this.config.rpcAddress);
-                        message = txClient.msgBurn({
+                        message = token_1.TokenTxClient.msgBurn({
                             owner: address,
                             tokenID: tokenID,
                             amount: amount
                         });
-                        return [4 /*yield*/, txClient.sign([message], FirmaUtil_1.getSignAndBroadcastOption(this.config.denom, txMisc))];
+                        txClient = new token_1.TokenTxClient(wallet, this.config.rpcAddress);
+                        return [4 /*yield*/, txClient.sign([message], (0, FirmaUtil_1.getSignAndBroadcastOption)(this.config.denom, txMisc))];
                     case 2: return [2 /*return*/, _a.sent()];
                     case 3:
                         error_6 = _a.sent();
@@ -193,7 +193,7 @@ var TokenService = /** @class */ (function () {
     TokenService.prototype.getSignedTxMint = function (wallet, tokenID, amount, toAddress, txMisc) {
         if (txMisc === void 0) { txMisc = FirmaUtil_1.DefaultTxMisc; }
         return __awaiter(this, void 0, void 0, function () {
-            var address, txClient, message, error_7;
+            var address, message, txClient, error_7;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -201,14 +201,14 @@ var TokenService = /** @class */ (function () {
                         return [4 /*yield*/, wallet.getAddress()];
                     case 1:
                         address = _a.sent();
-                        txClient = new token_1.TokenTxClient(wallet, this.config.rpcAddress);
-                        message = txClient.msgMint({
+                        message = token_1.TokenTxClient.msgMint({
                             owner: address,
                             tokenID: tokenID,
                             amount: amount,
                             toAddress: toAddress
                         });
-                        return [4 /*yield*/, txClient.sign([message], FirmaUtil_1.getSignAndBroadcastOption(this.config.denom, txMisc))];
+                        txClient = new token_1.TokenTxClient(wallet, this.config.rpcAddress);
+                        return [4 /*yield*/, txClient.sign([message], (0, FirmaUtil_1.getSignAndBroadcastOption)(this.config.denom, txMisc))];
                     case 2: return [2 /*return*/, _a.sent()];
                     case 3:
                         error_7 = _a.sent();
@@ -222,7 +222,7 @@ var TokenService = /** @class */ (function () {
     TokenService.prototype.getSignedTxCreateToken = function (wallet, tokenName, tokenSymbol, tokenURI, totalSupply, decimal, isMintable, isBurnable, txMisc) {
         if (txMisc === void 0) { txMisc = FirmaUtil_1.DefaultTxMisc; }
         return __awaiter(this, void 0, void 0, function () {
-            var address, txClient, message, error_8;
+            var address, message, txClient, error_8;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -230,8 +230,7 @@ var TokenService = /** @class */ (function () {
                         return [4 /*yield*/, wallet.getAddress()];
                     case 1:
                         address = _a.sent();
-                        txClient = new token_1.TokenTxClient(wallet, this.config.rpcAddress);
-                        message = txClient.msgCreateToken({
+                        message = token_1.TokenTxClient.msgCreateToken({
                             owner: address,
                             name: tokenName,
                             symbol: tokenSymbol,
@@ -241,7 +240,8 @@ var TokenService = /** @class */ (function () {
                             mintable: isMintable,
                             burnable: isBurnable
                         });
-                        return [4 /*yield*/, txClient.sign([message], FirmaUtil_1.getSignAndBroadcastOption(this.config.denom, txMisc))];
+                        txClient = new token_1.TokenTxClient(wallet, this.config.rpcAddress);
+                        return [4 /*yield*/, txClient.sign([message], (0, FirmaUtil_1.getSignAndBroadcastOption)(this.config.denom, txMisc))];
                     case 2: return [2 /*return*/, _a.sent()];
                     case 3:
                         error_8 = _a.sent();

package/dist/sdk/FirmaUtil.d.ts

@@ -1,7 +1,12 @@
-import { TxRaw } from "cosmjs-types/cosmos/tx/v1beta1/tx";
+import { SignDoc, TxRaw } from "cosmjs-types/cosmos/tx/v1beta1/tx";
 import { FirmaConfig } from "./FirmaConfig";
 import { SignerData } from "./firmachain/common/LedgerSigningStargateClient";
 import { SignAndBroadcastOptions, TxMisc } from "./firmachain/common";
+import { ArbitraryVerifyData } from "./firmachain/common/signingaminostargateclient";
+import { EncodeObject, Registry } from "@cosmjs/proto-signing";
+import { FirmaWalletService } from "./FirmaWalletService";
+import { Any } from "./firmachain/google/protobuf/any";
+import { CommonTxClient } from "./firmachain/common/CommonTxClient";
 export declare class FirmaUtil {
     static config: FirmaConfig;
     static readonly FctDecimal: number;
@@ -11,6 +16,8 @@ export declare class FirmaUtil {
     static getTokenStringFromUTokenStr(uTokenAmount: string, decimal: number): string;
     static getUTokenStringFromToken(tokenAmount: number, decimal: number): string;
     static getUTokenFromToken(tokenAmount: number, decimal: number): number;
+    static arrayBufferToBase64(buffer: Uint8Array): string;
+    static base64ToArrayBuffer(base64: string): Uint8Array;
     static getTokenStringFromUToken(uTokenAmount: number, decimal: number): string;
     static getUFCTStringFromFCTStr(fctAmount: string): string;
     static getUFCTFromFCT(fctAmount: number): number;
@@ -28,6 +35,17 @@ export declare class FirmaUtil {
     static estimateGas(txRaw: TxRaw): Promise<number>;
     static estimateGasRaw(txRaw: Uint8Array): Promise<number>;
     static printLog(log: any): void;
+    static experimentalAdr36Sign(wallet: FirmaWalletService, data: string): Promise<ArbitraryVerifyData>;
+    static experimentalAdr36Verify(data: ArbitraryVerifyData, checkMsg: string): Promise<boolean>;
+    private static recoverSigningAddress;
+    private static verifySignature;
+    static verifyDirectSignature(address: string, signature: string, signDoc: SignDoc): Promise<boolean>;
+    static parseSignDocValues(signDocString: any): any;
+    static stringifySignDocValues(signDoc: any): any;
+    static makeSignDoc(signerAddress: string, messages: readonly EncodeObject[], txMisc?: TxMisc): Promise<SignDoc>;
+    static makeSignDocWithStringify(signerAddress: string, messages: readonly EncodeObject[], txMisc?: TxMisc): Promise<SignDoc>;
+    static getAnyData(registry: Registry, message: EncodeObject): Any;
+    static getCommonTxClient(aliceWallet: FirmaWalletService): CommonTxClient;
 }
 export declare const DefaultTxMisc: {
     memo: string;

package/dist/sdk/FirmaUtil.js

@@ -1,4 +1,15 @@
 "use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 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) {
@@ -35,6 +46,9 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getSignAndBroadcastOption = exports.DefaultTxMisc = exports.FirmaUtil = void 0;
 var fs_1 = require("fs");
@@ -42,6 +56,15 @@ 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 encoding_2 = require("@cosmjs/encoding");
+var crypto_1 = require("@cosmjs/crypto");
+var amino_1 = require("@cosmjs/amino");
+var signingaminostargateclient_1 = require("./firmachain/common/signingaminostargateclient");
+var proto_signing_1 = require("@cosmjs/proto-signing");
+var signingstargateclient_1 = require("./firmachain/common/signingstargateclient");
+var any_1 = require("./firmachain/google/protobuf/any");
+var long_1 = __importDefault(require("long"));
+var CommonTxClient_1 = require("./firmachain/common/CommonTxClient");
 var CryptoJS = require("crypto-js");
 var sha1 = require("crypto-js/sha1");
 var sha256 = require("crypto-js/sha256");
@@ -86,6 +109,27 @@ var FirmaUtil = /** @class */ (function () {
         var newBig = big.toFixed(0);
         return Number.parseInt(newBig);
     };
+    FirmaUtil.arrayBufferToBase64 = function (buffer) {
+        return Buffer.from(buffer).toString("base64");
+        /*var binary = '';
+        var bytes = new Uint8Array(buffer);
+        var len = bytes.byteLength;
+        for (var i = 0; i < len; i++) {
+            binary += String.fromCharCode(bytes[i]);
+        }
+        return btoa(binary);*/
+    };
+    FirmaUtil.base64ToArrayBuffer = function (base64) {
+        var buffer = Buffer.from(base64, "base64");
+        return new Uint8Array(buffer);
+        /*        var binary_string = atob(base64);
+                var len = binary_string.length;
+                var bytes = new Uint8Array(len);
+                for (var i = 0; i < len; i++) {
+                    bytes[i] = binary_string.charCodeAt(i);
+                }
+                return bytes;*/
+    };
     FirmaUtil.getTokenStringFromUToken = function (uTokenAmount, decimal) {
         var fixedUTokenAmount = Math.floor(uTokenAmount);
         var decimalMutiplyer = Math.pow(10, decimal);
@@ -181,7 +225,7 @@ var FirmaUtil = /** @class */ (function () {
                     case 0:
                         _a.trys.push([0, 2, , 3]);
                         encodedTx = Uint8Array.from(tx_1.TxRaw.encode(txRaw).finish());
-                        hexTx = "0x" + Buffer.from(encodedTx).toString("hex");
+                        hexTx = "0x".concat(Buffer.from(encodedTx).toString("hex"));
                         queryClient = new TendermintQueryClient_1.TendermintQueryClient(FirmaUtil.config.rpcAddress);
                         return [4 /*yield*/, queryClient.queryEstimateGas(hexTx)];
                     case 1:
@@ -205,7 +249,7 @@ var FirmaUtil = /** @class */ (function () {
                     case 0:
                         _a.trys.push([0, 2, , 3]);
                         encodedTx = Uint8Array.from(txRaw);
-                        hexTx = "0x" + Buffer.from(encodedTx).toString("hex");
+                        hexTx = "0x".concat(Buffer.from(encodedTx).toString("hex"));
                         console.log("hexTx:" + hexTx);
                         queryClient = new TendermintQueryClient_1.TendermintQueryClient(FirmaUtil.config.rpcAddress);
                         return [4 /*yield*/, queryClient.queryEstimateGas(hexTx)];
@@ -225,7 +269,158 @@ var FirmaUtil = /** @class */ (function () {
     FirmaUtil.printLog = function (log) {
         if (FirmaUtil.config.isShowLog === false)
             return;
-        console.log("[FirmaSDK] " + log);
+        console.log("[FirmaSDK] ".concat(log));
+    };
+    FirmaUtil.experimentalAdr36Sign = function (wallet, data) {
+        return __awaiter(this, void 0, void 0, function () {
+            var registry, aliceClient, address, userData, error_4;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        _a.trys.push([0, 4, , 5]);
+                        registry = new proto_signing_1.Registry();
+                        return [4 /*yield*/, signingaminostargateclient_1.SigningAminoStargateClient.connectWithSigner(FirmaUtil.config.rpcAddress, wallet.getRawAminoWallet(), registry)];
+                    case 1:
+                        aliceClient = _a.sent();
+                        return [4 /*yield*/, wallet.getAddress()];
+                    case 2:
+                        address = _a.sent();
+                        userData = Buffer.from(data);
+                        return [4 /*yield*/, aliceClient.experimentalAdr36Sign(address, userData)];
+                    case 3: return [2 /*return*/, _a.sent()];
+                    case 4:
+                        error_4 = _a.sent();
+                        FirmaUtil.printLog(error_4);
+                        throw error_4;
+                    case 5: return [2 /*return*/];
+                }
+            });
+        });
+    };
+    FirmaUtil.experimentalAdr36Verify = function (data, checkMsg) {
+        return __awaiter(this, void 0, void 0, function () {
+            var error_5;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        _a.trys.push([0, 2, , 3]);
+                        return [4 /*yield*/, signingaminostargateclient_1.SigningAminoStargateClient.experimentalAdr36Verify(data, checkMsg)];
+                    case 1: return [2 /*return*/, _a.sent()];
+                    case 2:
+                        error_5 = _a.sent();
+                        FirmaUtil.printLog(error_5);
+                        throw error_5;
+                    case 3: return [2 /*return*/];
+                }
+            });
+        });
+    };
+    FirmaUtil.recoverSigningAddress = function (signature, hash, recoveryIndex) {
+        return __awaiter(this, void 0, void 0, function () {
+            var sig, extendedSig, recoveredPubKey, _a;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        if (recoveryIndex > 3) {
+                            throw new Error('Invalid recovery index');
+                        }
+                        sig = crypto_1.Secp256k1Signature.fromFixedLength((0, encoding_2.fromBase64)(signature));
+                        extendedSig = new crypto_1.ExtendedSecp256k1Signature(sig.r(), sig.s(), recoveryIndex);
+                        _b.label = 1;
+                    case 1:
+                        _b.trys.push([1, 3, , 4]);
+                        return [4 /*yield*/, crypto_1.Secp256k1.recoverPubkey(extendedSig, hash)];
+                    case 2:
+                        recoveredPubKey = _b.sent();
+                        return [2 /*return*/, (0, amino_1.pubkeyToAddress)({
+                                type: 'tendermint/PubKeySecp256k1',
+                                value: (0, encoding_2.toBase64)(crypto_1.Secp256k1.compressPubkey(recoveredPubKey)),
+                            }, 'firma')];
+                    case 3:
+                        _a = _b.sent();
+                        return [2 /*return*/, null];
+                    case 4: return [2 /*return*/];
+                }
+            });
+        });
+    };
+    FirmaUtil.verifySignature = function (address, signature, hash) {
+        return __awaiter(this, void 0, void 0, function () {
+            var i, recoveredAddress;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        i = 0;
+                        _a.label = 1;
+                    case 1:
+                        if (!(i < 4)) return [3 /*break*/, 4];
+                        return [4 /*yield*/, this.recoverSigningAddress(signature, hash, i)];
+                    case 2:
+                        recoveredAddress = _a.sent();
+                        if (recoveredAddress === address) {
+                            return [2 /*return*/, true];
+                        }
+                        _a.label = 3;
+                    case 3:
+                        i++;
+                        return [3 /*break*/, 1];
+                    case 4: return [2 /*return*/, false];
+                }
+            });
+        });
+    };
+    FirmaUtil.verifyDirectSignature = function (address, signature, signDoc) {
+        var messageHash = (0, crypto_1.sha256)((0, proto_signing_1.makeSignBytes)(signDoc));
+        return this.verifySignature(address, signature, messageHash);
+    };
+    ;
+    FirmaUtil.parseSignDocValues = function (signDocString) {
+        return __assign(__assign({}, signDocString), { bodyBytes: (0, encoding_2.fromHex)(signDocString.bodyBytes), authInfoBytes: (0, encoding_2.fromHex)(signDocString.authInfoBytes), accountNumber: new long_1.default(signDocString.accountNumber) });
+    };
+    FirmaUtil.stringifySignDocValues = function (signDoc) {
+        return __assign(__assign({}, signDoc), { bodyBytes: (0, encoding_2.toHex)(signDoc.bodyBytes), authInfoBytes: (0, encoding_2.toHex)(signDoc.authInfoBytes), accountNumber: signDoc.accountNumber.toString(16) });
+    };
+    FirmaUtil.makeSignDoc = function (signerAddress, messages, txMisc) {
+        if (txMisc === void 0) { txMisc = exports.DefaultTxMisc; }
+        return __awaiter(this, void 0, void 0, function () {
+            var result, chainID, serverUrl, registry;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        result = FirmaUtil.getSignAndBroadcastOption(FirmaUtil.config.denom, txMisc);
+                        chainID = FirmaUtil.config.chainID;
+                        serverUrl = FirmaUtil.config.rpcAddress;
+                        registry = CommonTxClient_1.CommonTxClient.getRegistry();
+                        return [4 /*yield*/, signingstargateclient_1.SigningStargateClient.makeSignDocForSend(signerAddress, messages, result.fee, result.memo, serverUrl, chainID, registry)];
+                    case 1: return [2 /*return*/, _a.sent()];
+                }
+            });
+        });
+    };
+    FirmaUtil.makeSignDocWithStringify = function (signerAddress, messages, txMisc) {
+        if (txMisc === void 0) { txMisc = exports.DefaultTxMisc; }
+        return __awaiter(this, void 0, void 0, function () {
+            var signDoc, stringSignDoc;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.makeSignDoc(signerAddress, messages, txMisc)];
+                    case 1:
+                        signDoc = _a.sent();
+                        stringSignDoc = this.stringifySignDocValues(signDoc);
+                        return [2 /*return*/, stringSignDoc];
+                }
+            });
+        });
+    };
+    FirmaUtil.getAnyData = function (registry, message) {
+        var anyData = any_1.Any.fromPartial({
+            typeUrl: message.typeUrl,
+            value: registry.encode(message)
+        });
+        return anyData;
+    };
+    FirmaUtil.getCommonTxClient = function (aliceWallet) {
+        return new CommonTxClient_1.CommonTxClient(aliceWallet, FirmaUtil.config.rpcAddress);
     };
     FirmaUtil.FctDecimal = 6;
     return FirmaUtil;

package/dist/sdk/FirmaWalletService.d.ts

@@ -4,16 +4,19 @@ import { FirmaConfig } from "./FirmaConfig";
 import { SignAndBroadcastOptions } from "./firmachain/common";
 import { LedgerWalletInterface } from "./firmachain/common/LedgerWallet";
 import { TxRaw } from "cosmjs-types/cosmos/tx/v1beta1/tx";
+import { Secp256k1Wallet } from "@cosmjs/amino";
 export declare class FirmaWalletService {
     private readonly config;
     private mnemonic;
     private privateKey;
     private accountIndex;
+    private aminoWallet;
     private wallet;
     private ledger;
     getHdPath(): string;
     getPrefix(): string;
     getRawWallet(): DirectSecp256k1Wallet;
+    getRawAminoWallet(): Secp256k1Wallet;
     getPrivateKey(): string;
     getMnemonic(): string;
     isLedger(): boolean;

package/dist/sdk/FirmaWalletService.js

@@ -41,6 +41,7 @@ var proto_signing_1 = require("@cosmjs/proto-signing");
 var crypto_1 = require("@cosmjs/crypto");
 var FirmaUtil_1 = require("./FirmaUtil");
 var LedgerWallet_1 = require("./firmachain/common/LedgerWallet");
+var amino_1 = require("@cosmjs/amino");
 var CryptoJS = require("crypto-js");
 var FirmaWalletService = /** @class */ (function () {
     function FirmaWalletService(config) {
@@ -58,6 +59,9 @@ var FirmaWalletService = /** @class */ (function () {
     FirmaWalletService.prototype.getRawWallet = function () {
         return this.wallet;
     };
+    FirmaWalletService.prototype.getRawAminoWallet = function () {
+        return this.aminoWallet;
+    };
     FirmaWalletService.prototype.getPrivateKey = function () {
         return this.privateKey;
     };
@@ -88,7 +92,7 @@ var FirmaWalletService = /** @class */ (function () {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, LedgerWallet_1.signFromLedger(this.ledger, messages, option, registry)];
+                    case 0: return [4 /*yield*/, (0, LedgerWallet_1.signFromLedger)(this.ledger, messages, option, registry)];
                     case 1: return [2 /*return*/, _a.sent()];
                 }
             });
@@ -119,7 +123,7 @@ var FirmaWalletService = /** @class */ (function () {
     };
     FirmaWalletService.getHdPath = function (hdPath, accountIndex) {
         try {
-            return [crypto_1.stringToPath(hdPath + accountIndex + "'/0/0")];
+            return [(0, crypto_1.stringToPath)(hdPath + accountIndex + "'/0/0")];
         }
         catch (error) {
             FirmaUtil_1.FirmaUtil.printLog(error);
@@ -163,9 +167,9 @@ var FirmaWalletService = /** @class */ (function () {
                         return [4 /*yield*/, crypto_1.Bip39.mnemonicToSeed(mnemonicChecked)];
                     case 1:
                         seed = _a.sent();
-                        hdpath = FirmaWalletService.getHdPath(this.getHdPath(), this.accountIndex);
+                        hdpath = FirmaWalletService.getHdPath(this.getHdPath(), accountIndex);
                         privkey = crypto_1.Slip10.derivePath(crypto_1.Slip10Curve.Secp256k1, seed, hdpath[0]).privkey;
-                        privateKey = "0x" + Buffer.from(privkey).toString("hex");
+                        privateKey = "0x".concat(Buffer.from(privkey).toString("hex"));
                         return [2 /*return*/, privateKey];
                     case 2:
                         error_3 = _a.sent();
@@ -178,23 +182,27 @@ var FirmaWalletService = /** @class */ (function () {
     };
     FirmaWalletService.prototype.initFromPrivateKey = function (privateKey) {
         return __awaiter(this, void 0, void 0, function () {
-            var tempPrivateKey, _a, error_4;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
+            var tempPrivateKey, _a, _b, error_4;
+            return __generator(this, function (_c) {
+                switch (_c.label) {
                     case 0:
-                        _b.trys.push([0, 2, , 3]);
+                        _c.trys.push([0, 3, , 4]);
                         tempPrivateKey = Buffer.from(privateKey.replace("0x", ""), "hex");
                         _a = this;
                         return [4 /*yield*/, proto_signing_1.DirectSecp256k1Wallet.fromKey(tempPrivateKey, this.getPrefix())];
                     case 1:
-                        _a.wallet = _b.sent();
-                        this.privateKey = privateKey;
-                        return [3 /*break*/, 3];
+                        _a.wallet = _c.sent();
+                        _b = this;
+                        return [4 /*yield*/, amino_1.Secp256k1Wallet.fromKey(tempPrivateKey, this.getPrefix())];
                     case 2:
-                        error_4 = _b.sent();
+                        _b.aminoWallet = _c.sent();
+                        this.privateKey = privateKey;
+                        return [3 /*break*/, 4];
+                    case 3:
+                        error_4 = _c.sent();
                         FirmaUtil_1.FirmaUtil.printLog(error_4);
                         throw error_4;
-                    case 3: return [2 /*return*/];
+                    case 4: return [2 /*return*/];
                 }
             });
         });