Move @parity/resolc from js-revive (#296)

- Move npm package from paritytech/js-revive 
- Rename package to `@parity/resolc`

.cargo/config.toml

@@ -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=--js-library=js/emscripten/embed/soljson_interface.js",
-    "-Clink-arg=--pre-js=js/embed/pre.js",
+    "-Clink-arg=--pre-js=js/emscripten/embed/pre.js",
     "-Clink-arg=-sSTACK_SIZE=128kb",
     "-Clink-arg=-sNODEJS_CATCH_EXIT=0"
 ]

.github/actions/get-emsdk/action.yml

@@ -5,6 +5,7 @@ inputs:
     required: false
     default: "3.1.64"
 
+
 runs:
   using: "composite"
   steps:

.github/workflows/npm-release.yml

@@ -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 }}

.github/workflows/release-llvm.yml

@@ -37,15 +37,7 @@ jobs:
   build:
     strategy:
       matrix:
-        target:
+        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]
-          [
-            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

.github/workflows/release.yml

@@ -286,3 +286,30 @@ jobs:
             resolc.wasm
             resolc_web.js
             checksums.txt
+
+  npm-release:
+    needs: [create-release]
+    runs-on: macos-14
+    environment: tags
+    steps:
+      - name: Build
+        run: 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: 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(''{{ "repo": "{0}", "run_id": "{1}" }}'', github.repository, github.run_id) }}'
+        env:
+          GITHUB_TOKEN: ${{ secrets.NPM_PUBLISH_AUTOMATION_TOKEN }}

.github/workflows/test-llvm-builder.yml

@@ -4,9 +4,9 @@ on:
     branches: ["main"]
     types: [opened, synchronize]
     paths:
-      - "LLVM.lock"
+      - 'LLVM.lock'
-      - "crates/llvm-builder/**"
+      - 'crates/llvm-builder/**'
-      - ".github/workflows/test-llvm-builder.yml"
+      - '.github/workflows/test-llvm-builder.yml'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}

.github/workflows/test-wasm.yml

@@ -86,13 +86,18 @@ jobs:
       - name: Install Node Packages
         run: npm install
 
-      - name: Run Playwright tests
+      - name: Test emscripten
-        run: |
-          cd js
-          npx playwright install --with-deps
-          npx playwright test
-
-      - name: Test revive
         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

.prettierrc.json

@@ -0,0 +1,6 @@
+{
+  "trailingComma": "es5",
+  "tabWidth": 2,
+  "semi": false,
+  "singleQuote": false
+}

CHANGELOG.md

@@ -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. 
 - 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.
 - 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.
 

Makefile

@@ -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 ; \
+	cargo uninstall revive-llvm-builder ;
-	rm -f package-lock.json ; \
-	rm -rf js/dist ; \
-	rm -f js/src/resolc.{wasm,js}

README.md

@@ -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
 ```
@@ -100,7 +97,6 @@ Please consult the [Makefile](Makefile) targets to learn how to run tests and be
 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. 
 
 [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).

crates/benchmarks/BENCHMARKS.md

@@ -16,13 +16,13 @@
 ### Baseline
 
 |         | `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**)  |
@@ -30,7 +30,7 @@
 ### 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**)  |
@@ -38,7 +38,7 @@
 ### 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**)    |
@@ -47,27 +47,27 @@
 ### FibonacciIterative
 
 |           | `EVM`                    | `PVMInterpreter`                 |
