ah yes emscripten

* Stripping "./resolc-out" from linux artifact is weirdly
`--strip-components 2`, not `1`
* Adding execution bit for macos binary

.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

@@ -1,14 +1,15 @@
-name: "Get Emscripten SDK"
+name: "get emsdk"
 inputs:
   version:
     description: ""
     required: false
-    default: "4.0.9"
+    default: "3.1.64"
 
 
 runs:
   using: "composite"
   steps:
+
     - name: install emsdk
       shell: bash
       run: |

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

@@ -1,12 +1,29 @@
 # example:
-#       - uses: ./.github/actions/get-llvm
+#
+#       - name: get llvm
+#         uses: ./.github/actions/get-llvm
 #         with:
-#           target: x86_64-unknown-linux-gnu
+#           releasePrefix: llvm-
+#           artifactArch: macos-arm64
+#           dir: target-llvm/macos
 
-name: "Download LLVM"
+name: "get llvm"
 inputs:
-  target:
+  artifactArch:
     required: true
+  releasePrefix:
+    description: "LLVM release tag prefix to search"
+    required: false
+    default: "llvm-"
+  dir:
+    description: "Archive extract path (`tar -C`)"
+    required: false
+    default: "./"
+  stripComponents:
+    description: "Strip UMBER leading components from file names on extraction (`tar --strip-components`)"
+    required: false
+    default: 0
+
 
 runs:
   using: "composite"
@@ -15,15 +32,16 @@ runs:
       id: find
       uses: actions/github-script@v7
       env:
-        target: ${{ inputs.target }}
+        releasePrefix: ${{ inputs.releasePrefix }}
+        artifactArch: ${{ inputs.artifactArch }}
       with:
         result-encoding: string
         script: |
           let page = 1;
           let releases = [];
 
-          let releasePrefix = "llvm-"
+          let releasePrefix = process.env.releasePrefix
-          let target = process.env.target
+          let artifactArch = process.env.artifactArch
 
           do {
             const res = await github.rest.repos.listReleases({
@@ -43,10 +61,10 @@ runs:
             });
             if (llvmLatestRelease){
                 let asset = llvmLatestRelease.assets.find(asset =>{
-                    return asset.name.includes(target);
+                    return asset.name.includes(artifactArch);
                 });
                 if (!asset){
-                  core.setFailed(`Artifact for '${target}' not found in release ${llvmLatestRelease.tag_name} (${llvmLatestRelease.html_url})`);
+                  core.setFailed(`Artifact for '${artifactArch}' not found in release ${llvmLatestRelease.tag_name} (${llvmLatestRelease.html_url})`);
                   process.exit();
                 }
                 return asset.browser_download_url;
@@ -61,10 +79,13 @@ runs:
     - name: download
       shell: bash
       run: |
+        mkdir -p ${{ inputs.dir }}
         curl -sSLo llvm.tar.gz ${{ steps.find.outputs.result }}
+        ls -al
 
     - name: unpack
       shell: bash
       run: |
-        tar -xf llvm.tar.gz
+        tar -xf llvm.tar.gz -C ${{ inputs.dir }} --strip-components=${{ inputs.stripComponents }}
         rm llvm.tar.gz
+        ls -al ${{ inputs.dir }}

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

@@ -1,36 +0,0 @@
-name: "Install Solidity Compiler"
-description: "Installs the Ethereum solc Solidity compiler frontend executable"
-
-runs:
-  using: "composite"
-  steps:
-    - name: Figure out Solc Download URL
-      shell: bash
-      run: |
-        if [[ "${{ runner.os }}" == "Linux" ]]; then
-          echo "SOLC_NAME=solc-static-linux" >> $GITHUB_ENV
-        elif [[ "${{ runner.os }}" == "Windows" ]]; then
-          echo "SOLC_NAME=solc-windows.exe" >> $GITHUB_ENV
-        else
-          echo "SOLC_NAME=solc-macos" >> $GITHUB_ENV
-        fi
-
-    - name: Download Solc
-      shell: bash
-      run: |
-        mkdir -p solc
-        curl -sSL --output solc/solc https://github.com/ethereum/solidity/releases/download/v0.8.30/${SOLC_NAME}
-
-    - name: Make Solc Executable
-      if: ${{ runner.os == 'Windows' }}
-      shell: bash
-      run: |
-        echo "$(pwd -W)\\solc" >> $GITHUB_PATH
-        mv solc/solc solc/solc.exe
-
-    - name: Make Solc Executable
-      if: ${{ runner.os != 'Windows' }}
-      shell: bash
-      run: |
-        echo "$(pwd)/solc" >> $GITHUB_PATH
-        chmod +x solc/solc

.github/scripts/json_generator.py

@@ -1,165 +0,0 @@
-import os
-import sys
-import json
-import requests
-
-def validate_github_token():
-    """Validate that GITHUB_TOKEN environment variable is set."""
-    if 'GITHUB_TOKEN' not in os.environ:
-        print("Error: GITHUB_TOKEN environment variable is not set.")
-        sys.exit(1)
-
-def fetch_release_data(repo, tag):
-    """Fetch release data from GitHub API."""
-    url = f"https://api.github.com/repos/{repo}/releases/tags/{tag}"
-    headers = {
-        'Authorization': f"Bearer {os.environ['GITHUB_TOKEN']}",
-        'Accept': 'application/vnd.github+json',
-        'X-GitHub-Api-Version': '2022-11-28'
-    }
-
-    try:
-        response = requests.get(url, headers=headers)
-        response.raise_for_status()
-        return response.json()
-    except requests.RequestException as e:
-        print(f"Error fetching release data: {e}")
-        sys.exit(1)
-
-def fetch_checksum_file(release_data):
-    """
-    Fetch the checksum.txt file from the release assets
-    and parse it into a dictionary mapping file names to their SHA256 checksums.
-    """
-    checksums = {}
-
-    # Find the checksum.txt asset URL
-    checksum_asset = None
-    for asset in release_data['assets']:
-        if asset['name'] == 'checksums.txt':
-            checksum_asset = asset
-            break
-
-    if not checksum_asset:
-        print("Warning: checksum.txt file not found in release assets.")
-        return checksums
-
-    # Download the checksum file
-    headers = {
-        'Authorization': f"Bearer {os.environ['GITHUB_TOKEN']}",
-        'Accept': 'application/octet-stream'
-    }
-
-    try:
-        response = requests.get(checksum_asset['browser_download_url'], headers=headers)
-        response.raise_for_status()
-
-        # Parse checksum file
-        for line in response.text.splitlines():
-            if line.strip():
-                checksum, filename = line.strip().split(None, 1)
-                checksums[filename] = checksum
-
-        return checksums
-    except requests.RequestException as e:
-        print(f"Error fetching checksum file: {e}")
-        return checksums
-    except Exception as e:
-        print(f"Error parsing checksum file: {e}")
-        return checksums
-
-def extract_build_hash(target_commitish):
-    """Extract the first 8 characters of the commit hash."""
-    return f"commit.{target_commitish[:8]}"
-
-def generate_asset_json(release_data, asset, checksums):
-    """Generate JSON for a specific asset."""
-    version = release_data['tag_name'].lstrip('v')
-    build = extract_build_hash(release_data['target_commitish'])
-    long_version = f"{version}+{build}"
-
-    # Get SHA256 checksum if available
-    sha256 = checksums.get(asset['name'], "")
-
-    return {
-        "name": asset['name'],
-        "version": version,
-        "build": build,
-        "longVersion": long_version,
-        "url": asset['browser_download_url'],
-        "sha256": sha256,
-        "firstSolcVersion": os.environ.get("FIRST_SOLC_VERSION", ""),
-        "lastSolcVersion": os.environ.get("LAST_SOLC_VERSION", "")
-    }
-
-def save_platform_json(platform_folder, asset_json, tag):
-    """Save asset JSON and update list.json for a specific platform."""
-    # Create platform folder if it doesn't exist
-    os.makedirs(platform_folder, exist_ok=True)
-
-    # Update or create list.json
-    list_file_path = os.path.join(platform_folder, "list.json")
-
-    if os.path.exists(list_file_path):
-        with open(list_file_path, 'r') as f:
-            try:
-                list_data = json.load(f)
-            except json.JSONDecodeError:
-                list_data = {"builds": [], "releases": {}, "latestRelease": ""}
-    else:
-        list_data = {"builds": [], "releases": {}, "latestRelease": ""}
-
-    # Remove any existing entry with the same path
-    list_data['builds'] = [
-        build for build in list_data['builds']
-        if build['version'] != asset_json['version']
-    ]
-    # Add the new build
-    list_data['builds'].append(asset_json)
-
-    # Update releases
-    version = asset_json['version']
-    list_data['releases'][version] = f"{asset_json['name']}+{asset_json['longVersion']}"
-
-    # Update latest release
-    list_data['latestRelease'] = version
-
-    with open(list_file_path, 'w') as f:
-        json.dump(list_data, f, indent=4)
-
-def main():
-    # Validate arguments
-    if len(sys.argv) != 3:
-        print("Usage: python script.py <repo> <tag>")
-        sys.exit(1)
-
-    repo, tag = sys.argv[1], sys.argv[2]
-
-    # Validate GitHub token
-    validate_github_token()
-
-    # Fetch release data
-    release_data = fetch_release_data(repo, tag)
-
-    # Fetch checksums
-    checksums = fetch_checksum_file(release_data)
-
-    # Mapping of asset names to platform folders
-    platform_mapping = {
-        'resolc-x86_64-unknown-linux-musl': 'linux',
-        'resolc-universal-apple-darwin': 'macos',
-        'resolc-x86_64-pc-windows-msvc.exe': 'windows',
-        'resolc_web.js': 'wasm'
-    }
-
-    # Process each asset
-    for asset in release_data['assets']:
-        platform_name = platform_mapping.get(asset['name'])
-        if platform_name:
-            platform_folder = os.path.join(platform_name)
-            asset_json = generate_asset_json(release_data, asset, checksums)
-            save_platform_json(platform_folder, asset_json, tag)
-            print(f"Processed {asset['name']} for {platform_name}")
-
-if __name__ == "__main__":
-    main()

.github/workflows/build-revive-wasm.yml

@@ -1,10 +1,10 @@
-name: Test Wasm Version
+name: Build revive-wasm
 on:
   push:
     branches: ["main"]
   pull_request:
     branches: ["main"]
-    types: [opened, synchronize]
+  workflow_dispatch:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
@@ -15,38 +15,48 @@ env:
   REVIVE_WASM_INSTALL_DIR: ${{ github.workspace }}/target/wasm32-unknown-emscripten/release
 
 jobs:
-  build:
+  build-revive-wasm:
     runs-on: ubuntu-24.04
     defaults:
       run:
         shell: bash
     steps:
       - uses: actions/checkout@v4
-      - uses: actions-rust-lang/setup-rust-toolchain@v1
+
+      - name: Install Rust stable toolchain
+        uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
+          toolchain: stable
+          components: rust-src
           target: wasm32-unknown-emscripten
-          # without this it will override our rust flags
           rustflags: ""
 
-      - name: Download Host LLVM
+      - name: get llvm gnu
         uses: ./.github/actions/get-llvm
         with:
-          target: x86_64-unknown-linux-gnu
+          artifactArch: x86_64-linux-gnu
-
+      - name: get llvm emscripten
-      - name: Download Wasm LLVM
         uses: ./.github/actions/get-llvm
         with:
-          target: wasm32-unknown-emscripten
+          artifactArch: emscripten
 
-      - name: Install emsdk
+      - name: install emsdk
         uses: ./.github/actions/get-emsdk
 
-      - name: Set LLVM Environment Variables
+      - name: Setup revive environment variables
         run: |
-          echo "LLVM_SYS_181_PREFIX=$(pwd)/llvm-x86_64-unknown-linux-gnu" >> $GITHUB_ENV
+          echo "LLVM_SYS_181_PREFIX=$(pwd)/target-llvm/gnu/target-final" >> $GITHUB_ENV
-          echo "REVIVE_LLVM_TARGET_PREFIX=$(pwd)/llvm-wasm32-unknown-emscripten" >> $GITHUB_ENV
+          echo "REVIVE_LLVM_TARGET_PREFIX=$(pwd)/target-llvm/emscripten/target-final" >> $GITHUB_ENV
 
-      - name: Build Revive
+      - run: |
+          rustup show
+          cargo --version
+          rustup +nightly show
+          cargo +nightly --version
+          cmake --version
+          bash --version
+
+      - name: Build revive
         run: |
           source emsdk/emsdk_env.sh
           make install-wasm
@@ -60,8 +70,8 @@ jobs:
             ${{ env.REVIVE_WASM_INSTALL_DIR }}/resolc_web.js
           retention-days: 1
 
-  test:
+  test-revive-wasm:
-    needs: build
+    needs: build-revive-wasm
     strategy:
       matrix:
         os: ["ubuntu-24.04", "macos-14", "windows-2022"]
@@ -83,21 +93,16 @@ jobs:
         with:
           node-version: "20"
 
-      - name: Install Node Packages
+      - name: Install packages
         run: npm install
 
-      - name: Test emscripten
-        run: |
-          echo "Running tests for ${{ matrix.os }}"
-          npm run test:wasm
-
-      - name: Test @parity/resolc
-        run: |
-          echo "Running tests for ${{ matrix.os }}"
-          npm run -w js/resolc test
-
       - name: Run Playwright tests
         run: |
-          cd js/emscripten
+          cd js
           npx playwright install --with-deps
           npx playwright test
+
+      - name: Test revive
+        run: |
+          echo "Running tests for ${{ matrix.os }}"
+          npm run test:wasm

.github/workflows/generate_versions.yml

@@ -1,64 +0,0 @@
-name: Generate JSON for resolc-bin
-on:
-  release:
-    types: [published]
-
-jobs:
-  generateJson:
-    runs-on: ubuntu-latest
-    if: contains(github.event.release.tag_name, 'llvm') == false
-    environment: tags
-    env:
-      # the token is needed for json_generator.py
-      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          path: tmp
-
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          repository: paritytech/resolc-bin
-          path: resolc-bin
-
-      - uses: actions/create-github-app-token@v1
-        id: app-token
-        with:
-          app-id: ${{ secrets.REVIVE_JSON_APP_ID }}
-          private-key: ${{ secrets.REVIVE_JSON_APP_KEY }}
-          owner: paritytech
-          repositories: resolc-bin
-
-      - name: Generate json and push
-        env:
-          TOKEN: ${{ steps.app-token.outputs.token }}
-          APP_NAME: "paritytech-revive-json"
-          Green: "\e[32m"
-          NC: "\e[0m"
-        run: |
-          sudo apt-get update && sudo apt-get install -y wget
-          wget https://github.com/${GITHUB_REPOSITORY}/releases/download/${GITHUB_REF_NAME}/resolc-x86_64-unknown-linux-musl
-          chmod +x resolc-x86_64-unknown-linux-musl
-          export FIRST_SOLC_VERSION=$(./resolc-x86_64-unknown-linux-musl --supported-solc-versions | cut -f 1 -d "," | tr -d ">=")
-          export LAST_SOLC_VERSION=$(./resolc-x86_64-unknown-linux-musl --supported-solc-versions | cut -f 2 -d "," | tr -d "<=")
-
-          cd resolc-bin
-          python ../tmp/.github/scripts/json_generator.py ${GITHUB_REPOSITORY} ${{ github.event.release.tag_name }}
-
-          echo "${Green}Add new remote with gh app token${NC}"
-          git remote set-url origin $(git config remote.origin.url | sed "s/github.com/${APP_NAME}:${TOKEN}@github.com/g")
-
-          echo "${Green}Remove http section that causes issues with gh app auth token${NC}"
-          sed -i.bak '/\[http/d' ./.git/config
-          sed -i.bak '/extraheader/d' ./.git/config
-
-          git config user.email "ci@parity.io"
-          git config user.name "${APP_NAME}"
-
-          git add .
-          git commit -m "Update json"
-          git push origin main
-
-          echo "::notice::info.list files were successfully published to https://github.com/paritytech/resolc-bin"

.github/workflows/release-llvm.yml

@@ -1,4 +1,5 @@
 name: Release LLVM
+
 on:
   workflow_dispatch:
     inputs:
@@ -8,15 +9,15 @@ on:
         description: llvm version in "x.x.x" format, e.g. "18.1.8"
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
 env:
   CARGO_TERM_COLOR: always
 
 jobs:
-  create-release-draft:
+  create-release:
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
     permissions:
       contents: write
     outputs:
@@ -26,112 +27,145 @@ jobs:
         run: |
           echo "version=llvm-${{ inputs.llvm_version }}-revive.${GITHUB_SHA:0:7}" >> $GITHUB_OUTPUT
 
-      - name: Create Release
+      - name: create release
         uses: softprops/action-gh-release@v2
         with:
-          name: ${{ steps.resolve-version.outputs.version }}
+          name: "LLVM binaries release: ${{ steps.resolve-version.outputs.version }}"
-          body: "LLVM is a dependency of revive. The LLVM releases are used by our CI to build revive."
+          body: "This release includes binaries of LLVM, used to compile revive itself"
-          draft: true
+          make_latest: "false"
           tag_name: ${{ steps.resolve-version.outputs.version }}
 
-  build:
+  build-macos:
     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]
+        os: [macos-14, macos-13]
         include:
-          - target: x86_64-unknown-linux-gnu
+          - os: macos-13
-            builder-arg: gnu
+            arch: x64
-            host: linux
+          - os: macos-14
-            runner: parity-large
+            arch: arm64
-          - target: x86_64-unknown-linux-musl
+    needs: create-release
-            builder-arg: musl
+    runs-on: ${{ matrix.os }}
-            host: linux
+    name: "build-macos-${{ matrix.arch }}"
-            runner: parity-large
-          - target: wasm32-unknown-emscripten
-            builder-arg: emscripten
-            host: linux
-            runner: parity-large
-          - target: aarch64-apple-darwin
-            builder-arg: gnu
-            host: macos
-            runner: macos-14
-          - target: x86_64-apple-darwin
-            builder-arg: gnu
-            host: macos
-            runner: macos-13
-          - target: x86_64-pc-windows-msvc
-            builder-arg: gnu
-            host: windows
-            runner: windows-2022
-    needs: create-release-draft
-    runs-on: ${{ matrix.runner }}
     env:
       RUST_LOG: trace
     permissions:
       contents: write # for uploading assets to release
     steps:
       - uses: actions/checkout@v4
-      - uses: actions-rust-lang/setup-rust-toolchain@v1
-        with:
-          # without this it will override our rust flags
-          rustflags: ""
-          cache-key: ${{ matrix.target }}
 
-      - name: Install Dependencies
+      - name: install macos deps
-        if: ${{ matrix.host == 'linux' }}
-        run: |
-          sudo apt-get update && sudo apt-get install -y cmake ninja-build curl git libssl-dev pkg-config clang lld musl
-
-      - name: Install Dependencies
-        if: ${{ matrix.host == 'macos' }}
         run: |
           brew install ninja
 
-      - name: Install Dependencies
+      - name: versions
-        if: ${{ matrix.host == 'windows' }}
         run: |
-          choco install ninja
+          rustup show
-
+          cargo --version
-      - name: Install LLVM Builder
+          cmake --version
-        run: |
+          echo "bash:" && bash --version
-          cargo install --locked --force --path crates/llvm-builder
+          echo "ninja:" && ninja --version
-
+          echo "clang:" && clang --version
-      - name: Clone LLVM
-        run: |
-          revive-llvm --target-env ${{ matrix.builder-arg }} clone
 
       - name: Build LLVM
-        if: ${{ matrix.target != 'wasm32-unknown-emscripten' }}
         run: |
-          revive-llvm --target-env ${{ matrix.builder-arg }} build --llvm-projects lld --llvm-projects clang
+          make install-llvm
 
-      - name: Build LLVM
+      - name: clean
-        if: ${{ matrix.target == 'wasm32-unknown-emscripten' }}
+        # check removed files
         run: |
-          source emsdk/emsdk_env.sh
+          cd target-llvm/gnu/target-final/bin/
-          revive-llvm --target-env ${{ matrix.builder-arg }} build --llvm-projects lld
+          rm diagtool llvm-libtool-darwin llvm-lipo llvm-pdbutil llvm-dwarfdump llvm-nm llvm-readobj llvm-cfi-verify \
+             sancov llvm-debuginfo-analyzer llvm-objdump llvm-profgen llvm-extract llvm-jitlink llvm-c-test llvm-gsymutil llvm-dwp \
+             dsymutil llvm-dwarfutil llvm-exegesis lli clang-rename bugpoint clang-extdef-mapping clang-refactor c-index-test \
+             llvm-reduce llvm-lto clang-linker-wrapper llc llvm-lto2
 
-      - name: Remove Unnecessary Binaries
+      - name: package artifacts
-        shell: bash
         run: |
-          cd target-llvm/${{ matrix.builder-arg }}/target-final/bin/
+          tar -czf "${{ needs.create-release.outputs.version }}-macos-${{ matrix.arch }}.tar.gz" target-llvm/gnu/target-final
-          rm -f diagtool* llvm-libtool-darwin* llvm-lipo* llvm-pdbutil* llvm-dwarfdump* llvm-nm* llvm-readobj* llvm-cfi-verify* \
-              sancov* llvm-debuginfo-analyzer* llvm-objdump* llvm-profgen* llvm-extract* llvm-jitlink* llvm-c-test* llvm-gsymutil* llvm-dwp* \
-              dsymutil* llvm-dwarfutil* llvm-exegesis* lli clang-rename* bugpoint* clang-extdef-mapping* clang-refactor* c-index-test* \
-              llvm-reduce* llvm-lto* clang-linker-wrapper* llc* llvm-lto2* llvm-otool* llvm-readelf* \
-              clang-repl* clang-check* clang-scan-deps*
-          cd -
 
-      - name: Package Artifact
+      - name: upload archive to release
-        shell: bash
-        run: |
-          mv target-llvm/${{ matrix.builder-arg }}/target-final/ llvm-${{ matrix.target }}
-          tar -czf "${{ needs.create-release-draft.outputs.version }}-${{ matrix.target }}.tar.gz" llvm-${{ matrix.target }}
-
-      - name: Add Artifact to Release
         uses: softprops/action-gh-release@v2
         with:
-          tag_name: ${{ needs.create-release-draft.outputs.version }}
+          make_latest: "false"
-          draft: true
+          tag_name: ${{ needs.create-release.outputs.version }}
           files: |
-            ${{ needs.create-release-draft.outputs.version }}-${{ matrix.target }}.tar.gz
+            ${{ needs.create-release.outputs.version }}-macos-${{ matrix.arch }}.tar.gz
+
+
+  build-linux-all:
+    needs: create-release
+    runs-on: parity-large
+    env:
+      RUST_LOG: trace
+    permissions:
+      contents: write # for uploading assets to release
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: install linux deps
+        run: |
+          sudo apt-get update && sudo apt-get install -y cmake ninja-build curl git libssl-dev pkg-config clang lld musl
+
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
+        with:
+          toolchain: stable
+          components: rust-src
+          target: wasm32-unknown-emscripten
+          rustflags: ""
+
+      - name: versions
+        run: |
+          rustup show
+          cargo --version
+          cmake --version
+          echo "bash:" && bash --version
+          echo "ninja:" && ninja --version
+          echo "clang:" && clang --version
+
+      - name: Build host LLVM
+        run: |
+          make install-llvm
+
+      - name: Build gnu LLVM
+        run: |
+          revive-llvm clone
+          revive-llvm build --llvm-projects lld --llvm-projects clang
+
+      - name: Build musl LLVM
+        run: |
+          revive-llvm --target-env musl build --llvm-projects lld --llvm-projects clang
+
+      - name: Build emscripten LLVM
+        run: |
+          revive-llvm --target-env emscripten clone
+          source emsdk/emsdk_env.sh
+          revive-llvm --target-env emscripten build --llvm-projects lld
+
+      - name: clean
+        # check removed files
+        run: |
+          for target in gnu emscripten musl; do
+            cd target-llvm/${target}/target-final/bin/
+            rm -rf diagtool llvm-libtool-darwin llvm-lipo llvm-pdbutil llvm-dwarfdump llvm-nm llvm-readobj llvm-cfi-verify \
+               sancov llvm-debuginfo-analyzer llvm-objdump llvm-profgen llvm-extract llvm-jitlink llvm-c-test llvm-gsymutil llvm-dwp \
+               dsymutil llvm-dwarfutil llvm-exegesis lli clang-rename bugpoint clang-extdef-mapping clang-refactor c-index-test \
+               llvm-reduce llvm-lto clang-linker-wrapper llc llvm-lto2 llvm-otool llvm-readelf
+            cd -
+          done
+
+      - name: package artifacts
+        run: |
+          tar -czf "${{ needs.create-release.outputs.version }}-x86_64-linux-gnu-linux.tar.gz" target-llvm/gnu/target-final
+          tar -czf "${{ needs.create-release.outputs.version }}-x86_64-linux-musl.tar.gz" target-llvm/musl/target-final
+          tar -czf "${{ needs.create-release.outputs.version }}-wasm32-unknown-emscripten.tar.gz" target-llvm/emscripten/target-final
+
+      - name: upload archive to release
+        uses: softprops/action-gh-release@v2
+        with:
+          make_latest: "false"
+          tag_name: ${{ needs.create-release.outputs.version }}
+          files: |
+            ${{ needs.create-release.outputs.version }}-x86_64-linux-gnu-linux.tar.gz
+            ${{ needs.create-release.outputs.version }}-x86_64-linux-musl.tar.gz
+            ${{ needs.create-release.outputs.version }}-wasm32-unknown-emscripten.tar.gz

.github/workflows/release.yml

@@ -1,61 +1,59 @@
-name: Build & Release
+name: Release
+run-name: Release ${{ github.ref_name }}
 on:
   push:
-    branches: ["main"]
+    branches:
-    tags:
+      - "main"
-      - "v*"
   pull_request:
-    branches: ["main"]
+    types: [opened, synchronize, reopened, ready_for_review, labeled]
-    types: [opened, synchronize, labeled, unlabeled]
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 
 env:
-  CARGO_TERM_COLOR: always
+  #rust-musl-cross:x86_64-musl
-  RUST_MUSL_CROSS_IMAGE: messense/rust-musl-cross@sha256:c0154e992adb791c3b848dd008939d19862549204f8cb26f5ca7a00f629e6067
+  RUST_MUSL_CROSS_IMAGE: messense/rust-musl-cross@sha256:68b86bc7cb2867259e6b233415a665ff4469c28b57763e78c3bfea1c68091561
+  RUST_LOG: trace
 
 jobs:
-  check-version-changed:
+  tag:
+    if: github.event_name != 'pull_request' || contains(github.event.pull_request.labels.*.name, 'release-test')
     runs-on: ubuntu-24.04
     permissions:
       contents: write
-    env:
-      CURRENT_TAG: ${{ github.ref_name }}
     outputs:
+      TAG: ${{ steps.versions.outputs.TAG }}
+      PKG_VER: ${{ steps.versions.outputs.PKG_VER }}
       RELEASE_NOTES: ${{ steps.versions.outputs.RELEASE_NOTES }}
     steps:
-      - uses: actions/checkout@v4
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-tags: "true"
+          fetch-depth: 0
 
-      # Check that tag and version in Cargo.toml match
+      - name: Versions
-      - name: Check versions
         id: versions
         run: |
-          if [[ $CURRENT_TAG == 'main' ]];
+          export CURRENT_TAG=$(git describe --tags --abbrev=0 --exclude "llvm-*")
-            then
+          export PKG_VER=v$(cat Cargo.toml | grep -A 5 package] | grep version | cut -d '=' -f 2 | tr -d '"' | tr -d " ")
-              echo "::notice::Tag $CURRENT_TAG is not a release tag, skipping the check in the main branch";
-              exit 0
-            fi
-
-          if [[ $CURRENT_TAG != "v"* ]];
-            then
-              echo "::notice::Tag $CURRENT_TAG is not a release tag, skipping the check in a PR";
-              exit 0
-            fi
-
-          export PKG_VER=v$(cat crates/resolc/Cargo.toml | grep -A 5 package] | grep version | cut -d '=' -f 2 | tr -d '"' | tr -d " ")
           echo "Current tag $CURRENT_TAG"
           echo "Package version $PKG_VER"
           #
