wip

lint
release resolc v0.1.0-dev.14 (#289 )
2026-06-14 20:21:07 +00:00 · 2025-04-28 16:39:59 +02:00 · 2025-04-24 16:34:06 +02:00 · 2025-04-24 11:57:46 +02:00 · 2025-04-24 10:47:38 +02:00 · 2025-04-23 20:25:55 +02:00
155 changed files with 7393 additions and 1433 deletions
@@ -1,19 +1,18 @@
-name: "Get Emscripten SDK"
-inputs:
-  version:
-    description: ""
-    required: false
-    default: "3.1.64"
-
-
-runs:
-  using: "composite"
-  steps:
-    - name: install emsdk
-      shell: bash
-      run: |
-        git clone https://github.com/emscripten-core/emsdk.git ./emsdk/
-        cd emsdk
-        git checkout tags/${{ inputs.version }}
-        ./emsdk install ${{ inputs.version }}
-        ./emsdk activate ${{ inputs.version }}
+name: "Get Emscripten SDK"
+inputs:
+  version:
+    description: ""
+    required: false
+    default: "3.1.64"
+
+runs:
+  using: "composite"
+  steps:
+    - name: install emsdk
+      shell: bash
+      run: |
+        git clone https://github.com/emscripten-core/emsdk.git ./emsdk/
+        cd emsdk
+        git checkout tags/${{ inputs.version }}
+        ./emsdk install ${{ inputs.version }}
+        ./emsdk activate ${{ inputs.version }}
@@ -1,70 +1,70 @@
-# example:
-#       - uses: ./.github/actions/get-llvm
-#         with:
-#           target: x86_64-unknown-linux-gnu
-
-name: "Download LLVM"
-inputs:
-  target:
-    required: true
-
-runs:
-  using: "composite"
-  steps:
-    - name: find asset
-      id: find
-      uses: actions/github-script@v7
-      env:
-        target: ${{ inputs.target }}
-      with:
-        result-encoding: string
-        script: |
-          let page = 1;
-          let releases = [];
-
-          let releasePrefix = "llvm-"
-          let target = process.env.target
-
-          do {
-            const res = await github.rest.repos.listReleases({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              per_page: 50,
-              page,
-            });
-
-            releases = res.data
-            releases.sort((a, b) => {
-              return (a.published_at < b.published_at) ? 1 : ((a.published_at > b.published_at) ? -1 : 0);
-            });
-
-            let llvmLatestRelease = releases.find(release => {
-              return release.tag_name.startsWith(releasePrefix);
-            });
-            if (llvmLatestRelease){
-                let asset = llvmLatestRelease.assets.find(asset =>{
-                    return asset.name.includes(target);
-                });
-                if (!asset){
-                  core.setFailed(`Artifact for '${target}' not found in release ${llvmLatestRelease.tag_name} (${llvmLatestRelease.html_url})`);
-                  process.exit();
-                }
-                return asset.browser_download_url;
-            }
-
-            page++;
-          } while(releases.length > 0);
-
-          core.setFailed(`No LLVM releases with '${releasePrefix}' atifacts found! Please release LLVM before running this workflow.`);
-          process.exit();
-
-    - name: download
-      shell: bash
-      run: |
-        curl -sSLo llvm.tar.gz ${{ steps.find.outputs.result }}
-
-    - name: unpack
-      shell: bash
-      run: |
-        tar -xf llvm.tar.gz
-        rm llvm.tar.gz
+# example:
+#       - uses: ./.github/actions/get-llvm
+#         with:
+#           target: x86_64-unknown-linux-gnu
+
+name: "Download LLVM"
+inputs:
+  target:
+    required: true
+
+runs:
+  using: "composite"
+  steps:
+    - name: find asset
+      id: find
+      uses: actions/github-script@v7
+      env:
+        target: ${{ inputs.target }}
+      with:
+        result-encoding: string
+        script: |
+          let page = 1;
+          let releases = [];
+
+          let releasePrefix = "llvm-"
+          let target = process.env.target
+
+          do {
+            const res = await github.rest.repos.listReleases({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              per_page: 50,
+              page,
+            });
+
+            releases = res.data
+            releases.sort((a, b) => {
+              return (a.published_at < b.published_at) ? 1 : ((a.published_at > b.published_at) ? -1 : 0);
+            });
+
+            let llvmLatestRelease = releases.find(release => {
+              return release.tag_name.startsWith(releasePrefix);
+            });
+            if (llvmLatestRelease){
+                let asset = llvmLatestRelease.assets.find(asset =>{
+                    return asset.name.includes(target);
+                });
+                if (!asset){
+                  core.setFailed(`Artifact for '${target}' not found in release ${llvmLatestRelease.tag_name} (${llvmLatestRelease.html_url})`);
+                  process.exit();
+                }
+                return asset.browser_download_url;
+            }
+
+            page++;
+          } while(releases.length > 0);
+
+          core.setFailed(`No LLVM releases with '${releasePrefix}' atifacts found! Please release LLVM before running this workflow.`);
+          process.exit();
+
+    - name: download
+      shell: bash
+      run: |
+        curl -sSLo llvm.tar.gz ${{ steps.find.outputs.result }}
+
+    - name: unpack
+      shell: bash
+      run: |
+        tar -xf llvm.tar.gz
+        rm llvm.tar.gz
@@ -1,4 +1,5 @@
 name: "Install Solidity Compiler"
+description: "Installs the Ethereum solc Solidity compiler frontend executable"

 runs:
  using: "composite"
@@ -18,7 +19,7 @@ runs:
      shell: bash
      run: |
        mkdir -p solc
-        curl -sSL --output solc/solc https://github.com/ethereum/solidity/releases/download/v0.8.28/${SOLC_NAME}
+        curl -sSL --output solc/solc https://github.com/ethereum/solidity/releases/download/v0.8.29/${SOLC_NAME}

    - name: Make Solc Executable
      if: ${{ runner.os == 'Windows' }}
@@ -0,0 +1,165 @@
+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()
@@ -0,0 +1,64 @@
+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"
@@ -0,0 +1,49 @@
+name: NPM Release
+
+on:
+    release:
+        types: [released]
+
+env:
+    CI: true
+
+jobs:
+    publish:
+        name: Build & Publish to NPM
+        runs-on: ubuntu-latest
+        steps:
+            - name: Checkout
+              uses: actions/checkout@v4
+
+            - name: Setup Node.js
+              uses: actions/setup-node@v4
+              with:
+                  node-version: 22.x
+
+            - name: Install
+              run: yarn install --immutable
+
+            - name: update-resolc
+              run: yarn update-resolc
+
+            - name: Build
+              run: yarn build
+
+            - name: Set version
+              run: npm version --no-git-tag-version ${{github.event.release.tag_name}}
+
+            - name: npm pack
+              run: npm pack
+
+            - uses: actions/upload-artifact@v4
+              with:
+                  name: package
+                  path: 'parity-revive-*.tgz'
+
+            - uses: octokit/request-action@bbedc70b1981e610d89f1f8de88311a1fc02fb83
+              with:
+                  route: POST /repos/paritytech/npm_publish_automation/actions/workflows/publish.yml/dispatches
+                  ref: main
+                  inputs: '${{ format(''{{ "repo": "{0}", "run_id": "{1}" }}'', github.repository, github.run_id) }}'
+              env:
+                  GITHUB_TOKEN: ${{ secrets.NPM_PUBLISH_AUTOMATION_TOKEN }}
@@ -37,7 +37,15 @@ jobs:
  build:
    strategy:
      matrix:
-        target: [x86_64-unknown-linux-gnu, x86_64-unknown-linux-musl, wasm32-unknown-emscripten, aarch64-apple-darwin, x86_64-apple-darwin, x86_64-pc-windows-msvc]
+        target:
+          [
+            x86_64-unknown-linux-gnu,
+            x86_64-unknown-linux-musl,
+            wasm32-unknown-emscripten,
+            aarch64-apple-darwin,
+            x86_64-apple-darwin,
+            x86_64-pc-windows-msvc,
+          ]
        include:
          - target: x86_64-unknown-linux-gnu
            builder-arg: gnu
@@ -1,11 +1,12 @@
-name: Release
+name: Build & Release
 on:
  push:
    branches: ["main"]
+    tags:
+      - "v*"
  pull_request:
    branches: ["main"]
-    types: [opened, synchronize, labled, unlabled]
-  workflow_dispatch:
+    types: [opened, synchronize, labeled, unlabeled]

 concurrency:
  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
@@ -17,40 +18,44 @@ env:

 jobs:
  check-version-changed:
-    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
-        with:
-          fetch-tags: true

-      - name: Check Versions
+      # Check that tag and version in Cargo.toml match
+      - name: Check versions
        id: versions
        run: |
-          export CURRENT_TAG=$(git describe --tags --abbrev=0 --exclude "llvm-*")
+          if [[ $CURRENT_TAG == 'main' ]];
+            then
+              echo "::notice::Tag $CURRENT_TAG is not a release tag, skipping the check in the main branch";
+              exit 0
+            fi
+
+          if [[ $CURRENT_TAG != "v"* ]];
+            then
+              echo "::notice::Tag $CURRENT_TAG is not a release tag, skipping the check in a PR";
+              exit 0
+            fi
+
          export PKG_VER=v$(cat 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"
          #
-          echo "PKG_VER=$PKG_VER" >> $GITHUB_OUTPUT
-          if [[ $CURRENT_TAG == $PKG_VER  ]];
+          if [[ $CURRENT_TAG != $PKG_VER  ]];
            then
-              echo "Tag is up to date. Nothing to do.";
-              export TAG=old;
-            else
-              echo "Tag was updated.";
-              export TAG=new;
+              echo "::error::Tag $CURRENT_TAG doesn't match package version $PKG_VER in Cargo.toml, please fix";
+              exit 1
            fi
-          echo "TAG=$TAG" >> $GITHUB_OUTPUT

          # Generating release notes early, in order to avoid checkout at the last step
-          export RELEASE_NOTES="$(sed '/^## '${PKG_VER}'/,/^## v/!d' CHANGELOG.md | sed -e '1d' -e '$d')"
+          export RELEASE_NOTES="$(sed '/^## '${CURRENT_TAG}'/,/^## v/!d' CHANGELOG.md | sed -e '1d' -e '$d')"

          echo "Release notes:"
          echo "$RELEASE_NOTES"
@@ -62,7 +67,13 @@ jobs:
  build:
    strategy:
      matrix:
-        target: [x86_64-unknown-linux-musl, aarch64-apple-darwin, x86_64-apple-darwin, x86_64-pc-windows-msvc]
+        target:
+          [
+            x86_64-unknown-linux-musl,
+            aarch64-apple-darwin,
+            x86_64-apple-darwin,
+            x86_64-pc-windows-msvc,
+          ]
        include:
          - target: x86_64-unknown-linux-musl
            type: musl
@@ -76,14 +87,13 @@ jobs:
          - target: x86_64-pc-windows-msvc
            type: native
            runner: windows-2022
-    if: ${{ needs.check-version-changed.outputs.TAG == 'new' }}
    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
+          # without this it will override our rust flags
          rustflags: ""
          cache-key: ${{ matrix.target }}

@@ -130,9 +140,10 @@ jobs:
          retention-days: 1

  build-wasm:
-    if: ${{ needs.check-version-changed.outputs.TAG == 'new' }}
    runs-on: ubuntu-24.04
    needs: [check-version-changed]
+    env:
+      RELEASE_RESOLC_WASM_URI: https://github.com/paritytech/revive-workflow-test/releases/download/${{ github.ref_name }}/resolc.wasm
    steps:
      - uses: actions/checkout@v4
      - uses: actions-rust-lang/setup-rust-toolchain@v1
@@ -165,12 +176,12 @@ jobs:
      - name: Set Up Node.js
        uses: actions/setup-node@v3
        with:
-         node-version: "20"
+          node-version: "20"

      - name: Basic Sanity Check
        run: |
          mkdir -p solc
-          curl -sSLo solc/soljson.js https://github.com/ethereum/solidity/releases/download/v0.8.28/soljson.js
+          curl -sSLo solc/soljson.js https://github.com/ethereum/solidity/releases/download/v0.8.29/soljson.js
          node -e "
          const soljson = require('solc/soljson');
          const createRevive = require('./target/wasm32-unknown-emscripten/release/resolc.js');
@@ -207,23 +218,22 @@ jobs:

      - name: Compress Artifact
        run: |
-          tar -czf $(pwd)/resolc-wasm32-unknown-emscripten.tar.gz -C ./target/wasm32-unknown-emscripten/release/ \
-            resolc.js \
-            resolc.wasm \
-            resolc_web.js
+          mkdir -p resolc-wasm32-unknown-emscripten
+          mv ./target/wasm32-unknown-emscripten/release/resolc.js ./resolc-wasm32-unknown-emscripten/
+          mv ./target/wasm32-unknown-emscripten/release/resolc.wasm ./resolc-wasm32-unknown-emscripten/
+          mv ./target/wasm32-unknown-emscripten/release/resolc_web.js ./resolc-wasm32-unknown-emscripten/

      - uses: actions/upload-artifact@v4
        with:
          name: resolc-wasm32-unknown-emscripten
-          path: resolc-wasm32-unknown-emscripten.tar.gz
+          path: resolc-wasm32-unknown-emscripten/*
          retention-days: 1

  create-release:
-    if: github.event_name != 'pull_request'
+    if: startsWith(github.ref_name, 'v')
    needs: [check-version-changed, build-wasm]
    runs-on: macos-14
-    permissions:
-      contents: write
+    environment: tags
    steps:
      - name: Download Artifacts
        uses: actions/download-artifact@v4
@@ -234,13 +244,25 @@ jobs:
        run: |
          lipo resolc-aarch64-apple-darwin resolc-x86_64-apple-darwin -create -output resolc-universal-apple-darwin

-      - name: Compress Artifacts
+      - name: Make Executable
        run: |
          chmod +x resolc-x86_64-unknown-linux-musl
          chmod +x resolc-universal-apple-darwin
-          tar -czf resolc-x86_64-unknown-linux-musl.tar.gz resolc-x86_64-unknown-linux-musl
-          tar -czf resolc-universal-apple-darwin.tar.gz resolc-universal-apple-darwin
-          zip -j resolc-x86_64-pc-windows-msvc.zip resolc-x86_64-pc-windows-msvc.exe
+
+      - name: Create sha-256 checksum
+        run: |
+          shasum -a 256 resolc-x86_64-unknown-linux-musl > checksums.txt
+          shasum -a 256 resolc-universal-apple-darwin >> checksums.txt
+          shasum -a 256 resolc-x86_64-pc-windows-msvc.exe >> checksums.txt
+          shasum -a 256 resolc.js >> checksums.txt
+          shasum -a 256 resolc.wasm >> checksums.txt
+          shasum -a 256 resolc_web.js >> checksums.txt
+
+      - uses: actions/create-github-app-token@v1
+        id: app-token
+        with:
+          app-id: ${{ secrets.REVIVE_RELEASE_APP_ID }}
+          private-key: ${{ secrets.REVIVE_RELEASE_APP_KEY }}

      - name: create-release
        uses: softprops/action-gh-release@v2
@@ -251,12 +273,16 @@ jobs:

            ## 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: ${{ needs.check-version-changed.outputs.PKG_VER }}
-          name: ${{ needs.check-version-changed.outputs.PKG_VER }}
-          draft: true
+          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.tar.gz
-            resolc-universal-apple-darwin.tar.gz
-            resolc-wasm32-unknown-emscripten.tar.gz
-            resolc-x86_64-pc-windows-msvc.zip
+            resolc-x86_64-unknown-linux-musl
+            resolc-universal-apple-darwin
+            resolc-x86_64-pc-windows-msvc.exe
+            resolc.js
+            resolc.wasm
+            resolc_web.js
+            checksums.txt
@@ -4,9 +4,9 @@ on:
    branches: ["main"]
    types: [opened, synchronize]
    paths:
-      - 'LLVM.lock'
-      - 'crates/llvm-builder/**'
-      - '.github/workflows/test-llvm-builder.yml'
+      - "LLVM.lock"
+      - "crates/llvm-builder/**"
+      - ".github/workflows/test-llvm-builder.yml"

 concurrency:
  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
@@ -1,4 +1,5 @@
 /target
+/js/resolc/dist
 target-llvm
 *.dot
 .vscode/
@@ -6,6 +6,53 @@ This is a development pre-release.

 Supported `polkadot-sdk` rev:`c29e72a8628835e34deb6aa7db9a78a2e4eabcee`

+### Added
+
+### Changed
+
+### Fixed
+
+## 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.
@@ -13,10 +60,12 @@ This is a development pre-release.
 Supported `polkadot-sdk` rev: `21f6f0705e53c15aa2b8a5706b208200447774a9`

 ### Added
+
 - Per file output selection for `--standard-json` mode.
 - The `ir` output selection option for `--standard-json` mode.

 ### Changed
+
 - Improved code size: Large contracts compile to smaller code blobs when enabling aggressive size optimizations (`-Oz`).

 ### Fixed
@@ -32,6 +81,7 @@ 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.

@@ -42,10 +92,12 @@ 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.
@@ -55,6 +107,7 @@ 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.
@@ -68,9 +121,11 @@ 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
@@ -78,15 +133,18 @@ 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.
@@ -96,17 +154,20 @@ 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.
@@ -116,6 +177,7 @@ 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`.
@@ -123,21 +185,24 @@ 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)

+- 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
@@ -147,9 +212,11 @@ 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.

@@ -4553,7 +4553,7 @@ checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104"

 [[package]]
 name = "lld-sys"
-version = "0.1.0-dev.12"
+version = "0.1.0-dev.14"
 dependencies = [
 "cc",
 "libc",
@@ -4965,9 +4965,9 @@ checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381"

 [[package]]
 name = "openssl"
-version = "0.10.71"
+version = "0.10.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e14130c6a98cd258fdcb0fb6d744152343ff729cbfcb28c656a9d12b999fbcd"
+checksum = "fedfea7d58a1f73118430a55da6a286e7b044961736ce96a16a17068ea25e5da"
 dependencies = [
 "bitflags 2.8.0",
 "cfg-if",
@@ -4997,9 +4997,9 @@ checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e"

 [[package]]
 name = "openssl-sys"
-version = "0.9.106"
+version = "0.9.107"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bb61ea9811cc39e3c2069f40b8b8e2e70d8569b361f879786cc7ed48b777cdd"
+checksum = "8288979acd84749c744a9014b4382d42b8f7b2592847b5afb2ed29e5d16ede07"
 dependencies = [
 "cc",
 "libc",
@@ -8266,7 +8266,7 @@ dependencies = [

 [[package]]
 name = "revive-benchmarks"
-version = "0.1.0-dev.12"
+version = "0.1.0-dev.14"
 dependencies = [
 "alloy-primitives",
 "criterion",
@@ -8278,18 +8278,18 @@ dependencies = [

 [[package]]
 name = "revive-build-utils"
-version = "0.1.0-dev.12"
+version = "0.1.0-dev.14"

 [[package]]
 name = "revive-builtins"
-version = "0.1.0-dev.12"
+version = "0.1.0-dev.14"
 dependencies = [
 "revive-build-utils",
 ]

 [[package]]
 name = "revive-common"
-version = "0.1.0-dev.12"
+version = "0.1.0-dev.14"
 dependencies = [
 "anyhow",
 "serde",
@@ -8299,7 +8299,7 @@ dependencies = [

 [[package]]
 name = "revive-differential"
-version = "0.1.0-dev.12"
+version = "0.1.0-dev.14"
 dependencies = [
 "alloy-genesis",
 "alloy-primitives",
@@ -8312,7 +8312,7 @@ dependencies = [

 [[package]]
 name = "revive-integration"
-version = "0.1.0-dev.12"
+version = "0.1.0-dev.14"
 dependencies = [
 "alloy-primitives",
 "alloy-sol-types",
@@ -8328,7 +8328,7 @@ dependencies = [

 [[package]]
 name = "revive-linker"
-version = "0.1.0-dev.12"
+version = "0.1.0-dev.14"
 dependencies = [
 "anyhow",
 "libc",
@@ -8340,7 +8340,7 @@ dependencies = [

 [[package]]
 name = "revive-llvm-builder"
-version = "0.1.0-dev.12"
+version = "0.1.0-dev.14"
 dependencies = [
 "anyhow",
 "assert_cmd",
@@ -8362,18 +8362,20 @@ dependencies = [

 [[package]]
 name = "revive-llvm-context"
-version = "0.1.0-dev.12"
+version = "0.1.0-dev.14"
 dependencies = [
 "anyhow",
 "hex",
 "inkwell",
 "itertools 0.14.0",
+ "libc",
 "num",
 "polkavm-common 0.21.0",
 "polkavm-disassembler",
 "revive-common",
 "revive-linker",
 "revive-runtime-api",
+ "revive-solc-json-interface",
 "revive-stdlib",
 "semver 1.0.25",
 "serde",
@@ -8382,9 +8384,12 @@ dependencies = [

 [[package]]
 name = "revive-runner"
-version = "0.1.0-dev.12"
+version = "0.1.0-dev.14"
 dependencies = [
 "alloy-primitives",
+ "anyhow",
+ "clap",
+ "env_logger 0.11.6",
 "hex",
 "parity-scale-codec",
 "polkadot-sdk 0.1.0",
@@ -8398,7 +8403,7 @@ dependencies = [

 [[package]]
 name = "revive-runtime-api"
-version = "0.1.0-dev.12"
+version = "0.1.0-dev.14"
 dependencies = [
 "anyhow",
 "inkwell",
@@ -8406,9 +8411,21 @@ dependencies = [
 "revive-common",
 ]

+[[package]]
+name = "revive-solc-json-interface"
+version = "0.1.0-dev.14"
+dependencies = [
+ "anyhow",
+ "rayon",
+ "revive-common",
+ "semver 1.0.25",
+ "serde",
+ "serde_json",
+]
+
 [[package]]
 name = "revive-solidity"
-version = "0.1.0-dev.12"
+version = "0.1.0-dev.14"
 dependencies = [
 "anyhow",
 "clap",
@@ -8424,6 +8441,7 @@ dependencies = [
 "regex",
 "revive-common",
 "revive-llvm-context",
+ "revive-solc-json-interface",
 "semver 1.0.25",
 "serde",
 "serde_json",
@@ -8434,7 +8452,7 @@ dependencies = [

 [[package]]
 name = "revive-stdlib"
-version = "0.1.0-dev.12"
+version = "0.1.0-dev.14"
 dependencies = [
 "inkwell",
 "revive-build-utils",
@@ -11102,9 +11120,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"

 [[package]]
 name = "tokio"
-version = "1.43.0"
+version = "1.44.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d61fa4ffa3de412bfea335c6ecff681de2b609ba3c77ef3e00e521813a9ed9e"
+checksum = "e6b88822cbe49de4185e3a4cbf8321dd487cf5fe0c5c65695fef6346371e9c48"
 dependencies = [
 "backtrace",
 "bytes",
@@ -3,7 +3,7 @@ resolver = "2"
 members = ["crates/*"]

 [workspace.package]
-version = "0.1.0-dev.12"
+version = "0.1.0-dev.14"
 authors = [
    "Cyrill Leutwiler <cyrill@parity.io>",
    "Parity Technologies <admin@parity.io>",
@@ -14,19 +14,20 @@ repository = "https://github.com/paritytech/revive"
 rust-version = "1.81.0"

 [workspace.dependencies]
-revive-benchmarks = { version = "0.1.0-dev.12", path = "crates/benchmarks" }
-revive-builtins = { version = "0.1.0-dev.12", path = "crates/builtins" }
-revive-common = { version = "0.1.0-dev.12", path = "crates/common" }
-revive-differential = { version = "0.1.0-dev.12", path = "crates/differential" }
-revive-integration = { version = "0.1.0-dev.12", path = "crates/integration" }
-revive-linker = { version = "0.1.0-dev.12", path = "crates/linker" }
-lld-sys = { version = "0.1.0-dev.12", path = "crates/lld-sys" }
-revive-llvm-context = { version = "0.1.0-dev.12", path = "crates/llvm-context" }
-revive-runtime-api = { version = "0.1.0-dev.12", path = "crates/runtime-api" }
-revive-runner = { version = "0.1.0-dev.12", path = "crates/runner" }
-revive-solidity = { version = "0.1.0-dev.12", path = "crates/solidity" }
-revive-stdlib = { version = "0.1.0-dev.12", path = "crates/stdlib" }
-revive-build-utils = { version = "0.1.0-dev.12", path = "crates/build-utils" }
+revive-benchmarks = { version = "0.1.0-dev.14", path = "crates/benchmarks" }
+revive-builtins = { version = "0.1.0-dev.14", path = "crates/builtins" }
+revive-common = { version = "0.1.0-dev.14", path = "crates/common" }
+revive-differential = { version = "0.1.0-dev.14", path = "crates/differential" }
+revive-integration = { version = "0.1.0-dev.14", path = "crates/integration" }
+revive-linker = { version = "0.1.0-dev.14", path = "crates/linker" }
+lld-sys = { version = "0.1.0-dev.14", path = "crates/lld-sys" }
+revive-llvm-context = { version = "0.1.0-dev.14", path = "crates/llvm-context" }
+revive-runtime-api = { version = "0.1.0-dev.14", path = "crates/runtime-api" }
+revive-runner = { version = "0.1.0-dev.14", path = "crates/runner" }
+revive-solc-json-interface = { version = "0.1.0-dev.14", path = "crates/solc-json-interface" }
+revive-solidity = { version = "0.1.0-dev.14", path = "crates/solidity" }
+revive-stdlib = { version = "0.1.0-dev.14", path = "crates/stdlib" }
+revive-build-utils = { version = "0.1.0-dev.14", path = "crates/build-utils" }

 hex = "0.4.3"
 cc = "1.2"
@@ -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:x86_64-musl AS resolc-builder
+FROM messense/rust-musl-cross@sha256:68b86bc7cb2867259e6b233415a665ff4469c28b57763e78c3bfea1c68091561 AS resolc-builder
 WORKDIR /opt/revive

 RUN apt update && \ 
@@ -5,6 +5,7 @@
 	install-wasm \
 	install-llvm-builder \
 	install-llvm \
+	install-revive-runner \
 	format \
 	clippy \
 	machete \
@@ -23,7 +24,7 @@
 install: install-bin install-npm

 install-bin:
-	cargo install --path crates/solidity
+	cargo install --locked --path crates/solidity

 install-npm:
 	npm install && npm fund
@@ -39,6 +40,9 @@ install-llvm: install-llvm-builder
 	revive-llvm clone
 	revive-llvm build --llvm-projects lld --llvm-projects clang

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

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

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

 test-integration: install-bin
 	cargo test --package revive-integration
@@ -1,4 +1,4 @@
-![CI](https://github.com/paritytech/revive/actions/workflows/rust.yml/badge.svg)
+![CI](https://github.com/paritytech/revive/actions/workflows/test.yml/badge.svg)
 [![Docs](https://img.shields.io/badge/Docs-contracts.polkadot.io-brightgreen.svg)](https://contracts.polkadot.io/revive_compiler/)

 # revive
@@ -14,6 +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
+
 Please consult [the documentation](https://contracts.polkadot.io/revive_compiler/installation) for installation instructions.

 ## Building from source
@@ -30,11 +31,13 @@ Building revive requires a [stable Rust installation](https://rustup.rs/) and a
 Download the [latest LLVM build](https://github.com/paritytech/revive/releases?q=LLVM+binaries+release&expanded=true) from our releases.

 > **MacOS** users need to clear the `downloaded` attribute from all binaries after extracting the archive:
+>
 > ```sh
 > xattr -rc </path/to/the/extracted/archive>/target-llvm/gnu/target-final/bin/*
 > ```

 After extracting the archive, point `$LLVM_SYS_181_PREFIX` to it:
+
 ```sh
 export LLVM_SYS_181_PREFIX=</path/to/the/extracted/archive>/target-llvm/gnu/target-final
 ```
@@ -44,7 +47,7 @@ export LLVM_SYS_181_PREFIX=</path/to/the/extracted/archive>/target-llvm/gnu/targ
 <details>
  <summary>Building from source</summary>

- Use the provided [revive-llvm](crates/llvm-builder/README.md) utility to compile a compatible LLVM build locally and point `$LLVM_SYS_181_PREFIX` to the installation afterwards.
+Use the provided [revive-llvm](crates/llvm-builder/README.md) utility to compile a compatible LLVM build locally and point `$LLVM_SYS_181_PREFIX` to the installation afterwards.

 The `Makefile` provides a shortcut target to obtain a compatible LLVM build:

@@ -93,11 +96,12 @@ make test-wasm

 ## Development

-Please consult the [Makefile](Makefile) targets to learn how to run tests and benchmarks. 
+Please consult the [Makefile](Makefile) targets to learn how to run tests and benchmarks.
 Ensure that your branch passes `make test` locally when submitting a pull request.

 ### Design overview
-See the [relevant section in our documentation](https://contracts.polkadot.io/revive_compiler/architecture) to learn more about how the compiler works. 
+
+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).

@@ -4,15 +4,18 @@ 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 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.
-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.
-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).
-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)
-5. Update the [contract-docs](https://github.com/paritytech/contract-docs/) accordingly
+1. Create a release PR which updates the `-dev.X` versions in the workspace `Cargo.toml` and updates the `CHANGELOG.md` accordingly.
+2. If the CI passes, merge the release PR.
+3. Push a tag that has the same `-dev.X` version as in `Cargo.toml`
+4. The release workflow will attempt to build and publish a new pre-release if the latest tag does match the cargo package version.
+5. Wait for the `Release` workflow to finish. It should create the pre-release with the same `-dev.X` name.
+6. Check that pre-release was created on the [Releases page](https://github.com/paritytech/revive/releases) with all artifacts.
+7. After the release is published, another workflow should start automatically and update json files in https://github.com/paritytech/resolc-bin. Check the changes.
+8. Update the [contract-docs](https://github.com/paritytech/contract-docs/) accordingly

 # LLVM release

 To create a new LLVM release, run "Release LLVM" workflow. Use current LLVM version as parameter, e.g. `18.1.8`.
 Version suffix will be resolved automatically.  
 The workflows will create new GitHub release, and upload LLVM binaries.
-Next release of resolc will use newly created binaries.  
+Next release of resolc will use newly created binaries.
@@ -1 +1 @@
-https://github.com/paritytech/polkadot-sdk/blob/master/docs/contributor/SECURITY.md
+https://github.com/paritytech/polkadot-sdk/blob/master/docs/contributor/SECURITY.md
@@ -3,71 +3,71 @@
 ## Table of Contents

 - [Benchmark Results](#benchmark-results)
-    - [Baseline](#baseline)
-    - [OddPorduct](#oddporduct)
-    - [TriangleNumber](#trianglenumber)
-    - [FibonacciRecursive](#fibonaccirecursive)
-    - [FibonacciIterative](#fibonacciiterative)
-    - [FibonacciBinet](#fibonaccibinet)
-    - [SHA1](#sha1)
+  - [Baseline](#baseline)
+  - [OddPorduct](#oddporduct)
+  - [TriangleNumber](#trianglenumber)
+  - [FibonacciRecursive](#fibonaccirecursive)
+  - [FibonacciIterative](#fibonacciiterative)
+  - [FibonacciBinet](#fibonaccibinet)
+  - [SHA1](#sha1)

 ## Benchmark Results

 ### Baseline

-|         | `EVM`                   | `PVMInterpreter`                 |
-|:--------|:------------------------|:-------------------------------- |
-| **`0`** | `3.36 us` (✅ **1.00x**) | `11.84 us` (❌ *3.52x slower*)    |
+|         | `EVM`                     | `PVMInterpreter`                 |
+| :------ | :------------------------ | :------------------------------- |
+| **`0`** | `10.08 us` (✅ **1.00x**) | `10.32 us` (✅ **1.02x slower**) |

 ### OddPorduct

-|              | `EVM`                    | `PVMInterpreter`                 |
-|:-------------|:-------------------------|:-------------------------------- |
-| **`10000`**  | `3.11 ms` (✅ **1.00x**)  | `1.53 ms` (🚀 **2.03x faster**)   |
-| **`100000`** | `30.70 ms` (✅ **1.00x**) | `15.54 ms` (🚀 **1.98x faster**)  |
-| **`300000`** | `92.68 ms` (✅ **1.00x**) | `45.47 ms` (🚀 **2.04x faster**)  |
+|              | `EVM`                      | `PVMInterpreter`                 |
+| :----------- | :------------------------- | :------------------------------- |
+| **`10000`**  | `3.60 ms` (✅ **1.00x**)   | `1.57 ms` (🚀 **2.28x faster**)  |
+| **`100000`** | `34.72 ms` (✅ **1.00x**)  | `14.82 ms` (🚀 **2.34x faster**) |
+| **`300000`** | `105.01 ms` (✅ **1.00x**) | `44.11 ms` (🚀 **2.38x faster**) |

 ### TriangleNumber

-|              | `EVM`                    | `PVMInterpreter`                 |
-|:-------------|:-------------------------|:-------------------------------- |
-| **`10000`**  | `2.29 ms` (✅ **1.00x**)  | `1.09 ms` (🚀 **2.11x faster**)   |
-| **`100000`** | `22.84 ms` (✅ **1.00x**) | `10.66 ms` (🚀 **2.14x faster**)  |
-| **`360000`** | `82.29 ms` (✅ **1.00x**) | `37.01 ms` (🚀 **2.22x faster**)  |
+|              | `EVM`                     | `PVMInterpreter`                 |
+| :----------- | :------------------------ | :------------------------------- |
+| **`10000`**  | `2.43 ms` (✅ **1.00x**)  | `1.12 ms` (🚀 **2.17x faster**)  |
+| **`100000`** | `24.20 ms` (✅ **1.00x**) | `10.86 ms` (🚀 **2.23x faster**) |
+| **`360000`** | `88.69 ms` (✅ **1.00x**) | `38.46 ms` (🚀 **2.31x faster**) |

 ### FibonacciRecursive

-|          | `EVM`                     | `PVMInterpreter`                  |
-|:---------|:--------------------------|:--------------------------------- |
-| **`12`** | `135.67 us` (✅ **1.00x**) | `125.02 us` (✅ **1.09x faster**)  |
-| **`16`** | `903.75 us` (✅ **1.00x**) | `762.79 us` (✅ **1.18x faster**)  |
-| **`20`** | `6.12 ms` (✅ **1.00x**)   | `4.96 ms` (✅ **1.23x faster**)    |
-| **`24`** | `42.05 ms` (✅ **1.00x**)  | `33.86 ms` (✅ **1.24x faster**)   |
+|          | `EVM`                      | `PVMInterpreter`                  |
+| :------- | :------------------------- | :-------------------------------- |
+| **`12`** | `144.17 us` (✅ **1.00x**) | `150.85 us` (✅ **1.05x slower**) |
+| **`16`** | `938.71 us` (✅ **1.00x**) | `922.11 us` (✅ **1.02x faster**) |
+| **`20`** | `6.54 ms` (✅ **1.00x**)   | `6.20 ms` (✅ **1.05x faster**)   |
+| **`24`** | `45.73 ms` (✅ **1.00x**)  | `41.98 ms` (✅ **1.09x faster**)  |

 ### FibonacciIterative

-|           | `EVM`                    | `PVMInterpreter`                 |
-|:----------|:-------------------------|:-------------------------------- |
-| **`64`**  | `15.04 us` (✅ **1.00x**) | `29.45 us` (❌ *1.96x slower*)    |
-| **`128`** | `26.36 us` (✅ **1.00x**) | `42.19 us` (❌ *1.60x slower*)    |
-| **`256`** | `48.61 us` (✅ **1.00x**) | `65.71 us` (❌ *1.35x slower*)    |
+|           | `EVM`                     | `PVMInterpreter`                 |
+| :-------- | :------------------------ | :------------------------------- |
+| **`64`**  | `23.00 us` (✅ **1.00x**) | `31.88 us` (❌ _1.39x slower_)   |
+| **`128`** | `35.28 us` (✅ **1.00x**) | `42.43 us` (❌ _1.20x slower_)   |
+| **`256`** | `60.12 us` (✅ **1.00x**) | `61.20 us` (✅ **1.02x slower**) |

 ### FibonacciBinet

-|           | `EVM`                    | `PVMInterpreter`                 |
-|:----------|:-------------------------|:-------------------------------- |
-| **`64`**  | `15.22 us` (✅ **1.00x**) | `41.46 us` (❌ *2.72x slower*)    |
-| **`128`** | `17.05 us` (✅ **1.00x**) | `42.84 us` (❌ *2.51x slower*)    |
-| **`256`** | `19.00 us` (✅ **1.00x**) | `44.36 us` (❌ *2.34x slower*)    |
+|           | `EVM`                     | `PVMInterpreter`               |
+| :-------- | :------------------------ | :----------------------------- |
+| **`64`**  | `23.01 us` (✅ **1.00x**) | `47.74 us` (❌ _2.07x slower_) |
+| **`128`** | `25.44 us` (✅ **1.00x**) | `49.67 us` (❌ _1.95x slower_) |
+| **`256`** | `28.66 us` (✅ **1.00x**) | `53.01 us` (❌ _1.85x slower_) |

 ### SHA1

-|           | `EVM`                     | `PVMInterpreter`                  |
-|:----------|:--------------------------|:--------------------------------- |
-| **`1`**   | `110.04 us` (✅ **1.00x**) | `216.11 us` (❌ *1.96x slower*)    |
-| **`64`**  | `209.04 us` (✅ **1.00x**) | `309.48 us` (❌ *1.48x slower*)    |
-| **`512`** | `903.65 us` (✅ **1.00x**) | `980.49 us` (✅ **1.09x slower**)  |
+|           | `EVM`                      | `PVMInterpreter`                |
+| :-------- | :------------------------- | :------------------------------ |
+| **`1`**   | `135.87 us` (✅ **1.00x**) | `243.75 us` (❌ _1.79x slower_) |
+| **`64`**  | `258.45 us` (✅ **1.00x**) | `355.70 us` (❌ _1.38x slower_) |
+| **`512`** | `1.10 ms` (✅ **1.00x**)   | `1.09 ms` (✅ **1.01x faster**) |

 ---
-Made with [criterion-table](https://github.com/nu11ptr/criterion-table)

+Made with [criterion-table](https://github.com/nu11ptr/criterion-table)
@@ -1,47 +1,47 @@
 {
-    "config": {
-        "chainId": 420420420,
-        "homesteadBlock": 0,
-        "eip150Block": 0,
-        "eip155Block": 0,
-        "eip158Block": 0,
-        "byzantiumBlock": 0,
-        "constantinopleBlock": 0,
-        "petersburgBlock": 0,
-        "istanbulBlock": 0,
-        "berlinBlock": 0,
-        "londonBlock": 0,
-        "arrowGlacierBlock": 0,
-        "grayGlacierBlock": 0,
-        "shanghaiTime": 0,
-        "cancunTime": 0,
-        "terminalTotalDifficulty": 0,
-        "terminalTotalDifficultyPassed": true,
-        "blobSchedule": {
-            "cancun": {
-                "target": 3,
-                "max": 6,
-                "baseFeeUpdateFraction": 3338477
-            }
-        }
-    },
-    "coinbase": "0xffffffffffffffffffffffffffffffffffffffff",
-    "difficulty": "0x20000",
-    "extraData": "",
-    "gasLimit": "0xffffffff",
-    "nonce": "0x0000000000000042",
-    "mixhash": "0x0000000000000000000000000000000000000000000000000000000000000000",
-    "parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
-    "timestamp": "0x00",
-    "alloc": {
-        "0101010101010101010101010101010101010101": {
-            "balance": "1000000000"
-        },
-        "0202020202020202020202020202020202020202": {
-            "balance": "1000000000"
-        },
-        "0303030303030303030303030303030303030303": {
-            "balance": "1000000000"
-        }
+  "config": {
+    "chainId": 420420420,
+    "homesteadBlock": 0,
+    "eip150Block": 0,
+    "eip155Block": 0,
+    "eip158Block": 0,
+    "byzantiumBlock": 0,
+    "constantinopleBlock": 0,
+    "petersburgBlock": 0,
+    "istanbulBlock": 0,
+    "berlinBlock": 0,
+    "londonBlock": 0,
+    "arrowGlacierBlock": 0,
+    "grayGlacierBlock": 0,
+    "shanghaiTime": 0,
+    "cancunTime": 0,
+    "terminalTotalDifficulty": 0,
+    "terminalTotalDifficultyPassed": true,
+    "blobSchedule": {
+      "cancun": {
+        "target": 3,
+        "max": 6,
+        "baseFeeUpdateFraction": 3338477
+      }
    }
-}
+  },
+  "coinbase": "0xffffffffffffffffffffffffffffffffffffffff",
+  "difficulty": "0x20000",
+  "extraData": "",
+  "gasLimit": "0xffffffff",
+  "nonce": "0x0000000000000042",
+  "mixhash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "timestamp": "0x00",
+  "alloc": {
+    "0101010101010101010101010101010101010101": {
+      "balance": "1000000000"
+    },
+    "0202020202020202020202020202020202020202": {
+      "balance": "1000000000"
+    },
+    "0303030303030303030303030303030303030303": {
+      "balance": "1000000000"
+    }
+  }
+}
@@ -1,10 +1,10 @@
 {
-  "Baseline": 1443,
-  "Computation": 2788,
-  "DivisionArithmetics": 9748,
-  "ERC20": 19203,
-  "Events": 2201,
-  "FibonacciIterative": 2041,
-  "Flipper": 2632,
-  "SHA1": 8958
-}
+  "Baseline": 939,
+  "Computation": 2282,
+  "DivisionArithmetics": 8849,
+  "ERC20": 18308,
+  "Events": 1640,
+  "FibonacciIterative": 1497,
+  "Flipper": 2099,
+  "SHA1": 8243
+}
@@ -0,0 +1,33 @@
+// 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)));
+    }
+}
@@ -0,0 +1,52 @@
+// 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
+        }
+    }
+}
@@ -15,7 +15,7 @@ pragma solidity ^0.8;
                "Instantiated": 0
            },
            "key": "0000000000000000000000000000000000000000000000000000000000000000",
-            "expected": "0100000000000000000000000000000000000000000000000000000000000000"
+            "expected": "0000000000000000000000000000000000000000000000000000000000000001"
        }
    },
    {
@@ -250,6 +250,17 @@ 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 {
@@ -59,6 +59,7 @@ 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 {
@@ -485,3 +486,31 @@ 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();
+}
@@ -6,6 +6,7 @@ Parity fork of the [Matter Labs zksync LLVM builder](https://github.com/matter-l

 The LLVM compiler framework for revive must be built with our tool called `revive-llvm`.
 This is because the revive compiler has requirements not fullfilled in upstream builds:
+
 - Special builds for compiling the frontend into statically linked ELF binaries and also Wasm executables
 - The RISC-V target (the PolkaVM target)
 - The compiler-rt builtins for the PolkaVM target
@@ -17,85 +18,92 @@ Obtain a compatible build for your host platform from the release section of thi
 <details>
 <summary>1. Install the system prerequisites.</summary>

-   * Linux (Debian):
+- Linux (Debian):

-      Install the following packages:
-      ```shell
-      apt install cmake ninja-build curl git libssl-dev pkg-config clang lld
-      ```
-   * Linux (Arch):
+  Install the following packages:

-      Install the following packages:
-      ```shell
-      pacman -Syu which cmake ninja curl git pkg-config clang lld
-      ```
+  ```shell
+  apt install cmake ninja-build curl git libssl-dev pkg-config clang lld
+  ```

-   * MacOS:
+- Linux (Arch):

-      * Install the [HomeBrew](https://brew.sh) package manager.
-      * Install the following packages:
+  Install the following packages:

-         ```shell
-         brew install cmake ninja coreutils
-         ```
+  ```shell
+  pacman -Syu which cmake ninja curl git pkg-config clang lld
+  ```

-      * Install your choice of a recent LLVM/[Clang](https://clang.llvm.org) compiler, e.g. via [Xcode](https://developer.apple.com/xcode/), [Apple’s Command Line Tools](https://developer.apple.com/library/archive/technotes/tn2339/_index.html), or your preferred package manager.
-</details>
+- MacOS:
+
+        * Install the [HomeBrew](https://brew.sh) package manager.
+        * Install the following packages:
+
+           ```shell
+           brew install cmake ninja coreutils
+           ```
+
+        * Install your choice of a recent LLVM/[Clang](https://clang.llvm.org) compiler, e.g. via [Xcode](https://developer.apple.com/xcode/), [Apple’s Command Line Tools](https://developer.apple.com/library/archive/technotes/tn2339/_index.html), or your preferred package manager.
+
+  </details>

 <details>
 <summary>2. Install Rust.</summary>

-   * Follow the latest [official instructions](https://www.rust-lang.org/tools/install:
-      ```shell
+- Follow the latest [official instructions](https://www.rust-lang.org/tools/install:
+  `shell
      curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
      . ${HOME}/.cargo/env
-      ```
+      `

-      > Currently we are not pinned to any specific version of Rust, so just install the latest stable build for your   platform.
-</details>
+        > Currently we are not pinned to any specific version of Rust, so just install the latest stable build for your   platform.
+
+  </details>

 <details>
 <summary>3. Install the revive LLVM framework builder.</summary>

-   * Install the builder using `cargo`:
-      ```shell
-      cargo install --git https://github.com/paritytech/revive-llvm-builder --force --locked
-      ```
+- Install the builder using `cargo`:

-      > The builder is not the LLVM framework itself, but a tool that clones its repository and runs a sequence of build commands. By default it is installed in `~/.cargo/bin/`, which is recommended to be added to your `$PATH`.
+  ```shell
+  cargo install --git https://github.com/paritytech/revive-llvm-builder --force --locked
+  ```
+
+  > The builder is not the LLVM framework itself, but a tool that clones its repository and runs a sequence of build commands. By default it is installed in `~/.cargo/bin/`, which is recommended to be added to your `$PATH`.

 </details>

 <details>
 <summary>4. (Optional) Create the `LLVM.lock` file.</summary>

-   * The `LLVM.lock` dictates the LLVM source tree being used.
-     A default `./LLVM.lock` pointing to the release used for development is already provided.
+- The `LLVM.lock` dictates the LLVM source tree being used.
+  A default `./LLVM.lock` pointing to the release used for development is already provided.

 </details>

 <details>
 <summary>5. Build LLVM.</summary>

-   * Clone and build the LLVM framework using the `revive-llvm` tool.
+- Clone and build the LLVM framework using the `revive-llvm` tool.

-     The clang and lld projects are required for the `resolc` Solidity frontend executable; they are enabled by default. LLVM assertions are also enabled by default.
+  The clang and lld projects are required for the `resolc` Solidity frontend executable; they are enabled by default. LLVM assertions are also enabled by default.

-      ```shell
-      revive-llvm clone
-      revive-llvm build --llvm-projects lld --llvm-projects clang
-      ```
+  ```shell
+  revive-llvm clone
+  revive-llvm build --llvm-projects lld --llvm-projects clang
+  ```

-      Build artifacts end up in the `./target-llvm/gnu/target-final/` directory by default.
-      The `gnu` directory depends on the supported archticture and will either be `gnu`, `musl` or `emscripten`.
-      You now need to export the final target directory `$LLVM_SYS_181_PREFIX`: `export LLVM_SYS_181_PREFIX=${PWD}/target-llvm/gnu/target-final`
-      If built with the `--enable-tests` option, test tools will be in the `./target-llvm/gnu/build-final/` directory, along with copies of the build artifacts. For all supported build options, run `revive-llvm build --help`.
+  Build artifacts end up in the `./target-llvm/gnu/target-final/` directory by default.
+  The `gnu` directory depends on the supported archticture and will either be `gnu`, `musl` or `emscripten`.
+  You now need to export the final target directory `$LLVM_SYS_181_PREFIX`: `export LLVM_SYS_181_PREFIX=${PWD}/target-llvm/gnu/target-final`
+  If built with the `--enable-tests` option, test tools will be in the `./target-llvm/gnu/build-final/` directory, along with copies of the build artifacts. For all supported build options, run `revive-llvm build --help`.

 </details>

 ## Supported target architectures

 The following target platforms are supported:
+
 - Linux GNU (x86)
 - Linux MUSL (x86)
 - MacOS (aarch64)
@@ -105,28 +113,29 @@ The following target platforms are supported:
 <details>
 <summary>Building for MUSL</summary>

-   * Via a musl build we can build revive into fully static ELF binaries.
-     Which is desirable for reproducible Solidity contracts builds.
-     The resulting binary is also very portable, akin to the`solc` frontend binary distribution.
+- Via a musl build we can build revive into fully static ELF binaries.
+  Which is desirable for reproducible Solidity contracts builds.
+  The resulting binary is also very portable, akin to the`solc` frontend binary distribution.

-     Clone and build the LLVM framework using the `revive-llvm` tool:
-      ```shell
-      revive-llvm --target-env musl clone
-      revive-llvm --target-env musl build --enable-assertions --llvm-projects clang --llvm-projects lld 
-      ```
+  Clone and build the LLVM framework using the `revive-llvm` tool:
+
+  ```shell
+  revive-llvm --target-env musl clone
+  revive-llvm --target-env musl build --enable-assertions --llvm-projects clang --llvm-projects lld
+  ```

 </details>

 <details>
 <summary>Building for Emscripten</summary>

-   * Via an emsdk build we can run revive in the browser and on node.js.
+- Via an emsdk build we can run revive in the browser and on node.js.

-     Clone and build the LLVM framework using the `revive-llvm` tool:
-      ```shell
-      revive-llvm --target-env emscripten clone
-      revive-llvm --target-env emscripten build --enable-assertions --llvm-projects clang --llvm-projects lld 
-      ```
+  Clone and build the LLVM framework using the `revive-llvm` tool:
+
+  ```shell
+  revive-llvm --target-env emscripten clone
+  revive-llvm --target-env emscripten build --enable-assertions --llvm-projects clang --llvm-projects lld
+  ```

 </details>
-
@@ -22,6 +22,7 @@ num = { workspace = true }
 hex = { workspace = true }
 sha3 = { workspace = true }
 inkwell = { workspace = true }
+libc = { workspace = true }
 polkavm-disassembler = { workspace = true }
 polkavm-common = { workspace = true }

@@ -29,3 +30,4 @@ revive-common = { workspace = true }
 revive-runtime-api = { workspace = true }
 revive-linker = { workspace = true }
 revive-stdlib = { workspace = true }
+revive-solc-json-interface = { workspace = true }
@@ -1,12 +1,11 @@
 //! The LLVM context library.

-pub(crate) mod debug_config;
-pub(crate) mod optimizer;
-pub(crate) mod polkavm;
-pub(crate) mod target_machine;
+use std::ffi::CString;
+use std::sync::OnceLock;

 pub use self::debug_config::ir_type::IRType as DebugConfigIR;
 pub use self::debug_config::DebugConfig;
+pub use self::memory::MemoryConfig;
 pub use self::optimizer::settings::size_level::SizeLevel as OptimizerSettingsSizeLevel;
 pub use self::optimizer::settings::Settings as OptimizerSettings;
 pub use self::optimizer::Optimizer;
@@ -30,6 +29,7 @@ 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;
@@ -38,7 +38,9 @@ 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;
@@ -60,13 +62,11 @@ 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;
@@ -75,9 +75,42 @@ pub use self::polkavm::WriteLLVM as PolkaVMWriteLLVM;
 pub use self::target_machine::target::Target;
 pub use self::target_machine::TargetMachine;

-/// Initializes the target machine.
-pub fn initialize_target(target: Target) {
+pub(crate) mod debug_config;
+pub(crate) mod memory;
+pub(crate) mod optimizer;
+pub(crate) mod polkavm;
+pub(crate) mod target_machine;
+
+static DID_INITIALIZE: OnceLock<()> = OnceLock::new();
+
+/// Initializes the LLVM compiler backend.
+///
+/// This is a no-op if called subsequentially.
+///
+/// `llvm_arguments` are passed as-is to the LLVM CL options parser.
+pub fn initialize_llvm(target: 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 => self::polkavm::initialize_target(),
+        Target::PVM => inkwell::targets::Target::initialize_riscv(&Default::default()),
    }
 }
@@ -0,0 +1,21 @@
+//! The compile time PolkaVM memory configuration settings.
+
+use serde::{Deserialize, Serialize};
+
+/// The PolkaVM memory configuration.
+#[derive(Clone, Copy, Debug, Deserialize, Serialize)]
+pub struct MemoryConfig {
+    /// The emulated EVM linear heap memory size in bytes.
+    pub heap_size: u32,
+    /// The PVM stack size in bytes.
+    pub stack_size: u32,
+}
+
+impl Default for MemoryConfig {
+    fn default() -> Self {
+        Self {
+            heap_size: 64 * 1024,
+            stack_size: 32 * 1024,
+        }
+    }
+}
@@ -2,6 +2,7 @@

 pub mod size_level;

+use revive_solc_json_interface::SolcStandardJsonInputSettingsOptimizer;
 use serde::Deserialize;
 use serde::Serialize;

@@ -226,3 +227,18 @@ 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::cycles(),
+        };
+        if value.fallback_to_optimizing_for_size.unwrap_or_default() {
+            result.enable_fallback_to_size();
+        }
+        Ok(result)
+    }
+}
@@ -9,6 +9,15 @@ 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;
@@ -4,61 +4,98 @@
 #[derive(Debug, Clone)]
 pub struct Argument<'ctx> {
    /// The actual LLVM operand.
-    pub value: inkwell::values::BasicValueEnum<'ctx>,
+    pub value: Value<'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> {
-    /// The calldata offset argument index.
-    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 {
+    /// A shortcut constructor for register arguments.
+    pub fn value(value: inkwell::values::BasicValueEnum<'ctx>) -> Self {
        Self {
-            value,
+            value: Value::Register(value),
            original: None,
            constant: None,
        }
    }

-    /// A shortcut constructor.
-    pub fn new_with_original(
-        value: inkwell::values::BasicValueEnum<'ctx>,
-        original: String,
-    ) -> Self {
+    /// A shortcut constructor for stack arguments.
+    pub fn pointer(pointer: crate::polkavm::context::Pointer<'ctx>, id: String) -> Self {
        Self {
-            value,
-            original: Some(original),
+            value: Value::Pointer { pointer, id },
+            original: None,
            constant: None,
        }
    }

-    /// A shortcut constructor.
-    pub fn new_with_constant(
-        value: inkwell::values::BasicValueEnum<'ctx>,
-        constant: num::BigUint,
-    ) -> Self {
-        Self {
-            value,
-            original: None,
-            constant: Some(constant),
-        }
+    /// Set the original decleratation value.
+    pub fn with_original(mut self, original: String) -> Self {
+        self.original = Some(original);
+        self
+    }
+
+    /// Set the constant value.
+    pub fn with_constant(mut self, constant: num::BigUint) -> Self {
+        self.constant = Some(constant);
+        self
    }

    /// Returns the inner LLVM value.
-    pub fn to_llvm(&self) -> inkwell::values::BasicValueEnum<'ctx> {
-        self.value
+    ///
+    /// Panics if `self` is a pointer argument.
+    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::new(value)
+        Self::value(value)
    }
 }
@@ -31,6 +31,31 @@ 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);
+        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(())
    }

@@ -5,6 +5,7 @@ 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";
@@ -0,0 +1,144 @@
+//! 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)
+    }
+}
@@ -26,6 +26,7 @@ use inkwell::debug_info::DIScope;
 use inkwell::types::BasicType;
 use inkwell::values::BasicValue;

+use crate::memory::MemoryConfig;
 use crate::optimizer::settings::Settings as OptimizerSettings;
 use crate::optimizer::Optimizer;
 use crate::polkavm::DebugConfig;
@@ -33,6 +34,7 @@ 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;
@@ -83,6 +85,10 @@ 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: MemoryConfig,

    /// The project dependency manager. It can be any entity implementing the trait.
    /// The manager is used to get information about contracts and their dependencies during
@@ -114,9 +120,6 @@ 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,
@@ -216,6 +219,7 @@ where
    }

    /// Initializes a new LLVM context.
+    #[allow(clippy::too_many_arguments)]
    pub fn new(
        llvm: &'ctx inkwell::context::Context,
        module: inkwell::module::Module<'ctx>,
@@ -223,11 +227,13 @@ where
        dependency_manager: Option<D>,
        include_metadata_hash: bool,
        debug_config: DebugConfig,
+        llvm_arguments: &'ctx [String],
+        memory_config: MemoryConfig,
    ) -> Self {
        Self::set_data_layout(llvm, &module);
        Self::link_stdlib_module(llvm, &module);
        Self::link_polkavm_imports(llvm, &module);
-        Self::set_polkavm_stack_size(llvm, &module, Self::POLKAVM_STACK_SIZE);
+        Self::set_polkavm_stack_size(llvm, &module, memory_config.stack_size);
        Self::set_module_flags(llvm, &module);

        let intrinsics = Intrinsics::new(llvm, &module);
@@ -250,6 +256,8 @@ 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,
@@ -639,6 +647,8 @@ where
                    self.optimizer.settings().to_owned(),
                    self.include_metadata_hash,
                    self.debug_config.clone(),
+                    self.llvm_arguments,
+                    self.memory_config,
                )
            })
    }
@@ -745,7 +755,9 @@ 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.build_alloca_at_entry(address_type, "address_pointer");
+        let address_pointer = self
+            .get_global(crate::polkavm::GLOBAL_ADDRESS_SPILL_BUFFER)?
+            .into();
        let address_truncated =
            self.builder()
                .build_int_truncate(address, address_type, "address_truncated")?;
@@ -1077,32 +1089,40 @@ where
        offset: inkwell::values::IntValue<'ctx>,
        size: inkwell::values::IntValue<'ctx>,
    ) -> anyhow::Result<inkwell::values::PointerValue<'ctx>> {
-        Ok(self
-            .builder()
-            .build_call(
-                self.runtime_api_method(revive_runtime_api::polkavm_imports::SBRK),
-                &[offset.into(), size.into()],
-                "call_sbrk",
-            )?
+        let call_site_value = self.builder().build_call(
+            <PolkaVMSbrkFunction as RuntimeFunction<D>>::declaration(self).function_value(),
+            &[offset.into(), size.into()],
+            "alloc_start",
+        )?;
+
+        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()
-            .expect("sbrk returns a pointer")
+            .unwrap_or_else(|| {
+                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>> {
-        let memory_size_pointer = self
-            .module()
-            .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())
+        Ok(self
+            .get_global_value(crate::polkavm::GLOBAL_HEAP_SIZE)?
+            .into_int_value())
    }

    /// Returns a pointer to `offset` into the heap, allocating
@@ -1421,4 +1441,9 @@ 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 as u64, false)
+    }
 }
@@ -17,47 +17,20 @@ where
    const NAME: &'static str = "__revive_load_storage_word";

    fn r#type<'ctx>(context: &Context<'ctx, D>) -> inkwell::types::FunctionType<'ctx> {
-        context.word_type().fn_type(
-            &[context.xlen_type().into(), context.word_type().into()],
-            false,
-        )
+        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>>> {
-        let is_transient = Self::paramater(context, 0);
-        let key_value = Self::paramater(context, 1);
-
-        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")?))
+        Ok(Some(emit_load(
+            context,
+            Self::paramater(context, 0),
+            false,
+        )?))
    }
 }

@@ -74,6 +47,42 @@ 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;

@@ -86,9 +95,8 @@ where
    fn r#type<'ctx>(context: &Context<'ctx, D>) -> inkwell::types::FunctionType<'ctx> {
        context.void_type().fn_type(
            &[
-                context.xlen_type().into(),
-                context.word_type().into(),
-                context.word_type().into(),
+                context.llvm().ptr_type(Default::default()).into(),
+                context.llvm().ptr_type(Default::default()).into(),
            ],
            false,
        )
@@ -98,24 +106,12 @@ where
        &self,
        context: &mut Context<'ctx, D>,
    ) -> anyhow::Result<Option<BasicValueEnum<'ctx>>> {
-        let is_transient = Self::paramater(context, 0);
-        let key = Self::paramater(context, 1);
-        let value = Self::paramater(context, 2);
-
-        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);
+        emit_store(
+            context,
+            Self::paramater(context, 0),
+            Self::paramater(context, 1),
+            false,
+        )?;

        Ok(None)
    }
@@ -133,3 +129,149 @@ 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(())
+}
@@ -10,12 +10,21 @@ pub fn create_context(
    llvm: &inkwell::context::Context,
    optimizer_settings: OptimizerSettings,
 ) -> Context<DummyDependency> {
-    crate::polkavm::initialize_target();
+    crate::initialize_llvm(crate::Target::PVM, "resolc", Default::default());

    let module = llvm.create_module("test");
    let optimizer = Optimizer::new(optimizer_settings);

-    Context::<DummyDependency>::new(llvm, module, optimizer, None, true, Default::default())
+    Context::<DummyDependency>::new(
+        llvm,
+        module,
+        optimizer,
+        None,
+        true,
+        Default::default(),
+        Default::default(),
+        Default::default(),
+    )
 }

 #[test]
@@ -63,7 +63,6 @@ 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,
@@ -73,7 +72,6 @@ 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);
@@ -81,11 +79,17 @@ 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);
-    context.build_load(result_pointer, "shift_left_result")
+    let result = context
+        .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.
@@ -101,7 +105,6 @@ 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,
@@ -111,7 +114,6 @@ 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);
@@ -121,11 +123,17 @@ 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);
-    context.build_load(result_pointer, "shift_right_result")
+    let result = context
+        .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.
@@ -145,8 +153,6 @@ 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,
@@ -174,11 +180,9 @@ 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);
@@ -188,11 +192,21 @@ 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);
-    context.build_load(result_pointer, "shift_right_arithmetic_result")
+    let result = context
+        .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`
@@ -2,6 +2,7 @@

 use inkwell::values::BasicValue;

+use crate::polkavm::context::pointer::Pointer;
 use crate::polkavm::context::Context;
 use crate::polkavm::Dependency;

@@ -49,7 +50,9 @@ where
    D: Dependency + Clone,
 {
    let address_type = context.integer_type(revive_common::BIT_LENGTH_ETH_ADDRESS);
-    let address_pointer = context.build_alloca_at_entry(address_type, "origin_address");
+    let address_pointer: Pointer<'_> = context
+        .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,
@@ -97,13 +100,13 @@ where
    D: Dependency + Clone,
 {
    let output_pointer = context.build_alloca_at_entry(context.word_type(), "blockhash_out_ptr");
-    let index_ptr = context.build_alloca_at_entry(context.word_type(), "blockhash_index_ptr");
-    context.build_store(index_ptr, index)?;
+    let index_pointer = context.build_alloca_at_entry(context.word_type(), "blockhash_index_ptr");
+    context.build_store(index_pointer, index)?;

    context.build_runtime_call(
        revive_runtime_api::polkavm_imports::BLOCK_HASH,
        &[
-            index_ptr.to_int(context).into(),
+            index_pointer.to_int(context).into(),
            output_pointer.to_int(context).into(),
        ],
    );
@@ -127,10 +130,9 @@ pub fn coinbase<'ctx, D>(
 where
    D: Dependency + Clone,
 {
-    let pointer = context.build_alloca_at_entry(
-        context.integer_type(revive_common::BIT_LENGTH_ETH_ADDRESS),
-        "coinbase_output",
-    );
+    let pointer: Pointer<'_> = context
+        .get_global(crate::polkavm::GLOBAL_ADDRESS_SPILL_BUFFER)?
+        .into();
    context.build_runtime_call(
        revive_runtime_api::polkavm_imports::BLOCK_AUTHOR,
        &[pointer.to_int(context).into()],
@@ -155,10 +157,9 @@ pub fn address<'ctx, D>(
 where
    D: Dependency + Clone,
 {
-    let pointer = context.build_alloca_at_entry(
-        context.integer_type(revive_common::BIT_LENGTH_ETH_ADDRESS),
-        "address_output",
-    );
+    let pointer: Pointer<'_> = context
+        .get_global(crate::polkavm::GLOBAL_ADDRESS_SPILL_BUFFER)?
+        .into();
    context.build_runtime_call(
        revive_runtime_api::polkavm_imports::ADDRESS,
        &[pointer.to_int(context).into()],
@@ -173,10 +174,9 @@ pub fn caller<'ctx, D>(
 where
    D: Dependency + Clone,
 {
-    let pointer = context.build_alloca_at_entry(
-        context.integer_type(revive_common::BIT_LENGTH_ETH_ADDRESS),
-        "address_output",
-    );
+    let pointer: Pointer<'_> = context
+        .get_global(crate::polkavm::GLOBAL_ADDRESS_SPILL_BUFFER)?
+        .into();
    context.build_runtime_call(
        revive_runtime_api::polkavm_imports::CALLER,
        &[pointer.to_int(context).into()],
@@ -32,6 +32,7 @@ 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
        }
@@ -118,10 +119,8 @@ where
                _ => error,
            })?;
    if contract_path.as_str() == parent {
-        return Ok(Argument::new_with_constant(
-            context.word_const(0).as_basic_value_enum(),
-            num::BigUint::zero(),
-        ));
+        return Ok(Argument::value(context.word_const(0).as_basic_value_enum())
+            .with_constant(num::BigUint::zero()));
    } else if identifier.ends_with("_deployed") && code_type == CodeType::Runtime {
        anyhow::bail!("type({}).runtimeCode is not supported", identifier);
    }
@@ -130,7 +129,7 @@ where
    let hash_value = context
        .word_const_str_hex(hash_string.as_str())
        .as_basic_value_enum();
-    Ok(Argument::new_with_original(hash_value, hash_string))
+    Ok(Argument::value(hash_value).with_original(hash_string))
 }

 /// Translates the deploy call header size instruction. the header consists of
@@ -159,10 +158,8 @@ where
                _ => error,
            })?;
    if contract_path.as_str() == parent {
-        return Ok(Argument::new_with_constant(
-            context.word_const(0).as_basic_value_enum(),
-            num::BigUint::zero(),
-        ));
+        return Ok(Argument::value(context.word_const(0).as_basic_value_enum())
+            .with_constant(num::BigUint::zero()));
    } else if identifier.ends_with("_deployed") && code_type == CodeType::Runtime {
        anyhow::bail!("type({}).runtimeCode is not supported", identifier);
    }
@@ -171,5 +168,5 @@ where
    let size_value = context
        .word_const(crate::polkavm::DEPLOYER_CALL_HEADER_SIZE as u64)
        .as_basic_value_enum();
-    Ok(Argument::new_with_constant(size_value, size_bigint))
+    Ok(Argument::value(size_value).with_constant(size_bigint))
 }
@@ -28,7 +28,7 @@ pub fn value<'ctx, D>(
 where
    D: Dependency + Clone,
 {
-    let output_pointer = context.build_alloca(context.value_type(), "value_transferred");
+    let output_pointer = context.build_alloca_at_entry(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,8 +46,7 @@ where
    D: Dependency + Clone,
 {
    let address_pointer = context.build_address_argument_store(address)?;
-
-    let balance_pointer = context.build_alloca(context.word_type(), "balance_pointer");
+    let balance_pointer = context.build_alloca_at_entry(context.word_type(), "balance_pointer");
    let balance = context.builder().build_ptr_to_int(
        balance_pointer.value,
        context.xlen_type(),
@@ -69,7 +68,7 @@ pub fn self_balance<'ctx, D>(
 where
    D: Dependency + Clone,
 {
-    let balance_pointer = context.build_alloca(context.word_type(), "balance_pointer");
+    let balance_pointer = context.build_alloca_at_entry(context.word_type(), "balance_pointer");
    let balance = context.builder().build_ptr_to_int(
        balance_pointer.value,
        context.xlen_type(),
@@ -3,20 +3,23 @@
 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: inkwell::values::IntValue<'ctx>,
+    position: &PolkaVMArgument<'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 = [context.xlen_type().const_zero().into(), position.into()];
+    let arguments = [position.as_pointer(context)?.value.into()];
    Ok(context
        .build_call(declaration, &arguments, "storage_load")
        .unwrap_or_else(|| panic!("runtime function {name} should return a value")))
@@ -25,17 +28,16 @@ where
 /// Translates the storage store.
 pub fn store<'ctx, D>(
    context: &mut Context<'ctx, D>,
-    position: inkwell::values::IntValue<'ctx>,
-    value: inkwell::values::IntValue<'ctx>,
+    position: &PolkaVMArgument<'ctx>,
+    value: &PolkaVMArgument<'ctx>,
 ) -> anyhow::Result<()>
 where
    D: Dependency + Clone,
 {
    let declaration = <PolkaVMStoreStorageWordFunction as RuntimeFunction<D>>::declaration(context);
    let arguments = [
-        context.xlen_type().const_zero().into(),
-        position.into(),
-        value.into(),
+        position.as_pointer(context)?.value.into(),
+        value.as_pointer(context)?.value.into(),
    ];
    context.build_call(declaration, &arguments, "storage_store");
    Ok(())
@@ -44,37 +46,35 @@ where
 /// Translates the transient storage load.
 pub fn transient_load<'ctx, D>(
    context: &mut Context<'ctx, D>,
-    position: inkwell::values::IntValue<'ctx>,
+    position: &PolkaVMArgument<'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 = [
-        context.xlen_type().const_int(1, false).into(),
-        position.into(),
-    ];
+    let name = <PolkaVMLoadTransientStorageWordFunction as RuntimeFunction<D>>::NAME;
+    let arguments = [position.as_pointer(context)?.value.into()];
+    let declaration =
+        <PolkaVMLoadTransientStorageWordFunction as RuntimeFunction<D>>::declaration(context);
    Ok(context
-        .build_call(declaration, &arguments, "storage_load")
+        .build_call(declaration, &arguments, "transient_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: inkwell::values::IntValue<'ctx>,
-    value: inkwell::values::IntValue<'ctx>,
+    position: &PolkaVMArgument<'ctx>,
+    value: &PolkaVMArgument<'ctx>,
 ) -> anyhow::Result<()>
 where
    D: Dependency + Clone,
 {
-    let declaration = <PolkaVMStoreStorageWordFunction as RuntimeFunction<D>>::declaration(context);
+    let declaration =
+        <PolkaVMStoreTransientStorageWordFunction as RuntimeFunction<D>>::declaration(context);
    let arguments = [
-        context.xlen_type().const_int(1, false).into(),
-        position.into(),
-        value.into(),
+        position.as_pointer(context)?.value.into(),
+        value.as_pointer(context)?.value.into(),
    ];
-    context.build_call(declaration, &arguments, "storage_store");
+    context.build_call(declaration, &arguments, "transient_storage_store");
    Ok(())
 }
@@ -3,11 +3,11 @@
 pub mod r#const;
 pub mod context;
 pub mod evm;
-pub mod metadata_hash;

 pub use self::r#const::*;

 use crate::debug_config::DebugConfig;
+use crate::memory::MemoryConfig;
 use crate::optimizer::settings::Settings as OptimizerSettings;

 use anyhow::Context as AnyhowContext;
@@ -18,11 +18,6 @@ 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,
@@ -95,6 +90,8 @@ pub trait Dependency {
        optimizer_settings: OptimizerSettings,
        include_metadata_hash: bool,
        debug_config: DebugConfig,
+        llvm_arguments: &[String],
+        memory_config: MemoryConfig,
    ) -> anyhow::Result<String>;

    /// Resolves a full contract path.
@@ -115,6 +112,8 @@ impl Dependency for DummyDependency {
        _optimizer_settings: OptimizerSettings,
        _include_metadata_hash: bool,
        _debug_config: DebugConfig,
+        _llvm_arguments: &[String],
+        _memory_config: MemoryConfig,
    ) -> anyhow::Result<String> {
        Ok(String::new())
    }
@@ -10,12 +10,19 @@ 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 = ["revive-solidity", "revive-differential"]
+solidity = ["revive-solidity", "revive-differential", "revive-llvm-context"]

 [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"] }
@@ -34,4 +41,4 @@ polkadot-sdk.features = [

 revive-solidity = { workspace = true, optional = true }
 revive-differential = { workspace = true, optional = true }
-revive-llvm-context = { workspace = true }
+revive-llvm-context = { workspace = true, optional = true }
@@ -0,0 +1,27 @@
+# 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
+```
@@ -0,0 +1,93 @@
+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(())
+}
@@ -1,9 +1,11 @@
-use std::time::Instant;
+use std::{str::FromStr, time::Instant};

 use serde::{Deserialize, Serialize};

 use crate::*;
-use alloy_primitives::{keccak256, Address};
+use alloy_primitives::keccak256;
+#[cfg(feature = "revive-solidity")]
+use alloy_primitives::Address;
 #[cfg(feature = "revive-solidity")]
 use revive_differential::{Evm, EvmLog};
 #[cfg(feature = "revive-solidity")]
@@ -106,14 +108,10 @@ 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,
-                expected,
+                key: **key,
+                expected: **expected,
            });
        }

@@ -160,6 +158,39 @@ 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)]
@@ -216,6 +247,7 @@ 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 {
@@ -5,34 +5,6 @@

 // 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;
@@ -2,14 +2,6 @@ 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";
@@ -78,8 +70,7 @@ 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; 34] = [
-    SBRK,
+pub static IMPORTS: [&str; 33] = [
    ADDRESS,
    BALANCE,
    BALANCE_OF,
@@ -0,0 +1,23 @@
+[package]
+name = "revive-solc-json-interface"
+version.workspace = true
+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 }
@@ -0,0 +1,27 @@
+//! 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::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;
@@ -8,14 +8,15 @@ use std::collections::BTreeMap;
 use std::collections::BTreeSet;
 use std::path::PathBuf;

-#[cfg(feature = "parallel")]
+#[cfg(all(feature = "parallel", feature = "resolc"))]
 use rayon::iter::{IntoParallelIterator, ParallelIterator};
 use serde::Deserialize;
 use serde::Serialize;

-use crate::solc::standard_json::input::settings::metadata::Metadata as SolcStandardJsonInputSettingsMetadata;
-use crate::solc::standard_json::input::settings::optimizer::Optimizer as SolcStandardJsonInputSettingsOptimizer;
-use crate::solc::standard_json::input::settings::selection::Selection as SolcStandardJsonInputSettingsSelection;
+use crate::standard_json::input::settings::metadata::Metadata as SolcStandardJsonInputSettingsMetadata;
+use crate::standard_json::input::settings::optimizer::Optimizer as SolcStandardJsonInputSettingsOptimizer;
+use crate::standard_json::input::settings::selection::Selection as SolcStandardJsonInputSettingsSelection;
+#[cfg(feature = "resolc")]
 use crate::warning::Warning;

 use self::language::Language;
@@ -33,6 +34,7 @@ pub struct Input {
    /// The compiler settings.
    pub settings: Settings,
    /// The suppressed warnings.
+    #[cfg(feature = "resolc")]
    #[serde(skip_serializing)]
    pub suppressed_warnings: Option<Vec<Warning>>,
 }
@@ -60,7 +62,7 @@ impl Input {
        output_selection: SolcStandardJsonInputSettingsSelection,
        optimizer: SolcStandardJsonInputSettingsOptimizer,
        metadata: Option<SolcStandardJsonInputSettingsMetadata>,
-        suppressed_warnings: Option<Vec<Warning>>,
+        #[cfg(feature = "resolc")] suppressed_warnings: Option<Vec<Warning>>,
    ) -> anyhow::Result<Self> {
        let mut paths: BTreeSet<PathBuf> = paths.iter().cloned().collect();
        let libraries = Settings::parse_libraries(library_map)?;
@@ -89,12 +91,14 @@ impl Input {
                optimizer,
                metadata,
            ),
+            #[cfg(feature = "resolc")]
            suppressed_warnings,
        })
    }

    /// A shortcut constructor from source code.
    /// Only for the integration test purposes.
+    #[cfg(feature = "resolc")]
    #[allow(clippy::too_many_arguments)]
    pub fn try_from_sources(
        evm_version: Option<revive_common::EVMVersion>,
@@ -3,18 +3,20 @@
 use serde::Deserialize;
 use serde::Serialize;

+use crate::standard_json::input::settings::metadata_hash::MetadataHash;
+
 /// The `solc --standard-json` input settings metadata.
 #[derive(Debug, Default, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct Metadata {
    /// The bytecode hash mode.
    #[serde(skip_serializing_if = "Option::is_none")]
-    pub bytecode_hash: Option<revive_llvm_context::PolkaVMMetadataHash>,
+    pub bytecode_hash: Option<MetadataHash>,
 }

 impl Metadata {
    /// A shortcut constructor.
-    pub fn new(bytecode_hash: revive_llvm_context::PolkaVMMetadataHash) -> Self {
+    pub fn new(bytecode_hash: MetadataHash) -> Self {
        Self {
            bytecode_hash: Some(bytecode_hash),
        }
@@ -1,6 +1,7 @@
 //! The `solc --standard-json` input settings.

 pub mod metadata;
+pub mod metadata_hash;
 pub mod optimizer;
 pub mod selection;

@@ -49,18 +49,3 @@ impl Optimizer {
        };
    }
 }
-
-impl TryFrom<&Optimizer> for revive_llvm_context::OptimizerSettings {
-    type Error = anyhow::Error;
-
-    fn try_from(value: &Optimizer) -> Result<Self, Self::Error> {
-        let mut result = match value.mode {
-            Some(mode) => Self::try_from_cli(mode)?,
-            None => Self::cycles(),
-        };
-        if value.fallback_to_optimizing_for_size.unwrap_or_default() {
-            result.enable_fallback_to_size();
-        }
-        Ok(result)
-    }
-}
@@ -0,0 +1,4 @@
+//! The `solc <input>.sol --standard-json` interface input and output.
+
+pub mod input;
+pub mod output;
@@ -0,0 +1,71 @@
+//! 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(())
+    }
+}
@@ -3,7 +3,8 @@
 use serde::Deserialize;
 use serde::Serialize;

-use crate::solc::standard_json::output::error::Error as SolcStandardJsonOutputError;
+use crate::standard_json::output::error::Error as SolcStandardJsonOutputError;
+#[cfg(feature = "resolc")]
 use crate::warning::Warning;

 /// The `solc --standard-json` output source.
@@ -131,6 +132,7 @@ impl Source {
    }

    /// Returns the list of messages for some specific parts of the AST.
+    #[cfg(feature = "resolc")]
    pub fn get_messages(
        ast: &serde_json::Value,
        suppressed_warnings: &[Warning],
@@ -194,7 +196,7 @@ impl Source {
                    _ => None,
                },
            )
-            .last()
+            .next_back()
            .ok_or_else(|| anyhow::anyhow!("The last contract not found in the AST"))
    }
 }
@@ -1,26 +1,22 @@
-//! The compiler warning.
+//! `resolc` custom compiler warnings.
+//!
+//! The revive compiler adds warnings only applicable when compilng
+//! to the revive stack on Polkadot to the output.

 use std::str::FromStr;

 use serde::Deserialize;
 use serde::Serialize;

-/// The compiler warning.
+// The `resolc` custom compiler warning.
 #[derive(Debug, Serialize, Deserialize, Clone, Copy, PartialEq, Eq, Hash)]
 pub enum Warning {
-    /// The warning for eponymous feature.
    EcRecover,
-    /// The warning for eponymous feature.
    SendTransfer,
-    /// The warning for eponymous feature.
    ExtCodeSize,
-    /// The warning for eponymous feature.
    TxOrigin,
-    /// The warning for eponymous feature.
    BlockTimestamp,
-    /// The warning for eponymous feature.
    BlockNumber,
-    /// The warning for eponymous feature.
    BlockHash,
 }

@@ -37,6 +37,7 @@ inkwell = { workspace = true }

 revive-common = { workspace = true }
 revive-llvm-context = { workspace = true }
+revive-solc-json-interface = { workspace = true, features = ["resolc"] }

 [target.'cfg(target_env = "musl")'.dependencies]
 mimalloc = { version = "*", default-features = false }
@@ -5,12 +5,11 @@ 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 {
@@ -131,7 +130,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 StandardJsonOutputContract,
+        standard_json_contract: &mut SolcStandardJsonOutputContract,
    ) -> anyhow::Result<()> {
        standard_json_contract.metadata = Some(self.metadata_json);

@@ -5,8 +5,9 @@ pub mod contract;
 use std::collections::BTreeMap;
 use std::path::Path;

-use crate::solc::combined_json::CombinedJson;
-use crate::solc::standard_json::output::Output as StandardJsonOutput;
+use revive_solc_json_interface::combined_json::CombinedJson;
+use revive_solc_json_interface::SolcStandardJsonOutput;
+
 use crate::solc::version::Version as SolcVersion;
 use crate::ResolcVersion;

@@ -66,7 +67,7 @@ impl Build {
    /// Writes all contracts assembly and bytecode to the standard JSON.
    pub fn write_to_standard_json(
        mut self,
-        standard_json: &mut StandardJsonOutput,
+        standard_json: &mut SolcStandardJsonOutput,
        solc_version: &SolcVersion,
    ) -> anyhow::Result<()> {
        let contracts = match standard_json.contracts.as_mut() {
@@ -7,7 +7,6 @@ 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;
@@ -23,29 +22,16 @@ 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;
@@ -54,6 +40,13 @@ 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::SolcStandardJsonInputSettingsSelection;
+
 /// Runs the Yul mode.
 pub fn yul<T: Compiler>(
    input_files: &[PathBuf],
@@ -61,6 +54,8 @@ 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: revive_llvm_context::MemoryConfig,
 ) -> anyhow::Result<Build> {
    let path = match input_files.len() {
        1 => input_files.first().expect("Always exists"),
@@ -81,7 +76,13 @@ pub fn yul<T: Compiler>(
    let solc_validator = Some(&*solc);
    let project = Project::try_from_yul_path(path, solc_validator)?;

-    let build = project.compile(optimizer_settings, include_metadata_hash, debug_config)?;
+    let build = project.compile(
+        optimizer_settings,
+        include_metadata_hash,
+        debug_config,
+        llvm_arguments,
+        memory_config,
+    )?;

    Ok(build)
 }
@@ -92,6 +93,8 @@ 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: revive_llvm_context::MemoryConfig,
 ) -> anyhow::Result<Build> {
    let path = match input_files.len() {
        1 => input_files.first().expect("Always exists"),
@@ -104,7 +107,13 @@ pub fn llvm_ir(

    let project = Project::try_from_llvm_ir_path(path)?;

-    let build = project.compile(optimizer_settings, include_metadata_hash, debug_config)?;
+    let build = project.compile(
+        optimizer_settings,
+        include_metadata_hash,
+        debug_config,
+        llvm_arguments,
+        memory_config,
+    )?;

    Ok(build)
 }
@@ -123,8 +132,10 @@ pub fn standard_output<T: Compiler>(
    include_paths: Vec<String>,
    allow_paths: Option<String>,
    remappings: Option<BTreeSet<String>>,
-    suppressed_warnings: Option<Vec<Warning>>,
+    suppressed_warnings: Option<Vec<ResolcWarning>>,
    debug_config: revive_llvm_context::DebugConfig,
+    llvm_arguments: &[String],
+    memory_config: revive_llvm_context::MemoryConfig,
 ) -> anyhow::Result<Build> {
    let solc_version = solc.version()?;

@@ -152,7 +163,7 @@ pub fn standard_output<T: Compiler>(
        .collect();

    let libraries = solc_input.settings.libraries.clone().unwrap_or_default();
-    let mut solc_output = solc.standard_json(solc_input, base_path, include_paths, allow_paths)?;
+    let 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;
@@ -170,15 +181,27 @@ pub fn standard_output<T: Compiler>(
        }
    }

-    let project =
-        solc_output.try_to_project(source_code_files, libraries, &solc_version, &debug_config)?;
+    let project = Project::try_from_standard_json_output(
+        &solc_output,
+        source_code_files,
+        libraries,
+        &solc_version,
+        &debug_config,
+    )?;

-    let build = project.compile(optimizer_settings, include_metadata_hash, debug_config)?;
+    let build = project.compile(
+        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,
@@ -186,6 +209,8 @@ pub fn standard_json<T: Compiler>(
    include_paths: Vec<String>,
    allow_paths: Option<String>,
    debug_config: revive_llvm_context::DebugConfig,
+    llvm_arguments: &[String],
+    memory_config: revive_llvm_context::MemoryConfig,
 ) -> anyhow::Result<()> {
    let solc_version = solc.version()?;

@@ -200,9 +225,7 @@ pub fn standard_json<T: Compiler>(
        revive_llvm_context::OptimizerSettings::try_from(&solc_input.settings.optimizer)?;

    let include_metadata_hash = match solc_input.settings.metadata {
-        Some(ref metadata) => {
-            metadata.bytecode_hash != Some(revive_llvm_context::PolkaVMMetadataHash::None)
-        }
+        Some(ref metadata) => metadata.bytecode_hash != Some(MetadataHash::None),
        None => true,
    };

@@ -218,14 +241,25 @@ pub fn standard_json<T: Compiler>(
        }
    }

-    let project =
-        solc_output.try_to_project(source_code_files, libraries, &solc_version, &debug_config)?;
+    let project = Project::try_from_standard_json_output(
+        &solc_output,
+        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(optimizer_settings, include_metadata_hash, debug_config)?;
+        let build = project.compile(
+            optimizer_settings,
+            include_metadata_hash,
+            debug_config,
+            llvm_arguments,
+            memory_config,
+        )?;
        build.write_to_standard_json(&mut solc_output, &solc_version)?;
    }
    serde_json::to_writer(std::io::stdout(), &solc_output)?;
@@ -247,10 +281,12 @@ pub fn combined_json<T: Compiler>(
    include_paths: Vec<String>,
    allow_paths: Option<String>,
    remappings: Option<BTreeSet<String>>,
-    suppressed_warnings: Option<Vec<Warning>>,
+    suppressed_warnings: Option<Vec<ResolcWarning>>,
    debug_config: revive_llvm_context::DebugConfig,
    output_directory: Option<PathBuf>,
    overwrite: bool,
+    llvm_arguments: &[String],
+    memory_config: revive_llvm_context::MemoryConfig,
 ) -> anyhow::Result<()> {
    let build = standard_output(
        input_files,
@@ -266,6 +302,8 @@ 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())?;
@@ -3,7 +3,8 @@
 use std::collections::BTreeMap;
 use std::collections::HashSet;

-use crate::solc::standard_json::output::Output as StandardJsonOutput;
+use revive_solc_json_interface::SolcStandardJsonOutput;
+
 use crate::solc::version::Version as SolcVersion;
 use crate::ResolcVersion;

@@ -22,7 +23,7 @@ impl MissingLibraries {
    /// Writes the missing libraries to the standard JSON.
    pub fn write_to_standard_json(
        mut self,
-        standard_json: &mut StandardJsonOutput,
+        standard_json: &mut SolcStandardJsonOutput,
        solc_version: &SolcVersion,
    ) -> anyhow::Result<()> {
        let contracts = match standard_json.contracts.as_mut() {
@@ -20,6 +20,10 @@ 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: revive_llvm_context::MemoryConfig,
 }

 impl Input {
@@ -30,6 +34,8 @@ impl Input {
        include_metadata_hash: bool,
        optimizer_settings: revive_llvm_context::OptimizerSettings,
        debug_config: revive_llvm_context::DebugConfig,
+        llvm_arguments: Vec<String>,
+        memory_config: revive_llvm_context::MemoryConfig,
    ) -> Self {
        Self {
            contract,
@@ -37,6 +43,8 @@ impl Input {
            include_metadata_hash,
            optimizer_settings,
            debug_config,
+            llvm_arguments,
+            memory_config,
        }
    }
 }
@@ -37,11 +37,20 @@ 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 {
@@ -18,6 +18,8 @@ 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 {
@@ -27,6 +29,7 @@ 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,
@@ -34,6 +37,7 @@ impl Metadata {
            revive_pallet_version,
            revive_version: ResolcVersion::default().long,
            optimizer_settings,
+            llvm_arguments,
        }
    }
 }
@@ -77,6 +77,8 @@ impl Contract {
        optimizer_settings: revive_llvm_context::OptimizerSettings,
        include_metadata_hash: bool,
        debug_config: revive_llvm_context::DebugConfig,
+        llvm_arguments: &[String],
+        memory_config: revive_llvm_context::MemoryConfig,
    ) -> anyhow::Result<ContractBuild> {
        let llvm = inkwell::context::Context::create();
        let optimizer = revive_llvm_context::Optimizer::new(optimizer_settings);
@@ -89,6 +91,7 @@ impl Contract {
            version.long.clone(),
            version.l2_revision.clone(),
            optimizer.settings().to_owned(),
+            llvm_arguments.to_vec(),
        );
        let metadata_json = serde_json::to_value(&metadata).expect("Always valid");
        let metadata_hash: Option<[u8; revive_common::BYTE_LENGTH_WORD]> = if include_metadata_hash
@@ -120,6 +123,8 @@ impl Contract {
            Some(project),
            include_metadata_hash,
            debug_config,
+            llvm_arguments,
+            memory_config,
        );
        context.set_solidity_data(revive_llvm_context::PolkaVMContextSolidityData::default());
        match self.ir {
@@ -9,6 +9,7 @@ use std::path::Path;

 #[cfg(feature = "parallel")]
 use rayon::iter::{IntoParallelIterator, ParallelIterator};
+use revive_solc_json_interface::SolcStandardJsonOutput;
 use serde::Deserialize;
 use serde::Serialize;
 use sha3::Digest;
@@ -65,6 +66,8 @@ impl Project {
        optimizer_settings: revive_llvm_context::OptimizerSettings,
        include_metadata_hash: bool,
        debug_config: revive_llvm_context::DebugConfig,
+        llvm_arguments: &[String],
+        memory_config: revive_llvm_context::MemoryConfig,
    ) -> anyhow::Result<Build> {
        let project = self.clone();
        #[cfg(feature = "parallel")]
@@ -80,6 +83,8 @@ impl Project {
                    include_metadata_hash,
                    optimizer_settings.clone(),
                    debug_config.clone(),
+                    llvm_arguments.to_vec(),
+                    memory_config,
                );
                let process_output = {
                    #[cfg(target_os = "emscripten")]
@@ -243,6 +248,69 @@ impl Project {
            BTreeMap::new(),
        ))
    }
+
+    /// Converts the `solc` JSON output into a convenient project.
+    pub fn try_from_standard_json_output(
+        output: &SolcStandardJsonOutput,
+        source_code_files: BTreeMap<String, String>,
+        libraries: BTreeMap<String, BTreeMap<String, String>>,
+        solc_version: &SolcVersion,
+        debug_config: &revive_llvm_context::DebugConfig,
+    ) -> anyhow::Result<Self> {
+        let files = match output.contracts.as_ref() {
+            Some(files) => files,
+            None => match &output.errors {
+                Some(errors) if errors.iter().any(|e| e.severity == "error") => {
+                    anyhow::bail!(serde_json::to_string_pretty(errors).expect("Always valid"));
+                }
+                _ => &BTreeMap::new(),
+            },
+        };
+        let mut project_contracts = BTreeMap::new();
+
+        for (path, contracts) in files.iter() {
+            for (name, contract) in contracts.iter() {
+                let full_path = format!("{path}:{name}");
+
+                let ir_optimized = match contract.ir_optimized.to_owned() {
+                    Some(ir_optimized) => ir_optimized,
+                    None => continue,
+                };
+                if ir_optimized.is_empty() {
+                    continue;
+                }
+
+                debug_config.dump_yul(full_path.as_str(), ir_optimized.as_str())?;
+
+                let mut lexer = Lexer::new(ir_optimized.to_owned());
+                let object = Object::parse(&mut lexer, None).map_err(|error| {
+                    anyhow::anyhow!("Contract `{}` parsing error: {:?}", full_path, error)
+                })?;
+
+                let source = IR::new_yul(ir_optimized.to_owned(), object);
+
+                let source_code = source_code_files
+                    .get(path.as_str())
+                    .ok_or_else(|| anyhow::anyhow!("Source code for path `{}` not found", path))?;
+                let source_hash = sha3::Keccak256::digest(source_code.as_bytes()).into();
+
+                let project_contract = Contract::new(
+                    full_path.clone(),
+                    source_hash,
+                    solc_version.to_owned(),
+                    source,
+                    contract.metadata.to_owned(),
+                );
+                project_contracts.insert(full_path, project_contract);
+            }
+        }
+
+        Ok(Project::new(
+            solc_version.to_owned(),
+            project_contracts,
+            libraries,
+        ))
+    }
 }

 impl revive_llvm_context::PolkaVMDependency for Project {
@@ -252,6 +320,8 @@ impl revive_llvm_context::PolkaVMDependency for Project {
        optimizer_settings: revive_llvm_context::OptimizerSettings,
        include_metadata_hash: bool,
        debug_config: revive_llvm_context::DebugConfig,
+        llvm_arguments: &[String],
+        memory_config: revive_llvm_context::MemoryConfig,
    ) -> anyhow::Result<String> {
        let contract_path = project.resolve_path(identifier)?;
        let contract = project
@@ -271,6 +341,8 @@ impl revive_llvm_context::PolkaVMDependency for Project {
                optimizer_settings,
                include_metadata_hash,
                debug_config,
+                llvm_arguments,
+                memory_config,
            )
            .map_err(|error| {
                anyhow::anyhow!(
@@ -19,6 +19,10 @@ pub struct Arguments {
    #[arg(long = "version")]
    pub version: bool,

+    /// Print supported `solc` versions and exit.
+    #[arg(long = "supported-solc-versions")]
+    pub supported_solc_versions: bool,
+
    /// Print the licence and exit.
    #[arg(long = "license")]
    pub license: bool,
@@ -162,6 +166,42 @@ pub struct Arguments {
    #[cfg(debug_assertions)]
    #[arg(long = "recursive-process-input")]
    pub recursive_process_input: Option<String>,
+
+    /// These are passed to LLVM as the command line to allow manual control.
+    #[arg(long = "llvm-arg")]
+    pub llvm_arguments: Vec<String>,
+
+    /// The emulated EVM linear heap memory static buffer size in bytes.
+    ///
+    /// Unlike the EVM, due to the lack of dynamic memory metering, PVM contracts emulate
+    /// the EVM heap memory with a static buffer. Consequentially, instead of infinite
+    /// memory with exponentially growing gas costs, PVM contracts have a finite amount
+    /// of memory with constant gas costs available.
+    ///
+    /// If the contract uses more heap memory than configured, it will compile fine but
+    /// eventually revert execution at runtime!
+    ///
+    /// You are incentiviced to keep this value as small as possible:
+    /// 1.Increasing the heap size will increase startup costs.
+    /// 2.The heap size contributes to the total memory size a contract can use,
+    ///   which includes the contracts code size
+    #[arg(long = "heap-size", default_value = "65536")]
+    pub heap_size: u32,
+
+    /// The contracts total stack size in bytes.
+    ///
+    /// PVM is a register machine with a traditional stack memory space for local
+    /// variables. This controls the total amount of stack space the contract can use.
+    ///
+    /// If the contract uses more stack memory than configured, it will compile fine but
+    /// eventually revert execution at runtime!
+    ///
+    /// You are incentiviced to keep this value as small as possible:
+    /// 1.Increasing the heap size will increase startup costs.
+    /// 2.The stack size contributes to the total memory size a contract can use,
+    ///   which includes the contracts code size
+    #[arg(long = "stack-size", default_value = "32768")]
+    pub stack_size: u32,
 }

 impl Arguments {
@@ -171,6 +211,12 @@ impl Arguments {
            anyhow::bail!("No other options are allowed while getting the compiler version.");
        }

+        if self.supported_solc_versions && std::env::args().count() > 2 {
+            anyhow::bail!(
+                "No other options are allowed while getting the supported `solc` versions."
+            );
+        }
+
        #[cfg(debug_assertions)]
        if self.recursive_process_input.is_some() && !self.recursive_process {
            anyhow::bail!("--process-input can be only used when --recursive-process is given");
@@ -41,6 +41,16 @@ fn main_inner() -> anyhow::Result<()> {
        return Ok(());
    }

+    if arguments.supported_solc_versions {
+        writeln!(
+            std::io::stdout(),
+            ">={},<={}",
+            revive_solidity::SolcFirstSupportedVersion,
+            revive_solidity::SolcLastSupportedVersion,
+        )?;
+        return Ok(());
+    }
+
    if arguments.license {
        let license_mit = include_str!("../../../../LICENSE-MIT");
        let license_apache = include_str!("../../../../LICENSE-APACHE");
@@ -54,8 +64,6 @@ fn main_inner() -> anyhow::Result<()> {
        .stack_size(RAYON_WORKER_STACK_SIZE)
        .build_global()
        .expect("Thread pool configuration failure");
-    inkwell::support::enable_llvm_pretty_stack_trace();
-    revive_llvm_context::initialize_target(revive_llvm_context::Target::PVM); // TODO: pass from CLI

    if arguments.recursive_process {
        #[cfg(debug_assertions)]
@@ -94,7 +102,7 @@ fn main_inner() -> anyhow::Result<()> {
    let (input_files, remappings) = arguments.split_input_files_and_remappings()?;

    let suppressed_warnings = match arguments.suppress_warnings {
-        Some(warnings) => Some(revive_solidity::Warning::try_from_strings(
+        Some(warnings) => Some(revive_solc_json_interface::ResolcWarning::try_from_strings(
            warnings.as_slice(),
        )?),
        None => None,
@@ -132,12 +140,19 @@ fn main_inner() -> anyhow::Result<()> {
    let include_metadata_hash = match arguments.metadata_hash {
        Some(metadata_hash) => {
            let metadata =
-                revive_llvm_context::PolkaVMMetadataHash::from_str(metadata_hash.as_str())?;
-            metadata != revive_llvm_context::PolkaVMMetadataHash::None
+                revive_solc_json_interface::SolcStandardJsonInputSettingsMetadataHash::from_str(
+                    metadata_hash.as_str(),
+                )?;
+            metadata != revive_solc_json_interface::SolcStandardJsonInputSettingsMetadataHash::None
        }
        None => true,
    };

+    let memory_config = revive_llvm_context::MemoryConfig {
+        heap_size: arguments.heap_size,
+        stack_size: arguments.stack_size,
+    };
+
    let build = if arguments.yul {
        revive_solidity::yul(
            input_files.as_slice(),
@@ -145,6 +160,8 @@ fn main_inner() -> anyhow::Result<()> {
            optimizer_settings,
            include_metadata_hash,
            debug_config,
+            &arguments.llvm_arguments,
+            memory_config,
        )
    } else if arguments.llvm_ir {
        revive_solidity::llvm_ir(
@@ -152,6 +169,8 @@ fn main_inner() -> anyhow::Result<()> {
            optimizer_settings,
            include_metadata_hash,
            debug_config,
+            &arguments.llvm_arguments,
+            memory_config,
        )
    } else if arguments.standard_json {
        revive_solidity::standard_json(
@@ -161,6 +180,8 @@ fn main_inner() -> anyhow::Result<()> {
            arguments.include_paths,
            arguments.allow_paths,
            debug_config,
+            &arguments.llvm_arguments,
+            memory_config,
        )?;
        return Ok(());
    } else if let Some(format) = arguments.combined_json {
@@ -181,6 +202,8 @@ fn main_inner() -> anyhow::Result<()> {
            debug_config,
            arguments.output_directory,
            arguments.overwrite,
+            &arguments.llvm_arguments,
+            memory_config,
        )?;
        return Ok(());
    } else {
@@ -198,6 +221,8 @@ fn main_inner() -> anyhow::Result<()> {
            remappings,
            suppressed_warnings,
            debug_config,
+            &arguments.llvm_arguments,
+            memory_config,
        )
    }?;

@@ -1,26 +1,25 @@
 //! The Solidity compiler.

-pub mod combined_json;
 #[cfg(not(target_os = "emscripten"))]
 pub mod solc_compiler;
 #[cfg(target_os = "emscripten")]
 pub mod soljson_compiler;
-pub mod standard_json;
 pub mod version;

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

-use self::combined_json::CombinedJson;
-use self::standard_json::input::Input as StandardJsonInput;
-use self::standard_json::output::Output as StandardJsonOutput;
+use revive_solc_json_interface::combined_json::CombinedJson;
+use revive_solc_json_interface::SolcStandardJsonInput;
+use revive_solc_json_interface::SolcStandardJsonOutput;
+
 use self::version::Version;

 /// The first version of `solc` with the support of standard JSON interface.
 pub const FIRST_SUPPORTED_VERSION: semver::Version = semver::Version::new(0, 8, 0);

 /// The last supported version of `solc`.
-pub const LAST_SUPPORTED_VERSION: semver::Version = semver::Version::new(0, 8, 28);
+pub const LAST_SUPPORTED_VERSION: semver::Version = semver::Version::new(0, 8, 29);

 /// `--include-path` was introduced in solc `0.8.8` <https://github.com/ethereum/solidity/releases/tag/v0.8.8>
 pub const FIRST_INCLUDE_PATH_VERSION: semver::Version = semver::Version::new(0, 8, 8);
@@ -30,11 +29,11 @@ pub trait Compiler {
    /// Compiles the Solidity `--standard-json` input into Yul IR.
    fn standard_json(
        &mut self,
-        input: StandardJsonInput,
+        input: SolcStandardJsonInput,
        base_path: Option<String>,
        include_paths: Vec<String>,
        allow_paths: Option<String>,
-    ) -> anyhow::Result<StandardJsonOutput>;
+    ) -> anyhow::Result<SolcStandardJsonOutput>;

    /// The `solc --combined-json abi,hashes...` mirror.
    fn combined_json(
@@ -4,9 +4,10 @@ use std::io::Write;
 use std::path::Path;
 use std::path::PathBuf;

-use crate::solc::combined_json::CombinedJson;
-use crate::solc::standard_json::input::Input as StandardJsonInput;
-use crate::solc::standard_json::output::Output as StandardJsonOutput;
+use revive_solc_json_interface::combined_json::CombinedJson;
+use revive_solc_json_interface::SolcStandardJsonInput;
+use revive_solc_json_interface::SolcStandardJsonOutput;
+
 use crate::solc::version::Version;

 use super::Compiler;
@@ -39,11 +40,11 @@ impl Compiler for SolcCompiler {
    /// Compiles the Solidity `--standard-json` input into Yul IR.
    fn standard_json(
        &mut self,
-        mut input: StandardJsonInput,
+        mut input: SolcStandardJsonInput,
        base_path: Option<String>,
        include_paths: Vec<String>,
        allow_paths: Option<String>,
-    ) -> anyhow::Result<StandardJsonOutput> {
+    ) -> anyhow::Result<SolcStandardJsonOutput> {
        let version = self.version()?.validate(&include_paths)?.default;

        let mut command = std::process::Command::new(self.executable.as_str());
@@ -93,7 +94,7 @@ impl Compiler for SolcCompiler {
            );
        }

-        let mut output: StandardJsonOutput =
+        let mut output: SolcStandardJsonOutput =
            revive_common::deserialize_from_slice(output.stdout.as_slice()).map_err(|error| {
                anyhow::anyhow!(
                    "{} subprocess output parsing error: {}\n{}",
@@ -3,9 +3,10 @@
 use std::path::Path;
 use std::path::PathBuf;

-use crate::solc::combined_json::CombinedJson;
-use crate::solc::standard_json::input::Input as StandardJsonInput;
-use crate::solc::standard_json::output::Output as StandardJsonOutput;
+use revive_solc_json_interface::combined_json::CombinedJson;
+use revive_solc_json_interface::SolcStandardJsonInput;
+use revive_solc_json_interface::SolcStandardJsonOutput;
+
 use crate::solc::version::Version;
 use anyhow::Context;
 use std::ffi::{c_char, c_void, CStr, CString};
@@ -24,11 +25,11 @@ impl Compiler for SoljsonCompiler {
    /// Compiles the Solidity `--standard-json` input into Yul IR.
    fn standard_json(
        &mut self,
-        mut input: StandardJsonInput,
+        mut input: SolcStandardJsonInput,
        base_path: Option<String>,
        include_paths: Vec<String>,
        allow_paths: Option<String>,
-    ) -> anyhow::Result<StandardJsonOutput> {
+    ) -> anyhow::Result<SolcStandardJsonOutput> {
        if !include_paths.is_empty() {
            anyhow::bail!("configuring include paths is not supported with solJson")
        }
@@ -46,8 +47,8 @@ impl Compiler for SoljsonCompiler {

        let input_json = serde_json::to_string(&input).expect("Always valid");
        let out = Self::compile_standard_json(input_json)?;
-        let mut output: StandardJsonOutput = revive_common::deserialize_from_slice(out.as_bytes())
-            .map_err(|error| {
+        let mut output: SolcStandardJsonOutput =
+            revive_common::deserialize_from_slice(out.as_bytes()).map_err(|error| {
                anyhow::anyhow!(
                    "Soljson output parsing error: {}\n{}",
                    error,
@@ -1,4 +0,0 @@
-//! The `solc <input>.sol --standard-json`.
-
-pub mod input;
-pub mod output;
@@ -1,138 +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;
-use sha3::Digest;
-
-use crate::project::contract::ir::IR as ProjectContractIR;
-use crate::project::contract::Contract as ProjectContract;
-use crate::project::Project;
-use crate::solc::version::Version as SolcVersion;
-use crate::warning::Warning;
-use crate::yul::lexer::Lexer;
-use crate::yul::parser::statement::object::Object;
-
-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 {
-    /// Converts the `solc` JSON output into a convenient project.
-    pub fn try_to_project(
-        &mut self,
-        source_code_files: BTreeMap<String, String>,
-        libraries: BTreeMap<String, BTreeMap<String, String>>,
-        solc_version: &SolcVersion,
-        debug_config: &revive_llvm_context::DebugConfig,
-    ) -> anyhow::Result<Project> {
-        let files = match self.contracts.as_ref() {
-            Some(files) => files,
-            None => match &self.errors {
-                Some(errors) if errors.iter().any(|e| e.severity == "error") => {
-                    anyhow::bail!(serde_json::to_string_pretty(errors).expect("Always valid"));
-                }
-                _ => &BTreeMap::new(),
-            },
-        };
-        let mut project_contracts = BTreeMap::new();
-
-        for (path, contracts) in files.iter() {
-            for (name, contract) in contracts.iter() {
-                let full_path = format!("{path}:{name}");
-
-                let ir_optimized = match contract.ir_optimized.to_owned() {
-                    Some(ir_optimized) => ir_optimized,
-                    None => continue,
-                };
-                if ir_optimized.is_empty() {
-                    continue;
-                }
-
-                debug_config.dump_yul(full_path.as_str(), ir_optimized.as_str())?;
-
-                let mut lexer = Lexer::new(ir_optimized.to_owned());
-                let object = Object::parse(&mut lexer, None).map_err(|error| {
-                    anyhow::anyhow!("Contract `{}` parsing error: {:?}", full_path, error)
-                })?;
-
-                let source = ProjectContractIR::new_yul(ir_optimized.to_owned(), object);
-
-                let source_code = source_code_files
-                    .get(path.as_str())
-                    .ok_or_else(|| anyhow::anyhow!("Source code for path `{}` not found", path))?;
-                let source_hash = sha3::Keccak256::digest(source_code.as_bytes()).into();
-
-                let project_contract = ProjectContract::new(
-                    full_path.clone(),
-                    source_hash,
-                    solc_version.to_owned(),
-                    source,
-                    contract.metadata.to_owned(),
-                );
-                project_contracts.insert(full_path, project_contract);
-            }
-        }
-
-        Ok(Project::new(
-            solc_version.to_owned(),
-            project_contracts,
-            libraries,
-        ))
-    }
-
-    /// Traverses the AST and returns the list of additional errors and warnings.
-    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(())
-    }
-}
@@ -7,17 +7,17 @@ use std::sync::Mutex;

 use once_cell::sync::Lazy;
 use revive_llvm_context::OptimizerSettings;
+use revive_solc_json_interface::standard_json::output::contract::evm::bytecode::Bytecode;
+use revive_solc_json_interface::standard_json::output::contract::evm::bytecode::DeployedBytecode;
+use revive_solc_json_interface::warning::Warning;
+use revive_solc_json_interface::SolcStandardJsonInput;
+use revive_solc_json_interface::SolcStandardJsonInputSettingsOptimizer;
+use revive_solc_json_interface::SolcStandardJsonInputSettingsSelection;
+use revive_solc_json_interface::SolcStandardJsonOutput;

 use crate::project::Project;
 use crate::solc::solc_compiler::SolcCompiler;
-use crate::solc::standard_json::input::settings::optimizer::Optimizer as SolcStandardJsonInputSettingsOptimizer;
-use crate::solc::standard_json::input::settings::selection::Selection as SolcStandardJsonInputSettingsSelection;
-use crate::solc::standard_json::input::Input as SolcStandardJsonInput;
-use crate::solc::standard_json::output::contract::evm::bytecode::Bytecode;
-use crate::solc::standard_json::output::contract::evm::bytecode::DeployedBytecode;
-use crate::solc::standard_json::output::Output as SolcStandardJsonOutput;
 use crate::solc::Compiler;
-use crate::warning::Warning;

 static PVM_BLOB_CACHE: Lazy<Mutex<HashMap<CachedBlob, Vec<u8>>>> = Lazy::new(Default::default);
 static EVM_BLOB_CACHE: Lazy<Mutex<HashMap<CachedBlob, Vec<u8>>>> = Lazy::new(Default::default);
@@ -73,7 +73,11 @@ pub fn build_solidity_with_options(
    check_dependencies();

    inkwell::support::enable_llvm_pretty_stack_trace();
-    revive_llvm_context::initialize_target(revive_llvm_context::Target::PVM);
+    revive_llvm_context::initialize_llvm(
+        revive_llvm_context::Target::PVM,
+        crate::DEFAULT_EXECUTABLE_NAME,
+        &[],
+    );
    let _ = crate::process::native_process::EXECUTABLE
        .set(PathBuf::from(crate::r#const::DEFAULT_EXECUTABLE_NAME));

@@ -88,7 +92,7 @@ pub fn build_solidity_with_options(
        SolcStandardJsonInputSettingsSelection::new_required(),
        SolcStandardJsonInputSettingsOptimizer::new(
            solc_optimizer_enabled,
-            None,
+            optimizer_settings.middle_end_as_string().chars().last(),
            &solc_version.default,
            false,
        ),
@@ -98,9 +102,26 @@ pub fn build_solidity_with_options(

    let mut output = solc.standard_json(input, None, vec![], None)?;

-    let project = output.try_to_project(sources, libraries, &solc_version, &DEBUG_CONFIG)?;
+    let debug_config = revive_llvm_context::DebugConfig::new(
+        None,
+        optimizer_settings.middle_end_as_string() != "z",
+    );

-    let build: crate::Build = project.compile(optimizer_settings, false, DEBUG_CONFIG)?;
+    let project = Project::try_from_standard_json_output(
+        &output,
+        sources,
+        libraries,
+        &solc_version,
+        &debug_config,
+    )?;
+
+    let build: crate::Build = project.compile(
+        optimizer_settings,
+        false,
+        debug_config,
+        Default::default(),
+        Default::default(),
+    )?;
    build.write_to_standard_json(&mut output, &solc_version)?;

    Ok(output)
@@ -116,7 +137,11 @@ pub fn build_solidity_with_options_evm(
    check_dependencies();

    inkwell::support::enable_llvm_pretty_stack_trace();
-    revive_llvm_context::initialize_target(revive_llvm_context::Target::PVM);
+    revive_llvm_context::initialize_llvm(
+        revive_llvm_context::Target::PVM,
+        crate::DEFAULT_EXECUTABLE_NAME,
+        &[],
+    );
    let _ = crate::process::native_process::EXECUTABLE
        .set(PathBuf::from(crate::r#const::DEFAULT_EXECUTABLE_NAME));

@@ -168,7 +193,11 @@ pub fn build_solidity_and_detect_missing_libraries(
    check_dependencies();

    inkwell::support::enable_llvm_pretty_stack_trace();
-    revive_llvm_context::initialize_target(revive_llvm_context::Target::PVM);
+    revive_llvm_context::initialize_llvm(
+        revive_llvm_context::Target::PVM,
+        crate::DEFAULT_EXECUTABLE_NAME,
+        &[],
+    );
    let _ = crate::process::native_process::EXECUTABLE
        .set(PathBuf::from(crate::r#const::DEFAULT_EXECUTABLE_NAME));

@@ -188,7 +217,13 @@ pub fn build_solidity_and_detect_missing_libraries(

    let mut output = solc.standard_json(input, None, vec![], None)?;

-    let project = output.try_to_project(sources, libraries, &solc_version, &DEBUG_CONFIG)?;
+    let project = Project::try_from_standard_json_output(
+        &output,
+        sources,
+        libraries,
+        &solc_version,
+        &DEBUG_CONFIG,
+    )?;

    let missing_libraries = project.get_missing_libraries();
    missing_libraries.write_to_standard_json(&mut output, &solc.version()?)?;
@@ -201,7 +236,11 @@ pub fn build_yul(source_code: &str) -> anyhow::Result<()> {
    check_dependencies();

    inkwell::support::enable_llvm_pretty_stack_trace();
-    revive_llvm_context::initialize_target(revive_llvm_context::Target::PVM);
+    revive_llvm_context::initialize_llvm(
+        revive_llvm_context::Target::PVM,
+        crate::DEFAULT_EXECUTABLE_NAME,
+        &[],
+    );
    let optimizer_settings = revive_llvm_context::OptimizerSettings::none();

    let project = Project::try_from_yul_string::<SolcCompiler>(
@@ -209,7 +248,13 @@ pub fn build_yul(source_code: &str) -> anyhow::Result<()> {
        source_code,
        None,
    )?;
-    let _build = project.compile(optimizer_settings, false, DEBUG_CONFIG)?;
+    let _build = project.compile(
+        optimizer_settings,
+        false,
+        DEBUG_CONFIG,
+        Default::default(),
+        Default::default(),
+    )?;

    Ok(())
 }
@@ -23,4 +23,4 @@
    "ts-jest": "^29.2.5",
    "typescript": "^5.7.3"
  }
-}
+}
@@ -1,19 +1,33 @@
-import * as path from 'path';
+import * as path from "path";

-const outputDir = 'artifacts';
-const binExtension = ':C.pvm';
-const asmExtension = ':C.pvmasm';
-const llvmExtension = '.ll';
-const contractSolFilename = 'contract.sol';
-const contractYulFilename = 'contract.yul';
-const contractOptimizedLLVMFilename = contractSolFilename + '.C.optimized';
-const contractUnoptimizedLLVMFilename = contractSolFilename + '.C.unoptimized';
-const pathToOutputDir = path.join(__dirname, '..', outputDir);
-const pathToContracts = path.join(__dirname, '..', 'src', 'contracts');
-const pathToBasicYulContract = path.join(pathToContracts, 'yul', contractYulFilename);
-const pathToBasicSolContract = path.join(pathToContracts, 'solidity', contractSolFilename);
-const pathToSolBinOutputFile = path.join(pathToOutputDir, contractSolFilename + binExtension);
-const pathToSolAsmOutputFile = path.join(pathToOutputDir, contractSolFilename + asmExtension);
+const outputDir = "artifacts";
+const binExtension = ":C.pvm";
+const asmExtension = ":C.pvmasm";
+const llvmExtension = ".ll";
+const contractSolFilename = "contract.sol";
+const contractYulFilename = "contract.yul";
+const contractOptimizedLLVMFilename = contractSolFilename + ".C.optimized";
+const contractUnoptimizedLLVMFilename = contractSolFilename + ".C.unoptimized";
+const pathToOutputDir = path.join(__dirname, "..", outputDir);
+const pathToContracts = path.join(__dirname, "..", "src", "contracts");
+const pathToBasicYulContract = path.join(
+  pathToContracts,
+  "yul",
+  contractYulFilename,
+);
+const pathToBasicSolContract = path.join(
+  pathToContracts,
+  "solidity",
+  contractSolFilename,
+);
+const pathToSolBinOutputFile = path.join(
+  pathToOutputDir,
+  contractSolFilename + binExtension,
+);
+const pathToSolAsmOutputFile = path.join(
+  pathToOutputDir,
+  contractSolFilename + asmExtension,
+);

 export const paths = {
  outputDir: outputDir,
@@ -1,44 +1,51 @@
-import * as shell from 'shelljs';
-import * as fs from 'fs';
-import { spawnSync } from 'child_process';
+import * as shell from "shelljs";
+import * as fs from "fs";
+import { spawnSync } from "child_process";

 interface CommandResult {
-    output: string;
-    exitCode: number;
+  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
-        });
+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 || ''
+      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);
+  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 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);
-    }
+  if (fs.existsSync(file)) {
+    return fs.readFileSync(file).length === 0;
+  }
 };
@@ -1,12 +1,11 @@
-import {executeCommand} from "../src/helper";
-import { paths } from '../src/entities';
-
+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 commandInvalid = "resolc --asm";
  const resultInvalid = executeCommand(commandInvalid);

  it("Valid command exit code = 0", () => {
@@ -28,16 +27,18 @@ describe("Run with --asm by default", () => {
  });

  it("run invalid: resolc --asm", () => {
-    expect(resultInvalid.output).toMatch(/(No input sources specified|Compilation aborted)/i);
+    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 command = "solc --asm";
    const solcResult = executeCommand(command);
    expect(solcResult.exitCode).toBe(resultInvalid.exitCode);
  });
-});
+});
@@ -1,191 +1,241 @@
-import { executeCommand, isFolderExist, isFileExist, isFileEmpty } from "../src/helper";
-import { paths } from '../src/entities';
-import * as shell from 'shelljs';
-import * as path from 'path';
-
+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);
+  const command = "resolc";
+  const result = executeCommand(command);

-    it("Info with help is presented", () => {
-        expect(result.output).toMatch(/(Usage: resolc)/i);
-    });
+  it("Info with help is presented", () => {
+    expect(result.output).toMatch(/(Usage: resolc)/i);
+  });

-    it("Exit code = 1", () => {
-        expect(result.exitCode).toBe(1);
-    });
+  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);
-    });
+  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);

-    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);
-    });
+  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);

-    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);
-    });
+  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`;
+  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);
+  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);
-        });
-    }
+    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`;
+  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);
+  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);
-        });
-    }
+    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');
+  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(() => {
-        shell.mkdir('-p', contractsDir);
+      const tempInputFile = path.join(contractsDir, "temp-input.json");
+      shell.cp(inputFile, tempInputFile);
+      const inputContent = shell.cat(inputFile).toString();

-        const input = JSON.parse(shell.cat(inputFile).toString());
+      const command = `resolc --standard-json --base-path "${contractsDir}" --include-path "${contractsDir}" --allow-paths "${contractsDir}"`;

-        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);
-        });
+      result = executeCommand(command, inputContent);
+
+      shell.rm(tempInputFile);
    });

-    afterAll(() => {
-        shell.rm('-rf', contractsDir);
+    it("Compiler run successful without emiting warnings", () => {
+      const parsedResults = JSON.parse(result.output);
+      expect(
+        parsedResults.errors.filter(
+          (error: { type: string }) => error.type != "Warning",
+        ),
+      ).toEqual([]);
    });
-
-    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([]);
-        });
-    });
-});
+  });
+});
@@ -1,12 +1,11 @@
-import {executeCommand} from "../src/helper";
-import { paths } from '../src/entities';
-
+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 commandInvalid = "resolc --yul";
  const resultInvalid = executeCommand(commandInvalid);

  it("Valid command exit code = 0", () => {
@@ -18,11 +17,11 @@ describe("Run with --yul by default", () => {
    expect(result.output).toMatch(/(No output requested)/i);
  });

-
-  xit("solc exit code == resolc exit code", () => { // unknown solc issue for datatype of the contract
-      const command = `solc ${paths.pathToBasicSolContract} --yul`;
-      const solcResult = executeCommand(command);
-      expect(solcResult.exitCode).toBe(result.exitCode);
+  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", () => {
@@ -33,7 +32,7 @@ describe("Run with --yul by default", () => {
  });

  it("Invalid solc exit code == Invalid resolc exit code", () => {
-    const command = 'solc --yul';
+    const command = "solc --yul";
    const solcResult = executeCommand(command);
    expect(solcResult.exitCode).toBe(resultInvalid.exitCode);
  });
--- a/Show More
+++ b/Show More