wip

Signed-off-by: Cyrill Leutwiler <bigcyrill@hotmail.com>

.cargo/config.toml

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

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

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

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

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

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

@@ -14,7 +14,7 @@ concurrency:
 
 env:
   CARGO_TERM_COLOR: always
-  RUST_MUSL_CROSS_IMAGE: messense/rust-musl-cross@sha256:c0154e992adb791c3b848dd008939d19862549204f8cb26f5ca7a00f629e6067
+  RUST_MUSL_CROSS_IMAGE: messense/rust-musl-cross@sha256:68b86bc7cb2867259e6b233415a665ff4469c28b57763e78c3bfea1c68091561
 
 jobs:
   check-version-changed:
@@ -181,7 +181,7 @@ jobs:
       - name: Basic Sanity Check
         run: |
           mkdir -p solc
-          curl -sSLo solc/soljson.js https://github.com/ethereum/solidity/releases/download/v0.8.30/soljson.js
+          curl -sSLo solc/soljson.js https://github.com/ethereum/solidity/releases/download/v0.8.29/soljson.js
           node -e "
           const soljson = require('solc/soljson');
           const createRevive = require('./target/wasm32-unknown-emscripten/release/resolc.js');
@@ -286,43 +286,3 @@ jobs:
             resolc.wasm
             resolc_web.js
             checksums.txt
-
-  npm-release:
-    needs: [create-release]
-    runs-on: macos-14
-    environment: tags
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Download Artifacts
-        uses: actions/download-artifact@v4
-        with:
-          merge-multiple: true
-
-      - name: Set Up Node.js
-        uses: actions/setup-node@v3
-        with:
-          node-version: "20"
-
-      - run: npm ci -w js/resolc
-
-      - name: Build
-        run: |
-          cp -f resolc.{wasm,js} js/resolc/src/resolc
-          npm -w js/resolc run build
-
-      - name: npm pack
-        run: npm -w js/resolc pack
-
-      - uses: actions/upload-artifact@v4
-        with:
-          name: npm_package
-          path: "parity-resolc-*.tgz"
-
-      - uses: octokit/request-action@bbedc70b1981e610d89f1f8de88311a1fc02fb83
-        with:
-          route: POST /repos/paritytech/npm_publish_automation/actions/workflows/publish.yml/dispatches
-          ref: main
-          inputs: '${{ format(''{{ "artifact_name": "npm_package", "repo": "{0}", "run_id": "{1}" }}'', github.repository, github.run_id) }}'
-        env:
-          GITHUB_TOKEN: ${{ secrets.NPM_PUBLISH_AUTOMATION_TOKEN }}

.github/workflows/test-wasm.yml

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

.gitignore

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

.prettierrc.json

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

CHANGELOG.md

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

Cargo.toml

@@ -3,7 +3,7 @@ resolver = "2"
 members = ["crates/*"]
 
 [workspace.package]
-version = "0.1.0-dev.16"
+version = "0.1.0-dev.13"
 authors = [
     "Cyrill Leutwiler <cyrill@parity.io>",
     "Parity Technologies <admin@parity.io>",
@@ -11,27 +11,27 @@ authors = [
 license = "MIT/Apache-2.0"
 edition = "2021"
 repository = "https://github.com/paritytech/revive"
-rust-version = "1.85.0"
+rust-version = "1.81.0"
 
 [workspace.dependencies]
-revive-benchmarks = { version = "0.1.0-dev.16", path = "crates/benchmarks" }
+revive-benchmarks = { version = "0.1.0-dev.13", path = "crates/benchmarks" }
-revive-builtins = { version = "0.1.0-dev.16", path = "crates/builtins" }
+revive-builtins = { version = "0.1.0-dev.13", path = "crates/builtins" }
-revive-common = { version = "0.1.0-dev.16", path = "crates/common" }
+revive-common = { version = "0.1.0-dev.13", path = "crates/common" }
-revive-differential = { version = "0.1.0-dev.16", path = "crates/differential" }
+revive-differential = { version = "0.1.0-dev.13", path = "crates/differential" }
-revive-integration = { version = "0.1.0-dev.16", path = "crates/integration" }
+revive-integration = { version = "0.1.0-dev.13", path = "crates/integration" }
-revive-linker = { version = "0.1.0-dev.16", path = "crates/linker" }
+revive-linker = { version = "0.1.0-dev.13", path = "crates/linker" }
-lld-sys = { version = "0.1.0-dev.16", path = "crates/lld-sys" }
+lld-sys = { version = "0.1.0-dev.13", path = "crates/lld-sys" }
-revive-llvm-context = { version = "0.1.0-dev.16", path = "crates/llvm-context" }
+revive-llvm-context = { version = "0.1.0-dev.13", path = "crates/llvm-context" }
-revive-runtime-api = { version = "0.1.0-dev.16", path = "crates/runtime-api" }
+revive-runtime-api = { version = "0.1.0-dev.13", path = "crates/runtime-api" }
-revive-runner = { version = "0.1.0-dev.16", path = "crates/runner" }
+revive-runner = { version = "0.1.0-dev.13", path = "crates/runner" }
-revive-solc-json-interface = { version = "0.1.0-dev.16", path = "crates/solc-json-interface" }
+revive-solc-json-interface = { version = "0.1.0-dev.13", path = "crates/solc-json-interface" }
-revive-solidity = { version = "0.1.0-dev.16", path = "crates/solidity" }
+revive-solidity = { version = "0.1.0-dev.13", path = "crates/solidity" }
-revive-stdlib = { version = "0.1.0-dev.16", path = "crates/stdlib" }
+revive-stdlib = { version = "0.1.0-dev.13", path = "crates/stdlib" }
-revive-build-utils = { version = "0.1.0-dev.16", path = "crates/build-utils" }
+revive-build-utils = { version = "0.1.0-dev.13", path = "crates/build-utils" }
 
 hex = "0.4.3"
 cc = "1.2"
-libc = "0.2.172"
+libc = "0.2.169"
 tempfile = "3.17"
 anyhow = "1.0"
 semver = { version = "1.0", features = ["serde"] }
@@ -73,13 +73,14 @@ assert_fs = "1.1"
 # polkadot-sdk and friends
 codec = { version = "3.6.12", default-features = false, package = "parity-scale-codec" }
 scale-info = { version = "2.11.6", default-features = false }
-polkadot-sdk = { version = "2503.0.1" }
+polkadot-sdk = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c29e72a8628835e34deb6aa7db9a78a2e4eabcee" }
 
 # llvm
 [workspace.dependencies.inkwell]
-version = "0.6.0"
+git = "https://github.com/TheDan64/inkwell.git"
+rev = "7b410298b6a93450adaa90b1841d5805a3038f12"
 default-features = false
-features = ["serde", "llvm18-1", "no-libffi-linking", "target-riscv"]
+features = ["serde", "llvm18-0", "no-libffi-linking", "target-riscv"]
 
 [profile.bench]
 inherits = "release"

Dockerfile

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

Makefile

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

RELEASE.md

@@ -13,10 +13,6 @@ To create a new pre-release:
 7. After the release is published, another workflow should start automatically and update json files in https://github.com/paritytech/resolc-bin. Check the changes.
 8. Update the [contract-docs](https://github.com/paritytech/contract-docs/) accordingly
 
-# `resolc` NPM package release
-
-Will happen automatically.
-
 # LLVM release
 
 To create a new LLVM release, run "Release LLVM" workflow. Use current LLVM version as parameter, e.g. `18.1.8`.

STATUS.md

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

crates/integration/codesize.json

@@ -1,10 +1,10 @@
 {
-  "Baseline": 939,
+  "Baseline": 950,
-  "Computation": 2282,
+  "Computation": 2262,
-  "DivisionArithmetics": 8849,
+  "DivisionArithmetics": 8915,
-  "ERC20": 18308,
+  "ERC20": 17233,
-  "Events": 1640,
+  "Events": 1628,
-  "FibonacciIterative": 1497,
+  "FibonacciIterative": 1485,
-  "Flipper": 2099,
+  "Flipper": 2132,
-  "SHA1": 8243
+  "SHA1": 8381
 }

crates/llvm-builder/src/builtins.rs

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

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

@@ -8,9 +8,8 @@ use std::path::Path;
 use std::process::Command;
 
 /// The build options shared by all platforms.
-pub const SHARED_BUILD_OPTS: [&str; 22] = [
+pub const SHARED_BUILD_OPTS: [&str; 21] = [
     "-DPACKAGE_VENDOR='Parity Technologies'",
-    "-DCMAKE_CXX_FLAGS='-include cstdint -include stdint.h'",
     "-DCMAKE_BUILD_WITH_INSTALL_RPATH=1",
     "-DLLVM_BUILD_DOCS='Off'",
     "-DLLVM_INCLUDE_DOCS='Off'",

crates/llvm-builder/src/utils.rs

@@ -38,7 +38,7 @@ pub const MUSL_SNAPSHOTS_URL: &str = "https://git.musl-libc.org/cgit/musl/snapsh
 pub const EMSDK_SOURCE_URL: &str = "https://github.com/emscripten-core/emsdk.git";
 
 /// The emscripten SDK version.
-pub const EMSDK_VERSION: &str = "4.0.9";
+pub const EMSDK_VERSION: &str = "3.1.64";
 
 /// The subprocess runner.
 ///

crates/llvm-context/src/lib.rs

@@ -28,7 +28,6 @@ pub use self::polkavm::context::function::runtime::entry::Entry as PolkaVMEntryF
 pub use self::polkavm::context::function::runtime::revive::Exit as PolkaVMExitFunction;
 pub use self::polkavm::context::function::runtime::revive::WordToPointer as PolkaVMWordToPointerFunction;
 pub use self::polkavm::context::function::runtime::runtime_code::RuntimeCode as PolkaVMRuntimeCodeFunction;
-pub use self::polkavm::context::function::runtime::sbrk::Sbrk as PolkaVMSbrkFunction;
 pub use self::polkavm::context::function::runtime::FUNCTION_DEPLOY_CODE as PolkaVMFunctionDeployCode;
 pub use self::polkavm::context::function::runtime::FUNCTION_ENTRY as PolkaVMFunctionEntry;
 pub use self::polkavm::context::function::runtime::FUNCTION_RUNTIME_CODE as PolkaVMFunctionRuntimeCode;
@@ -61,6 +60,7 @@ pub use self::polkavm::evm::ext_code as polkavm_evm_ext_code;
 pub use self::polkavm::evm::immutable as polkavm_evm_immutable;
 pub use self::polkavm::evm::immutable::Load as PolkaVMLoadImmutableDataFunction;
 pub use self::polkavm::evm::immutable::Store as PolkaVMStoreImmutableDataFunction;
+
 pub use self::polkavm::evm::math as polkavm_evm_math;
 pub use self::polkavm::evm::memory as polkavm_evm_memory;
 pub use self::polkavm::evm::r#return as polkavm_evm_return;

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

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

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

@@ -9,12 +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";
 

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

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

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

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

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

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

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

@@ -25,7 +25,6 @@ use inkwell::debug_info::AsDIScope;
 use inkwell::debug_info::DIScope;
 use inkwell::types::BasicType;
 use inkwell::values::BasicValue;
-use revive_solc_json_interface::SolcStandardJsonInputSettingsPolkaVMMemory;
 
 use crate::optimizer::settings::Settings as OptimizerSettings;
 use crate::optimizer::Optimizer;
@@ -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: SolcStandardJsonInputSettingsPolkaVMMemory,
 
     /// The project dependency manager. It can be any entity implementing the trait.
     /// The manager is used to get information about contracts and their dependencies during
@@ -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: SolcStandardJsonInputSettingsPolkaVMMemory,
     ) -> Self {
         Self::set_data_layout(llvm, &module);
         Self::link_stdlib_module(llvm, &module);
         Self::link_polkavm_imports(llvm, &module);
-        Self::set_polkavm_stack_size(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,
                 )
             })
     }
@@ -778,27 +773,49 @@ where
             .into())
     }
 
