@firmachain/firma-js 0.3.7 → 0.3.8

package/dist/sdk/FirmaDistributionService.js

@@ -322,28 +322,38 @@ var FirmaDistributionService = /** @class */ (function () {
     FirmaDistributionService.prototype.getSignedTxwithdrawAllRewardsFromAllValidator = function (wallet, delegationList, txMisc) {
         if (txMisc === void 0) { txMisc = FirmaUtil_1.DefaultTxMisc; }
         return __awaiter(this, void 0, void 0, function () {
-            var address, txClient, messageList, i, validatorAddress, message, error_13;
+            var address, txClient, messageList, totalRewardInfo_1, filteredDelegationList, i, validatorAddress, message, error_13;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        _a.trys.push([0, 3, , 4]);
+                        _a.trys.push([0, 4, , 5]);
                         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;
+                        return [4 /*yield*/, this.getTotalRewardInfo(address)];
+                    case 2:
+                        totalRewardInfo_1 = _a.sent();
+                        filteredDelegationList = delegationList.filter(function (delegation) {
+                            var hasReward = totalRewardInfo_1.rewards.some(function (reward) { return reward.validator_address === delegation.delegation.validator_address; });
+                            if (!hasReward) {
+                                FirmaUtil_1.FirmaUtil.printLog("Validator filtered. Will not request to withdraw reward from zero reward validator: ".concat(delegation.delegation.validator_address, ", delegation amount=").concat(delegation.balance.amount));
+                            }
+                            return hasReward;
+                        });
+                        for (i = 0; i < filteredDelegationList.length; i++) {
+                            validatorAddress = filteredDelegationList[i].delegation.validator_address;
                             message = distribution_1.DistributionTxClient.msgWithdrawDelegatorReward({ delegatorAddress: address, validatorAddress: validatorAddress });
                             messageList.push(message);
                         }
                         return [4 /*yield*/, txClient.sign(messageList, (0, FirmaUtil_1.getSignAndBroadcastOption)(this.config.denom, txMisc))];
-                    case 2: return [2 /*return*/, _a.sent()];
-                    case 3:
+                    case 3: return [2 /*return*/, _a.sent()];
+                    case 4:
                         error_13 = _a.sent();
                         FirmaUtil_1.FirmaUtil.printLog(error_13);
                         throw error_13;
-                    case 4: return [2 /*return*/];
+                    case 5: return [2 /*return*/];
                 }
             });
         });

package/dist/sdk/FirmaGovService.js

