@firmachain/firma-js 0.2.2 → 0.2.6

package/dist/sdk/FirmaGovService.js

@@ -35,6 +35,9 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FirmaGovService = void 0;
 var gov_1 = require("./firmachain/gov");
@@ -44,19 +47,21 @@ var gov_2 = require("cosmjs-types/cosmos/gov/v1beta1/gov");
 var distribution_1 = require("cosmjs-types/cosmos/distribution/v1beta1/distribution");
 var params_1 = require("cosmjs-types/cosmos/params/v1beta1/params");
 var upgrade_1 = require("cosmjs-types/cosmos/upgrade/v1beta1/upgrade");
+var long_1 = __importDefault(require("long"));
 var FirmaGovService = /** @class */ (function () {
-    function FirmaGovService(_config) {
-        this._config = _config;
+    function FirmaGovService(config) {
+        this.config = config;
     }
-    FirmaGovService.prototype.getGasEstimationDeposit = function (wallet, proposalId, amount, txMisc) {
+    FirmaGovService.prototype.getGasEstimationVote = function (wallet, proposalId, option, txMisc) {
         if (txMisc === void 0) { txMisc = gov_1.DefaultTxMisc; }
         return __awaiter(this, void 0, void 0, function () {
-            var txRaw, error_1;
+            var longId, txRaw, error_1;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         _a.trys.push([0, 3, , 4]);
-                        return [4 /*yield*/, this.getSignedTxDeposit(wallet, proposalId, amount, txMisc)];
+                        longId = long_1.default.fromInt(proposalId);
+                        return [4 /*yield*/, this.getSignedTxVote(wallet, longId, option, txMisc)];
                     case 1:
                         txRaw = _a.sent();
                         return [4 /*yield*/, FirmaUtil_1.FirmaUtil.estimateGas(txRaw)];
@@ -70,16 +75,156 @@ var FirmaGovService = /** @class */ (function () {
             });
         });
     };
-    FirmaGovService.prototype.getSignedTxSubmitTextProposal = function (wallet, title, description, initialDepositFCT, proposer, txMisc) {
+    FirmaGovService.prototype.getGasEstimationDeposit = function (wallet, proposalId, amount, txMisc) {
         if (txMisc === void 0) { txMisc = gov_1.DefaultTxMisc; }
         return __awaiter(this, void 0, void 0, function () {
-            var txClient, sendAmount, proposal, content, message, error_2;
+            var longId, txRaw, error_2;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        _a.trys.push([0, 2, , 3]);
-                        txClient = new gov_1.GovTxClient(wallet.getRawWallet(), this._config.rpcAddress);
-                        sendAmount = { denom: this._config.denom, amount: FirmaUtil_1.FirmaUtil.getUFCTStringFromFCT(initialDepositFCT) };
+                        _a.trys.push([0, 3, , 4]);
+                        longId = long_1.default.fromInt(proposalId);
+                        return [4 /*yield*/, this.getSignedTxDeposit(wallet, longId, amount, txMisc)];
+                    case 1:
+                        txRaw = _a.sent();
+                        return [4 /*yield*/, FirmaUtil_1.FirmaUtil.estimateGas(txRaw)];
+                    case 2: return [2 /*return*/, _a.sent()];
+                    case 3:
+                        error_2 = _a.sent();
+                        FirmaUtil_1.FirmaUtil.printLog(error_2);
+                        throw error_2;
+                    case 4: return [2 /*return*/];
+                }
+            });
+        });
+    };
+    FirmaGovService.prototype.getGasEstimationSubmitCancelSoftwareUpgradeProposal = function (wallet, title, description, initialDepositFCT, txMisc) {
+        if (txMisc === void 0) { txMisc = gov_1.DefaultTxMisc; }
+        return __awaiter(this, void 0, void 0, function () {
+            var txRaw, error_3;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        _a.trys.push([0, 3, , 4]);
+                        return [4 /*yield*/, this.getSignedTxSubmitCancelSoftwareUpgradeProposal(wallet, title, description, initialDepositFCT, txMisc)];
+                    case 1:
+                        txRaw = _a.sent();
+                        return [4 /*yield*/, FirmaUtil_1.FirmaUtil.estimateGas(txRaw)];
+                    case 2: return [2 /*return*/, _a.sent()];
+                    case 3:
+                        error_3 = _a.sent();
+                        FirmaUtil_1.FirmaUtil.printLog(error_3);
+                        throw error_3;
+                    case 4: return [2 /*return*/];
+                }
+            });
+        });
+    };
+    FirmaGovService.prototype.getGasEstimationSubmitSoftwareUpgradeProposalByHeight = function (wallet, title, description, initialDepositFCT, upgradeName, height, txMisc) {
+        if (txMisc === void 0) { txMisc = gov_1.DefaultTxMisc; }
+        return __awaiter(this, void 0, void 0, function () {
+            var plan, txRaw, error_4;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        _a.trys.push([0, 3, , 4]);
+                        plan = {
+                            name: upgradeName,
+                            time: undefined,
+                            height: height,
+                            info: undefined,
+                            upgradedClientState: undefined
+                        };
+                        return [4 /*yield*/, this.getSignedTxSubmitSoftwareUpgradeProposal(wallet, title, description, initialDepositFCT, plan, txMisc)];
+                    case 1:
+                        txRaw = _a.sent();
+                        return [4 /*yield*/, FirmaUtil_1.FirmaUtil.estimateGas(txRaw)];
+                    case 2: return [2 /*return*/, _a.sent()];
+                    case 3:
+                        error_4 = _a.sent();
+                        FirmaUtil_1.FirmaUtil.printLog(error_4);
+                        throw error_4;
+                    case 4: return [2 /*return*/];
+                }
+            });
+        });
+    };
+    FirmaGovService.prototype.getGasEstimationSubmitParameterChangeProposal = function (wallet, title, description, initialDepositFCT, paramList, txMisc) {
+        if (txMisc === void 0) { txMisc = gov_1.DefaultTxMisc; }
+        return __awaiter(this, void 0, void 0, function () {
+            var txRaw, error_5;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        _a.trys.push([0, 3, , 4]);
+                        return [4 /*yield*/, this.getSignedTxSubmitParameterChangeProposal(wallet, title, description, initialDepositFCT, paramList, txMisc)];
+                    case 1:
+                        txRaw = _a.sent();
+                        return [4 /*yield*/, FirmaUtil_1.FirmaUtil.estimateGas(txRaw)];
+                    case 2: return [2 /*return*/, _a.sent()];
+                    case 3:
+                        error_5 = _a.sent();
+                        FirmaUtil_1.FirmaUtil.printLog(error_5);
+                        throw error_5;
+                    case 4: return [2 /*return*/];
+                }
+            });
+        });
+    };
+    FirmaGovService.prototype.getGasEstimationSubmitCommunityPoolSpendProposal = function (wallet, title, description, initialDepositFCT, amount, recipient, txMisc) {
+        if (txMisc === void 0) { txMisc = gov_1.DefaultTxMisc; }
+        return __awaiter(this, void 0, void 0, function () {
+            var txRaw, error_6;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        _a.trys.push([0, 3, , 4]);
+                        return [4 /*yield*/, this.getSignedTxSubmitCommunityPoolSpendProposal(wallet, title, description, initialDepositFCT, amount, recipient, txMisc)];
+                    case 1:
+                        txRaw = _a.sent();
+                        return [4 /*yield*/, FirmaUtil_1.FirmaUtil.estimateGas(txRaw)];
+                    case 2: return [2 /*return*/, _a.sent()];
+                    case 3:
+                        error_6 = _a.sent();
+                        FirmaUtil_1.FirmaUtil.printLog(error_6);
+                        throw error_6;
+                    case 4: return [2 /*return*/];
+                }
+            });
+        });
+    };
+    FirmaGovService.prototype.getGasEstimationSubmitTextProposal = function (wallet, title, description, initialDepositFCT, txMisc) {
+        if (txMisc === void 0) { txMisc = gov_1.DefaultTxMisc; }
+        return __awaiter(this, void 0, void 0, function () {
+            var txRaw, error_7;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        _a.trys.push([0, 3, , 4]);
+                        return [4 /*yield*/, this.getSignedTxSubmitTextProposal(wallet, title, description, initialDepositFCT, txMisc)];
+                    case 1:
+                        txRaw = _a.sent();
+                        return [4 /*yield*/, FirmaUtil_1.FirmaUtil.estimateGas(txRaw)];
+                    case 2: return [2 /*return*/, _a.sent()];
+                    case 3:
+                        error_7 = _a.sent();
+                        FirmaUtil_1.FirmaUtil.printLog(error_7);
+                        throw error_7;
+                    case 4: return [2 /*return*/];
+                }
+            });
+        });
+    };
+    FirmaGovService.prototype.getSignedTxSubmitTextProposal = function (wallet, title, description, initialDepositFCT, txMisc) {
+        if (txMisc === void 0) { txMisc = gov_1.DefaultTxMisc; }
+        return __awaiter(this, void 0, void 0, function () {
+            var txClient, sendAmount, proposal, content, proposer, message, error_8;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        _a.trys.push([0, 3, , 4]);
+                        txClient = new gov_1.GovTxClient(wallet.getRawWallet(), this.config.rpcAddress);
+                        sendAmount = { denom: this.config.denom, amount: FirmaUtil_1.FirmaUtil.getUFCTStringFromFCT(initialDepositFCT) };
                         proposal = gov_2.TextProposal.fromPartial({
                             title: title,
                             description: description,
@@ -88,28 +233,74 @@ var FirmaGovService = /** @class */ (function () {
                             typeUrl: "/cosmos.gov.v1beta1.TextProposal",
                             value: Uint8Array.from(gov_2.TextProposal.encode(proposal).finish()),
                         });
+                        return [4 /*yield*/, wallet.getAddress()];
+                    case 1:
+                        proposer = _a.sent();
                         message = txClient.msgSubmitProposal({ content: content, initialDeposit: [sendAmount], proposer: proposer });
-                        return [4 /*yield*/, txClient.sign([message], gov_1.getSignAndBroadcastOption(this._config.denom, txMisc))];
-                    case 1: return [2 /*return*/, _a.sent()];
-                    case 2:
-                        error_2 = _a.sent();
-                        FirmaUtil_1.FirmaUtil.printLog(error_2);
-                        throw error_2;
-                    case 3: return [2 /*return*/];
+                        return [4 /*yield*/, txClient.sign([message], gov_1.getSignAndBroadcastOption(this.config.denom, txMisc))];
+                    case 2: return [2 /*return*/, _a.sent()];
+                    case 3:
+                        error_8 = _a.sent();
+                        FirmaUtil_1.FirmaUtil.printLog(error_8);
+                        throw error_8;
+                    case 4: return [2 /*return*/];
                 }
             });
         });
     };
