carbon-js-sdk 0.6.3 → 0.6.5

package/lib/clients/ETHClient.js

@@ -69,13 +69,15 @@ class ETHClient {
         });
     }
     approveERC20(params) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const { token, gasPriceGwei, gasLimit, ethAddress, spenderAddress, signer, amount } = params;
             const contractAddress = token.tokenAddress;
             const rpcProvider = this.getProvider();
             const contract = new ethers_1.ethers.Contract(contractAddress, eth_1.ABIs.erc20, rpcProvider);
+            const approvalAmount = ethers_1.ethers.BigNumber.from((_a = amount === null || amount === void 0 ? void 0 : amount.toString(10)) !== null && _a !== void 0 ? _a : ethers_1.ethers.constants.MaxUint256);
             const nonce = yield this.getTxNonce(ethAddress, params.nonce, rpcProvider);
-            const approveResultTx = yield contract.connect(signer).approve(spenderAddress !== null && spenderAddress !== void 0 ? spenderAddress : token.bridgeAddress, amount !== null && amount !== void 0 ? amount : ethers_1.ethers.constants.MaxUint256, Object.assign(Object.assign({ nonce }, gasPriceGwei && ({ gasPrice: gasPriceGwei.shiftedBy(9).toString(10) })), gasLimit && ({ gasLimit: gasLimit.toString(10) })));
+            const approveResultTx = yield contract.connect(signer).approve(spenderAddress !== null && spenderAddress !== void 0 ? spenderAddress : token.bridgeAddress, approvalAmount, Object.assign(Object.assign({ nonce }, gasPriceGwei && ({ gasPrice: gasPriceGwei.shiftedBy(9).toString(10) })), gasLimit && ({ gasLimit: gasLimit.toString(10) })));
             return approveResultTx;
         });
     }

package/lib/modules/liquiditypool.js

@@ -19,6 +19,7 @@ const bignumber_js_1 = require("bignumber.js");
 const dayjs_1 = __importDefault(require("dayjs"));
 const long_1 = __importDefault(require("long"));
 const base_1 = __importDefault(require("./base"));
+const number_1 = require("../util/number");
 class LiquidityPoolModule extends base_1.default {
     create(params, opts) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -164,14 +165,14 @@ class LiquidityPoolModule extends base_1.default {
     getWeeklyRewardsRealInflation() {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            const { result } = yield this.sdkProvider.insights.Inflation();
-            const MIN_RATE = new bignumber_js_1.BigNumber(0.0003);
-            const INITIAL_SUPPLY = new bignumber_js_1.BigNumber(1000000000);
-            let inflationRate = new bignumber_js_1.BigNumber(result.inflationRate);
-            if (inflationRate.lt(MIN_RATE)) {
-                inflationRate = MIN_RATE;
+            const mintDataResponse = yield this.sdkProvider.query.inflation.MintData({});
+            let weeklyRewards = number_1.BN_ZERO;
+            if (mintDataResponse.mintData) {
+                const mintData = mintDataResponse.mintData;
+                const currentSupply = new bignumber_js_1.BigNumber(mintData.currentSupply);
+                const swthInflationRate = new bignumber_js_1.BigNumber(mintData.inflationRate).shiftedBy(-18);
+                weeklyRewards = currentSupply.times(swthInflationRate).div(52);
             }
-            const weeklyRewards = INITIAL_SUPPLY.div(52).times(inflationRate);
             // Calculate weekly rewards earned by liquidity providers
             // Weekly LP Rewards = liquidityRewardRatio * weeklyRewards
             const distributionParams = yield this.sdkProvider.query.distribution.Params({});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "carbon-js-sdk",
-  "version": "0.6.3",
+  "version": "0.6.5",
   "description": "TypeScript SDK for Carbon blockchain",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",