@firmachain/firma-js 0.3.4 → 0.3.6-beta1

package/dist/sdk/FirmaWalletService.js

@@ -14,7 +14,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]) {
@@ -41,7 +41,6 @@ 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) {
@@ -59,45 +58,12 @@ 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;
     };
     FirmaWalletService.prototype.getMnemonic = function () {
         return this.mnemonic;
     };
-    FirmaWalletService.prototype.isLedger = function () {
-        return (this.ledger != null);
-    };
-    FirmaWalletService.prototype.initFromLedger = function (ledger) {
-        return __awaiter(this, void 0, void 0, function () {
-            var wallet;
-            return __generator(this, function (_a) {
-                try {
-                    wallet = new FirmaWalletService(this.config);
-                    wallet.ledger = ledger;
-                    return [2 /*return*/, wallet];
-                }
-                catch (error) {
-                    FirmaUtil_1.FirmaUtil.printLog(error);
-                    throw error;
-                }
-                return [2 /*return*/];
-            });
-        });
-    };
-    FirmaWalletService.prototype.signLedger = function (messages, option, registry) {
-        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 1: return [2 /*return*/, _a.sent()];
-                }
-            });
-        });
-    };
     FirmaWalletService.prototype.getPubKey = function () {
         return __awaiter(this, void 0, void 0, function () {
             var _a, _b, accounts, error_1;
@@ -105,7 +71,7 @@ var FirmaWalletService = /** @class */ (function () {
                 switch (_c.label) {
                     case 0:
                         _c.trys.push([0, 4, , 5]);
-                        if (!(this.ledger != null)) return [3 /*break*/, 2];
+                        if (!this.isLedger()) return [3 /*break*/, 2];
                         _b = (_a = FirmaUtil_1.FirmaUtil).arrayBufferToBase64;
                         return [4 /*yield*/, this.ledger.getPublicKey()];
                     case 1: return [2 /*return*/, _b.apply(_a, [_c.sent()])];
@@ -129,7 +95,7 @@ var FirmaWalletService = /** @class */ (function () {
                 switch (_a.label) {
                     case 0:
                         _a.trys.push([0, 4, , 5]);
-                        if (!(this.ledger != null)) return [3 /*break*/, 2];
+                        if (!this.isLedger()) return [3 /*break*/, 2];
                         return [4 /*yield*/, this.ledger.getAddress()];
                     case 1: return [2 /*return*/, _a.sent()];
                     case 2: return [4 /*yield*/, this.wallet.getAccounts()];
@@ -147,7 +113,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);
@@ -193,7 +159,7 @@ var FirmaWalletService = /** @class */ (function () {
                         seed = _a.sent();
                         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_4 = _a.sent();
@@ -206,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*/];
                 }
             });
         });
@@ -336,6 +298,78 @@ var FirmaWalletService = /** @class */ (function () {
             });
         });
     };
+    // Ledger
+    FirmaWalletService.prototype.isLedger = function () {
+        return (this.ledger != null);
+    };
+    FirmaWalletService.prototype.initFromLedger = function (ledger) {
+        return __awaiter(this, void 0, void 0, function () {
+            var wallet;
+            return __generator(this, function (_a) {
+                try {
+                    wallet = new FirmaWalletService(this.config);
+                    wallet.ledger = ledger;
+                    return [2 /*return*/, wallet];
+                }
+                catch (error) {
+                    FirmaUtil_1.FirmaUtil.printLog(error);
+                    throw error;
+                }
+                return [2 /*return*/];
+            });
+        });
+    };
+    FirmaWalletService.prototype.signLedger = function (messages, option, registry) {
+        return __awaiter(this, void 0, void 0, function () {
+            var address, addressAndPubkey, displayError_1, error_10, errorMessage, accountInfo, chainId, signerData;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        if (!this.ledger) {
+                            throw new Error("Ledger is not initialized.");
+                        }
+                        _a.label = 1;
+                    case 1:
+                        _a.trys.push([1, 7, , 8]);
+                        return [4 /*yield*/, this.ledger.getAddressAndPublicKey()];
+                    case 2:
+                        addressAndPubkey = _a.sent();
+                        address = addressAndPubkey.address;
+                        if (!this.ledger.showAddressOnDevice) return [3 /*break*/, 6];
+                        _a.label = 3;
+                    case 3:
+                        _a.trys.push([3, 5, , 6]);
+                        return [4 /*yield*/, this.ledger.showAddressOnDevice()];
+                    case 4:
+                        _a.sent();
+                        return [3 /*break*/, 6];
+                    case 5:
+                        displayError_1 = _a.sent();
+                        return [3 /*break*/, 6];
+                    case 6: return [3 /*break*/, 8];
+                    case 7:
+                        error_10 = _a.sent();
+                        errorMessage = error_10 instanceof Error ? error_10.message : String(error_10);
+                        throw new Error("Failed to connect to Ledger: ".concat(errorMessage, ". Please make sure your Ledger is connected and the FirmaChain app is open."));
+                    case 8: return [4 /*yield*/, FirmaUtil_1.FirmaUtil.getAccountInfo(address)];
+                    case 9:
+                        accountInfo = _a.sent();
+                        return [4 /*yield*/, FirmaUtil_1.FirmaUtil.getChainId()];
+                    case 10:
+                        chainId = _a.sent();
+                        signerData = {
+                            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)];
+                    case 11: 
+                    // Use protobuf signing with FirmaChain Ledger app
+                    return [2 /*return*/, _a.sent()];
+                }
+            });
+        });
+    };
     return FirmaWalletService;
 }());
 exports.FirmaWalletService = FirmaWalletService;