-    FirmaGovService.prototype.getSignedTxSoftwareUpgradeProposal = function (wallet, title, description, initialDepositFCT, proposer, plan, txMisc) {
+    FirmaGovService.prototype.getSignedTxSubmitCancelSoftwareUpgradeProposal = function (wallet, title, description, initialDepositFCT, txMisc) {
         if (txMisc === void 0) { txMisc = gov_1.DefaultTxMisc; }
         return __awaiter(this, void 0, void 0, function () {
-            var txClient, initialDepositAmount, proposal, content, message, error_3;
+            var txClient, initialDepositAmount, proposal, content, proposer, message, error_9;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        _a.trys.push([0, 2, , 3]);
-                        txClient = new gov_1.GovTxClient(wallet.getRawWallet(), this._config.rpcAddress);
-                        initialDepositAmount = { denom: this._config.denom, amount: FirmaUtil_1.FirmaUtil.getUFCTStringFromFCT(initialDepositFCT) };
+                        _a.trys.push([0, 3, , 4]);
+                        txClient = new gov_1.GovTxClient(wallet.getRawWallet(), this.config.rpcAddress);
+                        initialDepositAmount = {
+                            denom: this.config.denom,
+                            amount: FirmaUtil_1.FirmaUtil.getUFCTStringFromFCT(initialDepositFCT)
+                        };
+                        proposal = upgrade_1.CancelSoftwareUpgradeProposal.fromPartial({
+                            title: title,
+                            description: description,
+                        });
+                        content = any_1.Any.fromPartial({
+                            typeUrl: "/cosmos.upgrade.v1beta1.CancelSoftwareUpgradeProposal",
+                            value: Uint8Array.from(upgrade_1.SoftwareUpgradeProposal.encode(proposal).finish()),
+                        });
+                        return [4 /*yield*/, wallet.getAddress()];
+                    case 1:
+                        proposer = _a.sent();
+                        message = txClient.msgSubmitProposal({
+                            content: content,
+                            initialDeposit: [initialDepositAmount],
+                            proposer: proposer
+                        });
+                        return [4 /*yield*/, txClient.sign([message], gov_1.getSignAndBroadcastOption(this.config.denom, txMisc))];
+                    case 2: return [2 /*return*/, _a.sent()];
+                    case 3:
+                        error_9 = _a.sent();
+                        FirmaUtil_1.FirmaUtil.printLog(error_9);
+                        throw error_9;
+                    case 4: return [2 /*return*/];
+                }
+            });
+        });
+    };
+    FirmaGovService.prototype.getSignedTxSubmitSoftwareUpgradeProposal = function (wallet, title, description, initialDepositFCT, plan, txMisc) {
+        if (txMisc === void 0) { txMisc = gov_1.DefaultTxMisc; }
+        return __awaiter(this, void 0, void 0, function () {
+            var txClient, initialDepositAmount, proposal, content, proposer, message, error_10;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        _a.trys.push([0, 3, , 4]);
+                        txClient = new gov_1.GovTxClient(wallet.getRawWallet(), this.config.rpcAddress);
+                        initialDepositAmount = {
+                            denom: this.config.denom,
+                            amount: FirmaUtil_1.FirmaUtil.getUFCTStringFromFCT(initialDepositFCT)
+                        };
                         proposal = upgrade_1.SoftwareUpgradeProposal.fromPartial({
                             title: title,
                             description: description,
@@ -119,28 +310,38 @@ var FirmaGovService = /** @class */ (function () {
                             typeUrl: "/cosmos.upgrade.v1beta1.SoftwareUpgradeProposal",
                             value: Uint8Array.from(upgrade_1.SoftwareUpgradeProposal.encode(proposal).finish()),
                         });
-                        message = txClient.msgSubmitProposal({ content: content, initialDeposit: [initialDepositAmount], proposer: proposer });
-                        return [4 /*yield*/, txClient.sign([message], gov_1.getSignAndBroadcastOption(this._config.denom, txMisc))];
-                    case 1: return [2 /*return*/, _a.sent()];
-                    case 2:
-                        error_3 = _a.sent();
-                        FirmaUtil_1.FirmaUtil.printLog(error_3);
-                        throw error_3;
-                    case 3: return [2 /*return*/];
+                        return [4 /*yield*/, wallet.getAddress()];
+                    case 1:
+                        proposer = _a.sent();
+                        message = txClient.msgSubmitProposal({
+                            content: content,
+                            initialDeposit: [initialDepositAmount],
+                            proposer: proposer
+                        });
+                        return [4 /*yield*/, txClient.sign([message], gov_1.getSignAndBroadcastOption(this.config.denom, txMisc))];
+                    case 2: return [2 /*return*/, _a.sent()];
+                    case 3:
+                        error_10 = _a.sent();
+                        FirmaUtil_1.FirmaUtil.printLog(error_10);
+                        throw error_10;
+                    case 4: return [2 /*return*/];
                 }
             });
         });
     };