-          if [[ $CURRENT_TAG != $PKG_VER  ]];
+          echo "PKG_VER=$PKG_VER" >> $GITHUB_OUTPUT
+          if [[ $CURRENT_TAG == $PKG_VER  ]];
             then
-              echo "::error::Tag $CURRENT_TAG doesn't match package version $PKG_VER in Cargo.toml, please fix";
+              echo "Tag is up to date. Nothing to do.";
-              exit 1
+              export TAG=old;
+            else
+              echo "Tag was updated.";
+              export TAG=new;
             fi
+          echo "TAG=$TAG" >> $GITHUB_OUTPUT
 
           # Generating release notes early, in order to avoid checkout at the last step
-          export RELEASE_NOTES="$(sed '/^## '${CURRENT_TAG}'/,/^## v/!d' CHANGELOG.md | sed -e '1d' -e '$d')"
+          export RELEASE_NOTES="$(sed '/^## '${PKG_VER}'/,/^## v/!d' CHANGELOG.md | sed -e '1d' -e '$d')"
 
           echo "Release notes:"
           echo "$RELEASE_NOTES"
@@ -64,124 +62,190 @@ jobs:
           echo "$RELEASE_NOTES" >> $GITHUB_OUTPUT
           echo 'EOF' >> $GITHUB_OUTPUT
 
-  build:
+  build-macos:
     strategy:
       matrix:
-        target:
+        os: [macos-14, macos-13]
-          [
-            x86_64-unknown-linux-musl,
-            aarch64-apple-darwin,
-            x86_64-apple-darwin,
-            x86_64-pc-windows-msvc,
-          ]
         include:
-          - target: x86_64-unknown-linux-musl
+          - os: macos-13
-            type: musl
+            arch: x64
-            runner: ubuntu-24.04
+          - os: macos-14
-          - target: aarch64-apple-darwin
+            arch: arm64
-            type: native
+    if: ${{ needs.tag.outputs.TAG == 'new' }}
-            runner: macos-14
+    runs-on: ${{ matrix.os }}
-          - target: x86_64-apple-darwin
+    name: build-macos
-            type: native
+    needs: [tag]
-            runner: macos-13
-          - target: x86_64-pc-windows-msvc
-            type: native
-            runner: windows-2022
-    runs-on: ${{ matrix.runner }}
-    needs: [check-version-changed]
     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
+      - name: get llvm
         uses: ./.github/actions/get-llvm
         with:
-          target: ${{ matrix.target }}
+          releasePrefix: llvm-
+          artifactArch: macos-${{ matrix.arch }}
+          dir: ./
 
-      - name: Build
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
-        if: ${{ matrix.type == 'native' }}
+        with:
-        shell: bash
+          toolchain: stable
+          components: rust-src
+          target: wasm32-unknown-emscripten
+          rustflags: ""
+
+      - name: install macos deps
         run: |
-          export LLVM_SYS_181_PREFIX=$PWD/llvm-${{ matrix.target }}
+          brew install ninja
+
+      - name: versions
+        run: |
+          rustup show
+          cargo --version
+          cmake --version
+          echo "bash:" && bash --version
+          echo "ninja:" && ninja --version
+          echo "clang:" && clang --version
+
+      - name: build revive
+        run: |
+          export LLVM_SYS_181_PREFIX=$PWD/target-llvm/gnu/target-final
           make install-bin
-          mv target/release/resolc resolc-${{ matrix.target }} || mv target/release/resolc.exe resolc-${{ matrix.target }}.exe
+          cp ./target/release/resolc ./target/release/resolc-${{ matrix.arch }}
 
-      - name: Build
+      - name: check revive
-        if: ${{ matrix.type == 'musl' }}
         run: |
-          docker run -v $PWD:/opt/revive $RUST_MUSL_CROSS_IMAGE /bin/bash -c "
+          mkdir solc
-           cd /opt/revive
+          curl -sSLo solc/solc https://github.com/ethereum/solidity/releases/download/v0.8.28/solc-macos
-           chown -R root:root .
+          chmod +x solc/solc
-           apt update && apt upgrade -y && apt install -y pkg-config
+          PATH=$PWD/solc:$PATH
-           export LLVM_SYS_181_PREFIX=/opt/revive/llvm-${{ matrix.target }}
+          result=$(./target/release/resolc-${{ matrix.arch }} --bin crates/integration/contracts/flipper.sol)
-           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
 
       - uses: actions/upload-artifact@v4
         with:
-          name: resolc-${{ matrix.target }}
+          name: "revive-macos-${{ matrix.arch }}"
-          path: resolc-${{ matrix.target }}*
+          path: |
+            ./target/release/resolc-${{ matrix.arch }}
           retention-days: 1
 
-  build-wasm:
+  macos-universal-binary:
-    runs-on: ubuntu-24.04
+    runs-on: macos-14
-    needs: [check-version-changed]
+    needs: [build-macos]
-    env:
+    steps:
-      RELEASE_RESOLC_WASM_URI: https://github.com/paritytech/revive/releases/download/${{ github.ref_name }}/resolc.wasm
+      - uses: actions/download-artifact@v4
+        with:
+          pattern: revive-macos-*
+          path: revive-macos
+
+      - name: run lipo
+        run: |
+          lipo revive-macos/revive-macos-arm64/resolc-arm64 revive-macos/revive-macos-x64/resolc-x64 -create -output resolc-macos
+
+      - name: compress macos artifact
+        run: |
+          chmod +x resolc-macos
+          tar -czf resolc-macos.tar.gz ./resolc-macos
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: revive-macos
+          path: |
+            resolc-macos.tar.gz
+          retention-days: 1
+
+  build-linux-all:
+    if: ${{ needs.tag.outputs.TAG == 'new' }}
+    runs-on: parity-large
+    needs: [tag]
     steps:
       - uses: actions/checkout@v4
+
+      - name: install linux deps
+        run: |
+          sudo apt-get update && sudo apt-get install -y cmake ninja-build \
+          curl git libssl-dev pkg-config clang lld musl
+
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
+          toolchain: stable
+          components: rust-src
           target: wasm32-unknown-emscripten
-          # without this it will override our rust flags
           rustflags: ""
 
-      - name: Download Host LLVM
+      - name: versions
-        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
+          rustup show
-          export REVIVE_LLVM_TARGET_PREFIX=$PWD/llvm-wasm32-unknown-emscripten
+          cargo --version
-          source emsdk/emsdk_env.sh
+          cmake --version
-          make install-wasm
+          echo "bash:" && bash --version
-          chmod -x ./target/wasm32-unknown-emscripten/release/resolc.wasm
+          echo "ninja:" && ninja --version
+          echo "clang:" && clang --version
+
+      - name: get llvm musl
+        uses: ./.github/actions/get-llvm
+        with:
+          releasePrefix: llvm-
+          artifactArch: x86_64-linux-musl
+          dir: ./
+
+      # Build revive
+
+      - name: build musl
+        run: |
+          mkdir resolc-out
+          docker run -v $PWD:/opt/revive $RUST_MUSL_CROSS_IMAGE /bin/bash -c "
+           cd /opt/revive
+           apt update && apt upgrade -y && apt install -y pkg-config
+           export LLVM_SYS_181_PREFIX=/opt/revive/target-llvm/musl/target-final
+           make install-bin
+           cp /root/.cargo/bin/resolc /opt/revive/resolc-out/resolc-static-linux
+           "
+
+      - name: check musl
+        run: |
+          mkdir solc
+          curl -sSLo solc/solc https://github.com/ethereum/solidity/releases/download/v0.8.28/solc-static-linux
+          chmod +x solc/solc
+          PATH=$PWD/solc:$PATH
+          result=$(./resolc-out/resolc-static-linux --bin crates/integration/contracts/flipper.sol)
+          echo $result
+          if [[ $result == *'0x50564d'* ]]; then exit 0; else exit 1; fi
+
+      - name: compress musl artifact
+        run: |
+          tar --strip-components 2 -czf resolc-static-linux.tar.gz ./resolc-out/resolc-static-linux
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: revive-linux
+          path: |
+            ./resolc-static-linux.tar.gz
+          retention-days: 1
 
       - name: Set Up Node.js
         uses: actions/setup-node@v3
         with:
           node-version: "20"
 
-      - name: Basic Sanity Check
+      - name: get llvm emscripten
+        uses: ./.github/actions/get-llvm
+        with:
+          artifactArch: emscripten
+
+      - name: install emsdk
+        uses: ./.github/actions/get-emsdk
+
+      - name: build wasm
         run: |
-          mkdir -p solc
+          export LLVM_SYS_181_PREFIX=$PWD/target-llvm/musl/target-final
-          curl -sSLo solc/soljson.js https://github.com/ethereum/solidity/releases/download/v0.8.30/soljson.js
+          export REVIVE_LLVM_TARGET_PREFIX=$PWD/target-llvm/emscripten/target-final
+          source emsdk/emsdk_env.sh
+          rustup target add wasm32-unknown-emscripten
+          make install-wasm
+
+      - name: check wasm
+        run: |
+          curl -sSLo solc/soljson.js https://github.com/ethereum/solidity/releases/download/v0.8.28/soljson.js
           node -e "
           const soljson = require('solc/soljson');
           const createRevive = require('./target/wasm32-unknown-emscripten/release/resolc.js');
@@ -216,113 +280,55 @@ jobs:
           if(!bytecode.startsWith('50564d')) { process.exit(1); }
           "
 
-      - name: Compress Artifact
+      - name: compress wasm artifact
         run: |
-          mkdir -p resolc-wasm32-unknown-emscripten
+          tar --strip-components 4 -czf resolc-wasm.tar.gz \
-          mv ./target/wasm32-unknown-emscripten/release/resolc.js ./resolc-wasm32-unknown-emscripten/
+            ./target/wasm32-unknown-emscripten/release/resolc.js \
-          mv ./target/wasm32-unknown-emscripten/release/resolc.wasm ./resolc-wasm32-unknown-emscripten/
+            ./target/wasm32-unknown-emscripten/release/resolc.wasm \
-          mv ./target/wasm32-unknown-emscripten/release/resolc_web.js ./resolc-wasm32-unknown-emscripten/
+            ./target/wasm32-unknown-emscripten/release/resolc_web.js
 
       - uses: actions/upload-artifact@v4
         with:
-          name: resolc-wasm32-unknown-emscripten
+          name: revive-wasm
-          path: resolc-wasm32-unknown-emscripten/*
+          path: |
+            resolc-wasm.tar.gz
           retention-days: 1
 
   create-release:
-    if: startsWith(github.ref_name, 'v')
+    if: github.event_name != 'pull_request'
-    needs: [check-version-changed, build-wasm]
+    needs: [tag, build-linux-all, macos-universal-binary]
-    runs-on: macos-14
+    runs-on: ubuntu-24.04
-    environment: tags
+    permissions:
+      contents: write
     steps:
-      - name: Download Artifacts
+      - name: Download revive-wasm
         uses: actions/download-artifact@v4
         with:
-          merge-multiple: true
+          name: revive-wasm
+          path: resolc-wasm/
 
-      - name: Create macOS Fat Binary
+      - name: Download revive-linux
-        run: |
+        uses: actions/download-artifact@v4
-          lipo resolc-aarch64-apple-darwin resolc-x86_64-apple-darwin -create -output resolc-universal-apple-darwin
-
-      - name: Make Executable
-        run: |
-          chmod +x resolc-x86_64-unknown-linux-musl
-          chmod +x resolc-universal-apple-darwin
-
-      - name: Create sha-256 checksum
-        run: |
-          shasum -a 256 resolc-x86_64-unknown-linux-musl > checksums.txt
-          shasum -a 256 resolc-universal-apple-darwin >> checksums.txt
-          shasum -a 256 resolc-x86_64-pc-windows-msvc.exe >> checksums.txt
-          shasum -a 256 resolc.js >> checksums.txt
-          shasum -a 256 resolc.wasm >> checksums.txt
-          shasum -a 256 resolc_web.js >> checksums.txt
-
-      - uses: actions/create-github-app-token@v1
-        id: app-token
         with:
-          app-id: ${{ secrets.REVIVE_RELEASE_APP_ID }}
+          name: revive-linux
-          private-key: ${{ secrets.REVIVE_RELEASE_APP_KEY }}
+          path: resolc-linux/
+
+      - name: Download revive-macos
+        uses: actions/download-artifact@v4
+        with:
+          name: revive-macos
+          path: resolc-macos/
 
       - name: create-release
         uses: softprops/action-gh-release@v2
         with:
-          body: |
+          body: ${{ needs.tag.outputs.RELEASE_NOTES }}
-            ## Changelog
+          tag_name: ${{ needs.tag.outputs.PKG_VER }}
-            ${{ needs.check-version-changed.outputs.RELEASE_NOTES }}
+          name: ${{ needs.tag.outputs.PKG_VER }}
-
+          draft: true
-            ## Note for macOS Users
-            The macOS binary is unsigned and it needs to be made runnable using `xattr -c resolc-universal-apple-darwin`.
-          tag_name: ${{ github.ref_name }}
-          name: ${{ github.ref_name }}
-          prerelease: true
-          token: ${{ steps.app-token.outputs.token }}
           target_commitish: ${{ github.sha }}
           files: |
-            resolc-x86_64-unknown-linux-musl
+            ./resolc-linux/resolc-static-linux.tar.gz
-            resolc-universal-apple-darwin
+            ./resolc-macos/resolc-macos.tar.gz
-            resolc-x86_64-pc-windows-msvc.exe
+            ./resolc-wasm/resolc-wasm.tar.gz
-            resolc.js
-            resolc.wasm
-            resolc_web.js
-            checksums.txt
 
-  npm-release:
-    needs: [create-release]
-    runs-on: macos-14
-    environment: tags
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Download Artifacts
-        uses: actions/download-artifact@v4
-        with:
-          merge-multiple: true
-
-      - name: Set Up Node.js
-        uses: actions/setup-node@v3
-        with:
-          node-version: "20"
-
-      - run: npm ci -w js/resolc
-
-      - name: Build
-        run: |
-          cp -f resolc.{wasm,js} js/resolc/src/resolc
-          npm -w js/resolc run build
-
-      - name: npm pack
-        run: npm -w js/resolc pack
-
-      - uses: actions/upload-artifact@v4
-        with:
-          name: npm_package
-          path: "parity-resolc-*.tgz"
-
-      - uses: octokit/request-action@bbedc70b1981e610d89f1f8de88311a1fc02fb83
-        with:
-          route: POST /repos/paritytech/npm_publish_automation/actions/workflows/publish.yml/dispatches
-          ref: main
-          inputs: '${{ format(''{{ "artifact_name": "npm_package", "repo": "{0}", "run_id": "{1}" }}'', github.repository, github.run_id) }}'
-        env:
-          GITHUB_TOKEN: ${{ secrets.NPM_PUBLISH_AUTOMATION_TOKEN }}

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

@@ -1,45 +1,43 @@
-name: Test LLVM Builder
 on:
   pull_request:
-    branches: ["main"]
+    types: [assigned, opened, synchronize, reopened]
-    types: [opened, synchronize]
     paths:
       - 'LLVM.lock'
       - 'crates/llvm-builder/**'
-      - '.github/workflows/test-llvm-builder.yml'
+      - '.github/workflows/revive-llvm-test.yml'
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: true
-
-env:
-  CARGO_TERM_COLOR: always
 
 jobs:
   test:
     strategy:
       matrix:
-        runner: [parity-large, macos-14, windows-2022]
+        runner: [parity-large, macos-14, macos-13]
     runs-on: ${{ matrix.runner }}
     steps:
       - uses: actions/checkout@v4
-      - uses: actions-rust-lang/setup-rust-toolchain@v1
-        with:
-          # without this it will override our rust flags
-          rustflags: ""
-          cache-key: ${{ matrix.runner }}
 
-      - name: Install Dependencies
+      - name: Install apt dependencies
         if: matrix.runner == 'parity-large'
         run: |
           sudo apt update && sudo apt-get install -y cmake ninja-build curl git libssl-dev pkg-config clang lld musl
 
-      - name: Install Dependencies
+      - name: Install macos dependencies
-        if: matrix.runner == 'macos-14'
+        if: matrix.runner == 'macos-14' || matrix.runner == 'macos-13'
         run: |
           brew install ninja
 
-      - name: Test
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
+        with:
+          toolchain: stable
+          components: rust-src
+          rustflags: ""
+
+      - run: |
+          rustup show
+          cargo --version
+          cmake --version
+          bash --version
+
+      - name: Test llvm-builder
         run: make test-llvm-builder
         env:
           RUST_LOG: trace

.github/workflows/rust.yml

@@ -0,0 +1,64 @@
+name: Build
+
+on:
+  push:
+    branches: ["main"]
+  pull_request:
+    branches: ["main"]
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
+env:
+  CARGO_TERM_COLOR: always
+
+jobs:
+  build-ubuntu-x86:
+    runs-on: ubuntu-24.04
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install solc
+        run: |
+          mkdir -p solc
+          curl -sSL --output solc/solc https://github.com/ethereum/solidity/releases/download/v0.8.28/solc-static-linux
+          chmod +x solc/solc
+          echo "$(pwd)/solc/" >> $GITHUB_PATH
+
+      - name: Install LLVM
+        run: |
+          curl -sSL --output llvm.tar.xz https://github.com/paritytech/revive/releases/download/v0.1.0-dev.7/clang+llvm-18.1.8-x86_64-linux-gnu-ubuntu-24.04.tar.xz
+          mkdir llvm18
+          tar Jxf llvm.tar.xz -C llvm18/
+          echo "LLVM_SYS_181_PREFIX=$(pwd)/llvm18" >> $GITHUB_ENV
+
+      - name: Install geth
+        run: |
+          sudo add-apt-repository -y ppa:ethereum/ethereum
+          sudo apt update
+          sudo apt install -y ethereum
+
+      # Disabled for now (always install the latest version despite setting it):
+      # https://github.com/bnjbvr/cargo-machete/issues/156
+      #- name: Machete
+      #  uses: bnjbvr/cargo-machete@v0.7.0
+
+      - name: Format
+        run: make format
+
+      - name: Clippy
+        run: make clippy
+
+      - name: Test cargo workspace
+        run: make test-workspace
+
+      - name: Test CLI
+        run: make test-cli
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: ${{ github.job }}-resolc
+          path: ./target/release/resolc
+          retention-days: 1

.github/workflows/test.yml

@@ -1,57 +0,0 @@
-name: Test
-on:
-  push:
-    branches: ["main"]
-  pull_request:
-    branches: ["main"]
-    types: [opened, synchronize]
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: true
-
-env:
-  CARGO_TERM_COLOR: always
-
-jobs:
-  test:
-    runs-on: ubuntu-24.04
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions-rust-lang/setup-rust-toolchain@v1
-        with:
-          # without this it will override our rust flags
-          rustflags: ""
-
-      - name: Install Solc
-        uses: ./.github/actions/get-solc
-
-      - name: Download LLVM
-        uses: ./.github/actions/get-llvm
-        with:
-          target: x86_64-unknown-linux-gnu
-
-      - name: Set LLVM Environment Variables
-        run: |
-          echo "LLVM_SYS_181_PREFIX=$(pwd)/llvm-x86_64-unknown-linux-gnu" >> $GITHUB_ENV
-
-      - name: Install Geth
-        run: |
-          sudo add-apt-repository -y ppa:ethereum/ethereum
-          sudo apt update
-          sudo apt install -y ethereum
-
-      - name: Machete
-        uses: bnjbvr/cargo-machete@v0.7.1
-
-      - name: Format
-        run: make format
-
-      - name: Clippy
-        run: make clippy
-
-      - name: Test cargo workspace
-        run: make test-workspace
-
-      - name: Test CLI
-        run: make test-cli

.gitignore

@@ -1,5 +1,4 @@
 /target
-/js/resolc/dist
 target-llvm
 *.dot
 .vscode/
@@ -12,6 +11,7 @@ target-llvm
 node_modules
 artifacts
 tmp
+package-lock.json
 /*.html
 /build
 soljson.js

.prettierrc.json

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

CHANGELOG.md

@@ -2,104 +2,6 @@
 
 ## Unreleased
 
-This is a development pre-release.
-
-Supported `polkadot-sdk` rev: `2503.0.1`
-
-## v0.2.0
-
-This is a development pre-release.
-
-Supported `polkadot-sdk` rev: `2503.0.1`
-
-### Changed
-
-- Removed the license printer from the `resolc` binary.
-- EVM bytecode is no longer requested from solc (except in test utils) leading to less compilation work in the pipeline.
-
-### Fixed
-
-- solc-json-interface: Serializing of any custom key in the JSON input is only skipped if not provided.
-- npm package resolution no longer fails with an 'ERR_PACKAGE_PATH_NOT_EXPORTED' error for packages defining exports fields in the `package.json`.
-
-## v0.1.0
-
-This is a development pre-release.
-
-Supported `polkadot-sdk` rev: `2503.0.1`
-
-### Added
-
-- Add the PolkaVM heap size, stack size and debug info CLI compiler options to the standard JSON settings. This makes the standard JSON input succint for reproducible builds.
-
-### Changed
-
-- Supported `polkadot-sdk` version is now `2503.0.1`
-- The `emsdk` version is now `4.0.9`
-
-### Fixed
-
-## v0.1.0-dev.16
-
-This is a development pre-release.
-
-Supported `polkadot-sdk` rev:`c29e72a8628835e34deb6aa7db9a78a2e4eabcee`
-
-### Added
-
-- Move the npm package from paritytech/js-revive, into this repo. The package `@parity/resolc` will be deployed to npm for each release.
-- Support for solc v0.8.30
-
-### Changed
-
-- By default, heavy size optimizations are applied.
-
-### Fixed
-
-- @parity/resolc: The solc dependency package is constrained to the latest supported version, preventing breaking the package ever time a new solc package was released. 
-- The resolc npm package no longer ignores the optimizer settings
-
-## v0.1.0-dev.14
-
-This is a development pre-release.
-
-Supported `polkadot-sdk` rev:`c29e72a8628835e34deb6aa7db9a78a2e4eabcee`
-
-### Added
-
-- The `revive-runner` helper utility binary which helps to run contracts locally without a blockchain node.
-- Allow configuration of the EVM heap memory size and stack size via CLI flags and JSON input settings.
-
-### Changed
-
-- The default PVM stack memory size was increased from 16kb to 32kb.
-
-### Fixed
-
-- Constructors avoid storing zero sized immutable data on exit.
-
-## v0.1.0-dev.13
-
-This is a development pre-release.
-
-Supported `polkadot-sdk` rev:`c29e72a8628835e34deb6aa7db9a78a2e4eabcee`
-
-### Added
-
-- Support for solc v0.8.29
-- Decouples the solc JSON-input-output type definitions from the Solidity fronted and expose them via a dedicated crate.
-- `--supported-solc-versions` for `resolc` binary to return a `semver` range of supported `solc` versions.
-- Support for passing LLVM command line options via the prcoess input or providing one or more `--llvm-arg='..'` resolc CLI flag. This allows more fine-grained control over the LLVM backend configuration.
-
-### Changed
-
-- Storage keys and values are big endian. This was a pre-mature optimization because for the contract itself it this is a no-op and thus not observable. However we should consider the storage layout as part of the contract ABI. The endianness of transient storage values are still kept as-is.
-- Running `resolc` using webkit is no longer supported.
-
-### Fixed
-
-- A missing byte swap for the create2 salt value.
-
 ## v0.1.0-dev.12
 
 This is a development pre-release.
@@ -107,12 +9,10 @@ This is a development pre-release.
 Supported `polkadot-sdk` rev: `21f6f0705e53c15aa2b8a5706b208200447774a9`
 
 ### Added
-
 - Per file output selection for `--standard-json` mode.
 - The `ir` output selection option for `--standard-json` mode.
 
 ### Changed
-
 - Improved code size: Large contracts compile to smaller code blobs when enabling aggressive size optimizations (`-Oz`).
 
 ### Fixed
@@ -128,7 +28,6 @@ Supported `polkadot-sdk` rev: `274a781e8ca1a9432c7ec87593bd93214abbff50`
 ### Changed
 
 ### Fixed
-
 - A bug causing incorrect loads from the emulated EVM linear memory.
 - A missing integer truncate after switching to 64bit.
 
@@ -139,12 +38,10 @@ This is a development pre-release.
 Supported `polkadot-sdk` rev: `274a781e8ca1a9432c7ec87593bd93214abbff50`
 
 ### Added
-
 - Support for the `coinbase` opcode.
 - The resolc web JS version.
 
 ### Changed
-
 - Missing the `--overwrite` flag emits an error instead of a warning.
 - The `resolc` executable prints the help by default.
 - Removed support for legacy EVM assembly (EVMLA) translation.
@@ -154,7 +51,6 @@ Supported `polkadot-sdk` rev: `274a781e8ca1a9432c7ec87593bd93214abbff50`
   If detected, the re-entrant call flag is not set and 0 deposit limit is endowed.
 
 ### Fixed
-
 - Solidity: Add the solc `--libraries` files to sources.
 - A data race in tests.
 - Fix `broken pipe` errors.
@@ -168,11 +64,9 @@ This is a development pre-release.
 ### Added
 
 ### Changed
-
 - Syscalls with more than 6 arguments now pack them into registers.
 
 ### Fixed
-
 - Remove reloading of the resolc.js file (fix issue with relative path in web worker)
 
 ## v0.1.0-dev.8
@@ -180,18 +74,15 @@ This is a development pre-release.
 This is a development pre-release.
 
 ### Added
-
 - The `revive-llvm-builder` crate with the `revive-llvm` helper utility for streamlined management of the LLVM framework dependency.
 - Initial support for running `resolc` in the browser.
 
 ### Changed
-
 - Suported contracts runtime is polkadot-sdk git version `d62a90c8c729acd98c7e9a5cab9803b8b211ffc5`.
 - The minimum supported Rust version is `1.81.0`.
 - Error out early instead of invoking `solc` with invalid base or include path flags.
 
 ### Fixed
-
 - Decouple the LLVM target dependency from the LLVM host dependency.
 - Do not error out if no files and no errors were produced. This aligns resolc closer to solc.
 - Fixes input normalization in the Wasm version.
@@ -201,20 +92,17 @@ This is a development pre-release.
 This is a development pre-release.
 
 ### Added
-
 - Implement the `GASPRICE` opcode.
 - Implement the `BASEFEE` opcode.
 - Implement the `GASLIMIT` opcode.
 
 ### Changed
-
 - The `GAS` opcode now returns the remaining `ref_time`.
 - Contracts can now be supplied call data input of arbitrary size.
-- Some syscalls now return the value in a register, slightly improving emitted contract code.
+- Some syscalls now return the value in a register, slightly improving  emitted contract code.
 - Calls forward maximum weight limits instead of 0, anticipating a change in polkadot-sdk where weight limits of 0 no longer interprets as uncapped limit.
 
 ### Fixed
-
 - A linker bug which was preventing certain contracts from linking with the PVM linker.
 - JS: Fix encoding conversion from JS string (UTF-16) to UTF-8.
 - The git commit hash slug is always displayed in the version string.
@@ -224,7 +112,6 @@ This is a development pre-release.
 This is a development pre-release.
 
 # Added
-
 - Implement the `BLOCKHASH` opcode.
 - Implement delegate calls.
 - Implement the `GASPRICE` opcode. Currently hard-coded to return `1`.
@@ -232,24 +119,21 @@ This is a development pre-release.
 - Initial support for emitting debug info (opt in via the `-g` flag)
 
 # Changed
-
 - resolc now emits 64bit PolkaVM blobs, reducing contract code size and execution time.
 - The RISC-V bit-manipulation target feature (`zbb`) is enabled.
 
 # Fixed
-
 - Compilation to Wasm (for usage in node and web browsers)
 
+
 ## v0.1.0-dev.5
 
 This is development pre-release.
 
 # Added
-
 - Implement the `CODESIZE` and `EXTCODESIZE` opcodes.
 
 # Changed
-
 - Include the full revive version in the contract metadata.
 
 # Fixed
@@ -259,11 +143,9 @@ This is development pre-release.
 This is development pre-release.
 
 # Added
-
 - Support the `ORIGIN` opcode.
 
 # Changed
-
 - Update polkavm to `v0.14.0`.
 - Enable the `a`, `fast-unaligned-access` and `xtheadcondmov` LLVM target features, decreasing the code size for some contracts.
 

Cargo.toml

@@ -3,7 +3,7 @@ resolver = "2"
 members = ["crates/*"]
 
 [workspace.package]
-version = "0.1.0"
+version = "0.1.0-dev.12"
 authors = [
     "Cyrill Leutwiler <cyrill@parity.io>",
     "Parity Technologies <admin@parity.io>",
@@ -11,60 +11,58 @@ 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.2.0", path = "crates/resolc" }
+revive-benchmarks = { version = "0.1.0-dev.12", path = "crates/benchmarks" }
-revive-benchmarks = { version = "0.1.0", path = "crates/benchmarks" }
+revive-builtins = { version = "0.1.0-dev.12", path = "crates/builtins" }
-revive-builtins = { version = "0.1.0", path = "crates/builtins" }
+revive-common = { version = "0.1.0-dev.12", path = "crates/common" }
-revive-common = { version = "0.1.0", path = "crates/common" }
+revive-differential = { version = "0.1.0-dev.12", path = "crates/differential" }
-revive-differential = { version = "0.1.0", path = "crates/differential" }
+revive-integration = { version = "0.1.0-dev.12", path = "crates/integration" }
-revive-integration = { version = "0.1.0", path = "crates/integration" }
+revive-linker = { version = "0.1.0-dev.12", path = "crates/linker" }
-revive-linker = { version = "0.1.0", path = "crates/linker" }
+lld-sys = { version = "0.1.0-dev.12", path = "crates/lld-sys" }
-lld-sys = { version = "0.1.0", path = "crates/lld-sys" }
+revive-llvm-context = { version = "0.1.0-dev.12", path = "crates/llvm-context" }
-revive-llvm-context = { version = "0.2.0", path = "crates/llvm-context" }
+revive-runtime-api = { version = "0.1.0-dev.12", path = "crates/runtime-api" }
-revive-runtime-api = { version = "0.1.0", path = "crates/runtime-api" }
+revive-runner = { version = "0.1.0-dev.12", path = "crates/runner" }
-revive-runner = { version = "0.1.0", path = "crates/runner" }
+revive-solidity = { version = "0.1.0-dev.12", path = "crates/solidity" }
-revive-solc-json-interface = { version = "0.2.0", path = "crates/solc-json-interface" }
+revive-stdlib = { version = "0.1.0-dev.12", path = "crates/stdlib" }
-revive-stdlib = { version = "0.1.0", path = "crates/stdlib" }
+revive-build-utils = { version = "0.1.0-dev.12", path = "crates/build-utils" }
-revive-build-utils = { version = "0.1.0", path = "crates/build-utils" }
-revive-yul = { version = "0.2.0", 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 +70,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 = "21f6f0705e53c15aa2b8a5706b208200447774a9" }
 
 # 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:x86_64-musl AS resolc-builder
 WORKDIR /opt/revive
 
 RUN apt update && \ 

Makefile

@@ -5,13 +5,12 @@
 	install-wasm \
 	install-llvm-builder \
 	install-llvm \
-	install-revive-runner \
 	format \
 	clippy \
 	machete \
 	test \
 	test-integration \
-	test-resolc \
+	test-solidity \
 	test-workspace \
 	test-cli \
 	test-wasm \
@@ -24,25 +23,22 @@
 install: install-bin install-npm
 
 install-bin:
-	cargo install --force --locked --path crates/resolc
+	cargo install --path crates/solidity
 
 install-npm:
 	npm install && npm fund
 
 install-wasm: install-npm
-	cargo build --target wasm32-unknown-emscripten -p resolc --release --no-default-features
+	cargo build --target wasm32-unknown-emscripten -p revive-solidity --release --no-default-features
 	npm run build:package
 
 install-llvm-builder:
-	cargo install --force --locked --path crates/llvm-builder
+	cargo install --path crates/llvm-builder
 
 install-llvm: install-llvm-builder
 	revive-llvm clone
 	revive-llvm build --llvm-projects lld --llvm-projects clang
 
-install-revive-runner:
-	cargo install --locked --force --path crates/runner --no-default-features
-
 format:
 	cargo fmt --all --check
 
@@ -53,13 +49,13 @@ machete:
 	cargo install cargo-machete
 	cargo machete
 
-test: format clippy machete test-cli test-workspace install-revive-runner
+test: format clippy machete test-cli test-workspace
 
 test-integration: install-bin
 	cargo test --package revive-integration
 
-test-resolc: install
+test-solidity: install
-	cargo test --package resolc
+	cargo test --package revive-solidity
 
 test-workspace: install
 	cargo test --workspace --exclude revive-llvm-builder
@@ -90,6 +86,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

@@ -1,4 +1,4 @@
-![CI](https://github.com/paritytech/revive/actions/workflows/test.yml/badge.svg)
+![CI](https://github.com/paritytech/revive/actions/workflows/rust.yml/badge.svg)
 [![Docs](https://img.shields.io/badge/Docs-contracts.polkadot.io-brightgreen.svg)](https://contracts.polkadot.io/revive_compiler/)
 
 # revive
@@ -14,39 +14,7 @@ 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:
+Please consult [the documentation](https://contracts.polkadot.io/revive_compiler/installation) for installation instructions.
-- `resolc`: The revive Solidity compiler YUL frontend and PolkaVM code generator (provided by this repository).
-- `solc`: The [Ethereum Solidity reference compiler](https://github.com/ethereum/solidity/) implemenation.`resolc` uses `solc` during the compilation process, please refer to the [Ethereum Solidity documentation](https://docs.soliditylang.org/en/latest/installing-solidity.html) for installation instructions.
-
-### `resolc` binary releases
-`resolc` 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
 
@@ -131,6 +99,8 @@ Ensure that your branch passes `make test` locally when submitting a pull reques
 ### 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 +109,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,22 +4,11 @@ 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. Add the `release-test` label to trigger the release workflows.
-  - Updates the versions in the workspace `Cargo.toml`
+2. If the CI passes, merge the release PR. The release workflow will attempt to build and publish a new release whenever the latest git tag does not match the cargo package version.
-  - Updates the version in each crate `Cargo.toml`
+3. Wait for the `Release` workflow to finish. If the workflow fails after the `build-linux-all` step, check if a tag has been created and delete it before restarting or pushing updates. Note: It's more convenient to debug the release workflow in a fork (the fork has to be under the `paritytech` org to access `parity-large` runners).
-  - Updates the version of the NPM package in `js/resolc/package.json`
+4. Check draft release on [Releases page](https://github.com/paritytech/revive/releases) and publish (should contain `resolc.js`, `resolc.wasm`, `resolc-web.js`, and `resolc-static-linux` release assets)
-  - Updates the `CHANGELOG.md` to reflect all observable changes
+5. Update the [contract-docs](https://github.com/paritytech/contract-docs/) accordingly
-2. If the CI passes, merge the release PR.
-3. Push a `vX.Y.Z` tag that has the same version as in `Cargo.toml`
-4. The release workflow will attempt to build and publish a new pre-release if the latest tag does match the cargo package version.
-5. Wait for the `Release` workflow to finish. It should create the pre-release with the same name.
-6. Check that pre-release was created on the [Releases page](https://github.com/paritytech/revive/releases) with all artifacts.
-7. After the release is published, another workflow should start automatically and update json files in https://github.com/paritytech/resolc-bin. Check the changes.
-8. Update the [contract-docs](https://github.com/paritytech/contract-docs/) accordingly
-
-# `resolc` NPM package release
-
-Will happen automatically.
 
 # LLVM release
 

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

@@ -15,58 +15,58 @@
 
 ### Baseline
 
-|         | `EVM`                    | `PVMInterpreter`                 |
+|         | `EVM`                   | `PVMInterpreter`                 |
-|:--------|:-------------------------|:-------------------------------- |
+|:--------|:------------------------|:-------------------------------- |
-| **`0`** | `10.08 us` (✅ **1.00x**) | `10.32 us` (✅ **1.02x slower**)  |
+| **`0`** | `3.36 us` (✅ **1.00x**) | `11.84 us` (❌ *3.52x slower*)    |
 
 ### OddPorduct
 
-|              | `EVM`                     | `PVMInterpreter`                 |
+|              | `EVM`                    | `PVMInterpreter`                 |
-|:-------------|:--------------------------|:-------------------------------- |
+|:-------------|:-------------------------|:-------------------------------- |
-| **`10000`**  | `3.60 ms` (✅ **1.00x**)   | `1.57 ms` (🚀 **2.28x faster**)   |
+| **`10000`**  | `3.11 ms` (✅ **1.00x**)  | `1.53 ms` (🚀 **2.03x faster**)   |
-| **`100000`** | `34.72 ms` (✅ **1.00x**)  | `14.82 ms` (🚀 **2.34x faster**)  |
+| **`100000`** | `30.70 ms` (✅ **1.00x**) | `15.54 ms` (🚀 **1.98x faster**)  |
-| **`300000`** | `105.01 ms` (✅ **1.00x**) | `44.11 ms` (🚀 **2.38x faster**)  |
+| **`300000`** | `92.68 ms` (✅ **1.00x**) | `45.47 ms` (🚀 **2.04x faster**)  |
 
 ### TriangleNumber
 
 |              | `EVM`                    | `PVMInterpreter`                 |
 |:-------------|:-------------------------|:-------------------------------- |
-| **`10000`**  | `2.43 ms` (✅ **1.00x**)  | `1.12 ms` (🚀 **2.17x faster**)   |
+| **`10000`**  | `2.29 ms` (✅ **1.00x**)  | `1.09 ms` (🚀 **2.11x faster**)   |
-| **`100000`** | `24.20 ms` (✅ **1.00x**) | `10.86 ms` (🚀 **2.23x faster**)  |
+| **`100000`** | `22.84 ms` (✅ **1.00x**) | `10.66 ms` (🚀 **2.14x faster**)  |
-| **`360000`** | `88.69 ms` (✅ **1.00x**) | `38.46 ms` (🚀 **2.31x faster**)  |
+| **`360000`** | `82.29 ms` (✅ **1.00x**) | `37.01 ms` (🚀 **2.22x faster**)  |
 
 ### FibonacciRecursive
 
 |          | `EVM`                     | `PVMInterpreter`                  |
 |:---------|:--------------------------|:--------------------------------- |
-| **`12`** | `144.17 us` (✅ **1.00x**) | `150.85 us` (✅ **1.05x slower**)  |
+| **`12`** | `135.67 us` (✅ **1.00x**) | `125.02 us` (✅ **1.09x faster**)  |
-| **`16`** | `938.71 us` (✅ **1.00x**) | `922.11 us` (✅ **1.02x faster**)  |
+| **`16`** | `903.75 us` (✅ **1.00x**) | `762.79 us` (✅ **1.18x faster**)  |
-| **`20`** | `6.54 ms` (✅ **1.00x**)   | `6.20 ms` (✅ **1.05x faster**)    |
+| **`20`** | `6.12 ms` (✅ **1.00x**)   | `4.96 ms` (✅ **1.23x faster**)    |
-| **`24`** | `45.73 ms` (✅ **1.00x**)  | `41.98 ms` (✅ **1.09x faster**)   |
+| **`24`** | `42.05 ms` (✅ **1.00x**)  | `33.86 ms` (✅ **1.24x faster**)   |
 
 ### FibonacciIterative
 
 |           | `EVM`                    | `PVMInterpreter`                 |
 |:----------|:-------------------------|:-------------------------------- |
-| **`64`**  | `23.00 us` (✅ **1.00x**) | `31.88 us` (❌ *1.39x slower*)    |
+| **`64`**  | `15.04 us` (✅ **1.00x**) | `29.45 us` (❌ *1.96x slower*)    |
-| **`128`** | `35.28 us` (✅ **1.00x**) | `42.43 us` (❌ *1.20x slower*)    |
+| **`128`** | `26.36 us` (✅ **1.00x**) | `42.19 us` (❌ *1.60x slower*)    |
-| **`256`** | `60.12 us` (✅ **1.00x**) | `61.20 us` (✅ **1.02x slower**)  |
+| **`256`** | `48.61 us` (✅ **1.00x**) | `65.71 us` (❌ *1.35x slower*)    |
 
 ### FibonacciBinet
 
 |           | `EVM`                    | `PVMInterpreter`                 |
 |:----------|:-------------------------|:-------------------------------- |
-| **`64`**  | `23.01 us` (✅ **1.00x**) | `47.74 us` (❌ *2.07x slower*)    |
+| **`64`**  | `15.22 us` (✅ **1.00x**) | `41.46 us` (❌ *2.72x slower*)    |
-| **`128`** | `25.44 us` (✅ **1.00x**) | `49.67 us` (❌ *1.95x slower*)    |
+| **`128`** | `17.05 us` (✅ **1.00x**) | `42.84 us` (❌ *2.51x slower*)    |
-| **`256`** | `28.66 us` (✅ **1.00x**) | `53.01 us` (❌ *1.85x slower*)    |
+| **`256`** | `19.00 us` (✅ **1.00x**) | `44.36 us` (❌ *2.34x slower*)    |
 
 ### SHA1
 
 |           | `EVM`                     | `PVMInterpreter`                  |
 |:----------|:--------------------------|:--------------------------------- |
-| **`1`**   | `135.87 us` (✅ **1.00x**) | `243.75 us` (❌ *1.79x slower*)    |
+| **`1`**   | `110.04 us` (✅ **1.00x**) | `216.11 us` (❌ *1.96x slower*)    |
-| **`64`**  | `258.45 us` (✅ **1.00x**) | `355.70 us` (❌ *1.38x slower*)    |
+| **`64`**  | `209.04 us` (✅ **1.00x**) | `309.48 us` (❌ *1.48x slower*)    |
-| **`512`** | `1.10 ms` (✅ **1.00x**)   | `1.09 ms` (✅ **1.01x faster**)    |
+| **`512`** | `903.65 us` (✅ **1.00x**) | `980.49 us` (✅ **1.09x slower**)  |
 
 ---
 Made with [criterion-table](https://github.com/nu11ptr/criterion-table)

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

@@ -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": 939,
+  "Baseline": 1443,
-  "Computation": 2282,
+  "Computation": 2788,
-  "DivisionArithmetics": 8849,
+  "DivisionArithmetics": 9748,
-  "ERC20": 18308,
+  "ERC20": 19203,
-  "Events": 1640,
+  "Events": 2201,
-  "FibonacciIterative": 1497,
+  "FibonacciIterative": 2041,
-  "Flipper": 2099,
+  "Flipper": 2632,
-  "SHA1": 8243
+  "SHA1": 8958
 }

crates/integration/contracts/AddressPredictor.sol

@@ -1,33 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity ^0.8.28;
-
-contract Predicted {
-    uint public salt;
-
-    constructor(uint _salt) {
-        salt = _salt;
-    }
-}
-
-contract AddressPredictor {
-    constructor(uint _salt, bytes memory _bytecode) payable {
-        address deployed = address(new Predicted{salt: bytes32(_salt)}(_salt));
-        address predicted = predictAddress(_salt, _bytecode);
-        assert(deployed == predicted);
-    }
-
-    function predictAddress(
-        uint _foo,
-        bytes memory _bytecode
-    ) public view returns (address predicted) {
-        bytes32 addr = keccak256(
-            abi.encodePacked(
-                bytes1(0xff),
-                address(this),
-                bytes32(_foo),
-                keccak256(abi.encodePacked(_bytecode, abi.encode(_foo)))
-            )
-        );
-        predicted = address(uint160(uint(addr)));
-    }
-}

crates/integration/contracts/DelegateCaller.sol

@@ -1,38 +0,0 @@
-// SPDX-License-Identifier: MIT
-
-pragma solidity ^0.8.28;
-
-/* runner.json
-{
-    "differential": true,
-    "actions": [
-        {
-            "Instantiate": {
-                "code": {
-                    "Solidity": {
-                        "contract": "DelegateCaller"
-                    }
-                }
-            }
-        },
-        {
-            "Call": {
-                "dest": {
-                    "Instantiated": 0
-                },
-                "data": "e466c6c9"
-            }
-        }
-    ]
-}
-*/
-
-contract DelegateCaller {
-    function delegateNoContract() external returns (bool) {
-        address testAddress = 0x0000000000000000000000000000000000000000;
-        (bool success, ) = testAddress.delegatecall(
-            abi.encodeWithSignature("test()")
-        );
-        return success;
-    }
-}

