@reclaimprotocol/attestor-core 4.0.2 → 5.0.1-beta.1

package/README.md

@@ -6,7 +6,6 @@
     </div>
 </div>
 
-
 ![Test status](https://github.com/ReclaimProtocol/attestor-core/actions/workflows/ci-cd.yml/badge.svg?job=test)
 ![Deploy status](https://github.com/ReclaimProtocol/attestor-core/actions/workflows/ci-cd.yml/badge.svg?job=deploy)
 
@@ -92,4 +91,4 @@ For Indie Hackers: [Check out our guidelines and potential grant opportunities](
 
 This project is licensed under a [AGPL v3](./LICENSE). By contributing to this project, you agree that your contributions will be licensed under its terms.
 
-Thank you for your contributions!
+Thank you for your contributions!

package/package.json

@@ -1,19 +1,32 @@
 {
   "name": "@reclaimprotocol/attestor-core",
-  "version": "4.0.2",
+  "version": "5.0.1-beta.1",
   "description": "",
-  "main": "lib/index",
+  "type": "module",
+  "imports": {
+    "#src/*.ts": "./src/*.ts"
+  },
+  "exports": {
+    ".": {
+      "types": "./lib/index.d.ts",
+      "default": "./lib/index.js"
+    },
+    "./external-rpc": {
+      "types": "./lib/external-rpc/index.d.ts",
+      "default": "./lib/external-rpc/index.js"
+    }
+  },
   "scripts": {
-    "build": "tsc -p tsconfig.build.json && tsc-alias",
+    "build": "tsc -p tsconfig.build.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",
-    "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 +39,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 +76,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/abis/avsDirectoryABI.d.ts

@@ -1,60 +0,0 @@
-export declare const avsDirectoryABI: ({
-    type: string;
-    inputs: {
-        name: string;
-        type: string;
-        internalType: string;
-    }[];
-    stateMutability: string;
-    name?: undefined;
-    outputs?: undefined;
-    anonymous?: undefined;
-} | {
-    type: string;
-    name: string;
-    inputs: {
-        name: string;
-        type: string;
-        internalType: string;
-    }[];
-    outputs: {
-        name: string;
-        type: string;
-        internalType: string;
-    }[];
-    stateMutability: string;
-    anonymous?: undefined;
-} | {
-    type: string;
-    name: string;
-    inputs: ({
-        name: string;
-        type: string;
-        internalType: string;
-        components?: undefined;
-    } | {
-        name: string;
-        type: string;
-        internalType: string;
-        components: {
-            name: string;
-            type: string;
-            internalType: string;
-        }[];
-    })[];
-    outputs: never[];
-    stateMutability: string;
-    anonymous?: undefined;
-} | {
-    type: string;
-    name: string;
-    inputs: {
-        name: string;
-        type: string;
-        indexed: boolean;
-        internalType: string;
-    }[];
-    anonymous: boolean;
-    stateMutability?: undefined;
-    outputs?: undefined;
-})[];

package/lib/avs/abis/avsDirectoryABI.js

@@ -1,344 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.avsDirectoryABI = void 0;
-exports.avsDirectoryABI = [
-    {
-        type: "constructor",
-        inputs: [
-            {
-                name: "_delegation",
-                type: "address",
-                internalType: "contract IDelegationManager",
-            },
-        ],
-        stateMutability: "nonpayable",
-    },
-    {
-        type: "function",
-        name: "DOMAIN_TYPEHASH",
-        inputs: [],
-        outputs: [{ name: "", type: "bytes32", internalType: "bytes32" }],
-        stateMutability: "view",
-    },
-    {
-        type: "function",
-        name: "OPERATOR_AVS_REGISTRATION_TYPEHASH",
-        inputs: [],
-        outputs: [{ name: "", type: "bytes32", internalType: "bytes32" }],
-        stateMutability: "view",
-    },
-    {
-        type: "function",
-        name: "avsOperatorStatus",
-        inputs: [
-            { name: "", type: "address", internalType: "address" },
-            { name: "", type: "address", internalType: "address" },
-        ],
-        outputs: [
-            {
-                name: "",
-                type: "uint8",
-                internalType: "enum IAVSDirectory.OperatorAVSRegistrationStatus",
-            },
-        ],
-        stateMutability: "view",
-    },
-    {
-        type: "function",
-        name: "calculateOperatorAVSRegistrationDigestHash",
-        inputs: [
-            { name: "operator", type: "address", internalType: "address" },
-            { name: "avs", type: "address", internalType: "address" },
-            { name: "salt", type: "bytes32", internalType: "bytes32" },
-            { name: "expiry", type: "uint256", internalType: "uint256" },
-        ],
-        outputs: [{ name: "", type: "bytes32", internalType: "bytes32" }],
-        stateMutability: "view",
-    },
-    {
-        type: "function",
-        name: "cancelSalt",
-        inputs: [{ name: "salt", type: "bytes32", internalType: "bytes32" }],
-        outputs: [],
-        stateMutability: "nonpayable",
-    },
-    {
-        type: "function",
-        name: "delegation",
-        inputs: [],
-        outputs: [
-            {
-                name: "",
-                type: "address",
-                internalType: "contract IDelegationManager",
-            },
-        ],
-        stateMutability: "view",
-    },
-    {
-        type: "function",
-        name: "deregisterOperatorFromAVS",
-        inputs: [{ name: "operator", type: "address", internalType: "address" }],
-        outputs: [],
-        stateMutability: "nonpayable",
-    },
-    {
-        type: "function",
-        name: "domainSeparator",
-        inputs: [],
-        outputs: [{ name: "", type: "bytes32", internalType: "bytes32" }],
-        stateMutability: "view",
-    },
-    {
-        type: "function",
-        name: "initialize",
-        inputs: [
-            { name: "initialOwner", type: "address", internalType: "address" },
-            {
-                name: "_pauserRegistry",
-                type: "address",
-                internalType: "contract IPauserRegistry",
-            },
-            { name: "initialPausedStatus", type: "uint256", internalType: "uint256" },
-        ],
-        outputs: [],
-        stateMutability: "nonpayable",
-    },
-    {
-        type: "function",
-        name: "operatorSaltIsSpent",
-        inputs: [
-            { name: "", type: "address", internalType: "address" },
-            { name: "", type: "bytes32", internalType: "bytes32" },
-        ],
-        outputs: [{ name: "", type: "bool", internalType: "bool" }],
-        stateMutability: "view",
-    },
-    {
-        type: "function",
-        name: "owner",
-        inputs: [],
-        outputs: [{ name: "", type: "address", internalType: "address" }],
-        stateMutability: "view",
-    },
-    {
-        type: "function",
-        name: "pause",
-        inputs: [
-            { name: "newPausedStatus", type: "uint256", internalType: "uint256" },
-        ],
-        outputs: [],
-        stateMutability: "nonpayable",
-    },
-    {
-        type: "function",
-        name: "pauseAll",
-        inputs: [],
-        outputs: [],
-        stateMutability: "nonpayable",
-    },
-    {
-        type: "function",
-        name: "paused",
-        inputs: [{ name: "index", type: "uint8", internalType: "uint8" }],
-        outputs: [{ name: "", type: "bool", internalType: "bool" }],
-        stateMutability: "view",
-    },
-    {
-        type: "function",
-        name: "paused",
-        inputs: [],
-        outputs: [{ name: "", type: "uint256", internalType: "uint256" }],
-        stateMutability: "view",
-    },
-    {
-        type: "function",
-        name: "pauserRegistry",
-        inputs: [],
-        outputs: [
-            { name: "", type: "address", internalType: "contract IPauserRegistry" },
-        ],
-        stateMutability: "view",
-    },
-    {
-        type: "function",
-        name: "registerOperatorToAVS",
-        inputs: [
-            { name: "operator", type: "address", internalType: "address" },
-            {
-                name: "operatorSignature",
-                type: "tuple",
-                internalType: "struct ISignatureUtils.SignatureWithSaltAndExpiry",
-                components: [
-                    { name: "signature", type: "bytes", internalType: "bytes" },
-                    { name: "salt", type: "bytes32", internalType: "bytes32" },
-                    { name: "expiry", type: "uint256", internalType: "uint256" },
-                ],
-            },
-        ],
-        outputs: [],
-        stateMutability: "nonpayable",
-    },
-    {
-        type: "function",
-        name: "renounceOwnership",
-        inputs: [],
-        outputs: [],
-        stateMutability: "nonpayable",
-    },
-    {
-        type: "function",
-        name: "setPauserRegistry",
-        inputs: [
-            {
-                name: "newPauserRegistry",
-                type: "address",
-                internalType: "contract IPauserRegistry",
-            },
-        ],
-        outputs: [],
-        stateMutability: "nonpayable",
-    },
-    {
-        type: "function",
-        name: "transferOwnership",
-        inputs: [{ name: "newOwner", type: "address", internalType: "address" }],
-        outputs: [],
-        stateMutability: "nonpayable",
-    },
-    {
-        type: "function",
-        name: "unpause",
-        inputs: [
-            { name: "newPausedStatus", type: "uint256", internalType: "uint256" },
-        ],
-        outputs: [],
-        stateMutability: "nonpayable",
-    },
-    {
-        type: "function",
-        name: "updateAVSMetadataURI",
-        inputs: [{ name: "metadataURI", type: "string", internalType: "string" }],
-        outputs: [],
-        stateMutability: "nonpayable",
-    },
-    {
-        type: "event",
-        name: "AVSMetadataURIUpdated",
-        inputs: [
-            { name: "avs", type: "address", indexed: true, internalType: "address" },
-            {
-                name: "metadataURI",
-                type: "string",
-                indexed: false,
-                internalType: "string",
-            },
-        ],
-        anonymous: false,
-    },
-    {
-        type: "event",
-        name: "Initialized",
-        inputs: [
-            { name: "version", type: "uint8", indexed: false, internalType: "uint8" },
-        ],
-        anonymous: false,
-    },
-    {
-        type: "event",
-        name: "OperatorAVSRegistrationStatusUpdated",
-        inputs: [
-            {
-                name: "operator",
-                type: "address",
-                indexed: true,
-                internalType: "address",
-            },
-            { name: "avs", type: "address", indexed: true, internalType: "address" },
-            {
-                name: "status",
-                type: "uint8",
-                indexed: false,
-                internalType: "enum IAVSDirectory.OperatorAVSRegistrationStatus",
-            },
-        ],
-        anonymous: false,
-    },
-    {
-        type: "event",
-        name: "OwnershipTransferred",
-        inputs: [
-            {
-                name: "previousOwner",
-                type: "address",
-                indexed: true,
-                internalType: "address",
-            },
-            {
-                name: "newOwner",
-                type: "address",
-                indexed: true,
-                internalType: "address",
-            },
-        ],
-        anonymous: false,
-    },
-    {
-        type: "event",
-        name: "Paused",
-        inputs: [
-            {
-                name: "account",
-                type: "address",
-                indexed: true,
-                internalType: "address",
-            },
-            {
-                name: "newPausedStatus",
-                type: "uint256",
-                indexed: false,
-                internalType: "uint256",
-            },
-        ],
-        anonymous: false,
-    },
-    {
-        type: "event",
-        name: "PauserRegistrySet",
-        inputs: [
-            {
-                name: "pauserRegistry",
-                type: "address",
-                indexed: false,
-                internalType: "contract IPauserRegistry",
-            },
-            {
-                name: "newPauserRegistry",
-                type: "address",
-                indexed: false,
-                internalType: "contract IPauserRegistry",
-            },
-        ],
-        anonymous: false,
-    },
-    {
-        type: "event",
-        name: "Unpaused",
-        inputs: [
-            {
-                name: "account",
-                type: "address",
-                indexed: true,
-                internalType: "address",
-            },
-            {
-                name: "newPausedStatus",
-                type: "uint256",
-                indexed: false,
-                internalType: "uint256",
-            },
-        ],
-        anonymous: false,
-    },
-];
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"avsDirectoryABI.js","sourceRoot":"","sources":["../../../src/avs/abis/avsDirectoryABI.ts"],"names":[],"mappings":";;;AAAa,QAAA,eAAe,GAAG;IAC7B;QACE,IAAI,EAAE,aAAa;QACnB,MAAM,EAAE;YACN;gBACE,IAAI,EAAE,aAAa;gBACnB,IAAI,EAAE,SAAS;gBACf,YAAY,EAAE,6BAA6B;aAC5C;SACF;QACD,eAAe,EAAE,YAAY;KAC9B;IACD;QACE,IAAI,EAAE,UAAU;QAChB,IAAI,EAAE,iBAAiB;QACvB,MAAM,EAAE,EAAE;QACV,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,YAAY,EAAE,SAAS,EAAE,CAAC;QACjE,eAAe,EAAE,MAAM;KACxB;IACD;QACE,IAAI,EAAE,UAAU;QAChB,IAAI,EAAE,oCAAoC;QAC1C,MAAM,EAAE,EAAE;QACV,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,YAAY,EAAE,SAAS,EAAE,CAAC;QACjE,eAAe,EAAE,MAAM;KACxB;IACD;QACE,IAAI,EAAE,UAAU;QAChB,IAAI,EAAE,mBAAmB;QACzB,MAAM,EAAE;YACN,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,YAAY,EAAE,SAAS,EAAE;YACtD,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,YAAY,EAAE,SAAS,EAAE;SACvD;QACD,OAAO,EAAE;YACP;gBACE,IAAI,EAAE,EAAE;gBACR,IAAI,EAAE,OAAO;gBACb,YAAY,EAAE,kDAAkD;aACjE;SACF;QACD,eAAe,EAAE,MAAM;KACxB;IACD;QACE,IAAI,EAAE,UAAU;QAChB,IAAI,EAAE,4CAA4C;QAClD,MAAM,EAAE;YACN,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,SAAS,EAAE,YAAY,EAAE,SAAS,EAAE;YAC9D,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,YAAY,EAAE,SAAS,EAAE;YACzD,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,YAAY,EAAE,SAAS,EAAE;YAC1D,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,YAAY,EAAE,SAAS,EAAE;SAC7D;QACD,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,YAAY,EAAE,SAAS,EAAE,CAAC;QACjE,eAAe,EAAE,MAAM;KACxB;IACD;QACE,IAAI,EAAE,UAAU;QAChB,IAAI,EAAE,YAAY;QAClB,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,YAAY,EAAE,SAAS,EAAE,CAAC;QACpE,OAAO,EAAE,EAAE;QACX,eAAe,EAAE,YAAY;KAC9B;IACD;QACE,IAAI,EAAE,UAAU;QAChB,IAAI,EAAE,YAAY;QAClB,MAAM,EAAE,EAAE;QACV,OAAO,EAAE;YACP;gBACE,IAAI,EAAE,EAAE;gBACR,IAAI,EAAE,SAAS;gBACf,YAAY,EAAE,6BAA6B;aAC5C;SACF;QACD,eAAe,EAAE,MAAM;KACxB;IACD;QACE,IAAI,EAAE,UAAU;QAChB,IAAI,EAAE,2BAA2B;QACjC,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,SAAS,EAAE,YAAY,EAAE,SAAS,EAAE,CAAC;QACxE,OAAO,EAAE,EAAE;QACX,eAAe,EAAE,YAAY;KAC9B;IACD;QACE,IAAI,EAAE,UAAU;QAChB,IAAI,EAAE,iBAAiB;QACvB,MAAM,EAAE,EAAE;QACV,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,YAAY,EAAE,SAAS,EAAE,CAAC;QACjE,eAAe,EAAE,MAAM;KACxB;IACD;QACE,IAAI,EAAE,UAAU;QAChB,IAAI,EAAE,YAAY;QAClB,MAAM,EAAE;YACN,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,SAAS,EAAE,YAAY,EAAE,SAAS,EAAE;YAClE;gBACE,IAAI,EAAE,iBAAiB;gBACvB,IAAI,EAAE,SAAS;gBACf,YAAY,EAAE,0BAA0B;aACzC;YACD,EAAE,IAAI,EAAE,qBAAqB,EAAE,IAAI,EAAE,SAAS,EAAE,YAAY,EAAE,SAAS,EAAE;SAC1E;QACD,OAAO,EAAE,EAAE;QACX,eAAe,EAAE,YAAY;KAC9B;IACD;QACE,IAAI,EAAE,UAAU;QAChB,IAAI,EAAE,qBAAqB;QAC3B,MAAM,EAAE;YACN,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,YAAY,EAAE,SAAS,EAAE;YACtD,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,YAAY,EAAE,SAAS,EAAE;SACvD;QACD,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,CAAC;QAC3D,eAAe,EAAE,MAAM;KACxB;IACD;QACE,IAAI,EAAE,UAAU;QAChB,IAAI,EAAE,OAAO;QACb,MAAM,EAAE,EAAE;QACV,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,YAAY,EAAE,SAAS,EAAE,CAAC;QACjE,eAAe,EAAE,MAAM;KACxB;IACD;QACE,IAAI,EAAE,UAAU;QAChB,IAAI,EAAE,OAAO;QACb,MAAM,EAAE;YACN,EAAE,IAAI,EAAE,iBAAiB,EAAE,IAAI,EAAE,SAAS,EAAE,YAAY,EAAE,SAAS,EAAE;SACtE;QACD,OAAO,EAAE,EAAE;QACX,eAAe,EAAE,YAAY;KAC9B;IACD;QACE,IAAI,EAAE,UAAU;QAChB,IAAI,EAAE,UAAU;QAChB,MAAM,EAAE,EAAE;QACV,OAAO,EAAE,EAAE;QACX,eAAe,EAAE,YAAY;KAC9B;IACD;QACE,IAAI,EAAE,UAAU;QAChB,IAAI,EAAE,QAAQ;QACd,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,CAAC;QACjE,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,CAAC;QAC3D,eAAe,EAAE,MAAM;KACxB;IACD;QACE,IAAI,EAAE,UAAU;QAChB,IAAI,EAAE,QAAQ;QACd,MAAM,EAAE,EAAE;QACV,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,YAAY,EAAE,SAAS,EAAE,CAAC;QACjE,eAAe,EAAE,MAAM;KACxB;IACD;QACE,IAAI,EAAE,UAAU;QAChB,IAAI,EAAE,gBAAgB;QACtB,MAAM,EAAE,EAAE;QACV,OAAO,EAAE;YACP,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,YAAY,EAAE,0BAA0B,EAAE;SACxE;QACD,eAAe,EAAE,MAAM;KACxB;IACD;QACE,IAAI,EAAE,UAAU;QAChB,IAAI,EAAE,uBAAuB;QAC7B,MAAM,EAAE;YACN,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,SAAS,EAAE,YAAY,EAAE,SAAS,EAAE;YAC9D;gBACE,IAAI,EAAE,mBAAmB;gBACzB,IAAI,EAAE,OAAO;gBACb,YAAY,EAAE,mDAAmD;gBACjE,UAAU,EAAE;oBACV,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE;oBAC3D,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,YAAY,EAAE,SAAS,EAAE;oBAC1D,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,YAAY,EAAE,SAAS,EAAE;iBAC7D;aACF;SACF;QACD,OAAO,EAAE,EAAE;QACX,eAAe,EAAE,YAAY;KAC9B;IACD;QACE,IAAI,EAAE,UAAU;QAChB,IAAI,EAAE,mBAAmB;QACzB,MAAM,EAAE,EAAE;QACV,OAAO,EAAE,EAAE;QACX,eAAe,EAAE,YAAY;KAC9B;IACD;QACE,IAAI,EAAE,UAAU;QAChB,IAAI,EAAE,mBAAmB;QACzB,MAAM,EAAE;YACN;gBACE,IAAI,EAAE,mBAAmB;gBACzB,IAAI,EAAE,SAAS;gBACf,YAAY,EAAE,0BAA0B;aACzC;SACF;QACD,OAAO,EAAE,EAAE;QACX,eAAe,EAAE,YAAY;KAC9B;IACD;QACE,IAAI,EAAE,UAAU;QAChB,IAAI,EAAE,mBAAmB;QACzB,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,SAAS,EAAE,YAAY,EAAE,SAAS,EAAE,CAAC;QACxE,OAAO,EAAE,EAAE;QACX,eAAe,EAAE,YAAY;KAC9B;IACD;QACE,IAAI,EAAE,UAAU;QAChB,IAAI,EAAE,SAAS;QACf,MAAM,EAAE;YACN,EAAE,IAAI,EAAE,iBAAiB,EAAE,IAAI,EAAE,SAAS,EAAE,YAAY,EAAE,SAAS,EAAE;SACtE;QACD,OAAO,EAAE,EAAE;QACX,eAAe,EAAE,YAAY;KAC9B;IACD;QACE,IAAI,EAAE,UAAU;QAChB,IAAI,EAAE,sBAAsB;QAC5B,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,QAAQ,EAAE,YAAY,EAAE,QAAQ,EAAE,CAAC;QACzE,OAAO,EAAE,EAAE;QACX,eAAe,EAAE,YAAY;KAC9B;IACD;QACE,IAAI,EAAE,OAAO;QACb,IAAI,EAAE,uBAAuB;QAC7B,MAAM,EAAE;YACN,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,IAAI,EAAE,YAAY,EAAE,SAAS,EAAE;YACxE;gBACE,IAAI,EAAE,aAAa;gBACnB,IAAI,EAAE,QAAQ;gBACd,OAAO,EAAE,KAAK;gBACd,YAAY,EAAE,QAAQ;aACvB;SACF;QACD,SAAS,EAAE,KAAK;KACjB;IACD;QACE,IAAI,EAAE,OAAO;QACb,IAAI,EAAE,aAAa;QACnB,MAAM,EAAE;YACN,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE;SAC1E;QACD,SAAS,EAAE,KAAK;KACjB;IACD;QACE,IAAI,EAAE,OAAO;QACb,IAAI,EAAE,sCAAsC;QAC5C,MAAM,EAAE;YACN;gBACE,IAAI,EAAE,UAAU;gBAChB,IAAI,EAAE,SAAS;gBACf,OAAO,EAAE,IAAI;gBACb,YAAY,EAAE,SAAS;aACxB;YACD,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,IAAI,EAAE,YAAY,EAAE,SAAS,EAAE;YACxE;gBACE,IAAI,EAAE,QAAQ;gBACd,IAAI,EAAE,OAAO;gBACb,OAAO,EAAE,KAAK;gBACd,YAAY,EAAE,kDAAkD;aACjE;SACF;QACD,SAAS,EAAE,KAAK;KACjB;IACD;QACE,IAAI,EAAE,OAAO;QACb,IAAI,EAAE,sBAAsB;QAC5B,MAAM,EAAE;YACN;gBACE,IAAI,EAAE,eAAe;gBACrB,IAAI,EAAE,SAAS;gBACf,OAAO,EAAE,IAAI;gBACb,YAAY,EAAE,SAAS;aACxB;YACD;gBACE,IAAI,EAAE,UAAU;gBAChB,IAAI,EAAE,SAAS;gBACf,OAAO,EAAE,IAAI;gBACb,YAAY,EAAE,SAAS;aACxB;SACF;QACD,SAAS,EAAE,KAAK;KACjB;IACD;QACE,IAAI,EAAE,OAAO;QACb,IAAI,EAAE,QAAQ;QACd,MAAM,EAAE;YACN;gBACE,IAAI,EAAE,SAAS;gBACf,IAAI,EAAE,SAAS;gBACf,OAAO,EAAE,IAAI;gBACb,YAAY,EAAE,SAAS;aACxB;YACD;gBACE,IAAI,EAAE,iBAAiB;gBACvB,IAAI,EAAE,SAAS;gBACf,OAAO,EAAE,KAAK;gBACd,YAAY,EAAE,SAAS;aACxB;SACF;QACD,SAAS,EAAE,KAAK;KACjB;IACD;QACE,IAAI,EAAE,OAAO;QACb,IAAI,EAAE,mBAAmB;QACzB,MAAM,EAAE;YACN;gBACE,IAAI,EAAE,gBAAgB;gBACtB,IAAI,EAAE,SAAS;gBACf,OAAO,EAAE,KAAK;gBACd,YAAY,EAAE,0BAA0B;aACzC;YACD;gBACE,IAAI,EAAE,mBAAmB;gBACzB,IAAI,EAAE,SAAS;gBACf,OAAO,EAAE,KAAK;gBACd,YAAY,EAAE,0BAA0B;aACzC;SACF;QACD,SAAS,EAAE,KAAK;KACjB;IACD;QACE,IAAI,EAAE,OAAO;QACb,IAAI,EAAE,UAAU;QAChB,MAAM,EAAE;YACN;gBACE,IAAI,EAAE,SAAS;gBACf,IAAI,EAAE,SAAS;gBACf,OAAO,EAAE,IAAI;gBACb,YAAY,EAAE,SAAS;aACxB;YACD;gBACE,IAAI,EAAE,iBAAiB;gBACvB,IAAI,EAAE,SAAS;gBACf,OAAO,EAAE,KAAK;gBACd,YAAY,EAAE,SAAS;aACxB;SACF;QACD,SAAS,EAAE,KAAK;KACjB;CACF,CAAC"}