@firmachain/firma-js 0.3.4 → 0.3.6-beta1

package/dist/test/06.feegrant_tx.test.js

@@ -14,7 +14,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {
@@ -39,6 +39,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var chai_1 = require("chai");
 var FirmaSDK_1 = require("../sdk/FirmaSDK");
 var config_test_1 = require("./config_test");
+var FirmaUtil_1 = require("../sdk/FirmaUtil");
 describe('[06. Feegrant Tx Test]', function () {
     var firma;
     var aliceWallet;
@@ -69,24 +70,25 @@ describe('[06. Feegrant Tx Test]', function () {
         });
     });
     it('feegrant GrantPeriodicAllowance tx', function () { return __awaiter(void 0, void 0, void 0, function () {
-        var expirationDate, periodicAllowanceData, result;
+        var expirationDate, grantResult;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
                     expirationDate = new Date();
-                    expirationDate.setMinutes(expirationDate.getMinutes() + 20);
-                    periodicAllowanceData = {
-                        // basicSpendLimit: undefined,
-                        // basicExpiration: undefined,
-                        periodSeconds: 30,
-                        periodSpendLimit: 2000,
-                        periodCanSpend: 10000,
-                        periodReset: expirationDate
-                    };
-                    return [4 /*yield*/, firma.FeeGrant.grantPeriodicAllowance(aliceWallet, bobAddress, periodicAllowanceData)];
+                    expirationDate.setDate(expirationDate.getDate() + 1);
+                    return [4 /*yield*/, firma.FeeGrant.grantBasicAllowance(aliceWallet, bobAddress, {
+                            spendLimit: [{
+                                    amount: "10000",
+                                    denom: firma.Config.denom
+                                }],
+                            expiration: {
+                                seconds: BigInt(Math.floor(expirationDate.getTime() / 1000)),
+                                nanos: (expirationDate.getTime() % 1000) * 1000000
+                            }
+                        })];
                 case 1:
-                    result = _a.sent();
-                    chai_1.expect(result.code).to.equal(0);
+                    grantResult = _a.sent();
+                    (0, chai_1.expect)(grantResult.code).to.equal(0);
                     return [2 /*return*/];
             }
         });
@@ -102,58 +104,80 @@ describe('[06. Feegrant Tx Test]', function () {
                 case 1: return [4 /*yield*/, _b.apply(_a, _c.concat([_d.sent()]))];
                 case 2:
                     result = _d.sent();
-                    chai_1.expect(result.code).to.equal(0);
+                    (0, chai_1.expect)(result.code).to.equal(0);
                     return [2 /*return*/];
             }
         });
     }); });
     it('feegrant GrantBasicAllowance tx', function () { return __awaiter(void 0, void 0, void 0, function () {
-        var expirationDate, result, revokeResult;
+        var result, revokeResult;
         return __generator(this, function (_a) {
             switch (_a.label) {
-                case 0:
-                    expirationDate = new Date();
-                    expirationDate.setMonth(12);
-                    return [4 /*yield*/, firma.FeeGrant.grantBasicAllowance(aliceWallet, bobAddress, { expiration: expirationDate })];
+                case 0: return [4 /*yield*/, firma.FeeGrant.grantBasicAllowance(aliceWallet, bobAddress, {
+                        spendLimit: [{
+                                denom: firma.Config.denom,
+                                amount: "10000"
+                            }]
+                    })];
                 case 1:
                     result = _a.sent();
-                    chai_1.expect(result.code).to.be.equal(0);
+                    (0, chai_1.expect)(result.code).to.be.equal(0);
                     return [4 /*yield*/, firma.FeeGrant.revokeAllowance(aliceWallet, bobAddress)];
                 case 2:
                     revokeResult = _a.sent();
-                    chai_1.expect(revokeResult.code).to.be.equal(0);
+                    (0, chai_1.expect)(revokeResult.code).to.be.equal(0);
                     return [2 /*return*/];
             }
         });
     }); });
     it('feegrant send tx', function () { return __awaiter(void 0, void 0, void 0, function () {
-        var amount, expirationDate, periodicAllowanceData, grantResult, sendResult, revokeResult;
+        var error_1, spendAmount, amount, expirationDate, periodicAllowanceData, grantResult, sendResult, revokeResult;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
+                    _a.trys.push([0, 2, , 3]);
+                    return [4 /*yield*/, firma.FeeGrant.revokeAllowance(aliceWallet, bobAddress)];
+                case 1:
+                    _a.sent();
+                    return [3 /*break*/, 3];
+                case 2:
+                    error_1 = _a.sent();
+                    return [3 /*break*/, 3];
+                case 3:
+                    spendAmount = FirmaUtil_1.FirmaUtil.getUFCTStringFromFCTStr("10");
                     amount = 0.1;
                     expirationDate = new Date();
                     expirationDate.setMinutes(expirationDate.getMinutes() + 20);
                     periodicAllowanceData = {
-                        // basicSpendLimit: undefined,
-                        // basicExpiration: undefined,
-                        periodSeconds: 30,
-                        periodSpendLimit: 1000000,
-                        periodCanSpend: 200000,
-                        periodReset: expirationDate
+                        basic: {
+                            spendLimit: [
+                                { amount: spendAmount, denom: firma.Config.denom }
+                            ]
+                        },
+                        period: { seconds: BigInt(60 * 60 * 24), nanos: 0 },
+                        periodSpendLimit: [
+                            { amount: spendAmount, denom: firma.Config.denom }
+                        ],
+                        periodCanSpend: [
+                            { amount: spendAmount, denom: firma.Config.denom }
+                        ],
+                        periodReset: {
+                            seconds: BigInt(Math.floor(expirationDate.getTime() / 1000)),
+                            nanos: (expirationDate.getTime() % 1000) * 1000000
+                        }
                     };
                     return [4 /*yield*/, firma.FeeGrant.grantPeriodicAllowance(aliceWallet, bobAddress, periodicAllowanceData)];
-                case 1:
+                case 4:
                     grantResult = _a.sent();
-                    chai_1.expect(grantResult.code).to.equal(0);
+                    (0, chai_1.expect)(grantResult.code).to.equal(0);
                     return [4 /*yield*/, firma.Bank.send(bobWallet, aliceAddress, amount, { feeGranter: aliceAddress })];
-                case 2:
+                case 5:
                     sendResult = _a.sent();
-                    chai_1.expect(sendResult.code).to.equal(0);
+                    (0, chai_1.expect)(sendResult.code).to.equal(0);
                     return [4 /*yield*/, firma.FeeGrant.revokeAllowance(aliceWallet, bobAddress)];
-                case 3:
+                case 6:
                     revokeResult = _a.sent();
-                    chai_1.expect(revokeResult.code).to.equal(0);
+                    (0, chai_1.expect)(revokeResult.code).to.equal(0);
                     return [2 /*return*/];
             }
         });

package/dist/test/07.feegrant_query.test.js

@@ -14,7 +14,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {
@@ -82,27 +82,30 @@ describe('[07. Feegrant Query Test]', function () {
         });
     });
     it('feegrant getGranteeAllowance', function () { return __awaiter(void 0, void 0, void 0, function () {
-        var expirationDate, grantResult, allowance, error_1;
+        var expirationDate, grantResult, allowance;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    _a.trys.push([0, 3, , 4]);
                     expirationDate = new Date();
-                    expirationDate.setMonth(12);
-                    return [4 /*yield*/, firma.FeeGrant.grantBasicAllowance(aliceWallet, bobAddress, { expiration: expirationDate })];
+                    expirationDate.setDate(expirationDate.getDate() + 1);
+                    return [4 /*yield*/, firma.FeeGrant.grantBasicAllowance(aliceWallet, bobAddress, {
+                            spendLimit: [{
+                                    amount: "10000",
+                                    denom: firma.Config.denom
+                                }],
+                            expiration: {
+                                seconds: BigInt(Math.floor(expirationDate.getTime() / 1000)),
+                                nanos: (expirationDate.getTime() % 1000) * 1000000
+                            }
+                        })];
                 case 1:
                     grantResult = _a.sent();
-                    chai_1.expect(grantResult.code).to.equal(0);
+                    (0, chai_1.expect)(grantResult.code).to.equal(0);
                     return [4 /*yield*/, firma.FeeGrant.getGranteeAllowance(aliceAddress, bobAddress)];
                 case 2:
                     allowance = _a.sent();
-                    chai_1.expect(allowance).to.not.equal(null);
-                    return [3 /*break*/, 4];
-                case 3:
-                    error_1 = _a.sent();
-                    chai_1.expect(false).to.be.equal(true);
-                    return [3 /*break*/, 4];
-                case 4: return [2 /*return*/];
+                    (0, chai_1.expect)(allowance).to.not.equal(null);
+                    return [2 /*return*/];
             }
         });
     }); });
@@ -114,10 +117,10 @@ describe('[07. Feegrant Query Test]', function () {
                 case 1:
                     result = _a.sent();
                     if (result.length === 0) {
-                        chai_1.expect(true).to.be.equal(true);
+                        (0, chai_1.expect)(true).to.be.equal(true);
                     }
                     else {
-                        chai_1.expect(FirmaUtil_1.FirmaUtil.isValidAddress(result[0].granter)).to.be.equal(true);
+                        (0, chai_1.expect)(FirmaUtil_1.FirmaUtil.isValidAddress(result[0].granter)).to.be.equal(true);
                     }
                     return [2 /*return*/];
             }