@reclaimprotocol/attestor-core 4.0.3 → 5.0.1-beta.10

package/package.json

@@ -1,19 +1,39 @@
 {
   "name": "@reclaimprotocol/attestor-core",
-  "version": "4.0.3",
+  "version": "5.0.1-beta.10",
   "description": "",
-  "main": "lib/index",
+  "type": "module",
+  "main": "./lib/index.js",
+  "browser": "./lib/browser/index.js",
+  "types": "./lib/index.d.ts",
+  "imports": {
+    "#src/*.ts": "./src/*.ts"
+  },
+  "exports": {
+    ".": {
+      "types": "./lib/index.d.ts",
+      "browser": "./lib/browser/index.js",
+      "node": "./lib/index.js",
+      "default": "./lib/index.js"
+    },
+    "./external-rpc": {
+      "types": "./lib/external-rpc/index.d.ts",
+      "browser": "./lib/browser/external-rpc/index.js",
+      "node": "./lib/external-rpc/index.js",
+      "default": "./lib/external-rpc/index.js"
+    }
+  },
   "scripts": {
-    "build": "tsc -p tsconfig.build.json && tsc-alias",
+    "build": "tsc -p tsconfig.build.json && npm run run:tsc -- src/scripts/build-lib.ts",
     "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",
-    "start": "node lib/scripts/start-server",
-    "prepare": "sh ./src/scripts/prepare.sh",
-    "test": "NODE_ENV=test TZ=utc jest --verbose --forceExit --detectOpenHandles",
+    "run:tsc": "node --experimental-strip-types",
+    "start": "npm run run:tsc -- src/scripts/start-server.ts",
+    "prepare": "npm run build",
+    "run:test-files": "NODE_ENV=test TZ=utc npm run run:tsc -- --import=#src/tests/mocks.ts --experimental-test-module-mocks --test-force-exit",
+    "test": "npm run run:test-files -- --test src/tests/*.test.ts",
     "test:avs": "NODE_ENV=test TZ=utc jest --verbose --forceExit --detectOpenHandles --test-match **/src/avs/tests/test.*.ts",
-    "lint": "eslint ./ --ext .js,.ts,.jsx,.tsx",
-    "lint:fix": "eslint ./ --fix --ext .js,.ts,.jsx,.tsx",
+    "lint": "eslint .",
+    "lint:fix": "eslint . --fix",
     "generate:proto": "sh ./src/scripts/generate-proto.sh",
     "generate:contracts-data": "sh ./src/scripts/contract-data-gen.sh",
     "generate:provider-types": "npm run run:tsc -- src/scripts/generate-provider-types.ts",
@@ -26,7 +46,7 @@
     "check:avs-registration": "npm run run:tsc -- src/scripts/check-avs-registration.ts",
     "whitelist:operator": "npm run run:tsc -- src/scripts/whitelist-operator.ts",
     "update:avs-metadata": "npm run run:tsc -- src/scripts/update-avs-metadata.ts",
-    "generate:avs": "typechain -- --target ethers-v5 --out-dir src/avs/contracts avs/contracts/out/ReclaimServiceManager.sol/*.json",
+    "generate:avs": "typechain --target ethers-v6 --out-dir src/avs/contracts avs/contracts/out/ReclaimServiceManager.sol/*.json",
     "start:chain": "bash ./avs/utils/anvil/start-anvil-chain-with-el-and-avs-deployed.sh",
     "commitlint": "commitlint --edit",
     "download:zk-files": "node node_modules/@reclaimprotocol/zk-symmetric-crypto/lib/scripts/download-files",
@@ -63,63 +83,62 @@
   "author": "Adhiraj Singh",
   "license": "AGPL-3.0-only",
   "dependencies": {
-    "@bufbuild/protobuf": "^2.2.2",
-    "@commitlint/cli": "^17.8.1",
-    "@commitlint/config-conventional": "^17.8.1",
+    "@bufbuild/protobuf": "^2.11.0",
+    "@peculiar/asn1-x509": "^2.6.1",
+    "@peculiar/webcrypto": "^1.5.0",
+    "@peculiar/x509": "^1.14.3",
     "@reclaimprotocol/tls": "github:reclaimprotocol/tls",
-    "@reclaimprotocol/zk-symmetric-crypto": "^3.0.5",
-    "ajv": "^8.17.1",
-    "canonicalize": "^2.0.0",
-    "dotenv": "^16.4.6",
-    "elastic-apm-node": "^4.8.1",
+    "@reclaimprotocol/zk-symmetric-crypto": "^5.0.9",
+    "ajv": "^8.18.0",
+    "bs58": "^6.0.0",
+    "canonicalize": "^2.1.0",
+    "cbor-x": "^1.6.4",
+    "cose-js": "^0.9.0",
+    "dotenv": "^16.6.1",
+    "elastic-apm-node": "^4.15.0",
     "esprima-next": "^5.8.4",
-    "ethers": "^5.7.2",
-    "https-proxy-agent": "^7.0.5",
-    "ip-cidr": "^3.0.0",
-    "jsdom": "^24.1.3",
-    "jsonpath-plus": "^10.2.0",
-    "p-queue": "^8.0.1",
-    "pino": "^9.5.0",
-    "protobufjs": "^7.4.0",
-    "re2": "^1.21.4",
-    "serve-static": "^1.16.2",
-    "snarkjs": "^0.7.5",
-    "ws": "^8.18.0"
+    "ethers": "^6.16.0",
+    "https-proxy-agent": "^7.0.6",
+    "ip-cidr": "^3.1.0",
+    "jsonpath-plus": "^10.4.0",
+    "koffi": "^2.15.2",
+    "p-queue": "^8.1.1",
+    "parse5": "^8.0.0",
+    "parse5-htmlparser2-tree-adapter": "^8.0.0",
+    "pino": "^9.14.0",
+    "re2": "^1.23.3",
+    "serve-static": "^1.16.3",
+    "snarkjs": "^0.7.6",
+    "ws": "^8.20.0",
+    "xpath": "^0.0.34"
   },
   "devDependencies": {
     "@adiwajshing/eslint-config": "github:adiwajshing/eslint-config",
-    "@swc-node/register": "^1.10.9",
-    "@swc/core": "^1.9.3",
-    "@swc/jest": "^0.2.37",
-    "@typechain/ethers-v5": "^11.1.2",
-    "@types/chance": "^1.1.6",
-    "@types/jest": "^29.5.14",
+    "@commitlint/cli": "^17.8.1",
+    "@commitlint/config-conventional": "^17.8.1",
+    "@kayahr/text-encoding": "^2.1.0",
+    "@typechain/ethers-v6": "^0.5.1",
+    "@types/chance": "^1.1.7",
+    "@types/cose-js": "^0.8.3",
     "@types/jsdom": "^21.1.7",
-    "@types/node": "^20.17.9",
-    "@types/serve-static": "^1.15.7",
-    "@types/ws": "^8.5.13",
-    "chance": "^1.1.12",
-    "eslint": "^8.57.1",
-    "eslint-plugin-no-relative-import-paths": "^1.5.5",
-    "jest": "^29.7.0",
-    "json-schema-to-typescript": "^15.0.3",
-    "ts-loader": "^9.5.1",
-    "ts-proto": "^2.5.0",
-    "tsc-alias": "^1.8.10",
-    "tsconfig-paths-webpack-plugin": "^4.2.0",
+    "@types/node": "^22.19.15",
+    "@types/serve-static": "^1.15.10",
+    "@types/ws": "^8.18.1",
+    "chance": "^1.1.13",
+    "esbuild": "^0.25.12",
+    "eslint": "^9.39.4",
+    "eslint-plugin-no-relative-import-paths": "^1.6.1",
+    "event-target-shim": "^6.0.2",
+    "json-schema-to-typescript": "^15.0.4",
+    "ts-jest": "^29.4.6",
+    "ts-proto": "^2.11.6",
     "typechain": "^8.3.2",
-    "typescript": "^5.7.2",
-    "webpack": "^5.97.0",
-    "webpack-cli": "^5.1.4",
-    "yaml": "^2.6.1"
+    "typescript": "^5.9.3",
+    "whatwg-url": "^14.2.0",
+    "yaml": "^2.8.3"
   },
   "overrides": {
-    "@ethersproject/providers": {
-      "ws": "^7.5.10"
-    },
-    "elliptic": "^v6.5.7"
-  },
-  "optionalDependencies": {
-    "koffi": "^2.9.2"
+    "elliptic": "^6.6.1",
+    "underscore": "^1.13.8"
   }
 }

package/lib/avs/tests/test.operator.d.ts

@@ -1,11 +0,0 @@
-/**
- * This file tests the operator registration and task creation.
- * The tests were initially written using Node's own testing framework, but
- * later switched to Jest. Thus, the tests were initially written in a nested
- * format, but were later refactored to use Jest's `describe` and `it` functions.
- * Apologies for the hence resulting inconsistency in the code style.
- *
- * The nesting of tests is helpful as the tests logically depend on each other,
- * and the nesting helps save time by not repeating the same setup code.
- */
-export {};

package/lib/avs/tests/test.operator.js

@@ -1,313 +0,0 @@
-"use strict";
-/**
- * This file tests the operator registration and task creation.
- * The tests were initially written using Node's own testing framework, but
- * later switched to Jest. Thus, the tests were initially written in a nested
- * format, but were later refactored to use Jest's `describe` and `it` functions.
- * Apologies for the hence resulting inconsistency in the code style.
- *
- * The nesting of tests is helpful as the tests logically depend on each other,
- * and the nesting helps save time by not repeating the same setup code.
- */
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const ethers_1 = require("ethers");
-const utils_1 = require("ethers/lib/utils");
-const node_assert_1 = __importDefault(require("node:assert"));
-const create_claim_on_avs_1 = require("../../avs/client/create-claim-on-avs");
-const utils_2 = require("../../avs/tests/utils");
-const contracts_1 = require("../../avs/utils/contracts");
-const register_1 = require("../../avs/utils/register");
-const tasks_1 = require("../../avs/utils/tasks");
-const describe_with_server_1 = require("../../tests/describe-with-server");
-const utils_3 = require("../../utils");
-const contracts = (0, contracts_1.getContracts)();
-jest.setTimeout(60000);
-describe('Operators', () => {
-    let shutdownChain;
-    let operators = [];
-    const createClaimFn = jest.fn(() => {
-        throw new Error('Not implemented');
-    });
-    let registeredFirstOperator = false;
-    let registeredSecondOperator = false;
-    beforeAll(async () => {
-        shutdownChain = await (0, utils_2.runFreshChain)();
-        operators = [{ wallet: contracts.wallet, url: 'ws://example.com' }];
-        createClaimFn.mockImplementation(async ({ ownerPrivateKey, name, params, context, client, timestampS }) => {
-            if (!('url' in client)) {
-                throw new Error('Invalid client');
-            }
-            const op = operators
-                .find(op => op.url === client.url.toString());
-            if (!op) {
-                throw new Error('Operator not found: ' + client.url);
-            }
-            const userWallet = new ethers_1.Wallet(ownerPrivateKey, contracts.provider);
-            const data = (0, utils_3.createSignDataForClaim)({
-                provider: name,
-                parameters: (0, utils_3.canonicalStringify)(params),
-                context: context
-                    ? (0, utils_3.canonicalStringify)(context)
-                    : '',
-                timestampS: timestampS,
-                owner: userWallet.address,
-                epoch: 1
-            });
-            const signData = await op.wallet.signMessage(data);
-            const signArray = (0, utils_1.arrayify)(signData);
-            return {
-                signatures: { claimSignature: signArray }
-            };
-        });
-    });
-    afterAll(async () => {
-        await (shutdownChain === null || shutdownChain === void 0 ? void 0 : shutdownChain());
-    });
-    it('should prevent registration of non-whitelisted operator', async () => {
-        const op = randomWallet();
-        const url = 'ws://abcd.com/ws';
-        await (0, utils_2.sendGasToAddress)(op.address);
-        // using try-catch since jest.rejects.toMatchObject wasn't
-        // working as expected
-        try {
-            await (0, register_1.registerOperator)({
-                wallet: op,
-                reclaimRpcUrl: url
-            });
-            throw new Error('Should have thrown an error');
-        }
-        catch (err) {
-            expect(err.message).toMatch(/Operator not whitelisted/);
-        }
-    });
-    it('should prevent non-admins from modifying internal settings', async () => {
-        const nonAdmin = randomWallet();
-        await (0, utils_2.sendGasToAddress)(nonAdmin.address);
-        const contract = contracts.contract.connect(nonAdmin);
-        const OPS = [
-            () => (contract.whitelistAddressAsOperator(nonAdmin.address, true)),
-            () => (contract.updateTaskCreationMetadata({
-                minSignaturesPerTask: 2,
-                maxTaskLifetimeS: 10,
-                maxTaskCreationDelayS: 0
-            }))
-        ];
-        for (const op of OPS) {
-            try {
-                await op();
-                throw new Error('Should have thrown an error');
-            }
-            catch (err) {
-                expect(err.message).toMatch(/Caller is not admin/);
-            }
-        }
-    });
-    it('should register the operator on chain', async () => {
-        await registerFirstOperator();
-    });
-    it('should not throw an error on repeated registration', async () => {
-        await registerFirstOperator();
-        await (0, register_1.registerOperator)();
-    });
-    it('should register multiple operators', async () => {
-        await registerFirstOperator();
-        await registerSecondOperator();
-    });
-    describe('With Task', () => {
-        let userWallet;
-        let arg;
-        beforeAll(async () => {
-            await registerFirstOperator();
-            await registerSecondOperator();
-            userWallet = randomWallet();
-            await (0, utils_2.sendGasToAddress)(userWallet.address);
-        });
-        it('should create a task', async () => {
-            arg = await createNewTask(userWallet);
-        });
-        it('should mark a task as completed', async () => {
-            if (!arg) {
-                arg = await createNewTask(userWallet);
-            }
-            await markTaskAsCompleted(userWallet, arg);
-        });
-        it('should create a task for another wallet', async () => {
-            const ownerWallet = randomWallet();
-            const rslt = await createNewTask(userWallet, ownerWallet);
-            node_assert_1.default.strictEqual(rslt.task.request.owner, ownerWallet.address);
-        });
-    });
-    (0, describe_with_server_1.describeWithServer)('With Task & Attestor Server', opts => {
-        beforeAll(async () => {
-            await registerFirstOperator();
-            await registerSecondOperator();
-        });
-        it('should create claim via createClaimOnChain', createClaimViaFn);
-        it('should make attestor pay for claim', async () => {
-            const userWallet = randomWallet();
-            const { object: rslt } = await (0, create_claim_on_avs_1.createClaimOnAvs)({
-                ownerPrivateKey: userWallet.privateKey,
-                name: 'http',
-                params: {
-                    url: 'https://example.com',
-                    method: 'GET',
-                    responseRedactions: [],
-                    responseMatches: [
-                        {
-                            type: 'contains',
-                            value: 'test'
-                        }
-                    ]
-                },
-                secretParams: {},
-                payer: { attestor: opts.serverUrl },
-                createClaimOnAttestor: createClaimFn
-            });
-            node_assert_1.default.strictEqual(rslt.task.task.request.owner, userWallet.address);
-        });
-    });
-    async function registerFirstOperator() {
-        if (registeredFirstOperator) {
-            return;
-        }
-        // fetch address from the env variable, PRIVATE_KEY
-        const operatorAddress = await contracts.wallet.address;
-        await (0, utils_2.sendGasToAddress)(operatorAddress);
-        await contracts.contract.whitelistAddressAsOperator(operatorAddress, true);
-        await (0, register_1.registerOperator)({
-            wallet: operators[0].wallet,
-            reclaimRpcUrl: operators[0].url
-        });
-        node_assert_1.default.strictEqual(await contracts.registryContract
-            .operatorRegistered(operatorAddress), true);
-        const op = await contracts.contract.registeredOperators(0);
-        node_assert_1.default.strictEqual(op.addr, operatorAddress);
-        registeredFirstOperator = true;
-    }
-    async function registerSecondOperator() {
-        if (registeredSecondOperator) {
-            return;
-        }
-        const wallet2 = randomWallet();
-        const url = 'ws://abcd.com/ws';
-        await (0, utils_2.sendGasToAddress)(wallet2.address);
-        await contracts.contract.whitelistAddressAsOperator(wallet2.address, true);
-        await (0, register_1.registerOperator)({
-            wallet: wallet2,
-            reclaimRpcUrl: url
-        });
-        const newAddr = wallet2.address;
-        node_assert_1.default.strictEqual(await contracts.registryContract.operatorRegistered(newAddr), true);
-        const meta = await contracts.contract
-            .getMetadataForOperator(newAddr);
-        node_assert_1.default.strictEqual(meta.url, url);
-        node_assert_1.default.strictEqual(meta.addr, newAddr);
-        operators.push({ wallet: wallet2, url });
-        registeredSecondOperator = true;
-    }
-    async function createNewTask(userWallet, claimOwner = userWallet) {
-        var _a, _b;
-        const params = makeNewCreateClaimParams();
-        const { task } = await (0, tasks_1.createNewClaimRequestOnChain)({
-            request: {
-                provider: params.provider,
-                claimUserId: new Uint8Array(32),
-                claimHash: (0, utils_3.getIdentifierFromClaimInfo)(params),
-                requestedAt: (0, utils_3.unixTimestampSeconds)(),
-            },
-            payer: userWallet,
-            owner: claimOwner
-        });
-        node_assert_1.default.strictEqual(!!task, true);
-        node_assert_1.default.equal((_b = (_a = task === null || task === void 0 ? void 0 : task.task) === null || _a === void 0 ? void 0 : _a.request) === null || _b === void 0 ? void 0 : _b.provider, params.provider);
-        return task;
-    }
-    async function markTaskAsCompleted(userWallet, { task, taskIndex }) {
-        var _a;
-        node_assert_1.default.ok(task.operators.length > 0, 'No operators selected for the task');
-        const req = task.request;
-        const signData = (0, utils_3.createSignDataForClaim)({
-            identifier: req.claimHash,
-            timestampS: +task.createdAt.toString(),
-            owner: userWallet.address,
-            epoch: 1
-        });
-        const signatures = [];
-        for (const { wallet: operator } of operators) {
-            const opAddr = operator.address;
-            const selectedOp = task.operators
-                .some(op => op.addr === opAddr);
-            if (!selectedOp) {
-                continue;
-            }
-            const signature = await operator
-                .signMessage(signData);
-            signatures.push(signature);
-        }
-        node_assert_1.default.strictEqual(signatures.length, task.operators.length);
-        const tx = await contracts.contract
-            .connect(userWallet)
-            .taskCompleted({ task, signatures }, taskIndex);
-        const rslt = await tx.wait();
-        const events = rslt.events;
-        const arg = (_a = events === null || events === void 0 ? void 0 : events[0]) === null || _a === void 0 ? void 0 : _a.args;
-        node_assert_1.default.strictEqual(events === null || events === void 0 ? void 0 : events.length, 1);
-        node_assert_1.default.ok(arg.task);
-    }
-    async function createClaimViaFn() {
-        const tx = await contracts.contract.updateTaskCreationMetadata({
-            minSignaturesPerTask: 2,
-            maxTaskLifetimeS: 0,
-            maxTaskCreationDelayS: 0
-        });
-        await tx.wait();
-        console.log('min sigs set to 2');
-        const userWallet = randomWallet();
-        await (0, utils_2.sendGasToAddress)(userWallet.address);
-        const { object: rslt } = await (0, create_claim_on_avs_1.createClaimOnAvs)({
-            ownerPrivateKey: userWallet.privateKey,
-            name: 'http',
-            params: {
-                url: 'https://example.com',
-                method: 'GET',
-                responseRedactions: [],
-                responseMatches: [
-                    {
-                        type: 'contains',
-                        value: 'test'
-                    }
-                ]
-            },
-            secretParams: {},
-            createClaimOnAttestor: createClaimFn
-        });
-        // ensure two operators were selected
-        node_assert_1.default.equal(rslt.task.task.operators.length, 2);
-        node_assert_1.default.equal(rslt.task.signatures.length, 2);
-    }
-});
-function randomWallet() {
-    return ethers_1.Wallet.createRandom()
-        .connect(contracts.provider);
-}
-function makeNewCreateClaimParams() {
-    return {
-        provider: 'http',
-        parameters: (0, utils_3.canonicalStringify)({
-            url: 'https://example.com',
-            method: 'GET',
-            responseRedactions: [],
-            responseMatches: [
-                {
-                    type: 'contains',
-                    value: 'test'
-                }
-            ]
-        }),
-        context: ''
-    };
-}
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"test.operator.js","sourceRoot":"","sources":["../../../src/avs/tests/test.operator.ts"],"names":[],"mappings":"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"}