-    /// Builds a stack load instruction.
+    /// Builds a stack load instruction with a direct assignment.
     /// Sets the alignment to 256 bits for the stack and 1 bit for the heap, parent, and child.
-    pub fn build_load(
+    pub fn build_load_assign(
         &self,
         pointer: Pointer<'ctx>,
         name: &str,
-    ) -> anyhow::Result<inkwell::values::BasicValueEnum<'ctx>> {
+        assignment_pointer: &mut Option<inkwell::values::PointerValue<'ctx>>,
+    ) -> anyhow::Result<Option<inkwell::values::BasicValueEnum<'ctx>>> {
         match pointer.address_space {
             AddressSpace::Heap => {
-                let name = <PolkaVMLoadHeapWordFunction as RuntimeFunction<D>>::NAME;
                 let declaration =
                     <PolkaVMLoadHeapWordFunction as RuntimeFunction<D>>::declaration(self);
-                let arguments = [self
+                match assignment_pointer.take() {
-                    .builder()
+                    Some(assignment_pointer) => {
-                    .build_ptr_to_int(pointer.value, self.xlen_type(), "offset_ptrtoint")?
+                        let arguments = [
-                    .as_basic_value_enum()];
+                            self.builder()
-                Ok(self
+                                .build_ptr_to_int(
-                    .build_call(declaration, &arguments, "heap_load")
+                                    pointer.value,
-                    .unwrap_or_else(|| {
+                                    self.xlen_type(),
-                        panic!("revive runtime function {name} should return a value")
+                                    "offset_ptrtoint",
-                    }))
+                                )?
+                                .as_basic_value_enum(),
+                            assignment_pointer.into(),
+                        ];
+                        self.build_call(declaration, &arguments, "heap_load");
+                        Ok(None)
+                    }
+                    None => {
+                        let pointer = self.build_alloca_at_entry(self.word_type(), "pointer");
+                        let arguments = [
+                            self.builder()
+                                .build_ptr_to_int(
+                                    pointer.value,
+                                    self.xlen_type(),
+                                    "offset_ptrtoint",
+                                )?
+                                .as_basic_value_enum(),
+                            pointer.value.into(),
+                        ];
+                        self.build_call(declaration, &arguments, "heap_load");
+                        Ok(Some(self.build_load(pointer, "storage_value")?))
+                    }
+                }
             }
             AddressSpace::Stack => {
                 let value = self
@@ -811,11 +828,23 @@ where
                     .set_alignment(revive_common::BYTE_LENGTH_STACK_ALIGN as u32)
                     .expect("Alignment is valid");
 
-                Ok(value)
+                Ok(Some(value))
             }
         }
     }
 
+    /// Builds a stack load instruction.
+    /// Sets the alignment to 256 bits for the stack and 1 bit for the heap, parent, and child.
+    pub fn build_load(
+        &self,
+        pointer: Pointer<'ctx>,
+        name: &str,
+    ) -> anyhow::Result<inkwell::values::BasicValueEnum<'ctx>> {
+        Ok(self
+            .build_load_assign(pointer, name, &mut None)?
+            .expect("without an assignment pointer loads return a value"))
+    }
+
     /// Builds a stack store instruction.
     /// Sets the alignment to 256 bits for the stack and 1 bit for the heap, parent, and child.
     pub fn build_store<V>(&self, pointer: Pointer<'ctx>, value: V) -> anyhow::Result<()>
@@ -1089,40 +1118,32 @@ where
         offset: inkwell::values::IntValue<'ctx>,
         size: inkwell::values::IntValue<'ctx>,
     ) -> anyhow::Result<inkwell::values::PointerValue<'ctx>> {
-        let call_site_value = self.builder().build_call(
+        Ok(self
-            <PolkaVMSbrkFunction as RuntimeFunction<D>>::declaration(self).function_value(),
+            .builder()
+            .build_call(
+                self.runtime_api_method(revive_runtime_api::polkavm_imports::SBRK),
                 &[offset.into(), size.into()],
-            "alloc_start",
+                "call_sbrk",
-        )?;
+            )?
-
-        call_site_value.add_attribute(
-            inkwell::attributes::AttributeLoc::Return,
-            self.llvm
-                .create_enum_attribute(Attribute::NonNull as u32, 0),
-        );
-        call_site_value.add_attribute(
-            inkwell::attributes::AttributeLoc::Return,
-            self.llvm
-                .create_enum_attribute(Attribute::NoUndef as u32, 0),
-        );
-
-        Ok(call_site_value
             .try_as_basic_value()
             .left()
-            .unwrap_or_else(|| {
+            .expect("sbrk returns a pointer")
-                panic!(
-                    "revive runtime function {} should return a value",
-                    <PolkaVMSbrkFunction as RuntimeFunction<D>>::NAME,
-                )
-            })
             .into_pointer_value())
     }
 
     /// Build a call to PolkaVM `msize` for querying the linear memory size.
     pub fn build_msize(&self) -> anyhow::Result<inkwell::values::IntValue<'ctx>> {
-        Ok(self
+        let memory_size_pointer = self
-            .get_global_value(crate::polkavm::GLOBAL_HEAP_SIZE)?
+            .module()
-            .into_int_value())
+            .get_global(revive_runtime_api::polkavm_imports::MEMORY_SIZE)
+            .expect("the memory size symbol should have been declared")
+            .as_pointer_value();
+        let memory_size_value = self.builder().build_load(
+            self.xlen_type(),
+            memory_size_pointer,
+            "memory_size_value",
+        )?;
+        Ok(memory_size_value.into_int_value())
     }
 
     /// Returns a pointer to `offset` into the heap, allocating
@@ -1441,9 +1462,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/heap.rs

@@ -2,6 +2,8 @@
 
 use inkwell::values::BasicValueEnum;
 
+use crate::polkavm::context::address_space::AddressSpace;
+use crate::polkavm::context::pointer::Pointer;
 use crate::polkavm::context::runtime::RuntimeFunction;
 use crate::polkavm::context::Context;
 use crate::polkavm::Dependency;
@@ -17,9 +19,13 @@ where
     const NAME: &'static str = "__revive_load_heap_word";
 
     fn r#type<'ctx>(context: &Context<'ctx, D>) -> inkwell::types::FunctionType<'ctx> {
-        context
+        context.void_type().fn_type(
-            .word_type()
+            &[
-            .fn_type(&[context.xlen_type().into()], false)
+                context.xlen_type().into(),
+                context.llvm().ptr_type(Default::default()).into(),
+            ],
+            false,
+        )
     }
 
     fn emit_body<'ctx>(
@@ -27,6 +33,7 @@ where
         context: &mut Context<'ctx, D>,
     ) -> anyhow::Result<Option<BasicValueEnum<'ctx>>> {
         let offset = Self::paramater(context, 0).into_int_value();
