@super-protocol/sdk-js 0.12.8-beta.2 → 0.12.9-beta.2

package/build/connectors/BlockchainConnector.js

@@ -359,7 +359,7 @@ var BlockchainConnector = /** @class */ (function (_super) {
     BlockchainConnector.prototype.getTransactions = function (addresses, startBlock, lastBlock, batchSize) {
         if (batchSize === void 0) { batchSize = constants_1.BLOCK_SIZE_TO_FETCH_TRANSACTION; }
         return __awaiter(this, void 0, void 0, function () {
-            var blockchainLastBlock, transactionsByAddress, batch, getBlock, batchLastBlock, blockNumber, blocks;
+            var blockchainLastBlock, transactionsByAddress, validAddresses, batch, getBlock, batchLastBlock, blockNumber, blocks;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -377,7 +377,14 @@ var BlockchainConnector = /** @class */ (function (_super) {
                             startBlock = Math.max(lastBlock - 1000, 0);
                         }
                         transactionsByAddress = {};
-                        addresses.forEach(function (address) { return (transactionsByAddress[address] = []); });
+                        validAddresses = addresses.filter(function (address) { var _a; return (_a = store_1.default.web3Https) === null || _a === void 0 ? void 0 : _a.utils.isAddress(address); });
+                        if (!validAddresses.length) {
+                            return [2 /*return*/, {
+                                    transactionsByAddress: transactionsByAddress,
+                                    lastBlock: lastBlock,
+                                }];
+                        }
+                        validAddresses.forEach(function (address) { return (transactionsByAddress[address] = []); });
                         _a.label = 2;
                     case 2:
                         if (!(startBlock <= lastBlock)) return [3 /*break*/, 4];
@@ -389,15 +396,15 @@ var BlockchainConnector = /** @class */ (function (_super) {
                         }
                         return [4 /*yield*/, this.executeBatchAsync(batch)];
                     case 3:
-                        blocks = _a.sent();
+                        blocks = (_a.sent());
                         blocks.forEach(function (block) {
                             if (!(block === null || block === void 0 ? void 0 : block.transactions))
                                 return;
                             block.transactions.forEach(function (transaction) {
                                 var address = null;
-                                if (addresses.includes(transaction.from))
+                                if (validAddresses.includes(transaction.from))
                                     address = transaction.from;
-                                else if (transaction.to && addresses.includes(transaction.to))
+                                else if (transaction.to && validAddresses.includes(transaction.to))
                                     address = transaction.to;
                                 if (address) {
                                     transactionsByAddress[address].push(__assign(__assign({}, transaction), { timestamp: +block.timestamp * 1000, input: transaction.input }));

package/build/constants.d.ts

@@ -1,6 +1,6 @@
 export declare const defaultBlockchainUrl = "http://127.0.0.1:8545";
 export declare const defaultGasLimit = 7000000;
-export declare const defaultGasPrice = "3000000000";
+export declare const defaultGasPrice = "30000000000";
 export declare const defaultGasPriceMultiplier = 1;
 export declare const defaultGasLimitMultiplier = 1.2;
 export declare const ONE_DAY: number;

package/build/constants.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.POLYGON_MATIC_EVENT_PATH = exports.BLOCK_SIZE_TO_FETCH_TRANSACTION = exports.ONE_DAY = exports.defaultGasLimitMultiplier = exports.defaultGasPriceMultiplier = exports.defaultGasPrice = exports.defaultGasLimit = exports.defaultBlockchainUrl = void 0;
 exports.defaultBlockchainUrl = "http://127.0.0.1:8545";
 exports.defaultGasLimit = 7000000;
-exports.defaultGasPrice = "3000000000";
+exports.defaultGasPrice = "30000000000";
 exports.defaultGasPriceMultiplier = 1;
 exports.defaultGasLimitMultiplier = 1.2;
 exports.ONE_DAY = 24 * 60 * 60;

package/build/staticModels/OrdersFactory.d.ts

@@ -32,7 +32,7 @@ declare class OrdersFactory {
      * @returns {Promise<void>} - Does not return id of created order!
      */
     static createOrder(orderInfo: OrderInfo, holdDeposit?: string, suspended?: boolean, transactionOptions?: TransactionOptions): Promise<void>;
-    static getOrder(consumer: string, externalId: string): Promise<OrderCreatedEvent>;
+    static getOrder(consumer?: string, externalId?: string, fromBlock?: number | string, toBlock?: number | string): Promise<OrderCreatedEvent>;
     /**
      * Function for create workflow
      * @param parentOrderInfo - order info for new order

package/build/staticModels/OrdersFactory.js

@@ -56,10 +56,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+var utils_1 = require("ethers/lib/utils");
 var logger_1 = __importDefault(require("../logger"));
-var utils_1 = require("../utils");
+var utils_2 = require("../utils");
 var Order_1 = require("../types/Order");
-var utils_2 = require("ethers/lib/utils");
 var Superpro_1 = __importDefault(require("./Superpro"));
 var TxManager_1 = __importDefault(require("../utils/TxManager"));
 var BlockchainConnector_1 = __importDefault(require("../connectors/BlockchainConnector"));
@@ -167,9 +167,9 @@ var OrdersFactory = /** @class */ (function () {
                 switch (_a.label) {
                     case 0:
                         contract = BlockchainConnector_1.default.getInstance().getContract(transactionOptions);
-                        (0, utils_1.checkIfActionAccountInitialized)(transactionOptions);
-                        preparedInfo = __assign(__assign({}, orderInfo), { externalId: (0, utils_2.formatBytes32String)(orderInfo.externalId) });
-                        orderInfoArguments = (0, utils_1.objectToTuple)(preparedInfo, Order_1.OrderInfoStructure);
+                        (0, utils_2.checkIfActionAccountInitialized)(transactionOptions);
+                        preparedInfo = __assign(__assign({}, orderInfo), { externalId: (0, utils_1.formatBytes32String)(orderInfo.externalId) });
+                        orderInfoArguments = (0, utils_2.objectToTuple)(preparedInfo, Order_1.OrderInfoStructure);
                         return [4 /*yield*/, TxManager_1.default.execute(contract.methods.createOrder, [orderInfoArguments, holdDeposit, suspended], transactionOptions)];
                     case 1:
                         _a.sent();
@@ -178,27 +178,30 @@ var OrdersFactory = /** @class */ (function () {
             });
         });
     };
-    OrdersFactory.getOrder = function (consumer, externalId) {
+    OrdersFactory.getOrder = function (consumer, externalId, fromBlock, toBlock) {
+        if (consumer === void 0) { consumer = ""; }
+        if (externalId === void 0) { externalId = ""; }
         return __awaiter(this, void 0, void 0, function () {
-            var contract, filter, foundIds, notFound, response;
+            var contract, filter, options, foundIds, notFound, response;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         contract = BlockchainConnector_1.default.getInstance().getContract();
                         filter = {
                             consumer: consumer,
-                            externalId: (0, utils_2.formatBytes32String)(externalId),
+                            externalId: (0, utils_1.formatBytes32String)(externalId),
                         };
-                        return [4 /*yield*/, contract.getPastEvents("OrderCreated", { filter: filter })];
+                        options = { filter: filter };
+                        if (fromBlock)
+                            options.fromBlock = fromBlock;
+                        if (toBlock)
+                            options.toBlock = toBlock;
+                        return [4 /*yield*/, contract.getPastEvents("OrderCreated", options)];
                     case 1:
                         foundIds = _a.sent();
-                        notFound = {
-                            consumer: consumer,
-                            externalId: externalId,
-                            offerId: "-1",
-                            orderId: "-1",
-                        };
+                        notFound = __assign(__assign({}, filter), { offerId: "-1", orderId: "-1" });
                         response = foundIds.length > 0 ? foundIds[0].returnValues : notFound;
+                        response.externalId = (0, utils_1.parseBytes32String)(response.externalId);
                         return [2 /*return*/, response];
                 }
             });
@@ -220,11 +223,11 @@ var OrdersFactory = /** @class */ (function () {
                 switch (_a.label) {
                     case 0:
                         contract = BlockchainConnector_1.default.getInstance().getContract(transactionOptions);
-                        (0, utils_1.checkIfActionAccountInitialized)(transactionOptions);
-                        preparedInfo = __assign(__assign({}, parentOrderInfo), { externalId: (0, utils_2.formatBytes32String)(parentOrderInfo.externalId) });
-                        parentOrderInfoArgs = (0, utils_1.objectToTuple)(preparedInfo, Order_1.OrderInfoStructure);
-                        preparedSubOrdersInfo = subOrdersInfo.map(function (o) { return (__assign(__assign({}, o), { externalId: (0, utils_2.formatBytes32String)(o.externalId) })); });
-                        subOrdersInfoArgs = (0, utils_1.objectToTuple)(preparedSubOrdersInfo, Order_1.OrderInfoStructureArray);
+                        (0, utils_2.checkIfActionAccountInitialized)(transactionOptions);
+                        preparedInfo = __assign(__assign({}, parentOrderInfo), { externalId: (0, utils_1.formatBytes32String)(parentOrderInfo.externalId) });
+                        parentOrderInfoArgs = (0, utils_2.objectToTuple)(preparedInfo, Order_1.OrderInfoStructure);
+                        preparedSubOrdersInfo = subOrdersInfo.map(function (o) { return (__assign(__assign({}, o), { externalId: (0, utils_1.formatBytes32String)(o.externalId) })); });
+                        subOrdersInfoArgs = (0, utils_2.objectToTuple)(preparedSubOrdersInfo, Order_1.OrderInfoStructureArray);
                         return [4 /*yield*/, TxManager_1.default.execute(contract.methods.createWorkflow, [parentOrderInfoArgs, holdDeposit, subOrdersInfoArgs], transactionOptions)];
                     case 1:
                         _a.sent();
@@ -245,7 +248,7 @@ var OrdersFactory = /** @class */ (function () {
                 switch (_a.label) {
                     case 0:
                         contract = BlockchainConnector_1.default.getInstance().getContract(transactionOptions);
-                        (0, utils_1.checkIfActionAccountInitialized)(transactionOptions);
+                        (0, utils_2.checkIfActionAccountInitialized)(transactionOptions);
                         return [4 /*yield*/, TxManager_1.default.execute(contract.methods.cancelWorkflow, [perentOrderId], transactionOptions)];
                     case 1:
                         _a.sent();
@@ -266,7 +269,7 @@ var OrdersFactory = /** @class */ (function () {
                 switch (_a.label) {
                     case 0:
                         contract = BlockchainConnector_1.default.getInstance().getContract(transactionOptions);
-                        (0, utils_1.checkIfActionAccountInitialized)(transactionOptions);
+                        (0, utils_2.checkIfActionAccountInitialized)(transactionOptions);
                         return [4 /*yield*/, TxManager_1.default.execute(contract.methods.withdrawWorkflowChange, [parentOrderId], transactionOptions)];
                     case 1:
                         _a.sent();
@@ -288,7 +291,7 @@ var OrdersFactory = /** @class */ (function () {
                 switch (_a.label) {
                     case 0:
                         contract = BlockchainConnector_1.default.getInstance().getContract(transactionOptions);
-                        (0, utils_1.checkIfActionAccountInitialized)(transactionOptions);
+                        (0, utils_2.checkIfActionAccountInitialized)(transactionOptions);
                         return [4 /*yield*/, TxManager_1.default.execute(contract.methods.refillOrder, [orderId, amount], transactionOptions)];
                     case 1:
                         _a.sent();
@@ -311,7 +314,7 @@ var OrdersFactory = /** @class */ (function () {
             .on("data", function (event) { return __awaiter(_this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 //consumer: string, externalId: string, offerId: string, orderId: string
-                callback(event.returnValues.consumer, (0, utils_2.parseBytes32String)(event.returnValues.externalId), event.returnValues.offerId, event.returnValues.orderId, {
+                callback(event.returnValues.consumer, (0, utils_1.parseBytes32String)(event.returnValues.externalId), event.returnValues.offerId, event.returnValues.orderId, {
                     index: event.blockNumber,
                     hash: event.blockHash,
                 });
@@ -339,7 +342,7 @@ var OrdersFactory = /** @class */ (function () {
             .on("data", function (event) { return __awaiter(_this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 //consumer: string, externalId: string, offerId: string, orderId: string
-                callback(event.returnValues.consumer, (0, utils_2.parseBytes32String)(event.returnValues.externalId), event.returnValues.offerId, event.returnValues.orderId, {
+                callback(event.returnValues.consumer, (0, utils_1.parseBytes32String)(event.returnValues.externalId), event.returnValues.offerId, event.returnValues.orderId, {
                     index: event.blockNumber,
                     hash: event.blockHash,
                 });
@@ -685,13 +688,13 @@ var OrdersFactory = /** @class */ (function () {
     };
     OrdersFactory.logger = logger_1.default.child({ className: "OrdersFactory" });
     __decorate([
-        (0, utils_1.incrementMethodCall)()
+        (0, utils_2.incrementMethodCall)()
     ], OrdersFactory, "createOrder", null);
     __decorate([
-        (0, utils_1.incrementMethodCall)()
+        (0, utils_2.incrementMethodCall)()
     ], OrdersFactory, "getOrder", null);
     __decorate([
-        (0, utils_1.incrementMethodCall)()
+        (0, utils_2.incrementMethodCall)()
     ], OrdersFactory, "createWorkflow", null);
     return OrdersFactory;
 }());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@super-protocol/sdk-js",
-  "version": "0.12.8-beta.2",
+  "version": "0.12.9-beta.2",
   "main": "build/index.js",
   "license": "MIT",
   "files": [