wip

.cargo/config.toml

@@ -10,8 +10,8 @@ rustflags = [
     "-Clink-arg=-sWASM_ASYNC_COMPILATION=0",
     "-Clink-arg=-sDYNAMIC_EXECUTION=0",
     "-Clink-arg=-sALLOW_TABLE_GROWTH=1",
-    "-Clink-arg=--js-library=js/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"
 ]

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

@@ -3,8 +3,7 @@ inputs:
   version:
     description: ""
     required: false
-    default: "4.0.9"
+    default: "3.1.64"
-
 
 runs:
   using: "composite"

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

@@ -19,7 +19,7 @@ runs:
       shell: bash
       run: |
         mkdir -p solc
-        curl -sSL --output solc/solc https://github.com/ethereum/solidity/releases/download/v0.8.30/${SOLC_NAME}
+        curl -sSL --output solc/solc https://github.com/ethereum/solidity/releases/download/v0.8.29/${SOLC_NAME}
 
     - name: Make Solc Executable
       if: ${{ runner.os == 'Windows' }}

.github/scripts/json_generator.py

@@ -1,13 +1,3 @@
-#!/usr/bin/env python3
-"""
-This script generates JSON files for different platforms based on GitHub release data.
-It fetches release information from a specified GitHub repository and tag,
-parses the release assets, and generates JSON files for each platform with relevant metadata.
-It also handles checksum files and updates a list.json file for each platform.
-It requires the GITHUB_TOKEN environment variable to be set for authentication.
-Usage:
-    python json_generator.py <repo> <tag>
-"""
 import os
 import sys
 import json

.github/scripts/json_generator_nightly.py

@@ -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()

.github/workflows/npm-release.yml

@@ -0,0 +1,49 @@
+name: NPM Release
+
+on:
+    release:
+        types: [released]
+
+env:
+    CI: true
+
+jobs:
+    publish:
+        name: Build & Publish to NPM
+        runs-on: ubuntu-latest
+        steps:
+            - name: Checkout
+              uses: actions/checkout@v4
+
+            - name: Setup Node.js
+              uses: actions/setup-node@v4
+              with:
+                  node-version: 22.x
+
+            - name: Install
+              run: yarn install --immutable
+
+            - name: update-resolc
+              run: yarn update-resolc
+
+            - name: Build
+              run: yarn build
+
+            - name: Set version
+              run: npm version --no-git-tag-version ${{github.event.release.tag_name}}
+
+            - name: npm pack
+              run: npm pack
+
+            - uses: actions/upload-artifact@v4
+              with:
+                  name: package
+                  path: 'parity-revive-*.tgz'
+
+            - uses: octokit/request-action@bbedc70b1981e610d89f1f8de88311a1fc02fb83
+              with:
+                  route: POST /repos/paritytech/npm_publish_automation/actions/workflows/publish.yml/dispatches
+                  ref: main
+                  inputs: '${{ format(''{{ "repo": "{0}", "run_id": "{1}" }}'', github.repository, github.run_id) }}'
+              env:
+                  GITHUB_TOKEN: ${{ secrets.NPM_PUBLISH_AUTOMATION_TOKEN }}

.github/workflows/release-llvm.yml

@@ -37,7 +37,15 @@ jobs:
   build:
     strategy:
       matrix:
-        target: [x86_64-unknown-linux-gnu, x86_64-unknown-linux-musl, wasm32-unknown-emscripten, aarch64-apple-darwin, x86_64-apple-darwin, x86_64-pc-windows-msvc]
+        target:
+          [
+            x86_64-unknown-linux-gnu,
+            x86_64-unknown-linux-musl,
+            wasm32-unknown-emscripten,
+            aarch64-apple-darwin,
+            x86_64-apple-darwin,
+            x86_64-pc-windows-msvc,
+          ]
         include:
           - target: x86_64-unknown-linux-gnu
             builder-arg: gnu
@@ -87,14 +95,9 @@ jobs:
         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
+          cargo install --path crates/llvm-builder
 
       - name: Clone LLVM
         run: |

.github/workflows/release-nightly.yml

@@ -1,385 +0,0 @@
-name: Nightly Release
-on:
-  schedule:
-    # Run every day at 01:00 UTC
-    - cron: "0 1 * * *"
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: true
-
-env:
-  CARGO_TERM_COLOR: always
-  RUST_MUSL_CROSS_IMAGE: messense/rust-musl-cross@sha256:c0154e992adb791c3b848dd008939d19862549204f8cb26f5ca7a00f629e6067
-
-jobs:
-  # check if there were commits yesterday
-  check_commits:
-    runs-on: ubuntu-latest
-    outputs:
-      has_commits: ${{ steps.check_commits.outputs.has_commits }}
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0 # Fetch full history to check previous commits
-          ref: "main"
-
-      - name: Check for commits from yesterday
-        id: check_commits
-        run: |
-          # Get yesterday's date in YYYY-MM-DD format
-          YESTERDAY=$(date -d "yesterday" +%Y-%m-%d)
-          echo "Checking for commits from: $YESTERDAY"
-
-          # Check if there were any commits yesterday
-          COMMIT_COUNT=$(git log --oneline --since="$YESTERDAY 00:00:00" --until="$YESTERDAY 23:59:59" | wc -l)
-
-          echo "Found $COMMIT_COUNT commits from yesterday"
-
-          if [ $COMMIT_COUNT -gt 0 ]; then
-            echo "has_commits=true" >> $GITHUB_OUTPUT
-            echo "✅ Found $COMMIT_COUNT commits from yesterday - continuing workflow"
-          else
-            echo "has_commits=false" >> $GITHUB_OUTPUT
-            echo "❌ No commits found from yesterday - skipping remaining steps"
-            echo "::notice::❌ No commits found from yesterday - skipping remaining steps"
-          fi
-
-  build:
-    # github actions matrix jobs don't support multiple outputs
-    # ugly workaround from https://github.com/orgs/community/discussions/17245#discussioncomment-11222880
-    if: ${{ needs.check_commits.outputs.has_commits == 'true' }}
-    outputs:
-      resolc-x86_64-unknown-linux-musl_url: ${{ steps.set-output.outputs.resolc-x86_64-unknown-linux-musl_url }}
-      resolc-x86_64-unknown-linux-musl_sha: ${{ steps.set-output.outputs.resolc-x86_64-unknown-linux-musl_sha }}
-      resolc-aarch64-apple-darwin_url: ${{ steps.set-output.outputs.resolc-aarch64-apple-darwin_url }}
-      resolc-aarch64-apple-darwin_sha: ${{ steps.set-output.outputs.resolc-aarch64-apple-darwin_sha }}
-      resolc-x86_64-apple-darwin_url: ${{ steps.set-output.outputs.resolc-x86_64-apple-darwin_url }}
-      resolc-x86_64-apple-darwin_sha: ${{ steps.set-output.outputs.resolc-x86_64-apple-darwin_sha }}
-      resolc-x86_64-pc-windows-msvc_url: ${{ steps.set-output.outputs.resolc-x86_64-pc-windows-msvc_url }}
-      resolc-x86_64-pc-windows-msvc_sha: ${{ steps.set-output.outputs.resolc-x86_64-pc-windows-msvc_sha }}
-    strategy:
-      matrix:
-        target:
-          [
-            x86_64-unknown-linux-musl,
-            aarch64-apple-darwin,
-            x86_64-apple-darwin,
-            x86_64-pc-windows-msvc,
-          ]
-        include:
-          - target: x86_64-unknown-linux-musl
-            type: musl
-            runner: ubuntu-24.04
-          - target: aarch64-apple-darwin
-            type: native
-            runner: macos-14
-          - target: x86_64-apple-darwin
-            type: native
-            runner: macos-13
-          - target: x86_64-pc-windows-msvc
-            type: native
-            runner: windows-2022
-    runs-on: ${{ matrix.runner }}
-    needs: [check_commits]
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions-rust-lang/setup-rust-toolchain@v1
-        with:
-          # without this it will override our rust flags
-          rustflags: ""
-          cache-key: ${{ matrix.target }}
-
-      - name: Download LLVM
-        uses: ./.github/actions/get-llvm
-        with:
-          target: ${{ matrix.target }}
-
-      - name: Build
-        if: ${{ matrix.type == 'native' }}
-        shell: bash
-        run: |
-          export LLVM_SYS_181_PREFIX=$PWD/llvm-${{ matrix.target }}
-          make install-bin
-          mv target/release/resolc resolc-${{ matrix.target }} || mv target/release/resolc.exe resolc-${{ matrix.target }}.exe
-
-      - name: Build
-        if: ${{ matrix.type == 'musl' }}
-        run: |
-          docker run -v $PWD:/opt/revive $RUST_MUSL_CROSS_IMAGE /bin/bash -c "
-           cd /opt/revive
-           chown -R root:root .
-           apt update && apt upgrade -y && apt install -y pkg-config
-           export LLVM_SYS_181_PREFIX=/opt/revive/llvm-${{ matrix.target }}
-           make install-bin
-           mv target/${{ matrix.target }}/release/resolc resolc-${{ matrix.target }}
-           "
-          sudo chown -R $(id -u):$(id -g) .
-
-      - name: Install Solc
-        uses: ./.github/actions/get-solc
-
-      - name: Basic Sanity Check
-        shell: bash
-        run: |
-          result=$(./resolc-${{ matrix.target }} --bin crates/integration/contracts/flipper.sol)
-          echo $result
-          if [[ $result == *'0x50564d'* ]]; then exit 0; else exit 1; fi
-
-      - name: Upload artifacts (nightly)
-        uses: actions/upload-artifact@v4
-        id: artifact-upload-step
-        with:
-          name: resolc-${{ matrix.target }}
-          path: resolc-${{ matrix.target }}*
-          retention-days: 40
-
-      - name: Set output variables (nightly)
-        id: set-output
-        shell: bash
-        run: |
-          echo "Artifact URL is ${{ steps.artifact-upload-step.outputs.artifact-url }}"
-          echo "Artifact SHA is ${{ steps.artifact-upload-step.outputs.artifact-digest }}"
-          echo "resolc-${{ matrix.target }}_url=${{ steps.artifact-upload-step.outputs.artifact-url }}"
-          echo "resolc-${{ matrix.target }}_url=${{ steps.artifact-upload-step.outputs.artifact-url }}" >> "$GITHUB_OUTPUT"
-          echo "resolc-${{ matrix.target }}_sha=${{ steps.artifact-upload-step.outputs.artifact-digest }}"
-          echo "resolc-${{ matrix.target }}_sha=${{ steps.artifact-upload-step.outputs.artifact-digest }}" >> "$GITHUB_OUTPUT"
-
-  build-wasm:
-    runs-on: ubuntu-24.04
-    needs: [check_commits]
-    if: ${{ needs.check_commits.outputs.has_commits == 'true' }}
-    outputs:
-      resolc-web.js_url: ${{ steps.set-output.outputs.resolc_web_js_url }}
-      resolc-web.js_sha: ${{ steps.set-output.outputs.resolc_web_js_sha }}
-    env:
-      RELEASE_RESOLC_WASM_URI: https://github.com/paritytech/revive/releases/download/${{ github.ref_name }}/resolc.wasm
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions-rust-lang/setup-rust-toolchain@v1
-        with:
-          target: wasm32-unknown-emscripten
-          # without this it will override our rust flags
-          rustflags: ""
-
-      - name: Download Host LLVM
-        uses: ./.github/actions/get-llvm
-        with:
-          target: x86_64-unknown-linux-gnu
-
-      - name: Download Wasm LLVM
-        uses: ./.github/actions/get-llvm
-        with:
-          target: wasm32-unknown-emscripten
-
-      - name: Download EMSDK
-        uses: ./.github/actions/get-emsdk
-
-      - name: Build
-        run: |
-          export LLVM_SYS_181_PREFIX=$PWD/llvm-x86_64-unknown-linux-gnu
-          export REVIVE_LLVM_TARGET_PREFIX=$PWD/llvm-wasm32-unknown-emscripten
-          source emsdk/emsdk_env.sh
-          make install-wasm
-          chmod -x ./target/wasm32-unknown-emscripten/release/resolc.wasm
-
-      - name: Set Up Node.js
-        uses: actions/setup-node@v3
-        with:
-          node-version: "20"
-
-      - name: Basic Sanity Check
-        run: |
-          mkdir -p solc
-          curl -sSLo solc/soljson.js https://github.com/ethereum/solidity/releases/download/v0.8.30/soljson.js
-          node -e "
-          const soljson = require('solc/soljson');
-          const createRevive = require('./target/wasm32-unknown-emscripten/release/resolc.js');
-
-          const compiler = createRevive();
-          compiler.soljson = soljson;
-
-          const standardJsonInput =
-          {
-            language: 'Solidity',
-            sources: {
-              'MyContract.sol': {
-                content: 'pragma solidity ^0.8.0; contract MyContract { function greet() public pure returns (string memory) { return \'Hello\'; } }',
-              },
-            },
-            settings: { optimizer: { enabled: false } }
-          };
-
-          compiler.writeToStdin(JSON.stringify(standardJsonInput));
-          compiler.callMain(['--standard-json']);
-
-          // Collect output
-          const stdout = compiler.readFromStdout();
-          const stderr = compiler.readFromStderr();
-
-          if (stderr) { console.error(stderr); process.exit(1); }
-
-          let out = JSON.parse(stdout);
-          let bytecode = out.contracts['MyContract.sol']['MyContract'].evm.bytecode.object
-          console.log(bytecode);
-
-          if(!bytecode.startsWith('50564d')) { process.exit(1); }
-          "
-
-      - name: Compress Artifact
-        run: |
-          mkdir -p resolc-wasm32-unknown-emscripten
-          mv ./target/wasm32-unknown-emscripten/release/resolc.js ./resolc-wasm32-unknown-emscripten/
-          mv ./target/wasm32-unknown-emscripten/release/resolc.wasm ./resolc-wasm32-unknown-emscripten/
-          mv ./target/wasm32-unknown-emscripten/release/resolc_web.js ./resolc-wasm32-unknown-emscripten/
-
-      # There is no way to upload several files as several artifacts with a single upload-artifact step
-      # It's needed to have resolc_web.js separately for night builds for resolc-bin repo
-      # https://github.com/actions/upload-artifact/issues/331
-      - name: Upload artifact resolc.js (nightly)
-        uses: actions/upload-artifact@v4
-        with:
-          name: resolc.js
-          path: resolc-wasm32-unknown-emscripten/resolc.js
-          retention-days: 40
-
-      - name: Upload artifacts resolc.wasm (nightly)
-        uses: actions/upload-artifact@v4
-        with:
-          name: resolc.wasm
-          path: resolc-wasm32-unknown-emscripten/resolc.wasm
-          retention-days: 40
-
-      - name: Upload artifacts resolc_web.js (nightly)
-        uses: actions/upload-artifact@v4
-        id: artifact-upload-step
-        with:
-          name: resolc_web.js
-          path: resolc-wasm32-unknown-emscripten/resolc_web.js
-          retention-days: 40
-
-      - name: Set output variables
-        id: set-output
-        env:
-          TARGET: resolc_web_js
-        run: |
-          echo "Artifact URL is ${{ steps.artifact-upload-step.outputs.artifact-url }}"
-          echo "Artifact SHA is ${{ steps.artifact-upload-step.outputs.artifact-digest }}"
-          echo "${TARGET}_url=${{ steps.artifact-upload-step.outputs.artifact-url }}"
-          echo "${TARGET}_url=${{ steps.artifact-upload-step.outputs.artifact-url }}" >> "$GITHUB_OUTPUT"
-          echo "${TARGET}_sha=${{ steps.artifact-upload-step.outputs.artifact-digest }}""
-          echo "${TARGET}_sha=${{ steps.artifact-upload-step.outputs.artifact-digest }}"" >> "$GITHUB_OUTPUT"
-
-  create-macos-fat-binary:
-    if: ${{ needs.check_commits.outputs.has_commits == 'true' }}
-    needs: [build]
-    outputs:
-      resolc-universal-apple-darwin_url: ${{ steps.set-output.outputs.resolc-universal-apple-darwin_url }}
-      resolc-universal-apple-darwin_sha: ${{ steps.set-output.outputs.resolc-universal-apple-darwin_sha }}
-    runs-on: macos-14
-    steps:
-      - uses: actions/download-artifact@v4
-        with:
-          merge-multiple: true
-
-      - name: Create macOS Fat Binary
-        run: |
-          lipo resolc-aarch64-apple-darwin resolc-x86_64-apple-darwin -create -output resolc-universal-apple-darwin
-
-      - name: Make Executable
-        run: |
-          chmod +x resolc-universal-apple-darwin
-
-      - uses: actions/upload-artifact@v4
-        id: artifact-upload-step
-        with:
-          name: resolc-universal-apple-darwin
-          path: resolc-universal-apple-darwin
-          retention-days: 40
-
-      - name: Set output variables
-        id: set-output
-        env:
-          TARGET: resolc-universal-apple-darwin
-        run: |
-          echo "Artifact URL is ${{ steps.artifact-upload-step.outputs.artifact-url }}"
-          echo "Artifact SHA is ${{ steps.artifact-upload-step.outputs.artifact-digest }}"
-          echo "${TARGET}_url=${{ steps.artifact-upload-step.outputs.artifact-url }}"
-          echo "${TARGET}_url=${{ steps.artifact-upload-step.outputs.artifact-url }}" >> "$GITHUB_OUTPUT"
-          echo "${TARGET}_sha=${{ steps.artifact-upload-step.outputs.artifact-digest }}""
-          echo "${TARGET}_sha=${{ steps.artifact-upload-step.outputs.artifact-digest }}"" >> "$GITHUB_OUTPUT"
-
-  generate-nightly-json:
-    runs-on: ubuntu-24.04
-    if: ${{ needs.check_commits.outputs.has_commits == 'true' }}
-    environment: tags
-    needs: [build-wasm, build, create-macos-fat-binary, check_commits]
-    steps:
-      - name: Checkout revive
-        uses: actions/checkout@v4
-        with:
-          path: revive
-
-      - name: Checkout resolc-bin
-        uses: actions/checkout@v4
-        with:
-          repository: paritytech/resolc-bin
-          path: resolc-bin
-
-      - name: Download Artifacts
-        uses: actions/download-artifact@v4
-        with:
-          merge-multiple: true
-          path: bins
-
-      - uses: actions/create-github-app-token@v1
-        id: app-token
-        with:
-          app-id: ${{ secrets.REVIVE_JSON_APP_ID }}
-          private-key: ${{ secrets.REVIVE_JSON_APP_KEY }}
-          owner: paritytech
-          repositories: resolc-bin
-
-      - name: Generate JSON
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          TOKEN: ${{ steps.app-token.outputs.token }}
-          APP_NAME: "paritytech-revive-json"
-          Green: "\e[32m"
-          NC: "\e[0m"
-        run: |
-          echo '[' > data.json
-          echo '${{ toJSON(needs.build.outputs) }}' >> data.json
-          echo ',' >> data.json
-          echo '${{ toJSON(needs.build-wasm.outputs) }}' >> data.json
-          echo ',' >> data.json
-          echo '${{ toJSON(needs.create-macos-fat-binary.outputs) }}' >> data.json
-          echo ']' >> data.json
-          chmod +x bins/resolc-x86_64-unknown-linux-musl
-          export FIRST_SOLC_VERSION=$(./bins/resolc-x86_64-unknown-linux-musl --supported-solc-versions | cut -f 1 -d "," | tr -d ">=")
-          export LAST_SOLC_VERSION=$(./bins/resolc-x86_64-unknown-linux-musl --supported-solc-versions | cut -f 2 -d "," | tr -d "<=")
-          export FILEPATH=$(readlink -f data.json)
-          export TAG=$(cd revive;gh release list --json name,isLatest --jq '.[] | select(.isLatest)|.name')
-          cd resolc-bin
-          mkdir -p nightly
-          cd nightly
-          python3 ../../revive/.github/scripts/json_generator_nightly.py
-          cd ..
-          git status
-
-          echo "${Green}Add new remote with gh app token${NC}"
-          git remote set-url origin $(git config remote.origin.url | sed "s/github.com/${APP_NAME}:${TOKEN}@github.com/g")
-
-          echo "${Green}Remove http section that causes issues with gh app auth token${NC}"
-          sed -i.bak '/\[http/d' ./.git/config
-          sed -i.bak '/extraheader/d' ./.git/config
-
-          git config user.email "ci@parity.io"
-          git config user.name "${APP_NAME}"
-
-          git add nightly/
-          git commit -m "Update nightly json"
-          git push origin main
-
-          echo "::notice::nightly info.list files were successfully published to https://github.com/paritytech/resolc-bin"