+        let assignment_pointer = Self::paramater(context, 1).into_pointer_value();
         let length = context
             .xlen_type()
             .const_int(revive_common::BYTE_LENGTH_WORD as u64, false);
@@ -42,7 +49,11 @@ where
             .expect("Alignment is valid");
 
         let swapped_value = context.build_byte_swap(value)?;
-        Ok(Some(swapped_value))
+        context.build_store(
+            Pointer::new(context.word_type(), AddressSpace::Stack, assignment_pointer),
+            swapped_value,
+        )?;
+        Ok(None)
     }
 }
 

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

@@ -2,6 +2,8 @@
 
 use inkwell::values::BasicValueEnum;
 
+use crate::polkavm::context::address_space::AddressSpace;
+use crate::polkavm::context::pointer::Pointer;
 use crate::polkavm::context::runtime::RuntimeFunction;
 use crate::polkavm::context::Context;
 use crate::polkavm::Dependency;
@@ -17,20 +19,27 @@ where
     const NAME: &'static str = "__revive_load_storage_word";
 
     fn r#type<'ctx>(context: &Context<'ctx, D>) -> inkwell::types::FunctionType<'ctx> {
-        context
+        context.void_type().fn_type(
-            .word_type()
+            &[
-            .fn_type(&[context.llvm().ptr_type(Default::default()).into()], false)
+                context.llvm().ptr_type(Default::default()).into(),
+                context.llvm().ptr_type(Default::default()).into(),
+            ],
+            false,
+        )
     }
 
     fn emit_body<'ctx>(
         &self,
         context: &mut Context<'ctx, D>,
     ) -> anyhow::Result<Option<BasicValueEnum<'ctx>>> {
-        Ok(Some(emit_load(
+        let key = Self::paramater(context, 0);
-            context,
+        let assignment_pointer = Self::paramater(context, 1).into_pointer_value();
-            Self::paramater(context, 0),
+        let value = emit_load(context, key, false)?;
-            false,
+        context.build_store(
-        )?))
+            Pointer::new(context.word_type(), AddressSpace::Stack, assignment_pointer),
+            value,
+        )?;
+        Ok(None)
     }
 }
 

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/memory.rs

@@ -29,7 +29,8 @@ where
 pub fn load<'ctx, D>(
     context: &mut Context<'ctx, D>,
     offset: inkwell::values::IntValue<'ctx>,
-) -> anyhow::Result<inkwell::values::BasicValueEnum<'ctx>>
+    assignment_pointer: &mut Option<inkwell::values::PointerValue<'ctx>>,
+) -> anyhow::Result<Option<inkwell::values::BasicValueEnum<'ctx>>>
 where
     D: Dependency + Clone,
 {
@@ -40,7 +41,7 @@ where
         offset,
         "memory_load_pointer",
     );
-    context.build_load(pointer, "memory_load_result")
+    context.build_load_assign(pointer, "memory_load_result", assignment_pointer)
 }
 
 /// Translates the `mstore` instruction.

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

@@ -13,16 +13,32 @@ use crate::PolkaVMStoreTransientStorageWordFunction;
 pub fn load<'ctx, D>(
     context: &mut Context<'ctx, D>,
     position: &PolkaVMArgument<'ctx>,
-) -> anyhow::Result<inkwell::values::BasicValueEnum<'ctx>>
+    assignment_pointer: &mut Option<inkwell::values::PointerValue<'ctx>>,
+) -> anyhow::Result<Option<inkwell::values::BasicValueEnum<'ctx>>>
 where
     D: Dependency + Clone,
 {
-    let name = <PolkaVMLoadStorageWordFunction as RuntimeFunction<D>>::NAME;
+    let _name = <PolkaVMLoadStorageWordFunction as RuntimeFunction<D>>::NAME;
     let declaration = <PolkaVMLoadStorageWordFunction as RuntimeFunction<D>>::declaration(context);
-    let arguments = [position.as_pointer(context)?.value.into()];
+    match assignment_pointer.take() {
-    Ok(context
+        Some(assignment_pointer) => {
-        .build_call(declaration, &arguments, "storage_load")
+            let arguments = [
-        .unwrap_or_else(|| panic!("runtime function {name} should return a value")))
+                position.as_pointer(context)?.value.into(),
+                assignment_pointer.into(),
+            ];
+            context.build_call(declaration, &arguments, "storage_load");
+            Ok(None)
+        }
+        None => {
+            let pointer = context.build_alloca_at_entry(context.word_type(), "pointer");
+            let arguments = [
+                position.as_pointer(context)?.value.into(),
+                pointer.value.into(),
+            ];
+            context.build_call(declaration, &arguments, "storage_load");
+            Ok(Some(context.build_load(pointer, "storage_value")?))
+        }
+    }
 }
 
 /// Translates the storage store.

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

@@ -12,7 +12,6 @@ use crate::optimizer::settings::Settings as OptimizerSettings;
 use anyhow::Context as AnyhowContext;
 use polkavm_common::program::ProgramBlob;
 use polkavm_disassembler::{Disassembler, DisassemblyFormat};
-use revive_solc_json_interface::SolcStandardJsonInputSettingsPolkaVMMemory;
 use sha3::Digest;
 
 use self::context::build::Build;
@@ -91,7 +90,6 @@ pub trait Dependency {
         include_metadata_hash: bool,
         debug_config: DebugConfig,
         llvm_arguments: &[String],
-        memory_config: SolcStandardJsonInputSettingsPolkaVMMemory,
     ) -> anyhow::Result<String>;
 
     /// Resolves a full contract path.
@@ -113,7 +111,6 @@ impl Dependency for DummyDependency {
         _include_metadata_hash: bool,
         _debug_config: DebugConfig,
         _llvm_arguments: &[String],
-        _memory_config: SolcStandardJsonInputSettingsPolkaVMMemory,
     ) -> anyhow::Result<String> {
         Ok(String::new())
     }

crates/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/runtime.rs

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

crates/runner/src/specs.rs

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

@@ -9,7 +9,7 @@ description = "Implements the low level runtime API bindings with pallet contrac
 
 [dependencies]
 anyhow = { workspace = true }
-inkwell = { workspace = true, features = ["target-riscv", "no-libffi-linking", "llvm18-1"] }
+inkwell = { workspace = true, features = ["target-riscv", "no-libffi-linking", "llvm18-0"] }
 
 revive-common = { workspace = true }
 

crates/runtime-api/src/polkavm_imports.c

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

crates/runtime-api/src/polkavm_imports.rs

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

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

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

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

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

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

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

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

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

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

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

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

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

crates/solc-json-interface/src/standard_json/input/settings/polkavm/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/solc-json-interface/src/standard_json/input/settings/polkavm/mod.rs

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

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

@@ -10,7 +10,7 @@ use serde::Serialize;
 use self::flag::Flag as SelectionFlag;
 
 /// The `solc --standard-json` output file selection.