-    FirmaGovService.prototype.getSignedTxParameterChangeProposal = function (wallet, title, description, initialDepositFCT, proposer, paramList, txMisc) {
+    FirmaGovService.prototype.getSignedTxSubmitParameterChangeProposal = function (wallet, title, description, initialDepositFCT, paramList, txMisc) {
         if (txMisc === void 0) { txMisc = gov_1.DefaultTxMisc; }
         return __awaiter(this, void 0, void 0, function () {
-            var txClient, initialDepositAmount, proposal, content, message, error_4;
+            var txClient, initialDepositAmount, proposal, content, proposer, message, error_11;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        _a.trys.push([0, 2, , 3]);
-                        txClient = new gov_1.GovTxClient(wallet.getRawWallet(), this._config.rpcAddress);
-                        initialDepositAmount = { denom: this._config.denom, amount: FirmaUtil_1.FirmaUtil.getUFCTStringFromFCT(initialDepositFCT) };
+                        _a.trys.push([0, 3, , 4]);
+                        txClient = new gov_1.GovTxClient(wallet.getRawWallet(), this.config.rpcAddress);
+                        initialDepositAmount = {
+                            denom: this.config.denom,
+                            amount: FirmaUtil_1.FirmaUtil.getUFCTStringFromFCT(initialDepositFCT)
+                        };
                         proposal = params_1.ParameterChangeProposal.fromPartial({
                             title: title,
                             description: description,
@@ -150,29 +351,39 @@ var FirmaGovService = /** @class */ (function () {
                             typeUrl: "/cosmos.params.v1beta1.ParameterChangeProposal",
                             value: Uint8Array.from(params_1.ParameterChangeProposal.encode(proposal).finish()),
                         });
-                        message = txClient.msgSubmitProposal({ content: content, initialDeposit: [initialDepositAmount], proposer: proposer });
-                        return [4 /*yield*/, txClient.sign([message], gov_1.getSignAndBroadcastOption(this._config.denom, txMisc))];
-                    case 1: return [2 /*return*/, _a.sent()];
-                    case 2:
-                        error_4 = _a.sent();
-                        FirmaUtil_1.FirmaUtil.printLog(error_4);
-                        throw error_4;
-                    case 3: return [2 /*return*/];
+                        return [4 /*yield*/, wallet.getAddress()];
+                    case 1:
+                        proposer = _a.sent();
+                        message = txClient.msgSubmitProposal({
+                            content: content,
+                            initialDeposit: [initialDepositAmount],
+                            proposer: proposer
+                        });
+                        return [4 /*yield*/, txClient.sign([message], gov_1.getSignAndBroadcastOption(this.config.denom, txMisc))];
+                    case 2: return [2 /*return*/, _a.sent()];
+                    case 3:
+                        error_11 = _a.sent();
+                        FirmaUtil_1.FirmaUtil.printLog(error_11);
+                        throw error_11;
+                    case 4: return [2 /*return*/];
                 }
             });
         });
     };