.github/workflows/release.yml

@@ -14,8 +14,7 @@ concurrency:
 
 env:
   CARGO_TERM_COLOR: always
-  # if changed, dont forget to update the env var in release-nightly.yml
+  RUST_MUSL_CROSS_IMAGE: messense/rust-musl-cross@sha256:68b86bc7cb2867259e6b233415a665ff4469c28b57763e78c3bfea1c68091561
-  RUST_MUSL_CROSS_IMAGE: messense/rust-musl-cross@sha256:c0154e992adb791c3b848dd008939d19862549204f8cb26f5ca7a00f629e6067
 
 jobs:
   check-version-changed:
@@ -45,7 +44,7 @@ jobs:
               exit 0
             fi
 
-          export PKG_VER=v$(cat crates/resolc/Cargo.toml | grep -A 5 package] | grep version | cut -d '=' -f 2 | tr -d '"' | tr -d " ")
+          export PKG_VER=v$(cat Cargo.toml | grep -A 5 package] | grep version | cut -d '=' -f 2 | tr -d '"' | tr -d " ")
           echo "Current tag $CURRENT_TAG"
           echo "Package version $PKG_VER"
           #
@@ -144,7 +143,7 @@ jobs:
     runs-on: ubuntu-24.04
     needs: [check-version-changed]
     env:
-      RELEASE_RESOLC_WASM_URI: https://github.com/paritytech/revive/releases/download/${{ github.ref_name }}/resolc.wasm
+      RELEASE_RESOLC_WASM_URI: https://github.com/paritytech/revive-workflow-test/releases/download/${{ github.ref_name }}/resolc.wasm
     steps:
       - uses: actions/checkout@v4
       - uses: actions-rust-lang/setup-rust-toolchain@v1
@@ -182,7 +181,7 @@ jobs:
       - 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
+          curl -sSLo solc/soljson.js https://github.com/ethereum/solidity/releases/download/v0.8.29/soljson.js
           node -e "
           const soljson = require('solc/soljson');
           const createRevive = require('./target/wasm32-unknown-emscripten/release/resolc.js');
@@ -287,43 +286,3 @@ jobs:
             resolc.wasm
             resolc_web.js
             checksums.txt
-
-  npm-release:
-    needs: [create-release]
-    runs-on: macos-14
-    environment: tags
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Download Artifacts
-        uses: actions/download-artifact@v4
-        with:
-          merge-multiple: true
-
-      - name: Set Up Node.js
-        uses: actions/setup-node@v3
-        with:
-          node-version: "20"
-
-      - run: npm ci -w js/resolc
-
-      - name: Build
-        run: |
-          cp -f resolc.{wasm,js} js/resolc/src/resolc
-          npm -w js/resolc run build
-
-      - name: 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 }}

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

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

.github/workflows/test-wasm.yml

@@ -86,18 +86,13 @@ jobs:
       - name: Install Node Packages
         run: npm install
 
-      - name: Test emscripten
+      - 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
-
-      - 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

.gitignore

@@ -12,6 +12,7 @@ target-llvm
 node_modules
 artifacts
 tmp
