@firmachain/firma-js 0.3.5 → 0.3.6-beta1

package/dist/sdk/FirmaUtil.d.ts

@@ -1,11 +1,12 @@
 import { SignDoc, TxRaw } from "cosmjs-types/cosmos/tx/v1beta1/tx";
 import { Duration } from "cosmjs-types/google/protobuf/duration";
 import { EncodeObject, Registry } from "@cosmjs/proto-signing";
-import { SignAndBroadcastOptions, TxMisc, ArbitraryVerifyData } from "./firmachain/common";
+import { SignAndBroadcastOptions, TxMisc } from "./firmachain/common";
 import { FirmaConfig } from "./FirmaConfig";
 import { FirmaWalletService } from "./FirmaWalletService";
-import { Any } from "./firmachain/google/protobuf/any";
+import { Any } from "cosmjs-types/google/protobuf/any";
 import { CommonTxClient } from "./firmachain/common/CommonTxClient";
+import { ArbitraryVerifyData } from "./firmachain/common/signingprotobufstargateclient";
 export declare class FirmaUtil {
     static config: FirmaConfig;
     static readonly FctDecimal: number;
@@ -41,6 +42,24 @@ export declare class FirmaUtil {
     }>;
     static getChainId(): Promise<string>;
     static printLog(log: any): void;
+    /**
+     * ADR-036 protobuf arbitrary signing (wrapper for protobufArbitrarySign)
+     *
+     * @param wallet - FirmaWalletService instance
+     * @param data - Arbitrary data string to sign
+     * @returns ArbitraryVerifyData for verification
+     */
+    static experimentalAdr36Sign(wallet: FirmaWalletService, data: string): Promise<ArbitraryVerifyData>;
+    /**
+     * ADR-036 protobuf arbitrary signature verification (wrapper for protobufArbitraryVerify)
+     *
+     * @param data - ArbitraryVerifyData to verify
+     * @param checkMsg - Original message that was signed
+     * @returns boolean indicating if the signature is valid
+     */
+    static experimentalAdr36Verify(data: ArbitraryVerifyData, checkMsg: string): Promise<boolean>;
+    static makeSignDoc(signerAddress: string, pubkey: string, messages: readonly EncodeObject[], txMisc?: TxMisc): Promise<SignDoc>;
+    static makeSignDocWithStringify(signerAddress: string, pubkey: string, messages: readonly EncodeObject[], txMisc?: TxMisc): Promise<string>;
     private static recoverSigningAddress;
     private static verifySignature;
     static verifyDirectSignature(address: string, signature: string, signDoc: SignDoc): Promise<boolean>;
@@ -61,23 +80,6 @@ export declare class FirmaUtil {
      * @returns Processed commission rate string safe for protobuf usage (atomics format or empty string)
      */
     static processCommissionRateAsDecimal(commissionRate: string): string;
-    /**
-     * 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
-     */
-    static protobufArbitrarySign(wallet: FirmaWalletService, signerAddress: string, data: Uint8Array): Promise<ArbitraryVerifyData>;
-    /**
-     * 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
-     */
-    static protobufArbitraryVerify(data: ArbitraryVerifyData, originalMessage: Uint8Array): Promise<boolean>;
 }
 export declare const DefaultTxMisc: {
     memo: string;

package/dist/sdk/FirmaUtil.js

@@ -79,16 +79,18 @@ exports.getSignAndBroadcastOption = exports.DefaultTxMisc = exports.FirmaUtil =
 var fs_1 = require("fs");
 var tx_1 = require("cosmjs-types/cosmos/tx/v1beta1/tx");
 var axios_1 = __importDefault(require("axios"));
+var duration_1 = require("cosmjs-types/google/protobuf/duration");
 var encoding_1 = require("@cosmjs/encoding");
 var proto_signing_1 = require("@cosmjs/proto-signing");
 var crypto_1 = require("@cosmjs/crypto");
-var amino_1 = require("@cosmjs/amino");
-var any_1 = require("./firmachain/google/protobuf/any");
+var any_1 = require("cosmjs-types/google/protobuf/any");
 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 signingprotobufstargateclient_1 = require("./firmachain/common/signingprotobufstargateclient");
+var signingstargateclient_1 = require("./firmachain/common/signingstargateclient");
+var coin_1 = require("cosmjs-types/cosmos/base/v1beta1/coin");
 var CryptoJS = require("crypto-js");
 var sha1 = require("crypto-js/sha1");
 var sha256 = require("crypto-js/sha256");
@@ -107,9 +109,17 @@ var FirmaUtil = /** @class */ (function () {
             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 };
+        var gasFeeAmount = coin_1.Coin.fromPartial({
+            denom: denom,
+            amount: txMisc.fee.toString(),
+        });
+        var fee = tx_1.Fee.fromPartial({
+            amount: [gasFeeAmount],
+            gasLimit: BigInt(txMisc.gas),
+            granter: txMisc.feeGranter,
+            payer: "",
+        });
+        return { fee: fee, memo: txMisc.memo };
     };
     FirmaUtil.getUTokenStringFromTokenStr = function (tokenAmount, decimal) {
         var fct = Number.parseFloat(tokenAmount);
@@ -135,24 +145,10 @@ var FirmaUtil = /** @class */ (function () {
     };
     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);
@@ -327,9 +323,104 @@ var FirmaUtil = /** @class */ (function () {
             return;
         console.log("[FirmaSDK] ".concat(log));
     };
+    /**
+     * ADR-036 protobuf arbitrary signing (wrapper for protobufArbitrarySign)
+     *
+     * @param wallet - FirmaWalletService instance
+     * @param data - Arbitrary data string to sign
+     * @returns ArbitraryVerifyData for verification
+     */
+    FirmaUtil.experimentalAdr36Sign = function (wallet, data) {
+        return __awaiter(this, void 0, void 0, function () {
+            var client, address, dataBytes, error_4;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        _a.trys.push([0, 4, , 5]);
+                        return [4 /*yield*/, signingprotobufstargateclient_1.SigningProtobufStargateClient.connectWithSigner(FirmaUtil.config.rpcAddress, wallet.getRawWallet(), {})];
+                    case 1:
+                        client = _a.sent();
+                        return [4 /*yield*/, wallet.getAddress()];
+                    case 2:
+                        address = _a.sent();
+                        dataBytes = Buffer.from(data, 'utf8');
+                        return [4 /*yield*/, client.experimentalAdr36Sign(address, dataBytes)];
+                    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*/];
+                }
+            });
+        });
+    };
+    /**
+     * ADR-036 protobuf arbitrary signature verification (wrapper for protobufArbitraryVerify)
+     *
+     * @param data - ArbitraryVerifyData to verify
+     * @param checkMsg - Original message that was signed
+     * @returns boolean indicating if the signature is valid
+     */
+    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*/, signingprotobufstargateclient_1.SigningProtobufStargateClient.experimentalAdr36Verify(data, checkMsg)];
+                    case 1: return [2 /*return*/, _a.sent()];
+                    case 2:
+                        error_5 = _a.sent();
+                        FirmaUtil.printLog(error_5);
+                        return [2 /*return*/, false];
+                    case 3: return [2 /*return*/];
+                }
+            });
+        });
+    };
+    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, fee;
+            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();
+                        fee = {
+                            amount: __spreadArray([], __read(result.fee.amount), false),
+                            gasLimit: result.fee.gasLimit,
+                            granter: result.fee.granter || "",
+                            payer: ""
+                        };
+                        return [4 /*yield*/, signingstargateclient_1.SigningStargateClient.makeSignDocForSend(signerAddress, pubkey, messages, 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];
+                }
+            });
+        });
+    };
     FirmaUtil.recoverSigningAddress = function (signature, hash, recoveryIndex) {
         return __awaiter(this, void 0, void 0, function () {
-            var sig, extendedSig, recoveredPubKey, _a;
+            var sig, extendedSig, recoveredPubKey, compressedPubkey, rawAddress, _a;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
@@ -344,10 +435,9 @@ var FirmaUtil = /** @class */ (function () {
                         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_1.toBase64)(crypto_1.Secp256k1.compressPubkey(recoveredPubKey)),
-                            }, 'firma')];
+                        compressedPubkey = crypto_1.Secp256k1.compressPubkey(recoveredPubKey);
+                        rawAddress = (0, tendermint_rpc_1.rawSecp256k1PubkeyToRawAddress)(compressedPubkey);
+                        return [2 /*return*/, (0, encoding_1.toBech32)('firma', rawAddress)];
                     case 3:
                         _a = _b.sent();
                         return [2 /*return*/, null];
@@ -463,9 +553,7 @@ var FirmaUtil = /** @class */ (function () {
     };
     FirmaUtil.createDurationFromString = function (durationStr) {
         var _a = FirmaUtil.parseDurationString(durationStr), seconds = _a.seconds, nanos = _a.nanos;
-        // Import Duration if not already imported
-        var Duration = require("./firmachain/google/protobuf/duration").Duration;
-        return Duration.fromPartial({
+        return duration_1.Duration.fromPartial({
             seconds: seconds,
             nanos: nanos
         });
@@ -498,129 +586,6 @@ var FirmaUtil = /** @class */ (function () {
         // Returns integer string
         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,6 +1,5 @@
 import { DirectSecp256k1Wallet, EncodeObject, Registry } from "@cosmjs/proto-signing";
 import { FirmaConfig } from "./FirmaConfig";
-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";
@@ -9,13 +8,11 @@ export declare class FirmaWalletService {
     private mnemonic;
     private privateKey;
     private accountIndex;
-    private aminoWallet;
     private wallet;
     private ledger;
     getHdPath(): string;
     getPrefix(): string;
     getRawWallet(): DirectSecp256k1Wallet;
-    getRawAminoWallet(): Secp256k1Wallet;
     getPrivateKey(): string;
     getMnemonic(): string;
     getPubKey(): Promise<string>;

package/dist/sdk/FirmaWalletService.js

@@ -40,7 +40,6 @@ exports.FirmaWalletService = void 0;
 var proto_signing_1 = require("@cosmjs/proto-signing");
 var crypto_1 = require("@cosmjs/crypto");
 var FirmaUtil_1 = require("./FirmaUtil");
-var amino_1 = require("@cosmjs/amino");
 var LedgerWallet_1 = require("./firmachain/common/LedgerWallet");
 var CryptoJS = require("crypto-js");
 var FirmaWalletService = /** @class */ (function () {
@@ -59,9 +58,6 @@ 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;
     };
@@ -176,27 +172,23 @@ var FirmaWalletService = /** @class */ (function () {
     };
     FirmaWalletService.prototype.initFromPrivateKey = function (privateKey) {
         return __awaiter(this, void 0, void 0, function () {
-            var tempPrivateKey, _a, _b, error_5;
-            return __generator(this, function (_c) {
-                switch (_c.label) {
+            var tempPrivateKey, _a, error_5;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
                     case 0:
-                        _c.trys.push([0, 3, , 4]);
+                        _b.trys.push([0, 2, , 3]);
                         tempPrivateKey = Buffer.from(privateKey.replace("0x", ""), "hex");
                         _a = this;
                         return [4 /*yield*/, proto_signing_1.DirectSecp256k1Wallet.fromKey(tempPrivateKey, this.getPrefix())];
                     case 1:
-                        _a.wallet = _c.sent();
-                        _b = this;
-                        return [4 /*yield*/, amino_1.Secp256k1Wallet.fromKey(tempPrivateKey, this.getPrefix())];
-                    case 2:
-                        _b.aminoWallet = _c.sent();
+                        _a.wallet = _b.sent();
                         this.privateKey = privateKey;
-                        return [3 /*break*/, 4];
-                    case 3:
-                        error_5 = _c.sent();
+                        return [3 /*break*/, 3];
+                    case 2:
+                        error_5 = _b.sent();
                         FirmaUtil_1.FirmaUtil.printLog(error_5);
                         throw error_5;
-                    case 4: return [2 /*return*/];
+                    case 3: return [2 /*return*/];
                 }
             });
         });
@@ -366,8 +358,8 @@ var FirmaWalletService = /** @class */ (function () {
                     case 10:
                         chainId = _a.sent();
                         signerData = {
-                            account_number: Number(accountInfo.account_number),
-                            sequence: Number(accountInfo.sequence),
+                            account_number: parseInt(accountInfo.account_number, 10),
+                            sequence: parseInt(accountInfo.sequence, 10),
                             chain_id: chainId,
                         };
                         return [4 /*yield*/, (0, LedgerWallet_1.signWithSignerProtobuf)(this.ledger, messages, signerData, option, registry)];

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

@@ -1,8 +1,9 @@
 import { Registry, EncodeObject } from "@cosmjs/proto-signing";
 import { SignAndBroadcastOptions } from ".";
-import { TxRaw } from "cosmjs-types/cosmos/tx/v1beta1/tx";
+import { SignDoc, TxRaw } from "cosmjs-types/cosmos/tx/v1beta1/tx";
 import { FirmaWalletService } from "../../FirmaWalletService";
 import { DeliverTxResponse } from "@cosmjs/stargate";
+import { TxRawExt } from "./signingstargateclient";
 export declare class ITxClient {
     private readonly wallet;
     private readonly serverUrl;
@@ -14,4 +15,5 @@ export declare class ITxClient {
     broadcast(txRaw: TxRaw): Promise<DeliverTxResponse>;
     broadcastTxBytes(txBytes: Uint8Array): Promise<DeliverTxResponse>;
     signAndBroadcast(msgs: EncodeObject[], { fee, memo }: SignAndBroadcastOptions): Promise<DeliverTxResponse>;
+    signDirectForSignDoc(signerAddress: string, signDoc: SignDoc): Promise<TxRawExt>;
 }

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

@@ -38,7 +38,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ITxClient = void 0;
 var tx_1 = require("cosmjs-types/cosmos/tx/v1beta1/tx");
-var stargate_1 = require("@cosmjs/stargate");
+var signingstargateclient_1 = require("./signingstargateclient");
 var ITxClient = /** @class */ (function () {
     function ITxClient(wallet, serverUrl, registry) {
         this.wallet = wallet;
@@ -56,7 +56,7 @@ var ITxClient = /** @class */ (function () {
                     case 0:
                         if (!this.wallet.isLedger()) return [3 /*break*/, 1];
                         return [2 /*return*/, this.wallet.signLedger(msgs, { fee: fee, memo: memo }, this.registry)];
-                    case 1: return [4 /*yield*/, stargate_1.SigningStargateClient.connectWithSigner(this.serverUrl, this.rawWallet, { registry: this.registry })];
+                    case 1: return [4 /*yield*/, signingstargateclient_1.SigningStargateClient.connectWithSigner(this.serverUrl, this.rawWallet, { registry: this.registry })];
                     case 2:
                         client = _b.sent();
                         return [4 /*yield*/, this.rawWallet.getAccounts()];
@@ -73,7 +73,7 @@ var ITxClient = /** @class */ (function () {
             var client, txBytes;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, stargate_1.SigningStargateClient.connectWithSigner(this.serverUrl, this.rawWallet, { registry: this.registry })];
+                    case 0: return [4 /*yield*/, signingstargateclient_1.SigningStargateClient.connectWithSigner(this.serverUrl, this.rawWallet, { registry: this.registry })];
                     case 1:
                         client = _a.sent();
                         txBytes = tx_1.TxRaw.encode(txRaw).finish();
@@ -88,7 +88,7 @@ var ITxClient = /** @class */ (function () {
             var client;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, stargate_1.SigningStargateClient.connectWithSigner(this.serverUrl, this.rawWallet, { registry: this.registry })];
+                    case 0: return [4 /*yield*/, signingstargateclient_1.SigningStargateClient.connectWithSigner(this.serverUrl, this.rawWallet, { registry: this.registry })];
                     case 1:
                         client = _a.sent();
                         return [4 /*yield*/, client.broadcastTx(txBytes)];
@@ -112,6 +112,20 @@ var ITxClient = /** @class */ (function () {
             });
         });
     };
+    ITxClient.prototype.signDirectForSignDoc = function (signerAddress, signDoc) {
+        return __awaiter(this, void 0, void 0, function () {
+            var client;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, signingstargateclient_1.SigningStargateClient.connectWithSigner(this.serverUrl, this.rawWallet, { registry: this.registry })];
+                    case 1:
+                        client = _a.sent();
+                        return [4 /*yield*/, client.signDirectForSignDoc(signerAddress, signDoc)];
+                    case 2: return [2 /*return*/, _a.sent()];
+                }
+            });
+        });
+    };
     return ITxClient;
 }());
 exports.ITxClient = ITxClient;

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

@@ -130,7 +130,7 @@ function signWithSignerProtobuf(signer, messages, signerData, option, registry)
                         denom: a.denom,
                         amount: a.amount,
                     }); });
-                    authInfoBytes = makeAuthInfoBytesDirect(pubkeyProto, feeAmount, parseInt(option.fee.gas), signerData.sequence);
+                    authInfoBytes = makeAuthInfoBytesDirect(pubkeyProto, feeAmount, option.fee.gasLimit, signerData.sequence);
                     signDoc = tx_1.SignDoc.fromPartial({
                         bodyBytes: bodyBytes,
                         authInfoBytes: authInfoBytes,

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

@@ -1,4 +1,4 @@
-import { StdFee } from "@cosmjs/stargate";
+import { Fee } from "cosmjs-types/cosmos/tx/v1beta1/tx";
 export declare const DefaultBasicFeeGrantOption: {
     spendLimit: undefined;
     expiration: undefined;
@@ -10,7 +10,7 @@ export interface TxMisc {
     feeGranter?: string;
 }
 export interface SignAndBroadcastOptions {
-    fee: StdFee;
+    fee: Fee;
     memo: string;
 }
 export interface MsgCreateValidator {

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

@@ -0,0 +1,32 @@
+import { tendermint34, tendermint37 } from "@cosmjs/tendermint-rpc";
+/**
+ * An event attribute.
+ *
+ * This is the same attribute type as tendermint34.Attribute and tendermint35.EventAttribute
+ * but `key` and `value` are unified to strings. The conversion
+ * from bytes to string in the Tendermint 0.34 case should be done by performing
+ * [lossy] UTF-8 decoding.
+ *
+ * [lossy]: https://doc.rust-lang.org/stable/std/string/struct.String.html#method.from_utf8_lossy
+ */
+export interface Attribute {
+    readonly key: string;
+    readonly value: string;
+}
+/**
+ * The same event type as tendermint34.Event and tendermint35.Event
+ * but attribute keys and values are unified to strings. The conversion
+ * from bytes to string in the Tendermint 0.34 case should be done by performing
+ * [lossy] UTF-8 decoding.
+ *
+ * [lossy]: https://doc.rust-lang.org/stable/std/string/struct.String.html#method.from_utf8_lossy
+ */
+export interface Event {
+    readonly type: string;
+    readonly attributes: readonly Attribute[];
+}
+/**
+ * Takes a Tendermint 0.34 or 0.37 event with binary encoded key and value
+ * and converts it into an `Event` with string attributes.
+ */
+export declare function fromTendermintEvent(event: tendermint34.Event | tendermint37.Event): Event;

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

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fromTendermintEvent = void 0;
+var encoding_1 = require("@cosmjs/encoding");
+/**
+ * Takes a Tendermint 0.34 or 0.37 event with binary encoded key and value
+ * and converts it into an `Event` with string attributes.
+ */
+function fromTendermintEvent(event) {
+    return {
+        type: event.type,
+        attributes: event.attributes.map(function (attr) { return ({
+            key: typeof attr.key == "string" ? attr.key : (0, encoding_1.fromUtf8)(attr.key, true),
+            value: typeof attr.value == "string" ? attr.value : (0, encoding_1.fromUtf8)(attr.value, true),
+        }); }),
+    };
+}
+exports.fromTendermintEvent = fromTendermintEvent;

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

@@ -0,0 +1,26 @@
+import { Decimal } from "@cosmjs/math";
+import { Fee } from "cosmjs-types/cosmos/tx/v1beta1/tx";
+/**
+ * A gas price, i.e. the price of a single unit of gas. This is typically a fraction of
+ * the smallest fee token unit, such as 0.012utoken.
+ */
+export declare class GasPrice {
+    readonly amount: Decimal;
+    readonly denom: string;
+    constructor(amount: Decimal, denom: string);
+    /**
+     * Parses a gas price formatted as `<amount><denom>`, e.g. `GasPrice.fromString("0.012utoken")`.
+     *
+     * The denom must match the Cosmos SDK 0.42 pattern (https://github.com/cosmos/cosmos-sdk/blob/v0.42.4/types/coin.go#L599-L601).
+     * See `GasPrice` in @cosmjs/stargate for a more generic matcher.
+     *
+     * Separators are not yet supported.
+     */
+    static fromString(gasPrice: string): GasPrice;
+    /**
+     * Returns a string representation of this gas price, e.g. "0.025uatom".
+     * This can be used as an input to `GasPrice.fromString`.
+     */
+    toString(): string;
+}
+export declare function calculateFee(gasLimit: number, gasPrice: GasPrice | string): Fee;