bump PVM

Signed-off-by: xermicus <cyrill@parity.io>
switch polkadot-sdk branch to disable validation in the runner
2026-06-14 15:41:04 +00:00 · 2025-02-13 09:19:58 +01:00 · 2025-02-13 08:35:46 +01:00
367 changed files with 14352 additions and 22757 deletions
@@ -10,11 +10,8 @@ rustflags = [
    "-Clink-arg=-sWASM_ASYNC_COMPILATION=0",
    "-Clink-arg=-sDYNAMIC_EXECUTION=0",
    "-Clink-arg=-sALLOW_TABLE_GROWTH=1",
-    "-Clink-arg=--js-library=js/emscripten/embed/soljson_interface.js",
+    "-Clink-arg=--js-library=js/embed/soljson_interface.js",
-    "-Clink-arg=--pre-js=js/emscripten/embed/pre.js",
+    "-Clink-arg=--pre-js=js/embed/pre.js",
    "-Clink-arg=-sSTACK_SIZE=128kb",
    "-Clink-arg=-sNODEJS_CATCH_EXIT=0"
 ]
 [build]
 rustdocflags = ["-D", "warnings"]
@@ -1,19 +0,0 @@
 name: "Get Emscripten SDK"
 inputs:
  version:
    description: ""
    required: false
    default: "4.0.9"
 runs:
  using: "composite"
  steps:
    - name: install emsdk
      shell: bash
      run: |
        git clone https://github.com/emscripten-core/emsdk.git ./emsdk/
        cd emsdk
        git checkout tags/${{ inputs.version }}
        ./emsdk install ${{ inputs.version }}
        ./emsdk activate ${{ inputs.version }}
@@ -1,70 +0,0 @@
 # example:
 #       - uses: ./.github/actions/get-llvm
 #         with:
 #           target: x86_64-unknown-linux-gnu
 name: "Download LLVM"
 inputs:
  target:
    required: true
 runs:
  using: "composite"
  steps:
    - name: find asset
      id: find
      uses: actions/github-script@v7
      env:
        target: ${{ inputs.target }}
      with:
        result-encoding: string
        script: |
          let page = 1;
          let releases = [];
          let releasePrefix = "llvm-"
          let target = process.env.target
          do {
            const res = await github.rest.repos.listReleases({
              owner: context.repo.owner,
              repo: context.repo.repo,
              per_page: 50,
              page,
            });
            releases = res.data
            releases.sort((a, b) => {
              return (a.published_at < b.published_at) ? 1 : ((a.published_at > b.published_at) ? -1 : 0);
            });
            let llvmLatestRelease = releases.find(release => {
              return release.tag_name.startsWith(releasePrefix);
            });
            if (llvmLatestRelease){
                let asset = llvmLatestRelease.assets.find(asset =>{
                    return asset.name.includes(target);
                });
                if (!asset){
                  core.setFailed(`Artifact for '${target}' not found in release ${llvmLatestRelease.tag_name} (${llvmLatestRelease.html_url})`);
                  process.exit();
                }
                return asset.browser_download_url;
            }
            page++;
          } while(releases.length > 0);
          core.setFailed(`No LLVM releases with '${releasePrefix}' atifacts found! Please release LLVM before running this workflow.`);
          process.exit();
    - name: download
      shell: bash
      run: |
        curl -sSLo llvm.tar.gz ${{ steps.find.outputs.result }}
    - name: unpack
      shell: bash
      run: |
        tar -xf llvm.tar.gz
        rm llvm.tar.gz
@@ -1,36 +0,0 @@
 name: "Install Solidity Compiler"
 description: "Installs the Ethereum solc Solidity compiler frontend executable"
 runs:
  using: "composite"
  steps:
    - name: Figure out Solc Download URL
      shell: bash
      run: |
        if [[ "${{ runner.os }}" == "Linux" ]]; then
          echo "SOLC_NAME=solc-static-linux" >> $GITHUB_ENV
        elif [[ "${{ runner.os }}" == "Windows" ]]; then
          echo "SOLC_NAME=solc-windows.exe" >> $GITHUB_ENV
        else
          echo "SOLC_NAME=solc-macos" >> $GITHUB_ENV
        fi
    - name: Download Solc
      shell: bash
      run: |
        mkdir -p solc
        curl -sSL --output solc/solc https://github.com/ethereum/solidity/releases/download/v0.8.30/${SOLC_NAME}
    - name: Make Solc Executable
      if: ${{ runner.os == 'Windows' }}
      shell: bash
      run: |
        echo "$(pwd -W)\\solc" >> $GITHUB_PATH
        mv solc/solc solc/solc.exe
    - name: Make Solc Executable
      if: ${{ runner.os != 'Windows' }}
      shell: bash
      run: |
        echo "$(pwd)/solc" >> $GITHUB_PATH
        chmod +x solc/solc