-    FirmaGovService.prototype.getSignedTxCommunityPoolSpendProposal = function (wallet, title, description, initialDepositFCT, proposer, amount, recipient, txMisc) {
+    FirmaGovService.prototype.getSignedTxSubmitCommunityPoolSpendProposal = function (wallet, title, description, initialDepositFCT, amount, recipient, txMisc) {
         if (txMisc === void 0) { txMisc = gov_1.DefaultTxMisc; }
         return __awaiter(this, void 0, void 0, function () {
-            var txClient, initialDepositAmount, sendAmount, proposal, content, message, error_5;
+            var txClient, initialDepositAmount, sendAmount, proposal, content, proposer, message, error_12;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        _a.trys.push([0, 2, , 3]);
-                        txClient = new gov_1.GovTxClient(wallet.getRawWallet(), this._config.rpcAddress);
-                        initialDepositAmount = { denom: this._config.denom, amount: FirmaUtil_1.FirmaUtil.getUFCTStringFromFCT(initialDepositFCT) };
-                        sendAmount = { denom: this._config.denom, amount: FirmaUtil_1.FirmaUtil.getUFCTStringFromFCT(amount) };
+                        _a.trys.push([0, 3, , 4]);
+                        txClient = new gov_1.GovTxClient(wallet.getRawWallet(), this.config.rpcAddress);
+                        initialDepositAmount = {
+                            denom: this.config.denom,
+                            amount: FirmaUtil_1.FirmaUtil.getUFCTStringFromFCT(initialDepositFCT)
+                        };
+                        sendAmount = { denom: this.config.denom, amount: FirmaUtil_1.FirmaUtil.getUFCTStringFromFCT(amount) };
                         proposal = distribution_1.CommunityPoolSpendProposal.fromPartial({
                             title: title,
                             description: description,
@@ -183,22 +394,52 @@ var FirmaGovService = /** @class */ (function () {
                             typeUrl: "/cosmos.distribution.v1beta1.CommunityPoolSpendProposal",
                             value: Uint8Array.from(distribution_1.CommunityPoolSpendProposal.encode(proposal).finish()),
                         });
-                        message = txClient.msgSubmitProposal({ content: content, initialDeposit: [initialDepositAmount], proposer: proposer });
-                        return [4 /*yield*/, txClient.sign([message], gov_1.getSignAndBroadcastOption(this._config.denom, txMisc))];
-                    case 1: return [2 /*return*/, _a.sent()];
-                    case 2:
-                        error_5 = _a.sent();
-                        FirmaUtil_1.FirmaUtil.printLog(error_5);
-                        throw error_5;
-                    case 3: return [2 /*return*/];
+                        return [4 /*yield*/, wallet.getAddress()];
+                    case 1:
+                        proposer = _a.sent();
+                        message = txClient.msgSubmitProposal({
+                            content: content,
+                            initialDeposit: [initialDepositAmount],
+                            proposer: proposer
+                        });
+                        return [4 /*yield*/, txClient.sign([message], gov_1.getSignAndBroadcastOption(this.config.denom, txMisc))];
+                    case 2: return [2 /*return*/, _a.sent()];
+                    case 3:
+                        error_12 = _a.sent();
+                        FirmaUtil_1.FirmaUtil.printLog(error_12);
+                        throw error_12;
+                    case 4: return [2 /*return*/];
+                }
+            });
+        });
+    };
+    FirmaGovService.prototype.submitCancelSoftwareUpgradeProposal = function (wallet, title, description, initialDeposit, txMisc) {
+        if (txMisc === void 0) { txMisc = gov_1.DefaultTxMisc; }
+        return __awaiter(this, void 0, void 0, function () {
+            var txRaw, txClient, error_13;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        _a.trys.push([0, 3, , 4]);
+                        return [4 /*yield*/, this.getSignedTxSubmitCancelSoftwareUpgradeProposal(wallet, title, description, initialDeposit, txMisc)];
+                    case 1:
+                        txRaw = _a.sent();
+                        txClient = new gov_1.GovTxClient(wallet.getRawWallet(), this.config.rpcAddress);
+                        return [4 /*yield*/, txClient.broadcast(txRaw)];
+                    case 2: return [2 /*return*/, _a.sent()];
+                    case 3:
+                        error_13 = _a.sent();
+                        FirmaUtil_1.FirmaUtil.printLog(error_13);
+                        throw error_13;
+                    case 4: return [2 /*return*/];
                 }
             });
         });
     };