+package-lock.json
 /*.html
 /build
 soljson.js

.prettierrc.json

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

CHANGELOG.md

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

Cargo.toml

@@ -3,7 +3,7 @@ resolver = "2"
 members = ["crates/*"]
 
 [workspace.package]
-version = "0.1.0"
+version = "0.1.0-dev.14"
 authors = [
     "Cyrill Leutwiler <cyrill@parity.io>",
     "Parity Technologies <admin@parity.io>",
@@ -11,60 +11,59 @@ 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]
-resolc = { version = "0.3.0", path = "crates/resolc" }
+revive-benchmarks = { version = "0.1.0-dev.14", path = "crates/benchmarks" }
-revive-benchmarks = { version = "0.1.0", path = "crates/benchmarks" }
+revive-builtins = { version = "0.1.0-dev.14", path = "crates/builtins" }
-revive-builtins = { version = "0.1.0", path = "crates/builtins" }
+revive-common = { version = "0.1.0-dev.14", path = "crates/common" }
-revive-common = { version = "0.1.0", path = "crates/common" }
+revive-differential = { version = "0.1.0-dev.14", path = "crates/differential" }
-revive-differential = { version = "0.1.0", path = "crates/differential" }
+revive-integration = { version = "0.1.0-dev.14", path = "crates/integration" }
-revive-integration = { version = "0.1.1", path = "crates/integration" }
+revive-linker = { version = "0.1.0-dev.14", path = "crates/linker" }
-revive-linker = { version = "0.1.0", path = "crates/linker" }
+lld-sys = { version = "0.1.0-dev.14", path = "crates/lld-sys" }
-lld-sys = { version = "0.1.0", path = "crates/lld-sys" }
+revive-llvm-context = { version = "0.1.0-dev.14", path = "crates/llvm-context" }
-revive-llvm-context = { version = "0.3.0", path = "crates/llvm-context" }
+revive-runtime-api = { version = "0.1.0-dev.14", path = "crates/runtime-api" }
-revive-runtime-api = { version = "0.2.0", path = "crates/runtime-api" }
+revive-runner = { version = "0.1.0-dev.14", path = "crates/runner" }
-revive-runner = { version = "0.1.0", path = "crates/runner" }
+revive-solc-json-interface = { version = "0.1.0-dev.14", path = "crates/solc-json-interface" }
-revive-solc-json-interface = { version = "0.2.0", path = "crates/solc-json-interface" }
+revive-solidity = { version = "0.1.0-dev.14", path = "crates/solidity" }
-revive-stdlib = { version = "0.1.1", path = "crates/stdlib" }
+revive-stdlib = { version = "0.1.0-dev.14", path = "crates/stdlib" }
-revive-build-utils = { version = "0.1.0", path = "crates/build-utils" }
+revive-build-utils = { version = "0.1.0-dev.14", path = "crates/build-utils" }
-revive-yul = { version = "0.2.1", path = "crates/yul" }
 
 hex = "0.4.3"
 cc = "1.2"
-libc = "0.2.172"
+libc = "0.2.169"
-tempfile = "3.20"
+tempfile = "3.17"
 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.1"
-alloy-serde = "1.0"
+alloy-serde = "0.11.1"
-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"
@@ -72,15 +71,16 @@ assert_cmd = "2.0"
 assert_fs = "1.1"
 
 # 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", rev = "c29e72a8628835e34deb6aa7db9a78a2e4eabcee" }
 
 # 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"

Dockerfile

@@ -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@sha256:68b86bc7cb2867259e6b233415a665ff4469c28b57763e78c3bfea1c68091561 AS resolc-builder
 WORKDIR /opt/revive
 
 RUN apt update && \ 

Makefile

@@ -11,7 +11,7 @@
 	machete \
 	test \
 	test-integration \
-	test-resolc \
+	test-solidity \
 	test-workspace \
 	test-cli \
 	test-wasm \
@@ -24,24 +24,24 @@
 install: install-bin install-npm
 
 install-bin:
-	cargo install --force --locked --path crates/resolc
+	cargo install --locked --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
+	cargo install --path crates/runner --no-default-features --locked
 
 format:
 	cargo fmt --all --check
@@ -58,8 +58,8 @@ test: format clippy machete test-cli test-workspace install-revive-runner
 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
@@ -90,6 +90,9 @@ clean:
 	cargo clean ; \
 	revive-llvm clean ; \
 	rm -rf node_modules ; \
-	rm -rf crates/resolc/src/tests/cli-tests/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}

README.md

@@ -14,39 +14,8 @@ 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
+Please consult [the documentation](https://contracts.polkadot.io/revive_compiler/installation) for installation instructions.
-`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>
-  <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
 
@@ -62,11 +31,13 @@ Building revive requires a [stable Rust installation](https://rustup.rs/) and a
 Download the [latest LLVM build](https://github.com/paritytech/revive/releases?q=LLVM+binaries+release&expanded=true) from our releases.
 
 > **MacOS** users need to clear the `downloaded` attribute from all binaries after extracting the archive:
+>
 > ```sh
 > xattr -rc </path/to/the/extracted/archive>/target-llvm/gnu/target-final/bin/*
 > ```
 
 After extracting the archive, point `$LLVM_SYS_181_PREFIX` to it:
+
 ```sh
 export LLVM_SYS_181_PREFIX=</path/to/the/extracted/archive>/target-llvm/gnu/target-final
 ```
@@ -129,8 +100,11 @@ Please consult the [Makefile](Makefile) targets to learn how to run tests and be
 Ensure that your branch passes `make test` locally when submitting a pull request.
 
 ### Design overview
+
 See the [relevant section in our documentation](https://contracts.polkadot.io/revive_compiler/architecture) to learn more about how the compiler works.
 
+[Frontend](https://github.com/matter-labs/era-compiler-solidity) and [code generator](https://github.com/matter-labs/era-compiler-llvm-context) are based of ZKSync `zksolc` (the project started as a fork of the era compiler).
+
 ### 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).
@@ -139,8 +113,3 @@ Once Geth is installed, you can run the tests using the following command:
 ```sh
 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.
-

RELEASE.md

@@ -4,23 +4,15 @@ 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. Create 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`
-  - Updates the version in each crate `Cargo.toml`
-  - Updates the version of the NPM package in `js/resolc/package.json`
-  - Updates the `CHANGELOG.md` to reflect all observable changes
 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`
+3. Push a tag that has the same `-dev.X` 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.
+5. Wait for the `Release` workflow to finish. It should create the pre-release with the same `-dev.X` 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`.

STATUS.md

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

crates/benchmarks/BENCHMARKS.md

@@ -16,13 +16,13 @@
 ### Baseline
 
 |         | `EVM`                     | `PVMInterpreter`                 |
-|:--------|:-------------------------|:-------------------------------- |
+| :------ | :------------------------ | :------------------------------- |
 | **`0`** | `10.08 us` (✅ **1.00x**) | `10.32 us` (✅ **1.02x slower**) |
 
 ### OddPorduct
 
 |              | `EVM`                      | `PVMInterpreter`                 |
-|:-------------|:--------------------------|:-------------------------------- |
+| :----------- | :------------------------- | :------------------------------- |
 | **`10000`**  | `3.60 ms` (✅ **1.00x**)   | `1.57 ms` (🚀 **2.28x faster**)  |
 | **`100000`** | `34.72 ms` (✅ **1.00x**)  | `14.82 ms` (🚀 **2.34x faster**) |
 | **`300000`** | `105.01 ms` (✅ **1.00x**) | `44.11 ms` (🚀 **2.38x faster**) |
@@ -30,7 +30,7 @@
 ### TriangleNumber
 
 |              | `EVM`                     | `PVMInterpreter`                 |
-|:-------------|:-------------------------|:-------------------------------- |
+| :----------- | :------------------------ | :------------------------------- |
 | **`10000`**  | `2.43 ms` (✅ **1.00x**)  | `1.12 ms` (🚀 **2.17x faster**)  |
 | **`100000`** | `24.20 ms` (✅ **1.00x**) | `10.86 ms` (🚀 **2.23x faster**) |
 | **`360000`** | `88.69 ms` (✅ **1.00x**) | `38.46 ms` (🚀 **2.31x faster**) |
@@ -38,7 +38,7 @@
 ### FibonacciRecursive
 
 |          | `EVM`                      | `PVMInterpreter`                  |
-|:---------|:--------------------------|:--------------------------------- |
+| :------- | :------------------------- | :-------------------------------- |
 | **`12`** | `144.17 us` (✅ **1.00x**) | `150.85 us` (✅ **1.05x slower**) |
 | **`16`** | `938.71 us` (✅ **1.00x**) | `922.11 us` (✅ **1.02x faster**) |
 | **`20`** | `6.54 ms` (✅ **1.00x**)   | `6.20 ms` (✅ **1.05x faster**)   |
@@ -47,27 +47,27 @@
 ### FibonacciIterative
 
 |           | `EVM`                     | `PVMInterpreter`                 |
-|:----------|:-------------------------|:-------------------------------- |
+| :-------- | :------------------------ | :------------------------------- |
-| **`64`**  | `23.00 us` (✅ **1.00x**) | `31.88 us` (❌ *1.39x slower*)    |
+| **`64`**  | `23.00 us` (✅ **1.00x**) | `31.88 us` (❌ _1.39x slower_)   |
-| **`128`** | `35.28 us` (✅ **1.00x**) | `42.43 us` (❌ *1.20x slower*)    |
+| **`128`** | `35.28 us` (✅ **1.00x**) | `42.43 us` (❌ _1.20x slower_)   |
 | **`256`** | `60.12 us` (✅ **1.00x**) | `61.20 us` (✅ **1.02x slower**) |
 
 ### FibonacciBinet
 
 |           | `EVM`                     | `PVMInterpreter`               |
-|:----------|:-------------------------|:-------------------------------- |
+| :-------- | :------------------------ | :----------------------------- |
-| **`64`**  | `23.01 us` (✅ **1.00x**) | `47.74 us` (❌ *2.07x slower*)    |
+| **`64`**  | `23.01 us` (✅ **1.00x**) | `47.74 us` (❌ _2.07x slower_) |
-| **`128`** | `25.44 us` (✅ **1.00x**) | `49.67 us` (❌ *1.95x slower*)    |
+| **`128`** | `25.44 us` (✅ **1.00x**) | `49.67 us` (❌ _1.95x slower_) |
-| **`256`** | `28.66 us` (✅ **1.00x**) | `53.01 us` (❌ *1.85x slower*)    |
+| **`256`** | `28.66 us` (✅ **1.00x**) | `53.01 us` (❌ _1.85x slower_) |
 
 ### SHA1
 
 |           | `EVM`                      | `PVMInterpreter`                |
-|:----------|:--------------------------|:--------------------------------- |
+| :-------- | :------------------------- | :------------------------------ |
-| **`1`**   | `135.87 us` (✅ **1.00x**) | `243.75 us` (❌ *1.79x slower*)    |
+| **`1`**   | `135.87 us` (✅ **1.00x**) | `243.75 us` (❌ _1.79x slower_) |
-| **`64`**  | `258.45 us` (✅ **1.00x**) | `355.70 us` (❌ *1.38x slower*)    |
+| **`64`**  | `258.45 us` (✅ **1.00x**) | `355.70 us` (❌ _1.38x slower_) |
 | **`512`** | `1.10 ms` (✅ **1.00x**)   | `1.09 ms` (✅ **1.01x faster**) |
 
 ---
-Made with [criterion-table](https://github.com/nu11ptr/criterion-table)
 
+Made with [criterion-table](https://github.com/nu11ptr/criterion-table)

crates/differential/Cargo.toml

@@ -1,6 +1,5 @@
 [package]
 name = "revive-differential"
-description = "utilities for differential testing the revive compiler against EVM"
 version.workspace = true
 license.workspace = true
 edition.workspace = true

crates/integration/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "revive-integration"
-version = "0.1.1"
+version.workspace = true
 license.workspace = true
 edition.workspace = true
 repository.workspace = true
@@ -13,7 +13,7 @@ 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 }
 

crates/integration/codesize.json

@@ -1,10 +1,10 @@
 {
-  "Baseline": 945,
+  "Baseline": 939,
-  "Computation": 2308,
+  "Computation": 2282,
-  "DivisionArithmetics": 2334,
+  "DivisionArithmetics": 8849,
-  "ERC20": 21363,
+  "ERC20": 18308,
-  "Events": 1677,
+  "Events": 1640,
-  "FibonacciIterative": 1516,
+  "FibonacciIterative": 1497,
   "Flipper": 2099,
-  "SHA1": 8268
+  "SHA1": 8243
 }

crates/integration/contracts/SAR.sol

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

crates/integration/src/cases.rs

@@ -1,8 +1,8 @@
 use alloy_primitives::{Address, Bytes, I256, U256};
 use alloy_sol_types::{sol, SolCall, SolConstructor};
 
-use resolc::test_utils::*;
 use revive_llvm_context::OptimizerSettings;
+use revive_solidity::test_utils::*;
 
 #[derive(Clone)]
 pub struct Contract {

crates/integration/src/tests.rs

@@ -60,7 +60,6 @@ test_spec!(mload, "MLoad", "MLoad.sol");
 test_spec!(delegate_no_contract, "DelegateCaller", "DelegateCaller.sol");
 test_spec!(function_type, "FunctionType", "FunctionType.sol");
 test_spec!(layout_at, "LayoutAt", "LayoutAt.sol");
-test_spec!(shift_arithmetic_right, "SAR", "SAR.sol");
 
 fn instantiate(path: &str, contract: &str) -> Vec<SpecsAction> {
     vec![Instantiate {

crates/llvm-builder/Cargo.toml

@@ -6,7 +6,7 @@ authors = [
     "Anton Baliasnikov <aba@matterlabs.dev>",
     "Cyrill Leutwiler <cyrill@parity.io>",
 ]
-version = "0.2.0"
+version.workspace = true
 license.workspace = true
 edition.workspace = true
 repository.workspace = true

crates/llvm-builder/README.md

@@ -6,6 +6,7 @@ Parity fork of the [Matter Labs zksync LLVM builder](https://github.com/matter-l
 
 The LLVM compiler framework for revive must be built with our tool called `revive-llvm`.
 This is because the revive compiler has requirements not fullfilled in upstream builds:
+
 - Special builds for compiling the frontend into statically linked ELF binaries and also Wasm executables
 - The RISC-V target (the PolkaVM target)
 - The compiler-rt builtins for the PolkaVM target
@@ -17,20 +18,23 @@ Obtain a compatible build for your host platform from the release section of thi
 <details>
 <summary>1. Install the system prerequisites.</summary>
 
-   * Linux (Debian):
+- Linux (Debian):
 
   Install the following packages:
+
   ```shell
   apt install cmake ninja-build curl git libssl-dev pkg-config clang lld
   ```
-   * Linux (Arch):
+
+- Linux (Arch):
 
   Install the following packages:
+
   ```shell
   pacman -Syu which cmake ninja curl git pkg-config clang lld
   ```
 
-   * MacOS:
+- MacOS:
 
         * Install the [HomeBrew](https://brew.sh) package manager.
         * Install the following packages:
@@ -40,24 +44,27 @@ Obtain a compatible build for your host platform from the release section of thi
            ```
 
         * Install your choice of a recent LLVM/[Clang](https://clang.llvm.org) compiler, e.g. via [Xcode](https://developer.apple.com/xcode/), [Apple’s Command Line Tools](https://developer.apple.com/library/archive/technotes/tn2339/_index.html), or your preferred package manager.
+
   </details>
 
 <details>
 <summary>2. Install Rust.</summary>
 
-   * Follow the latest [official instructions](https://www.rust-lang.org/tools/install:
+- Follow the latest [official instructions](https://www.rust-lang.org/tools/install:
-      ```shell
+  `shell
       curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
       . ${HOME}/.cargo/env
-      ```
+      `
 
         > Currently we are not pinned to any specific version of Rust, so just install the latest stable build for your   platform.
+
   </details>
 
 <details>
 <summary>3. Install the revive LLVM framework builder.</summary>
 
-   * Install the builder using `cargo`:
+- Install the builder using `cargo`:
+
   ```shell
   cargo install --git https://github.com/paritytech/revive-llvm-builder --force --locked
   ```
@@ -69,7 +76,7 @@ Obtain a compatible build for your host platform from the release section of thi
 <details>
 <summary>4. (Optional) Create the `LLVM.lock` file.</summary>
 
-   * The `LLVM.lock` dictates the LLVM source tree being used.
+- The `LLVM.lock` dictates the LLVM source tree being used.
   A default `./LLVM.lock` pointing to the release used for development is already provided.
 
 </details>
@@ -77,7 +84,7 @@ Obtain a compatible build for your host platform from the release section of thi
 <details>
 <summary>5. Build LLVM.</summary>
 
-   * Clone and build the LLVM framework using the `revive-llvm` tool.
+- Clone and build the LLVM framework using the `revive-llvm` tool.
 
   The clang and lld projects are required for the `resolc` Solidity frontend executable; they are enabled by default. LLVM assertions are also enabled by default.
 
@@ -96,6 +103,7 @@ Obtain a compatible build for your host platform from the release section of thi
 ## Supported target architectures
 
 The following target platforms are supported:
+
 - Linux GNU (x86)
 - Linux MUSL (x86)
 - MacOS (aarch64)
@@ -105,11 +113,12 @@ The following target platforms are supported:
 <details>
 <summary>Building for MUSL</summary>
 
-   * Via a musl build we can build revive into fully static ELF binaries.
+- Via a musl build we can build revive into fully static ELF binaries.
   Which is desirable for reproducible Solidity contracts builds.
   The resulting binary is also very portable, akin to the`solc` frontend binary distribution.
 
   Clone and build the LLVM framework using the `revive-llvm` tool:
+
   ```shell
   revive-llvm --target-env musl clone
   revive-llvm --target-env musl build --enable-assertions --llvm-projects clang --llvm-projects lld
@@ -120,13 +129,13 @@ The following target platforms are supported:
 <details>
 <summary>Building for Emscripten</summary>
 
-   * Via an emsdk build we can run revive in the browser and on node.js.
+- Via an emsdk build we can run revive in the browser and on node.js.
 
   Clone and build the LLVM framework using the `revive-llvm` tool:
+
   ```shell
   revive-llvm --target-env emscripten clone
   revive-llvm --target-env emscripten build --enable-assertions --llvm-projects clang --llvm-projects lld
   ```
 
 </details>
-

crates/llvm-builder/src/build_type.rs

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

crates/llvm-builder/src/builtins.rs

@@ -117,7 +117,13 @@ pub fn build(
     log::info!("building compiler-rt for rv64emac");
 
     crate::utils::check_presence("cmake")?;
+
+    let generator = if cfg!(target_os = "windows") {
+        "Visual Studio 17 2022"
+    } else {
         crate::utils::check_presence("ninja")?;
+        "Ninja"
+    };
 
     let llvm_module_compiler_rt = crate::LLVMPath::llvm_module_compiler_rt()?;
     let llvm_compiler_rt_build = crate::LLVMPath::llvm_build_compiler_rt()?;
@@ -130,7 +136,7 @@ pub fn build(
                 "-B",
                 llvm_compiler_rt_build.to_string_lossy().as_ref(),
                 "-G",
-                "Ninja",
+                generator,
             ])
             .args(CMAKE_STATIC_ARGS)
             .args(cmake_dynamic_args(build_type, target_env)?)

crates/llvm-builder/src/ccache_variant.rs

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

crates/llvm-builder/src/lib.rs

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

crates/llvm-builder/src/llvm_project.rs

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

crates/llvm-builder/src/lock.rs

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

crates/llvm-builder/src/platforms/mod.rs

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

crates/llvm-builder/src/revive_llvm/main.rs

@@ -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())?;

crates/llvm-builder/src/sanitizer.rs

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

crates/llvm-builder/src/target_env.rs

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

crates/llvm-builder/src/target_triple.rs

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

crates/llvm-builder/src/utils.rs

@@ -38,7 +38,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 +92,7 @@ pub fn unpack_tar(filename: PathBuf, path: &str) -> anyhow::Result<()> {
 pub fn download_musl(name: &str) -> anyhow::Result<()> {
     log::info!("downloading musl {name}");
     let tar_file_name = format!("{name}.tar.gz");
-    let url = format!("{MUSL_SNAPSHOTS_URL}/{tar_file_name}");
+    let url = format!("{}/{tar_file_name}", MUSL_SNAPSHOTS_URL);
     let target_path = crate::llvm_path::DIRECTORY_LLVM_TARGET
         .get()
         .unwrap()
@@ -223,6 +223,6 @@ pub fn install_emsdk() -> anyhow::Result<()> {
 /// The LLVM target directory default path.
 pub fn directory_target_llvm(target_env: crate::target_env::TargetEnv) -> PathBuf {
     crate::llvm_path::DIRECTORY_LLVM_TARGET
-        .get_or_init(|| PathBuf::from(format!("./target-llvm/{target_env}/")))
+        .get_or_init(|| PathBuf::from(format!("./target-llvm/{}/", target_env)))
         .clone()
 }

crates/llvm-context/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "revive-llvm-context"
-version = "0.3.0"
+version.workspace = true
 license.workspace = true
 edition.workspace = true
 repository.workspace = true

crates/llvm-context/src/debug_config/mod.rs

@@ -2,7 +2,6 @@
 
 pub mod ir_type;
 
-use std::path::Path;
 use std::path::PathBuf;
 
 use serde::Deserialize;
@@ -17,14 +16,6 @@ pub struct DebugConfig {
     pub output_directory: Option<PathBuf>,
     /// Whether debug info should be emitted.
     pub emit_debug_info: bool,
-    /// The YUL debug output file path.
-    ///
-    /// Is expected to be configured when running in YUL mode.
-    pub contract_path: Option<PathBuf>,
-    /// The YUL input file path.
-    ///
-    /// Is expected to be configured when not running in YUL mode.
-    pub yul_path: Option<PathBuf>,
 }
 
 impl DebugConfig {
@@ -33,41 +24,15 @@ impl DebugConfig {
         Self {
             output_directory,
             emit_debug_info,
-            contract_path: None,
-            yul_path: None,
         }
     }
 
-    /// Set the current YUL path.
-    pub fn set_yul_path(&mut self, yul_path: &Path) {
-        self.yul_path = yul_path.to_path_buf().into();
-    }
-
-    /// Set the current contract path.
-    pub fn set_contract_path(&mut self, contract_path: &str) {
-        self.contract_path = self.yul_source_path(contract_path);
-    }
-
-    /// Returns with the following precedence:
-    /// 1. The YUL source path if it was configured.
-    /// 2. The source YUL path from the debug output dir if it was configured.
-    /// 3. `None` if there is no debug output directory.
-    pub fn yul_source_path(&self, contract_path: &str) -> Option<PathBuf> {
-        if let Some(path) = self.yul_path.as_ref() {
-            return Some(path.clone());
-        }
-
-        self.output_directory.as_ref().map(|output_directory| {
-            let mut file_path = output_directory.to_owned();
-            let full_file_name = Self::full_file_name(contract_path, None, IRType::Yul);
-            file_path.push(full_file_name);
-            file_path
-        })
-    }
-
     /// Dumps the Yul IR.
     pub fn dump_yul(&self, contract_path: &str, code: &str) -> anyhow::Result<()> {
-        if let Some(file_path) = self.yul_source_path(contract_path) {
+        if let Some(output_directory) = self.output_directory.as_ref() {
+            let mut file_path = output_directory.to_owned();
+            let full_file_name = Self::full_file_name(contract_path, None, IRType::Yul);
+            file_path.push(full_file_name);
             std::fs::write(file_path, code)?;
         }
 

crates/llvm-context/src/lib.rs

@@ -5,6 +5,7 @@ use std::sync::OnceLock;
 
 pub use self::debug_config::ir_type::IRType as DebugConfigIR;
 pub use self::debug_config::DebugConfig;
+pub use self::memory::MemoryConfig;
 pub use self::optimizer::settings::size_level::SizeLevel as OptimizerSettingsSizeLevel;
 pub use self::optimizer::settings::Settings as OptimizerSettings;
 pub use self::optimizer::Optimizer;
@@ -75,6 +76,7 @@ pub use self::target_machine::target::Target;
 pub use self::target_machine::TargetMachine;
 
 pub(crate) mod debug_config;
+pub(crate) mod memory;
 pub(crate) mod optimizer;
 pub(crate) mod polkavm;
 pub(crate) mod target_machine;

crates/llvm-context/src/memory.rs

@@ -0,0 +1,21 @@
+//! The compile time PolkaVM memory configuration settings.
+
+use serde::{Deserialize, Serialize};
+
+/// The PolkaVM memory configuration.
+#[derive(Clone, Copy, Debug, Deserialize, Serialize)]
+pub struct MemoryConfig {
+    /// The emulated EVM linear heap memory size in bytes.
+    pub heap_size: u32,
+    /// The PVM stack size in bytes.
+    pub stack_size: u32,
+}
+
+impl Default for MemoryConfig {
+    fn default() -> Self {
+        Self {
+            heap_size: 64 * 1024,
+            stack_size: 32 * 1024,
+        }
+    }
+}

crates/llvm-context/src/optimizer/settings/mod.rs

@@ -234,7 +234,7 @@ impl TryFrom<&SolcStandardJsonInputSettingsOptimizer> for Settings {
     fn try_from(value: &SolcStandardJsonInputSettingsOptimizer) -> Result<Self, Self::Error> {
         let mut result = match value.mode {
             Some(mode) => Self::try_from_cli(mode)?,
-            None => Self::size(),
+            None => Self::cycles(),
         };
         if value.fallback_to_optimizing_for_size.unwrap_or_default() {
             result.enable_fallback_to_size();

crates/llvm-context/src/polkavm/context/debug_info.rs

@@ -51,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,

crates/llvm-context/src/polkavm/context/function/mod.rs

@@ -15,8 +15,6 @@ use crate::optimizer::settings::size_level::SizeLevel;
 use crate::optimizer::Optimizer;
 use crate::polkavm::context::attribute::Attribute;
 use crate::polkavm::context::pointer::Pointer;
-use crate::polkavm::context::Context;
-use crate::polkavm::Dependency;
 
 use self::declaration::Declaration;
 use self::r#return::Return;
@@ -30,9 +28,7 @@ pub struct Function<'ctx> {
     /// The LLVM function declaration.
     declaration: Declaration<'ctx>,
     /// The stack representation.
-    stack: HashMap<String, u64>,
+    stack: HashMap<String, Pointer<'ctx>>,
-    /// The stack variables pointer.
-    stack_variables: Pointer<'ctx>,
     /// The return value entity.
     r#return: Return<'ctx>,
 
@@ -60,14 +56,11 @@ impl<'ctx> Function<'ctx> {
 
         entry_block: inkwell::basic_block::BasicBlock<'ctx>,
         return_block: inkwell::basic_block::BasicBlock<'ctx>,
-
-        stack_variables: Pointer<'ctx>,
     ) -> Self {
         Self {
             name,
             declaration,
             stack: HashMap::with_capacity(Self::STACK_HASHMAP_INITIAL_CAPACITY),
-            stack_variables,
             r#return,
 
             entry_block,
@@ -217,49 +210,22 @@ impl<'ctx> Function<'ctx> {
 
     /// Saves the pointer to a stack variable, returning the pointer to the shadowed variable,
     /// if it exists.
-    pub fn insert_stack_pointer<D: Dependency + Clone>(
+    pub fn insert_stack_pointer(
         &mut self,
-        context: &mut Context<'ctx, D>,
         name: String,
-    ) -> Pointer<'ctx> {
+        pointer: Pointer<'ctx>,
-        let pointer_name = format!("{}_stack_pointer", &name);
+    ) -> Option<Pointer<'ctx>> {
-        let len = self.stack.len();
+        self.stack.insert(name, pointer)
-        let index = *self.stack.entry(name).or_insert_with(|| len as u64);
-        let indices = &[
-            context.xlen_type().const_zero(),
-            context.xlen_type().const_int(index, false),
-        ];
-
-        context.build_gep(
-            self.stack_variables,
-            indices,
-            context.word_type(),
-            &pointer_name,
-        )
     }
 
     /// Gets the pointer to a stack variable.
-    pub fn get_stack_pointer<D: Dependency + Clone>(
+    pub fn get_stack_pointer(&self, name: &str) -> Option<Pointer<'ctx>> {
-        &self,
+        self.stack.get(name).copied()
-        context: &mut Context<'ctx, D>,
+    }
-        name: String,
-    ) -> Pointer<'ctx> {
-        let pointer_name = format!("{}_stack_pointer", &name);
-        let index = *self
-            .stack
-            .get(&name)
-            .unwrap_or_else(|| panic!("stack pointer access prior to insertion: {name}"));
-        let indices = &[
-            context.xlen_type().const_zero(),
-            context.xlen_type().const_int(index, false),
-        ];
 
-        context.build_gep(
+    /// Removes the pointer to a stack variable.
-            self.stack_variables,
+    pub fn remove_stack_pointer(&mut self, name: &str) {
-            indices,
+        self.stack.remove(name);
-            context.word_type(),
-            &pointer_name,
-        )
     }
 
     /// Returns the return entity representation.

crates/llvm-context/src/polkavm/context/function/runtime/deploy_code.rs

@@ -48,7 +48,6 @@ where
             function_type,
             0,
             Some(inkwell::module::Linkage::External),
-            1024,
         )?;
 
         self.inner.declare(context)

crates/llvm-context/src/polkavm/context/function/runtime/entry.rs

@@ -1,7 +1,6 @@
 //! The entry function.
 
 use inkwell::types::BasicType;
-use revive_solc_json_interface::PolkaVMDefaultHeapMemorySize;
 
 use crate::polkavm::context::address_space::AddressSpace;
 use crate::polkavm::context::function::runtime;
@@ -39,12 +38,9 @@ impl Entry {
             context.xlen_type().const_zero(),
         );
 
-        let heap_memory_type = context.byte_type().array_type(
+        let heap_memory_type = context
-            context
+            .byte_type()
-                .memory_config
+            .array_type(context.memory_config.heap_size);
-                .heap_size
-                .unwrap_or(PolkaVMDefaultHeapMemorySize),
-        );
         context.set_global(
             crate::polkavm::GLOBAL_HEAP_MEMORY,
             heap_memory_type,
@@ -145,7 +141,6 @@ where
             entry_function_type,
             0,
             Some(inkwell::module::Linkage::External),
-            0,
         )?;
 
         context.declare_global(

crates/llvm-context/src/polkavm/context/function/runtime/runtime_code.rs

@@ -48,7 +48,6 @@ where
             function_type,
             0,
             Some(inkwell::module::Linkage::External),
-            1024,
         )?;
 
         self.inner.declare(context)

crates/llvm-context/src/polkavm/context/mod.rs

@@ -25,10 +25,8 @@ use inkwell::debug_info::AsDIScope;
 use inkwell::debug_info::DIScope;
 use inkwell::types::BasicType;
 use inkwell::values::BasicValue;
-use revive_solc_json_interface::PolkaVMDefaultHeapMemorySize;
-use revive_solc_json_interface::PolkaVMDefaultStackMemorySize;
-use revive_solc_json_interface::SolcStandardJsonInputSettingsPolkaVMMemory;
 
+use crate::memory::MemoryConfig;
 use crate::optimizer::settings::Settings as OptimizerSettings;
 use crate::optimizer::Optimizer;
 use crate::polkavm::DebugConfig;
@@ -90,7 +88,7 @@ where
     /// The extra LLVM arguments that were used during target initialization.
     llvm_arguments: &'ctx [String],
     /// The PVM memory configuration.
-    memory_config: SolcStandardJsonInputSettingsPolkaVMMemory,
+    memory_config: MemoryConfig,
 
     /// The project dependency manager. It can be any entity implementing the trait.
     /// The manager is used to get information about contracts and their dependencies during
@@ -230,24 +228,18 @@ where
         include_metadata_hash: bool,
         debug_config: DebugConfig,
         llvm_arguments: &'ctx [String],
-        memory_config: SolcStandardJsonInputSettingsPolkaVMMemory,
+        memory_config: MemoryConfig,
     ) -> Self {
         Self::set_data_layout(llvm, &module);
         Self::link_stdlib_module(llvm, &module);
         Self::link_polkavm_imports(llvm, &module);
-        Self::set_polkavm_stack_size(
+        Self::set_polkavm_stack_size(llvm, &module, memory_config.stack_size);
-            llvm,
-            &module,
-            memory_config
-                .stack_size
-                .unwrap_or(PolkaVMDefaultStackMemorySize),
-        );
         Self::set_module_flags(llvm, &module);
 
         let intrinsics = Intrinsics::new(llvm, &module);
         let llvm_runtime = LLVMRuntime::new(llvm, &module, &optimizer);
         let debug_info = debug_config.emit_debug_info.then(|| {
-            let debug_info = DebugInfo::new(&module, &debug_config);
+            let debug_info = DebugInfo::new(&module);
             debug_info.initialize_module(llvm, &module);
             debug_info
         });
@@ -463,7 +455,6 @@ where
         r#type: inkwell::types::FunctionType<'ctx>,
         return_values_length: usize,
         linkage: Option<inkwell::module::Linkage>,
-        stack_variables: u32,
     ) -> anyhow::Result<Rc<RefCell<Function<'ctx>>>> {
         let value = self.module().add_function(name, r#type, linkage);
 
@@ -485,30 +476,15 @@ where
         let entry_block = self.llvm.append_basic_block(value, "entry");
         let return_block = self.llvm.append_basic_block(value, "return");
 
-        self.builder().position_at_end(entry_block);
-        let stack_variables_pointer = self.build_alloca(
-            self.word_type().array_type(stack_variables),
-            "stack_variables",
-        );
-
         let r#return = match return_values_length {
             0 => FunctionReturn::none(),
             1 => {
-                //self.set_basic_block(entry_block);
+                self.set_basic_block(entry_block);
-                //let pointer = self
+                let pointer = self.build_alloca(self.word_type(), "return_pointer");
-                //    .current_function()
+                FunctionReturn::primitive(pointer)
-                //    .borrow_mut()
-                //    .insert_stack_pointer(self, format!("{name}_return_pointer"));
-
-                FunctionReturn::primitive(self.build_gep(
-                    stack_variables_pointer,
-                    &[self.xlen_type().const_zero(), self.xlen_type().const_zero()],
-                    self.word_type(),
-                    "return_pointer",
-                ))
             }
             size => {
-                //self.set_basic_block(entry_block);
+                self.set_basic_block(entry_block);
                 let pointer = self.build_alloca(
                     self.structure_type(
                         vec![self.word_type().as_basic_type_enum(); size].as_slice(),
@@ -525,7 +501,6 @@ where
             r#return,
             entry_block,
             return_block,
-            stack_variables_pointer,
         );
         Function::set_default_attributes(self.llvm, function.declaration(), &self.optimizer);
         let function = Rc::new(RefCell::new(function));
@@ -753,23 +728,6 @@ where
         pointer
     }
 
-    pub fn variable_decl<T: BasicType<'ctx> + Clone + Copy>(
-        &self,
-        r#type: T,
-        name: &str,
-    ) -> Pointer<'ctx> {
-        let pointer = self.builder.build_alloca(r#type, name).unwrap();
-
-        pointer
-            .as_instruction()
-            .unwrap()
-            .set_alignment(revive_common::BYTE_LENGTH_STACK_ALIGN as u32)
-            .expect("Alignment is valid");
-
-        Pointer::new(r#type, AddressSpace::Stack, pointer)
-    }
-
-    /// Truncate `address` to the ethereum address length and store it as bytes on the stack.
     /// Builds an aligned stack allocation at the current position.
     /// Use this if [`build_alloca_at_entry`] might change program semantics.
     /// Otherwise, alloca should always be built at the function prelude!
@@ -1485,11 +1443,7 @@ where
     }
 
     pub fn heap_size(&self) -> inkwell::values::IntValue<'ctx> {
-        self.xlen_type().const_int(
+        self.xlen_type()
-            self.memory_config
+            .const_int(self.memory_config.heap_size as u64, false)
-                .heap_size
-                .unwrap_or(PolkaVMDefaultHeapMemorySize) as u64,
-            false,
-        )
     }
 }

crates/llvm-context/src/polkavm/context/runtime.rs

@@ -35,7 +35,6 @@ where
             Self::r#type(context),
             0,
             Some(inkwell::module::Linkage::External),
-            0,
         )?;
 
         let mut attributes = Self::ATTRIBUTES.to_vec();

crates/llvm-context/src/polkavm/context/tests.rs

@@ -40,7 +40,6 @@ pub fn check_attribute_null_pointer_is_invalid() {
                 .fn_type(&[context.word_type().into()], false),
             1,
             Some(inkwell::module::Linkage::External),
-            16,
         )
         .expect("Failed to add function");
     assert!(!function
@@ -64,7 +63,6 @@ pub fn check_attribute_optimize_for_size_mode_3() {
                 .fn_type(&[context.word_type().into()], false),
             1,
             Some(inkwell::module::Linkage::External),
-            16,
         )
         .expect("Failed to add function");
     assert!(!function
@@ -88,7 +86,6 @@ pub fn check_attribute_optimize_for_size_mode_z() {
                 .fn_type(&[context.word_type().into()], false),
             1,
             Some(inkwell::module::Linkage::External),
-            16,
         )
         .expect("Failed to add function");
     assert!(function
@@ -112,7 +109,6 @@ pub fn check_attribute_min_size_mode_3() {
                 .fn_type(&[context.word_type().into()], false),
             1,
             Some(inkwell::module::Linkage::External),
-            16,
         )
         .expect("Failed to add function");
     assert!(!function
@@ -136,7 +132,6 @@ pub fn check_attribute_min_size_mode_z() {
                 .fn_type(&[context.word_type().into()], false),
             1,
             Some(inkwell::module::Linkage::External),
-            16,
         )
         .expect("Failed to add function");
     assert!(function

crates/llvm-context/src/polkavm/evm/bitwise.rs

@@ -204,7 +204,7 @@ where
             &context.word_type().const_all_ones(),
             overflow_negative_block,
         ),
-        (&context.word_const(0), overflow_positive_block),
+        (&context.word_const(0), overflow_block),
     ]);
     Ok(result.as_basic_value())
 }

crates/llvm-context/src/polkavm/mod.rs

@@ -7,12 +7,12 @@ pub mod evm;
 pub use self::r#const::*;
 
 use crate::debug_config::DebugConfig;
+use crate::memory::MemoryConfig;
 use crate::optimizer::settings::Settings as OptimizerSettings;
 
 use anyhow::Context as AnyhowContext;
 use polkavm_common::program::ProgramBlob;
 use polkavm_disassembler::{Disassembler, DisassemblyFormat};
-use revive_solc_json_interface::SolcStandardJsonInputSettingsPolkaVMMemory;
 use sha3::Digest;
 
 use self::context::build::Build;
@@ -37,7 +37,7 @@ pub fn build_assembly_text(
     let mut disassembled_code = Vec::new();
     disassembler
         .disassemble_into(&mut disassembled_code)
-        .with_context(|| format!("Failed to disassemble contract: {contract_path}"))?;
+        .with_context(|| format!("Failed to disassemble contract: {}", contract_path))?;
 
     let assembly_text = String::from_utf8(disassembled_code).with_context(|| {
         format!("Failed to convert disassembled code to string for contract: {contract_path}")
@@ -91,7 +91,7 @@ pub trait Dependency {
         include_metadata_hash: bool,
         debug_config: DebugConfig,
         llvm_arguments: &[String],
-        memory_config: SolcStandardJsonInputSettingsPolkaVMMemory,
+        memory_config: MemoryConfig,
     ) -> anyhow::Result<String>;
 
     /// Resolves a full contract path.
@@ -113,7 +113,7 @@ impl Dependency for DummyDependency {
         _include_metadata_hash: bool,
         _debug_config: DebugConfig,
         _llvm_arguments: &[String],
-        _memory_config: SolcStandardJsonInputSettingsPolkaVMMemory,
+        _memory_config: MemoryConfig,
     ) -> anyhow::Result<String> {
         Ok(String::new())
     }

crates/resolc/build.rs

@@ -1,11 +0,0 @@
-fn main() {
-    match git2::Repository::open("../..") {
-        Ok(repo) => {
-            let head = repo.head().expect("should have head");
-            let commit = head.peel_to_commit().expect("should have commit");
-            let id = &commit.id().to_string()[..7];
-            println!("cargo:rustc-env=GIT_COMMIT_HASH={id}");
-        }
-        Err(_) => println!("cargo:rustc-env=GIT_COMMIT_HASH=unknown"),
-    };
-}

crates/resolc/src/tests/cli-tests/src/contracts/yul/memset.yul

@@ -1,22 +0,0 @@
-object "Test" {                                                                                                                                            
-        code {                                                                                                                                                 
-        function allocate(size) -> ptr {                                                                                                                       
-            ptr := mload(0x40)                                                                                                                                 
-            if iszero(ptr) { ptr := 0x60 }                                                                                                                     
-            mstore(0x40, add(ptr, size))                                                                                                                       
-        }                                                                                                                                                      
-        let size := datasize("Test_deployed")          
-        let offset := allocate(size)                                                                                                                           
-        datacopy(offset, dataoffset("Test_deployed"), size)
-        return(offset, size)                                                                                                                                   
-    }                                                                          
-    object "Test_deployed" {                                                                                                                                   
-        code {                                                                                                                                                 
-{                                                                                                                                                              
-        let test:=0x5                                                                                                                                          
-        mstore(2,signextend(0x8,0x0))                                                                                                                          
-        mstore(8,lt(0xc,test))                                                 
-}                                                                                                                                                              
-                                                                                                                                                               
-    return(0, 65536)                                                                                                                                           
-}}}

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

@@ -1,44 +0,0 @@
-import { executeCommand } from '../src/helper'
-import { paths } from '../src/entities'
-
-//id1746
-describe('Run with --asm by default', () => {
-  const command = `resolc ${paths.pathToBasicSolContract} --asm`
-  const result = executeCommand(command)
-  const commandInvalid = 'resolc --asm'
-  const resultInvalid = executeCommand(commandInvalid)
-
-  it('Valid command exit code = 0', () => {
-    expect(result.exitCode).toBe(0)
-  })
-
-  it('--asm output is presented', () => {
-    const expectedPatterns = [/(deploy)/i, /(call)/i, /(seal_return)/i]
-
-    for (const pattern of expectedPatterns) {
-      expect(result.output).toMatch(pattern)
-    }
-  })
-
-  it('solc exit code == resolc exit code', () => {
-    const command = `solc ${paths.pathToBasicSolContract} --asm`
-    const solcResult = executeCommand(command)
-    expect(solcResult.exitCode).toBe(result.exitCode)
-  })
-
-  it('run invalid: resolc --asm', () => {
-    expect(resultInvalid.output).toMatch(
-      /(No input sources specified|Compilation aborted)/i
-    )
-  })
-
-  it('Invalid command exit code = 1', () => {
-    expect(resultInvalid.exitCode).toBe(1)
-  })
-
-  it('Invalid solc exit code == Invalid resolc exit code', () => {
-    const command = 'solc --asm'
-    const solcResult = executeCommand(command)
-    expect(solcResult.exitCode).toBe(resultInvalid.exitCode)
-  })
-})

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

@@ -1,241 +0,0 @@
-import {
-  executeCommand,
-  isFolderExist,
-  isFileExist,
-  isFileEmpty,
-} from '../src/helper'
-import { paths } from '../src/entities'
-import * as shell from 'shelljs'
-import * as path from 'path'
-
-//id1762
-describe('Run resolc without any options', () => {
-  const command = 'resolc'
-  const result = executeCommand(command)
-
-  it('Info with help is presented', () => {
-    expect(result.output).toMatch(/(Usage: resolc)/i)
-  })
-
-  it('Exit code = 1', () => {
-    expect(result.exitCode).toBe(1)
-  })
-
-  it('solc exit code == resolc exit code', () => {
-    const command = 'solc'
-    const solcResult = executeCommand(command)
-    expect(solcResult.exitCode).toBe(result.exitCode)
-  })
-})
-
-//#1713
-describe('Default run a command from the help', () => {
-  const command = `resolc ${paths.pathToBasicSolContract} --overwrite -O3 --bin --output-dir "${paths.pathToOutputDir}"` // potential issue on resolc with full path on Windows cmd
-  const result = executeCommand(command)
-
-  it('Compiler run successful', () => {
-    expect(result.output).toMatch(/(Compiler run successful.)/i)
-  })
-  it('Exit code = 0', () => {
-    expect(result.exitCode).toBe(0)
-  })
-  it('Output dir is created', () => {
-    expect(isFolderExist(paths.pathToOutputDir)).toBe(true)
-  })
-  xit('Output file is created', () => {
-    // a bug on windows
-    expect(
-      isFileExist(
-        paths.pathToOutputDir,
-        paths.contractSolFilename,
-        paths.binExtension
-      )
-    ).toBe(true)
-  })
-  it('the output file is not empty', () => {
-    expect(isFileEmpty(paths.pathToSolBinOutputFile)).toBe(false)
-  })
-  it("No 'Error'/'Warning'/'Fail' in the output", () => {
-    expect(result.output).not.toMatch(/([Ee]rror|[Ww]arning|[Ff]ail)/i)
-  })
-})
-
-//#1818
-describe('Default run a command from the help', () => {
-  const command = `resolc ${paths.pathToBasicSolContract} --overwrite -O3 --bin --asm --output-dir "${paths.pathToOutputDir}"` // potential issue on resolc with full path on Windows cmd
-  const result = executeCommand(command)
-
-  it('Compiler run successful', () => {
-    expect(result.output).toMatch(/(Compiler run successful.)/i)
-  })
-  it('Exit code = 0', () => {
-    expect(result.exitCode).toBe(0)
-  })
-  it('Output dir is created', () => {
-    expect(isFolderExist(paths.pathToOutputDir)).toBe(true)
-  })
-  xit('Output files are created', () => {
-    // a bug on windows
-    expect(
-      isFileExist(
-        paths.pathToOutputDir,
-        paths.contractSolFilename,
-        paths.binExtension
-      )
-    ).toBe(true)
-    expect(
-      isFileExist(
-        paths.pathToOutputDir,
-        paths.contractSolFilename,
-        paths.asmExtension
-      )
-    ).toBe(true)
-  })
-  it('the output files are not empty', () => {
-    expect(isFileEmpty(paths.pathToSolBinOutputFile)).toBe(false)
-    expect(isFileEmpty(paths.pathToSolAsmOutputFile)).toBe(false)
-  })
-  it("No 'Error'/'Warning'/'Fail' in the output", () => {
-    expect(result.output).not.toMatch(/([Ee]rror|[Ww]arning|[Ff]ail)/i)
-  })
-})
-
-describe('Run resolc with source debug information', () => {
-  const commands = [
-    `resolc -g ${paths.pathToBasicSolContract} --overwrite --bin --asm --output-dir "${paths.pathToOutputDir}"`,
-    `resolc --disable-solc-optimizer -g ${paths.pathToBasicSolContract} --overwrite --bin --asm --output-dir "${paths.pathToOutputDir}"`,
-  ] // potential issue on resolc with full path on Windows cmd`;
-
-  for (var idx in commands) {
-    const command = commands[idx]
-    const result = executeCommand(command)
-
-    it('Compiler run successful', () => {
-      expect(result.output).toMatch(/(Compiler run successful.)/i)
-    })
-    it('Exit code = 0', () => {
-      expect(result.exitCode).toBe(0)
-    })
-    it('Output dir is created', () => {
-      expect(isFolderExist(paths.pathToOutputDir)).toBe(true)
-    })
-    it('Output files are created', () => {
-      // a bug on windows
-      expect(
-        isFileExist(
-          paths.pathToOutputDir,
-          paths.contractSolFilename,
-          paths.binExtension
-        )
-      ).toBe(true)
-      expect(
-        isFileExist(
-          paths.pathToOutputDir,
-          paths.contractSolFilename,
-          paths.asmExtension
-        )
-      ).toBe(true)
-    })
-    it('the output files are not empty', () => {
-      expect(isFileEmpty(paths.pathToSolBinOutputFile)).toBe(false)
-      expect(isFileEmpty(paths.pathToSolAsmOutputFile)).toBe(false)
-    })
-    it("No 'Error'/'Fail' in the output", () => {
-      expect(result.output).not.toMatch(/([Ee]rror|[Ff]ail)/i)
-    })
-  }
-})
-
-describe('Run resolc with source debug information, check LLVM debug-info', () => {
-  const commands = [
-    `resolc -g ${paths.pathToBasicSolContract} --overwrite --debug-output-dir="${paths.pathToOutputDir}"`,
-    `resolc -g --disable-solc-optimizer ${paths.pathToBasicSolContract} --overwrite --debug-output-dir="${paths.pathToOutputDir}"`,
-  ] // potential issue on resolc with full path on Windows cmd`;
-
-  for (var idx in commands) {
-    const command = commands[idx]
-    const result = executeCommand(command)
-
-    it('Compiler run successful', () => {
-      expect(result.output).toMatch(/(Compiler run successful.)/i)
-    })
-    it('Exit code = 0', () => {
-      expect(result.exitCode).toBe(0)
-    })
-    it('Output dir is created', () => {
-      expect(isFolderExist(paths.pathToOutputDir)).toBe(true)
-    })
-    it('Output files are created', () => {
-      // a bug on windows
-      expect(
-        isFileExist(
-          paths.pathToOutputDir,
-          paths.contractOptimizedLLVMFilename,
-          paths.llvmExtension
-        )
-      ).toBe(true)
-      expect(
-        isFileExist(
-          paths.pathToOutputDir,
-          paths.contractUnoptimizedLLVMFilename,
-          paths.llvmExtension
-        )
-      ).toBe(true)
-    })
-    it('the output files are not empty', () => {
-      expect(isFileEmpty(paths.pathToSolBinOutputFile)).toBe(false)
-      expect(isFileEmpty(paths.pathToSolAsmOutputFile)).toBe(false)
-    })
-    it("No 'Error'/'Fail' in the output", () => {
-      expect(result.output).not.toMatch(/([Ee]rror|[Ff]ail)/i)
-    })
-  }
-})
-
-describe('Standard JSON compilation with path options', () => {
-  const contractsDir = path.join(shell.tempdir(), 'contracts-test')
-  const inputFile = path.join(__dirname, '..', 'src/contracts/compiled/1.json')
-
-  beforeAll(() => {
-    shell.mkdir('-p', contractsDir)
-
-    const input = JSON.parse(shell.cat(inputFile).toString())
-
-    Object.entries(input.sources).forEach(
-      ([sourcePath, source]: [string, any]) => {
-        const filePath = path.join(contractsDir, sourcePath)
-        shell.mkdir('-p', path.dirname(filePath))
-        shell.ShellString(source.content).to(filePath)
-      }
-    )
-  })
-
-  afterAll(() => {
-    shell.rm('-rf', contractsDir)
-  })
-
-  describe('Output with all path options', () => {
-    let result: { exitCode: number; output: string }
-
-    beforeAll(() => {
-      const tempInputFile = path.join(contractsDir, 'temp-input.json')
-      shell.cp(inputFile, tempInputFile)
-      const inputContent = shell.cat(inputFile).toString()
-
-      const command = `resolc --standard-json --base-path "${contractsDir}" --include-path "${contractsDir}" --allow-paths "${contractsDir}"`
-
-      result = executeCommand(command, inputContent)
-
-      shell.rm(tempInputFile)
-    })
-
-    it('Compiler run successful without emiting warnings', () => {
-      const parsedResults = JSON.parse(result.output)
-      expect(
-        parsedResults.errors.filter(
-          (error: { type: string }) => error.type != 'Warning'
-        )
-      ).toEqual([])
-    })
-  })
-})

crates/resolc/src/tests/cli-tests/tests/memset.test.ts

@@ -1,18 +0,0 @@
-import { executeCommand } from '../src/helper'
-import { paths } from '../src/entities'
-
-describe('tests for the memset builtin to be present', () => {
-  // -O3 is required to reproduce.
-  const command = `resolc ${paths.pathToMemsetYulContract} --yul -O3`
-  const result = executeCommand(command)
-
-  it('Valid command exit code = 0', () => {
-    expect(result.exitCode).toBe(0)
-  })
-
-  it('--yul output is presented', () => {
-    expect(result.output).toMatch(/(Compiler run successful)/i)
-    expect(result.output).toMatch(/(No output requested)/i)
-  })
-
-})

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

@@ -1,39 +0,0 @@
-import { executeCommand } from '../src/helper'
-import { paths } from '../src/entities'
-
-//id1743
-describe('Run with --yul by default', () => {
-  const command = `resolc ${paths.pathToBasicYulContract} --yul`
-  const result = executeCommand(command)
-  const commandInvalid = 'resolc --yul'
-  const resultInvalid = executeCommand(commandInvalid)
-
-  it('Valid command exit code = 0', () => {
-    expect(result.exitCode).toBe(0)
-  })
-
-  it('--yul output is presented', () => {
-    expect(result.output).toMatch(/(Compiler run successful)/i)
-    expect(result.output).toMatch(/(No output requested)/i)
-  })
-
-  xit('solc exit code == resolc exit code', () => {
-    // unknown solc issue for datatype of the contract
-    const command = `solc ${paths.pathToBasicSolContract} --yul`
-    const solcResult = executeCommand(command)
-    expect(solcResult.exitCode).toBe(result.exitCode)
-  })
-
-  it('run invalid: resolc --yul', () => {
-    expect(resultInvalid.output).toMatch(/(The input file is missing)/i)
-  })
-  it('Invalid command exit code = 1', () => {
-    expect(resultInvalid.exitCode).toBe(1)
-  })
-
-  it('Invalid solc exit code == Invalid resolc exit code', () => {
-    const command = 'solc --yul'
-    const solcResult = executeCommand(command)
-    expect(solcResult.exitCode).toBe(resultInvalid.exitCode)
-  })
-})

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

@@ -1,188 +0,0 @@
-import { executeCommand } from '../src/helper'
-import { paths } from '../src/entities'
-
-describe('Set of --combined-json tests', () => {
-  const zksolcCommand = 'zksolc'
-  const solcCommand = 'solc'
-  const json_args: string[] = [
-    `abi`,
-    `hashes`,
-    `metadata`,
-    `devdoc`,
-    `userdoc`,
-    `storage-layout`,
-    `ast`,
-    `asm`,
-    `bin`,
-    `bin-runtime`,
-  ]
-
-  //id1742:I
-  describe(`Run ${zksolcCommand} with just --combined-json`, () => {
-    const args = [`--combined-json`]
-    const result = executeCommand(zksolcCommand, args)
-
-    it('Valid command exit code = 1', () => {
-      expect(result.exitCode).toBe(1)
-    })
-
-    it('--combined-json error is presented', () => {
-      expect(result.output).toMatch(/(requires a value but none was supplied)/i)
-    })
-
-    it('solc exit code == zksolc exit code', () => {
-      const solcResult = executeCommand(solcCommand, args)
-      expect(solcResult.exitCode).toBe(result.exitCode)
-    })
-  })
-
-  //id1742:II
-  describe(`Run ${zksolcCommand} with Sol contract and --combined-json`, () => {
-    const args = [`${paths.pathToBasicSolContract}`, `--combined-json`]
-    const result = executeCommand(zksolcCommand, args)
-
-    it('Valid command exit code = 1', () => {
-      expect(result.exitCode).toBe(1)
-    })
-
-    it('--combined-json error is presented', () => {
-      expect(result.output).toMatch(/(requires a value but none was supplied)/i)
-    })
-
-    it('solc exit code == zksolc exit code', () => {
-      const solcResult = executeCommand(solcCommand, args)
-      expect(solcResult.exitCode).toBe(result.exitCode)
-    })
-  })
-
-  //id1742:III
-  for (let i = 0; i < json_args.length; i++) {
-    describe(`Run ${zksolcCommand} with Sol, --combined-json and ARG: ${json_args[i]}`, () => {
-      const args = [
-        `${paths.pathToBasicSolContract}`,
-        `--combined-json`,
-        `${json_args[i]}`,
-      ]
-      const result = executeCommand(zksolcCommand, args)
-
-      it('Valid command exit code = 0', () => {
-        expect(result.exitCode).toBe(0)
-      })
-
-      it('--combined-json error is presented', () => {
-        expect(result.output).toMatch(/(contracts)/i)
-      })
-
-      it('solc exit code == zksolc exit code', () => {
-        const solcResult = executeCommand(solcCommand, args)
-        expect(solcResult.exitCode).toBe(result.exitCode)
-      })
-    })
-  }
-
-  //id1829:I
-  for (let i = 0; i < json_args.length; i++) {
-    describe(`Run ${zksolcCommand} with Sol, --combined-json and wrong ARG: --${json_args[i]}`, () => {
-      const args = [
-        `${paths.pathToBasicSolContract}`,
-        `--combined-json`,
-        `--${json_args[i]}`,
-      ]
-      const result = executeCommand(zksolcCommand, args)
-
-      it('Valid command exit code = 1', () => {
-        expect(result.exitCode).toBe(1)
-      })
-
-      it('--combined-json error is presented', () => {
-        expect(result.output).toMatch(/(Invalid option|error)/i)
-      })
-
-      it('solc exit code == zksolc exit code', () => {
-        const solcResult = executeCommand(solcCommand, args)
-        expect(solcResult.exitCode).toBe(result.exitCode)
-      })
-    })
-  }
-
-  //id1829:II
-  for (let i = 0; i < json_args.length; i++) {
-    describe(`Run ${zksolcCommand} with Sol, --combined-json and multiple ARG: ${json_args[i]} ${json_args[i]}`, () => {
-      const args = [
-        `${paths.pathToBasicSolContract}`,
-        `--combined-json`,
-        `${json_args[i]}`,
-        `${json_args[i]}`,
-      ]
-      const result = executeCommand(zksolcCommand, args)
-
-      xit('Valid command exit code = 1', () => {
-        expect(result.exitCode).toBe(1)
-      })
-
-      it('--combined-json error is presented', () => {
-        expect(result.output).toMatch(
-          /(No such file or directory|cannot find the file specified)/i
-        ) // Hopefully we should have more precise message here!
-      })
-
-      xit('solc exit code == zksolc exit code', () => {
-        const solcResult = executeCommand(solcCommand, args)
-        expect(solcResult.exitCode).toBe(result.exitCode)
-      })
-    })
-  }
-
-  //id1829:III
-  for (let i = 0; i < json_args.length; i++) {
-    describe(`Run ${zksolcCommand} with Sol, and multiple (--combined-json ${json_args[i]})`, () => {
-      const args = [
-        `${paths.pathToBasicSolContract}`,
-        `--combined-json`,
-        `${json_args[i]}`,
-        `--combined-json`,
-        `${json_args[i]}`,
-      ]
-      const result = executeCommand(zksolcCommand, args)
-
-      it('Valid command exit code = 1', () => {
-        expect(result.exitCode).toBe(1)
-      })
-
-      it('--combined-json error is presented', () => {
-        expect(result.output).toMatch(/(cannot be used multiple times)/i)
-      })
-
-      it('solc exit code == zksolc exit code', () => {
-        const solcResult = executeCommand(solcCommand, args)
-        expect(solcResult.exitCode).toBe(result.exitCode)
-      })
-    })
-  }
-
-  //id1830
-  for (let i = 0; i < json_args.length; i++) {
-    describe(`Run ${zksolcCommand} with Yul, and --combined-json ${json_args[i]}`, () => {
-      const args = [
-        `${paths.pathToBasicYulContract}`,
-        `--combined-json`,
-        `${json_args[i]}`,
-      ]
-      const result = executeCommand(zksolcCommand, args)
-
-      it('Valid command exit code = 1', () => {
-        expect(result.exitCode).toBe(1)
-      })
-
-      it('--combined-json error is presented', () => {
-        expect(result.output).toMatch(/(ParserError: Expected identifier)/i)
-      })
-      asd
-
-      it('solc exit code == zksolc exit code', () => {
-        const solcResult = executeCommand(solcCommand, args)
-        expect(solcResult.exitCode).toBe(result.exitCode)
-      })
-    })
-  }
-})

crates/runner/Cargo.toml

@@ -17,7 +17,7 @@ path = "src/main.rs"
 [features]
 std = ["polkadot-sdk/std"]
 default = ["solidity"]
-solidity = ["resolc", "revive-differential", "revive-llvm-context"]
+solidity = ["revive-solidity", "revive-differential", "revive-llvm-context"]
 
 [dependencies]
 env_logger = { workspace = true }
@@ -39,6 +39,6 @@ polkadot-sdk.features = [
     "pallet-timestamp"
 ]
 
-resolc = { workspace = true, optional = true }
+revive-solidity = { workspace = true, optional = true }
 revive-differential = { workspace = true, optional = true }
 revive-llvm-context = { workspace = true, optional = true }

crates/runner/README.md

@@ -24,3 +24,4 @@ Set the `RUST_LOG` environment varibale to the `trace` level to see the full Pol
 
 ```bash
 RUST_LOG=trace revive-runner -f mycontract.pvm -c a9059cbb000000000000000000000000f24ff3a9cf04c71dbc94d0b566f7a27b94566cac0000000000000000000000000000000000000000000000000000000000000000
+```

crates/runner/src/lib.rs

@@ -44,7 +44,7 @@ pub use crate::specs::*;
 mod runtime;
 mod specs;
 
-#[cfg(not(feature = "resolc"))]
+#[cfg(not(feature = "revive-solidity"))]
 pub(crate) const NO_SOLIDITY_FRONTEND: &str =
     "revive-runner was built without the solidity frontend; please enable the 'solidity' feature!";
 
@@ -234,7 +234,7 @@ impl CallResult {
 
 #[derive(Clone, Debug, Serialize, Deserialize)]
 pub enum Code {
-    #[cfg(feature = "resolc")]
+    #[cfg(feature = "revive-solidity")]
     /// Compile a single solidity source and use the blob of `contract`
     Solidity {
         path: Option<std::path::PathBuf>,
@@ -270,7 +270,7 @@ impl From<Code> for pallet_revive::Code {
                 let Ok(source_code) = std::fs::read_to_string(&path) else {
                     panic!("Failed to reead source code from {}", path.display());
                 };
-                pallet_revive::Code::Upload(resolc::test_utils::compile_blob_with_options(
+                pallet_revive::Code::Upload(revive_solidity::test_utils::compile_blob_with_options(
                     &contract,
                     &source_code,
                     solc_optimizer.unwrap_or(true),

crates/runner/src/runtime.rs

@@ -94,12 +94,6 @@ impl FindAuthor<<Runtime as frame_system::Config>::AccountId> for Runtime {
     where
         I: 'a + IntoIterator<Item = (frame_support::ConsensusEngineId, &'a [u8])>,
     {
-        Some(
+        Some([0xff; 32].into())
-            [[0xff; 20].as_slice(), [0xee; 12].as_slice()]
-                .concat()
-                .as_slice()
-                .try_into()
-                .unwrap(),
-        )
     }
 }

crates/runner/src/specs.rs

@@ -4,12 +4,12 @@ use serde::{Deserialize, Serialize};
 
 use crate::*;
 use alloy_primitives::keccak256;
-#[cfg(feature = "resolc")]
+#[cfg(feature = "revive-solidity")]
 use alloy_primitives::Address;
-#[cfg(feature = "resolc")]
+#[cfg(feature = "revive-solidity")]
-use resolc::test_utils::*;
-#[cfg(feature = "resolc")]
 use revive_differential::{Evm, EvmLog};
+#[cfg(feature = "revive-solidity")]
+use revive_solidity::test_utils::*;
 
 const SPEC_MARKER_BEGIN: &str = "/* runner.json";
 const SPEC_MARKER_END: &str = "*/";