@@ -1,175 +0,0 @@
 #!/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
 import requests
 def validate_github_token():
    """Validate that GITHUB_TOKEN environment variable is set."""
    if 'GITHUB_TOKEN' not in os.environ:
        print("Error: GITHUB_TOKEN environment variable is not set.")
        sys.exit(1)
 def fetch_release_data(repo, tag):
    """Fetch release data from GitHub API."""
    url = f"https://api.github.com/repos/{repo}/releases/tags/{tag}"
    headers = {
        'Authorization': f"Bearer {os.environ['GITHUB_TOKEN']}",
        'Accept': 'application/vnd.github+json',
        'X-GitHub-Api-Version': '2022-11-28'
    }
    try:
        response = requests.get(url, headers=headers)
        response.raise_for_status()
        return response.json()
    except requests.RequestException as e:
        print(f"Error fetching release data: {e}")
        sys.exit(1)
 def fetch_checksum_file(release_data):
    """
    Fetch the checksum.txt file from the release assets
    and parse it into a dictionary mapping file names to their SHA256 checksums.
    """
    checksums = {}
    # Find the checksum.txt asset URL
    checksum_asset = None
    for asset in release_data['assets']:
        if asset['name'] == 'checksums.txt':
            checksum_asset = asset
            break
    if not checksum_asset:
        print("Warning: checksum.txt file not found in release assets.")
        return checksums
    # Download the checksum file
    headers = {
        'Authorization': f"Bearer {os.environ['GITHUB_TOKEN']}",
        'Accept': 'application/octet-stream'
    }
    try:
        response = requests.get(checksum_asset['browser_download_url'], headers=headers)
        response.raise_for_status()
        # Parse checksum file
        for line in response.text.splitlines():
            if line.strip():
                checksum, filename = line.strip().split(None, 1)
                checksums[filename] = checksum
        return checksums
    except requests.RequestException as e:
        print(f"Error fetching checksum file: {e}")
        return checksums
    except Exception as e:
        print(f"Error parsing checksum file: {e}")
        return checksums
 def extract_build_hash(target_commitish):
    """Extract the first 8 characters of the commit hash."""
    return f"commit.{target_commitish[:8]}"
 def generate_asset_json(release_data, asset, checksums):
    """Generate JSON for a specific asset."""
    version = release_data['tag_name'].lstrip('v')
    build = extract_build_hash(release_data['target_commitish'])
    long_version = f"{version}+{build}"
    # Get SHA256 checksum if available
    sha256 = checksums.get(asset['name'], "")
    return {
        "name": asset['name'],
        "version": version,
        "build": build,
        "longVersion": long_version,
        "url": asset['browser_download_url'],
        "sha256": sha256,
        "firstSolcVersion": os.environ.get("FIRST_SOLC_VERSION", ""),
        "lastSolcVersion": os.environ.get("LAST_SOLC_VERSION", "")
    }
 def save_platform_json(platform_folder, asset_json, tag):
    """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 arguments
    if len(sys.argv) != 3:
        print("Usage: python script.py <repo> <tag>")
        sys.exit(1)
    repo, tag = sys.argv[1], sys.argv[2]
    # Validate GitHub token
    validate_github_token()
    # Fetch release data
    release_data = fetch_release_data(repo, tag)
    # Fetch checksums
    checksums = fetch_checksum_file(release_data)
    # 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.exe': 'windows',
        'resolc_web.js': 'wasm'
    }
    # Process each asset
    for asset in release_data['assets']:
        platform_name = platform_mapping.get(asset['name'])
        if platform_name:
            platform_folder = os.path.join(platform_name)
            asset_json = generate_asset_json(release_data, asset, checksums)
            save_platform_json(platform_folder, asset_json, tag)
            print(f"Processed {asset['name']} for {platform_name}")
 if __name__ == "__main__":
    main()
@@ -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()
@@ -0,0 +1,143 @@
 name: Build revive-wasm
 on:
  push:
    branches: ["main"]
  pull_request:
    branches: ["main"]
  workflow_dispatch:
 env:
  CARGO_TERM_COLOR: always
  REVIVE_WASM_INSTALL_DIR: ${{ github.workspace }}/target/wasm32-unknown-emscripten/release
  BUN_VERSION: 1.1.43
 jobs:
  build-revive-wasm:
    runs-on: parity-large
    defaults:
      run:
        shell: bash
    steps:
      - uses: actions/checkout@v4
      - name: Cache LLVM build
        id: cache-llvm
        uses: actions/cache@v3
        with:
          path: |
            target-llvm/emscripten/target-final
            target-llvm/gnu/target-final
          # Use a unique key based on LLVM version or configuration files to avoid cache invalidation
          key: llvm-build-${{ runner.os }}-${{ hashFiles('LLVM.lock', 'Cargo.toml', 'Cargo.lock', 'crates/llvm-builder/**', '.github/workflows/build-revive-wasm.yml') }}
      - name: Install system dependencies
        run: |
          sudo apt-get update && sudo apt-get install -y cmake ninja-build curl git libssl-dev pkg-config clang lld
      - name: Install Rust stable toolchain
        uses: actions-rs/toolchain@v1
        with:
          profile: minimal
          toolchain: stable
          components: rust-src
          target: wasm32-unknown-emscripten
      - name: Install LLVM build dependencies
        run: |
          make install-llvm-builder
          revive-llvm --target-env emscripten clone
      - name: Setup revive environment variables
        run: |
          echo "LLVM_SYS_181_PREFIX=$(pwd)/target-llvm/gnu/target-final" >> $GITHUB_ENV
          echo "REVIVE_LLVM_TARGET_PREFIX=$(pwd)/target-llvm/emscripten/target-final" >> $GITHUB_ENV
      - name: Build host LLVM
        if: steps.cache-llvm.outputs.cache-hit != 'true'
        run: |
          revive-llvm build --llvm-projects lld --llvm-projects clang
      - name: Build target LLVM
        if: steps.cache-llvm.outputs.cache-hit != 'true'
        run: |
          source emsdk/emsdk_env.sh
          revive-llvm --target-env emscripten build --llvm-projects lld
      - run: |
          rustup show
          cargo --version
          rustup +nightly show
          cargo +nightly --version
          cmake --version
          bash --version
      - name: Use Cached LLVM
        if: steps.cache-llvm.outputs.cache-hit == 'true'
        run: |
          echo "Using cached LLVM"
      - name: Build revive
        run: |
          source emsdk/emsdk_env.sh
          make install-wasm
      - uses: actions/upload-artifact@v4
        with:
          name: revive-wasm
          path: |
            ${{ env.REVIVE_WASM_INSTALL_DIR }}/resolc.js
            ${{ env.REVIVE_WASM_INSTALL_DIR }}/resolc.wasm
            ${{ env.REVIVE_WASM_INSTALL_DIR }}/resolc_web.js
          retention-days: 1
  test-revive-wasm:
    needs: build-revive-wasm
    strategy:
      matrix:
        os: ["ubuntu-24.04", "macos-14", "windows-2022"]
    runs-on: ${{ matrix.os }}
    steps:
      - uses: actions/checkout@v4
      - name: Create Target Directory
        run: mkdir -p ${{ env.REVIVE_WASM_INSTALL_DIR }}
      - name: Download Artifact
        uses: actions/download-artifact@v4
        with:
          name: revive-wasm
          path: ${{ env.REVIVE_WASM_INSTALL_DIR }}
      - name: Set Up Node.js
        uses: actions/setup-node@v3
        with:
          node-version: "20"
      - name: Install Bun on Windows
        if: runner.os == 'Windows'
        run: |
          Set-ExecutionPolicy RemoteSigned -Scope CurrentUser
          iex (new-object net.webclient).downloadstring('https://get.scoop.sh')
          scoop install bun@${{ env.BUN_VERSION }}
          scoop install wget
          Join-Path (Resolve-Path ~).Path "scoop\shims" >> $Env:GITHUB_PATH
      - name: Install Bun on macOS and Linux
        if: runner.os != 'Windows'
        run: |
          curl -fsSL https://bun.sh/install | bash -s bun-v${{ env.BUN_VERSION }}
          echo "$HOME/.bun/bin" >> $GITHUB_PATH
      - name: Install packages
        run: npm install
      - name: Run Playwright tests
        run: |
          cd js
          npx playwright install --with-deps
          npx playwright test
      - name: Test revive
        run: |
          echo "Running tests for ${{ matrix.os }}"
          npm run test:wasm
@@ -1,64 +0,0 @@
 name: Generate JSON for resolc-bin
 on:
  release:
    types: [published]
 jobs:
  generateJson:
    runs-on: ubuntu-latest
    if: contains(github.event.release.tag_name, 'llvm') == false
    environment: tags
    env:
      # the token is needed for json_generator.py
      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
    steps:
      - name: Checkout
        uses: actions/checkout@v4
        with:
          path: tmp
      - name: Checkout
        uses: actions/checkout@v4
        with:
          repository: paritytech/resolc-bin
          path: resolc-bin
      - 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 and push
        env:
          TOKEN: ${{ steps.app-token.outputs.token }}
          APP_NAME: "paritytech-revive-json"
          Green: "\e[32m"
          NC: "\e[0m"
        run: |
          sudo apt-get update && sudo apt-get install -y wget
          wget https://github.com/${GITHUB_REPOSITORY}/releases/download/${GITHUB_REF_NAME}/resolc-x86_64-unknown-linux-musl
          chmod +x resolc-x86_64-unknown-linux-musl
          export FIRST_SOLC_VERSION=$(./resolc-x86_64-unknown-linux-musl --supported-solc-versions | cut -f 1 -d "," | tr -d ">=")
          export LAST_SOLC_VERSION=$(./resolc-x86_64-unknown-linux-musl --supported-solc-versions | cut -f 2 -d "," | tr -d "<=")
          cd resolc-bin
          python ../tmp/.github/scripts/json_generator.py ${GITHUB_REPOSITORY} ${{ github.event.release.tag_name }}
          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 .
          git commit -m "Update json"
          git push origin main
          echo "::notice::info.list files were successfully published to https://github.com/paritytech/resolc-bin"
@@ -1,137 +0,0 @@
 name: Release LLVM
 on:
  workflow_dispatch:
    inputs:
      llvm_version:
        type: string
        required: true
        description: llvm version in "x.x.x" format, e.g. "18.1.8"
 concurrency:
  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
  cancel-in-progress: true
 env:
  CARGO_TERM_COLOR: always
 jobs:
  create-release-draft:
    runs-on: ubuntu-24.04
    permissions:
      contents: write
    outputs:
      version: ${{ steps.resolve-version.outputs.version }}
    steps:
      - id: resolve-version
        run: |
          echo "version=llvm-${{ inputs.llvm_version }}-revive.${GITHUB_SHA:0:7}" >> $GITHUB_OUTPUT
      - name: Create Release
        uses: softprops/action-gh-release@v2
        with:
          name: ${{ steps.resolve-version.outputs.version }}
          body: "LLVM is a dependency of revive. The LLVM releases are used by our CI to build revive."
          draft: true
          tag_name: ${{ steps.resolve-version.outputs.version }}
  build:
    strategy:
      matrix:
        target: [x86_64-unknown-linux-gnu, x86_64-unknown-linux-musl, wasm32-unknown-emscripten, aarch64-apple-darwin, x86_64-apple-darwin, x86_64-pc-windows-msvc]
        include:
          - target: x86_64-unknown-linux-gnu
            builder-arg: gnu
            host: linux
            runner: parity-large
          - target: x86_64-unknown-linux-musl
            builder-arg: musl
            host: linux
            runner: parity-large
          - target: wasm32-unknown-emscripten
            builder-arg: emscripten
            host: linux
            runner: parity-large
          - target: aarch64-apple-darwin
            builder-arg: gnu
            host: macos
            runner: macos-14
          - target: x86_64-apple-darwin
            builder-arg: gnu
            host: macos
            runner: macos-13
          - target: x86_64-pc-windows-msvc
            builder-arg: gnu
            host: windows
            runner: windows-2022
    needs: create-release-draft
    runs-on: ${{ matrix.runner }}
    env:
      RUST_LOG: trace
    permissions:
      contents: write # for uploading assets to release
    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: Install Dependencies
        if: ${{ matrix.host == 'linux' }}
        run: |
          sudo apt-get update && sudo apt-get install -y cmake ninja-build curl git libssl-dev pkg-config clang lld musl
      - name: Install Dependencies
        if: ${{ matrix.host == 'macos' }}
        run: |
          brew install ninja
      - name: Install Dependencies
        if: ${{ matrix.host == 'windows' }}
        run: |
          choco install ninja
      - name: Install LLVM Builder
        run: |
          cargo install --locked --force --path crates/llvm-builder
      - name: Clone LLVM
        run: |
          revive-llvm --target-env ${{ matrix.builder-arg }} clone
      - name: Build LLVM
        if: ${{ matrix.target != 'wasm32-unknown-emscripten' }}
        run: |
          revive-llvm --target-env ${{ matrix.builder-arg }} build --llvm-projects lld --llvm-projects clang
      - name: Build LLVM
        if: ${{ matrix.target == 'wasm32-unknown-emscripten' }}
        run: |
          source emsdk/emsdk_env.sh
          revive-llvm --target-env ${{ matrix.builder-arg }} build --llvm-projects lld
      - name: Remove Unnecessary Binaries
        shell: bash
        run: |
          cd target-llvm/${{ matrix.builder-arg }}/target-final/bin/
          rm -f diagtool* llvm-libtool-darwin* llvm-lipo* llvm-pdbutil* llvm-dwarfdump* llvm-nm* llvm-readobj* llvm-cfi-verify* \
              sancov* llvm-debuginfo-analyzer* llvm-objdump* llvm-profgen* llvm-extract* llvm-jitlink* llvm-c-test* llvm-gsymutil* llvm-dwp* \
              dsymutil* llvm-dwarfutil* llvm-exegesis* lli clang-rename* bugpoint* clang-extdef-mapping* clang-refactor* c-index-test* \
              llvm-reduce* llvm-lto* clang-linker-wrapper* llc* llvm-lto2* llvm-otool* llvm-readelf* \
              clang-repl* clang-check* clang-scan-deps*
          cd -
      - name: Package Artifact
        shell: bash
        run: |
          mv target-llvm/${{ matrix.builder-arg }}/target-final/ llvm-${{ matrix.target }}
          tar -czf "${{ needs.create-release-draft.outputs.version }}-${{ matrix.target }}.tar.gz" llvm-${{ matrix.target }}
      - name: Add Artifact to Release
        uses: softprops/action-gh-release@v2
        with:
          tag_name: ${{ needs.create-release-draft.outputs.version }}
          draft: true
          files: |
            ${{ needs.create-release-draft.outputs.version }}-${{ matrix.target }}.tar.gz
@@ -1,161 +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
 jobs:
  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
          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:
    if: ${{ needs.check_commits.outputs.has_commits == 'true' }}
    needs: [check_commits]
    uses: ./.github/workflows/reusable-build.yml
    with:
      is_release: false
      retention_days: 40
  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 "${TARGET}_url=${{ steps.artifact-upload-step.outputs.artifact-url }}" >> "$GITHUB_OUTPUT"
          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, 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.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"
@@ -1,165 +0,0 @@
 name: Build & Release
 on:
  push:
    branches: ["main"]
    tags:
      - "v*"
  pull_request:
    branches: ["main"]
    types: [opened, synchronize, labeled, unlabeled]
 concurrency:
  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
  cancel-in-progress: true
 env:
  CARGO_TERM_COLOR: always
 jobs:
  check-version-changed:
    runs-on: ubuntu-24.04
    permissions:
      contents: write
    env:
      CURRENT_TAG: ${{ github.ref_name }}
    outputs:
      RELEASE_NOTES: ${{ steps.versions.outputs.RELEASE_NOTES }}
    steps:
      - uses: actions/checkout@v4
      - name: Check versions
        id: versions
        run: |
          if [[ $CURRENT_TAG == 'main' ]]; then
            echo "::notice::Tag $CURRENT_TAG is not a release tag, skipping the check in the main branch"
            exit 0
          fi
          if [[ $CURRENT_TAG != "v"* ]]; then
            echo "::notice::Tag $CURRENT_TAG is not a release tag, skipping the check in a PR"
            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 " ")
          echo "Current tag $CURRENT_TAG"
          echo "Package version $PKG_VER"
          if [[ $CURRENT_TAG != $PKG_VER ]]; then
            echo "::error::Tag $CURRENT_TAG doesn't match package version $PKG_VER in Cargo.toml, please fix"
            exit 1
          fi
          export RELEASE_NOTES="$(sed '/^## '${CURRENT_TAG}'/,/^## v/!d' CHANGELOG.md | sed -e '1d' -e '$d')"
          echo "Release notes:"
          echo "$RELEASE_NOTES"
          echo 'RELEASE_NOTES<<EOF' >> $GITHUB_OUTPUT
          echo "$RELEASE_NOTES" >> $GITHUB_OUTPUT
          echo 'EOF' >> $GITHUB_OUTPUT
  build:
    needs: [check-version-changed]
    uses: ./.github/workflows/reusable-build.yml
    with:
      is_release: true
      retention_days: 1
  create-release:
    if: startsWith(github.ref_name, 'v')
    needs: [check-version-changed, build]
    runs-on: macos-14
    environment: tags
    steps:
      - name: Download Artifacts
        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-x86_64-unknown-linux-musl
          chmod +x resolc-universal-apple-darwin
      - name: Create sha-256 checksum
        run: |
          shasum -a 256 resolc-x86_64-unknown-linux-musl > checksums.txt
          shasum -a 256 resolc-universal-apple-darwin >> checksums.txt
          shasum -a 256 resolc-x86_64-pc-windows-msvc.exe >> checksums.txt
          shasum -a 256 resolc.js >> checksums.txt
          shasum -a 256 resolc.wasm >> checksums.txt
          shasum -a 256 resolc_web.js >> checksums.txt
      - uses: actions/create-github-app-token@v1
        id: app-token
        with:
          app-id: ${{ secrets.REVIVE_RELEASE_APP_ID }}
          private-key: ${{ secrets.REVIVE_RELEASE_APP_KEY }}
      - name: create-release
        uses: softprops/action-gh-release@v2
        with:
          body: |
            ## Changelog
            ${{ needs.check-version-changed.outputs.RELEASE_NOTES }}
            ## Note for macOS Users
            The macOS binary is unsigned and it needs to be made runnable using `xattr -c resolc-universal-apple-darwin`.
          tag_name: ${{ github.ref_name }}
          name: ${{ github.ref_name }}
          prerelease: true
          token: ${{ steps.app-token.outputs.token }}
          target_commitish: ${{ github.sha }}
          files: |
            resolc-x86_64-unknown-linux-musl
            resolc-universal-apple-darwin
            resolc-x86_64-pc-windows-msvc.exe
            resolc.js
            resolc.wasm
            resolc_web.js
            checksums.txt
  npm-release:
    needs: [create-release]
    runs-on: macos-14
    environment: tags
    steps:
      - uses: actions/checkout@v4
      - name: Download Artifacts
        uses: actions/download-artifact@v4
        with:
          merge-multiple: true
      - name: Set Up Node.js
        uses: actions/setup-node@v3
        with:
          node-version: "20"
      - run: npm ci -w js/resolc
      - name: Build
        run: |
          cp -f resolc.{wasm,js} js/resolc/src/resolc
          npm -w js/resolc run build
      - name: npm pack
        run: npm -w js/resolc pack
      - uses: actions/upload-artifact@v4
        with:
          name: npm_package
          path: "parity-resolc-*.tgz"
      - uses: octokit/request-action@bbedc70b1981e610d89f1f8de88311a1fc02fb83
        with:
          route: POST /repos/paritytech/npm_publish_automation/actions/workflows/publish.yml/dispatches
          ref: main
          inputs: '${{ format(''{{ "artifact_name": "npm_package", "repo": "{0}", "run_id": "{1}" }}'', github.repository, github.run_id) }}'
        env:
          GITHUB_TOKEN: ${{ secrets.NPM_PUBLISH_AUTOMATION_TOKEN }}
@@ -1,262 +0,0 @@
 name: Reusable Build
 on:
  workflow_call:
    inputs:
      is_release:
        description: "Whether this is a release build"
        required: true
        type: boolean
      retention_days:
        description: "Artifact retention days"
        required: false
        type: number
        default: 1
    outputs:
      resolc-x86_64-unknown-linux-musl_url:
        value: ${{ jobs.build.outputs.resolc-x86_64-unknown-linux-musl_url }}
      resolc-x86_64-unknown-linux-musl_sha:
        value: ${{ jobs.build.outputs.resolc-x86_64-unknown-linux-musl_sha }}
      resolc-aarch64-apple-darwin_url:
        value: ${{ jobs.build.outputs.resolc-aarch64-apple-darwin_url }}
      resolc-aarch64-apple-darwin_sha:
        value: ${{ jobs.build.outputs.resolc-aarch64-apple-darwin_sha }}
      resolc-x86_64-apple-darwin_url:
        value: ${{ jobs.build.outputs.resolc-x86_64-apple-darwin_url }}
      resolc-x86_64-apple-darwin_sha:
        value: ${{ jobs.build.outputs.resolc-x86_64-apple-darwin_sha }}
      resolc-x86_64-pc-windows-msvc_url:
        value: ${{ jobs.build.outputs.resolc-x86_64-pc-windows-msvc_url }}
      resolc-x86_64-pc-windows-msvc_sha:
        value: ${{ jobs.build.outputs.resolc-x86_64-pc-windows-msvc_sha }}
      resolc-web_js_url:
        value: ${{ jobs.build-wasm.outputs.resolc_web_js_url }}
      resolc-web_js_sha:
        value: ${{ jobs.build-wasm.outputs.resolc_web_js_sha }}
 env:
  CARGO_TERM_COLOR: always
  RUST_MUSL_CROSS_IMAGE: messense/rust-musl-cross@sha256:c0154e992adb791c3b848dd008939d19862549204f8cb26f5ca7a00f629e6067
 jobs:
  build:
    # github actions matrix jobs don't support multiple outputs
    # ugly workaround from https://github.com/orgs/community/discussions/17245#discussioncomment-11222880
    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 }}
    steps:
      - uses: actions/checkout@v4
      - uses: actions-rust-lang/setup-rust-toolchain@v1
        with:
          rustflags: ""
          cache-key: ${{ matrix.target }}
      - name: Download LLVM
        uses: ./.github/actions/get-llvm
        with:
          target: ${{ matrix.target }}
      - name: Build (Native)
        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 (MUSL)
        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 == *'50564d'* ]]; then exit 0; else exit 1; fi
      - uses: actions/upload-artifact@v4
        id: artifact-upload-step
        with:
          name: resolc-${{ matrix.target }}
          path: resolc-${{ matrix.target }}*
          retention-days: ${{ inputs.retention_days }}
      - name: Set output variables
        if: ${{ !inputs.is_release }}
        id: set-output
        shell: bash
        run: |
          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 }}" >> "$GITHUB_OUTPUT"
  build-wasm:
    runs-on: ubuntu-24.04
    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
          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']);
          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/
      - name: Upload artifacts (Release)
        if: ${{ inputs.is_release }}
        uses: actions/upload-artifact@v4
        with:
          name: resolc-wasm32-unknown-emscripten
          path: resolc-wasm32-unknown-emscripten/*
          retention-days: ${{ inputs.retention_days }}
      # 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)
        if: ${{ !inputs.is_release }}
        uses: actions/upload-artifact@v4
        with:
          name: resolc.js
          path: resolc-wasm32-unknown-emscripten/resolc.js
          retention-days: ${{ inputs.retention_days }}
      - name: Upload artifacts resolc.wasm (Nightly)
        if: ${{ !inputs.is_release }}
        uses: actions/upload-artifact@v4
        with:
          name: resolc.wasm
          path: resolc-wasm32-unknown-emscripten/resolc.wasm
          retention-days: ${{ inputs.retention_days }}
      - name: Upload artifacts resolc_web.js (Nightly)
        if: ${{ !inputs.is_release }}
        uses: actions/upload-artifact@v4
        id: artifact-upload-step
        with:
          name: resolc_web.js
          path: resolc-wasm32-unknown-emscripten/resolc_web.js
          retention-days: ${{ inputs.retention_days }}
      - name: Set output variables
        if: ${{ !inputs.is_release }}
        id: set-output
        env:
          TARGET: resolc_web_js
        run: |
          echo "${TARGET}_url=${{ steps.artifact-upload-step.outputs.artifact-url }}" >> "$GITHUB_OUTPUT"
          echo "${TARGET}_sha=${{ steps.artifact-upload-step.outputs.artifact-digest }}" >> "$GITHUB_OUTPUT"
@@ -0,0 +1,59 @@
 name: Build
 on:
  push:
    branches: ["main"]
  pull_request:
    branches: ["main"]
 env:
  CARGO_TERM_COLOR: always
 jobs:
  build-ubuntu-x86:
    runs-on: ubuntu-24.04
    steps:
      - uses: actions/checkout@v4
      - name: Install solc
        run: |
          mkdir -p solc
          curl -sSL --output solc/solc https://github.com/ethereum/solidity/releases/download/v0.8.28/solc-static-linux
          chmod +x solc/solc
          echo "$(pwd)/solc/" >> $GITHUB_PATH
      - name: Install LLVM
        run: |
          curl -sSL --output llvm.tar.xz https://github.com/paritytech/revive/releases/download/v0.1.0-dev.7/clang+llvm-18.1.8-x86_64-linux-gnu-ubuntu-24.04.tar.xz
          mkdir llvm18
          tar Jxf llvm.tar.xz -C llvm18/
          echo "LLVM_SYS_181_PREFIX=$(pwd)/llvm18" >> $GITHUB_ENV
      - name: Install geth
        run: |
          git clone https://github.com/xermicus/go-ethereum --branch=cl/fix-runner-state-dump --depth=1
          cd go-ethereum
          make all
          echo "$(pwd)/build/bin/" >> $GITHUB_PATH
      - name: Machete
        uses: bnjbvr/cargo-machete@main
      - name: Format
        run: make format
      - name: Clippy
        run: make clippy
      - name: Test cargo workspace
        run: make test-workspace
      - name: Test CLI
        run: make test-cli
      - uses: actions/upload-artifact@v4
        with:
          name: ${{ github.job }}-resolc
          path: ./target/release/resolc
          retention-days: 1
@@ -1,47 +0,0 @@
 name: Test LLVM Builder
 on:
  pull_request:
    branches: ["main"]
    types: [opened, synchronize]
    paths:
      - '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 }}
  cancel-in-progress: true
 env:
  CARGO_TERM_COLOR: always
 jobs:
  test:
    strategy:
      matrix:
        runner: [parity-large, macos-14, windows-2022]
    runs-on: ${{ matrix.runner }}
    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.runner }}
      - name: Install Dependencies
        if: matrix.runner == 'parity-large'
        run: |
          sudo apt update && sudo apt-get install -y cmake ninja-build curl git libssl-dev pkg-config clang lld musl
      - name: Install Dependencies
        if: matrix.runner == 'macos-14'
        run: |
          brew install ninja
      - name: Test
        run: make test-llvm-builder
        env:
          RUST_LOG: trace
@@ -1,107 +0,0 @@
 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 }}
  cancel-in-progress: true
 env:
  CARGO_TERM_COLOR: always
  REVIVE_WASM_INSTALL_DIR: ${{ github.workspace }}/target/wasm32-unknown-emscripten/release
 jobs:
  build:
    runs-on: ubuntu-24.04
    defaults:
      run:
        shell: bash
    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: Install emsdk
        uses: ./.github/actions/get-emsdk
      - name: Set LLVM Environment Variables
        run: |
          echo "LLVM_SYS_181_PREFIX=$(pwd)/llvm-x86_64-unknown-linux-gnu" >> $GITHUB_ENV
          echo "REVIVE_LLVM_TARGET_PREFIX=$(pwd)/llvm-wasm32-unknown-emscripten" >> $GITHUB_ENV
      - name: Build Revive
        run: |
          source emsdk/emsdk_env.sh
          make install-wasm
      - uses: actions/upload-artifact@v4
        with:
          name: revive-wasm
          path: |
            ${{ env.REVIVE_WASM_INSTALL_DIR }}/resolc.js
            ${{ env.REVIVE_WASM_INSTALL_DIR }}/resolc.wasm
            ${{ env.REVIVE_WASM_INSTALL_DIR }}/resolc_web.js
          retention-days: 1
  test:
    needs: build
    strategy:
      matrix:
        os: ["ubuntu-24.04", "macos-14", "windows-2022"]
    runs-on: ${{ matrix.os }}
    steps:
      - uses: actions/checkout@v4
      - name: Create Target Directory
        run: mkdir -p ${{ env.REVIVE_WASM_INSTALL_DIR }}
      - name: Download Artifact
        uses: actions/download-artifact@v4
        with:
          name: revive-wasm
          path: ${{ env.REVIVE_WASM_INSTALL_DIR }}
      - name: Set Up Node.js
        uses: actions/setup-node@v3
        with:
          node-version: "20"
      - name: Install Node Packages
        run: npm install
      - name: Test emscripten
        run: |
          echo "Running tests for ${{ matrix.os }}"
          npm run test:wasm
      - name: Test @parity/resolc
        run: |
          echo "Running tests for ${{ matrix.os }}"
          npm run -w js/resolc test
      - name: Run Playwright tests
        run: |
          cd js/emscripten
          npx playwright install --with-deps
          npx playwright test
@@ -1,62 +0,0 @@
 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 }}
  cancel-in-progress: true
 env:
  CARGO_TERM_COLOR: always
 jobs:
  test:
    runs-on: ubuntu-24.04
    steps:
      - uses: actions/checkout@v4
      - uses: actions-rust-lang/setup-rust-toolchain@v1
        with:
          # without this it will override our rust flags
          rustflags: ""
          components: rustfmt, clippy
      - name: Install Solc
        uses: ./.github/actions/get-solc
      - name: Download LLVM
        uses: ./.github/actions/get-llvm
        with:
          target: x86_64-unknown-linux-gnu
      - name: Set LLVM Environment Variables
        run: |
          echo "LLVM_SYS_181_PREFIX=$(pwd)/llvm-x86_64-unknown-linux-gnu" >> $GITHUB_ENV
      - name: Install Geth
        run: |
          sudo add-apt-repository -y ppa:ethereum/ethereum
          sudo apt update
          sudo apt install -y ethereum
      - name: Machete
        uses: bnjbvr/cargo-machete@v0.7.1
      - name: Format
        run: make format
      - name: Clippy
        run: make clippy
      - name: Test cargo workspace
        run: make test-workspace
      - name: Test docs
        run: make doc
@@ -1,5 +1,4 @@
 /target
 /js/resolc/dist
 target-llvm
 *.dot
 .vscode/
@@ -12,6 +11,7 @@ target-llvm
 node_modules
 artifacts
 tmp
 package-lock.json
 /*.html
 /build
 soljson.js
@@ -1,6 +0,0 @@
 {
  "trailingComma": "es5",
  "tabWidth": 2,
  "semi": false,
  "singleQuote": true
 }
@@ -4,182 +4,8 @@
 This is a development pre-release.
 Supported `polkadot-sdk` rev: `2503.0.1`
 ## v0.4.1
 This is a development pre-release.
 Supported `polkadot-sdk` rev: `2503.0.1`
 ### Changed
 - The `ast` output is no longer pruned in standard JSON mode (required for foundry).
 - Support `standard_json.output_selection` to also look at per file settings.
 ## v0.4.0
 This is a development pre-release.
 Supported `polkadot-sdk` rev: `2503.0.1`
 ### Changed
 - Remove the broken `--llvm-ir` mode.
 - Remove the unused fallback for size optimization setting.
 - Unlinked contract binaries are emitted as raw ELF objects.
 ### 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.
 - The `--link` deploy time linking mode.
 ### Fixed
 - The debug info source file matches the YUL path in `--debug-output-dir`, allowing tools to display the source line. 
 - Incosistent type forwarding in JSON output (empty string vs. null object).
 - The solc automatic import resolution.
 - Compiler panic on missing libraries definition.
 ## 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.
 Supported `polkadot-sdk` rev: `2503.0.1`
 ### Added
 - Add the PolkaVM heap size, stack size and debug info CLI compiler options to the standard JSON settings. This makes the standard JSON input succint for reproducible builds.
 ### Changed
 - Supported `polkadot-sdk` version is now `2503.0.1`
 - The `emsdk` version is now `4.0.9`
 ### Fixed
 ## v0.1.0-dev.16
 This is a development pre-release.
 Supported `polkadot-sdk` rev:`c29e72a8628835e34deb6aa7db9a78a2e4eabcee`
 ### Added
 - Move the npm package from paritytech/js-revive, into this repo. The package `@parity/resolc` will be deployed to npm for each release.
 - Support for solc v0.8.30
 ### Changed
 - By default, heavy size optimizations are applied.
 ### Fixed
 - @parity/resolc: The solc dependency package is constrained to the latest supported version, preventing breaking the package ever time a new solc package was released. 
 - The resolc npm package no longer ignores the optimizer settings
 ## v0.1.0-dev.14
 This is a development pre-release.
 Supported `polkadot-sdk` rev:`c29e72a8628835e34deb6aa7db9a78a2e4eabcee`
 ### Added
 - The `revive-runner` helper utility binary which helps to run contracts locally without a blockchain node.
 - Allow configuration of the EVM heap memory size and stack size via CLI flags and JSON input settings.
 ### Changed
 - The default PVM stack memory size was increased from 16kb to 32kb.
 ### Fixed
 - Constructors avoid storing zero sized immutable data on exit.
 ## v0.1.0-dev.13
 This is a development pre-release.
 Supported `polkadot-sdk` rev:`c29e72a8628835e34deb6aa7db9a78a2e4eabcee`
 ### Added
 - Support for solc v0.8.29
 - Decouples the solc JSON-input-output type definitions from the Solidity fronted and expose them via a dedicated crate.
 - `--supported-solc-versions` for `resolc` binary to return a `semver` range of supported `solc` versions.
 - Support for passing LLVM command line options via the prcoess input or providing one or more `--llvm-arg='..'` resolc CLI flag. This allows more fine-grained control over the LLVM backend configuration.
 ### Changed
 - Storage keys and values are big endian. This was a pre-mature optimization because for the contract itself it this is a no-op and thus not observable. However we should consider the storage layout as part of the contract ABI. The endianness of transient storage values are still kept as-is.
 - Running `resolc` using webkit is no longer supported.
 ### Fixed
 - A missing byte swap for the create2 salt value.
 ## v0.1.0-dev.12
 This is a development pre-release.
 Supported `polkadot-sdk` rev: `21f6f0705e53c15aa2b8a5706b208200447774a9`
 ### Added
 - Per file output selection for `--standard-json` mode.
 - The `ir` output selection option for `--standard-json` mode.
 ### Changed
 - Improved code size: Large contracts compile to smaller code blobs when enabling aggressive size optimizations (`-Oz`).
 ### Fixed
 ## v0.1.0-dev.11
 This is a development pre-release.
 Supported `polkadot-sdk` rev: `274a781e8ca1a9432c7ec87593bd93214abbff50`
 ### Added
 ### Changed
 ### Fixed
 - A bug causing incorrect loads from the emulated EVM linear memory.
 - A missing integer truncate after switching to 64bit.
 ## v0.1.0-dev.10
 This is a development pre-release.
@@ -187,12 +13,10 @@ This is a development pre-release.
 Supported `polkadot-sdk` rev: `274a781e8ca1a9432c7ec87593bd93214abbff50`
 ### Added
 - Support for the `coinbase` opcode.
 - The resolc web JS version.
-### Changed
+### Changed 
 - Missing the `--overwrite` flag emits an error instead of a warning.
 - The `resolc` executable prints the help by default.
 - Removed support for legacy EVM assembly (EVMLA) translation.
@@ -202,7 +26,6 @@ Supported `polkadot-sdk` rev: `274a781e8ca1a9432c7ec87593bd93214abbff50`
  If detected, the re-entrant call flag is not set and 0 deposit limit is endowed.
 ### Fixed
 - Solidity: Add the solc `--libraries` files to sources.
 - A data race in tests.
 - Fix `broken pipe` errors.
@@ -215,12 +38,10 @@ This is a development pre-release.
 ### Added
-### Changed
+### Changed 
 - Syscalls with more than 6 arguments now pack them into registers.
 ### Fixed
 - Remove reloading of the resolc.js file (fix issue with relative path in web worker)
 ## v0.1.0-dev.8
@@ -228,18 +49,15 @@ This is a development pre-release.
 This is a development pre-release.
 ### Added
 - The `revive-llvm-builder` crate with the `revive-llvm` helper utility for streamlined management of the LLVM framework dependency.
 - Initial support for running `resolc` in the browser.
 ### Changed
 - Suported contracts runtime is polkadot-sdk git version `d62a90c8c729acd98c7e9a5cab9803b8b211ffc5`.
 - The minimum supported Rust version is `1.81.0`.
 - Error out early instead of invoking `solc` with invalid base or include path flags.
 ### Fixed
 - Decouple the LLVM target dependency from the LLVM host dependency.
 - Do not error out if no files and no errors were produced. This aligns resolc closer to solc.
 - Fixes input normalization in the Wasm version.
@@ -249,30 +67,26 @@ This is a development pre-release.
 This is a development pre-release.
 ### Added
 - Implement the `GASPRICE` opcode.
 - Implement the `BASEFEE` opcode.
 - Implement the `GASLIMIT` opcode.
 ### Changed
 - The `GAS` opcode now returns the remaining `ref_time`.
 - Contracts can now be supplied call data input of arbitrary size.
- Some syscalls now return the value in a register, slightly improving emitted contract code.
+- Some syscalls now return the value in a register, slightly improving  emitted contract code.
 - Calls forward maximum weight limits instead of 0, anticipating a change in polkadot-sdk where weight limits of 0 no longer interprets as uncapped limit.
 ### Fixed
-
+- A linker bug which was preventing certain contracts from linking with the PVM linker. 
 - A linker bug which was preventing certain contracts from linking with the PVM linker.
 - JS: Fix encoding conversion from JS string (UTF-16) to UTF-8.
- The git commit hash slug is always displayed in the version string.
+- The git commit hash slug is always displayed in the version string. 
 ## v0.1.0-dev.6
 This is a development pre-release.
 # Added
 - Implement the `BLOCKHASH` opcode.
 - Implement delegate calls.
 - Implement the `GASPRICE` opcode. Currently hard-coded to return `1`.
@@ -280,24 +94,21 @@ This is a development pre-release.
 - Initial support for emitting debug info (opt in via the `-g` flag)
 # Changed
 - resolc now emits 64bit PolkaVM blobs, reducing contract code size and execution time.
 - The RISC-V bit-manipulation target feature (`zbb`) is enabled.
 # Fixed
 - Compilation to Wasm (for usage in node and web browsers)
 ## v0.1.0-dev.5
 This is development pre-release.
 # Added
 - Implement the `CODESIZE` and `EXTCODESIZE` opcodes.
 # Changed
 - Include the full revive version in the contract metadata.
 # Fixed
@@ -307,11 +118,9 @@ This is development pre-release.
 This is development pre-release.
 # Added
 - Support the `ORIGIN` opcode.
 # Changed
 - Update polkavm to `v0.14.0`.
 - Enable the `a`, `fast-unaligned-access` and `xtheadcondmov` LLVM target features, decreasing the code size for some contracts.
@@ -3,7 +3,7 @@ resolver = "2"
 members = ["crates/*"]
 [workspace.package]
-version = "0.1.0"
+version = "0.1.0-dev.10"
 authors = [
    "Cyrill Leutwiler <cyrill@parity.io>",
    "Parity Technologies <admin@parity.io>",
@@ -11,78 +11,75 @@ authors = [
 license = "MIT/Apache-2.0"
 edition = "2021"
 repository = "https://github.com/paritytech/revive"
-rust-version = "1.85.0"
+rust-version = "1.81.0"
 [workspace.dependencies]
-lld-sys = { version = "0.1.0", path = "crates/lld-sys" }
+revive-benchmarks = { version = "0.1.0-dev.10", path = "crates/benchmarks" }
-resolc = { version = "0.4.0", path = "crates/resolc", default-features = false }
+revive-builtins = { version = "0.1.0-dev.10", path = "crates/builtins" }
-revive-benchmarks = { version = "0.1.0", path = "crates/benchmarks" }
+revive-common = { version = "0.1.0-dev.10", path = "crates/common" }
-revive-build-utils = { version = "0.2.0", path = "crates/build-utils" }
+revive-differential = { version = "0.1.0-dev.10", path = "crates/differential" }
-revive-builtins = { version = "0.1.0", path = "crates/builtins" }
+revive-integration = { version = "0.1.0-dev.10", path = "crates/integration" }
-revive-common = { version = "0.2.1", path = "crates/common" }
+revive-linker = { version = "0.1.0-dev.10", path = "crates/linker" }
-revive-differential = { version = "0.2.0", path = "crates/differential" }
+lld-sys = { version = "0.1.0-dev.10", path = "crates/lld-sys" }
-revive-explorer = { version = "0.1.0", path = "crates/explore" }
+revive-llvm-context = { version = "0.1.0-dev.10", path = "crates/llvm-context" }
-revive-integration = { version = "0.2.0", path = "crates/integration" }
+revive-runtime-api = { version = "0.1.0-dev.10", path = "crates/runtime-api" }
-revive-linker = { version = "0.2.0", path = "crates/linker" }
+revive-runner = { version = "0.1.0-dev.10", path = "crates/runner" }
-revive-llvm-context = { version = "0.4.1", path = "crates/llvm-context" }
+revive-solidity = { version = "0.1.0-dev.10", path = "crates/solidity" }
-revive-runner = { version = "0.2.0", path = "crates/runner" }
+revive-stdlib = { version = "0.1.0-dev.10", path = "crates/stdlib" }
-revive-runtime-api = { version = "0.3.0", path = "crates/runtime-api" }
+revive-build-utils = { version = "0.1.0-dev.10", path = "crates/build-utils" }
 revive-solc-json-interface = { version = "0.4.0", path = "crates/solc-json-interface", default-features = false }
 revive-stdlib = { version = "0.2.0", path = "crates/stdlib" }
 revive-yul = { version = "0.3.1", path = "crates/yul" }
 hex = "0.4.3"
 cc = "1.2"
-libc = "0.2.172"
+libc = "0.2.169"
-tempfile = "3.20"
+tempfile = "3.16"
 anyhow = "1.0"
 semver = { version = "1.0", features = ["serde"] }
 itertools = "0.14"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = { version = "1.0", features = ["arbitrary_precision"] }
-regex = "1.11"
+regex = "1.10"
-once_cell = "1.21"
+once_cell = "1.20"
 num = "0.4.3"
 sha1 = "0.10"
 sha3 = "0.10"
 thiserror = "2.0"
 which = "7.0"
 path-slash = "0.2"
-rayon = "1.10"
+rayon = "1.8"
 clap = { version = "4", default-features = false, features = ["derive"] }
-polkavm-common = "0.24.0"
+polkavm-common = "0.21.0"
-polkavm-linker = "0.24.0"
+polkavm-linker = "0.21.0"
-polkavm-disassembler = "0.24.0"
+polkavm-disassembler = "0.21.0"
-polkavm = "0.24.0"
+polkavm = "0.21.0"
-alloy-primitives = { version = "1.1", features = ["serde"] }
+alloy-primitives = { version = "0.8.21", features = ["serde"] }
-alloy-sol-types = "1.1"
+alloy-sol-types = "0.8.21"
-alloy-genesis = "1.0"
+alloy-genesis = "0.11.0"
-alloy-serde = "1.0"
+alloy-serde = "0.11.0"
-env_logger = { version = "0.11.8", default-features = false }
+env_logger = { version = "0.11.6", default-features = false }
-serde_stacker = "0.1.12"
+serde_stacker = "0.1.11"
-criterion = { version = "0.6", features = ["html_reports"] }
+criterion = { version = "0.5.1", features = ["html_reports"] }
-log = { version = "0.4.27" }
+log = { version = "0.4.25" }
-git2 = { version = "0.20.2", default-features = false }
+git2 = { version = "0.20.0", default-features = false }
 downloader = "0.2.8"
-flate2 = "1.1"
+flate2 = "1.0.35"
-fs_extra = "1.3"
+fs_extra = "1.3.0"
 num_cpus = "1"
 tar = "0.4"
 toml = "0.8"
 assert_cmd = "2.0"
 assert_fs = "1.1"
 normpath = "1.3"
 # polkadot-sdk and friends
-codec = { version = "3.7.5", default-features = false, package = "parity-scale-codec" }
+codec = { version = "3.6.12", default-features = false, package = "parity-scale-codec" }
 scale-info = { version = "2.11.6", default-features = false }
-polkadot-sdk = { version = "2503.0.1" }
+polkadot-sdk = { git = "https://github.com/paritytech/polkadot-sdk", branch = "at/disable-validation" }
 # llvm
 [workspace.dependencies.inkwell]
-version = "0.6.0"
+git = "https://github.com/TheDan64/inkwell.git"
 rev = "7b410298b6a93450adaa90b1841d5805a3038f12"
 default-features = false
-features = ["serde", "llvm18-1", "no-libffi-linking", "target-riscv"]
+features = ["serde", "llvm18-0", "no-libffi-linking", "target-riscv"]
 [profile.bench]
 inherits = "release"
@@ -1,4 +1,4 @@
-FROM rust:1.85.0 AS llvm-builder
+FROM rust:1.84.0 AS llvm-builder
 WORKDIR /opt/revive
 RUN apt update && \ 
@@ -11,7 +11,7 @@ RUN make install-llvm-builder
 RUN revive-llvm --target-env musl clone
 RUN revive-llvm --target-env musl build  --llvm-projects lld --llvm-projects clang
-FROM messense/rust-musl-cross@sha256:c0154e992adb791c3b848dd008939d19862549204f8cb26f5ca7a00f629e6067 AS resolc-builder
+FROM messense/rust-musl-cross:x86_64-musl AS resolc-builder
 WORKDIR /opt/revive
 RUN apt update && \ 
@@ -5,16 +5,14 @@
 	install-wasm \
 	install-llvm-builder \
 	install-llvm \
 	install-revive-runner \
 	install-revive-explorer \
 	format \
 	clippy \
 	doc \
 	machete \
 	test \
 	test-integration \
-	test-resolc \
+	test-solidity \
 	test-workspace \
 	test-cli \
 	test-wasm \
 	test-llvm-builder
 	bench \
@@ -25,52 +23,46 @@
 install: install-bin install-npm
 install-bin:
-	cargo install --force --locked --path crates/resolc
+	cargo install --path crates/solidity
 install-npm:
 	npm install && npm fund
 install-wasm: install-npm
-	cargo build --target wasm32-unknown-emscripten -p resolc --release --no-default-features
+	cargo build --target wasm32-unknown-emscripten -p revive-solidity --release --no-default-features
 	npm run build:package
 install-llvm-builder:
-	cargo install --force --locked --path crates/llvm-builder
+	cargo install --path crates/llvm-builder
 install-llvm: install-llvm-builder
 	revive-llvm clone
 	revive-llvm build --llvm-projects lld --llvm-projects clang
 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
 clippy:
 	cargo clippy --all-features --workspace --tests --benches -- --deny warnings
 doc:
 	cargo doc --all-features --workspace --document-private-items --no-deps
 machete:
 	cargo install cargo-machete
 	cargo machete
-test: format clippy machete test-workspace install-revive-runner install-revive-explorer doc
+test: format clippy machete test-cli test-workspace
 test-integration: install-bin
 	cargo test --package revive-integration
-test-resolc: install
+test-solidity: install
-	cargo test --package resolc
+	cargo test --package revive-solidity
 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
@@ -94,6 +86,9 @@ clean:
 	cargo clean ; \
 	revive-llvm clean ; \
 	rm -rf node_modules ; \
-	rm -rf crates/resolc/src/tests/cli/artifacts ; \
+	rm -rf crates/solidity/src/tests/cli-tests/artifacts ; \
-	cargo uninstall resolc ; \
+	cargo uninstall revive-solidity ; \
-	cargo uninstall revive-llvm-builder ;
+	cargo uninstall revive-llvm-builder ; \
 	rm -f package-lock.json ; \
 	rm -rf js/dist ; \
 	rm -f js/src/resolc.{wasm,js}
@@ -1,5 +1,5 @@
-![CI](https://github.com/paritytech/revive/actions/workflows/test.yml/badge.svg)
+![CI](https://github.com/paritytech/revive/actions/workflows/rust.yml/badge.svg)
-[![Docs](https://img.shields.io/badge/Docs-contracts.polkadot.io-brightgreen.svg)](https://contracts.polkadot.io/revive_compiler/)
+[![Docs](https://img.shields.io/badge/Docs-contracts.polkadot.io-brightgreen.svg)](https://contracts.polkadot.io)
 # revive
@@ -14,39 +14,10 @@ This is experimental software in active development and not ready just yet for p
 Discussion around the development is hosted on the [Polkadot Forum](https://forum.polkadot.network/t/contracts-update-solidity-on-polkavm/6949#a-new-solidity-compiler-1).
 ## Installation
 Building Solidity contracts for PolkaVM requires installing the following two compilers:
 - `resolc`: The revive Solidity compiler YUL frontend and PolkaVM code generator (provided by this repository).
 - `solc`: The [Ethereum Solidity reference compiler](https://github.com/ethereum/solidity/) implemenation.`resolc` uses `solc` during the compilation process, please refer to the [Ethereum Solidity documentation](https://docs.soliditylang.org/en/latest/installing-solidity.html) for installation instructions.
-### `resolc` binary releases
+`resolc` depends on the [solc](https://github.com/ethereum/solidity) binary installed on your system.
 `resolc` is distributed as a standalone binary (with `solc` as the only external dependency). Please download one of our [binary releases](https://github.com/paritytech/revive/releases) for your target platform and mind the platform specific instructions below.
-<details>
+Download and install the `resolc` frontend executable for your platform from our [releases](https://github.com/paritytech/revive/releases).
  <summary>MacOS users</summary>
 > **MacOS** users need to clear the `downloaded` attribute from the binary and set the executable flag.
 > ```sh
 > xattr -rc resolc-universal-apple-darwin
 > chmod +x resolc-universal-apple-darwin
 > ```
 </details>
 <details>
  <summary>Linux users</summary>
 > **Linux** users need to set the executable flag.
 > ```sh
 > chmod +x resolc-x86_64-unknown-linux-musl
 > ```
 </details>
 ### `resolc` NPM package
 We distribute the revive compiler as [node.js module](https://www.npmjs.com/package/@parity/resolc) and [hardhat plugin](https://www.npmjs.com/package/@parity/hardhat-polkadot-resolc).
 Note: The `solc` dependency is bundled via NPM packaging and defaults to the latest supported version.
 ## Building from source
@@ -54,44 +25,22 @@ Building revive requires a [stable Rust installation](https://rustup.rs/) and a
 ### LLVM
-`revive` depends on a custom build of LLVM `v18.1.8` with the RISC-V _embedded_ target, including the `compiler-rt` builtins. You can either download a build from our releases (recommended for older hardware) or build it from source.
+`revive` depends on a custom build of LLVM `v18.1.8` with the RISC-V _embedded_ target, including the `compiler-rt` builtins. 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.
-<details>
+The `Makefile` provides a shortcut target to obtain a compatible LLVM build:
  <summary>Download from our LLVM releases</summary>
-Download the [latest LLVM build](https://github.com/paritytech/revive/releases?q=LLVM+binaries+release&expanded=true) from our releases.
+```bash
 > **MacOS** users need to clear the `downloaded` attribute from all binaries after extracting the archive:
 > ```sh
 > xattr -rc </path/to/the/extracted/archive>/target-llvm/gnu/target-final/bin/*
 > ```
 After extracting the archive, point `$LLVM_SYS_181_PREFIX` to it:
 ```sh
 export LLVM_SYS_181_PREFIX=</path/to/the/extracted/archive>/target-llvm/gnu/target-final
 ```
 </details>
 <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:
 ```sh
 make install-llvm
 export LLVM_SYS_181_PREFIX=${PWD}/target-llvm/gnu/target-final
 ```
 </details>
 ### The `resolc` Solidity frontend
-To build the `resolc` Solidity frontend executable, make sure you have obtained a compatible LLVM build and did export the `LLVM_SYS_181_PREFIX` environment variable pointing to it (see [above](#LLVM)).
+To build the `resolc` Solidity frontend executable, make sure you have obtained a compatible LLVM build using [revive-llvm](crates/llvm-builder/README.md) and did export the `LLVM_SYS_181_PREFIX` environment variable pointing to it (see [above](#LLVM)).
 To install the `resolc` Solidity frontend executable:
-```sh
+```bash
 make install-bin
 resolc --version
 ```
@@ -100,10 +49,7 @@ resolc --version
 Cross-compile the `resolc.js` frontend executable to Wasm for running it in a Node.js or browser environment. The `REVIVE_LLVM_TARGET_PREFIX` environment variable is used to control the target environment LLVM dependency.
-<details>
+```bash
  <summary>Instructions for cross-compilation to wasm32-unknown-emscripten</summary>
 ```sh
 # Build the host LLVM dependency with PolkaVM target support
 make install-llvm
 export LLVM_SYS_181_PREFIX=${PWD}/target-llvm/gnu/target-final
@@ -119,26 +65,21 @@ make install-wasm
 make test-wasm
 ```
-</details>
+### Development
 ## Development
 Please consult the [Makefile](Makefile) targets to learn how to run tests and benchmarks. 
 Ensure that your branch passes `make test` locally when submitting a pull request.
-### Design overview
+## Design overview
 See the [relevant section in our documentation](https://contracts.polkadot.io/revive_compiler/architecture) to learn more about how the compiler works. 
-### Tests
+`revive` uses [solc](https://github.com/ethereum/solidity/), the Ethereum Solidity compiler, as the [Solidity frontend](crates/solidity/src/lib.rs) to process smart contracts written in Solidity. The YUL IR code (or legacy EVM assembly as a fallback for older `solc` versions) emitted by `solc` is then translated to LLVM IR, targetting [Polkadots `revive` pallet](https://docs.rs/pallet-revive/latest/pallet_revive/trait.SyscallDoc.html).
 [Frontend](https://github.com/matter-labs/era-compiler-solidity) and [code generator](https://github.com/matter-labs/era-compiler-llvm-context) are based of ZKSync `zksolc`.
 ## Tests
 Before running the tests, ensure that Geth (Go Ethereum) is installed on your system. Follow the installation guide here: [Installing Geth](https://geth.ethereum.org/docs/getting-started/installing-geth).
 Once Geth is installed, you can run the tests using the following command:
-```sh
+```bash
 make test
 ```
 # Acknowledgements
 The revive compiler project, after some early experiments with EVM bytecode translations, decided to fork the `era-compiler` framework.
 [Frontend](https://github.com/matter-labs/era-compiler-solidity), [code generator](https://github.com/matter-labs/era-compiler-llvm-context) and some supporting libraries are based of ZKSync `zksolc`. I'd like to express my gratitude and thank the original authors for providing a useable code base under a generous license.
@@ -4,26 +4,8 @@ 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:
+1. Merge a release PR which updates the `-dev.X` versions in the workspace `Cargo.toml` and updates the `CHANGELOG.md` accordingly
-  - Updates the versions in the workspace `Cargo.toml`
+2. Push a release tag to `main`
-  - Updates the version in each crate `Cargo.toml`
+3. Create a __pre-release__ from the tag and manually upload the `resolc` binary from docker image
-  - Updates the version of the NPM package in `js/resolc/package.json`
+4. Manually upload `resolc.js`, `resolc-web.js` and `resolc.wasm` from the `build-revive-wasm` action artifacts.
-  - Updates the `CHANGELOG.md` to reflect all observable changes
+5. Update the [contract-docs](https://github.com/paritytech/contract-docs/) 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.
 5. Wait for the `Release` workflow to finish. It should create the pre-release with the same name.
 6. Check that pre-release was created on the [Releases page](https://github.com/paritytech/revive/releases) with all artifacts.
 7. After the release is published, another workflow should start automatically and update json files in https://github.com/paritytech/resolc-bin. Check the changes.
 8. Update the [contract-docs](https://github.com/paritytech/contract-docs/) accordingly
 # `resolc` NPM package release
 Will happen automatically.
 # LLVM release
 To create a new LLVM release, run "Release LLVM" workflow. Use current LLVM version as parameter, e.g. `18.1.8`.
 Version suffix will be resolved automatically.  
 The workflows will create new GitHub release, and upload LLVM binaries.
 Next release of resolc will use newly created binaries.  
@@ -0,0 +1,30 @@
 # Known issues
 The following is known and we are either working on it or it is a hard limitation. Please do not open a new issue.
 ## Release
 `0.1.0-dev-2`
 ## Missing features
 - [Libraries with public functions are not supported](https://github.com/paritytech/revive/issues/91)
 - [Automatic import resolution is not supported](https://github.com/paritytech/revive/issues/98)
 - The emulated EVM linear contract memory is limited to 64kb in size. Will be fixed with support for metered dynamic memory.
 - [The contract calldata is currently limited to 1kb in size](https://github.com/paritytech/revive/issues/57)
 - [EIP-4844 opcodes are not supported](https://github.com/paritytech/revive/issues/64)
 - [Delegate calls are not supported](https://github.com/paritytech/revive/issues/67)
 - [The `blockhash` opcode is not supported](https://github.com/paritytech/revive/issues/61)
 - [The `extcodesize` opcode is not supported](https://github.com/paritytech/revive/issues/58)
 - [The `origin` opcode is not supported](https://github.com/paritytech/revive/issues/59)
 - [Gas limits for contract calls are ignored](https://github.com/paritytech/revive/issues/60)
 - [Gas related opcodes are not supported](https://github.com/paritytech/revive/issues/60)
 - IPFS metadata hashes are not supported
 - [Compiled contract artifacts can exceed the pallet static memory limit and fail to deploy](https://github.com/paritytech/revive/issues/96).
 - [Transfers to inexistant accounts will fail if the transferred value lies below the ED.](https://github.com/paritytech/revive/issues/83) Will be fixed in the pallet to make the ED completely transparent for contracts.
 ## Wontfix
 Please consult our documentation to learn more about Solidity and EVM features likely to remain unsupported (and why they will not be supported).
 TODO: Insert link to the relevant documentation section.
@@ -1 +0,0 @@
 large-error-threshold = 192
@@ -15,58 +15,58 @@
 ### Baseline
-|         | `EVM`                    | `PVMInterpreter`                 |
+|         | `EVM`                   | `PVMInterpreter`                 |
-|:--------|:-------------------------|:-------------------------------- |
+|:--------|:------------------------|:-------------------------------- |
-| **`0`** | `10.08 us` (✅ **1.00x**) | `10.32 us` (✅ **1.02x slower**)  |
+| **`0`** | `3.36 us` (✅ **1.00x**) | `11.84 us` (❌ *3.52x slower*)    |
 ### OddPorduct
-|              | `EVM`                     | `PVMInterpreter`                 |
+|              | `EVM`                    | `PVMInterpreter`                 |
-|:-------------|:--------------------------|:-------------------------------- |
+|:-------------|:-------------------------|:-------------------------------- |
-| **`10000`**  | `3.60 ms` (✅ **1.00x**)   | `1.57 ms` (🚀 **2.28x faster**)   |
+| **`10000`**  | `3.11 ms` (✅ **1.00x**)  | `1.53 ms` (🚀 **2.03x faster**)   |
-| **`100000`** | `34.72 ms` (✅ **1.00x**)  | `14.82 ms` (🚀 **2.34x faster**)  |
+| **`100000`** | `30.70 ms` (✅ **1.00x**) | `15.54 ms` (🚀 **1.98x faster**)  |
-| **`300000`** | `105.01 ms` (✅ **1.00x**) | `44.11 ms` (🚀 **2.38x faster**)  |
+| **`300000`** | `92.68 ms` (✅ **1.00x**) | `45.47 ms` (🚀 **2.04x faster**)  |
 ### TriangleNumber
 |              | `EVM`                    | `PVMInterpreter`                 |
 |:-------------|:-------------------------|:-------------------------------- |
-| **`10000`**  | `2.43 ms` (✅ **1.00x**)  | `1.12 ms` (🚀 **2.17x faster**)   |
+| **`10000`**  | `2.29 ms` (✅ **1.00x**)  | `1.09 ms` (🚀 **2.11x faster**)   |
-| **`100000`** | `24.20 ms` (✅ **1.00x**) | `10.86 ms` (🚀 **2.23x faster**)  |
+| **`100000`** | `22.84 ms` (✅ **1.00x**) | `10.66 ms` (🚀 **2.14x faster**)  |
-| **`360000`** | `88.69 ms` (✅ **1.00x**) | `38.46 ms` (🚀 **2.31x faster**)  |
+| **`360000`** | `82.29 ms` (✅ **1.00x**) | `37.01 ms` (🚀 **2.22x faster**)  |
 ### FibonacciRecursive
 |          | `EVM`                     | `PVMInterpreter`                  |
 |:---------|:--------------------------|:--------------------------------- |
-| **`12`** | `144.17 us` (✅ **1.00x**) | `150.85 us` (✅ **1.05x slower**)  |
+| **`12`** | `135.67 us` (✅ **1.00x**) | `125.02 us` (✅ **1.09x faster**)  |
-| **`16`** | `938.71 us` (✅ **1.00x**) | `922.11 us` (✅ **1.02x faster**)  |
+| **`16`** | `903.75 us` (✅ **1.00x**) | `762.79 us` (✅ **1.18x faster**)  |
-| **`20`** | `6.54 ms` (✅ **1.00x**)   | `6.20 ms` (✅ **1.05x faster**)    |
+| **`20`** | `6.12 ms` (✅ **1.00x**)   | `4.96 ms` (✅ **1.23x faster**)    |
-| **`24`** | `45.73 ms` (✅ **1.00x**)  | `41.98 ms` (✅ **1.09x faster**)   |
+| **`24`** | `42.05 ms` (✅ **1.00x**)  | `33.86 ms` (✅ **1.24x faster**)   |
 ### FibonacciIterative
 |           | `EVM`                    | `PVMInterpreter`                 |
 |:----------|:-------------------------|:-------------------------------- |
-| **`64`**  | `23.00 us` (✅ **1.00x**) | `31.88 us` (❌ *1.39x slower*)    |
+| **`64`**  | `15.04 us` (✅ **1.00x**) | `29.45 us` (❌ *1.96x slower*)    |
-| **`128`** | `35.28 us` (✅ **1.00x**) | `42.43 us` (❌ *1.20x slower*)    |
+| **`128`** | `26.36 us` (✅ **1.00x**) | `42.19 us` (❌ *1.60x slower*)    |
-| **`256`** | `60.12 us` (✅ **1.00x**) | `61.20 us` (✅ **1.02x slower**)  |
+| **`256`** | `48.61 us` (✅ **1.00x**) | `65.71 us` (❌ *1.35x slower*)    |
 ### FibonacciBinet
 |           | `EVM`                    | `PVMInterpreter`                 |
 |:----------|:-------------------------|:-------------------------------- |
-| **`64`**  | `23.01 us` (✅ **1.00x**) | `47.74 us` (❌ *2.07x slower*)    |
+| **`64`**  | `15.22 us` (✅ **1.00x**) | `41.46 us` (❌ *2.72x slower*)    |
-| **`128`** | `25.44 us` (✅ **1.00x**) | `49.67 us` (❌ *1.95x slower*)    |
+| **`128`** | `17.05 us` (✅ **1.00x**) | `42.84 us` (❌ *2.51x slower*)    |
-| **`256`** | `28.66 us` (✅ **1.00x**) | `53.01 us` (❌ *1.85x slower*)    |
+| **`256`** | `19.00 us` (✅ **1.00x**) | `44.36 us` (❌ *2.34x slower*)    |
 ### SHA1
 |           | `EVM`                     | `PVMInterpreter`                  |
 |:----------|:--------------------------|:--------------------------------- |
-| **`1`**   | `135.87 us` (✅ **1.00x**) | `243.75 us` (❌ *1.79x slower*)    |
+| **`1`**   | `110.04 us` (✅ **1.00x**) | `216.11 us` (❌ *1.96x slower*)    |
-| **`64`**  | `258.45 us` (✅ **1.00x**) | `355.70 us` (❌ *1.38x slower*)    |
+| **`64`**  | `209.04 us` (✅ **1.00x**) | `309.48 us` (❌ *1.48x slower*)    |
-| **`512`** | `1.10 ms` (✅ **1.00x**)   | `1.09 ms` (✅ **1.01x faster**)    |
+| **`512`** | `903.65 us` (✅ **1.00x**) | `980.49 us` (✅ **1.09x slower**)  |
 ---
 Made with [criterion-table](https://github.com/nu11ptr/criterion-table)
@@ -1,6 +1,6 @@
 [package]
 name = "revive-build-utils"
-version = "0.2.0"
+version.workspace = true
 license.workspace = true
 edition.workspace = true
 repository.workspace = true
@@ -6,10 +6,6 @@ pub const REVIVE_LLVM_HOST_PREFIX: &str = "LLVM_SYS_181_PREFIX";
 /// The revive LLVM target dependency directory prefix environment variable.
 pub const REVIVE_LLVM_TARGET_PREFIX: &str = "REVIVE_LLVM_TARGET_PREFIX";
 /// The revive LLVM host tool help link.
 pub const REVIVE_LLVM_BUILDER_HELP_LINK: &str =
    "https://github.com/paritytech/revive?tab=readme-ov-file#building-from-source";
 /// Constructs a path to the LLVM tool `name`.
 ///
 /// Respects the [`REVIVE_LLVM_HOST_PREFIX`] environment variable.
@@ -17,7 +13,9 @@ pub fn llvm_host_tool(name: &str) -> std::path::PathBuf {
    std::env::var_os(REVIVE_LLVM_HOST_PREFIX)
        .map(Into::<std::path::PathBuf>::into)
        .unwrap_or_else(|| {
-            panic!("install LLVM using the revive-llvm builder and export '{REVIVE_LLVM_HOST_PREFIX}'; see also: {REVIVE_LLVM_BUILDER_HELP_LINK}")
+            panic!(
                "install LLVM using the revive-llvm builder and export {REVIVE_LLVM_HOST_PREFIX}",
            )
        })
        .join("bin")
        .join(name)
@@ -1,6 +1,6 @@
 [package]
 name = "revive-common"
-version = "0.2.1"
+version.workspace = true
 license.workspace = true
 edition.workspace = true
 repository.workspace = true
@@ -15,8 +15,6 @@ doctest = false
 [dependencies]
 anyhow = { workspace = true }
 hex = { workspace = true }
 sha3 = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true, features = [ "arbitrary_precision", "unbounded_depth" ] }
 serde_stacker = { workspace = true }
@@ -1,33 +0,0 @@
 //! The contract identifier helper library.
 use serde::{Deserialize, Serialize};
 /// This structure simplifies passing the contract identifiers through the compilation pipeline.
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct ContractIdentifier {
    /// The absolute file path.
    pub path: String,
    /// The contract name.
    /// Is set for Solidity contracts only. Otherwise it would be equal to the file name.
    pub name: Option<String>,
    /// The full contract identifier.
    /// For Solidity, The format is `<absolute file path>:<contract name>`.
    /// For other languages, `<absolute file path>`.
    pub full_path: String,
 }
 impl ContractIdentifier {
    /// A shortcut constructor.
    pub fn new(path: String, name: Option<String>) -> Self {
        let full_path = match name {
            Some(ref name) => format!("{path}:{name}"),
            None => path.clone(),
        };
        Self {
            path,
            name,
            full_path,
        }
    }
 }
@@ -37,4 +37,4 @@ pub static EXTENSION_POLKAVM_ASSEMBLY: &str = "pvmasm";
 pub static EXTENSION_POLKAVM_BINARY: &str = "pvm";
 /// The ELF shared object file extension.
-pub static EXTENSION_OBJECT: &str = "o";
+pub static EXTENSION_SHARED_OBJECT: &str = "so";
@@ -1,68 +0,0 @@
 //! Keccak-256 hash utilities.
 use serde::{Deserialize, Serialize};
 use sha3::digest::FixedOutput;
 use sha3::Digest;
 pub const DIGEST_BYTES: usize = 32;
 /// Keccak-256 hash utilities.
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
 pub struct Keccak256 {
    /// Binary representation.
    bytes: [u8; DIGEST_BYTES],
    /// Hexadecimal string representation.
    string: String,
 }
 impl Keccak256 {
    /// Computes the `keccak256` hash for `preimage`.
    pub fn from_slice(preimage: &[u8]) -> Self {
        let bytes = sha3::Keccak256::digest(preimage).into();
        let string = format!("0x{}", hex::encode(bytes));
        Self { bytes, string }
    }
    /// Computes the `keccak256` hash for an array of `preimages`.
    pub fn from_slices<R: AsRef<[u8]>>(preimages: &[R]) -> Self {
        let mut hasher = sha3::Keccak256::new();
        for preimage in preimages.iter() {
            hasher.update(preimage);
        }
        let bytes: [u8; DIGEST_BYTES] = hasher.finalize_fixed().into();
        let string = format!("0x{}", hex::encode(bytes));
        Self { bytes, string }
    }
    /// Returns a reference to the 32-byte SHA-3 hash.
    pub fn as_bytes(&self) -> &[u8] {
        self.bytes.as_slice()
    }
    /// Returns a reference to the hexadecimal string representation.
    pub fn as_str(&self) -> &str {
        self.string.as_str()
    }
    /// Extracts the binary representation.
    pub fn to_vec(&self) -> Vec<u8> {
        self.bytes.to_vec()
    }
 }
 impl std::fmt::Display for Keccak256 {
    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
        write!(f, "{}", self.as_str())
    }
 }
 #[cfg(test)]
 mod tests {
    #[test]
    fn hash_and_stringify_works() {
        assert_eq!(
            super::Keccak256::from_slices(&["foo".as_bytes(), "bar".as_bytes(),]).as_str(),
            "0x38d18acb67d25c8bb9942764b62f18e17054f66a817bd4295423adf9ed98873e"
        );
    }
 }
@@ -3,13 +3,9 @@
 pub(crate) mod base;
 pub(crate) mod bit_length;
 pub(crate) mod byte_length;
 pub(crate) mod contract_identifier;
 pub(crate) mod evm_version;
 pub(crate) mod exit_code;
 pub(crate) mod extension;
 pub(crate) mod keccak256;
 pub(crate) mod metadata;
 pub(crate) mod object;
 pub(crate) mod utils;
 pub use self::base::*;
@@ -18,8 +14,4 @@ pub use self::byte_length::*;
 pub use self::evm_version::EVMVersion;
 pub use self::exit_code::*;
 pub use self::extension::*;
 pub use self::keccak256::*;
 pub use self::metadata::*;
 pub use self::object::*;
 pub use self::utils::*;
 pub use contract_identifier::*;
@@ -1,42 +0,0 @@
 //! The metadata hash type.
 use std::str::FromStr;
 use serde::{Deserialize, Serialize};
 /// The metadata hash type.
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize)]
 pub enum MetadataHash {
    /// Do not include bytecode hash.
    #[serde(rename = "none")]
    None,
    /// Include the `ipfs` hash.
    #[serde(rename = "ipfs")]
    IPFS,
    /// Include the `keccak256`` hash.
    #[serde(rename = "keccak256")]
    Keccak256,
 }
 impl FromStr for MetadataHash {
    type Err = anyhow::Error;
    fn from_str(string: &str) -> Result<Self, Self::Err> {
        match string {
            "none" => Ok(Self::None),
            "ipfs" => Ok(Self::IPFS),
            "keccak256" => Ok(Self::Keccak256),
            string => anyhow::bail!("unknown bytecode hash mode: `{string}`"),
        }
    }
 }
 impl std::fmt::Display for MetadataHash {
    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
        match self {
            Self::None => write!(f, "none"),
            Self::IPFS => write!(f, "ipfs"),
            Self::Keccak256 => write!(f, "keccak256"),
        }
    }
 }
@@ -1,61 +0,0 @@
 //! The revive binary object helper module.
 use std::str::FromStr;
 use serde::{Deserialize, Serialize};
 /// The binary object format.
 ///
 /// Unlinked contracts are stored in a different object format
 /// than final (linked) contract blobs.
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize)]
 pub enum ObjectFormat {
    /// The unlinked ELF object format.
    ELF,
    /// The fully linked PVM format.
    PVM,
 }
 impl ObjectFormat {
    pub const PVM_MAGIC: [u8; 4] = [b'P', b'V', b'M', b'\0'];
    pub const ELF_MAGIC: [u8; 4] = [0x7f, b'E', b'L', b'F'];
 }
 impl FromStr for ObjectFormat {
    type Err = anyhow::Error;
    fn from_str(value: &str) -> Result<Self, Self::Err> {
        match value {
            "ELF" => Ok(Self::ELF),
            "PVM" => Ok(Self::PVM),
            _ => anyhow::bail!(
                "Unknown object format: {value}. Supported formats: {}, {}",
                Self::ELF,
                Self::PVM,
            ),
        }
    }
 }
 impl TryFrom<&[u8]> for ObjectFormat {
    type Error = &'static str;
    fn try_from(value: &[u8]) -> Result<Self, Self::Error> {
        if value.starts_with(&Self::PVM_MAGIC) {
            return Ok(Self::PVM);
        }
        if value.starts_with(&Self::ELF_MAGIC) {
            return Ok(Self::ELF);
        }
        Err("expected a contract object")
    }
 }
 impl std::fmt::Display for ObjectFormat {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        match self {
            Self::ELF => write!(f, "ELF"),
            Self::PVM => write!(f, "PVM"),
        }
    }
 }
@@ -1,45 +1,25 @@
 //! The compiler common utils.
 /// Deserializes a `serde_json` object from slice with the recursion limit disabled.
 ///
 /// Must be used for all JSON I/O to avoid crashes due to the aforementioned limit.
 pub fn deserialize_from_slice<O>(input: &[u8]) -> anyhow::Result<O>
 where
    O: serde::de::DeserializeOwned,
 {
-    let deserializer = serde_json::Deserializer::from_slice(input);
+    let mut deserializer = serde_json::Deserializer::from_slice(input);
-    deserialize(deserializer)
+    deserializer.disable_recursion_limit();
-}
+    let deserializer = serde_stacker::Deserializer::new(&mut deserializer);
-
+    let result = O::deserialize(deserializer)?;
-/// Deserializes a `serde_json` object from string with the recursion limit disabled.
+    Ok(result)
-///
+}
-/// Must be used for all JSON I/O to avoid crashes due to the aforementioned limit.
+
-pub fn deserialize_from_str<O>(input: &str) -> anyhow::Result<O>
+/// Deserializes a `serde_json` object from string with the recursion limit disabled.
-where
+/// Must be used for all JSON I/O to avoid crashes due to the aforementioned limit.
-    O: serde::de::DeserializeOwned,
+pub fn deserialize_from_str<O>(input: &str) -> anyhow::Result<O>
-{
+where
-    let deserializer = serde_json::Deserializer::from_str(input);
+    O: serde::de::DeserializeOwned,
-    deserialize(deserializer)
+{
-}
+    let mut deserializer = serde_json::Deserializer::from_str(input);
 /// Deserializes a `serde_json` object from reader with the recursion limit disabled.
 ///
 /// Must be used for all JSON I/O to avoid crashes due to the aforementioned limit.
 pub fn deserialize_from_reader<R, O>(reader: R) -> anyhow::Result<O>
 where
    R: std::io::Read,
    O: serde::de::DeserializeOwned,
 {
    let deserializer = serde_json::Deserializer::from_reader(reader);
    deserialize(deserializer)
 }
 /// Runs the generic deserializer.
 pub fn deserialize<'de, R, O>(mut deserializer: serde_json::Deserializer<R>) -> anyhow::Result<O>
 where
    R: serde_json::de::Read<'de>,
    O: serde::de::DeserializeOwned,
 {
    deserializer.disable_recursion_limit();
    let deserializer = serde_stacker::Deserializer::new(&mut deserializer);
    let result = O::deserialize(deserializer)?;
@@ -1,7 +1,6 @@
 [package]
 name = "revive-differential"
-description = "utilities for differential testing the revive compiler against EVM"
+version.workspace = true
 version = "0.2.0"
 license.workspace = true
 edition.workspace = true
 authors.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 }
@@ -3,8 +3,8 @@ use std::time::Duration;
 /// Parse a go formatted duration.
 ///
 /// Sources:
-/// - <https://crates.io/crates/go-parse-duration> (fixed an utf8 bug)
+/// - https://crates.io/crates/go-parse-duration (fixed an utf8 bug)
-/// - <https://github.com/golang/go/blob/master/src/time/format.go>
+/// - https://github.com/golang/go/blob/master/src/time/format.go
 pub fn parse_go_duration(value: &str) -> Result<Duration, String> {
    parse_duration(value).map(|ns| Duration::from_nanos(ns.unsigned_abs()))
 }
@@ -1,20 +0,0 @@
 [package]
 name = "revive-explorer"
 version = "0.1.0"
 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.2.0"
+version.workspace = true
 license.workspace = true
 edition.workspace = true
 repository.workspace = true
@@ -13,9 +13,8 @@ alloy-sol-types = { workspace = true }
 hex = { workspace = true }
 serde_json = { workspace = true }
-resolc = { workspace = true }
+revive-solidity = { workspace = true }
 revive-runner = { workspace = true }
 revive-llvm-context = { workspace = true }
 [dev-dependencies]
 sha1 = { workspace = true }
@@ -1,10 +1,10 @@
 {
-  "Baseline": 932,
+  "Baseline": 1110,
-  "Computation": 2313,
+  "Computation": 2389,
-  "DivisionArithmetics": 9103,
+  "DivisionArithmetics": 14822,
-  "ERC20": 17479,
+  "ERC20": 23973,
-  "Events": 1692,
+  "Events": 1605,
-  "FibonacciIterative": 1508,
+  "FibonacciIterative": 2023,
-  "Flipper": 2098,
+  "Flipper": 1989,
-  "SHA1": 8176
+  "SHA1": 17026
 }
@@ -1,81 +0,0 @@
 // SPDX-License-Identifier: GPL-3.0
 pragma solidity ^0.8;
 /* runner.json
 {
    "differential": true,
    "actions": [
        {
            "Upload": {
                "code": {
                    "Solidity": {
                        "contract": "AddModMulMod"
                    }
                }
            }
        },
        {
            "Instantiate": {
                "value": 123123,
                "code": {
                    "Solidity": {
                        "contract": "AddModMulModTester"
                    }
                }
            }
        },
        {
            "VerifyCall": {
                "success": true
            }
        }
    ]
 }
 */
 contract AddModMulMod {
    function test() public returns (uint256) {
        // Note that this only works because computation on literals is done using
        // unbounded integers.
        if ((2**255 + 2**255) % 7 != addmod(2**255, 2**255, 7)) return 1;
        if ((2**255 + 2**255) % 7 != addmod(2**255, 2**255, 7)) return 2;
        return 0;
    }
    function f(uint256 d) public pure returns (uint256) {
        addmod(1, 2, d);
        return 2;
    }
    function g(uint256 d) public pure returns (uint256) {
        mulmod(1, 2, d);
        return 2;
    }
    function h() public pure returns (uint256) {
        mulmod(0, 1, 2);
        mulmod(1, 0, 2);
        addmod(0, 1, 2);
        addmod(1, 0, 2);
        return 2;
    }
 }
 contract AddModMulModTester {
    constructor() payable {
        AddModMulMod c = new AddModMulMod();
        assert(c.test() == 0);
        try c.f(0) returns (uint m) { revert(); } catch Panic(uint errorCode) {
            assert(errorCode == 0x12);
        }
        try c.g(0) returns (uint m) { revert(); } catch Panic(uint errorCode) {
            assert(errorCode == 0x12);
        }
        assert(c.h() == 2);
    } 
 }
@@ -1,33 +0,0 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.28;
 contract Predicted {
    uint public salt;
    constructor(uint _salt) {
        salt = _salt;
    }
 }
 contract AddressPredictor {
    constructor(uint _salt, bytes memory _bytecode) payable {
        address deployed = address(new Predicted{salt: bytes32(_salt)}(_salt));
        address predicted = predictAddress(_salt, _bytecode);
        assert(deployed == predicted);
    }
    function predictAddress(
        uint _foo,
        bytes memory _bytecode
    ) public view returns (address predicted) {
        bytes32 addr = keccak256(
            abi.encodePacked(
                bytes1(0xff),
                address(this),
                bytes32(_foo),
                keccak256(abi.encodePacked(_bytecode, abi.encode(_foo)))
            )
        );
        predicted = address(uint160(uint(addr)));
    }
 }
@@ -1,38 +0,0 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.28;
 /* runner.json
 {
    "differential": true,
    "actions": [
        {
            "Instantiate": {
                "code": {
                    "Solidity": {
                        "contract": "DelegateCaller"
                    }
                }
            }
        },
        {
            "Call": {
                "dest": {
                    "Instantiated": 0
                },
                "data": "e466c6c9"
            }
        }
    ]
 }
 */
 contract DelegateCaller {
    function delegateNoContract() external returns (bool) {
        address testAddress = 0x0000000000000000000000000000000000000000;
        (bool success, ) = testAddress.delegatecall(
            abi.encodeWithSignature("test()")
        );
        return success;
    }
 }
@@ -1,36 +0,0 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.28;
 /* runner.json
 {
    "differential": true,
    "actions": [
        {
            "Instantiate": {
                "code": {
                    "Solidity": {
                        "contract": "FunctionType"
                    }
                }
            }
        },
        {
            "Call": {
                "dest": {
                    "Instantiated": 0
                },
                "data": "b8c9d365"
            }
        }
    ]
 }
 */
 contract FunctionType {
    uint public immutable x = 42;
    function h() public view returns (function() external view returns (uint)) {
        return this.x;
    }
 }
@@ -1,52 +0,0 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.29;
 /* runner.json
 {
    "differential": true,
    "actions": [
        {
            "Instantiate": {
                "code": {
                    "Solidity": {
                        "contract": "LayoutAt"
                    }
                }
            }
        },
        {
            "Call": {
                "dest": {
                    "Instantiated": 0
                },
                "data": "a7a0d537"
            }
        },
        {
            "Call": {
                "dest": {
                    "Instantiated": 0
                },
                "data": "15393349"
            }
        }
    ]
 }
 */
 contract LayoutAt layout at 0xDEADBEEF + 0xCAFEBABE {
    uint[3] public something;
    constructor() payable {
        something[0] = 1337;
        something[1] = 42;
        something[2] = 69;
    }
    function slotOfSomething() public pure returns (uint ret) {
        assembly {
            ret := something.slot
        }
    }
 }
@@ -1,51 +0,0 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8;
 /* runner.json
 {
    "differential": true,
    "actions": [
        {
            "Instantiate": {
                "code": {
                    "Solidity": {
                        "contract": "MCopyOverlap"
                    }
                }
            }
        },
        {
            "Call": {
                "dest": {
                    "Instantiated": 0
                },
                "data": "afdce848"
            }
        }
    ]
 }
 */
 function copy(
    uint dstOffset,
    uint srcOffset,
    uint length
 ) pure returns (bytes memory out) {
    out = hex"2222222222222222333333333333333344444444444444445555555555555555"
    hex"6666666666666666777777777777777788888888888888889999999999999999"
    hex"aaaaaaaaaaaaaaaabbbbbbbbbbbbbbbbccccccccccccccccdddddddddddddddd";
    assembly {
        mcopy(
            add(add(out, 0x20), dstOffset),
            add(add(out, 0x20), srcOffset),
            length
        )
    }
 }
 contract MCopyOverlap {
    function mcopy_to_right_overlap() public pure returns (bytes memory) {
        return copy(0x20, 0x10, 0x30);
    }
 }
@@ -1,40 +0,0 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.28;
 /* runner.json
 {
    "differential": true,
    "actions": [
        {
            "Instantiate": {
                "code": {
                    "Solidity": {
                        "contract": "MLoad"
                    }
                }
            }
        },
        {
            "Call": {
                "dest": {
                    "Instantiated": 0
                },
                "data": "e2179b8e"
            }
        }
    ]
 }
 */
 contract MLoad {
    constructor() payable {
        assert(g() == 0);
    }
    function g() public payable returns (uint m) {
        assembly {
            m := mload(0)
        }
    }
 }
@@ -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)
    }
  }
 }
@@ -15,7 +15,7 @@ pragma solidity ^0.8;
                "Instantiated": 0
            },
            "key": "0000000000000000000000000000000000000000000000000000000000000000",
-            "expected": "0000000000000000000000000000000000000000000000000000000000000001"
+            "expected": "0100000000000000000000000000000000000000000000000000000000000000"
        }
    },
    {
@@ -1,8 +1,7 @@
 use alloy_primitives::{Address, Bytes, I256, U256};
 use alloy_sol_types::{sol, SolCall, SolConstructor};
-use resolc::test_utils::*;
+use revive_solidity::test_utils::*;
 use revive_llvm_context::OptimizerSettings;
 #[derive(Clone)]
 pub struct Contract {
@@ -12,26 +11,6 @@ pub struct Contract {
    pub calldata: Vec<u8>,
 }
 impl Contract {
    pub fn build(calldata: Vec<u8>, name: &'static str, code: &str) -> Self {
        Self {
            name,
            evm_runtime: compile_evm_bin_runtime(name, code),
            pvm_runtime: compile_blob(name, code),
            calldata,
        }
    }
    pub fn build_size_opt(calldata: Vec<u8>, name: &'static str, code: &str) -> Self {
        Self {
            name,
            evm_runtime: compile_evm_bin_runtime(name, code),
            pvm_runtime: compile_blob_with_options(name, code, true, OptimizerSettings::size()),
            calldata,
        }
    }
 }
 macro_rules! case {
    // Arguments:
    //     1. The file name, expect to live under "../contracts/"
@@ -270,19 +249,20 @@ sol!(
 );
 case!("Storage.sol", Storage, transientCall, storage_transient, value: U256);
-sol!(
+impl Contract {
-    contract Predicted {
+    fn build(calldata: Vec<u8>, name: &'static str, code: &str) -> Self {
-        constructor(uint _foo);
+        Self {
            name,
            evm_runtime: compile_evm_bin_runtime(name, code),
            pvm_runtime: compile_blob(name, code),
            calldata,
        }
    }
-    contract AddressPredictor {
+}
        constructor(uint _foo, bytes memory _bytecode) payable;
    }
 );
 case!("AddressPredictor.sol", Predicted, constructorCall, predicted_constructor, salt: U256);
 case!("AddressPredictor.sol", AddressPredictor, constructorCall, address_predictor_constructor, salt: U256, bytecode: Bytes);
 #[cfg(test)]
 mod tests {
    use alloy_primitives::{Bytes, U256};
    use rayon::iter::{IntoParallelIterator, ParallelIterator};
    use serde::{de::Deserialize, Serialize};
    use std::{collections::BTreeMap, fs::File};
@@ -322,47 +302,14 @@ mod tests {
        };
        [
-            (|| {
+            Contract::baseline as fn() -> Contract,
-                Contract::build_size_opt(
+            Contract::flipper as fn() -> Contract,
-                    vec![],
+            (|| Contract::odd_product(0)) as fn() -> Contract,
-                    "Baseline",
+            (|| Contract::fib_iterative(U256::ZERO)) as fn() -> Contract,
-                    include_str!("../contracts/Baseline.sol"),
+            Contract::erc20 as fn() -> Contract,
-                )
+            (|| Contract::sha1(Bytes::new())) as fn() -> Contract,
-            }) as _,
+            (|| Contract::division_arithmetics_div(U256::ZERO, U256::ZERO)) as fn() -> Contract,
-            (|| {
+            (|| Contract::event(U256::ZERO)) as fn() -> Contract,
                Contract::build_size_opt(
                    vec![],
                    "Flipper",
                    include_str!("../contracts/flipper.sol"),
                )
            }) as _,
            (|| {
                Contract::build_size_opt(
                    vec![],
                    "Computation",
                    include_str!("../contracts/Computation.sol"),
                )
            }) as _,
            (|| {
                Contract::build_size_opt(
                    vec![],
                    "FibonacciIterative",
                    include_str!("../contracts/Fibonacci.sol"),
                )
            }) as _,
            (|| Contract::build_size_opt(vec![], "ERC20", include_str!("../contracts/ERC20.sol")))
                as _,
            (|| Contract::build_size_opt(vec![], "SHA1", include_str!("../contracts/SHA1.sol")))
                as _,
            (|| {
                Contract::build_size_opt(
                    vec![],
                    "DivisionArithmetics",
                    include_str!("../contracts/DivisionArithmetics.sol"),
                )
            }) as _,
            (|| Contract::build_size_opt(vec![], "Events", include_str!("../contracts/Events.sol")))
                as _,
        ]
        .into_par_iter()
        .map(extract_code_size)
@@ -33,7 +33,6 @@ test_spec!(msize, "MSize", "MSize.sol");
 test_spec!(sha1, "SHA1", "SHA1.sol");
 test_spec!(block, "Block", "Block.sol");
 test_spec!(mcopy, "MCopy", "MCopy.sol");
 test_spec!(mcopy_overlap, "MCopyOverlap", "MCopyOverlap.sol");
 test_spec!(events, "Events", "Events.sol");
 test_spec!(storage, "Storage", "Storage.sol");
 test_spec!(mstore8, "MStore8", "MStore8.sol");
@@ -56,12 +55,6 @@ test_spec!(create2, "CreateB", "Create2.sol");
 test_spec!(transfer, "Transfer", "Transfer.sol");
 test_spec!(send, "Send", "Send.sol");
 test_spec!(function_pointer, "FunctionPointer", "FunctionPointer.sol");
 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");
 test_spec!(add_mod_mul_mod, "AddModMulModTester", "AddModMulMod.sol");
 fn instantiate(path: &str, contract: &str) -> Vec<SpecsAction> {
    vec![Instantiate {
@@ -488,31 +481,3 @@ fn transfer_denies_reentrancy() {
    }
    .run();
 }
 #[test]
 fn create2_salt() {
    let salt = U256::from(777);
    let predicted = Contract::predicted_constructor(salt).pvm_runtime;
    let predictor = Contract::address_predictor_constructor(salt, predicted.clone().into());
    Specs {
        actions: vec![
            Upload {
                origin: TestAddress::Alice,
                code: Code::Bytes(predicted),
                storage_deposit_limit: None,
            },
            Instantiate {
                origin: TestAddress::Alice,
                value: 0,
                gas_limit: Some(GAS_LIMIT),
                storage_deposit_limit: None,
                code: Code::Bytes(predictor.pvm_runtime),
                data: predictor.calldata,
                salt: OptionalHex::default(),
            },
        ],
        differential: false,
        ..Default::default()
    }
    .run();
 }
@@ -1,6 +1,6 @@
 [package]
 name = "revive-linker"
-version = "0.2.0"
+version.workspace = true
 license.workspace = true
 edition.workspace = true
 repository.workspace = true
@@ -8,10 +8,10 @@ authors.workspace = true
 description = "revive compiler linker utils"
 [dependencies]
 anyhow = { workspace = true }
 libc = { workspace = true }
 polkavm-linker = { workspace = true }
 tempfile = { workspace = true }
 polkavm-linker = { workspace = true }
 libc = { workspace = true }
 anyhow = { workspace = true }
 lld-sys = { workspace = true }
 revive-builtins = { workspace = true }
 lld-sys = { workspace = true }
@@ -1,114 +0,0 @@
 //! The revive ELF object linker library.
 use std::{ffi::CString, fs, path::PathBuf, sync::Mutex};
 use lld_sys::LLDELFLink;
 use tempfile::TempDir;
 use revive_builtins::COMPILER_RT;
 static GUARD: Mutex<()> = Mutex::new(());
 /// The revive ELF object linker.
 pub struct ElfLinker {
    temporary_directory: TempDir,
    output_path: PathBuf,
    object_path: PathBuf,
    symbols_path: PathBuf,
    linker_script_path: PathBuf,
 }
 impl ElfLinker {
    const LINKER_SCRIPT: &str = r#"
 SECTIONS {
    .text : { KEEP(*(.text.polkavm_export)) *(.text .text.*) }
 }"#;
    const BUILTINS_ARCHIVE_FILE: &str = "libclang_rt.builtins-riscv64.a";
    const BUILTINS_LIB_NAME: &str = "clang_rt.builtins-riscv64";
    /// The setup routine prepares a temporary working directory.
    pub fn setup() -> anyhow::Result<Self> {
        let temporary_directory = TempDir::new()?;
        let object_path = temporary_directory.path().join("obj.o");
        let output_path = temporary_directory.path().join("out.o");
        let symbols_path = temporary_directory.path().join("sym.o");
        let linker_script_path = temporary_directory.path().join("linker.ld");
        fs::write(&linker_script_path, Self::LINKER_SCRIPT)
            .map_err(|message| anyhow::anyhow!("{message} {linker_script_path:?}",))?;
        let compiler_rt_path = temporary_directory.path().join(Self::BUILTINS_ARCHIVE_FILE);
        fs::write(&compiler_rt_path, COMPILER_RT)
            .map_err(|message| anyhow::anyhow!("{message} {compiler_rt_path:?}"))?;
        Ok(Self {
            temporary_directory,
            output_path,
            object_path,
            symbols_path,
            linker_script_path,
        })
    }
    /// Link `input` with `symbols` and the `compiler_rt` via `LLD`.
    pub fn link<T: AsRef<[u8]>>(self, input: T, symbols: T) -> anyhow::Result<Vec<u8>> {
        fs::write(&self.object_path, input)
            .map_err(|message| anyhow::anyhow!("{message} {:?}", self.object_path))?;
        fs::write(&self.symbols_path, symbols)
            .map_err(|message| anyhow::anyhow!("{message} {:?}", self.symbols_path))?;
        if lld(self
            .create_arguments()
            .into_iter()
            .map(|v| v.to_string())
            .collect())
        {
            return Err(anyhow::anyhow!("ld.lld failed"));
        }
        Ok(fs::read(&self.output_path)?)
    }
    /// The argument creation helper function.
    fn create_arguments(&self) -> Vec<String> {
        [
            "ld.lld",
            "--error-limit=0",
            "--relocatable",
            "--emit-relocs",
            "--no-relax",
            "--unique",
            "--gc-sections",
            self.linker_script_path.to_str().expect("should be utf8"),
            "-o",
            self.output_path.to_str().expect("should be utf8"),
            self.object_path.to_str().expect("should be utf8"),
            self.symbols_path.to_str().expect("should be utf8"),
            "--library-path",
            self.temporary_directory
                .path()
                .to_str()
                .expect("should be utf8"),
            "--library",
            Self::BUILTINS_LIB_NAME,
        ]
        .iter()
        .map(ToString::to_string)
        .collect()
    }
 }
 /// The thread-safe LLD helper function.
 fn lld(arguments: Vec<String>) -> bool {
    let c_strings = arguments
        .into_iter()
        .map(|arg| CString::new(arg).expect("ld.lld args should not contain null bytes"))
        .collect::<Vec<_>>();
    let args: Vec<*const libc::c_char> = c_strings.iter().map(|arg| arg.as_ptr()).collect();
    let _lock = GUARD.lock().expect("ICE: linker mutex should not poison");
    unsafe { LLDELFLink(args.as_ptr(), args.len()) == 0 }
 }
@@ -1,4 +1,77 @@
-//! The revive ELF object to PVM blob linker library.
+use std::{env, ffi::CString, fs};
-pub mod elf;
+use lld_sys::LLDELFLink;
-pub mod pvm;
+use revive_builtins::COMPILER_RT;
 const LINKER_SCRIPT: &str = r#"
 SECTIONS {
    .text : { KEEP(*(.text.polkavm_export)) *(.text .text.*) }
 }"#;
 const BUILTINS_ARCHIVE_FILE: &str = "libclang_rt.builtins-riscv64.a";
 const BUILTINS_LIB_NAME: &str = "clang_rt.builtins-riscv64";
 fn invoke_lld(cmd_args: &[&str]) -> bool {
    let c_strings = cmd_args
        .iter()
        .map(|arg| CString::new(*arg).expect("ld.lld args should not contain null bytes"))
        .collect::<Vec<_>>();
    let args: Vec<*const libc::c_char> = c_strings.iter().map(|arg| arg.as_ptr()).collect();
    unsafe { LLDELFLink(args.as_ptr(), args.len()) == 0 }
 }
 pub fn polkavm_linker<T: AsRef<[u8]>>(code: T, strip_binary: bool) -> anyhow::Result<Vec<u8>> {
    let mut config = polkavm_linker::Config::default();
    config.set_strip(strip_binary);
    config.set_optimize(true);
    polkavm_linker::program_from_elf(config, code.as_ref())
        .map_err(|reason| anyhow::anyhow!("polkavm linker failed: {}", reason))
 }
 pub fn link<T: AsRef<[u8]>>(input: T) -> anyhow::Result<Vec<u8>> {
    let dir = tempfile::tempdir().expect("failed to create temp directory for linking");
    let output_path = dir.path().join("out.so");
    let object_path = dir.path().join("out.o");
    let linker_script_path = dir.path().join("linker.ld");
    let compiler_rt_path = dir.path().join(BUILTINS_ARCHIVE_FILE);
    fs::write(&object_path, input).map_err(|msg| anyhow::anyhow!("{msg} {object_path:?}"))?;
    if env::var("PVM_LINKER_DUMP_OBJ").is_ok() {
        fs::copy(&object_path, "/tmp/out.o")?;
    }
    fs::write(&linker_script_path, LINKER_SCRIPT)
        .map_err(|msg| anyhow::anyhow!("{msg} {linker_script_path:?}"))?;
    fs::write(&compiler_rt_path, COMPILER_RT)
        .map_err(|msg| anyhow::anyhow!("{msg} {compiler_rt_path:?}"))?;
    let ld_args = [
        "ld.lld",
        "--lto=full",
        "--error-limit=0",
        "--relocatable",
        "--emit-relocs",
        "--no-relax",
        "--unique",
        "--gc-sections",
        "--library-path",
        dir.path().to_str().expect("should be utf8"),
        "--library",
        BUILTINS_LIB_NAME,
        linker_script_path.to_str().expect("should be utf8"),
        object_path.to_str().expect("should be utf8"),
        "-o",
        output_path.to_str().expect("should be utf8"),
    ];
    if invoke_lld(&ld_args) {
        return Err(anyhow::anyhow!("ld.lld failed"));
    }
    Ok(fs::read(&output_path)?)
 }
@@ -1,10 +0,0 @@
 //! The revive PVM blob linker library.
 pub fn polkavm_linker<T: AsRef<[u8]>>(code: T, strip_binary: bool) -> anyhow::Result<Vec<u8>> {
    let mut config = polkavm_linker::Config::default();
    config.set_strip(strip_binary);
    config.set_optimize(true);
    polkavm_linker::program_from_elf(config, code.as_ref())
        .map_err(|reason| anyhow::anyhow!("polkavm linker failed: {}", reason))
 }
@@ -96,7 +96,7 @@ fn main() {
    revive_build_utils::llvm_cxx_flags()
        .split_whitespace()
        .fold(&mut cc::Build::new(), |builder, flag| builder.flag(flag))
-        .warnings(false)
+        .flag("-Wno-unused-parameter")
        .cpp(true)
        .file("src/linker.cpp")
        .compile("liblinker.a");
@@ -6,7 +6,7 @@ authors = [
    "Anton Baliasnikov <aba@matterlabs.dev>",
    "Cyrill Leutwiler <cyrill@parity.io>",
 ]
-version = "0.3.0"
+version.workspace = true
 license.workspace = true
 edition.workspace = true
 repository.workspace = true
@@ -32,7 +32,6 @@ tar = { workspace = true }
 flate2 = { workspace = true }
 env_logger = { workspace = true }
 log = { workspace = true }
 which = { workspace = true }
 [dev-dependencies]
 assert_cmd = { 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`:
+      You now need to export the final target directory `$LLVM_SYS_181_PREFIX`: `export LLVM_SYS_181_PREFIX=${PWD}/target-llvm/gnu/target-final`
      ```shell
      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)),
        }
    }
 }
@@ -1,8 +1,5 @@
 //! Utilities for compiling the LLVM compiler-rt builtins.
 use crate::utils::path_windows_to_unix as to_unix;
 use std::{env::consts::EXE_EXTENSION, process::Command};
 /// Static CFLAGS variable passed to the compiler building the compiler-rt builtins.
 const C_FLAGS: [&str; 6] = [
    "--target=riscv64",
@@ -47,31 +44,24 @@ fn cmake_dynamic_args(
    let mut clang_path = llvm_target_host.to_path_buf();
    clang_path.push("bin/clang");
    clang_path.set_extension(EXE_EXTENSION);
    let mut clangxx_path = llvm_target_host.to_path_buf();
    clangxx_path.push("bin/clang++");
    clangxx_path.set_extension(EXE_EXTENSION);
    let mut llvm_config_path = llvm_target_host.to_path_buf();
    llvm_config_path.push("bin/llvm-config");
    llvm_config_path.set_extension(EXE_EXTENSION);
    let mut ar_path = llvm_target_host.to_path_buf();
    ar_path.push("bin/llvm-ar");
    ar_path.set_extension(EXE_EXTENSION);
    let mut nm_path = llvm_target_host.to_path_buf();
    nm_path.push("bin/llvm-nm");
    nm_path.set_extension(EXE_EXTENSION);
    let mut ranlib_path = llvm_target_host.to_path_buf();
    ranlib_path.push("bin/llvm-ranlib");
    ranlib_path.set_extension(EXE_EXTENSION);
    let mut linker_path = llvm_target_host.to_path_buf();
    linker_path.push("bin/ld.lld");
    linker_path.set_extension(EXE_EXTENSION);
    Ok([
        format!(
@@ -86,18 +76,12 @@ fn cmake_dynamic_args(
        format!("-DCMAKE_C_FLAGS='{}'", C_FLAGS.join(" ")),
        format!("-DCMAKE_ASM_FLAGS='{}'", C_FLAGS.join(" ")),
        format!("-DCMAKE_CXX_FLAGS='{}'", C_FLAGS.join(" ")),
-        format!(
+        format!("-DCMAKE_C_COMPILER='{}'", clang_path.to_string_lossy()),
-            "-DCMAKE_C_COMPILER='{}'",
+        format!("-DCMAKE_ASM_COMPILER='{}'", clang_path.to_string_lossy()),
-            to_unix(clang_path.clone())?.display()
+        format!("-DCMAKE_CXX_COMPILER='{}'", clangxx_path.to_string_lossy()),
-        ),
+        format!("-DCMAKE_AR='{}'", ar_path.to_string_lossy()),
-        format!("-DCMAKE_ASM_COMPILER='{}'", to_unix(clang_path)?.display()),
+        format!("-DCMAKE_NM='{}'", nm_path.to_string_lossy()),
-        format!(
+        format!("-DCMAKE_RANLIB='{}'", ranlib_path.to_string_lossy()),
            "-DCMAKE_CXX_COMPILER='{}'",
            to_unix(clangxx_path)?.display()
        ),
        format!("-DCMAKE_AR='{}'", to_unix(ar_path)?.display()),
        format!("-DCMAKE_NM='{}'", to_unix(nm_path)?.display()),
        format!("-DCMAKE_RANLIB='{}'", to_unix(ranlib_path)?.display()),
        format!(
            "-DLLVM_CONFIG_PATH='{}'",
            llvm_config_path.to_string_lossy()
@@ -147,17 +131,7 @@ pub fn build(
        "LLVM compiler-rt building cmake",
    )?;
-    crate::utils::command(
+    crate::utils::ninja(&llvm_compiler_rt_build)?;
        Command::new("cmake").args([
            "--build",
            llvm_compiler_rt_build.to_string_lossy().as_ref(),
            "--target",
            "install",
            "--config",
            build_type.to_string().as_str(),
        ]),
        "Building",
    )?;
    Ok(())
 }
@@ -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!("build type: {:?}", build_type);
-    log::trace!("target env: {target_env:?}");
+    log::trace!("target env: {:?}", target_env);
-    log::trace!("targets: {targets:?}");
+    log::trace!("targets: {:?}", targets);
-    log::trace!("llvm projects: {llvm_projects:?}");
+    log::trace!("llvm projects: {:?}", llvm_projects);
-    log::trace!("enable rtti: {enable_rtti:?}");
+    log::trace!("enable rtti: {:?}", enable_rtti);
-    log::trace!("default target: {default_target:?}");
+    log::trace!("default target: {:?}", default_target);
-    log::trace!("eneable tests: {enable_tests:?}");
+    log::trace!("eneable tests: {:?}", enable_tests);
-    log::trace!("enable_coverage: {enable_coverage:?}");
+    log::trace!("enable_coverage: {:?}", enable_coverage);
-    log::trace!("extra args: {extra_args:?}");
+    log::trace!("extra args: {:?}", extra_args);
-    log::trace!("sanitzer: {sanitizer:?}");
+    log::trace!("sanitzer: {:?}", sanitizer);
-    log::trace!("enable valgrind: {enable_valgrind:?}");
+    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`)",
+            "LLVM project source directory {} does not exist (run `revive-llvm --target-env {} clone`)",
-            LLVMPath::DIRECTORY_LLVM_SOURCE
+            LLVMPath::DIRECTORY_LLVM_SOURCE,
            target_env
        )
    }
@@ -213,7 +214,7 @@ pub fn build(
                sanitizer,
            )?;
        } else if cfg!(target_os = "windows") {
-            platforms::x86_64_windows_msvc::build(
+            platforms::x86_64_windows_gnu::build(
                build_type,
                targets,
                llvm_projects,
@@ -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)?)
    }
@@ -8,7 +8,7 @@ pub mod wasm32_emscripten;
 pub mod x86_64_linux_gnu;
 pub mod x86_64_linux_musl;
 pub mod x86_64_macos;
-pub mod x86_64_windows_msvc;
+pub mod x86_64_windows_gnu;
 use std::str::FromStr;
@@ -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)),
        }
    }
 }
@@ -8,7 +8,7 @@ use std::path::Path;
 use std::process::Command;
 /// The build options shared by all platforms.
-pub const SHARED_BUILD_OPTS: [&str; 21] = [
+pub const SHARED_BUILD_OPTS: [&str; 19] = [
    "-DPACKAGE_VENDOR='Parity Technologies'",
    "-DCMAKE_BUILD_WITH_INSTALL_RPATH=1",
    "-DLLVM_BUILD_DOCS='Off'",
@@ -28,8 +28,6 @@ pub const SHARED_BUILD_OPTS: [&str; 21] = [
    "-DCMAKE_EXPORT_COMPILE_COMMANDS='On'",
    "-DPython3_FIND_REGISTRY='LAST'", // Use Python version from $PATH, not from registry
    "-DBUG_REPORT_URL='https://github.com/paritytech/contract-issues/issues/'",
    "-DCLANG_ENABLE_ARCMT='Off'",
    "-DCLANG_ENABLE_STATIC_ANALYZER='Off'",
 ];
 /// The build options shared by all platforms except MUSL.
@@ -1,6 +1,7 @@
 //! The revive LLVM amd64 `windows-gnu` builder.
 use std::collections::HashSet;
 use std::path::PathBuf;
 use std::process::Command;
 use crate::build_type::BuildType;
@@ -27,6 +28,10 @@ pub fn build(
    sanitizer: Option<Sanitizer>,
 ) -> anyhow::Result<()> {
    crate::utils::check_presence("cmake")?;
    crate::utils::check_presence("clang")?;
    crate::utils::check_presence("clang++")?;
    crate::utils::check_presence("lld")?;
    crate::utils::check_presence("ninja")?;
    let llvm_module_llvm =
        LLVMPath::llvm_module_llvm().and_then(crate::utils::path_windows_to_unix)?;
@@ -43,12 +48,15 @@ pub fn build(
                "-B",
                llvm_build_final.to_string_lossy().as_ref(),
                "-G",
-                "Visual Studio 17 2022",
+                "Ninja",
                format!(
                    "-DCMAKE_INSTALL_PREFIX='{}'",
                    llvm_target_final.to_string_lossy().as_ref(),
                )
                .as_str(),
                format!("-DCMAKE_BUILD_TYPE='{build_type}'").as_str(),
                "-DCMAKE_C_COMPILER='clang'",
                "-DCMAKE_CXX_COMPILER='clang++'",
                format!(
                    "-DLLVM_TARGETS_TO_BUILD='{}'",
                    targets
@@ -67,7 +75,7 @@ pub fn build(
                        .join(";")
                )
                .as_str(),
-                "-DLLVM_BUILD_LLVM_C_DYLIB=Off",
+                "-DLLVM_USE_LINKER='lld'",
            ])
            .args(crate::platforms::shared::shared_build_opts_default_target(
                default_target,
@@ -99,16 +107,20 @@ pub fn build(
        "LLVM building cmake",
    )?;
-    crate::utils::command(
+    crate::utils::ninja(llvm_build_final.as_ref())?;
-        Command::new("cmake").args([
+
-            "--build",
+    let libstdcpp_source_path = match std::env::var("LIBSTDCPP_SOURCE_PATH") {
-            llvm_build_final.to_string_lossy().as_ref(),
+        Ok(libstdcpp_source_path) => PathBuf::from(libstdcpp_source_path),
-            "--target",
+        Err(error) => anyhow::bail!(
-            "install",
+            "The `LIBSTDCPP_SOURCE_PATH` must be set to the path to the libstdc++.a static library: {}", error
-            "--config",
+        ),
-            build_type.to_string().as_str(),
+    };
-        ]),
+    let mut libstdcpp_destination_path = llvm_target_final;
-        "Building with msbuild",
+    libstdcpp_destination_path.push("./lib/libstdc++.a");
    fs_extra::file::copy(
        crate::utils::path_windows_to_unix(libstdcpp_source_path)?,
        crate::utils::path_windows_to_unix(libstdcpp_destination_path)?,
        &fs_extra::file::CopyOptions::default(),
    )?;
    Ok(())
@@ -69,8 +69,8 @@ fn main_inner() -> anyhow::Result<()> {
                })
                .collect();
-            log::debug!("extra_args: {extra_args:#?}");
+            log::debug!("extra_args: {:#?}", extra_args);
-            log::debug!("extra_args_unescaped: {extra_args_unescaped:#?}");
+            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)),
        }
    }
 }
@@ -7,7 +7,6 @@ use std::process::Command;
 use std::process::Stdio;
 use std::time::Duration;
 use anyhow::Context;
 use path_slash::PathBufExt;
 /// The LLVM host repository URL.
@@ -38,7 +37,7 @@ pub const MUSL_SNAPSHOTS_URL: &str = "https://git.musl-libc.org/cgit/musl/snapsh
 pub const EMSDK_SOURCE_URL: &str = "https://github.com/emscripten-core/emsdk.git";
 /// The emscripten SDK version.
-pub const EMSDK_VERSION: &str = "4.0.9";
+pub const EMSDK_VERSION: &str = "3.1.64";
 /// The subprocess runner.
 ///
@@ -92,7 +91,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()
@@ -132,8 +131,11 @@ pub fn path_windows_to_unix<P: AsRef<Path> + PathBufExt>(path: P) -> anyhow::Res
 /// Checks if the tool exists in the system.
 pub fn check_presence(name: &str) -> anyhow::Result<()> {
-    which::which(name).with_context(|| format!("Tool `{name}` is missing. Please install"))?;
+    let description = &format!("checking the `{name}` executable");
-    Ok(())
+    log::info!("{description}");
    command(Command::new("which").arg(name), description)
        .map_err(|_| anyhow::anyhow!("Tool `{}` is missing. Please install", name))
 }
 /// Identify XCode version using `pkgutil`.
@@ -223,6 +225,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()
 }
@@ -53,16 +53,6 @@ fn clone_build_and_clean_musl() -> anyhow::Result<()> {
        .assert()
        .success();
    Command::cargo_bin(common::REVIVE_LLVM)?
        .current_dir(test_dir.path())
        .arg("build")
        .arg("--llvm-projects")
        .arg("clang")
        .arg("--llvm-projects")
        .arg("lld")
        .assert()
        .success();
    Command::cargo_bin(common::REVIVE_LLVM)?
        .arg("--target-env")
        .arg("musl")
@@ -75,6 +65,12 @@ fn clone_build_and_clean_musl() -> anyhow::Result<()> {
        .assert()
        .success();
    Command::cargo_bin(common::REVIVE_LLVM)?
        .current_dir(test_dir.path())
        .arg("builtins")
        .assert()
        .success();
    Command::cargo_bin(common::REVIVE_LLVM)?
        .current_dir(test_dir.path())
        .arg("clean")
@@ -87,7 +83,6 @@ fn clone_build_and_clean_musl() -> anyhow::Result<()> {
 /// This test verifies that the LLVM repository can be successfully cloned and built in debug mode
 /// with tests and coverage enabled.
 #[test]
 #[cfg(target_os = "linux")]
 fn debug_build_with_tests_coverage() -> anyhow::Result<()> {
    let test_dir = common::TestDir::with_lockfile(None)?;
@@ -104,10 +99,6 @@ fn debug_build_with_tests_coverage() -> anyhow::Result<()> {
        .arg("--enable-tests")
        .arg("--build-type")
        .arg("Debug")
        .arg("--llvm-projects")
        .arg("clang")
        .arg("--llvm-projects")
        .arg("lld")
        .assert()
        .success();
@@ -116,7 +107,6 @@ fn debug_build_with_tests_coverage() -> anyhow::Result<()> {
 /// This test verifies that the LLVM repository can be successfully built with address sanitizer.
 #[test]
 #[cfg(target_os = "linux")]
 fn build_with_sanitizers() -> anyhow::Result<()> {
    let test_dir = common::TestDir::with_lockfile(None)?;
@@ -131,10 +121,6 @@ fn build_with_sanitizers() -> anyhow::Result<()> {
        .arg("build")
        .arg("--sanitizer")
        .arg("Address")
        .arg("--llvm-projects")
        .arg("lld")
        .arg("--llvm-projects")
        .arg("clang")
        .assert()
        .success();
@@ -143,36 +129,15 @@ fn build_with_sanitizers() -> anyhow::Result<()> {
 /// Tests the clone, build, and clean process of the LLVM repository for the emscripten target.
 #[test]
-#[cfg(target_os = "linux")]
+#[cfg(any(target_os = "linux", target_os = "macos"))]
 fn clone_build_and_clean_emscripten() -> anyhow::Result<()> {
    let test_dir = common::TestDir::with_lockfile(None)?;
    let command = Command::cargo_bin(common::REVIVE_LLVM)?;
    let program = command.get_program().to_string_lossy();
    Command::cargo_bin(common::REVIVE_LLVM)?
        .current_dir(test_dir.path())
        .arg("clone")
        .assert()
        .success();
    Command::cargo_bin(common::REVIVE_LLVM)?
        .current_dir(test_dir.path())
        .arg("build")
        .arg("--llvm-projects")
        .arg("lld")
        .arg("--llvm-projects")
        .arg("clang")
        .assert()
        .success();
    // Two little shell-dependent things here:
    // Doing `. ./emsdk_env.sh` instead of `source`, as `source` might be missing in some shells
    // `cd {} && . ./emsdk_env.sh && cd ..` helps the script to locate `emsdk.py`
    // @see https://github.com/emscripten-core/emsdk/blob/9dbdc4b3437750b85d16931c7c801bb71a782122/emsdk_env.sh#L61-L69
    let emsdk_wrapped_build_command = format!(
        "{program} --target-env emscripten clone && \
-        cd {} && . ./emsdk_env.sh && cd .. && \
+        source {}emsdk_env.sh && \
-        {program} --target-env emscripten build --llvm-projects lld",
+        {program} --target-env emscripten build --llvm-projects clang --llvm-projects lld",
        revive_llvm_builder::LLVMPath::DIRECTORY_EMSDK_SOURCE,
    );
@@ -1,6 +1,6 @@
 [package]
 name = "revive-llvm-context"
-version = "0.4.1"
+version.workspace = true
 license.workspace = true
 edition.workspace = true
 repository.workspace = true
@@ -20,8 +20,8 @@ itertools = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
 num = { workspace = true }
 hex = { workspace = true }
 sha3 = { workspace = true }
 inkwell = { workspace = true }
 libc = { workspace = true }
 polkavm-disassembler = { workspace = true }
 polkavm-common = { workspace = true }
@@ -29,4 +29,3 @@ revive-common = { workspace = true }
 revive-runtime-api = { workspace = true }
 revive-linker = { workspace = true }
 revive-stdlib = { workspace = true }
 revive-solc-json-interface = { workspace = true }
@@ -1,9 +1,5 @@
 //! The debug IR type.
 use revive_common::{
    EXTENSION_LLVM_SOURCE, EXTENSION_OBJECT, EXTENSION_POLKAVM_ASSEMBLY, EXTENSION_YUL,
 };
 /// The debug IR type.
 #[allow(clippy::upper_case_acronyms)]
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
@@ -15,17 +11,22 @@ pub enum IRType {
    /// Whether to dump the assembly code.
    Assembly,
    /// Whether to dump the ELF shared object
-    Object,
+    SO,
    /// Whether to jump JSON
    #[cfg(debug_assertions)]
    JSON,
 }
 impl IRType {
    /// Returns the file extension for the specified IR.
    pub fn file_extension(&self) -> &'static str {
        match self {
-            Self::Yul => EXTENSION_YUL,
+            Self::Yul => revive_common::EXTENSION_YUL,
-            Self::LLVM => EXTENSION_LLVM_SOURCE,
+            Self::LLVM => revive_common::EXTENSION_LLVM_SOURCE,
-            Self::Assembly => EXTENSION_POLKAVM_ASSEMBLY,
+            Self::Assembly => revive_common::EXTENSION_POLKAVM_ASSEMBLY,
-            Self::Object => EXTENSION_OBJECT,
+            #[cfg(debug_assertions)]
            Self::JSON => revive_common::EXTENSION_JSON,
            Self::SO => revive_common::EXTENSION_SHARED_OBJECT,
        }
    }
 }
@@ -1,5 +1,7 @@
 //! The debug configuration.
 pub mod ir_type;
 use std::path::PathBuf;
 use serde::Deserialize;
@@ -7,8 +9,6 @@ use serde::Serialize;
 use self::ir_type::IRType;
 pub mod ir_type;
 /// The debug configuration.
 #[derive(Debug, Default, Serialize, Deserialize, Clone)]
 pub struct DebugConfig {
@@ -16,8 +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.
    pub contract_path: Option<PathBuf>,
 }
 impl DebugConfig {
@@ -26,27 +24,15 @@ impl DebugConfig {
        Self {
            output_directory,
            emit_debug_info,
            contract_path: None,
        }
    }
    /// Set the current contract path.
    pub fn set_contract_path(&mut self, contract_path: &str) {
        self.contract_path = self.yul_source_path(contract_path);
    }
    pub fn yul_source_path(&self, contract_path: &str) -> Option<PathBuf> {
        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)?;
        }
@@ -107,7 +93,7 @@ impl DebugConfig {
    pub fn dump_object(&self, contract_path: &str, code: &[u8]) -> anyhow::Result<()> {
        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::Object);
+            let full_file_name = Self::full_file_name(contract_path, None, IRType::SO);
            file_path.push(full_file_name);
            std::fs::write(file_path, code)?;
        }
@@ -115,6 +101,24 @@ impl DebugConfig {
        Ok(())
    }
    /// Dumps the stage output as a json file suitable for use with --recursive-process
    #[cfg(debug_assertions)]
    pub fn dump_stage_output(
        &self,
        contract_path: &str,
        contract_suffix: Option<&str>,
        stage_json: &Vec<u8>,
    ) -> anyhow::Result<()> {
        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, contract_suffix, IRType::JSON);
            file_path.push(full_file_name);
            std::fs::write(file_path, stage_json)?;
        }
        Ok(())
    }
    /// Creates a full file name, given the contract full path, suffix, and extension.
    fn full_file_name(contract_path: &str, suffix: Option<&str>, ir_type: IRType) -> String {
        let mut full_file_name = contract_path.replace('/', "_").replace(':', ".");
@@ -1,16 +1,16 @@
 //! The LLVM context library.
-#![allow(clippy::too_many_arguments)]
+pub(crate) mod debug_config;
-
+pub(crate) mod optimizer;
-use std::ffi::CString;
+pub(crate) mod polkavm;
-use std::sync::OnceLock;
+pub(crate) mod target_machine;
 pub use self::debug_config::ir_type::IRType as DebugConfigIR;
 pub use self::debug_config::DebugConfig;
 pub use self::optimizer::settings::size_level::SizeLevel as OptimizerSettingsSizeLevel;
 pub use self::optimizer::settings::Settings as OptimizerSettings;
 pub use self::optimizer::Optimizer;
-pub use self::polkavm::build as polkavm_build;
+pub use self::polkavm::build_assembly_text as polkavm_build_assembly_text;
 pub use self::polkavm::context::address_space::AddressSpace as PolkaVMAddressSpace;
 pub use self::polkavm::context::argument::Argument as PolkaVMArgument;
 pub use self::polkavm::context::attribute::Attribute as PolkaVMAttribute;
@@ -21,34 +21,22 @@ pub use self::polkavm::context::function::declaration::Declaration as PolkaVMFun
 pub use self::polkavm::context::function::intrinsics::Intrinsics as PolkaVMIntrinsicFunction;
 pub use self::polkavm::context::function::llvm_runtime::LLVMRuntime as PolkaVMLLVMRuntime;
 pub use self::polkavm::context::function::r#return::Return as PolkaVMFunctionReturn;
 pub use self::polkavm::context::function::runtime::arithmetics::Division as PolkaVMDivisionFunction;
 pub use self::polkavm::context::function::runtime::arithmetics::Remainder as PolkaVMRemainderFunction;
 pub use self::polkavm::context::function::runtime::arithmetics::SignedDivision as PolkaVMSignedDivisionFunction;
 pub use self::polkavm::context::function::runtime::arithmetics::SignedRemainder as PolkaVMSignedRemainderFunction;
 pub use self::polkavm::context::function::runtime::deploy_code::DeployCode as PolkaVMDeployCodeFunction;
 pub use self::polkavm::context::function::runtime::entry::Entry as PolkaVMEntryFunction;
-pub use self::polkavm::context::function::runtime::revive::Exit as PolkaVMExitFunction;
+pub use self::polkavm::context::function::runtime::immutable_data_load::ImmutableDataLoad as PolkaVMImmutableDataLoadFunction;
 pub use self::polkavm::context::function::runtime::revive::WordToPointer as PolkaVMWordToPointerFunction;
 pub use self::polkavm::context::function::runtime::runtime_code::RuntimeCode as PolkaVMRuntimeCodeFunction;
 pub use self::polkavm::context::function::runtime::sbrk::Sbrk as PolkaVMSbrkFunction;
 pub use self::polkavm::context::function::runtime::FUNCTION_DEPLOY_CODE as PolkaVMFunctionDeployCode;
 pub use self::polkavm::context::function::runtime::FUNCTION_ENTRY as PolkaVMFunctionEntry;
 pub use self::polkavm::context::function::runtime::FUNCTION_LOAD_IMMUTABLE_DATA as PolkaVMFunctionImmutableDataLoad;
 pub use self::polkavm::context::function::runtime::FUNCTION_RUNTIME_CODE as PolkaVMFunctionRuntimeCode;
 pub use self::polkavm::context::function::yul_data::YulData as PolkaVMFunctionYulData;
 pub use self::polkavm::context::function::Function as PolkaVMFunction;
 pub use self::polkavm::context::global::Global as PolkaVMGlobal;
 pub use self::polkavm::context::pointer::heap::LoadWord as PolkaVMLoadHeapWordFunction;
 pub use self::polkavm::context::pointer::heap::StoreWord as PolkaVMStoreHeapWordFunction;
 pub use self::polkavm::context::pointer::storage::LoadTransientWord as PolkaVMLoadTransientStorageWordFunction;
 pub use self::polkavm::context::pointer::storage::LoadWord as PolkaVMLoadStorageWordFunction;
 pub use self::polkavm::context::pointer::storage::StoreTransientWord as PolkaVMStoreTransientStorageWordFunction;
 pub use self::polkavm::context::pointer::storage::StoreWord as PolkaVMStoreStorageWordFunction;
 pub use self::polkavm::context::pointer::Pointer as PolkaVMPointer;
 pub use self::polkavm::context::r#loop::Loop as PolkaVMLoop;
 pub use self::polkavm::context::solidity_data::SolidityData as PolkaVMContextSolidityData;
 pub use self::polkavm::context::yul_data::YulData as PolkaVMContextYulData;
 pub use self::polkavm::context::Context as PolkaVMContext;
 pub use self::polkavm::disassemble as polkavm_disassemble;
 pub use self::polkavm::evm::arithmetic as polkavm_evm_arithmetic;
 pub use self::polkavm::evm::bitwise as polkavm_evm_bitwise;
 pub use self::polkavm::evm::call as polkavm_evm_call;
@@ -59,59 +47,25 @@ pub use self::polkavm::evm::create as polkavm_evm_create;
 pub use self::polkavm::evm::crypto as polkavm_evm_crypto;
 pub use self::polkavm::evm::ether_gas as polkavm_evm_ether_gas;
 pub use self::polkavm::evm::event as polkavm_evm_event;
 pub use self::polkavm::evm::event::EventLog as PolkaVMEventLogFunction;
 pub use self::polkavm::evm::ext_code as polkavm_evm_ext_code;
 pub use self::polkavm::evm::immutable as polkavm_evm_immutable;
 pub use self::polkavm::evm::immutable::Load as PolkaVMLoadImmutableDataFunction;
 pub use self::polkavm::evm::immutable::Store as PolkaVMStoreImmutableDataFunction;
 pub use self::polkavm::evm::math as polkavm_evm_math;
 pub use self::polkavm::evm::memory as polkavm_evm_memory;
 pub use self::polkavm::evm::r#return as polkavm_evm_return;
 pub use self::polkavm::evm::return_data as polkavm_evm_return_data;
 pub use self::polkavm::evm::storage as polkavm_evm_storage;
-pub use self::polkavm::hash as polkavm_hash;
+pub use self::polkavm::metadata_hash::MetadataHash as PolkaVMMetadataHash;
 pub use self::polkavm::link as polkavm_link;
 pub use self::polkavm::r#const as polkavm_const;
 pub use self::polkavm::Dependency as PolkaVMDependency;
 pub use self::polkavm::DummyDependency as PolkaVMDummyDependency;
 pub use self::polkavm::DummyLLVMWritable as PolkaVMDummyLLVMWritable;
 pub use self::polkavm::WriteLLVM as PolkaVMWriteLLVM;
-pub use self::target_machine::target::Target as PolkaVMTarget;
+pub use self::target_machine::target::Target;
-pub use self::target_machine::TargetMachine as PolkaVMTargetMachine;
+pub use self::target_machine::TargetMachine;
 pub(crate) mod debug_config;
 pub(crate) mod optimizer;
 pub(crate) mod polkavm;
 pub(crate) mod target_machine;
 static DID_INITIALIZE: OnceLock<()> = OnceLock::new();
 /// Initializes the LLVM compiler backend.
 ///
 /// This is a no-op if called subsequentially.
 ///
 /// `llvm_arguments` are passed as-is to the LLVM CL options parser.
 pub fn initialize_llvm(target: PolkaVMTarget, name: &str, llvm_arguments: &[String]) {
    let Ok(_) = DID_INITIALIZE.set(()) else {
        return; // Tests don't go through a recursive process
    };
    let argv = [name.to_string()]
        .iter()
        .chain(llvm_arguments)
        .map(|arg| CString::new(arg.as_bytes()).unwrap())
        .collect::<Vec<_>>();
    let argv: Vec<*const libc::c_char> = argv.iter().map(|arg| arg.as_ptr()).collect();
    let overview = CString::new("").unwrap();
    unsafe {
        inkwell::llvm_sys::support::LLVMParseCommandLineOptions(
            argv.len() as i32,
            argv.as_ptr(),
            overview.as_ptr(),
        );
    }
    inkwell::support::enable_llvm_pretty_stack_trace();
 /// Initializes the target machine.
 pub fn initialize_target(target: Target) {
    match target {
-        PolkaVMTarget::PVM => inkwell::targets::Target::initialize_riscv(&Default::default()),
+        Target::PVM => self::polkavm::initialize_target(),
    }
 }
@@ -1,5 +1,7 @@
 //! The LLVM optimizing tools.
 pub mod settings;
 use serde::Deserialize;
 use serde::Serialize;
@@ -7,8 +9,6 @@ use crate::target_machine::TargetMachine;
 use self::settings::Settings;
 pub mod settings;
 /// The LLVM optimizing tools.
 #[derive(Debug, Serialize, Deserialize)]
 pub struct Optimizer {
@@ -1,5 +1,7 @@
 //! The LLVM optimizer settings.
 pub mod size_level;
 use serde::Deserialize;
 use serde::Serialize;
@@ -7,8 +9,6 @@ use itertools::Itertools;
 use self::size_level::SizeLevel;
 pub mod size_level;
 /// The LLVM optimizer and code-gen settings.
 #[derive(Debug, Serialize, Deserialize, Clone, Eq)]
 pub struct Settings {
@@ -19,6 +19,9 @@ pub struct Settings {
    /// The back-end optimization level.
    pub level_back_end: inkwell::OptimizationLevel,
    /// Fallback to optimizing for size if the bytecode is too large.
    pub is_fallback_to_size_enabled: bool,
    /// Whether the LLVM `verify each` option is enabled.
    pub is_verify_each_enabled: bool,
    /// Whether the LLVM `debug logging` option is enabled.
@@ -37,6 +40,8 @@ impl Settings {
            level_middle_end_size,
            level_back_end,
            is_fallback_to_size_enabled: false,
            is_verify_each_enabled: false,
            is_debug_logging_enabled: false,
        }
@@ -56,6 +61,8 @@ impl Settings {
            level_middle_end_size,
            level_back_end,
            is_fallback_to_size_enabled: false,
            is_verify_each_enabled,
            is_debug_logging_enabled,
        }
@@ -189,6 +196,16 @@ impl Settings {
        combinations
    }
    /// Sets the fallback to optimizing for size if the bytecode is too large.
    pub fn enable_fallback_to_size(&mut self) {
        self.is_fallback_to_size_enabled = true;
    }
    /// Whether the fallback to optimizing for size is enabled.
    pub fn is_fallback_to_size_enabled(&self) -> bool {
        self.is_fallback_to_size_enabled
    }
 }
 impl PartialEq for Settings {
@@ -1,25 +1,20 @@
 //! The LLVM context constants.
 use revive_common::{BIT_LENGTH_X32, BYTE_LENGTH_WORD};
 /// The LLVM framework version.
 pub const LLVM_VERSION: semver::Version = semver::Version::new(18, 1, 4);
 /// The pointer width sized type.
-pub static XLEN: usize = BIT_LENGTH_X32;
+pub static XLEN: usize = revive_common::BIT_LENGTH_X32;
 /// The heap memory pointer pointer global variable name.
 pub static GLOBAL_HEAP_MEMORY_POINTER: &str = "memory_pointer";
 /// The calldata size global variable name.
 pub static GLOBAL_CALLDATA_SIZE: &str = "calldatasize";
-/// The heap size global variable name.
+/// The call flags global variable name.
-pub static GLOBAL_HEAP_SIZE: &str = "__heap_size";
+pub static GLOBAL_CALL_FLAGS: &str = "call_flags";
 /// The heap memory global variable name.
 pub static GLOBAL_HEAP_MEMORY: &str = "__heap_memory";
 /// The spill buffer global variable name.
 pub static GLOBAL_ADDRESS_SPILL_BUFFER: &str = "address_spill_buffer";
 /// The deployer call header size that consists of:
 /// - bytecode hash (32 bytes)
-pub const DEPLOYER_CALL_HEADER_SIZE: usize = BYTE_LENGTH_WORD;
+pub const DEPLOYER_CALL_HEADER_SIZE: usize = revive_common::BYTE_LENGTH_WORD;
@@ -8,6 +8,10 @@ pub enum AddressSpace {
    Stack,
    /// The heap memory.
    Heap,
    /// The generic memory page.
    Storage,
    /// The transient storage.
    TransientStorage,
 }
 impl From<AddressSpace> for inkwell::AddressSpace {
@@ -15,6 +19,8 @@ impl From<AddressSpace> for inkwell::AddressSpace {
        match value {
            AddressSpace::Stack => Self::from(0),
            AddressSpace::Heap => Self::from(1),
            AddressSpace::Storage => Self::from(5),
            AddressSpace::TransientStorage => Self::from(6),
        }
    }
 }
@@ -4,98 +4,61 @@
 #[derive(Debug, Clone)]
 pub struct Argument<'ctx> {
    /// The actual LLVM operand.
-    pub value: Value<'ctx>,
+    pub value: inkwell::values::BasicValueEnum<'ctx>,
    /// The original AST value. Used mostly for string literals.
    pub original: Option<String>,
    /// The preserved constant value, if available.
    pub constant: Option<num::BigUint>,
 }
 /// The function argument can be either a pointer or a integer value.
 /// This disambiguation allows for lazy loading of variables.
 #[derive(Clone, Debug)]
 pub enum Value<'ctx> {
    Register(inkwell::values::BasicValueEnum<'ctx>),
    Pointer {
        pointer: crate::polkavm::context::Pointer<'ctx>,
        id: String,
    },
 }
 impl<'ctx> Argument<'ctx> {
-    /// A shortcut constructor for register arguments.
+    /// The calldata offset argument index.
-    pub fn value(value: inkwell::values::BasicValueEnum<'ctx>) -> Self {
+    pub const ARGUMENT_INDEX_CALLDATA_OFFSET: usize = 0;
    /// The calldata length argument index.
    pub const ARGUMENT_INDEX_CALLDATA_LENGTH: usize = 1;
    /// A shortcut constructor.
    pub fn new(value: inkwell::values::BasicValueEnum<'ctx>) -> Self {
        Self {
-            value: Value::Register(value),
+            value,
            original: None,
            constant: None,
        }
    }
-    /// A shortcut constructor for stack arguments.
+    /// A shortcut constructor.
-    pub fn pointer(pointer: crate::polkavm::context::Pointer<'ctx>, id: String) -> Self {
+    pub fn new_with_original(
        value: inkwell::values::BasicValueEnum<'ctx>,
        original: String,
    ) -> Self {
        Self {
-            value: Value::Pointer { pointer, id },
+            value,
-            original: None,
+            original: Some(original),
            constant: None,
        }
    }
-    /// Set the original decleratation value.
+    /// A shortcut constructor.
-    pub fn with_original(mut self, original: String) -> Self {
+    pub fn new_with_constant(
-        self.original = Some(original);
+        value: inkwell::values::BasicValueEnum<'ctx>,
-        self
+        constant: num::BigUint,
-    }
+    ) -> Self {
-
+        Self {
-    /// Set the constant value.
+            value,
-    pub fn with_constant(mut self, constant: num::BigUint) -> Self {
+            original: None,
-        self.constant = Some(constant);
+            constant: Some(constant),
-        self
+        }
    }
    /// Returns the inner LLVM value.
-    ///
+    pub fn to_llvm(&self) -> inkwell::values::BasicValueEnum<'ctx> {
-    /// Panics if `self` is a pointer argument.
+        self.value
    pub fn _to_llvm_value(&self) -> inkwell::values::BasicValueEnum<'ctx> {
        match &self.value {
            Value::Register(value) => *value,
            Value::Pointer { .. } => unreachable!("invalid register value access"),
        }
    }
    /// Access the underlying value.
    ///
    /// Will emit a stack load if `self` is a pointer argument.
    pub fn access(
        &self,
        context: &crate::polkavm::context::Context<'ctx>,
    ) -> anyhow::Result<inkwell::values::BasicValueEnum<'ctx>> {
        match &self.value {
            Value::Register(value) => Ok(*value),
            Value::Pointer { pointer, id } => context.build_load(*pointer, id),
        }
    }
    /// Access the underlying value.
    ///
    /// Will emit a stack load if `self` is a pointer argument.
    pub fn as_pointer(
        &self,
        context: &crate::polkavm::context::Context<'ctx>,
    ) -> anyhow::Result<crate::polkavm::context::Pointer<'ctx>> {
        match &self.value {
            Value::Register(value) => {
                let pointer = context.build_alloca_at_entry(context.word_type(), "pvm_arg");
                context.build_store(pointer, *value)?;
                Ok(pointer)
            }
            Value::Pointer { pointer, .. } => Ok(*pointer),
        }
    }
 }
 impl<'ctx> From<inkwell::values::BasicValueEnum<'ctx>> for Argument<'ctx> {
    fn from(value: inkwell::values::BasicValueEnum<'ctx>) -> Self {
-        Self::value(value)
+        Self::new(value)
    }
 }
@@ -1,6 +1,7 @@
 //! The LLVM module build.
-use revive_common::BYTE_LENGTH_WORD;
+use std::collections::BTreeMap;
 use serde::Deserialize;
 use serde::Serialize;
@@ -8,23 +9,31 @@ use serde::Serialize;
 #[derive(Debug, Serialize, Deserialize)]
 pub struct Build {
    /// The PolkaVM text assembly.
-    pub assembly_text: Option<String>,
+    pub assembly_text: String,
    /// The metadata hash.
-    pub metadata_hash: Option<[u8; BYTE_LENGTH_WORD]>,
+    pub metadata_hash: Option<[u8; revive_common::BYTE_LENGTH_WORD]>,
    /// The PolkaVM binary bytecode.
    pub bytecode: Vec<u8>,
-    /// The PolkaVM bytecode hash. Unlinked builds don't have a hash yet.
+    /// The PolkaVM bytecode hash.
-    pub bytecode_hash: Option<[u8; BYTE_LENGTH_WORD]>,
+    pub bytecode_hash: String,
    /// The hash-to-full-path mapping of the contract factory dependencies.
    pub factory_dependencies: BTreeMap<String, String>,
 }
 impl Build {
    /// A shortcut constructor.
-    pub fn new(metadata_hash: Option<[u8; BYTE_LENGTH_WORD]>, bytecode: Vec<u8>) -> Self {
+    pub fn new(
        assembly_text: String,
        metadata_hash: Option<[u8; revive_common::BYTE_LENGTH_WORD]>,
        bytecode: Vec<u8>,
        bytecode_hash: String,
    ) -> Self {
        Self {
-            assembly_text: None,
+            assembly_text,
            metadata_hash,
            bytecode,
-            bytecode_hash: None,
+            bytecode_hash,
            factory_dependencies: BTreeMap::new(),
        }
    }
 }
@@ -2,8 +2,6 @@
 use std::cell::RefCell;
 use revive_common::BIT_LENGTH_WORD;
 use inkwell::debug_info::AsDIScope;
 use inkwell::debug_info::DIScope;
@@ -53,20 +51,11 @@ pub struct DebugInfo<'ctx> {
 impl<'ctx> DebugInfo<'ctx> {
    /// A shortcut constructor.
-    pub fn new(
+    pub fn new(module: &inkwell::module::Module<'ctx>) -> Self {
        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());
        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,
@@ -166,7 +155,7 @@ impl<'ctx> DebugInfo<'ctx> {
        &self,
        flags: Option<inkwell::debug_info::DIFlags>,
    ) -> anyhow::Result<inkwell::debug_info::DIBasicType<'ctx>> {
-        self.create_primitive_type(BIT_LENGTH_WORD, flags)
+        self.create_primitive_type(revive_common::BIT_LENGTH_WORD, flags)
    }
    /// Return the DIBuilder.
@@ -1,6 +1,9 @@
 //! The LLVM runtime functions.
 use inkwell::types::BasicType;
 use crate::optimizer::Optimizer;
 use crate::polkavm::context::address_space::AddressSpace;
 use crate::polkavm::context::function::declaration::Declaration as FunctionDeclaration;
 use crate::polkavm::context::function::Function;
@@ -16,6 +19,9 @@ pub struct LLVMRuntime<'ctx> {
    pub exp: FunctionDeclaration<'ctx>,
    /// The corresponding LLVM runtime function.
    pub sign_extend: FunctionDeclaration<'ctx>,
    /// The corresponding LLVM runtime function.
    pub sha3: FunctionDeclaration<'ctx>,
 }
 impl<'ctx> LLVMRuntime<'ctx> {
@@ -31,6 +37,9 @@ impl<'ctx> LLVMRuntime<'ctx> {
    /// The corresponding runtime function name.
    pub const FUNCTION_SIGNEXTEND: &'static str = "__signextend";
    /// The corresponding runtime function name.
    pub const FUNCTION_SHA3: &'static str = "__sha3";
    /// A shortcut constructor.
    pub fn new(
        llvm: &'ctx inkwell::context::Context,
@@ -56,21 +65,64 @@ impl<'ctx> LLVMRuntime<'ctx> {
        Function::set_default_attributes(llvm, sign_extend, optimizer);
        Function::set_pure_function_attributes(llvm, sign_extend);
        let sha3 = Self::declare(
            module,
            Self::FUNCTION_SHA3,
            llvm.custom_width_int_type(revive_common::BIT_LENGTH_WORD as u32)
                .fn_type(
                    vec![
                        llvm.ptr_type(AddressSpace::Heap.into())
                            .as_basic_type_enum()
                            .into(),
                        llvm.custom_width_int_type(revive_common::BIT_LENGTH_WORD as u32)
                            .as_basic_type_enum()
                            .into(),
                        llvm.custom_width_int_type(revive_common::BIT_LENGTH_BOOLEAN as u32)
                            .as_basic_type_enum()
                            .into(),
                    ]
                    .as_slice(),
                    false,
                ),
            Some(inkwell::module::Linkage::External),
        );
        Function::set_default_attributes(llvm, sha3, optimizer);
        Function::set_attributes(
            llvm,
            sha3,
            //vec![Attribute::ArgMemOnly, Attribute::ReadOnly],
            vec![],
            false,
        );
        Self {
            add_mod,
            mul_mod,
            exp,
            sign_extend,
            sha3,
        }
    }
    /// Declares an LLVM runtime function in the `module`,
    pub fn declare(
        module: &inkwell::module::Module<'ctx>,
        name: &str,
        r#type: inkwell::types::FunctionType<'ctx>,
        linkage: Option<inkwell::module::Linkage>,
    ) -> FunctionDeclaration<'ctx> {
        let value = module.add_function(name, r#type, linkage);
        FunctionDeclaration::new(r#type, value)
    }
    /// Create the function definition from an existing symbol.
    pub fn define(
        module: &inkwell::module::Module<'ctx>,
        name: &str,
    ) -> Option<FunctionDeclaration<'ctx>> {
        let value = module.get_function(name)?;
-        value.set_linkage(inkwell::module::Linkage::Private);
+        value.set_linkage(inkwell::module::Linkage::External);
        FunctionDeclaration::new(value.get_type(), value).into()
    }
 }
@@ -1,5 +1,12 @@
 //! The LLVM IR generator function.
 pub mod declaration;
 pub mod intrinsics;
 pub mod llvm_runtime;
 pub mod r#return;
 pub mod runtime;
 pub mod yul_data;
 use std::collections::HashMap;
 use inkwell::debug_info::AsDIScope;
@@ -13,13 +20,6 @@ use self::declaration::Declaration;
 use self::r#return::Return;
 use self::yul_data::YulData;
 pub mod declaration;
 pub mod intrinsics;
 pub mod llvm_runtime;
 pub mod r#return;
 pub mod runtime;
 pub mod yul_data;
 /// The LLVM IR generator function.
 #[derive(Debug)]
 pub struct Function<'ctx> {
@@ -75,6 +75,16 @@ impl<'ctx> Function<'ctx> {
        self.name.as_str()
    }
    /// Checks whether the function is defined outside of the front-end.
    pub fn is_name_external(name: &str) -> bool {
        name.starts_with("llvm.")
            || (name.starts_with("__")
                && name != self::runtime::FUNCTION_ENTRY
                && name != self::runtime::FUNCTION_DEPLOY_CODE
                && name != self::runtime::FUNCTION_RUNTIME_CODE
                && name != self::runtime::FUNCTION_LOAD_IMMUTABLE_DATA)
    }
    /// Returns the LLVM function declaration.
    pub fn declaration(&self) -> Declaration<'ctx> {
        self.declaration
@@ -100,21 +110,30 @@ impl<'ctx> Function<'ctx> {
    pub fn set_attributes(
        llvm: &'ctx inkwell::context::Context,
        declaration: Declaration<'ctx>,
-        attributes: &[Attribute],
+        attributes: Vec<Attribute>,
        force: bool,
    ) {
-        for attribute_kind in attributes {
+        for attribute_kind in attributes.into_iter() {
            match attribute_kind {
                Attribute::Memory => unimplemented!("`memory` attributes are not implemented"),
                attribute_kind @ Attribute::AlwaysInline if force => {
-                    declaration.value.remove_enum_attribute(
+                    let is_optimize_none_set = declaration
-                        inkwell::attributes::AttributeLoc::Function,
+                        .value
-                        Attribute::NoInline as u32,
+                        .get_enum_attribute(
-                    );
+                            inkwell::attributes::AttributeLoc::Function,
-                    declaration.value.add_attribute(
+                            Attribute::OptimizeNone as u32,
-                        inkwell::attributes::AttributeLoc::Function,
+                        )
-                        llvm.create_enum_attribute(*attribute_kind as u32, 0),
+                        .is_some();
-                    );
+                    if !is_optimize_none_set {
                        declaration.value.remove_enum_attribute(
                            inkwell::attributes::AttributeLoc::Function,
                            Attribute::NoInline as u32,
                        );
                        declaration.value.add_attribute(
                            inkwell::attributes::AttributeLoc::Function,
                            llvm.create_enum_attribute(attribute_kind as u32, 0),
                        );
                    }
                }
                attribute_kind @ Attribute::NoInline if force => {
                    declaration.value.remove_enum_attribute(
@@ -123,12 +142,12 @@ impl<'ctx> Function<'ctx> {
                    );
                    declaration.value.add_attribute(
                        inkwell::attributes::AttributeLoc::Function,
-                        llvm.create_enum_attribute(*attribute_kind as u32, 0),
+                        llvm.create_enum_attribute(attribute_kind as u32, 0),
                    );
                }
                attribute_kind => declaration.value.add_attribute(
                    inkwell::attributes::AttributeLoc::Function,
-                    llvm.create_enum_attribute(*attribute_kind as u32, 0),
+                    llvm.create_enum_attribute(attribute_kind as u32, 0),
                ),
            }
        }
@@ -159,16 +178,27 @@ impl<'ctx> Function<'ctx> {
        declaration: Declaration<'ctx>,
        optimizer: &Optimizer,
    ) {
-        if optimizer.settings().level_middle_end_size == SizeLevel::Z {
+        if optimizer.settings().level_middle_end == inkwell::OptimizationLevel::None {
            Self::remove_attributes(
                declaration,
                &[Attribute::OptimizeForSize, Attribute::AlwaysInline],
            );
            Self::set_attributes(
                llvm,
                declaration,
-                &[Attribute::OptimizeForSize, Attribute::MinSize],
+                vec![Attribute::OptimizeNone, Attribute::NoInline],
                false,
            );
        } else if optimizer.settings().level_middle_end_size == SizeLevel::Z {
            Self::set_attributes(
                llvm,
                declaration,
                vec![Attribute::OptimizeForSize, Attribute::MinSize],
                false,
            );
        }
-        Self::set_attributes(llvm, declaration, &[Attribute::NoFree], false);
+        Self::set_attributes(llvm, declaration, vec![Attribute::NoFree], false);
    }
    /// Sets the front-end runtime attributes.
@@ -178,10 +208,26 @@ impl<'ctx> Function<'ctx> {
        optimizer: &Optimizer,
    ) {
        if optimizer.settings().level_middle_end_size == SizeLevel::Z {
-            Self::set_attributes(llvm, declaration, &[Attribute::NoInline], false);
+            Self::set_attributes(llvm, declaration, vec![Attribute::NoInline], false);
        }
    }
    /// Sets the exception handler attributes.
    pub fn set_exception_handler_attributes(
        llvm: &'ctx inkwell::context::Context,
        declaration: Declaration<'ctx>,
    ) {
        Self::set_attributes(llvm, declaration, vec![Attribute::NoInline], false);
    }
    /// Sets the CXA-throw attributes.
    pub fn set_cxa_throw_attributes(
        llvm: &'ctx inkwell::context::Context,
        declaration: Declaration<'ctx>,
    ) {
        Self::set_attributes(llvm, declaration, vec![Attribute::NoProfile], false);
    }
    /// Sets the pure function attributes.
    pub fn set_pure_function_attributes(
        llvm: &'ctx inkwell::context::Context,
@@ -190,7 +236,7 @@ impl<'ctx> Function<'ctx> {
        Self::set_attributes(
            llvm,
            declaration,
-            &[
+            vec![
                Attribute::MustProgress,
                Attribute::NoUnwind,
                Attribute::WillReturn,
@@ -214,11 +260,30 @@ impl<'ctx> Function<'ctx> {
        self.stack.get(name).copied()
    }
    /// Removes the pointer to a stack variable.
    pub fn remove_stack_pointer(&mut self, name: &str) {
        self.stack.remove(name);
    }
    /// Returns the return entity representation.
    pub fn r#return(&self) -> Return<'ctx> {
        self.r#return
    }
    /// Returns the pointer to the function return value.
    /// # Panics
    /// If the pointer has not been set yet.
    pub fn return_pointer(&self) -> Option<Pointer<'ctx>> {
        self.r#return.return_pointer()
    }
    /// Returns the return data size in bytes, based on the default stack alignment.
    /// # Panics
    /// If the pointer has not been set yet.
    pub fn return_data_size(&self) -> usize {
        self.r#return.return_data_size()
    }
    /// Returns the function entry block.
    pub fn entry_block(&self) -> inkwell::basic_block::BasicBlock<'ctx> {
        self.entry_block
@@ -1,242 +0,0 @@
 //! Translates the arithmetic operations.
 use inkwell::values::BasicValue;
 use revive_common::BIT_LENGTH_WORD;
 use crate::polkavm::context::runtime::RuntimeFunction;
 use crate::polkavm::context::Context;
 use crate::polkavm::WriteLLVM;
 /// Implements the division operator according to the EVM specification.
 pub struct Division;
 impl RuntimeFunction for Division {
    const NAME: &'static str = "__revive_division";
    fn r#type<'ctx>(context: &Context<'ctx>) -> inkwell::types::FunctionType<'ctx> {
        context.word_type().fn_type(
            &[context.word_type().into(), context.word_type().into()],
            false,
        )
    }
    fn emit_body<'ctx>(
        &self,
        context: &mut Context<'ctx>,
    ) -> anyhow::Result<Option<inkwell::values::BasicValueEnum<'ctx>>> {
        let operand_1 = Self::paramater(context, 0).into_int_value();
        let operand_2 = Self::paramater(context, 1).into_int_value();
        wrapped_division(context, operand_2, || {
            Ok(context
                .builder()
                .build_int_unsigned_div(operand_1, operand_2, "DIV")?)
        })
        .map(Into::into)
    }
 }
 impl WriteLLVM for Division {
    fn declare(&mut self, context: &mut Context) -> anyhow::Result<()> {
        <Self as RuntimeFunction>::declare(self, context)
    }
    fn into_llvm(self, context: &mut Context) -> anyhow::Result<()> {
        <Self as RuntimeFunction>::emit(&self, context)
    }
 }
 /// Implements the signed division operator according to the EVM specification.
 pub struct SignedDivision;
 impl RuntimeFunction for SignedDivision {
    const NAME: &'static str = "__revive_signed_division";
    fn r#type<'ctx>(context: &Context<'ctx>) -> inkwell::types::FunctionType<'ctx> {
        context.word_type().fn_type(
            &[context.word_type().into(), context.word_type().into()],
            false,
        )
    }
    fn emit_body<'ctx>(
        &self,
        context: &mut Context<'ctx>,
    ) -> anyhow::Result<Option<inkwell::values::BasicValueEnum<'ctx>>> {
        let operand_1 = Self::paramater(context, 0).into_int_value();
        let operand_2 = Self::paramater(context, 1).into_int_value();
        let block_calculate = context.append_basic_block("calculate");
        let block_overflow = context.append_basic_block("overflow");
        let block_select = context.append_basic_block("select_result");
        let block_origin = context.basic_block();
        context.builder().build_switch(
            operand_2,
            block_calculate,
            &[
                (context.word_type().const_zero(), block_select),
                (context.word_type().const_all_ones(), block_overflow),
            ],
        )?;
        context.set_basic_block(block_calculate);
        let quotient = context
            .builder()
            .build_int_signed_div(operand_1, operand_2, "SDIV")?;
        context.build_unconditional_branch(block_select);
        context.set_basic_block(block_overflow);
        let max_uint = context.builder().build_int_z_extend(
            context.integer_type(BIT_LENGTH_WORD - 1).const_all_ones(),
            context.word_type(),
            "max_uint",
        )?;
        let is_operand_1_overflow = context.builder().build_int_compare(
            inkwell::IntPredicate::EQ,
            operand_1,
            context.builder().build_int_neg(max_uint, "min_uint")?,
            "is_operand_1_overflow",
        )?;
        context.build_conditional_branch(is_operand_1_overflow, block_select, block_calculate)?;
        context.set_basic_block(block_select);
        let result = context.builder().build_phi(context.word_type(), "result")?;
        result.add_incoming(&[
            (&operand_1, block_overflow),
            (&context.word_const(0), block_origin),
            (&quotient.as_basic_value_enum(), block_calculate),
        ]);
        Ok(Some(result.as_basic_value()))
    }
 }
 impl WriteLLVM for SignedDivision {
    fn declare(&mut self, context: &mut Context) -> anyhow::Result<()> {
        <Self as RuntimeFunction>::declare(self, context)
    }
    fn into_llvm(self, context: &mut Context) -> anyhow::Result<()> {
        <Self as RuntimeFunction>::emit(&self, context)
    }
 }
 /// Implements the remainder operator according to the EVM specification.
 pub struct Remainder;
 impl RuntimeFunction for Remainder {
    const NAME: &'static str = "__revive_remainder";
    fn r#type<'ctx>(context: &Context<'ctx>) -> inkwell::types::FunctionType<'ctx> {
        context.word_type().fn_type(
            &[context.word_type().into(), context.word_type().into()],
            false,
        )
    }
    fn emit_body<'ctx>(
        &self,
        context: &mut Context<'ctx>,
    ) -> anyhow::Result<Option<inkwell::values::BasicValueEnum<'ctx>>> {
        let operand_1 = Self::paramater(context, 0).into_int_value();
        let operand_2 = Self::paramater(context, 1).into_int_value();
        wrapped_division(context, operand_2, || {
            Ok(context
                .builder()
                .build_int_unsigned_rem(operand_1, operand_2, "MOD")?)
        })
        .map(Into::into)
    }
 }
 impl WriteLLVM for Remainder {
    fn declare(&mut self, context: &mut Context) -> anyhow::Result<()> {
        <Self as RuntimeFunction>::declare(self, context)
    }
    fn into_llvm(self, context: &mut Context) -> anyhow::Result<()> {
        <Self as RuntimeFunction>::emit(&self, context)
    }
 }
 /// Implements the signed remainder operator according to the EVM specification.
 pub struct SignedRemainder;
 impl RuntimeFunction for SignedRemainder {
    const NAME: &'static str = "__revive_signed_remainder";
    fn r#type<'ctx>(context: &Context<'ctx>) -> inkwell::types::FunctionType<'ctx> {
        context.word_type().fn_type(
            &[context.word_type().into(), context.word_type().into()],
            false,
        )
    }
    fn emit_body<'ctx>(
        &self,
        context: &mut Context<'ctx>,
    ) -> anyhow::Result<Option<inkwell::values::BasicValueEnum<'ctx>>> {
        let operand_1 = Self::paramater(context, 0).into_int_value();
        let operand_2 = Self::paramater(context, 1).into_int_value();
        wrapped_division(context, operand_2, || {
            Ok(context
                .builder()
                .build_int_signed_rem(operand_1, operand_2, "SMOD")?)
        })
        .map(Into::into)
    }
 }
 impl WriteLLVM for SignedRemainder {
    fn declare(&mut self, context: &mut Context) -> anyhow::Result<()> {
        <Self as RuntimeFunction>::declare(self, context)
    }
    fn into_llvm(self, context: &mut Context) -> anyhow::Result<()> {
        <Self as RuntimeFunction>::emit(&self, context)
    }
 }
 /// Wrap division operations so that zero will be returned if the
 /// denominator is zero (see also Ethereum YP Appendix H.2).
 ///
 /// The closure is expected to calculate and return the quotient.
 ///
 /// The result is either the calculated quotient or zero,
 ///  selected at runtime.
 fn wrapped_division<'ctx, F, T>(
    context: &Context<'ctx>,
    denominator: inkwell::values::IntValue<'ctx>,
    f: F,
 ) -> anyhow::Result<inkwell::values::BasicValueEnum<'ctx>>
 where
    F: FnOnce() -> anyhow::Result<T>,
    T: inkwell::values::IntMathValue<'ctx>,
 {
    assert_eq!(
        denominator.get_type().get_bit_width(),
        revive_common::BIT_LENGTH_WORD as u32
    );
    let block_calculate = context.append_basic_block("calculate");
    let block_select = context.append_basic_block("select");
    let block_origin = context.basic_block();
    context.builder().build_switch(
        denominator,
        block_calculate,
        &[(context.word_const(0), block_select)],
    )?;
    context.set_basic_block(block_calculate);
    let calculated_value = f()?.as_basic_value_enum();
    context.build_unconditional_branch(block_select);
    context.set_basic_block(block_select);
    let result = context.builder().build_phi(context.word_type(), "result")?;
    result.add_incoming(&[
        (&context.word_const(0), block_origin),
        (&calculated_value, block_calculate),
    ]);
    Ok(result.as_basic_value())
 }
@@ -1,52 +1,63 @@
 //! The deploy code function.
 use std::marker::PhantomData;
 use crate::polkavm::context::code_type::CodeType;
 use crate::polkavm::context::function::runtime;
 use crate::polkavm::context::Context;
 use crate::polkavm::Dependency;
 use crate::polkavm::WriteLLVM;
 /// The deploy code function.
 /// Is a special function that is only used by the front-end generated code.
 #[derive(Debug)]
-pub struct DeployCode<B>
+pub struct DeployCode<B, D>
 where
-    B: WriteLLVM,
+    B: WriteLLVM<D>,
    D: Dependency + Clone,
 {
    /// The deploy code AST representation.
    inner: B,
    /// The `D` phantom data.
    _pd: PhantomData<D>,
 }
-impl<B> DeployCode<B>
+impl<B, D> DeployCode<B, D>
 where
-    B: WriteLLVM,
+    B: WriteLLVM<D>,
    D: Dependency + Clone,
 {
    /// A shortcut constructor.
    pub fn new(inner: B) -> Self {
-        Self { inner }
+        Self {
            inner,
            _pd: PhantomData,
        }
    }
 }
-impl<B> WriteLLVM for DeployCode<B>
+impl<B, D> WriteLLVM<D> for DeployCode<B, D>
 where
-    B: WriteLLVM,
+    B: WriteLLVM<D>,
    D: Dependency + Clone,
 {
-    fn declare(&mut self, context: &mut Context) -> anyhow::Result<()> {
+    fn declare(&mut self, context: &mut Context<D>) -> anyhow::Result<()> {
        let function_type = context.function_type::<inkwell::types::BasicTypeEnum>(vec![], 0);
        context.add_function(
            runtime::FUNCTION_DEPLOY_CODE,
            function_type,
            0,
-            Some(inkwell::module::Linkage::Private),
+            Some(inkwell::module::Linkage::External),
            None,
            false,
        )?;
        self.inner.declare(context)
    }
-    fn into_llvm(self, context: &mut Context) -> anyhow::Result<()> {
+    fn into_llvm(self, context: &mut Context<D>) -> anyhow::Result<()> {
-        context.set_current_function(runtime::FUNCTION_DEPLOY_CODE, None, false)?;
+        context.set_current_function(runtime::FUNCTION_DEPLOY_CODE, None)?;
        context.set_basic_block(context.current_function().borrow().entry_block());
        context.set_code_type(CodeType::Deploy);
        self.inner.into_llvm(context)?;
        context.set_debug_location(0, 0, None)?;
@@ -63,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,16 +1,11 @@
 //! The entry function.
 use inkwell::types::BasicType;
 use revive_common::BIT_LENGTH_ETH_ADDRESS;
 use revive_runtime_api::immutable_data::{
    GLOBAL_IMMUTABLE_DATA_POINTER, GLOBAL_IMMUTABLE_DATA_SIZE,
 };
 use revive_runtime_api::polkavm_imports::CALL_DATA_SIZE;
 use revive_solc_json_interface::PolkaVMDefaultHeapMemorySize;
 use crate::polkavm::context::address_space::AddressSpace;
 use crate::polkavm::context::function::runtime;
 use crate::polkavm::context::Context;
 use crate::polkavm::Dependency;
 use crate::polkavm::WriteLLVM;
 /// The entry function.
@@ -25,7 +20,26 @@ impl Entry {
    /// Initializes the global variables.
    /// The pointers are not initialized, because it's not possible to create a null pointer.
-    pub fn initialize_globals(context: &mut Context) -> anyhow::Result<()> {
+    pub fn initialize_globals<D>(context: &mut Context<D>) -> anyhow::Result<()>
    where
        D: Dependency + Clone,
    {
        context.set_global(
            crate::polkavm::GLOBAL_HEAP_MEMORY_POINTER,
            context.llvm().ptr_type(AddressSpace::Heap.into()),
            AddressSpace::Stack,
            context.xlen_type().get_undef(),
        );
        context.build_store(
            context
                .get_global(crate::polkavm::GLOBAL_HEAP_MEMORY_POINTER)?
                .into(),
            context.build_sbrk(
                context.xlen_type().const_zero(),
                context.xlen_type().const_zero(),
            )?,
        )?;
        context.set_global(
            crate::polkavm::GLOBAL_CALLDATA_SIZE,
            context.xlen_type(),
@@ -34,51 +48,28 @@ impl Entry {
        );
        context.set_global(
-            crate::polkavm::GLOBAL_HEAP_SIZE,
+            crate::polkavm::GLOBAL_CALL_FLAGS,
-            context.xlen_type(),
+            context.word_type(),
            AddressSpace::Stack,
-            context.xlen_type().const_zero(),
+            context.word_const(0),
        );
        let heap_memory_type = context.byte_type().array_type(
            context
                .memory_config
                .heap_size
                .unwrap_or(PolkaVMDefaultHeapMemorySize),
        );
        context.set_global(
            crate::polkavm::GLOBAL_HEAP_MEMORY,
            heap_memory_type,
            AddressSpace::Stack,
            heap_memory_type.const_zero(),
        );
        let address_type = context.integer_type(BIT_LENGTH_ETH_ADDRESS);
        context.set_global(
            crate::polkavm::GLOBAL_ADDRESS_SPILL_BUFFER,
            address_type,
            AddressSpace::Stack,
            address_type.const_zero(),
        );
        Ok(())
    }
    /// Populate the calldata size global value.
-    pub fn load_calldata_size(context: &mut Context) -> anyhow::Result<()> {
+    pub fn load_calldata_size<D>(context: &mut Context<D>) -> anyhow::Result<()>
    where
        D: Dependency + Clone,
    {
        let call_data_size_pointer = context
            .get_global(crate::polkavm::GLOBAL_CALLDATA_SIZE)?
            .value
            .as_pointer_value();
        let call_data_size_value = context
-            .build_runtime_call(CALL_DATA_SIZE, &[])
+            .build_runtime_call(revive_runtime_api::polkavm_imports::CALL_DATA_SIZE, &[])
            .expect("the call_data_size syscall method should return a value")
            .into_int_value();
        let call_data_size_value = context.builder().build_int_truncate(
            call_data_size_value,
            context.xlen_type(),
            "call_data_size_truncated",
        )?;
        context
            .builder()
            .build_store(call_data_size_pointer, call_data_size_value)?;
@@ -88,7 +79,10 @@ impl Entry {
    /// Calls the deploy code if the first function argument was `1`.
    /// Calls the runtime code otherwise.
-    pub fn leave_entry(context: &mut Context) -> anyhow::Result<()> {
+    pub fn leave_entry<D>(context: &mut Context<D>) -> anyhow::Result<()>
    where
        D: Dependency + Clone,
    {
        context.set_debug_location(0, 0, None)?;
        let is_deploy = context
@@ -96,6 +90,13 @@ impl Entry {
            .borrow()
            .get_nth_param(Self::ARGUMENT_INDEX_CALL_FLAGS);
        context.set_global(
            crate::polkavm::GLOBAL_CALL_FLAGS,
            is_deploy.get_type(),
            AddressSpace::Stack,
            is_deploy.into_int_value(),
        );
        let deploy_code_call_block = context.append_basic_block("deploy_code_call_block");
        let runtime_code_call_block = context.append_basic_block("runtime_code_call_block");
@@ -128,8 +129,11 @@ impl Entry {
    }
 }
-impl WriteLLVM for Entry {
+impl<D> WriteLLVM<D> for Entry
-    fn declare(&mut self, context: &mut Context) -> anyhow::Result<()> {
+where
    D: Dependency + Clone,
 {
    fn declare(&mut self, context: &mut Context<D>) -> anyhow::Result<()> {
        let entry_arguments = vec![context.bool_type().as_basic_type_enum()];
        let entry_function_type = context.function_type(entry_arguments, 0);
        context.add_function(
@@ -137,18 +141,16 @@ impl WriteLLVM for Entry {
            entry_function_type,
            0,
            Some(inkwell::module::Linkage::External),
            None,
            false,
        )?;
        context.declare_global(
-            GLOBAL_IMMUTABLE_DATA_POINTER,
+            revive_runtime_api::immutable_data::GLOBAL_IMMUTABLE_DATA_POINTER,
            context.word_type().array_type(0),
            AddressSpace::Stack,
        );
        context.declare_global(
-            GLOBAL_IMMUTABLE_DATA_SIZE,
+            revive_runtime_api::immutable_data::GLOBAL_IMMUTABLE_DATA_SIZE,
            context.xlen_type(),
            AddressSpace::Stack,
        );
@@ -159,20 +161,20 @@ impl WriteLLVM for Entry {
    /// Instead of a single entrypoint, the runtime expects two exports: `call ` and `deploy`.
    /// `call` and `deploy` directly call `entry`, signaling a deploy if the first arg is `1`.
    /// The `entry` function loads calldata, sets globals and calls the runtime or deploy code.
-    fn into_llvm(self, context: &mut Context) -> anyhow::Result<()> {
+    fn into_llvm(self, context: &mut Context<D>) -> anyhow::Result<()> {
        let entry = context
-            .get_function(runtime::FUNCTION_ENTRY, false)
+            .get_function(runtime::FUNCTION_ENTRY)
            .expect("the entry function should already be declared")
            .borrow()
            .declaration;
        crate::PolkaVMFunction::set_attributes(
            context.llvm(),
            entry,
-            &[crate::PolkaVMAttribute::NoReturn],
+            vec![crate::PolkaVMAttribute::NoReturn],
            true,
        );
-        context.set_current_function(runtime::FUNCTION_ENTRY, None, false)?;
+        context.set_current_function(runtime::FUNCTION_ENTRY, None)?;
        context.set_basic_block(context.current_function().borrow().entry_block());
        Self::initialize_globals(context)?;
@@ -0,0 +1,118 @@
 //! The immutable data runtime function.
 use crate::polkavm::context::address_space::AddressSpace;
 use crate::polkavm::context::function::runtime;
 use crate::polkavm::context::pointer::Pointer;
 use crate::polkavm::context::Context;
 use crate::polkavm::Dependency;
 use crate::polkavm::WriteLLVM;
 /// A function for requesting the immutable data from the runtime.
 /// This is a special function that is only used by the front-end generated code.
 ///
 /// The runtime API is called lazily and subsequent calls are no-ops.
 ///
 /// The bytes written is asserted to match the expected length.
 /// This should never fail; the length is known.
 /// However, this is a one time assertion, hence worth it.
 #[derive(Debug)]
 pub struct ImmutableDataLoad;
 impl<D> WriteLLVM<D> for ImmutableDataLoad
 where
    D: Dependency + Clone,
 {
    fn declare(&mut self, context: &mut Context<D>) -> anyhow::Result<()> {
        context.add_function(
            runtime::FUNCTION_LOAD_IMMUTABLE_DATA,
            context.void_type().fn_type(Default::default(), false),
            0,
            Some(inkwell::module::Linkage::External),
        )?;
        Ok(())
    }
    fn into_llvm(self, context: &mut Context<D>) -> anyhow::Result<()> {
        context.set_current_function(runtime::FUNCTION_LOAD_IMMUTABLE_DATA, None)?;
        context.set_basic_block(context.current_function().borrow().entry_block());
        let immutable_data_size_pointer = context
            .get_global(revive_runtime_api::immutable_data::GLOBAL_IMMUTABLE_DATA_SIZE)?
            .value
            .as_pointer_value();
        let immutable_data_size = context.build_load(
            Pointer::new(
                context.xlen_type(),
                AddressSpace::Stack,
                immutable_data_size_pointer,
            ),
            "immutable_data_size_load",
        )?;
        let load_immutable_data_block = context.append_basic_block("load_immutables_block");
        let return_block = context.current_function().borrow().return_block();
        let immutable_data_size_is_zero = context.builder().build_int_compare(
            inkwell::IntPredicate::EQ,
            context.xlen_type().const_zero(),
            immutable_data_size.into_int_value(),
            "immutable_data_size_is_zero",
        )?;
        context.build_conditional_branch(
            immutable_data_size_is_zero,
            return_block,
            load_immutable_data_block,
        )?;
        context.set_basic_block(load_immutable_data_block);
        let output_pointer = context
            .get_global(revive_runtime_api::immutable_data::GLOBAL_IMMUTABLE_DATA_POINTER)?
            .value
            .as_pointer_value();
        context.build_runtime_call(
            revive_runtime_api::polkavm_imports::GET_IMMUTABLE_DATA,
            &[
                context
                    .builder()
                    .build_ptr_to_int(output_pointer, context.xlen_type(), "ptr_to_xlen")?
                    .into(),
                context
                    .builder()
                    .build_ptr_to_int(
                        immutable_data_size_pointer,
                        context.xlen_type(),
                        "ptr_to_xlen",
                    )?
                    .into(),
            ],
        );
        let bytes_written = context.builder().build_load(
            context.xlen_type(),
            immutable_data_size_pointer,
            "bytes_written",
        )?;
        context.builder().build_store(
            immutable_data_size_pointer,
            context.xlen_type().const_zero(),
        )?;
        let overflow_block = context.append_basic_block("immutable_data_overflow");
        let is_overflow = context.builder().build_int_compare(
            inkwell::IntPredicate::UGT,
            immutable_data_size.into_int_value(),
            bytes_written.into_int_value(),
            "is_overflow",
        )?;
        context.build_conditional_branch(is_overflow, overflow_block, return_block)?;
        context.set_basic_block(overflow_block);
        context.build_call(context.intrinsics().trap, &[], "invalid_trap");
        context.build_unreachable();
        context.set_basic_block(return_block);
        context.build_return(None);
        context.pop_debug_scope();
        Ok(())
    }
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
xermicus	471e4b7263	bump PVM Signed-off-by: xermicus <cyrill@parity.io>	2025-02-13 09:19:58 +01:00
xermicus	079e5c1cc4	switch polkadot-sdk branch to disable validation in the runner Signed-off-by: xermicus <cyrill@parity.io>	2025-02-13 08:35:46 +01:00