-| :-------- | :------------------------ | :------------------------------- |
+|:----------|:-------------------------|:-------------------------------- |
-| **`64`**  | `23.00 us` (✅ **1.00x**) | `31.88 us` (❌ _1.39x slower_)   |
+| **`64`**  | `23.00 us` (✅ **1.00x**) | `31.88 us` (❌ *1.39x slower*)    |
-| **`128`** | `35.28 us` (✅ **1.00x**) | `42.43 us` (❌ _1.20x 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_) |
+| **`64`**  | `23.01 us` (✅ **1.00x**) | `47.74 us` (❌ *2.07x slower*)    |
-| **`128`** | `25.44 us` (✅ **1.00x**) | `49.67 us` (❌ _1.95x 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_) |
+| **`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_) |
+| **`1`**   | `135.87 us` (✅ **1.00x**) | `243.75 us` (❌ *1.79x slower*)    |
-| **`64`**  | `258.45 us` (✅ **1.00x**) | `355.70 us` (❌ _1.38x 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)
+

crates/llvm-builder/README.md

@@ -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,23 +17,20 @@ 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:
-
       ```shell
       apt install cmake ninja-build curl git libssl-dev pkg-config clang lld
       ```
-
+   * Linux (Arch):
-- Linux (Arch):
 
       Install the following packages:
-
       ```shell
       pacman -Syu which cmake ninja curl git pkg-config clang lld
       ```
 
-- MacOS:
+   * MacOS:
 
       * Install the [HomeBrew](https://brew.sh) package manager.
       * Install the following packages:
@@ -44,27 +40,24 @@ Obtain a compatible build for your host platform from the release section of thi
          ```
 
       * 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:
+   * Follow the latest [official instructions](https://www.rust-lang.org/tools/install:
-  `shell
+      ```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>
 
 <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
       ```
@@ -76,7 +69,7 @@ Obtain a compatible build for your host platform from the release section of thi
 <details>
 <summary>4. (Optional) Create the `LLVM.lock` file.</summary>
 
-- The `LLVM.lock` dictates the LLVM source tree being used.
+   * 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>
@@ -84,7 +77,7 @@ Obtain a compatible build for your host platform from the release section of thi
 <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.
 
@@ -103,7 +96,6 @@ Obtain a compatible build for your host platform from the release section of thi
 ## Supported target architectures
 
 The following target platforms are supported:
-
 - Linux GNU (x86)
 - Linux MUSL (x86)
 - MacOS (aarch64)
@@ -113,12 +105,11 @@ 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.
+   * 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 
@@ -129,13 +120,13 @@ The following target platforms are supported:
 <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 
       ```
 
 </details>
+

crates/runner/README.md

@@ -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
-```

crates/solidity/src/tests/cli-tests/src/contracts/compiled/1.json

@@ -90,10 +90,14 @@
         },
         "outputSelection": {
             "*": {
-        "": ["ast"]
+                "": [
+                    "ast"
+                ]
             }
         },
         "evmVersion": "berlin",
-    "remappings": ["forge-std/=lib/forge-std/src/"]
+        "remappings": [
+            "forge-std/=lib/forge-std/src/"
+        ]
     }
 }

crates/solidity/src/tests/cli-tests/src/entities.ts

@@ -1,33 +1,19 @@
-import * as path from "path";
+import * as path from 'path';
 
-const outputDir = "artifacts";
+const outputDir = 'artifacts';
-const binExtension = ":C.pvm";
+const binExtension = ':C.pvm';
-const asmExtension = ":C.pvmasm";
+const asmExtension = ':C.pvmasm';
-const llvmExtension = ".ll";
+const llvmExtension = '.ll';
-const contractSolFilename = "contract.sol";
+const contractSolFilename = 'contract.sol';
-const contractYulFilename = "contract.yul";
+const contractYulFilename = 'contract.yul';
-const contractOptimizedLLVMFilename = contractSolFilename + ".C.optimized";
+const contractOptimizedLLVMFilename = contractSolFilename + '.C.optimized';
-const contractUnoptimizedLLVMFilename = contractSolFilename + ".C.unoptimized";
+const contractUnoptimizedLLVMFilename = contractSolFilename + '.C.unoptimized';
-const pathToOutputDir = path.join(__dirname, "..", outputDir);
+const pathToOutputDir = path.join(__dirname, '..', outputDir);
-const pathToContracts = path.join(__dirname, "..", "src", "contracts");
+const pathToContracts = path.join(__dirname, '..', 'src', 'contracts');
-const pathToBasicYulContract = path.join(
+const pathToBasicYulContract = path.join(pathToContracts, 'yul', contractYulFilename);
-  pathToContracts,
+const pathToBasicSolContract = path.join(pathToContracts, 'solidity', contractSolFilename);
-  "yul",
+const pathToSolBinOutputFile = path.join(pathToOutputDir, contractSolFilename + binExtension);
-  contractYulFilename,
+const pathToSolAsmOutputFile = path.join(pathToOutputDir, contractSolFilename + asmExtension);
-);
-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,

crates/solidity/src/tests/cli-tests/src/helper.ts

@@ -1,51 +1,44 @@
-import * as shell from "shelljs";
+import * as shell from 'shelljs';
-import * as fs from "fs";
+import * as fs from 'fs';
-import { spawnSync } from "child_process";
+import { spawnSync } from 'child_process';
 
 interface CommandResult {
     output: string;
     exitCode: number;
 }
 
-export const executeCommand = (
+export const executeCommand = (command: string, stdin?: string): CommandResult => {
-  command: string,
-  stdin?: string,
-): CommandResult => {
     if (stdin) {
         const process = spawnSync(command, [], {
             input: stdin,
             shell: true,
-      encoding: "utf8",
+            encoding: 'utf8',
-      maxBuffer: 30 * 1024 * 1024,
+            maxBuffer: 30 * 1024 * 1024
         });
 
         return {
             exitCode: process.status || 0,
-      output: (process.stdout || process.stderr || "").toString(),
+            output: (process.stdout || process.stderr || '').toString()
         };
     }
 
     const result = shell.exec(command, { silent: true, async: false });
     return {
         exitCode: result.code,
-    output: result.stdout || result.stderr || "",
+        output: result.stdout || result.stderr || ''
     };
 };
 
 export const isFolderExist = (folder: string): boolean => {
-  return shell.test("-d", folder);
+    return shell.test('-d', folder);
 };
 
-export const isFileExist = (
+export const isFileExist = (pathToFileDir: string, fileName: string, fileExtension: string): boolean => {
-  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;
+        return (fs.readFileSync(file).length === 0);
     }
 };

crates/solidity/src/tests/cli-tests/tests/asm.test.ts

@@ -1,11 +1,12 @@
 import {executeCommand} from "../src/helper";
-import { paths } from "../src/entities";
+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,9 +28,7 @@ describe("Run with --asm by default", () => {
   });
 
   it("run invalid: resolc --asm", () => {
-    expect(resultInvalid.output).toMatch(
+    expect(resultInvalid.output).toMatch(/(No input sources specified|Compilation aborted)/i);
-      /(No input sources specified|Compilation aborted)/i,
-    );
   });
   
   it("Invalid command exit code = 1", () => {
@@ -37,7 +36,7 @@ describe("Run with --asm by default", () => {
   });
 
   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);
   });

crates/solidity/src/tests/cli-tests/tests/common.test.ts

@@ -1,16 +1,12 @@
-import {
+import { executeCommand, isFolderExist, isFileExist, isFileEmpty } from "../src/helper";
-  executeCommand,
+import { paths } from '../src/entities';
-  isFolderExist,
+import * as shell from 'shelljs';
-  isFileExist,
+import * as path from 'path';
-  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 command = 'resolc';
     const result = executeCommand(command);
 
     it("Info with help is presented", () => {
@@ -22,14 +18,16 @@ describe("Run resolc without any options", () => {
     });
 
     it("solc exit code == resolc exit code", () => {
-    const command = "solc";
+        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);
 
@@ -42,15 +40,8 @@ describe("Default run a command from the help", () => {
     it("Output dir is created", () => {
         expect(isFolderExist(paths.pathToOutputDir)).toBe(true);
     });
-  xit("Output file is created", () => {
+    xit("Output file is created", () => { // a bug on windows
-    // a bug on windows
+        expect(isFileExist(paths.pathToOutputDir, paths.contractSolFilename, paths.binExtension)).toBe(true);
-    expect(
-      isFileExist(
-        paths.pathToOutputDir,
-        paths.contractSolFilename,
-        paths.binExtension,
-      ),
-    ).toBe(true);
     });
     it("the output file is not empty", () => {
         expect(isFileEmpty(paths.pathToSolBinOutputFile)).toBe(false);
@@ -62,6 +53,7 @@ describe("Default run a command from the help", () => {
 
 //#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);
 
@@ -74,22 +66,9 @@ describe("Default run a command from the help", () => {
     it("Output dir is created", () => {
         expect(isFolderExist(paths.pathToOutputDir)).toBe(true);
     });
-  xit("Output files are created", () => {
+    xit("Output files are created", () => { // a bug on windows
-    // a bug on windows
+        expect(isFileExist(paths.pathToOutputDir, paths.contractSolFilename, paths.binExtension)).toBe(true);
-    expect(
+        expect(isFileExist(paths.pathToOutputDir, paths.contractSolFilename, paths.asmExtension)).toBe(true);
-      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);
@@ -103,7 +82,7 @@ describe("Default run a command from the help", () => {
 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}"`,
+        `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) {
@@ -119,22 +98,9 @@ describe("Run resolc with source debug information", () => {
         it("Output dir is created", () => {
             expect(isFolderExist(paths.pathToOutputDir)).toBe(true);
         });
-    it("Output files are created", () => {
+        it("Output files are created", () => { // a bug on windows
-      // a bug on windows
+            expect(isFileExist(paths.pathToOutputDir, paths.contractSolFilename, paths.binExtension)).toBe(true);
-      expect(
+            expect(isFileExist(paths.pathToOutputDir, paths.contractSolFilename, paths.asmExtension)).toBe(true);
-        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);
@@ -149,7 +115,7 @@ describe("Run resolc with source debug information", () => {
 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}"`,
+        `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) {
@@ -165,22 +131,9 @@ describe("Run resolc with source debug information, check LLVM debug-info", () =
         it("Output dir is created", () => {
             expect(isFolderExist(paths.pathToOutputDir)).toBe(true);
         });
-    it("Output files are created", () => {
+        it("Output files are created", () => { // a bug on windows
-      // a bug on windows
+            expect(isFileExist(paths.pathToOutputDir, paths.contractOptimizedLLVMFilename, paths.llvmExtension)).toBe(true);
-      expect(
+            expect(isFileExist(paths.pathToOutputDir, paths.contractUnoptimizedLLVMFilename, paths.llvmExtension)).toBe(true);
-        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);
@@ -192,33 +145,33 @@ describe("Run resolc with source debug information, check LLVM debug-info", () =
     }
 });
 
+
+
 describe("Standard JSON compilation with path options", () => {
-  const contractsDir = path.join(shell.tempdir(), "contracts-test");
+    const contractsDir = path.join(shell.tempdir(), 'contracts-test');
-  const inputFile = path.join(__dirname, "..", "src/contracts/compiled/1.json");
+    const inputFile = path.join(__dirname, '..', 'src/contracts/compiled/1.json');
 
     beforeAll(() => {
-    shell.mkdir("-p", contractsDir);
+        shell.mkdir('-p', contractsDir);
 
         const input = JSON.parse(shell.cat(inputFile).toString());
 
-    Object.entries(input.sources).forEach(
+        Object.entries(input.sources).forEach(([sourcePath, source]: [string, any]) => {
-      ([sourcePath, source]: [string, any]) => {
             const filePath = path.join(contractsDir, sourcePath);
-        shell.mkdir("-p", path.dirname(filePath));
+            shell.mkdir('-p', path.dirname(filePath));
             shell.ShellString(source.content).to(filePath);
-      },
+        });
-    );
     });
 
     afterAll(() => {
-    shell.rm("-rf", contractsDir);
+        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");
+            const tempInputFile = path.join(contractsDir, 'temp-input.json');
             shell.cp(inputFile, tempInputFile);
             const inputContent = shell.cat(inputFile).toString();
 
@@ -227,15 +180,12 @@ describe("Standard JSON compilation with path options", () => {
             result = executeCommand(command, inputContent);
 
             shell.rm(tempInputFile);
+
         });
 
         it("Compiler run successful without emiting warnings", () => {
-      const parsedResults = JSON.parse(result.output);
+            const parsedResults = JSON.parse(result.output)
-      expect(
+            expect(parsedResults.errors.filter((error: { type: string; }) => error.type != 'Warning')).toEqual([]);
-        parsedResults.errors.filter(
-          (error: { type: string }) => error.type != "Warning",
-        ),
-      ).toEqual([]);
         });
     });
 });

crates/solidity/src/tests/cli-tests/tests/yul.test.ts

@@ -1,11 +1,12 @@
 import {executeCommand} from "../src/helper";
-import { paths } from "../src/entities";
+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,8 +18,8 @@ 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
+  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);
@@ -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);
   });

crates/solidity/src/tests/cli-tests/tsconfig.json

@@ -2,6 +2,6 @@
   "compilerOptions": {
     "target": "ES6",
     "module": "CommonJS",
-    "outDir": "./dist"
+    "outDir": "./dist",
   }
 }

crates/solidity/src/tests/combined-json.tests.ts

@@ -1,21 +1,11 @@
 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 zksolcCommand = 'zksolc';
-  const solcCommand = "solc";
+    const solcCommand = 'solc';
-  const json_args: string[] = [
+    const json_args: string[] = [`abi`, `hashes`, `metadata`, `devdoc`, `userdoc`, `storage-layout`, `ast`, `asm`, `bin`, `bin-runtime`];
-    `abi`,
-    `hashes`,
-    `metadata`,
-    `devdoc`,
-    `userdoc`,
-    `storage-layout`,
-    `ast`,
-    `asm`,
-    `bin`,
-    `bin-runtime`,
-  ];
 
     //id1742:I
     describe(`Run ${zksolcCommand} with just --combined-json`, () => {
@@ -27,9 +17,7 @@ describe("Set of --combined-json tests", () => {
         });
 
         it("--combined-json error is presented", () => {
-      expect(result.output).toMatch(
+            expect(result.output).toMatch(/(requires a value but none was supplied)/i);
-        /(requires a value but none was supplied)/i,
-      );
         });
 
         it("solc exit code == zksolc exit code", () => {
@@ -48,9 +36,7 @@ describe("Set of --combined-json tests", () => {
         });
 
         it("--combined-json error is presented", () => {
-      expect(result.output).toMatch(
+            expect(result.output).toMatch(/(requires a value but none was supplied)/i);
-        /(requires a value but none was supplied)/i,
-      );
         });
 
         it("solc exit code == zksolc exit code", () => {
@@ -62,11 +48,7 @@ describe("Set of --combined-json tests", () => {
     //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 = [
+            const args = [`${paths.pathToBasicSolContract}`, `--combined-json`, `${json_args[i]}`];
-        `${paths.pathToBasicSolContract}`,
-        `--combined-json`,
-        `${json_args[i]}`,
-      ];
             const result = executeCommand(zksolcCommand, args);
 
             it("Valid command exit code = 0", () => {
@@ -87,11 +69,7 @@ describe("Set of --combined-json tests", () => {
     //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 = [
+            const args = [`${paths.pathToBasicSolContract}`, `--combined-json`, `--${json_args[i]}`];
-        `${paths.pathToBasicSolContract}`,
-        `--combined-json`,
-        `--${json_args[i]}`,
-      ];
             const result = executeCommand(zksolcCommand, args);
 
             it("Valid command exit code = 1", () => {
@@ -112,12 +90,7 @@ describe("Set of --combined-json tests", () => {
     //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 = [
+            const args = [`${paths.pathToBasicSolContract}`, `--combined-json`, `${json_args[i]}`, `${json_args[i]}`];
-        `${paths.pathToBasicSolContract}`,
-        `--combined-json`,
-        `${json_args[i]}`,
-        `${json_args[i]}`,
-      ];
             const result = executeCommand(zksolcCommand, args);
 
             xit("Valid command exit code = 1", () => {
@@ -125,9 +98,7 @@ describe("Set of --combined-json tests", () => {
             });
 
             it("--combined-json error is presented", () => {
-        expect(result.output).toMatch(
+                expect(result.output).toMatch(/(No such file or directory|cannot find the file specified)/i); // Hopefully we should have more precise message here!
-          /(No such file or directory|cannot find the file specified)/i,
-        ); // Hopefully we should have more precise message here!
             });
 
             xit("solc exit code == zksolc exit code", () => {
@@ -140,13 +111,7 @@ describe("Set of --combined-json tests", () => {
     //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 = [
+            const args = [`${paths.pathToBasicSolContract}`, `--combined-json`, `${json_args[i]}`, `--combined-json`, `${json_args[i]}`];
-        `${paths.pathToBasicSolContract}`,
-        `--combined-json`,
-        `${json_args[i]}`,
-        `--combined-json`,
-        `${json_args[i]}`,
-      ];
             const result = executeCommand(zksolcCommand, args);
 
             it("Valid command exit code = 1", () => {
@@ -167,11 +132,7 @@ describe("Set of --combined-json tests", () => {
     //id1830
     for (let i = 0; i < json_args.length; i++) {
         describe(`Run ${zksolcCommand} with Yul, and --combined-json ${json_args[i]}`, () => {
-      const args = [
+            const args = [`${paths.pathToBasicYulContract}`, `--combined-json`, `${json_args[i]}`];
-        `${paths.pathToBasicYulContract}`,
-        `--combined-json`,
-        `${json_args[i]}`,
-      ];
             const result = executeCommand(zksolcCommand, args);
 
             it("Valid command exit code = 1", () => {
@@ -181,7 +142,7 @@ describe("Set of --combined-json tests", () => {
             it("--combined-json error is presented", () => {
                 expect(result.output).toMatch(/(ParserError: Expected identifier)/i);
             });
-      asd;
+            asd
 
             it("solc exit code == zksolc exit code", () => {
                 const solcResult = executeCommand(solcCommand, args);

js/emscripten/examples/web/resolc.wasm

@@ -0,0 +1 @@
+../../../../target/wasm32-unknown-emscripten/release/resolc.wasm

js/emscripten/examples/web/resolc_web.js

@@ -0,0 +1 @@
+../../../../target/wasm32-unknown-emscripten/release/resolc_web.js

js/resolc/.prettierrc.json

@@ -1,6 +0,0 @@
-{
-    "trailingComma": "es5",
-    "tabWidth": 4,
-    "semi": false,
-    "singleQuote": true
-}

js/resolc/README.md

@@ -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
 ```

js/resolc/package.json

@@ -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": "^5.6.3"
-        "typescript-eslint": "^8.13.0"
     },
     "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"
 }