-    FirmaGovService.prototype.SubmitSoftwareUpgradeProposalByHeight = function (wallet, title, description, initialDeposit, proposer, upgradeName, height, txMisc) {
+    FirmaGovService.prototype.submitSoftwareUpgradeProposalByHeight = function (wallet, title, description, initialDeposit, upgradeName, height, txMisc) {
         if (txMisc === void 0) { txMisc = gov_1.DefaultTxMisc; }
         return __awaiter(this, void 0, void 0, function () {
-            var plan, txRaw, txClient, error_6;
+            var plan, txRaw, txClient, error_14;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -210,25 +451,25 @@ var FirmaGovService = /** @class */ (function () {
                             info: undefined,
                             upgradedClientState: undefined
                         };
-                        return [4 /*yield*/, this.getSignedTxSoftwareUpgradeProposal(wallet, title, description, initialDeposit, proposer, plan, txMisc)];
+                        return [4 /*yield*/, this.getSignedTxSubmitSoftwareUpgradeProposal(wallet, title, description, initialDeposit, plan, txMisc)];
                     case 1:
                         txRaw = _a.sent();
-                        txClient = new gov_1.GovTxClient(wallet.getRawWallet(), this._config.rpcAddress);
+                        txClient = new gov_1.GovTxClient(wallet.getRawWallet(), this.config.rpcAddress);
                         return [4 /*yield*/, txClient.broadcast(txRaw)];
                     case 2: return [2 /*return*/, _a.sent()];
                     case 3:
-                        error_6 = _a.sent();
-                        FirmaUtil_1.FirmaUtil.printLog(error_6);
-                        throw error_6;
+                        error_14 = _a.sent();
+                        FirmaUtil_1.FirmaUtil.printLog(error_14);
+                        throw error_14;
                     case 4: return [2 /*return*/];
                 }
             });
         });
     };