@@ -256,7 +256,7 @@ impl Specs {
             };
 
             match code {
-                #[cfg(feature = "resolc")]
+                #[cfg(feature = "revive-solidity")]
                 Code::Bytes(bytes) if bytes.is_empty() => {
                     let contract_source = match std::fs::read_to_string(contract_path) {
                         Err(err) => panic!("unable to read {contract_path}: {err}"),
@@ -264,9 +264,9 @@ impl Specs {
                     };
                     *bytes = compile_blob(contract_name, &contract_source)
                 }
-                #[cfg(not(feature = "resolc"))]
+                #[cfg(not(feature = "revive-solidity"))]
                 Code::Bytes(_) => panic!("{NO_SOLIDITY_FRONTEND}"),
-                #[cfg(feature = "resolc")]
+                #[cfg(feature = "revive-solidity")]
                 Code::Solidity { path, .. } if path.is_none() => *path = Some(contract_path.into()),
                 _ => continue,
             }

crates/runtime-api/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "revive-runtime-api"
-version = "0.2.0"
+version.workspace = true
 license.workspace = true
 edition.workspace = true
 repository.workspace = true
@@ -9,7 +9,7 @@ description = "Implements the low level runtime API bindings with pallet contrac
 
 [dependencies]
 anyhow = { workspace = true }
-inkwell = { workspace = true, features = ["target-riscv", "no-libffi-linking", "llvm18-1"] }
+inkwell = { workspace = true, features = ["target-riscv", "no-libffi-linking", "llvm18-0"] }
 
 revive-common = { workspace = true }
 

crates/runtime-api/build.rs

@@ -37,11 +37,12 @@ fn compile(source_path: &str, bitcode_path: &str) {
             source_path,
         ])
         .output()
