@firmachain/firma-js 0.3.4 → 0.3.5

package/dist/sdk/FirmaUtil.js

@@ -25,7 +25,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {
@@ -62,10 +62,14 @@ var __read = (this && this.__read) || function (o, n) {
     }
     return ar;
 };
-var __spreadArray = (this && this.__spreadArray) || function (to, from) {
-    for (var i = 0, il = from.length, j = to.length; i < il; i++, j++)
-        to[j] = from[i];
-    return to;
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
 };
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
@@ -74,18 +78,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 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 axios_1 = __importDefault(require("axios"));
 var encoding_1 = require("@cosmjs/encoding");
-var LedgerSigningStargateClient_1 = require("./firmachain/common/LedgerSigningStargateClient");
-var encoding_2 = require("@cosmjs/encoding");
+var proto_signing_1 = require("@cosmjs/proto-signing");
 var crypto_1 = require("@cosmjs/crypto");
 var amino_1 = require("@cosmjs/amino");
-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 bignumber_js_1 = __importDefault(require("bignumber.js"));
 var CommonTxClient_1 = require("./firmachain/common/CommonTxClient");
+var TendermintQueryClient_1 = require("./firmachain/common/TendermintQueryClient");
+var bignumber_js_1 = require("bignumber.js");
+var tendermint_rpc_1 = require("@cosmjs/tendermint-rpc");
+var utils_1 = require("@cosmjs/utils");
 var CryptoJS = require("crypto-js");
 var sha1 = require("crypto-js/sha1");
 var sha256 = require("crypto-js/sha256");
