@super-protocol/sdk-js 3.0.0-beta.1 → 3.0.0-beta.10
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/TeeInputGeneratorBase.js +7 -10
- package/dist/cjs/connectors/BaseConnector.d.ts +6 -0
- package/dist/cjs/connectors/BaseConnector.js +10 -1
- package/dist/cjs/connectors/BlockchainEventsListener.d.ts +3 -0
- package/dist/cjs/connectors/BlockchainEventsListener.js +5 -3
- package/dist/cjs/contracts/abi.d.ts +726 -127
- package/dist/cjs/contracts/abi.js +975 -189
- package/dist/cjs/models/Order.js +7 -7
- package/dist/cjs/models/TeeOffer.js +3 -3
- package/dist/cjs/staticModels/Consensus.js +2 -2
- package/dist/cjs/staticModels/LoaderSessions.d.ts +1 -1
- package/dist/cjs/staticModels/LoaderSessions.js +10 -7
- package/dist/cjs/staticModels/Superpro.d.ts +6 -2
- package/dist/cjs/staticModels/Superpro.js +51 -1
- package/dist/cjs/staticModels/SuperproToken.js +3 -1
- package/dist/cjs/tee/TcbSerializer.d.ts +2 -2
- package/dist/cjs/types/Consensus.d.ts +4 -9
- package/dist/cjs/types/Consensus.js +1 -1
- package/dist/cjs/types/TokenInfo.d.ts +4 -0
- package/dist/cjs/types/TokenInfo.js +3 -0
- package/dist/cjs/types/index.d.ts +1 -0
- package/dist/cjs/types/index.js +2 -1
- package/dist/cjs/utils/helper.d.ts +3 -0
- package/dist/cjs/utils/helper.js +19 -2
- package/dist/cjs/utils/schema-utils/index.d.ts +1 -1
- package/dist/cjs/utils/schema-utils/index.js +3 -2
- package/dist/mjs/TeeInputGeneratorBase.js +7 -10
- package/dist/mjs/connectors/BaseConnector.d.ts +6 -0
- package/dist/mjs/connectors/BaseConnector.js +10 -1
- package/dist/mjs/connectors/BlockchainEventsListener.d.ts +3 -0
- package/dist/mjs/connectors/BlockchainEventsListener.js +5 -3
- package/dist/mjs/contracts/abi.d.ts +726 -127
- package/dist/mjs/contracts/abi.js +975 -189
- package/dist/mjs/models/Order.js +7 -7
- package/dist/mjs/models/TeeOffer.js +3 -3
- package/dist/mjs/staticModels/Consensus.js +3 -3
- package/dist/mjs/staticModels/LoaderSessions.d.ts +1 -1
- package/dist/mjs/staticModels/LoaderSessions.js +10 -7
- package/dist/mjs/staticModels/Superpro.d.ts +6 -2
- package/dist/mjs/staticModels/Superpro.js +48 -1
- package/dist/mjs/staticModels/SuperproToken.js +3 -1
- package/dist/mjs/tee/TcbSerializer.d.ts +2 -2
- package/dist/mjs/types/Consensus.d.ts +4 -9
- package/dist/mjs/types/Consensus.js +1 -1
- package/dist/mjs/types/TokenInfo.d.ts +4 -0
- package/dist/mjs/types/TokenInfo.js +2 -0
- package/dist/mjs/types/index.d.ts +1 -0
- package/dist/mjs/types/index.js +2 -1
- package/dist/mjs/utils/helper.d.ts +3 -0
- package/dist/mjs/utils/helper.js +16 -1
- package/dist/mjs/utils/schema-utils/index.d.ts +1 -1
- package/dist/mjs/utils/schema-utils/index.js +2 -2
- package/package.json +2 -2
|
@@ -9,15 +9,16 @@ const index_js_2 = require("./types/index.js");
|
|
|
9
9
|
const index_js_3 = __importDefault(require("./crypto/index.js"));
|
|
10
10
|
const TeeBlockVerifier_js_1 = require("./tee/TeeBlockVerifier.js");
|
|
11
11
|
const serializer_js_1 = require("./utils/schema-utils/serializer.js");
|
|
12
|
+
const constants_js_1 = require("./constants.js");
|
|
12
13
|
class TeeInputGeneratorBase {
|
|
13
14
|
static async generateRiiByOfferId(offerId) {
|
|
14
15
|
const offer = new index_js_1.Offer(offerId);
|
|
15
16
|
const offerInfo = await offer.getInfo();
|
|
16
|
-
const calcType = (offerType, offer) => {
|
|
17
|
+
const calcType = async (offerType, offer) => {
|
|
17
18
|
switch (offerType) {
|
|
18
19
|
case index_js_2.OfferType.Solution: {
|
|
19
|
-
const isBaseImage = offer.isBaseImage();
|
|
20
|
-
const isOfferPublic = offer.isOfferPublic();
|
|
20
|
+
const isBaseImage = await offer.isBaseImage();
|
|
21
|
+
const isOfferPublic = await offer.isOfferPublic();
|
|
21
22
|
if (!isBaseImage) {
|
|
22
23
|
return 'Solution';
|
|
23
24
|
}
|
|
@@ -30,17 +31,13 @@ class TeeInputGeneratorBase {
|
|
|
30
31
|
return 'Data';
|
|
31
32
|
}
|
|
32
33
|
};
|
|
33
|
-
const type = calcType(offerInfo.offerType, offer);
|
|
34
|
+
const type = await calcType(offerInfo.offerType, offer);
|
|
34
35
|
if (!type) {
|
|
35
36
|
return null;
|
|
36
37
|
}
|
|
37
|
-
const hash = (0, serializer_js_1.deserializeBySchema)(offerInfo.hash, dto_js_1.HashSchema);
|
|
38
|
-
if (!hash) {
|
|
39
|
-
return null;
|
|
40
|
-
}
|
|
41
38
|
return {
|
|
42
39
|
args: undefined,
|
|
43
|
-
hash,
|
|
40
|
+
hash: (0, serializer_js_1.deserializeBySchema)(offerInfo.hash, dto_js_1.HashSchema) ?? constants_js_1.ZERO_HASH,
|
|
44
41
|
...(offerInfo.signatureKeyHash && {
|
|
45
42
|
signatureKeyHash: offerInfo.signatureKeyHash,
|
|
46
43
|
}),
|
|
@@ -74,4 +71,4 @@ class TeeInputGeneratorBase {
|
|
|
74
71
|
}
|
|
75
72
|
}
|
|
76
73
|
exports.default = TeeInputGeneratorBase;
|
|
77
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
74
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVGVlSW5wdXRHZW5lcmF0b3JCYXNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL1RlZUlucHV0R2VuZXJhdG9yQmFzZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUFBLG1EQU9nQztBQUNoQyxnREFBeUQ7QUFDekQsK0NBQXNFO0FBQ3RFLGlFQUF1QztBQUN2QyxtRUFBNkQ7QUFDN0Qsc0VBQXlFO0FBQ3pFLGlEQUEyQztBQUUzQyxNQUFxQixxQkFBcUI7SUFDOUIsTUFBTSxDQUFDLEtBQUssQ0FBQyxvQkFBb0IsQ0FBQyxPQUFlO1FBQ3pELE1BQU0sS0FBSyxHQUFVLElBQUksZ0JBQUssQ0FBQyxPQUFPLENBQUMsQ0FBQztRQUN4QyxNQUFNLFNBQVMsR0FBYyxNQUFNLEtBQUssQ0FBQyxPQUFPLEVBQUUsQ0FBQztRQUNuRCxNQUFNLFFBQVEsR0FBRyxLQUFLLEVBQUUsU0FBb0IsRUFBRSxLQUFZLEVBQWdDLEVBQUU7WUFDMUYsUUFBUSxTQUFTLEVBQUUsQ0FBQztnQkFDbEIsS0FBSyxvQkFBUyxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUM7b0JBQ3hCLE1BQU0sV0FBVyxHQUFHLE1BQU0sS0FBSyxDQUFDLFdBQVcsRUFBRSxDQUFDO29CQUM5QyxNQUFNLGFBQWEsR0FBRyxNQUFNLEtBQUssQ0FBQyxhQUFhLEVBQUUsQ0FBQztvQkFDbEQsSUFBSSxDQUFDLFdBQVcsRUFBRSxDQUFDO3dCQUNqQixPQUFPLFVBQVUsQ0FBQztvQkFDcEIsQ0FBQzt5QkFBTSxJQUFJLENBQUMsYUFBYSxFQUFFLENBQUM7d0JBQzFCLE9BQU8sT0FBTyxDQUFDO29CQUNqQixDQUFDO29CQUNELE1BQU07Z0JBQ1IsQ0FBQztnQkFDRCxLQUFLLG9CQUFTLENBQUMsSUFBSTtvQkFDakIsT0FBTyxNQUFNLENBQUM7WUFDbEIsQ0FBQztRQUNILENBQUMsQ0FBQztRQUNGLE1BQU0sSUFBSSxHQUFHLE1BQU0sUUFBUSxDQUFDLFNBQVMsQ0FBQyxTQUFTLEVBQUUsS0FBSyxDQUFDLENBQUM7UUFDeEQsSUFBSSxDQUFDLElBQUksRUFBRSxDQUFDO1lBQ1YsT0FBTyxJQUFJLENBQUM7UUFDZCxDQUFDO1FBQ0QsT0FBTztZQUNMLElBQUksRUFBRSxTQUFTO1lBQ2YsSUFBSSxFQUFFLElBQUEsbUNBQW1CLEVBQUMsU0FBUyxDQUFDLElBQUksRUFBRSxtQkFBVSxDQUFDLElBQUksd0JBQVM7WUFDbEUsR0FBRyxDQUFDLFNBQVMsQ0FBQyxnQkFBZ0IsSUFBSTtnQkFDaEMsZ0JBQWdCLEVBQUUsU0FBUyxDQUFDLGdCQUFnQjthQUM3QyxDQUFDO1lBQ0YsSUFBSTtZQUNKLEdBQUcsQ0FBQyxTQUFTLENBQUMsZUFBZSxJQUFJLEVBQUUsZUFBZSxFQUFFLFNBQVMsQ0FBQyxlQUFlLEVBQUUsQ0FBQztTQUNqRixDQUFDO0lBQ0osQ0FBQztJQUVELE1BQU0sQ0FBQyxLQUFLLENBQUMscUJBQXFCLENBQUMsY0FBOEI7UUFDL0QsTUFBTSxNQUFNLEdBQUcsTUFBTSxPQUFPLENBQUMsR0FBRyxDQUFDLGNBQWMsQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLG9CQUFvQixDQUFDLENBQUMsQ0FBQztRQUVoRixPQUFPLE1BQU0sQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUF1QixDQUFDO0lBQ3RELENBQUM7SUFFRCxNQUFNLENBQUMsS0FBSyxDQUFDLGlCQUFpQixDQUM1QixPQUFlLEVBQ2YsSUFBWSxFQUNaLFNBQWlCO1FBRWpCLE1BQU0sVUFBVSxHQUFHLE1BQU0sSUFBSSxDQUFDLDBCQUEwQixDQUFDLE9BQU8sRUFBRSxTQUFTLENBQUMsQ0FBQztRQUU3RSxPQUFPLGtCQUFNLENBQUMsT0FBTyxDQUFDLElBQUksRUFBRSxVQUFVLENBQUMsQ0FBQztJQUMxQyxDQUFDO0lBRVMsTUFBTSxDQUFDLEtBQUssQ0FBQywwQkFBMEIsQ0FDL0MsT0FBZSxFQUNmLFNBQWlCO1FBRWpCLE1BQU0sUUFBUSxHQUFhLElBQUksbUJBQVEsQ0FBQyxPQUFPLENBQUMsQ0FBQztRQUNqRCxNQUFNLEtBQUssR0FBRyxNQUFNLFFBQVEsQ0FBQyxjQUFjLEVBQUUsQ0FBQztRQUU5QyxJQUFJLE1BQU0sQ0FBQyxRQUFRLENBQUMsS0FBSyxDQUFDLEtBQUssQ0FBQyxFQUFFLENBQUM7WUFDakMsTUFBTSxJQUFJLEtBQUssQ0FBQyxvQkFBb0IsQ0FBQyxDQUFDO1FBQ3hDLENBQUM7UUFFRCxNQUFNLEdBQUcsR0FBRyxJQUFJLGNBQUcsQ0FBQyxLQUFLLENBQUMsQ0FBQztRQUMzQixNQUFNLEVBQUUsTUFBTSxFQUFFLEtBQUssRUFBRSxHQUFHLE1BQU0sR0FBRyxDQUFDLGNBQWMsRUFBRSxDQUFDO1FBQ3JELE1BQU0sc0NBQWdCLENBQUMsU0FBUyxDQUFDLEdBQUcsRUFBRSxLQUFLLEVBQUUsTUFBTSxFQUFFLFNBQVMsQ0FBQyxDQUFDO1FBRWhFLHdEQUF3RDtRQUN4RCxPQUFPO1lBQ0wsSUFBSSxFQUFFLHdCQUFlLENBQUMsS0FBSztZQUMzQixHQUFHLEVBQUUsTUFBTTtZQUNYLFFBQVEsRUFBRSxpQkFBUSxDQUFDLE1BQU07U0FDMUIsQ0FBQztJQUNKLENBQUM7Q0FDRjtBQXpFRCx3Q0F5RUMifQ==
|
|
@@ -19,6 +19,7 @@ export declare class BaseConnector {
|
|
|
19
19
|
enabled: boolean;
|
|
20
20
|
} & import("pino").default.ChildLoggerOptions>;
|
|
21
21
|
protected contract?: Contract<typeof abi>;
|
|
22
|
+
protected tokenContract?: Contract<typeof abi>;
|
|
22
23
|
isInitialized(): boolean;
|
|
23
24
|
checkIfInitialized(): void;
|
|
24
25
|
/**
|
|
@@ -26,6 +27,11 @@ export declare class BaseConnector {
|
|
|
26
27
|
* @returns initialized contract
|
|
27
28
|
*/
|
|
28
29
|
getContract(): Contract<typeof abi>;
|
|
30
|
+
/**
|
|
31
|
+
*
|
|
32
|
+
* @returns initialized contract
|
|
33
|
+
*/
|
|
34
|
+
getTokenContract(): Contract<typeof abi>;
|
|
29
35
|
/**
|
|
30
36
|
* Function for connecting to blockchain
|
|
31
37
|
* Used to setting up settings for blockchain connector
|
|
@@ -9,6 +9,7 @@ class BaseConnector {
|
|
|
9
9
|
initialized = false;
|
|
10
10
|
logger = logger_js_1.default.child({ className: this.constructor['name'] });
|
|
11
11
|
contract;
|
|
12
|
+
tokenContract;
|
|
12
13
|
isInitialized() {
|
|
13
14
|
return this.initialized;
|
|
14
15
|
}
|
|
@@ -24,6 +25,14 @@ class BaseConnector {
|
|
|
24
25
|
this.checkIfInitialized();
|
|
25
26
|
return this.contract;
|
|
26
27
|
}
|
|
28
|
+
/**
|
|
29
|
+
*
|
|
30
|
+
* @returns initialized contract
|
|
31
|
+
*/
|
|
32
|
+
getTokenContract() {
|
|
33
|
+
this.checkIfInitialized();
|
|
34
|
+
return this.tokenContract;
|
|
35
|
+
}
|
|
27
36
|
/**
|
|
28
37
|
* Function for connecting to blockchain
|
|
29
38
|
* Used to setting up settings for blockchain connector
|
|
@@ -38,4 +47,4 @@ class BaseConnector {
|
|
|
38
47
|
}
|
|
39
48
|
}
|
|
40
49
|
exports.BaseConnector = BaseConnector;
|
|
41
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
50
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQmFzZUNvbm5lY3Rvci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jb25uZWN0b3JzL0Jhc2VDb25uZWN0b3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQ0EsNkRBQXNDO0FBZ0J0QyxNQUFhLGFBQWE7SUFDZCxXQUFXLEdBQUcsS0FBSyxDQUFDO0lBQ3BCLE1BQU0sR0FBRyxtQkFBVSxDQUFDLEtBQUssQ0FBQyxFQUFFLFNBQVMsRUFBRSxJQUFJLENBQUMsV0FBVyxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUMsQ0FBQztJQUNuRSxRQUFRLENBQXdCO0lBQ2hDLGFBQWEsQ0FBd0I7SUFFeEMsYUFBYTtRQUNsQixPQUFPLElBQUksQ0FBQyxXQUFXLENBQUM7SUFDMUIsQ0FBQztJQUVNLGtCQUFrQjtRQUN2QixJQUFJLENBQUMsSUFBSSxDQUFDLFdBQVc7WUFDbkIsTUFBTSxJQUFJLEtBQUssQ0FDYixHQUFHLElBQUksQ0FBQyxXQUFXLENBQUMsTUFBTSxDQUFDLHNDQUFzQyxJQUFJLENBQUMsV0FBVyxDQUFDLE1BQU0sQ0FBQyw0QkFBNEIsQ0FDdEgsQ0FBQztJQUNOLENBQUM7SUFFRDs7O09BR0c7SUFDSSxXQUFXO1FBQ2hCLElBQUksQ0FBQyxrQkFBa0IsRUFBRSxDQUFDO1FBRTFCLE9BQU8sSUFBSSxDQUFDLFFBQVMsQ0FBQztJQUN4QixDQUFDO0lBRUQ7OztPQUdHO0lBQ0ksZ0JBQWdCO1FBQ3JCLElBQUksQ0FBQyxrQkFBa0IsRUFBRSxDQUFDO1FBRTFCLE9BQU8sSUFBSSxDQUFDLGFBQWMsQ0FBQztJQUM3QixDQUFDO0lBRUQ7Ozs7T0FJRztJQUNJLEtBQUssQ0FBQyxVQUFVLENBQUMsT0FBZSxJQUFrQixDQUFDO0lBRW5ELFFBQVE7UUFDYixJQUFJLElBQUksQ0FBQyxXQUFXLEVBQUUsQ0FBQztZQUNyQixJQUFJLENBQUMsV0FBVyxHQUFHLEtBQUssQ0FBQztZQUN6QixJQUFJLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxHQUFHLElBQUksQ0FBQyxXQUFXLENBQUMsTUFBTSxDQUFDLGVBQWUsQ0FBQyxDQUFDO1FBQ2hFLENBQUM7SUFDSCxDQUFDO0NBQ0Y7QUFsREQsc0NBa0RDIn0=
|
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
import { BaseConnector, Config } from './BaseConnector.js';
|
|
2
|
+
import { Contract } from 'web3';
|
|
2
3
|
import { EventLog } from 'web3-types';
|
|
4
|
+
import { abi } from '../contracts/abi.js';
|
|
3
5
|
import { LogsSubscription } from 'web3-eth-contract';
|
|
4
6
|
export type WssSubscriptionOnDataFn = (event: EventLog) => Promise<void> | void;
|
|
5
7
|
export type WssSubscriptionOnErrorFn = (error: Error) => Promise<void> | void;
|
|
@@ -10,6 +12,7 @@ type SubscribeParams = {
|
|
|
10
12
|
onError: WssSubscriptionOnErrorFn;
|
|
11
13
|
subscription?: LogsSubscription;
|
|
12
14
|
event: string;
|
|
15
|
+
contract?: Contract<typeof abi>;
|
|
13
16
|
};
|
|
14
17
|
export default class BlockchainEventsListener extends BaseConnector {
|
|
15
18
|
private static instance;
|
|
@@ -56,7 +56,7 @@ class BlockchainEventsListener extends BaseConnector_js_1.BaseConnector {
|
|
|
56
56
|
if (this.isSubscribingBlocked) {
|
|
57
57
|
throw Error(`${BlockchainEventsListener.name} instance should be initialized before`);
|
|
58
58
|
}
|
|
59
|
-
const contract = this.getContract();
|
|
59
|
+
const contract = params.contract ?? this.getContract();
|
|
60
60
|
const subscription = contract.events[params.event]();
|
|
61
61
|
const key = uuid.v4();
|
|
62
62
|
this.logger.trace({
|
|
@@ -221,7 +221,9 @@ class BlockchainEventsListener extends BaseConnector_js_1.BaseConnector {
|
|
|
221
221
|
});
|
|
222
222
|
this.contract = new store_js_1.default.web3Wss.eth.Contract(abi_js_1.abi, config.contractAddress, web3Context);
|
|
223
223
|
Superpro_js_1.default.address = config.contractAddress;
|
|
224
|
-
|
|
224
|
+
const tokenAddress = await Superpro_js_1.default.getTokenAddress(this.contract);
|
|
225
|
+
this.tokenContract = new store_js_1.default.web3Wss.eth.Contract(abi_js_1.abi, tokenAddress, web3Context);
|
|
226
|
+
SuperproToken_js_1.default.addressWss = tokenAddress;
|
|
225
227
|
this.initialized = true;
|
|
226
228
|
this.logger.trace('Initialized');
|
|
227
229
|
}
|
|
@@ -239,4 +241,4 @@ class BlockchainEventsListener extends BaseConnector_js_1.BaseConnector {
|
|
|
239
241
|
}
|
|
240
242
|
}
|
|
241
243
|
exports.default = BlockchainEventsListener;
|
|
242
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
244
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"BlockchainEventsListener.js","sourceRoot":"","sources":["../../../src/connectors/BlockchainEventsListener.ts"],"names":[],"mappings":"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"}
|