apenft-js-tron 2.0.4 → 2.0.6-beta.0

package/README.md

@@ -268,33 +268,36 @@ async initApprove({ APENFTOrders, orderType, orderParams})
 
 Example:
 ```js
-let orderType = "FixPriceOrder";
-let orderParams = {
-  asset: {
-    tokenId: "6",
-    tokenAddress: "TDJLEEDZ5Zr81NQv9jQjWSNtdS9nJyrLD3",
-    schemaName: "ERC721",
-    data: "https://gateway.btfs.io/btfs/QmPXgdwcMFdo2URjHHxvqps8Uz3h8Jvc6zMz1hJFFMwxNX",
-    collection: {
-      transferFeeAddress: "",
-      APENFTSellerFeeBasisPoints: 0,
-    },
-  },
-  quantity: 1,
-  paymentToken: {
-    __typename: "Currency",
-    address: "T9yD14Nj9j7xAB4dbGeiX9h8unkKHxuWwb",
-    symbol: "TRX",
-    decimal: 6,
-    icon: "https://images-testnet.apenft.io/icon/currency/icon-trx.svg",
-    decimals: 6,
-  },
-  listingTime: 1669272864,
-  expirationTime: 1671864854,
-  startAmount: 77,
-  buyerAddress: "",
-};
-await initApprove({ APENFTOrders: sdk_orders, orderType, orderParams });
+  let orderType = "FixPriceOrder";
+  const params = {
+      collection: "TNy9UXCHeAa2jrRiG6CjUppiwKJ9vodfS9",
+      id: "67",
+      price: 20,
+      currency: "TRX",
+      expirationTime: new Date().getTime() + 7 * 24 * 60 * 60 * 1000,
+      buyerAddress: "",
+  }
+
+  let orderParams = await sdk_query.getFixPriceOrderParams(params);
+
+  try {
+      await initApprove({
+          APENFTOrders: sdk_orders,
+          orderType: orderType,
+          orderParams: orderParams,
+      });
+
+      let result = await sdk_orders.createSellOrder(orderParams);
+      console.log(result);
+
+      if (result && result.orderHash) {
+          console.log("FixPriceOrder Listing Successful!");
+      } else {
+          console.log("Failed");
+      }
+  } catch (e) {
+      console.log(e);
+  }
 ```
 
 #### Fixed Price
@@ -308,10 +311,10 @@ Instructions:
  *
  * @param {object}  params -
  * {
- *  collection: string 
- *  id: string 
+ *  collection: string  // collection address
+ *  id: string  // token id
  *  price: number 
- *  currency: string  
+ *  currency: string 
  *  expirationTime: number // timestamp, milliseconds
  *  buyerAddress?: string // buyer address, optional
  * }
@@ -323,10 +326,10 @@ async APENFTQuery.getFixPriceOrderParams(params);
 Example:
 ```js
 const params = {
-  collection: "TQXKjXfTiy9j2qfRXNroZdrrAawu65b72Z",
-  id: "5",
+  collection: "TNy9UXCHeAa2jrRiG6CjUppiwKJ9vodfS9",
+  id: "67",
   price: 20,
-  currency: "USDT",
+  currency: "TRX",
   expirationTime: new Date().getTime() + 7 * 24 * 60 * 60 * 1000,
   buyerAddress: "",
 };
@@ -349,16 +352,21 @@ async APENFTOrders.createSellOrder(orderParams);
 
 Example:
 ```js
+const orderType = "FixPriceOrder";
 const params = {
-  collection: "TQXKjXfTiy9j2qfRXNroZdrrAawu65b72Z",
-  id: "5",
+  collection: "TNy9UXCHeAa2jrRiG6CjUppiwKJ9vodfS9",
+  id: "67",
   price: 20,
-  currency: "USDT",
+  currency: "TRX",
   expirationTime: new Date().getTime() + 7 * 24 * 60 * 60 * 1000,
   buyerAddress: "",
 };
 let orderParams = await sdk_query.getFixPriceOrderParams(params);
