@super-protocol/sdk-js 3.12.1-beta.2 → 3.13.0-beta.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/certificates/binary-splitter.d.ts +26 -0
- package/dist/cjs/certificates/binary-splitter.js +269 -0
- package/dist/cjs/certificates/generator.d.ts +38 -0
- package/dist/cjs/certificates/generator.js +237 -0
- package/dist/cjs/certificates/helper.d.ts +5 -2
- package/dist/cjs/certificates/helper.js +19 -15
- package/dist/cjs/certificates/index.d.ts +1 -0
- package/dist/cjs/certificates/index.js +2 -1
- package/dist/cjs/certificates/serializer.d.ts +5 -0
- package/dist/cjs/certificates/serializer.js +98 -2
- package/dist/cjs/certificates/setup-crypto.d.ts +3 -0
- package/dist/cjs/certificates/setup-crypto.js +51 -0
- package/dist/cjs/certificates/types.d.ts +77 -0
- package/dist/cjs/connectors/BlockchainConnector.js +11 -8
- package/dist/cjs/connectors/BlockchainEventsListener.d.ts +4 -4
- package/dist/cjs/connectors/BlockchainEventsListener.js +9 -8
- package/dist/cjs/constants.d.ts +5 -1
- package/dist/cjs/constants.js +12 -5
- package/dist/cjs/index.d.ts +0 -2
- package/dist/cjs/index.js +3 -6
- package/dist/cjs/models/Offer.d.ts +1 -1
- package/dist/cjs/models/Offer.js +10 -3
- package/dist/cjs/models/Order.d.ts +1 -1
- package/dist/cjs/models/Order.js +21 -20
- package/dist/cjs/models/TeeOffer.d.ts +2 -2
- package/dist/cjs/models/TeeOffer.js +18 -3
- package/dist/cjs/proto/OrderReport.d.ts +206 -15
- package/dist/cjs/proto/OrderReport.js +169 -3
- package/dist/cjs/staticModels/ActiveOrders.d.ts +1 -1
- package/dist/cjs/staticModels/ActiveOrders.js +1 -1
- package/dist/cjs/staticModels/OfferResources.js +3 -4
- package/dist/cjs/staticModels/Offers.d.ts +3 -4
- package/dist/cjs/staticModels/Offers.js +16 -17
- package/dist/cjs/staticModels/OffersCommon.d.ts +18 -0
- package/dist/cjs/staticModels/OffersCommon.js +79 -0
- package/dist/cjs/staticModels/Orders.d.ts +6 -5
- package/dist/cjs/staticModels/Orders.js +96 -5
- package/dist/cjs/staticModels/SecretRequests.js +2 -3
- package/dist/cjs/staticModels/StaticModel.d.ts +14 -2
- package/dist/cjs/staticModels/StaticModel.js +90 -2
- package/dist/cjs/staticModels/SuperproToken.d.ts +26 -1
- package/dist/cjs/staticModels/SuperproToken.js +40 -1
- package/dist/cjs/staticModels/TeeOffers.d.ts +4 -4
- package/dist/cjs/staticModels/TeeOffers.js +17 -16
- package/dist/cjs/tee/OrderReportService.js +4 -2
- package/dist/cjs/tee/QuoteValidator.d.ts +3 -2
- package/dist/cjs/tee/QuoteValidator.js +5 -4
- package/dist/cjs/tee/TeeCertificateService.d.ts +1 -1
- package/dist/cjs/tee/TeeCertificateService.js +11 -14
- package/dist/cjs/tee/TeeSignatureVerifier.d.ts +6 -4
- package/dist/cjs/tee/TeeSignatureVerifier.js +60 -32
- package/dist/cjs/tee/types.d.ts +1 -1
- package/dist/cjs/types/Order.d.ts +28 -2
- package/dist/cjs/types/Order.js +23 -2
- package/dist/cjs/types/index.d.ts +0 -1
- package/dist/cjs/types/index.js +1 -2
- package/dist/cjs/utils/CryptoKeysTransformer.d.ts +4 -0
- package/dist/cjs/utils/CryptoKeysTransformer.js +50 -1
- package/dist/cjs/utils/TxManager.d.ts +2 -0
- package/dist/cjs/utils/TxManager.js +56 -25
- package/dist/cjs/utils/helper.d.ts +11 -3
- package/dist/cjs/utils/helper.js +56 -12
- package/dist/cjs/utils/helpers/getRawRpc.d.ts +2 -0
- package/dist/cjs/utils/helpers/getRawRpc.js +19 -0
- package/dist/cjs/utils/helpers/index.d.ts +1 -0
- package/dist/cjs/utils/helpers/index.js +2 -1
- package/dist/cjs/utils/types.d.ts +14 -0
- package/dist/cjs/utils/types.js +3 -0
- package/dist/mjs/certificates/binary-splitter.d.ts +26 -0
- package/dist/mjs/certificates/binary-splitter.js +265 -0
- package/dist/mjs/certificates/generator.d.ts +38 -0
- package/dist/mjs/certificates/generator.js +230 -0
- package/dist/mjs/certificates/helper.d.ts +5 -2
- package/dist/mjs/certificates/helper.js +19 -15
- package/dist/mjs/certificates/index.d.ts +1 -0
- package/dist/mjs/certificates/index.js +2 -1
- package/dist/mjs/certificates/serializer.d.ts +5 -0
- package/dist/mjs/certificates/serializer.js +94 -1
- package/dist/mjs/certificates/setup-crypto.d.ts +3 -0
- package/dist/mjs/certificates/setup-crypto.js +22 -0
- package/dist/mjs/certificates/types.d.ts +77 -0
- package/dist/mjs/connectors/BlockchainConnector.js +11 -8
- package/dist/mjs/connectors/BlockchainEventsListener.d.ts +4 -4
- package/dist/mjs/connectors/BlockchainEventsListener.js +9 -8
- package/dist/mjs/constants.d.ts +5 -1
- package/dist/mjs/constants.js +11 -4
- package/dist/mjs/index.d.ts +0 -2
- package/dist/mjs/index.js +1 -3
- package/dist/mjs/models/Offer.d.ts +1 -1
- package/dist/mjs/models/Offer.js +10 -3
- package/dist/mjs/models/Order.d.ts +1 -1
- package/dist/mjs/models/Order.js +22 -21
- package/dist/mjs/models/TeeOffer.d.ts +2 -2
- package/dist/mjs/models/TeeOffer.js +18 -3
- package/dist/mjs/proto/OrderReport.d.ts +206 -15
- package/dist/mjs/proto/OrderReport.js +168 -2
- package/dist/mjs/staticModels/ActiveOrders.d.ts +1 -1
- package/dist/mjs/staticModels/ActiveOrders.js +1 -1
- package/dist/mjs/staticModels/OfferResources.js +4 -5
- package/dist/mjs/staticModels/Offers.d.ts +3 -4
- package/dist/mjs/staticModels/Offers.js +16 -17
- package/dist/mjs/staticModels/OffersCommon.d.ts +18 -0
- package/dist/mjs/staticModels/OffersCommon.js +73 -0
- package/dist/mjs/staticModels/Orders.d.ts +6 -5
- package/dist/mjs/staticModels/Orders.js +98 -7
- package/dist/mjs/staticModels/SecretRequests.js +3 -4
- package/dist/mjs/staticModels/StaticModel.d.ts +14 -2
- package/dist/mjs/staticModels/StaticModel.js +90 -2
- package/dist/mjs/staticModels/SuperproToken.d.ts +26 -1
- package/dist/mjs/staticModels/SuperproToken.js +40 -1
- package/dist/mjs/staticModels/TeeOffers.d.ts +4 -4
- package/dist/mjs/staticModels/TeeOffers.js +17 -16
- package/dist/mjs/tee/OrderReportService.js +4 -2
- package/dist/mjs/tee/QuoteValidator.d.ts +3 -2
- package/dist/mjs/tee/QuoteValidator.js +5 -4
- package/dist/mjs/tee/TeeCertificateService.d.ts +1 -1
- package/dist/mjs/tee/TeeCertificateService.js +12 -15
- package/dist/mjs/tee/TeeSignatureVerifier.d.ts +6 -4
- package/dist/mjs/tee/TeeSignatureVerifier.js +59 -31
- package/dist/mjs/tee/types.d.ts +1 -1
- package/dist/mjs/types/Order.d.ts +28 -2
- package/dist/mjs/types/Order.js +21 -1
- package/dist/mjs/types/index.d.ts +0 -1
- package/dist/mjs/types/index.js +1 -2
- package/dist/mjs/utils/CryptoKeysTransformer.d.ts +4 -0
- package/dist/mjs/utils/CryptoKeysTransformer.js +50 -1
- package/dist/mjs/utils/TxManager.d.ts +2 -0
- package/dist/mjs/utils/TxManager.js +57 -26
- package/dist/mjs/utils/helper.d.ts +11 -3
- package/dist/mjs/utils/helper.js +54 -12
- package/dist/mjs/utils/helpers/getRawRpc.d.ts +2 -0
- package/dist/mjs/utils/helpers/getRawRpc.js +15 -0
- package/dist/mjs/utils/helpers/index.d.ts +1 -0
- package/dist/mjs/utils/helpers/index.js +2 -1
- package/dist/mjs/utils/types.d.ts +14 -0
- package/dist/mjs/utils/types.js +2 -0
- package/package.json +5 -3
- package/readme.md +11 -0
- package/dist/cjs/contracts/Campaign.d.ts +0 -1036
- package/dist/cjs/contracts/Campaign.js +0 -1347
- package/dist/cjs/staticModels/Campaign.d.ts +0 -59
- package/dist/cjs/staticModels/Campaign.js +0 -248
- package/dist/cjs/types/Campaign.d.ts +0 -57
- package/dist/cjs/types/Campaign.js +0 -11
- package/dist/mjs/contracts/Campaign.d.ts +0 -1036
- package/dist/mjs/contracts/Campaign.js +0 -1344
- package/dist/mjs/staticModels/Campaign.d.ts +0 -59
- package/dist/mjs/staticModels/Campaign.js +0 -243
- package/dist/mjs/types/Campaign.d.ts +0 -57
- package/dist/mjs/types/Campaign.js +0 -8
|
@@ -0,0 +1,79 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
const index_js_1 = require("../connectors/index.js");
|
|
7
|
+
const store_js_1 = __importDefault(require("../store.js"));
|
|
8
|
+
const lodash_1 = __importDefault(require("lodash"));
|
|
9
|
+
const helper_js_1 = require("../utils/helper.js");
|
|
10
|
+
const getRawRpc_js_1 = require("../utils/helpers/getRawRpc.js");
|
|
11
|
+
class OffersCommon {
|
|
12
|
+
static cachedOffers = new Map();
|
|
13
|
+
static latestCachedOfferId = '0';
|
|
14
|
+
static async getAll(batchSize = 1000) {
|
|
15
|
+
const contract = index_js_1.BlockchainConnector.getInstance().getContract();
|
|
16
|
+
const count = Number(await contract.methods.getOffersTotalCount().call());
|
|
17
|
+
const latestCachedOfferId = Number(this.latestCachedOfferId);
|
|
18
|
+
if (latestCachedOfferId > count) {
|
|
19
|
+
throw new Error('Unexpected behavior: latestCachedOfferId > count');
|
|
20
|
+
}
|
|
21
|
+
const newOfferIds = lodash_1.default.range(latestCachedOfferId + 1, count + 1).map(String);
|
|
22
|
+
const newOfferIdsChunks = lodash_1.default.chunk(newOfferIds, batchSize);
|
|
23
|
+
for (const newOfferIdsChunk of newOfferIdsChunks) {
|
|
24
|
+
const offers = await this.getOffersType(newOfferIdsChunk);
|
|
25
|
+
offers.forEach((v) => {
|
|
26
|
+
if (v.type) {
|
|
27
|
+
this.cachedOffers.set(v.offerId, v);
|
|
28
|
+
}
|
|
29
|
+
});
|
|
30
|
+
}
|
|
31
|
+
if (this.cachedOffers.size > 0) {
|
|
32
|
+
this.latestCachedOfferId = count.toString();
|
|
33
|
+
}
|
|
34
|
+
return Array.from(this.cachedOffers.values());
|
|
35
|
+
}
|
|
36
|
+
static async getOffersType(offerIds) {
|
|
37
|
+
const contract = index_js_1.BlockchainConnector.getInstance().getContract();
|
|
38
|
+
const contractAddress = contract.options.address;
|
|
39
|
+
if (!contractAddress) {
|
|
40
|
+
throw new Error('Contract address is not set');
|
|
41
|
+
}
|
|
42
|
+
const getOfferTypeAbi = contract.options.jsonInterface.find((abi) => abi.name === 'getOfferType' && abi.type === 'function')?.outputs;
|
|
43
|
+
if (!getOfferTypeAbi) {
|
|
44
|
+
throw new Error('getOfferType ABI not found');
|
|
45
|
+
}
|
|
46
|
+
const requests = offerIds.map((offerId) => {
|
|
47
|
+
const getOfferTypeEncoded = contract.methods.getOfferType(offerId).encodeABI();
|
|
48
|
+
return (0, getRawRpc_js_1.getRawRpcContractCall)(contractAddress, offerId, getOfferTypeEncoded);
|
|
49
|
+
});
|
|
50
|
+
const responses = await (0, helper_js_1.executeBatchAsync)(requests);
|
|
51
|
+
const responseRequestIdMap = lodash_1.default.groupBy(responses, (response) => response.requestId);
|
|
52
|
+
const data = [];
|
|
53
|
+
offerIds.forEach((offerId) => {
|
|
54
|
+
const response = responseRequestIdMap[offerId]?.[0];
|
|
55
|
+
if (!response || 'error' in response) {
|
|
56
|
+
data.push({
|
|
57
|
+
offerId,
|
|
58
|
+
error: `Failed to get offer type (offerId=${offerId})(error=${response?.error})`,
|
|
59
|
+
});
|
|
60
|
+
return;
|
|
61
|
+
}
|
|
62
|
+
const offerTypeRaw = store_js_1.default.web3Https.eth.abi.decodeParameters(getOfferTypeAbi, response.result)[0];
|
|
63
|
+
if (!offerTypeRaw) {
|
|
64
|
+
data.push({
|
|
65
|
+
offerId,
|
|
66
|
+
error: `Failed to decode offer type (offerId=${offerId})`,
|
|
67
|
+
});
|
|
68
|
+
return;
|
|
69
|
+
}
|
|
70
|
+
data.push({
|
|
71
|
+
offerId,
|
|
72
|
+
type: offerTypeRaw.toString(),
|
|
73
|
+
});
|
|
74
|
+
});
|
|
75
|
+
return data;
|
|
76
|
+
}
|
|
77
|
+
}
|
|
78
|
+
exports.default = OffersCommon;
|
|
79
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiT2ZmZXJzQ29tbW9uLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3N0YXRpY01vZGVscy9PZmZlcnNDb21tb24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFFQSxxREFBNkQ7QUFHN0QsMkRBQWdDO0FBQ2hDLG9EQUE0QjtBQUM1QixrREFBdUQ7QUFDdkQsZ0VBQXNFO0FBUXRFLE1BQXFCLFlBQVk7SUFDdkIsTUFBTSxDQUFDLFlBQVksR0FBRyxJQUFJLEdBQUcsRUFBMkMsQ0FBQztJQUN6RSxNQUFNLENBQUMsbUJBQW1CLEdBQWlCLEdBQUcsQ0FBQztJQUV2RCxNQUFNLENBQUMsS0FBSyxDQUFDLE1BQU0sQ0FBQyxZQUFvQixJQUFJO1FBQzFDLE1BQU0sUUFBUSxHQUFHLDhCQUFtQixDQUFDLFdBQVcsRUFBRSxDQUFDLFdBQVcsRUFBRSxDQUFDO1FBRWpFLE1BQU0sS0FBSyxHQUFHLE1BQU0sQ0FBQyxNQUFNLFFBQVEsQ0FBQyxPQUFPLENBQUMsbUJBQW1CLEVBQUUsQ0FBQyxJQUFJLEVBQUUsQ0FBQyxDQUFDO1FBQzFFLE1BQU0sbUJBQW1CLEdBQUcsTUFBTSxDQUFDLElBQUksQ0FBQyxtQkFBbUIsQ0FBQyxDQUFDO1FBRTdELElBQUksbUJBQW1CLEdBQUcsS0FBSyxFQUFFLENBQUM7WUFDaEMsTUFBTSxJQUFJLEtBQUssQ0FBQyxrREFBa0QsQ0FBQyxDQUFDO1FBQ3RFLENBQUM7UUFFRCxNQUFNLFdBQVcsR0FBRyxnQkFBTSxDQUFDLEtBQUssQ0FBQyxtQkFBbUIsR0FBRyxDQUFDLEVBQUUsS0FBSyxHQUFHLENBQUMsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsQ0FBQztRQUNqRixNQUFNLGlCQUFpQixHQUFHLGdCQUFNLENBQUMsS0FBSyxDQUFDLFdBQVcsRUFBRSxTQUFTLENBQUMsQ0FBQztRQUUvRCxLQUFLLE1BQU0sZ0JBQWdCLElBQUksaUJBQWlCLEVBQUUsQ0FBQztZQUNqRCxNQUFNLE1B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
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { BlockchainId, BlockInfo, OptionInfo, OrderCreatedEvent, OrderInfo, OrderSlots, OrderStatus, OrderUsage, SlotInfo, SlotUsage, TokenAmount, TransactionOptions, RefillArgs, WorkflowArgs } from '../types/index.js';
|
|
1
|
+
import { BlockchainId, BlockInfo, OptionInfo, OrderCreatedEvent, OrderInfo, OrderSlots, OrderStatus, OrderUsage, SlotInfo, SlotUsage, TokenAmount, TransactionOptions, RefillArgs, WorkflowArgs, GetAggregatedOrdersInfoResult } from '../types/index.js';
|
|
2
2
|
import StaticModel from './StaticModel.js';
|
|
3
3
|
import { TransactionReceipt } from 'web3-types';
|
|
4
4
|
declare class Orders implements StaticModel {
|
|
@@ -16,17 +16,18 @@ declare class Orders implements StaticModel {
|
|
|
16
16
|
* Function for fetching orders count
|
|
17
17
|
*/
|
|
18
18
|
static getCount(): Promise<number>;
|
|
19
|
-
static
|
|
19
|
+
static getAggregatedOrdersInfo(orderIds: string[]): Promise<GetAggregatedOrdersInfoResult[]>;
|
|
20
|
+
static createOrder(inputOrderInfo: OrderInfo, slots: OrderSlots, deposit?: TokenAmount, suspended?: boolean, transactionOptions?: TransactionOptions, checkTxBeforeSend?: boolean): Promise<BlockchainId>;
|
|
20
21
|
static getOrderIdByExternalId(consumer: string, externalId: string): Promise<number>;
|
|
21
22
|
static getByExternalId(filter: {
|
|
22
23
|
externalId: string;
|
|
23
24
|
consumer?: string;
|
|
24
|
-
}, fromBlock
|
|
25
|
-
static createWorkflow(inputParentOrderInfo: OrderInfo, parentOrderSlot: OrderSlots, inputSubOrdersInfo: OrderInfo[], subOrdersSlots: OrderSlots[], workflowDeposit: TokenAmount, transactionOptions?: TransactionOptions, checkTxBeforeSend?: boolean): Promise<
|
|
25
|
+
}, fromBlock: number | string, toBlock?: number | string): Promise<OrderCreatedEvent | null>;
|
|
26
|
+
static createWorkflow(inputParentOrderInfo: OrderInfo, parentOrderSlot: OrderSlots, inputSubOrdersInfo: OrderInfo[], subOrdersSlots: OrderSlots[], workflowDeposit: TokenAmount, transactionOptions?: TransactionOptions, checkTxBeforeSend?: boolean): Promise<BlockchainId>;
|
|
26
27
|
static replenishWorkflowDeposit(parentOrderId: BlockchainId, replenishAmount: TokenAmount, transactionOptions?: TransactionOptions): Promise<TransactionReceipt>;
|
|
27
28
|
static calculateWorkflowPerHourPrice(parentOrderId: BlockchainId): Promise<TokenAmount>;
|
|
28
29
|
static cancelWorkflow(parentOrderId: BlockchainId, transactionOptions?: TransactionOptions): Promise<TransactionReceipt>;
|
|
29
|
-
static createWorkflows(workflowArgs: WorkflowArgs[], transactionOptions?: TransactionOptions, checkTxBeforeSend?: boolean): Promise<
|
|
30
|
+
static createWorkflows(workflowArgs: WorkflowArgs[], transactionOptions?: TransactionOptions, checkTxBeforeSend?: boolean): Promise<BlockchainId[]>;
|
|
30
31
|
static cancelWorkflows(parentOrderIds: BlockchainId[], transactionOptions?: TransactionOptions): Promise<TransactionReceipt>;
|
|
31
32
|
/**
|
|
32
33
|
* Function for refilling order deposit
|
|
@@ -22,6 +22,9 @@ const index_js_2 = require("../connectors/index.js");
|
|
|
22
22
|
const StaticModel_js_1 = __importDefault(require("./StaticModel.js"));
|
|
23
23
|
const versify_js_1 = require("../utils/order/versify.js");
|
|
24
24
|
const Offer_js_1 = __importDefault(require("../models/Offer.js"));
|
|
25
|
+
const store_js_1 = __importDefault(require("../store.js"));
|
|
26
|
+
const getRawRpc_js_1 = require("../utils/helpers/getRawRpc.js");
|
|
27
|
+
const lodash_1 = __importDefault(require("lodash"));
|
|
25
28
|
class Orders {
|
|
26
29
|
static logger = logger_js_1.default.child({ className: 'Orders' });
|
|
27
30
|
static orders;
|
|
@@ -83,6 +86,65 @@ class Orders {
|
|
|
83
86
|
const contract = index_js_2.BlockchainConnector.getInstance().getContract();
|
|
84
87
|
return Number(await contract.methods.getOrdersCount().call());
|
|
85
88
|
}
|
|
89
|
+
static async getAggregatedOrdersInfo(orderIds) {
|
|
90
|
+
const denominatorRequestId = 'denominator';
|
|
91
|
+
const contract = index_js_2.BlockchainConnector.getInstance().getContract();
|
|
92
|
+
const contractAddress = contract.options.address;
|
|
93
|
+
if (!contractAddress) {
|
|
94
|
+
throw new Error('Contract address is not set');
|
|
95
|
+
}
|
|
96
|
+
const getCpuDenominatorEncoded = contract.methods.getCpuDenominator().encodeABI();
|
|
97
|
+
const requests = [
|
|
98
|
+
(0, getRawRpc_js_1.getRawRpcContractCall)(contractAddress, denominatorRequestId, getCpuDenominatorEncoded),
|
|
99
|
+
];
|
|
100
|
+
orderIds.forEach((orderId) => {
|
|
101
|
+
const getOrderAggregatedInfoEncoded = contract.methods
|
|
102
|
+
.getOrderAggregatedInfo(orderId)
|
|
103
|
+
.encodeABI();
|
|
104
|
+
requests.push((0, getRawRpc_js_1.getRawRpcContractCall)(contractAddress, orderId, getOrderAggregatedInfoEncoded));
|
|
105
|
+
});
|
|
106
|
+
const responses = await (0, helper_js_1.executeBatchAsync)(requests);
|
|
107
|
+
const responseRequestIdMap = lodash_1.default.groupBy(responses, (response) => response.requestId);
|
|
108
|
+
const getCpuDenominatorAbi = contract.options.jsonInterface.find((abi) => abi.name === 'getCpuDenominator' && abi.type === 'function')?.outputs;
|
|
109
|
+
if (!getCpuDenominatorAbi) {
|
|
110
|
+
throw new Error('getCpuDenominator ABI not found');
|
|
111
|
+
}
|
|
112
|
+
const denominatorResponse = responseRequestIdMap[denominatorRequestId][0];
|
|
113
|
+
if (!denominatorResponse || 'error' in denominatorResponse) {
|
|
114
|
+
throw new Error(`Failed to get CPU denominator: ${denominatorResponse?.error}`);
|
|
115
|
+
}
|
|
116
|
+
const cpuDenominatorRaw = store_js_1.default.web3Https.eth.abi.decodeParameters(getCpuDenominatorAbi, denominatorResponse.result)[0];
|
|
117
|
+
const cpuDenominator = Number(cpuDenominatorRaw);
|
|
118
|
+
const getOrderAggregatedInfoAbi = contract.options.jsonInterface.find((abi) => abi.name === 'getOrderAggregatedInfo' && abi.type === 'function')?.outputs;
|
|
119
|
+
if (!getOrderAggregatedInfoAbi) {
|
|
120
|
+
throw new Error('getOrderAggregatedInfo ABI not found');
|
|
121
|
+
}
|
|
122
|
+
const data = [];
|
|
123
|
+
orderIds.forEach((orderId) => {
|
|
124
|
+
const response = responseRequestIdMap[orderId]?.[0];
|
|
125
|
+
if (!response || 'error' in response) {
|
|
126
|
+
data.push({
|
|
127
|
+
orderId,
|
|
128
|
+
error: `Failed to get aggregated order info (orderId=${orderId})(error=${response?.error})`,
|
|
129
|
+
});
|
|
130
|
+
return;
|
|
131
|
+
}
|
|
132
|
+
const aggregatedInfoRaw = store_js_1.default.web3Https.eth.abi.decodeParameters(getOrderAggregatedInfoAbi, response.result);
|
|
133
|
+
if (!aggregatedInfoRaw) {
|
|
134
|
+
data.push({
|
|
135
|
+
orderId,
|
|
136
|
+
error: `Failed to decode aggregated order info (orderId=${orderId})`,
|
|
137
|
+
});
|
|
138
|
+
return;
|
|
139
|
+
}
|
|
140
|
+
const aggregatedInfo = (0, helper_js_1.cleanWeb3Data)(aggregatedInfoRaw[0]);
|
|
141
|
+
data.push({
|
|
142
|
+
orderId,
|
|
143
|
+
aggregatedInfo: (0, index_js_1.aggregatedOrderInfoFromRaw)(aggregatedInfo, cpuDenominator),
|
|
144
|
+
});
|
|
145
|
+
});
|
|
146
|
+
return data;
|
|
147
|
+
}
|
|
86
148
|
static async createOrder(inputOrderInfo, slots, deposit, suspended = false, transactionOptions, checkTxBeforeSend = false) {
|
|
87
149
|
const contract = index_js_2.BlockchainConnector.getInstance().getContract();
|
|
88
150
|
(0, helper_js_1.checkIfActionAccountInitialized)(transactionOptions);
|
|
@@ -96,13 +158,20 @@ class Orders {
|
|
|
96
158
|
if (checkTxBeforeSend) {
|
|
97
159
|
await TxManager_js_1.default.dryRun(contract.methods.createOrder(orderInfoArguments, slots, args, deposit, suspended), transactionOptions);
|
|
98
160
|
}
|
|
99
|
-
|
|
161
|
+
const newOrderId = await StaticModel_js_1.default.createEntity({
|
|
162
|
+
txExecutorCallback: async () => {
|
|
163
|
+
await TxManager_js_1.default.execute(contract.methods.createOrder(orderInfoArguments, slots, args, deposit, suspended), transactionOptions);
|
|
164
|
+
},
|
|
165
|
+
filters: [{ externalId: inputOrderInfo.externalId }],
|
|
166
|
+
eventName: 'OrderCreated',
|
|
167
|
+
});
|
|
168
|
+
return newOrderId;
|
|
100
169
|
}
|
|
101
170
|
static async getOrderIdByExternalId(consumer, externalId) {
|
|
102
171
|
const contract = index_js_2.BlockchainConnector.getInstance().getContract();
|
|
103
172
|
return await contract.methods.getOrderIdByExternalId(consumer, externalId).call();
|
|
104
173
|
}
|
|
105
|
-
static async getByExternalId(filter, fromBlock, toBlock) {
|
|
174
|
+
static async getByExternalId(filter, fromBlock, toBlock = 'latest') {
|
|
106
175
|
const founded = await StaticModel_js_1.default.findItemsById('OrderCreated', filter, fromBlock, toBlock);
|
|
107
176
|
if (!founded)
|
|
108
177
|
return null;
|
|
@@ -123,7 +192,14 @@ class Orders {
|
|
|
123
192
|
if (checkTxBeforeSend) {
|
|
124
193
|
await TxManager_js_1.default.dryRun(contract.methods.createWorkflow(rawWorkflowArgs), transactionOptions);
|
|
125
194
|
}
|
|
126
|
-
|
|
195
|
+
const newParentOrderId = await StaticModel_js_1.default.createEntity({
|
|
196
|
+
txExecutorCallback: async () => {
|
|
197
|
+
await TxManager_js_1.default.execute(contract.methods.createWorkflow(rawWorkflowArgs), transactionOptions);
|
|
198
|
+
},
|
|
199
|
+
filters: [{ externalId: inputParentOrderInfo.externalId }],
|
|
200
|
+
eventName: 'OrderCreated',
|
|
201
|
+
});
|
|
202
|
+
return newParentOrderId;
|
|
127
203
|
}
|
|
128
204
|
static async replenishWorkflowDeposit(parentOrderId, replenishAmount, transactionOptions) {
|
|
129
205
|
const contract = index_js_2.BlockchainConnector.getInstance().getContract();
|
|
@@ -153,7 +229,16 @@ class Orders {
|
|
|
153
229
|
if (checkTxBeforeSend) {
|
|
154
230
|
await TxManager_js_1.default.dryRun(contract.methods.createWorkflows(rawWorkflowArgs), transactionOptions);
|
|
155
231
|
}
|
|
156
|
-
|
|
232
|
+
const newParentOrderIds = await StaticModel_js_1.default.createEntities({
|
|
233
|
+
txExecutorCallback: async () => {
|
|
234
|
+
await TxManager_js_1.default.execute(contract.methods.createWorkflows(rawWorkflowArgs), transactionOptions);
|
|
235
|
+
},
|
|
236
|
+
filters: workflowArgs.map((wa) => {
|
|
237
|
+
return { externalId: wa.inputParentOrderInfo.externalId };
|
|
238
|
+
}),
|
|
239
|
+
eventName: 'OrderCreated',
|
|
240
|
+
});
|
|
241
|
+
return newParentOrderIds;
|
|
157
242
|
}
|
|
158
243
|
static async cancelWorkflows(parentOrderIds, transactionOptions) {
|
|
159
244
|
const contract = index_js_2.BlockchainConnector.getInstance().getContract();
|
|
@@ -510,6 +595,12 @@ class Orders {
|
|
|
510
595
|
});
|
|
511
596
|
}
|
|
512
597
|
}
|
|
598
|
+
__decorate([
|
|
599
|
+
(0, helper_js_1.incrementMethodCall)(),
|
|
600
|
+
__metadata("design:type", Function),
|
|
601
|
+
__metadata("design:paramtypes", [Array]),
|
|
602
|
+
__metadata("design:returntype", Promise)
|
|
603
|
+
], Orders, "getAggregatedOrdersInfo", null);
|
|
513
604
|
__decorate([
|
|
514
605
|
(0, helper_js_1.incrementMethodCall)(),
|
|
515
606
|
__metadata("design:type", Function),
|
|
@@ -547,4 +638,4 @@ __decorate([
|
|
|
547
638
|
__metadata("design:returntype", Promise)
|
|
548
639
|
], Orders, "createWorkflows", null);
|
|
549
640
|
exports.default = Orders;
|
|
550
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Orders.js","sourceRoot":"","sources":["../../../src/staticModels/Orders.ts"],"names":[],"mappings":"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"}
|
|
641
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Orders.js","sourceRoot":"","sources":["../../../src/staticModels/Orders.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,6 @@ const index_js_1 = require("../connectors/index.js");
|
|
|
7
7
|
const helper_js_1 = require("../utils/helper.js");
|
|
8
8
|
const TxManager_js_1 = __importDefault(require("../utils/TxManager.js"));
|
|
9
9
|
const logger_js_1 = __importDefault(require("../logger.js"));
|
|
10
|
-
const constants_js_1 = require("../constants.js");
|
|
11
10
|
class SecretRequests {
|
|
12
11
|
static logger = logger_js_1.default.child({ className: 'SecretRequests' });
|
|
13
12
|
static async getCountByKeeperId(teeOfferKeeperId) {
|
|
@@ -41,7 +40,7 @@ class SecretRequests {
|
|
|
41
40
|
const contract = index_js_1.BlockchainConnector.getInstance().getContract();
|
|
42
41
|
(0, helper_js_1.checkIfActionAccountInitialized)(transactionOptions);
|
|
43
42
|
const options = {
|
|
44
|
-
gas:
|
|
43
|
+
gas: (0, helper_js_1.getGasLimitForNetwork)(),
|
|
45
44
|
...transactionOptions,
|
|
46
45
|
};
|
|
47
46
|
await TxManager_js_1.default.execute(contract.methods.clearSecretRequests(teeOfferKeeperId), options);
|
|
@@ -76,4 +75,4 @@ class SecretRequests {
|
|
|
76
75
|
}
|
|
77
76
|
}
|
|
78
77
|
exports.default = SecretRequests;
|
|
79
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
78
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU2VjcmV0UmVxdWVzdHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvc3RhdGljTW9kZWxzL1NlY3JldFJlcXVlc3RzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7O0FBQUEscURBQXVGO0FBRXZGLGtEQUs0QjtBQUM1Qix5RUFBOEM7QUFFOUMsNkRBQXNDO0FBTXRDLE1BQU0sY0FBYztJQUNWLE1BQU0sQ0FBVSxNQUFNLEdBQUcsbUJBQVUsQ0FBQyxLQUFLLENBQUMsRUFBRSxTQUFTLEVBQUUsZ0JBQWdCLEVBQUUsQ0FBQyxDQUFDO0lBRTVFLE1BQU0sQ0FBQyxLQUFLLENBQUMsa0JBQWtCLENBQUMsZ0JBQThCO1FBQ25FLE1BQU0sUUFBUSxHQUFHLDhCQUFtQixDQUFDLFdBQVcsRUFBRSxDQUFDLFdBQVcsRUFBRSxDQUFDO1FBRWpFLE9BQU8sTUFBTSxDQUFDLE1BQU0sUUFBUSxDQUFDLE9BQU8sQ0FBQyxnQ0FBZ0MsQ0FBQyxnQkFBZ0IsQ0FBQyxDQUFDLElBQUksRUFBRSxDQUFDLENBQUM7SUFDbEcsQ0FBQztJQUVNLE1BQU0sQ0FBQyxhQUFhLENBQUMsZ0JBQThCO1FBQ3hELE1BQU0sUUFBUSxHQUFHLDhCQUFtQixDQUFDLFdBQVcsRUFBRSxDQUFDLFdBQVcsRUFBRSxDQUFDO1FBRWpFLE9BQU8sUUFBUSxDQUFDLE9BQU87YUFDcEIsMkJBQTJCLENBQUMsZ0JBQWdCLENBQUM7YUFDN0MsSUFBSSxFQUFFO2FBQ04sSUFBSSxDQUFDLENBQUMsUUFBMEIsRUFBRSxFQUFFLENBQ25DLFFBQVMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxPQUFPLEVBQUUsRUFBRSxDQUFDLElBQUEsdUNBQTJCLEVBQUMsT0FBd0IsQ0FBQyxDQUFDLENBQ2xGLENBQUM7SUFDTixDQUFDO0lBRU0sTUFBTSxDQUFDLGdCQUFnQixDQUFDLG1CQUFpQztRQUM5RCxNQUFNLFFBQVEsR0FBRyw4QkFBbUIsQ0FBQyxXQUFXLEVBQUUsQ0FBQyxXQUFX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
|
|
@@ -1,8 +1,20 @@
|
|
|
1
1
|
import { ContractEvents } from 'web3';
|
|
2
|
-
import { FilterWithExternalId } from '../types/index.js';
|
|
2
|
+
import { BlockchainId, FilterWithExternalId } from '../types/index.js';
|
|
3
3
|
import abi from '../contracts/abi.js';
|
|
4
4
|
declare class StaticModel {
|
|
5
5
|
private static readonly logger;
|
|
6
|
-
static findItemsById(eventName: keyof ContractEvents<typeof abi>, filter: FilterWithExternalId, fromBlock
|
|
6
|
+
static findItemsById(eventName: keyof ContractEvents<typeof abi>, filter: FilterWithExternalId, fromBlock: number | string, toBlock?: number | string): Promise<unknown>;
|
|
7
|
+
static findAllEventsByExternalIds(eventName: string, filter: FilterWithExternalId[], fromBlock: number | string, toBlock?: number | string): Promise<unknown[]>;
|
|
8
|
+
static createEntities(params: {
|
|
9
|
+
txExecutorCallback: () => Promise<void>;
|
|
10
|
+
filters: FilterWithExternalId[];
|
|
11
|
+
eventName: string;
|
|
12
|
+
}): Promise<BlockchainId[]>;
|
|
13
|
+
static createEntity(params: {
|
|
14
|
+
txExecutorCallback: () => Promise<void>;
|
|
15
|
+
filters: FilterWithExternalId[];
|
|
16
|
+
eventName: string;
|
|
17
|
+
}): Promise<BlockchainId>;
|
|
18
|
+
static getIdFromEvent(eventName: string, eventObject: unknown): BlockchainId;
|
|
7
19
|
}
|
|
8
20
|
export default StaticModel;
|
|
@@ -9,7 +9,7 @@ const logger_js_1 = __importDefault(require("../logger.js"));
|
|
|
9
9
|
const helper_js_1 = require("../utils/helper.js");
|
|
10
10
|
class StaticModel {
|
|
11
11
|
static logger = logger_js_1.default.child({ className: 'Offers' });
|
|
12
|
-
static async findItemsById(eventName, filter, fromBlock, toBlock) {
|
|
12
|
+
static async findItemsById(eventName, filter, fromBlock, toBlock = 'latest') {
|
|
13
13
|
const contract = BlockchainConnector_js_1.default.getInstance().getContract();
|
|
14
14
|
const options = { filter };
|
|
15
15
|
if (!(0, helper_js_1.isValidBytes32Hex)(filter.externalId)) {
|
|
@@ -30,6 +30,94 @@ class StaticModel {
|
|
|
30
30
|
parsedEvent.externalId = (0, utils_js_1.parseBytes32String)(parsedEvent.externalId);
|
|
31
31
|
return parsedEvent;
|
|
32
32
|
}
|
|
33
|
+
static async findAllEventsByExternalIds(eventName, filter, fromBlock, toBlock = 'latest') {
|
|
34
|
+
const contract = BlockchainConnector_js_1.default.getInstance().getContract();
|
|
35
|
+
const options = {};
|
|
36
|
+
if (fromBlock)
|
|
37
|
+
options.fromBlock = fromBlock;
|
|
38
|
+
if (toBlock)
|
|
39
|
+
options.toBlock = toBlock;
|
|
40
|
+
const events = await contract.getPastEvents(eventName, options);
|
|
41
|
+
if (!events.length) {
|
|
42
|
+
return [];
|
|
43
|
+
}
|
|
44
|
+
const externalIds = new Set(filter.map((f) => {
|
|
45
|
+
return f.externalId;
|
|
46
|
+
}));
|
|
47
|
+
return events
|
|
48
|
+
.map((eventLog) => {
|
|
49
|
+
if (typeof eventLog == 'string') {
|
|
50
|
+
throw Error('unexpected eventlog type');
|
|
51
|
+
}
|
|
52
|
+
const parsedEvent = (0, helper_js_1.cleanWeb3Data)(eventLog.returnValues);
|
|
53
|
+
if (parsedEvent.externalId) {
|
|
54
|
+
parsedEvent.externalId = (0, utils_js_1.parseBytes32String)(parsedEvent.externalId);
|
|
55
|
+
}
|
|
56
|
+
return parsedEvent;
|
|
57
|
+
})
|
|
58
|
+
.filter((parsedEvent) => parsedEvent.externalId !== undefined && externalIds.has(parsedEvent.externalId));
|
|
59
|
+
}
|
|
60
|
+
static async createEntities(params) {
|
|
61
|
+
const currentBlock = await BlockchainConnector_js_1.default.getInstance().getLastBlockInfo();
|
|
62
|
+
await params.txExecutorCallback();
|
|
63
|
+
const events = await StaticModel.findAllEventsByExternalIds(params.eventName, params.filters, currentBlock.index, 'latest');
|
|
64
|
+
return events.map((event) => StaticModel.getIdFromEvent(params.eventName, event));
|
|
65
|
+
}
|
|
66
|
+
static async createEntity(params) {
|
|
67
|
+
const ids = await StaticModel.createEntities(params);
|
|
68
|
+
if (ids.length === 0) {
|
|
69
|
+
throw new Error('The entity creation event was not found');
|
|
70
|
+
}
|
|
71
|
+
return ids[0];
|
|
72
|
+
}
|
|
73
|
+
static getIdFromEvent(eventName, eventObject) {
|
|
74
|
+
const checkers = {
|
|
75
|
+
TeeOfferCreated: () => {
|
|
76
|
+
const event = eventObject;
|
|
77
|
+
if (event && event?.offerId !== '-1') {
|
|
78
|
+
return event.offerId;
|
|
79
|
+
}
|
|
80
|
+
},
|
|
81
|
+
OfferCreated: () => {
|
|
82
|
+
const event = eventObject;
|
|
83
|
+
if (event && event?.offerId !== '-1') {
|
|
84
|
+
return event.offerId;
|
|
85
|
+
}
|
|
86
|
+
},
|
|
87
|
+
TeeSlotAdded: () => {
|
|
88
|
+
const event = eventObject;
|
|
89
|
+
if (event && event?.slotId !== '-1') {
|
|
90
|
+
return event.slotId;
|
|
91
|
+
}
|
|
92
|
+
},
|
|
93
|
+
OptionAdded: () => {
|
|
94
|
+
const event = eventObject;
|
|
95
|
+
if (event && event?.optionId !== '-1') {
|
|
96
|
+
return event.optionId;
|
|
97
|
+
}
|
|
98
|
+
},
|
|
99
|
+
ValueSlotAdded: () => {
|
|
100
|
+
const event = eventObject;
|
|
101
|
+
if (event && event?.slotId !== '-1') {
|
|
102
|
+
return event.slotId;
|
|
103
|
+
}
|
|
104
|
+
},
|
|
105
|
+
OrderCreated: () => {
|
|
106
|
+
const event = eventObject;
|
|
107
|
+
if (event && event?.orderId !== '-1') {
|
|
108
|
+
return event.orderId;
|
|
109
|
+
}
|
|
110
|
+
},
|
|
111
|
+
};
|
|
112
|
+
if (!checkers[eventName]) {
|
|
113
|
+
throw new Error('Unknown event');
|
|
114
|
+
}
|
|
115
|
+
const entityId = checkers[eventName]();
|
|
116
|
+
if (!entityId) {
|
|
117
|
+
throw new Error('Event doesnt contains entity id');
|
|
118
|
+
}
|
|
119
|
+
return entityId;
|
|
120
|
+
}
|
|
33
121
|
}
|
|
34
122
|
exports.default = StaticModel;
|
|
35
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
123
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU3RhdGljTW9kZWwuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvc3RhdGljTW9kZWxzL1N0YXRpY01vZGVsLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7O0FBQUEsa0RBQThFO0FBRTlFLGtHQUF1RTtBQVd2RSw2REFBc0M7QUFDdEMsa0RBQXNFO0FBUXRFLE1BQU0sV0FBVztJQUNQLE1BQU0sQ0FBVSxNQUFNLEdBQUcsbUJBQVUsQ0FBQyxLQUFLLENBQUMsRUFBRSxTQUFTLEVBQUUsUUFBUSxFQUFFLENBQUMsQ0FBQztJQUVwRSxNQUFNLENBQUMsS0FBSyxDQUFDLGFBQWEsQ0FDL0IsU0FBMkMsRUFDM0MsTUFBNEIsRUFDNUIsU0FBMEIsRUFDMUIsVUFBMkIsUUFBUTtRQUVuQyxNQUFNLFFBQVEsR0FBRyxnQ0FBbUIsQ0FBQyxXQUFXLEVBQUUsQ0FBQyxXQUFXLEVBQUUsQ0FBQztRQUNqRSxNQUFNLE9BQU8sR0FBaUIsRUFBRSxNQUFNLEVBQUUsQ0FBQztRQUN6QyxJQUFJLENBQUMsSUFBQSw2QkFBaUIsRUFBQyxNQUFNLENBQUMsVUFBVSxDQUFDLEVBQUUsQ0FBQztZQUMxQyxPQUFPLENBQUMsTUFBTyxDQUFDLFVBQVUsR0FBRyxJQUFBLDhCQUFtQixFQUFDLE1BQU0sQ0FBQyxVQUFVLENBQUMsQ0FBQztRQUN0RSxDQUFDO1FBQ0QsSUFBSSxTQUFTO1lBQUUsT0FBTyxDQUFDLFNBQVMsR0FBRyxTQUFTLENBQUM7UUFDN0MsSUFBSSxPQUFPO1lBQUUsT0FBTyxDQUFDLE9BQU8sR0FBRyxPQUFPLENBQUM7UUFFdkMsTUFBTSxRQUFRLEdBQUcsTUFBTSxRQUFRLENBQUMsYUFBYSxDQUFDLFNBQVMsRUFBRSxPQUFPLENBQUMsQ0FBQztRQUNsRSxJQUFJLENBQUMsUUFBUSxDQUFDLE1BQU0sRUFBRSxDQUFDO1lBQ3JCLE9BQU8sSUFBSSxDQUFDO1FBQ2QsQ0FBQztRQUNELElBQUksUUFBUSxDQUFDLE1BQU0sR0FBRyxD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
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Contract, Transaction } from 'web3';
|
|
1
|
+
import { BlockNumberOrTag, Contract, Transaction } from 'web3';
|
|
2
2
|
import { abi } from '../contracts/tokenAbi.js';
|
|
3
3
|
import { TransactionOptions, BlockInfo, TokenAmount } from '../types/index.js';
|
|
4
4
|
declare class SuperproToken {
|
|
@@ -15,6 +15,31 @@ declare class SuperproToken {
|
|
|
15
15
|
* Checks if contract has been initialized, if not - initialize contract
|
|
16
16
|
*/
|
|
17
17
|
private static checkInit;
|
|
18
|
+
/**
|
|
19
|
+
* Retrieves past "Transfer" events emitted by the token contract,
|
|
20
|
+
* optionally filtered by `from` and/or `to` addresses and a block range.
|
|
21
|
+
*
|
|
22
|
+
* Enriches each event with the block timestamp (`blockTimestamp`)
|
|
23
|
+
* by fetching the block using a concurrency-limited queue.
|
|
24
|
+
*/
|
|
25
|
+
static getTransferEvents(params: {
|
|
26
|
+
filter?: {
|
|
27
|
+
from?: string;
|
|
28
|
+
to?: string;
|
|
29
|
+
};
|
|
30
|
+
fromBlock?: BlockNumberOrTag;
|
|
31
|
+
toBlock?: BlockNumberOrTag;
|
|
32
|
+
}, options?: {
|
|
33
|
+
concurrency?: number;
|
|
34
|
+
contract?: Contract<typeof abi>;
|
|
35
|
+
}): Promise<{
|
|
36
|
+
from: string;
|
|
37
|
+
to: string;
|
|
38
|
+
value: bigint;
|
|
39
|
+
transactionHash: string;
|
|
40
|
+
blockNumber: bigint;
|
|
41
|
+
blockTimestamp: number;
|
|
42
|
+
}[]>;
|
|
18
43
|
/**
|
|
19
44
|
* Fetching balance of SuperProtocol tokens on address
|
|
20
45
|
*/
|