@@ -129,17 +129,20 @@ var FirmaGovService = /** @class */ (function () {
         if (metadata === void 0) { metadata = ""; }
         if (txMisc === void 0) { txMisc = FirmaUtil_1.DefaultTxMisc; }
         return __awaiter(this, void 0, void 0, function () {
-            var message, txRaw, error_3;
+            var msgObj, message, txRaw, error_3;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         _a.trys.push([0, 3, , 4]);
+                        msgObj = tx_3.MsgSoftwareUpgrade.fromPartial({
+                            authority: FirmaGovService.GOV_AUTHORITY,
+                            plan: plan
+                        });
+                        // Remove time field from the plan to avoid encoding deprecated field
+                        delete msgObj.plan.time;
                         message = {
                             typeUrl: "/cosmos.upgrade.v1beta1.MsgSoftwareUpgrade",
-                            value: tx_3.MsgSoftwareUpgrade.encode(tx_3.MsgSoftwareUpgrade.fromPartial({
-                                authority: FirmaGovService.GOV_AUTHORITY,
-                                plan: plan
-                            })).finish()
+                            value: tx_3.MsgSoftwareUpgrade.encode(msgObj).finish()
                         };
                         return [4 /*yield*/, this.getSignedTxSubmitSoftwareUpgradeProposal(wallet, title, summary, initialDepositFCT, [message], metadata, txMisc)];
                     case 1:
@@ -505,17 +508,20 @@ var FirmaGovService = /** @class */ (function () {
         if (metadata === void 0) { metadata = ""; }
         if (txMisc === void 0) { txMisc = FirmaUtil_1.DefaultTxMisc; }
         return __awaiter(this, void 0, void 0, function () {
-            var message, txRaw, txClient, error_14;
+            var msgObj, message, txRaw, txClient, error_14;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         _a.trys.push([0, 3, , 4]);
+                        msgObj = tx_3.MsgSoftwareUpgrade.fromPartial({
+                            authority: FirmaGovService.GOV_AUTHORITY,
+                            plan: plan
+                        });
+                        // Remove time field from the plan to avoid encoding deprecated field
+                        delete msgObj.plan.time;
                         message = {
                             typeUrl: "/cosmos.upgrade.v1beta1.MsgSoftwareUpgrade",
-                            value: tx_3.MsgSoftwareUpgrade.encode(tx_3.MsgSoftwareUpgrade.fromPartial({
-                                authority: FirmaGovService.GOV_AUTHORITY,
-                                plan: plan
-                            })).finish()
+                            value: tx_3.MsgSoftwareUpgrade.encode(msgObj).finish()
                         };
                         return [4 /*yield*/, this.getSignedTxSubmitSoftwareUpgradeProposal(wallet, title, summary, initialDepositFCT, [message], metadata, txMisc)];
                     case 1:

package/dist/test/16.gov_tx.test.js

@@ -258,7 +258,7 @@ describe('[16. Gov Tx Test]', function () {
         });
     }); });
     // TODO: get recent gov proposal list and then set proposalId for below case
-    var tempProposalId = 420;
+    var tempProposalId = 1;
     // more deposit after initial deposit case
     it.skip('Deposit OK', function () { return __awaiter(void 0, void 0, void 0, function () {
         var proposalId, amount, result;
@@ -275,18 +275,16 @@ describe('[16. Gov Tx Test]', function () {
             }
         });
     }); });
-    it('Vote - alice YES', function () { return __awaiter(void 0, void 0, void 0, function () {
-        var proposalId, validatorWallet3;
+    it.skip('Vote - alice YES', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var proposalId, result;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
                     proposalId = tempProposalId;
-                    return [4 /*yield*/, firma.Wallet.fromMnemonic("main shallow liberty desk super palm remind throw track legal warrior client garbage type insect first token keen subway pony curtain pitch yellow arrive")];
+                    return [4 /*yield*/, firma.Gov.vote(aliceWallet, proposalId, common_1.VotingOption.VOTE_OPTION_YES)];
                 case 1:
-                    validatorWallet3 = _a.sent();
-                    return [4 /*yield*/, firma.Gov.vote(validatorWallet3, proposalId, common_1.VotingOption.VOTE_OPTION_NO_WITH_VETO)];
-                case 2:
-                    _a.sent();
+                    result = _a.sent();
+                    (0, chai_1.expect)(result.code).to.equal(0);
                     return [2 /*return*/];
             }
         });

package/dist/test/config_test.d.ts

@@ -1,7 +1,7 @@
 import { FirmaConfig } from '../sdk/FirmaConfig';
 export declare let TestChainConfig: FirmaConfig;
-export declare const validatorMnemonic = "main shallow liberty desk super palm remind throw track legal warrior client garbage type insect first token keen subway pony curtain pitch yellow arrive";
-export declare const aliceMnemonic = "harvest galaxy sniff include record undo width oven tired sad month text museum curious firm mountain flash assault oval sand ribbon blouse consider lens";
+export declare const validatorMnemonic = "";
+export declare const aliceMnemonic = "ribbon cross anchor sudden smile shrug enact tourist door found farm injury mango cancel wine supreme toy breeze spread type lyrics broom latin apple";
 export declare const bobMnemonic = "certain bean eager measure crawl cliff innocent practice gas ladder board aspect fish link sweet raccoon staff long crumble skin special width click plastic";
 export declare const feeMnemonic = "";
 export declare const firmaFeeMnemonic = "";

package/dist/test/config_test.js

@@ -1,10 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.signerMnemonic4 = exports.signerMnemonic3 = exports.signerMnemonic2 = exports.signerMnemonic1 = exports.firmaFeeMnemonic = exports.feeMnemonic = exports.bobMnemonic = exports.aliceMnemonic = exports.validatorMnemonic = exports.TestChainConfig = void 0;
-var FirmaConfig_1 = require("../sdk/FirmaConfig");
-exports.TestChainConfig = FirmaConfig_1.FirmaConfig.TestNetConfig;
-exports.validatorMnemonic = "main shallow liberty desk super palm remind throw track legal warrior client garbage type insect first token keen subway pony curtain pitch yellow arrive";
-exports.aliceMnemonic = "harvest galaxy sniff include record undo width oven tired sad month text museum curious firm mountain flash assault oval sand ribbon blouse consider lens";
+exports.TestChainConfig = {
+    chainID: "roma-1",
+    rpcAddress: "http://192.168.30.45:26657",
+    restApiAddress: "http://192.168.30.47:1317",
+    ipfsNodeAddress: "http://192.168.30.47:5001",
+    ipfsNodePort: 5001,
+    ipfsWebApiAddress: "http://192.168.30.45:8080",
+    hdPath: "m/44'/7777777'/",
+    prefix: "firma",
+    denom: "ufct",
+    defaultFee: 30000,
+    defaultGas: 300000,
+    isShowLog: false,
+};
+exports.validatorMnemonic = "";
+exports.aliceMnemonic = "ribbon cross anchor sudden smile shrug enact tourist door found farm injury mango cancel wine supreme toy breeze spread type lyrics broom latin apple";
 exports.bobMnemonic = "certain bean eager measure crawl cliff innocent practice gas ladder board aspect fish link sweet raccoon staff long crumble skin special width click plastic";
 exports.feeMnemonic = "";
 exports.firmaFeeMnemonic = "";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@firmachain/firma-js",
-  "version": "0.3.7",
+  "version": "0.3.8",
   "description": "The Official FirmaChain Javascript SDK written in Typescript",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",