release resolc v0.1.0

Signed-off-by: Cyrill Leutwiler <bigcyrill@hotmail.com>
2026-06-14 21:31:05 +00:00 · 2025-05-27 11:52:40 +02:00
138 changed files with 8215 additions and 5333 deletions
@@ -1,13 +1,3 @@
-#!/usr/bin/env python3
-"""
-This script generates JSON files for different platforms based on GitHub release data.
-It fetches release information from a specified GitHub repository and tag,
-parses the release assets, and generates JSON files for each platform with relevant metadata.
-It also handles checksum files and updates a list.json file for each platform.
-It requires the GITHUB_TOKEN environment variable to be set for authentication.
-Usage:
-    python json_generator.py <repo> <tag>
-"""
 import os
 import sys
 import json
@@ -1,155 +0,0 @@
-#!/usr/bin/env python3
-"""
-This script generates JSON files for different platforms based on GitHub data.
-Requires the GITHUB_SHA, FIRST_SOLC_VERSION, LAST_SOLC_VERSION, TAG and FILEPATH environment variables to be set.
-Usage:
-    python json_generator_nightly.py
-"""
-import os
-import sys
-import json
-from datetime import datetime
-
-def validate_env_variables():
-    """Validate that environment variables are set."""
-    if "GITHUB_SHA" not in os.environ:
-        print("Error: GITHUB_SHA environment variable is not set.")
-        sys.exit(1)
-    if "FIRST_SOLC_VERSION" not in os.environ:
-        print("Error: FIRST_SOLC_VERSION environment variable is not set.")
-        sys.exit(1)
-    if "LAST_SOLC_VERSION" not in os.environ:
-        print("Error: LAST_SOLC_VERSION environment variable is not set.")
-        sys.exit(1)
-    if "TAG" not in os.environ:
-        print("Error: TAG environment variable is not set.")
-        sys.exit(1)
-    if "FILEPATH" not in os.environ:
-        print("Error: FILEPATH environment variable is not set.")
-        sys.exit(1)
-
-
-def fetch_data_file():
-    """
-    Fetch the data.json file with artifacts urls and sha256 checksums
-    and parse it into a single dictionary mapping artifact names to their URLs and SHAs.
-    """
-    # read data.json file
-    artifacts_data = {}
-    data_file_path = os.environ["FILEPATH"]
-    if not os.path.exists(data_file_path):
-        print("Error: data.json file not found.")
-        sys.exit(1)
-    with open(data_file_path, 'r') as f:
-        try:
-            artifacts_data = json.load(f)
-        except json.JSONDecodeError:
-            print("Error: data.json file is not a valid JSON.")
-            sys.exit(1)
-
-    result = {}
-
-    for item in artifacts_data:
-        for key, value in item.items():
-            if key.endswith('_url'):
-                base_key = key.rsplit('_url', 1)[0]
-                if base_key not in result:
-                    result[base_key] = {}
-                result[base_key]['url'] = value
-            elif key.endswith('_sha'):
-                base_key = key.rsplit('_sha', 1)[0]
-                if base_key not in result:
-                    result[base_key] = {}
-                result[base_key]['sha'] = value
-
-    return result
-
-
-
-
-
-def extract_build_hash():
-    """Extract the first 8 characters of the commit hash."""
-    sha = os.environ.get("GITHUB_SHA")
-    return f"commit.{sha[:8]}"
-
-def generate_asset_json_nightly(name, url, checksum):
-    """Generate JSON for a specific asset."""
-    # Date in format YYYY-MM-DD
-    date = datetime.now().strftime("%Y.%-m.%-d")
-    last_version = os.environ.get("TAG").replace('v','')
-    version = f"{last_version}-nightly.{date}"
-    SHA = os.environ.get("GITHUB_SHA", "")[:8]
-    build = f"commit.{SHA}"
-    long_version = f"{version}+{build}"
-
-    return {
-        "name": name,
-        "version": version,
-        "build": build,
-        "longVersion": long_version,
-        "url": url,
-        "sha256": checksum,
-        "firstSolcVersion": os.environ.get("FIRST_SOLC_VERSION"),
-        "lastSolcVersion": os.environ.get("LAST_SOLC_VERSION")
-    }
-
-def save_platform_json(platform_folder, asset_json):
-    """Save asset JSON and update list.json for a specific platform."""
-    # Create platform folder if it doesn't exist
-    os.makedirs(platform_folder, exist_ok=True)
-
-    # Update or create list.json
-    list_file_path = os.path.join(platform_folder, "list.json")
-
-    if os.path.exists(list_file_path):
-        with open(list_file_path, 'r') as f:
-            try:
-                list_data = json.load(f)
-            except json.JSONDecodeError:
-                list_data = {"builds": [], "releases": {}, "latestRelease": ""}
-    else:
-        list_data = {"builds": [], "releases": {}, "latestRelease": ""}
-
-    # Remove any existing entry with the same path
-    list_data['builds'] = [
-        build for build in list_data['builds']
-        if build['version'] != asset_json['version']
-    ]
-    # Add the new build
-    list_data['builds'].append(asset_json)
-
-    # Update releases
-    version = asset_json['version']
-    list_data['releases'][version] = f"{asset_json['name']}+{asset_json['longVersion']}"
-
-    # Update latest release
-    list_data['latestRelease'] = version
-
-    with open(list_file_path, 'w') as f:
-        json.dump(list_data, f, indent=4)
-
-def main():
-
-    validate_env_variables()
-    data = fetch_data_file()
-
-    # Mapping of asset names to platform folders
-    platform_mapping = {
-        'resolc-x86_64-unknown-linux-musl': 'linux',
-        'resolc-universal-apple-darwin': 'macos',
-        'resolc-x86_64-pc-windows-msvc': 'windows',
-        'resolc-web.js': 'wasm'
-    }
-
-    # Process each asset
-    for asset in data.keys():
-        platform_name = platform_mapping.get(asset)
-        if platform_name:
-            platform_folder = os.path.join(platform_name)
-            asset_json = generate_asset_json_nightly(asset, data[asset]['url'], data[asset]['sha'])
-            save_platform_json(platform_folder, asset_json)
-            print(f"Processed {asset} for {platform_name}")
-
-if __name__ == "__main__":
-    main()
@@ -1,385 +0,0 @@
-name: Nightly Release
-on:
-  schedule:
-    # Run every day at 01:00 UTC
-    - cron: "0 1 * * *"
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: true
-
-env:
-  CARGO_TERM_COLOR: always
-  RUST_MUSL_CROSS_IMAGE: messense/rust-musl-cross@sha256:c0154e992adb791c3b848dd008939d19862549204f8cb26f5ca7a00f629e6067
-
-jobs:
-  # check if there were commits yesterday
-  check_commits:
-    runs-on: ubuntu-latest
-    outputs:
-      has_commits: ${{ steps.check_commits.outputs.has_commits }}
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0 # Fetch full history to check previous commits
-          ref: "main"
-
-      - name: Check for commits from yesterday
-        id: check_commits
-        run: |
-          # Get yesterday's date in YYYY-MM-DD format
-          YESTERDAY=$(date -d "yesterday" +%Y-%m-%d)
-          echo "Checking for commits from: $YESTERDAY"
-
-          # Check if there were any commits yesterday
-          COMMIT_COUNT=$(git log --oneline --since="$YESTERDAY 00:00:00" --until="$YESTERDAY 23:59:59" | wc -l)
-
-          echo "Found $COMMIT_COUNT commits from yesterday"
-
-          if [ $COMMIT_COUNT -gt 0 ]; then
-            echo "has_commits=true" >> $GITHUB_OUTPUT
-            echo "✅ Found $COMMIT_COUNT commits from yesterday - continuing workflow"
-          else
-            echo "has_commits=false" >> $GITHUB_OUTPUT
-            echo "❌ No commits found from yesterday - skipping remaining steps"
-            echo "::notice::❌ No commits found from yesterday - skipping remaining steps"
-          fi
-
-  build:
-    # github actions matrix jobs don't support multiple outputs
-    # ugly workaround from https://github.com/orgs/community/discussions/17245#discussioncomment-11222880
-    if: ${{ needs.check_commits.outputs.has_commits == 'true' }}
-    outputs:
-      resolc-x86_64-unknown-linux-musl_url: ${{ steps.set-output.outputs.resolc-x86_64-unknown-linux-musl_url }}
-      resolc-x86_64-unknown-linux-musl_sha: ${{ steps.set-output.outputs.resolc-x86_64-unknown-linux-musl_sha }}
-      resolc-aarch64-apple-darwin_url: ${{ steps.set-output.outputs.resolc-aarch64-apple-darwin_url }}
-      resolc-aarch64-apple-darwin_sha: ${{ steps.set-output.outputs.resolc-aarch64-apple-darwin_sha }}
-      resolc-x86_64-apple-darwin_url: ${{ steps.set-output.outputs.resolc-x86_64-apple-darwin_url }}
-      resolc-x86_64-apple-darwin_sha: ${{ steps.set-output.outputs.resolc-x86_64-apple-darwin_sha }}
-      resolc-x86_64-pc-windows-msvc_url: ${{ steps.set-output.outputs.resolc-x86_64-pc-windows-msvc_url }}
-      resolc-x86_64-pc-windows-msvc_sha: ${{ steps.set-output.outputs.resolc-x86_64-pc-windows-msvc_sha }}
-    strategy:
-      matrix:
-        target:
-          [
-            x86_64-unknown-linux-musl,
-            aarch64-apple-darwin,
-            x86_64-apple-darwin,
-            x86_64-pc-windows-msvc,
-          ]
-        include:
-          - target: x86_64-unknown-linux-musl
-            type: musl
-            runner: ubuntu-24.04
-          - target: aarch64-apple-darwin
-            type: native
-            runner: macos-14
-          - target: x86_64-apple-darwin
-            type: native
-            runner: macos-13
-          - target: x86_64-pc-windows-msvc
-            type: native
-            runner: windows-2022
-    runs-on: ${{ matrix.runner }}
-    needs: [check_commits]
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions-rust-lang/setup-rust-toolchain@v1
-        with:
-          # without this it will override our rust flags
-          rustflags: ""
-          cache-key: ${{ matrix.target }}
-
-      - name: Download LLVM
-        uses: ./.github/actions/get-llvm
-        with:
-          target: ${{ matrix.target }}
-
-      - name: Build
-        if: ${{ matrix.type == 'native' }}
-        shell: bash
-        run: |
-          export LLVM_SYS_181_PREFIX=$PWD/llvm-${{ matrix.target }}
-          make install-bin
-          mv target/release/resolc resolc-${{ matrix.target }} || mv target/release/resolc.exe resolc-${{ matrix.target }}.exe
-
-      - name: Build
-        if: ${{ matrix.type == 'musl' }}
-        run: |
-          docker run -v $PWD:/opt/revive $RUST_MUSL_CROSS_IMAGE /bin/bash -c "
-           cd /opt/revive
-           chown -R root:root .
-           apt update && apt upgrade -y && apt install -y pkg-config
-           export LLVM_SYS_181_PREFIX=/opt/revive/llvm-${{ matrix.target }}
-           make install-bin
-           mv target/${{ matrix.target }}/release/resolc resolc-${{ matrix.target }}
-           "
-          sudo chown -R $(id -u):$(id -g) .
-
-      - name: Install Solc
-        uses: ./.github/actions/get-solc
-
-      - name: Basic Sanity Check
-        shell: bash
-        run: |
-          result=$(./resolc-${{ matrix.target }} --bin crates/integration/contracts/flipper.sol)
-          echo $result
-          if [[ $result == *'0x50564d'* ]]; then exit 0; else exit 1; fi
-
-      - name: Upload artifacts (nightly)
-        uses: actions/upload-artifact@v4
-        id: artifact-upload-step
-        with:
-          name: resolc-${{ matrix.target }}
-          path: resolc-${{ matrix.target }}*
-          retention-days: 40
-
-      - name: Set output variables (nightly)
-        id: set-output
-        shell: bash
-        run: |
-          echo "Artifact URL is ${{ steps.artifact-upload-step.outputs.artifact-url }}"
-          echo "Artifact SHA is ${{ steps.artifact-upload-step.outputs.artifact-digest }}"
-          echo "resolc-${{ matrix.target }}_url=${{ steps.artifact-upload-step.outputs.artifact-url }}"
-          echo "resolc-${{ matrix.target }}_url=${{ steps.artifact-upload-step.outputs.artifact-url }}" >> "$GITHUB_OUTPUT"
-          echo "resolc-${{ matrix.target }}_sha=${{ steps.artifact-upload-step.outputs.artifact-digest }}"
-          echo "resolc-${{ matrix.target }}_sha=${{ steps.artifact-upload-step.outputs.artifact-digest }}" >> "$GITHUB_OUTPUT"
-
-  build-wasm:
-    runs-on: ubuntu-24.04
-    needs: [check_commits]
-    if: ${{ needs.check_commits.outputs.has_commits == 'true' }}
-    outputs:
-      resolc-web.js_url: ${{ steps.set-output.outputs.resolc_web_js_url }}
-      resolc-web.js_sha: ${{ steps.set-output.outputs.resolc_web_js_sha }}
-    env:
-      RELEASE_RESOLC_WASM_URI: https://github.com/paritytech/revive/releases/download/${{ github.ref_name }}/resolc.wasm
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions-rust-lang/setup-rust-toolchain@v1
-        with:
-          target: wasm32-unknown-emscripten
-          # without this it will override our rust flags
-          rustflags: ""
-
-      - name: Download Host LLVM
-        uses: ./.github/actions/get-llvm
-        with:
-          target: x86_64-unknown-linux-gnu
-
-      - name: Download Wasm LLVM
-        uses: ./.github/actions/get-llvm
-        with:
-          target: wasm32-unknown-emscripten
-
-      - name: Download EMSDK
-        uses: ./.github/actions/get-emsdk
-
-      - name: Build
-        run: |
-          export LLVM_SYS_181_PREFIX=$PWD/llvm-x86_64-unknown-linux-gnu
-          export REVIVE_LLVM_TARGET_PREFIX=$PWD/llvm-wasm32-unknown-emscripten
-          source emsdk/emsdk_env.sh
-          make install-wasm
-          chmod -x ./target/wasm32-unknown-emscripten/release/resolc.wasm
-
-      - name: Set Up Node.js
-        uses: actions/setup-node@v3
-        with:
-          node-version: "20"
-
-      - name: Basic Sanity Check
-        run: |
-          mkdir -p solc
-          curl -sSLo solc/soljson.js https://github.com/ethereum/solidity/releases/download/v0.8.30/soljson.js
-          node -e "
-          const soljson = require('solc/soljson');
-          const createRevive = require('./target/wasm32-unknown-emscripten/release/resolc.js');
-
-          const compiler = createRevive();
-          compiler.soljson = soljson;
-
-          const standardJsonInput =
-          {
-            language: 'Solidity',
-            sources: {
-              'MyContract.sol': {
-                content: 'pragma solidity ^0.8.0; contract MyContract { function greet() public pure returns (string memory) { return \'Hello\'; } }',
-              },
-            },
-            settings: { optimizer: { enabled: false } }
-          };
-
-          compiler.writeToStdin(JSON.stringify(standardJsonInput));
-          compiler.callMain(['--standard-json']);
-
-          // Collect output
-          const stdout = compiler.readFromStdout();
-          const stderr = compiler.readFromStderr();
-
-          if (stderr) { console.error(stderr); process.exit(1); }
-
-          let out = JSON.parse(stdout);
-          let bytecode = out.contracts['MyContract.sol']['MyContract'].evm.bytecode.object
-          console.log(bytecode);
-
-          if(!bytecode.startsWith('50564d')) { process.exit(1); }
-          "
-
-      - name: Compress Artifact
-        run: |
-          mkdir -p resolc-wasm32-unknown-emscripten
-          mv ./target/wasm32-unknown-emscripten/release/resolc.js ./resolc-wasm32-unknown-emscripten/
-          mv ./target/wasm32-unknown-emscripten/release/resolc.wasm ./resolc-wasm32-unknown-emscripten/
-          mv ./target/wasm32-unknown-emscripten/release/resolc_web.js ./resolc-wasm32-unknown-emscripten/
-
-      # There is no way to upload several files as several artifacts with a single upload-artifact step
-      # It's needed to have resolc_web.js separately for night builds for resolc-bin repo
-      # https://github.com/actions/upload-artifact/issues/331
-      - name: Upload artifact resolc.js (nightly)
-        uses: actions/upload-artifact@v4
-        with:
-          name: resolc.js
-          path: resolc-wasm32-unknown-emscripten/resolc.js
-          retention-days: 40
-
-      - name: Upload artifacts resolc.wasm (nightly)
-        uses: actions/upload-artifact@v4
-        with:
-          name: resolc.wasm
-          path: resolc-wasm32-unknown-emscripten/resolc.wasm
-          retention-days: 40
-
-      - name: Upload artifacts resolc_web.js (nightly)
-        uses: actions/upload-artifact@v4
-        id: artifact-upload-step
-        with:
-          name: resolc_web.js
-          path: resolc-wasm32-unknown-emscripten/resolc_web.js
-          retention-days: 40
-
-      - name: Set output variables
-        id: set-output
-        env:
-          TARGET: resolc_web_js
-        run: |
-          echo "Artifact URL is ${{ steps.artifact-upload-step.outputs.artifact-url }}"
-          echo "Artifact SHA is ${{ steps.artifact-upload-step.outputs.artifact-digest }}"
-          echo "${TARGET}_url=${{ steps.artifact-upload-step.outputs.artifact-url }}"
-          echo "${TARGET}_url=${{ steps.artifact-upload-step.outputs.artifact-url }}" >> "$GITHUB_OUTPUT"
-          echo "${TARGET}_sha=${{ steps.artifact-upload-step.outputs.artifact-digest }}""
-          echo "${TARGET}_sha=${{ steps.artifact-upload-step.outputs.artifact-digest }}"" >> "$GITHUB_OUTPUT"
-
-  create-macos-fat-binary:
-    if: ${{ needs.check_commits.outputs.has_commits == 'true' }}
-    needs: [build]
-    outputs:
-      resolc-universal-apple-darwin_url: ${{ steps.set-output.outputs.resolc-universal-apple-darwin_url }}
-      resolc-universal-apple-darwin_sha: ${{ steps.set-output.outputs.resolc-universal-apple-darwin_sha }}
-    runs-on: macos-14
-    steps:
-      - uses: actions/download-artifact@v4
-        with:
-          merge-multiple: true
-
-      - name: Create macOS Fat Binary
-        run: |
-          lipo resolc-aarch64-apple-darwin resolc-x86_64-apple-darwin -create -output resolc-universal-apple-darwin
-
-      - name: Make Executable
-        run: |
-          chmod +x resolc-universal-apple-darwin
-
-      - uses: actions/upload-artifact@v4
-        id: artifact-upload-step
-        with:
-          name: resolc-universal-apple-darwin
-          path: resolc-universal-apple-darwin
-          retention-days: 40
-
-      - name: Set output variables
-        id: set-output
-        env:
-          TARGET: resolc-universal-apple-darwin
-        run: |
-          echo "Artifact URL is ${{ steps.artifact-upload-step.outputs.artifact-url }}"
-          echo "Artifact SHA is ${{ steps.artifact-upload-step.outputs.artifact-digest }}"
-          echo "${TARGET}_url=${{ steps.artifact-upload-step.outputs.artifact-url }}"
-          echo "${TARGET}_url=${{ steps.artifact-upload-step.outputs.artifact-url }}" >> "$GITHUB_OUTPUT"
-          echo "${TARGET}_sha=${{ steps.artifact-upload-step.outputs.artifact-digest }}""
-          echo "${TARGET}_sha=${{ steps.artifact-upload-step.outputs.artifact-digest }}"" >> "$GITHUB_OUTPUT"
-
-  generate-nightly-json:
-    runs-on: ubuntu-24.04
-    if: ${{ needs.check_commits.outputs.has_commits == 'true' }}
-    environment: tags
-    needs: [build-wasm, build, create-macos-fat-binary, check_commits]
-    steps:
-      - name: Checkout revive
-        uses: actions/checkout@v4
-        with:
-          path: revive
-
-      - name: Checkout resolc-bin
-        uses: actions/checkout@v4
-        with:
-          repository: paritytech/resolc-bin
-          path: resolc-bin
-
-      - name: Download Artifacts
-        uses: actions/download-artifact@v4
-        with:
-          merge-multiple: true
-          path: bins
-
-      - uses: actions/create-github-app-token@v1
-        id: app-token
-        with:
-          app-id: ${{ secrets.REVIVE_JSON_APP_ID }}
-          private-key: ${{ secrets.REVIVE_JSON_APP_KEY }}
-          owner: paritytech
-          repositories: resolc-bin
-
-      - name: Generate JSON
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          TOKEN: ${{ steps.app-token.outputs.token }}
-          APP_NAME: "paritytech-revive-json"
-          Green: "\e[32m"
-          NC: "\e[0m"
-        run: |
-          echo '[' > data.json
-          echo '${{ toJSON(needs.build.outputs) }}' >> data.json
-          echo ',' >> data.json
-          echo '${{ toJSON(needs.build-wasm.outputs) }}' >> data.json
-          echo ',' >> data.json
-          echo '${{ toJSON(needs.create-macos-fat-binary.outputs) }}' >> data.json
-          echo ']' >> data.json
-          chmod +x bins/resolc-x86_64-unknown-linux-musl
-          export FIRST_SOLC_VERSION=$(./bins/resolc-x86_64-unknown-linux-musl --supported-solc-versions | cut -f 1 -d "," | tr -d ">=")
-          export LAST_SOLC_VERSION=$(./bins/resolc-x86_64-unknown-linux-musl --supported-solc-versions | cut -f 2 -d "," | tr -d "<=")
-          export FILEPATH=$(readlink -f data.json)
-          export TAG=$(cd revive;gh release list --json name,isLatest --jq '.[] | select(.isLatest)|.name')
-          cd resolc-bin
-          mkdir -p nightly
-          cd nightly
-          python3 ../../revive/.github/scripts/json_generator_nightly.py
-          cd ..
-          git status
-
-          echo "${Green}Add new remote with gh app token${NC}"
-          git remote set-url origin $(git config remote.origin.url | sed "s/github.com/${APP_NAME}:${TOKEN}@github.com/g")
-
-          echo "${Green}Remove http section that causes issues with gh app auth token${NC}"
-          sed -i.bak '/\[http/d' ./.git/config
-          sed -i.bak '/extraheader/d' ./.git/config
-
-          git config user.email "ci@parity.io"
-          git config user.name "${APP_NAME}"
-
-          git add nightly/
-          git commit -m "Update nightly json"
-          git push origin main
-
-          echo "::notice::nightly info.list files were successfully published to https://github.com/paritytech/resolc-bin"
@@ -14,7 +14,6 @@ concurrency:

 env:
  CARGO_TERM_COLOR: always