package/dist/sdk/firmachain/authz/AuthzQueryClient.js

@@ -14,7 +14,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]) {
@@ -60,7 +60,7 @@ var AuthzQueryClient = /** @class */ (function () {
                 switch (_a.label) {
                     case 0:
                         msgType = "/cosmos.bank.v1beta1.MsgSend";
-                        path = "/cosmos/authz/v1beta1/grants?granter=" + granterAddress + "&grantee=" + granteeAddress + "&msg_type_url=" + msgType;
+                        path = "/cosmos/authz/v1beta1/grants?granter=".concat(granterAddress, "&grantee=").concat(granteeAddress, "&msg_type_url=").concat(msgType);
                         return [4 /*yield*/, this.axios.get(path, { params: { "pagination.key": paginationKey } })];
                     case 1:
                         result = _a.sent();
@@ -84,7 +84,7 @@ var AuthzQueryClient = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        path = "/cosmos/authz/v1beta1/grants?granter=" + granterAddress + "&grantee=" + granteeAddress + "&msg_type_url=" + msgType;
+                        path = "/cosmos/authz/v1beta1/grants?granter=".concat(granterAddress, "&grantee=").concat(granteeAddress, "&msg_type_url=").concat(msgType);
                         return [4 /*yield*/, this.axios.get(path, { params: { "pagination.key": paginationKey } })];
                     case 1:
                         result = _a.sent();
@@ -120,7 +120,7 @@ var AuthzQueryClient = /** @class */ (function () {
                                 msgType = "/cosmos.staking.v1beta1.MsgBeginRedelegate";
                                 break;
                         }
-                        path = "/cosmos/authz/v1beta1/grants?granter=" + granterAddress + "&grantee=" + granteeAddress + "&msg_type_url=" + msgType;
+                        path = "/cosmos/authz/v1beta1/grants?granter=".concat(granterAddress, "&grantee=").concat(granteeAddress, "&msg_type_url=").concat(msgType);
                         return [4 /*yield*/, this.axios.get(path, { params: { "pagination.key": paginationKey } })];
                     case 1:
                         result = _a.sent();

package/dist/sdk/firmachain/authz/AuthzTxTypes.d.ts

@@ -1,10 +1,7 @@
-/// <reference types="long" />
 import { Coin } from "cosmjs-types/cosmos/base/v1beta1/coin";
-import _m0 from "protobufjs/minimal";
-import { Writer } from "protobufjs/minimal";
-import { Timestamp } from "../google/protobuf/timestamp";
 import { Any } from "../google/protobuf/any";
 import { BinaryWriter } from "cosmjs-types/binary";
+import { Timestamp } from "cosmjs-types/google/protobuf/timestamp";
 export interface GenericAuthorization {
     /** Msg, identified by it's type URL, to grant unrestricted permissions to execute */
     msg: string;
@@ -56,7 +53,7 @@ export declare const MsgGrant: {
     fromPartial(object: DeepPartial<MsgGrant>): MsgGrant;
 };
 export declare const MsgExecResponse: {
-    encode(message: MsgExecResponse, writer?: _m0.Writer): _m0.Writer;
+    encode(message: MsgExecResponse, writer?: BinaryWriter): BinaryWriter;
     fromPartial(object: DeepPartial<MsgExecResponse>): MsgExecResponse;
 };
 export declare const MsgExec: {
@@ -64,15 +61,15 @@ export declare const MsgExec: {
     fromPartial(object: DeepPartial<MsgExec>): MsgExec;
 };
 export declare const MsgGrantResponse: {
-    encode(_: MsgGrantResponse, writer?: _m0.Writer): _m0.Writer;
+    encode(_: MsgGrantResponse, writer?: BinaryWriter): BinaryWriter;
     fromPartial(object: DeepPartial<MsgGrantResponse>): MsgGrantResponse;
 };
 export declare const MsgRevoke: {
-    encode(message: MsgRevoke, writer?: _m0.Writer): _m0.Writer;
+    encode(message: MsgRevoke, writer?: BinaryWriter): BinaryWriter;
     fromPartial(object: DeepPartial<MsgRevoke>): MsgRevoke;
 };
 export declare const MsgRevokeResponse: {
-    encode(_: MsgRevokeResponse, writer?: _m0.Writer): _m0.Writer;
+    encode(_: MsgRevokeResponse, writer?: BinaryWriter): BinaryWriter;
     fromPartial(object: DeepPartial<MsgRevokeResponse>): MsgRevokeResponse;
 };
 export declare const Grant: {
@@ -80,7 +77,7 @@ export declare const Grant: {
     fromPartial(object: DeepPartial<Grant>): Grant;
 };
 export declare const GenericAuthorization: {
-    encode(message: GenericAuthorization, writer?: _m0.Writer): _m0.Writer;
+    encode(message: GenericAuthorization, writer?: BinaryWriter): BinaryWriter;
     fromPartial(object: DeepPartial<GenericAuthorization>): GenericAuthorization;
 };
 /**
@@ -141,8 +138,8 @@ export declare const SendAuthorization: {
     encode(message: SendAuthorization, writer?: BinaryWriter): BinaryWriter;
     fromPartial(object: DeepPartial<SendAuthorization>): SendAuthorization;
 };
-declare type Builtin = Date | Function | Uint8Array | string | number | boolean | undefined | Long;
-export declare type DeepPartial<T> = T extends Builtin ? T : T extends Array<infer U> ? Array<DeepPartial<U>> : T extends ReadonlyArray<infer U> ? ReadonlyArray<DeepPartial<U>> : T extends {} ? {
+type Builtin = Date | Function | Uint8Array | string | number | boolean | undefined | bigint;
+export type DeepPartial<T> = T extends Builtin ? T : T extends Array<infer U> ? Array<DeepPartial<U>> : T extends ReadonlyArray<infer U> ? ReadonlyArray<DeepPartial<U>> : T extends {} ? {
     [K in keyof T]?: DeepPartial<T[K]>;
 } : Partial<T>;
 export {};

package/dist/sdk/firmachain/authz/AuthzTxTypes.js

@@ -10,16 +10,12 @@ var __values = (this && this.__values) || function(o) {
     };
     throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SendAuthorization = exports.StakeAuthorization_Validators = exports.StakeAuthorization = exports.authorizationTypeToJSON = exports.authorizationTypeFromJSON = exports.AuthorizationType = exports.GenericAuthorization = exports.Grant = exports.MsgRevokeResponse = exports.MsgRevoke = exports.MsgGrantResponse = exports.MsgExec = exports.MsgExecResponse = exports.MsgGrant = void 0;
 var coin_1 = require("cosmjs-types/cosmos/base/v1beta1/coin");
-var minimal_1 = __importDefault(require("protobufjs/minimal"));
-var timestamp_1 = require("../google/protobuf/timestamp");
 var any_1 = require("../google/protobuf/any");
 var binary_1 = require("cosmjs-types/binary");
+var timestamp_1 = require("cosmjs-types/google/protobuf/timestamp");
 function createBaseMsgGrant() {
     return { granter: "", grantee: "", grant: undefined };
 }
@@ -53,7 +49,7 @@ function createBaseMsgExecResponse() {
 exports.MsgExecResponse = {
     encode: function (message, writer) {
         var e_1, _a;
-        if (writer === void 0) { writer = minimal_1.default.Writer.create(); }
+        if (writer === void 0) { writer = binary_1.BinaryWriter.create(); }
         try {
             for (var _b = __values(message.results), _c = _b.next(); !_c.done; _c = _b.next()) {
                 var v = _c.value;
@@ -115,7 +111,7 @@ function createBaseMsgGrantResponse() {
 }
 exports.MsgGrantResponse = {
     encode: function (_, writer) {
-        if (writer === void 0) { writer = minimal_1.default.Writer.create(); }
+        if (writer === void 0) { writer = binary_1.BinaryWriter.create(); }
         return writer;
     },
     fromPartial: function (object) {
@@ -128,7 +124,7 @@ function createBaseMsgRevoke() {
 }
 exports.MsgRevoke = {
     encode: function (message, writer) {
-        if (writer === void 0) { writer = minimal_1.default.Writer.create(); }
+        if (writer === void 0) { writer = binary_1.BinaryWriter.create(); }
         if (message.granter !== "") {
             writer.uint32(10).string(message.granter);
         }
@@ -154,7 +150,7 @@ function createBaseMsgRevokeResponse() {
 }
 exports.MsgRevokeResponse = {
     encode: function (_, writer) {
-        if (writer === void 0) { writer = minimal_1.default.Writer.create(); }
+        if (writer === void 0) { writer = binary_1.BinaryWriter.create(); }
         return writer;
     },
     fromPartial: function (object) {
@@ -194,7 +190,7 @@ function createBaseGenericAuthorization() {
 }
 exports.GenericAuthorization = {
     encode: function (message, writer) {
-        if (writer === void 0) { writer = minimal_1.default.Writer.create(); }
+        if (writer === void 0) { writer = binary_1.BinaryWriter.create(); }
         if (message.msg !== "") {
             writer.uint32(10).string(message.msg);
         }

package/dist/sdk/firmachain/authz/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/dist/sdk/firmachain/bank/BankQueryClient.js

@@ -14,7 +14,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]) {
@@ -57,7 +57,7 @@ var BankQueryClient = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        path = "/cosmos/bank/v1beta1/supply/by_denom?denom=" + denom;
+                        path = "/cosmos/bank/v1beta1/supply/by_denom?denom=".concat(denom);
                         return [4 /*yield*/, this.axios.get(path)];
                     case 1:
                         result = _a.sent();
@@ -72,7 +72,7 @@ var BankQueryClient = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        path = "/cosmos/bank/v1beta1/balances/" + address + "/by_denom?denom=" + denom;
+                        path = "/cosmos/bank/v1beta1/balances/".concat(address, "/by_denom?denom=").concat(denom);
                         return [4 /*yield*/, this.axios.get(path)];
                     case 1:
                         result = _a.sent();
@@ -87,7 +87,7 @@ var BankQueryClient = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        path = "/cosmos/bank/v1beta1/balances/" + address;
+                        path = "/cosmos/bank/v1beta1/balances/".concat(address);
                         return [4 /*yield*/, this.axios.get(path)];
                     case 1:
                         result = _a.sent();
@@ -102,7 +102,7 @@ var BankQueryClient = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        path = "/cosmos/bank/v1beta1/balances/" + address + "/by_denom?denom=" + denom;
+                        path = "/cosmos/bank/v1beta1/balances/".concat(address, "/by_denom?denom=").concat(denom);
                         return [4 /*yield*/, this.axios.get(path)];
                     case 1:
                         result = _a.sent();

package/dist/sdk/firmachain/bank/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

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

@@ -1,8 +1,9 @@
 import { Registry, EncodeObject } from "@cosmjs/proto-signing";
 import { SignAndBroadcastOptions } from ".";
 import { SignDoc, TxRaw } from "cosmjs-types/cosmos/tx/v1beta1/tx";
-import { DeliverTxResponse } from "@cosmjs/stargate";
 import { FirmaWalletService } from "../../FirmaWalletService";
+import { DeliverTxResponse } from "@cosmjs/stargate";
+import { TxRawExt } from "./signingstargateclient";
 export declare class ITxClient {
     private readonly wallet;
     private readonly serverUrl;
@@ -14,6 +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<DeliverTxResponse>;
-    signDirectForSignDocTxRaw(signerAddress: string, signDoc: SignDoc): Promise<TxRaw>;
+    signDirectForSignDoc(signerAddress: string, signDoc: SignDoc): Promise<TxRawExt>;
 }

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

@@ -14,7 +14,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]) {
@@ -35,27 +35,10 @@ 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 __read = (this && this.__read) || function (o, n) {
-    var m = typeof Symbol === "function" && o[Symbol.iterator];
-    if (!m) return o;
-    var i = m.call(o), r, ar = [], e;
-    try {
-        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
-    }
-    catch (error) { e = { error: error }; }
-    finally {
-        try {
-            if (r && !r.done && (m = i["return"])) m.call(i);
-        }
-        finally { if (e) throw e.error; }
-    }
-    return ar;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ITxClient = void 0;
-var encoding_1 = require("@cosmjs/encoding");
 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;
@@ -63,41 +46,24 @@ var ITxClient = /** @class */ (function () {
         this.registry = registry;
         this.rawWallet = wallet.getRawWallet();
     }
-    ITxClient.prototype.getRegistry = function () {
-        return this.registry;
-    };
+    ITxClient.prototype.getRegistry = function () { return this.registry; };
     ITxClient.prototype.sign = function (msgs, _a) {
         var fee = _a.fee, memo = _a.memo;
         return __awaiter(this, void 0, void 0, function () {
-            var client, _b, account, accountData, chainId, signerData;
-            return __generator(this, function (_c) {
-                switch (_c.label) {
+            var client, address;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
                     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 = _c.sent();
+                        client = _b.sent();
                         return [4 /*yield*/, this.rawWallet.getAccounts()];
                     case 3:
-                        _b = __read.apply(void 0, [_c.sent(), 1]), account = _b[0];
-                        return [4 /*yield*/, client.getAccount(account.address)];
-                    case 4:
-                        accountData = _c.sent();
-                        return [4 /*yield*/, client.getChainId()];
-                    case 5:
-                        chainId = _c.sent();
-                        if (!accountData)
-                            throw new Error("Account data not found");
-                        signerData = {
-                            accountNumber: accountData.accountNumber,
-                            sequence: accountData.sequence,
-                            chainId: chainId,
-                        };
-                        return [4 /*yield*/, client.sign(account.address, msgs, fee, memo, signerData)];
-                    case 6: return [2 /*return*/, _c.sent()];
+                        address = (_b.sent())[0].address;
+                        return [4 /*yield*/, client.sign(address, msgs, fee, memo)];
+                    case 4: return [2 /*return*/, _b.sent()];
                 }
             });
         });
@@ -107,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.StargateClient.connect(this.serverUrl)];
+                    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();
@@ -122,7 +88,7 @@ var ITxClient = /** @class */ (function () {
             var client;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, stargate_1.StargateClient.connect(this.serverUrl)];
+                    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)];
@@ -131,59 +97,35 @@ var ITxClient = /** @class */ (function () {
             });
         });
     };
-    // sign() → broadcast()
     ITxClient.prototype.signAndBroadcast = function (msgs, _a) {
         var fee = _a.fee, memo = _a.memo;
         return __awaiter(this, void 0, void 0, function () {
-            var txRaw;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0: return [4 /*yield*/, this.sign(msgs, { fee: fee, memo: memo })];
-                    case 1:
-                        txRaw = _b.sent();
-                        return [4 /*yield*/, this.broadcast(txRaw)];
-                    case 2: return [2 /*return*/, _b.sent()];
+            var _b;
+            return __generator(this, function (_c) {
+                switch (_c.label) {
+                    case 0:
+                        _b = this.broadcast;
+                        return [4 /*yield*/, this.sign(msgs, { fee: fee, memo: memo })];
+                    case 1: return [4 /*yield*/, _b.apply(this, [_c.sent()])];
+                    case 2: return [2 /*return*/, _c.sent()];
                 }
             });
         });
     };
     ITxClient.prototype.signDirectForSignDoc = function (signerAddress, signDoc) {
         return __awaiter(this, void 0, void 0, function () {
-            var signatureResponse, txRaw;
+            var client;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.rawWallet.signDirect(signerAddress, signDoc)];
+                    case 0: return [4 /*yield*/, signingstargateclient_1.SigningStargateClient.connectWithSigner(this.serverUrl, this.rawWallet, { registry: this.registry })];
                     case 1:
-                        signatureResponse = _a.sent();
-                        txRaw = tx_1.TxRaw.fromPartial({
-                            bodyBytes: signDoc.bodyBytes,
-                            authInfoBytes: signDoc.authInfoBytes,
-                            signatures: [encoding_1.fromBase64(signatureResponse.signature.signature)],
-                        });
-                        return [4 /*yield*/, this.broadcast(txRaw)];
+                        client = _a.sent();
+                        return [4 /*yield*/, client.signDirectForSignDoc(signerAddress, signDoc)];
                     case 2: return [2 /*return*/, _a.sent()];
                 }
             });
         });
     };
-    ITxClient.prototype.signDirectForSignDocTxRaw = function (signerAddress, signDoc) {
-        return __awaiter(this, void 0, void 0, function () {
-            var signatureResponse, txRaw;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.rawWallet.signDirect(signerAddress, signDoc)];
-                    case 1:
-                        signatureResponse = _a.sent();
-                        txRaw = tx_1.TxRaw.fromPartial({
-                            bodyBytes: signDoc.bodyBytes,
-                            authInfoBytes: signDoc.authInfoBytes,
-                            signatures: [encoding_1.fromBase64(signatureResponse.signature.signature)],
-                        });
-                        return [2 /*return*/, txRaw];
-                }
-            });
-        });
-    };
     return ITxClient;
 }());
 exports.ITxClient = ITxClient;