@reclaimprotocol/attestor-core 3.0.2 → 3.0.4

package/lib/utils/logger.d.ts

@@ -1,4 +1,4 @@
-import type { LogLevel } from 'src/types';
+import type { LogLevel } from '../types';
 export declare let logger: import("pino").Logger<never, boolean>;
 /**
  * Creates a logger instance with optional redaction of PII.

package/lib/utils/logger.js

@@ -7,7 +7,7 @@ exports.logger = void 0;
 exports.makeLogger = makeLogger;
 exports.redact = redact;
 const pino_1 = __importDefault(require("pino"));
-const env_1 = require("src/utils/env");
+const env_1 = require("../utils/env");
 const PII_PROPERTIES = ['ownerPrivateKey', 'secretParams'];
 const redactedText = '[REDACTED]';
 const envLevel = (0, env_1.getEnvVariable)('LOG_LEVEL');

package/lib/utils/prepare-packets.d.ts

@@ -1,6 +1,6 @@
 import { CipherSuite, TLSPacketContext } from '@reclaimprotocol/tls';
-import { ClaimTunnelRequest_TranscriptMessage as TranscriptMessage } from 'src/proto/api';
-import { CompleteTLSPacket, Logger, MessageRevealInfo, PrepareZKProofsBaseOpts, Transcript } from 'src/types';
+import { ClaimTunnelRequest_TranscriptMessage as TranscriptMessage } from '../proto/api';
+import { CompleteTLSPacket, Logger, MessageRevealInfo, PrepareZKProofsBaseOpts, Transcript } from '../types';
 export type PreparePacketsForRevealOpts = {
     cipherSuite: CipherSuite;
     logger: Logger;

package/lib/utils/prepare-packets.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.preparePacketsForReveal = preparePacketsForReveal;
 const tls_1 = require("@reclaimprotocol/tls");
-const api_1 = require("src/proto/api");
-const zk_1 = require("src/utils/zk");
+const api_1 = require("../proto/api");
+const zk_1 = require("../utils/zk");
 /**
  * Prepares the packets for reveal to the server
  * according to the specified reveal type

package/lib/utils/redactions.d.ts

@@ -1,4 +1,4 @@
-import type { ArraySlice } from 'src/types';
+import type { ArraySlice } from '../types';
 export declare const REDACTION_CHAR = "*";
 export declare const REDACTION_CHAR_CODE: number;
 /**

package/lib/utils/retries.d.ts

@@ -1,4 +1,4 @@
-import { Logger } from 'src/types';
+import { Logger } from '../types';
 type RetryLoopOptions = {
     maxRetries?: number;
     logger: Logger;

package/lib/utils/signatures/eth.d.ts

@@ -1,2 +1,2 @@
-import { ServiceSignatureProvider } from 'src/types';
+import { ServiceSignatureProvider } from '../../types';
 export declare const ETH_SIGNATURE_PROVIDER: ServiceSignatureProvider;

package/lib/utils/signatures/index.d.ts

@@ -1,5 +1,5 @@
-import { ServiceSignatureType } from 'src/proto/api';
-import { ServiceSignatureProvider } from 'src/types';
+import { ServiceSignatureType } from '../../proto/api';
+import { ServiceSignatureProvider } from '../../types';
 export declare const SIGNATURES: { [key in ServiceSignatureType]: ServiceSignatureProvider; };
 export declare const SelectedServiceSignatureType = ServiceSignatureType.SERVICE_SIGNATURE_TYPE_ETH;
 export declare const SelectedServiceSignature: ServiceSignatureProvider;

package/lib/utils/signatures/index.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SelectedServiceSignature = exports.SelectedServiceSignatureType = exports.SIGNATURES = void 0;
-const api_1 = require("src/proto/api");
-const eth_1 = require("src/utils/signatures/eth");
+const api_1 = require("../../proto/api");
+const eth_1 = require("../../utils/signatures/eth");
 exports.SIGNATURES = {
     [api_1.ServiceSignatureType.SERVICE_SIGNATURE_TYPE_ETH]: eth_1.ETH_SIGNATURE_PROVIDER,
 };

package/lib/utils/socket-base.d.ts

@@ -1,5 +1,5 @@
-import { InitRequest, RPCMessage, RPCMessages } from 'src/proto/api';
-import { IAttestorSocket, Logger, RPCEvent, RPCEventMap } from 'src/types';
+import { InitRequest, RPCMessage, RPCMessages } from '../proto/api';
+import { IAttestorSocket, Logger, RPCEvent, RPCEventMap } from '../types';
 /**
  * Common AttestorSocket class used on the client & server side as the
  * base for their respective socket implementations.

package/lib/utils/socket-base.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AttestorSocket = void 0;
-const message_handler_1 = require("src/client/utils/message-handler");
-const api_1 = require("src/proto/api");
-const utils_1 = require("src/utils");
+const message_handler_1 = require("../client/utils/message-handler");
+const api_1 = require("../proto/api");
+const utils_1 = require("../utils");
 /**
  * Common AttestorSocket class used on the client & server side as the
  * base for their respective socket implementations.

package/lib/utils/tls.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getDefaultTlsOptions = getDefaultTlsOptions;
 const tls_1 = require("@reclaimprotocol/tls");
-const env_1 = require("src/utils/env");
+const env_1 = require("../utils/env");
 // we only support the following cipher suites
 // for ZK proof generation
 const ZK_CIPHER_SUITES = [

package/lib/utils/validation.d.ts

@@ -1,2 +1,2 @@
-import { ProviderName, ProviderParams } from 'src/types';
+import { ProviderName, ProviderParams } from '../types';
 export declare function assertValidateProviderParams<T extends ProviderName>(name: T, params: unknown): asserts params is ProviderParams<T>;

package/lib/utils/validation.js

@@ -5,8 +5,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.assertValidateProviderParams = assertValidateProviderParams;
 const ajv_1 = __importDefault(require("ajv"));
-const providers_gen_1 = require("src/types/providers.gen");
-const error_1 = require("src/utils/error");
+const providers_gen_1 = require("../types/providers.gen");
+const error_1 = require("../utils/error");
 const PROVIDER_VALIDATOR_MAP = {};
 const AJV = new ajv_1.default({
     allErrors: true,

package/lib/utils/ws.d.ts

@@ -1,4 +1,4 @@
-import { AnyWebSocketConstructor } from 'src/types';
+import { AnyWebSocketConstructor } from '../types';
 /**
  * Default WebSocket implementation, uses `ws` package
  * for Node.js and the native WebSocket for the browser & other

package/lib/utils/ws.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Websocket = void 0;
 exports.setWebsocket = setWebsocket;
-const env_1 = require("src/utils/env");
+const env_1 = require("../utils/env");
 /**
  * Default WebSocket implementation, uses `ws` package
  * for Node.js and the native WebSocket for the browser & other

package/lib/utils/zk.d.ts

@@ -1,7 +1,7 @@
 import { EncryptionAlgorithm, PrivateInput, PublicInput, ZKOperator } from '@reclaimprotocol/circom-symmetric-crypto';
 import { CipherSuite } from '@reclaimprotocol/tls';
-import { MessageReveal_MessageRevealZk as ZKReveal, MessageReveal_ZKProof as ZKProof } from 'src/proto/api';
-import { CompleteTLSPacket, Logger, PrepareZKProofsBaseOpts, ZKEngine, ZKOperators, ZKRevealInfo } from 'src/types';
+import { MessageReveal_MessageRevealZk as ZKReveal, MessageReveal_ZKProof as ZKProof } from '../proto/api';
+import { CompleteTLSPacket, Logger, PrepareZKProofsBaseOpts, ZKEngine, ZKOperators, ZKRevealInfo } from '../types';
 type PrepareZKProofsOpts = {
     logger?: Logger;
     cipherSuite: CipherSuite;

package/lib/utils/zk.js

@@ -6,13 +6,13 @@ exports.makeDefaultZkOperator = makeDefaultZkOperator;
 const circom_symmetric_crypto_1 = require("@reclaimprotocol/circom-symmetric-crypto");
 const gnark_1 = require("@reclaimprotocol/circom-symmetric-crypto/lib/gnark");
 const tls_1 = require("@reclaimprotocol/tls");
-const config_1 = require("src/config");
-const env_1 = require("src/utils/env");
-const error_1 = require("src/utils/error");
-const generics_1 = require("src/utils/generics");
-const logger_1 = require("src/utils/logger");
-const redactions_1 = require("src/utils/redactions");
-const retries_1 = require("src/utils/retries");
+const config_1 = require("../config");
+const env_1 = require("../utils/env");
+const error_1 = require("../utils/error");
+const generics_1 = require("../utils/generics");
+const logger_1 = require("../utils/logger");
+const redactions_1 = require("../utils/redactions");
+const retries_1 = require("../utils/retries");
 const ZK_CONCURRENCY = +((0, env_1.getEnvVariable)('ZK_CONCURRENCY')
     || config_1.DEFAULT_ZK_CONCURRENCY);
 async function makeZkProofGenerator({ zkOperators, logger = logger_1.logger, zkProofConcurrency = ZK_CONCURRENCY, maxZkChunks = config_1.MAX_ZK_CHUNKS, cipherSuite, zkEngine = 'snarkJS' }) {

package/lib/window-rpc/setup-window-rpc.js

@@ -2,13 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setupWindowRpc = setupWindowRpc;
 const tls_1 = require("@reclaimprotocol/tls");
-const create_claim_on_avs_1 = require("src/avs/client/create-claim-on-avs");
-const client_1 = require("src/client");
-const utils_1 = require("src/providers/http/utils");
-const utils_2 = require("src/utils");
-const benchmark_1 = require("src/utils/benchmark");
-const utils_3 = require("src/window-rpc/utils");
-const window_rpc_zk_1 = require("src/window-rpc/window-rpc-zk");
+const create_claim_on_avs_1 = require("../avs/client/create-claim-on-avs");
+const client_1 = require("../client");
+const utils_1 = require("../providers/http/utils");
+const utils_2 = require("../utils");
+const benchmark_1 = require("../utils/benchmark");
+const utils_3 = require("../window-rpc/utils");
+const window_rpc_zk_1 = require("../window-rpc/window-rpc-zk");
 class WindowRPCEvent extends Event {
     constructor(data) {
         super('message');

package/lib/window-rpc/types.d.ts

@@ -1,9 +1,9 @@
 import type { EncryptionAlgorithm, ZKOperator } from '@reclaimprotocol/circom-symmetric-crypto';
-import type { TaskCompletedEventObject } from 'src/avs/contracts/ReclaimServiceManager';
-import type { CreateClaimOnAvsOpts, CreateClaimOnAvsStep } from 'src/avs/types';
-import type { extractHTMLElement, extractJSONValueIndex } from 'src/providers/http/utils';
-import type { AttestorData, CompleteClaimData, CreateClaimOnAttestorOpts, LogLevel, ProofGenerationStep, ProviderName, ProviderParams, ProviderSecretParams, ZKEngine } from 'src/types';
-import { HttpRequest, HttpResponse } from 'src/utils';
+import type { TaskCompletedEventObject } from '../avs/contracts/ReclaimServiceManager';
+import type { CreateClaimOnAvsOpts, CreateClaimOnAvsStep } from '../avs/types';
+import type { extractHTMLElement, extractJSONValueIndex } from '../providers/http/utils';
+import type { AttestorData, CompleteClaimData, CreateClaimOnAttestorOpts, LogLevel, ProofGenerationStep, ProviderName, ProviderParams, ProviderSecretParams, ZKEngine } from '../types';
+import { HttpRequest, HttpResponse } from '../utils';
 type IdentifiedMessage = {
     module: 'attestor-core';
     /**

package/lib/window-rpc/utils.d.ts

@@ -1,5 +1,5 @@
-import { ClaimTunnelResponse } from 'src/proto/api';
-import { CreateClaimResponse } from 'src/window-rpc/types';
+import { ClaimTunnelResponse } from '../proto/api';
+import { CreateClaimResponse } from '../window-rpc/types';
 export declare function getCurrentMemoryUsage(): Promise<{
     available: boolean;
     content: string;

package/lib/window-rpc/utils.js

@@ -5,8 +5,8 @@ exports.generateRpcRequestId = generateRpcRequestId;
 exports.getWsApiUrlFromLocation = getWsApiUrlFromLocation;
 exports.mapToCreateClaimResponse = mapToCreateClaimResponse;
 const ethers_1 = require("ethers");
-const config_1 = require("src/config");
-const utils_1 = require("src/utils");
+const config_1 = require("../config");
+const utils_1 = require("../utils");
 // track memory usage
 async function getCurrentMemoryUsage() {
     if (!window.crossOriginIsolated) {

package/lib/window-rpc/window-rpc-zk.d.ts

@@ -1,6 +1,6 @@
 import { EncryptionAlgorithm, ZKOperator } from '@reclaimprotocol/circom-symmetric-crypto';
-import { ZKEngine } from 'src/types';
-import { CommunicationBridge, WindowRPCAppClient } from 'src/window-rpc/types';
+import { ZKEngine } from '../types';
+import { CommunicationBridge, WindowRPCAppClient } from '../window-rpc/types';
 export declare const ALL_ENC_ALGORITHMS: EncryptionAlgorithm[];
 /**
  * The goal of this RPC operator is if the attestor client

package/lib/window-rpc/window-rpc-zk.js

@@ -4,8 +4,8 @@ exports.ALL_ENC_ALGORITHMS = void 0;
 exports.makeWindowRpcZkOperator = makeWindowRpcZkOperator;
 exports.waitForResponse = waitForResponse;
 const utils_1 = require("ethers/lib/utils");
-const utils_2 = require("src/utils");
-const utils_3 = require("src/window-rpc/utils");
+const utils_2 = require("../utils");
+const utils_3 = require("../window-rpc/utils");
 exports.ALL_ENC_ALGORITHMS = [
     'aes-256-ctr',
     'aes-128-ctr',

package/package.json

@@ -1,10 +1,11 @@
 {
   "name": "@reclaimprotocol/attestor-core",
-  "version": "3.0.2",
+  "version": "3.0.4",
   "description": "",
   "main": "lib/index",
   "scripts": {
-    "build": "tsc -p tsconfig.build.json && tsc-alias",
+    "build": "tsc -p tsconfig.build.json && tsc-alias -p tsconfig.json",
+    "prepublish": "tsc-alias -p tsconfig.json",
     "build:browser": "sh ./src/scripts/build-browser.sh",
     "run:tsc": "SWC_NODE_IGNORE_DYNAMIC=true node -r @swc-node/register",
     "start:tsc": "npm run run:tsc -- src/scripts/start-server",

package/lib/server/utils/verify-server-certificates.d.ts

@@ -1,7 +0,0 @@
-import { IDecryptedTranscript } from 'src/types';
-/**
- * Verifies server cert chain and removes handshake messages from transcript, returning new one
- * @param receipt
- * @param logger
- */
-export declare function verifyServerCertificates(receipt: IDecryptedTranscript, logger: any): Promise<IDecryptedTranscript>;