-  # if changed, dont forget to update the env var in release-nightly.yml
  RUST_MUSL_CROSS_IMAGE: messense/rust-musl-cross@sha256:c0154e992adb791c3b848dd008939d19862549204f8cb26f5ca7a00f629e6067

 jobs:
@@ -45,7 +44,7 @@ jobs:
              exit 0
            fi

-          export PKG_VER=v$(cat crates/resolc/Cargo.toml | grep -A 5 package] | grep version | cut -d '=' -f 2 | tr -d '"' | tr -d " ")
+          export PKG_VER=v$(cat Cargo.toml | grep -A 5 package] | grep version | cut -d '=' -f 2 | tr -d '"' | tr -d " ")
          echo "Current tag $CURRENT_TAG"
          echo "Package version $PKG_VER"
          #
@@ -7,8 +7,6 @@ on:
      - 'LLVM.lock'
      - 'crates/llvm-builder/**'
      - '.github/workflows/test-llvm-builder.yml'
-    paths-ignore:
-      - "**.md"

 concurrency:
  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
@@ -2,13 +2,9 @@ name: Test Wasm Version
 on:
  push:
    branches: ["main"]
-    paths-ignore:
-      - "**.md"
  pull_request:
    branches: ["main"]
    types: [opened, synchronize]
-    paths-ignore:
-      - "**.md"

 concurrency:
  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
@@ -2,13 +2,9 @@ name: Test
 on:
  push:
    branches: ["main"]
-    paths-ignore:
-      - "**.md"
  pull_request:
    branches: ["main"]
    types: [opened, synchronize]
-    paths-ignore:
-      - "**.md"

 concurrency:
  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
@@ -56,3 +52,6 @@ jobs:

      - name: Test cargo workspace
        run: make test-workspace
+
+      - name: Test CLI
+        run: make test-cli
@@ -6,51 +6,6 @@ This is a development pre-release.

 Supported `polkadot-sdk` rev: `2503.0.1`

-## v0.4.0
-
-This is a development pre-release.
-
-Supported `polkadot-sdk` rev: `2503.0.1`
-
-### Added
- Line debug information per YUL builtin and for `if` statements.
- Column numbers in debug information.
- Support for the YUL optimizer details in the standard json input definition.
- The `revive-explorer` compiler utility.
- `revive-yul`: The AST visitor interface.
-
-### Fixed
- The debug info source file matches the YUL path in `--debug-output-dir`, allowing tools to display the source line. 
-
-## v0.3.0
-
-This is a development pre-release.
-
-Supported `polkadot-sdk` rev: `2503.0.1`
-
-### Fixed
-
- llvm-context: Bugfix the SAR YUL builtin translation.
- runtime-api: Add the missing `memset` builtin.
- npm package: Bugfix the exports field defined in the `package.json`.
-
-
-## v0.2.0
-
-This is a development pre-release.
-
-Supported `polkadot-sdk` rev: `2503.0.1`
-
-### Changed
-
- Removed the license printer from the `resolc` binary.
- EVM bytecode is no longer requested from solc (except in test utils) leading to less compilation work in the pipeline.
-
-### Fixed
-
- solc-json-interface: Serializing of any custom key in the JSON input is only skipped if not provided.
- npm package resolution no longer fails with an 'ERR_PACKAGE_PATH_NOT_EXPORTED' error for packages defining exports fields in the `package.json`.
-
 ## v0.1.0

 This is a development pre-release.
@@ -105,26 +105,13 @@ version = "0.8.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9d8bcce99ad10fe02640cfaec1c6bc809b837c783c1d52906aa5af66e2a196f6"
 dependencies = [
- "alloy-dyn-abi 0.8.25",
+ "alloy-dyn-abi",
 "alloy-json-abi 0.8.25",
 "alloy-primitives 0.8.25",
 "alloy-rlp",
 "alloy-sol-types 0.8.25",
 ]

-[[package]]
-name = "alloy-core"
-version = "1.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfe6c56d58fbfa9f0f6299376e8ce33091fc6494239466814c3f54b55743cb09"
-dependencies = [
- "alloy-dyn-abi 1.3.1",
- "alloy-json-abi 1.3.1",
- "alloy-primitives 1.3.1",
- "alloy-rlp",
- "alloy-sol-types 1.3.1",
-]
-
 [[package]]
 name = "alloy-dyn-abi"
 version = "0.8.25"
@@ -142,29 +129,13 @@ dependencies = [
 "winnow",
 ]