crates/integration/contracts/FunctionType.sol

@@ -1,36 +0,0 @@
-// SPDX-License-Identifier: MIT
-
-pragma solidity ^0.8.28;
-
-/* runner.json
-{
-    "differential": true,
-    "actions": [
-        {
-            "Instantiate": {
-                "code": {
-                    "Solidity": {
-                        "contract": "FunctionType"
-                    }
-                }
-            }
-        },
-        {
-            "Call": {
-                "dest": {
-                    "Instantiated": 0
-                },
-                "data": "b8c9d365"
-            }
-        }
-    ]
-}
-*/
-
-contract FunctionType {
-    uint public immutable x = 42;
-
-    function h() public view returns (function() external view returns (uint)) {
-        return this.x;
-    }
-}

crates/integration/contracts/LayoutAt.sol

@@ -1,52 +0,0 @@
-// SPDX-License-Identifier: MIT
-
-pragma solidity ^0.8.29;
-
-/* runner.json
-{
-    "differential": true,
-    "actions": [
-        {
-            "Instantiate": {
-                "code": {
-                    "Solidity": {
-                        "contract": "LayoutAt"
-                    }
-                }
-            }
-        },
-        {
-            "Call": {
-                "dest": {
-                    "Instantiated": 0
-                },
-                "data": "a7a0d537"
-            }
-        },
-        {
-            "Call": {
-                "dest": {
-                    "Instantiated": 0
-                },
-                "data": "15393349"
-            }
-        }
-    ]
-}
-*/
-
-contract LayoutAt layout at 0xDEADBEEF + 0xCAFEBABE {
-    uint[3] public something;
-
-    constructor() payable {
-        something[0] = 1337;
-        something[1] = 42;
-        something[2] = 69;
-    }
-
-    function slotOfSomething() public pure returns (uint ret) {
-        assembly {
-            ret := something.slot
-        }
-    }
-}

crates/integration/contracts/MCopyOverlap.sol

@@ -1,51 +0,0 @@
-// SPDX-License-Identifier: MIT
-
-pragma solidity ^0.8;
-
-/* runner.json
-{
-    "differential": true,
-    "actions": [
-        {
-            "Instantiate": {
-                "code": {
-                    "Solidity": {
-                        "contract": "MCopyOverlap"
-                    }
-                }
-            }
-        },
-        {
-            "Call": {
-                "dest": {
-                    "Instantiated": 0
-                },
-                "data": "afdce848"
-            }
-        }
-    ]
-}
-*/
-
-function copy(
-    uint dstOffset,
-    uint srcOffset,
-    uint length
-) pure returns (bytes memory out) {
-    out = hex"2222222222222222333333333333333344444444444444445555555555555555"
-    hex"6666666666666666777777777777777788888888888888889999999999999999"
-    hex"aaaaaaaaaaaaaaaabbbbbbbbbbbbbbbbccccccccccccccccdddddddddddddddd";
-    assembly {
-        mcopy(
-            add(add(out, 0x20), dstOffset),
-            add(add(out, 0x20), srcOffset),
-            length
-        )
-    }
-}
-
-contract MCopyOverlap {
-    function mcopy_to_right_overlap() public pure returns (bytes memory) {
-        return copy(0x20, 0x10, 0x30);
-    }
-}

crates/integration/contracts/flipper.sol

@@ -15,7 +15,7 @@ pragma solidity ^0.8;
                 "Instantiated": 0
             },
             "key": "0000000000000000000000000000000000000000000000000000000000000000",
