@firmachain/firma-js 0.3.4 → 0.3.6-beta1

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

@@ -14,17 +14,6 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -40,7 +29,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]) {
@@ -77,85 +66,51 @@ 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 };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SigningStargateClient = exports.isMsgSignData = exports.createDefaultAminoConverters = exports.defaultRegistryTypes = void 0;
-var amino_1 = require("@cosmjs/amino");
-var crypto_1 = require("@cosmjs/crypto");
+exports.SigningStargateClient = exports.defaultRegistryTypes = void 0;
 var encoding_1 = require("@cosmjs/encoding");
-var math_1 = require("@cosmjs/math");
 var proto_signing_1 = require("@cosmjs/proto-signing");
 var tendermint_rpc_1 = require("@cosmjs/tendermint-rpc");
-var utils_1 = require("@cosmjs/utils");
 var coin_1 = require("cosmjs-types/cosmos/base/v1beta1/coin");
-var tx_1 = require("cosmjs-types/cosmos/distribution/v1beta1/tx");
-var tx_2 = require("cosmjs-types/cosmos/staking/v1beta1/tx");
-var signing_1 = require("cosmjs-types/cosmos/tx/signing/v1beta1/signing");
-var tx_3 = require("cosmjs-types/cosmos/tx/v1beta1/tx");
-var tx_4 = require("cosmjs-types/ibc/applications/transfer/v1/tx");
-var fast_deep_equal_1 = __importDefault(require("fast-deep-equal"));
-var aminotypes_1 = require("./aminotypes");
-var fee_1 = require("./fee");
-var modules_1 = require("./modules");
-var modules_2 = require("./modules");
-var stargateclient_1 = require("./stargateclient");
-var FirmaUtil_1 = require("../../FirmaUtil");
+var tx_1 = require("cosmjs-types/cosmos/tx/v1beta1/tx");
+var keys_1 = require("cosmjs-types/cosmos/crypto/secp256k1/keys");
+var axios_1 = __importDefault(require("axios"));
+var accounts_1 = require("./accounts");
+var stargateClient_1 = require("./stargateClient");
+var any_1 = require("cosmjs-types/google/protobuf/any");
+var modules_1 = require("@cosmjs/stargate/build/modules");
+var signing_1 = require("./signing");
 exports.defaultRegistryTypes = __spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray([
     ["/cosmos.base.v1beta1.Coin", coin_1.Coin]
-], __read(modules_1.authzTypes)), __read(modules_1.bankTypes)), __read(modules_1.distributionTypes)), __read(modules_1.feegrantTypes)), __read(modules_1.govTypes)), __read(modules_1.groupTypes)), __read(modules_1.stakingTypes)), __read(modules_1.ibcTypes)), __read(modules_1.vestingTypes));
-function createDefaultAminoConverters() {
-    return __assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign({}, modules_2.createAuthzAminoConverters()), modules_2.createBankAminoConverters()), modules_2.createDistributionAminoConverters()), modules_2.createGovAminoConverters()), modules_2.createStakingAminoConverters()), modules_2.createIbcAminoConverters()), modules_2.createFeegrantAminoConverters()), modules_2.createVestingAminoConverters());
-}
-exports.createDefaultAminoConverters = createDefaultAminoConverters;
-function isMsgSignData(msg) {
-    var castedMsg = msg;
-    if (castedMsg.type !== "sign/MsgSignData")
-        return false;
-    if (!utils_1.isNonNullObject(castedMsg.value))
-        return false;
-    if (typeof castedMsg.value.signer !== "string")
-        return false;
-    if (typeof castedMsg.value.data !== "string")
-        return false;
-    return true;
-}
-exports.isMsgSignData = isMsgSignData;
+], __read(modules_1.authzTypes), false), __read(modules_1.bankTypes), false), __read(modules_1.distributionTypes), false), __read(modules_1.feegrantTypes), false), __read(modules_1.govTypes), false), __read(modules_1.groupTypes), false), __read(modules_1.stakingTypes), false), __read(modules_1.ibcTypes), false), __read(modules_1.vestingTypes), false);
 var SigningStargateClient = /** @class */ (function (_super) {
     __extends(SigningStargateClient, _super);
     function SigningStargateClient(cometClient, signer, options) {
         var _this = _super.call(this, cometClient, options) || this;
-        // Starting with Cosmos SDK 0.47, we see many cases in which 1.3 is not enough anymore
-        // E.g. https://github.com/cosmos/cosmos-sdk/issues/16020
-        _this.defaultGasMultiplier = 1.4;
-        var _a = options.registry, registry = _a === void 0 ? new proto_signing_1.Registry(exports.defaultRegistryTypes) : _a, _b = options.aminoTypes, aminoTypes = _b === void 0 ? new aminotypes_1.AminoTypes(createDefaultAminoConverters()) : _b;
+        var _a = options.registry, registry = _a === void 0 ? new proto_signing_1.Registry(exports.defaultRegistryTypes) : _a;
         _this.registry = registry;
-        _this.aminoTypes = aminoTypes;
         _this.signer = signer;
-        _this.broadcastTimeoutMs = options.broadcastTimeoutMs;
-        _this.broadcastPollIntervalMs = options.broadcastPollIntervalMs;
-        _this.gasPrice = options.gasPrice;
         return _this;
     }
-    /**
-     * Creates an instance by connecting to the given CometBFT RPC endpoint.
-     *
-     * This uses auto-detection to decide between a CometBFT 0.38, Tendermint 0.37 and 0.34 client.
-     * To set the Comet client explicitly, use `createWithSigner`.
-     */
     SigningStargateClient.connectWithSigner = function (endpoint, signer, options) {
         if (options === void 0) { options = {}; }
         return __awaiter(this, void 0, void 0, function () {
             var cometClient;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, tendermint_rpc_1.connectComet(endpoint)];
+                    case 0: return [4 /*yield*/, (0, tendermint_rpc_1.connectComet)(endpoint)];
                     case 1:
                         cometClient = _a.sent();
                         return [2 /*return*/, SigningStargateClient.createWithSigner(cometClient, signer, options)];
@@ -163,10 +118,6 @@ var SigningStargateClient = /** @class */ (function (_super) {
             });
         });
     };
-    /**
-     * Creates an instance from a manually created Comet client.
-     * Use this to use `Comet38Client` or `Tendermint37Client` instead of `Tendermint34Client`.
-     */
     SigningStargateClient.createWithSigner = function (cometClient, signer, options) {
         if (options === void 0) { options = {}; }
         return __awaiter(this, void 0, void 0, function () {
@@ -175,254 +126,57 @@ var SigningStargateClient = /** @class */ (function (_super) {
             });
         });
     };
-    /**
-     * Creates a client in offline mode.
-     *
-     * This should only be used in niche cases where you know exactly what you're doing,
-     * e.g. when building an offline signing application.
-     *
-     * When you try to use online functionality with such a signer, an
-     * exception will be raised.
-     */
-    SigningStargateClient.offline = function (signer, options) {
-        if (options === void 0) { options = {}; }
-        return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-                return [2 /*return*/, new SigningStargateClient(undefined, signer, options)];
-            });
-        });
-    };
-    SigningStargateClient.prototype.simulate = function (signerAddress, messages, memo) {
-        return __awaiter(this, void 0, void 0, function () {
-            var anyMsgs, accountFromSigner, pubkey, sequence, gasInfo;
-            var _this = this;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        anyMsgs = messages.map(function (m) { return _this.registry.encodeAsAny(m); });
-                        return [4 /*yield*/, this.signer.getAccounts()];
-                    case 1:
-                        accountFromSigner = (_a.sent()).find(function (account) { return account.address === signerAddress; });
-                        if (!accountFromSigner) {
-                            throw new Error("Failed to retrieve account from signer");
-                        }
-                        pubkey = amino_1.encodeSecp256k1Pubkey(accountFromSigner.pubkey);
-                        return [4 /*yield*/, this.getSequence(signerAddress)];
-                    case 2:
-                        sequence = (_a.sent()).sequence;
-                        return [4 /*yield*/, this.forceGetQueryClient().tx.simulate(anyMsgs, memo, pubkey, sequence)];
-                    case 3:
-                        gasInfo = (_a.sent()).gasInfo;
-                        utils_1.assertDefined(gasInfo);
-                        return [2 /*return*/, math_1.Uint53.fromString(gasInfo.gasUsed.toString()).toNumber()];
-                }
-            });
-        });
-    };
-    SigningStargateClient.prototype.sendTokens = function (senderAddress, recipientAddress, amount, fee, memo) {
-        if (memo === void 0) { memo = ""; }
-        return __awaiter(this, void 0, void 0, function () {
-            var sendMsg;
-            return __generator(this, function (_a) {
-                sendMsg = {
-                    typeUrl: "/cosmos.bank.v1beta1.MsgSend",
-                    value: {
-                        fromAddress: senderAddress,
-                        toAddress: recipientAddress,
-                        amount: __spreadArray([], __read(amount)),
-                    },
-                };
-                return [2 /*return*/, this.signAndBroadcast(senderAddress, [sendMsg], fee, memo)];
-            });
-        });
-    };
-    SigningStargateClient.prototype.delegateTokens = function (delegatorAddress, validatorAddress, amount, fee, memo) {
-        if (memo === void 0) { memo = ""; }
-        return __awaiter(this, void 0, void 0, function () {
-            var delegateMsg;
-            return __generator(this, function (_a) {
-                delegateMsg = {
-                    typeUrl: "/cosmos.staking.v1beta1.MsgDelegate",
-                    value: tx_2.MsgDelegate.fromPartial({
-                        delegatorAddress: delegatorAddress,
-                        validatorAddress: validatorAddress,
-                        amount: amount,
-                    }),
-                };
-                return [2 /*return*/, this.signAndBroadcast(delegatorAddress, [delegateMsg], fee, memo)];
-            });
-        });
-    };
-    SigningStargateClient.prototype.undelegateTokens = function (delegatorAddress, validatorAddress, amount, fee, memo) {
-        if (memo === void 0) { memo = ""; }
-        return __awaiter(this, void 0, void 0, function () {
-            var undelegateMsg;
-            return __generator(this, function (_a) {
-                undelegateMsg = {
-                    typeUrl: "/cosmos.staking.v1beta1.MsgUndelegate",
-                    value: tx_2.MsgUndelegate.fromPartial({
-                        delegatorAddress: delegatorAddress,
-                        validatorAddress: validatorAddress,
-                        amount: amount,
-                    }),
-                };
-                return [2 /*return*/, this.signAndBroadcast(delegatorAddress, [undelegateMsg], fee, memo)];
-            });
-        });
-    };
-    SigningStargateClient.prototype.withdrawRewards = function (delegatorAddress, validatorAddress, fee, memo) {
-        if (memo === void 0) { memo = ""; }
-        return __awaiter(this, void 0, void 0, function () {
-            var withdrawMsg;
-            return __generator(this, function (_a) {
-                withdrawMsg = {
-                    typeUrl: "/cosmos.distribution.v1beta1.MsgWithdrawDelegatorReward",
-                    value: tx_1.MsgWithdrawDelegatorReward.fromPartial({
-                        delegatorAddress: delegatorAddress,
-                        validatorAddress: validatorAddress,
-                    }),
-                };
-                return [2 /*return*/, this.signAndBroadcast(delegatorAddress, [withdrawMsg], fee, memo)];
-            });
-        });
-    };
-    /**
-     * @deprecated This API does not support setting the memo field of `MsgTransfer` (only the transaction memo).
-     * We'll remove this method at some point because trying to wrap the various message types is a losing strategy.
-     * Please migrate to `signAndBroadcast` with an `MsgTransferEncodeObject` created in the caller code instead.
-     * @see https://github.com/cosmos/cosmjs/issues/1493
-     */
-    SigningStargateClient.prototype.sendIbcTokens = function (senderAddress, recipientAddress, transferAmount, sourcePort, sourceChannel, timeoutHeight, 
-    /** timeout in seconds */
-    timeoutTimestamp, fee, memo) {
-        if (memo === void 0) { memo = ""; }
-        return __awaiter(this, void 0, void 0, function () {
-            var timeoutTimestampNanoseconds, transferMsg;
-            return __generator(this, function (_a) {
-                timeoutTimestampNanoseconds = timeoutTimestamp
-                    ? BigInt(timeoutTimestamp) * BigInt(1000000000)
-                    : undefined;
-                transferMsg = {
-                    typeUrl: "/ibc.applications.transfer.v1.MsgTransfer",
-                    value: tx_4.MsgTransfer.fromPartial({
-                        sourcePort: sourcePort,
-                        sourceChannel: sourceChannel,
-                        sender: senderAddress,
-                        receiver: recipientAddress,
-                        token: transferAmount,
-                        timeoutHeight: timeoutHeight,
-                        timeoutTimestamp: timeoutTimestampNanoseconds,
-                    }),
-                };
-                return [2 /*return*/, this.signAndBroadcast(senderAddress, [transferMsg], fee, memo)];
-            });
-        });
-    };
-    SigningStargateClient.prototype.signAndBroadcast = function (signerAddress, messages, fee, memo, timeoutHeight) {
-        if (memo === void 0) { memo = ""; }
-        return __awaiter(this, void 0, void 0, function () {
-            var usedFee, gasEstimation, multiplier, txRaw, txBytes;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        if (!(fee == "auto" || typeof fee === "number")) return [3 /*break*/, 2];
-                        utils_1.assertDefined(this.gasPrice, "Gas price must be set in the client options when auto gas is used.");
-                        return [4 /*yield*/, this.simulate(signerAddress, messages, memo)];
-                    case 1:
-                        gasEstimation = _a.sent();
-                        multiplier = typeof fee === "number" ? fee : this.defaultGasMultiplier;
-                        usedFee = fee_1.calculateFee(Math.round(gasEstimation * multiplier), this.gasPrice);
-                        return [3 /*break*/, 3];
-                    case 2:
-                        usedFee = fee;
-                        _a.label = 3;
-                    case 3: return [4 /*yield*/, this.sign(signerAddress, messages, usedFee, memo, undefined, timeoutHeight)];
-                    case 4:
-                        txRaw = _a.sent();
-                        txBytes = tx_3.TxRaw.encode(txRaw).finish();
-                        return [2 /*return*/, this.broadcastTx(txBytes, this.broadcastTimeoutMs, this.broadcastPollIntervalMs)];
-                }
-            });
-        });
-    };
-    /**
-     * This method is useful if you want to send a transaction in broadcast,
-     * without waiting for it to be placed inside a block, because for example
-     * I would like to receive the hash to later track the transaction with another tool.
-     * @returns Returns the hash of the transaction
-     */
-    SigningStargateClient.prototype.signAndBroadcastSync = function (signerAddress, messages, fee, memo, timeoutHeight) {
+    SigningStargateClient.prototype.signAndBroadcast = function (signerAddress, messages, fee, memo) {
         if (memo === void 0) { memo = ""; }
         return __awaiter(this, void 0, void 0, function () {
-            var usedFee, gasEstimation, multiplier, txRaw, txBytes;
+            var txRaw, txBytes;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0:
-                        if (!(fee == "auto" || typeof fee === "number")) return [3 /*break*/, 2];
-                        utils_1.assertDefined(this.gasPrice, "Gas price must be set in the client options when auto gas is used.");
-                        return [4 /*yield*/, this.simulate(signerAddress, messages, memo)];
+                    case 0: return [4 /*yield*/, this.sign(signerAddress, messages, fee, memo)];
                     case 1:
-                        gasEstimation = _a.sent();
-                        multiplier = typeof fee === "number" ? fee : this.defaultGasMultiplier;
-                        usedFee = fee_1.calculateFee(Math.round(gasEstimation * multiplier), this.gasPrice);
-                        return [3 /*break*/, 3];
-                    case 2:
-                        usedFee = fee;
-                        _a.label = 3;
-                    case 3: return [4 /*yield*/, this.sign(signerAddress, messages, usedFee, memo, undefined, timeoutHeight)];
-                    case 4:
                         txRaw = _a.sent();
-                        txBytes = tx_3.TxRaw.encode(txRaw).finish();
-                        return [2 /*return*/, this.broadcastTxSync(txBytes)];
+                        txBytes = tx_1.TxRaw.encode(txRaw).finish();
+                        return [2 /*return*/, this.broadcastTx(txBytes)];
                 }
             });
         });
     };
     SigningStargateClient.makeSignDocForSend = function (signerAddress, pubkeyStr, messages, fee, memo, serverUrl, chainId, registry) {
         return __awaiter(this, void 0, void 0, function () {
-            var client, _a, accountNumber, sequence, account, rawSecp256k1Pubkey, pubkey, txBodyEncodeObject, txBodyBytes, gasLimit, feePayer, authInfoBytes;
+            var _a, accountNumber, sequence, account, pubkeyBytes, pubkey, pubkeyAny, anyMsgs, txBody, bodyBytes, authInfoBytes;
             return __generator(this, function (_b) {
                 switch (_b.label) {
-                    case 0: return [4 /*yield*/, SigningStargateClient.connect(serverUrl)];
+                    case 0:
+                        SigningStargateClient._endpoint = serverUrl;
+                        return [4 /*yield*/, SigningStargateClient.getSequence(signerAddress)];
                     case 1:
-                        client = _b.sent();
-                        return [4 /*yield*/, client.getSequence(signerAddress)];
-                    case 2:
                         _a = _b.sent(), accountNumber = _a.accountNumber, sequence = _a.sequence;
-                        return [4 /*yield*/, client.getAccount(signerAddress)];
-                    case 3:
+                        return [4 /*yield*/, SigningStargateClient.getAccount(signerAddress)];
+                    case 2:
                         account = _b.sent();
                         if (account == null)
                             throw new Error("Failed to retrieve account from signer");
-                        rawSecp256k1Pubkey = encoding_1.fromBase64(pubkeyStr);
-                        pubkey = proto_signing_1.encodePubkey(amino_1.encodeSecp256k1Pubkey(rawSecp256k1Pubkey));
-                        txBodyEncodeObject = {
-                            typeUrl: "/cosmos.tx.v1beta1.TxBody",
-                            value: {
-                                messages: messages,
-                                memo: memo,
-                            },
+                        pubkeyBytes = (0, encoding_1.fromBase64)(pubkeyStr);
+                        pubkey = keys_1.PubKey.fromPartial({
+                            key: pubkeyBytes,
+                        });
+                        pubkeyAny = {
+                            typeUrl: "/cosmos.crypto.secp256k1.PubKey",
+                            value: keys_1.PubKey.encode(pubkey).finish(),
                         };
-                        txBodyBytes = registry.encode(txBodyEncodeObject);
-                        gasLimit = math_1.Int53.fromString(fee.gas).toNumber();
-                        feePayer = signerAddress;
-                        authInfoBytes = proto_signing_1.makeAuthInfoBytes([{ pubkey: pubkey, sequence: sequence }], fee.amount, gasLimit, fee.granter, feePayer);
-                        return [2 /*return*/, proto_signing_1.makeSignDoc(txBodyBytes, authInfoBytes, chainId, accountNumber)];
+                        anyMsgs = messages.map(function (msg) { return registry.encodeAsAny(msg); });
+                        txBody = tx_1.TxBody.fromPartial({
+                            messages: anyMsgs,
+                            memo: memo,
+                        });
+                        bodyBytes = tx_1.TxBody.encode(txBody).finish();
+                        authInfoBytes = (0, signing_1.makeAuthInfoBytesProtobuf)([{ pubkey: pubkeyAny, sequence: sequence }], fee.amount, fee.gasLimit, fee.granter, fee.payer);
+                        return [2 /*return*/, (0, signing_1.makeSignDocProtobuf)(bodyBytes, authInfoBytes, chainId, accountNumber)];
                 }
             });
         });
     };
-    /**
-     * Gets account number and sequence from the API, creates a sign doc,
-     * creates a single signature and assembles the signed transaction.
-     *
-     * The sign mode (SIGN_MODE_DIRECT or SIGN_MODE_LEGACY_AMINO_JSON) is determined by this client's signer.
-     *
-     * You can pass signer data (account number, sequence and chain ID) explicitly instead of querying them
-     * from the chain. This is needed when signing for a multisig account, but it also allows for offline signing
-     * (See the SigningStargateClient.offline constructor).
-     */
-    SigningStargateClient.prototype.sign = function (signerAddress, messages, fee, memo, explicitSignerData, timeoutHeight) {
+    SigningStargateClient.prototype.sign = function (signerAddress, messages, fee, memo, explicitSignerData) {
         return __awaiter(this, void 0, void 0, function () {
             var signerData, _a, accountNumber, sequence, chainId;
             return __generator(this, function (_b) {
@@ -443,232 +197,126 @@ var SigningStargateClient = /** @class */ (function (_super) {
                             chainId: chainId,
                         };
                         _b.label = 4;
-                    case 4: return [2 /*return*/, proto_signing_1.isOfflineDirectSigner(this.signer)
-                            ? this.signDirect(signerAddress, messages, fee, memo, signerData, timeoutHeight)
-                            : this.signAmino(signerAddress, messages, fee, memo, signerData, timeoutHeight)];
-                }
-            });
-        });
-    };
-    SigningStargateClient.prototype.getChainId = function () {
-        return __awaiter(this, void 0, void 0, function () {
-            var response, chainId;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        if (!!this.chainId) return [3 /*break*/, 2];
-                        return [4 /*yield*/, this.forceGetCometClient().status()];
-                    case 1:
-                        response = _a.sent();
-                        chainId = response.nodeInfo.network;
-                        if (!chainId)
-                            throw new Error("Chain ID must not be empty");
-                        this.chainId = chainId;
-                        _a.label = 2;
-                    case 2: return [2 /*return*/, this.chainId];
+                    case 4: return [2 /*return*/, this.signDirect(signerAddress, messages, fee, memo, signerData)];
                 }
             });
         });
     };