-[[package]]
-name = "alloy-dyn-abi"
-version = "1.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3f56873f3cac7a2c63d8e98a4314b8311aa96adb1a0f82ae923eb2119809d2c"
-dependencies = [
- "alloy-json-abi 1.3.1",
- "alloy-primitives 1.3.1",
- "alloy-sol-type-parser 1.3.1",
- "alloy-sol-types 1.3.1",
- "itoa",
- "serde",
- "serde_json",
- "winnow",
-]
-
 [[package]]
 name = "alloy-eip2124"
 version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "741bdd7499908b3aa0b159bba11e71c8cddd009a2c2eb7a06e825f1ec87900a5"
 dependencies = [
- "alloy-primitives 1.3.1",
+ "alloy-primitives 1.1.2",
 "alloy-rlp",
 "crc",
 "serde",
@@ -177,7 +148,7 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7b82752a889170df67bbb36d42ca63c531eb16274f0d7299ae2a680facba17bd"
 dependencies = [
- "alloy-primitives 1.3.1",
+ "alloy-primitives 1.1.2",
 "alloy-rlp",
 "serde",
 ]
@@ -188,7 +159,7 @@ version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9d4769c6ffddca380b0070d71c8b7f30bed375543fe76bb2f74ec0acf4b7cd16"
 dependencies = [
- "alloy-primitives 1.3.1",
+ "alloy-primitives 1.1.2",
 "alloy-rlp",
 "serde",
 "thiserror 2.0.12",
@@ -196,14 +167,14 @@ dependencies = [

 [[package]]
 name = "alloy-eips"
-version = "1.0.9"
+version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3056872f6da48046913e76edb5ddced272861f6032f09461aea1a2497be5ae5d"
+checksum = "4fa190bfa5340aee544ac831114876fa73bc8da487095b49a5ea153a6a4656ea"
 dependencies = [
 "alloy-eip2124",
 "alloy-eip2930",
 "alloy-eip7702",
- "alloy-primitives 1.3.1",
+ "alloy-primitives 1.1.2",
 "alloy-rlp",
 "alloy-serde",
 "auto_impl",
@@ -216,12 +187,12 @@ dependencies = [

 [[package]]
 name = "alloy-genesis"
-version = "1.0.9"
+version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c98fb40f07997529235cc474de814cd7bd9de561e101716289095696c0e4639d"
+checksum = "2b81b2dfd278d58af8bfde8753fa4685407ba8fbad8bc88a2bb0e065eed48478"
 dependencies = [
 "alloy-eips",
- "alloy-primitives 1.3.1",
+ "alloy-primitives 1.1.2",
 "alloy-serde",
 "alloy-trie",
 "serde",
@@ -241,12 +212,12 @@ dependencies = [

 [[package]]
 name = "alloy-json-abi"
-version = "1.3.1"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "125a1c373261b252e53e04d6e92c37d881833afc1315fceab53fd46045695640"
+checksum = "3ccaa79753d7bf15f06399ea76922afbfaf8d18bebed9e8fc452984b4a90dcc9"
 dependencies = [
- "alloy-primitives 1.3.1",
- "alloy-sol-type-parser 1.3.1",
+ "alloy-primitives 1.1.2",
+ "alloy-sol-type-parser 1.1.2",
 "serde",
 "serde_json",
 ]
@@ -280,9 +251,9 @@ dependencies = [

 [[package]]
 name = "alloy-primitives"
-version = "1.3.1"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc9485c56de23438127a731a6b4c87803d49faf1a7068dcd1d8768aca3a9edb9"
+checksum = "18c35fc4b03ace65001676358ffbbaefe2a2b27ee50fe777c345082c7c888be8"
 dependencies = [
 "alloy-rlp",
 "bytes",
@@ -329,11 +300,11 @@ dependencies = [

 [[package]]
 name = "alloy-serde"
-version = "1.0.9"
+version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "730e8f2edf2fc224cabd1c25d090e1655fa6137b2e409f92e5eec735903f1507"
+checksum = "3b7d927aa39ca51545ae4c9cf4bdb2cbc1f6b46ab4b54afc3ed9255f93eedbce"
 dependencies = [
- "alloy-primitives 1.3.1",
+ "alloy-primitives 1.1.2",
 "serde",
 "serde_json",
 ]
@@ -354,12 +325,12 @@ dependencies = [

 [[package]]
 name = "alloy-sol-macro"
-version = "1.3.1"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d20d867dcf42019d4779519a1ceb55eba8d7f3d0e4f0a89bcba82b8f9eb01e48"
+checksum = "8612e0658964d616344f199ab251a49d48113992d81b92dab93ed855faa66383"
 dependencies = [
- "alloy-sol-macro-expander 1.3.1",
- "alloy-sol-macro-input 1.3.1",
+ "alloy-sol-macro-expander 1.1.2",
+ "alloy-sol-macro-input 1.1.2",
 "proc-macro-error2",
 "proc-macro2",
 "quote",
@@ -386,11 +357,11 @@ dependencies = [

 [[package]]
 name = "alloy-sol-macro-expander"
-version = "1.3.1"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b74e91b0b553c115d14bd0ed41898309356dc85d0e3d4b9014c4e7715e48c8ad"
+checksum = "7a384edac7283bc4c010a355fb648082860c04b826bb7a814c45263c8f304c74"
 dependencies = [
- "alloy-sol-macro-input 1.3.1",
+ "alloy-sol-macro-input 1.1.2",
 "const-hex",
 "heck",
 "indexmap 2.9.0",
@@ -398,7 +369,7 @@ dependencies = [
 "proc-macro2",
 "quote",
 "syn 2.0.101",
- "syn-solidity 1.3.1",
+ "syn-solidity 1.1.2",
 "tiny-keccak",
 ]

@@ -420,9 +391,9 @@ dependencies = [

 [[package]]
 name = "alloy-sol-macro-input"
-version = "1.3.1"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84194d31220803f5f62d0a00f583fd3a062b36382e2bea446f1af96727754565"
+checksum = "0dd588c2d516da7deb421b8c166dc60b7ae31bca5beea29ab6621fcfa53d6ca5"
 dependencies = [
 "const-hex",
 "dunce",
@@ -431,7 +402,7 @@ dependencies = [
 "proc-macro2",
 "quote",
 "syn 2.0.101",
- "syn-solidity 1.3.1",
+ "syn-solidity 1.1.2",
 ]

 [[package]]
@@ -446,9 +417,9 @@ dependencies = [

 [[package]]
 name = "alloy-sol-type-parser"
-version = "1.3.1"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe8c27b3cf6b2bb8361904732f955bc7c05e00be5f469cec7e2280b6167f3ff0"
+checksum = "e86ddeb70792c7ceaad23e57d52250107ebbb86733e52f4a25d8dc1abc931837"
 dependencies = [
 "serde",
 "winnow",
@@ -469,13 +440,13 @@ dependencies = [

 [[package]]
 name = "alloy-sol-types"
-version = "1.3.1"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5383d34ea00079e6dd89c652bcbdb764db160cef84e6250926961a0b2295d04"
+checksum = "584cb97bfc5746cb9dcc4def77da11694b5d6d7339be91b7480a6a68dc129387"
 dependencies = [
- "alloy-json-abi 1.3.1",
- "alloy-primitives 1.3.1",
- "alloy-sol-macro 1.3.1",
+ "alloy-json-abi 1.1.2",
+ "alloy-primitives 1.1.2",
+ "alloy-sol-macro 1.1.2",
 "serde",
 ]

@@ -485,7 +456,7 @@ version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "983d99aa81f586cef9dae38443245e585840fcf0fc58b09aee0b1f27aed1d500"
 dependencies = [
- "alloy-primitives 1.3.1",
+ "alloy-primitives 1.1.2",
 "alloy-rlp",
 "arrayvec",
 "derive_more 2.0.1",
@@ -1778,9 +1749,9 @@ dependencies = [

 [[package]]
 name = "camino"
-version = "1.1.10"
+version = "1.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0da45bc31171d8d6960122e222a67740df867c1dd53b4d51caa297084c185cab"
+checksum = "8b96ec4966b5813e2c0507c1f86115c8c5abaadc3980879c3424042a02fd1ad3"
 dependencies = [
 "serde",
 ]
@@ -1816,9 +1787,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"

 [[package]]
 name = "cc"
-version = "1.2.25"
+version = "1.2.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0fc897dc1e865cc67c0e05a836d9d3f1df3cbe442aa4a9473b18e12624a4951"
+checksum = "16595d3be041c03b09d08d0858631facccee9221e579704070e6e9e4915d3bc7"
 dependencies = [
 "jobserver",
 "libc",
@@ -1880,9 +1851,9 @@ dependencies = [

 [[package]]
 name = "clap"
-version = "4.5.39"
+version = "4.5.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd60e63e9be68e5fb56422e397cf9baddded06dae1d2e523401542383bc72a9f"
+checksum = "ed93b9805f8ba930df42c2590f05453d5ec36cbb85d018868a5b24d31f6ac000"
 dependencies = [
 "clap_builder",
 "clap_derive",
@@ -1890,9 +1861,9 @@ dependencies = [

 [[package]]
 name = "clap_builder"
-version = "4.5.39"
+version = "4.5.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89cc6392a1f72bbeb820d71f32108f61fdaf18bc526e1d23954168a67759ef51"
+checksum = "379026ff283facf611b0ea629334361c4211d1b12ee01024eec1591133b04120"
 dependencies = [
 "anstream",
 "anstyle",
@@ -3344,9 +3315,9 @@ dependencies = [

 [[package]]
 name = "frame-benchmarking"
-version = "40.2.0"
+version = "40.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a9e5fcdb30bb83b2d97d7e718127230e0fbbad82b9c32dedf63971f08709def"
+checksum = "aaf87febd8e05e4fc404a4ff2654319f86baf02863d5ab19a1fa5cee5162e03d"
 dependencies = [
 "frame-support",
 "frame-support-procedural",
@@ -4115,21 +4086,17 @@ dependencies = [

 [[package]]
 name = "hyper-util"
-version = "0.1.13"
+version = "0.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1c293b6b3d21eca78250dc7dbebd6b9210ec5530e038cbfe0661b5c47ab06e8"
+checksum = "cf9f1e950e0d9d1d3c47184416723cf29c0d1f93bd8cccf37e4beb6b44f31710"
 dependencies = [
- "base64 0.22.1",
 "bytes",
 "futures-channel",
- "futures-core",
 "futures-util",
 "http",
 "http-body",
 "hyper",
- "ipnet",
 "libc",
- "percent-encoding",
 "pin-project-lite",
 "socket2",
 "tokio",
@@ -4441,16 +4408,6 @@ version = "2.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130"

-[[package]]
-name = "iri-string"
-version = "0.7.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbc5ebe9c3a1a7a5127f920a418f7585e9e758e911d0466ed004f393b0e380b2"
-dependencies = [
- "memchr",
- "serde",
-]
-
 [[package]]
 name = "is-terminal"
 version = "0.4.16"
@@ -4745,9 +4702,9 @@ dependencies = [

 [[package]]
 name = "lock_api"
-version = "0.4.13"
+version = "0.4.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96936507f153605bddfcda068dd804796c84324ed2510809e5b2a624c81da765"
+checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
 dependencies = [
 "autocfg",
 "scopeguard",
@@ -5083,11 +5040,11 @@ dependencies = [

 [[package]]
 name = "num_cpus"
-version = "1.17.0"
+version = "1.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91df4bbde75afed763b708b7eee1e8e7651e02d97f6d5dd763e89367e957b23b"
+checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
 dependencies = [
- "hermit-abi 0.5.1",
+ "hermit-abi 0.3.9",
 "libc",
 ]

@@ -5151,9 +5108,9 @@ checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381"

 [[package]]
 name = "openssl"
-version = "0.10.73"
+version = "0.10.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8505734d46c8ab1e19a1dce3aef597ad87dcb4c37e7188231769bd6bd51cebf8"
+checksum = "fedfea7d58a1f73118430a55da6a286e7b044961736ce96a16a17068ea25e5da"
 dependencies = [
 "bitflags 2.9.1",
 "cfg-if",
@@ -5183,9 +5140,9 @@ checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e"

 [[package]]
 name = "openssl-sys"
-version = "0.9.109"
+version = "0.9.108"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90096e2e47630d78b7d1c20952dc621f957103f8bc2c8359ec81290d75238571"
+checksum = "e145e1651e858e820e4860f7b9c5e169bc1d8ce1c86043be79fa7b7634821847"
 dependencies = [
 "cc",
 "libc",
@@ -6519,7 +6476,7 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "895fe6f50f621a69132697b8b43d29d1db4d9ff445eec410bf1fc98cd7e9412c"
 dependencies = [
- "alloy-core 0.8.25",
+ "alloy-core",
 "derive_more 0.99.20",
 "environmental",
 "ethabi-decode",
@@ -6534,8 +6491,8 @@ dependencies = [
 "num-integer",
 "num-traits",
 "pallet-revive-fixtures",
- "pallet-revive-proc-macro 0.3.0",
- "pallet-revive-uapi 0.4.0",
+ "pallet-revive-proc-macro",
+ "pallet-revive-uapi",
 "pallet-transaction-payment",
 "parity-scale-codec",
 "paste",
@@ -6568,7 +6525,7 @@ checksum = "dc1df19ca809f036d6ddf1632039e9db312f92dbe8f9390e6722ad808cd95377"
 dependencies = [
 "anyhow",
 "cargo_metadata",
- "pallet-revive-uapi 0.4.0",
+ "pallet-revive-uapi",
 "polkavm-linker 0.21.0",
 "sp-core",
 "sp-io",
@@ -6587,7 +6544,7 @@ dependencies = [
 "pallet-balances",
 "pallet-message-queue",
 "pallet-revive",
- "pallet-revive-uapi 0.4.0",
+ "pallet-revive-uapi",
 "pallet-timestamp",
 "pallet-xcm",
 "parity-scale-codec",
@@ -6616,17 +6573,6 @@ dependencies = [
 "syn 2.0.101",
 ]

-[[package]]
-name = "pallet-revive-proc-macro"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "feb9c42c125790dd4bb0132312bb1a9d3a890b4720c7696d636194311f948e36"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.101",
-]
-
 [[package]]
 name = "pallet-revive-uapi"
 version = "0.4.0"
@@ -6634,25 +6580,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0cb8f45102c6279f59f55e0051fc6c26b996619d7842800dfaf3a2583459a1c7"
 dependencies = [
 "bitflags 1.3.2",
- "pallet-revive-proc-macro 0.3.0",
+ "pallet-revive-proc-macro",
 "parity-scale-codec",
 "polkavm-derive 0.21.0",
 "scale-info",
 ]

-[[package]]
-name = "pallet-revive-uapi"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e340813d94f380bc531d4cd5f28685065a14dbbff87ab23507f72c7d2792b82c"
-dependencies = [
- "bitflags 1.3.2",
- "pallet-revive-proc-macro 0.4.0",
- "parity-scale-codec",
- "polkavm-derive 0.27.0",
- "scale-info",
-]
-
 [[package]]
 name = "pallet-root-offences"
 version = "37.0.0"
@@ -6718,9 +6651,9 @@ dependencies = [

 [[package]]
 name = "pallet-scheduler"
-version = "41.2.0"
+version = "41.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3cb7b2e47ad83f06891cd6a7fb1bd3ea670272c2b1248e9ae1c832df3678f720"
+checksum = "954531ea38dea2298c19a10df060572ac9722d79bbe326039c8809b86bcf5d13"
 dependencies = [
 "docify",
 "frame-benchmarking",
@@ -7112,9 +7045,9 @@ dependencies = [

 [[package]]
 name = "pallet-xcm"
-version = "19.1.2"
+version = "19.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca27d506282f4c9cd2cac6fb0d199edd89d366635f04801319e7145912547a68"
+checksum = "2634c61cdfe53073384659adea1ae2c4e0a4c1e35a9f7e7fc0acb68891df4c39"
 dependencies = [
 "bounded-collections",
 "frame-benchmarking",
@@ -7154,9 +7087,9 @@ dependencies = [

 [[package]]
 name = "pallet-xcm-bridge-hub"
-version = "0.16.3"
+version = "0.16.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "479b09d5317c91725370e1ef6fef92f5ec7c1c8b029e5f316a49cd3a57164cb0"
+checksum = "4a43dee4426efca33b8b02930f66b637ea7381cde3657ca0bd6d681823d236a6"
 dependencies = [
 "bp-messages",
 "bp-runtime",
@@ -7307,9 +7240,9 @@ checksum = "e1ad0aff30c1da14b1254fcb2af73e1fa9a28670e584a626f53a369d0e157304"

 [[package]]
 name = "parking_lot"
-version = "0.12.4"
+version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70d58bf43669b5795d1576d0641cfb6fbb2057bf629506267a92807158584a13"
+checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
 dependencies = [
 "lock_api",
 "parking_lot_core",
@@ -7317,9 +7250,9 @@ dependencies = [

 [[package]]
 name = "parking_lot_core"
-version = "0.9.11"
+version = "0.9.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc838d2a56b5b1a6c25f55575dfc605fabb63bb2365f6c2353ef9159aa69e4a5"
+checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
 dependencies = [
 "cfg-if",
 "libc",
@@ -7980,12 +7913,6 @@ dependencies = [
 "polkavm-assembler 0.24.0",
 ]

-[[package]]
-name = "polkavm-common"
-version = "0.27.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a19805789e7bf778ac5855f6fe9350353f6a1697c2aab9bfb6fc7c831be54fad"
-
 [[package]]
 name = "polkavm-derive"
 version = "0.18.0"
@@ -8004,15 +7931,6 @@ dependencies = [
 "polkavm-derive-impl-macro 0.21.0",
 ]

-[[package]]
-name = "polkavm-derive"
-version = "0.27.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4eea46a17d87cbf3c0f3f6156f6300f60cec67cf9eaca296c770e0873f8389d6"
-dependencies = [
- "polkavm-derive-impl-macro 0.27.0",
-]
-
 [[package]]
 name = "polkavm-derive-impl"
 version = "0.18.1"
@@ -8037,18 +7955,6 @@ dependencies = [
 "syn 2.0.101",
 ]

-[[package]]
-name = "polkavm-derive-impl"
-version = "0.27.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8abdd1210d96b1dda9ac21199ec469448fd628cea102e2ff0e0df1667c4c3b5f"
-dependencies = [
- "polkavm-common 0.27.0",
- "proc-macro2",
- "quote",
- "syn 2.0.101",
-]
-
 [[package]]
 name = "polkavm-derive-impl-macro"
 version = "0.18.0"
@@ -8069,16 +7975,6 @@ dependencies = [
 "syn 2.0.101",
 ]

-[[package]]
-name = "polkavm-derive-impl-macro"
-version = "0.27.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a45173d70138aa1879892c50777ed0d8b0c8556f7678372f09fa1d89bbbddb4"
-dependencies = [
- "polkavm-derive-impl 0.27.0",
- "syn 2.0.101",
-]
-
 [[package]]
 name = "polkavm-disassembler"
 version = "0.24.0"
@@ -8218,9 +8114,9 @@ dependencies = [

 [[package]]
 name = "prettyplease"
-version = "0.2.33"
+version = "0.2.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9dee91521343f4c5c6a63edd65e54f31f5c92fe8978c40a4282f8372194c6a7d"
+checksum = "664ec5419c51e34154eec046ebcba56312d5a2fc3b09a06da188e1ad21afadf6"
 dependencies = [
 "proc-macro2",
 "syn 2.0.101",
@@ -8597,13 +8493,14 @@ checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"

 [[package]]
 name = "reqwest"
-version = "0.12.19"
+version = "0.12.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2f8e5513d63f2e5b386eb5106dc67eaf3f84e95258e210489136b8b92ad6119"
+checksum = "d19c46a6fdd48bc4dab94b6103fccc55d34c67cc0ad04653aad4ea2a07cd7bbb"
 dependencies = [
 "base64 0.22.1",
 "bytes",
 "futures-core",
+ "futures-util",
 "http",
 "http-body",
 "http-body-util",
@@ -8618,7 +8515,7 @@ dependencies = [
 "once_cell",
 "percent-encoding",
 "pin-project-lite",
- "rustls-pki-types",
+ "rustls-pemfile",
 "serde",
 "serde_json",
 "serde_urlencoded",
@@ -8626,17 +8523,17 @@ dependencies = [
 "tokio",
 "tokio-native-tls",
 "tower",
- "tower-http",
 "tower-service",
 "url",
 "wasm-bindgen",
 "wasm-bindgen-futures",
 "web-sys",
+ "windows-registry",
 ]

 [[package]]
 name = "resolc"
-version = "0.3.0"
+version = "0.1.0"
 dependencies = [
 "anyhow",
 "clap",
@@ -8663,7 +8560,7 @@ dependencies = [
 name = "revive-benchmarks"
 version = "0.1.0"
 dependencies = [
- "alloy-primitives 1.3.1",
+ "alloy-primitives 1.1.2",
 "criterion",
 "hex",
 "revive-differential",
@@ -8697,7 +8594,7 @@ name = "revive-differential"
 version = "0.1.0"
 dependencies = [
 "alloy-genesis",
- "alloy-primitives 1.3.1",
+ "alloy-primitives 1.1.2",
 "alloy-serde",
 "hex",
 "serde",
@@ -8706,21 +8603,11 @@ dependencies = [
 ]

 [[package]]
-name = "revive-explorer"
+name = "revive-integration"
 version = "0.1.0"
 dependencies = [
- "anyhow",
- "clap",
- "num_cpus",
- "revive-yul",
-]
-
-[[package]]
-name = "revive-integration"
-version = "0.1.1"
-dependencies = [
- "alloy-primitives 1.3.1",
- "alloy-sol-types 1.3.1",
+ "alloy-primitives 1.1.2",
+ "alloy-sol-types 1.1.2",
 "hex",
 "rayon",
 "resolc",
@@ -8745,7 +8632,7 @@ dependencies = [

 [[package]]
 name = "revive-llvm-builder"
-version = "0.2.0"
+version = "0.1.0"
 dependencies = [
 "anyhow",
 "assert_cmd",
@@ -8767,7 +8654,7 @@ dependencies = [

 [[package]]
 name = "revive-llvm-context"
-version = "0.3.0"
+version = "0.1.0"
 dependencies = [
 "anyhow",
 "hex",
@@ -8787,27 +8674,11 @@ dependencies = [
 "sha3",
 ]

-[[package]]
-name = "revive-rul"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "pallet-revive-uapi 0.7.0",
- "polkavm-linker 0.24.0",
-]
-
-[[package]]
-name = "revive-rul-runtime-library"
-version = "0.1.0"
-dependencies = [
- "alloy-core 1.3.1",
-]
-
 [[package]]
 name = "revive-runner"
 version = "0.1.0"
 dependencies = [
- "alloy-primitives 1.3.1",
+ "alloy-primitives 1.1.2",
 "anyhow",
 "clap",
 "env_logger 0.11.8",
@@ -8824,7 +8695,7 @@ dependencies = [

 [[package]]
 name = "revive-runtime-api"
-version = "0.2.0"
+version = "0.1.0"
 dependencies = [
 "anyhow",
 "inkwell",
@@ -8834,7 +8705,7 @@ dependencies = [

 [[package]]
 name = "revive-solc-json-interface"
-version = "0.2.0"
+version = "0.1.0"
 dependencies = [
 "anyhow",
 "rayon",
@@ -8846,7 +8717,7 @@ dependencies = [

 [[package]]
 name = "revive-stdlib"
-version = "0.1.1"
+version = "0.1.0"
 dependencies = [
 "inkwell",
 "revive-build-utils",
@@ -8854,7 +8725,7 @@ dependencies = [

 [[package]]
 name = "revive-yul"
-version = "0.2.1"
+version = "0.1.0"
 dependencies = [
 "anyhow",
 "inkwell",
@@ -9046,6 +8917,15 @@ dependencies = [
 "windows-sys 0.59.0",
 ]

+[[package]]
+name = "rustls-pemfile"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50"
+dependencies = [
+ "rustls-pki-types",
+]
+
 [[package]]
 name = "rustls-pki-types"
 version = "1.12.0"
@@ -10858,9 +10738,9 @@ dependencies = [

 [[package]]
 name = "syn-solidity"
-version = "1.3.1"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0b198d366dbec045acfcd97295eb653a7a2b40e4dc764ef1e79aafcad439d3c"
+checksum = "1b5d879005cc1b5ba4e18665be9e9501d9da3a9b95f625497c4cb7ee082b532e"
 dependencies = [
 "paste",
 "proc-macro2",
@@ -11179,24 +11059,6 @@ dependencies = [
 "tower-service",
 ]

-[[package]]
-name = "tower-http"
-version = "0.6.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adc82fd73de2a9722ac5da747f12383d2bfdb93591ee6c58486e0097890f05f2"
-dependencies = [
- "bitflags 2.9.1",
- "bytes",
- "futures-util",
- "http",
- "http-body",
- "iri-string",
- "pin-project-lite",
- "tower",
- "tower-layer",
- "tower-service",
-]
-
 [[package]]
 name = "tower-layer"
 version = "0.3.3"
@@ -11962,6 +11824,41 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"

+[[package]]
+name = "windows-link"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "76840935b766e1b0a05c0066835fb9ec80071d4c09a16f6bd5f7e655e3c14c38"
+
+[[package]]
+name = "windows-registry"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4286ad90ddb45071efd1a66dfa43eb02dd0dfbae1545ad6cc3c51cf34d7e8ba3"
+dependencies = [
+ "windows-result",
+ "windows-strings",
+ "windows-targets 0.53.0",
+]
+
+[[package]]
+name = "windows-result"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6"
+dependencies = [
+ "windows-link",
+]
+
+[[package]]
+name = "windows-strings"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87fa48cc5d406560701792be122a10132491cff9d0aeb23583cc2dcafc847319"
+dependencies = [
+ "windows-link",
+]
+
 [[package]]
 name = "windows-sys"
 version = "0.45.0"
@@ -12037,13 +11934,29 @@ dependencies = [
 "windows_aarch64_gnullvm 0.52.6",
 "windows_aarch64_msvc 0.52.6",
 "windows_i686_gnu 0.52.6",
- "windows_i686_gnullvm",
+ "windows_i686_gnullvm 0.52.6",
 "windows_i686_msvc 0.52.6",
 "windows_x86_64_gnu 0.52.6",
 "windows_x86_64_gnullvm 0.52.6",
 "windows_x86_64_msvc 0.52.6",
 ]

+[[package]]
+name = "windows-targets"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1e4c7e8ceaaf9cb7d7507c974735728ab453b67ef8f18febdd7c11fe59dca8b"
+dependencies = [
+ "windows_aarch64_gnullvm 0.53.0",
+ "windows_aarch64_msvc 0.53.0",
+ "windows_i686_gnu 0.53.0",
+ "windows_i686_gnullvm 0.53.0",
+ "windows_i686_msvc 0.53.0",
+ "windows_x86_64_gnu 0.53.0",
+ "windows_x86_64_gnullvm 0.53.0",
+ "windows_x86_64_msvc 0.53.0",
+]
+
 [[package]]
 name = "windows_aarch64_gnullvm"
 version = "0.42.2"
@@ -12062,6 +11975,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"

+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764"
+
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.42.2"
@@ -12080,6 +11999,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"

+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c"
+
 [[package]]
 name = "windows_i686_gnu"
 version = "0.42.2"
@@ -12098,12 +12023,24 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"

+[[package]]
+name = "windows_i686_gnu"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3"
+
 [[package]]
 name = "windows_i686_gnullvm"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"

+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11"
+
 [[package]]
 name = "windows_i686_msvc"
 version = "0.42.2"
@@ -12122,6 +12059,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"

+[[package]]
+name = "windows_i686_msvc"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d"
+
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.42.2"
@@ -12140,6 +12083,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"

+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba"
+
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.42.2"
@@ -12158,6 +12107,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"

+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57"
+
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.42.2"
@@ -12176,6 +12131,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"

+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486"
+
 [[package]]
 name = "winnow"
 version = "0.7.10"
@@ -14,22 +14,21 @@ repository = "https://github.com/paritytech/revive"
 rust-version = "1.85.0"

 [workspace.dependencies]
-resolc = { version = "0.3.0", path = "crates/resolc" }
+resolc  = { version = "0.1.0", path = "crates/resolc" }
 revive-benchmarks = { version = "0.1.0", path = "crates/benchmarks" }
 revive-builtins = { version = "0.1.0", path = "crates/builtins" }
 revive-common = { version = "0.1.0", path = "crates/common" }
 revive-differential = { version = "0.1.0", path = "crates/differential" }
-revive-explorer = { version = "0.1.0", path = "crates/explore" }
-revive-integration = { version = "0.1.1", path = "crates/integration" }
+revive-integration = { version = "0.1.0", path = "crates/integration" }
 revive-linker = { version = "0.1.0", path = "crates/linker" }
 lld-sys = { version = "0.1.0", path = "crates/lld-sys" }
-revive-llvm-context = { version = "0.3.0", path = "crates/llvm-context" }
-revive-runtime-api = { version = "0.2.0", path = "crates/runtime-api" }
+revive-llvm-context = { version = "0.1.0", path = "crates/llvm-context" }
+revive-runtime-api = { version = "0.1.0", path = "crates/runtime-api" }
 revive-runner = { version = "0.1.0", path = "crates/runner" }
-revive-solc-json-interface = { version = "0.2.0", path = "crates/solc-json-interface" }
-revive-stdlib = { version = "0.1.1", path = "crates/stdlib" }
+revive-solc-json-interface = { version = "0.1.0", path = "crates/solc-json-interface" }
+revive-stdlib = { version = "0.1.0", path = "crates/stdlib" }
 revive-build-utils = { version = "0.1.0", path = "crates/build-utils" }
-revive-yul = { version = "0.2.1", path = "crates/yul" }
+revive-yul = { version = "0.1.0", path = "crates/yul" }

 hex = "0.4.3"
 cc = "1.2"
@@ -58,7 +57,6 @@ alloy-primitives = { version = "1.1", features = ["serde"] }
 alloy-sol-types = "1.1"
 alloy-genesis = "1.0"
 alloy-serde = "1.0"
-alloy-core = "1.3"
 env_logger = { version = "0.11.8", default-features = false }
 serde_stacker = "0.1.12"
 criterion = { version = "0.6", features = ["html_reports"] }
@@ -72,7 +70,6 @@ tar = "0.4"
 toml = "0.8"
 assert_cmd = "2.0"
 assert_fs = "1.1"
-pallet-revive-uapi = "0.7.0"

 # polkadot-sdk and friends
 codec = { version = "3.7.5", default-features = false, package = "parity-scale-codec" }
@@ -6,7 +6,6 @@
 	install-llvm-builder \
 	install-llvm \
 	install-revive-runner \
-	install-revive-explorer \
 	format \
 	clippy \
 	machete \
@@ -14,6 +13,7 @@
 	test-integration \
 	test-resolc \
 	test-workspace \
+	test-cli \
 	test-wasm \
 	test-llvm-builder
 	bench \
@@ -43,9 +43,6 @@ install-llvm: install-llvm-builder
 install-revive-runner:
 	cargo install --locked --force --path crates/runner --no-default-features

-install-revive-explorer:
-	cargo install --locked --force --path crates/explorer --no-default-features
-
 format:
 	cargo fmt --all --check

@@ -56,7 +53,7 @@ machete:
 	cargo install cargo-machete
 	cargo machete

-test: format clippy machete test-workspace install-revive-runner install-revive-explorer
+test: format clippy machete test-cli test-workspace install-revive-runner

 test-integration: install-bin
 	cargo test --package revive-integration
@@ -67,6 +64,9 @@ test-resolc: install
 test-workspace: install
 	cargo test --workspace --exclude revive-llvm-builder

+test-cli: install
+	npm run test:cli
+
 test-wasm: install-wasm
 	npm run test:wasm

@@ -90,6 +90,6 @@ clean:
 	cargo clean ; \
 	revive-llvm clean ; \
 	rm -rf node_modules ; \
-	rm -rf crates/resolc/src/tests/cli/artifacts ; \
+	rm -rf crates/resolc/src/tests/cli-tests/artifacts ; \
 	cargo uninstall resolc ; \
 	cargo uninstall revive-llvm-builder ;
@@ -76,7 +76,9 @@ export LLVM_SYS_181_PREFIX=</path/to/the/extracted/archive>/target-llvm/gnu/targ
 <details>
  <summary>Building from source</summary>

-The `Makefile` provides a shortcut target to obtain a compatible LLVM build, using the provided [revive-llvm](crates/llvm-builder/README.md) utility. Once installed, 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:

 ```sh
 make install-llvm
@@ -4,11 +4,7 @@ Prior to the first stable release we neither have formal release processes nor d

 To create a new pre-release:

-1. Create a release PR which, if necessary:
-  - Updates the versions in the workspace `Cargo.toml`
-  - Updates the version in each crate `Cargo.toml`
-  - Updates the version of the NPM package in `js/resolc/package.json`
-  - Updates the `CHANGELOG.md` to reflect all observable changes
+1. Create a release PR which updates the versions in the workspace `Cargo.toml` and updates the `CHANGELOG.md` accordingly.
 2. If the CI passes, merge the release PR.
 3. Push a `vX.Y.Z` tag that has the same version as in `Cargo.toml`
 4. The release workflow will attempt to build and publish a new pre-release if the latest tag does match the cargo package version.
@@ -1,6 +1,5 @@
 [package]
 name = "revive-differential"
-description = "utilities for differential testing the revive compiler against EVM"
 version.workspace = true
 license.workspace = true
 edition.workspace = true
@@ -14,4 +13,4 @@ serde = { workspace = true }
 serde_json = { workspace = true }
 alloy-primitives = { workspace = true, features = ["serde"] }
 alloy-genesis = { workspace = true }
-alloy-serde = { workspace = true }
+alloy-serde = { workspace = true }
@@ -1,20 +0,0 @@
-[package]
-name = "revive-explorer"
-version.workspace = true
-license.workspace = true
-edition.workspace = true
-repository.workspace = true
-authors.workspace = true
-description = "Helper utility to inspect debug builds"
-
-[[bin]]
-name = "revive-explorer"
-path = "src/main.rs"
-
-[dependencies]
-anyhow = { workspace = true }
-clap = { workspace = true, features = ["help", "std", "derive"] }
-num_cpus = { workspace = true }
-
-revive-yul = { workspace = true }
-
@@ -1,49 +0,0 @@
-# revive-explorer
-
-The `revive-explorer` is a helper utility for exploring the compilers YUL lowering unit.
-
-It analyzes a given shared objects from the debug dump and outputs:
- The count of each YUL statement translated.
- A per YUL statement break-down of bytecode size contributed per.
- Estimated `yul-phaser` cost parameters.
-
-Example:
-
-```
-statements count:
-	block 532
-	Caller 20
-	Not 73
-	Gas 24
-	Shr 2
-    ...
-	Shl 259
-	SetImmutable 2
-	CodeSize 1
-	CallDataLoad 87
-	Return 56
-bytes per statement:
-	Or 756
-	CodeCopy 158
-	Log3 620
-	Return 1562
-	MStore 36128
-	...
-	ReturnDataCopy 2854
-	DataOffset 28
-	assignment 1194
-	Number 540
-	CallValue 4258
-yul-phaser parameters:
-	--break-cost 1
-	--variable-declaration-cost 3
-	--function-call-cost 8
-	--if-cost 4
-	--expression-statement-cost 6
-	--function-definition-cost 11
-	--switch-cost 3
-	--block-cost 1
-	--leave-cost 1
-	--assignment-cost 1
-```
-
@@ -1,68 +0,0 @@
-//! The `llvm-dwarfdump` utility helper library.
-
-use std::{
-    path::{Path, PathBuf},
-    process::{Command, Stdio},
-};
-
-pub static EXECUTABLE: &str = "llvm-dwarfdump";
-pub static DEBUG_LINES_ARGUMENTS: [&str; 1] = ["--debug-line"];
-pub static SOURCE_FILE_ARGUMENTS: [&str; 1] = ["--show-sources"];
-
-/// Calls the `llvm-dwarfdump` tool to extract debug line information
-/// from the shared object at `path`. Returns the output.
-///
-/// Provide `Some(dwarfdump_exectuable)` to override the default executable.
-pub fn debug_lines(
-    shared_object: &Path,
-    dwarfdump_executable: &Option<PathBuf>,
-) -> anyhow::Result<String> {
-    dwarfdump(shared_object, dwarfdump_executable, &DEBUG_LINES_ARGUMENTS)
-}
-
-/// Calls the `llvm-dwarfdump` tool to extract the source file name.
-/// Returns the source file path.
-///
-/// Provide `Some(dwarfdump_exectuable)` to override the default executable.
-pub fn source_file(
-    shared_object: &Path,
-    dwarfdump_executable: &Option<PathBuf>,
-) -> anyhow::Result<PathBuf> {
-    let output = dwarfdump(shared_object, dwarfdump_executable, &SOURCE_FILE_ARGUMENTS)?;
-    let output = output.trim();
-
-    if output.is_empty() {
-        anyhow::bail!(
-            "the shared object at path `{}` doesn't contain the source file name. Hint: compile with debug information (-g)?",
-            shared_object.display()
-        );
-    }
-
-    Ok(output.into())
-}
-
-/// The internal `llvm-dwarfdump` helper function.
-fn dwarfdump(
-    shared_object: &Path,
-    dwarfdump_executable: &Option<PathBuf>,
-    arguments: &[&str],
-) -> anyhow::Result<String> {
-    let executable = dwarfdump_executable
-        .to_owned()
-        .unwrap_or_else(|| PathBuf::from(EXECUTABLE));
-
-    let output = Command::new(executable)
-        .args(arguments)
-        .arg(shared_object)
-        .stdin(Stdio::null())
-        .stdout(Stdio::piped())
-        .stderr(Stdio::piped())
-        .spawn()?
-        .wait_with_output()?;
-
-    if !output.status.success() {
-        anyhow::bail!(String::from_utf8_lossy(&output.stderr).to_string());
-    }
-
-    Ok(String::from_utf8_lossy(&output.stdout).to_string())
-}
@@ -1,222 +0,0 @@
-//! The core dwarf dump analyzer library.
-
-use std::{
-    collections::HashMap,
-    path::{Path, PathBuf},
-};
-
-use revive_yul::lexer::token::location::Location;
-
-use crate::location_mapper::{self, LocationMapper};
-
-/// The dwarf dump analyzer.
-///
-/// Loads debug information from `llvm-dwarfdump` and calculates statistics
-/// about the compiled YUL statements:
-/// - Statements count
-/// - Per-statement
-#[derive(Debug, Default)]
-pub struct DwarfdumpAnalyzer {
-    /// The YUL source file path.
-    source: PathBuf,
-
-    /// The YUL location to statements map.
-    location_map: HashMap<Location, String>,
-
-    /// The `llvm-dwarfdump --debug-lines` output.
-    debug_lines: String,
-
-    /// The observed statements.
-    statements_count: HashMap<String, usize>,
-    /// The observed statement to instructions size.
-    statements_size: HashMap<String, u64>,
-}
-
-impl DwarfdumpAnalyzer {
-    /// The debug info analyzer constructor.
-    ///
-    /// `source` is the path to the YUL source file.
-    /// `debug_lines` is the `llvm-dwarfdump --debug-lines` output.
-    pub fn new(source: &Path, debug_lines: String) -> Self {
-        Self {
-            source: source.to_path_buf(),
-            debug_lines,
-            ..Default::default()
-        }
-    }
-
-    /// Run the analysis.
-    pub fn analyze(&mut self) -> anyhow::Result<()> {
-        self.map_locations()?;
-        self.analyze_statements()?;
-        Ok(())
-    }
-
-    /// Populate the maps so that we can always unwrap later.
-    fn map_locations(&mut self) -> anyhow::Result<()> {
-        self.location_map = LocationMapper::map_locations(&self.source)?;
-
-        self.statements_count = HashMap::with_capacity(self.location_map.len());
-        self.statements_size = HashMap::with_capacity(self.location_map.len());
-
-        for statement in self.location_map.values() {
-            if !self.statements_size.contains_key(statement) {
-                self.statements_size.insert(statement.clone(), 0);
-            }
-
-            *self.statements_count.entry(statement.clone()).or_insert(0) += 1;
-        }
-
-        Ok(())
-    }
-
-    /// Analyze how much bytes of insturctions each statement contributes.
-    fn analyze_statements(&mut self) -> anyhow::Result<()> {
-        let mut previous_offset = 0;
-        let mut previous_location = Location::new(0, 0);
-
-        for line in self
-            .debug_lines
-            .lines()
-            .skip_while(|line| !line.starts_with("Address"))
-            .skip(2)
-        {
-            let mut parts = line.split_whitespace();
-            let (Some(offset), Some(line), Some(column)) =
-                (parts.next(), parts.next(), parts.next())
-            else {
-                continue;
-            };
-
-            let current_offset = u64::from_str_radix(offset.trim_start_matches("0x"), 16)?;
-            let mut current_location = Location::new(line.parse()?, column.parse()?);
-
-            // TODO: A bug? Needs further investigation.
-            if current_location.line == 0 && current_location.column != 0 {
-                current_location.line = previous_location.line;
-            }
-
-            if let Some(statement) = self.location_map.get(&previous_location) {
-                let contribution = current_offset - previous_offset;
-                *self.statements_size.get_mut(statement).unwrap() += contribution;
-            }
-
-            previous_offset = current_offset;
-            previous_location = current_location;
-        }
-
-        Ok(())
-    }
-
-    /// Print the per-statement count break-down.
-    pub fn display_statement_count(&self) {
-        println!("statements count:");
-        for (statement, count) in self.statements_count.iter() {
-            println!("\t{statement} {count}");
-        }
-    }
-
-    /// Print the per-statement byte size contribution break-down.
-    pub fn display_statement_size(&self) {
-        println!("bytes per statement:");
-        for (statement, size) in self.statements_size.iter() {
-            println!("\t{statement} {size}");
-        }
-    }
-
-    /// Print the estimated `yul-phaser` cost parameters.
-    pub fn display_phaser_costs(&self, yul_phaser_scale: u64) {
-        println!("yul-phaser parameters:");
-        for (parameter, cost) in self.phaser_costs(yul_phaser_scale) {
-            println!("\t{parameter} {cost}");
-        }
-    }
-
-    /// Estimate the `yul-phaser` costs using the simplified weight function:
-    /// `Total size / toal count = cost`
-    pub fn phaser_costs(&self, yul_phaser_scale: u64) -> Vec<(String, u64)> {
-        let mut costs: HashMap<String, (usize, u64)> = HashMap::with_capacity(16);
-        for (statement, count) in self
-            .statements_count
-            .iter()
-            .filter(|(_, count)| **count > 0)
-        {
-            let size = self.statements_size.get(statement).unwrap();
-            let cost = match statement.as_str() {
-                location_mapper::FOR => "--for-loop-cost",
-                location_mapper::OTHER => continue,
-                location_mapper::INTERNAL => continue,
-                location_mapper::BLOCK => "--block-cost",
-                location_mapper::FUNCTION_CALL => "--function-call-cost",
-                location_mapper::IF => "--if-cost",
-                location_mapper::SWITCH => "--switch-cost",
-                location_mapper::DECLARATION => "--variable-declaration-cost",
-                location_mapper::ASSIGNMENT => "--assignment-cost",
-                location_mapper::FUNCTION_DEFINITION => "--function-definition-cost",
-                location_mapper::IDENTIFIER => "--identifier-cost",
-                location_mapper::LITERAL => "--literal-cost",
-                _ => "--expression-statement-cost",
-            };
-
-            let entry = costs.entry(cost.to_string()).or_default();
-            entry.0 += count;
-            entry.1 += size;
-        }
-
-        let costs = costs
-            .iter()
-            .map(|(cost, (count, size))| {
-                let ratio = *size / *count as u64;
-                (cost.to_string(), ratio.min(100))
-            })
-            .collect::<Vec<_>>();
-
-        let scaled_costs = scale_to(
-            costs
-                .iter()
-                .map(|(_, ratio)| *ratio)
-                .collect::<Vec<_>>()
-                .as_slice(),
-            yul_phaser_scale,
-        );
-
-        costs
-            .iter()
-            .zip(scaled_costs)
-            .map(|((cost, _), scaled_ratio)| (cost.to_string(), scaled_ratio))
-            .collect()
-    }
-}
-
-/// Given a slice of u64 values, returns a Vec<u64> where each element
-/// is linearly scaled into the closed interval [1, 10].
-fn scale_to(data: &[u64], scale_max: u64) -> Vec<u64> {
-    if data.is_empty() {
-        return Vec::new();
-    }
-
-    let mut min = data[0];
-    let mut max = data[0];
-    for &x in &data[1..] {
-        if x < min {
-            min = x;
-        }
-        if x > max {
-            max = x;
-        }
-    }
-    if max < scale_max {
-        return data.to_vec();
-    }
-
-    let range = max - min;
-    data.iter()
-        .map(|&x| {
-            if range == 0 {
-                1
-            } else {
-                1 + (x - min) * scale_max / range
-            }
-        })
-        .collect()
-}
@@ -1,6 +0,0 @@
-//! The revive explorer leverages debug info to get insights into emitted code.
-
-pub mod dwarfdump;
-pub mod dwarfdump_analyzer;
-pub mod location_mapper;
-pub mod yul_phaser;
@@ -1,123 +0,0 @@
-//! The location mapper utility maps YUL source locations to AST statements.
-
-use std::{collections::HashMap, path::Path};
-
-use revive_yul::{
-    lexer::{token::location::Location, Lexer},
-    parser::{
-        identifier::Identifier,
-        statement::{
-            assignment::Assignment,
-            block::Block,
-            expression::{function_call::FunctionCall, literal::Literal},
-            for_loop::ForLoop,
-            function_definition::FunctionDefinition,
-            if_conditional::IfConditional,
-            object::Object,
-            switch::Switch,
-            variable_declaration::VariableDeclaration,
-        },
-    },
-    visitor::{AstNode, AstVisitor},
-};
-
-/// Code attributed to an unknown location.
-pub const OTHER: &str = "other";
-/// Code attributed to a compiler internal location.
-pub const INTERNAL: &str = "internal";
-/// Code attributed to a block.
-pub const BLOCK: &str = "block";
-/// Code attributed to a function call.
-pub const FUNCTION_CALL: &str = "function_call";
-/// Code attributed to a for loop.
-pub const FOR: &str = "for";
-/// Code attributed to an if statement.
-pub const IF: &str = "if";
-/// Code attributed to a switch statement.
-pub const SWITCH: &str = "switch";
-/// Code attributed to a variable declaration.
-pub const DECLARATION: &str = "let";
-/// Code attributed to a variable assignement.
-pub const ASSIGNMENT: &str = "assignment";
-/// Code attributed to a function definition.
-pub const FUNCTION_DEFINITION: &str = "function_definition";
-/// Code attributed to an identifier.
-pub const IDENTIFIER: &str = "identifier";
-/// Code attributed to a literal.
-pub const LITERAL: &str = "literal";
-
-/// The location to statements mapper.
-pub struct LocationMapper(HashMap<Location, String>);
-
-impl LocationMapper {
-    /// Construct a node location map from the given YUL `source` file.
-    pub fn map_locations(source: &Path) -> anyhow::Result<HashMap<Location, String>> {
-        let mut lexer = Lexer::new(std::fs::read_to_string(source)?);
-        let ast = Object::parse(&mut lexer, None).map_err(|error| {
-            anyhow::anyhow!("Contract `{}` parsing error: {:?}", source.display(), error)
-        })?;
-
-        let mut location_map = Self(Default::default());
-        ast.accept(&mut location_map);
-        location_map.0.insert(Location::new(0, 0), OTHER.into());
-        location_map.0.insert(Location::new(1, 0), INTERNAL.into());
-
-        Ok(location_map.0)
-    }
-}
-
-impl AstVisitor for LocationMapper {
-    fn visit(&mut self, node: &impl AstNode) {
-        node.visit_children(self);
-    }
-
-    fn visit_block(&mut self, node: &Block) {
-        node.visit_children(self);
-        self.0.insert(node.location, BLOCK.into());
-    }
-
-    fn visit_assignment(&mut self, node: &Assignment) {
-        node.visit_children(self);
-        self.0.insert(node.location, ASSIGNMENT.into());
-    }
-
-    fn visit_if_conditional(&mut self, node: &IfConditional) {
-        node.visit_children(self);
-        self.0.insert(node.location, IF.into());
-    }
-
-    fn visit_variable_declaration(&mut self, node: &VariableDeclaration) {
-        node.visit_children(self);
-        self.0.insert(node.location, DECLARATION.into());
-    }
-
-    fn visit_function_call(&mut self, node: &FunctionCall) {
-        node.visit_children(self);
-        self.0.insert(node.location, node.name.to_string());
-    }
-
-    fn visit_function_definition(&mut self, node: &FunctionDefinition) {
-        node.visit_children(self);
-        self.0.insert(node.location, FUNCTION_DEFINITION.into());
-    }
-
-    fn visit_identifier(&mut self, node: &Identifier) {
-        node.visit_children(self);
-        self.0.insert(node.location, IDENTIFIER.into());
-    }
-
-    fn visit_literal(&mut self, node: &Literal) {
-        node.visit_children(self);
-        self.0.insert(node.location, LITERAL.into());
-    }
-
-    fn visit_for_loop(&mut self, node: &ForLoop) {
-        node.visit_children(self);
-        self.0.insert(node.location, FOR.into());
-    }
-
-    fn visit_switch(&mut self, node: &Switch) {
-        node.visit_children(self);
-        self.0.insert(node.location, SWITCH.into());
-    }
-}
@@ -1,59 +0,0 @@
-use std::path::PathBuf;
-
-use clap::Parser;
-
-use revive_explorer::{dwarfdump, dwarfdump_analyzer::DwarfdumpAnalyzer, yul_phaser};
-
-/// The `revive-explorer` is a helper utility for exploring the compilers YUL lowering unit.
-///
-/// It analyzes a given shared objects from the debug dump and outputs:
-/// - The count of each YUL statement translated.
-/// - A per YUL statement break-down of bytecode size contributed per.
-/// - Estimated `yul-phaser` cost parameters.
-///
-/// Note: This tool might not be fully accurate, especially when the code was optimized.
-#[derive(Parser, Debug)]
-#[command(version, about, long_about = None)]
-struct Args {
-    /// Path of the dwarfdump executable.
-    #[arg(short, long)]
-    dwarfdump: Option<PathBuf>,
-
-    /// The YUL phaser cost scale maximum value.
-    #[arg(short, long, default_value_t = 10)]
-    cost_scale: u64,
-
-    /// Run the provided yul-phaser executable using the estimated costs.
-    #[arg(short, long)]
-    yul_phaser: Option<PathBuf>,
-
-    /// Path of the shared object to analyze.
-    /// It must have been compiled with debug info (-g).
-    file: PathBuf,
-}
-
-fn main() -> anyhow::Result<()> {
-    let args = Args::parse();
-
-    let source_file = dwarfdump::source_file(&args.file, &args.dwarfdump)?;
-    let debug_lines = dwarfdump::debug_lines(&args.file, &args.dwarfdump)?;
-    let mut analyzer = DwarfdumpAnalyzer::new(source_file.as_path(), debug_lines);
-
-    analyzer.analyze()?;
-
-    if let Some(path) = args.yul_phaser.as_ref() {
-        yul_phaser::run(
-            path,
-            source_file.as_path(),
-            analyzer.phaser_costs(args.cost_scale).as_slice(),
-            num_cpus::get() / 2, // TODO: should be configurable.
-        )?;
-        return Ok(());
-    }
-
-    analyzer.display_statement_count();
-    analyzer.display_statement_size();
-    analyzer.display_phaser_costs(args.cost_scale);
-
-    Ok(())
-}
@@ -1,79 +0,0 @@
-//! The revive explorer YUL phaser utility library.
-//!
-//! This can be used to invoke the `yul-phaser` utility,
-//! used to find better YUL optimizer sequences.
-
-use std::{
-    path::{Path, PathBuf},
-    process::{Command, Stdio},
-    thread,
-    time::{SystemTime, UNIX_EPOCH},
-};
-
-/// The `yul-phaser` sane default arguments:
-/// - Less verbose output.
-/// - Sufficient rounds.
-/// - Sufficient random population start.
-const ARGUMENTS: [&str; 6] = [
-    "--hide-round",
-    "--rounds",
-    "1000",
-    "--random-population",
-    "100",
-    "--show-only-top-chromosome",
-];
-
-/// Run multiple YUL phaser executables in parallel.
-pub fn run(
-    executable: &Path,
-    source: &Path,
-    costs: &[(String, u64)],
-    n_threads: usize,
-) -> anyhow::Result<()> {
-    let mut handles = Vec::with_capacity(n_threads);
-
-    for n in 0..n_threads {
-        let executable = executable.to_path_buf();
-        let source = source.to_path_buf();
-        let costs = costs.to_vec();
-
-        handles.push(thread::spawn(move || {
-            spawn_process(executable, source, costs, n)
-        }));
-    }
-
-    for handle in handles {
-        let _ = handle.join();
-    }
-
-    Ok(())
-}
-
-/// The `yul-phaser` process spawning helper function.
-fn spawn_process(
-    executable: PathBuf,
-    source: PathBuf,
-    costs: Vec<(String, u64)>,
-    seed: usize,
-) -> anyhow::Result<()> {
-    let cost_parameters = costs
-        .iter()
-        .flat_map(|(parameter, cost)| vec![parameter.clone(), cost.to_string()]);
-
-    let secs = SystemTime::now()
-        .duration_since(UNIX_EPOCH)
-        .expect("Time went backwards")
-        .as_secs();
-
-    Command::new(executable)
-        .args(cost_parameters)
-        .args(ARGUMENTS)
-        .arg("--seed")
-        .arg((seed + secs as usize).to_string())
-        .arg(source)
-        .stdin(Stdio::null())
-        .spawn()?
-        .wait()?;
-
-    Ok(())
-}
@@ -1,6 +1,6 @@
 [package]
 name = "revive-integration"
-version = "0.1.1"
+version.workspace = true
 license.workspace = true
 edition.workspace = true
 repository.workspace = true
@@ -1,10 +1,10 @@
 {
-  "Baseline": 960,
-  "Computation": 2367,
-  "DivisionArithmetics": 9108,
-  "ERC20": 17655,
-  "Events": 1680,
-  "FibonacciIterative": 1536,
-  "Flipper": 2137,
-  "SHA1": 8299
+  "Baseline": 939,
+  "Computation": 2282,
+  "DivisionArithmetics": 8849,
+  "ERC20": 18308,
+  "Events": 1640,
+  "FibonacciIterative": 1497,
+  "Flipper": 2099,
+  "SHA1": 8243
 }
@@ -1,49 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity ^0.8;
-
-/* runner.json
-{
-    "differential": true,
-    "actions": [
-        {
-            "Instantiate": {
-                "code": {
-                    "Solidity": {
-                        "contract": "SAR"
-                    }
-                }
-            }
-        }
-    ]
-}
-*/
-
-contract SAR {
-  constructor() payable {
-    assert(sar(0x03, 0x01) == 0x01);
-    assert(
-      sar(
-        0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff,
-        0x01
-      ) == 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-    );
-    assert(
-      sar(
-        0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff,
-        0xff
-      ) == 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-    );
-    assert(
-      sar(
-        0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff,
-        0x100
-      ) == 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-    );
-  }
-
-  function sar(uint256 a, uint256 b) public pure returns (uint256 c) {
-    assembly {
-      c := sar(b, a)
-    }
-  }
-}
@@ -60,7 +60,6 @@ test_spec!(mload, "MLoad", "MLoad.sol");
 test_spec!(delegate_no_contract, "DelegateCaller", "DelegateCaller.sol");
 test_spec!(function_type, "FunctionType", "FunctionType.sol");
 test_spec!(layout_at, "LayoutAt", "LayoutAt.sol");
-test_spec!(shift_arithmetic_right, "SAR", "SAR.sol");

 fn instantiate(path: &str, contract: &str) -> Vec<SpecsAction> {
    vec![Instantiate {
@@ -6,7 +6,7 @@ authors = [
    "Anton Baliasnikov <aba@matterlabs.dev>",
    "Cyrill Leutwiler <cyrill@parity.io>",
 ]
-version = "0.2.0"
+version.workspace = true
 license.workspace = true
 edition.workspace = true
 repository.workspace = true
@@ -59,7 +59,7 @@ Obtain a compatible build for your host platform from the release section of thi

   * Install the builder using `cargo`:
      ```shell
-      cargo install --force --locked --path crates/llvm-builder
+      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`.
@@ -88,12 +88,7 @@ Obtain a compatible build for your host platform from the release section of thi

      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`:
-
-      ```shell
-      export LLVM_SYS_181_PREFIX=${PWD}/target-llvm/gnu/target-final
-      ```
-
+      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>
@@ -22,7 +22,7 @@ impl std::str::FromStr for BuildType {
            "Release" => Ok(Self::Release),
            "RelWithDebInfo" => Ok(Self::RelWithDebInfo),
            "MinSizeRel" => Ok(Self::MinSizeRel),
-            value => Err(format!("Unsupported build type: `{value}`")),
+            value => Err(format!("Unsupported build type: `{}`", value)),
        }
    }
 }
@@ -16,7 +16,7 @@ impl std::str::FromStr for CcacheVariant {
        match value {
            "ccache" => Ok(Self::Ccache),
            "sccache" => Ok(Self::Sccache),
-            value => Err(format!("Unsupported ccache variant: `{value}`")),
+            value => Err(format!("Unsupported ccache variant: `{}`", value)),
        }
    }
 }
@@ -127,22 +127,23 @@ pub fn build(
    sanitizer: Option<sanitizer::Sanitizer>,
    enable_valgrind: bool,
 ) -> anyhow::Result<()> {
-    log::trace!("build type: {build_type:?}");
-    log::trace!("target env: {target_env:?}");
-    log::trace!("targets: {targets:?}");
-    log::trace!("llvm projects: {llvm_projects:?}");
-    log::trace!("enable rtti: {enable_rtti:?}");
-    log::trace!("default target: {default_target:?}");
-    log::trace!("eneable tests: {enable_tests:?}");
-    log::trace!("enable_coverage: {enable_coverage:?}");
-    log::trace!("extra args: {extra_args:?}");
-    log::trace!("sanitzer: {sanitizer:?}");
-    log::trace!("enable valgrind: {enable_valgrind:?}");
+    log::trace!("build type: {:?}", build_type);
+    log::trace!("target env: {:?}", target_env);
+    log::trace!("targets: {:?}", targets);
+    log::trace!("llvm projects: {:?}", llvm_projects);
+    log::trace!("enable rtti: {:?}", enable_rtti);
+    log::trace!("default target: {:?}", default_target);
+    log::trace!("eneable tests: {:?}", enable_tests);
+    log::trace!("enable_coverage: {:?}", enable_coverage);
+    log::trace!("extra args: {:?}", extra_args);
+    log::trace!("sanitzer: {:?}", sanitizer);
+    log::trace!("enable valgrind: {:?}", enable_valgrind);

    if !PathBuf::from(LLVMPath::DIRECTORY_LLVM_SOURCE).exists() {
        log::error!(
-            "LLVM project source directory {} does not exist (run `revive-llvm --target-env {target_env} clone`)",
-            LLVMPath::DIRECTORY_LLVM_SOURCE
+            "LLVM project source directory {} does not exist (run `revive-llvm --target-env {} clone`)",
+            LLVMPath::DIRECTORY_LLVM_SOURCE,
+            target_env
        )
    }

@@ -22,7 +22,7 @@ impl std::str::FromStr for LLVMProject {
            "lld" => Ok(Self::LLD),
            "lldb" => Ok(Self::LLDB),
            "mlir" => Ok(Self::MLIR),
-            value => Err(format!("Unsupported LLVM project to enable: `{value}`")),
+            value => Err(format!("Unsupported LLVM project to enable: `{}`", value)),
        }
    }
 }
@@ -30,7 +30,7 @@ impl TryFrom<&PathBuf> for Lock {
    fn try_from(path: &PathBuf) -> Result<Self, Self::Error> {
        let mut config_str = String::new();
        let mut config_file =
-            File::open(path).with_context(|| format!("Error opening {path:?} file"))?;
+            File::open(path).with_context(|| format!("Error opening {:?} file", path))?;
        config_file.read_to_string(&mut config_str)?;
        Ok(toml::from_str(&config_str)?)
    }
@@ -29,7 +29,7 @@ impl FromStr for Platform {
    fn from_str(value: &str) -> Result<Self, Self::Err> {
        match value {
            "PolkaVM" => Ok(Self::PolkaVM),
-            value => Err(format!("Unsupported platform: `{value}`")),
+            value => Err(format!("Unsupported platform: `{}`", value)),
        }
    }
 }
@@ -69,8 +69,8 @@ fn main_inner() -> anyhow::Result<()> {
                })
                .collect();

-            log::debug!("extra_args: {extra_args:#?}");
-            log::debug!("extra_args_unescaped: {extra_args_unescaped:#?}");
+            log::debug!("extra_args: {:#?}", extra_args);
+            log::debug!("extra_args_unescaped: {:#?}", extra_args_unescaped);

            if let Some(ccache_variant) = ccache_variant {
                revive_llvm_builder::utils::check_presence(ccache_variant.to_string().as_str())?;
@@ -30,7 +30,7 @@ impl std::str::FromStr for Sanitizer {
            "thread" => Ok(Self::Thread),
            "dataflow" => Ok(Self::DataFlow),
            "address;undefined" => Ok(Self::AddressUndefined),
-            value => Err(format!("Unsupported sanitizer: `{value}`")),
+            value => Err(format!("Unsupported sanitizer: `{}`", value)),
        }
    }
 }
@@ -20,7 +20,7 @@ impl std::str::FromStr for TargetEnv {
            "gnu" => Ok(Self::GNU),
            "musl" => Ok(Self::MUSL),
            "emscripten" => Ok(Self::Emscripten),
-            value => Err(format!("Unsupported target environment: `{value}`")),
+            value => Err(format!("Unsupported target environment: `{}`", value)),
        }
    }
 }
@@ -15,7 +15,7 @@ impl std::str::FromStr for TargetTriple {
    fn from_str(value: &str) -> Result<Self, Self::Err> {
        match value {
            "polkavm" => Ok(Self::PolkaVM),
-            value => Err(format!("Unsupported target triple: `{value}`")),
+            value => Err(format!("Unsupported target triple: `{}`", value)),
        }
    }
 }
@@ -92,7 +92,7 @@ pub fn unpack_tar(filename: PathBuf, path: &str) -> anyhow::Result<()> {
 pub fn download_musl(name: &str) -> anyhow::Result<()> {
    log::info!("downloading musl {name}");
    let tar_file_name = format!("{name}.tar.gz");
-    let url = format!("{MUSL_SNAPSHOTS_URL}/{tar_file_name}");
+    let url = format!("{}/{tar_file_name}", MUSL_SNAPSHOTS_URL);
    let target_path = crate::llvm_path::DIRECTORY_LLVM_TARGET
        .get()
        .unwrap()
@@ -223,6 +223,6 @@ pub fn install_emsdk() -> anyhow::Result<()> {
 /// The LLVM target directory default path.
 pub fn directory_target_llvm(target_env: crate::target_env::TargetEnv) -> PathBuf {
    crate::llvm_path::DIRECTORY_LLVM_TARGET
-        .get_or_init(|| PathBuf::from(format!("./target-llvm/{target_env}/")))
+        .get_or_init(|| PathBuf::from(format!("./target-llvm/{}/", target_env)))
        .clone()
 }
@@ -1,6 +1,6 @@
 [package]
 name = "revive-llvm-context"
-version = "0.3.0"
+version.workspace = true
 license.workspace = true
 edition.workspace = true
 repository.workspace = true
@@ -2,7 +2,6 @@

 pub mod ir_type;

-use std::path::Path;
 use std::path::PathBuf;

 use serde::Deserialize;
@@ -17,14 +16,6 @@ pub struct DebugConfig {
    pub output_directory: Option<PathBuf>,
    /// Whether debug info should be emitted.
    pub emit_debug_info: bool,
-    /// The YUL debug output file path.
-    ///
-    /// Is expected to be configured when running in YUL mode.
-    pub contract_path: Option<PathBuf>,
-    /// The YUL input file path.
-    ///
-    /// Is expected to be configured when not running in YUL mode.
-    pub yul_path: Option<PathBuf>,
 }

 impl DebugConfig {
@@ -33,41 +24,15 @@ impl DebugConfig {
        Self {
            output_directory,
            emit_debug_info,
-            contract_path: None,
-            yul_path: None,
        }
    }

-    /// Set the current YUL path.
-    pub fn set_yul_path(&mut self, yul_path: &Path) {
-        self.yul_path = yul_path.to_path_buf().into();
-    }
-
-    /// Set the current contract path.
-    pub fn set_contract_path(&mut self, contract_path: &str) {
-        self.contract_path = self.yul_source_path(contract_path);
-    }
-
-    /// Returns with the following precedence:
-    /// 1. The YUL source path if it was configured.
-    /// 2. The source YUL path from the debug output dir if it was configured.
-    /// 3. `None` if there is no debug output directory.
-    pub fn yul_source_path(&self, contract_path: &str) -> Option<PathBuf> {
-        if let Some(path) = self.yul_path.as_ref() {
-            return Some(path.clone());
-        }
-
-        self.output_directory.as_ref().map(|output_directory| {
-            let mut file_path = output_directory.to_owned();
-            let full_file_name = Self::full_file_name(contract_path, None, IRType::Yul);
-            file_path.push(full_file_name);
-            file_path
-        })
-    }
-
    /// Dumps the Yul IR.
    pub fn dump_yul(&self, contract_path: &str, code: &str) -> anyhow::Result<()> {
-        if let Some(file_path) = self.yul_source_path(contract_path) {
+        if let Some(output_directory) = self.output_directory.as_ref() {
+            let mut file_path = output_directory.to_owned();
+            let full_file_name = Self::full_file_name(contract_path, None, IRType::Yul);
+            file_path.push(full_file_name);
            std::fs::write(file_path, code)?;
        }

@@ -51,20 +51,11 @@ pub struct DebugInfo<'ctx> {

 impl<'ctx> DebugInfo<'ctx> {
    /// A shortcut constructor.
-    pub fn new(
-        module: &inkwell::module::Module<'ctx>,
-        debug_config: &crate::debug_config::DebugConfig,
-    ) -> Self {
-        let module_name = module.get_name().to_string_lossy();
-        let yul_name = debug_config
-            .contract_path
-            .as_ref()
-            .map(|path| path.display().to_string());
-
+    pub fn new(module: &inkwell::module::Module<'ctx>) -> Self {
        let (builder, compile_unit) = module.create_debug_info_builder(
            true,
            inkwell::debug_info::DWARFSourceLanguage::C,
-            yul_name.as_deref().unwrap_or_else(|| module_name.as_ref()),
+            module.get_name().to_string_lossy().as_ref(),
            "",
            "",
            false,
@@ -48,7 +48,6 @@ where
            function_type,
            0,
            Some(inkwell::module::Linkage::External),
-            None,
        )?;

        self.inner.declare(context)
@@ -75,6 +74,7 @@ where
        }

        context.set_basic_block(context.current_function().borrow().return_block());
+        context.set_debug_location(0, 0, None)?;
        context.build_return(None);

        context.pop_debug_scope();
@@ -1,7 +1,6 @@
 //! The entry function.

 use inkwell::types::BasicType;
-use revive_solc_json_interface::PolkaVMDefaultHeapMemorySize;

 use crate::polkavm::context::address_space::AddressSpace;
 use crate::polkavm::context::function::runtime;
@@ -39,12 +38,9 @@ impl Entry {
            context.xlen_type().const_zero(),
        );

-        let heap_memory_type = context.byte_type().array_type(
-            context
-                .memory_config
-                .heap_size
-                .unwrap_or(PolkaVMDefaultHeapMemorySize),
-        );
+        let heap_memory_type = context
+            .byte_type()
+            .array_type(context.memory_config.heap_size);
        context.set_global(
            crate::polkavm::GLOBAL_HEAP_MEMORY,
            heap_memory_type,
@@ -145,7 +141,6 @@ where
            entry_function_type,
            0,
            Some(inkwell::module::Linkage::External),
-            None,
        )?;

        context.declare_global(
@@ -48,7 +48,6 @@ where
            function_type,
            0,
            Some(inkwell::module::Linkage::External),
-            None,
        )?;

        self.inner.declare(context)
@@ -25,8 +25,6 @@ use inkwell::debug_info::AsDIScope;
 use inkwell::debug_info::DIScope;
 use inkwell::types::BasicType;
 use inkwell::values::BasicValue;
-use revive_solc_json_interface::PolkaVMDefaultHeapMemorySize;
-use revive_solc_json_interface::PolkaVMDefaultStackMemorySize;
 use revive_solc_json_interface::SolcStandardJsonInputSettingsPolkaVMMemory;

 use crate::optimizer::settings::Settings as OptimizerSettings;
@@ -235,19 +233,13 @@ where
        Self::set_data_layout(llvm, &module);
        Self::link_stdlib_module(llvm, &module);
        Self::link_polkavm_imports(llvm, &module);
-        Self::set_polkavm_stack_size(
-            llvm,
-            &module,
-            memory_config
-                .stack_size
-                .unwrap_or(PolkaVMDefaultStackMemorySize),
-        );
+        Self::set_polkavm_stack_size(llvm, &module, memory_config.stack_size);
        Self::set_module_flags(llvm, &module);

        let intrinsics = Intrinsics::new(llvm, &module);
        let llvm_runtime = LLVMRuntime::new(llvm, &module, &optimizer);
        let debug_info = debug_config.emit_debug_info.then(|| {
-            let debug_info = DebugInfo::new(&module, &debug_config);
+            let debug_info = DebugInfo::new(&module);
            debug_info.initialize_module(llvm, &module);
            debug_info
        });
@@ -463,7 +455,6 @@ where
        r#type: inkwell::types::FunctionType<'ctx>,
        return_values_length: usize,
        linkage: Option<inkwell::module::Linkage>,
-        location: Option<(u32, u32)>,
    ) -> anyhow::Result<Rc<RefCell<Function<'ctx>>>> {
        let value = self.module().add_function(name, r#type, linkage);

@@ -479,8 +470,7 @@ where
                Some(scp) => scp,
            };
            self.push_debug_scope(func_scope.as_debug_info_scope());
-            let (line, column) = location.unwrap_or((0, 0));
-            self.set_debug_location(line, column, Some(func_scope.as_debug_info_scope()))?;
+            self.set_debug_location(0, 0, Some(func_scope.as_debug_info_scope()))?;
        }

        let entry_block = self.llvm.append_basic_block(value, "entry");
@@ -535,11 +525,7 @@ where

    /// Sets the current active function. If debug-info generation is enabled,
    /// constructs a debug-scope and pushes in on the scope-stack.
-    pub fn set_current_function(
-        &mut self,
-        name: &str,
-        location: Option<(u32, u32)>,
-    ) -> anyhow::Result<()> {
+    pub fn set_current_function(&mut self, name: &str, line: Option<u32>) -> anyhow::Result<()> {
        let function = self.functions.get(name).cloned().ok_or_else(|| {
            anyhow::anyhow!("Failed to activate an undeclared function `{}`", name)
        })?;
@@ -548,8 +534,7 @@ where
        if let Some(scope) = self.current_function().borrow().get_debug_scope() {
            self.push_debug_scope(scope);
        }
-        let (line, column) = location.unwrap_or_default();
-        self.set_debug_location(line, column, None)?;
+        self.set_debug_location(line.unwrap_or_default(), 0, None)?;

        Ok(())
    }
@@ -730,23 +715,17 @@ where
        r#type: T,
        name: &str,
    ) -> Pointer<'ctx> {
-        // TODO: Revisit. While at entry should be preferred in theory:
-        // - It has negligible code size impact on real word contracts.
-        // - Sometimes has negative impact on code size.
-        // - Messes up debug information used to analyze code size issues.
-        self.build_alloca(r#type, name)
+        let current_block = self.basic_block();
+        let entry_block = self.current_function().borrow().entry_block();

-        // let current_block = self.basic_block();
-        // let entry_block = self.current_function().borrow().entry_block();
+        match entry_block.get_first_instruction() {
+            Some(instruction) => self.builder().position_before(&instruction),
+            None => self.builder().position_at_end(entry_block),
+        }

-        // match entry_block.get_first_instruction() {
-        //     Some(instruction) => self.builder().position_before(&instruction),
-        //     None => self.builder().position_at_end(entry_block),
-        // }
-
-        // let pointer = self.build_alloca(r#type, name);
-        // self.set_basic_block(current_block);
-        // pointer
+        let pointer = self.build_alloca(r#type, name);
+        self.set_basic_block(current_block);
+        pointer
    }

    /// Builds an aligned stack allocation at the current position.
@@ -1464,11 +1443,7 @@ where
    }

    pub fn heap_size(&self) -> inkwell::values::IntValue<'ctx> {
-        self.xlen_type().const_int(
-            self.memory_config
-                .heap_size
-                .unwrap_or(PolkaVMDefaultHeapMemorySize) as u64,
-            false,
-        )
+        self.xlen_type()
+            .const_int(self.memory_config.heap_size as u64, false)
    }
 }
@@ -35,7 +35,6 @@ where
            Self::r#type(context),
            0,
            Some(inkwell::module::Linkage::External),
-            None,
        )?;

        let mut attributes = Self::ATTRIBUTES.to_vec();
@@ -9,7 +9,7 @@ use crate::polkavm::DummyDependency;
 pub fn create_context(
    llvm: &inkwell::context::Context,
    optimizer_settings: OptimizerSettings,
-) -> Context<'_, DummyDependency> {
+) -> Context<DummyDependency> {
    crate::initialize_llvm(crate::Target::PVM, "resolc", Default::default());

    let module = llvm.create_module("test");
@@ -40,7 +40,6 @@ pub fn check_attribute_null_pointer_is_invalid() {
                .fn_type(&[context.word_type().into()], false),
            1,
            Some(inkwell::module::Linkage::External),
-            None,
        )
        .expect("Failed to add function");
    assert!(!function
@@ -64,7 +63,6 @@ pub fn check_attribute_optimize_for_size_mode_3() {
                .fn_type(&[context.word_type().into()], false),
            1,
            Some(inkwell::module::Linkage::External),
-            None,
        )
        .expect("Failed to add function");
    assert!(!function
@@ -88,7 +86,6 @@ pub fn check_attribute_optimize_for_size_mode_z() {
                .fn_type(&[context.word_type().into()], false),
            1,
            Some(inkwell::module::Linkage::External),
-            None,
        )
        .expect("Failed to add function");
    assert!(function
@@ -112,7 +109,6 @@ pub fn check_attribute_min_size_mode_3() {
                .fn_type(&[context.word_type().into()], false),
            1,
            Some(inkwell::module::Linkage::External),
-            None,
        )
        .expect("Failed to add function");
    assert!(!function
@@ -136,7 +132,6 @@ pub fn check_attribute_min_size_mode_z() {
                .fn_type(&[context.word_type().into()], false),
            1,
            Some(inkwell::module::Linkage::External),
-            None,
        )
        .expect("Failed to add function");
    assert!(function
@@ -204,7 +204,7 @@ where
            &context.word_type().const_all_ones(),
            overflow_negative_block,
        ),
-        (&context.word_const(0), overflow_positive_block),
+        (&context.word_const(0), overflow_block),
    ]);
    Ok(result.as_basic_value())
 }
@@ -37,7 +37,7 @@ pub fn build_assembly_text(
    let mut disassembled_code = Vec::new();
    disassembler
        .disassemble_into(&mut disassembled_code)
-        .with_context(|| format!("Failed to disassemble contract: {contract_path}"))?;
+        .with_context(|| format!("Failed to disassemble contract: {}", contract_path))?;

    let assembly_text = String::from_utf8(disassembled_code).with_context(|| {
        format!("Failed to convert disassembled code to string for contract: {contract_path}")
@@ -1,6 +1,6 @@
 [package]
 name = "resolc"
-version = "0.3.0"
+version.workspace = true
 license.workspace = true
 edition.workspace = true
 repository.workspace = true
@@ -37,7 +37,7 @@ revive-solc-json-interface = { workspace = true, features = ["resolc"] }
 revive-yul = { workspace = true }

 [target.'cfg(target_env = "musl")'.dependencies]
-mimalloc = { version = "0.1.46", default-features = false }
+mimalloc = { version = "*", default-features = false }

 [target.'cfg(target_os = "emscripten")'.dependencies]
 libc = { workspace = true }
@@ -1,11 +1,7 @@
 fn main() {
-    match git2::Repository::open("../..") {
-        Ok(repo) => {
-            let head = repo.head().expect("should have head");
-            let commit = head.peel_to_commit().expect("should have commit");
-            let id = &commit.id().to_string()[..7];
-            println!("cargo:rustc-env=GIT_COMMIT_HASH={id}");
-        }
-        Err(_) => println!("cargo:rustc-env=GIT_COMMIT_HASH=unknown"),
-    };
+    let repo = git2::Repository::open("../..").expect("should be a repository");
+    let head = repo.head().expect("should have head");
+    let commit = head.peel_to_commit().expect("should have commit");
+    let id = &commit.id().to_string()[..7];
+    println!("cargo:rustc-env=GIT_COMMIT_HASH={id}");
 }
@@ -54,7 +54,7 @@ pub fn yul<T: Compiler>(
    solc: &mut T,
    optimizer_settings: revive_llvm_context::OptimizerSettings,
    include_metadata_hash: bool,
-    mut debug_config: revive_llvm_context::DebugConfig,
+    debug_config: revive_llvm_context::DebugConfig,
    llvm_arguments: &[String],
    memory_config: SolcStandardJsonInputSettingsPolkaVMMemory,
 ) -> anyhow::Result<Build> {
@@ -77,7 +77,6 @@ pub fn yul<T: Compiler>(
    let solc_validator = Some(&*solc);
    let project = Project::try_from_yul_path(path, solc_validator)?;

-    debug_config.set_yul_path(path);
    let build = project.compile(
        optimizer_settings,
        include_metadata_hash,
@@ -230,7 +229,7 @@ pub fn standard_json<T: Compiler>(
        revive_llvm_context::OptimizerSettings::try_from(&solc_input.settings.optimizer)?;

    let polkavm_settings = solc_input.settings.polkavm.unwrap_or_default();
-    debug_config.emit_debug_info = polkavm_settings.debug_information.unwrap_or_default();
+    debug_config.emit_debug_info = polkavm_settings.debug_information;

    let include_metadata_hash = match solc_input.settings.metadata {
        Some(ref metadata) => metadata.bytecode_hash != Some(MetadataHash::None),
@@ -266,9 +265,7 @@ pub fn standard_json<T: Compiler>(
            include_metadata_hash,
            debug_config,
            llvm_arguments,
-            polkavm_settings
-                .memory_config
-                .unwrap_or_else(SolcStandardJsonInputSettingsPolkaVMMemory::default),
+            polkavm_settings.memory_config,
        )?;
        build.write_to_standard_json(&mut solc_output, &solc_version)?;
    }
@@ -77,7 +77,7 @@ impl Contract {
        project: Project,
        optimizer_settings: revive_llvm_context::OptimizerSettings,
        include_metadata_hash: bool,
-        mut debug_config: revive_llvm_context::DebugConfig,
+        debug_config: revive_llvm_context::DebugConfig,
        llvm_arguments: &[String],
        memory_config: SolcStandardJsonInputSettingsPolkaVMMemory,
    ) -> anyhow::Result<ContractBuild> {
@@ -117,7 +117,6 @@ impl Contract {
            _ => llvm.create_module(self.path.as_str()),
        };

-        debug_config.set_contract_path(&self.path);
        let mut context = revive_llvm_context::PolkaVMContext::new(
            &llvm,
            module,
@@ -155,8 +155,8 @@ impl Project {
            .iter()
            .flat_map(|(file, names)| {
                names
-                    .keys()
-                    .map(|name| format!("{file}:{name}"))
+                    .iter()
+                    .map(|(name, _address)| format!("{file}:{name}"))
                    .collect::<HashSet<String>>()
            })
            .collect::<HashSet<String>>();
@@ -23,6 +23,10 @@ pub struct Arguments {
    #[arg(long = "supported-solc-versions")]
    pub supported_solc_versions: bool,

+    /// Print the licence and exit.
+    #[arg(long = "license")]
+    pub license: bool,
+
    /// Specify the input paths and remappings.
    /// If an argument contains a '=', it is considered a remapping.
    /// Multiple Solidity files can be passed in the default Solidity mode.
@@ -51,6 +51,14 @@ fn main_inner() -> anyhow::Result<()> {
        return Ok(());
    }

+    if arguments.license {
+        let license_mit = include_str!("../../../../LICENSE-MIT");
+        let license_apache = include_str!("../../../../LICENSE-APACHE");
+
+        writeln!(std::io::stdout(), "{}\n{}\n", license_mit, license_apache)?;
+        return Ok(());
+    }
+
    #[cfg(feature = "parallel")]
    rayon::ThreadPoolBuilder::new()
        .stack_size(RAYON_WORKER_STACK_SIZE)
@@ -142,10 +150,14 @@ fn main_inner() -> anyhow::Result<()> {
        None => true,
    };

-    let memory_config = revive_solc_json_interface::SolcStandardJsonInputSettingsPolkaVMMemory::new(
-        arguments.heap_size,
-        arguments.stack_size,
-    );
+    let mut memory_config =
+        revive_solc_json_interface::SolcStandardJsonInputSettingsPolkaVMMemory::default();
+    if let Some(heap_size) = arguments.heap_size {
+        memory_config.heap_size = heap_size
+    }
+    if let Some(stack_size) = arguments.stack_size {
+        memory_config.stack_size = stack_size
+    }

    let build = if arguments.yul {
        resolc::yul(
@@ -240,7 +252,9 @@ fn main_inner() -> anyhow::Result<()> {

                writeln!(
                    std::io::stdout(),
-                    "Contract `{path}` assembly:\n\n{assembly_text}"
+                    "Contract `{}` assembly:\n\n{}",
+                    path,
+                    assembly_text
                )?;
            }
            if arguments.output_binary {
@@ -45,6 +45,8 @@ impl Compiler for SolcCompiler {
        include_paths: Vec<String>,
        allow_paths: Option<String>,
    ) -> anyhow::Result<SolcStandardJsonOutput> {
+        let version = self.version()?.validate(&include_paths)?.default;
+
        let mut command = std::process::Command::new(self.executable.as_str());
        command.stdin(std::process::Stdio::piped());
        command.stdout(std::process::Stdio::piped());
@@ -63,7 +65,7 @@ impl Compiler for SolcCompiler {
            command.arg(allow_paths);
        }

-        input.normalize();
+        input.normalize(&version);

        let suppressed_warnings = input.suppressed_warnings.take().unwrap_or_default();

@@ -40,7 +40,8 @@ impl Compiler for SoljsonCompiler {
            anyhow::bail!("configuring allow paths is not supported with solJson")
        }

-        input.normalize();
+        let version = self.version()?.validate(&include_paths)?.default;
+        input.normalize(&version);

        let suppressed_warnings = input.suppressed_warnings.take().unwrap_or_default();

@@ -89,7 +89,7 @@ pub fn build_solidity_with_options(
        sources.clone(),
        libraries.clone(),
        remappings,
-        SolcStandardJsonInputSettingsSelection::new_required_for_tests(),
+        SolcStandardJsonInputSettingsSelection::new_required(),
        SolcStandardJsonInputSettingsOptimizer::new(
            solc_optimizer_enabled,
            optimizer_settings.middle_end_as_string().chars().last(),
@@ -154,7 +154,7 @@ pub fn build_solidity_with_options_evm(
        sources.clone(),
        libraries.clone(),
        remappings,
-        SolcStandardJsonInputSettingsSelection::new_required_for_tests(),
+        SolcStandardJsonInputSettingsSelection::new_required(),
        SolcStandardJsonInputSettingsOptimizer::new(
            solc_optimizer_enabled,
            None,
@@ -211,7 +211,7 @@ pub fn build_solidity_and_detect_missing_libraries(
        sources.clone(),
        libraries.clone(),
        None,
-        SolcStandardJsonInputSettingsSelection::new_required_for_tests(),
+        SolcStandardJsonInputSettingsSelection::new_required(),
        SolcStandardJsonInputSettingsOptimizer::new(true, None, &solc_version.default, false),
        None,
        None,
@@ -285,7 +285,7 @@ pub fn check_solidity_warning(
        sources.clone(),
        libraries,
        None,
-        SolcStandardJsonInputSettingsSelection::new_required_for_tests(),
+        SolcStandardJsonInputSettingsSelection::new_required(),
        SolcStandardJsonInputSettingsOptimizer::new(true, None, &solc_version.default, false),
        None,
        suppressed_warnings,
@@ -361,7 +361,7 @@ fn compile_evm(
    .expect("source should compile");
    let object = &contracts
        .get(contract_name)
-        .unwrap_or_else(|| panic!("contract '{contract_name}' didn't produce bin-runtime"));
+        .unwrap_or_else(|| panic!("contract '{}' didn't produce bin-runtime", contract_name));
    let code = if runtime {
        object.1.object.as_str()
    } else {
@@ -0,0 +1,4 @@
+module.exports = {
+  preset: "ts-jest",
+  testEnvironment: "node",
+};
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuites name="jest tests" tests="27" failures="0" errors="0" time="2.146">
+  <testsuite name="Run with --yul by default" errors="0" failures="0" skipped="1" timestamp="2024-10-24T17:08:50" time="1.508" tests="6">
+    <testcase classname="Run with --yul by default Valid command exit code = 0" name="Run with --yul by default Valid command exit code = 0" time="0.003">
+    </testcase>
+    <testcase classname="Run with --yul by default --yul output is presented" name="Run with --yul by default --yul output is presented" time="0">
+    </testcase>
+    <testcase classname="Run with --yul by default solc exit code == resolc exit code" name="Run with --yul by default solc exit code == resolc exit code" time="0">
+      <skipped/>
+    </testcase>
+    <testcase classname="Run with --yul by default run invalid: resolc --yul" name="Run with --yul by default run invalid: resolc --yul" time="0.001">
+    </testcase>
+    <testcase classname="Run with --yul by default Invalid command exit code = 1" name="Run with --yul by default Invalid command exit code = 1" time="0">
+    </testcase>
+    <testcase classname="Run with --yul by default Invalid solc exit code == Invalid resolc exit code" name="Run with --yul by default Invalid solc exit code == Invalid resolc exit code" time="0.041">
+    </testcase>
+  </testsuite>
+  <testsuite name="Run with --asm by default" errors="0" failures="0" skipped="0" timestamp="2024-10-24T17:08:50" time="1.512" tests="6">
+    <testcase classname="Run with --asm by default Valid command exit code = 0" name="Run with --asm by default Valid command exit code = 0" time="0.002">
+    </testcase>
+    <testcase classname="Run with --asm by default --asm output is presented" name="Run with --asm by default --asm output is presented" time="0.001">
+    </testcase>
+    <testcase classname="Run with --asm by default solc exit code == resolc exit code" name="Run with --asm by default solc exit code == resolc exit code" time="0.044">
+    </testcase>
+    <testcase classname="Run with --asm by default run invalid: resolc --asm" name="Run with --asm by default run invalid: resolc --asm" time="0">
+    </testcase>
+    <testcase classname="Run with --asm by default Invalid command exit code = 1" name="Run with --asm by default Invalid command exit code = 1" time="0.001">
+    </testcase>
+    <testcase classname="Run with --asm by default Invalid solc exit code == Invalid resolc exit code" name="Run with --asm by default Invalid solc exit code == Invalid resolc exit code" time="0.04">
+    </testcase>
+  </testsuite>
+  <testsuite name="Run resolc without any options" errors="0" failures="0" skipped="2" timestamp="2024-10-24T17:08:50" time="2.016" tests="15">
+    <testcase classname="Run resolc without any options Info with help is presented" name="Run resolc without any options Info with help is presented" time="0.002">
+    </testcase>
+    <testcase classname="Run resolc without any options Exit code = 1" name="Run resolc without any options Exit code = 1" time="0">
+    </testcase>
+    <testcase classname="Run resolc without any options solc exit code == resolc exit code" name="Run resolc without any options solc exit code == resolc exit code" time="0.044">
+    </testcase>
+    <testcase classname="Default run a command from the help Compiler run successful" name="Default run a command from the help Compiler run successful" time="0">
+    </testcase>
+    <testcase classname="Default run a command from the help Exit code = 0" name="Default run a command from the help Exit code = 0" time="0.001">
+    </testcase>
+    <testcase classname="Default run a command from the help Output dir is created" name="Default run a command from the help Output dir is created" time="0">
+    </testcase>
+    <testcase classname="Default run a command from the help Output file is created" name="Default run a command from the help Output file is created" time="0">
+      <skipped/>
+    </testcase>
+    <testcase classname="Default run a command from the help the output file is not empty" name="Default run a command from the help the output file is not empty" time="0">
+    </testcase>
+    <testcase classname="Default run a command from the help No &apos;Error&apos;/&apos;Warning&apos;/&apos;Fail&apos; in the output" name="Default run a command from the help No &apos;Error&apos;/&apos;Warning&apos;/&apos;Fail&apos; in the output" time="0">
+    </testcase>
+    <testcase classname="Default run a command from the help Compiler run successful" name="Default run a command from the help Compiler run successful" time="0.001">
+    </testcase>
+    <testcase classname="Default run a command from the help Exit code = 0" name="Default run a command from the help Exit code = 0" time="0">
+    </testcase>
+    <testcase classname="Default run a command from the help Output dir is created" name="Default run a command from the help Output dir is created" time="0">
+    </testcase>
+    <testcase classname="Default run a command from the help Output files are created" name="Default run a command from the help Output files are created" time="0">
+      <skipped/>
+    </testcase>
+    <testcase classname="Default run a command from the help the output files are not empty" name="Default run a command from the help the output files are not empty" time="0.003">
+    </testcase>
+    <testcase classname="Default run a command from the help No &apos;Error&apos;/&apos;Warning&apos;/&apos;Fail&apos; in the output" name="Default run a command from the help No &apos;Error&apos;/&apos;Warning&apos;/&apos;Fail&apos; in the output" time="0">
+    </testcase>
+  </testsuite>
+</testsuites>
@@ -0,0 +1,26 @@
+{
+  "name": "cli-tests",
+  "version": "1.0.0",
+  "title": "resolc CLI Tests",
+  "description": "Auto tests for verifying resolc CLI",
+  "repository": "https://github.com/paritytech/revive",
+  "main": "index.js",
+  "private": true,
+  "scripts": {
+    "test": "npx jest --verbose --testPathPattern="
+  },
+  "keywords": [],
+  "author": "Matter Labs",
+  "contributors": [
+    "cyrill@parity.io"
+  ],
+  "license": "MIT",
+  "devDependencies": {
+    "@types/jest": "^29.5.14",
+    "@types/shelljs": "^0.8.15",
+    "jest": "^29.7.0",
+    "shelljs": "^0.8.5",
+    "ts-jest": "^29.2.5",
+    "typescript": "^5.7.3"
+  }
+}
@@ -0,0 +1,47 @@
+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
+)
+
+export const paths = {
+  outputDir: outputDir,
+  binExtension: binExtension,
+  asmExtension: asmExtension,
+  llvmExtension: llvmExtension,
+  contractSolFilename: contractSolFilename,
+  contractYulFilename: contractYulFilename,
+  contractOptimizedLLVMFilename: contractOptimizedLLVMFilename,
+  contractUnoptimizedLLVMFilename: contractUnoptimizedLLVMFilename,
+  pathToOutputDir: pathToOutputDir,
+  pathToContracts: pathToContracts,
+  pathToBasicSolContract: pathToBasicSolContract,
+  pathToBasicYulContract: pathToBasicYulContract,
+  pathToSolBinOutputFile: pathToSolBinOutputFile,
+  pathToSolAsmOutputFile: pathToSolAsmOutputFile,
+}
@@ -0,0 +1,51 @@
+import * as shell from 'shelljs'
+import * as fs from 'fs'
+import { spawnSync } from 'child_process'
+
+interface CommandResult {
+  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,
+    })
+
+    return {
+      exitCode: process.status || 0,
+      output: (process.stdout || process.stderr || '').toString(),
+    }
+  }
+
+  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)
+}
+
+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
+  }
+}
@@ -0,0 +1,44 @@
+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 resultInvalid = executeCommand(commandInvalid)
+
+  it('Valid command exit code = 0', () => {
+    expect(result.exitCode).toBe(0)
+  })
+
+  it('--asm output is presented', () => {
+    const expectedPatterns = [/(deploy)/i, /(call)/i, /(seal_return)/i]
+
+    for (const pattern of expectedPatterns) {
+      expect(result.output).toMatch(pattern)
+    }
+  })
+
+  it('solc exit code == resolc exit code', () => {
+    const command = `solc ${paths.pathToBasicSolContract} --asm`
+    const solcResult = executeCommand(command)
+    expect(solcResult.exitCode).toBe(result.exitCode)
+  })
+
+  it('run invalid: resolc --asm', () => {
+    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 solcResult = executeCommand(command)
+    expect(solcResult.exitCode).toBe(resultInvalid.exitCode)
+  })
+})
@@ -0,0 +1,241 @@
+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)
+
+  it('Info with help is presented', () => {
+    expect(result.output).toMatch(/(Usage: resolc)/i)
+  })
+
+  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)
+  })
+})
+
+//#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)
+  })
+})
+
+//#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)
+  })
+})
+
+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`;
+
+  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)
+    })
+  }
+})
+
+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`;
+
+  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)
+    })
+  }
+})
+
+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 }
+
+    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([])
+    })
+  })
+})
@@ -0,0 +1,39 @@
+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 resultInvalid = executeCommand(commandInvalid)
+
+  it('Valid command exit code = 0', () => {
+    expect(result.exitCode).toBe(0)
+  })
+
+  it('--yul output is presented', () => {
+    expect(result.output).toMatch(/(Compiler run successful)/i)
+    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)
+  })
+
+  it('run invalid: resolc --yul', () => {
+    expect(resultInvalid.output).toMatch(/(The input file is missing)/i)
+  })
+  it('Invalid command exit code = 1', () => {
+    expect(resultInvalid.exitCode).toBe(1)
+  })
+
+  it('Invalid solc exit code == Invalid resolc exit code', () => {
+    const command = 'solc --yul'
+    const solcResult = executeCommand(command)
+    expect(solcResult.exitCode).toBe(resultInvalid.exitCode)
+  })
+})
@@ -0,0 +1,7 @@
+{
+  "compilerOptions": {
+    "target": "ES6",
+    "module": "CommonJS",
+    "outDir": "./dist",
+  }
+}
@@ -1,40 +0,0 @@
-//! The tests for running resolc with asm option.
-
-#![cfg(test)]
-
-use crate::tests::cli::utils;
-
-const ASM_OPTION: &str = "--asm";
-
-#[test]
-fn runs_with_valid_input_file() {
-    let arguments = &[utils::SOLIDITY_CONTRACT_PATH, ASM_OPTION];
-    let resolc_result = utils::execute_resolc(arguments);
-    utils::assert_command_success(&resolc_result, "Providing a valid input file");
-
-    for pattern in &["deploy", "call", "seal_return"] {
-        assert!(
-            resolc_result.stdout.contains(pattern),
-            "Expected the output to contain `{pattern}`."
-        );
-    }
-
-    let solc_result = utils::execute_solc(arguments);
-    utils::assert_equal_exit_codes(&solc_result, &resolc_result);
-}
-
-#[test]
-fn fails_without_input_file() {
-    let arguments = &[ASM_OPTION];
-    let resolc_result = utils::execute_resolc(arguments);
-    utils::assert_command_failure(&resolc_result, "Omitting an input file");
-
-    let output = resolc_result.stderr.to_lowercase();
-    assert!(
-        output.contains("no input sources specified") || output.contains("compilation aborted"),
-        "Expected the output to contain a specific error message."
-    );
-
-    let solc_result = utils::execute_solc(arguments);
-    utils::assert_equal_exit_codes(&solc_result, &resolc_result);
-}
@@ -1,137 +0,0 @@
-//! The tests for running resolc with combined JSON option.
-
-#![cfg(test)]
-
-use revive_common;
-
-use crate::tests::cli::utils;
-
-const JSON_OPTION: &str = "--combined-json";
-const JSON_ARGUMENTS: &[&str] = &[
-    "abi",
-    "hashes",
-    "metadata",
-    "devdoc",
-    "userdoc",
-    "storage-layout",
-    "ast",
-    "asm",
-    "bin",
-    "bin-runtime",
-];
-
-#[test]
-fn runs_with_valid_json_argument() {
-    for json_argument in JSON_ARGUMENTS {
-        let arguments = &[utils::SOLIDITY_CONTRACT_PATH, JSON_OPTION, json_argument];
-        let resolc_result = utils::execute_resolc(arguments);
-        assert!(
-            resolc_result.success,
-            "Providing the `{json_argument}` argument should succeed with exit code {}, got {}.\nDetails: {}",
-            revive_common::EXIT_CODE_SUCCESS,
-            resolc_result.code,
-            resolc_result.stderr
-        );
-
-        assert!(
-            resolc_result.stdout.contains("contracts"),
-            "Expected the output to contain a `contracts` field when using the `{json_argument}` argument."
-        );
-
-        let solc_result = utils::execute_solc(arguments);
-        utils::assert_equal_exit_codes(&solc_result, &resolc_result);
-    }
-}
-
-#[test]
-fn fails_with_invalid_json_argument() {
-    let arguments = &[
-        utils::SOLIDITY_CONTRACT_PATH,
-        JSON_OPTION,
-        "invalid-argument",
-    ];
-    let resolc_result = utils::execute_resolc(arguments);
-    utils::assert_command_failure(&resolc_result, "Providing an invalid json argument");
-
-    assert!(
-        resolc_result.stdout.contains("Invalid option"),
-        "Expected the output to contain a specific error message."
-    );
-
-    let solc_result = utils::execute_solc(arguments);
-    utils::assert_equal_exit_codes(&solc_result, &resolc_result);
-}
-
-#[test]
-fn fails_with_multiple_json_arguments() {
-    let arguments = &[
-        utils::SOLIDITY_CONTRACT_PATH,
-        JSON_OPTION,
-        JSON_ARGUMENTS[0],
-        JSON_ARGUMENTS[1],
-    ];
-    let resolc_result = utils::execute_resolc(arguments);
-    utils::assert_command_failure(&resolc_result, "Providing multiple json arguments");
-
-    assert!(
-        resolc_result
-            .stderr
-            .contains("reading error: No such file or directory"),
-        "Expected the output to contain a specific error message."
-    );
-
-    // FIX: Resolc exit code == 101
-    // let solc_result = utils::execute_solc(arguments);
-    // utils::assert_equal_exit_codes(&solc_result, &resolc_result);
-}
-
-#[test]
-fn fails_without_json_argument() {
-    let arguments = &[utils::SOLIDITY_CONTRACT_PATH, JSON_OPTION];
-    let resolc_result = utils::execute_resolc(arguments);
-    utils::assert_command_failure(&resolc_result, "Omitting a JSON argument");
-
-    assert!(
-        resolc_result.stderr.contains(
-            "a value is required for '--combined-json <COMBINED_JSON>' but none was supplied"
-        ),
-        "Expected the output to contain a specific error message."
-    );
-
-    let solc_result = utils::execute_solc(arguments);
-    utils::assert_equal_exit_codes(&solc_result, &resolc_result);
-}
-
-#[test]
-fn fails_without_solidity_input_file() {
-    let arguments = &[JSON_OPTION, JSON_ARGUMENTS[0]];
-    let resolc_result = utils::execute_resolc(arguments);
-    utils::assert_command_failure(&resolc_result, "Omitting a Solidity input file");
-
-    assert!(
-        resolc_result.stderr.contains("No input sources specified"),
-        "Expected the output to contain a specific error message."
-    );
-
-    let solc_result = utils::execute_solc(arguments);
-    utils::assert_equal_exit_codes(&solc_result, &resolc_result);
-}
-
-#[test]
-fn fails_with_yul_input_file() {
-    for json_argument in JSON_ARGUMENTS {
-        let arguments = &[utils::YUL_CONTRACT_PATH, JSON_OPTION, json_argument];
-        let resolc_result = utils::execute_resolc(arguments);
-        utils::assert_command_failure(&resolc_result, "Providing a Yul input file");
-
-        assert!(
-            resolc_result
-                .stderr
-                .contains("ParserError: Expected identifier"),
-            "Expected the output to contain a specific error message."
-        );
-
-        let solc_result = utils::execute_solc(arguments);
-        utils::assert_equal_exit_codes(&solc_result, &resolc_result);
-    }
-}
@@ -1,22 +0,0 @@
-object "Test" {
-        code {
-        function allocate(size) -> ptr {
-            ptr := mload(0x40)
-            if iszero(ptr) { ptr := 0x60 }
-            mstore(0x40, add(ptr, size))
-        }
-        let size := datasize("Test_deployed")
-        let offset := allocate(size)
-        datacopy(offset, dataoffset("Test_deployed"), size)
-        return(offset, size)
-    }
-    object "Test_deployed" {
-        code {
-{
-        let test:=0x5
-        mstore(2,signextend(0x8,0x0))
-        mstore(8,lt(0xc,test))
-}
-
-    return(0, 65536)
-}}}
@@ -1,12 +0,0 @@
-//! The CLI tests.
-
-#![cfg(test)]
-
-mod asm;
-mod combined_json;
-mod optimization;
-mod output_dir;
-mod standard_json;
-mod usage;
-mod utils;
-mod yul;
@@ -1,53 +0,0 @@
-//! The tests for running resolc with explicit optimization.
-
-#![cfg(test)]
-
-use revive_common;
-
-use crate::tests::cli::{utils, yul};
-
-const LEVELS: &[char] = &['0', '1', '2', '3', 's', 'z'];
-
-#[test]
-fn runs_with_valid_level() {
-    for level in LEVELS {
-        let optimization_argument = format!("-O{level}");
-        let arguments = &[
-            utils::YUL_MEMSET_CONTRACT_PATH,
-            yul::YUL_OPTION,
-            &optimization_argument,
-        ];
-        let resolc_result = utils::execute_resolc(arguments);
-        assert!(
-            resolc_result.success,
-            "Providing the level `{optimization_argument}` should succeed with exit code {}, got {}.\nDetails: {}",
-            revive_common::EXIT_CODE_SUCCESS,
-            resolc_result.code,
-            resolc_result.stderr
-        );
-
-        assert!(
-            resolc_result
-                .stderr
-                .contains("Compiler run successful. No output requested"),
-            "Expected the output to contain a success message when providing the level `{optimization_argument}`."
-        );
-    }
-}
-
-#[test]
-fn fails_with_invalid_level() {
-    let arguments = &[utils::YUL_MEMSET_CONTRACT_PATH, yul::YUL_OPTION, "-O9"];
-    let resolc_result = utils::execute_resolc(arguments);
-    utils::assert_command_failure(&resolc_result, "Providing an invalid optimization level");
-
-    assert!(
-        resolc_result
-            .stderr
-            .contains("Unexpected optimization option"),
-        "Expected the output to contain a specific error message."
-    );
-
-    let solc_result = utils::execute_solc(arguments);
-    utils::assert_equal_exit_codes(&solc_result, &resolc_result);
-}
@@ -1,122 +0,0 @@
-//! The tests for running resolc with output directory option.
-
-#![cfg(test)]
-
-use std::path::Path;
-
-use crate::tests::cli::utils;
-
-const OUTPUT_DIRECTORY: &str = "src/tests/cli/artifacts";
-const OUTPUT_BIN_FILE_PATH: &str = "src/tests/cli/artifacts/contract.sol:C.pvm";
-const OUTPUT_ASM_FILE_PATH: &str = "src/tests/cli/artifacts/contract.sol:C.pvmasm";
-const OUTPUT_LLVM_OPTIMIZED_FILE_PATH: &str =
-    "src/tests/cli/artifacts/src_tests_cli_contracts_solidity_contract.sol.C.optimized.ll";
-const OUTPUT_LLVM_UNOPTIMIZED_FILE_PATH: &str =
-    "src/tests/cli/artifacts/src_tests_cli_contracts_solidity_contract.sol.C.unoptimized.ll";
-
-fn file_exists(path: &str) -> bool {
-    Path::new(path).try_exists().unwrap()
-}
-
-fn file_is_empty(path: &str) -> bool {
-    Path::new(path).metadata().unwrap().len() == 0
-}
-
-fn assert_valid_output_file(
-    result: &utils::CommandResult,
-    output_file_type: &str,
-    output_file_path: &str,
-) {
-    utils::assert_command_success(result, "Providing an output directory");
-
-    assert!(
-        result.stderr.contains("Compiler run successful"),
-        "Expected the compiler output to contain a success message.",
-    );
-
-    assert!(
-        file_exists(output_file_path),
-        "Expected the {output_file_type} output file `{output_file_path}` to exist."
-    );
-
-    assert!(
-        !file_is_empty(output_file_path),
-        "Expected the {output_file_type} output file `{output_file_path}` to not be empty."
-    );
-}
-
-#[test]
-fn writes_to_file() {
-    let arguments = &[
-        utils::SOLIDITY_CONTRACT_PATH,
-        "--overwrite",
-        "-O3",
-        "--bin",
-        "--asm",
-        "--output-dir",
-        OUTPUT_DIRECTORY,
-    ];
-    let result = utils::execute_resolc(arguments);
-    assert_valid_output_file(&result, "--bin", OUTPUT_BIN_FILE_PATH);
-    assert_valid_output_file(&result, "--asm", OUTPUT_ASM_FILE_PATH);
-}
-
-#[test]
-fn writes_debug_info_to_file_unoptimized() {
-    let arguments = &[
-        utils::SOLIDITY_CONTRACT_PATH,
-        "-g",
-        "--disable-solc-optimizer",
-        "--overwrite",
-        "--bin",
-        "--asm",
-        "--output-dir",
-        OUTPUT_DIRECTORY,
-    ];
-    let result = utils::execute_resolc(arguments);
-    assert_valid_output_file(&result, "--bin", OUTPUT_BIN_FILE_PATH);
-    assert_valid_output_file(&result, "--asm", OUTPUT_ASM_FILE_PATH);
-}
-
-#[test]
-fn writes_debug_info_to_file_optimized() {
-    let arguments = &[
-        utils::SOLIDITY_CONTRACT_PATH,
-        "-g",
-        "--overwrite",
-        "--bin",
-        "--asm",
-        "--output-dir",
-        OUTPUT_DIRECTORY,
-    ];
-    let result = utils::execute_resolc(arguments);
-    assert_valid_output_file(&result, "--bin", OUTPUT_BIN_FILE_PATH);
-    assert_valid_output_file(&result, "--asm", OUTPUT_ASM_FILE_PATH);
-}
-
-#[test]
-fn writes_llvm_debug_info_to_file_unoptimized() {
-    let arguments = &[
-        utils::SOLIDITY_CONTRACT_PATH,
-        "-g",
-        "--disable-solc-optimizer",
-        "--overwrite",
-        "--debug-output-dir",
-        OUTPUT_DIRECTORY,
-    ];
-    let result = utils::execute_resolc(arguments);
-    assert_valid_output_file(&result, "llvm", OUTPUT_LLVM_UNOPTIMIZED_FILE_PATH);
-}
-
-#[test]
-fn writes_llvm_debug_info_to_file_optimized() {
-    let arguments = &[
-        utils::SOLIDITY_CONTRACT_PATH,
-        "-g",
-        "--overwrite",
-        "--debug-output-dir",
-        OUTPUT_DIRECTORY,
-    ];
-    let result = utils::execute_resolc(arguments);
-    assert_valid_output_file(&result, "llvm", OUTPUT_LLVM_OPTIMIZED_FILE_PATH);
-}
@@ -1,24 +0,0 @@
-//! The tests for running resolc with standard JSON option.
-
-#![cfg(test)]
-
-use crate::tests::cli::utils;
-
-const JSON_OPTION: &str = "--standard-json";
-
-#[test]
-fn runs_with_valid_input_file() {
-    let arguments = &[JSON_OPTION];
-    let resolc_result =
-        utils::execute_resolc_with_stdin_input(arguments, utils::STANDARD_JSON_CONTRACTS_PATH);
-    utils::assert_command_success(&resolc_result, "Providing a valid input file to stdin");
-
-    assert!(
-        resolc_result.stdout.contains("contracts"),
-        "Expected the output to contain a `contracts` field."
-    );
-
-    let solc_result =
-        utils::execute_solc_with_stdin_input(arguments, utils::STANDARD_JSON_CONTRACTS_PATH);
-    utils::assert_equal_exit_codes(&solc_result, &resolc_result);
-}
@@ -1,35 +0,0 @@
-//! The tests for running resolc when expecting usage output.
-
-#![cfg(test)]
-
-use crate::tests::cli::utils;
-
-#[test]
-#[ignore = "Fix: 'resolc --help' should exit with success exit code"]
-fn shows_usage_with_help() {
-    let arguments = &["--help"];
-    let resolc_result = utils::execute_resolc(arguments);
-    utils::assert_command_success(&resolc_result, "Providing the `--help` option");
-
-    assert!(
-        resolc_result.stdout.contains("Usage: resolc"),
-        "Expected the output to contain usage information."
-    );
-
-    let solc_result = utils::execute_solc(arguments);
-    utils::assert_equal_exit_codes(&solc_result, &resolc_result);
-}
-
-#[test]
-fn fails_without_options() {
-    let resolc_result = utils::execute_resolc(&[]);
-    utils::assert_command_failure(&resolc_result, "Omitting options");
-
-    assert!(
-        resolc_result.stderr.contains("Usage: resolc"),
-        "Expected the output to contain usage information."
-    );
-
-    let solc_result = utils::execute_solc(&[]);
-    utils::assert_equal_exit_codes(&solc_result, &resolc_result);
-}
@@ -1,99 +0,0 @@
-//! Common utilities used for CLI tests.
-
-use std::{
-    fs::File,
-    process::{Command, Stdio},
-};
-
-use revive_common;
-
-use crate::SolcCompiler;
-
-pub const SOLIDITY_CONTRACT_PATH: &str = "src/tests/cli/contracts/solidity/contract.sol";
-pub const YUL_CONTRACT_PATH: &str = "src/tests/cli/contracts/yul/contract.yul";
-pub const YUL_MEMSET_CONTRACT_PATH: &str = "src/tests/cli/contracts/yul/memset.yul";
-pub const STANDARD_JSON_CONTRACTS_PATH: &str =
-    "src/tests/cli/contracts/standard_json/solidity_contracts.json";
-
-/// The result of executing a command.
-pub struct CommandResult {
-    /// The data written to `stdout`.
-    pub stdout: String,
-    /// The data written to `stderr`.
-    pub stderr: String,
-    /// Whether termination was successful.
-    pub success: bool,
-    /// The exit code of the process.
-    pub code: i32,
-}
-
-pub fn execute_resolc(arguments: &[&str]) -> CommandResult {
-    execute_command("resolc", arguments, None)
-}
-
-pub fn execute_resolc_with_stdin_input(arguments: &[&str], stdin_file_path: &str) -> CommandResult {
-    execute_command("resolc", arguments, Some(stdin_file_path))
-}
-
-pub fn execute_solc(arguments: &[&str]) -> CommandResult {
-    execute_command(SolcCompiler::DEFAULT_EXECUTABLE_NAME, arguments, None)
-}
-
-pub fn execute_solc_with_stdin_input(arguments: &[&str], stdin_file_path: &str) -> CommandResult {
-    execute_command(
-        SolcCompiler::DEFAULT_EXECUTABLE_NAME,
-        arguments,
-        Some(stdin_file_path),
-    )
-}
-
-fn execute_command(
-    command: &str,
-    arguments: &[&str],
-    stdin_file_path: Option<&str>,
-) -> CommandResult {
-    let stdin_config = match stdin_file_path {
-        Some(path) => Stdio::from(File::open(path).unwrap()),
-        None => Stdio::null(),
-    };
-    let result = Command::new(command)
-        .args(arguments)
-        .stdin(stdin_config)
-        .stdout(Stdio::piped())
-        .stderr(Stdio::piped())
-        .output()
-        .unwrap();
-
-    CommandResult {
-        stdout: String::from_utf8_lossy(&result.stdout).to_string(),
-        stderr: String::from_utf8_lossy(&result.stderr).to_string(),
-        success: result.status.success(),
-        code: result.status.code().unwrap(),
-    }
-}
-
-pub fn assert_equal_exit_codes(solc_result: &CommandResult, resolc_result: &CommandResult) {
-    assert_eq!(
-        solc_result.code, resolc_result.code,
-        "Expected solc and resolc to have the same exit code."
-    );
-}
-
-pub fn assert_command_success(result: &CommandResult, error_message_prefix: &str) {
-    assert!(
-        result.success,
-        "{error_message_prefix} should succeed with exit code {}, got {}.\nDetails: {}",
-        revive_common::EXIT_CODE_SUCCESS,
-        result.code,
-        result.stderr
-    );
-}
-
-pub fn assert_command_failure(result: &CommandResult, error_message_prefix: &str) {
-    assert!(
-        !result.success,
-        "{error_message_prefix} should fail with exit code {}, got {}.",
-        revive_common::EXIT_CODE_FAILURE,
-        result.code
-    );
-}
@@ -1,44 +0,0 @@
-//! The tests for running resolc with yul option.
-
-#![cfg(test)]
-
-use crate::tests::cli::utils;
-
-pub const YUL_OPTION: &str = "--yul";
-/// The `--yul` option was deprecated in Solidity 0.8.27 in favor of `--strict-assembly`.
-/// See section `--strict-assembly vs. --yul` in https://soliditylang.org/blog/2024/09/04/solidity-0.8.27-release-announcement/
-const SOLC_YUL_OPTION: &str = "--strict-assembly";
-
-#[test]
-fn runs_with_valid_input_file() {
-    let arguments = &[utils::YUL_CONTRACT_PATH, YUL_OPTION];
-    let resolc_result = utils::execute_resolc(arguments);
-    utils::assert_command_success(&resolc_result, "Providing a valid input file");
-
-    assert!(
-        resolc_result
-            .stderr
-            .contains("Compiler run successful. No output requested"),
-        "Expected the output to contain a success message."
-    );
-
-    let solc_arguments = &[utils::YUL_CONTRACT_PATH, SOLC_YUL_OPTION];
-    let solc_result = utils::execute_solc(solc_arguments);
-    utils::assert_equal_exit_codes(&solc_result, &resolc_result);
-}
-
-#[test]
-fn fails_without_input_file() {
-    let arguments = &[YUL_OPTION];
-    let resolc_result = utils::execute_resolc(arguments);
-    utils::assert_command_failure(&resolc_result, "Omitting an input file");
-
-    assert!(
-        resolc_result.stderr.contains("The input file is missing"),
-        "Expected the output to contain a specific error message."
-    );
-
-    let solc_arguments = &[SOLC_YUL_OPTION];
-    let solc_result = utils::execute_solc(solc_arguments);
-    utils::assert_equal_exit_codes(&solc_result, &resolc_result);
-}
@@ -0,0 +1,188 @@
+import { executeCommand } from '../src/helper'
+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`,
+  ]
+
+  //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('--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)
+    })
+  })
+
+  //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)
+    })
+  })
+
+  //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 = 0', () => {
+        expect(result.exitCode).toBe(0)
+      })
+
+      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)
+      })
+    })
+  }
+
+  //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)
+
+      it('Valid command exit code = 1', () => {
+        expect(result.exitCode).toBe(1)
+      })
+
+      it('--combined-json error is presented', () => {
+        expect(result.output).toMatch(/(Invalid option|error)/i)
+      })
+
+      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)
+
+      xit('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!
+      })
+
+      xit('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)
+
+      it('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('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)
+      })
+    })
+  }
+})
@@ -2,7 +2,6 @@

 #![cfg(test)]

-mod cli;
 mod factory_dependency;
 mod ir_artifacts;
 mod libraries;
@@ -121,10 +121,10 @@ fn optimizer() {

    assert!(
        size_when_optimized_for_cycles < size_when_unoptimized,
-        "Expected the cycles-optimized bytecode to be smaller than the unoptimized. Optimized: {size_when_optimized_for_cycles}B, Unoptimized: {size_when_unoptimized}B",
+        "Expected the cycles-optimized bytecode to be smaller than the unoptimized. Optimized: {}B, Unoptimized: {}B", size_when_optimized_for_cycles, size_when_unoptimized,
    );
    assert!(
        size_when_optimized_for_size < size_when_unoptimized,
-        "Expected the size-optimized bytecode to be smaller than the unoptimized. Optimized: {size_when_optimized_for_size}B, Unoptimized: {size_when_unoptimized}B",
+        "Expected the size-optimized bytecode to be smaller than the unoptimized. Optimized: {}B, Unoptimized: {}B", size_when_optimized_for_size, size_when_unoptimized,
    );
 }
@@ -1,11 +0,0 @@
-[package]
-name = "revive-rul-runtime-library"
-version.workspace = true
-license.workspace = true
-edition.workspace = true
-repository.workspace = true
-authors.workspace = true
-description = "revive compiler rust backend runtime library"
-
-[dependencies]
-alloy-core = { workspace = true, default-features = false }
@@ -1,4 +0,0 @@
-//! The revive Rust backend contract runtime library configuration.
-
-/// The Ethereum Virtual Machine word size in bytes.
-pub const EVM_WORD_SIZE_BYTES: usize = 32;
@@ -1,6 +0,0 @@
-//! The revive Rust backend contract runtime library.
-
-#![no_std]
-
-pub mod configuration;
-pub mod memory;
@@ -1,13 +0,0 @@
-//! The revive Rust backend contract runtime emulated linear EVM heap memory.
-
-/// The emulated linear EVM heap memory size.
-pub const MEMORY_SIZE: usize = 1024 * 64;
-
-/// The emulated linear EVM heap memory size.
-pub const MEMORY: [u8; MEMORY_SIZE] = [0; MEMORY_SIZE];
-
-pub struct Function<const VARIABLES: usize> {
-    pub variables: [u8; VARIABLES],
-}
-
-impl<const VARIABLES: usize> Function<VARIABLES> {}
@@ -1,14 +0,0 @@
-[package]
-name = "revive-rul"
-version.workspace = true
-license.workspace = true
-edition.workspace = true
-repository.workspace = true
-authors.workspace = true
-description = "revive compiler rust backend"
-
-[dependencies]
-anyhow = { workspace = true }
-pallet-revive-uapi = { workspace = true }
-polkavm-linker = { workspace = true }
-
@@ -1,79 +0,0 @@
-//! The revive rust backend builder module.
-
-const CARGO_TOML: &str = r#"
-[package]
-name = "contracts"
-publish = false
-version = "1.0.0"
-edition = "2021"
-
-# Make sure this is not included into the workspace
-[workspace]
-
-# Binary targets are injected dynamically by the build script.
-[[bin]]
-
-# All paths are injected dynamically by the build script.
-[dependencies]
-uapi = { version = "0.7.0", package = 'pallet-revive-uapi', features = ["unstable-hostfn"], default-features = false }
-hex-literal = { version = "0.4.1", default-features = false }
-polkavm-derive = { version = "0.27.0" }
-
-[profile.release]
-opt-level = z
-lto = true
-codegen-units = 1
-"#;
-
-const HEADER: &str = r#"
-#![no_std]
-#![no_main]
-include!("../panic_handler.rs");
-
-use uapi::{HostFn, HostFnImpl as api, ReturnFlags};
-
-#[panic_handler]
-fn panic(_info: &core::panic::PanicInfo) -> ! {
-	// SAFETY: The unimp instruction is guaranteed to trap
-	unsafe {
-		core::arch::asm!("unimp");
-		core::hint::unreachable_unchecked();
-	}
-}
-
-/// The emulated linear EVM heap memory size.
-pub const MEMORY_SIZE: usize = 1024 * 64;
-
-/// The emulated linear EVM heap memory size.
-pub const MEMORY: [u8; MEMORY_SIZE] = [0; MEMORY_SIZE];
-"#;
-
-const EXPORT_FUNCTION: &str = r#"
-#[no_mangle]
-#[polkavm_derive::polkavm_export]
-pub extern "C" fn "#;
-
-fn emit(constructor_code: &str, runtime_code: &str) -> String {
-    let mut buffer = String::from(HEADER);
-    buffer.reserve(
-        constructor_code.len() + runtime_code.len() + HEADER.len() + EXPORT_FUNCTION.len() * 2,
-    );
-
-    buffer.push_str(EXPORT_FUNCTION);
-    buffer.push_str("deploy() {");
-    buffer.push_str(constructor_code);
-    buffer.push_str("\n}");
-
-    buffer.push_str(EXPORT_FUNCTION);
-    buffer.push_str("call() {");
-    buffer.push_str(runtime_code);
-    buffer.push_str("\n}");
-
-    buffer
-}
-
-/// Build a PVM blob.
-pub fn build(constructor_code: &str, runtime_code: &str) -> Vec<u8> {
-    let code = emit(constructor_code, runtime_code);
-    todo!();
-}
@@ -1,5 +0,0 @@
-//! The revive rust backend library.
-
-pub mod builder;
-pub mod yul_library;
-
@@ -1 +0,0 @@
-//! The revive rust backend YUL auxilliary library functions module.
@@ -1,6 +1,6 @@
 [package]
 name = "revive-runtime-api"
-version = "0.2.0"
+version.workspace = true
 license.workspace = true
 edition.workspace = true
 repository.workspace = true
@@ -37,11 +37,12 @@ fn compile(source_path: &str, bitcode_path: &str) {
            source_path,
        ])
        .output()
-        .unwrap_or_else(|error| panic!("failed to execute clang: {error}"));
+        .unwrap_or_else(|error| panic!("failed to execute clang: {}", error));

    assert!(
        output.status.success(),
-        "failed to compile the PolkaVM C API: {output:?}"
+        "failed to compile the PolkaVM C API: {:?}",
+        output
    );
 }

@@ -26,19 +26,19 @@ pub static GLOBAL_IMMUTABLE_DATA_SIZE: &str = "__immutable_data_size";
 pub static IMMUTABLE_DATA_MAX_SIZE: u32 = 4 * 1024;

 /// Returns the immutable data global type.
-pub fn data_type(context: &inkwell::context::Context, size: u32) -> inkwell::types::ArrayType<'_> {
+pub fn data_type(context: &inkwell::context::Context, size: u32) -> inkwell::types::ArrayType {
    context
        .custom_width_int_type(revive_common::BIT_LENGTH_WORD as u32)
        .array_type(size)
 }

 /// Returns the immutable data size global type.
-pub fn size_type(context: &inkwell::context::Context) -> inkwell::types::IntType<'_> {
+pub fn size_type(context: &inkwell::context::Context) -> inkwell::types::IntType {
    context.custom_width_int_type(revive_common::BIT_LENGTH_X32 as u32)
 }

 /// Creates a LLVM module with the immutable data and its `size` in bytes.
-pub fn module(context: &inkwell::context::Context, size: u32) -> inkwell::module::Module<'_> {
+pub fn module(context: &inkwell::context::Context, size: u32) -> inkwell::module::Module {
    let module = context.create_module(MODULE_NAME);
    let length = size / revive_common::BYTE_LENGTH_WORD as u32;

@@ -30,13 +30,6 @@ void * memmove(void *dst, const void *src, size_t n) {
 	return dst;
 }

-void * memset(void *b, int c, size_t len) {
-    uint8_t *dest = b;
-    uint8_t val = (uint8_t)c;
-    while (len-- > 0) *dest++ = val;
-    return b;
-}
-
 // Imports

 POLKAVM_IMPORT(void, address, uint32_t)
@@ -1,6 +1,6 @@
 [package]
 name = "revive-solc-json-interface"
-version = "0.2.0"
+version.workspace = true
 authors.workspace = true
 license.workspace = true
 edition.workspace = true
@@ -20,4 +20,4 @@ anyhow = { workspace = true }
 rayon = { workspace = true, optional = true }
 semver = { workspace = true }
 serde = { workspace = true }
-serde_json = { workspace = true }
+serde_json = { workspace = true }
@@ -7,11 +7,8 @@ pub use self::combined_json::contract::Contract as CombinedJsonContract;
 pub use self::standard_json::input::language::Language as SolcStandardJsonInputLanguage;
 pub use self::standard_json::input::settings::metadata::Metadata as SolcStandardJsonInputSettingsMetadata;
 pub use self::standard_json::input::settings::metadata_hash::MetadataHash as SolcStandardJsonInputSettingsMetadataHash;
-pub use self::standard_json::input::settings::optimizer::yul_details::YulDetails as SolcStandardJsonInputSettingsYulOptimizerDetails;
 pub use self::standard_json::input::settings::optimizer::Optimizer as SolcStandardJsonInputSettingsOptimizer;
 pub use self::standard_json::input::settings::polkavm::memory::MemoryConfig as SolcStandardJsonInputSettingsPolkaVMMemory;
-pub use self::standard_json::input::settings::polkavm::memory::DEFAULT_HEAP_SIZE as PolkaVMDefaultHeapMemorySize;
-pub use self::standard_json::input::settings::polkavm::memory::DEFAULT_STACK_SIZE as PolkaVMDefaultStackMemorySize;
 pub use self::standard_json::input::settings::polkavm::PolkaVM as SolcStandardJsonInputSettingsPolkaVM;
 pub use self::standard_json::input::settings::selection::file::flag::Flag as SolcStandardJsonInputSettingsSelectionFileFlag;
 pub use self::standard_json::input::settings::selection::file::File as SolcStandardJsonInputSettingsSelectionFile;
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`//! The revive rust backend YUL auxilliary library functions module.`