js/resolc/src/index.test.ts

@@ -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()) {
+if (existsSync('../../target/release/resolc')) {
-    compileOptions.push({ bin: '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(
+            expected: require.resolve('@openzeppelin/contracts/token/ERC20/ERC20.sol'),
-                'node_modules/@openzeppelin/contracts/token/ERC20/ERC20.sol'
-            ),
         },
         // scopped module without version
         {
             file: '@openzeppelin/contracts/token/ERC20/ERC20.sol',
-            expected: resolve(
+            expected: require.resolve('@openzeppelin/contracts/token/ERC20/ERC20.sol'),
-                'node_modules/@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',
+            file: '@openzeppelin/contracts/package.json',
-            expected: resolve('node_modules/acorn/package.json'),
+            expected: require.resolve('@openzeppelin/contracts/package.json'),
         },
         // scopped module with version
         {
-            file: 'acorn@8.14.0/package.json',
+            file: '@openzeppelin/contracts@5.1.0/package.json',
-            expected: resolve('node_modules/acorn/package.json'),
+            expected: require.resolve('@openzeppelin/contracts/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`,
         },
     ]
 

js/resolc/tsconfig.json

@@ -17,7 +17,7 @@
         "allowSyntheticDefaultImports": true,
         "useUnknownInCatchVariables": true,
         "types": ["node"],
-        "typeRoots": ["./node_modules/@types", "./src"],
+        "typeRoots": ["../../node_modules/@types", "./src"],
         "paths": {
             "#src/*": ["./src/*"]
         },

js/wasm/examples/web/resolc.wasm

@@ -1 +0,0 @@
-../../../target/wasm32-unknown-emscripten/release/resolc.wasm

js/wasm/examples/web/resolc_web.js

@@ -1 +0,0 @@
-../../../target/wasm32-unknown-emscripten/release/resolc_web.js

package.json

@@ -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",
+    "test:wasm": "npm run test:node -w js/emscripten",
-    "build:package": "npm run build:package -w js/wasm",
+    "build:package": "npm run build:package -w js/emscripten",
-    "lint": "npx eslint 'js/**/*.{cjs,mjs,ts}' && npx prettier --check '**/*.{ts,json,yml,md}'",
+    "lint": "npx eslint 'js/**/*.{cjs,mjs,ts}' && npx prettier --check '**/*.{mjs,cjs,ts}'",
-    "lint:fix": "npx prettier --write '**/*.{mjs,cjs,ts,json,yml,md}'"
+    "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"
+  }
 }