-    FirmaGovService.prototype.SubmitSoftwareUpgradeProposalByTime = function (wallet, title, description, initialDeposit, proposer, upgradeName, upgradeTime, txMisc) {
+    FirmaGovService.prototype.submitSoftwareUpgradeProposalByTime = function (wallet, title, description, initialDeposit, upgradeName, upgradeTime, txMisc) {
         if (txMisc === void 0) { txMisc = gov_1.DefaultTxMisc; }
         return __awaiter(this, void 0, void 0, function () {
-            var plan, txRaw, txClient, error_7;
+            var plan, txRaw, txClient, error_15;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -240,85 +481,85 @@ var FirmaGovService = /** @class */ (function () {
                             info: undefined,
                             upgradedClientState: undefined
                         };
-                        return [4 /*yield*/, this.getSignedTxSoftwareUpgradeProposal(wallet, title, description, initialDeposit, proposer, plan, txMisc)];
+                        return [4 /*yield*/, this.getSignedTxSubmitSoftwareUpgradeProposal(wallet, title, description, initialDeposit, plan, txMisc)];
                     case 1:
                         txRaw = _a.sent();
-                        txClient = new gov_1.GovTxClient(wallet.getRawWallet(), this._config.rpcAddress);
+                        txClient = new gov_1.GovTxClient(wallet.getRawWallet(), this.config.rpcAddress);
                         return [4 /*yield*/, txClient.broadcast(txRaw)];
                     case 2: return [2 /*return*/, _a.sent()];
                     case 3:
-                        error_7 = _a.sent();
-                        FirmaUtil_1.FirmaUtil.printLog(error_7);
-                        throw error_7;
+                        error_15 = _a.sent();
+                        FirmaUtil_1.FirmaUtil.printLog(error_15);
+                        throw error_15;
                     case 4: return [2 /*return*/];
                 }
             });
         });
     };
-    FirmaGovService.prototype.SubmitParameterChangeProposal = function (wallet, title, description, initialDeposit, proposer, paramList, txMisc) {
+    FirmaGovService.prototype.submitParameterChangeProposal = function (wallet, title, description, initialDeposit, paramList, txMisc) {
         if (txMisc === void 0) { txMisc = gov_1.DefaultTxMisc; }
         return __awaiter(this, void 0, void 0, function () {
-            var txRaw, txClient, error_8;
+            var txRaw, txClient, error_16;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         _a.trys.push([0, 3, , 4]);
-                        return [4 /*yield*/, this.getSignedTxParameterChangeProposal(wallet, title, description, initialDeposit, proposer, paramList, txMisc)];
+                        return [4 /*yield*/, this.getSignedTxSubmitParameterChangeProposal(wallet, title, description, initialDeposit, paramList, txMisc)];
                     case 1:
                         txRaw = _a.sent();
-                        txClient = new gov_1.GovTxClient(wallet.getRawWallet(), this._config.rpcAddress);
+                        txClient = new gov_1.GovTxClient(wallet.getRawWallet(), this.config.rpcAddress);
                         return [4 /*yield*/, txClient.broadcast(txRaw)];
                     case 2: return [2 /*return*/, _a.sent()];
                     case 3:
-                        error_8 = _a.sent();
-                        FirmaUtil_1.FirmaUtil.printLog(error_8);
-                        throw error_8;
+                        error_16 = _a.sent();
+                        FirmaUtil_1.FirmaUtil.printLog(error_16);
+                        throw error_16;
                     case 4: return [2 /*return*/];
                 }
             });
         });
     };
-    FirmaGovService.prototype.SubmitCommunityPoolSpendProposal = function (wallet, title, description, initialDeposit, proposer, amount, recipient, txMisc) {
+    FirmaGovService.prototype.submitCommunityPoolSpendProposal = function (wallet, title, description, initialDeposit, amount, recipient, txMisc) {
         if (txMisc === void 0) { txMisc = gov_1.DefaultTxMisc; }
         return __awaiter(this, void 0, void 0, function () {
-            var txRaw, txClient, error_9;
+            var txRaw, txClient, error_17;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         _a.trys.push([0, 3, , 4]);
-                        return [4 /*yield*/, this.getSignedTxCommunityPoolSpendProposal(wallet, title, description, initialDeposit, proposer, amount, recipient, txMisc)];
+                        return [4 /*yield*/, this.getSignedTxSubmitCommunityPoolSpendProposal(wallet, title, description, initialDeposit, amount, recipient, txMisc)];
                     case 1:
                         txRaw = _a.sent();
-                        txClient = new gov_1.GovTxClient(wallet.getRawWallet(), this._config.rpcAddress);
+                        txClient = new gov_1.GovTxClient(wallet.getRawWallet(), this.config.rpcAddress);
                         return [4 /*yield*/, txClient.broadcast(txRaw)];
                     case 2: return [2 /*return*/, _a.sent()];
                     case 3:
-                        error_9 = _a.sent();
-                        FirmaUtil_1.FirmaUtil.printLog(error_9);
-                        throw error_9;
+                        error_17 = _a.sent();
+                        FirmaUtil_1.FirmaUtil.printLog(error_17);
+                        throw error_17;
                     case 4: return [2 /*return*/];
                 }
             });
         });
     };
