apenft-js-tron 2.0.5 → 2.0.6-beta.1

package/dist/src/tradeAPI/contractSchemas.js

@@ -62,6 +62,7 @@ var constants_1 = require("../utils/constants");
 var index_1 = require("../schemas/index");
 var tokens_1 = require("../tokens");
 var config_1 = require("../config");
+var error_1 = require("../utils/error");
 var ContractSchemas = /** @class */ (function (_super) {
     __extends(ContractSchemas, _super);
     function ContractSchemas(web3, apiConfig) {
@@ -224,7 +225,7 @@ var ContractSchemas = /** @class */ (function (_super) {
                             };
                             if (broadcast.message)
                                 err.message = this.web3.toUtf8(broadcast.message);
-                            defer.reject(err);
+                            defer.reject(new error_1.APENFTError({ code: '4003', context: err }));
                         }
                         if (!options.shouldPollResponse) {
                             defer.resolve(signedTransaction.txID);
@@ -299,7 +300,9 @@ var ContractSchemas = /** @class */ (function (_super) {
                                 });
                             });
                         };
-                        checkResult();
+                        if (!broadcast.code) {
+                            checkResult();
+                        }
                         return [2 /*return*/, Promise.resolve({ txHash: signedTransaction.txID, txSend: defer.eventEmitter })];
                 }
             });

package/dist/src/tradeAPI/nft.js

@@ -247,7 +247,7 @@ var AssetFactory = /** @class */ (function (_super) {
                     case 1:
                         _a.trys.push([1, 4, , 5]);
                         return [4 /*yield*/, this.contract721(assetAddr).catch(function (err) {
-                                defer.eventEmitter.emit('error', err);
+                                throw err;
                             })];
                     case 2:
                         assetContract = _a.sent();
@@ -255,13 +255,15 @@ var AssetFactory = /** @class */ (function (_super) {
                                 .mintTo(to, url || '')
                                 .send()
                                 .catch(function (err) {
-                                defer.eventEmitter.emit('error', err);
+                                // user reject sign
+                                // sign timeout
+                                throw err;
                             })
-                            // user reject sign
+                            // other sign errors
                         ];
                     case 3:
                         txID = _a.sent();
-                        // user reject sign
+                        // other sign errors
                         if (!txID) {
                             return [2 /*return*/, Promise.reject('Transaction was not signed properly')];
                         }
@@ -271,6 +273,7 @@ var AssetFactory = /** @class */ (function (_super) {
                     case 4:
                         err_1 = _a.sent();
                         defer.eventEmitter.emit('error', err_1);
+                        defer.reject(err_1);
                         return [2 /*return*/, Promise.resolve({ txHash: '', txSend: defer.eventEmitter })];
                     case 5: return [2 /*return*/];
                 }

package/dist/src/tradeAPI/orders.js

@@ -68,6 +68,7 @@ var constants_1 = require("../utils/constants");
 var check_1 = require("../utils/check");
 var makeOrder_1 = require("../utils/makeOrder");
 var helper_1 = require("../utils/helper");
+var error_1 = require("../utils/error");
 var contracts_1 = require("./contracts");
 var OrderCheckStatus;
 (function (OrderCheckStatus) {
@@ -118,7 +119,7 @@ var Orders = /** @class */ (function (_super) {
     Orders.prototype.createSignedOrder = function (_a) {
         var unHashOrder = _a.unHashOrder;
         return __awaiter(this, void 0, void 0, function () {
-            var signSellOrder, error_1;
+            var signSellOrder, error_2;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0: return [4 /*yield*/, (0, check_1.checkUnhashedOrder)(this, unHashOrder)];
@@ -132,14 +133,17 @@ var Orders = /** @class */ (function (_super) {
                         signSellOrder = _b.sent();
                         return [2 /*return*/, signSellOrder];
                     case 4:
-                        error_1 = _b.sent();
-                        if (error_1.data) {
-                            error_1.data.order = unHashOrder;
+                        error_2 = _b.sent();
+                        if (error_2.data) {
+                            error_2.data.order = unHashOrder;
+                        }
+                        else if (typeof error_2 === 'string') {
+                            error_2 = new error_1.APENFTError({ code: '4002', context: { errorString: error_2 }, data: { order: unHashOrder } });
                         }
                         else {
-                            error_1 = __assign(__assign({}, error_1), { message: error_1.message, data: { order: unHashOrder } });
+                            error_2 = __assign(__assign({}, error_2), { message: error_2.message, data: { order: unHashOrder } });
                         }
-                        throw error_1;
+                        throw error_2;
                     case 5: return [2 /*return*/];
                 }
             });

package/dist/src/utils/check.js

@@ -233,6 +233,9 @@ function checkUnhashedOrder(contract, order) {
                     if (error_2.data) {
                         error_2.data.order = order;
                     }
+                    else if (typeof error_2 === 'string') {
+                        error_2 = new error_1.APENFTError({ code: '4002', context: { errorString: error_2 }, data: { order: order } });
+                    }
                     else {
                         error_2 = __assign(__assign({}, error_2), { message: error_2.message, data: { order: order } });
                     }

package/dist/src/utils/error.js

@@ -128,7 +128,15 @@ exports.ErrorCodes = [
     },
     {
         code: '4001',
-        message: 'MetaMask Error '
+        message: 'TronLink Error'
+    },
+    {
+        code: '4002',
+        message: '{{errorString}}'
+    },
+    {
+        code: '4003',
+        message: 'Broadcast Transaction Error: {{error}}: {{message}}'
     }
 ];
 function render(template, context) {

package/dist/src/utils/makeOrder.js

@@ -108,7 +108,7 @@ function getPriceParameters(paymentTokenObj, expirationTime, startAmount, endAmo
         throw "No ERC-20 token found for '".concat(paymentToken, "'");
     }
     if (isTRX && waitingForBestCounterOrder) {
-        throw "English auctions must use wrapped ETH or an ERC-20 token.";
+        throw "English auctions must use wrapped TRX or an ERC-20 token.";
     }
     if (priceDiff < 0) {
         throw 'End price must be less than or equal to the start price.';

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "apenft-js-tron",
-  "version": "2.0.5",
+  "version": "2.0.6-beta.1",
   "description": "Javascript SDK for the APENFT ",
   "main": "dist/index.js",
   "author": "Project APENFT Developers",
   "scripts": {
-    "dev": "tsc -w -p tsconfig.json",
+    "dev": "tsc -w -p tsconfig.dev.json",
     "eslint": "eslint --fix src --ext .ts --max-warnings=0",
     "build": "tsc",
     "webpack": "webpack --mode production",

package/tsconfig.dev.json

@@ -0,0 +1,7 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "target": "es2018",
+    "module": "es2015",
+  }
+}