hardhat 2.16.0-dev.0 → 2.16.0

package/internal/core/jsonrpc/types/input/filterRequest.d.ts

@@ -1,21 +1,21 @@
 import * as t from "io-ts";
 export declare const rpcFilterRequest: t.TypeC<{
-    fromBlock: t.Type<bigint | "pending" | "latest" | "earliest" | "safe" | "finalized" | undefined, bigint | "pending" | "latest" | "earliest" | "safe" | "finalized" | undefined, unknown>;
-    toBlock: t.Type<bigint | "pending" | "latest" | "earliest" | "safe" | "finalized" | undefined, bigint | "pending" | "latest" | "earliest" | "safe" | "finalized" | undefined, unknown>;
+    fromBlock: t.Type<bigint | "pending" | "earliest" | "latest" | "safe" | "finalized" | undefined, bigint | "pending" | "earliest" | "latest" | "safe" | "finalized" | undefined, unknown>;
+    toBlock: t.Type<bigint | "pending" | "earliest" | "latest" | "safe" | "finalized" | undefined, bigint | "pending" | "earliest" | "latest" | "safe" | "finalized" | undefined, unknown>;
     address: t.Type<Buffer | Buffer[] | undefined, Buffer | Buffer[] | undefined, unknown>;
     topics: t.Type<(Buffer | (Buffer | null)[] | null)[] | undefined, (Buffer | (Buffer | null)[] | null)[] | undefined, unknown>;
     blockHash: t.Type<Buffer | undefined, Buffer | undefined, unknown>;
 }>;
 export declare type RpcFilterRequest = t.TypeOf<typeof rpcFilterRequest>;
 export declare const optionalRpcFilterRequest: t.Type<{
-    fromBlock: bigint | "pending" | "latest" | "earliest" | "safe" | "finalized" | undefined;
-    toBlock: bigint | "pending" | "latest" | "earliest" | "safe" | "finalized" | undefined;
+    fromBlock: bigint | "pending" | "earliest" | "latest" | "safe" | "finalized" | undefined;
+    toBlock: bigint | "pending" | "earliest" | "latest" | "safe" | "finalized" | undefined;
     address: Buffer | Buffer[] | undefined;
     topics: (Buffer | (Buffer | null)[] | null)[] | undefined;
     blockHash: Buffer | undefined;
 } | undefined, {
-    fromBlock: bigint | "pending" | "latest" | "earliest" | "safe" | "finalized" | undefined;
-    toBlock: bigint | "pending" | "latest" | "earliest" | "safe" | "finalized" | undefined;
+    fromBlock: bigint | "pending" | "earliest" | "latest" | "safe" | "finalized" | undefined;
+    toBlock: bigint | "pending" | "earliest" | "latest" | "safe" | "finalized" | undefined;
     address: Buffer | Buffer[] | undefined;
     topics: (Buffer | (Buffer | null)[] | null)[] | undefined;
     blockHash: Buffer | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hardhat",
-  "version": "2.16.0-dev.0",
+  "version": "2.16.0",
   "author": "Nomic Labs LLC",
   "license": "MIT",
   "homepage": "https://hardhat.org",
@@ -70,7 +70,6 @@
     "@types/lodash": "^4.14.123",
     "@types/mocha": ">=9.1.0",
     "@types/node": "^14.0.0",
-    "@types/qs": "^6.5.3",
     "@types/resolve": "^1.17.1",
     "@types/semver": "^6.0.2",
     "@types/sinon": "^9.0.8",
@@ -137,7 +136,6 @@
     "mnemonist": "^0.38.0",
     "mocha": "^10.0.0",
     "p-map": "^4.0.0",
-    "qs": "^6.7.0",
     "raw-body": "^2.4.1",
     "resolve": "1.17.0",
     "semver": "^6.3.0",

package/src/builtin-tasks/compile.ts

@@ -43,6 +43,7 @@ import { getAllFilesMatching } from "../internal/util/fs-utils";
 import {
   TASK_COMPILE,
   TASK_COMPILE_GET_COMPILATION_TASKS,
+  TASK_COMPILE_REMOVE_OBSOLETE_ARTIFACTS,
   TASK_COMPILE_SOLIDITY,
   TASK_COMPILE_SOLIDITY_CHECK_ERRORS,
   TASK_COMPILE_SOLIDITY_COMPILE,
@@ -72,7 +73,6 @@ import {
   TASK_COMPILE_SOLIDITY_READ_FILE,
   TASK_COMPILE_SOLIDITY_RUN_SOLC,
   TASK_COMPILE_SOLIDITY_RUN_SOLCJS,
-  TASK_COMPILE_REMOVE_OBSOLETE_ARTIFACTS,
   TASK_COMPILE_TRANSFORM_IMPORT_NAME,
 } from "./task-names";
 import {
@@ -115,16 +115,18 @@ const DEFAULT_CONCURRENCY_LEVEL = Math.max(os.cpus().length - 1, 1);
  * This is the right task to override to change how the solidity files of the
  * project are obtained.
  */
-subtask(
-  TASK_COMPILE_SOLIDITY_GET_SOURCE_PATHS,
-  async (_, { config }): Promise<string[]> => {
-    const paths = await getAllFilesMatching(config.paths.sources, (f) =>
-      f.endsWith(".sol")
-    );
-
-    return paths;
-  }
-);
+subtask(TASK_COMPILE_SOLIDITY_GET_SOURCE_PATHS)
+  .addOptionalParam("sourcePath", undefined, undefined, types.string)
+  .setAction(
+    async (
+      { sourcePath }: { sourcePath?: string },
+      { config }
+    ): Promise<string[]> => {
+      return getAllFilesMatching(sourcePath ?? config.paths.sources, (f) =>
+        f.endsWith(".sol")
+      );
+    }
+  );
 
 /**
  * Receives a list of absolute paths and returns a list of source names
@@ -134,17 +136,24 @@ subtask(
  * is generated.
  */
 subtask(TASK_COMPILE_SOLIDITY_GET_SOURCE_NAMES)
+  .addOptionalParam("rootPath", undefined, undefined, types.string)
   .addParam("sourcePaths", undefined, undefined, types.any)
   .setAction(
     async (
-      { sourcePaths }: { sourcePaths: string[] },
+      {
+        rootPath,
+        sourcePaths,
+      }: {
+        rootPath?: string;
+        sourcePaths: string[];
+      },
       { config }
     ): Promise<string[]> => {
-      const sourceNames = await Promise.all(
-        sourcePaths.map((p) => localPathToSourceName(config.paths.root, p))
+      return Promise.all(
+        sourcePaths.map((p) =>
+          localPathToSourceName(rootPath ?? config.paths.root, p)
+        )
       );
-
-      return sourceNames;
     }
   );
 
@@ -152,11 +161,9 @@ subtask(TASK_COMPILE_SOLIDITY_READ_FILE)
   .addParam("absolutePath", undefined, undefined, types.string)
   .setAction(
     async ({ absolutePath }: { absolutePath: string }): Promise<string> => {
-      const content = await fsExtra.readFile(absolutePath, {
+      return fsExtra.readFile(absolutePath, {
         encoding: "utf8",
       });
-
-      return content;
     }
   );
 
@@ -178,19 +185,25 @@ subtask(TASK_COMPILE_TRANSFORM_IMPORT_NAME)
  * node_modules) and generating the graph.
  */
 subtask(TASK_COMPILE_SOLIDITY_GET_DEPENDENCY_GRAPH)
+  .addOptionalParam("rootPath", undefined, undefined, types.string)
   .addParam("sourceNames", undefined, undefined, types.any)
   .addOptionalParam("solidityFilesCache", undefined, undefined, types.any)
   .setAction(
     async (
       {
+        rootPath,
         sourceNames,
         solidityFilesCache,
-      }: { sourceNames: string[]; solidityFilesCache?: SolidityFilesCache },
+      }: {
+        rootPath?: string;
+        sourceNames: string[];
+        solidityFilesCache?: SolidityFilesCache;
+      },
       { config, run }
     ): Promise<taskTypes.DependencyGraph> => {
       const parser = new Parser(solidityFilesCache);
       const resolver = new Resolver(
-        config.paths.root,
+        rootPath ?? config.paths.root,
         parser,
         (absolutePath: string) =>
           run(TASK_COMPILE_SOLIDITY_READ_FILE, { absolutePath }),
@@ -201,12 +214,8 @@ subtask(TASK_COMPILE_SOLIDITY_GET_DEPENDENCY_GRAPH)
       const resolvedFiles = await Promise.all(
         sourceNames.map((sn) => resolver.resolveSourceName(sn))
       );
-      const dependencyGraph = await DependencyGraph.createFromResolvedFiles(
-        resolver,
-        resolvedFiles
-      );
 
-      return dependencyGraph;
+      return DependencyGraph.createFromResolvedFiles(resolver, resolvedFiles);
     }
   );
 
@@ -628,9 +637,7 @@ subtask(TASK_COMPILE_SOLIDITY_RUN_SOLCJS)
     }) => {
       const compiler = new Compiler(solcJsPath);
 
-      const output = await compiler.compile(input);
-
-      return output;
+      return compiler.compile(input);
     }
   );
 
@@ -645,9 +652,7 @@ subtask(TASK_COMPILE_SOLIDITY_RUN_SOLC)
     async ({ input, solcPath }: { input: CompilerInput; solcPath: string }) => {
       const compiler = new NativeCompiler(solcPath);
 
-      const output = await compiler.compile(input);
-
-      return output;
+      return compiler.compile(input);
     }
   );
 
@@ -1290,13 +1295,16 @@ subtask(TASK_COMPILE_SOLIDITY)
       }: { force: boolean; quiet: boolean; concurrency: number },
       { artifacts, config, run }
     ) => {
+      const rootPath = config.paths.root;
+
       const sourcePaths: string[] = await run(
-        TASK_COMPILE_SOLIDITY_GET_SOURCE_PATHS
+        TASK_COMPILE_SOLIDITY_GET_SOURCE_PATHS,
+        { sourcePath: config.paths.sources }
       );
-
       const sourceNames: string[] = await run(
         TASK_COMPILE_SOLIDITY_GET_SOURCE_NAMES,
         {
+          rootPath,
           sourcePaths,
         }
       );
@@ -1308,7 +1316,7 @@ subtask(TASK_COMPILE_SOLIDITY)
 
       const dependencyGraph: taskTypes.DependencyGraph = await run(
         TASK_COMPILE_SOLIDITY_GET_DEPENDENCY_GRAPH,
-        { sourceNames, solidityFilesCache }
+        { rootPath, sourceNames, solidityFilesCache }
       );
 
       solidityFilesCache = await invalidateCacheMissingArtifacts(

package/src/internal/cli/analytics.ts

@@ -3,10 +3,8 @@ import type { request as RequestT } from "undici";
 import AbortController from "abort-controller";
 import debug from "debug";
 import os from "os";
-import qs from "qs";
 import { v4 as uuid } from "uuid";
 
-import * as builtinTaskNames from "../../builtin-tasks/task-names";
 import { isLocalDev } from "../core/execution-mode";
 import { isRunningOnCiServer } from "../util/ci-detection";
 import {
@@ -19,37 +17,46 @@ import { getPackageJson } from "../util/packageInfo";
 
 const log = debug("hardhat:core:analytics");
 
-// VERY IMPORTANT:
-// The documentation doesn't say so, but the user-agent parameter is required (ua).
-// If you don't send it, you won't get an error or anything, Google will *silently* drop your hit.
-//
-// https://stackoverflow.com/questions/27357954/google-analytics-measurement-protocol-not-working
-interface RawAnalytics {
-  v: "1";
-  tid: string;
-  cid: string;
-  dp: string;
-  dh: string;
-  t: string;
-  ua: string;
-  cs: string;
-  cm: string;
-  cd1: string;
-  cd2: string;
-  cd3: string;
+/* eslint-disable @typescript-eslint/naming-convention */
+interface AnalyticsPayload {
+  client_id: string;
+  user_id: string;
+  user_properties: {
+    projectId: {
+      value?: string;
+    };
+    userType: {
+      value?: string;
+    };
+    hardhatVersion: {
+      value?: string;
+    };
+    operatingSystem: {
+      value?: string;
+    };
+    nodeVersion: {
+      value?: string;
+    };
+  };
+  events: Array<{
+    name: string;
+    params: {
+      engagement_time_msec: string;
+      session_id: string;
+    };
+  }>;
 }
+/* eslint-enable @typescript-eslint/naming-convention */
 
 type AbortAnalytics = () => void;
 
-const googleAnalyticsUrl = "https://www.google-analytics.com/collect";
-
 export class Analytics {
   public static async getInstance(telemetryConsent: boolean | undefined) {
-    const analytics: Analytics = new Analytics({
-      clientId: await getClientId(),
+    const analytics: Analytics = new Analytics(
+      await getClientId(),
       telemetryConsent,
-      userType: getUserType(),
-    });
+      getUserType()
+    );
 
     return analytics;
   }
@@ -57,22 +64,22 @@ export class Analytics {
   private readonly _clientId: string;
   private readonly _enabled: boolean;
   private readonly _userType: string;
-  // Hardhat's tracking id. I guess there's no other choice than keeping it here.
-  private readonly _trackingId: string = "UA-117668706-3";
-
-  private constructor({
-    clientId,
-    telemetryConsent,
-    userType,
-  }: {
-    clientId: string;
-    telemetryConsent: boolean | undefined;
-    userType: string;
-  }) {
+  private readonly _analyticsUrl: string =
+    "https://www.google-analytics.com/mp/collect";
+  private readonly _apiSecret: string = "fQ5joCsDRTOp55wX8a2cVw";
+  private readonly _measurementId: string = "G-8LQ007N2QJ";
+  private _sessionId: string;
+
+  private constructor(
+    clientId: string,
+    telemetryConsent: boolean | undefined,
+    userType: string
+  ) {
     this._clientId = clientId;
     this._enabled =
       !isLocalDev() && !isRunningOnCiServer() && telemetryConsent === true;
     this._userType = userType;
+    this._sessionId = Math.random().toString();
   }
 
   /**
@@ -83,106 +90,70 @@ export class Analytics {
    *
    * Trying to abort a successfully completed request is a no-op, so it's always safe to call it.
    *
-   * @param taskName The name of the task to be logged
-   *
    * @returns The abort function
    */
-  public async sendTaskHit(
-    taskName: string
-  ): Promise<[AbortAnalytics, Promise<void>]> {
-    if (this._isABuiltinTaskName(taskName)) {
-      taskName = "builtin";
-    } else {
-      taskName = "custom";
-    }
-
+  public async sendTaskHit(): Promise<[AbortAnalytics, Promise<void>]> {
     if (!this._enabled) {
       return [() => {}, Promise.resolve()];
     }
 
-    return this._sendHit(await this._taskHit(taskName));
+    return this._sendHit(await this._buildTaskHitPayload());
   }
 
-  private _isABuiltinTaskName(taskName: string) {
-    return Object.values<string>(builtinTaskNames).includes(taskName);
-  }
-
-  private async _taskHit(taskName: string): Promise<RawAnalytics> {
+  private async _buildTaskHitPayload(): Promise<AnalyticsPayload> {
     return {
-      // Measurement protocol version.
-      v: "1",
-
-      // Hit type, we're only using pageviews for now.
-      t: "pageview",
-
-      // Hardhat's tracking Id.
-      tid: this._trackingId,
-
-      // Client Id.
-      cid: this._clientId,
-
-      // Document path, must start with a '/'.
-      dp: `/task/${taskName}`,
-
-      // Host name.
-      dh: "cli.hardhat.org",
-
-      // User agent, must be present.
-      // We use it to inform Node version used and OS.
-      // Example:
-      //   Node/v8.12.0 (Darwin 17.7.0)
-      ua: getUserAgent(),
-
-      // We're using the following values (Campaign source, Campaign medium) to track
-      // whether the user is a Developer or CI, as Custom Dimensions are not working for us atm.
-      cs: this._userType,
-      cm: "User Type",
-
-      // We're using custom dimensions for tracking different user projects, and user types (Developer/CI).
-      //
-      // See the following link for docs on these paremeters:
-      // https://developers.google.com/analytics/devguides/collection/protocol/v1/parameters#pr_cd_
-      //
-      // See the following link for setting up our custom dimensions in the Google Analytics dashboard
-      // https://support.google.com/tagmanager/answer/6164990
-      //
-      // Custom dimension 1: Project Id
-      cd1: "hardhat-project",
-      // Custom dimension 2: User type
-      //   Possible values: "CI", "Developer".
-      cd2: this._userType,
-      // Custom dimension 3: Hardhat Version
-      //   Example: "Hardhat 1.0.0".
-      cd3: await getHardhatVersion(),
+      client_id: this._clientId,
+      user_id: this._clientId,
+      user_properties: {
+        projectId: { value: "hardhat-project" },
+        userType: { value: this._userType },
+        hardhatVersion: { value: await getHardhatVersion() },
+        operatingSystem: { value: os.platform() },
+        nodeVersion: { value: process.version },
+      },
+      events: [
+        {
+          name: "task",
+          params: {
+            // From the GA docs: amount of time someone spends with your web
+            // page in focus or app screen in the foreground
+            // The parameter has no use for our app, but it's required in order
+            // for user activity to display in standard reports like Realtime
+            engagement_time_msec: "10000",
+            session_id: this._sessionId,
+          },
+        },
+      ],
     };
   }
 
-  private _sendHit(hit: RawAnalytics): [AbortAnalytics, Promise<void>] {
+  private _sendHit(payload: AnalyticsPayload): [AbortAnalytics, Promise<void>] {
     const { request } = require("undici") as { request: typeof RequestT };
-
-    log(`Sending hit for ${hit.dp}`);
+    const eventName = payload.events[0].name;
+    log(`Sending hit for ${eventName}`);
 
     const controller = new AbortController();
 
     const abortAnalytics = () => {
-      log(`Aborting hit for ${JSON.stringify(hit.dp)}`);
+      log(`Aborting hit for ${eventName}`);
 
       controller.abort();
     };
 
-    const hitPayload = qs.stringify(hit);
+    log(`Hit payload: ${JSON.stringify(payload)}`);
 
-    log(`Hit payload: ${JSON.stringify(hit)}`);
-
-    const hitPromise = request(googleAnalyticsUrl, {
-      body: hitPayload,
+    const hitPromise = request(this._analyticsUrl, {
+      query: {
+        api_secret: this._apiSecret,
+        measurement_id: this._measurementId,
+      },
+      body: JSON.stringify(payload),
       method: "POST",
       signal: controller.signal,
     })
       .then(() => {
-        log(`Hit for ${JSON.stringify(hit.dp)} sent successfully`);
+        log(`Hit for ${eventName} sent successfully`);
       })
-      // We're not really interested in handling failed analytics requests
       .catch(() => {
         log("Hit request failed");
       });
@@ -214,29 +185,6 @@ function getUserType(): string {
   return isRunningOnCiServer() ? "CI" : "Developer";
 }
 
-/**
- * At the moment, we couldn't find a reliably way to report the OS () in Node,
- * as the versions reported by the various `os` APIs (`os.platform()`, `os.type()`, etc)
- * return values different to those expected by Google Analytics
- * We decided to take the compromise of just reporting the OS Platform (OSX/Linux/Windows) for now (version information is bogus for now).
- */
-function getOperatingSystem(): string {
-  switch (os.type()) {
-    case "Windows_NT":
-      return "(Windows NT 6.1; Win64; x64)";
-    case "Darwin":
-      return "(Macintosh; Intel Mac OS X 10_13_6)";
-    case "Linux":
-      return "(X11; Linux x86_64)";
-    default:
-      return "(Unknown)";
-  }
-}
-
-function getUserAgent(): string {
-  return `Node/${process.version} ${getOperatingSystem()}`;
-}
-
 async function getHardhatVersion(): Promise<string> {
   const { version } = await getPackageJson();
 

package/src/internal/cli/cli.ts

@@ -233,7 +233,7 @@ async function main() {
     const providerExtenders = ctx.providerExtenders;
     const taskDefinitions = ctx.tasksDSL.getTaskDefinitions();
 
-    const [abortAnalytics, hitPromise] = await analytics.sendTaskHit(taskName);
+    const [abortAnalytics, hitPromise] = await analytics.sendTaskHit();
 
     let taskArguments: TaskArguments;
 

package/internal/core/config/extenders.d.ts

@@ -1,7 +0,0 @@
-import { EnvironmentExtender } from "../../../types";
-export declare class ExtenderManager {
-    private readonly _extenders;
-    add(extender: EnvironmentExtender): void;
-    getExtenders(): EnvironmentExtender[];
-}
-//# sourceMappingURL=extenders.d.ts.map

package/internal/core/config/extenders.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"extenders.d.ts","sourceRoot":"","sources":["../../../src/internal/core/config/extenders.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAErD,qBAAa,eAAe;IAC1B,OAAO,CAAC,QAAQ,CAAC,UAAU,CAA6B;IAEjD,GAAG,CAAC,QAAQ,EAAE,mBAAmB;IAIjC,YAAY,IAAI,mBAAmB,EAAE;CAG7C"}

package/internal/core/config/extenders.js

@@ -1,16 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ExtenderManager = void 0;
-class ExtenderManager {
-    constructor() {
-        this._extenders = [];
-    }
-    add(extender) {
-        this._extenders.push(extender);
-    }
-    getExtenders() {
-        return this._extenders;
-    }
-}
-exports.ExtenderManager = ExtenderManager;
-//# sourceMappingURL=extenders.js.map

package/internal/core/config/extenders.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"extenders.js","sourceRoot":"","sources":["../../../src/internal/core/config/extenders.ts"],"names":[],"mappings":";;;AAEA,MAAa,eAAe;IAA5B;QACmB,eAAU,GAA0B,EAAE,CAAC;IAS1D,CAAC;IAPQ,GAAG,CAAC,QAA6B;QACtC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACjC,CAAC;IAEM,YAAY;QACjB,OAAO,IAAI,CAAC,UAAU,CAAC;IACzB,CAAC;CACF;AAVD,0CAUC"}

package/internal/hardhat-network/provider/RethnetState.d.ts

@@ -1,29 +0,0 @@
-/// <reference types="node" />
-import { Address } from "@nomicfoundation/ethereumjs-util";
-import { StateManager, Account, Bytecode, RethnetContext } from "rethnet-evm";
-import { ForkConfig, GenesisAccount } from "./node-types";
-export declare class RethnetStateManager {
-    private _state;
-    constructor(_state: StateManager);
-    static withGenesisAccounts(context: RethnetContext, genesisAccounts: GenesisAccount[]): RethnetStateManager;
-    static forkRemote(context: RethnetContext, forkConfig: ForkConfig, genesisAccounts: GenesisAccount[]): Promise<RethnetStateManager>;
-    asInner(): StateManager;
-    accountExists(address: Address): Promise<boolean>;
-    getAccount(address: Address): Promise<Account | null>;
-    getAccountStorageRoot(address: Address): Promise<Buffer | null>;
-    accountIsEmpty(address: Address): Promise<boolean>;
-    deleteAccount(address: Address): Promise<void>;
-    makeSnapshot(): Promise<Buffer>;
-    removeSnapshot(stateRoot: Buffer): Promise<void>;
-    modifyAccount(address: Address, modifyAccountFn: (balance: bigint, nonce: bigint, code: Bytecode | undefined) => Promise<Account>): Promise<void>;
-    getContractCode(address: Address): Promise<Buffer>;
-    getContractStorage(address: Address, key: Buffer): Promise<Buffer>;
-    putContractStorage(address: Address, key: Buffer, value: Buffer): Promise<void>;
-    checkpoint(): Promise<void>;
-    commit(): Promise<void>;
-    revert(): Promise<void>;
-    getStateRoot(): Promise<Buffer>;
-    setBlockContext(stateRoot: Buffer, blockNumber?: bigint): Promise<void>;
-    serialize(): Promise<string>;
-}
-//# sourceMappingURL=RethnetState.d.ts.map

package/internal/hardhat-network/provider/RethnetState.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"RethnetState.d.ts","sourceRoot":"","sources":["../../../src/internal/hardhat-network/provider/RethnetState.ts"],"names":[],"mappings":";AAAA,OAAO,EACL,OAAO,EAGR,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC9E,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAM1D,qBAAa,mBAAmB;IAClB,OAAO,CAAC,MAAM;gBAAN,MAAM,EAAE,YAAY;WAE1B,mBAAmB,CAC/B,OAAO,EAAE,cAAc,EACvB,eAAe,EAAE,cAAc,EAAE,GAChC,mBAAmB;WAcF,UAAU,CAC5B,OAAO,EAAE,cAAc,EACvB,UAAU,EAAE,UAAU,EACtB,eAAe,EAAE,cAAc,EAAE,GAChC,OAAO,CAAC,mBAAmB,CAAC;IA0BxB,OAAO,IAAI,YAAY;IAIjB,aAAa,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IAKjD,UAAU,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC;IAIrD,qBAAqB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAI/D,cAAc,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IAUlD,aAAa,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAI9C,YAAY,IAAI,OAAO,CAAC,MAAM,CAAC;IAI/B,cAAc,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAIhD,aAAa,CACxB,OAAO,EAAE,OAAO,EAChB,eAAe,EAAE,CACf,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,EACb,IAAI,EAAE,QAAQ,GAAG,SAAS,KACvB,OAAO,CAAC,OAAO,CAAC,GACpB,OAAO,CAAC,IAAI,CAAC;IAIH,eAAe,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC;IAalD,kBAAkB,CAC7B,OAAO,EAAE,OAAO,EAChB,GAAG,EAAE,MAAM,GACV,OAAO,CAAC,MAAM,CAAC;IAOL,kBAAkB,CAC7B,OAAO,EAAE,OAAO,EAChB,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,IAAI,CAAC;IAOH,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAI3B,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAEvB,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAIvB,YAAY,IAAI,OAAO,CAAC,MAAM,CAAC;IAI/B,eAAe,CAC1B,SAAS,EAAE,MAAM,EACjB,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,IAAI,CAAC;IAIH,SAAS,IAAI,OAAO,CAAC,MAAM,CAAC;CAG1C"}