-    SigningStargateClient.prototype.signAmino = function (signerAddress, messages, fee, memo, _a, timeoutHeight) {
+    SigningStargateClient.prototype.signDirect = function (signerAddress, messages, fee, memo, _a) {
         var accountNumber = _a.accountNumber, sequence = _a.sequence, chainId = _a.chainId;
         return __awaiter(this, void 0, void 0, function () {
-            var accountFromSigner, pubkey, signMode, msgs, signDoc, _b, signature, signed, signedTxBody, signedTxBodyEncodeObject, signedTxBodyBytes, signedGasLimit, signedSequence, signedAuthInfoBytes;
+            var accountFromSigner, pubkey, pubkeyAny, anyMsgs, txBody, bodyBytes, authInfoBytes, signDoc, _b, signature, signed;
             var _this = this;
             return __generator(this, function (_c) {
                 switch (_c.label) {
-                    case 0:
-                        utils_1.assert(!proto_signing_1.isOfflineDirectSigner(this.signer));
-                        return [4 /*yield*/, this.signer.getAccounts()];
+                    case 0: return [4 /*yield*/, this.signer.getAccounts()];
                     case 1:
                         accountFromSigner = (_c.sent()).find(function (account) { return account.address === signerAddress; });
                         if (!accountFromSigner) {
                             throw new Error("Failed to retrieve account from signer");
                         }
-                        pubkey = proto_signing_1.encodePubkey(amino_1.encodeSecp256k1Pubkey(accountFromSigner.pubkey));
-                        signMode = signing_1.SignMode.SIGN_MODE_LEGACY_AMINO_JSON;
-                        msgs = messages.map(function (msg) { return _this.aminoTypes.toAmino(msg); });
-                        signDoc = amino_1.makeSignDoc(msgs, fee, chainId, memo, accountNumber, sequence, timeoutHeight);
-                        return [4 /*yield*/, this.signer.signAmino(signerAddress, signDoc)];
+                        pubkey = keys_1.PubKey.fromPartial({
+                            key: accountFromSigner.pubkey,
+                        });
+                        pubkeyAny = {
+                            typeUrl: "/cosmos.crypto.secp256k1.PubKey",
+                            value: keys_1.PubKey.encode(pubkey).finish(),
+                        };
+                        anyMsgs = messages.map(function (msg) { return _this.registry.encodeAsAny(msg); });
+                        txBody = tx_1.TxBody.fromPartial({
+                            messages: anyMsgs,
+                            memo: memo,
+                        });
+                        bodyBytes = tx_1.TxBody.encode(txBody).finish();
+                        authInfoBytes = (0, signing_1.makeAuthInfoBytesProtobuf)([{ pubkey: pubkeyAny, sequence: sequence }], fee.amount, fee.gasLimit, fee.granter, fee.payer);
+                        signDoc = (0, signing_1.makeSignDocProtobuf)(bodyBytes, authInfoBytes, chainId, accountNumber);
+                        return [4 /*yield*/, this.signer.signDirect(signerAddress, signDoc)];
                     case 2:
                         _b = _c.sent(), signature = _b.signature, signed = _b.signed;
-                        signedTxBody = {
-                            messages: signed.msgs.map(function (msg) { return _this.aminoTypes.fromAmino(msg); }),
-                            memo: signed.memo,
-                            timeoutHeight: timeoutHeight,
-                        };
-                        signedTxBodyEncodeObject = {
-                            typeUrl: "/cosmos.tx.v1beta1.TxBody",
-                            value: signedTxBody,
-                        };
-                        signedTxBodyBytes = this.registry.encode(signedTxBodyEncodeObject);
-                        signedGasLimit = math_1.Int53.fromString(signed.fee.gas).toNumber();
-                        signedSequence = math_1.Int53.fromString(signed.sequence).toNumber();
-                        signedAuthInfoBytes = proto_signing_1.makeAuthInfoBytes([{ pubkey: pubkey, sequence: signedSequence }], signed.fee.amount, signedGasLimit, signed.fee.granter, signed.fee.payer, signMode);
-                        return [2 /*return*/, tx_3.TxRaw.fromPartial({
-                                bodyBytes: signedTxBodyBytes,
-                                authInfoBytes: signedAuthInfoBytes,
-                                signatures: [encoding_1.fromBase64(signature.signature)],
+                        return [2 /*return*/, tx_1.TxRaw.fromPartial({
+                                bodyBytes: signed.bodyBytes,
+                                authInfoBytes: signed.authInfoBytes,
+                                signatures: [(0, encoding_1.fromBase64)(signature.signature)],
                             })];
                 }
             });
         });
     };
-    SigningStargateClient.prototype.signDirect = function (signerAddress, messages, fee, memo, _a, timeoutHeight) {
-        var accountNumber = _a.accountNumber, sequence = _a.sequence, chainId = _a.chainId;
+    SigningStargateClient.prototype.signDirectForSignDoc = function (signerAddress, signDoc) {
         return __awaiter(this, void 0, void 0, function () {
-            var accountFromSigner, pubkey, txBodyEncodeObject, txBodyBytes, gasLimit, authInfoBytes, signDoc, _b, signature, signed;
-            return __generator(this, function (_c) {
-                switch (_c.label) {
-                    case 0:
-                        utils_1.assert(proto_signing_1.isOfflineDirectSigner(this.signer));
-                        return [4 /*yield*/, this.signer.getAccounts()];
+            var accountFromSigner, _a, signature, signed, txRaw;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0: return [4 /*yield*/, this.signer.getAccounts()];
                     case 1:
-                        accountFromSigner = (_c.sent()).find(function (account) { return account.address === signerAddress; });
+                        accountFromSigner = (_b.sent()).find(function (account) { return account.address === signerAddress; });
                         if (!accountFromSigner) {
                             throw new Error("Failed to retrieve account from signer");
                         }
-                        pubkey = proto_signing_1.encodePubkey(amino_1.encodeSecp256k1Pubkey(accountFromSigner.pubkey));
-                        txBodyEncodeObject = {
-                            typeUrl: "/cosmos.tx.v1beta1.TxBody",
-                            value: {
-                                messages: messages,
-                                memo: memo,
-                                timeoutHeight: timeoutHeight,
-                            },
-                        };
-                        txBodyBytes = this.registry.encode(txBodyEncodeObject);
-                        gasLimit = math_1.Int53.fromString(fee.gas).toNumber();
-                        authInfoBytes = proto_signing_1.makeAuthInfoBytes([{ pubkey: pubkey, sequence: sequence }], fee.amount, gasLimit, fee.granter, fee.payer);
-                        signDoc = proto_signing_1.makeSignDoc(txBodyBytes, authInfoBytes, chainId, accountNumber);
                         return [4 /*yield*/, this.signer.signDirect(signerAddress, signDoc)];
                     case 2:
-                        _b = _c.sent(), signature = _b.signature, signed = _b.signed;
-                        return [2 /*return*/, tx_3.TxRaw.fromPartial({
-                                bodyBytes: signed.bodyBytes,
-                                authInfoBytes: signed.authInfoBytes,
-                                signatures: [encoding_1.fromBase64(signature.signature)],
-                            })];
+                        _a = _b.sent(), signature = _a.signature, signed = _a.signed;
+                        txRaw = tx_1.TxRaw.fromPartial({
+                            bodyBytes: signed.bodyBytes,
+                            authInfoBytes: signed.authInfoBytes,
+                            signatures: [(0, encoding_1.fromBase64)(signature.signature)],
+                        });
+                        return [2 /*return*/, { txRaw: txRaw, signature: signature.signature }];
                 }
             });
         });
     };
-    SigningStargateClient.experimentalAdr36Verify = function (data, checkMsg) {
+    SigningStargateClient.getSequence = function (address) {
         return __awaiter(this, void 0, void 0, function () {
-            var newSignature, signed, accountNumber, sequence, chainId, signedMessages, sourceMsg, signatures, signature, signBytes, prehashed, secpSignature, rawSecp256k1Pubkey, rawSignerAddress, ok;
+            var account;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0:
-                        newSignature = amino_1.encodeSecp256k1Signature(FirmaUtil_1.FirmaUtil.base64ToArrayBuffer(data.pubkey), FirmaUtil_1.FirmaUtil.base64ToArrayBuffer(data.signature));
-                        signed = {
-                            fee: {
-                                gas: "0",
-                                amount: [],
-                            },
-                            msg: [{
-                                    type: data.type,
-                                    value: { signer: data.signer, data: data.data }
-                                }],
-                            signatures: [newSignature],
-                            memo: ""
-                        };
-                        // Restrictions from ADR-036
-                        if (signed.memo !== "")
-                            throw new Error("Memo must be empty.");
-                        if (signed.fee.gas !== "0")
-                            throw new Error("Fee gas must 0.");
-                        if (signed.fee.amount.length !== 0)
-                            throw new Error("Fee amount must be an empty array.");
-                        accountNumber = 0;
-                        sequence = 0;
-                        chainId = "";
-                        signedMessages = signed.msg;
-                        if (!signedMessages.every(isMsgSignData)) {
-                            throw new Error("Found message that is not the expected type.");
-                        }
-                        if (signedMessages.length === 0) {
-                            throw new Error("No message found. Without messages we cannot determine the signer address.");
-                        }
-                        sourceMsg = Buffer.from(signedMessages[0].value.data, 'base64').toString();
-                        if (sourceMsg !== checkMsg) {
-                            throw new Error("Different Msg error. source:" + sourceMsg + ", target:" + checkMsg);
-                        }
-                        signatures = signed.signatures;
-                        if (signatures.length !== 1)
-                            throw new Error("Must have exactly one signature to be supported.");
-                        signature = signatures[0];
-                        if (!amino_1.isSecp256k1Pubkey(signature.pub_key)) {
-                            throw new Error("Only secp256k1 signatures are supported.");
-                        }
-                        signBytes = amino_1.serializeSignDoc(amino_1.makeSignDoc(signed.msg, signed.fee, chainId, signed.memo, accountNumber, sequence));
-                        prehashed = crypto_1.sha256(signBytes);
-                        secpSignature = crypto_1.Secp256k1Signature.fromFixedLength(encoding_1.fromBase64(signature.signature));
-                        rawSecp256k1Pubkey = encoding_1.fromBase64(signature.pub_key.value);
-                        rawSignerAddress = amino_1.rawSecp256k1PubkeyToRawAddress(rawSecp256k1Pubkey);
-                        if (signedMessages.some(function (msg) { return !utils_1.arrayContentEquals(encoding_1.fromBech32(msg.value.signer).data, rawSignerAddress); })) {
-                            throw new Error("Found mismatch between signer in message and public key");
-                        }
-                        return [4 /*yield*/, crypto_1.Secp256k1.verifySignature(secpSignature, prehashed, rawSecp256k1Pubkey)];
+                    case 0: return [4 /*yield*/, this.getAccount(address)];
                     case 1:
-                        ok = _a.sent();
-                        return [2 /*return*/, ok];
+                        account = _a.sent();
+                        if (!account) {
+                            throw new Error("Account does not exist on chain. Send some tokens there before trying to query sequence.");
+                        }
+                        return [2 /*return*/, {
+                                accountNumber: account.accountNumber,
+                                sequence: account.sequence,
+                            }];
                 }
             });
         });
     };
-    SigningStargateClient.prototype.experimentalAdr36Sign = function (signerAddress, data) {
+    SigningStargateClient.getAccount = function (address) {
         return __awaiter(this, void 0, void 0, function () {
-            var accountNumber, sequence, chainId, fee, memo, datas, msgs, accountFromSigner, signDoc, _a, signature, signed, signatureResult, decodeData, jsonData;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
+            var accAddress, hexAccAddress, axiosInstance, path, result, finalData, account, error_1;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
                     case 0:
-                        accountNumber = 0;
-                        sequence = 0;
-                        chainId = "";
-                        fee = {
-                            gas: "0",
-                            amount: [],
-                            //granter: "" // added by DH
-                        };
-                        memo = "";
-                        datas = Array.isArray(data) ? data : [data];
-                        msgs = datas.map(function (d) { return ({
-                            type: "sign/MsgSignData",
-                            value: {
-                                signer: signerAddress,
-                                data: encoding_1.toBase64(d),
+                        _a.trys.push([0, 2, , 3]);
+                        accAddress = (0, encoding_1.fromBech32)(address).data;
+                        hexAccAddress = "0x01".concat(Buffer.from(accAddress).toString("hex"));
+                        axiosInstance = axios_1.default.create({
+                            baseURL: SigningStargateClient._endpoint,
+                            headers: {
+                                Accept: "application/json",
                             },
-                        }); });
-                        return [4 /*yield*/, this.signer.getAccounts()];
+                            timeout: 15000
+                        });
+                        path = "/abci_query?path=\"/store/acc/key\"";
+                        return [4 /*yield*/, axiosInstance.get(path, { params: { data: hexAccAddress } })];
                     case 1:
-                        accountFromSigner = (_b.sent()).find(function (account) { return account.address === signerAddress; });
-                        if (!accountFromSigner) {
-                            throw new Error("Failed to retrieve account from signer");
-                        }
-                        if (!("signAmino" in this.signer)) {
-                            throw new Error("The signer does not support signAmino. Please use an OfflineAminoSigner instance.");
-                        }
-                        signDoc = amino_1.makeSignDoc(msgs, fee, chainId, memo, accountNumber, sequence);
-                        return [4 /*yield*/, this.signer.signAmino(signerAddress, signDoc)];
+                        result = _a.sent();
+                        finalData = result.data.result.response.value;
+                        account = any_1.Any.decode(Buffer.from(finalData, "base64"));
+                        return [2 /*return*/, (0, accounts_1.accountFromAny)(account)];
                     case 2:
-                        _a = _b.sent(), signature = _a.signature, signed = _a.signed;
-                        if (!fast_deep_equal_1.default(signDoc, signed)) {
-                            throw new Error("The signed document differs from the signing instruction. This is not supported for ADR-036.");
-                        }
-                        signatureResult = amino_1.makeStdTx(signDoc, signature);
-                        decodeData = amino_1.decodeSignature(signatureResult.signatures[0]);
-                        jsonData = {
-                            type: "sign/MsgSignData",
-                            signer: signatureResult.msg[0].value.signer,
-                            data: signatureResult.msg[0].value.data,
-                            pubkey: FirmaUtil_1.FirmaUtil.arrayBufferToBase64(decodeData.pubkey),
-                            signature: FirmaUtil_1.FirmaUtil.arrayBufferToBase64(decodeData.signature)
-                        };
-                        return [2 /*return*/, jsonData];
+                        error_1 = _a.sent();
+                        return [2 /*return*/, null];
+                    case 3: return [2 /*return*/];
                 }
             });
         });
     };
+    SigningStargateClient._endpoint = "";
     return SigningStargateClient;
-}(stargateclient_1.StargateClient));
+}(stargateClient_1.StargateClient));
 exports.SigningStargateClient = SigningStargateClient;