llvm-builder: use the ninja generator for building the builtins on windows (#299 )

The builtins build should use the Ninja generator (MSVC does not build a valid archive). Tested and verified here: https://github.com/paritytech/revive-alex-workflowtest/releases/tag/untagged-f02d0f574bab8404fead Closes #305 Signed-off-by: Cyrill Leutwiler <bigcyrill@hotmail.com>
Fix npm-release job (#297 )
2026-06-14 18:01:05 +00:00 · 2025-05-07 11:10:58 +02:00 · 2025-04-30 21:48:11 +02:00 · 2025-04-30 17:24:52 +02:00
62 changed files with 7403 additions and 4598 deletions
@@ -10,8 +10,8 @@ rustflags = [
    "-Clink-arg=-sWASM_ASYNC_COMPILATION=0",
    "-Clink-arg=-sDYNAMIC_EXECUTION=0",
    "-Clink-arg=-sALLOW_TABLE_GROWTH=1",
-    "-Clink-arg=--js-library=js/embed/soljson_interface.js",
-    "-Clink-arg=--pre-js=js/embed/pre.js",
+    "-Clink-arg=--js-library=js/emscripten/embed/soljson_interface.js",
+    "-Clink-arg=--pre-js=js/emscripten/embed/pre.js",
    "-Clink-arg=-sSTACK_SIZE=128kb",
    "-Clink-arg=-sNODEJS_CATCH_EXIT=0"
 ]
@@ -1,18 +1,19 @@
-name: "Get Emscripten SDK"
-inputs:
-  version:
-    description: ""
-    required: false
-    default: "3.1.64"
-
-runs:
-  using: "composite"
-  steps:
-    - name: install emsdk
-      shell: bash
-      run: |
-        git clone https://github.com/emscripten-core/emsdk.git ./emsdk/
-        cd emsdk
-        git checkout tags/${{ inputs.version }}
-        ./emsdk install ${{ inputs.version }}
-        ./emsdk activate ${{ inputs.version }}
+name: "Get Emscripten SDK"
+inputs:
+  version:
+    description: ""
+    required: false
+    default: "3.1.64"
+
+
+runs:
+  using: "composite"
+  steps:
+    - name: install emsdk
+      shell: bash
+      run: |
+        git clone https://github.com/emscripten-core/emsdk.git ./emsdk/
+        cd emsdk
+        git checkout tags/${{ inputs.version }}
+        ./emsdk install ${{ inputs.version }}
+        ./emsdk activate ${{ inputs.version }}
@@ -1,70 +1,70 @@
-# example:
-#       - uses: ./.github/actions/get-llvm
-#         with:
-#           target: x86_64-unknown-linux-gnu
-
-name: "Download LLVM"
-inputs:
-  target:
-    required: true
-
-runs:
-  using: "composite"
-  steps:
-    - name: find asset
-      id: find
-      uses: actions/github-script@v7
-      env:
-        target: ${{ inputs.target }}
-      with:
-        result-encoding: string
-        script: |
-          let page = 1;
-          let releases = [];
-
-          let releasePrefix = "llvm-"
-          let target = process.env.target
-
-          do {
-            const res = await github.rest.repos.listReleases({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              per_page: 50,
-              page,
-            });
-
-            releases = res.data
-            releases.sort((a, b) => {
-              return (a.published_at < b.published_at) ? 1 : ((a.published_at > b.published_at) ? -1 : 0);
-            });
-
-            let llvmLatestRelease = releases.find(release => {
-              return release.tag_name.startsWith(releasePrefix);
-            });
-            if (llvmLatestRelease){
-                let asset = llvmLatestRelease.assets.find(asset =>{
-                    return asset.name.includes(target);
-                });
-                if (!asset){
-                  core.setFailed(`Artifact for '${target}' not found in release ${llvmLatestRelease.tag_name} (${llvmLatestRelease.html_url})`);
-                  process.exit();
-                }
-                return asset.browser_download_url;
-            }
-
-            page++;
-          } while(releases.length > 0);
-
-          core.setFailed(`No LLVM releases with '${releasePrefix}' atifacts found! Please release LLVM before running this workflow.`);
-          process.exit();
-
-    - name: download
-      shell: bash
-      run: |
-        curl -sSLo llvm.tar.gz ${{ steps.find.outputs.result }}
-
-    - name: unpack
-      shell: bash
-      run: |
-        tar -xf llvm.tar.gz
-        rm llvm.tar.gz
+# example:
+#       - uses: ./.github/actions/get-llvm
+#         with:
+#           target: x86_64-unknown-linux-gnu
+
+name: "Download LLVM"
+inputs:
+  target:
+    required: true
+
+runs:
+  using: "composite"
+  steps:
+    - name: find asset
+      id: find
+      uses: actions/github-script@v7
+      env:
+        target: ${{ inputs.target }}
+      with:
+        result-encoding: string
+        script: |
+          let page = 1;
+          let releases = [];
+
+          let releasePrefix = "llvm-"
+          let target = process.env.target
+
+          do {
+            const res = await github.rest.repos.listReleases({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              per_page: 50,
+              page,
+            });
+
+            releases = res.data
+            releases.sort((a, b) => {
+              return (a.published_at < b.published_at) ? 1 : ((a.published_at > b.published_at) ? -1 : 0);
+            });
+
+            let llvmLatestRelease = releases.find(release => {
+              return release.tag_name.startsWith(releasePrefix);
+            });
+            if (llvmLatestRelease){
+                let asset = llvmLatestRelease.assets.find(asset =>{
+                    return asset.name.includes(target);
+                });
+                if (!asset){
+                  core.setFailed(`Artifact for '${target}' not found in release ${llvmLatestRelease.tag_name} (${llvmLatestRelease.html_url})`);
+                  process.exit();
+                }
+                return asset.browser_download_url;
+            }
+
+            page++;
+          } while(releases.length > 0);
+
+          core.setFailed(`No LLVM releases with '${releasePrefix}' atifacts found! Please release LLVM before running this workflow.`);
+          process.exit();
+
+    - name: download
+      shell: bash
+      run: |
+        curl -sSLo llvm.tar.gz ${{ steps.find.outputs.result }}
+
+    - name: unpack
+      shell: bash
+      run: |
+        tar -xf llvm.tar.gz
+        rm llvm.tar.gz
@@ -1,49 +0,0 @@
-name: NPM Release
-
-on:
-    release:
-        types: [released]
-
-env:
-    CI: true
-
-jobs:
-    publish:
-        name: Build & Publish to NPM
-        runs-on: ubuntu-latest
-        steps:
-            - name: Checkout
-              uses: actions/checkout@v4
-
-            - name: Setup Node.js
-              uses: actions/setup-node@v4
-              with:
-                  node-version: 22.x
-
-            - name: Install
-              run: yarn install --immutable
-
-            - name: update-resolc
-              run: yarn update-resolc
-
-            - name: Build
-              run: yarn build
-
-            - name: Set version
-              run: npm version --no-git-tag-version ${{github.event.release.tag_name}}
-
-            - name: npm pack
-              run: npm pack
-
-            - uses: actions/upload-artifact@v4
-              with:
-                  name: package
-                  path: 'parity-revive-*.tgz'
-
-            - uses: octokit/request-action@bbedc70b1981e610d89f1f8de88311a1fc02fb83
-              with:
-                  route: POST /repos/paritytech/npm_publish_automation/actions/workflows/publish.yml/dispatches
-                  ref: main
-                  inputs: '${{ format(''{{ "repo": "{0}", "run_id": "{1}" }}'', github.repository, github.run_id) }}'
-              env:
-                  GITHUB_TOKEN: ${{ secrets.NPM_PUBLISH_AUTOMATION_TOKEN }}
@@ -37,15 +37,7 @@ jobs:
  build:
    strategy:
      matrix:
-        target:
-          [
-            x86_64-unknown-linux-gnu,
-            x86_64-unknown-linux-musl,
-            wasm32-unknown-emscripten,
-            aarch64-apple-darwin,
-            x86_64-apple-darwin,
-            x86_64-pc-windows-msvc,
-          ]
+        target: [x86_64-unknown-linux-gnu, x86_64-unknown-linux-musl, wasm32-unknown-emscripten, aarch64-apple-darwin, x86_64-apple-darwin, x86_64-pc-windows-msvc]
        include:
          - target: x86_64-unknown-linux-gnu
            builder-arg: gnu
@@ -95,6 +87,11 @@ jobs:
        run: |
          brew install ninja

+      - name: Install Dependencies
+        if: ${{ matrix.host == 'windows' }}
+        run: |
+          choco install ninja
+
      - name: Install LLVM Builder
        run: |
          cargo install --path crates/llvm-builder
@@ -286,3 +286,46 @@ jobs:
            resolc.wasm
            resolc_web.js
            checksums.txt
+
+  npm-release:
+    needs: [create-release]
+    runs-on: macos-14
+    environment: tags
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Download Artifacts
+        uses: actions/download-artifact@v4
+        with:
+          merge-multiple: true
+
+      - name: Set Up Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: "20"
+
+      - run: npm ci -w js/resolc
+
+      - name: Build
+        run: |
+          cp -f resolc.{wasm,js} js/resolc/src/resolc
+          npm -w js/resolc run build
+
+      - name: Set version
+        run: npm -w js/resolc version --no-git-tag-version ${{github.event.release.tag_name}}
+
+      - name: npm pack
+        run: npm -w js/resolc pack
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: npm_package
+          path: "parity-resolc-*.tgz"
+
+      - uses: octokit/request-action@bbedc70b1981e610d89f1f8de88311a1fc02fb83
+        with:
+          route: POST /repos/paritytech/npm_publish_automation/actions/workflows/publish.yml/dispatches
+          ref: main
+          inputs: '${{ format(''{{ "artifact_name": "npm_package", "repo": "{0}", "run_id": "{1}" }}'', github.repository, github.run_id) }}'
+        env:
+          GITHUB_TOKEN: ${{ secrets.NPM_PUBLISH_AUTOMATION_TOKEN }}
@@ -4,9 +4,9 @@ on:
    branches: ["main"]
    types: [opened, synchronize]
    paths:
-      - "LLVM.lock"
-      - "crates/llvm-builder/**"
-      - ".github/workflows/test-llvm-builder.yml"
+      - 'LLVM.lock'
+      - 'crates/llvm-builder/**'
+      - '.github/workflows/test-llvm-builder.yml'

 concurrency:
  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
@@ -86,13 +86,18 @@ jobs:
      - name: Install Node Packages
        run: npm install

-      - name: Run Playwright tests
-        run: |
-          cd js
-          npx playwright install --with-deps
-          npx playwright test
-
-      - name: Test revive
+      - name: Test emscripten
        run: |
          echo "Running tests for ${{ matrix.os }}"
          npm run test:wasm
+
+      - name: Test @parity/resolc
+        run: |
+          echo "Running tests for ${{ matrix.os }}"
+          npm run -w js/resolc test
+
+      - name: Run Playwright tests
+        run: |
+          cd js/emscripten
+          npx playwright install --with-deps
+          npx playwright test
@@ -12,7 +12,6 @@ target-llvm
 node_modules
 artifacts
 tmp
-package-lock.json
 /*.html
 /build
 soljson.js
@@ -0,0 +1,6 @@
+{
+  "trailingComma": "es5",
+  "tabWidth": 2,
+  "semi": false,
+  "singleQuote": false
+}
@@ -19,16 +19,13 @@ This is a development pre-release.
 Supported `polkadot-sdk` rev:`c29e72a8628835e34deb6aa7db9a78a2e4eabcee`

 ### Added
-
- The `revive-runner` helper utility binary which helps to run contracts locally without a blockchain node.
+- The `revive-runner` helper utility binary which helps to run contracts locally without a blockchain node. 
 - Allow configuration of the EVM heap memory size and stack size via CLI flags and JSON input settings.

 ### Changed
-
 - The default PVM stack memory size was increased from 16kb to 32kb.

 ### Fixed
-
 - Constructors avoid storing zero sized immutable data on exit.

 ## v0.1.0-dev.13
@@ -38,19 +35,16 @@ This is a development pre-release.
 Supported `polkadot-sdk` rev:`c29e72a8628835e34deb6aa7db9a78a2e4eabcee`

 ### Added
-
 - Support for solc v0.8.29
 - Decouples the solc JSON-input-output type definitions from the Solidity fronted and expose them via a dedicated crate.
 - `--supported-solc-versions` for `resolc` binary to return a `semver` range of supported `solc` versions.
 - Support for passing LLVM command line options via the prcoess input or providing one or more `--llvm-arg='..'` resolc CLI flag. This allows more fine-grained control over the LLVM backend configuration.

 ### Changed
-
 - Storage keys and values are big endian. This was a pre-mature optimization because for the contract itself it this is a no-op and thus not observable. However we should consider the storage layout as part of the contract ABI. The endianness of transient storage values are still kept as-is.
 - Running `resolc` using webkit is no longer supported.

 ### Fixed
-
 - A missing byte swap for the create2 salt value.

 ## v0.1.0-dev.12
@@ -60,12 +54,10 @@ This is a development pre-release.
 Supported `polkadot-sdk` rev: `21f6f0705e53c15aa2b8a5706b208200447774a9`

 ### Added
-
 - Per file output selection for `--standard-json` mode.
 - The `ir` output selection option for `--standard-json` mode.

 ### Changed
-
 - Improved code size: Large contracts compile to smaller code blobs when enabling aggressive size optimizations (`-Oz`).

 ### Fixed
@@ -81,7 +73,6 @@ Supported `polkadot-sdk` rev: `274a781e8ca1a9432c7ec87593bd93214abbff50`
 ### Changed

 ### Fixed
-
 - A bug causing incorrect loads from the emulated EVM linear memory.
 - A missing integer truncate after switching to 64bit.

@@ -92,12 +83,10 @@ This is a development pre-release.
 Supported `polkadot-sdk` rev: `274a781e8ca1a9432c7ec87593bd93214abbff50`

 ### Added
-
 - Support for the `coinbase` opcode.
 - The resolc web JS version.

 ### Changed
-
 - Missing the `--overwrite` flag emits an error instead of a warning.
 - The `resolc` executable prints the help by default.
 - Removed support for legacy EVM assembly (EVMLA) translation.
@@ -107,7 +96,6 @@ Supported `polkadot-sdk` rev: `274a781e8ca1a9432c7ec87593bd93214abbff50`
  If detected, the re-entrant call flag is not set and 0 deposit limit is endowed.

 ### Fixed
-
 - Solidity: Add the solc `--libraries` files to sources.
 - A data race in tests.
 - Fix `broken pipe` errors.
@@ -121,11 +109,9 @@ This is a development pre-release.
 ### Added

 ### Changed
-
 - Syscalls with more than 6 arguments now pack them into registers.

 ### Fixed
-
 - Remove reloading of the resolc.js file (fix issue with relative path in web worker)

 ## v0.1.0-dev.8
@@ -133,18 +119,15 @@ This is a development pre-release.
 This is a development pre-release.

 ### Added
-
 - The `revive-llvm-builder` crate with the `revive-llvm` helper utility for streamlined management of the LLVM framework dependency.
 - Initial support for running `resolc` in the browser.

 ### Changed
-
 - Suported contracts runtime is polkadot-sdk git version `d62a90c8c729acd98c7e9a5cab9803b8b211ffc5`.
 - The minimum supported Rust version is `1.81.0`.
 - Error out early instead of invoking `solc` with invalid base or include path flags.

 ### Fixed
-
 - Decouple the LLVM target dependency from the LLVM host dependency.
 - Do not error out if no files and no errors were produced. This aligns resolc closer to solc.
 - Fixes input normalization in the Wasm version.
@@ -154,20 +137,17 @@ This is a development pre-release.
 This is a development pre-release.

 ### Added
-
 - Implement the `GASPRICE` opcode.
 - Implement the `BASEFEE` opcode.
 - Implement the `GASLIMIT` opcode.

 ### Changed
-
 - The `GAS` opcode now returns the remaining `ref_time`.
 - Contracts can now be supplied call data input of arbitrary size.
- Some syscalls now return the value in a register, slightly improving emitted contract code.
+- Some syscalls now return the value in a register, slightly improving  emitted contract code.
 - Calls forward maximum weight limits instead of 0, anticipating a change in polkadot-sdk where weight limits of 0 no longer interprets as uncapped limit.

 ### Fixed
-
 - A linker bug which was preventing certain contracts from linking with the PVM linker.
 - JS: Fix encoding conversion from JS string (UTF-16) to UTF-8.
 - The git commit hash slug is always displayed in the version string.
@@ -177,7 +157,6 @@ This is a development pre-release.
 This is a development pre-release.

 # Added
-
 - Implement the `BLOCKHASH` opcode.
 - Implement delegate calls.
 - Implement the `GASPRICE` opcode. Currently hard-coded to return `1`.
@@ -185,24 +164,21 @@ This is a development pre-release.
 - Initial support for emitting debug info (opt in via the `-g` flag)

 # Changed
-
 - resolc now emits 64bit PolkaVM blobs, reducing contract code size and execution time.
 - The RISC-V bit-manipulation target feature (`zbb`) is enabled.

 # Fixed
-
 - Compilation to Wasm (for usage in node and web browsers)

+
 ## v0.1.0-dev.5

 This is development pre-release.

 # Added
-
 - Implement the `CODESIZE` and `EXTCODESIZE` opcodes.

 # Changed
-
 - Include the full revive version in the contract metadata.

 # Fixed
@@ -212,11 +188,9 @@ This is development pre-release.
 This is development pre-release.

 # Added
-
 - Support the `ORIGIN` opcode.

 # Changed
-
 - Update polkavm to `v0.14.0`.
 - Enable the `a`, `fast-unaligned-access` and `xtheadcondmov` LLVM target features, decreasing the code size for some contracts.

@@ -92,7 +92,4 @@ clean:
 	rm -rf node_modules ; \
 	rm -rf crates/solidity/src/tests/cli-tests/artifacts ; \
 	cargo uninstall revive-solidity ; \
-	cargo uninstall revive-llvm-builder ; \
-	rm -f package-lock.json ; \
-	rm -rf js/dist ; \
-	rm -f js/src/resolc.{wasm,js}
+	cargo uninstall revive-llvm-builder ;
@@ -14,7 +14,6 @@ This is experimental software in active development and not ready just yet for p
 Discussion around the development is hosted on the [Polkadot Forum](https://forum.polkadot.network/t/contracts-update-solidity-on-polkavm/6949#a-new-solidity-compiler-1).

 ## Installation
-
 Please consult [the documentation](https://contracts.polkadot.io/revive_compiler/installation) for installation instructions.

 ## Building from source
@@ -31,13 +30,11 @@ Building revive requires a [stable Rust installation](https://rustup.rs/) and a
 Download the [latest LLVM build](https://github.com/paritytech/revive/releases?q=LLVM+binaries+release&expanded=true) from our releases.

 > **MacOS** users need to clear the `downloaded` attribute from all binaries after extracting the archive:
->
 > ```sh
 > xattr -rc </path/to/the/extracted/archive>/target-llvm/gnu/target-final/bin/*
 > ```

 After extracting the archive, point `$LLVM_SYS_181_PREFIX` to it:
-
 ```sh
 export LLVM_SYS_181_PREFIX=</path/to/the/extracted/archive>/target-llvm/gnu/target-final
 ```
@@ -47,7 +44,7 @@ export LLVM_SYS_181_PREFIX=</path/to/the/extracted/archive>/target-llvm/gnu/targ
 <details>
  <summary>Building from source</summary>

-Use the provided [revive-llvm](crates/llvm-builder/README.md) utility to compile a compatible LLVM build locally and point `$LLVM_SYS_181_PREFIX` to the installation afterwards.
+ Use the provided [revive-llvm](crates/llvm-builder/README.md) utility to compile a compatible LLVM build locally and point `$LLVM_SYS_181_PREFIX` to the installation afterwards.

 The `Makefile` provides a shortcut target to obtain a compatible LLVM build:

@@ -96,12 +93,11 @@ make test-wasm

 ## Development

-Please consult the [Makefile](Makefile) targets to learn how to run tests and benchmarks.
+Please consult the [Makefile](Makefile) targets to learn how to run tests and benchmarks. 
 Ensure that your branch passes `make test` locally when submitting a pull request.

 ### Design overview
-
-See the [relevant section in our documentation](https://contracts.polkadot.io/revive_compiler/architecture) to learn more about how the compiler works.
+See the [relevant section in our documentation](https://contracts.polkadot.io/revive_compiler/architecture) to learn more about how the compiler works. 

 [Frontend](https://github.com/matter-labs/era-compiler-solidity) and [code generator](https://github.com/matter-labs/era-compiler-llvm-context) are based of ZKSync `zksolc` (the project started as a fork of the era compiler).

@@ -18,4 +18,4 @@ To create a new pre-release:
 To create a new LLVM release, run "Release LLVM" workflow. Use current LLVM version as parameter, e.g. `18.1.8`.
 Version suffix will be resolved automatically.  
 The workflows will create new GitHub release, and upload LLVM binaries.
-Next release of resolc will use newly created binaries.
+Next release of resolc will use newly created binaries.  
@@ -1 +1 @@
-https://github.com/paritytech/polkadot-sdk/blob/master/docs/contributor/SECURITY.md
+https://github.com/paritytech/polkadot-sdk/blob/master/docs/contributor/SECURITY.md
@@ -3,71 +3,71 @@
 ## Table of Contents

 - [Benchmark Results](#benchmark-results)
-  - [Baseline](#baseline)
-  - [OddPorduct](#oddporduct)
-  - [TriangleNumber](#trianglenumber)
-  - [FibonacciRecursive](#fibonaccirecursive)
-  - [FibonacciIterative](#fibonacciiterative)
-  - [FibonacciBinet](#fibonaccibinet)
-  - [SHA1](#sha1)
+    - [Baseline](#baseline)
+    - [OddPorduct](#oddporduct)
+    - [TriangleNumber](#trianglenumber)
+    - [FibonacciRecursive](#fibonaccirecursive)
+    - [FibonacciIterative](#fibonacciiterative)
+    - [FibonacciBinet](#fibonaccibinet)
+    - [SHA1](#sha1)

 ## Benchmark Results

 ### Baseline

-|         | `EVM`                     | `PVMInterpreter`                 |
-| :------ | :------------------------ | :------------------------------- |
-| **`0`** | `10.08 us` (✅ **1.00x**) | `10.32 us` (✅ **1.02x slower**) |
+|         | `EVM`                    | `PVMInterpreter`                 |
+|:--------|:-------------------------|:-------------------------------- |
+| **`0`** | `10.08 us` (✅ **1.00x**) | `10.32 us` (✅ **1.02x slower**)  |

 ### OddPorduct

-|              | `EVM`                      | `PVMInterpreter`                 |
-| :----------- | :------------------------- | :------------------------------- |
-| **`10000`**  | `3.60 ms` (✅ **1.00x**)   | `1.57 ms` (🚀 **2.28x faster**)  |
-| **`100000`** | `34.72 ms` (✅ **1.00x**)  | `14.82 ms` (🚀 **2.34x faster**) |
-| **`300000`** | `105.01 ms` (✅ **1.00x**) | `44.11 ms` (🚀 **2.38x faster**) |
+|              | `EVM`                     | `PVMInterpreter`                 |
+|:-------------|:--------------------------|:-------------------------------- |
+| **`10000`**  | `3.60 ms` (✅ **1.00x**)   | `1.57 ms` (🚀 **2.28x faster**)   |
+| **`100000`** | `34.72 ms` (✅ **1.00x**)  | `14.82 ms` (🚀 **2.34x faster**)  |
+| **`300000`** | `105.01 ms` (✅ **1.00x**) | `44.11 ms` (🚀 **2.38x faster**)  |

 ### TriangleNumber

-|              | `EVM`                     | `PVMInterpreter`                 |
-| :----------- | :------------------------ | :------------------------------- |
-| **`10000`**  | `2.43 ms` (✅ **1.00x**)  | `1.12 ms` (🚀 **2.17x faster**)  |
-| **`100000`** | `24.20 ms` (✅ **1.00x**) | `10.86 ms` (🚀 **2.23x faster**) |
-| **`360000`** | `88.69 ms` (✅ **1.00x**) | `38.46 ms` (🚀 **2.31x faster**) |
+|              | `EVM`                    | `PVMInterpreter`                 |
+|:-------------|:-------------------------|:-------------------------------- |
+| **`10000`**  | `2.43 ms` (✅ **1.00x**)  | `1.12 ms` (🚀 **2.17x faster**)   |
+| **`100000`** | `24.20 ms` (✅ **1.00x**) | `10.86 ms` (🚀 **2.23x faster**)  |
+| **`360000`** | `88.69 ms` (✅ **1.00x**) | `38.46 ms` (🚀 **2.31x faster**)  |

 ### FibonacciRecursive

-|          | `EVM`                      | `PVMInterpreter`                  |
-| :------- | :------------------------- | :-------------------------------- |
-| **`12`** | `144.17 us` (✅ **1.00x**) | `150.85 us` (✅ **1.05x slower**) |
-| **`16`** | `938.71 us` (✅ **1.00x**) | `922.11 us` (✅ **1.02x faster**) |
-| **`20`** | `6.54 ms` (✅ **1.00x**)   | `6.20 ms` (✅ **1.05x faster**)   |
-| **`24`** | `45.73 ms` (✅ **1.00x**)  | `41.98 ms` (✅ **1.09x faster**)  |
+|          | `EVM`                     | `PVMInterpreter`                  |
+|:---------|:--------------------------|:--------------------------------- |
+| **`12`** | `144.17 us` (✅ **1.00x**) | `150.85 us` (✅ **1.05x slower**)  |
+| **`16`** | `938.71 us` (✅ **1.00x**) | `922.11 us` (✅ **1.02x faster**)  |
+| **`20`** | `6.54 ms` (✅ **1.00x**)   | `6.20 ms` (✅ **1.05x faster**)    |
+| **`24`** | `45.73 ms` (✅ **1.00x**)  | `41.98 ms` (✅ **1.09x faster**)   |

 ### FibonacciIterative

-|           | `EVM`                     | `PVMInterpreter`                 |
-| :-------- | :------------------------ | :------------------------------- |
-| **`64`**  | `23.00 us` (✅ **1.00x**) | `31.88 us` (❌ _1.39x slower_)   |
-| **`128`** | `35.28 us` (✅ **1.00x**) | `42.43 us` (❌ _1.20x slower_)   |
-| **`256`** | `60.12 us` (✅ **1.00x**) | `61.20 us` (✅ **1.02x slower**) |
+|           | `EVM`                    | `PVMInterpreter`                 |
+|:----------|:-------------------------|:-------------------------------- |
+| **`64`**  | `23.00 us` (✅ **1.00x**) | `31.88 us` (❌ *1.39x slower*)    |
+| **`128`** | `35.28 us` (✅ **1.00x**) | `42.43 us` (❌ *1.20x slower*)    |
+| **`256`** | `60.12 us` (✅ **1.00x**) | `61.20 us` (✅ **1.02x slower**)  |

 ### FibonacciBinet

-|           | `EVM`                     | `PVMInterpreter`               |
-| :-------- | :------------------------ | :----------------------------- |
-| **`64`**  | `23.01 us` (✅ **1.00x**) | `47.74 us` (❌ _2.07x slower_) |
-| **`128`** | `25.44 us` (✅ **1.00x**) | `49.67 us` (❌ _1.95x slower_) |
-| **`256`** | `28.66 us` (✅ **1.00x**) | `53.01 us` (❌ _1.85x slower_) |
+|           | `EVM`                    | `PVMInterpreter`                 |
+|:----------|:-------------------------|:-------------------------------- |
+| **`64`**  | `23.01 us` (✅ **1.00x**) | `47.74 us` (❌ *2.07x slower*)    |
+| **`128`** | `25.44 us` (✅ **1.00x**) | `49.67 us` (❌ *1.95x slower*)    |
+| **`256`** | `28.66 us` (✅ **1.00x**) | `53.01 us` (❌ *1.85x slower*)    |

 ### SHA1

-|           | `EVM`                      | `PVMInterpreter`                |
-| :-------- | :------------------------- | :------------------------------ |
-| **`1`**   | `135.87 us` (✅ **1.00x**) | `243.75 us` (❌ _1.79x slower_) |
-| **`64`**  | `258.45 us` (✅ **1.00x**) | `355.70 us` (❌ _1.38x slower_) |
-| **`512`** | `1.10 ms` (✅ **1.00x**)   | `1.09 ms` (✅ **1.01x faster**) |
+|           | `EVM`                     | `PVMInterpreter`                  |
+|:----------|:--------------------------|:--------------------------------- |
+| **`1`**   | `135.87 us` (✅ **1.00x**) | `243.75 us` (❌ *1.79x slower*)    |
+| **`64`**  | `258.45 us` (✅ **1.00x**) | `355.70 us` (❌ *1.38x slower*)    |
+| **`512`** | `1.10 ms` (✅ **1.00x**)   | `1.09 ms` (✅ **1.01x faster**)    |

 ---
-
 Made with [criterion-table](https://github.com/nu11ptr/criterion-table)
+
@@ -1,47 +1,47 @@
 {
-  "config": {
-    "chainId": 420420420,
-    "homesteadBlock": 0,
-    "eip150Block": 0,
-    "eip155Block": 0,
-    "eip158Block": 0,
-    "byzantiumBlock": 0,
-    "constantinopleBlock": 0,
-    "petersburgBlock": 0,
-    "istanbulBlock": 0,
-    "berlinBlock": 0,
-    "londonBlock": 0,
-    "arrowGlacierBlock": 0,
-    "grayGlacierBlock": 0,
-    "shanghaiTime": 0,
-    "cancunTime": 0,
-    "terminalTotalDifficulty": 0,
-    "terminalTotalDifficultyPassed": true,
-    "blobSchedule": {
-      "cancun": {
-        "target": 3,
-        "max": 6,
-        "baseFeeUpdateFraction": 3338477
-      }
-    }
-  },
-  "coinbase": "0xffffffffffffffffffffffffffffffffffffffff",
-  "difficulty": "0x20000",
-  "extraData": "",
-  "gasLimit": "0xffffffff",
-  "nonce": "0x0000000000000042",
-  "mixhash": "0x0000000000000000000000000000000000000000000000000000000000000000",
-  "parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
-  "timestamp": "0x00",
-  "alloc": {
-    "0101010101010101010101010101010101010101": {
-      "balance": "1000000000"
+    "config": {
+        "chainId": 420420420,
+        "homesteadBlock": 0,
+        "eip150Block": 0,
+        "eip155Block": 0,
+        "eip158Block": 0,
+        "byzantiumBlock": 0,
+        "constantinopleBlock": 0,
+        "petersburgBlock": 0,
+        "istanbulBlock": 0,
+        "berlinBlock": 0,
+        "londonBlock": 0,
+        "arrowGlacierBlock": 0,
+        "grayGlacierBlock": 0,
+        "shanghaiTime": 0,
+        "cancunTime": 0,
+        "terminalTotalDifficulty": 0,
+        "terminalTotalDifficultyPassed": true,
+        "blobSchedule": {
+            "cancun": {
+                "target": 3,
+                "max": 6,
+                "baseFeeUpdateFraction": 3338477
+            }
+        }
    },
-    "0202020202020202020202020202020202020202": {
-      "balance": "1000000000"
-    },
-    "0303030303030303030303030303030303030303": {
-      "balance": "1000000000"
+    "coinbase": "0xffffffffffffffffffffffffffffffffffffffff",
+    "difficulty": "0x20000",
+    "extraData": "",
+    "gasLimit": "0xffffffff",
+    "nonce": "0x0000000000000042",
+    "mixhash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+    "parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+    "timestamp": "0x00",
+    "alloc": {
+        "0101010101010101010101010101010101010101": {
+            "balance": "1000000000"
+        },
+        "0202020202020202020202020202020202020202": {
+            "balance": "1000000000"
+        },
+        "0303030303030303030303030303030303030303": {
+            "balance": "1000000000"
+        }
    }
-  }
-}
+}
@@ -7,4 +7,4 @@
  "FibonacciIterative": 1497,
  "Flipper": 2099,
  "SHA1": 8243
-}
+}
@@ -6,7 +6,6 @@ Parity fork of the [Matter Labs zksync LLVM builder](https://github.com/matter-l

 The LLVM compiler framework for revive must be built with our tool called `revive-llvm`.
 This is because the revive compiler has requirements not fullfilled in upstream builds:
-
 - Special builds for compiling the frontend into statically linked ELF binaries and also Wasm executables
 - The RISC-V target (the PolkaVM target)
 - The compiler-rt builtins for the PolkaVM target
@@ -18,92 +17,85 @@ Obtain a compatible build for your host platform from the release section of thi
 <details>
 <summary>1. Install the system prerequisites.</summary>

- Linux (Debian):
+   * Linux (Debian):

-  Install the following packages:
+      Install the following packages:
+      ```shell
+      apt install cmake ninja-build curl git libssl-dev pkg-config clang lld
+      ```
+   * Linux (Arch):

-  ```shell
-  apt install cmake ninja-build curl git libssl-dev pkg-config clang lld
-  ```
+      Install the following packages:
+      ```shell
+      pacman -Syu which cmake ninja curl git pkg-config clang lld
+      ```

- Linux (Arch):
+   * MacOS:

-  Install the following packages:
+      * Install the [HomeBrew](https://brew.sh) package manager.
+      * Install the following packages:

-  ```shell
-  pacman -Syu which cmake ninja curl git pkg-config clang lld
-  ```
+         ```shell
+         brew install cmake ninja coreutils
+         ```

- MacOS:
-
-        * Install the [HomeBrew](https://brew.sh) package manager.
-        * Install the following packages:
-
-           ```shell
-           brew install cmake ninja coreutils
-           ```
-
-        * Install your choice of a recent LLVM/[Clang](https://clang.llvm.org) compiler, e.g. via [Xcode](https://developer.apple.com/xcode/), [Apple’s Command Line Tools](https://developer.apple.com/library/archive/technotes/tn2339/_index.html), or your preferred package manager.
-
-  </details>
+      * Install your choice of a recent LLVM/[Clang](https://clang.llvm.org) compiler, e.g. via [Xcode](https://developer.apple.com/xcode/), [Apple’s Command Line Tools](https://developer.apple.com/library/archive/technotes/tn2339/_index.html), or your preferred package manager.
+</details>

 <details>
 <summary>2. Install Rust.</summary>

- Follow the latest [official instructions](https://www.rust-lang.org/tools/install:
-  `shell
+   * Follow the latest [official instructions](https://www.rust-lang.org/tools/install:
+      ```shell
      curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
      . ${HOME}/.cargo/env
-      `
+      ```

-        > Currently we are not pinned to any specific version of Rust, so just install the latest stable build for your   platform.
-
-  </details>
+      > Currently we are not pinned to any specific version of Rust, so just install the latest stable build for your   platform.
+</details>

 <details>
 <summary>3. Install the revive LLVM framework builder.</summary>

- Install the builder using `cargo`:
+   * Install the builder using `cargo`:
+      ```shell
+      cargo install --git https://github.com/paritytech/revive-llvm-builder --force --locked
+      ```

-  ```shell
-  cargo install --git https://github.com/paritytech/revive-llvm-builder --force --locked
-  ```
-
-  > The builder is not the LLVM framework itself, but a tool that clones its repository and runs a sequence of build commands. By default it is installed in `~/.cargo/bin/`, which is recommended to be added to your `$PATH`.
+      > The builder is not the LLVM framework itself, but a tool that clones its repository and runs a sequence of build commands. By default it is installed in `~/.cargo/bin/`, which is recommended to be added to your `$PATH`.

 </details>

 <details>
 <summary>4. (Optional) Create the `LLVM.lock` file.</summary>

- The `LLVM.lock` dictates the LLVM source tree being used.
-  A default `./LLVM.lock` pointing to the release used for development is already provided.
+   * The `LLVM.lock` dictates the LLVM source tree being used.
+     A default `./LLVM.lock` pointing to the release used for development is already provided.

 </details>

 <details>
 <summary>5. Build LLVM.</summary>

- Clone and build the LLVM framework using the `revive-llvm` tool.
+   * Clone and build the LLVM framework using the `revive-llvm` tool.

-  The clang and lld projects are required for the `resolc` Solidity frontend executable; they are enabled by default. LLVM assertions are also enabled by default.
+     The clang and lld projects are required for the `resolc` Solidity frontend executable; they are enabled by default. LLVM assertions are also enabled by default.

-  ```shell
-  revive-llvm clone
-  revive-llvm build --llvm-projects lld --llvm-projects clang
-  ```
+      ```shell
+      revive-llvm clone
+      revive-llvm build --llvm-projects lld --llvm-projects clang
+      ```

-  Build artifacts end up in the `./target-llvm/gnu/target-final/` directory by default.
-  The `gnu` directory depends on the supported archticture and will either be `gnu`, `musl` or `emscripten`.
-  You now need to export the final target directory `$LLVM_SYS_181_PREFIX`: `export LLVM_SYS_181_PREFIX=${PWD}/target-llvm/gnu/target-final`
-  If built with the `--enable-tests` option, test tools will be in the `./target-llvm/gnu/build-final/` directory, along with copies of the build artifacts. For all supported build options, run `revive-llvm build --help`.
+      Build artifacts end up in the `./target-llvm/gnu/target-final/` directory by default.
+      The `gnu` directory depends on the supported archticture and will either be `gnu`, `musl` or `emscripten`.
+      You now need to export the final target directory `$LLVM_SYS_181_PREFIX`: `export LLVM_SYS_181_PREFIX=${PWD}/target-llvm/gnu/target-final`
+      If built with the `--enable-tests` option, test tools will be in the `./target-llvm/gnu/build-final/` directory, along with copies of the build artifacts. For all supported build options, run `revive-llvm build --help`.

 </details>

 ## Supported target architectures

 The following target platforms are supported:
-
 - Linux GNU (x86)
 - Linux MUSL (x86)
 - MacOS (aarch64)
@@ -113,29 +105,28 @@ The following target platforms are supported:
 <details>
 <summary>Building for MUSL</summary>

- Via a musl build we can build revive into fully static ELF binaries.
-  Which is desirable for reproducible Solidity contracts builds.
-  The resulting binary is also very portable, akin to the`solc` frontend binary distribution.
+   * Via a musl build we can build revive into fully static ELF binaries.
+     Which is desirable for reproducible Solidity contracts builds.
+     The resulting binary is also very portable, akin to the`solc` frontend binary distribution.

-  Clone and build the LLVM framework using the `revive-llvm` tool:
-
-  ```shell
-  revive-llvm --target-env musl clone
-  revive-llvm --target-env musl build --enable-assertions --llvm-projects clang --llvm-projects lld
-  ```
+     Clone and build the LLVM framework using the `revive-llvm` tool:
+      ```shell
+      revive-llvm --target-env musl clone
+      revive-llvm --target-env musl build --enable-assertions --llvm-projects clang --llvm-projects lld 
+      ```

 </details>

 <details>
 <summary>Building for Emscripten</summary>

- Via an emsdk build we can run revive in the browser and on node.js.
+   * Via an emsdk build we can run revive in the browser and on node.js.

-  Clone and build the LLVM framework using the `revive-llvm` tool:
-
-  ```shell
-  revive-llvm --target-env emscripten clone
-  revive-llvm --target-env emscripten build --enable-assertions --llvm-projects clang --llvm-projects lld
-  ```
+     Clone and build the LLVM framework using the `revive-llvm` tool:
+      ```shell
+      revive-llvm --target-env emscripten clone
+      revive-llvm --target-env emscripten build --enable-assertions --llvm-projects clang --llvm-projects lld 
+      ```

 </details>
+
@@ -117,13 +117,7 @@ pub fn build(
    log::info!("building compiler-rt for rv64emac");

    crate::utils::check_presence("cmake")?;
-
-    let generator = if cfg!(target_os = "windows") {
-        "Visual Studio 17 2022"
-    } else {
-        crate::utils::check_presence("ninja")?;
-        "Ninja"
-    };
+    crate::utils::check_presence("ninja")?;

    let llvm_module_compiler_rt = crate::LLVMPath::llvm_module_compiler_rt()?;
    let llvm_compiler_rt_build = crate::LLVMPath::llvm_build_compiler_rt()?;
@@ -136,7 +130,7 @@ pub fn build(
                "-B",
                llvm_compiler_rt_build.to_string_lossy().as_ref(),
                "-G",
-                generator,
+                "Ninja",
            ])
            .args(CMAKE_STATIC_ARGS)
            .args(cmake_dynamic_args(build_type, target_env)?)
@@ -16,7 +16,7 @@ Inside the root `revive` repository directory, execute:
 make install-revive-runner
 ```

-Which will install the `revive-runner` using `cargo`.
+Which will install the `revive-runner` using `cargo`. 

 ## Usage

@@ -24,4 +24,3 @@ Set the `RUST_LOG` environment varibale to the `trace` level to see the full Pol

 ```bash
 RUST_LOG=trace revive-runner -f mycontract.pvm -c a9059cbb000000000000000000000000f24ff3a9cf04c71dbc94d0b566f7a27b94566cac0000000000000000000000000000000000000000000000000000000000000000
-```
@@ -23,4 +23,4 @@
    "ts-jest": "^29.2.5",
    "typescript": "^5.7.3"
  }
-}
+}
@@ -1,33 +1,19 @@
-import * as path from "path";
+import * as path from 'path';

-const outputDir = "artifacts";
-const binExtension = ":C.pvm";
-const asmExtension = ":C.pvmasm";
-const llvmExtension = ".ll";
-const contractSolFilename = "contract.sol";
-const contractYulFilename = "contract.yul";
-const contractOptimizedLLVMFilename = contractSolFilename + ".C.optimized";
-const contractUnoptimizedLLVMFilename = contractSolFilename + ".C.unoptimized";
-const pathToOutputDir = path.join(__dirname, "..", outputDir);
-const pathToContracts = path.join(__dirname, "..", "src", "contracts");
-const pathToBasicYulContract = path.join(
-  pathToContracts,
-  "yul",
-  contractYulFilename,
-);
-const pathToBasicSolContract = path.join(
-  pathToContracts,
-  "solidity",
-  contractSolFilename,
-);
-const pathToSolBinOutputFile = path.join(
-  pathToOutputDir,
-  contractSolFilename + binExtension,
-);
-const pathToSolAsmOutputFile = path.join(
-  pathToOutputDir,
-  contractSolFilename + asmExtension,
-);
+const outputDir = 'artifacts';
+const binExtension = ':C.pvm';
+const asmExtension = ':C.pvmasm';
+const llvmExtension = '.ll';
+const contractSolFilename = 'contract.sol';
+const contractYulFilename = 'contract.yul';
+const contractOptimizedLLVMFilename = contractSolFilename + '.C.optimized';
+const contractUnoptimizedLLVMFilename = contractSolFilename + '.C.unoptimized';
+const pathToOutputDir = path.join(__dirname, '..', outputDir);
+const pathToContracts = path.join(__dirname, '..', 'src', 'contracts');
+const pathToBasicYulContract = path.join(pathToContracts, 'yul', contractYulFilename);
+const pathToBasicSolContract = path.join(pathToContracts, 'solidity', contractSolFilename);
+const pathToSolBinOutputFile = path.join(pathToOutputDir, contractSolFilename + binExtension);
+const pathToSolAsmOutputFile = path.join(pathToOutputDir, contractSolFilename + asmExtension);

 export const paths = {
  outputDir: outputDir,
@@ -1,51 +1,44 @@
-import * as shell from "shelljs";
-import * as fs from "fs";
-import { spawnSync } from "child_process";
+import * as shell from 'shelljs';
+import * as fs from 'fs';
+import { spawnSync } from 'child_process';

 interface CommandResult {
-  output: string;
-  exitCode: number;
+    output: string;
+    exitCode: number;
 }

-export const executeCommand = (
-  command: string,
-  stdin?: string,
-): CommandResult => {
-  if (stdin) {
-    const process = spawnSync(command, [], {
-      input: stdin,
-      shell: true,
-      encoding: "utf8",
-      maxBuffer: 30 * 1024 * 1024,
-    });
+export const executeCommand = (command: string, stdin?: string): CommandResult => {
+    if (stdin) {
+        const process = spawnSync(command, [], {
+            input: stdin,
+            shell: true,
+            encoding: 'utf8',
+            maxBuffer: 30 * 1024 * 1024
+        });

+        return {
+            exitCode: process.status || 0,
+            output: (process.stdout || process.stderr || '').toString()
+        };
+    }
+
+    const result = shell.exec(command, { silent: true, async: false });
    return {
-      exitCode: process.status || 0,
-      output: (process.stdout || process.stderr || "").toString(),
+        exitCode: result.code,
+        output: result.stdout || result.stderr || ''
    };
-  }
-
-  const result = shell.exec(command, { silent: true, async: false });
-  return {
-    exitCode: result.code,
-    output: result.stdout || result.stderr || "",
-  };
 };

 export const isFolderExist = (folder: string): boolean => {
-  return shell.test("-d", folder);
+    return shell.test('-d', folder);
 };

-export const isFileExist = (
-  pathToFileDir: string,
-  fileName: string,
-  fileExtension: string,
-): boolean => {
-  return shell.ls(pathToFileDir).stdout.includes(fileName + fileExtension);
+export const isFileExist = (pathToFileDir: string, fileName: string, fileExtension: string): boolean => {
+    return shell.ls(pathToFileDir).stdout.includes(fileName + fileExtension);
 };

 export const isFileEmpty = (file: string): boolean => {
-  if (fs.existsSync(file)) {
-    return fs.readFileSync(file).length === 0;
-  }
+    if (fs.existsSync(file)) {
+        return (fs.readFileSync(file).length === 0);
+    }
 };
@@ -1,11 +1,12 @@
-import { executeCommand } from "../src/helper";
-import { paths } from "../src/entities";
+import {executeCommand} from "../src/helper";
+import { paths } from '../src/entities';
+

 //id1746
 describe("Run with --asm by default", () => {
  const command = `resolc ${paths.pathToBasicSolContract} --asm`;
  const result = executeCommand(command);
-  const commandInvalid = "resolc --asm";
+  const commandInvalid = 'resolc --asm';
  const resultInvalid = executeCommand(commandInvalid);

  it("Valid command exit code = 0", () => {
@@ -27,18 +28,16 @@ describe("Run with --asm by default", () => {
  });

  it("run invalid: resolc --asm", () => {
-    expect(resultInvalid.output).toMatch(
-      /(No input sources specified|Compilation aborted)/i,
-    );
+    expect(resultInvalid.output).toMatch(/(No input sources specified|Compilation aborted)/i);
  });
-
+  
  it("Invalid command exit code = 1", () => {
    expect(resultInvalid.exitCode).toBe(1);
  });

  it("Invalid solc exit code == Invalid resolc exit code", () => {
-    const command = "solc --asm";
+    const command = 'solc --asm';
    const solcResult = executeCommand(command);
    expect(solcResult.exitCode).toBe(resultInvalid.exitCode);
  });
-});
+});
@@ -1,241 +1,191 @@
-import {
-  executeCommand,
-  isFolderExist,
-  isFileExist,
-  isFileEmpty,
-} from "../src/helper";
-import { paths } from "../src/entities";
-import * as shell from "shelljs";
-import * as path from "path";
+import { executeCommand, isFolderExist, isFileExist, isFileEmpty } from "../src/helper";
+import { paths } from '../src/entities';
+import * as shell from 'shelljs';
+import * as path from 'path';
+

 //id1762
 describe("Run resolc without any options", () => {
-  const command = "resolc";
-  const result = executeCommand(command);
+    const command = 'resolc';
+    const result = executeCommand(command);

-  it("Info with help is presented", () => {
-    expect(result.output).toMatch(/(Usage: resolc)/i);
-  });
+    it("Info with help is presented", () => {
+        expect(result.output).toMatch(/(Usage: resolc)/i);
+    });

-  it("Exit code = 1", () => {
-    expect(result.exitCode).toBe(1);
-  });
+    it("Exit code = 1", () => {
+        expect(result.exitCode).toBe(1);
+    });

-  it("solc exit code == resolc exit code", () => {
-    const command = "solc";
-    const solcResult = executeCommand(command);
-    expect(solcResult.exitCode).toBe(result.exitCode);
-  });
+    it("solc exit code == resolc exit code", () => {
+        const command = 'solc';
+        const solcResult = executeCommand(command);
+        expect(solcResult.exitCode).toBe(result.exitCode);
+    });
 });

+
 //#1713
 describe("Default run a command from the help", () => {
-  const command = `resolc ${paths.pathToBasicSolContract} --overwrite -O3 --bin --output-dir "${paths.pathToOutputDir}"`; // potential issue on resolc with full path on Windows cmd
-  const result = executeCommand(command);

-  it("Compiler run successful", () => {
-    expect(result.output).toMatch(/(Compiler run successful.)/i);
-  });
-  it("Exit code = 0", () => {
-    expect(result.exitCode).toBe(0);
-  });
-  it("Output dir is created", () => {
-    expect(isFolderExist(paths.pathToOutputDir)).toBe(true);
-  });
-  xit("Output file is created", () => {
-    // a bug on windows
-    expect(
-      isFileExist(
-        paths.pathToOutputDir,
-        paths.contractSolFilename,
-        paths.binExtension,
-      ),
-    ).toBe(true);
-  });
-  it("the output file is not empty", () => {
-    expect(isFileEmpty(paths.pathToSolBinOutputFile)).toBe(false);
-  });
-  it("No 'Error'/'Warning'/'Fail' in the output", () => {
-    expect(result.output).not.toMatch(/([Ee]rror|[Ww]arning|[Ff]ail)/i);
-  });
+    const command = `resolc ${paths.pathToBasicSolContract} --overwrite -O3 --bin --output-dir "${paths.pathToOutputDir}"`; // potential issue on resolc with full path on Windows cmd
+    const result = executeCommand(command);
+
+    it("Compiler run successful", () => {
+        expect(result.output).toMatch(/(Compiler run successful.)/i);
+    });
+    it("Exit code = 0", () => {
+        expect(result.exitCode).toBe(0);
+    });
+    it("Output dir is created", () => {
+        expect(isFolderExist(paths.pathToOutputDir)).toBe(true);
+    });
+    xit("Output file is created", () => { // a bug on windows
+        expect(isFileExist(paths.pathToOutputDir, paths.contractSolFilename, paths.binExtension)).toBe(true);
+    });
+    it("the output file is not empty", () => {
+        expect(isFileEmpty(paths.pathToSolBinOutputFile)).toBe(false);
+    });
+    it("No 'Error'/'Warning'/'Fail' in the output", () => {
+        expect(result.output).not.toMatch(/([Ee]rror|[Ww]arning|[Ff]ail)/i);
+    });
 });

 //#1818
 describe("Default run a command from the help", () => {
-  const command = `resolc ${paths.pathToBasicSolContract} --overwrite -O3 --bin --asm --output-dir "${paths.pathToOutputDir}"`; // potential issue on resolc with full path on Windows cmd
-  const result = executeCommand(command);

-  it("Compiler run successful", () => {
-    expect(result.output).toMatch(/(Compiler run successful.)/i);
-  });
-  it("Exit code = 0", () => {
-    expect(result.exitCode).toBe(0);
-  });
-  it("Output dir is created", () => {
-    expect(isFolderExist(paths.pathToOutputDir)).toBe(true);
-  });
-  xit("Output files are created", () => {
-    // a bug on windows
-    expect(
-      isFileExist(
-        paths.pathToOutputDir,
-        paths.contractSolFilename,
-        paths.binExtension,
-      ),
-    ).toBe(true);
-    expect(
-      isFileExist(
-        paths.pathToOutputDir,
-        paths.contractSolFilename,
-        paths.asmExtension,
-      ),
-    ).toBe(true);
-  });
-  it("the output files are not empty", () => {
-    expect(isFileEmpty(paths.pathToSolBinOutputFile)).toBe(false);
-    expect(isFileEmpty(paths.pathToSolAsmOutputFile)).toBe(false);
-  });
-  it("No 'Error'/'Warning'/'Fail' in the output", () => {
-    expect(result.output).not.toMatch(/([Ee]rror|[Ww]arning|[Ff]ail)/i);
-  });
+    const command = `resolc ${paths.pathToBasicSolContract} --overwrite -O3 --bin --asm --output-dir "${paths.pathToOutputDir}"`; // potential issue on resolc with full path on Windows cmd
+    const result = executeCommand(command);
+
+    it("Compiler run successful", () => {
+        expect(result.output).toMatch(/(Compiler run successful.)/i);
+    });
+    it("Exit code = 0", () => {
+        expect(result.exitCode).toBe(0);
+    });
+    it("Output dir is created", () => {
+        expect(isFolderExist(paths.pathToOutputDir)).toBe(true);
+    });
+    xit("Output files are created", () => { // a bug on windows
+        expect(isFileExist(paths.pathToOutputDir, paths.contractSolFilename, paths.binExtension)).toBe(true);
+        expect(isFileExist(paths.pathToOutputDir, paths.contractSolFilename, paths.asmExtension)).toBe(true);
+    });
+    it("the output files are not empty", () => {
+        expect(isFileEmpty(paths.pathToSolBinOutputFile)).toBe(false);
+        expect(isFileEmpty(paths.pathToSolAsmOutputFile)).toBe(false);
+    });
+    it("No 'Error'/'Warning'/'Fail' in the output", () => {
+        expect(result.output).not.toMatch(/([Ee]rror|[Ww]arning|[Ff]ail)/i);
+    });
 });

 describe("Run resolc with source debug information", () => {
-  const commands = [
-    `resolc -g ${paths.pathToBasicSolContract} --overwrite --bin --asm --output-dir "${paths.pathToOutputDir}"`,
-    `resolc --disable-solc-optimizer -g ${paths.pathToBasicSolContract} --overwrite --bin --asm --output-dir "${paths.pathToOutputDir}"`,
-  ]; // potential issue on resolc with full path on Windows cmd`;
+    const commands = [
+        `resolc -g ${paths.pathToBasicSolContract} --overwrite --bin --asm --output-dir "${paths.pathToOutputDir}"`,
+        `resolc --disable-solc-optimizer -g ${paths.pathToBasicSolContract} --overwrite --bin --asm --output-dir "${paths.pathToOutputDir}"`
+    ]; // potential issue on resolc with full path on Windows cmd`;

-  for (var idx in commands) {
-    const command = commands[idx];
-    const result = executeCommand(command);
+    for (var idx in commands) {
+        const command = commands[idx];
+        const result = executeCommand(command);

-    it("Compiler run successful", () => {
-      expect(result.output).toMatch(/(Compiler run successful.)/i);
-    });
-    it("Exit code = 0", () => {
-      expect(result.exitCode).toBe(0);
-    });
-    it("Output dir is created", () => {
-      expect(isFolderExist(paths.pathToOutputDir)).toBe(true);
-    });
-    it("Output files are created", () => {
-      // a bug on windows
-      expect(
-        isFileExist(
-          paths.pathToOutputDir,
-          paths.contractSolFilename,
-          paths.binExtension,
-        ),
-      ).toBe(true);
-      expect(
-        isFileExist(
-          paths.pathToOutputDir,
-          paths.contractSolFilename,
-          paths.asmExtension,
-        ),
-      ).toBe(true);
-    });
-    it("the output files are not empty", () => {
-      expect(isFileEmpty(paths.pathToSolBinOutputFile)).toBe(false);
-      expect(isFileEmpty(paths.pathToSolAsmOutputFile)).toBe(false);
-    });
-    it("No 'Error'/'Fail' in the output", () => {
-      expect(result.output).not.toMatch(/([Ee]rror|[Ff]ail)/i);
-    });
-  }
+        it("Compiler run successful", () => {
+            expect(result.output).toMatch(/(Compiler run successful.)/i);
+        });
+        it("Exit code = 0", () => {
+            expect(result.exitCode).toBe(0);
+        });
+        it("Output dir is created", () => {
+            expect(isFolderExist(paths.pathToOutputDir)).toBe(true);
+        });
+        it("Output files are created", () => { // a bug on windows
+            expect(isFileExist(paths.pathToOutputDir, paths.contractSolFilename, paths.binExtension)).toBe(true);
+            expect(isFileExist(paths.pathToOutputDir, paths.contractSolFilename, paths.asmExtension)).toBe(true);
+        });
+        it("the output files are not empty", () => {
+            expect(isFileEmpty(paths.pathToSolBinOutputFile)).toBe(false);
+            expect(isFileEmpty(paths.pathToSolAsmOutputFile)).toBe(false);
+        });
+        it("No 'Error'/'Fail' in the output", () => {
+            expect(result.output).not.toMatch(/([Ee]rror|[Ff]ail)/i);
+        });
+    }
 });

 describe("Run resolc with source debug information, check LLVM debug-info", () => {
-  const commands = [
-    `resolc -g ${paths.pathToBasicSolContract} --overwrite --debug-output-dir="${paths.pathToOutputDir}"`,
-    `resolc -g --disable-solc-optimizer ${paths.pathToBasicSolContract} --overwrite --debug-output-dir="${paths.pathToOutputDir}"`,
-  ]; // potential issue on resolc with full path on Windows cmd`;
+    const commands = [
+        `resolc -g ${paths.pathToBasicSolContract} --overwrite --debug-output-dir="${paths.pathToOutputDir}"`,
+        `resolc -g --disable-solc-optimizer ${paths.pathToBasicSolContract} --overwrite --debug-output-dir="${paths.pathToOutputDir}"`
+    ]; // potential issue on resolc with full path on Windows cmd`;

-  for (var idx in commands) {
-    const command = commands[idx];
-    const result = executeCommand(command);
+    for (var idx in commands) {
+        const command = commands[idx];
+        const result = executeCommand(command);

-    it("Compiler run successful", () => {
-      expect(result.output).toMatch(/(Compiler run successful.)/i);
-    });
-    it("Exit code = 0", () => {
-      expect(result.exitCode).toBe(0);
-    });
-    it("Output dir is created", () => {
-      expect(isFolderExist(paths.pathToOutputDir)).toBe(true);
-    });
-    it("Output files are created", () => {
-      // a bug on windows
-      expect(
-        isFileExist(
-          paths.pathToOutputDir,
-          paths.contractOptimizedLLVMFilename,
-          paths.llvmExtension,
-        ),
-      ).toBe(true);
-      expect(
-        isFileExist(
-          paths.pathToOutputDir,
-          paths.contractUnoptimizedLLVMFilename,
-          paths.llvmExtension,
-        ),
-      ).toBe(true);
-    });
-    it("the output files are not empty", () => {
-      expect(isFileEmpty(paths.pathToSolBinOutputFile)).toBe(false);
-      expect(isFileEmpty(paths.pathToSolAsmOutputFile)).toBe(false);
-    });
-    it("No 'Error'/'Fail' in the output", () => {
-      expect(result.output).not.toMatch(/([Ee]rror|[Ff]ail)/i);
-    });
-  }
+        it("Compiler run successful", () => {
+            expect(result.output).toMatch(/(Compiler run successful.)/i);
+        });
+        it("Exit code = 0", () => {
+            expect(result.exitCode).toBe(0);
+        });
+        it("Output dir is created", () => {
+            expect(isFolderExist(paths.pathToOutputDir)).toBe(true);
+        });
+        it("Output files are created", () => { // a bug on windows
+            expect(isFileExist(paths.pathToOutputDir, paths.contractOptimizedLLVMFilename, paths.llvmExtension)).toBe(true);
+            expect(isFileExist(paths.pathToOutputDir, paths.contractUnoptimizedLLVMFilename, paths.llvmExtension)).toBe(true);
+        });
+        it("the output files are not empty", () => {
+            expect(isFileEmpty(paths.pathToSolBinOutputFile)).toBe(false);
+            expect(isFileEmpty(paths.pathToSolAsmOutputFile)).toBe(false);
+        });
+        it("No 'Error'/'Fail' in the output", () => {
+            expect(result.output).not.toMatch(/([Ee]rror|[Ff]ail)/i);
+        });
+    }
 });

+
+
 describe("Standard JSON compilation with path options", () => {
-  const contractsDir = path.join(shell.tempdir(), "contracts-test");
-  const inputFile = path.join(__dirname, "..", "src/contracts/compiled/1.json");
-
-  beforeAll(() => {
-    shell.mkdir("-p", contractsDir);
-
-    const input = JSON.parse(shell.cat(inputFile).toString());
-
-    Object.entries(input.sources).forEach(
-      ([sourcePath, source]: [string, any]) => {
-        const filePath = path.join(contractsDir, sourcePath);
-        shell.mkdir("-p", path.dirname(filePath));
-        shell.ShellString(source.content).to(filePath);
-      },
-    );
-  });
-
-  afterAll(() => {
-    shell.rm("-rf", contractsDir);
-  });
-
-  describe("Output with all path options", () => {
-    let result: { exitCode: number; output: string };
+    const contractsDir = path.join(shell.tempdir(), 'contracts-test');
+    const inputFile = path.join(__dirname, '..', 'src/contracts/compiled/1.json');

    beforeAll(() => {
-      const tempInputFile = path.join(contractsDir, "temp-input.json");
-      shell.cp(inputFile, tempInputFile);
-      const inputContent = shell.cat(inputFile).toString();
+        shell.mkdir('-p', contractsDir);

-      const command = `resolc --standard-json --base-path "${contractsDir}" --include-path "${contractsDir}" --allow-paths "${contractsDir}"`;
+        const input = JSON.parse(shell.cat(inputFile).toString());

-      result = executeCommand(command, inputContent);
-
-      shell.rm(tempInputFile);
+        Object.entries(input.sources).forEach(([sourcePath, source]: [string, any]) => {
+            const filePath = path.join(contractsDir, sourcePath);
+            shell.mkdir('-p', path.dirname(filePath));
+            shell.ShellString(source.content).to(filePath);
+        });
    });

-    it("Compiler run successful without emiting warnings", () => {
-      const parsedResults = JSON.parse(result.output);
-      expect(
-        parsedResults.errors.filter(
-          (error: { type: string }) => error.type != "Warning",
-        ),
-      ).toEqual([]);
+    afterAll(() => {
+        shell.rm('-rf', contractsDir);
    });
-  });
-});
+
+    describe("Output with all path options", () => {
+        let result: { exitCode: number; output: string };
+
+        beforeAll(() => {
+            const tempInputFile = path.join(contractsDir, 'temp-input.json');
+            shell.cp(inputFile, tempInputFile);
+            const inputContent = shell.cat(inputFile).toString();
+
+            const command = `resolc --standard-json --base-path "${contractsDir}" --include-path "${contractsDir}" --allow-paths "${contractsDir}"`;
+
+            result = executeCommand(command, inputContent);
+
+            shell.rm(tempInputFile);
+
+        });
+
+        it("Compiler run successful without emiting warnings", () => {
+            const parsedResults = JSON.parse(result.output)
+            expect(parsedResults.errors.filter((error: { type: string; }) => error.type != 'Warning')).toEqual([]);
+        });
+    });
+});
@@ -1,11 +1,12 @@
-import { executeCommand } from "../src/helper";
-import { paths } from "../src/entities";
+import {executeCommand} from "../src/helper";
+import { paths } from '../src/entities';
+

 //id1743
 describe("Run with --yul by default", () => {
  const command = `resolc ${paths.pathToBasicYulContract} --yul`;
  const result = executeCommand(command);
-  const commandInvalid = "resolc --yul";
+  const commandInvalid = 'resolc --yul';
  const resultInvalid = executeCommand(commandInvalid);

  it("Valid command exit code = 0", () => {
@@ -17,11 +18,11 @@ describe("Run with --yul by default", () => {
    expect(result.output).toMatch(/(No output requested)/i);
  });

-  xit("solc exit code == resolc exit code", () => {
-    // unknown solc issue for datatype of the contract
-    const command = `solc ${paths.pathToBasicSolContract} --yul`;
-    const solcResult = executeCommand(command);
-    expect(solcResult.exitCode).toBe(result.exitCode);
+
+  xit("solc exit code == resolc exit code", () => { // unknown solc issue for datatype of the contract
+      const command = `solc ${paths.pathToBasicSolContract} --yul`;
+      const solcResult = executeCommand(command);
+      expect(solcResult.exitCode).toBe(result.exitCode);
  });

  it("run invalid: resolc --yul", () => {
@@ -32,7 +33,7 @@ describe("Run with --yul by default", () => {
  });

  it("Invalid solc exit code == Invalid resolc exit code", () => {
-    const command = "solc --yul";
+    const command = 'solc --yul';
    const solcResult = executeCommand(command);
    expect(solcResult.exitCode).toBe(resultInvalid.exitCode);
  });
@@ -2,6 +2,6 @@
  "compilerOptions": {
    "target": "ES6",
    "module": "CommonJS",
-    "outDir": "./dist"
+    "outDir": "./dist",
  }
 }
@@ -1,192 +1,153 @@
 import { executeCommand } from "../src/helper";
-import { paths } from "../src/entities";
+import { paths } from '../src/entities';
+

 describe("Set of --combined-json tests", () => {
-  const zksolcCommand = "zksolc";
-  const solcCommand = "solc";
-  const json_args: string[] = [
-    `abi`,
-    `hashes`,
-    `metadata`,
-    `devdoc`,
-    `userdoc`,
-    `storage-layout`,
-    `ast`,
-    `asm`,
-    `bin`,
-    `bin-runtime`,
-  ];
+    const zksolcCommand = 'zksolc';
+    const solcCommand = 'solc';
+    const json_args: string[] = [`abi`, `hashes`, `metadata`, `devdoc`, `userdoc`, `storage-layout`, `ast`, `asm`, `bin`, `bin-runtime`];

-  //id1742:I
-  describe(`Run ${zksolcCommand} with just --combined-json`, () => {
-    const args = [`--combined-json`];
-    const result = executeCommand(zksolcCommand, args);
+    //id1742:I
+    describe(`Run ${zksolcCommand} with just --combined-json`, () => {
+        const args = [`--combined-json`];
+        const result = executeCommand(zksolcCommand, args);

-    it("Valid command exit code = 1", () => {
-      expect(result.exitCode).toBe(1);
+        it("Valid command exit code = 1", () => {
+            expect(result.exitCode).toBe(1);
+        });
+
+        it("--combined-json error is presented", () => {
+            expect(result.output).toMatch(/(requires a value but none was supplied)/i);
+        });
+
+        it("solc exit code == zksolc exit code", () => {
+            const solcResult = executeCommand(solcCommand, args);
+            expect(solcResult.exitCode).toBe(result.exitCode);
+        });
    });

-    it("--combined-json error is presented", () => {
-      expect(result.output).toMatch(
-        /(requires a value but none was supplied)/i,
-      );
+    //id1742:II
+    describe(`Run ${zksolcCommand} with Sol contract and --combined-json`, () => {
+        const args = [`${paths.pathToBasicSolContract}`, `--combined-json`];
+        const result = executeCommand(zksolcCommand, args);
+
+        it("Valid command exit code = 1", () => {
+            expect(result.exitCode).toBe(1);
+        });
+
+        it("--combined-json error is presented", () => {
+            expect(result.output).toMatch(/(requires a value but none was supplied)/i);
+        });
+
+        it("solc exit code == zksolc exit code", () => {
+            const solcResult = executeCommand(solcCommand, args);
+            expect(solcResult.exitCode).toBe(result.exitCode);
+        });
    });

-    it("solc exit code == zksolc exit code", () => {
-      const solcResult = executeCommand(solcCommand, args);
-      expect(solcResult.exitCode).toBe(result.exitCode);
-    });
-  });
+    //id1742:III
+    for (let i = 0; i < json_args.length; i++) {
+        describe(`Run ${zksolcCommand} with Sol, --combined-json and ARG: ${json_args[i]}`, () => {
+            const args = [`${paths.pathToBasicSolContract}`, `--combined-json`, `${json_args[i]}`];
+            const result = executeCommand(zksolcCommand, args);

-  //id1742:II
-  describe(`Run ${zksolcCommand} with Sol contract and --combined-json`, () => {
-    const args = [`${paths.pathToBasicSolContract}`, `--combined-json`];
-    const result = executeCommand(zksolcCommand, args);
+            it("Valid command exit code = 0", () => {
+                expect(result.exitCode).toBe(0);
+            });

-    it("Valid command exit code = 1", () => {
-      expect(result.exitCode).toBe(1);
-    });
+            it("--combined-json error is presented", () => {
+                expect(result.output).toMatch(/(contracts)/i);
+            });

-    it("--combined-json error is presented", () => {
-      expect(result.output).toMatch(
-        /(requires a value but none was supplied)/i,
-      );
-    });
+            it("solc exit code == zksolc exit code", () => {
+                const solcResult = executeCommand(solcCommand, args);
+                expect(solcResult.exitCode).toBe(result.exitCode);
+            });
+        });
+    }

-    it("solc exit code == zksolc exit code", () => {
-      const solcResult = executeCommand(solcCommand, args);
-      expect(solcResult.exitCode).toBe(result.exitCode);
-    });
-  });
+    //id1829:I
+    for (let i = 0; i < json_args.length; i++) {
+        describe(`Run ${zksolcCommand} with Sol, --combined-json and wrong ARG: --${json_args[i]}`, () => {
+            const args = [`${paths.pathToBasicSolContract}`, `--combined-json`, `--${json_args[i]}`];
+            const result = executeCommand(zksolcCommand, args);

-  //id1742:III
-  for (let i = 0; i < json_args.length; i++) {
-    describe(`Run ${zksolcCommand} with Sol, --combined-json and ARG: ${json_args[i]}`, () => {
-      const args = [
-        `${paths.pathToBasicSolContract}`,
-        `--combined-json`,
-        `${json_args[i]}`,
-      ];
-      const result = executeCommand(zksolcCommand, args);
+            it("Valid command exit code = 1", () => {
+                expect(result.exitCode).toBe(1);
+            });

-      it("Valid command exit code = 0", () => {
-        expect(result.exitCode).toBe(0);
-      });
+            it("--combined-json error is presented", () => {
+                expect(result.output).toMatch(/(Invalid option|error)/i);
+            });

-      it("--combined-json error is presented", () => {
-        expect(result.output).toMatch(/(contracts)/i);
-      });
+            it("solc exit code == zksolc exit code", () => {
+                const solcResult = executeCommand(solcCommand, args);
+                expect(solcResult.exitCode).toBe(result.exitCode);
+            });
+        });
+    }

-      it("solc exit code == zksolc exit code", () => {
-        const solcResult = executeCommand(solcCommand, args);
-        expect(solcResult.exitCode).toBe(result.exitCode);
-      });
-    });
-  }
+    //id1829:II
+    for (let i = 0; i < json_args.length; i++) {
+        describe(`Run ${zksolcCommand} with Sol, --combined-json and multiple ARG: ${json_args[i]} ${json_args[i]}`, () => {
+            const args = [`${paths.pathToBasicSolContract}`, `--combined-json`, `${json_args[i]}`, `${json_args[i]}`];
+            const result = executeCommand(zksolcCommand, args);

-  //id1829:I
-  for (let i = 0; i < json_args.length; i++) {
-    describe(`Run ${zksolcCommand} with Sol, --combined-json and wrong ARG: --${json_args[i]}`, () => {
-      const args = [
-        `${paths.pathToBasicSolContract}`,
-        `--combined-json`,
-        `--${json_args[i]}`,
-      ];
-      const result = executeCommand(zksolcCommand, args);
+            xit("Valid command exit code = 1", () => {
+                expect(result.exitCode).toBe(1);
+            });

-      it("Valid command exit code = 1", () => {
-        expect(result.exitCode).toBe(1);
-      });
+            it("--combined-json error is presented", () => {
+                expect(result.output).toMatch(/(No such file or directory|cannot find the file specified)/i); // Hopefully we should have more precise message here!
+            });

-      it("--combined-json error is presented", () => {
-        expect(result.output).toMatch(/(Invalid option|error)/i);
-      });
+            xit("solc exit code == zksolc exit code", () => {
+                const solcResult = executeCommand(solcCommand, args);
+                expect(solcResult.exitCode).toBe(result.exitCode);
+            });
+        });
+    }

-      it("solc exit code == zksolc exit code", () => {
-        const solcResult = executeCommand(solcCommand, args);
-        expect(solcResult.exitCode).toBe(result.exitCode);
-      });
-    });
-  }
+    //id1829:III
+    for (let i = 0; i < json_args.length; i++) {
+        describe(`Run ${zksolcCommand} with Sol, and multiple (--combined-json ${json_args[i]})`, () => {
+            const args = [`${paths.pathToBasicSolContract}`, `--combined-json`, `${json_args[i]}`, `--combined-json`, `${json_args[i]}`];
+            const result = executeCommand(zksolcCommand, args);

-  //id1829:II
-  for (let i = 0; i < json_args.length; i++) {
-    describe(`Run ${zksolcCommand} with Sol, --combined-json and multiple ARG: ${json_args[i]} ${json_args[i]}`, () => {
-      const args = [
-        `${paths.pathToBasicSolContract}`,
-        `--combined-json`,
-        `${json_args[i]}`,
-        `${json_args[i]}`,
-      ];
-      const result = executeCommand(zksolcCommand, args);
+            it("Valid command exit code = 1", () => {
+                expect(result.exitCode).toBe(1);
+            });

-      xit("Valid command exit code = 1", () => {
-        expect(result.exitCode).toBe(1);
-      });
+            it("--combined-json error is presented", () => {
+                expect(result.output).toMatch(/(cannot be used multiple times)/i);
+            });

-      it("--combined-json error is presented", () => {
-        expect(result.output).toMatch(
-          /(No such file or directory|cannot find the file specified)/i,
-        ); // Hopefully we should have more precise message here!
-      });
+            it("solc exit code == zksolc exit code", () => {
+                const solcResult = executeCommand(solcCommand, args);
+                expect(solcResult.exitCode).toBe(result.exitCode);
+            });
+        });
+    }

-      xit("solc exit code == zksolc exit code", () => {
-        const solcResult = executeCommand(solcCommand, args);
-        expect(solcResult.exitCode).toBe(result.exitCode);
-      });
-    });
-  }
+    //id1830
+    for (let i = 0; i < json_args.length; i++) {
+        describe(`Run ${zksolcCommand} with Yul, and --combined-json ${json_args[i]}`, () => {
+            const args = [`${paths.pathToBasicYulContract}`, `--combined-json`, `${json_args[i]}`];
+            const result = executeCommand(zksolcCommand, args);

-  //id1829:III
-  for (let i = 0; i < json_args.length; i++) {
-    describe(`Run ${zksolcCommand} with Sol, and multiple (--combined-json ${json_args[i]})`, () => {
-      const args = [
-        `${paths.pathToBasicSolContract}`,
-        `--combined-json`,
-        `${json_args[i]}`,
-        `--combined-json`,
-        `${json_args[i]}`,
-      ];
-      const result = executeCommand(zksolcCommand, args);
+            it("Valid command exit code = 1", () => {
+                expect(result.exitCode).toBe(1);
+            });

-      it("Valid command exit code = 1", () => {
-        expect(result.exitCode).toBe(1);
-      });
+            it("--combined-json error is presented", () => {
+                expect(result.output).toMatch(/(ParserError: Expected identifier)/i);
+            });
+            asd

-      it("--combined-json error is presented", () => {
-        expect(result.output).toMatch(/(cannot be used multiple times)/i);
-      });
-
-      it("solc exit code == zksolc exit code", () => {
-        const solcResult = executeCommand(solcCommand, args);
-        expect(solcResult.exitCode).toBe(result.exitCode);
-      });
-    });
-  }
-
-  //id1830
-  for (let i = 0; i < json_args.length; i++) {
-    describe(`Run ${zksolcCommand} with Yul, and --combined-json ${json_args[i]}`, () => {
-      const args = [
-        `${paths.pathToBasicYulContract}`,
-        `--combined-json`,
-        `${json_args[i]}`,
-      ];
-      const result = executeCommand(zksolcCommand, args);
-
-      it("Valid command exit code = 1", () => {
-        expect(result.exitCode).toBe(1);
-      });
-
-      it("--combined-json error is presented", () => {
-        expect(result.output).toMatch(/(ParserError: Expected identifier)/i);
-      });
-      asd;
-
-      it("solc exit code == zksolc exit code", () => {
-        const solcResult = executeCommand(solcCommand, args);
-        expect(solcResult.exitCode).toBe(result.exitCode);
-      });
-    });
-  }
+            it("solc exit code == zksolc exit code", () => {
+                const solcResult = executeCommand(solcCommand, args);
+                expect(solcResult.exitCode).toBe(result.exitCode);
+            });
+        });
+    }
 });
@@ -0,0 +1 @@
+../../../../target/wasm32-unknown-emscripten/release/resolc.wasm
@@ -0,0 +1 @@
+../../../../target/wasm32-unknown-emscripten/release/resolc_web.js
@@ -1,6 +0,0 @@
-{
-    "trailingComma": "es5",
-    "tabWidth": 4,
-    "semi": false,
-    "singleQuote": true
-}
@@ -1,10 +1,7 @@
-# @parity/revive
-
-Node.js module to compile Solidity contracts to Polkavm bytecode, using [Revive](https://github.com/paritytech/revive)
-
 # Usage from Node.js

 ```typescript
+import { compile } from "@parity/resolc";
 const sources = {
 ["contracts/1_Storage.sol"]: {
    content: readFileSync("fixtures/storage.sol", "utf8"),
@@ -16,5 +13,5 @@ const out = await compile(sources);
 # Usage from shell

 ```bash
- npx @parity/revive@latest --bin contracts/1_Storage.sol
+ npx @parity/resolc@latest --bin contracts/1_Storage.sol
 ```
@@ -24,18 +24,14 @@
        "test": "npm run build && node ./dist/index.test.js"
    },
    "devDependencies": {
-        "@eslint/js": "^9.14.0",
        "@openzeppelin/contracts": "5.1.0",
-        "@types/node": "^22.14.1",
-        "eslint": "^9.14.0",
        "globals": "^15.12.0",
-        "typescript": "^5.6.3",
-        "typescript-eslint": "^8.13.0"
+        "typescript": "^5.6.3"
    },
    "dependencies": {
+        "@types/node": "^22.9.0",
        "commander": "^13.1.0",
        "package-json": "^10.0.1",
        "solc": "^0.8.29"
-    },
-    "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
+    }
 }
@@ -1,22 +1,13 @@
 import { test } from 'node:test'
-import { readFileSync } from 'node:fs'
+import { readFileSync, existsSync } from 'node:fs'
 import assert from 'node:assert'
 import { compile, tryResolveImport } from '.'
 import { resolve } from 'node:path'
-import { execSync } from 'node:child_process'

-function isResolcInPath() {
-    try {
-        execSync('resolc --version', { stdio: 'ignore' })
-        return true
-    } catch {
-        return false
-    }
-}

 const compileOptions = [{}]
-if (isResolcInPath()) {
-    compileOptions.push({ bin: 'resolc' })
+if (existsSync('../../target/release/resolc')) {
+    compileOptions.push({ bin: '../../target/release/resolc' })
 }

 for (const options of compileOptions) {
@@ -83,16 +74,12 @@ test('resolve import', () => {
        // scopped module with version
        {
            file: '@openzeppelin/contracts@5.1.0/token/ERC20/ERC20.sol',
-            expected: resolve(
-                'node_modules/@openzeppelin/contracts/token/ERC20/ERC20.sol'
-            ),
+            expected: require.resolve('@openzeppelin/contracts/token/ERC20/ERC20.sol'),
        },
        // scopped module without version
        {
            file: '@openzeppelin/contracts/token/ERC20/ERC20.sol',
-            expected: resolve(
-                'node_modules/@openzeppelin/contracts/token/ERC20/ERC20.sol'
-            ),
+            expected: require.resolve('@openzeppelin/contracts/token/ERC20/ERC20.sol'),
        },
        // scopped module with wrong version
        {
@@ -101,17 +88,13 @@ test('resolve import', () => {
        },
        // module without version
        {
-            file: 'acorn/package.json',
-            expected: resolve('node_modules/acorn/package.json'),
+            file: '@openzeppelin/contracts/package.json',
+            expected: require.resolve('@openzeppelin/contracts/package.json'),
        },
        // scopped module with version
        {
-            file: 'acorn@8.14.0/package.json',
-            expected: resolve('node_modules/acorn/package.json'),
-        },
-        {
-            file: 'acorn@8.14.1/package.json',
-            expected: `Error: Version mismatch: Specified acorn@8.14.1, but installed version is 8.14.0`,
+            file: '@openzeppelin/contracts@5.1.0/package.json',
+            expected: require.resolve('@openzeppelin/contracts/package.json'),
        },
    ]

@@ -17,7 +17,7 @@
        "allowSyntheticDefaultImports": true,
        "useUnknownInCatchVariables": true,
        "types": ["node"],
-        "typeRoots": ["./node_modules/@types", "./src"],
+        "typeRoots": ["../../node_modules/@types", "./src"],
        "paths": {
            "#src/*": ["./src/*"]
        },
@@ -1 +0,0 @@
-../../../target/wasm32-unknown-emscripten/release/resolc.wasm
@@ -1 +0,0 @@
-../../../target/wasm32-unknown-emscripten/release/resolc_web.js
@@ -3,14 +3,19 @@
  "private": true,
  "scripts": {
    "test:cli": "npm run test -w crates/solidity/src/tests/cli-tests",
-    "test:wasm": "npm run test:node -w js/wasm",
-    "build:package": "npm run build:package -w js/wasm",
-    "lint": "npx eslint 'js/**/*.{cjs,mjs,ts}' && npx prettier --check '**/*.{ts,json,yml,md}'",
-    "lint:fix": "npx prettier --write '**/*.{mjs,cjs,ts,json,yml,md}'"
+    "test:wasm": "npm run test:node -w js/emscripten",
+    "build:package": "npm run build:package -w js/emscripten",
+    "lint": "npx eslint 'js/**/*.{cjs,mjs,ts}' && npx prettier --check '**/*.{mjs,cjs,ts}'",
+    "lint:fix": "npx prettier --write '**/*.{mjs,cjs,ts}'"
  },
  "workspaces": [
    "crates/solidity/src/tests/cli-tests",
-    "js/wasm",
+    "js/emscripten",
    "js/resolc"
-  ]
+  ],
+  "dependencies": {
+    "@eslint/js": "^9.14.0",
+    "eslint": "^9.14.0",
+    "typescript-eslint": "^8.13.0"
+  }
 }
				`@@ -0,0 +1 @@`
				`../../../../target/wasm32-unknown-emscripten/release/resolc.wasm`
				`@@ -1 +0,0 @@`
				`../../../target/wasm32-unknown-emscripten/release/resolc.wasm`