-#[derive(Clone, Debug, Default, Serialize, Deserialize, PartialEq)]
+#[derive(Debug, Default, Serialize, Deserialize, PartialEq)]
 pub struct File {
     /// The per-file output selections.
     #[serde(rename = "", skip_serializing_if = "Option::is_none")]

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

@@ -10,7 +10,7 @@ use serde::Serialize;
 use self::file::File as FileSelection;
 
 /// The `solc --standard-json` output selection.
-#[derive(Clone, Debug, Serialize, Deserialize, Default, PartialEq)]
+#[derive(Debug, Serialize, Deserialize, Default, PartialEq)]
 pub struct Selection {
     /// Only the 'all' wildcard is available for robustness reasons.
     #[serde(rename = "*", skip_serializing_if = "Option::is_none")]

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

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

crates/solidity/Cargo.toml

@@ -44,7 +44,7 @@ mimalloc = { version = "*", default-features = false }
 
 [target.'cfg(target_os = "emscripten")'.dependencies]
 libc = { workspace = true }
-inkwell = { workspace = true, features = ["target-riscv", "llvm18-1-no-llvm-linking"]}
+inkwell = { workspace = true, features = ["target-riscv", "llvm18-0-no-llvm-linking"]}
 
 [build-dependencies]
 git2 = { workspace = true, default-features = false }

crates/solidity/src/lib.rs

@@ -45,8 +45,6 @@ use revive_solc_json_interface::ResolcWarning;
 use revive_solc_json_interface::SolcStandardJsonInput;
 use revive_solc_json_interface::SolcStandardJsonInputLanguage;
 use revive_solc_json_interface::SolcStandardJsonInputSettingsOptimizer;
-use revive_solc_json_interface::SolcStandardJsonInputSettingsPolkaVM;
-use revive_solc_json_interface::SolcStandardJsonInputSettingsPolkaVMMemory;
 use revive_solc_json_interface::SolcStandardJsonInputSettingsSelection;
 
 /// Runs the Yul mode.
@@ -57,7 +55,6 @@ pub fn yul<T: Compiler>(
     include_metadata_hash: bool,
     debug_config: revive_llvm_context::DebugConfig,
     llvm_arguments: &[String],
-    memory_config: SolcStandardJsonInputSettingsPolkaVMMemory,
 ) -> anyhow::Result<Build> {
     let path = match input_files.len() {
         1 => input_files.first().expect("Always exists"),
@@ -83,7 +80,6 @@ pub fn yul<T: Compiler>(
         include_metadata_hash,
         debug_config,
         llvm_arguments,
-        memory_config,
     )?;
 
     Ok(build)
@@ -96,7 +92,6 @@ pub fn llvm_ir(
     include_metadata_hash: bool,
     debug_config: revive_llvm_context::DebugConfig,
     llvm_arguments: &[String],
-    memory_config: SolcStandardJsonInputSettingsPolkaVMMemory,
 ) -> anyhow::Result<Build> {
     let path = match input_files.len() {
         1 => input_files.first().expect("Always exists"),
@@ -114,7 +109,6 @@ pub fn llvm_ir(
         include_metadata_hash,
         debug_config,
         llvm_arguments,
-        memory_config,
     )?;
 
     Ok(build)
@@ -137,7 +131,6 @@ pub fn standard_output<T: Compiler>(
     suppressed_warnings: Option<Vec<ResolcWarning>>,
     debug_config: revive_llvm_context::DebugConfig,
     llvm_arguments: &[String],
-    memory_config: SolcStandardJsonInputSettingsPolkaVMMemory,
 ) -> anyhow::Result<Build> {
     let solc_version = solc.version()?;
 
@@ -156,10 +149,6 @@ pub fn standard_output<T: Compiler>(
         ),
         None,
         suppressed_warnings,
-        Some(SolcStandardJsonInputSettingsPolkaVM::new(
-            Some(memory_config),
-            debug_config.emit_debug_info,
-        )),
     )?;
 
     let source_code_files = solc_input
@@ -200,21 +189,19 @@ pub fn standard_output<T: Compiler>(
         include_metadata_hash,
         debug_config,
         llvm_arguments,
-        memory_config,
     )?;
 
     Ok(build)
 }
 
 /// Runs the standard JSON mode.
-#[allow(clippy::too_many_arguments)]
 pub fn standard_json<T: Compiler>(
     solc: &mut T,
     detect_missing_libraries: bool,
     base_path: Option<String>,
     include_paths: Vec<String>,
     allow_paths: Option<String>,
-    mut debug_config: revive_llvm_context::DebugConfig,
+    debug_config: revive_llvm_context::DebugConfig,
     llvm_arguments: &[String],
 ) -> anyhow::Result<()> {
     let solc_version = solc.version()?;
@@ -229,9 +216,6 @@ pub fn standard_json<T: Compiler>(
     let optimizer_settings =
         revive_llvm_context::OptimizerSettings::try_from(&solc_input.settings.optimizer)?;
 
-    let polkavm_settings = solc_input.settings.polkavm.unwrap_or_default();
-    debug_config.emit_debug_info = polkavm_settings.debug_information;
-
     let include_metadata_hash = match solc_input.settings.metadata {
         Some(ref metadata) => metadata.bytecode_hash != Some(MetadataHash::None),
         None => true,
@@ -266,7 +250,6 @@ pub fn standard_json<T: Compiler>(
             include_metadata_hash,
             debug_config,
             llvm_arguments,
-            polkavm_settings.memory_config,
         )?;
         build.write_to_standard_json(&mut solc_output, &solc_version)?;
     }
@@ -294,7 +277,6 @@ pub fn combined_json<T: Compiler>(
     output_directory: Option<PathBuf>,
     overwrite: bool,
     llvm_arguments: &[String],
-    memory_config: SolcStandardJsonInputSettingsPolkaVMMemory,
 ) -> anyhow::Result<()> {
     let build = standard_output(
         input_files,
@@ -311,7 +293,6 @@ pub fn combined_json<T: Compiler>(
         suppressed_warnings,
         debug_config,
         llvm_arguments,
-        memory_config,
     )?;
 
     let mut combined_json = solc.combined_json(input_files, format.as_str())?;

crates/solidity/src/process/input.rs

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

crates/solidity/src/process/mod.rs

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

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

@@ -5,7 +5,6 @@ pub mod metadata;
 
 use std::collections::HashSet;
 
-use revive_solc_json_interface::SolcStandardJsonInputSettingsPolkaVMMemory;
 use serde::Deserialize;
 use serde::Serialize;
 use sha3::Digest;
@@ -79,7 +78,6 @@ impl Contract {
         include_metadata_hash: bool,
         debug_config: revive_llvm_context::DebugConfig,
         llvm_arguments: &[String],
-        memory_config: SolcStandardJsonInputSettingsPolkaVMMemory,
     ) -> anyhow::Result<ContractBuild> {
         let llvm = inkwell::context::Context::create();
         let optimizer = revive_llvm_context::Optimizer::new(optimizer_settings);
@@ -125,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_solc_json_interface::SolcStandardJsonInputSettingsPolkaVMMemory,
     ) -> 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_solc_json_interface::SolcStandardJsonInputSettingsPolkaVMMemory,
     ) -> 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")]
-    pub heap_size: Option<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")]
-    pub stack_size: Option<u32>,
 }
 
 impl Arguments {
@@ -330,22 +298,6 @@ impl Arguments {
             if self.metadata_hash.is_some() {
                 anyhow::bail!("Metadata hash mode must specified in standard JSON input settings.");
             }
-
-            if self.heap_size.is_some() {
-                anyhow::bail!(
-                    "Heap size must be specified in standard JSON input polkavm memory settings."
-                );
-            }
-            if self.stack_size.is_some() {
-                anyhow::bail!(
-                    "Stack size must be specified in standard JSON input polkavm memory settings."
-                );
-            }
-            if self.emit_source_debug_info {
-                anyhow::bail!(
-                    "Debug info must be requested in standard JSON input polkavm settings."
-                );
-            }
         }
 
         Ok(())

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,15 +148,6 @@ fn main_inner() -> anyhow::Result<()> {
         None => true,
     };
 
-    let mut memory_config =
-        revive_solc_json_interface::SolcStandardJsonInputSettingsPolkaVMMemory::default();
-    if let Some(heap_size) = arguments.heap_size {
-        memory_config.heap_size = heap_size
-    }
-    if let Some(stack_size) = arguments.stack_size {
-        memory_config.stack_size = stack_size
-    }
-
     let build = if arguments.yul {
         revive_solidity::yul(
             input_files.as_slice(),
@@ -165,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(
@@ -174,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(
@@ -206,7 +195,6 @@ fn main_inner() -> anyhow::Result<()> {
             arguments.output_directory,
             arguments.overwrite,
             &arguments.llvm_arguments,
-            memory_config,
         )?;
         return Ok(());
     } else {
@@ -225,7 +213,6 @@ fn main_inner() -> anyhow::Result<()> {
             suppressed_warnings,
             debug_config,
             &arguments.llvm_arguments,
-            memory_config,
         )
     }?;
 

crates/solidity/src/solc/mod.rs

@@ -19,7 +19,7 @@ use self::version::Version;
 pub const FIRST_SUPPORTED_VERSION: semver::Version = semver::Version::new(0, 8, 0);
 
 /// The last supported version of `solc`.
-pub const LAST_SUPPORTED_VERSION: semver::Version = semver::Version::new(0, 8, 30);
+pub const LAST_SUPPORTED_VERSION: semver::Version = semver::Version::new(0, 8, 29);
 
 /// `--include-path` was introduced in solc `0.8.8` <https://github.com/ethereum/solidity/releases/tag/v0.8.8>
 pub const FIRST_INCLUDE_PATH_VERSION: semver::Version = semver::Version::new(0, 8, 8);

crates/solidity/src/test_utils.rs

@@ -98,7 +98,6 @@ pub fn build_solidity_with_options(
         ),
         None,
         None,
-        None,
     )?;
 
     let mut output = solc.standard_json(input, None, vec![], None)?;
@@ -116,13 +115,8 @@ pub fn build_solidity_with_options(
         &debug_config,
     )?;
 
-    let build: crate::Build = project.compile(
+    let build: crate::Build =
-        optimizer_settings,
+        project.compile(optimizer_settings, false, debug_config, Default::default())?;
-        false,
-        debug_config,
-        Default::default(),
-        Default::default(),
-    )?;
     build.write_to_standard_json(&mut output, &solc_version)?;
 
     Ok(output)
@@ -163,7 +157,6 @@ pub fn build_solidity_with_options_evm(
         ),
         None,
         None,
-        None,
     )?;
 
     let mut output = solc.standard_json(input, None, vec![], None)?;
@@ -215,7 +208,6 @@ pub fn build_solidity_and_detect_missing_libraries(
         SolcStandardJsonInputSettingsOptimizer::new(true, None, &solc_version.default, false),
         None,
         None,
-        None,
     )?;
 
     let mut output = solc.standard_json(input, None, vec![], None)?;
@@ -251,13 +243,7 @@ pub fn build_yul(source_code: &str) -> anyhow::Result<()> {
         source_code,
         None,
     )?;
-    let _build = project.compile(
+    let _build = project.compile(optimizer_settings, false, DEBUG_CONFIG, Default::default())?;
-        optimizer_settings,
-        false,
-        DEBUG_CONFIG,
-        Default::default(),
-        Default::default(),
-    )?;
 
     Ok(())
 }
@@ -289,7 +275,6 @@ pub fn check_solidity_warning(
         SolcStandardJsonInputSettingsOptimizer::new(true, None, &solc_version.default, false),
         None,
         suppressed_warnings,
-        None,
     )?;
 
     let output = solc.standard_json(input, None, vec![], None)?;

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 outputDir = 'artifacts';
-const binExtension = ':C.pvm'
+const binExtension = ':C.pvm';
-const asmExtension = ':C.pvmasm'
+const asmExtension = ':C.pvmasm';
-const llvmExtension = '.ll'
+const llvmExtension = '.ll';
-const contractSolFilename = 'contract.sol'
+const contractSolFilename = 'contract.sol';
-const contractYulFilename = 'contract.yul'
+const contractYulFilename = 'contract.yul';
-const contractOptimizedLLVMFilename = contractSolFilename + '.C.optimized'
+const contractOptimizedLLVMFilename = contractSolFilename + '.C.optimized';
-const contractUnoptimizedLLVMFilename = contractSolFilename + '.C.unoptimized'
+const contractUnoptimizedLLVMFilename = contractSolFilename + '.C.unoptimized';
-const pathToOutputDir = path.join(__dirname, '..', outputDir)
+const pathToOutputDir = path.join(__dirname, '..', outputDir);
-const pathToContracts = path.join(__dirname, '..', 'src', 'contracts')
+const pathToContracts = path.join(__dirname, '..', 'src', 'contracts');
-const pathToBasicYulContract = path.join(
+const pathToBasicYulContract = path.join(pathToContracts, 'yul', contractYulFilename);
-  pathToContracts,
+const pathToBasicSolContract = path.join(pathToContracts, 'solidity', contractSolFilename);
-  'yul',
+const pathToSolBinOutputFile = path.join(pathToOutputDir, contractSolFilename + binExtension);
-  contractYulFilename
+const pathToSolAsmOutputFile = path.join(pathToOutputDir, contractSolFilename + asmExtension);
-)
-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 shell from 'shelljs';
-import * as fs from 'fs'
+import * as fs from 'fs';
-import { spawnSync } from 'child_process'
+import { spawnSync } from 'child_process';
 
 interface CommandResult {
-  output: string
+    output: string;
-  exitCode: number
+    exitCode: number;
 }
 
-export const executeCommand = (
+export const executeCommand = (command: string, stdin?: string): CommandResult => {
-  command: string,
-  stdin?: string
-): CommandResult => {
     if (stdin) {
         const process = spawnSync(command, [], {
             input: stdin,
             shell: true,
             encoding: 'utf8',
-      maxBuffer: 30 * 1024 * 1024,
+            maxBuffer: 30 * 1024 * 1024
-    })
+        });
 
         return {
             exitCode: process.status || 0,
-      output: (process.stdout || process.stderr || '').toString(),
+            output: (process.stdout || process.stderr || '').toString()
-    }
+        };
     }
 
-  const result = shell.exec(command, { silent: true, async: false })
+    const result = shell.exec(command, { silent: true, async: false });
     return {
         exitCode: result.code,
-    output: result.stdout || result.stderr || '',
+        output: result.stdout || result.stderr || ''
-  }
+    };
-}
+};
 
 export const isFolderExist = (folder: string): boolean => {
-  return shell.test('-d', folder)
+    return shell.test('-d', folder);
-}
+};
 
-export const isFileExist = (
+export const isFileExist = (pathToFileDir: string, fileName: string, fileExtension: string): boolean => {
-  pathToFileDir: string,
+    return shell.ls(pathToFileDir).stdout.includes(fileName + fileExtension);
-  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
+        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 {executeCommand} from "../src/helper";
-import { paths } from '../src/entities'
+import { paths } from '../src/entities';
+
 
 //id1746
-describe('Run with --asm by default', () => {
+describe("Run with --asm by default", () => {
-  const command = `resolc ${paths.pathToBasicSolContract} --asm`
+  const command = `resolc ${paths.pathToBasicSolContract} --asm`;
-  const result = executeCommand(command)
+  const result = executeCommand(command);
-  const commandInvalid = 'resolc --asm'
+  const commandInvalid = 'resolc --asm';
-  const resultInvalid = executeCommand(commandInvalid)
+  const resultInvalid = executeCommand(commandInvalid);
 
-  it('Valid command exit code = 0', () => {
+  it("Valid command exit code = 0", () => {
-    expect(result.exitCode).toBe(0)
+    expect(result.exitCode).toBe(0);
-  })
+  });
 
-  it('--asm output is presented', () => {
+  it("--asm output is presented", () => {
-    const expectedPatterns = [/(deploy)/i, /(call)/i, /(seal_return)/i]
+    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', () => {
+  it("solc exit code == resolc exit code", () => {
-    const command = `solc ${paths.pathToBasicSolContract} --asm`
+    const command = `solc ${paths.pathToBasicSolContract} --asm`;
-    const solcResult = executeCommand(command)
+    const solcResult = executeCommand(command);
-    expect(solcResult.exitCode).toBe(result.exitCode)
+    expect(solcResult.exitCode).toBe(result.exitCode);
-  })
+  });
 
-  it('run invalid: resolc --asm', () => {
+  it("run invalid: resolc --asm", () => {
-    expect(resultInvalid.output).toMatch(
+    expect(resultInvalid.output).toMatch(/(No input sources specified|Compilation aborted)/i);
-      /(No input sources specified|Compilation aborted)/i
+  });
-    )
-  })
   
-  it('Invalid command exit code = 1', () => {
+  it("Invalid command exit code = 1", () => {
-    expect(resultInvalid.exitCode).toBe(1)
+    expect(resultInvalid.exitCode).toBe(1);
-  })
+  });
 
-  it('Invalid solc exit code == Invalid resolc exit code', () => {
+  it("Invalid solc exit code == Invalid resolc exit code", () => {
-    const command = 'solc --asm'
+    const command = 'solc --asm';
-    const solcResult = executeCommand(command)
+    const solcResult = executeCommand(command);
-    expect(solcResult.exitCode).toBe(resultInvalid.exitCode)
+    expect(solcResult.exitCode).toBe(resultInvalid.exitCode);
-  })
+  });
-})
+});

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

@@ -1,241 +1,191 @@
-import {
+import { executeCommand, isFolderExist, isFileExist, isFileEmpty } from "../src/helper";
-  executeCommand,
+import { paths } from '../src/entities';
-  isFolderExist,
+import * as shell from 'shelljs';
-  isFileExist,
+import * as path from 'path';
-  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', () => {
+describe("Run resolc without any options", () => {
-  const command = 'resolc'
+    const command = 'resolc';
-  const result = executeCommand(command)
+    const result = executeCommand(command);
 
-  it('Info with help is presented', () => {
+    it("Info with help is presented", () => {
-    expect(result.output).toMatch(/(Usage: resolc)/i)
+        expect(result.output).toMatch(/(Usage: resolc)/i);
-  })
+    });
 
-  it('Exit code = 1', () => {
+    it("Exit code = 1", () => {
-    expect(result.exitCode).toBe(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', () => {
+describe("Default run a command from the help", () => {
-  const command = `resolc ${paths.pathToBasicSolContract} --overwrite -O3 --bin --output-dir "${paths.pathToOutputDir}"` // potential issue on resolc with full path on Windows cmd
-  const result = executeCommand(command)
 
-  it('Compiler run successful', () => {
+    const command = `resolc ${paths.pathToBasicSolContract} --overwrite -O3 --bin --output-dir "${paths.pathToOutputDir}"`; // potential issue on resolc with full path on Windows cmd
-    expect(result.output).toMatch(/(Compiler run successful.)/i)
+    const result = executeCommand(command);
-  })
+
-  it('Exit code = 0', () => {
+    it("Compiler run successful", () => {
-    expect(result.exitCode).toBe(0)
+        expect(result.output).toMatch(/(Compiler run successful.)/i);
-  })
+    });
-  it('Output dir is created', () => {
+    it("Exit code = 0", () => {
-    expect(isFolderExist(paths.pathToOutputDir)).toBe(true)
+        expect(result.exitCode).toBe(0);
-  })
+    });
-  xit('Output file is created', () => {
+    it("Output dir is created", () => {
-    // a bug on windows
+        expect(isFolderExist(paths.pathToOutputDir)).toBe(true);
-    expect(
+    });
-      isFileExist(
+    xit("Output file is created", () => { // a bug on windows
-        paths.pathToOutputDir,
+        expect(isFileExist(paths.pathToOutputDir, paths.contractSolFilename, paths.binExtension)).toBe(true);
-        paths.contractSolFilename,
+    });
-        paths.binExtension
+    it("the output file is not empty", () => {
-      )
+        expect(isFileEmpty(paths.pathToSolBinOutputFile)).toBe(false);
-    ).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)
+        expect(result.output).not.toMatch(/([Ee]rror|[Ww]arning|[Ff]ail)/i);
-  })
+    });
-})
+});
 
 //#1818
-describe('Default run a command from the help', () => {
+describe("Default run a command from the help", () => {
-  const command = `resolc ${paths.pathToBasicSolContract} --overwrite -O3 --bin --asm --output-dir "${paths.pathToOutputDir}"` // potential issue on resolc with full path on Windows cmd
-  const result = executeCommand(command)
 
-  it('Compiler run successful', () => {
+    const command = `resolc ${paths.pathToBasicSolContract} --overwrite -O3 --bin --asm --output-dir "${paths.pathToOutputDir}"`; // potential issue on resolc with full path on Windows cmd
-    expect(result.output).toMatch(/(Compiler run successful.)/i)
+    const result = executeCommand(command);
-  })
+
-  it('Exit code = 0', () => {
+    it("Compiler run successful", () => {
-    expect(result.exitCode).toBe(0)
+        expect(result.output).toMatch(/(Compiler run successful.)/i);
-  })
+    });
-  it('Output dir is created', () => {
+    it("Exit code = 0", () => {
-    expect(isFolderExist(paths.pathToOutputDir)).toBe(true)
+        expect(result.exitCode).toBe(0);
-  })
+    });
-  xit('Output files are created', () => {
+    it("Output dir is created", () => {
-    // a bug on windows
+        expect(isFolderExist(paths.pathToOutputDir)).toBe(true);
-    expect(
+    });
-      isFileExist(
+    xit("Output files are created", () => { // a bug on windows
-        paths.pathToOutputDir,
+        expect(isFileExist(paths.pathToOutputDir, paths.contractSolFilename, paths.binExtension)).toBe(true);
-        paths.contractSolFilename,
+        expect(isFileExist(paths.pathToOutputDir, paths.contractSolFilename, paths.asmExtension)).toBe(true);
-        paths.binExtension
+    });
-      )
+    it("the output files are not empty", () => {
-    ).toBe(true)
+        expect(isFileEmpty(paths.pathToSolBinOutputFile)).toBe(false);
-    expect(
+        expect(isFileEmpty(paths.pathToSolAsmOutputFile)).toBe(false);
-      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)
+        expect(result.output).not.toMatch(/([Ee]rror|[Ww]arning|[Ff]ail)/i);
-  })
+    });
-})
+});
 
-describe('Run resolc with source debug information', () => {
+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}"`,
+        `resolc --disable-solc-optimizer -g ${paths.pathToBasicSolContract} --overwrite --bin --asm --output-dir "${paths.pathToOutputDir}"`
-  ] // potential issue on resolc with full path on Windows cmd`;
+    ]; // potential issue on resolc with full path on Windows cmd`;
 
     for (var idx in commands) {
-    const command = commands[idx]
+        const command = commands[idx];
-    const result = executeCommand(command)
+        const result = executeCommand(command);
 
-    it('Compiler run successful', () => {
+        it("Compiler run successful", () => {
-      expect(result.output).toMatch(/(Compiler run successful.)/i)
+            expect(result.output).toMatch(/(Compiler run successful.)/i);
-    })
+        });
-    it('Exit code = 0', () => {
+        it("Exit code = 0", () => {
-      expect(result.exitCode).toBe(0)
+            expect(result.exitCode).toBe(0);
-    })
+        });
-    it('Output dir is created', () => {
+        it("Output dir is created", () => {
-      expect(isFolderExist(paths.pathToOutputDir)).toBe(true)
+            expect(isFolderExist(paths.pathToOutputDir)).toBe(true);
-    })
+        });
-    it('Output files are created', () => {
+        it("Output files are created", () => { // a bug on windows
-      // a bug on windows
+            expect(isFileExist(paths.pathToOutputDir, paths.contractSolFilename, paths.binExtension)).toBe(true);
-      expect(
+            expect(isFileExist(paths.pathToOutputDir, paths.contractSolFilename, paths.asmExtension)).toBe(true);
-        isFileExist(
+        });
-          paths.pathToOutputDir,
+        it("the output files are not empty", () => {
-          paths.contractSolFilename,
+            expect(isFileEmpty(paths.pathToSolBinOutputFile)).toBe(false);
-          paths.binExtension
+            expect(isFileEmpty(paths.pathToSolAsmOutputFile)).toBe(false);
-        )
+        });
-      ).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)
+            expect(result.output).not.toMatch(/([Ee]rror|[Ff]ail)/i);
-    })
+        });
     }
-})
+});
 
-describe('Run resolc with source debug information, check LLVM debug-info', () => {
+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}"`,
+        `resolc -g --disable-solc-optimizer ${paths.pathToBasicSolContract} --overwrite --debug-output-dir="${paths.pathToOutputDir}"`
-  ] // potential issue on resolc with full path on Windows cmd`;
+    ]; // potential issue on resolc with full path on Windows cmd`;
 
     for (var idx in commands) {
-    const command = commands[idx]
+        const command = commands[idx];
-    const result = executeCommand(command)
+        const result = executeCommand(command);
 
-    it('Compiler run successful', () => {
+        it("Compiler run successful", () => {
-      expect(result.output).toMatch(/(Compiler run successful.)/i)
+            expect(result.output).toMatch(/(Compiler run successful.)/i);
-    })
+        });
-    it('Exit code = 0', () => {
+        it("Exit code = 0", () => {
-      expect(result.exitCode).toBe(0)
+            expect(result.exitCode).toBe(0);
-    })
+        });
-    it('Output dir is created', () => {
+        it("Output dir is created", () => {
-      expect(isFolderExist(paths.pathToOutputDir)).toBe(true)
+            expect(isFolderExist(paths.pathToOutputDir)).toBe(true);
-    })
+        });
-    it('Output files are created', () => {
+        it("Output files are created", () => { // a bug on windows
-      // a bug on windows
+            expect(isFileExist(paths.pathToOutputDir, paths.contractOptimizedLLVMFilename, paths.llvmExtension)).toBe(true);
-      expect(
+            expect(isFileExist(paths.pathToOutputDir, paths.contractUnoptimizedLLVMFilename, paths.llvmExtension)).toBe(true);
-        isFileExist(
+        });
-          paths.pathToOutputDir,
+        it("the output files are not empty", () => {
-          paths.contractOptimizedLLVMFilename,
+            expect(isFileEmpty(paths.pathToSolBinOutputFile)).toBe(false);
-          paths.llvmExtension
+            expect(isFileEmpty(paths.pathToSolAsmOutputFile)).toBe(false);
-        )
+        });
-      ).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)
+            expect(result.output).not.toMatch(/([Ee]rror|[Ff]ail)/i);
-    })
+        });
     }
-})
+});
 
-describe('Standard JSON compilation with path options', () => {
+
-  const contractsDir = path.join(shell.tempdir(), 'contracts-test')
+
-  const inputFile = path.join(__dirname, '..', 'src/contracts/compiled/1.json')
+describe("Standard JSON compilation with path options", () => {
+    const contractsDir = path.join(shell.tempdir(), 'contracts-test');
+    const inputFile = path.join(__dirname, '..', 'src/contracts/compiled/1.json');
 
     beforeAll(() => {
-    shell.mkdir('-p', contractsDir)
+        shell.mkdir('-p', contractsDir);
 
-    const input = JSON.parse(shell.cat(inputFile).toString())
+        const input = JSON.parse(shell.cat(inputFile).toString());
 
-    Object.entries(input.sources).forEach(
+        Object.entries(input.sources).forEach(([sourcePath, source]: [string, any]) => {
-      ([sourcePath, source]: [string, any]) => {
+            const filePath = path.join(contractsDir, sourcePath);
-        const filePath = path.join(contractsDir, sourcePath)
+            shell.mkdir('-p', path.dirname(filePath));
-        shell.mkdir('-p', path.dirname(filePath))
+            shell.ShellString(source.content).to(filePath);
-        shell.ShellString(source.content).to(filePath)
+        });
-      }
+    });
-    )
-  })
 
     afterAll(() => {
-    shell.rm('-rf', contractsDir)
+        shell.rm('-rf', contractsDir);
-  })
+    });
 