-
+await initApprove({
+          APENFTOrders: sdk_orders,
+          orderType: orderType,
+          orderParams: orderParams,
+      });
 await sdk_orders.createSellOrder(orderParams);
 ```
 

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-export { APENFTOrders } from './src/tradeAPI';
-export { APENFTQuery } from './src/queryAPI';
+export { APENFTOrders } from './src/tradeAPI/index';
+export { APENFTQuery } from './src/queryAPI/index';
 export { initApprove } from './src/tradeAPI/approve';
 export { Network, MakeOrderType, APENFTSchemaName, OrderSide } from './src/utils/types';
 export { AssetFactory } from './src/tradeAPI/nft';

package/dist/index.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.APENFTError = exports.NULL_ADDRESS = exports.makeBigNumber = exports.getSchemaList = exports.toBaseUnitAmount = exports.AssetFactory = exports.OrderSide = exports.APENFTSchemaName = exports.MakeOrderType = exports.Network = exports.initApprove = exports.APENFTQuery = exports.APENFTOrders = void 0;
-var tradeAPI_1 = require("./src/tradeAPI");
-Object.defineProperty(exports, "APENFTOrders", { enumerable: true, get: function () { return tradeAPI_1.APENFTOrders; } });
-var queryAPI_1 = require("./src/queryAPI");
-Object.defineProperty(exports, "APENFTQuery", { enumerable: true, get: function () { return queryAPI_1.APENFTQuery; } });
+var index_1 = require("./src/tradeAPI/index");
+Object.defineProperty(exports, "APENFTOrders", { enumerable: true, get: function () { return index_1.APENFTOrders; } });
+var index_2 = require("./src/queryAPI/index");
+Object.defineProperty(exports, "APENFTQuery", { enumerable: true, get: function () { return index_2.APENFTQuery; } });
 var approve_1 = require("./src/tradeAPI/approve");
 Object.defineProperty(exports, "initApprove", { enumerable: true, get: function () { return approve_1.initApprove; } });
 var types_1 = require("./src/utils/types");

package/dist/src/queryAPI/index.d.ts

@@ -1,5 +1,5 @@
 import { QueryAPI } from "./restful/queryAPI";
-import { CollectionApi, AssetApi, AccountApi } from "./graphql";
+import { CollectionApi, AssetApi, AccountApi } from "./graphql/index";
 import TronWeb from "tronweb";
 import { APIConfig, AddressParams, CollectionTradeTrendParams, CollectionTradingHistoryParams, HotCollectionsParams, FixPriceOrderParams, EnglishAuctionOrderParams, LowerPriceOrderParams, Pagination } from "../utils/types";
 export declare class APENFTQuery extends QueryAPI {

package/dist/src/queryAPI/index.js

@@ -64,7 +64,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.APENFTQuery = void 0;
 var queryAPI_1 = require("./restful/queryAPI");
-var graphql_1 = require("./graphql");
+var index_1 = require("./graphql/index");
 var constants_1 = require("../utils/constants");
 var utils_1 = require("../utils/utils");
 var types_1 = require("../utils/types");
@@ -82,15 +82,15 @@ var APENFTQuery = /** @class */ (function (_super) {
         if (((_b = _this.accountAddress) === null || _b === void 0 ? void 0 : _b.length) > 0)
             _this.accountAddress;
         _this.gqlApi = {
-            collectionApi: new graphql_1.GqlApi.collectionApi({
+            collectionApi: new index_1.GqlApi.collectionApi({
                 networkName: networkName,
                 account: _this.accountAddress,
             }),
-            assetApi: new graphql_1.GqlApi.assetApi({
+            assetApi: new index_1.GqlApi.assetApi({
                 networkName: networkName,
                 account: _this.accountAddress,
             }),
-            accountApi: new graphql_1.GqlApi.accountApi({
+            accountApi: new index_1.GqlApi.accountApi({
                 networkName: networkName,
                 account: _this.accountAddress,
             }),

package/dist/src/tradeAPI/account.js

@@ -14,6 +14,17 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -173,7 +184,7 @@ var Account = /** @class */ (function (_super) {
                         buy.paymentTokenApprove.isApprove = isApprove;
                         buy.paymentTokenApprove.balances = balances;
                         return [3 /*break*/, 9];
-                    case 8: throw new error_1.APENFTError({ code: '1204' });
+                    case 8: throw new error_1.APENFTError({ code: '1204', context: __assign({}, paymentToken) });
                     case 9: return [2 /*return*/, buy];
                 }
             });
@@ -261,7 +272,7 @@ var Account = /** @class */ (function (_super) {
                         buy.paymentTokenApprove.isApprove = isApprove;
                         buy.paymentTokenApprove.balances = balances;
                         return [3 /*break*/, 11];
-                    case 10: throw new error_1.APENFTError({ code: '1204' });
+                    case 10: throw new error_1.APENFTError({ code: '1204', context: __assign({}, paymentToken) });
                     case 11: return [2 /*return*/, buy];
                 }
             });

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/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

@@ -180,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_2;
+        var erc20Contract, metadata, sell, buy, assetAddress, erc20Bal, trxBal, error_2;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -214,16 +214,16 @@ function checkUnhashedOrder(contract, order) {
                 case 6:
                     erc20Bal = (_a.sent()).erc20Bal;
                     if ((0, helper_1.makeBigNumber)(erc20Bal).lt(buy.basePrice))
-                        throw new error_1.APENFTError({ code: '1104', context: { assetType: 'ERC20' } });
+                        throw new error_1.APENFTError({ code: '1104', context: { assetType: 'ERC20', erc20Bal: erc20Bal, buyBasePrice: buy.basePrice } });
                     return [4 /*yield*/, checkApproveTokenTransferProxy(contract.exchange, erc20Contract, buy.maker)];
                 case 7:
                     _a.sent();
                     return [3 /*break*/, 10];
                 case 8: return [4 /*yield*/, (0, helper_1.getAccountBalance)(contract.web3, buy.maker)];
                 case 9:
-                    ethBal = (_a.sent()).ethBal;
-                    if ((0, helper_1.makeBigNumber)(ethBal).lt(buy.basePrice))
-                        throw new error_1.APENFTError({ code: '1104', context: { assetType: 'ETH' } });
+                    trxBal = (_a.sent()).trxBal;
+                    if ((0, helper_1.makeBigNumber)(trxBal).lt(buy.basePrice))
+                        throw new error_1.APENFTError({ code: '1104', context: { assetType: 'TRX', trxBal: trxBal, buyBasePrice: buy.basePrice } });
                     _a.label = 10;
                 case 10:
                     checkDataToCall(contract.networkName, order);
@@ -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

@@ -80,7 +80,7 @@ exports.ErrorCodes = [
     },
     {
         code: '1204',
-        message: 'Buy order payment Token cannot be ETH '
+        message: 'Buy order payment Token cannot be {{symbol}} '
     },
     {
         code: '1205',
@@ -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/helper.js

@@ -105,11 +105,6 @@ function web3Sign(web3, msg, account) {
                         byteArray = web3.utils.code.hexStr2byteArray(hexStrWithout0x);
                         hash = web3.utils.ethersUtils.keccak256(byteArray).replace(/^0x/, '');
                     }
-                    // type===2 ledger wallet address
-                    // type===0 general wallet address
-                    if (web3.defaultAddress && web3.defaultAddress.type !== 2) {
-                        hash += '1';
-                    }
                     return [4 /*yield*/, web3.trx.sign(hash.replace(/^0x/, ''))];
                 case 1:
                     signatureRes = _a.sent();
@@ -138,7 +133,7 @@ function getAccountBalance(web3, account, erc20) {
         var trxBal, erc20Bal;
         return __generator(this, function (_a) {
             switch (_a.label) {
-                case 0: return [4 /*yield*/, web3.trx.getBalance(account).catch(function (error) {
+                case 0: return [4 /*yield*/, web3.trx.getUnconfirmedBalance(account).catch(function (error) {
                         throw new error_1.APENFTError({
                             code: '2003',
                             context: { funcName: 'getAccountBalance.getBalance ' }
@@ -160,7 +155,7 @@ function getAccountBalance(web3, account, erc20) {
                 case 2:
                     erc20Bal = _a.sent();
                     _a.label = 3;
-                case 3: return [2 /*return*/, { ethBal: Number(trxBal), erc20Bal: Number(erc20Bal) }];
+                case 3: return [2 /*return*/, { trxBal: Number(trxBal), erc20Bal: Number(erc20Bal) }];
             }
         });
     });

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/index.ts

@@ -1,5 +1,5 @@
-export { APENFTOrders } from './src/tradeAPI'
-export { APENFTQuery } from './src/queryAPI'
+export { APENFTOrders } from './src/tradeAPI/index'
+export { APENFTQuery } from './src/queryAPI/index'
 export { initApprove } from './src/tradeAPI/approve'
 export { Network, MakeOrderType, APENFTSchemaName, OrderSide } from './src/utils/types'
 export { AssetFactory } from './src/tradeAPI/nft'

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "apenft-js-tron",
-  "version": "2.0.4",
+  "version": "2.0.6-beta.0",
   "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",
+  }
+}