-            "expected": "0000000000000000000000000000000000000000000000000000000000000001"
+            "expected": "0100000000000000000000000000000000000000000000000000000000000000"
         }
     },
     {

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 {
@@ -250,17 +250,6 @@ sol!(
 );
 case!("Storage.sol", Storage, transientCall, storage_transient, value: U256);
 
-sol!(
-    contract Predicted {
-        constructor(uint _foo);
-    }
-    contract AddressPredictor {
-        constructor(uint _foo, bytes memory _bytecode) payable;
-    }
-);
-case!("AddressPredictor.sol", Predicted, constructorCall, predicted_constructor, salt: U256);
-case!("AddressPredictor.sol", AddressPredictor, constructorCall, address_predictor_constructor, salt: U256, bytecode: Bytes);
-
 impl Contract {
     pub fn build(calldata: Vec<u8>, name: &'static str, code: &str) -> Self {
         Self {

crates/integration/src/tests.rs

@@ -33,7 +33,6 @@ test_spec!(msize, "MSize", "MSize.sol");
 test_spec!(sha1, "SHA1", "SHA1.sol");
 test_spec!(block, "Block", "Block.sol");
 test_spec!(mcopy, "MCopy", "MCopy.sol");
-test_spec!(mcopy_overlap, "MCopyOverlap", "MCopyOverlap.sol");
 test_spec!(events, "Events", "Events.sol");
 test_spec!(storage, "Storage", "Storage.sol");
 test_spec!(mstore8, "MStore8", "MStore8.sol");
@@ -57,9 +56,6 @@ test_spec!(transfer, "Transfer", "Transfer.sol");
 test_spec!(send, "Send", "Send.sol");
 test_spec!(function_pointer, "FunctionPointer", "FunctionPointer.sol");
 test_spec!(mload, "MLoad", "MLoad.sol");
-test_spec!(delegate_no_contract, "DelegateCaller", "DelegateCaller.sol");
-test_spec!(function_type, "FunctionType", "FunctionType.sol");
-test_spec!(layout_at, "LayoutAt", "LayoutAt.sol");
 
 fn instantiate(path: &str, contract: &str) -> Vec<SpecsAction> {
     vec![Instantiate {
@@ -486,31 +482,3 @@ fn transfer_denies_reentrancy() {
     }
     .run();
 }
-
-#[test]
-fn create2_salt() {
-    let salt = U256::from(777);
-    let predicted = Contract::predicted_constructor(salt).pvm_runtime;
-    let predictor = Contract::address_predictor_constructor(salt, predicted.clone().into());
-    Specs {
-        actions: vec![
-            Upload {
-                origin: TestAddress::Alice,
-                code: Code::Bytes(predicted),
-                storage_deposit_limit: None,
-            },
-            Instantiate {
-                origin: TestAddress::Alice,
-                value: 0,
-                gas_limit: Some(GAS_LIMIT),
-                storage_deposit_limit: None,
-                code: Code::Bytes(predictor.pvm_runtime),
-                data: predictor.calldata,
-                salt: OptionalHex::default(),
-            },
-        ],
-        differential: false,
-        ..Default::default()
-    }
-    .run();
-}

crates/lld-sys/build.rs

@@ -96,7 +96,7 @@ fn main() {
     revive_build_utils::llvm_cxx_flags()
         .split_whitespace()
         .fold(&mut cc::Build::new(), |builder, flag| builder.flag(flag))
-        .warnings(false)
+        .flag("-Wno-unused-parameter")
         .cpp(true)
         .file("src/linker.cpp")
         .compile("liblinker.a");

crates/llvm-builder/Cargo.toml

@@ -32,7 +32,6 @@ tar = { workspace = true }
 flate2 = { workspace = true }
 env_logger = { workspace = true }
 log = { workspace = true }
-which = { workspace = true }
 
 [dev-dependencies]
 assert_cmd = { workspace = true }

crates/llvm-builder/src/builtins.rs

@@ -1,8 +1,5 @@
 //! Utilities for compiling the LLVM compiler-rt builtins.
 
-use crate::utils::path_windows_to_unix as to_unix;
-use std::{env::consts::EXE_EXTENSION, process::Command};
-
 /// Static CFLAGS variable passed to the compiler building the compiler-rt builtins.
 const C_FLAGS: [&str; 6] = [
     "--target=riscv64",
@@ -47,31 +44,24 @@ fn cmake_dynamic_args(
 
     let mut clang_path = llvm_target_host.to_path_buf();
     clang_path.push("bin/clang");
-    clang_path.set_extension(EXE_EXTENSION);
 
     let mut clangxx_path = llvm_target_host.to_path_buf();
     clangxx_path.push("bin/clang++");
-    clangxx_path.set_extension(EXE_EXTENSION);
 
     let mut llvm_config_path = llvm_target_host.to_path_buf();
     llvm_config_path.push("bin/llvm-config");
-    llvm_config_path.set_extension(EXE_EXTENSION);
 
     let mut ar_path = llvm_target_host.to_path_buf();
     ar_path.push("bin/llvm-ar");
-    ar_path.set_extension(EXE_EXTENSION);
 
     let mut nm_path = llvm_target_host.to_path_buf();
     nm_path.push("bin/llvm-nm");
-    nm_path.set_extension(EXE_EXTENSION);
 
     let mut ranlib_path = llvm_target_host.to_path_buf();
     ranlib_path.push("bin/llvm-ranlib");
-    ranlib_path.set_extension(EXE_EXTENSION);
 
     let mut linker_path = llvm_target_host.to_path_buf();
     linker_path.push("bin/ld.lld");
-    linker_path.set_extension(EXE_EXTENSION);
 
     Ok([
         format!(
@@ -86,18 +76,12 @@ fn cmake_dynamic_args(
         format!("-DCMAKE_C_FLAGS='{}'", C_FLAGS.join(" ")),
         format!("-DCMAKE_ASM_FLAGS='{}'", C_FLAGS.join(" ")),
         format!("-DCMAKE_CXX_FLAGS='{}'", C_FLAGS.join(" ")),
-        format!(
+        format!("-DCMAKE_C_COMPILER='{}'", clang_path.to_string_lossy()),
-            "-DCMAKE_C_COMPILER='{}'",
+        format!("-DCMAKE_ASM_COMPILER='{}'", clang_path.to_string_lossy()),
-            to_unix(clang_path.clone())?.display()
+        format!("-DCMAKE_CXX_COMPILER='{}'", clangxx_path.to_string_lossy()),
-        ),
+        format!("-DCMAKE_AR='{}'", ar_path.to_string_lossy()),
-        format!("-DCMAKE_ASM_COMPILER='{}'", to_unix(clang_path)?.display()),
+        format!("-DCMAKE_NM='{}'", nm_path.to_string_lossy()),
-        format!(
+        format!("-DCMAKE_RANLIB='{}'", ranlib_path.to_string_lossy()),
-            "-DCMAKE_CXX_COMPILER='{}'",
-            to_unix(clangxx_path)?.display()
-        ),
-        format!("-DCMAKE_AR='{}'", to_unix(ar_path)?.display()),
-        format!("-DCMAKE_NM='{}'", to_unix(nm_path)?.display()),
-        format!("-DCMAKE_RANLIB='{}'", to_unix(ranlib_path)?.display()),
         format!(
             "-DLLVM_CONFIG_PATH='{}'",
             llvm_config_path.to_string_lossy()
@@ -147,17 +131,7 @@ pub fn build(
         "LLVM compiler-rt building cmake",
     )?;
 
-    crate::utils::command(
+    crate::utils::ninja(&llvm_compiler_rt_build)?;
-        Command::new("cmake").args([
-            "--build",
-            llvm_compiler_rt_build.to_string_lossy().as_ref(),
-            "--target",
-            "install",
-            "--config",
-            build_type.to_string().as_str(),
-        ]),
-        "Building",
-    )?;
 
     Ok(())
 }

crates/llvm-builder/src/lib.rs

@@ -214,7 +214,7 @@ pub fn build(
                 sanitizer,
             )?;
         } else if cfg!(target_os = "windows") {
-            platforms::x86_64_windows_msvc::build(
+            platforms::x86_64_windows_gnu::build(
                 build_type,
                 targets,
                 llvm_projects,

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

@@ -8,7 +8,7 @@ pub mod wasm32_emscripten;
 pub mod x86_64_linux_gnu;
 pub mod x86_64_linux_musl;
 pub mod x86_64_macos;
-pub mod x86_64_windows_msvc;
+pub mod x86_64_windows_gnu;
 
 use std::str::FromStr;
 

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

@@ -8,7 +8,7 @@ use std::path::Path;
 use std::process::Command;
 
 /// The build options shared by all platforms.
-pub const SHARED_BUILD_OPTS: [&str; 21] = [
+pub const SHARED_BUILD_OPTS: [&str; 19] = [
     "-DPACKAGE_VENDOR='Parity Technologies'",
     "-DCMAKE_BUILD_WITH_INSTALL_RPATH=1",
     "-DLLVM_BUILD_DOCS='Off'",
@@ -28,8 +28,6 @@ pub const SHARED_BUILD_OPTS: [&str; 21] = [
     "-DCMAKE_EXPORT_COMPILE_COMMANDS='On'",
     "-DPython3_FIND_REGISTRY='LAST'", // Use Python version from $PATH, not from registry
     "-DBUG_REPORT_URL='https://github.com/paritytech/contract-issues/issues/'",
-    "-DCLANG_ENABLE_ARCMT='Off'",
-    "-DCLANG_ENABLE_STATIC_ANALYZER='Off'",
 ];
 
 /// The build options shared by all platforms except MUSL.

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

@@ -1,6 +1,7 @@
 //! The revive LLVM amd64 `windows-gnu` builder.
 
 use std::collections::HashSet;
+use std::path::PathBuf;
 use std::process::Command;
 
 use crate::build_type::BuildType;
@@ -27,6 +28,10 @@ pub fn build(
     sanitizer: Option<Sanitizer>,
 ) -> anyhow::Result<()> {
     crate::utils::check_presence("cmake")?;
+    crate::utils::check_presence("clang")?;
+    crate::utils::check_presence("clang++")?;
+    crate::utils::check_presence("lld")?;
+    crate::utils::check_presence("ninja")?;
 
     let llvm_module_llvm =
         LLVMPath::llvm_module_llvm().and_then(crate::utils::path_windows_to_unix)?;
@@ -43,12 +48,15 @@ pub fn build(
                 "-B",
                 llvm_build_final.to_string_lossy().as_ref(),
                 "-G",
-                "Visual Studio 17 2022",
+                "Ninja",
                 format!(
                     "-DCMAKE_INSTALL_PREFIX='{}'",
                     llvm_target_final.to_string_lossy().as_ref(),
                 )
                 .as_str(),
+                format!("-DCMAKE_BUILD_TYPE='{build_type}'").as_str(),
+                "-DCMAKE_C_COMPILER='clang'",
+                "-DCMAKE_CXX_COMPILER='clang++'",
                 format!(
                     "-DLLVM_TARGETS_TO_BUILD='{}'",
                     targets
@@ -67,7 +75,7 @@ pub fn build(
                         .join(";")
                 )
                 .as_str(),
-                "-DLLVM_BUILD_LLVM_C_DYLIB=Off",
+                "-DLLVM_USE_LINKER='lld'",
             ])
             .args(crate::platforms::shared::shared_build_opts_default_target(
                 default_target,
@@ -99,16 +107,20 @@ pub fn build(
         "LLVM building cmake",
     )?;
 
-    crate::utils::command(
+    crate::utils::ninja(llvm_build_final.as_ref())?;
-        Command::new("cmake").args([
+
-            "--build",
+    let libstdcpp_source_path = match std::env::var("LIBSTDCPP_SOURCE_PATH") {
-            llvm_build_final.to_string_lossy().as_ref(),
+        Ok(libstdcpp_source_path) => PathBuf::from(libstdcpp_source_path),
-            "--target",
+        Err(error) => anyhow::bail!(
-            "install",
+            "The `LIBSTDCPP_SOURCE_PATH` must be set to the path to the libstdc++.a static library: {}", error
-            "--config",
+        ),
-            build_type.to_string().as_str(),
+    };
-        ]),
+    let mut libstdcpp_destination_path = llvm_target_final;
-        "Building with msbuild",
+    libstdcpp_destination_path.push("./lib/libstdc++.a");
+    fs_extra::file::copy(
+        crate::utils::path_windows_to_unix(libstdcpp_source_path)?,
+        crate::utils::path_windows_to_unix(libstdcpp_destination_path)?,
+        &fs_extra::file::CopyOptions::default(),
     )?;
 
     Ok(())

crates/llvm-builder/src/utils.rs

@@ -7,7 +7,6 @@ use std::process::Command;
 use std::process::Stdio;
 use std::time::Duration;
 
-use anyhow::Context;
 use path_slash::PathBufExt;
 
 /// The LLVM host repository URL.
@@ -38,7 +37,7 @@ pub const MUSL_SNAPSHOTS_URL: &str = "https://git.musl-libc.org/cgit/musl/snapsh
 pub const EMSDK_SOURCE_URL: &str = "https://github.com/emscripten-core/emsdk.git";
 
 /// The emscripten SDK version.
-pub const EMSDK_VERSION: &str = "4.0.9";
+pub const EMSDK_VERSION: &str = "3.1.64";
 
 /// The subprocess runner.
 ///
@@ -132,8 +131,11 @@ pub fn path_windows_to_unix<P: AsRef<Path> + PathBufExt>(path: P) -> anyhow::Res
 
 /// Checks if the tool exists in the system.
 pub fn check_presence(name: &str) -> anyhow::Result<()> {
-    which::which(name).with_context(|| format!("Tool `{name}` is missing. Please install"))?;
+    let description = &format!("checking the `{name}` executable");
-    Ok(())
+    log::info!("{description}");
+
+    command(Command::new("which").arg(name), description)
+        .map_err(|_| anyhow::anyhow!("Tool `{}` is missing. Please install", name))
 }
 
 /// Identify XCode version using `pkgutil`.

crates/llvm-context/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "revive-llvm-context"
-version = "0.2.0"
+version.workspace = true
 license.workspace = true
 edition.workspace = true
 repository.workspace = true
@@ -22,7 +22,6 @@ num = { workspace = true }
 hex = { workspace = true }
 sha3 = { workspace = true }
 inkwell = { workspace = true }
-libc = { workspace = true }
 polkavm-disassembler = { workspace = true }
 polkavm-common = { workspace = true }
 
@@ -30,4 +29,3 @@ revive-common = { workspace = true }
 revive-runtime-api = { workspace = true }
 revive-linker = { workspace = true }
 revive-stdlib = { workspace = true }
-revive-solc-json-interface = { workspace = true }

crates/llvm-context/src/lib.rs

@@ -1,7 +1,9 @@
 //! The LLVM context library.
 
-use std::ffi::CString;
+pub(crate) mod debug_config;
-use std::sync::OnceLock;
+pub(crate) mod optimizer;
+pub(crate) mod polkavm;
+pub(crate) mod target_machine;
 
 pub use self::debug_config::ir_type::IRType as DebugConfigIR;
 pub use self::debug_config::DebugConfig;
@@ -28,7 +30,6 @@ pub use self::polkavm::context::function::runtime::entry::Entry as PolkaVMEntryF
 pub use self::polkavm::context::function::runtime::revive::Exit as PolkaVMExitFunction;
 pub use self::polkavm::context::function::runtime::revive::WordToPointer as PolkaVMWordToPointerFunction;
 pub use self::polkavm::context::function::runtime::runtime_code::RuntimeCode as PolkaVMRuntimeCodeFunction;
-pub use self::polkavm::context::function::runtime::sbrk::Sbrk as PolkaVMSbrkFunction;
 pub use self::polkavm::context::function::runtime::FUNCTION_DEPLOY_CODE as PolkaVMFunctionDeployCode;
 pub use self::polkavm::context::function::runtime::FUNCTION_ENTRY as PolkaVMFunctionEntry;
 pub use self::polkavm::context::function::runtime::FUNCTION_RUNTIME_CODE as PolkaVMFunctionRuntimeCode;
@@ -37,9 +38,7 @@ pub use self::polkavm::context::function::Function as PolkaVMFunction;
 pub use self::polkavm::context::global::Global as PolkaVMGlobal;
 pub use self::polkavm::context::pointer::heap::LoadWord as PolkaVMLoadHeapWordFunction;
 pub use self::polkavm::context::pointer::heap::StoreWord as PolkaVMStoreHeapWordFunction;
-pub use self::polkavm::context::pointer::storage::LoadTransientWord as PolkaVMLoadTransientStorageWordFunction;
 pub use self::polkavm::context::pointer::storage::LoadWord as PolkaVMLoadStorageWordFunction;
-pub use self::polkavm::context::pointer::storage::StoreTransientWord as PolkaVMStoreTransientStorageWordFunction;
 pub use self::polkavm::context::pointer::storage::StoreWord as PolkaVMStoreStorageWordFunction;
 pub use self::polkavm::context::pointer::Pointer as PolkaVMPointer;
 pub use self::polkavm::context::r#loop::Loop as PolkaVMLoop;
@@ -61,11 +60,13 @@ pub use self::polkavm::evm::ext_code as polkavm_evm_ext_code;
 pub use self::polkavm::evm::immutable as polkavm_evm_immutable;
 pub use self::polkavm::evm::immutable::Load as PolkaVMLoadImmutableDataFunction;
 pub use self::polkavm::evm::immutable::Store as PolkaVMStoreImmutableDataFunction;
+
 pub use self::polkavm::evm::math as polkavm_evm_math;
 pub use self::polkavm::evm::memory as polkavm_evm_memory;
 pub use self::polkavm::evm::r#return as polkavm_evm_return;
 pub use self::polkavm::evm::return_data as polkavm_evm_return_data;
 pub use self::polkavm::evm::storage as polkavm_evm_storage;
+pub use self::polkavm::metadata_hash::MetadataHash as PolkaVMMetadataHash;
 pub use self::polkavm::r#const as polkavm_const;
 pub use self::polkavm::Dependency as PolkaVMDependency;
 pub use self::polkavm::DummyDependency as PolkaVMDummyDependency;
@@ -74,41 +75,9 @@ pub use self::polkavm::WriteLLVM as PolkaVMWriteLLVM;
 pub use self::target_machine::target::Target;
 pub use self::target_machine::TargetMachine;
 
-pub(crate) mod debug_config;
+/// Initializes the target machine.
-pub(crate) mod optimizer;
+pub fn initialize_target(target: Target) {
-pub(crate) mod polkavm;
-pub(crate) mod target_machine;
-
-static DID_INITIALIZE: OnceLock<()> = OnceLock::new();
-
-/// Initializes the LLVM compiler backend.
-///
-/// This is a no-op if called subsequentially.
-///
-/// `llvm_arguments` are passed as-is to the LLVM CL options parser.
-pub fn initialize_llvm(target: Target, name: &str, llvm_arguments: &[String]) {
-    let Ok(_) = DID_INITIALIZE.set(()) else {
-        return; // Tests don't go through a recursive process
-    };
-
-    let argv = [name.to_string()]
-        .iter()
-        .chain(llvm_arguments)
-        .map(|arg| CString::new(arg.as_bytes()).unwrap())
-        .collect::<Vec<_>>();
-    let argv: Vec<*const libc::c_char> = argv.iter().map(|arg| arg.as_ptr()).collect();
-    let overview = CString::new("").unwrap();
-    unsafe {
-        inkwell::llvm_sys::support::LLVMParseCommandLineOptions(
-            argv.len() as i32,
-            argv.as_ptr(),
-            overview.as_ptr(),
-        );
-    }
-
-    inkwell::support::enable_llvm_pretty_stack_trace();
-
     match target {
-        Target::PVM => inkwell::targets::Target::initialize_riscv(&Default::default()),
+        Target::PVM => self::polkavm::initialize_target(),
     }
 }

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

@@ -2,7 +2,6 @@
 
 pub mod size_level;
 
-use revive_solc_json_interface::SolcStandardJsonInputSettingsOptimizer;
 use serde::Deserialize;
 use serde::Serialize;
 
@@ -227,18 +226,3 @@ impl std::fmt::Display for Settings {
         )
     }
 }
-
-impl TryFrom<&SolcStandardJsonInputSettingsOptimizer> for Settings {
-    type Error = anyhow::Error;
-
-    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(),
-        };
-        if value.fallback_to_optimizing_for_size.unwrap_or_default() {
-            result.enable_fallback_to_size();
-        }
-        Ok(result)
-    }
-}

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

@@ -9,15 +9,6 @@ pub static XLEN: usize = revive_common::BIT_LENGTH_X32;
 /// The calldata size global variable name.
 pub static GLOBAL_CALLDATA_SIZE: &str = "calldatasize";
 
-/// The heap size global variable name.
-pub static GLOBAL_HEAP_SIZE: &str = "__heap_size";
-
-/// The heap memory global variable name.
-pub static GLOBAL_HEAP_MEMORY: &str = "__heap_memory";
-
-/// The spill buffer global variable name.
-pub static GLOBAL_ADDRESS_SPILL_BUFFER: &str = "address_spill_buffer";
-
 /// The deployer call header size that consists of:
 /// - bytecode hash (32 bytes)
 pub const DEPLOYER_CALL_HEADER_SIZE: usize = revive_common::BYTE_LENGTH_WORD;

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

@@ -8,6 +8,10 @@ pub enum AddressSpace {
     Stack,
     /// The heap memory.
     Heap,
+    /// The generic memory page.
+    Storage,
+    /// The transient storage.
+    TransientStorage,
 }
 
 impl From<AddressSpace> for inkwell::AddressSpace {
@@ -15,6 +19,8 @@ impl From<AddressSpace> for inkwell::AddressSpace {
         match value {
             AddressSpace::Stack => Self::from(0),
             AddressSpace::Heap => Self::from(1),
+            AddressSpace::Storage => Self::from(5),
+            AddressSpace::TransientStorage => Self::from(6),
         }
     }
 }

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

@@ -4,98 +4,61 @@
 #[derive(Debug, Clone)]
 pub struct Argument<'ctx> {
     /// The actual LLVM operand.
-    pub value: Value<'ctx>,
+    pub value: inkwell::values::BasicValueEnum<'ctx>,
     /// The original AST value. Used mostly for string literals.
     pub original: Option<String>,
     /// The preserved constant value, if available.
     pub constant: Option<num::BigUint>,
 }
 
-/// The function argument can be either a pointer or a integer value.
-/// This disambiguation allows for lazy loading of variables.
-#[derive(Clone, Debug)]
-pub enum Value<'ctx> {
-    Register(inkwell::values::BasicValueEnum<'ctx>),
-    Pointer {
-        pointer: crate::polkavm::context::Pointer<'ctx>,
-        id: String,
-    },
-}
-
 impl<'ctx> Argument<'ctx> {
-    /// A shortcut constructor for register arguments.
+    /// The calldata offset argument index.
-    pub fn value(value: inkwell::values::BasicValueEnum<'ctx>) -> Self {
+    pub const ARGUMENT_INDEX_CALLDATA_OFFSET: usize = 0;
+
+    /// The calldata length argument index.
+    pub const ARGUMENT_INDEX_CALLDATA_LENGTH: usize = 1;
+
+    /// A shortcut constructor.
+    pub fn new(value: inkwell::values::BasicValueEnum<'ctx>) -> Self {
         Self {
-            value: Value::Register(value),
+            value,
             original: None,
             constant: None,
         }
     }
 
-    /// A shortcut constructor for stack arguments.
+    /// A shortcut constructor.
-    pub fn pointer(pointer: crate::polkavm::context::Pointer<'ctx>, id: String) -> Self {
+    pub fn new_with_original(
+        value: inkwell::values::BasicValueEnum<'ctx>,
+        original: String,
+    ) -> Self {
         Self {
-            value: Value::Pointer { pointer, id },
+            value,
-            original: None,
+            original: Some(original),
             constant: None,
         }
     }
 
-    /// Set the original decleratation value.
+    /// A shortcut constructor.
-    pub fn with_original(mut self, original: String) -> Self {
+    pub fn new_with_constant(
-        self.original = Some(original);
+        value: inkwell::values::BasicValueEnum<'ctx>,
-        self
+        constant: num::BigUint,
-    }
+    ) -> Self {
-
+        Self {
-    /// Set the constant value.
+            value,
-    pub fn with_constant(mut self, constant: num::BigUint) -> Self {
+            original: None,
-        self.constant = Some(constant);
+            constant: Some(constant),
-        self
+        }
     }
 
     /// Returns the inner LLVM value.
-    ///
+    pub fn to_llvm(&self) -> inkwell::values::BasicValueEnum<'ctx> {
-    /// Panics if `self` is a pointer argument.
+        self.value
-    pub fn _to_llvm_value(&self) -> inkwell::values::BasicValueEnum<'ctx> {
-        match &self.value {
-            Value::Register(value) => *value,
-            Value::Pointer { .. } => unreachable!("invalid register value access"),
-        }
-    }
-
-    /// Access the underlying value.
-    ///
-    /// Will emit a stack load if `self` is a pointer argument.
-    pub fn access<D: crate::polkavm::Dependency + Clone>(
-        &self,
-        context: &crate::polkavm::context::Context<'ctx, D>,
-    ) -> anyhow::Result<inkwell::values::BasicValueEnum<'ctx>> {
-        match &self.value {
-            Value::Register(value) => Ok(*value),
-            Value::Pointer { pointer, id } => context.build_load(*pointer, id),
-        }
-    }
-
-    /// Access the underlying value.
-    ///
-    /// Will emit a stack load if `self` is a pointer argument.
-    pub fn as_pointer<D: crate::polkavm::Dependency + Clone>(
-        &self,
-        context: &crate::polkavm::context::Context<'ctx, D>,
-    ) -> anyhow::Result<crate::polkavm::context::Pointer<'ctx>> {
-        match &self.value {
-            Value::Register(value) => {
-                let pointer = context.build_alloca_at_entry(context.word_type(), "pvm_arg");
-                context.build_store(pointer, *value)?;
-                Ok(pointer)
-            }
-            Value::Pointer { pointer, .. } => Ok(*pointer),
-        }
     }
 }
 
 impl<'ctx> From<inkwell::values::BasicValueEnum<'ctx>> for Argument<'ctx> {
     fn from(value: inkwell::values::BasicValueEnum<'ctx>) -> Self {
-        Self::value(value)
+        Self::new(value)
     }
 }

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

@@ -1,6 +1,9 @@
 //! The LLVM runtime functions.
 
+use inkwell::types::BasicType;
+
 use crate::optimizer::Optimizer;
+use crate::polkavm::context::address_space::AddressSpace;
 use crate::polkavm::context::function::declaration::Declaration as FunctionDeclaration;
 use crate::polkavm::context::function::Function;
 
@@ -16,6 +19,9 @@ pub struct LLVMRuntime<'ctx> {
     pub exp: FunctionDeclaration<'ctx>,
     /// The corresponding LLVM runtime function.
     pub sign_extend: FunctionDeclaration<'ctx>,
+
+    /// The corresponding LLVM runtime function.
+    pub sha3: FunctionDeclaration<'ctx>,
 }
 
 impl<'ctx> LLVMRuntime<'ctx> {
@@ -31,6 +37,9 @@ impl<'ctx> LLVMRuntime<'ctx> {
     /// The corresponding runtime function name.
     pub const FUNCTION_SIGNEXTEND: &'static str = "__signextend";
 
+    /// The corresponding runtime function name.
+    pub const FUNCTION_SHA3: &'static str = "__sha3";
+
     /// A shortcut constructor.
     pub fn new(
         llvm: &'ctx inkwell::context::Context,
@@ -56,11 +65,43 @@ impl<'ctx> LLVMRuntime<'ctx> {
         Function::set_default_attributes(llvm, sign_extend, optimizer);
         Function::set_pure_function_attributes(llvm, sign_extend);
 
+        let sha3 = Self::declare(
+            module,
+            Self::FUNCTION_SHA3,
+            llvm.custom_width_int_type(revive_common::BIT_LENGTH_WORD as u32)
+                .fn_type(
+                    vec![
+                        llvm.ptr_type(AddressSpace::Heap.into())
+                            .as_basic_type_enum()
+                            .into(),
+                        llvm.custom_width_int_type(revive_common::BIT_LENGTH_WORD as u32)
+                            .as_basic_type_enum()
+                            .into(),
+                        llvm.custom_width_int_type(revive_common::BIT_LENGTH_BOOLEAN as u32)
+                            .as_basic_type_enum()
+                            .into(),
+                    ]
+                    .as_slice(),
+                    false,
+                ),
+            Some(inkwell::module::Linkage::External),
+        );
+        Function::set_default_attributes(llvm, sha3, optimizer);
+        Function::set_attributes(
+            llvm,
+            sha3,
+            //vec![Attribute::ArgMemOnly, Attribute::ReadOnly],
+            &[],
+            false,
+        );
+
         Self {
             add_mod,
             mul_mod,
             exp,
             sign_extend,
+
+            sha3,
         }
     }
 

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;
@@ -32,34 +31,6 @@ impl Entry {
             context.xlen_type().get_undef(),
         );
 
-        context.set_global(
-            crate::polkavm::GLOBAL_HEAP_SIZE,
-            context.xlen_type(),
-            AddressSpace::Stack,
-            context.xlen_type().const_zero(),
-        );
-
-        let heap_memory_type = context.byte_type().array_type(
-            context
-                .memory_config
-                .heap_size
-                .unwrap_or(PolkaVMDefaultHeapMemorySize),
-        );
-        context.set_global(
-            crate::polkavm::GLOBAL_HEAP_MEMORY,
-            heap_memory_type,
-            AddressSpace::Stack,
-            heap_memory_type.const_zero(),
-        );
-
-        let address_type = context.integer_type(revive_common::BIT_LENGTH_ETH_ADDRESS);
-        context.set_global(
-            crate::polkavm::GLOBAL_ADDRESS_SPILL_BUFFER,
-            address_type,
-            AddressSpace::Stack,
-            address_type.const_zero(),
-        );
-
         Ok(())
     }
 

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

@@ -5,7 +5,6 @@ pub mod deploy_code;
 pub mod entry;
 pub mod revive;
 pub mod runtime_code;
-pub mod sbrk;
 
 /// The main entry function name.
 pub const FUNCTION_ENTRY: &str = "__entry";

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

@@ -1,144 +0,0 @@
-//! Emulates the linear EVM heap memory via a simulated `sbrk` system call.
-
-use inkwell::values::BasicValue;
-
-use crate::polkavm::context::attribute::Attribute;
-use crate::polkavm::context::runtime::RuntimeFunction;
-use crate::polkavm::context::Context;
-use crate::polkavm::Dependency;
-use crate::polkavm::WriteLLVM;
-
-/// Simulates the `sbrk` system call, reproducing the semantics of the EVM heap memory.
-///
-/// Parameters:
-/// - The `offset` into the emulated EVM heap memory.
-/// - The `size` of the allocation emulated EVM heap memory.
-///
-/// Returns:
-/// - A pointer to the EVM heap memory at given `offset`.
-///
-/// Semantics:
-/// - Traps if the offset is out of bounds.
-/// - Aligns the total heap memory size to the EVM word size.
-/// - Traps if the memory size would be greater than the configured EVM heap memory size.
-/// - Maintains the total memory size (`msize`) in global heap size value.
-pub struct Sbrk;
-
-impl<D> RuntimeFunction<D> for Sbrk
-where
-    D: Dependency + Clone,
-{
-    const NAME: &'static str = "__sbrk_internal";
-
-    const ATTRIBUTES: &'static [Attribute] = &[
-        Attribute::NoFree,
-        Attribute::NoRecurse,
-        Attribute::WillReturn,
-    ];
-
-    fn r#type<'ctx>(context: &Context<'ctx, D>) -> inkwell::types::FunctionType<'ctx> {
-        context.llvm().ptr_type(Default::default()).fn_type(
-            &[context.xlen_type().into(), context.xlen_type().into()],
-            false,
-        )
-    }
-
-    fn emit_body<'ctx>(
-        &self,
-        context: &mut Context<'ctx, D>,
-    ) -> anyhow::Result<Option<inkwell::values::BasicValueEnum<'ctx>>> {
-        let offset = Self::paramater(context, 0).into_int_value();
-        let size = Self::paramater(context, 1).into_int_value();
-
-        let trap_block = context.append_basic_block("trap");
-        let offset_in_bounds_block = context.append_basic_block("offset_in_bounds");
-        let is_offset_out_of_bounds = context.builder().build_int_compare(
-            inkwell::IntPredicate::UGE,
-            offset,
-            context.heap_size(),
-            "offset_out_of_bounds",
-        )?;
-        context.build_conditional_branch(
-            is_offset_out_of_bounds,
-            trap_block,
-            offset_in_bounds_block,
-        )?;
-
-        context.set_basic_block(trap_block);
-        context.build_call(context.intrinsics().trap, &[], "invalid_trap");
-        context.build_unreachable();
-
-        context.set_basic_block(offset_in_bounds_block);
-        let mask = context
-            .xlen_type()
-            .const_int(revive_common::BYTE_LENGTH_WORD as u64 - 1, false);
-        let total_size = context
-            .builder()
-            .build_int_add(offset, size, "total_size")?;
-        let memory_size = context.builder().build_and(
-            context.builder().build_int_add(total_size, mask, "mask")?,
-            context.builder().build_not(mask, "mask_not")?,
-            "memory_size",
-        )?;
-        let size_in_bounds_block = context.append_basic_block("size_in_bounds");
-        let is_size_out_of_bounds = context.builder().build_int_compare(
-            inkwell::IntPredicate::UGT,
-            memory_size,
-            context.heap_size(),
-            "size_out_of_bounds",
-        )?;
-        context.build_conditional_branch(
-            is_size_out_of_bounds,
-            trap_block,
-            size_in_bounds_block,
-        )?;
-
-        context.set_basic_block(size_in_bounds_block);
-        let return_block = context.append_basic_block("return_pointer");
-        let new_size_block = context.append_basic_block("new_size");
-        let is_new_size = context.builder().build_int_compare(
-            inkwell::IntPredicate::UGT,
-            memory_size,
-            context
-                .get_global_value(crate::polkavm::GLOBAL_HEAP_SIZE)?
-                .into_int_value(),
-            "is_new_size",
-        )?;
-        context.build_conditional_branch(is_new_size, new_size_block, return_block)?;
-
-        context.set_basic_block(new_size_block);
-        context.build_store(
-            context.get_global(crate::polkavm::GLOBAL_HEAP_SIZE)?.into(),
-            memory_size,
-        )?;
-        context.build_unconditional_branch(return_block);
-
-        context.set_basic_block(return_block);
-        Ok(Some(
-            context
-                .build_gep(
-                    context
-                        .get_global(crate::polkavm::GLOBAL_HEAP_MEMORY)?
-                        .into(),
-                    &[context.xlen_type().const_zero(), offset],
-                    context.byte_type(),
-                    "allocation_start_pointer",
-                )
-                .value
-                .as_basic_value_enum(),
-        ))
-    }
-}
-
-impl<D> WriteLLVM<D> for Sbrk
-where
-    D: Dependency + Clone,
-{
-    fn declare(&mut self, context: &mut Context<D>) -> anyhow::Result<()> {
-        <Self as RuntimeFunction<_>>::declare(self, context)
-    }
-
-    fn into_llvm(self, context: &mut Context<D>) -> anyhow::Result<()> {
-        <Self as RuntimeFunction<_>>::emit(&self, context)
-    }
-}

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

@@ -25,9 +25,6 @@ use inkwell::debug_info::AsDIScope;
 use inkwell::debug_info::DIScope;
 use inkwell::types::BasicType;
 use inkwell::values::BasicValue;
-use revive_solc_json_interface::PolkaVMDefaultHeapMemorySize;
-use revive_solc_json_interface::PolkaVMDefaultStackMemorySize;
-use revive_solc_json_interface::SolcStandardJsonInputSettingsPolkaVMMemory;
 
 use crate::optimizer::settings::Settings as OptimizerSettings;
 use crate::optimizer::Optimizer;
@@ -36,7 +33,6 @@ use crate::polkavm::Dependency;
 use crate::target_machine::target::Target;
 use crate::target_machine::TargetMachine;
 use crate::PolkaVMLoadHeapWordFunction;
-use crate::PolkaVMSbrkFunction;
 use crate::PolkaVMStoreHeapWordFunction;
 
 use self::address_space::AddressSpace;
@@ -87,10 +83,6 @@ where
     current_function: Option<Rc<RefCell<Function<'ctx>>>>,
     /// The loop context stack.
     loop_stack: Vec<Loop<'ctx>>,
-    /// The extra LLVM arguments that were used during target initialization.
-    llvm_arguments: &'ctx [String],
-    /// The PVM memory configuration.
-    memory_config: SolcStandardJsonInputSettingsPolkaVMMemory,
 
     /// 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
@@ -122,6 +114,9 @@ where
     /// The loop stack default capacity.
     const LOOP_STACK_INITIAL_CAPACITY: usize = 16;
 
+    /// The PolkaVM minimum stack size.
+    const POLKAVM_STACK_SIZE: u32 = 0x4000;
+
     /// Link in the stdlib module.
     fn link_stdlib_module(
         llvm: &'ctx inkwell::context::Context,
@@ -221,7 +216,6 @@ where
     }
 
     /// Initializes a new LLVM context.
-    #[allow(clippy::too_many_arguments)]
     pub fn new(
         llvm: &'ctx inkwell::context::Context,
         module: inkwell::module::Module<'ctx>,
@@ -229,19 +223,11 @@ where
         dependency_manager: Option<D>,
         include_metadata_hash: bool,
         debug_config: DebugConfig,
-        llvm_arguments: &'ctx [String],
-        memory_config: SolcStandardJsonInputSettingsPolkaVMMemory,
     ) -> 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, Self::POLKAVM_STACK_SIZE);
-            llvm,
-            &module,
-            memory_config
-                .stack_size
-                .unwrap_or(PolkaVMDefaultStackMemorySize),
-        );
         Self::set_module_flags(llvm, &module);
 
         let intrinsics = Intrinsics::new(llvm, &module);
@@ -264,8 +250,6 @@ where
             functions: HashMap::with_capacity(Self::FUNCTIONS_HASHMAP_INITIAL_CAPACITY),
             current_function: None,
             loop_stack: Vec::with_capacity(Self::LOOP_STACK_INITIAL_CAPACITY),
-            llvm_arguments,
-            memory_config,
 
             dependency_manager,
             include_metadata_hash,
@@ -655,8 +639,6 @@ where
                     self.optimizer.settings().to_owned(),
                     self.include_metadata_hash,
                     self.debug_config.clone(),
-                    self.llvm_arguments,
-                    self.memory_config,
                 )
             })
     }
@@ -763,9 +745,7 @@ where
         address: inkwell::values::IntValue<'ctx>,
     ) -> anyhow::Result<Pointer<'ctx>> {
         let address_type = self.integer_type(revive_common::BIT_LENGTH_ETH_ADDRESS);
-        let address_pointer = self
+        let address_pointer = self.build_alloca_at_entry(address_type, "address_pointer");
-            .get_global(crate::polkavm::GLOBAL_ADDRESS_SPILL_BUFFER)?
-            .into();
         let address_truncated =
             self.builder()
                 .build_int_truncate(address, address_type, "address_truncated")?;
@@ -808,6 +788,9 @@ where
                         panic!("revive runtime function {name} should return a value")
                     }))
             }
+            AddressSpace::Storage | AddressSpace::TransientStorage => {
+                unreachable!("should use the runtime function")
+            }
             AddressSpace::Stack => {
                 let value = self
                     .builder()
@@ -840,6 +823,9 @@ where
                 ];
                 self.build_call(declaration, &arguments, "heap_store");
             }
+            AddressSpace::Storage | AddressSpace::TransientStorage => {
+                unreachable!("should use the runtime function")
+            }
             AddressSpace::Stack => {
                 let instruction = self.builder.build_store(pointer.value, value).unwrap();
                 instruction
@@ -884,6 +870,9 @@ where
     where
         T: BasicType<'ctx>,
     {
+        assert_ne!(pointer.address_space, AddressSpace::Storage);
+        assert_ne!(pointer.address_space, AddressSpace::TransientStorage);
+
         let value = unsafe {
             self.builder
                 .build_gep(pointer.r#type, pointer.value, indexes, name)
@@ -1097,40 +1086,32 @@ where
         offset: inkwell::values::IntValue<'ctx>,
         size: inkwell::values::IntValue<'ctx>,
     ) -> anyhow::Result<inkwell::values::PointerValue<'ctx>> {
-        let call_site_value = self.builder().build_call(
+        Ok(self
-            <PolkaVMSbrkFunction as RuntimeFunction<D>>::declaration(self).function_value(),
+            .builder()
-            &[offset.into(), size.into()],
+            .build_call(
-            "alloc_start",
+                self.runtime_api_method(revive_runtime_api::polkavm_imports::SBRK),
-        )?;
+                &[offset.into(), size.into()],
-
+                "call_sbrk",
-        call_site_value.add_attribute(
+            )?
-            inkwell::attributes::AttributeLoc::Return,
-            self.llvm
-                .create_enum_attribute(Attribute::NonNull as u32, 0),
-        );
-        call_site_value.add_attribute(
-            inkwell::attributes::AttributeLoc::Return,
-            self.llvm
-                .create_enum_attribute(Attribute::NoUndef as u32, 0),
-        );
-
-        Ok(call_site_value
             .try_as_basic_value()
             .left()
-            .unwrap_or_else(|| {
+            .expect("sbrk returns a pointer")
-                panic!(
-                    "revive runtime function {} should return a value",
-                    <PolkaVMSbrkFunction as RuntimeFunction<D>>::NAME,
-                )
-            })
             .into_pointer_value())
     }
 
     /// Build a call to PolkaVM `msize` for querying the linear memory size.
     pub fn build_msize(&self) -> anyhow::Result<inkwell::values::IntValue<'ctx>> {
-        Ok(self
+        let memory_size_pointer = self
-            .get_global_value(crate::polkavm::GLOBAL_HEAP_SIZE)?
+            .module()
-            .into_int_value())
+            .get_global(revive_runtime_api::polkavm_imports::MEMORY_SIZE)
+            .expect("the memory size symbol should have been declared")
+            .as_pointer_value();
+        let memory_size_value = self.builder().build_load(
+            self.xlen_type(),
+            memory_size_pointer,
+            "memory_size_value",
+        )?;
+        Ok(memory_size_value.into_int_value())
     }
 
     /// Returns a pointer to `offset` into the heap, allocating
@@ -1317,6 +1298,13 @@ where
                     inkwell::attributes::AttributeLoc::Param(index as u32),
                     self.llvm.create_enum_attribute(Attribute::NoFree as u32, 0),
                 );
+                if function == self.llvm_runtime().sha3 {
+                    call_site_value.add_attribute(
+                        inkwell::attributes::AttributeLoc::Param(index as u32),
+                        self.llvm
+                            .create_enum_attribute(Attribute::ReadOnly as u32, 0),
+                    );
+                }
                 if Some(argument.get_type()) == function.r#type.get_return_type() {
                     if function
                         .r#type
@@ -1449,13 +1437,4 @@ where
     pub fn optimizer_settings(&self) -> &OptimizerSettings {
         self.optimizer.settings()
     }
-
-    pub fn heap_size(&self) -> inkwell::values::IntValue<'ctx> {
-        self.xlen_type().const_int(
-            self.memory_config
-                .heap_size
-                .unwrap_or(PolkaVMDefaultHeapMemorySize) as u64,
-            false,
-        )
-    }
 }

crates/llvm-context/src/polkavm/context/pointer/storage.rs

@@ -17,20 +17,47 @@ where
     const NAME: &'static str = "__revive_load_storage_word";
 
     fn r#type<'ctx>(context: &Context<'ctx, D>) -> inkwell::types::FunctionType<'ctx> {
-        context
+        context.word_type().fn_type(
-            .word_type()
+            &[context.xlen_type().into(), context.word_type().into()],
-            .fn_type(&[context.llvm().ptr_type(Default::default()).into()], false)
+            false,
+        )
     }
 
     fn emit_body<'ctx>(
         &self,
         context: &mut Context<'ctx, D>,
     ) -> anyhow::Result<Option<BasicValueEnum<'ctx>>> {
