Merge branch 'main' into as-release-json

.cargo/config.toml

@@ -10,8 +10,8 @@ rustflags = [
     "-Clink-arg=-sWASM_ASYNC_COMPILATION=0",
     "-Clink-arg=-sDYNAMIC_EXECUTION=0",
     "-Clink-arg=-sALLOW_TABLE_GROWTH=1",
-    "-Clink-arg=--js-library=js/emscripten/embed/soljson_interface.js",
+    "-Clink-arg=--js-library=js/embed/soljson_interface.js",
-    "-Clink-arg=--pre-js=js/emscripten/embed/pre.js",
+    "-Clink-arg=--pre-js=js/embed/pre.js",
     "-Clink-arg=-sSTACK_SIZE=128kb",
     "-Clink-arg=-sNODEJS_CATCH_EXIT=0"
 ]

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

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

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

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

.github/scripts/json_generator.py

@@ -2,6 +2,7 @@ import os
 import sys
 import json
 import requests
+from datetime import datetime
 
 def validate_github_token():
     """Validate that GITHUB_TOKEN environment variable is set."""
@@ -26,70 +27,26 @@ def fetch_release_data(repo, tag):
         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):
+def generate_asset_json(release_data, asset):
     """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}"
-
+    path = f"{asset['name']}+{long_version}"
-    # Get SHA256 checksum if available
-    sha256 = checksums.get(asset['name'], "")
 
     return {
+        "path": path,
         "name": asset['name'],
         "version": version,
         "build": build,
         "longVersion": long_version,
         "url": asset['browser_download_url'],
-        "sha256": sha256,
+        "firstSolcVersion": os.environ["FIRST_SOLC_VERSION"],
-        "firstSolcVersion": os.environ.get("FIRST_SOLC_VERSION", ""),
+        "lastSolcVersion": os.environ["LAST_SOLC_VERSION"]
-        "lastSolcVersion": os.environ.get("LAST_SOLC_VERSION", "")
     }
 
 def save_platform_json(platform_folder, asset_json, tag):
@@ -112,14 +69,14 @@ def save_platform_json(platform_folder, asset_json, tag):
     # Remove any existing entry with the same path
     list_data['builds'] = [
         build for build in list_data['builds']
-        if build['version'] != asset_json['version']
+        if build['path'] != asset_json['path']
     ]
     # 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']}"
+    list_data['releases'][version] = asset_json['path']
 
     # Update latest release
     list_data['latestRelease'] = version
@@ -141,9 +98,6 @@ def main():
     # 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',
@@ -157,7 +111,7 @@ def main():
         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)
+            asset_json = generate_asset_json(release_data, asset)
             save_platform_json(platform_folder, asset_json, tag)
             print(f"Processed {asset['name']} for {platform_name}")
 

.github/workflows/release-llvm.yml

@@ -87,14 +87,9 @@ jobs:
         run: |
           brew install ninja
 
-      - name: Install Dependencies
-        if: ${{ matrix.host == 'windows' }}
-        run: |
-          choco install ninja
-
       - name: Install LLVM Builder
         run: |
-          cargo install --locked --force --path crates/llvm-builder
+          cargo install --path crates/llvm-builder
 
       - name: Clone LLVM
         run: |

.github/workflows/release.yml

@@ -14,7 +14,7 @@ concurrency:
 
 env:
   CARGO_TERM_COLOR: always
-  RUST_MUSL_CROSS_IMAGE: messense/rust-musl-cross@sha256:c0154e992adb791c3b848dd008939d19862549204f8cb26f5ca7a00f629e6067
+  RUST_MUSL_CROSS_IMAGE: messense/rust-musl-cross@sha256:68b86bc7cb2867259e6b233415a665ff4469c28b57763e78c3bfea1c68091561
 
 jobs:
   check-version-changed:
@@ -44,7 +44,7 @@ jobs:
               exit 0
             fi
 
-          export PKG_VER=v$(cat crates/resolc/Cargo.toml | grep -A 5 package] | grep version | cut -d '=' -f 2 | tr -d '"' | tr -d " ")
+          export PKG_VER=v$(cat Cargo.toml | grep -A 5 package] | grep version | cut -d '=' -f 2 | tr -d '"' | tr -d " ")
           echo "Current tag $CURRENT_TAG"
           echo "Package version $PKG_VER"
           #
@@ -143,7 +143,7 @@ jobs:
     runs-on: ubuntu-24.04
     needs: [check-version-changed]
     env:
-      RELEASE_RESOLC_WASM_URI: https://github.com/paritytech/revive/releases/download/${{ github.ref_name }}/resolc.wasm
+      RELEASE_RESOLC_WASM_URI: https://github.com/paritytech/revive-workflow-test/releases/download/${{ github.ref_name }}/resolc.wasm
     steps:
       - uses: actions/checkout@v4
       - uses: actions-rust-lang/setup-rust-toolchain@v1
@@ -181,7 +181,7 @@ jobs:
       - name: Basic Sanity Check
         run: |
           mkdir -p solc
-          curl -sSLo solc/soljson.js https://github.com/ethereum/solidity/releases/download/v0.8.30/soljson.js
+          curl -sSLo solc/soljson.js https://github.com/ethereum/solidity/releases/download/v0.8.29/soljson.js
           node -e "
           const soljson = require('solc/soljson');
           const createRevive = require('./target/wasm32-unknown-emscripten/release/resolc.js');
@@ -249,15 +249,6 @@ jobs:
           chmod +x resolc-x86_64-unknown-linux-musl
           chmod +x resolc-universal-apple-darwin
 
-      - name: Create sha-256 checksum
-        run: |
-          shasum -a 256 resolc-x86_64-unknown-linux-musl > checksums.txt
-          shasum -a 256 resolc-universal-apple-darwin >> checksums.txt
-          shasum -a 256 resolc-x86_64-pc-windows-msvc.exe >> checksums.txt
-          shasum -a 256 resolc.js >> checksums.txt
-          shasum -a 256 resolc.wasm >> checksums.txt
-          shasum -a 256 resolc_web.js >> checksums.txt
-
       - uses: actions/create-github-app-token@v1
         id: app-token
         with:
@@ -285,44 +276,3 @@ jobs:
             resolc.js
             resolc.wasm
             resolc_web.js
-            checksums.txt
-
-  npm-release:
-    needs: [create-release]
-    runs-on: macos-14
-    environment: tags
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Download Artifacts
-        uses: actions/download-artifact@v4
-        with:
-          merge-multiple: true
-
-      - name: Set Up Node.js
-        uses: actions/setup-node@v3
-        with:
-          node-version: "20"
-
-      - run: npm ci -w js/resolc
-
-      - name: Build
-        run: |
-          cp -f resolc.{wasm,js} js/resolc/src/resolc
-          npm -w js/resolc run build
-
-      - name: npm pack
-        run: npm -w js/resolc pack
-
-      - uses: actions/upload-artifact@v4
-        with:
-          name: npm_package
-          path: "parity-resolc-*.tgz"
-
-      - uses: octokit/request-action@bbedc70b1981e610d89f1f8de88311a1fc02fb83
-        with:
-          route: POST /repos/paritytech/npm_publish_automation/actions/workflows/publish.yml/dispatches
-          ref: main
-          inputs: '${{ format(''{{ "artifact_name": "npm_package", "repo": "{0}", "run_id": "{1}" }}'', github.repository, github.run_id) }}'
-        env:
-          GITHUB_TOKEN: ${{ secrets.NPM_PUBLISH_AUTOMATION_TOKEN }}

.github/workflows/test-wasm.yml

@@ -86,18 +86,13 @@ jobs:
       - name: Install Node Packages
         run: npm install
 
-      - name: Test emscripten
+      - name: Run Playwright tests
+        run: |
+          cd js
+          npx playwright install --with-deps
+          npx playwright test
+
+      - name: Test revive
         run: |
           echo "Running tests for ${{ matrix.os }}"
           npm run test:wasm
-
-      - name: Test @parity/resolc
-        run: |
-          echo "Running tests for ${{ matrix.os }}"
-          npm run -w js/resolc test
-
-      - name: Run Playwright tests
-        run: |
-          cd js/emscripten
-          npx playwright install --with-deps
-          npx playwright test

.gitignore

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

.prettierrc.json

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

CHANGELOG.md

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

Cargo.toml

@@ -3,7 +3,7 @@ resolver = "2"
 members = ["crates/*"]
 
 [workspace.package]
-version = "0.1.0"
+version = "0.1.0-dev.12"
 authors = [
     "Cyrill Leutwiler <cyrill@parity.io>",
     "Parity Technologies <admin@parity.io>",
@@ -11,60 +11,59 @@ authors = [
 license = "MIT/Apache-2.0"
 edition = "2021"
 repository = "https://github.com/paritytech/revive"
-rust-version = "1.85.0"
+rust-version = "1.81.0"
 
 [workspace.dependencies]
-resolc = { version = "0.3.0", path = "crates/resolc" }
+revive-benchmarks = { version = "0.1.0-dev.12", path = "crates/benchmarks" }
-revive-benchmarks = { version = "0.1.0", path = "crates/benchmarks" }
+revive-builtins = { version = "0.1.0-dev.12", path = "crates/builtins" }
-revive-builtins = { version = "0.1.0", path = "crates/builtins" }
+revive-common = { version = "0.1.0-dev.12", path = "crates/common" }
-revive-common = { version = "0.1.0", path = "crates/common" }
+revive-differential = { version = "0.1.0-dev.12", path = "crates/differential" }
-revive-differential = { version = "0.1.0", path = "crates/differential" }
+revive-integration = { version = "0.1.0-dev.12", path = "crates/integration" }
-revive-integration = { version = "0.1.1", path = "crates/integration" }
+revive-linker = { version = "0.1.0-dev.12", path = "crates/linker" }
-revive-linker = { version = "0.1.0", path = "crates/linker" }
+lld-sys = { version = "0.1.0-dev.12", path = "crates/lld-sys" }
-lld-sys = { version = "0.1.0", path = "crates/lld-sys" }
+revive-llvm-context = { version = "0.1.0-dev.12", path = "crates/llvm-context" }
-revive-llvm-context = { version = "0.3.0", path = "crates/llvm-context" }
+revive-runtime-api = { version = "0.1.0-dev.12", path = "crates/runtime-api" }
-revive-runtime-api = { version = "0.2.0", path = "crates/runtime-api" }
+revive-runner = { version = "0.1.0-dev.12", path = "crates/runner" }
-revive-runner = { version = "0.1.0", path = "crates/runner" }
+revive-solc-json-interface = { version = "0.1.0-dev.12", path = "crates/solc-json-interface" }
-revive-solc-json-interface = { version = "0.2.0", path = "crates/solc-json-interface" }
+revive-solidity = { version = "0.1.0-dev.12", path = "crates/solidity" }
-revive-stdlib = { version = "0.1.1", path = "crates/stdlib" }
+revive-stdlib = { version = "0.1.0-dev.12", path = "crates/stdlib" }
-revive-build-utils = { version = "0.1.0", path = "crates/build-utils" }
+revive-build-utils = { version = "0.1.0-dev.12", path = "crates/build-utils" }
-revive-yul = { version = "0.2.1", path = "crates/yul" }
 
 hex = "0.4.3"
 cc = "1.2"
-libc = "0.2.172"
+libc = "0.2.169"
-tempfile = "3.20"
+tempfile = "3.17"
 anyhow = "1.0"
 semver = { version = "1.0", features = ["serde"] }
 itertools = "0.14"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = { version = "1.0", features = ["arbitrary_precision"] }
-regex = "1.11"
+regex = "1.10"
-once_cell = "1.21"
+once_cell = "1.20"
 num = "0.4.3"
 sha1 = "0.10"
 sha3 = "0.10"
 thiserror = "2.0"
 which = "7.0"
 path-slash = "0.2"
-rayon = "1.10"
+rayon = "1.8"
 clap = { version = "4", default-features = false, features = ["derive"] }
-polkavm-common = "0.24.0"
+polkavm-common = "0.21.0"
-polkavm-linker = "0.24.0"
+polkavm-linker = "0.21.0"
-polkavm-disassembler = "0.24.0"
+polkavm-disassembler = "0.21.0"
-polkavm = "0.24.0"
+polkavm = "0.21.0"
-alloy-primitives = { version = "1.1", features = ["serde"] }
+alloy-primitives = { version = "0.8.21", features = ["serde"] }
-alloy-sol-types = "1.1"
+alloy-sol-types = "0.8.21"
-alloy-genesis = "1.0"
+alloy-genesis = "0.11.1"
-alloy-serde = "1.0"
+alloy-serde = "0.11.1"
-env_logger = { version = "0.11.8", default-features = false }
+env_logger = { version = "0.11.6", default-features = false }
-serde_stacker = "0.1.12"
+serde_stacker = "0.1.11"
-criterion = { version = "0.6", features = ["html_reports"] }
+criterion = { version = "0.5.1", features = ["html_reports"] }
-log = { version = "0.4.27" }
+log = { version = "0.4.25" }
-git2 = { version = "0.20.2", default-features = false }
+git2 = { version = "0.20.0", default-features = false }
 downloader = "0.2.8"
-flate2 = "1.1"
+flate2 = "1.0.35"
-fs_extra = "1.3"
+fs_extra = "1.3.0"
 num_cpus = "1"
 tar = "0.4"
 toml = "0.8"
@@ -72,15 +71,16 @@ assert_cmd = "2.0"
 assert_fs = "1.1"
 
 # polkadot-sdk and friends
-codec = { version = "3.7.5", default-features = false, package = "parity-scale-codec" }
+codec = { version = "3.6.12", default-features = false, package = "parity-scale-codec" }
 scale-info = { version = "2.11.6", default-features = false }
-polkadot-sdk = { version = "2503.0.1" }
+polkadot-sdk = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c29e72a8628835e34deb6aa7db9a78a2e4eabcee" }
 
 # llvm
 [workspace.dependencies.inkwell]
-version = "0.6.0"
+git = "https://github.com/TheDan64/inkwell.git"
+rev = "7b410298b6a93450adaa90b1841d5805a3038f12"
 default-features = false
-features = ["serde", "llvm18-1", "no-libffi-linking", "target-riscv"]
+features = ["serde", "llvm18-0", "no-libffi-linking", "target-riscv"]
 
 [profile.bench]
 inherits = "release"

Dockerfile

@@ -1,4 +1,4 @@
-FROM rust:1.85.0 AS llvm-builder
+FROM rust:1.84.0 AS llvm-builder
 WORKDIR /opt/revive
 
 RUN apt update && \ 
@@ -11,7 +11,7 @@ RUN make install-llvm-builder
 RUN revive-llvm --target-env musl clone
 RUN revive-llvm --target-env musl build  --llvm-projects lld --llvm-projects clang
 
-FROM messense/rust-musl-cross@sha256:c0154e992adb791c3b848dd008939d19862549204f8cb26f5ca7a00f629e6067 AS resolc-builder
+FROM messense/rust-musl-cross:x86_64-musl AS resolc-builder
 WORKDIR /opt/revive
 
 RUN apt update && \ 

Makefile

@@ -5,13 +5,12 @@
 	install-wasm \
 	install-llvm-builder \
 	install-llvm \
-	install-revive-runner \
 	format \
 	clippy \
 	machete \
 	test \
 	test-integration \
-	test-resolc \
+	test-solidity \
 	test-workspace \
 	test-cli \
 	test-wasm \
@@ -24,25 +23,22 @@
 install: install-bin install-npm
 
 install-bin:
-	cargo install --force --locked --path crates/resolc
+	cargo install --locked --path crates/solidity
 
 install-npm:
 	npm install && npm fund
 
 install-wasm: install-npm
-	cargo build --target wasm32-unknown-emscripten -p resolc --release --no-default-features
+	cargo build --target wasm32-unknown-emscripten -p revive-solidity --release --no-default-features
 	npm run build:package
 
 install-llvm-builder:
-	cargo install --force --locked --path crates/llvm-builder
+	cargo install --path crates/llvm-builder
 
 install-llvm: install-llvm-builder
 	revive-llvm clone
 	revive-llvm build --llvm-projects lld --llvm-projects clang
 
-install-revive-runner:
-	cargo install --locked --force --path crates/runner --no-default-features
-
 format:
 	cargo fmt --all --check
 
@@ -53,13 +49,13 @@ machete:
 	cargo install cargo-machete
 	cargo machete
 
-test: format clippy machete test-cli test-workspace install-revive-runner
+test: format clippy machete test-cli test-workspace
 
 test-integration: install-bin
 	cargo test --package revive-integration
 
-test-resolc: install
+test-solidity: install
-	cargo test --package resolc
+	cargo test --package revive-solidity
 
 test-workspace: install
 	cargo test --workspace --exclude revive-llvm-builder
@@ -90,6 +86,9 @@ clean:
 	cargo clean ; \
 	revive-llvm clean ; \
 	rm -rf node_modules ; \
-	rm -rf crates/resolc/src/tests/cli-tests/artifacts ; \
+	rm -rf crates/solidity/src/tests/cli-tests/artifacts ; \
-	cargo uninstall resolc ; \
+	cargo uninstall revive-solidity ; \
-	cargo uninstall revive-llvm-builder ;
+	cargo uninstall revive-llvm-builder ; \
+	rm -f package-lock.json ; \
+	rm -rf js/dist ; \
+	rm -f js/src/resolc.{wasm,js}

README.md

@@ -14,39 +14,7 @@ This is experimental software in active development and not ready just yet for p
 Discussion around the development is hosted on the [Polkadot Forum](https://forum.polkadot.network/t/contracts-update-solidity-on-polkavm/6949#a-new-solidity-compiler-1).
 
 ## Installation
-Building Solidity contracts for PolkaVM requires installing the following two compilers:
+Please consult [the documentation](https://contracts.polkadot.io/revive_compiler/installation) for installation instructions.
-- `resolc`: The revive Solidity compiler YUL frontend and PolkaVM code generator (provided by this repository).
-- `solc`: The [Ethereum Solidity reference compiler](https://github.com/ethereum/solidity/) implemenation.`resolc` uses `solc` during the compilation process, please refer to the [Ethereum Solidity documentation](https://docs.soliditylang.org/en/latest/installing-solidity.html) for installation instructions.
-
-### `resolc` binary releases
-`resolc` is distributed as a standalone binary (with `solc` as the only external dependency). Please download one of our [binary releases](https://github.com/paritytech/revive/releases) for your target platform and mind the platform specific instructions below.
-
-<details>
-  <summary>MacOS users</summary>
-
-> **MacOS** users need to clear the `downloaded` attribute from the binary and set the executable flag.
-> ```sh
-> xattr -rc resolc-universal-apple-darwin
-> chmod +x resolc-universal-apple-darwin
-> ```
-
-</details>
-
-<details>
-  <summary>Linux users</summary>
-
-> **Linux** users need to set the executable flag.
-> ```sh
-> chmod +x resolc-x86_64-unknown-linux-musl
-> ```
-
-</details>
-
-
-### `resolc` NPM package
-We distribute the revive compiler as [node.js module](https://www.npmjs.com/package/@parity/resolc) and [hardhat plugin](https://www.npmjs.com/package/@parity/hardhat-polkadot-resolc).
-
-Note: The `solc` dependency is bundled via NPM packaging and defaults to the latest supported version.
 
 ## Building from source
 
@@ -131,6 +99,8 @@ Ensure that your branch passes `make test` locally when submitting a pull reques
 ### Design overview
 See the [relevant section in our documentation](https://contracts.polkadot.io/revive_compiler/architecture) to learn more about how the compiler works. 
 
+[Frontend](https://github.com/matter-labs/era-compiler-solidity) and [code generator](https://github.com/matter-labs/era-compiler-llvm-context) are based of ZKSync `zksolc` (the project started as a fork of the era compiler).
+
 ### Tests
 
 Before running the tests, ensure that Geth (Go Ethereum) is installed on your system. Follow the installation guide here: [Installing Geth](https://geth.ethereum.org/docs/getting-started/installing-geth).
@@ -139,8 +109,3 @@ Once Geth is installed, you can run the tests using the following command:
 ```sh
 make test
 ```
-# Acknowledgements
-
-The revive compiler project, after some early experiments with EVM bytecode translations, decided to fork the `era-compiler` framework.
-[Frontend](https://github.com/matter-labs/era-compiler-solidity), [code generator](https://github.com/matter-labs/era-compiler-llvm-context) and some supporting libraries are based of ZKSync `zksolc`. I'd like to express my gratitude and thank the original authors for providing a useable code base under a generous license.
-

RELEASE.md

@@ -4,23 +4,15 @@ Prior to the first stable release we neither have formal release processes nor d
 
 To create a new pre-release:
 
-1. Create a release PR which, if necessary:
+1. Create a release PR which updates the `-dev.X` versions in the workspace `Cargo.toml` and updates the `CHANGELOG.md` accordingly.
-  - Updates the versions in the workspace `Cargo.toml`
-  - Updates the version in each crate `Cargo.toml`
-  - Updates the version of the NPM package in `js/resolc/package.json`
-  - Updates the `CHANGELOG.md` to reflect all observable changes
 2. If the CI passes, merge the release PR.
-3. Push a `vX.Y.Z` tag that has the same version as in `Cargo.toml`
+3. Push a tag that has the same `-dev.X` version as in `Cargo.toml`
 4. The release workflow will attempt to build and publish a new pre-release if the latest tag does match the cargo package version.
-5. Wait for the `Release` workflow to finish. It should create the pre-release with the same name.
+5. Wait for the `Release` workflow to finish. It should create the pre-release with the same `-dev.X` name.
 6. Check that pre-release was created on the [Releases page](https://github.com/paritytech/revive/releases) with all artifacts.
 7. After the release is published, another workflow should start automatically and update json files in https://github.com/paritytech/resolc-bin. Check the changes.
 8. Update the [contract-docs](https://github.com/paritytech/contract-docs/) accordingly
 
-# `resolc` NPM package release
-
-Will happen automatically.
-
 # LLVM release
 
 To create a new LLVM release, run "Release LLVM" workflow. Use current LLVM version as parameter, e.g. `18.1.8`.

STATUS.md

@@ -0,0 +1,30 @@
+# Known issues
+
+The following is known and we are either working on it or it is a hard limitation. Please do not open a new issue.
+
+## Release
+
+`0.1.0-dev-2`
+
+## Missing features
+
+- [Libraries with public functions are not supported](https://github.com/paritytech/revive/issues/91)
+- [Automatic import resolution is not supported](https://github.com/paritytech/revive/issues/98)
+- The emulated EVM linear contract memory is limited to 64kb in size. Will be fixed with support for metered dynamic memory.
+- [The contract calldata is currently limited to 1kb in size](https://github.com/paritytech/revive/issues/57)
+- [EIP-4844 opcodes are not supported](https://github.com/paritytech/revive/issues/64)
+- [Delegate calls are not supported](https://github.com/paritytech/revive/issues/67)
+- [The `blockhash` opcode is not supported](https://github.com/paritytech/revive/issues/61)
+- [The `extcodesize` opcode is not supported](https://github.com/paritytech/revive/issues/58)
+- [The `origin` opcode is not supported](https://github.com/paritytech/revive/issues/59)
+- [Gas limits for contract calls are ignored](https://github.com/paritytech/revive/issues/60)
+- [Gas related opcodes are not supported](https://github.com/paritytech/revive/issues/60)
+- IPFS metadata hashes are not supported
+- [Compiled contract artifacts can exceed the pallet static memory limit and fail to deploy](https://github.com/paritytech/revive/issues/96).
+- [Transfers to inexistant accounts will fail if the transferred value lies below the ED.](https://github.com/paritytech/revive/issues/83) Will be fixed in the pallet to make the ED completely transparent for contracts.
+
+## Wontfix
+
+Please consult our documentation to learn more about Solidity and EVM features likely to remain unsupported (and why they will not be supported).
+
+TODO: Insert link to the relevant documentation section.

crates/benchmarks/BENCHMARKS.md

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

crates/differential/Cargo.toml

@@ -1,6 +1,5 @@
 [package]
 name = "revive-differential"
-description = "utilities for differential testing the revive compiler against EVM"
 version.workspace = true
 license.workspace = true
 edition.workspace = true
@@ -14,4 +13,4 @@ serde = { workspace = true }
 serde_json = { workspace = true }
 alloy-primitives = { workspace = true, features = ["serde"] }
 alloy-genesis = { workspace = true }
-alloy-serde = { workspace = true }
+alloy-serde = { workspace = true }

crates/integration/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "revive-integration"
-version = "0.1.1"
+version.workspace = true
 license.workspace = true
 edition.workspace = true
 repository.workspace = true
@@ -13,7 +13,7 @@ alloy-sol-types = { workspace = true }
 hex = { workspace = true }
 serde_json = { workspace = true }
 
-resolc = { workspace = true }
+revive-solidity = { workspace = true }
 revive-runner = { workspace = true }
 revive-llvm-context = { workspace = true }
 

crates/integration/codesize.json

@@ -1,10 +1,10 @@
 {
-  "Baseline": 939,
+  "Baseline": 1443,
-  "Computation": 2282,
+  "Computation": 2788,
-  "DivisionArithmetics": 8849,
+  "DivisionArithmetics": 9748,
-  "ERC20": 18308,
+  "ERC20": 19150,
-  "Events": 1640,
+  "Events": 2201,
-  "FibonacciIterative": 1497,
+  "FibonacciIterative": 2041,
-  "Flipper": 2099,
+  "Flipper": 2691,
-  "SHA1": 8243
+  "SHA1": 8997
 }

crates/integration/contracts/SAR.sol

@@ -1,49 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity ^0.8;
-
-/* runner.json
-{
-    "differential": true,
-    "actions": [
-        {
-            "Instantiate": {
-                "code": {
-                    "Solidity": {
-                        "contract": "SAR"
-                    }
-                }
-            }
-        }
-    ]
-}
-*/
-
-contract SAR {
-  constructor() payable {
-    assert(sar(0x03, 0x01) == 0x01);
-    assert(
-      sar(
-        0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff,
-        0x01
-      ) == 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-    );
-    assert(
-      sar(
-        0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff,
-        0xff
-      ) == 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-    );
-    assert(
-      sar(
-        0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff,
-        0x100
-      ) == 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-    );
-  }
-
-  function sar(uint256 a, uint256 b) public pure returns (uint256 c) {
-    assembly {
-      c := sar(b, a)
-    }
-  }
-}

crates/integration/src/cases.rs

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

crates/integration/src/tests.rs

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

crates/llvm-builder/Cargo.toml

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

crates/llvm-builder/src/build_type.rs

@@ -22,7 +22,7 @@ impl std::str::FromStr for BuildType {
             "Release" => Ok(Self::Release),
             "RelWithDebInfo" => Ok(Self::RelWithDebInfo),
             "MinSizeRel" => Ok(Self::MinSizeRel),
-            value => Err(format!("Unsupported build type: `{value}`")),
+            value => Err(format!("Unsupported build type: `{}`", value)),
         }
     }
 }

crates/llvm-builder/src/builtins.rs

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

crates/llvm-builder/src/ccache_variant.rs

@@ -16,7 +16,7 @@ impl std::str::FromStr for CcacheVariant {
         match value {
             "ccache" => Ok(Self::Ccache),
             "sccache" => Ok(Self::Sccache),
-            value => Err(format!("Unsupported ccache variant: `{value}`")),
+            value => Err(format!("Unsupported ccache variant: `{}`", value)),
         }
     }
 }

crates/llvm-builder/src/lib.rs

@@ -127,22 +127,23 @@ pub fn build(
     sanitizer: Option<sanitizer::Sanitizer>,
     enable_valgrind: bool,
 ) -> anyhow::Result<()> {
-    log::trace!("build type: {build_type:?}");
+    log::trace!("build type: {:?}", build_type);
-    log::trace!("target env: {target_env:?}");
+    log::trace!("target env: {:?}", target_env);
-    log::trace!("targets: {targets:?}");
+    log::trace!("targets: {:?}", targets);
-    log::trace!("llvm projects: {llvm_projects:?}");
+    log::trace!("llvm projects: {:?}", llvm_projects);
-    log::trace!("enable rtti: {enable_rtti:?}");
+    log::trace!("enable rtti: {:?}", enable_rtti);
-    log::trace!("default target: {default_target:?}");
+    log::trace!("default target: {:?}", default_target);
-    log::trace!("eneable tests: {enable_tests:?}");
+    log::trace!("eneable tests: {:?}", enable_tests);
-    log::trace!("enable_coverage: {enable_coverage:?}");
+    log::trace!("enable_coverage: {:?}", enable_coverage);
-    log::trace!("extra args: {extra_args:?}");
+    log::trace!("extra args: {:?}", extra_args);
-    log::trace!("sanitzer: {sanitizer:?}");
+    log::trace!("sanitzer: {:?}", sanitizer);
-    log::trace!("enable valgrind: {enable_valgrind:?}");
+    log::trace!("enable valgrind: {:?}", enable_valgrind);
 
     if !PathBuf::from(LLVMPath::DIRECTORY_LLVM_SOURCE).exists() {
         log::error!(
-            "LLVM project source directory {} does not exist (run `revive-llvm --target-env {target_env} clone`)",
+            "LLVM project source directory {} does not exist (run `revive-llvm --target-env {} clone`)",
-            LLVMPath::DIRECTORY_LLVM_SOURCE
+            LLVMPath::DIRECTORY_LLVM_SOURCE,
+            target_env
         )
     }
 

crates/llvm-builder/src/llvm_project.rs

@@ -22,7 +22,7 @@ impl std::str::FromStr for LLVMProject {
             "lld" => Ok(Self::LLD),
             "lldb" => Ok(Self::LLDB),
             "mlir" => Ok(Self::MLIR),
-            value => Err(format!("Unsupported LLVM project to enable: `{value}`")),
+            value => Err(format!("Unsupported LLVM project to enable: `{}`", value)),
         }
     }
 }

crates/llvm-builder/src/lock.rs

@@ -30,7 +30,7 @@ impl TryFrom<&PathBuf> for Lock {
     fn try_from(path: &PathBuf) -> Result<Self, Self::Error> {
         let mut config_str = String::new();
         let mut config_file =
-            File::open(path).with_context(|| format!("Error opening {path:?} file"))?;
+            File::open(path).with_context(|| format!("Error opening {:?} file", path))?;
         config_file.read_to_string(&mut config_str)?;
         Ok(toml::from_str(&config_str)?)
     }

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

@@ -29,7 +29,7 @@ impl FromStr for Platform {
     fn from_str(value: &str) -> Result<Self, Self::Err> {
         match value {
             "PolkaVM" => Ok(Self::PolkaVM),
-            value => Err(format!("Unsupported platform: `{value}`")),
+            value => Err(format!("Unsupported platform: `{}`", value)),
         }
     }
 }

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

@@ -69,8 +69,8 @@ fn main_inner() -> anyhow::Result<()> {
                 })
                 .collect();
 
-            log::debug!("extra_args: {extra_args:#?}");
+            log::debug!("extra_args: {:#?}", extra_args);
-            log::debug!("extra_args_unescaped: {extra_args_unescaped:#?}");
+            log::debug!("extra_args_unescaped: {:#?}", extra_args_unescaped);
 
             if let Some(ccache_variant) = ccache_variant {
                 revive_llvm_builder::utils::check_presence(ccache_variant.to_string().as_str())?;

crates/llvm-builder/src/sanitizer.rs

@@ -30,7 +30,7 @@ impl std::str::FromStr for Sanitizer {
             "thread" => Ok(Self::Thread),
             "dataflow" => Ok(Self::DataFlow),
             "address;undefined" => Ok(Self::AddressUndefined),
-            value => Err(format!("Unsupported sanitizer: `{value}`")),
+            value => Err(format!("Unsupported sanitizer: `{}`", value)),
         }
     }
 }

crates/llvm-builder/src/target_env.rs

@@ -20,7 +20,7 @@ impl std::str::FromStr for TargetEnv {
             "gnu" => Ok(Self::GNU),
             "musl" => Ok(Self::MUSL),
             "emscripten" => Ok(Self::Emscripten),
-            value => Err(format!("Unsupported target environment: `{value}`")),
+            value => Err(format!("Unsupported target environment: `{}`", value)),
         }
     }
 }

crates/llvm-builder/src/target_triple.rs

@@ -15,7 +15,7 @@ impl std::str::FromStr for TargetTriple {
     fn from_str(value: &str) -> Result<Self, Self::Err> {
         match value {
             "polkavm" => Ok(Self::PolkaVM),
-            value => Err(format!("Unsupported target triple: `{value}`")),
+            value => Err(format!("Unsupported target triple: `{}`", value)),
         }
     }
 }

crates/llvm-builder/src/utils.rs

@@ -38,7 +38,7 @@ pub const MUSL_SNAPSHOTS_URL: &str = "https://git.musl-libc.org/cgit/musl/snapsh
 pub const EMSDK_SOURCE_URL: &str = "https://github.com/emscripten-core/emsdk.git";
 
 /// The emscripten SDK version.
-pub const EMSDK_VERSION: &str = "4.0.9";
+pub const EMSDK_VERSION: &str = "3.1.64";
 
 /// The subprocess runner.
 ///
@@ -92,7 +92,7 @@ pub fn unpack_tar(filename: PathBuf, path: &str) -> anyhow::Result<()> {
 pub fn download_musl(name: &str) -> anyhow::Result<()> {
     log::info!("downloading musl {name}");
     let tar_file_name = format!("{name}.tar.gz");
-    let url = format!("{MUSL_SNAPSHOTS_URL}/{tar_file_name}");
+    let url = format!("{}/{tar_file_name}", MUSL_SNAPSHOTS_URL);
     let target_path = crate::llvm_path::DIRECTORY_LLVM_TARGET
         .get()
         .unwrap()
@@ -223,6 +223,6 @@ pub fn install_emsdk() -> anyhow::Result<()> {
 /// The LLVM target directory default path.
 pub fn directory_target_llvm(target_env: crate::target_env::TargetEnv) -> PathBuf {
     crate::llvm_path::DIRECTORY_LLVM_TARGET
-        .get_or_init(|| PathBuf::from(format!("./target-llvm/{target_env}/")))
+        .get_or_init(|| PathBuf::from(format!("./target-llvm/{}/", target_env)))
         .clone()
 }

crates/llvm-context/Cargo.toml

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

crates/llvm-context/src/lib.rs

@@ -28,7 +28,6 @@ pub use self::polkavm::context::function::runtime::entry::Entry as PolkaVMEntryF
 pub use self::polkavm::context::function::runtime::revive::Exit as PolkaVMExitFunction;
 pub use self::polkavm::context::function::runtime::revive::WordToPointer as PolkaVMWordToPointerFunction;
 pub use self::polkavm::context::function::runtime::runtime_code::RuntimeCode as PolkaVMRuntimeCodeFunction;
-pub use self::polkavm::context::function::runtime::sbrk::Sbrk as PolkaVMSbrkFunction;
 pub use self::polkavm::context::function::runtime::FUNCTION_DEPLOY_CODE as PolkaVMFunctionDeployCode;
 pub use self::polkavm::context::function::runtime::FUNCTION_ENTRY as PolkaVMFunctionEntry;
 pub use self::polkavm::context::function::runtime::FUNCTION_RUNTIME_CODE as PolkaVMFunctionRuntimeCode;
@@ -61,6 +60,7 @@ 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;

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

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

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

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

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

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

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

@@ -1,7 +1,6 @@
 //! The entry function.
 
 use inkwell::types::BasicType;
-use revive_solc_json_interface::PolkaVMDefaultHeapMemorySize;
 
 use crate::polkavm::context::address_space::AddressSpace;
 use crate::polkavm::context::function::runtime;
@@ -32,34 +31,6 @@ impl Entry {
             context.xlen_type().get_undef(),
         );
 
-        context.set_global(
-            crate::polkavm::GLOBAL_HEAP_SIZE,
-            context.xlen_type(),
-            AddressSpace::Stack,
-            context.xlen_type().const_zero(),
-        );
-
-        let heap_memory_type = context.byte_type().array_type(
-            context
-                .memory_config
-                .heap_size
-                .unwrap_or(PolkaVMDefaultHeapMemorySize),
-        );
-        context.set_global(
-            crate::polkavm::GLOBAL_HEAP_MEMORY,
-            heap_memory_type,
-            AddressSpace::Stack,
-            heap_memory_type.const_zero(),
-        );
-
-        let address_type = context.integer_type(revive_common::BIT_LENGTH_ETH_ADDRESS);
-        context.set_global(
-            crate::polkavm::GLOBAL_ADDRESS_SPILL_BUFFER,
-            address_type,
-            AddressSpace::Stack,
-            address_type.const_zero(),
-        );
-
         Ok(())
     }
 

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

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

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

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

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

@@ -25,9 +25,6 @@ use inkwell::debug_info::AsDIScope;
 use inkwell::debug_info::DIScope;
 use inkwell::types::BasicType;
 use inkwell::values::BasicValue;
-use revive_solc_json_interface::PolkaVMDefaultHeapMemorySize;
-use revive_solc_json_interface::PolkaVMDefaultStackMemorySize;
-use revive_solc_json_interface::SolcStandardJsonInputSettingsPolkaVMMemory;
 
 use crate::optimizer::settings::Settings as OptimizerSettings;
 use crate::optimizer::Optimizer;
@@ -36,7 +33,6 @@ use crate::polkavm::Dependency;
 use crate::target_machine::target::Target;
 use crate::target_machine::TargetMachine;
 use crate::PolkaVMLoadHeapWordFunction;
-use crate::PolkaVMSbrkFunction;
 use crate::PolkaVMStoreHeapWordFunction;
 
 use self::address_space::AddressSpace;
@@ -89,8 +85,6 @@ where
     loop_stack: Vec<Loop<'ctx>>,
     /// The extra LLVM arguments that were used during target initialization.
     llvm_arguments: &'ctx [String],
-    /// The PVM memory configuration.
-    memory_config: SolcStandardJsonInputSettingsPolkaVMMemory,
 
     /// The project dependency manager. It can be any entity implementing the trait.
     /// The manager is used to get information about contracts and their dependencies during
@@ -122,6 +116,9 @@ where
     /// The loop stack default capacity.
     const LOOP_STACK_INITIAL_CAPACITY: usize = 16;
 
+    /// The PolkaVM minimum stack size.
+    const POLKAVM_STACK_SIZE: u32 = 0x4000;
+
     /// Link in the stdlib module.
     fn link_stdlib_module(
         llvm: &'ctx inkwell::context::Context,
@@ -221,7 +218,6 @@ where
     }
 
     /// Initializes a new LLVM context.
-    #[allow(clippy::too_many_arguments)]
     pub fn new(
         llvm: &'ctx inkwell::context::Context,
         module: inkwell::module::Module<'ctx>,
@@ -230,18 +226,11 @@ where
         include_metadata_hash: bool,
         debug_config: DebugConfig,
         llvm_arguments: &'ctx [String],
-        memory_config: SolcStandardJsonInputSettingsPolkaVMMemory,
     ) -> Self {
         Self::set_data_layout(llvm, &module);
         Self::link_stdlib_module(llvm, &module);
         Self::link_polkavm_imports(llvm, &module);
-        Self::set_polkavm_stack_size(
+        Self::set_polkavm_stack_size(llvm, &module, Self::POLKAVM_STACK_SIZE);
-            llvm,
-            &module,
-            memory_config
-                .stack_size
-                .unwrap_or(PolkaVMDefaultStackMemorySize),
-        );
         Self::set_module_flags(llvm, &module);
 
         let intrinsics = Intrinsics::new(llvm, &module);
@@ -265,7 +254,6 @@ where
             current_function: None,
             loop_stack: Vec::with_capacity(Self::LOOP_STACK_INITIAL_CAPACITY),
             llvm_arguments,
-            memory_config,
 
             dependency_manager,
             include_metadata_hash,
@@ -656,7 +644,6 @@ where
                     self.include_metadata_hash,
                     self.debug_config.clone(),
                     self.llvm_arguments,
-                    self.memory_config,
                 )
             })
     }
@@ -763,9 +750,7 @@ where
         address: inkwell::values::IntValue<'ctx>,
     ) -> anyhow::Result<Pointer<'ctx>> {
         let address_type = self.integer_type(revive_common::BIT_LENGTH_ETH_ADDRESS);
-        let address_pointer = self
+        let address_pointer = self.build_alloca_at_entry(address_type, "address_pointer");
-            .get_global(crate::polkavm::GLOBAL_ADDRESS_SPILL_BUFFER)?
-            .into();
         let address_truncated =
             self.builder()
                 .build_int_truncate(address, address_type, "address_truncated")?;
@@ -1097,40 +1082,32 @@ where
         offset: inkwell::values::IntValue<'ctx>,
         size: inkwell::values::IntValue<'ctx>,
     ) -> anyhow::Result<inkwell::values::PointerValue<'ctx>> {
-        let call_site_value = self.builder().build_call(
+        Ok(self
-            <PolkaVMSbrkFunction as RuntimeFunction<D>>::declaration(self).function_value(),
+            .builder()
-            &[offset.into(), size.into()],
+            .build_call(
-            "alloc_start",
+                self.runtime_api_method(revive_runtime_api::polkavm_imports::SBRK),
-        )?;
+                &[offset.into(), size.into()],
-
+                "call_sbrk",
-        call_site_value.add_attribute(
+            )?
-            inkwell::attributes::AttributeLoc::Return,
-            self.llvm
-                .create_enum_attribute(Attribute::NonNull as u32, 0),
-        );
-        call_site_value.add_attribute(
-            inkwell::attributes::AttributeLoc::Return,
-            self.llvm
-                .create_enum_attribute(Attribute::NoUndef as u32, 0),
-        );
-
-        Ok(call_site_value
             .try_as_basic_value()
             .left()
-            .unwrap_or_else(|| {
+            .expect("sbrk returns a pointer")
-                panic!(
-                    "revive runtime function {} should return a value",
-                    <PolkaVMSbrkFunction as RuntimeFunction<D>>::NAME,
-                )
-            })
             .into_pointer_value())
     }
 
     /// Build a call to PolkaVM `msize` for querying the linear memory size.
     pub fn build_msize(&self) -> anyhow::Result<inkwell::values::IntValue<'ctx>> {
-        Ok(self
+        let memory_size_pointer = self
-            .get_global_value(crate::polkavm::GLOBAL_HEAP_SIZE)?
+            .module()
-            .into_int_value())
+            .get_global(revive_runtime_api::polkavm_imports::MEMORY_SIZE)
+            .expect("the memory size symbol should have been declared")
+            .as_pointer_value();
+        let memory_size_value = self.builder().build_load(
+            self.xlen_type(),
+            memory_size_pointer,
+            "memory_size_value",
+        )?;
+        Ok(memory_size_value.into_int_value())
     }
 
     /// Returns a pointer to `offset` into the heap, allocating
@@ -1449,13 +1426,4 @@ where
     pub fn optimizer_settings(&self) -> &OptimizerSettings {
         self.optimizer.settings()
     }
-
-    pub fn heap_size(&self) -> inkwell::values::IntValue<'ctx> {
-        self.xlen_type().const_int(
-            self.memory_config
-                .heap_size
-                .unwrap_or(PolkaVMDefaultHeapMemorySize) as u64,
-            false,
-        )
-    }
 }

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

@@ -19,7 +19,7 @@ where
     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_type(&[context.word_type().into()], false)
     }
 
     fn emit_body<'ctx>(
@@ -59,7 +59,7 @@ where
     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_type(&[context.word_type().into()], false)
     }
 
     fn emit_body<'ctx>(
@@ -94,10 +94,7 @@ where
 
     fn r#type<'ctx>(context: &Context<'ctx, D>) -> inkwell::types::FunctionType<'ctx> {
         context.void_type().fn_type(
-            &[
+            &[context.word_type().into(), context.word_type().into()],
-                context.llvm().ptr_type(Default::default()).into(),
-                context.llvm().ptr_type(Default::default()).into(),
-            ],
             false,
         )
     }
@@ -141,10 +138,7 @@ where
 
     fn r#type<'ctx>(context: &Context<'ctx, D>) -> inkwell::types::FunctionType<'ctx> {
         context.void_type().fn_type(
-            &[
+            &[context.word_type().into(), context.word_type().into()],
-                context.llvm().ptr_type(Default::default()).into(),
-                context.llvm().ptr_type(Default::default()).into(),
-            ],
             false,
         )
     }
@@ -179,17 +173,9 @@ where
 
 fn emit_load<'ctx, D: Dependency + Clone>(
     context: &mut Context<'ctx, D>,
-    key: BasicValueEnum<'ctx>,
+    mut 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)?;
     }
@@ -231,26 +217,10 @@ fn emit_load<'ctx, D: Dependency + Clone>(
 
 fn emit_store<'ctx, D: Dependency + Clone>(
     context: &mut Context<'ctx, D>,
-    key: BasicValueEnum<'ctx>,
+    mut key: BasicValueEnum<'ctx>,
-    value: BasicValueEnum<'ctx>,
+    mut 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)?;

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

@@ -23,7 +23,6 @@ pub fn create_context(
         true,
         Default::default(),
         Default::default(),
-        Default::default(),
     )
 }
 

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

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

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

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

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

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

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

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

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

@@ -3,7 +3,6 @@
 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;
@@ -12,14 +11,14 @@ use crate::PolkaVMStoreTransientStorageWordFunction;
 /// Translates the storage load.
 pub fn load<'ctx, D>(
     context: &mut Context<'ctx, D>,
-    position: &PolkaVMArgument<'ctx>,
+    position: inkwell::values::IntValue<'ctx>,
 ) -> anyhow::Result<inkwell::values::BasicValueEnum<'ctx>>
 where
     D: Dependency + Clone,
 {
     let name = <PolkaVMLoadStorageWordFunction as RuntimeFunction<D>>::NAME;
     let declaration = <PolkaVMLoadStorageWordFunction as RuntimeFunction<D>>::declaration(context);
-    let arguments = [position.as_pointer(context)?.value.into()];
+    let arguments = [position.into()];
     Ok(context
         .build_call(declaration, &arguments, "storage_load")
         .unwrap_or_else(|| panic!("runtime function {name} should return a value")))
@@ -28,17 +27,14 @@ where
 /// Translates the storage store.
 pub fn store<'ctx, D>(
     context: &mut Context<'ctx, D>,
-    position: &PolkaVMArgument<'ctx>,
+    position: inkwell::values::IntValue<'ctx>,
-    value: &PolkaVMArgument<'ctx>,
+    value: inkwell::values::IntValue<'ctx>,
 ) -> anyhow::Result<()>
 where
     D: Dependency + Clone,
 {
     let declaration = <PolkaVMStoreStorageWordFunction as RuntimeFunction<D>>::declaration(context);
-    let arguments = [
+    let arguments = [position.into(), value.into()];
-        position.as_pointer(context)?.value.into(),
-        value.as_pointer(context)?.value.into(),
-    ];
     context.build_call(declaration, &arguments, "storage_store");
     Ok(())
 }
@@ -46,13 +42,13 @@ where
 /// Translates the transient storage load.
 pub fn transient_load<'ctx, D>(
     context: &mut Context<'ctx, D>,
-    position: &PolkaVMArgument<'ctx>,
+    position: inkwell::values::IntValue<'ctx>,
 ) -> anyhow::Result<inkwell::values::BasicValueEnum<'ctx>>
 where
     D: Dependency + Clone,
 {
     let name = <PolkaVMLoadTransientStorageWordFunction as RuntimeFunction<D>>::NAME;
-    let arguments = [position.as_pointer(context)?.value.into()];
+    let arguments = [position.into()];
     let declaration =
         <PolkaVMLoadTransientStorageWordFunction as RuntimeFunction<D>>::declaration(context);
     Ok(context
@@ -63,18 +59,15 @@ where
 /// Translates the transient storage store.
 pub fn transient_store<'ctx, D>(
     context: &mut Context<'ctx, D>,
-    position: &PolkaVMArgument<'ctx>,
+    position: inkwell::values::IntValue<'ctx>,
-    value: &PolkaVMArgument<'ctx>,
+    value: inkwell::values::IntValue<'ctx>,
 ) -> anyhow::Result<()>
 where
     D: Dependency + Clone,
 {
     let declaration =
         <PolkaVMStoreTransientStorageWordFunction as RuntimeFunction<D>>::declaration(context);
-    let arguments = [
+    let arguments = [position.into(), value.into()];
-        position.as_pointer(context)?.value.into(),
-        value.as_pointer(context)?.value.into(),
-    ];
     context.build_call(declaration, &arguments, "transient_storage_store");
     Ok(())
 }

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

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

crates/resolc/build.rs

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

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

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

crates/resolc/src/tests/cli-tests/src/entities.ts

@@ -1,53 +0,0 @@
-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 pathToMemsetYulContract = path.join(
-  pathToContracts,
-  'yul',
-  'memset.yul'
-)
-const pathToBasicSolContract = path.join(
-  pathToContracts,
-  'solidity',
-  contractSolFilename
-)
-const pathToSolBinOutputFile = path.join(
-  pathToOutputDir,
-  contractSolFilename + binExtension
-)
-const pathToSolAsmOutputFile = path.join(
-  pathToOutputDir,
-  contractSolFilename + asmExtension
-)
-
-export const paths = {
-  outputDir: outputDir,
-  binExtension: binExtension,
-  asmExtension: asmExtension,
-  llvmExtension: llvmExtension,
-  contractSolFilename: contractSolFilename,
-  contractYulFilename: contractYulFilename,
-  contractOptimizedLLVMFilename: contractOptimizedLLVMFilename,
-  contractUnoptimizedLLVMFilename: contractUnoptimizedLLVMFilename,
-  pathToOutputDir: pathToOutputDir,
-  pathToContracts: pathToContracts,
-  pathToBasicSolContract: pathToBasicSolContract,
-  pathToBasicYulContract: pathToBasicYulContract,
-  pathToMemsetYulContract: pathToMemsetYulContract,
-  pathToSolBinOutputFile: pathToSolBinOutputFile,
-  pathToSolAsmOutputFile: pathToSolAsmOutputFile,
-}

crates/resolc/src/tests/cli-tests/src/helper.ts

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

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

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

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

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

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

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

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

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

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

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

crates/runner/Cargo.toml

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

crates/runner/README.md

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

crates/runner/src/lib.rs

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

crates/runner/src/main.rs

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

crates/runner/src/runtime.rs

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

crates/runner/src/specs.rs

@@ -1,15 +1,13 @@
-use std::{str::FromStr, time::Instant};
+use std::time::Instant;
 
 use serde::{Deserialize, Serialize};
 
 use crate::*;
-use alloy_primitives::keccak256;
+use alloy_primitives::{keccak256, Address};
-#[cfg(feature = "resolc")]
+#[cfg(feature = "revive-solidity")]
-use alloy_primitives::Address;
-#[cfg(feature = "resolc")]
-use resolc::test_utils::*;
-#[cfg(feature = "resolc")]
 use revive_differential::{Evm, EvmLog};
+#[cfg(feature = "revive-solidity")]
+use revive_solidity::test_utils::*;
 
 const SPEC_MARKER_BEGIN: &str = "/* runner.json";
 const SPEC_MARKER_END: &str = "*/";
@@ -158,39 +156,6 @@ impl TestAddress {
     }
 }
 
-impl FromStr for TestAddress {
-    type Err = &'static str;
-
-    fn from_str(value: &str) -> Result<Self, Self::Err> {
-        value.try_into()
-    }
-}
-
-impl TryFrom<&str> for TestAddress {
-    type Error = &'static str;
-
-    fn try_from(value: &str) -> Result<Self, Self::Error> {
-        match value {
-            "alice" => Ok(Self::Alice),
-            "bob" => Ok(Self::Bob),
-            "charlie" => Ok(Self::Charlie),
-            value => {
-                if let Ok(value) = value.parse() {
-                    return Ok(Self::Instantiated(value));
-                }
-
-                if let Ok(value) = hex::decode(value) {
-                    if value.len() == 20 {
-                        return Ok(Self::AccountId(H160(value.try_into().unwrap())));
-                    }
-                }
-
-                Err("can not parse into test address")
-            }
-        }
-    }
-}
-
 /// Specs for a contract test
 #[derive(Clone, Debug, Serialize, Deserialize)]
 #[serde(default)]
@@ -247,7 +212,6 @@ impl Specs {
     /// Helper to allow not specifying the code bytes or path directly in the runner.json
     /// - Replace `Code::Bytes(bytes)` if `bytes` are empty: read `contract_file`
     /// - Replace `Code::Solidity{ path, ..}` if `path` is not provided: replace `path` with `contract_file`
-    #[allow(unused_variables)]
     pub fn replace_empty_code(&mut self, contract_name: &str, contract_path: &str) {
         for action in self.actions.iter_mut() {
             let code = match action {
@@ -256,7 +220,7 @@ impl Specs {
             };
 
             match code {
-                #[cfg(feature = "resolc")]
+                #[cfg(feature = "revive-solidity")]
                 Code::Bytes(bytes) if bytes.is_empty() => {
                     let contract_source = match std::fs::read_to_string(contract_path) {
                         Err(err) => panic!("unable to read {contract_path}: {err}"),
@@ -264,9 +228,9 @@ impl Specs {
                     };
                     *bytes = compile_blob(contract_name, &contract_source)
                 }
-                #[cfg(not(feature = "resolc"))]
+                #[cfg(not(feature = "revive-solidity"))]
                 Code::Bytes(_) => panic!("{NO_SOLIDITY_FRONTEND}"),
-                #[cfg(feature = "resolc")]
+                #[cfg(feature = "revive-solidity")]
                 Code::Solidity { path, .. } if path.is_none() => *path = Some(contract_path.into()),
                 _ => continue,
             }

crates/runtime-api/Cargo.toml

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

crates/runtime-api/build.rs

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

crates/runtime-api/src/polkavm_imports.c

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

crates/runtime-api/src/polkavm_imports.rs

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

crates/solc-json-interface/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "revive-solc-json-interface"
-version = "0.2.0"
+version.workspace = true
 authors.workspace = true
 license.workspace = true
 edition.workspace = true
@@ -20,4 +20,4 @@ anyhow = { workspace = true }
 rayon = { workspace = true, optional = true }
 semver = { workspace = true }
 serde = { workspace = true }
-serde_json = { workspace = true }
+serde_json = { workspace = true }

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

@@ -8,10 +8,6 @@ pub use self::standard_json::input::language::Language as SolcStandardJsonInputL
 pub use self::standard_json::input::settings::metadata::Metadata as SolcStandardJsonInputSettingsMetadata;
 pub use self::standard_json::input::settings::metadata_hash::MetadataHash as SolcStandardJsonInputSettingsMetadataHash;
 pub use self::standard_json::input::settings::optimizer::Optimizer as SolcStandardJsonInputSettingsOptimizer;
-pub use self::standard_json::input::settings::polkavm::memory::MemoryConfig as SolcStandardJsonInputSettingsPolkaVMMemory;
-pub use self::standard_json::input::settings::polkavm::memory::DEFAULT_HEAP_SIZE as PolkaVMDefaultHeapMemorySize;
-pub use self::standard_json::input::settings::polkavm::memory::DEFAULT_STACK_SIZE as PolkaVMDefaultStackMemorySize;
-pub use self::standard_json::input::settings::polkavm::PolkaVM as SolcStandardJsonInputSettingsPolkaVM;
 pub use self::standard_json::input::settings::selection::file::flag::Flag as SolcStandardJsonInputSettingsSelectionFileFlag;
 pub use self::standard_json::input::settings::selection::file::File as SolcStandardJsonInputSettingsSelectionFile;
 pub use self::standard_json::input::settings::selection::Selection as SolcStandardJsonInputSettingsSelection;

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

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

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

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

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

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

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

@@ -4,7 +4,7 @@ use serde::Deserialize;
 use serde::Serialize;
 
 /// The `solc --standard-json` input settings optimizer details.
-#[derive(Clone, Debug, Serialize, Deserialize)]
+#[derive(Debug, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct Details {
     /// Whether the pass is enabled.

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

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

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

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

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

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

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

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

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

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

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

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

crates/solidity/Cargo.toml

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

crates/solidity/build.rs

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

crates/solidity/src/lib.rs

@@ -7,6 +7,7 @@ pub(crate) mod process;
 pub(crate) mod project;
 pub(crate) mod solc;
 pub(crate) mod version;
+pub(crate) mod yul;
 
 pub use self::build::contract::Contract as ContractBuild;
 pub use self::build::Build;
@@ -44,8 +45,6 @@ use revive_solc_json_interface::ResolcWarning;
 use revive_solc_json_interface::SolcStandardJsonInput;
 use revive_solc_json_interface::SolcStandardJsonInputLanguage;
 use revive_solc_json_interface::SolcStandardJsonInputSettingsOptimizer;
-use revive_solc_json_interface::SolcStandardJsonInputSettingsPolkaVM;
-use revive_solc_json_interface::SolcStandardJsonInputSettingsPolkaVMMemory;
 use revive_solc_json_interface::SolcStandardJsonInputSettingsSelection;
 
 /// Runs the Yul mode.
@@ -56,7 +55,6 @@ pub fn yul<T: Compiler>(
     include_metadata_hash: bool,
     debug_config: revive_llvm_context::DebugConfig,
     llvm_arguments: &[String],
-    memory_config: SolcStandardJsonInputSettingsPolkaVMMemory,
 ) -> anyhow::Result<Build> {
     let path = match input_files.len() {
         1 => input_files.first().expect("Always exists"),
@@ -82,7 +80,6 @@ pub fn yul<T: Compiler>(
         include_metadata_hash,
         debug_config,
         llvm_arguments,
-        memory_config,
     )?;
 
     Ok(build)
@@ -95,7 +92,6 @@ pub fn llvm_ir(
     include_metadata_hash: bool,
     debug_config: revive_llvm_context::DebugConfig,
     llvm_arguments: &[String],
-    memory_config: SolcStandardJsonInputSettingsPolkaVMMemory,
 ) -> anyhow::Result<Build> {
     let path = match input_files.len() {
         1 => input_files.first().expect("Always exists"),
@@ -113,7 +109,6 @@ pub fn llvm_ir(
         include_metadata_hash,
         debug_config,
         llvm_arguments,
-        memory_config,
     )?;
 
     Ok(build)
@@ -136,7 +131,6 @@ pub fn standard_output<T: Compiler>(
     suppressed_warnings: Option<Vec<ResolcWarning>>,
     debug_config: revive_llvm_context::DebugConfig,
     llvm_arguments: &[String],
-    memory_config: SolcStandardJsonInputSettingsPolkaVMMemory,
 ) -> anyhow::Result<Build> {
     let solc_version = solc.version()?;
 
@@ -155,10 +149,6 @@ pub fn standard_output<T: Compiler>(
         ),
         None,
         suppressed_warnings,
-        Some(SolcStandardJsonInputSettingsPolkaVM::new(
-            Some(memory_config),
-            debug_config.emit_debug_info,
-        )),
     )?;
 
     let source_code_files = solc_input
@@ -199,21 +189,19 @@ pub fn standard_output<T: Compiler>(
         include_metadata_hash,
         debug_config,
         llvm_arguments,
-        memory_config,
     )?;
 
     Ok(build)
 }
 
 /// Runs the standard JSON mode.
-#[allow(clippy::too_many_arguments)]
 pub fn standard_json<T: Compiler>(
     solc: &mut T,
     detect_missing_libraries: bool,
     base_path: Option<String>,
     include_paths: Vec<String>,
     allow_paths: Option<String>,
-    mut debug_config: revive_llvm_context::DebugConfig,
+    debug_config: revive_llvm_context::DebugConfig,
     llvm_arguments: &[String],
 ) -> anyhow::Result<()> {
     let solc_version = solc.version()?;
@@ -228,9 +216,6 @@ pub fn standard_json<T: Compiler>(
     let optimizer_settings =
         revive_llvm_context::OptimizerSettings::try_from(&solc_input.settings.optimizer)?;
 
-    let polkavm_settings = solc_input.settings.polkavm.unwrap_or_default();
-    debug_config.emit_debug_info = polkavm_settings.debug_information.unwrap_or_default();
-
     let include_metadata_hash = match solc_input.settings.metadata {
         Some(ref metadata) => metadata.bytecode_hash != Some(MetadataHash::None),
         None => true,
@@ -265,9 +250,6 @@ pub fn standard_json<T: Compiler>(
             include_metadata_hash,
             debug_config,
             llvm_arguments,
-            polkavm_settings
-                .memory_config
-                .unwrap_or_else(SolcStandardJsonInputSettingsPolkaVMMemory::default),
         )?;
         build.write_to_standard_json(&mut solc_output, &solc_version)?;
     }
@@ -295,7 +277,6 @@ pub fn combined_json<T: Compiler>(
     output_directory: Option<PathBuf>,
     overwrite: bool,
     llvm_arguments: &[String],
-    memory_config: SolcStandardJsonInputSettingsPolkaVMMemory,
 ) -> anyhow::Result<()> {
     let build = standard_output(
         input_files,
@@ -312,7 +293,6 @@ pub fn combined_json<T: Compiler>(
         suppressed_warnings,
         debug_config,
         llvm_arguments,
-        memory_config,
     )?;
 
     let mut combined_json = solc.combined_json(input_files, format.as_str())?;

crates/solidity/src/process/input.rs

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

crates/solidity/src/process/mod.rs

@@ -50,7 +50,6 @@ pub trait Process {
             input.include_metadata_hash,
             input.debug_config,
             &input.llvm_arguments,
-            input.memory_config,
         );
 
         match result {

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

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

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

@@ -5,7 +5,7 @@ use std::collections::HashSet;
 use serde::Deserialize;
 use serde::Serialize;
 
-use revive_yul::parser::statement::object::Object;
+use crate::yul::parser::statement::object::Object;
 
 /// The contract Yul source code.
 #[derive(Debug, Serialize, Deserialize, Clone)]