-        .unwrap_or_else(|error| panic!("failed to execute clang: {error}"));
+        .unwrap_or_else(|error| panic!("failed to execute clang: {}", error));
 
     assert!(
         output.status.success(),
-        "failed to compile the PolkaVM C API: {output:?}"
+        "failed to compile the PolkaVM C API: {:?}",
+        output
     );
 }
 

crates/runtime-api/src/polkavm_imports.c

@@ -30,13 +30,6 @@ void * memmove(void *dst, const void *src, size_t n) {
 	return dst;
 }
 
-void * memset(void *b, int c, size_t len) {
-    uint8_t *dest = b;
-    uint8_t val = (uint8_t)c;
-    while (len-- > 0) *dest++ = val;
-    return b;
-}
-
 // Imports
 
 POLKAVM_IMPORT(void, address, uint32_t)

crates/solc-json-interface/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "revive-solc-json-interface"
-version = "0.2.0"
+version.workspace = true
 authors.workspace = true
 license.workspace = true
 edition.workspace = true

crates/solc-json-interface/src/lib.rs

@@ -7,12 +7,7 @@ pub use self::combined_json::contract::Contract as CombinedJsonContract;
 pub use self::standard_json::input::language::Language as SolcStandardJsonInputLanguage;
 pub use self::standard_json::input::settings::metadata::Metadata as SolcStandardJsonInputSettingsMetadata;
 pub use self::standard_json::input::settings::metadata_hash::MetadataHash as SolcStandardJsonInputSettingsMetadataHash;
-pub use self::standard_json::input::settings::optimizer::yul_details::YulDetails as SolcStandardJsonInputSettingsYulOptimizerDetails;
 pub use self::standard_json::input::settings::optimizer::Optimizer as SolcStandardJsonInputSettingsOptimizer;
-pub use self::standard_json::input::settings::polkavm::memory::MemoryConfig as SolcStandardJsonInputSettingsPolkaVMMemory;
-pub use self::standard_json::input::settings::polkavm::memory::DEFAULT_HEAP_SIZE as PolkaVMDefaultHeapMemorySize;
-pub use self::standard_json::input::settings::polkavm::memory::DEFAULT_STACK_SIZE as PolkaVMDefaultStackMemorySize;
-pub use self::standard_json::input::settings::polkavm::PolkaVM as SolcStandardJsonInputSettingsPolkaVM;
 pub use self::standard_json::input::settings::selection::file::flag::Flag as SolcStandardJsonInputSettingsSelectionFileFlag;
 pub use self::standard_json::input::settings::selection::file::File as SolcStandardJsonInputSettingsSelectionFile;
 pub use self::standard_json::input::settings::selection::Selection as SolcStandardJsonInputSettingsSelection;

crates/solc-json-interface/src/standard_json/input/mod.rs

@@ -18,14 +18,13 @@ use crate::standard_json::input::settings::optimizer::Optimizer as SolcStandardJ
 use crate::standard_json::input::settings::selection::Selection as SolcStandardJsonInputSettingsSelection;
 #[cfg(feature = "resolc")]
 use crate::warning::Warning;
-use crate::SolcStandardJsonInputSettingsPolkaVM;
 
 use self::language::Language;
 use self::settings::Settings;
 use self::source::Source;
 
 /// The `solc --standard-json` input.
-#[derive(Clone, Debug, Serialize, Deserialize)]
+#[derive(Debug, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct Input {
     /// The input language.
@@ -64,7 +63,6 @@ impl Input {
         optimizer: SolcStandardJsonInputSettingsOptimizer,
         metadata: Option<SolcStandardJsonInputSettingsMetadata>,
         #[cfg(feature = "resolc")] suppressed_warnings: Option<Vec<Warning>>,
-        polkavm: Option<SolcStandardJsonInputSettingsPolkaVM>,
     ) -> anyhow::Result<Self> {
         let mut paths: BTreeSet<PathBuf> = paths.iter().cloned().collect();
         let libraries = Settings::parse_libraries(library_map)?;
@@ -92,7 +90,6 @@ impl Input {
                 output_selection,
                 optimizer,
                 metadata,
-                polkavm,
             ),
             #[cfg(feature = "resolc")]
             suppressed_warnings,
@@ -112,7 +109,6 @@ impl Input {
         optimizer: SolcStandardJsonInputSettingsOptimizer,
         metadata: Option<SolcStandardJsonInputSettingsMetadata>,
         suppressed_warnings: Option<Vec<Warning>>,
-        polkavm: Option<SolcStandardJsonInputSettingsPolkaVM>,
     ) -> anyhow::Result<Self> {
         #[cfg(feature = "parallel")]
         let iter = sources.into_par_iter(); // Parallel iterator
@@ -133,14 +129,13 @@ impl Input {
                 output_selection,
                 optimizer,
                 metadata,
-                polkavm,
             ),
             suppressed_warnings,
         })
     }
 
     /// Sets the necessary defaults.
-    pub fn normalize(&mut self) {
+    pub fn normalize(&mut self, version: &semver::Version) {
-        self.settings.normalize();
+        self.settings.normalize(version);
     }
 }

crates/solc-json-interface/src/standard_json/input/settings/metadata.rs

@@ -6,7 +6,7 @@ use serde::Serialize;
 use crate::standard_json::input::settings::metadata_hash::MetadataHash;
 
 /// The `solc --standard-json` input settings metadata.
-#[derive(Clone, Debug, Default, Serialize, Deserialize)]
+#[derive(Debug, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct Metadata {
     /// The bytecode hash mode.

crates/solc-json-interface/src/standard_json/input/settings/mod.rs

@@ -3,7 +3,6 @@
 pub mod metadata;
 pub mod metadata_hash;
 pub mod optimizer;
-pub mod polkavm;
 pub mod selection;
 
 use std::collections::BTreeMap;
@@ -14,11 +13,10 @@ use serde::Serialize;
 
 use self::metadata::Metadata;
 use self::optimizer::Optimizer;
-use self::polkavm::PolkaVM;
 use self::selection::Selection;
 
 /// The `solc --standard-json` input settings.
-#[derive(Clone, Debug, Serialize, Deserialize)]
+#[derive(Debug, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct Settings {
     /// The target EVM version.