-        Ok(Some(emit_load(
+        let is_transient = Self::paramater(context, 0);
-            context,
+        let key_value = Self::paramater(context, 1);
-            Self::paramater(context, 0),
+
-            false,
+        let key_pointer = context.build_alloca_at_entry(context.word_type(), "key_pointer");
-        )?))
+        let value_pointer = context.build_alloca_at_entry(context.word_type(), "value_pointer");
+        let length_pointer = context.build_alloca_at_entry(context.xlen_type(), "length_pointer");
+
+        context
+            .builder()
+            .build_store(key_pointer.value, key_value)?;
+        context.build_store(value_pointer, context.word_const(0))?;
+        context.build_store(
+            length_pointer,
+            context
+                .xlen_type()
+                .const_int(revive_common::BYTE_LENGTH_WORD as u64, false),
+        )?;
+
+        let arguments = [
+            is_transient,
+            key_pointer.to_int(context).into(),
+            context.xlen_type().const_all_ones().into(),
+            value_pointer.to_int(context).into(),
+            length_pointer.to_int(context).into(),
+        ];
+        context.build_runtime_call(revive_runtime_api::polkavm_imports::GET_STORAGE, &arguments);
+
+        // We do not to check the return value: Solidity assumes infallible loads.
+        // If a key doesn't exist the "zero" value is returned (ensured by above write).
+
+        Ok(Some(context.build_load(value_pointer, "storage_value")?))
     }
 }
 
@@ -47,42 +74,6 @@ where
     }
 }
 
-/// Load a word size value from a transient storage pointer.
-pub struct LoadTransientWord;
-
-impl<D> RuntimeFunction<D> for LoadTransientWord
-where
-    D: Dependency + Clone,
-{
-    const NAME: &'static str = "__revive_load_transient_storage_word";
-
-    fn r#type<'ctx>(context: &Context<'ctx, D>) -> inkwell::types::FunctionType<'ctx> {
-        context
-            .word_type()
-            .fn_type(&[context.llvm().ptr_type(Default::default()).into()], false)
-    }
-
-    fn emit_body<'ctx>(
-        &self,
-        context: &mut Context<'ctx, D>,
-    ) -> anyhow::Result<Option<BasicValueEnum<'ctx>>> {
-        Ok(Some(emit_load(context, Self::paramater(context, 0), true)?))
-    }
-}
-
-impl<D> WriteLLVM<D> for LoadTransientWord
-where
-    D: Dependency + Clone,
-{
-    fn declare(&mut self, context: &mut Context<D>) -> anyhow::Result<()> {
-        <Self as RuntimeFunction<_>>::declare(self, context)
-    }
-
-    fn into_llvm(self, context: &mut Context<D>) -> anyhow::Result<()> {
-        <Self as RuntimeFunction<_>>::emit(&self, context)
-    }
-}
-
 /// Store a word size value through a storage pointer.
 pub struct StoreWord;
 
@@ -95,8 +86,9 @@ where
     fn r#type<'ctx>(context: &Context<'ctx, D>) -> inkwell::types::FunctionType<'ctx> {
         context.void_type().fn_type(
             &[
-                context.llvm().ptr_type(Default::default()).into(),
+                context.xlen_type().into(),
-                context.llvm().ptr_type(Default::default()).into(),
+                context.word_type().into(),
+                context.word_type().into(),
             ],
             false,
         )
@@ -106,12 +98,24 @@ where
         &self,
         context: &mut Context<'ctx, D>,
     ) -> anyhow::Result<Option<BasicValueEnum<'ctx>>> {
-        emit_store(
+        let is_transient = Self::paramater(context, 0);
-            context,
+        let key = Self::paramater(context, 1);
-            Self::paramater(context, 0),
+        let value = Self::paramater(context, 2);
-            Self::paramater(context, 1),
+
-            false,
+        let key_pointer = context.build_alloca_at_entry(context.word_type(), "key_pointer");
-        )?;
+        let value_pointer = context.build_alloca_at_entry(context.word_type(), "value_pointer");
+
+        context.build_store(key_pointer, key)?;
+        context.build_store(value_pointer, value)?;
+
+        let arguments = [
+            is_transient,
+            key_pointer.to_int(context).into(),
+            context.xlen_type().const_all_ones().into(),
+            value_pointer.to_int(context).into(),
+            context.integer_const(crate::polkavm::XLEN, 32).into(),
+        ];
+        context.build_runtime_call(revive_runtime_api::polkavm_imports::SET_STORAGE, &arguments);
 
         Ok(None)
     }
@@ -129,149 +133,3 @@ where
         <Self as RuntimeFunction<_>>::emit(&self, context)
     }
 }
-
-/// Store a word size value through a transient storage pointer.
-pub struct StoreTransientWord;
-
-impl<D> RuntimeFunction<D> for StoreTransientWord
-where
-    D: Dependency + Clone,
-{
-    const NAME: &'static str = "__revive_store_transient_storage_word";
-
-    fn r#type<'ctx>(context: &Context<'ctx, D>) -> inkwell::types::FunctionType<'ctx> {
-        context.void_type().fn_type(
-            &[
-                context.llvm().ptr_type(Default::default()).into(),
-                context.llvm().ptr_type(Default::default()).into(),
-            ],
-            false,
-        )
-    }
-
-    fn emit_body<'ctx>(
-        &self,
-        context: &mut Context<'ctx, D>,
-    ) -> anyhow::Result<Option<BasicValueEnum<'ctx>>> {
-        emit_store(
-            context,
-            Self::paramater(context, 0),
-            Self::paramater(context, 1),
-            true,
-        )?;
-
-        Ok(None)
-    }
-}
-
-impl<D> WriteLLVM<D> for StoreTransientWord
-where
-    D: Dependency + Clone,
-{
-    fn declare(&mut self, context: &mut Context<D>) -> anyhow::Result<()> {
-        <Self as RuntimeFunction<_>>::declare(self, context)
-    }
-
-    fn into_llvm(self, context: &mut Context<D>) -> anyhow::Result<()> {
-        <Self as RuntimeFunction<_>>::emit(&self, context)
-    }
-}
-
-fn emit_load<'ctx, D: Dependency + Clone>(
-    context: &mut Context<'ctx, D>,
-    key: BasicValueEnum<'ctx>,
-    transient: bool,
-) -> anyhow::Result<BasicValueEnum<'ctx>> {
-    let mut key = context.build_load(
-        super::Pointer::new(
-            context.word_type(),
-            Default::default(),
-            key.into_pointer_value(),
-        ),
-        "key",
-    )?;
-    if !transient {
-        key = context.build_byte_swap(key)?;
-    }
-
-    let key_pointer = context.build_alloca_at_entry(context.word_type(), "key_pointer");
-    let value_pointer = context.build_alloca_at_entry(context.word_type(), "value_pointer");
-    let length_pointer = context.build_alloca_at_entry(context.xlen_type(), "length_pointer");
-
-    context.builder().build_store(key_pointer.value, key)?;
-    context.build_store(value_pointer, context.word_const(0))?;
-    context.build_store(
-        length_pointer,
-        context
-            .xlen_type()
-            .const_int(revive_common::BYTE_LENGTH_WORD as u64, false),
-    )?;
-
-    let is_transient = context.xlen_type().const_int(transient as u64, false);
-
-    let arguments = [
-        is_transient.into(),
-        key_pointer.to_int(context).into(),
-        context.xlen_type().const_all_ones().into(),
-        value_pointer.to_int(context).into(),
-        length_pointer.to_int(context).into(),
-    ];
-    context.build_runtime_call(revive_runtime_api::polkavm_imports::GET_STORAGE, &arguments);
-
-    // We do not to check the return value: Solidity assumes infallible loads.
-    // If a key doesn't exist the "zero" value is returned (ensured by above write).
-
-    let value = context.build_load(value_pointer, "storage_value")?;
-    Ok(if transient {
-        value
-    } else {
-        context.build_byte_swap(value)?
-    })
-}
-
-fn emit_store<'ctx, D: Dependency + Clone>(
-    context: &mut Context<'ctx, D>,
-    key: BasicValueEnum<'ctx>,
-    value: BasicValueEnum<'ctx>,
-    transient: bool,
-) -> anyhow::Result<()> {
-    let mut key = context.build_load(
-        super::Pointer::new(
-            context.word_type(),
-            Default::default(),
-            key.into_pointer_value(),
-        ),
-        "key",
-    )?;
-    let mut value = context.build_load(
-        super::Pointer::new(
-            context.word_type(),
-            Default::default(),
-            value.into_pointer_value(),
-        ),
-        "key",
-    )?;
-    if !transient {
-        key = context.build_byte_swap(key)?;
-        value = context.build_byte_swap(value)?;
-    }
-
-    let key_pointer = context.build_alloca_at_entry(context.word_type(), "key_pointer");
-    let value_pointer = context.build_alloca_at_entry(context.word_type(), "value_pointer");
-
-    context.build_store(key_pointer, key)?;
-    context.build_store(value_pointer, value)?;
-
-    let is_transient = context.xlen_type().const_int(transient as u64, false);
-
-    let arguments = [
-        is_transient.into(),
-        key_pointer.to_int(context).into(),
-        context.xlen_type().const_all_ones().into(),
-        value_pointer.to_int(context).into(),
-        context.integer_const(crate::polkavm::XLEN, 32).into(),
-    ];
-    context.build_runtime_call(revive_runtime_api::polkavm_imports::SET_STORAGE, &arguments);
-
-    Ok(())
-}

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

@@ -10,21 +10,12 @@ pub fn create_context(
     llvm: &inkwell::context::Context,
     optimizer_settings: OptimizerSettings,
 ) -> Context<DummyDependency> {
-    crate::initialize_llvm(crate::Target::PVM, "resolc", Default::default());
+    crate::polkavm::initialize_target();
 
     let module = llvm.create_module("test");
     let optimizer = Optimizer::new(optimizer_settings);
 
-    Context::<DummyDependency>::new(
+    Context::<DummyDependency>::new(llvm, module, optimizer, None, true, Default::default())
-        llvm,
-        module,
-        optimizer,
-        None,
-        true,
-        Default::default(),
-        Default::default(),
-        Default::default(),
-    )
 }
 
 #[test]

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

@@ -63,6 +63,7 @@ where
     let non_overflow_block = context.append_basic_block("shift_left_non_overflow");
     let join_block = context.append_basic_block("shift_left_join");
 
+    let result_pointer = context.build_alloca(context.word_type(), "shift_left_result_pointer");
     let condition_is_overflow = context.builder().build_int_compare(
         inkwell::IntPredicate::UGT,
         shift,
@@ -72,6 +73,7 @@ where
     context.build_conditional_branch(condition_is_overflow, overflow_block, non_overflow_block)?;
 
     context.set_basic_block(overflow_block);
+    context.build_store(result_pointer, context.word_const(0))?;
     context.build_unconditional_branch(join_block);
 
     context.set_basic_block(non_overflow_block);
@@ -79,17 +81,11 @@ where
         context
             .builder()
             .build_left_shift(value, shift, "shift_left_non_overflow_result")?;
+    context.build_store(result_pointer, value)?;
     context.build_unconditional_branch(join_block);
 
     context.set_basic_block(join_block);
-    let result = context
+    context.build_load(result_pointer, "shift_left_result")
-        .builder()
-        .build_phi(context.word_type(), "shift_left_value")?;
-    result.add_incoming(&[
-        (&value, non_overflow_block),
-        (&context.word_const(0), overflow_block),
-    ]);
-    Ok(result.as_basic_value())
 }
 
 /// Translates the bitwise shift right.
@@ -105,6 +101,7 @@ where
     let non_overflow_block = context.append_basic_block("shift_right_non_overflow");
     let join_block = context.append_basic_block("shift_right_join");
 
+    let result_pointer = context.build_alloca(context.word_type(), "shift_right_result_pointer");
     let condition_is_overflow = context.builder().build_int_compare(
         inkwell::IntPredicate::UGT,
         shift,
@@ -114,6 +111,7 @@ where
     context.build_conditional_branch(condition_is_overflow, overflow_block, non_overflow_block)?;
 
     context.set_basic_block(overflow_block);
+    context.build_store(result_pointer, context.word_const(0))?;
     context.build_unconditional_branch(join_block);
 
     context.set_basic_block(non_overflow_block);
@@ -123,17 +121,11 @@ where
         false,
         "shift_right_non_overflow_result",
     )?;
+    context.build_store(result_pointer, value)?;
     context.build_unconditional_branch(join_block);
 
     context.set_basic_block(join_block);