-    FirmaGovService.prototype.SubmitTextProposal = function (wallet, title, description, initialDeposit, proposer, txMisc) {
+    FirmaGovService.prototype.submitTextProposal = function (wallet, title, description, initialDeposit, txMisc) {
         if (txMisc === void 0) { txMisc = gov_1.DefaultTxMisc; }
         return __awaiter(this, void 0, void 0, function () {
-            var txRaw, txClient, error_10;
+            var txRaw, txClient, error_18;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         _a.trys.push([0, 3, , 4]);
-                        return [4 /*yield*/, this.getSignedTxSubmitTextProposal(wallet, title, description, initialDeposit, proposer, txMisc)];
+                        return [4 /*yield*/, this.getSignedTxSubmitTextProposal(wallet, title, description, initialDeposit, txMisc)];
                     case 1:
                         txRaw = _a.sent();
-                        txClient = new gov_1.GovTxClient(wallet.getRawWallet(), this._config.rpcAddress);
+                        txClient = new gov_1.GovTxClient(wallet.getRawWallet(), this.config.rpcAddress);
                         return [4 /*yield*/, txClient.broadcast(txRaw)];
                     case 2: return [2 /*return*/, _a.sent()];
                     case 3:
-                        error_10 = _a.sent();
-                        FirmaUtil_1.FirmaUtil.printLog(error_10);
-                        throw error_10;
+                        error_18 = _a.sent();
+                        FirmaUtil_1.FirmaUtil.printLog(error_18);
+                        throw error_18;
                     case 4: return [2 /*return*/];
                 }
             });
@@ -327,7 +568,7 @@ var FirmaGovService = /** @class */ (function () {
     FirmaGovService.prototype.getSignedTxVote = function (wallet, proposalId, option, txMisc) {
         if (txMisc === void 0) { txMisc = gov_1.DefaultTxMisc; }
         return __awaiter(this, void 0, void 0, function () {
-            var voter, txClient, message, error_11;
+            var voter, txClient, message, error_19;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -335,37 +576,38 @@ var FirmaGovService = /** @class */ (function () {
                         return [4 /*yield*/, wallet.getAddress()];
                     case 1:
                         voter = _a.sent();
-                        txClient = new gov_1.GovTxClient(wallet.getRawWallet(), this._config.rpcAddress);
+                        txClient = new gov_1.GovTxClient(wallet.getRawWallet(), this.config.rpcAddress);
                         message = txClient.msgVote({ proposalId: proposalId, voter: voter, option: option });
-                        return [4 /*yield*/, txClient.sign([message], gov_1.getSignAndBroadcastOption(this._config.denom, txMisc))];
+                        return [4 /*yield*/, txClient.sign([message], gov_1.getSignAndBroadcastOption(this.config.denom, txMisc))];
                     case 2: return [2 /*return*/, _a.sent()];
                     case 3:
-                        error_11 = _a.sent();
-                        FirmaUtil_1.FirmaUtil.printLog(error_11);
-                        throw error_11;
+                        error_19 = _a.sent();
+                        FirmaUtil_1.FirmaUtil.printLog(error_19);
+                        throw error_19;
                     case 4: return [2 /*return*/];
                 }
             });
         });
     };
-    FirmaGovService.prototype.Vote = function (wallet, proposalId, option, txMisc) {
+    FirmaGovService.prototype.vote = function (wallet, proposalId, option, txMisc) {
         if (txMisc === void 0) { txMisc = gov_1.DefaultTxMisc; }
         return __awaiter(this, void 0, void 0, function () {
-            var txRaw, txClient, error_12;
+            var longId, txRaw, txClient, error_20;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         _a.trys.push([0, 3, , 4]);
-                        return [4 /*yield*/, this.getSignedTxVote(wallet, proposalId, option, txMisc)];
+                        longId = long_1.default.fromInt(proposalId);
+                        return [4 /*yield*/, this.getSignedTxVote(wallet, longId, option, txMisc)];
                     case 1:
                         txRaw = _a.sent();
-                        txClient = new gov_1.GovTxClient(wallet.getRawWallet(), this._config.rpcAddress);
+                        txClient = new gov_1.GovTxClient(wallet.getRawWallet(), this.config.rpcAddress);
                         return [4 /*yield*/, txClient.broadcast(txRaw)];
                     case 2: return [2 /*return*/, _a.sent()];
                     case 3:
-                        error_12 = _a.sent();
-                        FirmaUtil_1.FirmaUtil.printLog(error_12);
-                        throw error_12;
+                        error_20 = _a.sent();
+                        FirmaUtil_1.FirmaUtil.printLog(error_20);
+                        throw error_20;
                     case 4: return [2 /*return*/];
                 }
             });
@@ -374,51 +616,137 @@ var FirmaGovService = /** @class */ (function () {
     FirmaGovService.prototype.getSignedTxDeposit = function (wallet, proposalId, amount, txMisc) {
         if (txMisc === void 0) { txMisc = gov_1.DefaultTxMisc; }
         return __awaiter(this, void 0, void 0, function () {
-            var txClient, depositor, sendAmount, message, error_13;
+            var txClient, depositor, sendAmount, message, error_21;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         _a.trys.push([0, 3, , 4]);
-                        txClient = new gov_1.GovTxClient(wallet.getRawWallet(), this._config.rpcAddress);
+                        txClient = new gov_1.GovTxClient(wallet.getRawWallet(), this.config.rpcAddress);
                         return [4 /*yield*/, wallet.getAddress()];
                     case 1:
                         depositor = _a.sent();
-                        sendAmount = { denom: this._config.denom, amount: FirmaUtil_1.FirmaUtil.getUFCTStringFromFCT(amount) };
+                        sendAmount = { denom: this.config.denom, amount: FirmaUtil_1.FirmaUtil.getUFCTStringFromFCT(amount) };
                         message = txClient.msgDeposit({ proposalId: proposalId, depositor: depositor, amount: [sendAmount] });
-                        return [4 /*yield*/, txClient.sign([message], gov_1.getSignAndBroadcastOption(this._config.denom, txMisc))];
+                        return [4 /*yield*/, txClient.sign([message], gov_1.getSignAndBroadcastOption(this.config.denom, txMisc))];
                     case 2: return [2 /*return*/, _a.sent()];
                     case 3:
-                        error_13 = _a.sent();
-                        FirmaUtil_1.FirmaUtil.printLog(error_13);
-                        throw error_13;
+                        error_21 = _a.sent();
+                        FirmaUtil_1.FirmaUtil.printLog(error_21);
+                        throw error_21;
                     case 4: return [2 /*return*/];
                 }
             });
         });
     };
-    FirmaGovService.prototype.Deposit = function (wallet, proposalId, amount, txMisc) {
+    FirmaGovService.prototype.deposit = function (wallet, proposalId, amount, txMisc) {
         if (txMisc === void 0) { txMisc = gov_1.DefaultTxMisc; }
         return __awaiter(this, void 0, void 0, function () {
-            var txRaw, txClient, error_14;
+            var longId, txRaw, txClient, error_22;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         _a.trys.push([0, 3, , 4]);
-                        return [4 /*yield*/, this.getSignedTxDeposit(wallet, proposalId, amount, txMisc)];
+                        longId = long_1.default.fromInt(proposalId);
+                        return [4 /*yield*/, this.getSignedTxDeposit(wallet, longId, amount, txMisc)];
                     case 1:
                         txRaw = _a.sent();
-                        txClient = new gov_1.GovTxClient(wallet.getRawWallet(), this._config.rpcAddress);
+                        txClient = new gov_1.GovTxClient(wallet.getRawWallet(), this.config.rpcAddress);
                         return [4 /*yield*/, txClient.broadcast(txRaw)];
                     case 2: return [2 /*return*/, _a.sent()];
                     case 3:
-                        error_14 = _a.sent();
-                        FirmaUtil_1.FirmaUtil.printLog(error_14);
-                        throw error_14;
+                        error_22 = _a.sent();
+                        FirmaUtil_1.FirmaUtil.printLog(error_22);
+                        throw error_22;
                     case 4: return [2 /*return*/];
                 }
             });
         });
     };