@@ -45,9 +43,6 @@ pub struct Settings {
     /// The metadata settings.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub metadata: Option<Metadata>,
-    /// The resolc custom PolkaVM settings.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub polkavm: Option<PolkaVM>,
 }
 
 impl Settings {
@@ -59,7 +54,6 @@ impl Settings {
         output_selection: Selection,
         optimizer: Optimizer,
         metadata: Option<Metadata>,
-        polkavm: Option<PolkaVM>,
     ) -> Self {
         Self {
             evm_version,
@@ -69,14 +63,12 @@ impl Settings {
             optimizer,
             metadata,
             via_ir: Some(true),
-            polkavm,
         }
     }
 
     /// Sets the necessary defaults.
-    pub fn normalize(&mut self) {
+    pub fn normalize(&mut self, version: &semver::Version) {
-        self.polkavm = None;
+        self.optimizer.normalize(version);
-        self.optimizer.normalize();
     }
 
     /// Parses the library list and returns their double hashmap with path and name as keys.

crates/solc-json-interface/src/standard_json/input/settings/optimizer/details.rs

@@ -3,54 +3,37 @@
 use serde::Deserialize;
 use serde::Serialize;
 
-use crate::standard_json::input::settings::optimizer::yul_details::YulDetails;
-
 /// The `solc --standard-json` input settings optimizer details.
-#[derive(Clone, Debug, Serialize, Deserialize)]
+#[derive(Debug, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct Details {
     /// Whether the pass is enabled.
-    #[serde(skip_serializing_if = "Option::is_none")]
+    pub peephole: bool,
-    pub peephole: Option<bool>,
     /// Whether the pass is enabled.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub inliner: Option<bool>,
     /// Whether the pass is enabled.
-    #[serde(skip_serializing_if = "Option::is_none")]
+    pub jumpdest_remover: bool,
-    pub jumpdest_remover: Option<bool>,
     /// Whether the pass is enabled.
-    #[serde(skip_serializing_if = "Option::is_none")]
+    pub order_literals: bool,
-    pub order_literals: Option<bool>,
     /// Whether the pass is enabled.
-    #[serde(skip_serializing_if = "Option::is_none")]
+    pub deduplicate: bool,
-    pub deduplicate: Option<bool>,
     /// Whether the pass is enabled.
-    #[serde(skip_serializing_if = "Option::is_none")]
+    pub cse: bool,
-    pub cse: Option<bool>,
     /// Whether the pass is enabled.
-    #[serde(skip_serializing_if = "Option::is_none")]
+    pub constant_optimizer: bool,
-    pub constant_optimizer: Option<bool>,
-    /// Whether the YUL optimizer is enabled.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub yul: Option<bool>,
-    /// The YUL optimizer configuration.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub yul_details: Option<YulDetails>,
 }
 
 impl Details {
     /// A shortcut constructor.
-    #[allow(clippy::too_many_arguments)]
     pub fn new(
-        peephole: Option<bool>,
+        peephole: bool,
         inliner: Option<bool>,
-        jumpdest_remover: Option<bool>,
+        jumpdest_remover: bool,
-        order_literals: Option<bool>,
+        order_literals: bool,
-        deduplicate: Option<bool>,
+        deduplicate: bool,
-        cse: Option<bool>,
+        cse: bool,
-        constant_optimizer: Option<bool>,
+        constant_optimizer: bool,
-        yul: Option<bool>,
-        yul_details: Option<YulDetails>,
     ) -> Self {
         Self {
             peephole,
@@ -60,11 +43,10 @@ impl Details {
             deduplicate,
             cse,
             constant_optimizer,
-            yul,
-            yul_details,
         }
     }
 
+    /// Creates a set of disabled optimizations.
     pub fn disabled(version: &semver::Version) -> Self {
         let inliner = if version >= &semver::Version::new(0, 8, 5) {
             Some(false)
@@ -72,16 +54,6 @@ impl Details {
             None
         };
 
-        Self::new(
+        Self::new(false, inliner, false, false, false, false, false)
-            Some(false),
-            inliner,
-            Some(false),
-            Some(false),
-            Some(false),
-            Some(false),
-            Some(false),
-            None,
-            None,
-        )
     }
 }

crates/solc-json-interface/src/standard_json/input/settings/optimizer/mod.rs

@@ -1,7 +1,6 @@
 //! The `solc --standard-json` input settings optimizer.
 
 pub mod details;
-pub mod yul_details;
 
 use serde::Deserialize;
 use serde::Serialize;
@@ -9,19 +8,19 @@ use serde::Serialize;
 use self::details::Details;
 
 /// The `solc --standard-json` input settings optimizer.
-#[derive(Clone, Debug, Serialize, Deserialize)]
+#[derive(Debug, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct Optimizer {
     /// Whether the optimizer is enabled.
     pub enabled: bool,
     /// The optimization mode string.
-    #[serde(skip_serializing_if = "Option::is_none")]
+    #[serde(skip_serializing)]
     pub mode: Option<char>,
     /// The `solc` optimizer details.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub details: Option<Details>,
     /// Whether to try to recompile with -Oz if the bytecode is too large.
-    #[serde(skip_serializing_if = "Option::is_none")]
+    #[serde(skip_serializing)]
     pub fallback_to_optimizing_for_size: Option<bool>,
 }
 
@@ -42,8 +41,11 @@ impl Optimizer {
     }
 
     /// Sets the necessary defaults.
-    pub fn normalize(&mut self) {
+    pub fn normalize(&mut self, version: &semver::Version) {
-        self.mode = None;
+        self.details = if version >= &semver::Version::new(0, 5, 5) {
-        self.fallback_to_optimizing_for_size = None;
+            Some(Details::disabled(version))
+        } else {
+            None
+        };
     }
 }

crates/solc-json-interface/src/standard_json/input/settings/optimizer/yul_details.rs

@@ -1,26 +0,0 @@
-//! The `solc --standard-json` input settings YUL optimizer details.
-
-use serde::Deserialize;
-use serde::Serialize;
-
-/// The `solc --standard-json` input settings optimizer YUL details.
-#[derive(Clone, Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct YulDetails {
-    /// Whether the stack allocation pass is enabled.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub stack_allocation: Option<bool>,
-    /// The optimization step sequence string.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub optimizer_steps: Option<String>,
-}
-
-impl YulDetails {
-    /// A shortcut constructor.
-    pub fn new(stack_allocation: Option<bool>, optimizer_steps: Option<String>) -> Self {
-        Self {
-            stack_allocation,
-            optimizer_steps,
-        }
-    }
-}

crates/solc-json-interface/src/standard_json/input/settings/polkavm/memory.rs

@@ -1,36 +0,0 @@
-//! The compile time PolkaVM memory configuration settings.
-
-use serde::{Deserialize, Serialize};
-
-pub const DEFAULT_HEAP_SIZE: u32 = 64 * 1024;
-pub const DEFAULT_STACK_SIZE: u32 = 32 * 1024;
-
-/// The PolkaVM memory configuration.
-#[derive(Clone, Copy, Debug, Deserialize, Serialize)]
-pub struct MemoryConfig {
-    /// The emulated EVM linear heap memory size in bytes.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub heap_size: Option<u32>,
-    /// The PVM stack size in bytes.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub stack_size: Option<u32>,
-}
-
-impl MemoryConfig {
-    /// A shorthand constructor.
-    pub fn new(heap_size: Option<u32>, stack_size: Option<u32>) -> Self {
-        Self {
-            heap_size,
-            stack_size,
-        }
-    }
-}
-
-impl Default for MemoryConfig {
-    fn default() -> Self {
-        Self {
-            heap_size: Some(DEFAULT_HEAP_SIZE),
-            stack_size: Some(DEFAULT_STACK_SIZE),
-        }
-    }
-}

crates/solc-json-interface/src/standard_json/input/settings/polkavm/mod.rs

@@ -1,28 +0,0 @@
-//! The `resolc --standard-json` polkavm settings.
-//!
-//! Used for options specific to PolkaVM which therefor don't exist in solc.
-
-use memory::MemoryConfig;
-use serde::{Deserialize, Serialize};
-
-pub mod memory;
-
-/// PVM specific compiler settings.
-#[derive(Clone, Copy, Default, Debug, Serialize, Deserialize)]
-pub struct PolkaVM {
-    /// The PolkaVM target machine memory configuration settings.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub memory_config: Option<MemoryConfig>,
-    /// Instruct LLVM to emit debug information.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub debug_information: Option<bool>,
-}
-
-impl PolkaVM {
-    pub fn new(memory_config: Option<MemoryConfig>, debug_information: bool) -> Self {
-        Self {
-            memory_config,
-            debug_information: Some(debug_information),
-        }
-    }
-}

crates/solc-json-interface/src/standard_json/input/settings/selection/file/mod.rs

@@ -10,7 +10,7 @@ use serde::Serialize;
 use self::flag::Flag as SelectionFlag;
 
 /// The `solc --standard-json` output file selection.
-#[derive(Clone, Debug, Default, Serialize, Deserialize, PartialEq)]
+#[derive(Debug, Default, Serialize, Deserialize, PartialEq)]
 pub struct File {
     /// The per-file output selections.
     #[serde(rename = "", skip_serializing_if = "Option::is_none")]
@@ -21,20 +21,8 @@ pub struct File {
 }
 
 impl File {
-    /// Creates the selection required for production compilation (excludes EVM bytecode).
+    /// Creates the selection required by our compilation process.
     pub fn new_required() -> Self {
-        Self {
-            per_file: Some(HashSet::from_iter([SelectionFlag::AST])),
-            per_contract: Some(HashSet::from_iter([
-                SelectionFlag::MethodIdentifiers,
-                SelectionFlag::Metadata,
-                SelectionFlag::Yul,
-            ])),
-        }
-    }
-
-    /// Creates the selection required for test compilation (includes EVM bytecode).
-    pub fn new_required_for_tests() -> Self {
         Self {
             per_file: Some(HashSet::from_iter([SelectionFlag::AST])),
             per_contract: Some(HashSet::from_iter([
@@ -61,38 +49,3 @@ impl File {
         self
     }
 }
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn production_excludes_evm_bytecode() {
-        let selection = File::new_required();
-        let per_contract = selection.per_contract.unwrap();
-
-        // Production should NOT include EVM bytecode flags
-        assert!(!per_contract.contains(&SelectionFlag::EVMBC));
-        assert!(!per_contract.contains(&SelectionFlag::EVMDBC));
-
-        // But should include other required flags
-        assert!(per_contract.contains(&SelectionFlag::MethodIdentifiers));
-        assert!(per_contract.contains(&SelectionFlag::Metadata));
-        assert!(per_contract.contains(&SelectionFlag::Yul));
-    }
-
-    #[test]
-    fn tests_include_evm_bytecode() {
-        let selection = File::new_required_for_tests();
-        let per_contract = selection.per_contract.unwrap();
-
-        // Tests should include EVM bytecode flags
-        assert!(per_contract.contains(&SelectionFlag::EVMBC));
-        assert!(per_contract.contains(&SelectionFlag::EVMDBC));
-
-        // And should also include other required flags
-        assert!(per_contract.contains(&SelectionFlag::MethodIdentifiers));
-        assert!(per_contract.contains(&SelectionFlag::Metadata));
-        assert!(per_contract.contains(&SelectionFlag::Yul));
-    }
-}

crates/solc-json-interface/src/standard_json/input/settings/selection/mod.rs

@@ -10,7 +10,7 @@ use serde::Serialize;
 use self::file::File as FileSelection;
 
 /// The `solc --standard-json` output selection.
-#[derive(Clone, Debug, Serialize, Deserialize, Default, PartialEq)]
+#[derive(Debug, Serialize, Deserialize, Default, PartialEq)]
 pub struct Selection {
     /// Only the 'all' wildcard is available for robustness reasons.
     #[serde(rename = "*", skip_serializing_if = "Option::is_none")]
@@ -29,14 +29,6 @@ impl Selection {
         }
     }
 
-    /// Creates the selection required for test compilation (includes EVM bytecode).
-    pub fn new_required_for_tests() -> Self {
-        Self {
-            all: Some(FileSelection::new_required_for_tests()),
-            files: BTreeMap::new(),
-        }
-    }
-
     /// Extends the user's output selection with flag required by our compilation process.
     pub fn extend_with_required(&mut self) -> &mut Self {
         self.all

crates/solc-json-interface/src/standard_json/input/source.rs

@@ -7,7 +7,7 @@ use serde::Deserialize;
 use serde::Serialize;
 
 /// The `solc --standard-json` input source.
-#[derive(Clone, Debug, Serialize, Deserialize)]
+#[derive(Debug, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct Source {
     /// The source code file content.

crates/solidity/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
-name = "resolc"
+name = "revive-solidity"
-version = "0.3.0"
+version.workspace = true
 license.workspace = true
 edition.workspace = true
 repository.workspace = true
@@ -18,30 +18,33 @@ path = "src/resolc/main.rs"
 doctest = false
 
 [dependencies]
-anyhow = { workspace = true }
 clap = { workspace = true }
-hex = { workspace = true }
+thiserror = { workspace = true }
-inkwell = { workspace = true }
+anyhow = { workspace = true }
-once_cell = { workspace = true }
+which = { workspace = true }
 path-slash = { workspace = true }
 rayon = { workspace = true, optional = true }
-semver = { workspace = true }
+
 serde = { workspace = true }
 serde_json = { workspace = true }
+semver = { workspace = true }
+once_cell = { workspace = true }
+regex = { workspace = true }
+hex = { workspace = true }
+num = { workspace = true }
 sha3 = { workspace = true }
-which = { workspace = true }
+inkwell = { workspace = true }
 
 revive-common = { workspace = true }
 revive-llvm-context = { workspace = true }
 revive-solc-json-interface = { workspace = true, features = ["resolc"] }
-revive-yul = { workspace = true }
 
 [target.'cfg(target_env = "musl")'.dependencies]
-mimalloc = { version = "0.1.46", default-features = false }
+mimalloc = { version = "*", default-features = false }
 
 [target.'cfg(target_os = "emscripten")'.dependencies]
 libc = { workspace = true }
-inkwell = { workspace = true, features = ["target-riscv", "llvm18-1-no-llvm-linking"]}
+inkwell = { workspace = true, features = ["target-riscv", "llvm18-0-no-llvm-linking"]}
 
 [build-dependencies]
 git2 = { workspace = true, default-features = false }

crates/solidity/build.rs

@@ -0,0 +1,7 @@
+fn main() {
+    let repo = git2::Repository::open("../..").expect("should be a repository");
+    let head = repo.head().expect("should have head");
+    let commit = head.peel_to_commit().expect("should have commit");
+    let id = &commit.id().to_string()[..7];
+    println!("cargo:rustc-env=GIT_COMMIT_HASH={id}");
+}

crates/solidity/src/lib.rs

@@ -7,6 +7,7 @@ pub(crate) mod process;
 pub(crate) mod project;
 pub(crate) mod solc;
 pub(crate) mod version;
+pub(crate) mod yul;
 
 pub use self::build::contract::Contract as ContractBuild;
 pub use self::build::Build;
@@ -44,8 +45,6 @@ use revive_solc_json_interface::ResolcWarning;
 use revive_solc_json_interface::SolcStandardJsonInput;
 use revive_solc_json_interface::SolcStandardJsonInputLanguage;
 use revive_solc_json_interface::SolcStandardJsonInputSettingsOptimizer;
-use revive_solc_json_interface::SolcStandardJsonInputSettingsPolkaVM;
-use revive_solc_json_interface::SolcStandardJsonInputSettingsPolkaVMMemory;
 use revive_solc_json_interface::SolcStandardJsonInputSettingsSelection;
 
 /// Runs the Yul mode.
@@ -54,9 +53,9 @@ pub fn yul<T: Compiler>(
     solc: &mut T,
     optimizer_settings: revive_llvm_context::OptimizerSettings,
     include_metadata_hash: bool,
-    mut debug_config: revive_llvm_context::DebugConfig,
+    debug_config: revive_llvm_context::DebugConfig,
     llvm_arguments: &[String],
-    memory_config: SolcStandardJsonInputSettingsPolkaVMMemory,
+    memory_config: revive_llvm_context::MemoryConfig,
 ) -> anyhow::Result<Build> {
     let path = match input_files.len() {
         1 => input_files.first().expect("Always exists"),
@@ -77,7 +76,6 @@ pub fn yul<T: Compiler>(
     let solc_validator = Some(&*solc);
     let project = Project::try_from_yul_path(path, solc_validator)?;
 
-    debug_config.set_yul_path(path);
     let build = project.compile(
         optimizer_settings,
         include_metadata_hash,
@@ -96,7 +94,7 @@ pub fn llvm_ir(
     include_metadata_hash: bool,
     debug_config: revive_llvm_context::DebugConfig,
     llvm_arguments: &[String],
-    memory_config: SolcStandardJsonInputSettingsPolkaVMMemory,
+    memory_config: revive_llvm_context::MemoryConfig,
 ) -> anyhow::Result<Build> {
     let path = match input_files.len() {
         1 => input_files.first().expect("Always exists"),
@@ -137,7 +135,7 @@ pub fn standard_output<T: Compiler>(
     suppressed_warnings: Option<Vec<ResolcWarning>>,
     debug_config: revive_llvm_context::DebugConfig,
     llvm_arguments: &[String],
-    memory_config: SolcStandardJsonInputSettingsPolkaVMMemory,
+    memory_config: revive_llvm_context::MemoryConfig,
 ) -> anyhow::Result<Build> {
     let solc_version = solc.version()?;
 
@@ -156,10 +154,6 @@ pub fn standard_output<T: Compiler>(
         ),
         None,
         suppressed_warnings,
-        Some(SolcStandardJsonInputSettingsPolkaVM::new(
-            Some(memory_config),
-            debug_config.emit_debug_info,
-        )),
     )?;
 
     let source_code_files = solc_input
@@ -214,8 +208,9 @@ pub fn standard_json<T: Compiler>(
     base_path: Option<String>,
     include_paths: Vec<String>,
     allow_paths: Option<String>,
-    mut debug_config: revive_llvm_context::DebugConfig,
+    debug_config: revive_llvm_context::DebugConfig,
     llvm_arguments: &[String],
+    memory_config: revive_llvm_context::MemoryConfig,
 ) -> anyhow::Result<()> {
     let solc_version = solc.version()?;
 
@@ -229,9 +224,6 @@ pub fn standard_json<T: Compiler>(
     let optimizer_settings =
         revive_llvm_context::OptimizerSettings::try_from(&solc_input.settings.optimizer)?;
 
-    let polkavm_settings = solc_input.settings.polkavm.unwrap_or_default();
-    debug_config.emit_debug_info = polkavm_settings.debug_information.unwrap_or_default();
-
     let include_metadata_hash = match solc_input.settings.metadata {
         Some(ref metadata) => metadata.bytecode_hash != Some(MetadataHash::None),
         None => true,
@@ -266,9 +258,7 @@ pub fn standard_json<T: Compiler>(
             include_metadata_hash,
             debug_config,
             llvm_arguments,
-            polkavm_settings
+            memory_config,
-                .memory_config
-                .unwrap_or_else(SolcStandardJsonInputSettingsPolkaVMMemory::default),
         )?;
         build.write_to_standard_json(&mut solc_output, &solc_version)?;
     }
@@ -296,7 +286,7 @@ pub fn combined_json<T: Compiler>(
     output_directory: Option<PathBuf>,
     overwrite: bool,
     llvm_arguments: &[String],
-    memory_config: SolcStandardJsonInputSettingsPolkaVMMemory,
+    memory_config: revive_llvm_context::MemoryConfig,
 ) -> anyhow::Result<()> {
     let build = standard_output(
         input_files,

crates/solidity/src/process/input.rs

@@ -1,7 +1,6 @@
 //! Process for compiling a single compilation unit.
 //! The input data.
 
-use revive_solc_json_interface::SolcStandardJsonInputSettingsPolkaVMMemory;
 use serde::Deserialize;
 use serde::Serialize;
 
@@ -24,7 +23,7 @@ pub struct Input {
     /// The extra LLVM arguments give used for manual control.
     pub llvm_arguments: Vec<String>,
     /// The PVM memory configuration.
-    pub memory_config: SolcStandardJsonInputSettingsPolkaVMMemory,
+    pub memory_config: revive_llvm_context::MemoryConfig,
 }
 
 impl Input {
@@ -36,7 +35,7 @@ impl Input {
         optimizer_settings: revive_llvm_context::OptimizerSettings,
         debug_config: revive_llvm_context::DebugConfig,
         llvm_arguments: Vec<String>,
-        memory_config: SolcStandardJsonInputSettingsPolkaVMMemory,
+        memory_config: revive_llvm_context::MemoryConfig,
     ) -> Self {
         Self {
             contract,

crates/solidity/src/project/contract/ir/mod.rs

@@ -8,7 +8,7 @@ use std::collections::HashSet;
 use serde::Deserialize;
 use serde::Serialize;
 
-use revive_yul::parser::statement::object::Object;
+use crate::yul::parser::statement::object::Object;
 
 use self::llvm_ir::LLVMIR;
 use self::yul::Yul;