-    let result = context
+    context.build_load(result_pointer, "shift_right_result")
-        .builder()
-        .build_phi(context.word_type(), "shift_right_value")?;
-    result.add_incoming(&[
-        (&value, non_overflow_block),
-        (&context.word_const(0), overflow_block),
-    ]);
-    Ok(result.as_basic_value())
 }
 
 /// Translates the arithmetic bitwise shift right.
@@ -153,6 +145,8 @@ where
     let non_overflow_block = context.append_basic_block("shift_right_arithmetic_non_overflow");
     let join_block = context.append_basic_block("shift_right_arithmetic_join");
 
+    let result_pointer =
+        context.build_alloca(context.word_type(), "shift_right_arithmetic_result_pointer");
     let condition_is_overflow = context.builder().build_int_compare(
         inkwell::IntPredicate::UGT,
         shift,
@@ -180,9 +174,11 @@ where
     )?;
 
     context.set_basic_block(overflow_positive_block);
+    context.build_store(result_pointer, context.word_const(0))?;
     context.build_unconditional_branch(join_block);
 
     context.set_basic_block(overflow_negative_block);
+    context.build_store(result_pointer, context.word_type().const_all_ones())?;
     context.build_unconditional_branch(join_block);
 
     context.set_basic_block(non_overflow_block);
@@ -192,21 +188,11 @@ where
         true,
         "shift_right_arithmetic_non_overflow_result",
     )?;
+    context.build_store(result_pointer, value)?;
     context.build_unconditional_branch(join_block);
 
     context.set_basic_block(join_block);
-    let result = context
+    context.build_load(result_pointer, "shift_right_arithmetic_result")
-        .builder()
-        .build_phi(context.word_type(), "shift_arithmetic_right_value")?;
-    result.add_incoming(&[
-        (&value, non_overflow_block),
-        (
-            &context.word_type().const_all_ones(),
-            overflow_negative_block,
-        ),
-        (&context.word_const(0), overflow_block),
-    ]);
-    Ok(result.as_basic_value())
 }
 
 /// Translates the `byte` instruction, extracting the byte of `operand_2`

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

@@ -2,7 +2,6 @@
 
 use inkwell::values::BasicValue;
 
-use crate::polkavm::context::pointer::Pointer;
 use crate::polkavm::context::Context;
 use crate::polkavm::Dependency;
 
@@ -50,9 +49,7 @@ where
     D: Dependency + Clone,
 {
     let address_type = context.integer_type(revive_common::BIT_LENGTH_ETH_ADDRESS);
-    let address_pointer: Pointer<'_> = context
+    let address_pointer = context.build_alloca_at_entry(address_type, "origin_address");
-        .get_global(crate::polkavm::GLOBAL_ADDRESS_SPILL_BUFFER)?
-        .into();
     context.build_store(address_pointer, address_type.const_zero())?;
     context.build_runtime_call(
         revive_runtime_api::polkavm_imports::ORIGIN,
@@ -100,13 +97,13 @@ where
     D: Dependency + Clone,
 {
     let output_pointer = context.build_alloca_at_entry(context.word_type(), "blockhash_out_ptr");
-    let index_pointer = context.build_alloca_at_entry(context.word_type(), "blockhash_index_ptr");
+    let index_ptr = context.build_alloca_at_entry(context.word_type(), "blockhash_index_ptr");
-    context.build_store(index_pointer, index)?;
+    context.build_store(index_ptr, index)?;
 
     context.build_runtime_call(
         revive_runtime_api::polkavm_imports::BLOCK_HASH,
         &[
-            index_pointer.to_int(context).into(),
+            index_ptr.to_int(context).into(),
             output_pointer.to_int(context).into(),
         ],
     );
@@ -130,9 +127,10 @@ pub fn coinbase<'ctx, D>(
 where
     D: Dependency + Clone,
 {
-    let pointer: Pointer<'_> = context
+    let pointer = context.build_alloca_at_entry(
-        .get_global(crate::polkavm::GLOBAL_ADDRESS_SPILL_BUFFER)?
+        context.integer_type(revive_common::BIT_LENGTH_ETH_ADDRESS),
-        .into();
+        "coinbase_output",
+    );
     context.build_runtime_call(
         revive_runtime_api::polkavm_imports::BLOCK_AUTHOR,
         &[pointer.to_int(context).into()],
@@ -157,9 +155,10 @@ pub fn address<'ctx, D>(
 where
     D: Dependency + Clone,
 {
-    let pointer: Pointer<'_> = context
+    let pointer = context.build_alloca_at_entry(
-        .get_global(crate::polkavm::GLOBAL_ADDRESS_SPILL_BUFFER)?
+        context.integer_type(revive_common::BIT_LENGTH_ETH_ADDRESS),
-        .into();
+        "address_output",
+    );
     context.build_runtime_call(
         revive_runtime_api::polkavm_imports::ADDRESS,
         &[pointer.to_int(context).into()],
@@ -174,9 +173,10 @@ pub fn caller<'ctx, D>(
 where
     D: Dependency + Clone,
 {
-    let pointer: Pointer<'_> = context
+    let pointer = context.build_alloca_at_entry(
-        .get_global(crate::polkavm::GLOBAL_ADDRESS_SPILL_BUFFER)?
+        context.integer_type(revive_common::BIT_LENGTH_ETH_ADDRESS),
-        .into();
+        "address_output",
+    );
     context.build_runtime_call(
         revive_runtime_api::polkavm_imports::CALLER,
         &[pointer.to_int(context).into()],

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

@@ -32,7 +32,6 @@ where
     let salt_pointer = match salt {
         Some(salt) => {
             let salt_pointer = context.build_alloca_at_entry(context.word_type(), "salt_pointer");
-            let salt = context.build_byte_swap(salt.into())?;
             context.build_store(salt_pointer, salt)?;
             salt_pointer
         }
@@ -119,8 +118,10 @@ where
                 _ => error,
             })?;
     if contract_path.as_str() == parent {
-        return Ok(Argument::value(context.word_const(0).as_basic_value_enum())
+        return Ok(Argument::new_with_constant(
-            .with_constant(num::BigUint::zero()));
+            context.word_const(0).as_basic_value_enum(),
+            num::BigUint::zero(),
+        ));
     } else if identifier.ends_with("_deployed") && code_type == CodeType::Runtime {
         anyhow::bail!("type({}).runtimeCode is not supported", identifier);
     }
@@ -129,7 +130,7 @@ where
     let hash_value = context
         .word_const_str_hex(hash_string.as_str())
         .as_basic_value_enum();
-    Ok(Argument::value(hash_value).with_original(hash_string))
+    Ok(Argument::new_with_original(hash_value, hash_string))
 }
 
 /// Translates the deploy call header size instruction. the header consists of
@@ -158,8 +159,10 @@ where
                 _ => error,
             })?;
     if contract_path.as_str() == parent {
-        return Ok(Argument::value(context.word_const(0).as_basic_value_enum())
+        return Ok(Argument::new_with_constant(
-            .with_constant(num::BigUint::zero()));
+            context.word_const(0).as_basic_value_enum(),
+            num::BigUint::zero(),
+        ));
     } else if identifier.ends_with("_deployed") && code_type == CodeType::Runtime {
         anyhow::bail!("type({}).runtimeCode is not supported", identifier);
     }
@@ -168,5 +171,5 @@ where
     let size_value = context
         .word_const(crate::polkavm::DEPLOYER_CALL_HEADER_SIZE as u64)
         .as_basic_value_enum();
-    Ok(Argument::value(size_value).with_constant(size_bigint))
+    Ok(Argument::new_with_constant(size_value, size_bigint))
 }

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

@@ -28,7 +28,7 @@ pub fn value<'ctx, D>(
 where
     D: Dependency + Clone,
 {
-    let output_pointer = context.build_alloca_at_entry(context.value_type(), "value_transferred");
+    let output_pointer = context.build_alloca(context.value_type(), "value_transferred");
     context.build_store(output_pointer, context.word_const(0))?;
     context.build_runtime_call(
         revive_runtime_api::polkavm_imports::VALUE_TRANSFERRED,
@@ -46,7 +46,8 @@ where
     D: Dependency + Clone,
 {
     let address_pointer = context.build_address_argument_store(address)?;
-    let balance_pointer = context.build_alloca_at_entry(context.word_type(), "balance_pointer");
+
+    let balance_pointer = context.build_alloca(context.word_type(), "balance_pointer");
     let balance = context.builder().build_ptr_to_int(
         balance_pointer.value,
         context.xlen_type(),
@@ -68,7 +69,7 @@ pub fn self_balance<'ctx, D>(
 where
     D: Dependency + Clone,
 {
-    let balance_pointer = context.build_alloca_at_entry(context.word_type(), "balance_pointer");
+    let balance_pointer = context.build_alloca(context.word_type(), "balance_pointer");
     let balance = context.builder().build_ptr_to_int(
         balance_pointer.value,
         context.xlen_type(),

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

@@ -3,23 +3,20 @@
 use crate::polkavm::context::runtime::RuntimeFunction;
 use crate::polkavm::context::Context;
 use crate::polkavm::Dependency;
-use crate::PolkaVMArgument;
 use crate::PolkaVMLoadStorageWordFunction;
-use crate::PolkaVMLoadTransientStorageWordFunction;
 use crate::PolkaVMStoreStorageWordFunction;
-use crate::PolkaVMStoreTransientStorageWordFunction;
 
 /// Translates the storage load.
 pub fn load<'ctx, D>(
     context: &mut Context<'ctx, D>,
-    position: &PolkaVMArgument<'ctx>,
+    position: inkwell::values::IntValue<'ctx>,
 ) -> anyhow::Result<inkwell::values::BasicValueEnum<'ctx>>
 where
     D: Dependency + Clone,
 {
     let name = <PolkaVMLoadStorageWordFunction as RuntimeFunction<D>>::NAME;
     let declaration = <PolkaVMLoadStorageWordFunction as RuntimeFunction<D>>::declaration(context);
-    let arguments = [position.as_pointer(context)?.value.into()];
+    let arguments = [context.xlen_type().const_zero().into(), position.into()];
     Ok(context
         .build_call(declaration, &arguments, "storage_load")
         .unwrap_or_else(|| panic!("runtime function {name} should return a value")))
@@ -28,16 +25,17 @@ where
 /// Translates the storage store.
 pub fn store<'ctx, D>(
     context: &mut Context<'ctx, D>,
-    position: &PolkaVMArgument<'ctx>,
+    position: inkwell::values::IntValue<'ctx>,
-    value: &PolkaVMArgument<'ctx>,
+    value: inkwell::values::IntValue<'ctx>,
 ) -> anyhow::Result<()>
 where
     D: Dependency + Clone,
 {
     let declaration = <PolkaVMStoreStorageWordFunction as RuntimeFunction<D>>::declaration(context);
     let arguments = [
-        position.as_pointer(context)?.value.into(),
+        context.xlen_type().const_zero().into(),
-        value.as_pointer(context)?.value.into(),
+        position.into(),
+        value.into(),
     ];
     context.build_call(declaration, &arguments, "storage_store");
     Ok(())
@@ -46,35 +44,37 @@ where
 /// Translates the transient storage load.
 pub fn transient_load<'ctx, D>(
     context: &mut Context<'ctx, D>,
-    position: &PolkaVMArgument<'ctx>,
+    position: inkwell::values::IntValue<'ctx>,
 ) -> anyhow::Result<inkwell::values::BasicValueEnum<'ctx>>
 where
     D: Dependency + Clone,
 {
-    let name = <PolkaVMLoadTransientStorageWordFunction as RuntimeFunction<D>>::NAME;
+    let name = <PolkaVMLoadStorageWordFunction as RuntimeFunction<D>>::NAME;
-    let arguments = [position.as_pointer(context)?.value.into()];
+    let declaration = <PolkaVMLoadStorageWordFunction as RuntimeFunction<D>>::declaration(context);
-    let declaration =
+    let arguments = [
-        <PolkaVMLoadTransientStorageWordFunction as RuntimeFunction<D>>::declaration(context);
+        context.xlen_type().const_int(1, false).into(),
+        position.into(),
+    ];
     Ok(context
-        .build_call(declaration, &arguments, "transient_storage_load")
+        .build_call(declaration, &arguments, "storage_load")
         .unwrap_or_else(|| panic!("runtime function {name} should return a value")))
 }
 
 /// Translates the transient storage store.
 pub fn transient_store<'ctx, D>(
     context: &mut Context<'ctx, D>,
-    position: &PolkaVMArgument<'ctx>,
+    position: inkwell::values::IntValue<'ctx>,
-    value: &PolkaVMArgument<'ctx>,
+    value: inkwell::values::IntValue<'ctx>,
 ) -> anyhow::Result<()>
 where
     D: Dependency + Clone,
 {
-    let declaration =
+    let declaration = <PolkaVMStoreStorageWordFunction as RuntimeFunction<D>>::declaration(context);
-        <PolkaVMStoreTransientStorageWordFunction as RuntimeFunction<D>>::declaration(context);
     let arguments = [
-        position.as_pointer(context)?.value.into(),
+        context.xlen_type().const_int(1, false).into(),
-        value.as_pointer(context)?.value.into(),
+        position.into(),
+        value.into(),
     ];
-    context.build_call(declaration, &arguments, "transient_storage_store");
+    context.build_call(declaration, &arguments, "storage_store");
     Ok(())
 }

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

@@ -3,6 +3,7 @@
 pub mod r#const;
 pub mod context;
 pub mod evm;
+pub mod metadata_hash;
 
 pub use self::r#const::*;
 
@@ -12,12 +13,16 @@ 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;
 use self::context::Context;
 
+/// Initializes the PolkaVM target machine.
+pub fn initialize_target() {
+    inkwell::targets::Target::initialize_riscv(&Default::default());
+}
+
 /// Builds PolkaVM assembly text.
 pub fn build_assembly_text(
     contract_path: &str,
@@ -90,8 +95,6 @@ pub trait Dependency {
         optimizer_settings: OptimizerSettings,
         include_metadata_hash: bool,
         debug_config: DebugConfig,
-        llvm_arguments: &[String],
-        memory_config: SolcStandardJsonInputSettingsPolkaVMMemory,
     ) -> anyhow::Result<String>;
 
     /// Resolves a full contract path.
@@ -112,8 +115,6 @@ impl Dependency for DummyDependency {
         _optimizer_settings: OptimizerSettings,
         _include_metadata_hash: bool,
         _debug_config: DebugConfig,
-        _llvm_arguments: &[String],
-        _memory_config: SolcStandardJsonInputSettingsPolkaVMMemory,
     ) -> 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/helper.ts

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

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/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

@@ -10,19 +10,12 @@ description = "Execute revive contracts in a simulated blockchain runtime"
 [package.metadata.cargo-machete]
 ignored = ["codec", "scale-info"]
 
-[[bin]]
-name = "revive-runner"
-path = "src/main.rs"
-
 [features]
 std = ["polkadot-sdk/std"]
 default = ["solidity"]
-solidity = ["resolc", "revive-differential", "revive-llvm-context"]
+solidity = ["revive-solidity", "revive-differential"]
 
 [dependencies]
-env_logger = { workspace = true }
-clap = { workspace = true, features = ["help", "std", "derive"] }
-anyhow = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
 hex = { workspace = true, features = ["serde"] }
@@ -39,6 +32,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 }
+revive-llvm-context = { workspace = true }

crates/runner/README.md

@@ -1,26 +0,0 @@
-# revive-runner
-
-The revive runner is a helper utility aiding in contract debugging.
-
-Given a PVM contract blob, it will upload, deploy and call that contract using a local, stand-alone un-blockchained pallet revive (which is our execution layer).
-
-This is somewhat similar to the geth `evm` utility binary.
-
-## Installation
-
-The `revive-runner` does not depend on the compiler itself, hence installing this utility does not depend on LLVM, so no LLVM build is required.
-
-Inside the root `revive` repository directory, execute:
-
-```bash
-make install-revive-runner
-```
-
-Which will install the `revive-runner` using `cargo`. 
-
-## Usage
-
-Set the `RUST_LOG` environment varibale to the `trace` level to see the full PolkaVM execution trace. For example:
-
-```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/main.rs

@@ -1,93 +0,0 @@
-use std::path::PathBuf;
-
-use clap::Parser;
-
-use revive_runner::{Code, OptionalHex, Specs, SpecsAction::*, TestAddress};
-
-/// Execute revive PolkaVM contracts locally.
-#[derive(Parser)]
-#[command(version, about, long_about = None)]
-struct Arguments {
-    /// The hex encoded calldata for the contract call.
-    #[arg(short, long)]
-    calldata: Option<String>,
-
-    /// The hex encoded calldata for the contract deployment.
-    #[arg(short, long)]
-    deploy_calldata: Option<String>,
-
-    /// The hex encoded contract code blob to instantiate and execute.
-    #[arg(short, long)]
-    blob: Option<String>,
-
-    /// The contract code to instantiate and execute.
-    #[arg(short, long)]
-    file: Option<PathBuf>,
-
-    /// The origin account used to initiate the deploy and call transactions.
-    #[arg(short, long)]
-    origin: Option<TestAddress>,
-
-    /// The value the call transaction is endowed with.
-    #[arg(short, long)]
-    value: Option<u128>,
-
-    /// The value the deploy transaction is endowed with.
-    #[arg(long)]
-    deploy_value: Option<u128>,
-}
-
-fn main() -> anyhow::Result<()> {
-    env_logger::init();
-
-    let arguments = Arguments::parse();
-
-    let code = match (arguments.blob, arguments.file) {
-        (Some(blob), None) => hex::decode(blob)
-            .map_err(|error| anyhow::anyhow!("expected hex encoded PVM blob: {error}"))?,
-        (None, Some(file)) => std::fs::read(&file).map_err(|error| {
-            anyhow::anyhow!("unable to read PVM file {}: {error}", file.display())
-        })?,
-        _ => anyhow::bail!("should either provide a PVM blob or a PVM file"),
-    };
-    let calldata = match arguments.calldata {
-        Some(calldata) => hex::decode(calldata)
-            .map_err(|error| anyhow::anyhow!("expected hex encoded calldata: {error}"))?,
-        None => vec![],
-    };
-    let deploy_calldata = match arguments.deploy_calldata {
-        Some(calldata) => hex::decode(calldata)
-            .map_err(|error| anyhow::anyhow!("expected hex encoded calldata: {error}"))?,
-        None => vec![],
-    };
-    let origin = arguments.origin.unwrap_or(TestAddress::Alice);
-
-    let actions = vec![
-        Instantiate {
-            origin: origin.clone(),
-            value: arguments.deploy_value.unwrap_or(0),
-            gas_limit: None,
-            storage_deposit_limit: None,
-            code: Code::Bytes(code),
-            data: deploy_calldata,
-            salt: OptionalHex::default(),
-        },
-        Call {
-            origin,
-            dest: TestAddress::Instantiated(0),
-            value: arguments.value.unwrap_or(0),
-            gas_limit: None,
-            storage_deposit_limit: None,
-            data: calldata,
-        },
-    ];
-
-    Specs {
-        actions,
-        differential: false,
-        ..Default::default()
-    }
-    .run();
-
-    Ok(())
-}

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

@@ -1,15 +1,13 @@
-use std::{str::FromStr, time::Instant};
+use std::time::Instant;
 
 use serde::{Deserialize, Serialize};
 
 use crate::*;
-use alloy_primitives::keccak256;
+use alloy_primitives::{keccak256, Address};
-#[cfg(feature = "resolc")]
+#[cfg(feature = "revive-solidity")]
-use alloy_primitives::Address;
-#[cfg(feature = "resolc")]
-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 = "*/";
@@ -108,10 +106,14 @@ impl SpecsAction {
         };
 
         for (key, expected) in storage {
+            let mut key = **key;
+            let mut expected = **expected;
+            key.reverse();
+            expected.reverse();
             actions.push(Self::VerifyStorage {
                 contract: account_pvm.clone(),
-                key: **key,
+                key,
-                expected: **expected,
+                expected,
             });
         }
 
@@ -158,39 +160,6 @@ impl TestAddress {
     }
 }
 
-impl FromStr for TestAddress {
-    type Err = &'static str;
-
-    fn from_str(value: &str) -> Result<Self, Self::Err> {
-        value.try_into()
-    }
-}
-
-impl TryFrom<&str> for TestAddress {
-    type Error = &'static str;
-
-    fn try_from(value: &str) -> Result<Self, Self::Error> {
-        match value {
-            "alice" => Ok(Self::Alice),
-            "bob" => Ok(Self::Bob),
-            "charlie" => Ok(Self::Charlie),
-            value => {
-                if let Ok(value) = value.parse() {
-                    return Ok(Self::Instantiated(value));
-                }
-
-                if let Ok(value) = hex::decode(value) {
-                    if value.len() == 20 {
-                        return Ok(Self::AccountId(H160(value.try_into().unwrap())));
-                    }
-                }
-
-                Err("can not parse into test address")
-            }
-        }
-    }
-}
-
 /// Specs for a contract test
 #[derive(Clone, Debug, Serialize, Deserialize)]
 #[serde(default)]
@@ -247,7 +216,6 @@ impl Specs {
     /// Helper to allow not specifying the code bytes or path directly in the runner.json
     /// - Replace `Code::Bytes(bytes)` if `bytes` are empty: read `contract_file`
     /// - Replace `Code::Solidity{ path, ..}` if `path` is not provided: replace `path` with `contract_file`
-    #[allow(unused_variables)]
     pub fn replace_empty_code(&mut self, contract_name: &str, contract_path: &str) {
         for action in self.actions.iter_mut() {
             let code = match action {
@@ -256,7 +224,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 +232,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

@@ -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/src/polkavm_imports.c

@@ -5,6 +5,34 @@
 
 // Missing builtins
 
+#define EVM_WORD_SIZE 32
+#define ALIGN(size) ((size + EVM_WORD_SIZE - 1) & ~(EVM_WORD_SIZE - 1))
+#define MAX_MEMORY_SIZE (64 * 1024)
+char __memory[MAX_MEMORY_SIZE];
+uint32_t __memory_size = 0;
+
+void * __sbrk_internal(uint32_t offset, uint32_t size) {
+    if (offset >= MAX_MEMORY_SIZE || size > MAX_MEMORY_SIZE) {
+        POLKAVM_TRAP();
+    }
+
+    uint32_t new_size = ALIGN(offset + size);
+    if (new_size > MAX_MEMORY_SIZE) {
+        POLKAVM_TRAP();
+    }
+    if (new_size > __memory_size) {
+        __memory_size = new_size;
+    }
+
+    return (void *)&__memory[offset];
+}
+
+void * memset(void *b, int c, size_t len) {
+    uint8_t *dest = b;
+    while (len-- > 0) *dest++ = c;
+    return b;
+}
+
 void * memcpy(void *dst, const void *_src, size_t len) {
     uint8_t *dest = dst;
     const uint8_t *src = _src;

crates/runtime-api/src/polkavm_imports.rs

@@ -2,6 +2,14 @@ use inkwell::{context::Context, memory_buffer::MemoryBuffer, module::Module, sup
 
 include!(concat!(env!("OUT_DIR"), "/polkavm_imports.rs"));
 
+/// The emulated EVM heap memory global symbol.
+pub static MEMORY: &str = "__memory";
+
+/// The emulated EVM heap memory size global symbol.
+pub static MEMORY_SIZE: &str = "__memory_size";
+
+pub static SBRK: &str = "__sbrk_internal";
+
 pub static ADDRESS: &str = "address";
 
 pub static BALANCE: &str = "balance";
@@ -70,7 +78,8 @@ pub static WEIGHT_TO_FEE: &str = "weight_to_fee";
 
 /// All imported runtime API symbols.
 /// Useful for configuring common attributes and linkage.
-pub static IMPORTS: [&str; 33] = [
+pub static IMPORTS: [&str; 34] = [
+    SBRK,
     ADDRESS,
     BALANCE,
     BALANCE_OF,

crates/solc-json-interface/Cargo.toml

@@ -1,23 +0,0 @@
-[package]
-name = "revive-solc-json-interface"
-version = "0.2.0"
-authors.workspace = true
-license.workspace = true
-edition.workspace = true
-repository.workspace = true
-rust-version.workspace = true
-description = "Rust bindings for the solc standard JSON and combined JSON interface"
-
-[features]
-default = ["parallel"]
-parallel = ["rayon"]
-resolc = [] # The resolc binary adds a bunch of custom fields to the format
-
-[dependencies]
-revive-common = { workspace = true }
-
-anyhow = { workspace = true }
-rayon = { workspace = true, optional = true }
-semver = { workspace = true }
-serde = { workspace = true }
-serde_json = { workspace = true }

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

@@ -1,31 +0,0 @@
-//! This crates provides (de)serializable Rust types for interacting
-//! `solc` via the [JSON-input-output][0] interface.
-//!
-//! [0]: https://docs.soliditylang.org/en/latest/using-the-compiler.html#compiler-input-and-output-json-description
-
-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::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;
-pub use self::standard_json::input::settings::Settings as SolcStandardJsonInputSettings;
-pub use self::standard_json::input::source::Source as SolcStandardJsonInputSource;
-pub use self::standard_json::input::Input as SolcStandardJsonInput;
-pub use self::standard_json::output::contract::evm::bytecode::Bytecode as SolcStandardJsonOutputContractEVMBytecode;
-pub use self::standard_json::output::contract::evm::EVM as SolcStandardJsonOutputContractEVM;
-pub use self::standard_json::output::contract::Contract as SolcStandardJsonOutputContract;
-pub use self::standard_json::output::Output as SolcStandardJsonOutput;
-#[cfg(feature = "resolc")]
-pub use self::warning::Warning as ResolcWarning;
-
-pub mod combined_json;
-pub mod standard_json;
-#[cfg(feature = "resolc")]
-pub mod warning;

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

@@ -1,98 +0,0 @@
-//! The `solc --standard-json` output file selection.
-
-pub mod flag;
-
-use std::collections::HashSet;
-
-use serde::Deserialize;
-use serde::Serialize;
-
-use self::flag::Flag as SelectionFlag;
-
-/// The `solc --standard-json` output file selection.
-#[derive(Clone, Debug, Default, Serialize, Deserialize, PartialEq)]
-pub struct File {
-    /// The per-file output selections.
-    #[serde(rename = "", skip_serializing_if = "Option::is_none")]
-    pub per_file: Option<HashSet<SelectionFlag>>,
-    /// The per-contract output selections.
-    #[serde(rename = "*", skip_serializing_if = "Option::is_none")]
-    pub per_contract: Option<HashSet<SelectionFlag>>,
-}
-
-impl File {
-    /// Creates the selection required for production compilation (excludes EVM bytecode).
-    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([
-                SelectionFlag::EVMBC,
-                SelectionFlag::EVMDBC,
-                SelectionFlag::MethodIdentifiers,
-                SelectionFlag::Metadata,
-                SelectionFlag::Yul,
-            ])),
-        }
-    }
-
-    /// Extends the user's output selection with flag required by our compilation process.
-    pub fn extend_with_required(&mut self) -> &mut Self {
-        let required = Self::new_required();
-
-        self.per_file
-            .get_or_insert_with(HashSet::default)
-            .extend(required.per_file.unwrap_or_default());
-        self.per_contract
-            .get_or_insert_with(HashSet::default)
-            .extend(required.per_contract.unwrap_or_default());
-
-        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/mod.rs

@@ -1,4 +0,0 @@
-//! The `solc <input>.sol --standard-json` interface input and output.
-
-pub mod input;
-pub mod output;

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

@@ -1,71 +0,0 @@
-//! The `solc --standard-json` output.
-
-pub mod contract;
-pub mod error;
-pub mod source;
-
-use std::collections::BTreeMap;
-
-use serde::Deserialize;
-use serde::Serialize;
-
-#[cfg(feature = "resolc")]
-use crate::warning::Warning;
-
-use self::contract::Contract;
-use self::error::Error as SolcStandardJsonOutputError;
-use self::source::Source;
-
-/// The `solc --standard-json` output.
-#[derive(Debug, Serialize, Deserialize, Clone, Default)]
-pub struct Output {
-    /// The file-contract hashmap.
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub contracts: Option<BTreeMap<String, BTreeMap<String, Contract>>>,
-    /// The source code mapping data.
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub sources: Option<BTreeMap<String, Source>>,
-    /// The compilation errors and warnings.
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub errors: Option<Vec<SolcStandardJsonOutputError>>,
-    /// The `solc` compiler version.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub version: Option<String>,
-    /// The `solc` compiler long version.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub long_version: Option<String>,
-    /// The `resolc` compiler version.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub revive_version: Option<String>,
-}
-
-impl Output {
-    /// Traverses the AST and returns the list of additional errors and warnings.
-    #[cfg(feature = "resolc")]
-    pub fn preprocess_ast(&mut self, suppressed_warnings: &[Warning]) -> anyhow::Result<()> {
-        let sources = match self.sources.as_ref() {
-            Some(sources) => sources,
-            None => return Ok(()),
-        };
-
-        let mut messages = Vec::new();
-        for (path, source) in sources.iter() {
-            if let Some(ast) = source.ast.as_ref() {
-                let mut polkavm_messages = Source::get_messages(ast, suppressed_warnings);
-                for message in polkavm_messages.iter_mut() {
-                    message.push_contract_path(path.as_str());
-                }
-                messages.extend(polkavm_messages);
-            }
-        }
-        self.errors = match self.errors.take() {
-            Some(mut errors) => {
-                errors.extend(messages);
-                Some(errors)
-            }
-            None => Some(messages),
-        };
-
-        Ok(())
-    }
-}

crates/solidity/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
-name = "resolc"
+name = "revive-solidity"
-version = "0.2.0"
+version.workspace = true
 license.workspace = true
 edition.workspace = true
 repository.workspace = true
@@ -18,30 +18,32 @@ 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/build/contract.rs

@@ -5,11 +5,12 @@ use std::fs::File;
 use std::io::Write;
 use std::path::Path;
 
-use revive_solc_json_interface::CombinedJsonContract;
-use revive_solc_json_interface::SolcStandardJsonOutputContract;
 use serde::Deserialize;
 use serde::Serialize;
 
+use crate::solc::combined_json::contract::Contract as CombinedJsonContract;
+use crate::solc::standard_json::output::contract::Contract as StandardJsonOutputContract;
+
 /// The Solidity contract build.
 #[derive(Debug, Serialize, Deserialize)]
 pub struct Contract {
@@ -130,7 +131,7 @@ impl Contract {
     /// Writes the contract text assembly and bytecode to the standard JSON.
     pub fn write_to_standard_json(
         self,
-        standard_json_contract: &mut SolcStandardJsonOutputContract,
+        standard_json_contract: &mut StandardJsonOutputContract,
     ) -> anyhow::Result<()> {
         standard_json_contract.metadata = Some(self.metadata_json);
 

crates/solidity/src/build/mod.rs

@@ -5,9 +5,8 @@ pub mod contract;
 use std::collections::BTreeMap;
 use std::path::Path;
 
-use revive_solc_json_interface::combined_json::CombinedJson;
+use crate::solc::combined_json::CombinedJson;
-use revive_solc_json_interface::SolcStandardJsonOutput;
+use crate::solc::standard_json::output::Output as StandardJsonOutput;
-
 use crate::solc::version::Version as SolcVersion;
 use crate::ResolcVersion;
 
@@ -67,7 +66,7 @@ impl Build {
     /// Writes all contracts assembly and bytecode to the standard JSON.
     pub fn write_to_standard_json(
         mut self,
-        standard_json: &mut SolcStandardJsonOutput,
+        standard_json: &mut StandardJsonOutput,
         solc_version: &SolcVersion,
     ) -> anyhow::Result<()> {
         let contracts = match standard_json.contracts.as_mut() {

crates/solidity/src/lib.rs

@@ -7,6 +7,8 @@ pub(crate) mod process;
 pub(crate) mod project;
 pub(crate) mod solc;
 pub(crate) mod version;
+pub(crate) mod warning;
+pub(crate) mod yul;
 
 pub use self::build::contract::Contract as ContractBuild;
 pub use self::build::Build;
@@ -21,16 +23,29 @@ pub use self::process::Process;
 pub use self::project::contract::Contract as ProjectContract;
 pub use self::project::Project;
 pub use self::r#const::*;
+pub use self::solc::combined_json::contract::Contract as SolcCombinedJsonContract;
+pub use self::solc::combined_json::CombinedJson as SolcCombinedJson;
 #[cfg(not(target_os = "emscripten"))]
 pub use self::solc::solc_compiler::SolcCompiler;
 #[cfg(target_os = "emscripten")]
 pub use self::solc::soljson_compiler::SoljsonCompiler;
+pub use self::solc::standard_json::input::language::Language as SolcStandardJsonInputLanguage;
+pub use self::solc::standard_json::input::settings::metadata::Metadata as SolcStandardJsonInputSettingsMetadata;
+pub use self::solc::standard_json::input::settings::optimizer::Optimizer as SolcStandardJsonInputSettingsOptimizer;
+pub use self::solc::standard_json::input::settings::selection::file::flag::Flag as SolcStandardJsonInputSettingsSelectionFileFlag;
+pub use self::solc::standard_json::input::settings::selection::file::File as SolcStandardJsonInputSettingsSelectionFile;
+pub use self::solc::standard_json::input::settings::selection::Selection as SolcStandardJsonInputSettingsSelection;
+pub use self::solc::standard_json::input::settings::Settings as SolcStandardJsonInputSettings;
+pub use self::solc::standard_json::input::source::Source as SolcStandardJsonInputSource;
+pub use self::solc::standard_json::input::Input as SolcStandardJsonInput;
+pub use self::solc::standard_json::output::contract::evm::bytecode::Bytecode as SolcStandardJsonOutputContractEVMBytecode;
+pub use self::solc::standard_json::output::contract::evm::EVM as SolcStandardJsonOutputContractEVM;
+pub use self::solc::standard_json::output::contract::Contract as SolcStandardJsonOutputContract;
+pub use self::solc::standard_json::output::Output as SolcStandardJsonOutput;
 pub use self::solc::version::Version as SolcVersion;
 pub use self::solc::Compiler;
-pub use self::solc::FIRST_SUPPORTED_VERSION as SolcFirstSupportedVersion;
-pub use self::solc::LAST_SUPPORTED_VERSION as SolcLastSupportedVersion;
 pub use self::version::Version as ResolcVersion;
-
+pub use self::warning::Warning;
 #[cfg(not(target_os = "emscripten"))]
 pub mod test_utils;
 pub mod tests;
@@ -39,15 +54,6 @@ use std::collections::BTreeSet;
 use std::io::Write;
 use std::path::PathBuf;
 
-use revive_solc_json_interface::standard_json::input::settings::metadata_hash::MetadataHash;
-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.
 pub fn yul<T: Compiler>(
     input_files: &[PathBuf],
@@ -55,8 +61,6 @@ pub fn yul<T: Compiler>(
     optimizer_settings: revive_llvm_context::OptimizerSettings,
     include_metadata_hash: bool,
     debug_config: revive_llvm_context::DebugConfig,
-    llvm_arguments: &[String],
-    memory_config: SolcStandardJsonInputSettingsPolkaVMMemory,
 ) -> anyhow::Result<Build> {
     let path = match input_files.len() {
         1 => input_files.first().expect("Always exists"),
@@ -77,13 +81,7 @@ pub fn yul<T: Compiler>(
     let solc_validator = Some(&*solc);
     let project = Project::try_from_yul_path(path, solc_validator)?;
 
-    let build = project.compile(
+    let build = project.compile(optimizer_settings, include_metadata_hash, debug_config)?;
-        optimizer_settings,
-        include_metadata_hash,
-        debug_config,
-        llvm_arguments,
-        memory_config,
-    )?;
 
     Ok(build)
 }
@@ -94,8 +92,6 @@ pub fn llvm_ir(
     optimizer_settings: revive_llvm_context::OptimizerSettings,
     include_metadata_hash: bool,
     debug_config: revive_llvm_context::DebugConfig,
-    llvm_arguments: &[String],
-    memory_config: SolcStandardJsonInputSettingsPolkaVMMemory,
 ) -> anyhow::Result<Build> {
     let path = match input_files.len() {
         1 => input_files.first().expect("Always exists"),
@@ -108,13 +104,7 @@ pub fn llvm_ir(
 
     let project = Project::try_from_llvm_ir_path(path)?;
 
-    let build = project.compile(
+    let build = project.compile(optimizer_settings, include_metadata_hash, debug_config)?;
-        optimizer_settings,
-        include_metadata_hash,
-        debug_config,
-        llvm_arguments,
-        memory_config,
-    )?;
 
     Ok(build)
 }
@@ -133,10 +123,8 @@ pub fn standard_output<T: Compiler>(
     include_paths: Vec<String>,
     allow_paths: Option<String>,
     remappings: Option<BTreeSet<String>>,
-    suppressed_warnings: Option<Vec<ResolcWarning>>,
+    suppressed_warnings: Option<Vec<Warning>>,
     debug_config: revive_llvm_context::DebugConfig,
-    llvm_arguments: &[String],
-    memory_config: SolcStandardJsonInputSettingsPolkaVMMemory,
 ) -> anyhow::Result<Build> {
     let solc_version = solc.version()?;
 
@@ -155,10 +143,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
@@ -168,7 +152,7 @@ pub fn standard_output<T: Compiler>(
         .collect();
 
     let libraries = solc_input.settings.libraries.clone().unwrap_or_default();
-    let solc_output = solc.standard_json(solc_input, base_path, include_paths, allow_paths)?;
+    let mut solc_output = solc.standard_json(solc_input, base_path, include_paths, allow_paths)?;
 
     if let Some(errors) = solc_output.errors.as_deref() {
         let mut has_errors = false;
@@ -186,35 +170,22 @@ pub fn standard_output<T: Compiler>(
         }
     }
 
-    let project = Project::try_from_standard_json_output(
+    let project =
-        &solc_output,
+        solc_output.try_to_project(source_code_files, libraries, &solc_version, &debug_config)?;
-        source_code_files,
-        libraries,
-        &solc_version,
-        &debug_config,
-    )?;
 
-    let build = project.compile(
+    let build = project.compile(optimizer_settings, include_metadata_hash, debug_config)?;
-        optimizer_settings,
-        include_metadata_hash,
-        debug_config,
-        llvm_arguments,
-        memory_config,
-    )?;
 
     Ok(build)
 }
 
 /// Runs the standard JSON mode.
-#[allow(clippy::too_many_arguments)]
 pub fn standard_json<T: Compiler>(
     solc: &mut T,
     detect_missing_libraries: bool,
     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],
 ) -> anyhow::Result<()> {
     let solc_version = solc.version()?;
 
@@ -228,11 +199,10 @@ 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),
+        Some(ref metadata) => {
+            metadata.bytecode_hash != Some(revive_llvm_context::PolkaVMMetadataHash::None)
+        }
         None => true,
     };
 
@@ -248,27 +218,14 @@ pub fn standard_json<T: Compiler>(
         }
     }
 
-    let project = Project::try_from_standard_json_output(
+    let project =
-        &solc_output,
+        solc_output.try_to_project(source_code_files, libraries, &solc_version, &debug_config)?;
-        source_code_files,
-        libraries,
-        &solc_version,
-        &debug_config,
-    )?;
 
     if detect_missing_libraries {
         let missing_libraries = project.get_missing_libraries();
         missing_libraries.write_to_standard_json(&mut solc_output, &solc_version)?;
     } else {
-        let build = project.compile(
+        let build = project.compile(optimizer_settings, include_metadata_hash, debug_config)?;
-            optimizer_settings,
-            include_metadata_hash,
-            debug_config,
-            llvm_arguments,
-            polkavm_settings
-                .memory_config
-                .unwrap_or_else(SolcStandardJsonInputSettingsPolkaVMMemory::default),
-        )?;
         build.write_to_standard_json(&mut solc_output, &solc_version)?;
     }
     serde_json::to_writer(std::io::stdout(), &solc_output)?;
@@ -290,12 +247,10 @@ pub fn combined_json<T: Compiler>(
     include_paths: Vec<String>,
     allow_paths: Option<String>,
     remappings: Option<BTreeSet<String>>,
-    suppressed_warnings: Option<Vec<ResolcWarning>>,
+    suppressed_warnings: Option<Vec<Warning>>,
     debug_config: revive_llvm_context::DebugConfig,
     output_directory: Option<PathBuf>,
     overwrite: bool,
-    llvm_arguments: &[String],
-    memory_config: SolcStandardJsonInputSettingsPolkaVMMemory,
 ) -> anyhow::Result<()> {
     let build = standard_output(
         input_files,
@@ -311,8 +266,6 @@ pub fn combined_json<T: Compiler>(
         remappings,
         suppressed_warnings,
         debug_config,
-        llvm_arguments,
-        memory_config,
     )?;
 
     let mut combined_json = solc.combined_json(input_files, format.as_str())?;

crates/solidity/src/missing_libraries.rs

@@ -3,8 +3,7 @@
 use std::collections::BTreeMap;
 use std::collections::HashSet;
 
-use revive_solc_json_interface::SolcStandardJsonOutput;
+use crate::solc::standard_json::output::Output as StandardJsonOutput;
-
 use crate::solc::version::Version as SolcVersion;
 use crate::ResolcVersion;
 
@@ -23,7 +22,7 @@ impl MissingLibraries {
     /// Writes the missing libraries to the standard JSON.
     pub fn write_to_standard_json(
         mut self,
-        standard_json: &mut SolcStandardJsonOutput,
+        standard_json: &mut StandardJsonOutput,
         solc_version: &SolcVersion,
     ) -> anyhow::Result<()> {
         let contracts = match standard_json.contracts.as_mut() {

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;
 
@@ -21,10 +20,6 @@ pub struct Input {
     pub optimizer_settings: revive_llvm_context::OptimizerSettings,
     /// The debug output config.
     pub debug_config: revive_llvm_context::DebugConfig,
-    /// The extra LLVM arguments give used for manual control.
-    pub llvm_arguments: Vec<String>,
-    /// The PVM memory configuration.
-    pub memory_config: SolcStandardJsonInputSettingsPolkaVMMemory,
 }
 
 impl Input {
@@ -35,8 +30,6 @@ impl Input {
         include_metadata_hash: bool,
         optimizer_settings: revive_llvm_context::OptimizerSettings,
         debug_config: revive_llvm_context::DebugConfig,
-        llvm_arguments: Vec<String>,
-        memory_config: SolcStandardJsonInputSettingsPolkaVMMemory,
     ) -> Self {
         Self {
             contract,
@@ -44,8 +37,6 @@ impl Input {
             include_metadata_hash,
             optimizer_settings,
             debug_config,
-            llvm_arguments,
-            memory_config,
         }
     }
 }

crates/solidity/src/process/mod.rs

@@ -37,20 +37,11 @@ pub trait Process {
         }
 
         let input: Input = revive_common::deserialize_from_slice(buffer.as_slice())?;
-
-        revive_llvm_context::initialize_llvm(
-            revive_llvm_context::Target::PVM,
-            crate::DEFAULT_EXECUTABLE_NAME,
-            &input.llvm_arguments,
-        );
-
         let result = input.contract.compile(
             input.project,
             input.optimizer_settings,
             input.include_metadata_hash,
             input.debug_config,
-            &input.llvm_arguments,
-            input.memory_config,
         );
 
         match result {

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;

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

@@ -5,7 +5,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;
 
 /// The contract Yul source code.
 #[derive(Debug, Serialize, Deserialize, Clone)]

crates/solidity/src/project/contract/metadata.rs

@@ -18,8 +18,6 @@ pub struct Metadata {
     pub revive_version: String,
     /// The PolkaVM compiler optimizer settings.
     pub optimizer_settings: revive_llvm_context::OptimizerSettings,
-    /// The extra LLVM arguments give used for manual control.
-    pub llvm_arguments: Vec<String>,
 }
 
 impl Metadata {
@@ -29,7 +27,6 @@ impl Metadata {
         solc_version: String,
         revive_pallet_version: Option<semver::Version>,
         optimizer_settings: revive_llvm_context::OptimizerSettings,
-        llvm_arguments: Vec<String>,
     ) -> Self {
         Self {
             solc_metadata,
@@ -37,7 +34,6 @@ impl Metadata {
             revive_pallet_version,
             revive_version: ResolcVersion::default().long,
             optimizer_settings,
-            llvm_arguments,
         }
     }
 }