@@ -200,7 +203,7 @@ var FirmaUtil = /** @class */ (function () {
     FirmaUtil.isValidAddress = function (address) {
         try {
             // eslint-disable-next-line @typescript-eslint/no-unused-expressions
-            encoding_1.fromBech32(address).data;
+            (0, encoding_1.fromBech32)(address).data;
             return true;
         }
         catch (e) {
@@ -208,64 +211,65 @@ var FirmaUtil = /** @class */ (function () {
         return false;
     };
     FirmaUtil.buf2hex = function (buffer) {
-        return __spreadArray([], __read(new Uint8Array(buffer))).map(function (x) { return x.toString(16).padStart(2, '0'); })
+        return __spreadArray([], __read(new Uint8Array(buffer)), false).map(function (x) { return x.toString(16).padStart(2, '0'); })
             .join('');
     };
     // for evm address support
     FirmaUtil.getHexAddressFromAddress = function (address) {
-        var data = encoding_1.fromBech32(address).data;
+        var data = (0, encoding_1.fromBech32)(address).data;
         return "0x" + FirmaUtil.buf2hex(data);
     };
     FirmaUtil.getValOperAddressFromAccAddress = function (address) {
-        var data = encoding_1.fromBech32(address).data;
-        return encoding_1.toBech32(FirmaUtil.config.prefix + "valoper", data);
+        var data = (0, encoding_1.fromBech32)(address).data;
+        return (0, encoding_1.toBech32)(FirmaUtil.config.prefix + "valoper", data);
     };
     FirmaUtil.getValConsAddressFromAccAddress = function (consensusPubkey) {
-        var ed25519PubkeyRaw = encoding_2.fromBase64(consensusPubkey);
-        var addressData = crypto_1.sha256(ed25519PubkeyRaw).slice(0, 20);
-        return encoding_1.toBech32(FirmaUtil.config.prefix + "valcons", addressData);
+        var ed25519PubkeyRaw = (0, encoding_1.fromBase64)(consensusPubkey);
+        var addressData = (0, crypto_1.sha256)(ed25519PubkeyRaw).slice(0, 20);
+        return (0, encoding_1.toBech32)(FirmaUtil.config.prefix + "valcons", addressData);
     };
     FirmaUtil.getAccAddressFromValOperAddress = function (address) {
-        var data = encoding_1.fromBech32(address).data;
-        return encoding_1.toBech32(FirmaUtil.config.prefix, data);
+        var data = (0, encoding_1.fromBech32)(address).data;
+        return (0, encoding_1.toBech32)(FirmaUtil.config.prefix, data);
     };
-    FirmaUtil.getSignerDataForLedger = function (address) {
+    FirmaUtil.estimateGas = function (txRaw) {
         return __awaiter(this, void 0, void 0, function () {
-            var signingClient, sequence, error_1;
+            var encodedTx, hexTx, queryClient, gas, multiplier, error_1;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        _a.trys.push([0, 3, , 4]);
-                        return [4 /*yield*/, LedgerSigningStargateClient_1.LedgerSigningStargateClient.connectWithSigner(FirmaUtil.config.rpcAddress)];
+                        _a.trys.push([0, 2, , 3]);
+                        encodedTx = Uint8Array.from(tx_1.TxRaw.encode(txRaw).finish());
+                        hexTx = "0x".concat(Buffer.from(encodedTx).toString("hex"));
+                        queryClient = new TendermintQueryClient_1.TendermintQueryClient(FirmaUtil.config.rpcAddress);
+                        return [4 /*yield*/, queryClient.queryEstimateGas(hexTx)];
                     case 1:
-                        signingClient = _a.sent();
-                        return [4 /*yield*/, signingClient.getSignerData(address)];
+                        gas = _a.sent();
+                        multiplier = 1.15;
+                        return [2 /*return*/, Math.ceil(gas * multiplier)];
                     case 2:
-                        sequence = _a.sent();
-                        return [2 /*return*/, sequence];
-                    case 3:
                         error_1 = _a.sent();
                         FirmaUtil.printLog(error_1);
                         throw error_1;
-                    case 4: return [2 /*return*/];
+                    case 3: return [2 /*return*/];
                 }
             });
         });
     };
-    FirmaUtil.estimateGas = function (txRaw) {
+    FirmaUtil.estimateGasRaw = function (txRaw) {
         return __awaiter(this, void 0, void 0, function () {
             var encodedTx, hexTx, queryClient, gas, multiplier, error_2;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         _a.trys.push([0, 2, , 3]);
-                        encodedTx = Uint8Array.from(tx_1.TxRaw.encode(txRaw).finish());
-                        hexTx = "0x" + Buffer.from(encodedTx).toString("hex");
+                        encodedTx = Uint8Array.from(txRaw);
+                        hexTx = "0x".concat(Buffer.from(encodedTx).toString("hex"));
                         queryClient = new TendermintQueryClient_1.TendermintQueryClient(FirmaUtil.config.rpcAddress);
                         return [4 /*yield*/, queryClient.queryEstimateGas(hexTx)];
                     case 1:
                         gas = _a.sent();
-                        multiplier = 1.15;
+                        multiplier = 1.25;
                         return [2 /*return*/, Math.ceil(gas * multiplier)];
                     case 2:
                         error_2 = _a.sent();
@@ -276,78 +280,52 @@ var FirmaUtil = /** @class */ (function () {
             });
         });
     };
-    FirmaUtil.estimateGasRaw = function (txRaw) {
+    FirmaUtil.getAccountInfo = function (address) {
         return __awaiter(this, void 0, void 0, function () {
-            var encodedTx, hexTx, queryClient, gas, multiplier, error_3;
+            var res, json, baseAccount, result, error_3;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         _a.trys.push([0, 2, , 3]);
-                        encodedTx = Uint8Array.from(txRaw);
-                        hexTx = "0x" + Buffer.from(encodedTx).toString("hex");
-                        queryClient = new TendermintQueryClient_1.TendermintQueryClient(FirmaUtil.config.rpcAddress);
-                        return [4 /*yield*/, queryClient.queryEstimateGas(hexTx)];
+                        return [4 /*yield*/, axios_1.default.get("".concat(FirmaUtil.config.restApiAddress, "/cosmos/auth/v1beta1/accounts/").concat(address))];
                     case 1:
-                        gas = _a.sent();
-                        multiplier = 1.25;
-                        return [2 /*return*/, Math.ceil(gas * multiplier)];
+                        res = _a.sent();
+                        if (res.status !== 200) {
+                            throw new Error("HTTP ".concat(res.status, ": ").concat(res.statusText));
+                        }
+                        json = res.data;
+                        baseAccount = json.account.base_account || json.account;
+                        result = {
+                            account_number: baseAccount.account_number,
+                            sequence: baseAccount.sequence,
+                        };
+                        return [2 /*return*/, result];
                     case 2:
                         error_3 = _a.sent();
-                        FirmaUtil.printLog(error_3);
                         throw error_3;
                     case 3: return [2 /*return*/];
                 }
             });
         });
     };
-    FirmaUtil.printLog = function (log) {
-        if (FirmaUtil.config.isShowLog === false)
-            return;
-        console.log("[FirmaSDK] " + log);
-    };
-    FirmaUtil.experimentalAdr36Sign = function (wallet, data) {
+    FirmaUtil.getChainId = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var registry, client, address, userData, error_4;
+            var res, json;
             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*/, signingstargateclient_1.SigningStargateClient.connectWithSigner(FirmaUtil.config.rpcAddress, wallet.getRawAminoWallet(), { registry: registry })];
+                    case 0: return [4 /*yield*/, axios_1.default.get("".concat(FirmaUtil.config.restApiAddress, "/cosmos/base/tendermint/v1beta1/node_info"))];
                     case 1:
-                        client = _a.sent();
-                        return [4 /*yield*/, wallet.getAddress()];
-                    case 2:
-                        address = _a.sent();
-                        userData = Buffer.from(data);
-                        return [4 /*yield*/, client.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*/];
+                        res = _a.sent();
+                        json = res.data;
+                        return [2 /*return*/, json.default_node_info.network];
                 }
             });
         });
     };