package/lib/avs/tests/utils.d.ts

@@ -1,2 +0,0 @@
-export declare function runFreshChain(): Promise<() => Promise<void>>;
-export declare function sendGasToAddress(address: string): Promise<void>;

package/lib/avs/tests/utils.js

@@ -1,50 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.runFreshChain = runFreshChain;
-exports.sendGasToAddress = sendGasToAddress;
-const child_process_1 = require("child_process");
-async function runFreshChain() {
-    const task = (0, child_process_1.spawn)('npm', ['run', 'start:chain']);
-    task.stderr.pipe(process.stderr);
-    await new Promise((resolve, reject) => {
-        task.stdout.on('data', (data) => {
-            if (data.toString().includes('advancing chain...')) {
-                resolve();
-            }
-        });
-        task.on('exit', (code) => {
-            reject(`Exited with code ${code || 0}`);
-        });
-    });
-    console.log('Anvil chain booted');
-    return async () => {
-        process.kill(task.pid, 'SIGTERM');
-        await new Promise((resolve) => {
-            task.on('exit', resolve);
-        });
-        console.log('Chain shutdown');
-    };
-}
-async function sendGasToAddress(address) {
-    const task = (0, child_process_1.spawn)('cast', [
-        'send',
-        address,
-        '--value',
-        '10ether',
-        '--private-key',
-        '0x2a871d0798f97d79848a013d4936a73bf4cc922c825d33c1cf7073dff6d409c6'
-    ]);
-    task.stdout.pipe(process.stdout);
-    task.stderr.pipe(process.stderr);
-    await new Promise((resolve, reject) => {
-        task.on('exit', (code) => {
-            if (code === 0) {
-                resolve();
-            }
-            else {
-                reject(`Gas add process exited with code ${code || 0}`);
-            }
-        });
-    });
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvYXZzL3Rlc3RzL3V0aWxzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBRUEsc0NBd0JDO0FBRUQsNENBc0JDO0FBbERELGlEQUFxQztBQUU5QixLQUFLLFVBQVUsYUFBYTtJQUNsQyxNQUFNLElBQUksR0FBRyxJQUFBLHFCQUFLLEVBQUMsS0FBSyxFQUFFLENBQUMsS0FBSyxFQUFFLGFBQWEsQ0FBQyxDQUFDLENBQUE7SUFDakQsSUFBSSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQUFBO0lBQ2hDLE1BQU0sSUFBSSxPQUFPLENBQU8sQ0FBQyxPQUFPLEVBQUUsTUFBTSxFQUFFLEVBQUU7UUFDM0MsSUFBSSxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUMsTUFBTSxFQUFFLENBQUMsSUFBSSxFQUFFLEVBQUU7WUFDL0IsSUFBRyxJQUFJLENBQUMsUUFBUSxFQUFFLENBQUMsUUFBUSxDQUFDLG9CQUFvQixDQUFDLEVBQUUsQ0FBQztnQkFDbkQsT0FBTyxFQUFFLENBQUE7WUFDVixDQUFDO1FBQ0YsQ0FBQyxDQUFDLENBQUE7UUFDRixJQUFJLENBQUMsRUFBRSxDQUFDLE1BQU0sRUFBRSxDQUFDLElBQUksRUFBRSxFQUFFO1lBQ3hCLE1BQU0sQ0FBQyxvQkFBb0IsSUFBSSxJQUFJLENBQUMsRUFBRSxDQUFDLENBQUE7UUFDeEMsQ0FBQyxDQUFDLENBQUE7SUFDSCxDQUFDLENBQUMsQ0FBQTtJQUVGLE9BQU8sQ0FBQyxHQUFHLENBQUMsb0JBQW9CLENBQUMsQ0FBQTtJQUVqQyxPQUFPLEtBQUssSUFBRyxFQUFFO1FBQ2hCLE9BQU8sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLEdBQUksRUFBRSxTQUFTLENBQUMsQ0FBQTtRQUNsQyxNQUFNLElBQUksT0FBTyxDQUFPLENBQUMsT0FBTyxFQUFFLEVBQUU7WUFDbkMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxNQUFNLEVBQUUsT0FBTyxDQUFDLENBQUE7UUFDekIsQ0FBQyxDQUFDLENBQUE7UUFFRixPQUFPLENBQUMsR0FBRyxDQUFDLGdCQUFnQixDQUFDLENBQUE7SUFDOUIsQ0FBQyxDQUFBO0FBQ0YsQ0FBQztBQUVNLEtBQUssVUFBVSxnQkFBZ0IsQ0FBQyxPQUFlO0lBQ3JELE1BQU0sSUFBSSxHQUFHLElBQUEscUJBQUssRUFBQyxNQUFNLEVBQUU7UUFDMUIsTUFBTTtRQUNOLE9BQU87UUFDUCxTQUFTO1FBQ1QsU0FBUztRQUNULGVBQWU7UUFDZixvRUFBb0U7S0FDcEUsQ0FBQyxDQUFBO0lBRUYsSUFBSSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQUFBO0lBQ2hDLElBQUksQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUMsQ0FBQTtJQUVoQyxNQUFNLElBQUksT0FBTyxDQUFPLENBQUMsT0FBTyxFQUFFLE1BQU0sRUFBRSxFQUFFO1FBQzNDLElBQUksQ0FBQyxFQUFFLENBQUMsTUFBTSxFQUFFLENBQUMsSUFBSSxFQUFFLEVBQUU7WUFDeEIsSUFBRyxJQUFJLEtBQUssQ0FBQyxFQUFFLENBQUM7Z0JBQ2YsT0FBTyxFQUFFLENBQUE7WUFDVixDQUFDO2lCQUFNLENBQUM7Z0JBQ1AsTUFBTSxDQUFDLG9DQUFvQyxJQUFJLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FBQTtZQUN4RCxDQUFDO1FBQ0YsQ0FBQyxDQUFDLENBQUE7SUFDSCxDQUFDLENBQUMsQ0FBQTtBQUNILENBQUMifQ==

package/lib/scripts/verify-root-ca.d.ts

@@ -1 +0,0 @@
-export declare function main(): Promise<void>;

package/lib/scripts/verify-root-ca.js

@@ -1,51 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.main = main;
-const tls_1 = require("@reclaimprotocol/tls");
-const parse_certificate_1 = require("@reclaimprotocol/tls/lib/utils/parse-certificate");
-const net_1 = require("net");
-const config_1 = require("../config");
-const utils_1 = require("../utils");
-const hostPort = process.argv[2];
-async function main() {
-    const [host, port] = hostPort.split(':');
-    const socket = new net_1.Socket();
-    let rootIssuer = '';
-    let certError;
-    const tls = (0, tls_1.makeTLSClient)({
-        host,
-        logger: utils_1.logger,
-        verifyServerCertificate: false,
-        async onRecvCertificates({ certificates }) {
-            rootIssuer = certificates[certificates.length - 1].internal.issuer;
-            utils_1.logger.info({ rootIssuer }, 'received certificates');
-            try {
-                await (0, parse_certificate_1.verifyCertificateChain)(certificates, host);
-                utils_1.logger.info('root CA in store. Successfully verified certificate chain');
-            }
-            catch (err) {
-                certError = err;
-            }
-        },
-        async onHandshake() {
-            await tls.end();
-            socket.end();
-            if (certError) {
-                // wait for everything else to log
-                setTimeout(() => {
-                    utils_1.logger.info({ err: certError.message, rootIssuer }, 'error in cert verify');
-                }, 500);
-            }
-        },
-        async write({ header, content }) {
-            socket.write(header);
-            socket.write(content);
-        }
-    });
-    socket.once('connect', () => tls.startHandshake());
-    socket.on('data', tls.handleReceivedBytes);
-    utils_1.logger.info(`connecting to ${hostPort}`);
-    socket.connect({ host, port: +(port || config_1.DEFAULT_HTTPS_PORT) });
-}
-void main();
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmVyaWZ5LXJvb3QtY2EuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvc2NyaXB0cy92ZXJpZnktcm9vdC1jYS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQVFBLG9CQWdEQztBQXhERCw4Q0FBb0Q7QUFDcEQsd0ZBQXlGO0FBQ3pGLDZCQUE0QjtBQUM1Qix1Q0FBK0M7QUFDL0MscUNBQWtDO0FBRWxDLE1BQU0sUUFBUSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUE7QUFFekIsS0FBSyxVQUFVLElBQUk7SUFDekIsTUFBTSxDQUFDLElBQUksRUFBRSxJQUFJLENBQUMsR0FBRyxRQUFRLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFBO0lBQ3hDLE1BQU0sTUFBTSxHQUFHLElBQUksWUFBTSxFQUFFLENBQUE7SUFDM0IsSUFBSSxVQUFVLEdBQUcsRUFBRSxDQUFBO0lBQ25CLElBQUksU0FBNEIsQ0FBQTtJQUNoQyxNQUFNLEdBQUcsR0FBRyxJQUFBLG1CQUFhLEVBQUM7UUFDekIsSUFBSTtRQUNKLE1BQU0sRUFBTixjQUFNO1FBQ04sdUJBQXVCLEVBQUUsS0FBSztRQUM5QixLQUFLLENBQUMsa0JBQWtCLENBQUMsRUFBRSxZQUFZLEVBQUU7WUFDeEMsVUFBVSxHQUFHLFlBQVksQ0FBQyxZQUFZLENBQUMsTUFBTSxHQUFHLENBQUMsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxNQUFNLENBQUE7WUFDbEUsY0FBTSxDQUFDLElBQUksQ0FBQyxFQUFFLFVBQVUsRUFBRSxFQUFFLHVCQUF1QixDQUFDLENBQUE7WUFDcEQsSUFBSSxDQUFDO2dCQUNKLE1BQU0sSUFBQSwwQ0FBc0IsRUFBQyxZQUFZLEVBQUUsSUFBSSxDQUFDLENBQUE7Z0JBQ2hELGNBQU0sQ0FBQyxJQUFJLENBQUMsMkRBQTJELENBQUMsQ0FBQTtZQUN6RSxDQUFDO1lBQUMsT0FBTSxHQUFHLEVBQUUsQ0FBQztnQkFDYixTQUFTLEdBQUcsR0FBRyxDQUFBO1lBQ2hCLENBQUM7UUFDRixDQUFDO1FBQ0QsS0FBSyxDQUFDLFdBQVc7WUFDaEIsTUFBTSxHQUFHLENBQUMsR0FBRyxFQUFFLENBQUE7WUFDZixNQUFNLENBQUMsR0FBRyxFQUFFLENBQUE7WUFFWixJQUFHLFNBQVMsRUFBRSxDQUFDO2dCQUNkLGtDQUFrQztnQkFDbEMsVUFBVSxDQUNULEdBQUcsRUFBRTtvQkFDSixjQUFNLENBQUMsSUFBSSxDQUNWLEVBQUUsR0FBRyxFQUFFLFNBQVUsQ0FBQyxPQUFPLEVBQUUsVUFBVSxFQUFFLEVBQ3ZDLHNCQUFzQixDQUN0QixDQUFBO2dCQUNGLENBQUMsRUFDRCxHQUFHLENBQ0gsQ0FBQTtZQUNGLENBQUM7UUFDRixDQUFDO1FBQ0QsS0FBSyxDQUFDLEtBQUssQ0FBQyxFQUFFLE1BQU0sRUFBRSxPQUFPLEVBQUU7WUFDOUIsTUFBTSxDQUFDLEtBQUssQ0FBQyxNQUFNLENBQUMsQ0FBQTtZQUNwQixNQUFNLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxDQUFBO1FBQ3RCLENBQUM7S0FDRCxDQUFDLENBQUE7SUFFRixNQUFNLENBQUMsSUFBSSxDQUFDLFNBQVMsRUFBRSxHQUFHLEVBQUUsQ0FBQyxHQUFHLENBQUMsY0FBYyxFQUFFLENBQUMsQ0FBQTtJQUNsRCxNQUFNLENBQUMsRUFBRSxDQUFDLE1BQU0sRUFBRSxHQUFHLENBQUMsbUJBQW1CLENBQUMsQ0FBQTtJQUUxQyxjQUFNLENBQUMsSUFBSSxDQUFDLGlCQUFpQixRQUFRLEVBQUUsQ0FBQyxDQUFBO0lBRXhDLE1BQU0sQ0FBQyxPQUFPLENBQUMsRUFBRSxJQUFJLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQyxJQUFJLElBQUksMkJBQWtCLENBQUMsRUFBRSxDQUFDLENBQUE7QUFDOUQsQ0FBQztBQUVELEtBQUssSUFBSSxFQUFFLENBQUEifQ==