+    //query
+    FirmaGovService.prototype.getParam = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            var queryClient, result, error_23;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        _a.trys.push([0, 2, , 3]);
+                        queryClient = new gov_1.GovQueryClient(this.config.restApiAddress);
+                        return [4 /*yield*/, queryClient.queryGetParam()];
+                    case 1:
+                        result = _a.sent();
+                        return [2 /*return*/, result];
+                    case 2:
+                        error_23 = _a.sent();
+                        FirmaUtil_1.FirmaUtil.printLog(error_23);
+                        throw error_23;
+                    case 3: return [2 /*return*/];
+                }
+            });
+        });
+    };
+    FirmaGovService.prototype.getProposal = function (id) {
+        return __awaiter(this, void 0, void 0, function () {
+            var queryClient, result, error_24;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        _a.trys.push([0, 2, , 3]);
+                        queryClient = new gov_1.GovQueryClient(this.config.restApiAddress);
+                        return [4 /*yield*/, queryClient.queryGetProposal(id)];
+                    case 1:
+                        result = _a.sent();
+                        return [2 /*return*/, result];
+                    case 2:
+                        error_24 = _a.sent();
+                        FirmaUtil_1.FirmaUtil.printLog(error_24);
+                        throw error_24;
+                    case 3: return [2 /*return*/];
+                }
+            });
+        });
+    };
+    FirmaGovService.prototype.getProposalListByStatus = function (status) {
+        return __awaiter(this, void 0, void 0, function () {
+            var queryClient, result, error_25;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        _a.trys.push([0, 2, , 3]);
+                        queryClient = new gov_1.GovQueryClient(this.config.restApiAddress);
+                        return [4 /*yield*/, queryClient.queryGetProposalListByStatus(status)];
+                    case 1:
+                        result = _a.sent();
+                        return [2 /*return*/, result];
+                    case 2:
+                        error_25 = _a.sent();
+                        FirmaUtil_1.FirmaUtil.printLog(error_25);
+                        throw error_25;
+                    case 3: return [2 /*return*/];
+                }
+            });
+        });
+    };
+    FirmaGovService.prototype.getProposalList = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            var queryClient, result, error_26;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        _a.trys.push([0, 2, , 3]);
+                        queryClient = new gov_1.GovQueryClient(this.config.restApiAddress);
+                        return [4 /*yield*/, queryClient.queryGetProposalList()];
+                    case 1:
+                        result = _a.sent();
+                        return [2 /*return*/, result];
+                    case 2:
+                        error_26 = _a.sent();
+                        FirmaUtil_1.FirmaUtil.printLog(error_26);
+                        throw error_26;
+                    case 3: return [2 /*return*/];
+                }
+            });
+        });
+    };
     return FirmaGovService;
 }());
 exports.FirmaGovService = FirmaGovService;