@0xweb/hardhat 0.1.34 → 0.1.37

package/hardhat.config.js

@@ -13,6 +13,7 @@ module.exports = {
                         enabled: true,
                         runs: 200,
                     },
+                    viaIR: true
                 },
             }
         ],

package/lib/index.js

@@ -1816,12 +1816,23 @@ const HardhatProvider_1 = require("dequanto/hardhat/HardhatProvider");
 const constants_1 = require("hardhat/internal/constants");
 var $coverage;
 (function ($coverage) {
+    let viaIR = true;
+    function config(opts) {
+        var _a;
+        viaIR = (_a = opts.viaIR) !== null && _a !== void 0 ? _a : viaIR;
+    }
+    $coverage.config = config;
     async function compile(params) {
         const hh = new HardhatProvider_1.HardhatProvider();
-        const hardhat = await hh.getHardhat();
         // Ensure optimizer is disabled, otherwise instrumented code will be removed as unused.
+        const hardhat = await hh.getHardhat();
         hardhat.config.solidity.compilers.forEach(compiler => {
-            compiler.settings.optimizer.enabled = false;
+            var _a, _b;
+            // -compiler.settings.optimizer.enabled = false;
+            if ((_b = (_a = compiler.settings) === null || _a === void 0 ? void 0 : _a.optimizer) === null || _b === void 0 ? void 0 : _b.enabled) {
+                // Prevent from deep reorder
+                compiler.settings.optimizer.runs = 1;
+            }
         });
         const client = await hh.client('hardhat');
         const result = await hh.compileSolDirectory(params.contracts, {
@@ -1842,7 +1853,7 @@ var $coverage;
     }
     $coverage.attachToHardhatVM = attachToHardhatVM;
     async function instrumentFiles(params) {
-        var _a;
+        var _a, _b;
         let source = params.source;
         let targetDir = (_a = params.target) !== null && _a !== void 0 ? _a : './coverage/contracts/';
         let files;
@@ -1872,15 +1883,48 @@ var $coverage;
             };
         })
             .toArrayAsync({ threads: 5 });
+        const G_ORIG = 'orig';
+        const G_INSTRUMENT = 'instrument';
+        let groups = (0, alot_1.default)(targets).groupBy(x => {
+            if (isIgnored(x.relativePath, params.ignore)) {
+                return G_ORIG;
+            }
+            return G_INSTRUMENT;
+        }).toDictionary(x => x.key, x => x.values);
         const api = await ApiUtil.getApi();
-        const result = await api.instrument(targets);
-        await (0, alot_1.default)(result)
+        const result = await api.instrument(groups[G_INSTRUMENT]);
+        await (0, alot_1.default)(result !== null && result !== void 0 ? result : [])
             .forEachAsync(async (target) => {
             let path = target.relativePath.replace(/^[\/.]*contracts/, '');
             let output = _path_1.$path.join(targetDir, path);
             await atma_io_1.File.writeAsync(output, target.source);
         })
             .toArrayAsync({ threads: 5 });
+        await (0, alot_1.default)((_b = groups[G_ORIG]) !== null && _b !== void 0 ? _b : [])
+            .forEachAsync(async (target) => {
+            let path = target.relativePath.replace(/^[\/.]*contracts/, '');
+            let output = _path_1.$path.join(targetDir, path);
+            await atma_io_1.File.writeAsync(output, target.source);
+        })
+            .toArrayAsync({ threads: 5 });
+        function isIgnored(relativePath, ignores) {
+            if (ignores == null || ignores.length === 0) {
+                return false;
+            }
+            for (let ignore of ignores) {
+                if (typeof ignore === 'string') {
+                    if (relativePath.includes(ignore)) {
+                        return true;
+                    }
+                }
+                else if (ignore instanceof RegExp) {
+                    if (ignore.test(relativePath)) {
+                        return true;
+                    }
+                }
+            }
+            return false;
+        }
     }
     $coverage.instrumentFiles = instrumentFiles;
     async function report(params) {
@@ -1892,7 +1936,7 @@ var $coverage;
     $coverage.report = report;
     class ApiUtil {
         static async getApi() {
-            return new Api();
+            return new Api({ viaIR });
         }
     }
     __decorate([

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@0xweb/hardhat",
     "description": "0xweb plugin for Hardhat",
-    "version": "0.1.34",
+    "version": "0.1.37",
     "main": "./lib/index.js",
     "author": {
         "name": "Alex Kit",

package/0xc/hardhat/Foo/Foo.ts

@@ -1,208 +0,0 @@
-/**
- *  AUTO-Generated Class: 2025-12-03 10:56
- *  Implementation: coverage/contracts/test/fixtures/coverage/Foo.sol
- */
-import di from 'a-di';
-import { TAddress } from 'dequanto/models/TAddress';
-import { TAccount } from 'dequanto/models/TAccount';
-import { TBufferLike } from 'dequanto/models/TBufferLike';
-import { ClientEventsStream, TClientEventsStreamData } from 'dequanto/clients/ClientEventsStream';
-import { ContractBase } from 'dequanto/contracts/ContractBase';
-import { ContractBaseUtils } from 'dequanto/contracts/utils/ContractBaseUtils';
-import { ContractStorageReaderBase } from 'dequanto/contracts/ContractStorageReaderBase';
-import { TxWriter } from 'dequanto/txs/TxWriter';
-import { ITxLogItem } from 'dequanto/txs/receipt/ITxLogItem';
-import { Web3Client } from 'dequanto/clients/Web3Client';
-import { IBlockchainExplorer } from 'dequanto/explorer/IBlockchainExplorer';
-import { SubjectStream } from 'dequanto/class/SubjectStream';
-
-
-import type { ContractWriter } from 'dequanto/contracts/ContractWriter';
-import type { TAbiItem } from 'dequanto/types/TAbi';
-import type { TEth } from 'dequanto/models/TEth';
-import type { TOverrideReturns } from 'dequanto/utils/types';
-
-
-import { Etherscan } from 'dequanto/explorer/Etherscan';
-import { HardhatWeb3Client } from 'dequanto/hardhat/HardhatWeb3Client';
-
-
-
-export class Foo extends ContractBase {
-    constructor(
-        public address: TEth.Address = null,
-        public client: Web3Client = di.resolve(HardhatWeb3Client, ),
-        public explorer: IBlockchainExplorer = di.resolve(Etherscan, ),
-    ) {
-        super(address, client, explorer)
-
-        this.storage = new FooStorageReader(this.address, this.client, this.explorer);
-    }
-
-    Types: TFooTypes;
-
-    $meta = {
-        "artifact": "artifacts/coverage/contracts/test/fixtures/coverage/Foo.sol/Foo.json",
-        "class": "./0xc/hardhat/Foo/Foo.ts"
-    }
-
-    async $constructor (deployer: TSender, _name: string): Promise<TxWriter> {
-        throw new Error('Not implemented. Typing purpose. Use the ContractDeployer class to deploy the contract');
-    }
-
-    // 0x17d7de7c
-    async getName (): Promise<string> {
-        return this.$read(this.$getAbiItem('function', 'getName'));
-    }
-
-    // 0x06fdde03
-    async name (): Promise<string> {
-        return this.$read(this.$getAbiItem('function', 'name'));
-    }
-
-    // 0xc47f0027
-    async setName (sender: TSender, _name: string): Promise<TxWriter> {
-        return this.$write(this.$getAbiItem('function', 'setName'), sender, _name);
-    }
-
-    $call () {
-        return super.$call() as IFooTxCaller;
-    }
-    $signed (): TOverrideReturns<IFooTxCaller, Promise<{ signed: TEth.Hex, error?: Error & { data?: { type: string, params } } }>> {
-        return super.$signed() as any;
-    }
-    $data (): IFooTxData {
-        return super.$data() as IFooTxData;
-    }
-    $gas (): TOverrideReturns<IFooTxCaller, Promise<{ gas?: bigint, price?: bigint, error?: Error & { data?: { type: string, params } } }>> {
-        return super.$gas() as any;
-    }
-
-    onTransaction <TMethod extends keyof TFooTypes['Methods']> (method: TMethod, options: Parameters<ContractBase['$onTransaction']>[0]): SubjectStream<{
-        tx: TEth.Tx
-        block: TEth.Block<TEth.Hex>
-        calldata: {
-            method: TMethod
-            arguments: TFooTypes['Methods'][TMethod]['arguments']
-        }
-    }> {
-        options ??= {};
-        options.filter ??= {};
-        options.filter.method = method;
-        return <any> this.$onTransaction(options);
-    }
-
-    onLog (event: keyof TEvents, cb?: (event: TClientEventsStreamData) => void): ClientEventsStream<TClientEventsStreamData> {
-        return this.$onLog(event, cb);
-    }
-
-    async getPastLogs <TEventName extends keyof TEvents> (
-        events: TEventName[]
-        , options?: TEventLogOptions<TEventParams<TEventName>>
-    ): Promise<ITxLogItem<TEventParams<TEventName>, TEventName>[]>
-    async getPastLogs <TEventName extends keyof TEvents> (
-        event: TEventName
-        , options?: TEventLogOptions<TEventParams<TEventName>>
-    ): Promise<ITxLogItem<TEventParams<TEventName>, TEventName>[]>
-    async getPastLogs (mix: any, options?): Promise<any> {
-        return await super.getPastLogs(mix, options) as any;
-    }
-
-    onUpdated (fn?: (event: TClientEventsStreamData<TEventArguments<'Updated'>>) => void): ClientEventsStream<TClientEventsStreamData<TEventArguments<'Updated'>>> {
-        return this.$onLog('Updated', fn);
-    }
-
-    extractLogsUpdated (tx: TEth.TxReceipt): ITxLogItem<TEventParams<'Updated'>>[] {
-        let abi = this.$getAbiItem('event', 'Updated');
-        return this.$extractLogs(tx, abi) as any as ITxLogItem<TEventParams<'Updated'>>[];
-    }
-
-    async getPastLogsUpdated (options?: {
-        fromBlock?: number | Date
-        toBlock?: number | Date
-        params?: {  }
-    }): Promise<ITxLogItem<TEventParams<'Updated'>>[]> {
-        return await this.$getPastLogsParsed('Updated', options) as any;
-    }
-
-    abi: TAbiItem[] = [{"inputs":[{"internalType":"string","name":"_name","type":"string"}],"stateMutability":"nonpayable","type":"constructor"},{"anonymous":false,"inputs":[{"indexed":false,"internalType":"string","name":"newName","type":"string"}],"name":"Updated","type":"event"},{"inputs":[],"name":"getName","outputs":[{"internalType":"string","name":"","type":"string"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"name","outputs":[{"internalType":"string","name":"","type":"string"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"string","name":"_name","type":"string"}],"name":"setName","outputs":[],"stateMutability":"nonpayable","type":"function"}]
-
-    declare storage: FooStorageReader
-}
-
-type TSender = TAccount & {
-    value?: string | number | bigint
-}
-
-type TEventLogOptions<TParams> = {
-    fromBlock?: number | Date
-    toBlock?: number | Date
-    params?: TParams
-}
-
-export type TFooTypes = {
-    Events: {
-        Updated: {
-            outputParams: { newName: string },
-            outputArgs:   [ newName: string ],
-        }
-    },
-    Methods: {
-        getName: {
-          method: "getName"
-          arguments: [  ]
-        }
-        name: {
-          method: "name"
-          arguments: [  ]
-        }
-        setName: {
-          method: "setName"
-          arguments: [ _name: string ]
-        }
-    }
-}
-
-
-
-class FooStorageReader extends ContractStorageReaderBase {
-    constructor(
-        public address: TAddress,
-        public client: Web3Client,
-        public explorer: IBlockchainExplorer,
-    ) {
-        super(address, client, explorer);
-
-        this.$createHandler(this.$slots);
-    }
-
-    async name(): Promise<string> {
-        return this.$storage.get(['name', ]);
-    }
-
-    $slots = [
-    {
-        "slot": 0,
-        "position": 0,
-        "name": "name",
-        "size": null,
-        "type": "string"
-    }
-]
-
-}
-
-
-interface IFooTxCaller {
-    setName (sender: TSender, _name: string): Promise<{ error?: Error & { data?: { type: string, params } }, result? }>
-}
-
-
-interface IFooTxData {
-    setName (sender: TSender, _name: string): Promise<TEth.TxLike>
-}
-
-
-type TEvents = TFooTypes['Events'];
-type TEventParams<TEventName extends keyof TEvents> = Partial<TEvents[TEventName]['outputParams']>;
-type TEventArguments<TEventName extends keyof TEvents> = Partial<TEvents[TEventName]['outputArgs']>;

package/0xc/hardhat/Foo/FooAbi.json

@@ -1,65 +0,0 @@
-[
-  {
-    "inputs": [
-      {
-        "internalType": "string",
-        "name": "_name",
-        "type": "string"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "constructor"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "internalType": "string",
-        "name": "newName",
-        "type": "string"
-      }
-    ],
-    "name": "Updated",
-    "type": "event"
-  },
-  {
-    "inputs": [],
-    "name": "getName",
-    "outputs": [
-      {
-        "internalType": "string",
-        "name": "",
-        "type": "string"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "name",
-    "outputs": [
-      {
-        "internalType": "string",
-        "name": "",
-        "type": "string"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "string",
-        "name": "_name",
-        "type": "string"
-      }
-    ],
-    "name": "setName",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]

package/0xweb.json

@@ -1,16 +0,0 @@
-{
-  "dependencies": {
-    "Foo": {
-      "main": "./0xc/hardhat/Foo/Foo.ts",
-      "contractName": "Foo",
-      "source": {
-        "path": "file:///home/runner/work/hardhat/hardhat/artifacts/coverage/contracts/test/fixtures/coverage/Foo.sol/Foo.json"
-      },
-      "deployments": {
-        "hardhat": {
-          "address": null
-        }
-      }
-    }
-  }
-}