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=--pre-js=js/emscripten/embed/pre.js",
+    "-Clink-arg=--js-library=js/embed/soljson_interface.js",
+    "-Clink-arg=--pre-js=js/embed/pre.js",
     "-Clink-arg=-sSTACK_SIZE=128kb",
     "-Clink-arg=-sNODEJS_CATCH_EXIT=0"
 ]

.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}"
-
-    # Get SHA256 checksum if available
-    sha256 = checksums.get(asset['name'], "")
+    path = f"{asset['name']}+{long_version}"
 
     return {
+        "path": path,
         "name": asset['name'],
         "version": version,
         "build": build,
         "longVersion": long_version,
         "url": asset['browser_download_url'],
-        "sha256": sha256,
-        "firstSolcVersion": os.environ.get("FIRST_SOLC_VERSION", ""),
-        "lastSolcVersion": os.environ.get("LAST_SOLC_VERSION", "")
+        "firstSolcVersion": os.environ["FIRST_SOLC_VERSION"],
+        "lastSolcVersion": os.environ["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,11 +87,6 @@ jobs:
         run: |
           brew install ninja
 
-      - name: Install Dependencies
-        if: ${{ matrix.host == 'windows' }}
-        run: |
-          choco install ninja
-
       - name: Install LLVM Builder
         run: |
           cargo install --path crates/llvm-builder

.github/workflows/release.yml

@@ -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,50 +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: Set version
-        run: |
-          VERSION="${{ github.event.release.tag_name }}"
-          STRIPPED_VERSION="${VERSION#v}"
-          npm -w js/resolc version --no-git-tag-version "$STRIPPED_VERSION"
-
-      - 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

@@ -6,41 +6,6 @@ This is a development pre-release.
 
 Supported `polkadot-sdk` rev:`c29e72a8628835e34deb6aa7db9a78a2e4eabcee`
 
-## v0.1.0
-
-This is a development pre-release.
-
-Supported `polkadot-sdk` rev:`c29e72a8628835e34deb6aa7db9a78a2e4eabcee`
-
-### Added
-
-### Changed
-- By default, heavy size optimizations are applied.
-
-### Fixed
-
-## v0.1.0-dev.14
-
-This is a development pre-release.
-
-Supported `polkadot-sdk` rev:`c29e72a8628835e34deb6aa7db9a78a2e4eabcee`
-
-### Added
-- The `revive-runner` helper utility binary which helps to run contracts locally without a blockchain node. 
-- Allow configuration of the EVM heap memory size and stack size via CLI flags and JSON input settings.
-
-### Changed
-- The default PVM stack memory size was increased from 16kb to 32kb.
-
-### Fixed
-- Constructors avoid storing zero sized immutable data on exit.
-
-## v0.1.0-dev.13
-
-This is a development pre-release.
-
-Supported `polkadot-sdk` rev:`c29e72a8628835e34deb6aa7db9a78a2e4eabcee`
-
 ### Added
 - Support for solc v0.8.29
 - Decouples the solc JSON-input-output type definitions from the Solidity fronted and expose them via a dedicated crate.
@@ -49,7 +14,7 @@ Supported `polkadot-sdk` rev:`c29e72a8628835e34deb6aa7db9a78a2e4eabcee`
 
 ### 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.

Cargo.lock

@@ -4553,7 +4553,7 @@ checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104"
 
 [[package]]
 name = "lld-sys"
-version = "0.1.0-dev.14"
+version = "0.1.0-dev.12"
 dependencies = [
  "cc",
  "libc",
@@ -8266,7 +8266,7 @@ dependencies = [
 
 [[package]]
 name = "revive-benchmarks"
-version = "0.1.0-dev.14"
+version = "0.1.0-dev.12"
 dependencies = [
  "alloy-primitives",
  "criterion",
@@ -8278,18 +8278,18 @@ dependencies = [
 
 [[package]]
 name = "revive-build-utils"
-version = "0.1.0-dev.14"
+version = "0.1.0-dev.12"
 
 [[package]]
 name = "revive-builtins"
-version = "0.1.0-dev.14"
+version = "0.1.0-dev.12"
 dependencies = [
  "revive-build-utils",
 ]
 
 [[package]]
 name = "revive-common"
-version = "0.1.0-dev.14"
+version = "0.1.0-dev.12"
 dependencies = [
  "anyhow",
  "serde",
@@ -8299,7 +8299,7 @@ dependencies = [
 
 [[package]]
 name = "revive-differential"
-version = "0.1.0-dev.14"
+version = "0.1.0-dev.12"
 dependencies = [
  "alloy-genesis",
  "alloy-primitives",
@@ -8312,7 +8312,7 @@ dependencies = [
 
 [[package]]
 name = "revive-integration"
-version = "0.1.0-dev.14"
+version = "0.1.0-dev.12"
 dependencies = [
  "alloy-primitives",
  "alloy-sol-types",
@@ -8328,7 +8328,7 @@ dependencies = [
 
 [[package]]
 name = "revive-linker"
-version = "0.1.0-dev.14"
+version = "0.1.0-dev.12"
 dependencies = [
  "anyhow",
  "libc",
@@ -8340,7 +8340,7 @@ dependencies = [
 
 [[package]]
 name = "revive-llvm-builder"
-version = "0.1.0-dev.14"
+version = "0.1.0-dev.12"
 dependencies = [
  "anyhow",
  "assert_cmd",
@@ -8362,7 +8362,7 @@ dependencies = [
 
 [[package]]
 name = "revive-llvm-context"
-version = "0.1.0-dev.14"
+version = "0.1.0-dev.12"
 dependencies = [
  "anyhow",
  "hex",
@@ -8384,12 +8384,9 @@ dependencies = [
 
 [[package]]
 name = "revive-runner"
-version = "0.1.0-dev.14"
+version = "0.1.0-dev.12"
 dependencies = [
  "alloy-primitives",
- "anyhow",
- "clap",
- "env_logger 0.11.6",
  "hex",
  "parity-scale-codec",
  "polkadot-sdk 0.1.0",
@@ -8403,7 +8400,7 @@ dependencies = [
 
 [[package]]
 name = "revive-runtime-api"
-version = "0.1.0-dev.14"
+version = "0.1.0-dev.12"
 dependencies = [
  "anyhow",
  "inkwell",
@@ -8413,7 +8410,7 @@ dependencies = [
 
 [[package]]
 name = "revive-solc-json-interface"
-version = "0.1.0-dev.14"
+version = "0.1.0-dev.12"
 dependencies = [
  "anyhow",
  "rayon",
@@ -8425,7 +8422,7 @@ dependencies = [
 
 [[package]]
 name = "revive-solidity"
-version = "0.1.0-dev.14"
+version = "0.1.0-dev.12"
 dependencies = [
  "anyhow",
  "clap",
@@ -8452,7 +8449,7 @@ dependencies = [
 
 [[package]]
 name = "revive-stdlib"
-version = "0.1.0-dev.14"
+version = "0.1.0-dev.12"
 dependencies = [
  "inkwell",
  "revive-build-utils",
@@ -11120,9 +11117,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.44.2"
+version = "1.43.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6b88822cbe49de4185e3a4cbf8321dd487cf5fe0c5c65695fef6346371e9c48"
+checksum = "3d61fa4ffa3de412bfea335c6ecff681de2b609ba3c77ef3e00e521813a9ed9e"
 dependencies = [
  "backtrace",
  "bytes",

Cargo.toml

@@ -3,7 +3,7 @@ resolver = "2"
 members = ["crates/*"]
 
 [workspace.package]
-version = "0.1.0-dev.14"
+version = "0.1.0-dev.12"
 authors = [
     "Cyrill Leutwiler <cyrill@parity.io>",
     "Parity Technologies <admin@parity.io>",
@@ -14,20 +14,20 @@ repository = "https://github.com/paritytech/revive"
 rust-version = "1.81.0"
 
 [workspace.dependencies]
-revive-benchmarks = { version = "0.1.0-dev.14", path = "crates/benchmarks" }
-revive-builtins = { version = "0.1.0-dev.14", path = "crates/builtins" }
-revive-common = { version = "0.1.0-dev.14", path = "crates/common" }
-revive-differential = { version = "0.1.0-dev.14", path = "crates/differential" }
-revive-integration = { version = "0.1.0-dev.14", path = "crates/integration" }
-revive-linker = { version = "0.1.0-dev.14", path = "crates/linker" }
-lld-sys = { version = "0.1.0-dev.14", path = "crates/lld-sys" }
-revive-llvm-context = { version = "0.1.0-dev.14", path = "crates/llvm-context" }
-revive-runtime-api = { version = "0.1.0-dev.14", path = "crates/runtime-api" }
-revive-runner = { version = "0.1.0-dev.14", path = "crates/runner" }
-revive-solc-json-interface = { version = "0.1.0-dev.14", path = "crates/solc-json-interface" }
-revive-solidity = { version = "0.1.0-dev.14", path = "crates/solidity" }
-revive-stdlib = { version = "0.1.0-dev.14", path = "crates/stdlib" }
-revive-build-utils = { version = "0.1.0-dev.14", path = "crates/build-utils" }
+revive-benchmarks = { version = "0.1.0-dev.12", path = "crates/benchmarks" }
+revive-builtins = { version = "0.1.0-dev.12", path = "crates/builtins" }
+revive-common = { version = "0.1.0-dev.12", path = "crates/common" }
+revive-differential = { version = "0.1.0-dev.12", path = "crates/differential" }
+revive-integration = { version = "0.1.0-dev.12", path = "crates/integration" }
+revive-linker = { version = "0.1.0-dev.12", path = "crates/linker" }
+lld-sys = { version = "0.1.0-dev.12", path = "crates/lld-sys" }
+revive-llvm-context = { version = "0.1.0-dev.12", path = "crates/llvm-context" }
+revive-runtime-api = { version = "0.1.0-dev.12", path = "crates/runtime-api" }
+revive-runner = { version = "0.1.0-dev.12", path = "crates/runner" }
+revive-solc-json-interface = { version = "0.1.0-dev.12", path = "crates/solc-json-interface" }
+revive-solidity = { version = "0.1.0-dev.12", path = "crates/solidity" }
+revive-stdlib = { version = "0.1.0-dev.12", path = "crates/stdlib" }
+revive-build-utils = { version = "0.1.0-dev.12", path = "crates/build-utils" }
 
 hex = "0.4.3"
 cc = "1.2"

Dockerfile

@@ -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:68b86bc7cb2867259e6b233415a665ff4469c28b57763e78c3bfea1c68091561 AS resolc-builder
+FROM messense/rust-musl-cross:x86_64-musl AS resolc-builder
 WORKDIR /opt/revive
 
 RUN apt update && \ 

Makefile

@@ -5,7 +5,6 @@
 	install-wasm \
 	install-llvm-builder \
 	install-llvm \
-	install-revive-runner \
 	format \
 	clippy \
 	machete \
@@ -40,9 +39,6 @@ install-llvm: install-llvm-builder
 	revive-llvm clone
 	revive-llvm build --llvm-projects lld --llvm-projects clang
 
-install-revive-runner:
-	cargo install --path crates/runner --no-default-features --locked
-
 format:
 	cargo fmt --all --check
 
@@ -53,7 +49,7 @@ 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
@@ -92,4 +88,7 @@ clean:
 	rm -rf node_modules ; \
 	rm -rf crates/solidity/src/tests/cli-tests/artifacts ; \
 	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}

crates/benchmarks/BENCHMARKS.md

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

crates/integration/codesize.json

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

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-context/src/lib.rs

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

crates/llvm-context/src/memory.rs

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

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

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

crates/llvm-context/src/polkavm/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.
-    pub fn value(value: inkwell::values::BasicValueEnum<'ctx>) -> Self {
+    /// The calldata offset argument index.
+    pub const ARGUMENT_INDEX_CALLDATA_OFFSET: usize = 0;
+
+    /// The calldata length argument index.
+    pub const ARGUMENT_INDEX_CALLDATA_LENGTH: usize = 1;
+
+    /// A shortcut constructor.
+    pub fn new(value: inkwell::values::BasicValueEnum<'ctx>) -> Self {
         Self {
-            value: Value::Register(value),
+            value,
             original: None,
             constant: None,
         }
     }
 
-    /// A shortcut constructor for stack arguments.
-    pub fn pointer(pointer: crate::polkavm::context::Pointer<'ctx>, id: String) -> Self {
+    /// A shortcut constructor.
+    pub fn new_with_original(
+        value: inkwell::values::BasicValueEnum<'ctx>,
+        original: String,
+    ) -> Self {
         Self {
-            value: Value::Pointer { pointer, id },
-            original: None,
+            value,
+            original: Some(original),
             constant: None,
         }
     }
 
-    /// Set the original decleratation value.
-    pub fn with_original(mut self, original: String) -> Self {
-        self.original = Some(original);
-        self
-    }
-
-    /// Set the constant value.
-    pub fn with_constant(mut self, constant: num::BigUint) -> Self {
-        self.constant = Some(constant);
-        self
+    /// A shortcut constructor.
+    pub fn new_with_constant(
+        value: inkwell::values::BasicValueEnum<'ctx>,
+        constant: num::BigUint,
+    ) -> Self {
+        Self {
+            value,
+            original: None,
+            constant: Some(constant),
+        }
     }
 
     /// Returns the inner LLVM value.
-    ///
-    /// Panics if `self` is a pointer argument.
-    pub fn _to_llvm_value(&self) -> inkwell::values::BasicValueEnum<'ctx> {
-        match &self.value {
-            Value::Register(value) => *value,
-            Value::Pointer { .. } => unreachable!("invalid register value access"),
-        }
-    }
-
-    /// Access the underlying value.
-    ///
-    /// Will emit a stack load if `self` is a pointer argument.
-    pub fn access<D: crate::polkavm::Dependency + Clone>(
-        &self,
-        context: &crate::polkavm::context::Context<'ctx, D>,
-    ) -> anyhow::Result<inkwell::values::BasicValueEnum<'ctx>> {
-        match &self.value {
-            Value::Register(value) => Ok(*value),
-            Value::Pointer { pointer, id } => context.build_load(*pointer, id),
-        }
-    }
-
-    /// Access the underlying value.
-    ///
-    /// Will emit a stack load if `self` is a pointer argument.
-    pub fn as_pointer<D: crate::polkavm::Dependency + Clone>(
-        &self,
-        context: &crate::polkavm::context::Context<'ctx, D>,
-    ) -> anyhow::Result<crate::polkavm::context::Pointer<'ctx>> {
-        match &self.value {
-            Value::Register(value) => {
-                let pointer = context.build_alloca_at_entry(context.word_type(), "pvm_arg");
-                context.build_store(pointer, *value)?;
-                Ok(pointer)
-            }
-            Value::Pointer { pointer, .. } => Ok(*pointer),
-        }
+    pub fn to_llvm(&self) -> inkwell::values::BasicValueEnum<'ctx> {
+        self.value
     }
 }
 
 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

@@ -31,31 +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);
-        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

@@ -26,7 +26,6 @@ use inkwell::debug_info::DIScope;
 use inkwell::types::BasicType;
 use inkwell::values::BasicValue;
 
-use crate::memory::MemoryConfig;
 use crate::optimizer::settings::Settings as OptimizerSettings;
 use crate::optimizer::Optimizer;
 use crate::polkavm::DebugConfig;
@@ -34,7 +33,6 @@ use crate::polkavm::Dependency;
 use crate::target_machine::target::Target;
 use crate::target_machine::TargetMachine;
 use crate::PolkaVMLoadHeapWordFunction;
-use crate::PolkaVMSbrkFunction;
 use crate::PolkaVMStoreHeapWordFunction;
 
 use self::address_space::AddressSpace;
@@ -87,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: MemoryConfig,
 
     /// The project dependency manager. It can be any entity implementing the trait.
     /// The manager is used to get information about contracts and their dependencies during
@@ -120,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,
@@ -219,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>,
@@ -228,12 +226,11 @@ where
         include_metadata_hash: bool,
         debug_config: DebugConfig,
         llvm_arguments: &'ctx [String],
-        memory_config: MemoryConfig,
     ) -> Self {
         Self::set_data_layout(llvm, &module);
         Self::link_stdlib_module(llvm, &module);
         Self::link_polkavm_imports(llvm, &module);
-        Self::set_polkavm_stack_size(llvm, &module, memory_config.stack_size);
+        Self::set_polkavm_stack_size(llvm, &module, Self::POLKAVM_STACK_SIZE);
         Self::set_module_flags(llvm, &module);
 
         let intrinsics = Intrinsics::new(llvm, &module);
@@ -257,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,
@@ -648,7 +644,6 @@ where
                     self.include_metadata_hash,
                     self.debug_config.clone(),
                     self.llvm_arguments,
-                    self.memory_config,
                 )
             })
     }
@@ -755,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
-            .get_global(crate::polkavm::GLOBAL_ADDRESS_SPILL_BUFFER)?
-            .into();
+        let address_pointer = self.build_alloca_at_entry(address_type, "address_pointer");
         let address_truncated =
             self.builder()
                 .build_int_truncate(address, address_type, "address_truncated")?;
@@ -1089,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(
-            <PolkaVMSbrkFunction as RuntimeFunction<D>>::declaration(self).function_value(),
-            &[offset.into(), size.into()],
-            "alloc_start",
-        )?;
-
-        call_site_value.add_attribute(
-            inkwell::attributes::AttributeLoc::Return,
-            self.llvm
-                .create_enum_attribute(Attribute::NonNull as u32, 0),
-        );
-        call_site_value.add_attribute(
-            inkwell::attributes::AttributeLoc::Return,
-            self.llvm
-                .create_enum_attribute(Attribute::NoUndef as u32, 0),
-        );
-
-        Ok(call_site_value
+        Ok(self
+            .builder()
+            .build_call(
+                self.runtime_api_method(revive_runtime_api::polkavm_imports::SBRK),
+                &[offset.into(), size.into()],
+                "call_sbrk",
+            )?
             .try_as_basic_value()
             .left()
-            .unwrap_or_else(|| {
-                panic!(
-                    "revive runtime function {} should return a value",
-                    <PolkaVMSbrkFunction as RuntimeFunction<D>>::NAME,
-                )
-            })
+            .expect("sbrk returns a pointer")
             .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
-            .get_global_value(crate::polkavm::GLOBAL_HEAP_SIZE)?
-            .into_int_value())
+        let memory_size_pointer = self
+            .module()
+            .get_global(revive_runtime_api::polkavm_imports::MEMORY_SIZE)
+            .expect("the memory size symbol should have been declared")
+            .as_pointer_value();
+        let memory_size_value = self.builder().build_load(
+            self.xlen_type(),
+            memory_size_pointer,
+            "memory_size_value",
+        )?;
+        Ok(memory_size_value.into_int_value())
     }
 
     /// Returns a pointer to `offset` into the heap, allocating
@@ -1441,9 +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 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.llvm().ptr_type(Default::default()).into(),
-                context.llvm().ptr_type(Default::default()).into(),
-            ],
+            &[context.word_type().into(), context.word_type().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.llvm().ptr_type(Default::default()).into(),
-                context.llvm().ptr_type(Default::default()).into(),
-            ],
+            &[context.word_type().into(), context.word_type().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>,
-    value: BasicValueEnum<'ctx>,
+    mut key: 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
-        .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())
+    context.build_load(result_pointer, "shift_left_result")
 }
 
 /// 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
-        .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())
+    context.build_load(result_pointer, "shift_right_result")
 }
 
 /// 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
-        .builder()
-        .build_phi(context.word_type(), "shift_arithmetic_right_value")?;
-    result.add_incoming(&[
-        (&value, non_overflow_block),
-        (
-            &context.word_type().const_all_ones(),
-            overflow_negative_block,
-        ),
-        (&context.word_const(0), overflow_block),
-    ]);
-    Ok(result.as_basic_value())
+    context.build_load(result_pointer, "shift_right_arithmetic_result")
 }
 
 /// 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
-        .get_global(crate::polkavm::GLOBAL_ADDRESS_SPILL_BUFFER)?
-        .into();
+    let address_pointer = context.build_alloca_at_entry(address_type, "origin_address");
     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");
-    context.build_store(index_pointer, index)?;
+    let index_ptr = context.build_alloca_at_entry(context.word_type(), "blockhash_index_ptr");
+    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
-        .get_global(crate::polkavm::GLOBAL_ADDRESS_SPILL_BUFFER)?
-        .into();
+    let pointer = context.build_alloca_at_entry(
+        context.integer_type(revive_common::BIT_LENGTH_ETH_ADDRESS),
+        "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
-        .get_global(crate::polkavm::GLOBAL_ADDRESS_SPILL_BUFFER)?
-        .into();
+    let pointer = context.build_alloca_at_entry(
+        context.integer_type(revive_common::BIT_LENGTH_ETH_ADDRESS),
+        "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
-        .get_global(crate::polkavm::GLOBAL_ADDRESS_SPILL_BUFFER)?
-        .into();
+    let pointer = context.build_alloca_at_entry(
+        context.integer_type(revive_common::BIT_LENGTH_ETH_ADDRESS),
+        "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())
-            .with_constant(num::BigUint::zero()));
+        return Ok(Argument::new_with_constant(
+            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())
-            .with_constant(num::BigUint::zero()));
+        return Ok(Argument::new_with_constant(
+            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>,
-    value: &PolkaVMArgument<'ctx>,
+    position: inkwell::values::IntValue<'ctx>,
+    value: inkwell::values::IntValue<'ctx>,
 ) -> anyhow::Result<()>
 where
     D: Dependency + Clone,
 {
     let declaration = <PolkaVMStoreStorageWordFunction as RuntimeFunction<D>>::declaration(context);
-    let arguments = [
-        position.as_pointer(context)?.value.into(),
-        value.as_pointer(context)?.value.into(),
-    ];
+    let arguments = [position.into(), 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>,
-    value: &PolkaVMArgument<'ctx>,
+    position: inkwell::values::IntValue<'ctx>,
+    value: inkwell::values::IntValue<'ctx>,
 ) -> anyhow::Result<()>
 where
     D: Dependency + Clone,
 {
     let declaration =
         <PolkaVMStoreTransientStorageWordFunction as RuntimeFunction<D>>::declaration(context);
-    let arguments = [
-        position.as_pointer(context)?.value.into(),
-        value.as_pointer(context)?.value.into(),
-    ];
+    let arguments = [position.into(), value.into()];
     context.build_call(declaration, &arguments, "transient_storage_store");
     Ok(())
 }

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

@@ -7,7 +7,6 @@ pub mod evm;
 pub use self::r#const::*;
 
 use crate::debug_config::DebugConfig;
-use crate::memory::MemoryConfig;
 use crate::optimizer::settings::Settings as OptimizerSettings;
 
 use anyhow::Context as AnyhowContext;
@@ -91,7 +90,6 @@ pub trait Dependency {
         include_metadata_hash: bool,
         debug_config: DebugConfig,
         llvm_arguments: &[String],
-        memory_config: MemoryConfig,
     ) -> 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: MemoryConfig,
     ) -> anyhow::Result<String> {
         Ok(String::new())
     }

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

@@ -1,11 +1,9 @@
-use std::{str::FromStr, time::Instant};
+use std::time::Instant;
 
 use serde::{Deserialize, Serialize};
 
 use crate::*;
-use alloy_primitives::keccak256;
-#[cfg(feature = "revive-solidity")]
-use alloy_primitives::Address;
+use alloy_primitives::{keccak256, Address};
 #[cfg(feature = "revive-solidity")]
 use revive_differential::{Evm, EvmLog};
 #[cfg(feature = "revive-solidity")]
@@ -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 {

crates/runtime-api/src/polkavm_imports.c

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

crates/runtime-api/src/polkavm_imports.rs

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

crates/solidity/src/lib.rs

@@ -55,7 +55,6 @@ pub fn yul<T: Compiler>(
     include_metadata_hash: bool,
     debug_config: revive_llvm_context::DebugConfig,
     llvm_arguments: &[String],
-    memory_config: revive_llvm_context::MemoryConfig,
 ) -> anyhow::Result<Build> {
     let path = match input_files.len() {
         1 => input_files.first().expect("Always exists"),
@@ -81,7 +80,6 @@ pub fn yul<T: Compiler>(
         include_metadata_hash,
         debug_config,
         llvm_arguments,
-        memory_config,
     )?;
 
     Ok(build)
@@ -94,7 +92,6 @@ pub fn llvm_ir(
     include_metadata_hash: bool,
     debug_config: revive_llvm_context::DebugConfig,
     llvm_arguments: &[String],
-    memory_config: revive_llvm_context::MemoryConfig,
 ) -> anyhow::Result<Build> {
     let path = match input_files.len() {
         1 => input_files.first().expect("Always exists"),
@@ -112,7 +109,6 @@ pub fn llvm_ir(
         include_metadata_hash,
         debug_config,
         llvm_arguments,
-        memory_config,
     )?;
 
     Ok(build)
@@ -135,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: revive_llvm_context::MemoryConfig,
 ) -> anyhow::Result<Build> {
     let solc_version = solc.version()?;
 
@@ -194,14 +189,12 @@ 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,
@@ -210,7 +203,6 @@ pub fn standard_json<T: Compiler>(
     allow_paths: Option<String>,
     debug_config: revive_llvm_context::DebugConfig,
     llvm_arguments: &[String],
-    memory_config: revive_llvm_context::MemoryConfig,
 ) -> anyhow::Result<()> {
     let solc_version = solc.version()?;
 
@@ -258,7 +250,6 @@ pub fn standard_json<T: Compiler>(
             include_metadata_hash,
             debug_config,
             llvm_arguments,
-            memory_config,
         )?;
         build.write_to_standard_json(&mut solc_output, &solc_version)?;
     }
@@ -286,7 +277,6 @@ pub fn combined_json<T: Compiler>(
     output_directory: Option<PathBuf>,
     overwrite: bool,
     llvm_arguments: &[String],
-    memory_config: revive_llvm_context::MemoryConfig,
 ) -> anyhow::Result<()> {
     let build = standard_output(
         input_files,
@@ -303,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

@@ -22,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: revive_llvm_context::MemoryConfig,
 }
 
 impl Input {
@@ -35,7 +33,6 @@ impl Input {
         optimizer_settings: revive_llvm_context::OptimizerSettings,
         debug_config: revive_llvm_context::DebugConfig,
         llvm_arguments: Vec<String>,
-        memory_config: revive_llvm_context::MemoryConfig,
     ) -> Self {
         Self {
             contract,
@@ -44,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/mod.rs

@@ -78,7 +78,6 @@ impl Contract {
         include_metadata_hash: bool,
         debug_config: revive_llvm_context::DebugConfig,
         llvm_arguments: &[String],
-        memory_config: revive_llvm_context::MemoryConfig,
     ) -> anyhow::Result<ContractBuild> {
         let llvm = inkwell::context::Context::create();
         let optimizer = revive_llvm_context::Optimizer::new(optimizer_settings);
@@ -124,7 +123,6 @@ impl Contract {
             include_metadata_hash,
             debug_config,
             llvm_arguments,
-            memory_config,
         );
         context.set_solidity_data(revive_llvm_context::PolkaVMContextSolidityData::default());
         match self.ir {

crates/solidity/src/project/mod.rs

@@ -67,7 +67,6 @@ impl Project {
         include_metadata_hash: bool,
         debug_config: revive_llvm_context::DebugConfig,
         llvm_arguments: &[String],
-        memory_config: revive_llvm_context::MemoryConfig,
     ) -> anyhow::Result<Build> {
         let project = self.clone();
         #[cfg(feature = "parallel")]
@@ -84,7 +83,6 @@ impl Project {
                     optimizer_settings.clone(),
                     debug_config.clone(),
                     llvm_arguments.to_vec(),
-                    memory_config,
                 );
                 let process_output = {
                     #[cfg(target_os = "emscripten")]
@@ -321,7 +319,6 @@ impl revive_llvm_context::PolkaVMDependency for Project {
         include_metadata_hash: bool,
         debug_config: revive_llvm_context::DebugConfig,
         llvm_arguments: &[String],
-        memory_config: revive_llvm_context::MemoryConfig,
     ) -> anyhow::Result<String> {
         let contract_path = project.resolve_path(identifier)?;
         let contract = project
@@ -342,7 +339,6 @@ impl revive_llvm_context::PolkaVMDependency for Project {
                 include_metadata_hash,
                 debug_config,
                 llvm_arguments,
-                memory_config,
             )
             .map_err(|error| {
                 anyhow::anyhow!(

crates/solidity/src/resolc/arguments.rs

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

crates/solidity/src/resolc/main.rs

@@ -129,7 +129,7 @@ fn main_inner() -> anyhow::Result<()> {
 
     let mut optimizer_settings = match arguments.optimization {
         Some(mode) => revive_llvm_context::OptimizerSettings::try_from_cli(mode)?,
-        None => revive_llvm_context::OptimizerSettings::size(),
+        None => revive_llvm_context::OptimizerSettings::cycles(),
     };
     if arguments.fallback_to_optimizing_for_size {
         optimizer_settings.enable_fallback_to_size();
@@ -148,11 +148,6 @@ fn main_inner() -> anyhow::Result<()> {
         None => true,
     };
 
-    let memory_config = revive_llvm_context::MemoryConfig {
-        heap_size: arguments.heap_size,
-        stack_size: arguments.stack_size,
-    };
-
     let build = if arguments.yul {
         revive_solidity::yul(
             input_files.as_slice(),
@@ -161,7 +156,6 @@ fn main_inner() -> anyhow::Result<()> {
             include_metadata_hash,
             debug_config,
             &arguments.llvm_arguments,
-            memory_config,
         )
     } else if arguments.llvm_ir {
         revive_solidity::llvm_ir(
@@ -170,7 +164,6 @@ fn main_inner() -> anyhow::Result<()> {
             include_metadata_hash,
             debug_config,
             &arguments.llvm_arguments,
-            memory_config,
         )
     } else if arguments.standard_json {
         revive_solidity::standard_json(
@@ -181,7 +174,6 @@ fn main_inner() -> anyhow::Result<()> {
             arguments.allow_paths,
             debug_config,
             &arguments.llvm_arguments,
-            memory_config,
         )?;
         return Ok(());
     } else if let Some(format) = arguments.combined_json {
@@ -203,7 +195,6 @@ fn main_inner() -> anyhow::Result<()> {
             arguments.output_directory,
             arguments.overwrite,
             &arguments.llvm_arguments,
-            memory_config,
         )?;
         return Ok(());
     } else {
@@ -222,7 +213,6 @@ fn main_inner() -> anyhow::Result<()> {
             suppressed_warnings,
             debug_config,
             &arguments.llvm_arguments,
-            memory_config,
         )
     }?;
 

crates/solidity/src/test_utils.rs

@@ -92,7 +92,7 @@ pub fn build_solidity_with_options(
         SolcStandardJsonInputSettingsSelection::new_required(),
         SolcStandardJsonInputSettingsOptimizer::new(
             solc_optimizer_enabled,
-            optimizer_settings.middle_end_as_string().chars().last(),
+            None,
             &solc_version.default,
             false,
         ),
@@ -102,26 +102,16 @@ pub fn build_solidity_with_options(
 
     let mut output = solc.standard_json(input, None, vec![], None)?;
 
-    let debug_config = revive_llvm_context::DebugConfig::new(
-        None,
-        optimizer_settings.middle_end_as_string() != "z",
-    );
-
     let project = Project::try_from_standard_json_output(
         &output,
         sources,
         libraries,
         &solc_version,
-        &debug_config,
+        &DEBUG_CONFIG,
     )?;
 
-    let build: crate::Build = project.compile(
-        optimizer_settings,
-        false,
-        debug_config,
-        Default::default(),
-        Default::default(),
-    )?;
+    let build: crate::Build =
+        project.compile(optimizer_settings, false, DEBUG_CONFIG, Default::default())?;
     build.write_to_standard_json(&mut output, &solc_version)?;
 
     Ok(output)
@@ -248,13 +238,7 @@ pub fn build_yul(source_code: &str) -> anyhow::Result<()> {
         source_code,
         None,
     )?;
-    let _build = project.compile(
-        optimizer_settings,
-        false,
-        DEBUG_CONFIG,
-        Default::default(),
-        Default::default(),
-    )?;
+    let _build = project.compile(optimizer_settings, false, DEBUG_CONFIG, Default::default())?;
 
     Ok(())
 }

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

@@ -1,33 +1,19 @@
-import * as path from 'path'
+import * as path from 'path';
 
-const outputDir = 'artifacts'
-const binExtension = ':C.pvm'
-const asmExtension = ':C.pvmasm'
-const llvmExtension = '.ll'
-const contractSolFilename = 'contract.sol'
-const contractYulFilename = 'contract.yul'
-const contractOptimizedLLVMFilename = contractSolFilename + '.C.optimized'
-const contractUnoptimizedLLVMFilename = contractSolFilename + '.C.unoptimized'
-const pathToOutputDir = path.join(__dirname, '..', outputDir)
-const pathToContracts = path.join(__dirname, '..', 'src', 'contracts')
-const pathToBasicYulContract = path.join(
-  pathToContracts,
-  'yul',
-  contractYulFilename
-)
-const pathToBasicSolContract = path.join(
-  pathToContracts,
-  'solidity',
-  contractSolFilename
-)
-const pathToSolBinOutputFile = path.join(
-  pathToOutputDir,
-  contractSolFilename + binExtension
-)
-const pathToSolAsmOutputFile = path.join(
-  pathToOutputDir,
-  contractSolFilename + asmExtension
-)
+const outputDir = 'artifacts';
+const binExtension = ':C.pvm';
+const asmExtension = ':C.pvmasm';
+const llvmExtension = '.ll';
+const contractSolFilename = 'contract.sol';
+const contractYulFilename = 'contract.yul';
+const contractOptimizedLLVMFilename = contractSolFilename + '.C.optimized';
+const contractUnoptimizedLLVMFilename = contractSolFilename + '.C.unoptimized';
+const pathToOutputDir = path.join(__dirname, '..', outputDir);
+const pathToContracts = path.join(__dirname, '..', 'src', 'contracts');
+const pathToBasicYulContract = path.join(pathToContracts, 'yul', contractYulFilename);
+const pathToBasicSolContract = path.join(pathToContracts, 'solidity', contractSolFilename);
+const pathToSolBinOutputFile = path.join(pathToOutputDir, contractSolFilename + binExtension);
+const pathToSolAsmOutputFile = path.join(pathToOutputDir, contractSolFilename + asmExtension);
 
 export const paths = {
   outputDir: outputDir,
@@ -44,4 +30,4 @@ export const paths = {
   pathToBasicYulContract: pathToBasicYulContract,
   pathToSolBinOutputFile: pathToSolBinOutputFile,
   pathToSolAsmOutputFile: pathToSolAsmOutputFile,
-}
+};

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

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

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

@@ -1,44 +1,43 @@
-import { executeCommand } from '../src/helper'
-import { paths } from '../src/entities'
+import {executeCommand} from "../src/helper";
+import { paths } from '../src/entities';
+
 
 //id1746
-describe('Run with --asm by default', () => {
-  const command = `resolc ${paths.pathToBasicSolContract} --asm`
-  const result = executeCommand(command)
-  const commandInvalid = 'resolc --asm'
-  const resultInvalid = executeCommand(commandInvalid)
+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("Valid command exit code = 0", () => {
+    expect(result.exitCode).toBe(0);
+  });
 
-  it('--asm output is presented', () => {
-    const expectedPatterns = [/(deploy)/i, /(call)/i, /(seal_return)/i]
+  it("--asm output is presented", () => {
+    const expectedPatterns = [/(deploy)/i, /(call)/i, /(seal_return)/i];
 
     for (const pattern of expectedPatterns) {
-      expect(result.output).toMatch(pattern)
+      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("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("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 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)
-  })
-})
+  it("Invalid solc exit code == Invalid resolc exit code", () => {
+    const command = 'solc --asm';
+    const solcResult = executeCommand(command);
+    expect(solcResult.exitCode).toBe(resultInvalid.exitCode);
+  });
+});

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

@@ -1,241 +1,191 @@
-import {
-  executeCommand,
-  isFolderExist,
-  isFileExist,
-  isFileEmpty,
-} from '../src/helper'
-import { paths } from '../src/entities'
-import * as shell from 'shelljs'
-import * as path from 'path'
+import { executeCommand, isFolderExist, isFileExist, isFileEmpty } from "../src/helper";
+import { paths } from '../src/entities';
+import * as shell from 'shelljs';
+import * as path from 'path';
+
 
 //id1762
-describe('Run resolc without any options', () => {
-  const command = 'resolc'
-  const result = executeCommand(command)
+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("Info with help is presented", () => {
+        expect(result.output).toMatch(/(Usage: resolc)/i);
+    });
 
-  it('Exit code = 1', () => {
-    expect(result.exitCode).toBe(1)
-  })
+    it("Exit code = 1", () => {
+        expect(result.exitCode).toBe(1);
+    });
+
+    it("solc exit code == resolc exit code", () => {
+        const command = 'solc';
+        const solcResult = executeCommand(command);
+        expect(solcResult.exitCode).toBe(result.exitCode);
+    });
+});
 
-  it('solc exit code == resolc exit code', () => {
-    const command = 'solc'
-    const solcResult = executeCommand(command)
-    expect(solcResult.exitCode).toBe(result.exitCode)
-  })
-})
 
 //#1713
-describe('Default run a command from the help', () => {
-  const command = `resolc ${paths.pathToBasicSolContract} --overwrite -O3 --bin --output-dir "${paths.pathToOutputDir}"` // potential issue on resolc with full path on Windows cmd
-  const result = executeCommand(command)
+describe("Default run a command from the help", () => {
 
-  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)
-  })
-})
+    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)
+describe("Default run a command from the help", () => {
 
-  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)
-  })
-})
+    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);
 
-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`;
+    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);
+    });
+});
 
-  for (var idx in commands) {
-    const command = commands[idx]
-    const result = executeCommand(command)
+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`;
 
-    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)
-    })
-  }
-})
+    for (var idx in commands) {
+        const command = commands[idx];
+        const result = executeCommand(command);
 
-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`;
+        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);
+        });
+    }
+});
 
-  for (var idx in commands) {
-    const command = commands[idx]
-    const result = executeCommand(command)
+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`;
 
-    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)
-    })
-  }
-})
+    for (var idx in commands) {
+        const command = commands[idx];
+        const result = executeCommand(command);
 
-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')
+        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);
+        });
+    }
+});
 
-  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 }
+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(() => {
-      const tempInputFile = path.join(contractsDir, 'temp-input.json')
-      shell.cp(inputFile, tempInputFile)
-      const inputContent = shell.cat(inputFile).toString()
+        shell.mkdir('-p', contractsDir);
 
-      const command = `resolc --standard-json --base-path "${contractsDir}" --include-path "${contractsDir}" --allow-paths "${contractsDir}"`
+        const input = JSON.parse(shell.cat(inputFile).toString());
 
-      result = executeCommand(command, inputContent)
+        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);
+        });
+    });
 
-      shell.rm(tempInputFile)
-    })
+    afterAll(() => {
+        shell.rm('-rf', contractsDir);
+    });
 
-    it('Compiler run successful without emiting warnings', () => {
-      const parsedResults = JSON.parse(result.output)
-      expect(
-        parsedResults.errors.filter(
-          (error: { type: string }) => error.type != 'Warning'
-        )
-      ).toEqual([])
-    })
-  })
-})
+    describe("Output with all path options", () => {
+        let result: { exitCode: number; output: string };
+
+        beforeAll(() => {
+            const tempInputFile = path.join(contractsDir, 'temp-input.json');
+            shell.cp(inputFile, tempInputFile);
+            const inputContent = shell.cat(inputFile).toString();
+
+            const command = `resolc --standard-json --base-path "${contractsDir}" --include-path "${contractsDir}" --allow-paths "${contractsDir}"`;
+
+            result = executeCommand(command, inputContent);
+
+            shell.rm(tempInputFile);
+
+        });
+
+        it("Compiler run successful without emiting warnings", () => {
+            const parsedResults = JSON.parse(result.output)
+            expect(parsedResults.errors.filter((error: { type: string; }) => error.type != 'Warning')).toEqual([]);
+        });
+    });
+});

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

@@ -1,39 +1,40 @@
-import { executeCommand } from '../src/helper'
-import { paths } from '../src/entities'
+import {executeCommand} from "../src/helper";
+import { paths } from '../src/entities';
+
 
 //id1743
-describe('Run with --yul by default', () => {
-  const command = `resolc ${paths.pathToBasicYulContract} --yul`
-  const result = executeCommand(command)
-  const commandInvalid = 'resolc --yul'
-  const resultInvalid = executeCommand(commandInvalid)
+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("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)
-  })
+  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)
-  })
+  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('Invalid solc exit code == Invalid resolc exit code', () => {
-    const command = 'solc --yul'
-    const solcResult = executeCommand(command)
-    expect(solcResult.exitCode).toBe(resultInvalid.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/solidity/src/tests/combined-json.tests.ts

@@ -1,188 +1,153 @@
-import { executeCommand } from '../src/helper'
-import { paths } from '../src/entities'
+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)
+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`];
 
-    it('Valid command exit code = 1', () => {
-      expect(result.exitCode).toBe(1)
-    })
+    //id1742:I
+    describe(`Run ${zksolcCommand} with just --combined-json`, () => {
+        const args = [`--combined-json`];
+        const result = executeCommand(zksolcCommand, args);
 
-    it('--combined-json error is presented', () => {
-      expect(result.output).toMatch(/(requires a value but none was supplied)/i)
-    })
+        it("Valid command exit code = 1", () => {
+            expect(result.exitCode).toBe(1);
+        });
 
-    it('solc exit code == zksolc exit code', () => {
-      const solcResult = executeCommand(solcCommand, args)
-      expect(solcResult.exitCode).toBe(result.exitCode)
-    })
-  })
+        it("--combined-json error is presented", () => {
+            expect(result.output).toMatch(/(requires a value but none was supplied)/i);
+        });
 
-  //id1742:II
-  describe(`Run ${zksolcCommand} with Sol contract and --combined-json`, () => {
-    const args = [`${paths.pathToBasicSolContract}`, `--combined-json`]
-    const result = executeCommand(zksolcCommand, args)
+        it("solc exit code == zksolc exit code", () => {
+            const solcResult = executeCommand(solcCommand, args);
+            expect(solcResult.exitCode).toBe(result.exitCode);
+        });
+    });
 
-    it('Valid command exit code = 1', () => {
-      expect(result.exitCode).toBe(1)
-    })
+    //id1742:II
+    describe(`Run ${zksolcCommand} with Sol contract and --combined-json`, () => {
+        const args = [`${paths.pathToBasicSolContract}`, `--combined-json`];
+        const result = executeCommand(zksolcCommand, args);
 
-    it('--combined-json error is presented', () => {
-      expect(result.output).toMatch(/(requires a value but none was supplied)/i)
-    })
+        it("Valid command exit code = 1", () => {
+            expect(result.exitCode).toBe(1);
+        });
 
-    it('solc exit code == zksolc exit code', () => {
-      const solcResult = executeCommand(solcCommand, args)
-      expect(solcResult.exitCode).toBe(result.exitCode)
-    })
-  })
+        it("--combined-json error is presented", () => {
+            expect(result.output).toMatch(/(requires a value but none was supplied)/i);
+        });
 
-  //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("solc exit code == zksolc exit code", () => {
+            const solcResult = executeCommand(solcCommand, args);
+            expect(solcResult.exitCode).toBe(result.exitCode);
+        });
+    });
 
-      it('Valid command exit code = 0', () => {
-        expect(result.exitCode).toBe(0)
-      })
+    //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('--combined-json error is presented', () => {
-        expect(result.output).toMatch(/(contracts)/i)
-      })
+            it("Valid command exit code = 0", () => {
+                expect(result.exitCode).toBe(0);
+            });
 
-      it('solc exit code == zksolc exit code', () => {
-        const solcResult = executeCommand(solcCommand, args)
-        expect(solcResult.exitCode).toBe(result.exitCode)
-      })
-    })
-  }
+            it("--combined-json error is presented", () => {
+                expect(result.output).toMatch(/(contracts)/i);
+            });
 
-  //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("solc exit code == zksolc exit code", () => {
+                const solcResult = executeCommand(solcCommand, args);
+                expect(solcResult.exitCode).toBe(result.exitCode);
+            });
+        });
+    }
 
-      it('Valid command exit code = 1', () => {
-        expect(result.exitCode).toBe(1)
-      })
+    //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('--combined-json error is presented', () => {
-        expect(result.output).toMatch(/(Invalid option|error)/i)
-      })
+            it("Valid command exit code = 1", () => {
+                expect(result.exitCode).toBe(1);
+            });
 
-      it('solc exit code == zksolc exit code', () => {
-        const solcResult = executeCommand(solcCommand, args)
-        expect(solcResult.exitCode).toBe(result.exitCode)
-      })
-    })
-  }
+            it("--combined-json error is presented", () => {
+                expect(result.output).toMatch(/(Invalid option|error)/i);
+            });
 
-  //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)
+            it("solc exit code == zksolc exit code", () => {
+                const solcResult = executeCommand(solcCommand, args);
+                expect(solcResult.exitCode).toBe(result.exitCode);
+            });
+        });
+    }
 
-      xit('Valid command exit code = 1', () => {
-        expect(result.exitCode).toBe(1)
-      })
+    //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);
 
-      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("Valid command exit code = 1", () => {
+                expect(result.exitCode).toBe(1);
+            });
 
-      xit('solc exit code == zksolc exit code', () => {
-        const solcResult = executeCommand(solcCommand, args)
-        expect(solcResult.exitCode).toBe(result.exitCode)
-      })
-    })
-  }
+            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!
+            });
 
-  //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)
+            xit("solc exit code == zksolc exit code", () => {
+                const solcResult = executeCommand(solcCommand, args);
+                expect(solcResult.exitCode).toBe(result.exitCode);
+            });
+        });
+    }
 
-      it('Valid command exit code = 1', () => {
-        expect(result.exitCode).toBe(1)
-      })
+    //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('--combined-json error is presented', () => {
-        expect(result.output).toMatch(/(cannot be used multiple times)/i)
-      })
+            it("Valid command exit code = 1", () => {
+                expect(result.exitCode).toBe(1);
+            });
 
-      it('solc exit code == zksolc exit code', () => {
-        const solcResult = executeCommand(solcCommand, args)
-        expect(solcResult.exitCode).toBe(result.exitCode)
-      })
-    })
-  }
+            it("--combined-json error is presented", () => {
+                expect(result.output).toMatch(/(cannot be used multiple times)/i);
+            });
 
-  //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("solc exit code == zksolc exit code", () => {
+                const solcResult = executeCommand(solcCommand, args);
+                expect(solcResult.exitCode).toBe(result.exitCode);
+            });
+        });
+    }
 
-      it('Valid command exit code = 1', () => {
-        expect(result.exitCode).toBe(1)
-      })
+    //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('--combined-json error is presented', () => {
-        expect(result.output).toMatch(/(ParserError: Expected identifier)/i)
-      })
-      asd
+            it("Valid command exit code = 1", () => {
+                expect(result.exitCode).toBe(1);
+            });
 
-      it('solc exit code == zksolc exit code', () => {
-        const solcResult = executeCommand(solcCommand, args)
-        expect(solcResult.exitCode).toBe(result.exitCode)
-      })
-    })
-  }
-})
+            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/solidity/src/yul/parser/statement/assignment.rs

@@ -139,14 +139,13 @@ where
                         identifier.inner,
                     )
                 })?;
-            context.build_store(pointer, value.access(context)?)?;
+            context.build_store(pointer, value.to_llvm())?;
             return Ok(());
         }
 
-        let value = value.access(context)?;
-        let llvm_type = value.into_struct_value().get_type();
+        let llvm_type = value.to_llvm().into_struct_value().get_type();
         let tuple_pointer = context.build_alloca(llvm_type, "assignment_pointer");
-        context.build_store(tuple_pointer, value)?;
+        context.build_store(tuple_pointer, value.to_llvm())?;
 
         for (index, binding) in self.bindings.into_iter().enumerate() {
             context.set_debug_location(self.location.line, 0, None)?;

crates/solidity/src/yul/parser/statement/expression/function_call/mod.rs

@@ -128,10 +128,7 @@ impl FunctionCall {
             Name::UserDefined(name) => {
                 let mut values = Vec::with_capacity(self.arguments.len());
                 for argument in self.arguments.into_iter().rev() {
-                    let value = argument
-                        .into_llvm(context)?
-                        .expect("Always exists")
-                        .access(context)?;
+                    let value = argument.into_llvm(context)?.expect("Always exists").value;
                     values.push(value);
                 }
                 values.reverse();
@@ -464,29 +461,36 @@ impl FunctionCall {
             }
 
             Name::SLoad => {
-                let arguments = self.pop_arguments::<D, 1>(context)?;
-                revive_llvm_context::polkavm_evm_storage::load(context, &arguments[0]).map(Some)
+                let arguments = self.pop_arguments_llvm::<D, 1>(context)?;
+                revive_llvm_context::polkavm_evm_storage::load(
+                    context,
+                    arguments[0].into_int_value(),
+                )
+                .map(Some)
             }
             Name::SStore => {
-                let arguments = self.pop_arguments::<D, 2>(context)?;
+                let arguments = self.pop_arguments_llvm::<D, 2>(context)?;
                 revive_llvm_context::polkavm_evm_storage::store(
                     context,
-                    &arguments[0],
-                    &arguments[1],
+                    arguments[0].into_int_value(),
+                    arguments[1].into_int_value(),
                 )
                 .map(|_| None)
             }
             Name::TLoad => {
-                let arguments = self.pop_arguments::<D, 1>(context)?;
-                revive_llvm_context::polkavm_evm_storage::transient_load(context, &arguments[0])
-                    .map(Some)
+                let arguments = self.pop_arguments_llvm::<D, 1>(context)?;
+                revive_llvm_context::polkavm_evm_storage::transient_load(
+                    context,
+                    arguments[0].into_int_value(),
+                )
+                .map(Some)
             }
             Name::TStore => {
-                let arguments = self.pop_arguments::<D, 2>(context)?;
+                let arguments = self.pop_arguments_llvm::<D, 2>(context)?;
                 revive_llvm_context::polkavm_evm_storage::transient_store(
                     context,
-                    &arguments[0],
-                    &arguments[1],
+                    arguments[0].into_int_value(),
+                    arguments[1].into_int_value(),
                 )
                 .map(|_| None)
             }
@@ -510,7 +514,7 @@ impl FunctionCall {
                 let offset = context.solidity_mut().allocate_immutable(key.as_str())
                     / revive_common::BYTE_LENGTH_WORD;
                 let index = context.xlen_type().const_int(offset as u64, false);
-                let value = arguments[2].access(context)?.into_int_value();
+                let value = arguments[2].value.into_int_value();
                 revive_llvm_context::polkavm_evm_immutable::store(context, index, value)
                     .map(|_| None)
             }
@@ -716,13 +720,13 @@ impl FunctionCall {
             Name::Call => {
                 let arguments = self.pop_arguments::<D, 7>(context)?;
 
-                let gas = arguments[0].access(context)?.into_int_value();
-                let address = arguments[1].access(context)?.into_int_value();
-                let value = arguments[2].access(context)?.into_int_value();
-                let input_offset = arguments[3].access(context)?.into_int_value();
-                let input_size = arguments[4].access(context)?.into_int_value();
-                let output_offset = arguments[5].access(context)?.into_int_value();
-                let output_size = arguments[6].access(context)?.into_int_value();
+                let gas = arguments[0].value.into_int_value();
+                let address = arguments[1].value.into_int_value();
+                let value = arguments[2].value.into_int_value();
+                let input_offset = arguments[3].value.into_int_value();
+                let input_size = arguments[4].value.into_int_value();
+                let output_offset = arguments[5].value.into_int_value();
+                let output_size = arguments[6].value.into_int_value();
 
                 let simulation_address: Vec<Option<num::BigUint>> = arguments
                     .into_iter()
@@ -746,12 +750,12 @@ impl FunctionCall {
             Name::StaticCall => {
                 let arguments = self.pop_arguments::<D, 6>(context)?;
 
-                let gas = arguments[0].access(context)?.into_int_value();
-                let address = arguments[1].access(context)?.into_int_value();
-                let input_offset = arguments[2].access(context)?.into_int_value();
-                let input_size = arguments[3].access(context)?.into_int_value();
-                let output_offset = arguments[4].access(context)?.into_int_value();
-                let output_size = arguments[5].access(context)?.into_int_value();
+                let gas = arguments[0].value.into_int_value();
+                let address = arguments[1].value.into_int_value();
+                let input_offset = arguments[2].value.into_int_value();
+                let input_size = arguments[3].value.into_int_value();
+                let output_offset = arguments[4].value.into_int_value();
+                let output_size = arguments[5].value.into_int_value();
 
                 let simulation_address: Vec<Option<num::BigUint>> = arguments
                     .into_iter()
@@ -775,12 +779,12 @@ impl FunctionCall {
             Name::DelegateCall => {
                 let arguments = self.pop_arguments::<D, 6>(context)?;
 
-                let gas = arguments[0].access(context)?.into_int_value();
-                let address = arguments[1].access(context)?.into_int_value();
-                let input_offset = arguments[2].access(context)?.into_int_value();
-                let input_size = arguments[3].access(context)?.into_int_value();
-                let output_offset = arguments[4].access(context)?.into_int_value();
-                let output_size = arguments[5].access(context)?.into_int_value();
+                let gas = arguments[0].value.into_int_value();
+                let address = arguments[1].value.into_int_value();
+                let input_offset = arguments[2].value.into_int_value();
+                let input_size = arguments[3].value.into_int_value();
+                let output_offset = arguments[4].value.into_int_value();
+                let output_size = arguments[5].value.into_int_value();
 
                 let simulation_address: Vec<Option<num::BigUint>> = arguments
                     .into_iter()
@@ -841,8 +845,7 @@ impl FunctionCall {
                 })?;
 
                 revive_llvm_context::polkavm_evm_create::contract_hash(context, identifier)
-                    .and_then(|argument| argument.access(context))
-                    .map(Some)
+                    .map(|argument| Some(argument.value))
             }
             Name::DataSize => {
                 let mut arguments = self.pop_arguments::<D, 1>(context)?;
@@ -852,8 +855,7 @@ impl FunctionCall {
                 })?;
 
                 revive_llvm_context::polkavm_evm_create::header_size(context, identifier)
-                    .and_then(|argument| argument.access(context))
-                    .map(Some)
+                    .map(|argument| Some(argument.value))
             }
             Name::DataCopy => {
                 let arguments = self.pop_arguments_llvm::<D, 3>(context)?;
@@ -987,12 +989,7 @@ impl FunctionCall {
     {
         let mut arguments = Vec::with_capacity(N);
         for expression in self.arguments.drain(0..N).rev() {
-            arguments.push(
-                expression
-                    .into_llvm(context)?
-                    .expect("Always exists")
-                    .access(context)?,
-            );
+            arguments.push(expression.into_llvm(context)?.expect("Always exists").value);
         }
         arguments.reverse();
 

crates/solidity/src/yul/parser/statement/expression/literal.rs

@@ -97,7 +97,9 @@ impl Literal {
                     BooleanLiteral::True => num::BigUint::one(),
                 };
 
-                Ok(revive_llvm_context::PolkaVMArgument::value(value).with_constant(constant))
+                Ok(revive_llvm_context::PolkaVMArgument::new_with_constant(
+                    value, constant,
+                ))
             }
             LexicalLiteral::Integer(inner) => {
                 let r#type = self.yul_type.unwrap_or_default().into_llvm(context);
@@ -125,7 +127,9 @@ impl Literal {
                 }
                 .expect("Always valid");
 
-                Ok(revive_llvm_context::PolkaVMArgument::value(value).with_constant(constant))
+                Ok(revive_llvm_context::PolkaVMArgument::new_with_constant(
+                    value, constant,
+                ))
             }
             LexicalLiteral::String(inner) => {
                 let string = inner.inner;
@@ -196,10 +200,10 @@ impl Literal {
                 };
 
                 if hex_string.len() > revive_common::BYTE_LENGTH_WORD * 2 {
-                    return Ok(revive_llvm_context::PolkaVMArgument::value(
+                    return Ok(revive_llvm_context::PolkaVMArgument::new_with_original(
                         r#type.const_zero().as_basic_value_enum(),
-                    )
-                    .with_original(string));
+                        string,
+                    ));
                 }
 
                 if hex_string.len() < revive_common::BYTE_LENGTH_WORD * 2 {
@@ -216,7 +220,9 @@ impl Literal {
                     )
                     .expect("The value is valid")
                     .as_basic_value_enum();
-                Ok(revive_llvm_context::PolkaVMArgument::value(value).with_original(string))
+                Ok(revive_llvm_context::PolkaVMArgument::new_with_original(
+                    value, string,
+                ))
             }
         }
     }

crates/solidity/src/yul/parser/statement/expression/mod.rs

@@ -119,28 +119,36 @@ impl Expression {
                 })
                 .map(Some),
             Self::Identifier(identifier) => {
-                let id = identifier.inner;
-
                 let pointer = context
                     .current_function()
                     .borrow()
-                    .get_stack_pointer(&id)
+                    .get_stack_pointer(identifier.inner.as_str())
                     .ok_or_else(|| {
-                        anyhow::anyhow!("{} Undeclared variable `{}`", identifier.location, id)
+                        anyhow::anyhow!(
+                            "{} Undeclared variable `{}`",
+                            identifier.location,
+                            identifier.inner,
+                        )
                     })?;
 
-                let constant = context.current_function().borrow().yul().get_constant(&id);
+                let constant = context
+                    .current_function()
+                    .borrow()
+                    .yul()
+                    .get_constant(identifier.inner.as_str());
 
-                let argument = revive_llvm_context::PolkaVMArgument::pointer(pointer, id);
+                let value = context.build_load(pointer, identifier.inner.as_str())?;
 
-                Ok(Some(match constant {
-                    Some(constant) => argument.with_constant(constant),
-                    _ => argument,
-                }))
+                match constant {
+                    Some(constant) => Ok(Some(
+                        revive_llvm_context::PolkaVMArgument::new_with_constant(value, constant),
+                    )),
+                    None => Ok(Some(value.into())),
+                }
             }
             Self::FunctionCall(call) => Ok(call
                 .into_llvm(context)?
-                .map(revive_llvm_context::PolkaVMArgument::value)),
+                .map(revive_llvm_context::PolkaVMArgument::new)),
         }
     }
 }

crates/solidity/src/yul/parser/statement/for_loop.rs

@@ -78,7 +78,7 @@ where
             .condition
             .into_llvm(context)?
             .expect("Always exists")
-            .access(context)?
+            .to_llvm()
             .into_int_value();
         let condition = context.builder().build_int_z_extend_or_bit_cast(
             condition,

crates/solidity/src/yul/parser/statement/if_conditional.rs

@@ -57,7 +57,7 @@ where
             .condition
             .into_llvm(context)?
             .expect("Always exists")
-            .access(context)?
+            .to_llvm()
             .into_int_value();
         let condition = context.builder().build_int_z_extend_or_bit_cast(
             condition,

crates/solidity/src/yul/parser/statement/object.rs

@@ -209,8 +209,6 @@ where
         revive_llvm_context::PolkaVMRemainderFunction.declare(context)?;
         revive_llvm_context::PolkaVMSignedRemainderFunction.declare(context)?;
 
-        revive_llvm_context::PolkaVMSbrkFunction.declare(context)?;
-
         let mut entry = revive_llvm_context::PolkaVMEntryFunction::default();
         entry.declare(context)?;
 
@@ -263,8 +261,6 @@ where
         revive_llvm_context::PolkaVMRemainderFunction.into_llvm(context)?;
         revive_llvm_context::PolkaVMSignedRemainderFunction.into_llvm(context)?;
 
-        revive_llvm_context::PolkaVMSbrkFunction.into_llvm(context)?;
-
         Ok(())
     }
 

crates/solidity/src/yul/parser/statement/switch/mod.rs

@@ -137,7 +137,7 @@ where
 
         let mut branches = Vec::with_capacity(self.cases.len());
         for (index, case) in self.cases.into_iter().enumerate() {
-            let constant = case.literal.into_llvm(context)?.access(context)?;
+            let constant = case.literal.into_llvm(context)?.to_llvm();
 
             let expression_block = context
                 .append_basic_block(format!("switch_case_branch_{}_block", index + 1).as_str());
@@ -161,10 +161,7 @@ where
 
         context.set_basic_block(current_block);
         context.builder().build_switch(
-            scrutinee
-                .expect("Always exists")
-                .access(context)?
-                .into_int_value(),
+            scrutinee.expect("Always exists").to_llvm().into_int_value(),
             default_block,
             branches.as_slice(),
         )?;

crates/solidity/src/yul/parser/statement/variable_declaration.rs

@@ -121,7 +121,7 @@ where
                                 .insert_constant(identifier.inner.clone(), constant);
                         }
 
-                        value.access(context)?
+                        value.to_llvm()
                     }
                     None => r#type.const_zero().as_basic_value_enum(),
                 }
@@ -175,8 +175,7 @@ where
                 .collect::<Vec<inkwell::types::BasicTypeEnum<'ctx>>>()
                 .as_slice(),
         );
-        let value = expression.access(context)?;
-        if value.get_type() != llvm_type.as_basic_type_enum() {
+        if expression.value.get_type() != llvm_type.as_basic_type_enum() {
             anyhow::bail!(
                 "{} Assignment to {:?} received an invalid number of arguments",
                 location,
@@ -184,7 +183,7 @@ where
             );
         }
         let pointer = context.build_alloca(llvm_type, "bindings_pointer");
-        context.build_store(pointer, value)?;
+        context.build_store(pointer, expression.to_llvm())?;
 
         for (index, binding) in self.bindings.into_iter().enumerate() {
             let pointer = context.build_gep(

eslint.config.mjs

@@ -1,11 +0,0 @@
-import globals from 'globals'
-import pluginJs from '@eslint/js'
-import tseslint from 'typescript-eslint'
-
-/** @type {import('eslint').Linter.Config[]} */
-export default [
-  { files: ['**/*.{mjs,ts}'] },
-  { languageOptions: { globals: globals.browser } },
-  pluginJs.configs.recommended,
-  ...tseslint.configs.recommended,
-]

js/build.js

@@ -8,7 +8,7 @@ const RESOLC_WASM_URI =
   process.env.RELEASE_RESOLC_WASM_URI || "http://127.0.0.1:8080/resolc.wasm";
 const RESOLC_WASM_TARGET_DIR = path.join(
   __dirname,
-  "../../target/wasm32-unknown-emscripten/release",
+  "../target/wasm32-unknown-emscripten/release",
 );
 const RESOLC_JS = path.join(RESOLC_WASM_TARGET_DIR, "resolc.js");
 const RESOLC_WEB_JS = path.join(RESOLC_WASM_TARGET_DIR, "resolc_web.js");

js/emscripten/examples/node/resolc.js

@@ -1 +0,0 @@
-../../../../target/wasm32-unknown-emscripten/release/resolc.js

js/emscripten/examples/node/resolc.wasm

@@ -1 +0,0 @@
-../../../../target/wasm32-unknown-emscripten/release/resolc.wasm

js/emscripten/examples/web/resolc.wasm

@@ -1 +0,0 @@
-../../../../target/wasm32-unknown-emscripten/release/resolc.wasm

js/emscripten/examples/web/resolc_web.js

@@ -1 +0,0 @@
-../../../../target/wasm32-unknown-emscripten/release/resolc_web.js

js/emscripten/fixtures/instantiate.json

@@ -1,19 +0,0 @@
-{
-  "language": "Solidity",
-  "sources": {
-    "fixtures/instantiate.sol": {
-      "content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.8.2 <0.9.0;\ncontract ChildContract {\n    constructor() {\n    }\n}\ncontract MainContract {\n    constructor() {\n       ChildContract newContract = new ChildContract();\n    }\n}"
-    }
-  },
-  "settings": {
-    "optimizer": {
-      "enabled": true,
-      "runs": 200
-    },
-    "outputSelection": {
-      "*": {
-        "*": ["abi"]
-      }
-    }
-  }
-}

js/emscripten/tests/node.test.mjs

@@ -1,138 +0,0 @@
-import { expect } from 'chai'
-import { compile } from '../examples/node/revive.js'
-import { fileURLToPath } from 'url'
-import path from 'path'
-import fs from 'fs'
-const __filename = fileURLToPath(import.meta.url)
-const __dirname = path.dirname(__filename)
-
-function loadFixture(fixture) {
-  const fixturePath = path.resolve(__dirname, `../fixtures/${fixture}`)
-  return JSON.parse(fs.readFileSync(fixturePath, 'utf-8'))
-}
-
-describe('Compile Function Tests', function () {
-  it('should successfully compile valid Solidity code', async function () {
-    const standardInput = loadFixture('storage.json')
-
-    const result = await compile(standardInput)
-    expect(result).to.be.a('string')
-    const output = JSON.parse(result)
-    expect(output).to.have.property('contracts')
-    expect(output.contracts['fixtures/storage.sol']).to.have.property('Storage')
-    expect(output.contracts['fixtures/storage.sol'].Storage).to.have.property(
-      'abi'
-    )
-    expect(output.contracts['fixtures/storage.sol'].Storage).to.have.property(
-      'evm'
-    )
-    expect(
-      output.contracts['fixtures/storage.sol'].Storage.evm
-    ).to.have.property('bytecode')
-  })
-
-  if (typeof globalThis.Bun == 'undefined') {
-    // Running this test with Bun on a Linux host causes:
-    // RuntimeError: Out of bounds memory access (evaluating 'getWasmTableEntry(index)(a1, a2, a3, a4, a5)')
-    // Once this issue is resolved, the test will be re-enabled.
-    it('should successfully compile large Solidity code', async function () {
-      const standardInput = loadFixture('token.json')
-
-      const result = await compile(standardInput)
-      expect(result).to.be.a('string')
-      const output = JSON.parse(result)
-      expect(output).to.have.property('contracts')
-      expect(output.contracts['fixtures/token.sol']).to.have.property('MyToken')
-      expect(output.contracts['fixtures/token.sol'].MyToken).to.have.property(
-        'abi'
-      )
-      expect(output.contracts['fixtures/token.sol'].MyToken).to.have.property(
-        'evm'
-      )
-      expect(
-        output.contracts['fixtures/token.sol'].MyToken.evm
-      ).to.have.property('bytecode')
-    })
-
-    it('should successfully compile a valid Solidity contract that instantiates the token contracts', async function () {
-      const standardInput = loadFixture('instantiate_tokens.json')
-
-      const result = await compile(standardInput)
-      expect(result).to.be.a('string')
-      const output = JSON.parse(result)
-      expect(output).to.have.property('contracts')
-      expect(
-        output.contracts['fixtures/instantiate_tokens.sol']
-      ).to.have.property('TokensFactory')
-      expect(
-        output.contracts['fixtures/instantiate_tokens.sol'].TokensFactory
-      ).to.have.property('abi')
-      expect(
-        output.contracts['fixtures/instantiate_tokens.sol'].TokensFactory
-      ).to.have.property('evm')
-      expect(
-        output.contracts['fixtures/instantiate_tokens.sol'].TokensFactory.evm
-      ).to.have.property('bytecode')
-    })
-  }
-
-  it('should throw an error for invalid Solidity code', async function () {
-    const standardInput = loadFixture('invalid_contract_content.json')
-
-    const result = await compile(standardInput)
-    expect(result).to.be.a('string')
-    const output = JSON.parse(result)
-    expect(output).to.have.property('errors')
-    expect(output.errors).to.be.an('array')
-    expect(output.errors.length).to.be.greaterThan(0)
-    expect(output.errors[0].type).to.exist
-    expect(output.errors[0].type).to.contain('ParserError')
-  })
-
-  it('should return not found error for missing imports', async function () {
-    const standardInput = loadFixture('missing_import.json')
-
-    const result = await compile(standardInput)
-    const output = JSON.parse(result)
-    expect(output).to.have.property('errors')
-    expect(output.errors).to.be.an('array')
-    expect(output.errors.length).to.be.greaterThan(0)
-    expect(output.errors[0].message).to.exist
-    expect(output.errors[0].message).to.include(
-      'Source "nonexistent/console.sol" not found'
-    )
-  })
-
-  it('should successfully compile a valid Solidity contract that instantiates another contract', async function () {
-    const standardInput = loadFixture('instantiate.json')
-
-    const result = await compile(standardInput)
-    expect(result).to.be.a('string')
-    const output = JSON.parse(result)
-    expect(output).to.have.property('contracts')
-    expect(output.contracts['fixtures/instantiate.sol']).to.have.property(
-      'ChildContract'
-    )
-    expect(
-      output.contracts['fixtures/instantiate.sol'].ChildContract
-    ).to.have.property('abi')
-    expect(
-      output.contracts['fixtures/instantiate.sol'].ChildContract
-    ).to.have.property('evm')
-    expect(
-      output.contracts['fixtures/instantiate.sol'].ChildContract.evm
-    ).to.have.property('bytecode')
-    expect(output.contracts['fixtures/instantiate.sol']).to.have.property(
-      'MainContract'
-    )
-    expect(
-      output.contracts['fixtures/instantiate.sol'].MainContract
-    ).to.have.property('abi')
-    expect(
-      output.contracts['fixtures/instantiate.sol'].MainContract
-    ).to.have.property('evm')
-    expect(
-      output.contracts['fixtures/instantiate.sol'].MainContract.evm
-    ).to.have.property('bytecode')
-  })
-})

js/examples/node/resolc.js

@@ -0,0 +1 @@
+../../../target/wasm32-unknown-emscripten/release/resolc.js

js/examples/node/resolc.wasm

@@ -0,0 +1 @@
+../../../target/wasm32-unknown-emscripten/release/resolc.wasm

js/examples/web/resolc.wasm

@@ -0,0 +1 @@
+../../../target/wasm32-unknown-emscripten/release/resolc.wasm

js/examples/web/resolc_web.js

@@ -0,0 +1 @@
+../../../target/wasm32-unknown-emscripten/release/resolc_web.js

js/fixtures/instantiate.json

@@ -0,0 +1,20 @@
+{
+    "language": "Solidity",
+    "sources": {
+      "fixtures/instantiate.sol": {
+        "content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.8.2 <0.9.0;\ncontract ChildContract {\n    constructor() {\n    }\n}\ncontract MainContract {\n    constructor() {\n       ChildContract newContract = new ChildContract();\n    }\n}"
+      }
+    },
+    "settings": {
+      "optimizer": {
+        "enabled": true,
+        "runs": 200
+      },
+      "outputSelection": {
+        "*": {
+          "*": ["abi"]
+        }
+      }
+    }
+  }
+  

js/fixtures/instantiate_tokens.json

@@ -72,7 +72,9 @@
     },
     "outputSelection": {
       "*": {
-        "*": ["abi"]
+        "*": [
+          "abi"
+        ]
       }
     }
   }

js/resolc/README.md

@@ -1,17 +0,0 @@
-# Usage from Node.js
-
-```typescript
-import { compile } from "@parity/resolc";
-const sources = {
-["contracts/1_Storage.sol"]: {
-    content: readFileSync("fixtures/storage.sol", "utf8"),
-}
-
-const out = await compile(sources);
-```
-
-# Usage from shell
-
-```bash
- npx @parity/resolc@latest --bin contracts/1_Storage.sol
-```

js/resolc/fixtures/bad_pragma.sol

@@ -1,10 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity ^9999;
-
-/**
- * @title Storage
- * @dev Store & retrieve value in a variable
- * @custom:dev-run-script ./scripts/deploy_with_ethers.ts
- */
-contract BadPragma {
-}

js/resolc/fixtures/storage.sol

@@ -1,28 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.8.2 <0.9.0;
-
-/**
- * @title Storage
- * @dev Store & retrieve value in a variable
- * @custom:dev-run-script ./scripts/deploy_with_ethers.ts
- */
-contract Storage {
-
-    uint256 number;
-
-    /**
-     * @dev Store value in variable
-     * @param num value to store
-     */
-    function store(uint256 num) public {
-        number = num;
-    }
-
-    /**
-     * @dev Return value 
-     * @return value of 'number'
-     */
-    function retrieve() public view returns (uint256){
-        return number;
-    }
-}

js/resolc/fixtures/storage_bad.sol

@@ -1,26 +0,0 @@
-// missing license and pragama
-/**
- * @title Storage
- * @dev Store & retrieve value in a variable
- * @custom:dev-run-script ./scripts/deploy_with_ethers.ts
- */
-contract Storage {
-
-    uint256 number;
-
-    /**
-     * @dev Store value in variable
-     * @param num value to store
-     */
-    function store(uint256 num) public {
-        number = num;
-    }
-
-    /**
-     * @dev Return value 
-     * @return value of 'number'
-     */
-    function retrieve() public view returns (uint256){
-        return number;
-    }
-}

js/resolc/fixtures/token.sol

@@ -1,22 +0,0 @@
-// SPDX-License-Identifier: MIT
-// Compatible with OpenZeppelin Contracts ^5.0.0
-pragma solidity ^0.8.22;
-
-import "@openzeppelin/contracts/token/ERC20/ERC20.sol";
-import "@openzeppelin/contracts/access/Ownable.sol";
-import "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";
-
-contract MyToken is ERC20, Ownable, ERC20Permit {
-    constructor(address initialOwner)
-        ERC20("MyToken", "MTK")
-        Ownable(initialOwner)
-        ERC20Permit("MyToken")
-    {
-        _mint(msg.sender, 100 * 10 ** decimals());
-    }
-
-    function mint(address to, uint256 amount) public onlyOwner {
-        _mint(to, amount);
-    }
-}
-

js/resolc/package.json

@@ -1,37 +0,0 @@
-{
-    "name": "@parity/resolc",
-    "license": "Apache-2.0",
-    "version": "0.0.0-updated-via-gh-releases",
-    "author": "Parity <admin@parity.io> (https://parity.io)",
-    "module": "index.ts",
-    "types": "./dist/index.d.ts",
-    "main": "./dist/index.js",
-    "bin": {
-        "resolc": "./dist/bin.js"
-    },
-    "exports": {
-        ".": {
-            "import": "./dist/index.js",
-            "require": "./dist/index.js",
-            "types": "./dist/index.d.ts"
-        }
-    },
-    "files": [
-        "dist"
-    ],
-    "scripts": {
-        "build": "tsc && cp src/resolc/** dist/resolc",
-        "test": "npm run build && node ./dist/index.test.js"
-    },
-    "devDependencies": {
-        "@openzeppelin/contracts": "5.1.0",
-        "globals": "^15.12.0",
-        "typescript": "^5.6.3"
-    },
-    "dependencies": {
-        "@types/node": "^22.9.0",
-        "commander": "^13.1.0",
-        "package-json": "^10.0.1",
-        "solc": "^0.8.29"
-    }
-}

js/resolc/src/bin.ts

@@ -1,200 +0,0 @@
-#!/usr/bin/env node
-
-import * as commander from 'commander'
-import * as fs from 'fs'
-import * as os from 'os'
-import * as path from 'path'
-import * as resolc from '.'
-import { SolcInput } from '.'
-
-async function main() {
-  // hold on to any exception handlers that existed prior to this script running, we'll be adding them back at the end
-  const originalUncaughtExceptionListeners =
-    process.listeners('uncaughtException')
-  // FIXME: remove annoying exception catcher of Emscripten
-  //        see https://github.com/chriseth/browser-solidity/issues/167
-  process.removeAllListeners('uncaughtException')
-
-  const program = new commander.Command()
-
-  program.name('solcjs')
-  program.version(resolc.version())
-  program
-    .option('--bin', 'Binary of the contracts in hex.')
-    .option('--abi', 'ABI of the contracts.')
-    .option(
-      '--base-path <path>',
-      'Root of the project source tree. ' +
-        'The import callback will attempt to interpret all import paths as relative to this directory.'
-    )
-    .option(
-      '--include-path <path...>',
-      'Extra source directories available to the import callback. ' +
-        'When using a package manager to install libraries, use this option to specify directories where packages are installed. ' +
-        'Can be used multiple times to provide multiple locations.'
-    )
-    .option(
-      '-o, --output-dir <output-directory>',
-      'Output directory for the contracts.'
-    )
-    .option('-p, --pretty-json', 'Pretty-print all JSON output.', false)
-    .option('-v, --verbose', 'More detailed console output.', false)
-    .argument('<files...>')
-
-  program.parse(process.argv)
-  const options = program.opts<{
-    verbose: boolean
-    abi: boolean
-    bin: boolean
-    outputDir?: string
-    prettyJson: boolean
-    basePath?: string
-    includePath?: string[]
-  }>()
-  const files: string[] = program.args
-  const destination = options.outputDir ?? '.'
-
-  function abort(msg: string) {
-    console.error(msg || 'Error occurred')
-    process.exit(1)
-  }
-
-  function withUnixPathSeparators(filePath: string) {
-    // On UNIX-like systems forward slashes in paths are just a part of the file name.
-    if (os.platform() !== 'win32') {
-      return filePath
-    }
-
-    return filePath.replace(/\\/g, '/')
-  }
-
-  function makeSourcePathRelativeIfPossible(sourcePath: string) {
-    const absoluteBasePath = options.basePath
-      ? path.resolve(options.basePath)
-      : path.resolve('.')
-    const absoluteIncludePaths = options.includePath
-      ? options.includePath.map((prefix: string) => {
-          return path.resolve(prefix)
-        })
-      : []
-
-    // Compared to base path stripping logic in solc this is much simpler because path.resolve()
-    // handles symlinks correctly (does not resolve them except in work dir) and strips .. segments
-    // from paths going beyond root (e.g. `/../../a/b/c` -> `/a/b/c/`). It's simpler also because it
-    // ignores less important corner cases: drive letters are not stripped from absolute paths on
-    // Windows and UNC paths are not handled in a special way (at least on Linux). Finally, it has
-    // very little test coverage so there might be more differences that we are just not aware of.
-    const absoluteSourcePath = path.resolve(sourcePath)
-
-    for (const absolutePrefix of [absoluteBasePath].concat(
-      absoluteIncludePaths
-    )) {
-      const relativeSourcePath = path.relative(
-        absolutePrefix,
-        absoluteSourcePath
-      )
-
-      if (!relativeSourcePath.startsWith('../')) {
-        return withUnixPathSeparators(relativeSourcePath)
-      }
-    }
-
-    // File is not located inside base path or include paths so use its absolute path.
-    return withUnixPathSeparators(absoluteSourcePath)
-  }
-
-  function toFormattedJson<T>(input: T) {
-    return JSON.stringify(input, null, options.prettyJson ? 4 : 0)
-  }
-
-  if (files.length === 0) {
-    console.error('Must provide a file')
-    process.exit(1)
-  }
-
-  if (!(options.bin || options.abi)) {
-    abort('Invalid option selected, must specify either --bin or --abi')
-  }
-
-  const sources: SolcInput = {}
-
-  for (let i = 0; i < files.length; i++) {
-    try {
-      sources[makeSourcePathRelativeIfPossible(files[i])] = {
-        content: fs.readFileSync(files[i]).toString(),
-      }
-    } catch (e) {
-      abort('Error reading ' + files[i] + ': ' + e)
-    }
-  }
-
-  if (options.verbose) {
-    console.log('>>> Compiling:\n' + toFormattedJson(sources) + '\n')
-  }
-
-  const output = await resolc.compile(sources)
-  let hasError = false
-
-  if (!output) {
-    abort('No output from compiler')
-  } else if (output.errors) {
-    for (const error in output.errors) {
-      const message = output.errors[error]
-      if (message.severity === 'warning') {
-        console.log(message.formattedMessage)
-      } else {
-        console.error(message.formattedMessage)
-        hasError = true
-      }
-    }
-  }
-
-  fs.mkdirSync(destination, { recursive: true })
-
-  function writeFile(file: string, content: Buffer | string) {
-    file = path.join(destination, file)
-    fs.writeFile(file, content, function (err) {
-      if (err) {
-        console.error('Failed to write ' + file + ': ' + err)
-      }
-    })
-  }
-
-  for (const fileName in output.contracts) {
-    for (const contractName in output.contracts[fileName]) {
-      let contractFileName = fileName + ':' + contractName
-      contractFileName = contractFileName.replace(/[:./\\]/g, '_')
-
-      if (options.bin) {
-        writeFile(
-          contractFileName + '.polkavm',
-          Buffer.from(
-            output.contracts[fileName][contractName].evm.bytecode.object,
-            'hex'
-          )
-        )
-      }
-
-      if (options.abi) {
-        writeFile(
-          contractFileName + '.abi',
-          toFormattedJson(output.contracts[fileName][contractName].abi)
-        )
-      }
-    }
-  }
-
-  // Put back original exception handlers.
-  originalUncaughtExceptionListeners.forEach(function (listener) {
-    process.addListener('uncaughtException', listener)
-  })
-
-  if (hasError) {
-    process.exit(1)
-  }
-}
-
-main().catch((err) => {
-  console.error('Error:', err)
-  process.exit(1)
-})

js/resolc/src/index.test.ts

@@ -1,116 +0,0 @@
-import { test } from 'node:test'
-import { readFileSync, existsSync } from 'node:fs'
-import assert from 'node:assert'
-import { compile, tryResolveImport } from '.'
-import { resolve } from 'node:path'
-
-const compileOptions = [{}]
-if (existsSync('../../target/release/resolc')) {
-  compileOptions.push({ bin: '../../target/release/resolc' })
-}
-
-for (const options of compileOptions) {
-  test(`check Ok output with option ${JSON.stringify(options)}`, async () => {
-    const contract = 'fixtures/token.sol'
-    const sources = {
-      [contract]: {
-        content: readFileSync('fixtures/storage.sol', 'utf8'),
-      },
-    }
-
-    const out = await compile(sources, options)
-    assert(out.contracts[contract].Storage.abi != null)
-    assert(out.contracts[contract].Storage.evm.bytecode != null)
-  })
-}
-
-test('check Err output', async () => {
-  const sources = {
-    bad: {
-      content: readFileSync('fixtures/storage_bad.sol', 'utf8'),
-    },
-  }
-
-  const out = await compile(sources)
-  assert(
-    out?.errors?.[0].message.includes(
-      'SPDX license identifier not provided in source file'
-    )
-  )
-  assert(
-    out?.errors?.[1].message.includes(
-      'Source file does not specify required compiler version'
-    )
-  )
-})
-
-test('check Err from stderr', async () => {
-  const sources = {
-    bad: {
-      content: readFileSync('fixtures/bad_pragma.sol', 'utf8'),
-    },
-  }
-
-  try {
-    await compile(sources)
-    assert(false, 'Expected error')
-  } catch (error) {
-    assert(
-      String(error).includes('Source file requires different compiler version')
-    )
-  }
-})
-
-test('resolve import', () => {
-  const cases = [
-    // local
-    {
-      file: './fixtures/storage.sol',
-      expected: resolve('fixtures/storage.sol'),
-    },
-    // scopped module with version
-    {
-      file: '@openzeppelin/contracts@5.1.0/token/ERC20/ERC20.sol',
-      expected: require.resolve(
-        '@openzeppelin/contracts/token/ERC20/ERC20.sol'
-      ),
-    },
-    // scopped module without version
-    {
-      file: '@openzeppelin/contracts/token/ERC20/ERC20.sol',
-      expected: require.resolve(
-        '@openzeppelin/contracts/token/ERC20/ERC20.sol'
-      ),
-    },
-    // scopped module with wrong version
-    {
-      file: '@openzeppelin/contracts@4.8.3/token/ERC20/ERC20.sol',
-      expected: `Error: Version mismatch: Specified @openzeppelin/contracts@4.8.3, but installed version is 5.1.0`,
-    },
-    // module without version
-    {
-      file: '@openzeppelin/contracts/package.json',
-      expected: require.resolve('@openzeppelin/contracts/package.json'),
-    },
-    // scopped module with version
-    {
-      file: '@openzeppelin/contracts@5.1.0/package.json',
-      expected: require.resolve('@openzeppelin/contracts/package.json'),
-    },
-  ]
-
-  for (const { file, expected } of cases) {
-    try {
-      const resolved = tryResolveImport(file)
-      assert(
-        resolved === expected,
-        `\nGot:\n${resolved}\nExpected:\n${expected}`
-      )
-    } catch (error) {
-      assert(
-        String(error) == expected,
-        `\nGot:\n${String(error)}\nExpected:\n${expected}`
-      )
-    }
-  }
-})

js/resolc/src/index.ts

@@ -1,213 +0,0 @@
-import solc from 'solc'
-import { spawn } from 'child_process'
-import { resolc, version as resolcVersion } from './resolc'
-import path from 'path'
-import { existsSync, readFileSync } from 'fs'
-
-export type SolcInput = {
-  [contractName: string]: {
-    content: string
-  }
-}
-
-export type SolcError = {
-  component: string
-  errorCode: string
-  formattedMessage: string
-  message: string
-  severity: string
-  sourceLocation?: {
-    file: string
-    start: number
-    end: number
-  }
-  type: string
-}
-
-export type SolcOutput = {
-  contracts: {
-    [contractPath: string]: {
-      [contractName: string]: {
-        abi: Array<{
-          name: string
-          inputs: Array<{ name: string; type: string }>
-          outputs: Array<{ name: string; type: string }>
-          stateMutability: string
-          type: string
-        }>
-        evm: {
-          bytecode: { object: string }
-        }
-      }
-    }
-  }
-  errors?: Array<SolcError>
-}
-
-export function resolveInputs(sources: SolcInput): SolcInput {
-  const input = {
-    language: 'Solidity',
-    sources,
-    settings: {
-      outputSelection: {
-        '*': {
-          '*': ['evm.bytecode.object'],
-        },
-      },
-    },
-  }
-
-  const out = solc.compile(JSON.stringify(input), {
-    import: (path: string) => {
-      return {
-        contents: readFileSync(tryResolveImport(path), 'utf8'),
-      }
-    },
-  })
-
-  const output = JSON.parse(out) as {
-    sources: { [fileName: string]: { id: number } }
-    errors: Array<SolcError>
-  }
-
-  if (output.errors && Object.keys(output.sources).length === 0) {
-    throw new Error(output.errors[0].formattedMessage)
-  }
-
-  return Object.fromEntries(
-    Object.keys(output.sources).map((fileName) => {
-      return [
-        fileName,
-        sources[fileName] ?? {
-          content: readFileSync(tryResolveImport(fileName), 'utf8'),
-        },
-      ]
-    })
-  )
-}
-
-export function version(): string {
-  const v = resolcVersion()
-  return v.split(' ').pop() ?? v
-}
-
-export async function compile(
-  sources: SolcInput,
-  option: {
-    optimizer?: Record<string, unknown>
-    bin?: string
-  } = {}
-): Promise<SolcOutput> {
-  const {
-    optimizer = {
-      mode: 'z',
-      fallback_to_optimizing_for_size: true,
-      enabled: true,
-      runs: 200,
-    },
-    bin,
-  } = option
-
-  const input = JSON.stringify({
-    language: 'Solidity',
-    sources: resolveInputs(sources),
-    settings: {
-      optimizer,
-      outputSelection: {
-        '*': {
-          '*': ['abi'],
-        },
-      },
-    },
-  })
-
-  if (bin) {
-    return compileWithBin(input, bin)
-  }
-
-  return resolc(input)
-}
-
-/**
- * Resolve an import path to a file path.
- * @param importPath - The import path to resolve.
- */
-export function tryResolveImport(importPath: string) {
-  // resolve local path
-  if (existsSync(importPath)) {
-    return path.resolve(importPath)
-  }
-
-  const importRegex = /^(@?[^@/]+(?:\/[^@/]+)?)(?:@([^/]+))?(\/.+)$/
-  const match = importPath.match(importRegex)
-
-  if (!match) {
-    throw new Error('Invalid import path format.')
-  }
-
-  const basePackage = match[1] // "foo", "@scope/foo"
-  const specifiedVersion = match[2] // "1.2.3" (optional)
-  const relativePath = match[3] // "/path/to/file.sol"
-
-  let packageJsonPath
-  try {
-    packageJsonPath = require.resolve(path.join(basePackage, 'package.json'))
-  } catch {
-    throw new Error(`Could not resolve package ${basePackage}`)
-  }
-
-  // Check if a version was specified and compare with the installed version
-  if (specifiedVersion) {
-    const installedVersion = JSON.parse(
-      readFileSync(packageJsonPath, 'utf-8')
-    ).version
-
-    if (installedVersion !== specifiedVersion) {
-      throw new Error(
-        `Version mismatch: Specified ${basePackage}@${specifiedVersion}, but installed version is ${installedVersion}`
-      )
-    }
-  }
-
-  const packageRoot = path.dirname(packageJsonPath)
-
-  // Construct full path to the requested file
-  const resolvedPath = path.join(packageRoot, relativePath)
-  if (existsSync(resolvedPath)) {
-    return resolvedPath
-  } else {
-    throw new Error(`Resolved path ${resolvedPath} does not exist.`)
-  }
-}
-function compileWithBin(input: string, bin: string): PromiseLike<SolcOutput> {
-  return new Promise((resolve, reject) => {
-    const process = spawn(bin, ['--standard-json'])
-
-    let output = ''
-    let error = ''
-
-    process.stdin.write(input)
-    process.stdin.end()
-
-    process.stdout.on('data', (data) => {
-      output += data.toString()
-    })
-
-    process.stderr.on('data', (data) => {
-      error += data.toString()
-    })
-
-    process.on('close', (code) => {
-      if (code === 0) {
-        try {
-          const result: SolcOutput = JSON.parse(output)
-          resolve(result)
-        } catch {
-          reject(new Error(`Failed to parse output`))
-        }
-      } else {
-        reject(new Error(`Process exited with code ${code}: ${error}`))
-      }
-    })
-  })
-}

js/resolc/src/resolc.ts

@@ -1,30 +0,0 @@
-import soljson from 'solc/soljson'
-import Resolc from './resolc/resolc'
-import type { SolcOutput } from '.'
-
-export function resolc(input: string): SolcOutput {
-  const m = Resolc() as any // eslint-disable-line @typescript-eslint/no-explicit-any
-  m.soljson = soljson
-  m.writeToStdin(input)
-  m.callMain(['--standard-json'])
-  const err = m.readFromStderr()
-
-  if (err) {
-    throw new Error(err)
-  }
-
-  return JSON.parse(m.readFromStdout()) as SolcOutput
-}
-
-export function version(): string {
-  const m = Resolc() as any // eslint-disable-line @typescript-eslint/no-explicit-any
-  m.soljson = soljson
-  m.callMain(['--version'])
-  const err = m.readFromStderr()
-
-  if (err) {
-    throw new Error(err)
-  }
-
-  return m.readFromStdout()
-}

js/resolc/src/resolc/resolc.js

@@ -1 +0,0 @@
-../../../../target/wasm32-unknown-emscripten/release/resolc.js