@firmachain/firma-js 0.2.15 → 0.2.19

package/dist/sdk/FirmaBankService.js

@@ -76,7 +76,7 @@ var FirmaBankService = /** @class */ (function () {
                         return [4 /*yield*/, this.getSignedTxSend(wallet, targetAddress, tokenID, FirmaUtil_1.FirmaUtil.getUTokenStringFromToken(amount, decimal), txMisc)];
                     case 1:
                         txRaw = _a.sent();
-                        bankTxClient = new bank_1.BankTxClient(wallet.getRawWallet(), this.config.rpcAddress);
+                        bankTxClient = new bank_1.BankTxClient(wallet, this.config.rpcAddress);
                         return [4 /*yield*/, bankTxClient.broadcast(txRaw)];
                     case 2: return [2 /*return*/, _a.sent()];
                     case 3:
@@ -99,7 +99,7 @@ var FirmaBankService = /** @class */ (function () {
                         return [4 /*yield*/, this.getSignedTxSend(wallet, targetAddress, this.config.denom, FirmaUtil_1.FirmaUtil.getUFCTStringFromFCT(amount), txMisc)];
                     case 1:
                         txRaw = _a.sent();
-                        bankTxClient = new bank_1.BankTxClient(wallet.getRawWallet(), this.config.rpcAddress);
+                        bankTxClient = new bank_1.BankTxClient(wallet, this.config.rpcAddress);
                         return [4 /*yield*/, bankTxClient.broadcast(txRaw)];
                     case 2: return [2 /*return*/, _a.sent()];
                     case 3:
@@ -189,7 +189,7 @@ var FirmaBankService = /** @class */ (function () {
                 switch (_a.label) {
                     case 0:
                         _a.trys.push([0, 3, , 4]);
-                        bankTxClient = new bank_1.BankTxClient(wallet.getRawWallet(), this.config.rpcAddress);
+                        bankTxClient = new bank_1.BankTxClient(wallet, this.config.rpcAddress);
                         return [4 /*yield*/, wallet.getAddress()];
                     case 1:
                         address = _a.sent();

package/dist/sdk/FirmaContractService.js

@@ -148,7 +148,7 @@ var ContractService = /** @class */ (function () {
                 switch (_a.label) {
                     case 0:
                         _a.trys.push([0, 3, , 4]);
-                        contractTxClient = new contract_1.ContractTxClient(wallet.getRawWallet(), this.config.rpcAddress);
+                        contractTxClient = new contract_1.ContractTxClient(wallet, this.config.rpcAddress);
                         return [4 /*yield*/, contractTxClient.sign(txList, contract_1.getSignAndBroadcastOption(this.config.denom, txMisc))];
                     case 1:
                         txRaw = _a.sent();
@@ -195,7 +195,7 @@ var ContractService = /** @class */ (function () {
                         return [4 /*yield*/, wallet.getAddress()];
                     case 1:
                         address = _a.sent();
-                        contractTxClient = new contract_1.ContractTxClient(wallet.getRawWallet(), this.config.rpcAddress);
+                        contractTxClient = new contract_1.ContractTxClient(wallet, this.config.rpcAddress);
                         return [2 /*return*/, contractTxClient.msgCreateContractFile({
                                 creator: address,
                                 fileHash: fileHash,
@@ -223,7 +223,7 @@ var ContractService = /** @class */ (function () {
                         return [4 /*yield*/, wallet.getAddress()];
                     case 1:
                         address = _a.sent();
-                        contractTxClient = new contract_1.ContractTxClient(wallet.getRawWallet(), this.config.rpcAddress);
+                        contractTxClient = new contract_1.ContractTxClient(wallet, this.config.rpcAddress);
                         message = contractTxClient.msgCreateContractFile({
                             creator: address,
                             fileHash: fileHash,
@@ -253,7 +253,7 @@ var ContractService = /** @class */ (function () {
                         return [4 /*yield*/, this.getSignedTxCreateContractFile(wallet, fileHash, timeStamp, ownerList, metaDataJsonString, txMisc)];
                     case 1:
                         txRaw = _a.sent();
-                        contractTxClient = new contract_1.ContractTxClient(wallet.getRawWallet(), this.config.rpcAddress);
+                        contractTxClient = new contract_1.ContractTxClient(wallet, this.config.rpcAddress);
                         return [4 /*yield*/, contractTxClient.broadcast(txRaw)];
                     case 2: return [2 /*return*/, _a.sent()];
                     case 3:
@@ -298,7 +298,7 @@ var ContractService = /** @class */ (function () {
                         return [4 /*yield*/, wallet.getAddress()];
                     case 1:
                         address = _a.sent();
-                        contractTxClient = new contract_1.ContractTxClient(wallet.getRawWallet(), this.config.rpcAddress);
+                        contractTxClient = new contract_1.ContractTxClient(wallet, this.config.rpcAddress);
                         message = contractTxClient.msgAddContractLog({
                             creator: address,
                             contractHash: contractHash,
@@ -329,7 +329,7 @@ var ContractService = /** @class */ (function () {
                         return [4 /*yield*/, this.getSignedTxAddContractLog(wallet, contractHash, timeStamp, eventName, ownerAddress, jsonString, txMisc)];
                     case 1:
                         txRaw = _a.sent();
-                        contractTxClient = new contract_1.ContractTxClient(wallet.getRawWallet(), this.config.rpcAddress);
+                        contractTxClient = new contract_1.ContractTxClient(wallet, this.config.rpcAddress);
                         return [4 /*yield*/, contractTxClient.broadcast(txRaw)];
                     case 2: return [2 /*return*/, _a.sent()];
                     case 3:
@@ -351,7 +351,7 @@ var ContractService = /** @class */ (function () {
                         return [4 /*yield*/, wallet.getAddress()];
                     case 1:
                         address = _a.sent();
-                        contractTxClient = new contract_1.ContractTxClient(wallet.getRawWallet(), this.config.rpcAddress);
+                        contractTxClient = new contract_1.ContractTxClient(wallet, this.config.rpcAddress);
                         return [2 /*return*/, contractTxClient.msgAddContractLog({
                                 creator: address,
                                 contractHash: contractHash,
@@ -377,7 +377,7 @@ var ContractService = /** @class */ (function () {
                 switch (_a.label) {
                     case 0:
                         _a.trys.push([0, 2, , 3]);
-                        contractTxClient = new contract_1.ContractTxClient(wallet.getRawWallet(), this.config.rpcAddress);
+                        contractTxClient = new contract_1.ContractTxClient(wallet, this.config.rpcAddress);
                         return [4 /*yield*/, contractTxClient.signAndBroadcast(msgList, contract_1.getSignAndBroadcastOption(this.config.denom, txMisc))];
                     case 1: return [2 /*return*/, _a.sent()];
                     case 2:

package/dist/sdk/FirmaDistributionService.d.ts

@@ -3,12 +3,14 @@ import { FirmaWalletService } from "./FirmaWalletService";
 import { FirmaConfig } from "./FirmaConfig";
 import { BroadcastTxResponse } from "./firmachain/common/stargateclient";
 import { Coin } from "cosmjs-types/cosmos/base/v1beta1/coin";
+import { DelegationInfo } from "./firmachain/staking";
 export declare class FirmaDistributionService {
     private readonly config;
     constructor(config: FirmaConfig);
     getGasEstimationSetWithdrawAddress(wallet: FirmaWalletService, withdrawAddress: string, txMisc?: TxMisc): Promise<number>;
     getGasEstimationFundCommunityPool(wallet: FirmaWalletService, amount: number, txMisc?: TxMisc): Promise<number>;
     getGasEstimationWithdrawValidatorCommission(wallet: FirmaWalletService, validatorAddress: string, txMisc?: TxMisc): Promise<number>;
+    getGasEstimationWithdrawAllRewardsFromAllValidator(wallet: FirmaWalletService, delegationList: DelegationInfo[], txMisc?: TxMisc): Promise<number>;
     getGasEstimationWithdrawAllRewards(wallet: FirmaWalletService, validatorAddress: string, txMisc?: TxMisc): Promise<number>;
     private getSignedTxWithdrawAllRewards;
     private getSignedTxSetWithdrawAddress;
@@ -17,6 +19,8 @@ export declare class FirmaDistributionService {
     setWithdrawAddress(wallet: FirmaWalletService, withdrawAddress: string, txMisc?: TxMisc): Promise<BroadcastTxResponse>;
     fundCommunityPool(wallet: FirmaWalletService, amount: number, txMisc?: TxMisc): Promise<BroadcastTxResponse>;
     withdrawValidatorCommission(wallet: FirmaWalletService, validatorAddres: string, txMisc?: TxMisc): Promise<BroadcastTxResponse>;
+    private getSignedTxwithdrawAllRewardsFromAllValidator;
+    withdrawAllRewardsFromAllValidator(wallet: FirmaWalletService, delegationList: DelegationInfo[], txMisc?: TxMisc): Promise<BroadcastTxResponse>;
     withdrawAllRewards(wallet: FirmaWalletService, validatorAddress: string, txMisc?: TxMisc): Promise<BroadcastTxResponse>;
     getRewardInfo(address: string, validatorAddress: string): Promise<string>;
     getValidatorOutStandingReward(validatorAddress: string): Promise<Coin[]>;

package/dist/sdk/FirmaDistributionService.js

@@ -109,7 +109,7 @@ var FirmaDistributionService = /** @class */ (function () {
             });
         });
     };
-    FirmaDistributionService.prototype.getGasEstimationWithdrawAllRewards = function (wallet, validatorAddress, txMisc) {
+    FirmaDistributionService.prototype.getGasEstimationWithdrawAllRewardsFromAllValidator = function (wallet, delegationList, txMisc) {
         if (txMisc === void 0) { txMisc = distribution_1.DefaultTxMisc; }
         return __awaiter(this, void 0, void 0, function () {
             var txRaw, error_4;
@@ -117,7 +117,7 @@ var FirmaDistributionService = /** @class */ (function () {
                 switch (_a.label) {
                     case 0:
                         _a.trys.push([0, 3, , 4]);
-                        return [4 /*yield*/, this.getSignedTxWithdrawAllRewards(wallet, validatorAddress, txMisc)];
+                        return [4 /*yield*/, this.getSignedTxwithdrawAllRewardsFromAllValidator(wallet, delegationList, txMisc)];
                     case 1:
                         txRaw = _a.sent();
                         return [4 /*yield*/, FirmaUtil_1.FirmaUtil.estimateGas(txRaw)];
@@ -131,20 +131,18 @@ var FirmaDistributionService = /** @class */ (function () {
             });
         });
     };
-    FirmaDistributionService.prototype.getSignedTxWithdrawAllRewards = function (wallet, validatorAddress, txMisc) {
+    FirmaDistributionService.prototype.getGasEstimationWithdrawAllRewards = function (wallet, validatorAddress, txMisc) {
         if (txMisc === void 0) { txMisc = distribution_1.DefaultTxMisc; }
         return __awaiter(this, void 0, void 0, function () {
-            var txClient, address, message, error_5;
+            var txRaw, error_5;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         _a.trys.push([0, 3, , 4]);
-                        txClient = new distribution_1.DistributionTxClient(wallet.getRawWallet(), this.config.rpcAddress);
-                        return [4 /*yield*/, wallet.getAddress()];
+                        return [4 /*yield*/, this.getSignedTxWithdrawAllRewards(wallet, validatorAddress, txMisc)];
                     case 1:
-                        address = _a.sent();
-                        message = txClient.msgWithdrawDelegatorReward({ delegatorAddress: address, validatorAddress: validatorAddress });
-                        return [4 /*yield*/, txClient.sign([message], distribution_1.getSignAndBroadcastOption(this.config.denom, txMisc))];
+                        txRaw = _a.sent();
+                        return [4 /*yield*/, FirmaUtil_1.FirmaUtil.estimateGas(txRaw)];
                     case 2: return [2 /*return*/, _a.sent()];
                     case 3:
                         error_5 = _a.sent();
@@ -155,7 +153,7 @@ var FirmaDistributionService = /** @class */ (function () {
             });
         });
     };
-    FirmaDistributionService.prototype.getSignedTxSetWithdrawAddress = function (wallet, withdrawAddress, txMisc) {
+    FirmaDistributionService.prototype.getSignedTxWithdrawAllRewards = function (wallet, validatorAddress, txMisc) {
         if (txMisc === void 0) { txMisc = distribution_1.DefaultTxMisc; }
         return __awaiter(this, void 0, void 0, function () {
             var txClient, address, message, error_6;
@@ -163,11 +161,11 @@ var FirmaDistributionService = /** @class */ (function () {
                 switch (_a.label) {
                     case 0:
                         _a.trys.push([0, 3, , 4]);
-                        txClient = new distribution_1.DistributionTxClient(wallet.getRawWallet(), this.config.rpcAddress);
+                        txClient = new distribution_1.DistributionTxClient(wallet, this.config.rpcAddress);
                         return [4 /*yield*/, wallet.getAddress()];
                     case 1:
                         address = _a.sent();
-                        message = txClient.msgSetWithdrawAddress({ delegatorAddress: address, withdrawAddress: withdrawAddress });
+                        message = txClient.msgWithdrawDelegatorReward({ delegatorAddress: address, validatorAddress: validatorAddress });
                         return [4 /*yield*/, txClient.sign([message], distribution_1.getSignAndBroadcastOption(this.config.denom, txMisc))];
                     case 2: return [2 /*return*/, _a.sent()];
                     case 3:
@@ -179,20 +177,19 @@ var FirmaDistributionService = /** @class */ (function () {
             });
         });
     };
-    FirmaDistributionService.prototype.getSignedTxFundCommunityPool = function (wallet, amount, txMisc) {
+    FirmaDistributionService.prototype.getSignedTxSetWithdrawAddress = function (wallet, withdrawAddress, txMisc) {
         if (txMisc === void 0) { txMisc = distribution_1.DefaultTxMisc; }
         return __awaiter(this, void 0, void 0, function () {
-            var txClient, address, sendAmount, message, error_7;
+            var txClient, address, message, error_7;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         _a.trys.push([0, 3, , 4]);
-                        txClient = new distribution_1.DistributionTxClient(wallet.getRawWallet(), this.config.rpcAddress);
+                        txClient = new distribution_1.DistributionTxClient(wallet, this.config.rpcAddress);
                         return [4 /*yield*/, wallet.getAddress()];
                     case 1:
                         address = _a.sent();
-                        sendAmount = { denom: this.config.denom, amount: FirmaUtil_1.FirmaUtil.getUFCTStringFromFCT(amount) };
-                        message = txClient.msgFundCommunityPool({ depositor: address, amount: [sendAmount] });
+                        message = txClient.msgSetWithdrawAddress({ delegatorAddress: address, withdrawAddress: withdrawAddress });
                         return [4 /*yield*/, txClient.sign([message], distribution_1.getSignAndBroadcastOption(this.config.denom, txMisc))];
                     case 2: return [2 /*return*/, _a.sent()];
                     case 3:
@@ -204,22 +201,47 @@ var FirmaDistributionService = /** @class */ (function () {
             });
         });
     };
+    FirmaDistributionService.prototype.getSignedTxFundCommunityPool = function (wallet, amount, txMisc) {
+        if (txMisc === void 0) { txMisc = distribution_1.DefaultTxMisc; }
+        return __awaiter(this, void 0, void 0, function () {
+            var txClient, address, sendAmount, message, error_8;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        _a.trys.push([0, 3, , 4]);
+                        txClient = new distribution_1.DistributionTxClient(wallet, this.config.rpcAddress);
+                        return [4 /*yield*/, wallet.getAddress()];
+                    case 1:
+                        address = _a.sent();
+                        sendAmount = { denom: this.config.denom, amount: FirmaUtil_1.FirmaUtil.getUFCTStringFromFCT(amount) };
+                        message = txClient.msgFundCommunityPool({ depositor: address, amount: [sendAmount] });
+                        return [4 /*yield*/, txClient.sign([message], distribution_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*/];
+                }
+            });
+        });
+    };
     FirmaDistributionService.prototype.getSignedTxWithdrawValidatorCommission = function (wallet, validatorAddres, txMisc) {
         if (txMisc === void 0) { txMisc = distribution_1.DefaultTxMisc; }
         return __awaiter(this, void 0, void 0, function () {
-            var txClient, message, error_8;
+            var txClient, message, error_9;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         _a.trys.push([0, 2, , 3]);
-                        txClient = new distribution_1.DistributionTxClient(wallet.getRawWallet(), this.config.rpcAddress);
+                        txClient = new distribution_1.DistributionTxClient(wallet, this.config.rpcAddress);
                         message = txClient.msgWithdrawValidatorCommission({ validatorAddress: validatorAddres });
                         return [4 /*yield*/, txClient.sign([message], distribution_1.getSignAndBroadcastOption(this.config.denom, txMisc))];
                     case 1: return [2 /*return*/, _a.sent()];
                     case 2:
-                        error_8 = _a.sent();
-                        FirmaUtil_1.FirmaUtil.printLog(error_8);
-                        throw error_8;
+                        error_9 = _a.sent();
+                        FirmaUtil_1.FirmaUtil.printLog(error_9);
+                        throw error_9;
                     case 3: return [2 /*return*/];
                 }
             });
@@ -228,7 +250,7 @@ var FirmaDistributionService = /** @class */ (function () {
     FirmaDistributionService.prototype.setWithdrawAddress = function (wallet, withdrawAddress, txMisc) {
         if (txMisc === void 0) { txMisc = distribution_1.DefaultTxMisc; }
         return __awaiter(this, void 0, void 0, function () {
-            var txRaw, txClient, error_9;
+            var txRaw, txClient, error_10;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -236,13 +258,13 @@ var FirmaDistributionService = /** @class */ (function () {
                         return [4 /*yield*/, this.getSignedTxSetWithdrawAddress(wallet, withdrawAddress, txMisc)];
                     case 1:
                         txRaw = _a.sent();
-                        txClient = new distribution_1.DistributionTxClient(wallet.getRawWallet(), this.config.rpcAddress);
+                        txClient = new distribution_1.DistributionTxClient(wallet, 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_10 = _a.sent();
+                        FirmaUtil_1.FirmaUtil.printLog(error_10);
+                        throw error_10;
                     case 4: return [2 /*return*/];
                 }
             });
@@ -251,7 +273,7 @@ var FirmaDistributionService = /** @class */ (function () {
     FirmaDistributionService.prototype.fundCommunityPool = function (wallet, amount, txMisc) {
         if (txMisc === void 0) { txMisc = distribution_1.DefaultTxMisc; }
         return __awaiter(this, void 0, void 0, function () {
-            var txRaw, txClient, error_10;
+            var txRaw, txClient, error_11;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -259,13 +281,13 @@ var FirmaDistributionService = /** @class */ (function () {
                         return [4 /*yield*/, this.getSignedTxFundCommunityPool(wallet, amount, txMisc)];
                     case 1:
                         txRaw = _a.sent();
-                        txClient = new distribution_1.DistributionTxClient(wallet.getRawWallet(), this.config.rpcAddress);
+                        txClient = new distribution_1.DistributionTxClient(wallet, 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_11 = _a.sent();
+                        FirmaUtil_1.FirmaUtil.printLog(error_11);
+                        throw error_11;
                     case 4: return [2 /*return*/];
                 }
             });
@@ -274,7 +296,7 @@ var FirmaDistributionService = /** @class */ (function () {
     FirmaDistributionService.prototype.withdrawValidatorCommission = function (wallet, validatorAddres, txMisc) {
         if (txMisc === void 0) { txMisc = distribution_1.DefaultTxMisc; }
         return __awaiter(this, void 0, void 0, function () {
-            var txRaw, txClient, error_11;
+            var txRaw, txClient, error_12;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -282,13 +304,65 @@ var FirmaDistributionService = /** @class */ (function () {
                         return [4 /*yield*/, this.getSignedTxWithdrawValidatorCommission(wallet, validatorAddres, txMisc)];
                     case 1:
                         txRaw = _a.sent();
-                        txClient = new distribution_1.DistributionTxClient(wallet.getRawWallet(), this.config.rpcAddress);
+                        txClient = new distribution_1.DistributionTxClient(wallet, this.config.rpcAddress);
                         return [4 /*yield*/, txClient.broadcast(txRaw)];
                     case 2: return [2 /*return*/, _a.sent()];
                     case 3:
-                        error_11 = _a.sent();
-                        FirmaUtil_1.FirmaUtil.printLog(error_11);
-                        throw error_11;
+                        error_12 = _a.sent();
+                        FirmaUtil_1.FirmaUtil.printLog(error_12);
+                        throw error_12;
+                    case 4: return [2 /*return*/];
+                }
+            });
+        });
+    };
+    FirmaDistributionService.prototype.getSignedTxwithdrawAllRewardsFromAllValidator = function (wallet, delegationList, txMisc) {
+        if (txMisc === void 0) { txMisc = distribution_1.DefaultTxMisc; }
+        return __awaiter(this, void 0, void 0, function () {
+            var address, txClient, messageList, i, validatorAddress, message, error_13;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        _a.trys.push([0, 3, , 4]);
+                        return [4 /*yield*/, wallet.getAddress()];
+                    case 1:
+                        address = _a.sent();
+                        txClient = new distribution_1.DistributionTxClient(wallet, this.config.rpcAddress);
+                        messageList = [];
+                        for (i = 0; i < delegationList.length; i++) {
+                            validatorAddress = delegationList[i].delegation.validator_address;
+                            message = txClient.msgWithdrawDelegatorReward({ delegatorAddress: address, validatorAddress: validatorAddress });
+                            messageList.push(message);
+                        }
+                        return [4 /*yield*/, txClient.sign(messageList, distribution_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;
+                    case 4: return [2 /*return*/];
+                }
+            });
+        });
+    };
+    FirmaDistributionService.prototype.withdrawAllRewardsFromAllValidator = function (wallet, delegationList, txMisc) {
+        if (txMisc === void 0) { txMisc = distribution_1.DefaultTxMisc; }
+        return __awaiter(this, void 0, void 0, function () {
+            var txRaw, txClient, error_14;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        _a.trys.push([0, 3, , 4]);
+                        return [4 /*yield*/, this.getSignedTxwithdrawAllRewardsFromAllValidator(wallet, delegationList, txMisc)];
+                    case 1:
+                        txRaw = _a.sent();
+                        txClient = new distribution_1.DistributionTxClient(wallet, 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;
                     case 4: return [2 /*return*/];
                 }
             });
@@ -297,7 +371,7 @@ var FirmaDistributionService = /** @class */ (function () {
     FirmaDistributionService.prototype.withdrawAllRewards = function (wallet, validatorAddress, txMisc) {
         if (txMisc === void 0) { txMisc = distribution_1.DefaultTxMisc; }
         return __awaiter(this, void 0, void 0, function () {
-            var txRaw, txClient, error_12;
+            var txRaw, txClient, error_15;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -305,13 +379,13 @@ var FirmaDistributionService = /** @class */ (function () {
                         return [4 /*yield*/, this.getSignedTxWithdrawAllRewards(wallet, validatorAddress, txMisc)];
                     case 1:
                         txRaw = _a.sent();
-                        txClient = new distribution_1.DistributionTxClient(wallet.getRawWallet(), this.config.rpcAddress);
+                        txClient = new distribution_1.DistributionTxClient(wallet, 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_15 = _a.sent();
+                        FirmaUtil_1.FirmaUtil.printLog(error_15);
+                        throw error_15;
                     case 4: return [2 /*return*/];
                 }
             });
@@ -321,7 +395,7 @@ var FirmaDistributionService = /** @class */ (function () {
     // 
     FirmaDistributionService.prototype.getRewardInfo = function (address, validatorAddress) {
         return __awaiter(this, void 0, void 0, function () {
-            var queryClient, result, error_13;
+            var queryClient, result, error_16;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -332,9 +406,9 @@ var FirmaDistributionService = /** @class */ (function () {
                         result = _a.sent();
                         return [2 /*return*/, result];
                     case 2:
-                        error_13 = _a.sent();
-                        FirmaUtil_1.FirmaUtil.printLog(error_13);
-                        throw error_13;
+                        error_16 = _a.sent();
+                        FirmaUtil_1.FirmaUtil.printLog(error_16);
+                        throw error_16;
                     case 3: return [2 /*return*/];
                 }
             });
@@ -342,7 +416,7 @@ var FirmaDistributionService = /** @class */ (function () {
     };
     FirmaDistributionService.prototype.getValidatorOutStandingReward = function (validatorAddress) {
         return __awaiter(this, void 0, void 0, function () {
-            var queryClient, result, error_14;
+            var queryClient, result, error_17;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -353,9 +427,9 @@ var FirmaDistributionService = /** @class */ (function () {
                         result = _a.sent();
                         return [2 /*return*/, result];
                     case 2:
-                        error_14 = _a.sent();
-                        FirmaUtil_1.FirmaUtil.printLog(error_14);
-                        throw error_14;
+                        error_17 = _a.sent();
+                        FirmaUtil_1.FirmaUtil.printLog(error_17);
+                        throw error_17;
                     case 3: return [2 /*return*/];
                 }
             });
@@ -363,7 +437,7 @@ var FirmaDistributionService = /** @class */ (function () {
     };
     FirmaDistributionService.prototype.getValidatorCommission = function (validatorAddress) {
         return __awaiter(this, void 0, void 0, function () {
-            var queryClient, result, error_15;
+            var queryClient, result, error_18;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -374,9 +448,9 @@ var FirmaDistributionService = /** @class */ (function () {
                         result = _a.sent();
                         return [2 /*return*/, result];
                     case 2:
-                        error_15 = _a.sent();
-                        FirmaUtil_1.FirmaUtil.printLog(error_15);
-                        throw error_15;
+                        error_18 = _a.sent();
+                        FirmaUtil_1.FirmaUtil.printLog(error_18);
+                        throw error_18;
                     case 3: return [2 /*return*/];
                 }
             });
@@ -384,7 +458,7 @@ var FirmaDistributionService = /** @class */ (function () {
     };
     FirmaDistributionService.prototype.getTotalRewardInfo = function (address) {
         return __awaiter(this, void 0, void 0, function () {
-            var queryClient, result, error_16;
+            var queryClient, result, error_19;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -395,9 +469,9 @@ var FirmaDistributionService = /** @class */ (function () {
                         result = _a.sent();
                         return [2 /*return*/, result];
                     case 2:
-                        error_16 = _a.sent();
-                        FirmaUtil_1.FirmaUtil.printLog(error_16);
-                        throw error_16;
+                        error_19 = _a.sent();
+                        FirmaUtil_1.FirmaUtil.printLog(error_19);
+                        throw error_19;
                     case 3: return [2 /*return*/];
                 }
             });
@@ -405,7 +479,7 @@ var FirmaDistributionService = /** @class */ (function () {
     };
     FirmaDistributionService.prototype.getCommunityPool = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var queryClient, result, error_17;
+            var queryClient, result, error_20;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -416,9 +490,9 @@ var FirmaDistributionService = /** @class */ (function () {
                         result = _a.sent();
                         return [2 /*return*/, result];
                     case 2:
-                        error_17 = _a.sent();
-                        FirmaUtil_1.FirmaUtil.printLog(error_17);
-                        throw error_17;
+                        error_20 = _a.sent();
+                        FirmaUtil_1.FirmaUtil.printLog(error_20);
+                        throw error_20;
                     case 3: return [2 /*return*/];
                 }
             });
@@ -426,7 +500,7 @@ var FirmaDistributionService = /** @class */ (function () {
     };
     FirmaDistributionService.prototype.getWithdrawAddress = function (address) {
         return __awaiter(this, void 0, void 0, function () {
-            var queryClient, result, error_18;
+            var queryClient, result, error_21;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -437,9 +511,9 @@ var FirmaDistributionService = /** @class */ (function () {
                         result = _a.sent();
                         return [2 /*return*/, result];
                     case 2:
-                        error_18 = _a.sent();
-                        FirmaUtil_1.FirmaUtil.printLog(error_18);
-                        throw error_18;
+                        error_21 = _a.sent();
+                        FirmaUtil_1.FirmaUtil.printLog(error_21);
+                        throw error_21;
                     case 3: return [2 /*return*/];
                 }
             });

package/dist/sdk/FirmaFeeGrantService.js

@@ -79,7 +79,7 @@ var FirmaFeeGrantService = /** @class */ (function () {
                         return [4 /*yield*/, wallet.getAddress()];
                     case 1:
                         address = _a.sent();
-                        feeGrantTxClient = new feegrant_1.FeeGrantTxClient(wallet.getRawWallet(), this.config.rpcAddress);
+                        feeGrantTxClient = new feegrant_1.FeeGrantTxClient(wallet, this.config.rpcAddress);
                         message = feeGrantTxClient.msgRevokeAllowance({ granter: address, grantee: granteeAddress });
                         return [4 /*yield*/, feeGrantTxClient.sign([message], feegrant_1.getSignAndBroadcastOption(this.config.denom, txMisc))];
                     case 2: return [2 /*return*/, _a.sent()];
@@ -103,7 +103,7 @@ var FirmaFeeGrantService = /** @class */ (function () {
                         return [4 /*yield*/, this.getSignedTxRevokeAllowance(wallet, granteeAddress, txMisc)];
                     case 1:
                         txRaw = _a.sent();
-                        feeGrantTxClient = new feegrant_1.FeeGrantTxClient(wallet.getRawWallet(), this.config.rpcAddress);
+                        feeGrantTxClient = new feegrant_1.FeeGrantTxClient(wallet, this.config.rpcAddress);
                         return [4 /*yield*/, feeGrantTxClient.broadcast(txRaw)];
                     case 2: return [2 /*return*/, _a.sent()];
                     case 3:
@@ -153,7 +153,7 @@ var FirmaFeeGrantService = /** @class */ (function () {
                         return [4 /*yield*/, wallet.getAddress()];
                     case 1:
                         address = _a.sent();
-                        feeGrantTxClient = new feegrant_1.FeeGrantTxClient(wallet.getRawWallet(), this.config.rpcAddress);
+                        feeGrantTxClient = new feegrant_1.FeeGrantTxClient(wallet, this.config.rpcAddress);
                         periodicAllowanceData = {
                             basic: {
                                 spendLimit: this.getCoinType(feegrantOption.basicSpendLimit),
@@ -217,7 +217,7 @@ var FirmaFeeGrantService = /** @class */ (function () {
                 switch (_a.label) {
                     case 0:
                         _a.trys.push([0, 3, , 4]);
-                        feeGrantTxClient = new feegrant_1.FeeGrantTxClient(wallet.getRawWallet(), this.config.rpcAddress);
+                        feeGrantTxClient = new feegrant_1.FeeGrantTxClient(wallet, this.config.rpcAddress);
                         return [4 /*yield*/, wallet.getAddress()];
                     case 1:
                         address = _a.sent();
@@ -257,7 +257,7 @@ var FirmaFeeGrantService = /** @class */ (function () {
                         return [4 /*yield*/, this.getSignedTxGrantPeriodicAllowance(wallet, granteeAddress, feegrantOption, txMisc)];
                     case 1:
                         txRaw = _a.sent();
-                        feeGrantTxClient = new feegrant_1.FeeGrantTxClient(wallet.getRawWallet(), this.config.rpcAddress);
+                        feeGrantTxClient = new feegrant_1.FeeGrantTxClient(wallet, this.config.rpcAddress);
                         return [4 /*yield*/, feeGrantTxClient.broadcast(txRaw)];
                     case 2: return [2 /*return*/, _a.sent()];
                     case 3:
@@ -281,7 +281,7 @@ var FirmaFeeGrantService = /** @class */ (function () {
                         return [4 /*yield*/, this.getSignedTxGrantBasicAllowance(wallet, granteeAddress, feegrantOption, txMisc)];
                     case 1:
                         txRaw = _a.sent();
-                        feeGrantTxClient = new feegrant_1.FeeGrantTxClient(wallet.getRawWallet(), this.config.rpcAddress);
+                        feeGrantTxClient = new feegrant_1.FeeGrantTxClient(wallet, this.config.rpcAddress);
                         return [4 /*yield*/, feeGrantTxClient.broadcast(txRaw)];
                     case 2: return [2 /*return*/, _a.sent()];
                     case 3: