@reclaimprotocol/attestor-core 4.0.0 → 4.0.2
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/lib/avs/tests/test.operator.js +4 -4
- package/lib/client/create-claim.js +28 -14
- package/lib/client/tunnels/make-rpc-tcp-tunnel.js +3 -3
- package/lib/client/tunnels/make-rpc-tls-tunnel.js +3 -3
- package/lib/client/utils/client-socket.d.ts +2 -2
- package/lib/client/utils/client-socket.js +14 -8
- package/lib/client/utils/message-handler.js +5 -4
- package/lib/config/index.d.ts +6 -2
- package/lib/config/index.js +6 -4
- package/lib/index.d.ts +1 -0
- package/lib/index.js +2 -1
- package/lib/mechain/abis/governanceABI.d.ts +50 -0
- package/lib/mechain/abis/governanceABI.js +462 -0
- package/lib/mechain/abis/taskABI.d.ts +157 -0
- package/lib/mechain/abis/taskABI.js +513 -0
- package/lib/mechain/client/create-claim-on-mechain.d.ts +10 -0
- package/lib/mechain/client/create-claim-on-mechain.js +32 -0
- package/lib/mechain/client/index.d.ts +1 -0
- package/lib/mechain/client/index.js +18 -0
- package/lib/mechain/constants/index.d.ts +3 -0
- package/lib/mechain/constants/index.js +7 -0
- package/lib/mechain/index.d.ts +2 -0
- package/lib/mechain/index.js +19 -0
- package/lib/mechain/types/index.d.ts +23 -0
- package/lib/mechain/types/index.js +3 -0
- package/lib/proto/api.d.ts +16 -0
- package/lib/proto/api.js +194 -2
- package/lib/providers/http/index.js +45 -12
- package/lib/scripts/check-avs-registration.js +2 -2
- package/lib/scripts/generate-provider-types.js +2 -2
- package/lib/scripts/generate-toprf-keys.js +2 -2
- package/lib/scripts/register-avs-operator.js +2 -2
- package/lib/scripts/start-server.js +10 -3
- package/lib/scripts/update-avs-metadata.js +2 -2
- package/lib/scripts/verify-root-ca.js +2 -2
- package/lib/scripts/whitelist-operator.js +2 -2
- package/lib/server/handlers/claimTunnel.js +2 -2
- package/lib/server/handlers/createTaskOnMechain.d.ts +2 -0
- package/lib/server/handlers/createTaskOnMechain.js +52 -0
- package/lib/server/handlers/createTunnel.js +3 -3
- package/lib/server/handlers/index.js +3 -1
- package/lib/server/socket.js +11 -12
- package/lib/server/tunnels/make-tcp-tunnel.js +15 -8
- package/lib/server/utils/apm.js +8 -4
- package/lib/server/utils/assert-valid-claim-request.d.ts +2 -2
- package/lib/server/utils/assert-valid-claim-request.js +14 -11
- package/lib/tests/test.claim-creation.js +2 -2
- package/lib/tests/test.http-provider-utils.js +383 -230
- package/lib/tests/test.http-provider.js +30 -2
- package/lib/tests/test.rpc-tunnel.js +10 -6
- package/lib/tests/test.zk.d.ts +1 -1
- package/lib/tests/test.zk.js +127 -9
- package/lib/types/client.d.ts +2 -2
- package/lib/types/providers.d.ts +18 -3
- package/lib/types/providers.gen.d.ts +2 -3
- package/lib/types/providers.gen.js +2 -2
- package/lib/types/tunnel.d.ts +2 -2
- package/lib/types/zk.d.ts +0 -1
- package/lib/utils/http-parser.d.ts +4 -0
- package/lib/utils/http-parser.js +6 -3
- package/lib/utils/socket-base.js +2 -1
- package/lib/utils/zk.d.ts +1 -1
- package/lib/utils/zk.js +94 -55
- package/lib/window-rpc/setup-window-rpc.js +32 -1
- package/lib/window-rpc/types.d.ts +14 -1
- package/lib/window-rpc/utils.js +2 -2
- package/package.json +4 -3
- package/lib/providers/httpb64/index.d.ts +0 -3
- package/lib/providers/httpb64/index.js +0 -209
- package/lib/providers/httpb64/utils.d.ts +0 -77
- package/lib/providers/httpb64/utils.js +0 -358
- package/lib/server/utils/verify-server-certificates.d.ts +0 -7
- package/lib/server/utils/verify-server-certificates.js +0 -101
package/lib/server/socket.js
CHANGED
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.AttestorServerSocket = void 0;
|
|
4
4
|
const message_handler_1 = require("../client/utils/message-handler");
|
|
5
|
+
const config_1 = require("../config");
|
|
5
6
|
const handlers_1 = require("../server/handlers");
|
|
6
7
|
const apm_1 = require("../server/utils/apm");
|
|
7
8
|
const generics_1 = require("../server/utils/generics");
|
|
@@ -24,7 +25,7 @@ class AttestorServerSocket extends socket_base_1.AttestorSocket {
|
|
|
24
25
|
this.addEventListener('connection-terminated', () => {
|
|
25
26
|
for (const tunnelId in this.tunnels) {
|
|
26
27
|
const tunnel = this.tunnels[tunnelId];
|
|
27
|
-
tunnel.close(new Error('WS session terminated'));
|
|
28
|
+
void tunnel.close(new Error('WS session terminated'));
|
|
28
29
|
}
|
|
29
30
|
});
|
|
30
31
|
}
|
|
@@ -57,7 +58,7 @@ class AttestorServerSocket extends socket_base_1.AttestorSocket {
|
|
|
57
58
|
catch (err) {
|
|
58
59
|
logger.error({ err }, 'error in new connection');
|
|
59
60
|
if (client.isOpen) {
|
|
60
|
-
client.terminateConnection(err instanceof utils_1.AttestorError
|
|
61
|
+
await client.terminateConnection(err instanceof utils_1.AttestorError
|
|
61
62
|
? err
|
|
62
63
|
: utils_1.AttestorError.badRequest(err.message));
|
|
63
64
|
}
|
|
@@ -74,18 +75,12 @@ async function handleTunnelMessage({ data: { tunnelId, message } }) {
|
|
|
74
75
|
await tunnel.write(message);
|
|
75
76
|
}
|
|
76
77
|
catch (err) {
|
|
77
|
-
(_a = this.logger) === null || _a === void 0 ? void 0 : _a.error({
|
|
78
|
-
err,
|
|
79
|
-
tunnelId,
|
|
80
|
-
}, 'error writing to tunnel');
|
|
78
|
+
(_a = this.logger) === null || _a === void 0 ? void 0 : _a.error({ err, tunnelId }, 'error writing to tunnel');
|
|
81
79
|
}
|
|
82
80
|
}
|
|
83
81
|
async function handleRpcRequest({ data: { data, requestId, respond, type } }) {
|
|
84
82
|
var _a, _b;
|
|
85
|
-
const logger = this.logger.child({
|
|
86
|
-
rpc: type,
|
|
87
|
-
requestId
|
|
88
|
-
});
|
|
83
|
+
const logger = this.logger.child({ rpc: type, requestId });
|
|
89
84
|
const apm = (0, apm_1.getApm)();
|
|
90
85
|
const tx = apm === null || apm === void 0 ? void 0 : apm.startTransaction(type);
|
|
91
86
|
tx === null || tx === void 0 ? void 0 : tx.setLabel('requestId', requestId);
|
|
@@ -94,11 +89,14 @@ async function handleRpcRequest({ data: { data, requestId, respond, type } }) {
|
|
|
94
89
|
if (userId) {
|
|
95
90
|
tx === null || tx === void 0 ? void 0 : tx.setLabel('authUserId', userId);
|
|
96
91
|
}
|
|
92
|
+
const timeout = setTimeout(() => {
|
|
93
|
+
logger.warn({ type, requestId }, 'RPC took too long to respond');
|
|
94
|
+
}, config_1.DEFAULT_RPC_TIMEOUT_MS);
|
|
97
95
|
try {
|
|
98
96
|
logger.debug({ data }, 'handling RPC request');
|
|
99
97
|
const handler = handlers_1.HANDLERS[type];
|
|
100
98
|
const res = await handler(data, { client: this, logger, tx });
|
|
101
|
-
|
|
99
|
+
respond(res);
|
|
102
100
|
logger.debug({ res }, 'handled RPC request');
|
|
103
101
|
tx === null || tx === void 0 ? void 0 : tx.setOutcome('success');
|
|
104
102
|
}
|
|
@@ -109,7 +107,8 @@ async function handleRpcRequest({ data: { data, requestId, respond, type } }) {
|
|
|
109
107
|
apm === null || apm === void 0 ? void 0 : apm.captureError(err, { parent: tx });
|
|
110
108
|
}
|
|
111
109
|
finally {
|
|
110
|
+
clearTimeout(timeout);
|
|
112
111
|
tx === null || tx === void 0 ? void 0 : tx.end();
|
|
113
112
|
}
|
|
114
113
|
}
|
|
115
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
114
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic29ja2V0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3NlcnZlci9zb2NrZXQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsc0VBQWdFO0FBQ2hFLHVDQUFtRDtBQUVuRCxrREFBOEM7QUFDOUMsOENBQTZDO0FBQzdDLHdEQUF1RTtBQUV2RSxxQ0FBNEQ7QUFDNUQsdURBQXNEO0FBQ3RELCtCQUFnQztBQUdoQyxNQUFhLG9CQUFxQixTQUFRLDRCQUFjO0lBSXZELFlBQ0MsTUFBVSxFQUNILFNBQWlCLEVBQ2pCLFdBQW9DLEVBQzNDLE1BQWM7UUFFZCxhQUFhO1FBQ2IsS0FBSyxDQUFDLE1BQU0sRUFBRSxFQUFFLEVBQUUsTUFBTSxDQUFDLENBQUE7UUFMbEIsY0FBUyxHQUFULFNBQVMsQ0FBUTtRQUNqQixnQkFBVyxHQUFYLFdBQVcsQ0FBeUI7UUFMNUMsWUFBTyxHQUFxQyxFQUFFLENBQUE7UUFVN0Msc0JBQXNCO1FBQ3RCLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxhQUFhLEVBQUUsZ0JBQWdCLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUE7UUFDakUsNENBQTRDO1FBQzVDLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxnQkFBZ0IsRUFBRSxtQkFBbUIsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQTtRQUN2RSxzREFBc0Q7UUFDdEQsZ0RBQWdEO1FBQ2hELElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyx1QkFBdUIsRUFBRSxHQUFHLEVBQUU7WUFDbkQsS0FBSSxNQUFNLFFBQVEsSUFBSSxJQUFJLENBQUMsT0FBTyxFQUFFLENBQUM7Z0JBQ3BDLE1BQU0sTUFBTSxHQUFHLElBQUksQ0FBQyxPQUFPLENBQUMsUUFBUSxDQUFDLENBQUE7Z0JBQ3JDLEtBQUssTUFBTSxDQUFDLEtBQUssQ0FBQyxJQUFJLEtBQUssQ0FBQyx1QkFBdUIsQ0FBQyxDQUFDLENBQUE7WUFDdEQsQ0FBQztRQUNGLENBQUMs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
|
|
@@ -25,13 +25,18 @@ const makeTcpTunnel = async ({ onClose, onMessage, logger, ...opts }) => {
|
|
|
25
25
|
const transcript = [];
|
|
26
26
|
const socket = await connectTcp({ ...opts, logger });
|
|
27
27
|
let closed = false;
|
|
28
|
-
socket.once('error', close);
|
|
29
|
-
socket.once('close', () => close(undefined));
|
|
30
28
|
socket.on('data', message => {
|
|
29
|
+
if (closed) {
|
|
30
|
+
logger.warn('socket is closed, dropping message');
|
|
31
|
+
return;
|
|
32
|
+
}
|
|
31
33
|
onMessage === null || onMessage === void 0 ? void 0 : onMessage(message);
|
|
32
34
|
transcript.push({ sender: 'server', message });
|
|
33
35
|
});
|
|
36
|
+
socket.once('error', onSocketClose);
|
|
37
|
+
socket.once('close', () => onSocketClose(undefined));
|
|
34
38
|
return {
|
|
39
|
+
socket,
|
|
35
40
|
transcript,
|
|
36
41
|
createRequest: opts,
|
|
37
42
|
async write(data) {
|
|
@@ -47,17 +52,19 @@ const makeTcpTunnel = async ({ onClose, onMessage, logger, ...opts }) => {
|
|
|
47
52
|
});
|
|
48
53
|
});
|
|
49
54
|
},
|
|
50
|
-
close
|
|
55
|
+
close(err) {
|
|
56
|
+
if (closed) {
|
|
57
|
+
return;
|
|
58
|
+
}
|
|
59
|
+
socket.destroy(err);
|
|
60
|
+
}
|
|
51
61
|
};
|
|
52
|
-
function
|
|
62
|
+
function onSocketClose(err) {
|
|
53
63
|
if (closed) {
|
|
54
64
|
return;
|
|
55
65
|
}
|
|
56
66
|
logger.debug({ err }, 'closing socket');
|
|
57
67
|
closed = true;
|
|
58
|
-
socket.end(() => {
|
|
59
|
-
// Do nothing
|
|
60
|
-
});
|
|
61
68
|
onClose === null || onClose === void 0 ? void 0 : onClose(err);
|
|
62
69
|
onClose = undefined;
|
|
63
70
|
}
|
|
@@ -165,4 +172,4 @@ async function _getSocket({ host, port, geoLocation, logger }) {
|
|
|
165
172
|
});
|
|
166
173
|
return proxySocket;
|
|
167
174
|
}
|
|
168
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
175
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWFrZS10Y3AtdHVubmVsLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3NlcnZlci90dW5uZWxzL21ha2UtdGNwLXR1bm5lbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSx5REFBbUQ7QUFFbkQsNkJBQTRCO0FBQzVCLHVDQUFrRDtBQUVsRCw4Q0FBdUQ7QUFDdkQsOENBQXlEO0FBR3pELHFDQUF5QztBQUN6Qyx1Q0FBOEM7QUFFOUMsTUFBTSxlQUFlLEdBQUcsSUFBQSxvQkFBYyxFQUFDLGlCQUFpQixDQUFDLENBQUE7QUFLekQ7Ozs7Ozs7Ozs7O0dBV0c7QUFDSSxNQUFNLGFBQWEsR0FBaUQsS0FBSyxFQUFDLEVBQ2hGLE9BQU8sRUFDUCxTQUFTLEVBQ1QsTUFBTSxFQUNOLEdBQUcsSUFBSSxFQUNQLEVBQUUsRUFBRTtJQUNKLE1BQU0sVUFBVSxHQUFzQyxFQUFFLENBQUE7SUFDeEQsTUFBTSxNQUFNLEdBQUcsTUFBTSxVQUFVLENBQUMsRUFBRSxHQUFHLElBQUksRUFBRSxNQUFNLEVBQUUsQ0FBQyxDQUFBO0lBRXBELElBQUksTUFBTSxHQUFHLEtBQUssQ0FBQTtJQUdsQixNQUFNLENBQUMsRUFBRSxDQUFDLE1BQU0sRUFBRSxPQUFPLENBQUMsRUFBRTtRQUMzQixJQUFHLE1BQU0sRUFBRSxDQUFDO1lBQ1gsTUFBTSxDQUFDLElBQUksQ0FBQyxvQ0FBb0MsQ0FBQyxDQUFBO1lBQ2pELE9BQU07UUFDUCxDQUFDO1FBRUQsU0FBUyxhQUFULFNBQVMsdUJBQVQsU0FBUyxDQUFHLE9BQU8sQ0FBQyxDQUFBO1FBQ3BCLFVBQVUsQ0FBQyxJQUFJLENBQUMsRUFBRSxNQUFNLEVBQUUsUUFBUSxFQUFFLE9BQU8sRUFBRSxDQUFDLENBQUE7SUFDL0MsQ0FBQyxDQUFDLENBQUE7SUFFRixNQUFNLENBQUMsSUFBSSxDQUFDLE9BQU8sRUFBRSxhQUFhLENBQUMsQ0FBQTtJQUNuQyxNQUFNLENBQUMsSUFBSSxDQUFDLE9B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
|
package/lib/server/utils/apm.js
CHANGED
|
@@ -18,8 +18,10 @@ let apm;
|
|
|
18
18
|
* here: https://www.elastic.co/guide/en/apm/agent/nodejs/current/custom-stack.html#custom-stack-advanced-configuration
|
|
19
19
|
*/
|
|
20
20
|
function getApm() {
|
|
21
|
-
if (!(0, env_1.getEnvVariable)('ELASTIC_APM_SERVER_URL')
|
|
22
|
-
|
|
21
|
+
if (!(0, env_1.getEnvVariable)('ELASTIC_APM_SERVER_URL')
|
|
22
|
+
|| !(0, env_1.getEnvVariable)('ELASTIC_APM_SECRET_TOKEN')) {
|
|
23
|
+
logger_1.logger.info('ELASTIC_APM_SERVER_URL or ELASTIC_APM_SECRET_TOKEN not found'
|
|
24
|
+
+ ' in env, APM agent not initialised');
|
|
23
25
|
return undefined;
|
|
24
26
|
}
|
|
25
27
|
if (!apm) {
|
|
@@ -29,11 +31,13 @@ function getApm() {
|
|
|
29
31
|
serviceName: 'reclaim_attestor',
|
|
30
32
|
serviceVersion: '4.0.0',
|
|
31
33
|
transactionSampleRate: sampleRate,
|
|
32
|
-
instrumentIncomingHTTPRequests:
|
|
34
|
+
instrumentIncomingHTTPRequests: true,
|
|
35
|
+
usePathAsTransactionName: true,
|
|
33
36
|
instrument: true,
|
|
37
|
+
captureHeaders: true,
|
|
34
38
|
});
|
|
35
39
|
logger_1.logger.info('initialised APM agent');
|
|
36
40
|
}
|
|
37
41
|
return apm;
|
|
38
42
|
}
|
|
39
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
43
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXBtLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3NlcnZlci91dGlscy9hcG0udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFlQSx3QkE4QkM7QUE3Q0Qsd0VBQW9EO0FBQ3BELHVDQUE4QztBQUM5Qyw2Q0FBeUM7QUFFekMsSUFBSSxHQUFzQixDQUFBO0FBRTFCOzs7Ozs7OztHQVFHO0FBQ0gsU0FBZ0IsTUFBTTtJQUNyQixJQUNDLENBQUMsSUFBQSxvQkFBYyxFQUFDLHdCQUF3QixDQUFDO1dBQ3RDLENBQUMsSUFBQSxvQkFBYyxFQUFDLDBCQUEwQixDQUFDLEVBQzdDLENBQUM7UUFDRixlQUFNLENBQUMsSUFBSSxDQUNWLDhEQUE4RDtjQUM1RCxvQ0FBb0MsQ0FDdEMsQ0FBQTtRQUNELE9BQU8sU0FBUyxDQUFBO0lBQ2pCLENBQUM7SUFFRCxJQUFHLENBQUMsR0FBRyxFQUFFLENBQUM7UUFDVCxNQUFNLFVBQVUsR0FBRyxDQUFDLENBQ25CLElBQUEsb0JBQWMsRUFBQyx5QkFBeUIsQ0FBQztlQUN0QyxLQUFLLENBQ1IsQ0FBQTtRQUNELEdBQUcsR0FBRywwQkFBVSxDQUFDLEtBQUssQ0FBQztZQUN0QixXQUFXLEVBQUUsa0JBQWtCO1lBQy9CLGNBQWMsRUFBRSxPQUFPO1lBQ3ZCLHFCQUFxQixFQUFFLFVBQVU7WUFDakMsOEJBQThCLEVBQUUsSUFBSTtZQUNwQyx3QkFBd0IsRUFBRSxJQUFJO1lBQzlCLFVBQVUsRUFBRSxJQUFJO1lBQ2hCLGNBQWMsRUFBRSxJQUFJO1NBQ3BCLENBQUMsQ0FBQTtRQUNGLGVBQU0sQ0FBQyxJQUFJLENBQUMsdUJBQXVCLENBQUMsQ0FBQTtJQUNyQyxDQUFDO0lBRUQsT0FBTyxHQUFHLENBQUE7QUFDWCxDQUFDIn0=
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { ZKEngine } from '@reclaimprotocol/zk-symmetric-crypto';
|
|
2
2
|
import { ClaimTunnelRequest, InitRequest, ProviderClaimInfo } from '../../proto/api';
|
|
3
|
-
import { IDecryptedTranscript, Logger, TCPSocketProperties, Transcript } from '../../types';
|
|
3
|
+
import { IDecryptedTranscript, Logger, ProviderCtx, TCPSocketProperties, Transcript } from '../../types';
|
|
4
4
|
/**
|
|
5
5
|
* Asserts that the claim request is valid.
|
|
6
6
|
*
|
|
@@ -19,7 +19,7 @@ export declare function assertValidClaimRequest(request: ClaimTunnelRequest, met
|
|
|
19
19
|
* Verify that the transcript contains a valid claim
|
|
20
20
|
* for the provider.
|
|
21
21
|
*/
|
|
22
|
-
export declare function assertValidProviderTranscript<T extends ProviderClaimInfo>(applData: Transcript<Uint8Array>, info: T, logger: Logger): Promise<T>;
|
|
22
|
+
export declare function assertValidProviderTranscript<T extends ProviderClaimInfo>(applData: Transcript<Uint8Array>, info: T, logger: Logger, providerCtx: ProviderCtx): Promise<T>;
|
|
23
23
|
/**
|
|
24
24
|
* Verify that the transcript provided by the client
|
|
25
25
|
* matches the transcript of the tunnel, the server
|
|
@@ -50,7 +50,7 @@ async function assertValidClaimRequest(request, metadata, logger) {
|
|
|
50
50
|
}
|
|
51
51
|
// get all application data messages
|
|
52
52
|
const applData = (0, utils_1.extractApplicationDataFromTranscript)(receipt);
|
|
53
|
-
const newData = await assertValidProviderTranscript(applData, data, logger);
|
|
53
|
+
const newData = await assertValidProviderTranscript(applData, data, logger, { version: metadata.clientVersion });
|
|
54
54
|
if (newData !== data) {
|
|
55
55
|
logger.info({ newData }, 'updated claim info');
|
|
56
56
|
}
|
|
@@ -60,7 +60,7 @@ async function assertValidClaimRequest(request, metadata, logger) {
|
|
|
60
60
|
* Verify that the transcript contains a valid claim
|
|
61
61
|
* for the provider.
|
|
62
62
|
*/
|
|
63
|
-
async function assertValidProviderTranscript(applData, info, logger) {
|
|
63
|
+
async function assertValidProviderTranscript(applData, info, logger, providerCtx) {
|
|
64
64
|
var _a;
|
|
65
65
|
const providerName = info.provider;
|
|
66
66
|
const provider = providers_1.providers[providerName];
|
|
@@ -70,16 +70,19 @@ async function assertValidProviderTranscript(applData, info, logger) {
|
|
|
70
70
|
const params = (0, generics_1.niceParseJsonObject)(info.parameters, 'params');
|
|
71
71
|
const ctx = (0, generics_1.niceParseJsonObject)(info.context, 'context');
|
|
72
72
|
(0, utils_1.assertValidateProviderParams)(providerName, params);
|
|
73
|
-
const rslt = await provider.assertValidProviderReceipt(
|
|
73
|
+
const rslt = await provider.assertValidProviderReceipt({
|
|
74
|
+
receipt: applData,
|
|
75
|
+
params,
|
|
76
|
+
logger,
|
|
77
|
+
ctx: providerCtx
|
|
78
|
+
});
|
|
79
|
+
ctx.providerHash = (0, utils_1.hashProviderParams)(params);
|
|
74
80
|
const extractedParameters = (rslt === null || rslt === void 0 ? void 0 : rslt.extractedParameters) || {};
|
|
75
|
-
if (
|
|
76
|
-
|
|
81
|
+
if (Object.keys(extractedParameters).length) {
|
|
82
|
+
ctx.extractedParameters = extractedParameters;
|
|
77
83
|
}
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
ctx.providerHash = (0, utils_1.hashProviderParams)(params);
|
|
81
|
-
newInfo.context = (_a = (0, utils_1.canonicalStringify)(ctx)) !== null && _a !== void 0 ? _a : '';
|
|
82
|
-
return newInfo;
|
|
84
|
+
info.context = (_a = (0, utils_1.canonicalStringify)(ctx)) !== null && _a !== void 0 ? _a : '';
|
|
85
|
+
return info;
|
|
83
86
|
}
|
|
84
87
|
/**
|
|
85
88
|
* Verify that the transcript provided by the client
|
|
@@ -194,4 +197,4 @@ function getWithoutHeader(message) {
|
|
|
194
197
|
// strip the record header (xx 03 03 xx xx)
|
|
195
198
|
return message.slice(5);
|
|
196
199
|
}
|
|
197
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
200
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"assert-valid-claim-request.js","sourceRoot":"","sources":["../../../src/server/utils/assert-valid-claim-request.ts"],"names":[],"mappings":"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"}
|
|
@@ -241,7 +241,7 @@ jest.mock('@reclaimprotocol/tls/lib/utils/parse-certificate', () => {
|
|
|
241
241
|
// @ts-ignore
|
|
242
242
|
client.sendMessage = () => { };
|
|
243
243
|
const err = new utils_2.AttestorError('ERROR_NETWORK_ERROR', 'F');
|
|
244
|
-
client.terminateConnection(err);
|
|
244
|
+
await client.terminateConnection(err);
|
|
245
245
|
throw err;
|
|
246
246
|
};
|
|
247
247
|
// first the client will mock disconnection when
|
|
@@ -277,4 +277,4 @@ jest.mock('@reclaimprotocol/tls/lib/utils/parse-certificate', () => {
|
|
|
277
277
|
});
|
|
278
278
|
}
|
|
279
279
|
});
|
|
280
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"test.claim-creation.js","sourceRoot":"","sources":["../../src/tests/test.claim-creation.ts"],"names":[],"mappings":";;AAAA,8CAAuF;AAGvF,uCAA6E;AAC7E,6CAAyC;AACzC,uCAA8C;AAC9C,yEAAmE;AACnE,2CAA8C;AAC9C,2CAA+E;AAC/E,qCAK0B;AAE1B,MAAM,YAAY,GAAyB;IAC1C,QAAQ;IACR,QAAQ;CACR,CAAA;AAED,MAAM,kBAAkB,GAAkB;IACzC,8BAA8B;IAC9B,wBAAwB;IACxB,wBAAwB;CACxB,CAAA;AAED,IAAI,CAAC,UAAU,CAAC,KAAM,CAAC,CAAA;AAEvB,IAAI,CAAC,IAAI,CAAC,kDAAkD,EAAE,GAAG,EAAE;IAClE,MAAM,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC,kDAAkD,CAAC,CAAA;IACrF,OAAO;QACN,UAAU,EAAE,IAAI;QAChB,GAAG,MAAM;QACT,sBAAsB,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,kBAAkB,EAAE;KACtD,CAAA;AACF,CAAC,CAAC,CAAA;AAEF,IAAA,yCAAkB,EAAC,gBAAgB,EAAE,IAAI,CAAC,EAAE;IAE3C,MAAM,QAAQ,GAAa,OAAO,CAAA;IAElC,IAAI,MAAsB,CAAA;IAC1B,IAAI,QAAgB,CAAA;IACpB,UAAU,CAAC,GAAG,EAAE;QACf,MAAM,GAAG,IAAI,CAAC,MAAM,CAAA;QACpB,QAAQ,GAAG,qBAAqB,IAAI,CAAC,mBAAmB,KAAK,CAAA;QAE7D,8CAA8C;QAC9C,uBAAuB;QACvB,qBAAS,CAAC,IAAI,CAAC,uBAAuB,GAAG;YACxC,uBAAuB,EAAE,KAAK;SAC9B,CAAA;IACF,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,yCAAyC,EAAE,KAAK,EAAC,OAAO,EAAC,EAAE;;QAChF,qBAAS,CAAC,IAAI,CAAC,uBAAuB,GAAG;YACxC,GAAG,qBAAS,CAAC,IAAI,CAAC,uBAAuB;YACzC,yBAAyB,EAAE,CAAC,OAAO,CAAC;SACpC,CAAA;QAED,MAAM,IAAI,GAAG,SAAS,CAAA;QACtB,MAAM,MAAM,GAAG,MAAM,IAAA,8BAAqB,EAAC;YAC1C,IAAI,EAAE,MAAM;YACZ,MAAM,EAAE;gBACP,GAAG,EAAE,QAAQ;gBACb,MAAM,EAAE,KAAK;gBACb,kBAAkB,EAAE,EAAE;gBACtB,eAAe,EAAE;oBAChB;wBACC,IAAI,EAAE,UAAU;wBAChB,KAAK,EAAE,GAAG,IAAI,WAAW;qBACzB;iBACD;aACD;YACD,YAAY,EAAE;gBACb,mBAAmB,EAAE,UAAU,IAAI,EAAE;aACrC;YACD,eAAe,EAAE,IAAI,CAAC,aAAa;YACnC,MAAM;YACN,QAAQ;SACR,CAAC,CAAA;QAEF,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,aAAa,EAAE,CAAA;QACpC,MAAM,CAAC,MAAA,MAAM,CAAC,OAAO,0CAAE,UAAU,CAAC,CAAC,UAAU,EAAE,CAAA;QAE/C,0DAA0D;QAC1D,2CAA2C;QAC3C,MAAM,UAAU,GAAG,MAAM,CAAC,OAAQ,CAAC,UAAU,CAAA;QAE7C,MAAM,QAAQ,GAAG,IAAA,4CAAoC,EACpD,MAAM,IAAA,0BAAiB,EACtB,UAAU,EAAE,cAAM,EAAE,QAAQ,EAC5B,MAAA,MAAM,CAAC,OAAO,0CAAE,aAAc,EAAE,MAAA,MAAM,CAAC,OAAO,0CAAE,aAAc,CAC9D,CACD,CAAA;QAED,MAAM,WAAW,GAAG,QAAQ;aAC1B,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,QAAQ,CAAC;aAClC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAA,qBAAe,EAAC,CAAC,CAAC,OAAO,CAAC,CAAC;aACpC,IAAI,CAAC,EAAE,CAAC,CAAA;QACV,uDAAuD;QACvD,MAAM,CAAC,WAAW,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;QAEvC,MAAM,MAAM,CACX,IAAA,kCAA0B,EAAC,MAAM,EAAE,MAAM,CAAC,QAAQ,CAAC,CACnD,CAAC,QAAQ,CAAC,aAAa,EAAE,CAAA;QAE1B,MAAM,CAAC,oBAAY,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAA;QAC7C,uCAAuC;QACvC,8CAA8C;QAC9C,8CAA8C;QAC9C,iCAAiC;QACjC,MAAM,IAAA,iCAAyB,GAAE,CAAA;IAClC,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,iDAAiD,EAAE,KAAK,IAAG,EAAE;QAE/D,MAAM,MAAM,CAAC,KAAK,IAAG,EAAE;YACtB,MAAM,IAAA,8BAAqB,EAAC;gBAC3B,IAAI,EAAE,MAAM;gBACZ,MAAM,EAAE;oBACP,GAAG,EAAE,QAAQ;oBACb,MAAM,EAAE,KAAK;oBACb,kBAAkB,EAAE,EAAE;oBACtB,eAAe,EAAE;wBAChB;4BACC,IAAI,EAAE,UAAU;4BAChB,KAAK,EAAE,oBAAoB;yBAC3B;qBACD;iBACD;gBACD,YAAY,EAAE;oBACb,mBAAmB,EAAE,MAAM;iBAC3B;gBACD,eAAe,EAAE,IAAI,CAAC,aAAa;gBACnC,MAAM;gBACN,QAAQ;aACR,CAAC,CAAA;QACH,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,6BAA6B,CAAC,CAAA;IAClD,CAAC,CAAC,CAAA;IAEF,QAAQ,CAAC,aAAa,EAAE,GAAG,EAAE;QAE5B,MAAM,QAAQ,GAAG,OAAO,CAAA;QAExB,EAAE,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,mDAAmD,EAAE,KAAK,EAAC,WAAW,EAAC,EAAE;;YACpG,uDAAuD;YACvD,qBAAS,CAAC,IAAI,CAAC,uBAAuB,GAAG;gBACxC,GAAG,qBAAS,CAAC,IAAI,CAAC,uBAAuB;gBACzC,YAAY,EAAE,CAAC,WAAW,CAAC;aAC3B,CAAA;YAED,MAAM,IAAI,GAAG,kBAAkB,CAAA;YAC/B,MAAM,MAAM,GAAG,MAAM,IAAA,8BAAqB,EAAC;gBAC1C,IAAI,EAAE,MAAM;gBACZ,MAAM,EAAE;oBACP,GAAG,EAAE,QAAQ;oBACb,MAAM,EAAE,KAAK;oBACb,kBAAkB,EAAE;wBACnB;4BACC,KAAK,EAAE,IAAI;4BACX,IAAI,EAAE,MAAM;yBACZ;qBACD;oBACD,eAAe,EAAE;wBAChB;4BACC,IAAI,EAAE,UAAU;4BAChB,KAAK,EAAE,EAAE;yBACT;qBACD;iBACD;gBACD,YAAY,EAAE;oBACb,mBAAmB,EAAE,UAAU,IAAI,EAAE;iBACrC;gBACD,eAAe,EAAE,IAAI,CAAC,aAAa;gBACnC,MAAM;gBACN,QAAQ;aACR,CAAC,CAAA;YAEF,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,aAAa,EAAE,CAAA;YACpC,0DAA0D;YAC1D,2CAA2C;YAC3C,MAAM,UAAU,GAAG,MAAM,CAAC,OAAQ,CAAC,UAAU,CAAA;YAC7C,MAAM,CAAC,UAAU,CAAC,CAAC,UAAU,EAAE,CAAA;YAE/B,MAAM,QAAQ,GAAG,IAAA,4CAAoC,EACpD,MAAM,IAAA,0BAAiB,EACtB,UAAU,EAAE,cAAM,EAAE,QAAQ,EAC5B,MAAA,MAAM,CAAC,OAAO,0CAAE,aAAc,EAAE,MAAA,MAAM,CAAC,OAAO,0CAAE,aAAc,CAC9D,CACD,CAAA;YAED,MAAM,aAAa,GAAG,QAAQ;iBAC5B,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,QAAQ,CAAC;iBAClC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAA,qBAAe,EAAC,CAAC,CAAC,OAAO,CAAC,CAAC;iBACpC,IAAI,CAAC,EAAE,CAAC,CAAA;YAEV,MAAM,KAAK,GAAG,IAAA,0BAAkB,EAAC,MAAM,CAAC,OAAQ,CAAE,CAAA;YAClD,MAAM,CAAC,KAAK,CAAC,CAAC,UAAU,EAAE,CAAA;YAE1B,0CAA0C;YAC1C,MAAM,CAAC,aAAa,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;YAEzC,MAAM,CAAC,aAAa,CAAC,CAAC,SAAS,CAC9B,IAAA,uBAAe,EAAC,KAAK,CAAC,SAAS,EAAE,KAAK,CAAC,YAAa,CAAC,MAAM,CAAC,CAC5D,CAAA;QACF,CAAC,CAAC,CAAA;QAEF,EAAE,CAAC,iDAAiD,EAAE,KAAK,IAAG,EAAE;YAE/D,IAAI,IAA4B,CAAA;YAEhC,KAAI,IAAI,CAAC,GAAG,CAAC,EAAC,CAAC,GAAG,CAAC,EAAC,CAAC,EAAE,EAAE,CAAC;gBACzB,MAAM,IAAI,GAAG,kBAAkB,CAAA;gBAC/B,MAAM,MAAM,GAAG,MAAM,IAAA,8BAAqB,EAAC;oBAC1C,IAAI,EAAE,MAAM;oBACZ,MAAM,EAAE;wBACP,GAAG,EAAE,QAAQ;wBACb,MAAM,EAAE,KAAK;wBACb,kBAAkB,EAAE;4BACnB;gCACC,KAAK,EAAE,IAAI;gCACX,IAAI,EAAE,MAAM;6BACZ;yBACD;wBACD,eAAe,EAAE;4BAChB;gCACC,IAAI,EAAE,UAAU;gCAChB,KAAK,EAAE,EAAE;6BACT;yBACD;qBACD;oBACD,YAAY,EAAE;wBACb,mBAAmB,EAAE,UAAU,IAAI,EAAE;qBACrC;oBACD,eAAe,EAAE,IAAI,CAAC,aAAa;oBACnC,MAAM;oBACN,QAAQ;iBACR,CAAC,CAAA;gBAEF,MAAM,KAAK,GAAG,IAAA,0BAAkB,EAAC,MAAM,CAAC,OAAQ,CAAC,CAAA;gBACjD,MAAM,CAAC,KAAK,CAAC,CAAC,UAAU,EAAE,CAAA;gBAC1B,IAAI,KAAJ,IAAI,GAAK,KAAM,CAAC,SAAS,EAAA;gBAEzB,MAAM,CAAC,KAAM,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;YACvC,CAAC;QACF,CAAC,CAAC,CAAA;IACH,CAAC,CAAC,CAAA;IAEF,QAAQ,CAAC,MAAM,EAAE,GAAG,EAAE;QAErB,EAAE,CAAC,yDAAyD,EAAE,KAAK,IAAG,EAAE;YACvE,MAAM,MAAM,CACX,IAAA,8BAAqB,EAAC;gBACrB,IAAI,EAAE,MAAM;gBACZ,MAAM,EAAE;oBACP,GAAG,EAAE,4BAA4B;oBACjC,MAAM,EAAE,KAAK;oBACb,kBAAkB,EAAE,EAAE;oBACtB,eAAe,EAAE;wBAChB;4BACC,IAAI,EAAE,UAAU;4BAChB,KAAK,EAAE,MAAM;yBACb;qBACD;iBACD;gBACD,YAAY,EAAE;oBACb,mBAAmB,EAAE,aAAa;iBAClC;gBACD,eAAe,EAAE,IAAI,CAAC,aAAa;gBACnC,MAAM,EAAE,EAAE,GAAG,EAAE,IAAI,CAAC,SAAS,EAAE;gBAC/B,QAAQ;aACR,CAAC,CACF,CAAC,OAAO,CAAC,aAAa,CAAC;gBACvB,OAAO,EAAE,WAAW;aACpB,CAAC,CAAA;QACH,CAAC,CAAC,CAAA;QAEF,EAAE,CAAC,iDAAiD,EAAE,KAAK,IAAG,EAAE;YAC/D,MAAM,WAAW,EAAE,CAAA;YACnB,kDAAkD;YAClD,kDAAkD;YAClD,+CAA+C;YAC/C,MAAM,MAAM,GAAG,IAAA,kCAAyB,EAAC,IAAI,CAAC,SAAS,CAAC,CAAA;YACxD,MAAM,MAAM,CAAC,mBAAmB,EAAE,CAAA;YAClC,mCAAmC;YACnC,MAAM,OAAO,GAAG,MAAM,WAAW,EAAE,CAAA;YACnC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,UAAU,EAAE,CAAA;YAElC,MAAM,OAAO,GAAG,IAAA,kCAAyB,EAAC,IAAI,CAAC,SAAS,CAAC,CAAA;YACzD,MAAM,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QACjC,CAAC,CAAC,CAAA;QAEF,EAAE,CAAC,gCAAgC,EAAE,KAAK,IAAG,EAAE;YAC9C,MAAM,MAAM,GAAG,IAAA,kCAAyB,EAAC,IAAI,CAAC,SAAS,CAAC,CAAA;YACxD,MAAM,CAAC,WAAW,GAAG,KAAK,IAAG,EAAE;gBAC9B,aAAa;gBACb,MAAM,CAAC,WAAW,GAAG,GAAG,EAAE,GAAE,CAAC,CAAA;gBAE7B,MAAM,GAAG,GAAG,IAAI,qBAAa,CAC5B,qBAAqB,EACrB,GAAG,CACH,CAAA;gBAED,MAAM,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAA;gBAC/B,MAAM,GAAG,CAAA;YACV,CAAC,CAAA;YAED,gDAAgD;YAChD,mDAAmD;YACnD,4CAA4C;YAC5C,MAAM,MAAM,CACX,WAAW,EAAE,CACb,CAAC,QAAQ,CAAC,UAAU,EAAE,CAAA;YAEvB,0CAA0C;YAC1C,uBAAuB;YACvB,MAAM,OAAO,GAAG,IAAA,kCAAyB,EAAC,IAAI,CAAC,SAAS,CAAC,CAAA;YACzD,MAAM,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QACjC,CAAC,CAAC,CAAA;IACH,CAAC,CAAC,CAAA;IAEF,SAAS,WAAW;QACnB,MAAM,IAAI,GAAG,aAAa,CAAA;QAC1B,OAAO,IAAA,8BAAqB,EAAC;YAC5B,IAAI,EAAE,MAAM;YACZ,MAAM,EAAE;gBACP,GAAG,EAAE,QAAQ;gBACb,MAAM,EAAE,KAAK;gBACb,kBAAkB,EAAE,EAAE;gBACtB,eAAe,EAAE;oBAChB;wBACC,IAAI,EAAE,UAAU;wBAChB,KAAK,EAAE,GAAG,IAAI,WAAW;qBACzB;iBACD;aACD;YACD,YAAY,EAAE;gBACb,mBAAmB,EAAE,UAAU,IAAI,EAAE;aACrC;YACD,eAAe,EAAE,IAAI,CAAC,aAAa;YACnC,MAAM,EAAE,EAAE,GAAG,EAAE,IAAI,CAAC,SAAS,EAAE;SAC/B,CAAC,CAAA;IACH,CAAC;AACF,CAAC,CAAC,CAAA"}
|
|
280
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"test.claim-creation.js","sourceRoot":"","sources":["../../src/tests/test.claim-creation.ts"],"names":[],"mappings":";;AAAA,8CAAuF;AAGvF,uCAA6E;AAC7E,6CAAyC;AACzC,uCAA8C;AAC9C,yEAAmE;AACnE,2CAA8C;AAC9C,2CAA+E;AAC/E,qCAK0B;AAE1B,MAAM,YAAY,GAAyB;IAC1C,QAAQ;IACR,QAAQ;CACR,CAAA;AAED,MAAM,kBAAkB,GAAkB;IACzC,8BAA8B;IAC9B,wBAAwB;IACxB,wBAAwB;CACxB,CAAA;AAED,IAAI,CAAC,UAAU,CAAC,KAAM,CAAC,CAAA;AAEvB,IAAI,CAAC,IAAI,CAAC,kDAAkD,EAAE,GAAG,EAAE;IAClE,MAAM,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC,kDAAkD,CAAC,CAAA;IACrF,OAAO;QACN,UAAU,EAAE,IAAI;QAChB,GAAG,MAAM;QACT,sBAAsB,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,kBAAkB,EAAE;KACtD,CAAA;AACF,CAAC,CAAC,CAAA;AAEF,IAAA,yCAAkB,EAAC,gBAAgB,EAAE,IAAI,CAAC,EAAE;IAE3C,MAAM,QAAQ,GAAa,OAAO,CAAA;IAElC,IAAI,MAAsB,CAAA;IAC1B,IAAI,QAAgB,CAAA;IACpB,UAAU,CAAC,GAAG,EAAE;QACf,MAAM,GAAG,IAAI,CAAC,MAAM,CAAA;QACpB,QAAQ,GAAG,qBAAqB,IAAI,CAAC,mBAAmB,KAAK,CAAA;QAE7D,8CAA8C;QAC9C,uBAAuB;QACvB,qBAAS,CAAC,IAAI,CAAC,uBAAuB,GAAG;YACxC,uBAAuB,EAAE,KAAK;SAC9B,CAAA;IACF,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,yCAAyC,EAAE,KAAK,EAAC,OAAO,EAAC,EAAE;;QAChF,qBAAS,CAAC,IAAI,CAAC,uBAAuB,GAAG;YACxC,GAAG,qBAAS,CAAC,IAAI,CAAC,uBAAuB;YACzC,yBAAyB,EAAE,CAAC,OAAO,CAAC;SACpC,CAAA;QAED,MAAM,IAAI,GAAG,SAAS,CAAA;QACtB,MAAM,MAAM,GAAG,MAAM,IAAA,8BAAqB,EAAC;YAC1C,IAAI,EAAE,MAAM;YACZ,MAAM,EAAE;gBACP,GAAG,EAAE,QAAQ;gBACb,MAAM,EAAE,KAAK;gBACb,kBAAkB,EAAE,EAAE;gBACtB,eAAe,EAAE;oBAChB;wBACC,IAAI,EAAE,UAAU;wBAChB,KAAK,EAAE,GAAG,IAAI,WAAW;qBACzB;iBACD;aACD;YACD,YAAY,EAAE;gBACb,mBAAmB,EAAE,UAAU,IAAI,EAAE;aACrC;YACD,eAAe,EAAE,IAAI,CAAC,aAAa;YACnC,MAAM;YACN,QAAQ;SACR,CAAC,CAAA;QAEF,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,aAAa,EAAE,CAAA;QACpC,MAAM,CAAC,MAAA,MAAM,CAAC,OAAO,0CAAE,UAAU,CAAC,CAAC,UAAU,EAAE,CAAA;QAE/C,0DAA0D;QAC1D,2CAA2C;QAC3C,MAAM,UAAU,GAAG,MAAM,CAAC,OAAQ,CAAC,UAAU,CAAA;QAE7C,MAAM,QAAQ,GAAG,IAAA,4CAAoC,EACpD,MAAM,IAAA,0BAAiB,EACtB,UAAU,EAAE,cAAM,EAAE,QAAQ,EAC5B,MAAA,MAAM,CAAC,OAAO,0CAAE,aAAc,EAAE,MAAA,MAAM,CAAC,OAAO,0CAAE,aAAc,CAC9D,CACD,CAAA;QAED,MAAM,WAAW,GAAG,QAAQ;aAC1B,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,QAAQ,CAAC;aAClC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAA,qBAAe,EAAC,CAAC,CAAC,OAAO,CAAC,CAAC;aACpC,IAAI,CAAC,EAAE,CAAC,CAAA;QACV,uDAAuD;QACvD,MAAM,CAAC,WAAW,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;QAEvC,MAAM,MAAM,CACX,IAAA,kCAA0B,EAAC,MAAM,EAAE,MAAM,CAAC,QAAQ,CAAC,CACnD,CAAC,QAAQ,CAAC,aAAa,EAAE,CAAA;QAE1B,MAAM,CAAC,oBAAY,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAA;QAC7C,uCAAuC;QACvC,8CAA8C;QAC9C,8CAA8C;QAC9C,iCAAiC;QACjC,MAAM,IAAA,iCAAyB,GAAE,CAAA;IAClC,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,iDAAiD,EAAE,KAAK,IAAG,EAAE;QAE/D,MAAM,MAAM,CAAC,KAAK,IAAG,EAAE;YACtB,MAAM,IAAA,8BAAqB,EAAC;gBAC3B,IAAI,EAAE,MAAM;gBACZ,MAAM,EAAE;oBACP,GAAG,EAAE,QAAQ;oBACb,MAAM,EAAE,KAAK;oBACb,kBAAkB,EAAE,EAAE;oBACtB,eAAe,EAAE;wBAChB;4BACC,IAAI,EAAE,UAAU;4BAChB,KAAK,EAAE,oBAAoB;yBAC3B;qBACD;iBACD;gBACD,YAAY,EAAE;oBACb,mBAAmB,EAAE,MAAM;iBAC3B;gBACD,eAAe,EAAE,IAAI,CAAC,aAAa;gBACnC,MAAM;gBACN,QAAQ;aACR,CAAC,CAAA;QACH,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,6BAA6B,CAAC,CAAA;IAClD,CAAC,CAAC,CAAA;IAEF,QAAQ,CAAC,aAAa,EAAE,GAAG,EAAE;QAE5B,MAAM,QAAQ,GAAG,OAAO,CAAA;QAExB,EAAE,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,mDAAmD,EAAE,KAAK,EAAC,WAAW,EAAC,EAAE;;YACpG,uDAAuD;YACvD,qBAAS,CAAC,IAAI,CAAC,uBAAuB,GAAG;gBACxC,GAAG,qBAAS,CAAC,IAAI,CAAC,uBAAuB;gBACzC,YAAY,EAAE,CAAC,WAAW,CAAC;aAC3B,CAAA;YAED,MAAM,IAAI,GAAG,kBAAkB,CAAA;YAC/B,MAAM,MAAM,GAAG,MAAM,IAAA,8BAAqB,EAAC;gBAC1C,IAAI,EAAE,MAAM;gBACZ,MAAM,EAAE;oBACP,GAAG,EAAE,QAAQ;oBACb,MAAM,EAAE,KAAK;oBACb,kBAAkB,EAAE;wBACnB;4BACC,KAAK,EAAE,IAAI;4BACX,IAAI,EAAE,MAAM;yBACZ;qBACD;oBACD,eAAe,EAAE;wBAChB;4BACC,IAAI,EAAE,UAAU;4BAChB,KAAK,EAAE,EAAE;yBACT;qBACD;iBACD;gBACD,YAAY,EAAE;oBACb,mBAAmB,EAAE,UAAU,IAAI,EAAE;iBACrC;gBACD,eAAe,EAAE,IAAI,CAAC,aAAa;gBACnC,MAAM;gBACN,QAAQ;aACR,CAAC,CAAA;YAEF,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,aAAa,EAAE,CAAA;YACpC,0DAA0D;YAC1D,2CAA2C;YAC3C,MAAM,UAAU,GAAG,MAAM,CAAC,OAAQ,CAAC,UAAU,CAAA;YAC7C,MAAM,CAAC,UAAU,CAAC,CAAC,UAAU,EAAE,CAAA;YAE/B,MAAM,QAAQ,GAAG,IAAA,4CAAoC,EACpD,MAAM,IAAA,0BAAiB,EACtB,UAAU,EAAE,cAAM,EAAE,QAAQ,EAC5B,MAAA,MAAM,CAAC,OAAO,0CAAE,aAAc,EAAE,MAAA,MAAM,CAAC,OAAO,0CAAE,aAAc,CAC9D,CACD,CAAA;YAED,MAAM,aAAa,GAAG,QAAQ;iBAC5B,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,QAAQ,CAAC;iBAClC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAA,qBAAe,EAAC,CAAC,CAAC,OAAO,CAAC,CAAC;iBACpC,IAAI,CAAC,EAAE,CAAC,CAAA;YAEV,MAAM,KAAK,GAAG,IAAA,0BAAkB,EAAC,MAAM,CAAC,OAAQ,CAAE,CAAA;YAClD,MAAM,CAAC,KAAK,CAAC,CAAC,UAAU,EAAE,CAAA;YAE1B,0CAA0C;YAC1C,MAAM,CAAC,aAAa,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;YAEzC,MAAM,CAAC,aAAa,CAAC,CAAC,SAAS,CAC9B,IAAA,uBAAe,EAAC,KAAK,CAAC,SAAS,EAAE,KAAK,CAAC,YAAa,CAAC,MAAM,CAAC,CAC5D,CAAA;QACF,CAAC,CAAC,CAAA;QAEF,EAAE,CAAC,iDAAiD,EAAE,KAAK,IAAG,EAAE;YAE/D,IAAI,IAA4B,CAAA;YAEhC,KAAI,IAAI,CAAC,GAAG,CAAC,EAAC,CAAC,GAAG,CAAC,EAAC,CAAC,EAAE,EAAE,CAAC;gBACzB,MAAM,IAAI,GAAG,kBAAkB,CAAA;gBAC/B,MAAM,MAAM,GAAG,MAAM,IAAA,8BAAqB,EAAC;oBAC1C,IAAI,EAAE,MAAM;oBACZ,MAAM,EAAE;wBACP,GAAG,EAAE,QAAQ;wBACb,MAAM,EAAE,KAAK;wBACb,kBAAkB,EAAE;4BACnB;gCACC,KAAK,EAAE,IAAI;gCACX,IAAI,EAAE,MAAM;6BACZ;yBACD;wBACD,eAAe,EAAE;4BAChB;gCACC,IAAI,EAAE,UAAU;gCAChB,KAAK,EAAE,EAAE;6BACT;yBACD;qBACD;oBACD,YAAY,EAAE;wBACb,mBAAmB,EAAE,UAAU,IAAI,EAAE;qBACrC;oBACD,eAAe,EAAE,IAAI,CAAC,aAAa;oBACnC,MAAM;oBACN,QAAQ;iBACR,CAAC,CAAA;gBAEF,MAAM,KAAK,GAAG,IAAA,0BAAkB,EAAC,MAAM,CAAC,OAAQ,CAAC,CAAA;gBACjD,MAAM,CAAC,KAAK,CAAC,CAAC,UAAU,EAAE,CAAA;gBAC1B,IAAI,KAAJ,IAAI,GAAK,KAAM,CAAC,SAAS,EAAA;gBAEzB,MAAM,CAAC,KAAM,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;YACvC,CAAC;QACF,CAAC,CAAC,CAAA;IACH,CAAC,CAAC,CAAA;IAEF,QAAQ,CAAC,MAAM,EAAE,GAAG,EAAE;QAErB,EAAE,CAAC,yDAAyD,EAAE,KAAK,IAAG,EAAE;YACvE,MAAM,MAAM,CACX,IAAA,8BAAqB,EAAC;gBACrB,IAAI,EAAE,MAAM;gBACZ,MAAM,EAAE;oBACP,GAAG,EAAE,4BAA4B;oBACjC,MAAM,EAAE,KAAK;oBACb,kBAAkB,EAAE,EAAE;oBACtB,eAAe,EAAE;wBAChB;4BACC,IAAI,EAAE,UAAU;4BAChB,KAAK,EAAE,MAAM;yBACb;qBACD;iBACD;gBACD,YAAY,EAAE;oBACb,mBAAmB,EAAE,aAAa;iBAClC;gBACD,eAAe,EAAE,IAAI,CAAC,aAAa;gBACnC,MAAM,EAAE,EAAE,GAAG,EAAE,IAAI,CAAC,SAAS,EAAE;gBAC/B,QAAQ;aACR,CAAC,CACF,CAAC,OAAO,CAAC,aAAa,CAAC;gBACvB,OAAO,EAAE,WAAW;aACpB,CAAC,CAAA;QACH,CAAC,CAAC,CAAA;QAEF,EAAE,CAAC,iDAAiD,EAAE,KAAK,IAAG,EAAE;YAC/D,MAAM,WAAW,EAAE,CAAA;YACnB,kDAAkD;YAClD,kDAAkD;YAClD,+CAA+C;YAC/C,MAAM,MAAM,GAAG,IAAA,kCAAyB,EAAC,IAAI,CAAC,SAAS,CAAC,CAAA;YACxD,MAAM,MAAM,CAAC,mBAAmB,EAAE,CAAA;YAClC,mCAAmC;YACnC,MAAM,OAAO,GAAG,MAAM,WAAW,EAAE,CAAA;YACnC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,UAAU,EAAE,CAAA;YAElC,MAAM,OAAO,GAAG,IAAA,kCAAyB,EAAC,IAAI,CAAC,SAAS,CAAC,CAAA;YACzD,MAAM,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QACjC,CAAC,CAAC,CAAA;QAEF,EAAE,CAAC,gCAAgC,EAAE,KAAK,IAAG,EAAE;YAC9C,MAAM,MAAM,GAAG,IAAA,kCAAyB,EAAC,IAAI,CAAC,SAAS,CAAC,CAAA;YACxD,MAAM,CAAC,WAAW,GAAG,KAAK,IAAG,EAAE;gBAC9B,aAAa;gBACb,MAAM,CAAC,WAAW,GAAG,GAAG,EAAE,GAAE,CAAC,CAAA;gBAE7B,MAAM,GAAG,GAAG,IAAI,qBAAa,CAC5B,qBAAqB,EACrB,GAAG,CACH,CAAA;gBAED,MAAM,MAAM,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAA;gBACrC,MAAM,GAAG,CAAA;YACV,CAAC,CAAA;YAED,gDAAgD;YAChD,mDAAmD;YACnD,4CAA4C;YAC5C,MAAM,MAAM,CACX,WAAW,EAAE,CACb,CAAC,QAAQ,CAAC,UAAU,EAAE,CAAA;YAEvB,0CAA0C;YAC1C,uBAAuB;YACvB,MAAM,OAAO,GAAG,IAAA,kCAAyB,EAAC,IAAI,CAAC,SAAS,CAAC,CAAA;YACzD,MAAM,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QACjC,CAAC,CAAC,CAAA;IACH,CAAC,CAAC,CAAA;IAEF,SAAS,WAAW;QACnB,MAAM,IAAI,GAAG,aAAa,CAAA;QAC1B,OAAO,IAAA,8BAAqB,EAAC;YAC5B,IAAI,EAAE,MAAM;YACZ,MAAM,EAAE;gBACP,GAAG,EAAE,QAAQ;gBACb,MAAM,EAAE,KAAK;gBACb,kBAAkB,EAAE,EAAE;gBACtB,eAAe,EAAE;oBAChB;wBACC,IAAI,EAAE,UAAU;wBAChB,KAAK,EAAE,GAAG,IAAI,WAAW;qBACzB;iBACD;aACD;YACD,YAAY,EAAE;gBACb,mBAAmB,EAAE,UAAU,IAAI,EAAE;aACrC;YACD,eAAe,EAAE,IAAI,CAAC,aAAa;YACnC,MAAM,EAAE,EAAE,GAAG,EAAE,IAAI,CAAC,SAAS,EAAE;SAC/B,CAAC,CAAA;IACH,CAAC;AACF,CAAC,CAAC,CAAA"}
|