@pioneer-platform/eth-network 8.1.65 → 8.1.67

package/lib/index.js

@@ -72,6 +72,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var TAG = " | eth-network | ";
 var Web3 = require('web3');
 var ethers_1 = require("ethers");
+// @ts-ignore
+var BigNumber = require('bignumber.js');
 //
 var Axios = require('axios');
 var https = require('https');
@@ -162,8 +164,8 @@ module.exports = {
     getSymbolFromContract: function (contract) {
         return get_symbol_from_contract(contract);
     },
-    getTransferData: function (toAddress, amount, prescision) {
-        return get_token_transfer_data(toAddress, amount, prescision);
+    getTransferData: function (toAddress, amount, contract) {
+        return get_token_transfer_data(toAddress, amount, contract);
     },
     getPoolPositions: function (address) {
         return get_pool_positions(address);
@@ -360,19 +362,40 @@ var check_airdrop_claim = function (address) {
     });
 };
 //get_token_transfer_data
-var get_token_transfer_data = function (toAddress, amount, prescision) {
+var get_token_transfer_data = function (toAddress, amount, contract) {
     return __awaiter(this, void 0, void 0, function () {
-        var tag, value, tokenData, e_4;
+        var tag, minABI, newContract, decimals, value, tokenData, e_4;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
                     tag = TAG + " | get_token_transfer_data | ";
                     _a.label = 1;
                 case 1:
-                    _a.trys.push([1, 3, , 4]);
-                    if (!prescision)
-                        prescision = 18;
-                    value = parseInt(amount / Math.pow(10, prescision));
+                    _a.trys.push([1, 4, , 5]);
+                    minABI = [
+                        // balanceOf
+                        {
+                            "constant": true,
+                            "inputs": [{ "name": "_owner", "type": "address" }],
+                            "name": "balanceOf",
+                            "outputs": [{ "name": "balance", "type": "uint256" }],
+                            "type": "function"
+                        },
+                        // decimals
+                        {
+                            "constant": true,
+                            "inputs": [],
+                            "name": "decimals",
+                            "outputs": [{ "name": "", "type": "uint8" }],
+                            "type": "function"
+                        }
+                    ];
+                    newContract = new web3.eth.Contract(minABI, contract);
+                    return [4 /*yield*/, newContract.methods.decimals().call()];
+                case 2:
+                    decimals = _a.sent();
+                    value = new BigNumber(amount).times(new BigNumber(10).pow(decimals)).toFixed();
+                    log.info(tag, "value: ", value);
                     return [4 /*yield*/, web3.eth.abi.encodeFunctionCall({
                             name: 'transfer',
                             type: 'function',
@@ -387,14 +410,14 @@ var get_token_transfer_data = function (toAddress, amount, prescision) {
                                 }
                             ]
                         }, [toAddress, value])];
-                case 2:
+                case 3:
                     tokenData = _a.sent();
                     return [2 /*return*/, tokenData];
-                case 3:
+                case 4:
                     e_4 = _a.sent();
                     console.error(tag, e_4);
-                    return [3 /*break*/, 4];
-                case 4: return [2 /*return*/];
+                    return [3 /*break*/, 5];
+                case 5: return [2 /*return*/];
             }
         });
     });
@@ -818,7 +841,7 @@ var estimate_fee = function (sourceAsset, params) {
                     return [4 /*yield*/, get_fees(entry)];
                 case 3:
                     fees = (_b.sent()).fees;
-                    minimumWeiCost = ethers_1.BigNumber.from(fees.average);
+                    minimumWeiCost = BigNumber.from(fees.average);
                     minimumWeiCost = minimumWeiCost.mul(estimateGas.toNumber());
                     return [2 /*return*/, minimumWeiCost];
                 case 4:
@@ -842,7 +865,7 @@ var get_gas_limit = function (_a) {
                 case 1:
                     _b.trys.push([1, 6, , 7]);
                     log.debug(tag, "input: ", { asset: asset, recipient: recipient, amount: amount, memo: memo });
-                    txAmount = ethers_1.BigNumber.from(amount === null || amount === void 0 ? void 0 : amount.amount().toFixed());
+                    txAmount = BigNumber.from(amount === null || amount === void 0 ? void 0 : amount.amount().toFixed());
                     assetAddress = void 0;
                     if (asset && (0, xchain_util_1.assetToString)(asset) !== (0, xchain_util_1.assetToString)(xchain_util_1.AssetETH)) {
                         assetAddress = (0, utils_1.getTokenAddress)(asset);

package/lib/types/client-types.js

@@ -5,4 +5,4 @@ var Network;
 (function (Network) {
     Network["TEST"] = "ropsten";
     Network["MAIN"] = "homestead";
-})(Network = exports.Network || (exports.Network = {}));
+})(Network || (exports.Network = Network = {}));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pioneer-platform/eth-network",
-  "version": "8.1.65",
+  "version": "8.1.67",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "scripts": {
@@ -19,6 +19,8 @@
     "@pioneer-platform/loggerdog": "^8.1.29",
     "@xchainjs/xchain-util": "^0.2.6",
     "axios": "^0.21.4",
+    "bignumber.js": "^9.1.1",
+    "decimal.js": "^10.4.3",
     "dotenv": "^8.2.0",
     "ethers": "^5.1.0",
     "request-promise": "^4.2.6",