-  describe('Output with all path options', () => {
+    describe("Output with all path options", () => {
-    let result: { exitCode: number; output: string }
+        let result: { exitCode: number; output: string };
 
         beforeAll(() => {
-      const tempInputFile = path.join(contractsDir, 'temp-input.json')
+            const tempInputFile = path.join(contractsDir, 'temp-input.json');
-      shell.cp(inputFile, tempInputFile)
+            shell.cp(inputFile, tempInputFile);
-      const inputContent = shell.cat(inputFile).toString()
+            const inputContent = shell.cat(inputFile).toString();
 
-      const command = `resolc --standard-json --base-path "${contractsDir}" --include-path "${contractsDir}" --allow-paths "${contractsDir}"`
+            const command = `resolc --standard-json --base-path "${contractsDir}" --include-path "${contractsDir}" --allow-paths "${contractsDir}"`;
 
-      result = executeCommand(command, inputContent)
+            result = executeCommand(command, inputContent);
 
-      shell.rm(tempInputFile)
+            shell.rm(tempInputFile);
-    })
 
-    it('Compiler run successful without emiting warnings', () => {
+        });
+
+        it("Compiler run successful without emiting warnings", () => {
             const parsedResults = JSON.parse(result.output)
-      expect(
+            expect(parsedResults.errors.filter((error: { type: string; }) => error.type != 'Warning')).toEqual([]);
-        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 {executeCommand} from "../src/helper";
-import { paths } from '../src/entities'
+import { paths } from '../src/entities';
+
 
 //id1743
-describe('Run with --yul by default', () => {
+describe("Run with --yul by default", () => {
-  const command = `resolc ${paths.pathToBasicYulContract} --yul`
+  const command = `resolc ${paths.pathToBasicYulContract} --yul`;
-  const result = executeCommand(command)
+  const result = executeCommand(command);
-  const commandInvalid = 'resolc --yul'
+  const commandInvalid = 'resolc --yul';
-  const resultInvalid = executeCommand(commandInvalid)
+  const resultInvalid = executeCommand(commandInvalid);
 
-  it('Valid command exit code = 0', () => {
+  it("Valid command exit code = 0", () => {
-    expect(result.exitCode).toBe(0)
+    expect(result.exitCode).toBe(0);
-  })
+  });
 
-  it('--yul output is presented', () => {
+  it("--yul output is presented", () => {
-    expect(result.output).toMatch(/(Compiler run successful)/i)
+    expect(result.output).toMatch(/(Compiler run successful)/i);
-    expect(result.output).toMatch(/(No output requested)/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', () => {
+  xit("solc exit code == resolc exit code", () => { // unknown solc issue for datatype of the contract
-    expect(resultInvalid.output).toMatch(/(The input file is missing)/i)
+      const command = `solc ${paths.pathToBasicSolContract} --yul`;
-  })
+      const solcResult = executeCommand(command);
-  it('Invalid command exit code = 1', () => {
+      expect(solcResult.exitCode).toBe(result.exitCode);
-    expect(resultInvalid.exitCode).toBe(1)
+  });
-  })
 
-  it('Invalid solc exit code == Invalid resolc exit code', () => {
+  it("run invalid: resolc --yul", () => {
-    const command = 'solc --yul'
+    expect(resultInvalid.output).toMatch(/(The input file is missing)/i);
-    const solcResult = executeCommand(command)
+  });
-    expect(solcResult.exitCode).toBe(resultInvalid.exitCode)
+  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 { executeCommand } from "../src/helper";
-import { paths } from '../src/entities'
+import { paths } from '../src/entities';
 
-describe('Set of --combined-json tests', () => {
+
-  const zksolcCommand = 'zksolc'
+describe("Set of --combined-json tests", () => {
-  const solcCommand = 'solc'
+    const zksolcCommand = 'zksolc';
-  const json_args: string[] = [
+    const solcCommand = 'solc';
-    `abi`,
+    const json_args: string[] = [`abi`, `hashes`, `metadata`, `devdoc`, `userdoc`, `storage-layout`, `ast`, `asm`, `bin`, `bin-runtime`];
-    `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 args = [`--combined-json`];
-    const result = executeCommand(zksolcCommand, args)
+        const result = executeCommand(zksolcCommand, args);
 
-    it('Valid command exit code = 1', () => {
+        it("Valid command exit code = 1", () => {
-      expect(result.exitCode).toBe(1)
+            expect(result.exitCode).toBe(1);
-    })
+        });
 
-    it('--combined-json error is presented', () => {
+        it("--combined-json error is presented", () => {
-      expect(result.output).toMatch(/(requires a value but none was supplied)/i)
+            expect(result.output).toMatch(/(requires a value but none was supplied)/i);
-    })
+        });
 
-    it('solc exit code == zksolc exit code', () => {
+        it("solc exit code == zksolc exit code", () => {
-      const solcResult = executeCommand(solcCommand, args)
+            const solcResult = executeCommand(solcCommand, args);
-      expect(solcResult.exitCode).toBe(result.exitCode)
+            expect(solcResult.exitCode).toBe(result.exitCode);
-    })
+        });
-  })
+    });
 
     //id1742:II
     describe(`Run ${zksolcCommand} with Sol contract and --combined-json`, () => {
-    const args = [`${paths.pathToBasicSolContract}`, `--combined-json`]
+        const args = [`${paths.pathToBasicSolContract}`, `--combined-json`];
-    const result = executeCommand(zksolcCommand, args)
+        const result = executeCommand(zksolcCommand, args);
 
-    it('Valid command exit code = 1', () => {
+        it("Valid command exit code = 1", () => {
-      expect(result.exitCode).toBe(1)
+            expect(result.exitCode).toBe(1);
-    })
+        });
 
-    it('--combined-json error is presented', () => {
+        it("--combined-json error is presented", () => {
-      expect(result.output).toMatch(/(requires a value but none was supplied)/i)
+            expect(result.output).toMatch(/(requires a value but none was supplied)/i);
-    })
+        });
 
-    it('solc exit code == zksolc exit code', () => {
+        it("solc exit code == zksolc exit code", () => {
-      const solcResult = executeCommand(solcCommand, args)
+            const solcResult = executeCommand(solcCommand, args);
-      expect(solcResult.exitCode).toBe(result.exitCode)
+            expect(solcResult.exitCode).toBe(result.exitCode);
-    })
+        });
-  })
+    });
 
     //id1742:III
     for (let i = 0; i < json_args.length; i++) {
         describe(`Run ${zksolcCommand} with Sol, --combined-json and ARG: ${json_args[i]}`, () => {
-      const args = [
+            const args = [`${paths.pathToBasicSolContract}`, `--combined-json`, `${json_args[i]}`];
-        `${paths.pathToBasicSolContract}`,
+            const result = executeCommand(zksolcCommand, args);
-        `--combined-json`,
-        `${json_args[i]}`,
-      ]
-      const result = executeCommand(zksolcCommand, args)
 
-      it('Valid command exit code = 0', () => {
+            it("Valid command exit code = 0", () => {
-        expect(result.exitCode).toBe(0)
+                expect(result.exitCode).toBe(0);
-      })
+            });
 
-      it('--combined-json error is presented', () => {
+            it("--combined-json error is presented", () => {
-        expect(result.output).toMatch(/(contracts)/i)
+                expect(result.output).toMatch(/(contracts)/i);
-      })
+            });
 
-      it('solc exit code == zksolc exit code', () => {
+            it("solc exit code == zksolc exit code", () => {
-        const solcResult = executeCommand(solcCommand, args)
+                const solcResult = executeCommand(solcCommand, args);
-        expect(solcResult.exitCode).toBe(result.exitCode)
+                expect(solcResult.exitCode).toBe(result.exitCode);
-      })
+            });
-    })
+        });
     }
 
     //id1829:I
     for (let i = 0; i < json_args.length; i++) {
         describe(`Run ${zksolcCommand} with Sol, --combined-json and wrong ARG: --${json_args[i]}`, () => {
-      const args = [
+            const args = [`${paths.pathToBasicSolContract}`, `--combined-json`, `--${json_args[i]}`];
-        `${paths.pathToBasicSolContract}`,
+            const result = executeCommand(zksolcCommand, args);
-        `--combined-json`,
-        `--${json_args[i]}`,
-      ]
-      const result = executeCommand(zksolcCommand, args)
 
-      it('Valid command exit code = 1', () => {
+            it("Valid command exit code = 1", () => {
-        expect(result.exitCode).toBe(1)
+                expect(result.exitCode).toBe(1);
-      })
+            });
 
-      it('--combined-json error is presented', () => {
+            it("--combined-json error is presented", () => {
-        expect(result.output).toMatch(/(Invalid option|error)/i)
+                expect(result.output).toMatch(/(Invalid option|error)/i);
-      })
+            });
 
-      it('solc exit code == zksolc exit code', () => {
+            it("solc exit code == zksolc exit code", () => {
-        const solcResult = executeCommand(solcCommand, args)
+                const solcResult = executeCommand(solcCommand, args);
-        expect(solcResult.exitCode).toBe(result.exitCode)
+                expect(solcResult.exitCode).toBe(result.exitCode);
-      })
+            });
-    })
+        });
     }
 
     //id1829:II
     for (let i = 0; i < json_args.length; i++) {
         describe(`Run ${zksolcCommand} with Sol, --combined-json and multiple ARG: ${json_args[i]} ${json_args[i]}`, () => {
-      const args = [
+            const args = [`${paths.pathToBasicSolContract}`, `--combined-json`, `${json_args[i]}`, `${json_args[i]}`];
-        `${paths.pathToBasicSolContract}`,
+            const result = executeCommand(zksolcCommand, args);
-        `--combined-json`,
-        `${json_args[i]}`,
-        `${json_args[i]}`,
-      ]
-      const result = executeCommand(zksolcCommand, args)
 
-      xit('Valid command exit code = 1', () => {
+            xit("Valid command exit code = 1", () => {
-        expect(result.exitCode).toBe(1)
+                expect(result.exitCode).toBe(1);
-      })
+            });
 
-      it('--combined-json error is presented', () => {
+            it("--combined-json error is presented", () => {
-        expect(result.output).toMatch(
+                expect(result.output).toMatch(/(No such file or directory|cannot find the file specified)/i); // Hopefully we should have more precise message here!
-          /(No such file or directory|cannot find the file specified)/i
+            });
-        ) // Hopefully we should have more precise message here!
-      })
 
-      xit('solc exit code == zksolc exit code', () => {
+            xit("solc exit code == zksolc exit code", () => {
-        const solcResult = executeCommand(solcCommand, args)
+                const solcResult = executeCommand(solcCommand, args);
-        expect(solcResult.exitCode).toBe(result.exitCode)
+                expect(solcResult.exitCode).toBe(result.exitCode);
-      })
+            });
-    })
+        });
     }
 
     //id1829:III
     for (let i = 0; i < json_args.length; i++) {
         describe(`Run ${zksolcCommand} with Sol, and multiple (--combined-json ${json_args[i]})`, () => {
-      const args = [
+            const args = [`${paths.pathToBasicSolContract}`, `--combined-json`, `${json_args[i]}`, `--combined-json`, `${json_args[i]}`];
-        `${paths.pathToBasicSolContract}`,
+            const result = executeCommand(zksolcCommand, args);
-        `--combined-json`,
-        `${json_args[i]}`,
-        `--combined-json`,
-        `${json_args[i]}`,
-      ]
-      const result = executeCommand(zksolcCommand, args)
 
-      it('Valid command exit code = 1', () => {
+            it("Valid command exit code = 1", () => {
-        expect(result.exitCode).toBe(1)
+                expect(result.exitCode).toBe(1);
-      })
+            });
 
-      it('--combined-json error is presented', () => {
+            it("--combined-json error is presented", () => {
-        expect(result.output).toMatch(/(cannot be used multiple times)/i)
+                expect(result.output).toMatch(/(cannot be used multiple times)/i);
-      })
+            });
 
-      it('solc exit code == zksolc exit code', () => {
+            it("solc exit code == zksolc exit code", () => {
-        const solcResult = executeCommand(solcCommand, args)
+                const solcResult = executeCommand(solcCommand, args);
-        expect(solcResult.exitCode).toBe(result.exitCode)
+                expect(solcResult.exitCode).toBe(result.exitCode);
-      })
+            });
-    })
+        });
     }
 
     //id1830
     for (let i = 0; i < json_args.length; i++) {
         describe(`Run ${zksolcCommand} with Yul, and --combined-json ${json_args[i]}`, () => {
-      const args = [
+            const args = [`${paths.pathToBasicYulContract}`, `--combined-json`, `${json_args[i]}`];
-        `${paths.pathToBasicYulContract}`,
+            const result = executeCommand(zksolcCommand, args);
-        `--combined-json`,
-        `${json_args[i]}`,
-      ]
-      const result = executeCommand(zksolcCommand, args)
 
-      it('Valid command exit code = 1', () => {
+            it("Valid command exit code = 1", () => {
-        expect(result.exitCode).toBe(1)
+                expect(result.exitCode).toBe(1);
-      })
+            });
 
-      it('--combined-json error is presented', () => {
+            it("--combined-json error is presented", () => {
-        expect(result.output).toMatch(/(ParserError: Expected identifier)/i)
+                expect(result.output).toMatch(/(ParserError: Expected identifier)/i);
-      })
+            });
             asd
 
-      it('solc exit code == zksolc exit code', () => {
+            it("solc exit code == zksolc exit code", () => {
-        const solcResult = executeCommand(solcCommand, args)
+                const solcResult = executeCommand(solcCommand, args);
-        expect(solcResult.exitCode).toBe(result.exitCode)
+                expect(solcResult.exitCode).toBe(result.exitCode);
-      })
+            });
-    })
+        });
     }
-})
+});

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

@@ -121,11 +121,6 @@ where
     ) -> anyhow::Result<()> {
         context.set_debug_location(self.location.line, 0, None)?;
 
-        let value = match self.initializer.into_llvm(context)? {
-            Some(value) => value,
-            None => return Ok(()),
-        };
-
         if self.bindings.len() == 1 {
             let identifier = self.bindings.remove(0);
             let pointer = context
@@ -139,10 +134,27 @@ where
                         identifier.inner,
                     )
                 })?;
+
+            let mut assignment_pointer = Some(pointer.value);
+            let value = match self
+                .initializer
+                .into_llvm(context, &mut assignment_pointer)?
+            {
+                Some(value) => value,
+                None => return Ok(()),
+            };
+
+            if assignment_pointer.is_some() {
                 context.build_store(pointer, value.access(context)?)?;
+            }
+
             return Ok(());
         }
 
+        let value = match self.initializer.into_llvm(context, &mut None)? {
+            Some(value) => value,
+            None => return Ok(()),
+        };
         let value = value.access(context)?;
         let llvm_type = value.into_struct_value().get_type();
         let tuple_pointer = context.build_alloca(llvm_type, "assignment_pointer");

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

@@ -184,7 +184,7 @@ where
                     block.into_llvm(context)?;
                 }
                 Statement::Expression(expression) => {
-                    expression.into_llvm(context)?;
+                    expression.into_llvm(context, &mut None)?;
                 }
                 Statement::VariableDeclaration(statement) => statement.into_llvm(context)?,
                 Statement::Assignment(statement) => statement.into_llvm(context)?,

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

@@ -118,6 +118,7 @@ impl FunctionCall {
     pub fn into_llvm<'ctx, D>(
         mut self,
         context: &mut revive_llvm_context::PolkaVMContext<'ctx, D>,
+        assignment_pointer: &mut Option<inkwell::values::PointerValue<'ctx>>,
     ) -> anyhow::Result<Option<inkwell::values::BasicValueEnum<'ctx>>>
     where
         D: revive_llvm_context::PolkaVMDependency + Clone,
@@ -129,7 +130,7 @@ impl FunctionCall {
                 let mut values = Vec::with_capacity(self.arguments.len());
                 for argument in self.arguments.into_iter().rev() {
                     let value = argument
-                        .into_llvm(context)?
+                        .into_llvm(context, &mut None)?
                         .expect("Always exists")
                         .access(context)?;
                     values.push(value);
@@ -416,8 +417,8 @@ impl FunctionCall {
                 revive_llvm_context::polkavm_evm_memory::load(
                     context,
                     arguments[0].into_int_value(),
+                    assignment_pointer,
                 )
-                .map(Some)
             }
             Name::MStore => {
                 let arguments = self.pop_arguments_llvm::<D, 2>(context)?;
@@ -465,7 +466,11 @@ impl FunctionCall {
 
             Name::SLoad => {
                 let arguments = self.pop_arguments::<D, 1>(context)?;
-                revive_llvm_context::polkavm_evm_storage::load(context, &arguments[0]).map(Some)
+                revive_llvm_context::polkavm_evm_storage::load(
+                    context,
+                    &arguments[0],
+                    assignment_pointer,
+                )
             }
             Name::SStore => {
                 let arguments = self.pop_arguments::<D, 2>(context)?;
@@ -989,7 +994,7 @@ impl FunctionCall {
         for expression in self.arguments.drain(0..N).rev() {
             arguments.push(
                 expression
-                    .into_llvm(context)?
+                    .into_llvm(context, &mut None)?
                     .expect("Always exists")
                     .access(context)?,
             );
@@ -1009,7 +1014,11 @@ 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"));
+            arguments.push(
+                expression
+                    .into_llvm(context, &mut None)?
+                    .expect("Always exists"),
+            );
         }
         arguments.reverse();
 

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

@@ -101,6 +101,7 @@ impl Expression {
     pub fn into_llvm<'ctx, D>(
         self,
         context: &mut revive_llvm_context::PolkaVMContext<'ctx, D>,
+        assignment_pointer: &mut Option<inkwell::values::PointerValue<'ctx>>,
     ) -> anyhow::Result<Option<revive_llvm_context::PolkaVMArgument<'ctx>>>
     where
         D: revive_llvm_context::PolkaVMDependency + Clone,
@@ -139,7 +140,7 @@ impl Expression {
                 }))
             }
             Self::FunctionCall(call) => Ok(call
-                .into_llvm(context)?
+                .into_llvm(context, assignment_pointer)?
                 .map(revive_llvm_context::PolkaVMArgument::value)),
         }
     }

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

@@ -76,7 +76,7 @@ where
         context.set_basic_block(condition_block);
         let condition = self
             .condition
-            .into_llvm(context)?
+            .into_llvm(context, &mut None)?
             .expect("Always exists")
             .access(context)?
             .into_int_value();

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

@@ -55,7 +55,7 @@ where
     fn into_llvm(self, context: &mut revive_llvm_context::PolkaVMContext<D>) -> anyhow::Result<()> {
         let condition = self
             .condition
-            .into_llvm(context)?
+            .into_llvm(context, &mut None)?
             .expect("Always exists")
             .access(context)?
             .into_int_value();

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

@@ -123,7 +123,7 @@ where
     D: revive_llvm_context::PolkaVMDependency + Clone,
 {
     fn into_llvm(self, context: &mut revive_llvm_context::PolkaVMContext<D>) -> anyhow::Result<()> {
-        let scrutinee = self.expression.into_llvm(context)?;
+        let scrutinee = self.expression.into_llvm(context, &mut None)?;
 
         if self.cases.is_empty() {
             if let Some(block) = self.default {

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

@@ -110,8 +110,9 @@ where
                 .borrow_mut()
                 .insert_stack_pointer(identifier.inner.clone(), pointer);
 
+            let mut assignment_pointer = Some(pointer.value);
             let value = if let Some(expression) = self.expression {
-                match expression.into_llvm(context)? {
+                match expression.into_llvm(context, &mut assignment_pointer)? {
                     Some(mut value) => {
                         if let Some(constant) = value.constant.take() {
                             context
@@ -128,7 +129,9 @@ where
             } else {
                 r#type.const_zero().as_basic_value_enum()
             };
+            if assignment_pointer.is_some() {
                 context.build_store(pointer, value)?;
+            }
             return Ok(());
         }
 
@@ -156,7 +159,7 @@ where
             None => return Ok(()),
         };
         let location = expression.location();
-        let expression = match expression.into_llvm(context)? {
+        let expression = match expression.into_llvm(context, &mut None)? {
             Some(expression) => expression,
             None => return Ok(()),
         };

crates/stdlib/Cargo.toml

@@ -7,7 +7,7 @@ repository.workspace = true
 description = "revive compiler stdlib components"
 
 [dependencies]
-inkwell = { workspace = true, features = ["target-riscv", "no-libffi-linking", "llvm18-1"] }
+inkwell = { workspace = true, features = ["target-riscv", "no-libffi-linking", "llvm18-0"] }
 
 [build-dependencies]
 revive-build-utils = { workspace = true }

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

@@ -3,12 +3,12 @@ const path = require("path");
 const { minify } = require("terser");
 
 const SOLJSON_URI =
-  "https://binaries.soliditylang.org/wasm/soljson-v0.8.30+commit.73712a01.js";
+  "https://binaries.soliditylang.org/wasm/soljson-v0.8.29+commit.ab55807c.js";
 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"
+        ]
       }
     }
   }