apenft-js-tron 2.0.2 → 2.0.4

package/dist/src/schemas/schemasFunctions.js

@@ -9,7 +9,7 @@ var ethereumjs_util_1 = require("ethereumjs-util");
 var types_1 = require("../utils/types");
 var tronweb_1 = __importDefault(require("tronweb"));
 var failWith = function (msg) {
-    throw "Error";
+    throw new Error(msg);
 };
 var generateDefaultValue = function (type) {
     switch (type) {

package/dist/src/tradeAPI/account.js

@@ -59,6 +59,7 @@ var helper_1 = require("../utils/helper");
 var Abi_1 = require("../utils/Abi");
 var contractSchemas_1 = require("./contractSchemas");
 var contracts_1 = require("./contracts");
+var error_1 = require("../utils/error");
 var Account = /** @class */ (function (_super) {
     __extends(Account, _super);
     function Account(web3, apiConfig) {
@@ -172,7 +173,7 @@ var Account = /** @class */ (function (_super) {
                         buy.paymentTokenApprove.isApprove = isApprove;
                         buy.paymentTokenApprove.balances = balances;
                         return [3 /*break*/, 9];
-                    case 8: throw "Error";
+                    case 8: throw new error_1.APENFTError({ code: '1204' });
                     case 9: return [2 /*return*/, buy];
                 }
             });
@@ -260,7 +261,7 @@ var Account = /** @class */ (function (_super) {
                         buy.paymentTokenApprove.isApprove = isApprove;
                         buy.paymentTokenApprove.balances = balances;
                         return [3 /*break*/, 11];
-                    case 10: throw "Error";
+                    case 10: throw new error_1.APENFTError({ code: '1204' });
                     case 11: return [2 /*return*/, buy];
                 }
             });

package/dist/src/tradeAPI/contractSchemas.js

@@ -142,7 +142,7 @@ var ContractSchemas = /** @class */ (function (_super) {
                     from: this.web3.defaultAddress.hex,
                     callValue: 0,
                     _isConstant: true,
-                    feeLimit: 1000000000
+                    feeLimit: 2000000000
                 };
                 return [2 /*return*/, new Promise(function (resolve, reject) {
                         var tradePromise = _this.web3.transactionBuilder.triggerSmartContract(contractAddress, functionSelector, options, parameters, options.from ? _this.web3.address.toHex(options.from) : false);
@@ -201,7 +201,8 @@ var ContractSchemas = /** @class */ (function (_super) {
                         options = {
                             from: this.web3.defaultAddress.base58,
                             callValue: value || 0,
-                            shouldPollResponse: true // Only used for sign()
+                            shouldPollResponse: true,
+                            feeLimit: 2000000000
                         };
                         defer = (0, PromiEvent_1.default)();
                         return [4 /*yield*/, this.web3.transactionBuilder.triggerSmartContract(contractAddress, functionSelector, options, parameters)];

package/dist/src/tradeAPI/index.js

@@ -74,6 +74,7 @@ var nft_1 = require("./nft");
 var types_1 = require("../utils/types");
 var helper_1 = require("../utils/helper");
 var makeOrder_1 = require("../utils/makeOrder");
+var error_1 = require("../utils/error");
 var APENFTOrders = /** @class */ (function (_super) {
     __extends(APENFTOrders, _super);
     function APENFTOrders(walletProvider, apiConfig, walletAccount) {
@@ -118,7 +119,7 @@ var APENFTOrders = /** @class */ (function (_super) {
                     case 1:
                         orderVersion = _a.sent();
                         if (!orderVersion.isTradable) {
-                            throw "Error";
+                            throw new error_1.APENFTError({ code: '1212' });
                         }
                         newAsset = __assign({}, assetData);
                         sharedAsset = this.orders.APENFTSharedAssetAddr;

package/dist/src/tradeAPI/nft.js

@@ -134,7 +134,7 @@ var AssetFactory = /** @class */ (function (_super) {
                     case 0:
                         defaultOptions = {
                             shouldPollResponse: true,
-                            feeLimit: 1e9,
+                            feeLimit: 2000000000,
                             callValue: 0,
                             userFeePercentage: 30,
                             originEnergyLimit: 1e7
@@ -197,7 +197,7 @@ var AssetFactory = /** @class */ (function (_super) {
                     case 0:
                         defaultOptions = {
                             shouldPollResponse: true,
-                            feeLimit: 1e9,
+                            feeLimit: 2000000000,
                             callValue: 0,
                             userFeePercentage: 30,
                             originEnergyLimit: 1e7

package/dist/src/utils/check.js

@@ -55,6 +55,7 @@ var helper_1 = require("./helper");
 var makeOrder_1 = require("./makeOrder");
 var Abi_1 = require("../utils/Abi");
 var contractSchemas_1 = require("../tradeAPI/contractSchemas");
+var error_1 = require("../utils/error");
 var log = console.log;
 function getAccountProxyAddr(contracts, schemaName) {
     return __awaiter(this, void 0, void 0, function () {
@@ -89,10 +90,7 @@ function checkApproveTokenTransferProxy(exchangeContract, erc20Contract, account
                 case 2:
                     allowAmount = _a.sent();
                     if (new constants_1.BigNumber(allowAmount.toString()).eq(0)) {
-                        throw {
-                            code: "1101",
-                            data: { erc20Address: erc20Contract.address }
-                        };
+                        throw new error_1.APENFTError({ code: '1101', data: { erc20Address: erc20Contract.address } });
                     }
                     return [2 /*return*/, true];
             }
@@ -112,7 +110,7 @@ function checkApproveERC1155TransferProxy(contract, nftsContract, account) {
                 case 2:
                     isApprove = _a.sent();
                     if (!isApprove) {
-                        throw "Error";
+                        throw new error_1.APENFTError({ code: '1102', data: { nftAddress: nftsContract.address } });
                     }
                     return [2 /*return*/, isApprove];
             }
@@ -132,7 +130,7 @@ function checkApproveERC721TransferProxy(contract, nftsContract, account, tokenI
                 case 2:
                     isApprove = _a.sent();
                     if (!isApprove) {
-                        throw "Error";
+                        throw new error_1.APENFTError({ code: '1106', data: { nftAddress: nftsContract.address, tokenId: tokenID } });
                     }
                     return [2 /*return*/, true];
             }
@@ -172,7 +170,7 @@ function checkApproveSchemaProxy(contract, orderMetadata, account) {
                         res = contract.web3.address.fromHex(res) === operator;
                     }
                     if (!res) {
-                        throw "Error";
+                        throw new error_1.APENFTError({ code: '1108', context: { schemaName: asset.schemaName, tokenId: asset.tokenId } });
                     }
                     return [2 /*return*/, res];
             }
@@ -182,7 +180,7 @@ function checkApproveSchemaProxy(contract, orderMetadata, account) {
 exports.checkApproveSchemaProxy = checkApproveSchemaProxy;
 function checkUnhashedOrder(contract, order) {
     return __awaiter(this, void 0, void 0, function () {
-        var erc20Contract, metadata, sell, buy, assetAddress, erc20Bal, ethBal, error_1;
+        var erc20Contract, metadata, sell, buy, assetAddress, erc20Bal, ethBal, error_2;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -216,7 +214,7 @@ function checkUnhashedOrder(contract, order) {
                 case 6:
                     erc20Bal = (_a.sent()).erc20Bal;
                     if ((0, helper_1.makeBigNumber)(erc20Bal).lt(buy.basePrice))
-                        throw "Error";
+                        throw new error_1.APENFTError({ code: '1104', context: { assetType: 'ERC20' } });
                     return [4 /*yield*/, checkApproveTokenTransferProxy(contract.exchange, erc20Contract, buy.maker)];
                 case 7:
                     _a.sent();
@@ -225,20 +223,20 @@ function checkUnhashedOrder(contract, order) {
                 case 9:
                     ethBal = (_a.sent()).ethBal;
                     if ((0, helper_1.makeBigNumber)(ethBal).lt(buy.basePrice))
-                        throw "Error";
+                        throw new error_1.APENFTError({ code: '1104', context: { assetType: 'ETH' } });
                     _a.label = 10;
                 case 10:
                     checkDataToCall(contract.networkName, order);
                     return [3 /*break*/, 12];
                 case 11:
-                    error_1 = _a.sent();
-                    if (error_1.data) {
-                        error_1.data.order = order;
+                    error_2 = _a.sent();
+                    if (error_2.data) {
+                        error_2.data.order = order;
                     }
                     else {
-                        error_1 = __assign(__assign({}, error_1), { message: error_1.message, data: { order: order } });
+                        error_2 = __assign(__assign({}, error_2), { message: error_2.message, data: { order: order } });
                     }
-                    throw error_1;
+                    throw error_2;
                 case 12: return [2 /*return*/, true];
             }
         });
@@ -272,15 +270,15 @@ function checkMatchOrder(contract, buy, sell) {
                 case 0:
                     equalPrice = sell.basePrice.gte(buy.basePrice);
                     if (!equalPrice) {
-                        throw "Error";
+                        throw new error_1.APENFTError({ code: '1201' });
                     }
                     if (!_ordersCanMatch(buy, sell)) {
-                        throw "Error";
+                        throw new error_1.APENFTError({ code: '1202' });
                     }
                     if (!(sell.feeRecipient != constants_1.NULL_ADDRESS)) return [3 /*break*/, 3];
                     /* Assert taker fee is less than or equal to maximum fee specified by buyer. */
                     if (!sell.takerRelayerFee.lte(buy.takerRelayerFee)) {
-                        throw "sell.takerRelayerFee ".concat(sell.takerRelayerFee, " <= buy.takerRelayerFee ").concat(buy.takerRelayerFee);
+                        throw new error_1.APENFTError({ code: '1000', message: "sell.takerRelayerFee ".concat(sell.takerRelayerFee, " <= buy.takerRelayerFee ").concat(buy.takerRelayerFee) });
                     }
                     return [4 /*yield*/, checkUnhashedOrder(contract, buy)];
                 case 1:
@@ -292,7 +290,7 @@ function checkMatchOrder(contract, buy, sell) {
                 case 3:
                     /* Assert taker fee is less than or equal to maximum fee specified by seller. */
                     if (!buy.takerRelayerFee.lte(sell.takerRelayerFee)) {
-                        throw "buy.takerRelayerFee ".concat(buy.takerRelayerFee, " <= sell.takerRelayerFee ").concat(sell.takerRelayerFee);
+                        throw new error_1.APENFTError({ code: '1000', message: "buy.takerRelayerFee ".concat(buy.takerRelayerFee, " <= sell.takerRelayerFee ").concat(sell.takerRelayerFee) });
                     }
                     return [4 /*yield*/, checkUnhashedOrder(contract, sell)];
                 case 4:
@@ -322,13 +320,13 @@ function checkDataToCall(netWorkName, order) {
         encodeData = (0, schemasFunctions_1.encodeBuy)(schemas[0], asset, order.maker);
     }
     if (encodeData.dataToCall != order.dataToCall) {
-        throw "Error: dataToCall";
+        throw new error_1.APENFTError({ code: '1208', context: { part: 'dataToCall' } });
     }
     if (encodeData.target != order.target) {
-        throw "Error: target";
+        throw new error_1.APENFTError({ code: '1208', context: { part: 'target' } });
     }
     if (encodeData.replacementPattern != order.replacementPattern) {
-        throw "Error: replacementPattern";
+        throw new error_1.APENFTError({ code: '1208', context: { part: 'replacementPattern' } });
     }
 }
 exports.checkDataToCall = checkDataToCall;
@@ -347,13 +345,13 @@ function validateOrder(exchangeHelper, order) {
                 case 2:
                     isValidate = _a.sent();
                     if (!isValidate) {
-                        throw "Error";
+                        throw new error_1.APENFTError({ code: '1203' });
                     }
                     return [2 /*return*/, isValidate];
                 case 3:
                     e_1 = _a.sent();
                     if (!e_1.code) {
-                        throw "Error";
+                        throw new error_1.APENFTError({ code: '1205' });
                     }
                     throw e_1;
                 case 4: return [2 /*return*/];
@@ -413,7 +411,7 @@ function ordersCanMatch(exchangeHelper, buy, sell) {
             sellOrderParamArray = (0, helper_1.orderParamsEncode)(sell);
             canMatch = exchangeHelper.methods.ordersCanMatch(buyOrderParamArray, sellOrderParamArray).call();
             if (!canMatch) {
-                throw "Error";
+                throw new error_1.APENFTError({ code: '1202' });
             }
             return [2 /*return*/, true];
         });
@@ -446,10 +444,10 @@ function checkOrderCancelledOrFinalized(contract, order) {
                     isCancelledOrFinalized = _a.sent();
                     if (isCancelledOrFinalized) {
                         if (order.side === types_1.OrderSide.Sell) {
-                            throw "Error: Sell";
+                            throw new error_1.APENFTError({ code: '1207', context: { orderSide: 'Sell' } });
                         }
                         else {
-                            throw "Error: Buy";
+                            throw new error_1.APENFTError({ code: '1207', context: { orderSide: 'Buy' } });
                         }
                     }
                     return [2 /*return*/];
@@ -466,7 +464,7 @@ function getAssetInfo(metadata) {
         assetAddress = metadata.asset.address;
     }
     else {
-        throw "Error: sell.metadata.asset.id or address undefined";
+        throw new error_1.APENFTError({ message: 'sell.metadata.asset.id or address undefined', code: '1000' });
     }
     return { tokenId: tokenId, assetAddress: assetAddress };
 }
@@ -488,7 +486,7 @@ function checkAssetAddress(netWorkName, order) {
             metadata = order.metadata;
             assetAddress = getAssetInfo(metadata).assetAddress;
             if (schemas.length === 0) {
-                throw "Error";
+                throw new error_1.APENFTError({ code: '1206', context: { assetType: metadata.schema } });
             }
             return [2 /*return*/];
         });
@@ -583,7 +581,7 @@ function checkAssetBalance(contract, order) {
                     owner = _c.sent();
                     checkAddrHex = contract.web3.address.toHex(checkAddr);
                     if (owner !== checkAddrHex)
-                        throw "Error";
+                        throw new error_1.APENFTError({ code: '1103', context: { assetType: metadata.schema, orderQuantity: order.quantity, ownerQuantity: 0 } });
                     balance = 1;
                     return [3 /*break*/, 7];
                 case 4:
@@ -594,13 +592,13 @@ function checkAssetBalance(contract, order) {
                 case 5:
                     balance = _c.sent();
                     return [3 /*break*/, 7];
-                case 6: throw "Error";
+                case 6: throw new error_1.APENFTError({ code: '1206', context: { assetType: metadata.schema } });
                 case 7:
                     if (!constants_1.BigNumber.isBigNumber(order.quantity)) {
                         order.quantity = new constants_1.BigNumber(order.quantity);
                     }
                     if (order.quantity.gt(balance.toString())) {
-                        throw "Error";
+                        throw new error_1.APENFTError({ code: '1103', context: { assetType: metadata.schema, orderQuantity: order.quantity.toString(), ownerQuantity: balance.toString() } });
                     }
                     return [2 /*return*/, Number(balance)];
             }

package/dist/src/utils/helper.js

@@ -49,6 +49,7 @@ exports.orderFromJSON = exports.Sleep = exports.checkResultFast = exports.checkR
 var index_1 = require("../schemas/index");
 var tokens_1 = require("../tokens");
 var constants_1 = require("./constants");
+var error_1 = require("../utils/error");
 function toBaseUnitAmount(amount, decimals) {
     var unit = new constants_1.BigNumber(10).pow(decimals);
     return amount.times(unit).integerValue();
@@ -93,7 +94,7 @@ function makeBigNumber(arg) {
 exports.makeBigNumber = makeBigNumber;
 function web3Sign(web3, msg, account) {
     return __awaiter(this, void 0, void 0, function () {
-        var hash, hexStrWithout0x, byteArray, signatureRes, tail, error_1;
+        var hash, hexStrWithout0x, byteArray, signatureRes, tail, error_2;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -124,8 +125,8 @@ function web3Sign(web3, msg, account) {
                     console.log('signatureRes', signatureRes);
                     return [2 /*return*/, signatureRes];
                 case 2:
-                    error_1 = _a.sent();
-                    throw error_1;
+                    error_2 = _a.sent();
+                    throw error_2;
                 case 3: return [2 /*return*/];
             }
         });
@@ -138,7 +139,10 @@ function getAccountBalance(web3, account, erc20) {
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0: return [4 /*yield*/, web3.trx.getBalance(account).catch(function (error) {
-                        throw "Error";
+                        throw new error_1.APENFTError({
+                            code: '2003',
+                            context: { funcName: 'getAccountBalance.getBalance ' }
+                        });
                     })];
                 case 1:
                     trxBal = _a.sent();
@@ -148,7 +152,10 @@ function getAccountBalance(web3, account, erc20) {
                             .balanceOf(account)
                             .call()
                             .catch(function (error) {
-                            throw "Error";
+                            throw new error_1.APENFTError({
+                                code: '2002',
+                                context: { funcName: 'getAccountBalance.balanceOf ' }
+                            });
                         })];
                 case 2:
                     erc20Bal = _a.sent();
@@ -163,13 +170,13 @@ function getSchemaList(networkName, schemaName) {
     // @ts-ignore
     var schemaList = index_1.schemas[networkName];
     if (!schemaList) {
-        throw "Error";
+        throw new error_1.APENFTError({ code: '1206', context: { assetType: schemaName } });
     }
     if (schemaName) {
         schemaList = schemaList.filter(function (val) { return val.name === schemaName; });
     }
     if (schemaList.length === 0) {
-        throw "Error";
+        throw new error_1.APENFTError({ code: '1206', context: { assetType: schemaName } });
     }
     return schemaList;
 }

package/dist/src/utils/makeOrder.js

@@ -55,10 +55,11 @@ var constants_1 = require("./constants");
 var config_1 = require("../config");
 var check_1 = require("./check");
 var helper_1 = require("./helper");
+var error_1 = require("../utils/error");
 function getSchema(networkName, schemaName) {
     var schemaInfo = (0, helper_1.getSchemaList)(networkName, schemaName);
     if (schemaInfo.length == 0) {
-        throw "Error";
+        throw new error_1.APENFTError({ code: '1107', context: { schemaName: schemaName } });
     }
     return schemaInfo[0];
 }
@@ -356,7 +357,7 @@ function hashAndValidateOrder(web3, exchangeHelper, order) {
 exports.hashAndValidateOrder = hashAndValidateOrder;
 function signOrderHash(web3, hashedOrder) {
     return __awaiter(this, void 0, void 0, function () {
-        var signature, signatureRes, signatureHex, error_1;
+        var signature, signatureRes, signatureHex, error_2;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -372,8 +373,8 @@ function signOrderHash(web3, hashedOrder) {
                     };
                     return [3 /*break*/, 3];
                 case 2:
-                    error_1 = _a.sent();
-                    throw error_1;
+                    error_2 = _a.sent();
+                    throw error_2;
                 case 3: return [2 /*return*/, signature];
             }
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apenft-js-tron",
-  "version": "2.0.2",
+  "version": "2.0.4",
   "description": "Javascript SDK for the APENFT ",
   "main": "dist/index.js",
   "author": "Project APENFT Developers",