-    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*/, signingstargateclient_1.SigningStargateClient.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.printLog = function (log) {
+        if (FirmaUtil.config.isShowLog === false)
+            return;
+        console.log("[FirmaSDK] ".concat(log));
     };
     FirmaUtil.recoverSigningAddress = function (signature, hash, recoveryIndex) {
         return __awaiter(this, void 0, void 0, function () {
@@ -358,7 +336,7 @@ var FirmaUtil = /** @class */ (function () {
                         if (recoveryIndex > 3) {
                             throw new Error('Invalid recovery index');
                         }
-                        sig = crypto_1.Secp256k1Signature.fromFixedLength(encoding_2.fromBase64(signature));
+                        sig = crypto_1.Secp256k1Signature.fromFixedLength((0, encoding_1.fromBase64)(signature));
                         extendedSig = new crypto_1.ExtendedSecp256k1Signature(sig.r(), sig.s(), recoveryIndex);
                         _b.label = 1;
                     case 1:
@@ -366,9 +344,9 @@ var FirmaUtil = /** @class */ (function () {
                         return [4 /*yield*/, crypto_1.Secp256k1.recoverPubkey(extendedSig, hash)];
                     case 2:
                         recoveredPubKey = _b.sent();
-                        return [2 /*return*/, amino_1.pubkeyToAddress({
+                        return [2 /*return*/, (0, amino_1.pubkeyToAddress)({
                                 type: 'tendermint/PubKeySecp256k1',
-                                value: encoding_2.toBase64(crypto_1.Secp256k1.compressPubkey(recoveredPubKey)),
+                                value: (0, encoding_1.toBase64)(crypto_1.Secp256k1.compressPubkey(recoveredPubKey)),
                             }, 'firma')];
                     case 3:
                         _a = _b.sent();
@@ -404,48 +382,16 @@ var FirmaUtil = /** @class */ (function () {
         });
     };
     FirmaUtil.verifyDirectSignature = function (address, signature, signDoc) {
-        var messageHash = crypto_1.sha256(proto_signing_1.makeSignBytes(signDoc));
+        var messageHash = (0, crypto_1.sha256)((0, proto_signing_1.makeSignBytes)(signDoc));
         return this.verifySignature(address, signature, messageHash);
     };
     ;
     FirmaUtil.parseSignDocValues = function (signDocString) {
         var signDoc = JSON.parse(signDocString);
-        return __assign(__assign({}, signDoc), { bodyBytes: encoding_2.fromHex(signDoc.bodyBytes), authInfoBytes: encoding_2.fromHex(signDoc.authInfoBytes), accountNumber: long_1.default.fromString(signDoc.accountNumber) });
+        return __assign(__assign({}, signDoc), { bodyBytes: (0, encoding_1.fromHex)(signDoc.bodyBytes), authInfoBytes: (0, encoding_1.fromHex)(signDoc.authInfoBytes), accountNumber: BigInt(signDoc.accountNumber) });
     };
     FirmaUtil.stringifySignDocValues = function (signDoc) {
-        return JSON.stringify(__assign(__assign({}, signDoc), { bodyBytes: encoding_2.toHex(signDoc.bodyBytes), authInfoBytes: encoding_2.toHex(signDoc.authInfoBytes), accountNumber: signDoc.accountNumber.toString() }));
-    };
-    FirmaUtil.makeSignDoc = function (signerAddress, pubkey, 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, pubkey, messages, result.fee, result.memo, serverUrl, chainID, registry)];
-                    case 1: return [2 /*return*/, _a.sent()];
-                }
-            });
-        });
-    };
-    FirmaUtil.makeSignDocWithStringify = function (signerAddress, pubkey, 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, pubkey, messages, txMisc)];
-                    case 1:
-                        signDoc = _a.sent();
-                        stringSignDoc = this.stringifySignDocValues(signDoc);
-                        return [2 /*return*/, stringSignDoc];
-                }
-            });
-        });
+        return JSON.stringify(__assign(__assign({}, signDoc), { bodyBytes: (0, encoding_1.toHex)(signDoc.bodyBytes), authInfoBytes: (0, encoding_1.toHex)(signDoc.authInfoBytes), accountNumber: signDoc.accountNumber.toString() }));
     };
     FirmaUtil.getAnyData = function (registry, message) {
         var anyData = any_1.Any.fromPartial({
@@ -457,13 +403,6 @@ var FirmaUtil = /** @class */ (function () {
     FirmaUtil.getCommonTxClient = function (aliceWallet) {
         return new CommonTxClient_1.CommonTxClient(aliceWallet, FirmaUtil.config.rpcAddress);
     };
-    /**
-     * Parses a duration string to a Duration object.
-     * Supports formats like "336h0m0s", "21d", "1000ms", "1s", "1m", "1h", "1ns", "1µs"/"1us"
-     *
-     * @param durationStr - Duration string to parse (e.g., "336h0m0s", "21d")
-     * @returns Duration object with seconds and nanos fields
-     */
     FirmaUtil.parseDurationString = function (durationStr) {
         if (!durationStr || durationStr.trim() === "") {
             return { seconds: BigInt(0), nanos: 0 };
@@ -508,7 +447,7 @@ var FirmaUtil = /** @class */ (function () {
             }
         }
         if (!hasMatches) {
-            throw new Error("Invalid duration format: " + durationStr);
+            throw new Error("Invalid duration format: ".concat(durationStr));
         }
         // Convert excess nanos to seconds
         var extraSeconds = Math.floor(totalNanos / 1000000000);
@@ -522,13 +461,6 @@ var FirmaUtil = /** @class */ (function () {
             nanos: Math.floor(finalNanos)
         };
     };
-    /**
-     * Creates a Duration object from a duration string.
-     * This is a convenience method that combines parseDurationString with Duration.fromPartial.
-     *
-     * @param durationStr - Duration string to parse (e.g., "336h0m0s", "21d")
-     * @returns Duration object ready to use with protobuf
-     */
     FirmaUtil.createDurationFromString = function (durationStr) {
         var _a = FirmaUtil.parseDurationString(durationStr), seconds = _a.seconds, nanos = _a.nanos;
         // Import Duration if not already imported
@@ -548,13 +480,13 @@ var FirmaUtil = /** @class */ (function () {
     FirmaUtil.processCommissionRateAsDecimal = function (commissionRate) {
         var trimmed = commissionRate.trim();
         if (!commissionRate || trimmed === "") {
-            throw new Error("Invalid commission rate format: " + commissionRate);
+            throw new Error("Invalid commission rate format: ".concat(commissionRate));
         }
         if (!/^-?\d+\.?\d*$/.test(trimmed)) {
-            throw new Error("Invalid commission rate format: " + commissionRate);
+            throw new Error("Invalid commission rate format: ".concat(commissionRate));
         }
         // Validates input and creates BigNumber instance
-        var commissionRateBN = new bignumber_js_1.default(trimmed);
+        var commissionRateBN = new bignumber_js_1.BigNumber(trimmed);
         // Checks if it's a valid finite number
         if (!commissionRateBN.isFinite())
             throw new Error("Invalid commission rate format: " + commissionRate);
@@ -562,9 +494,132 @@ var FirmaUtil = /** @class */ (function () {
         if (commissionRateBN.isNegative() || commissionRateBN.isGreaterThan(1))
             throw new Error("Invalid commission rate range. Must be between 0 and 1 inclusive.");
         // Converts to atomics format (multiply by 10^18)
-        var atomics = commissionRateBN.multipliedBy(new bignumber_js_1.default(10).pow(18));
+        var atomics = commissionRateBN.multipliedBy(new bignumber_js_1.BigNumber(10).pow(18));
         // Returns integer string
-        return atomics.integerValue(bignumber_js_1.default.ROUND_DOWN).toString();
+        return atomics.integerValue(bignumber_js_1.BigNumber.ROUND_DOWN).toString();
+    };
+    /**
+     * ADR-036 protobuf arbitrary signing
+     *
+     * @param wallet - FirmaWalletService instance
+     * @param signerAddress - Address of the signer
+     * @param data - Arbitrary data to sign
+     * @returns ArbitraryVerifyData for verification
+     */
+    FirmaUtil.protobufArbitrarySign = function (wallet, signerAddress, data) {
+        return __awaiter(this, void 0, void 0, function () {
+            var rawWallet, accounts, account, txBody, authInfo, signDoc, signBytes, hash, privKey, signature, sigBytes, error_4;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        _a.trys.push([0, 3, , 4]);
+                        rawWallet = wallet.getRawWallet();
+                        return [4 /*yield*/, rawWallet.getAccounts()];
+                    case 1:
+                        accounts = _a.sent();
+                        account = accounts.find(function (acc) { return acc.address === signerAddress; });
+                        if (!account) {
+                            throw new Error("Account not found in rawWallet");
+                        }
+                        txBody = tx_1.TxBody.fromPartial({
+                            messages: [],
+                            memo: new TextDecoder().decode(data),
+                            timeoutHeight: BigInt(0),
+                        });
+                        authInfo = tx_1.AuthInfo.fromPartial({
+                            signerInfos: [],
+                            fee: {
+                                amount: [],
+                                gasLimit: BigInt(0),
+                                payer: "",
+                                granter: ""
+                            }
+                        });
+                        signDoc = (0, proto_signing_1.makeSignDoc)(tx_1.TxBody.encode(txBody).finish(), tx_1.AuthInfo.encode(authInfo).finish(), "", // Empty chainId for arbitrary signing
+                        0 // 0 account number for arbitrary signing
+                        );
+                        signBytes = (0, proto_signing_1.makeSignBytes)(signDoc);
+                        hash = (0, crypto_1.sha256)(signBytes);
+                        privKey = rawWallet["privkey"];
+                        if (!privKey) {
+                            throw new Error("Private key not accessible from wallet");
+                        }
+                        return [4 /*yield*/, crypto_1.Secp256k1.createSignature(hash, privKey)];
+                    case 2:
+                        signature = _a.sent();
+                        sigBytes = new Uint8Array(__spreadArray(__spreadArray([], __read(signature.r(32)), false), __read(signature.s(32)), false));
+                        return [2 /*return*/, {
+                                chainId: signDoc.chainId,
+                                accountNumber: signDoc.accountNumber.toString(),
+                                sequence: "0",
+                                bodyBytes: (0, encoding_1.toBase64)(signDoc.bodyBytes),
+                                authInfoBytes: (0, encoding_1.toBase64)(signDoc.authInfoBytes),
+                                signerAddress: signerAddress,
+                                pubkey: (0, encoding_1.toBase64)(account.pubkey),
+                                signature: (0, encoding_1.toBase64)(sigBytes),
+                            }];
+                    case 3:
+                        error_4 = _a.sent();
+                        FirmaUtil.printLog(error_4);
+                        throw error_4;
+                    case 4: return [2 /*return*/];
+                }
+            });
+        });
+    };
+    /**
+     * ADR-036 protobuf arbitrary signature verification
+     *
+     * @param data - ArbitraryVerifyData to verify
+     * @param originalMessage - Original message that was signed
+     * @returns boolean indicating if the signature is valid
+     */
+    FirmaUtil.protobufArbitraryVerify = function (data, originalMessage) {
+        return __awaiter(this, void 0, void 0, function () {
+            var signDoc, txBody, memoData, originalMessageString, signBytes, hash, pubkeyBytes, signatureBytes, secpSig, rawSignerAddr, bech32SignerAddr, isValid, error_5, error_6;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        _a.trys.push([0, 5, , 6]);
+                        signDoc = (0, proto_signing_1.makeSignDoc)((0, encoding_1.fromBase64)(data.bodyBytes), (0, encoding_1.fromBase64)(data.authInfoBytes), data.chainId, Number(data.accountNumber));
+                        txBody = tx_1.TxBody.decode(signDoc.bodyBytes);
+                        // For ADR-036 arbitrary signing, messages should be empty
+                        if (txBody.messages.length !== 0) {
+                            return [2 /*return*/, false];
+                        }
+                        memoData = txBody.memo;
+                        originalMessageString = new TextDecoder().decode(originalMessage);
+                        if (memoData !== originalMessageString) {
+                            return [2 /*return*/, false];
+                        }
+                        signBytes = (0, proto_signing_1.makeSignBytes)(signDoc);
+                        hash = (0, crypto_1.sha256)(signBytes);
+                        _a.label = 1;
+                    case 1:
+                        _a.trys.push([1, 3, , 4]);
+                        pubkeyBytes = (0, encoding_1.fromBase64)(data.pubkey);
+                        signatureBytes = (0, encoding_1.fromBase64)(data.signature);
+                        secpSig = crypto_1.Secp256k1Signature.fromFixedLength(signatureBytes);
+                        rawSignerAddr = (0, tendermint_rpc_1.rawSecp256k1PubkeyToRawAddress)(pubkeyBytes);
+                        bech32SignerAddr = (0, encoding_1.fromBech32)(data.signerAddress).data;
+                        if (!rawSignerAddr || !bech32SignerAddr || !(0, utils_1.arrayContentEquals)(rawSignerAddr, bech32SignerAddr)) {
+                            return [2 /*return*/, false];
+                        }
+                        return [4 /*yield*/, crypto_1.Secp256k1.verifySignature(secpSig, hash, pubkeyBytes)];
+                    case 2:
+                        isValid = _a.sent();
+                        return [2 /*return*/, isValid];
+                    case 3:
+                        error_5 = _a.sent();
+                        return [2 /*return*/, false];
+                    case 4: return [3 /*break*/, 6];
+                    case 5:
+                        error_6 = _a.sent();
+                        return [2 /*return*/, false];
+                    case 6: return [2 /*return*/];
+                }
+            });
+        });
     };
     FirmaUtil.FctDecimal = 6;
     return FirmaUtil;

package/dist/sdk/FirmaWalletService.d.ts

@@ -1,10 +1,9 @@
-import { DirectSecp256k1Wallet, Registry } from "@cosmjs/proto-signing";
-import { EncodeObject } from "@cosmjs/proto-signing";
+import { DirectSecp256k1Wallet, EncodeObject, Registry } from "@cosmjs/proto-signing";
 import { FirmaConfig } from "./FirmaConfig";
-import { SignAndBroadcastOptions } from "./firmachain/common";
+import { Secp256k1Wallet } from "@cosmjs/amino";
 import { LedgerWalletInterface } from "./firmachain/common/LedgerWallet";
+import { SignAndBroadcastOptions } from "./firmachain/common";
 import { TxRaw } from "cosmjs-types/cosmos/tx/v1beta1/tx";
-import { Secp256k1Wallet } from "@cosmjs/amino";
 export declare class FirmaWalletService {
     private readonly config;
     private mnemonic;
@@ -19,9 +18,6 @@ export declare class FirmaWalletService {
     getRawAminoWallet(): Secp256k1Wallet;
     getPrivateKey(): string;
     getMnemonic(): string;
-    isLedger(): boolean;
-    initFromLedger(ledger: LedgerWalletInterface): Promise<FirmaWalletService>;
-    signLedger(messages: EncodeObject[], option: SignAndBroadcastOptions, registry: Registry): Promise<TxRaw>;
     getPubKey(): Promise<string>;
     getAddress(): Promise<string>;
     constructor(config: FirmaConfig);
@@ -37,4 +33,7 @@ export declare class FirmaWalletService {
     fromMnemonic(mnemonic: string, accountIndex?: number): Promise<FirmaWalletService>;
     fromPrivateKey(privateKey: string): Promise<FirmaWalletService>;
     generateMnemonic(): Promise<string>;
+    isLedger(): boolean;
+    initFromLedger(ledger: LedgerWalletInterface): Promise<FirmaWalletService>;
+    signLedger(messages: EncodeObject[], option: SignAndBroadcastOptions, registry: Registry): Promise<TxRaw>;
 }