package/lib/server/utils/verify-server-certificates.js

@@ -1,102 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.verifyServerCertificates = verifyServerCertificates;
-const tls_1 = require("@reclaimprotocol/tls");
-const parse_certificate_1 = require("@reclaimprotocol/tls/lib/utils/parse-certificate");
-const utils_1 = require("src/utils");
-const RECORD_LENGTH_BYTES = 3;
-/**
- * Verifies server cert chain and removes handshake messages from transcript, returning new one
- * @param receipt
- * @param logger
- */
-async function verifyServerCertificates(receipt, logger) {
-    const handshakeMsgs = (0, utils_1.extractHandshakeFromTranscript)(receipt);
-    let handshakeData = (0, tls_1.concatenateUint8Arrays)(handshakeMsgs.messages.map(m => m.message));
-    let packetData;
-    const handshakeRawMessages = [];
-    const certificates = [];
-    let cipherSuite = undefined;
-    let serverRandom = undefined;
-    let clientRandom = undefined;
-    let certVerified = false;
-    while ((packetData = readPacket()) && !certVerified) {
-        const { type, content } = packetData;
-        switch (type) {
-            case tls_1.SUPPORTED_RECORD_TYPE_MAP.CLIENT_HELLO:
-                const clientHello = (0, tls_1.parseClientHello)(handshakeRawMessages[0]);
-                clientRandom = clientHello.serverRandom;
-                break;
-            case tls_1.SUPPORTED_RECORD_TYPE_MAP.SERVER_HELLO:
-                const serverHello = await (0, tls_1.parseServerHello)(content);
-                cipherSuite = serverHello.cipherSuite;
-                serverRandom = serverHello.serverRandom;
-                break;
-            case tls_1.SUPPORTED_RECORD_TYPE_MAP.CERTIFICATE:
-                const parseResult = (0, tls_1.parseCertificates)(content, { version: receipt.tlsVersion });
-                certificates.push(...parseResult.certificates);
-                break;
-            case tls_1.SUPPORTED_RECORD_TYPE_MAP.CERTIFICATE_VERIFY:
-                const signature = (0, tls_1.parseServerCertificateVerify)(content);
-                if (!(certificates === null || certificates === void 0 ? void 0 : certificates.length)) {
-                    throw new Error('No provider certificates received');
-                }
-                const signatureData = await (0, tls_1.getSignatureDataTls13)(handshakeRawMessages.slice(0, -1), cipherSuite);
-                await (0, tls_1.verifyCertificateSignature)({
-                    ...signature,
-                    publicKey: certificates[0].getPublicKey(),
-                    signatureData,
-                });
-                await (0, parse_certificate_1.verifyCertificateChain)(certificates, receipt.hostname);
-                logger.info({ host: receipt.hostname }, 'verified provider certificate chain');
-                certVerified = true;
-                break;
-            case tls_1.SUPPORTED_RECORD_TYPE_MAP.SERVER_KEY_SHARE:
-                if (!(certificates === null || certificates === void 0 ? void 0 : certificates.length)) {
-                    throw new Error('No provider certificates received');
-                }
-                const keyShare = await (0, tls_1.processServerKeyShare)(content);
-                const signatureData12 = await (0, tls_1.getSignatureDataTls12)({
-                    clientRandom: clientRandom,
-                    serverRandom: serverRandom,
-                    curveType: keyShare.publicKeyType,
-                    publicKey: keyShare.publicKey,
-                });
-                // verify signature
-                await (0, tls_1.verifyCertificateSignature)({
-                    signature: keyShare.signatureBytes,
-                    algorithm: keyShare.signatureAlgorithm,
-                    publicKey: certificates[0].getPublicKey(),
-                    signatureData: signatureData12,
-                });
-                await (0, parse_certificate_1.verifyCertificateChain)(certificates, receipt.hostname);
-                logger.info({ host: receipt.hostname }, 'verified provider certificate chain');
-                certVerified = true;
-                break;
-        }
-    }
-    if (!certVerified) {
-        throw new Error('No provider certificates received');
-    }
-    function readPacket() {
-        if (!handshakeData.length) {
-            return;
-        }
-        const type = handshakeData[0];
-        const content = (0, tls_1.readWithLength)(handshakeData.slice(1), RECORD_LENGTH_BYTES);
-        if (!content) {
-            logger.warn('missing bytes from packet');
-            return;
-        }
-        const totalLength = 1 + RECORD_LENGTH_BYTES + content.length;
-        handshakeRawMessages.push(handshakeData.slice(0, totalLength));
-        handshakeData = handshakeData.slice(totalLength);
-        return { type, content };
-    }
-    return {
-        tlsVersion: receipt.tlsVersion,
-        hostname: receipt.hostname,
-        transcript: receipt.transcript.slice(handshakeMsgs.lastMsgIndex)
-    };
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmVyaWZ5LXNlcnZlci1jZXJ0aWZpY2F0ZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvc2VydmVyL3V0aWxzL3ZlcmlmeS1zZXJ2ZXItY2VydGlmaWNhdGVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBbUJBLDREQWdIQztBQW5JRCw4Q0FNNkI7QUFDN0Isd0ZBQXlGO0FBRXpGLHFDQUEwRDtBQUcxRCxNQUFNLG1CQUFtQixHQUFHLENBQUMsQ0FBQTtBQUU3Qjs7OztHQUlHO0FBQ0ksS0FBSyxVQUFVLHdCQUF3QixDQUFDLE9BQTZCLEVBQUUsTUFBTTtJQUNuRixNQUFNLGFBQWEsR0FBRyxJQUFBLHNDQUE4QixFQUFDLE9BQU8sQ0FBQyxDQUFBO0lBQzdELElBQUksYUFBYSxHQUFHLElBQUEsNEJBQXNCLEVBQUMsYUFBYSxDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQTtJQUN0RixJQUFJLFVBQXlDLENBQUE7SUFDN0MsTUFBTSxvQkFBb0IsR0FBaUIsRUFBRSxDQUFBO0lBQzdDLE1BQU0sWUFBWSxHQUFzQixFQUFFLENBQUE7SUFDMUMsSUFBSSxXQUFXLEdBQTRCLFNBQVMsQ0FBQTtJQUNwRCxJQUFJLFlBQVksR0FBMkIsU0FBUyxDQUFBO0lBQ3BELElBQUksWUFBWSxHQUEyQixTQUFTLENBQUE7SUFFcEQsSUFBSSxZQUFZLEdBQUcsS0FBSyxDQUFBO0lBQ3hCLE9BQU0sQ0FBQyxVQUFVLEdBQUcsVUFBVSxFQUFFLENBQUMsSUFBSSxDQUFDLFlBQVksRUFBRSxDQUFDO1FBQ3BELE1BQU0sRUFBRSxJQUFJLEVBQUUsT0FBTyxFQUFFLEdBQUcsVUFBVSxDQUFBO1FBRXBDLFFBQVEsSUFBSSxFQUFFLENBQUM7WUFDZixLQUFLLCtCQUF5QixDQUFDLFlBQVk7Z0JBQzFDLE1BQU0sV0FBVyxHQUFHLElBQUEsc0JBQWdCLEVBQUMs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