update emsdk

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/embed/soljson_interface.js",
-    "-Clink-arg=--pre-js=js/embed/pre.js",
+    "-Clink-arg=--js-library=js/emscripten/embed/soljson_interface.js",
+    "-Clink-arg=--pre-js=js/emscripten/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: "3.1.64"
+    default: "4.0.9"
 
 
 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.29/${SOLC_NAME}
+        curl -sSL --output solc/solc https://github.com/ethereum/solidity/releases/download/v0.8.30/${SOLC_NAME}
 
     - name: Make Solc Executable
       if: ${{ runner.os == 'Windows' }}

.github/workflows/release-llvm.yml

@@ -87,6 +87,11 @@ 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:68b86bc7cb2867259e6b233415a665ff4469c28b57763e78c3bfea1c68091561
+  RUST_MUSL_CROSS_IMAGE: messense/rust-musl-cross@sha256:c0154e992adb791c3b848dd008939d19862549204f8cb26f5ca7a00f629e6067
 
 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.29/soljson.js
+          curl -sSLo solc/soljson.js https://github.com/ethereum/solidity/releases/download/v0.8.30/soljson.js
           node -e "
           const soljson = require('solc/soljson');
           const createRevive = require('./target/wasm32-unknown-emscripten/release/resolc.js');
@@ -286,3 +286,43 @@ 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,13 +86,18 @@ jobs:
       - name: Install Node Packages
         run: npm install
 
-      - name: Run Playwright tests
-        run: |
-          cd js
-          npx playwright install --with-deps
-          npx playwright test
-
-      - name: Test revive
+      - name: Test emscripten
         run: |
           echo "Running tests for ${{ matrix.os }}"
           npm run test:wasm
+
+      - name: Test @parity/resolc
+        run: |
+          echo "Running tests for ${{ matrix.os }}"
+          npm run -w js/resolc test
+
+      - name: Run Playwright tests
+        run: |
+          cd js/emscripten
+          npx playwright install --with-deps
+          npx playwright test

.gitignore

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

.prettierrc.json

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

CHANGELOG.md

@@ -4,13 +4,62 @@
 
 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
+
+## 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
@@ -20,16 +69,19 @@ 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
@@ -39,10 +91,12 @@ This is a development pre-release.
 Supported `polkadot-sdk` rev: `21f6f0705e53c15aa2b8a5706b208200447774a9`
 
 ### Added
+
 - Per file output selection for `--standard-json` mode.
 - The `ir` output selection option for `--standard-json` mode.
 
 ### Changed
+
 - Improved code size: Large contracts compile to smaller code blobs when enabling aggressive size optimizations (`-Oz`).
 
 ### Fixed
@@ -58,6 +112,7 @@ Supported `polkadot-sdk` rev: `274a781e8ca1a9432c7ec87593bd93214abbff50`
 ### Changed
 
 ### Fixed
+
 - A bug causing incorrect loads from the emulated EVM linear memory.
 - A missing integer truncate after switching to 64bit.
 
@@ -68,10 +123,12 @@ This is a development pre-release.
 Supported `polkadot-sdk` rev: `274a781e8ca1a9432c7ec87593bd93214abbff50`
 
 ### Added
+
 - Support for the `coinbase` opcode.
 - The resolc web JS version.
 
 ### Changed
+
 - Missing the `--overwrite` flag emits an error instead of a warning.
 - The `resolc` executable prints the help by default.
 - Removed support for legacy EVM assembly (EVMLA) translation.
@@ -81,6 +138,7 @@ Supported `polkadot-sdk` rev: `274a781e8ca1a9432c7ec87593bd93214abbff50`
   If detected, the re-entrant call flag is not set and 0 deposit limit is endowed.
 
 ### Fixed
+
 - Solidity: Add the solc `--libraries` files to sources.
 - A data race in tests.
 - Fix `broken pipe` errors.
@@ -94,9 +152,11 @@ This is a development pre-release.
 ### Added
 
 ### Changed
+
 - Syscalls with more than 6 arguments now pack them into registers.
 
 ### Fixed
+
 - Remove reloading of the resolc.js file (fix issue with relative path in web worker)
 
 ## v0.1.0-dev.8
@@ -104,15 +164,18 @@ This is a development pre-release.
 This is a development pre-release.
 
 ### Added
+
 - The `revive-llvm-builder` crate with the `revive-llvm` helper utility for streamlined management of the LLVM framework dependency.
 - Initial support for running `resolc` in the browser.
 
 ### Changed
+
 - Suported contracts runtime is polkadot-sdk git version `d62a90c8c729acd98c7e9a5cab9803b8b211ffc5`.
 - The minimum supported Rust version is `1.81.0`.
 - Error out early instead of invoking `solc` with invalid base or include path flags.
 
 ### Fixed
+
 - Decouple the LLVM target dependency from the LLVM host dependency.
 - Do not error out if no files and no errors were produced. This aligns resolc closer to solc.
 - Fixes input normalization in the Wasm version.
@@ -122,17 +185,20 @@ This is a development pre-release.
 This is a development pre-release.
 
 ### Added
+
 - Implement the `GASPRICE` opcode.
 - Implement the `BASEFEE` opcode.
 - Implement the `GASLIMIT` opcode.
 
 ### Changed
+
 - The `GAS` opcode now returns the remaining `ref_time`.
 - Contracts can now be supplied call data input of arbitrary size.
-- Some syscalls now return the value in a register, slightly improving  emitted contract code.
+- Some syscalls now return the value in a register, slightly improving emitted contract code.
 - Calls forward maximum weight limits instead of 0, anticipating a change in polkadot-sdk where weight limits of 0 no longer interprets as uncapped limit.
 
 ### Fixed
+
 - A linker bug which was preventing certain contracts from linking with the PVM linker.
 - JS: Fix encoding conversion from JS string (UTF-16) to UTF-8.
 - The git commit hash slug is always displayed in the version string.
@@ -142,6 +208,7 @@ This is a development pre-release.
 This is a development pre-release.
 
 # Added
+
 - Implement the `BLOCKHASH` opcode.
 - Implement delegate calls.
 - Implement the `GASPRICE` opcode. Currently hard-coded to return `1`.
@@ -149,21 +216,24 @@ This is a development pre-release.
 - Initial support for emitting debug info (opt in via the `-g` flag)
 
 # Changed
+
 - resolc now emits 64bit PolkaVM blobs, reducing contract code size and execution time.
 - The RISC-V bit-manipulation target feature (`zbb`) is enabled.
 
 # Fixed
-- Compilation to Wasm (for usage in node and web browsers)
 
+- Compilation to Wasm (for usage in node and web browsers)
 
 ## v0.1.0-dev.5
 
 This is development pre-release.
 
 # Added
+
 - Implement the `CODESIZE` and `EXTCODESIZE` opcodes.
 
 # Changed
+
 - Include the full revive version in the contract metadata.
 
 # Fixed
@@ -173,9 +243,11 @@ This is development pre-release.
 This is development pre-release.
 
 # Added
+
 - Support the `ORIGIN` opcode.
 
 # Changed
+
 - Update polkavm to `v0.14.0`.
 - Enable the `a`, `fast-unaligned-access` and `xtheadcondmov` LLVM target features, decreasing the code size for some contracts.
 

Cargo.toml

@@ -3,7 +3,7 @@ resolver = "2"
 members = ["crates/*"]
 
 [workspace.package]
-version = "0.1.0-dev.13"
+version = "0.1.0-dev.16"
 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.81.0"
+rust-version = "1.85.0"
 
 [workspace.dependencies]
-revive-benchmarks = { version = "0.1.0-dev.13", path = "crates/benchmarks" }
-revive-builtins = { version = "0.1.0-dev.13", path = "crates/builtins" }
-revive-common = { version = "0.1.0-dev.13", path = "crates/common" }
-revive-differential = { version = "0.1.0-dev.13", path = "crates/differential" }
-revive-integration = { version = "0.1.0-dev.13", path = "crates/integration" }
-revive-linker = { version = "0.1.0-dev.13", path = "crates/linker" }
-lld-sys = { version = "0.1.0-dev.13", path = "crates/lld-sys" }
-revive-llvm-context = { version = "0.1.0-dev.13", path = "crates/llvm-context" }
-revive-runtime-api = { version = "0.1.0-dev.13", path = "crates/runtime-api" }
-revive-runner = { version = "0.1.0-dev.13", path = "crates/runner" }
-revive-solc-json-interface = { version = "0.1.0-dev.13", path = "crates/solc-json-interface" }
-revive-solidity = { version = "0.1.0-dev.13", path = "crates/solidity" }
-revive-stdlib = { version = "0.1.0-dev.13", path = "crates/stdlib" }
-revive-build-utils = { version = "0.1.0-dev.13", path = "crates/build-utils" }
+revive-benchmarks = { version = "0.1.0-dev.16", path = "crates/benchmarks" }
+revive-builtins = { version = "0.1.0-dev.16", path = "crates/builtins" }
+revive-common = { version = "0.1.0-dev.16", path = "crates/common" }
+revive-differential = { version = "0.1.0-dev.16", path = "crates/differential" }
+revive-integration = { version = "0.1.0-dev.16", path = "crates/integration" }
+revive-linker = { version = "0.1.0-dev.16", path = "crates/linker" }
+lld-sys = { version = "0.1.0-dev.16", path = "crates/lld-sys" }
+revive-llvm-context = { version = "0.1.0-dev.16", path = "crates/llvm-context" }
+revive-runtime-api = { version = "0.1.0-dev.16", path = "crates/runtime-api" }
+revive-runner = { version = "0.1.0-dev.16", path = "crates/runner" }
+revive-solc-json-interface = { version = "0.1.0-dev.16", path = "crates/solc-json-interface" }
+revive-solidity = { version = "0.1.0-dev.16", path = "crates/solidity" }
+revive-stdlib = { version = "0.1.0-dev.16", path = "crates/stdlib" }
+revive-build-utils = { version = "0.1.0-dev.16", path = "crates/build-utils" }
 
 hex = "0.4.3"
 cc = "1.2"
-libc = "0.2.169"
+libc = "0.2.172"
 tempfile = "3.17"
 anyhow = "1.0"
 semver = { version = "1.0", features = ["serde"] }
@@ -73,14 +73,13 @@ 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 = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c29e72a8628835e34deb6aa7db9a78a2e4eabcee" }
+polkadot-sdk = { version = "2503.0.1" }
 
 # llvm
 [workspace.dependencies.inkwell]
-git = "https://github.com/TheDan64/inkwell.git"
-rev = "7b410298b6a93450adaa90b1841d5805a3038f12"
+version = "0.6.0"
 default-features = false
-features = ["serde", "llvm18-0", "no-libffi-linking", "target-riscv"]
+features = ["serde", "llvm18-1", "no-libffi-linking", "target-riscv"]
 
 [profile.bench]
 inherits = "release"

Dockerfile

@@ -1,4 +1,4 @@
-FROM rust:1.84.0 AS llvm-builder
+FROM rust:1.85.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:68b86bc7cb2867259e6b233415a665ff4469c28b57763e78c3bfea1c68091561 AS resolc-builder
+FROM messense/rust-musl-cross@sha256:c0154e992adb791c3b848dd008939d19862549204f8cb26f5ca7a00f629e6067 AS resolc-builder
 WORKDIR /opt/revive
 
 RUN apt update && \ 

Makefile

@@ -5,6 +5,7 @@
 	install-wasm \
 	install-llvm-builder \
 	install-llvm \
+	install-revive-runner \
 	format \
 	clippy \
 	machete \
@@ -39,6 +40,9 @@ install-llvm: install-llvm-builder
 	revive-llvm clone
 	revive-llvm build --llvm-projects lld --llvm-projects clang
 
+install-revive-runner:
+	cargo install --path crates/runner --no-default-features --locked
+
 format:
 	cargo fmt --all --check
 
@@ -49,7 +53,7 @@ machete:
 	cargo install cargo-machete
 	cargo machete
 
-test: format clippy machete test-cli test-workspace
+test: format clippy machete test-cli test-workspace install-revive-runner
 
 test-integration: install-bin
 	cargo test --package revive-integration
@@ -88,7 +92,4 @@ clean:
 	rm -rf node_modules ; \
 	rm -rf crates/solidity/src/tests/cli-tests/artifacts ; \
 	cargo uninstall revive-solidity ; \
-	cargo uninstall revive-llvm-builder ; \
-	rm -f package-lock.json ; \
-	rm -rf js/dist ; \
-	rm -f js/src/resolc.{wasm,js}
+	cargo uninstall revive-llvm-builder ;

RELEASE.md

@@ -13,6 +13,10 @@ 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

@@ -1,30 +0,0 @@
-# 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": 950,
-  "Computation": 2222,
-  "DivisionArithmetics": 8802,
-  "ERC20": 17602,
-  "Events": 1628,
-  "FibonacciIterative": 1485,
-  "Flipper": 2082,
-  "SHA1": 8230
+  "Baseline": 939,
+  "Computation": 2282,
+  "DivisionArithmetics": 8849,
+  "ERC20": 18308,
+  "Events": 1640,
+  "FibonacciIterative": 1497,
+  "Flipper": 2099,
+  "SHA1": 8243
 }

crates/llvm-builder/src/builtins.rs

@@ -117,13 +117,7 @@ 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"
-    };
+    crate::utils::check_presence("ninja")?;
 
     let llvm_module_compiler_rt = crate::LLVMPath::llvm_module_compiler_rt()?;
     let llvm_compiler_rt_build = crate::LLVMPath::llvm_build_compiler_rt()?;
@@ -136,7 +130,7 @@ pub fn build(
                 "-B",
                 llvm_compiler_rt_build.to_string_lossy().as_ref(),
                 "-G",
-                generator,
+                "Ninja",
             ])
             .args(CMAKE_STATIC_ARGS)
             .args(cmake_dynamic_args(build_type, target_env)?)

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 = "3.1.64";
+pub const EMSDK_VERSION: &str = "4.0.9";
 
 /// The subprocess runner.
 ///

crates/llvm-context/src/lib.rs

@@ -28,6 +28,7 @@ pub use self::polkavm::context::function::runtime::entry::Entry as PolkaVMEntryF
 pub use self::polkavm::context::function::runtime::revive::Exit as PolkaVMExitFunction;
 pub use self::polkavm::context::function::runtime::revive::WordToPointer as PolkaVMWordToPointerFunction;
 pub use self::polkavm::context::function::runtime::runtime_code::RuntimeCode as PolkaVMRuntimeCodeFunction;
+pub use self::polkavm::context::function::runtime::sbrk::Sbrk as PolkaVMSbrkFunction;
 pub use self::polkavm::context::function::runtime::FUNCTION_DEPLOY_CODE as PolkaVMFunctionDeployCode;
 pub use self::polkavm::context::function::runtime::FUNCTION_ENTRY as PolkaVMFunctionEntry;
 pub use self::polkavm::context::function::runtime::FUNCTION_RUNTIME_CODE as PolkaVMFunctionRuntimeCode;
@@ -60,7 +61,6 @@ 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::cycles(),
+            None => Self::size(),
         };
         if value.fallback_to_optimizing_for_size.unwrap_or_default() {
             result.enable_fallback_to_size();

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

@@ -9,6 +9,12 @@ 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,6 +31,23 @@ 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,6 +5,7 @@ pub mod deploy_code;
 pub mod entry;
 pub mod revive;
 pub mod runtime_code;
+pub mod sbrk;
 
 /// The main entry function name.
 pub const FUNCTION_ENTRY: &str = "__entry";

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

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

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

@@ -25,6 +25,7 @@ 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;
@@ -33,6 +34,7 @@ use crate::polkavm::Dependency;
 use crate::target_machine::target::Target;
 use crate::target_machine::TargetMachine;
 use crate::PolkaVMLoadHeapWordFunction;
+use crate::PolkaVMSbrkFunction;
 use crate::PolkaVMStoreHeapWordFunction;
 
 use self::address_space::AddressSpace;
@@ -85,6 +87,8 @@ 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
@@ -116,9 +120,6 @@ where
     /// The loop stack default capacity.
     const LOOP_STACK_INITIAL_CAPACITY: usize = 16;
 
-    /// The PolkaVM minimum stack size.
-    const POLKAVM_STACK_SIZE: u32 = 0x4000;
-
     /// Link in the stdlib module.
     fn link_stdlib_module(
         llvm: &'ctx inkwell::context::Context,
@@ -218,6 +219,7 @@ where
     }
 
     /// Initializes a new LLVM context.
+    #[allow(clippy::too_many_arguments)]
     pub fn new(
         llvm: &'ctx inkwell::context::Context,
         module: inkwell::module::Module<'ctx>,
@@ -226,11 +228,12 @@ 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, Self::POLKAVM_STACK_SIZE);
+        Self::set_polkavm_stack_size(llvm, &module, memory_config.stack_size);
         Self::set_module_flags(llvm, &module);
 
         let intrinsics = Intrinsics::new(llvm, &module);
@@ -254,6 +257,7 @@ where
             current_function: None,
             loop_stack: Vec::with_capacity(Self::LOOP_STACK_INITIAL_CAPACITY),
             llvm_arguments,
+            memory_config,
 
             dependency_manager,
             include_metadata_hash,
@@ -644,6 +648,7 @@ where
                     self.include_metadata_hash,
                     self.debug_config.clone(),
                     self.llvm_arguments,
+                    self.memory_config,
                 )
             })
     }
@@ -1084,32 +1089,40 @@ where
         offset: inkwell::values::IntValue<'ctx>,
         size: inkwell::values::IntValue<'ctx>,
     ) -> anyhow::Result<inkwell::values::PointerValue<'ctx>> {
-        Ok(self
-            .builder()
-            .build_call(
-                self.runtime_api_method(revive_runtime_api::polkavm_imports::SBRK),
-                &[offset.into(), size.into()],
-                "call_sbrk",
-            )?
+        let call_site_value = self.builder().build_call(
+            <PolkaVMSbrkFunction as RuntimeFunction<D>>::declaration(self).function_value(),
+            &[offset.into(), size.into()],
+            "alloc_start",
+        )?;
+
+        call_site_value.add_attribute(
+            inkwell::attributes::AttributeLoc::Return,
+            self.llvm
+                .create_enum_attribute(Attribute::NonNull as u32, 0),
+        );
+        call_site_value.add_attribute(
+            inkwell::attributes::AttributeLoc::Return,
+            self.llvm
+                .create_enum_attribute(Attribute::NoUndef as u32, 0),
+        );
+
+        Ok(call_site_value
             .try_as_basic_value()
             .left()
-            .expect("sbrk returns a pointer")
+            .unwrap_or_else(|| {
+                panic!(
+                    "revive runtime function {} should return a value",
+                    <PolkaVMSbrkFunction as RuntimeFunction<D>>::NAME,
+                )
+            })
             .into_pointer_value())
     }
 
     /// Build a call to PolkaVM `msize` for querying the linear memory size.
     pub fn build_msize(&self) -> anyhow::Result<inkwell::values::IntValue<'ctx>> {
-        let memory_size_pointer = self
-            .module()
-            .get_global(revive_runtime_api::polkavm_imports::MEMORY_SIZE)
-            .expect("the memory size symbol should have been declared")
-            .as_pointer_value();
-        let memory_size_value = self.builder().build_load(
-            self.xlen_type(),
-            memory_size_pointer,
-            "memory_size_value",
-        )?;
-        Ok(memory_size_value.into_int_value())
+        Ok(self
+            .get_global_value(crate::polkavm::GLOBAL_HEAP_SIZE)?
+            .into_int_value())
     }
 
     /// Returns a pointer to `offset` into the heap, allocating
@@ -1428,4 +1441,9 @@ where
     pub fn optimizer_settings(&self) -> &OptimizerSettings {
         self.optimizer.settings()
     }
+
+    pub fn heap_size(&self) -> inkwell::values::IntValue<'ctx> {
+        self.xlen_type()
+            .const_int(self.memory_config.heap_size as u64, false)
+    }
 }

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

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

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

@@ -12,6 +12,7 @@ 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;
@@ -90,6 +91,7 @@ pub trait Dependency {
         include_metadata_hash: bool,
         debug_config: DebugConfig,
         llvm_arguments: &[String],
+        memory_config: SolcStandardJsonInputSettingsPolkaVMMemory,
     ) -> anyhow::Result<String>;
 
     /// Resolves a full contract path.
@@ -111,6 +113,7 @@ 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,12 +10,19 @@ description = "Execute revive contracts in a simulated blockchain runtime"
 [package.metadata.cargo-machete]
 ignored = ["codec", "scale-info"]
 
+[[bin]]
+name = "revive-runner"
+path = "src/main.rs"
+
 [features]
 std = ["polkadot-sdk/std"]
 default = ["solidity"]
-solidity = ["revive-solidity", "revive-differential"]
+solidity = ["revive-solidity", "revive-differential", "revive-llvm-context"]
 
 [dependencies]
+env_logger = { workspace = true }
+clap = { workspace = true, features = ["help", "std", "derive"] }
+anyhow = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
 hex = { workspace = true, features = ["serde"] }
@@ -34,4 +41,4 @@ polkadot-sdk.features = [
 
 revive-solidity = { workspace = true, optional = true }
 revive-differential = { workspace = true, optional = true }
-revive-llvm-context = { workspace = true }
+revive-llvm-context = { workspace = true, optional = true }

crates/runner/README.md

@@ -0,0 +1,26 @@
+# 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

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

crates/runner/src/runtime.rs

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

crates/runner/src/specs.rs

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

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-0"] }
+inkwell = { workspace = true, features = ["target-riscv", "no-libffi-linking", "llvm18-1"] }
 
 revive-common = { workspace = true }
 

crates/runtime-api/src/polkavm_imports.c

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

crates/runtime-api/src/polkavm_imports.rs

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

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

@@ -8,6 +8,8 @@ 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,6 +18,7 @@ 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;
@@ -63,6 +64,7 @@ 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)?;
@@ -90,6 +92,7 @@ impl Input {
                 output_selection,
                 optimizer,
                 metadata,
+                polkavm,
             ),
             #[cfg(feature = "resolc")]
             suppressed_warnings,
@@ -109,6 +112,7 @@ 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
@@ -129,6 +133,7 @@ impl Input {
                 output_selection,
                 optimizer,
                 metadata,
+                polkavm,
             ),
             suppressed_warnings,
         })

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

@@ -3,6 +3,7 @@
 pub mod metadata;
 pub mod metadata_hash;
 pub mod optimizer;
+pub mod polkavm;
 pub mod selection;
 
 use std::collections::BTreeMap;
@@ -13,6 +14,7 @@ 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.
@@ -43,6 +45,9 @@ 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 {
@@ -54,6 +59,7 @@ impl Settings {
         output_selection: Selection,
         optimizer: Optimizer,
         metadata: Option<Metadata>,
+        polkavm: Option<PolkaVM>,
     ) -> Self {
         Self {
             evm_version,
@@ -63,6 +69,7 @@ impl Settings {
             optimizer,
             metadata,
             via_ir: Some(true),
+            polkavm,
         }
     }
 

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

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

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

@@ -0,0 +1,26 @@
+//! 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/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-0-no-llvm-linking"]}
+inkwell = { workspace = true, features = ["target-riscv", "llvm18-1-no-llvm-linking"]}
 
 [build-dependencies]
 git2 = { workspace = true, default-features = false }

crates/solidity/src/lib.rs

@@ -45,6 +45,8 @@ 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.
@@ -55,6 +57,7 @@ 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"),
@@ -80,6 +83,7 @@ pub fn yul<T: Compiler>(
         include_metadata_hash,
         debug_config,
         llvm_arguments,
+        memory_config,
     )?;
 
     Ok(build)
@@ -92,6 +96,7 @@ 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"),
@@ -109,6 +114,7 @@ pub fn llvm_ir(
         include_metadata_hash,
         debug_config,
         llvm_arguments,
+        memory_config,
     )?;
 
     Ok(build)
@@ -131,6 +137,7 @@ 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()?;
 
@@ -149,6 +156,10 @@ 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
@@ -189,19 +200,21 @@ 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>,
-    debug_config: revive_llvm_context::DebugConfig,
+    mut debug_config: revive_llvm_context::DebugConfig,
     llvm_arguments: &[String],
 ) -> anyhow::Result<()> {
     let solc_version = solc.version()?;
@@ -216,6 +229,9 @@ 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,
@@ -250,6 +266,7 @@ 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)?;
     }
@@ -277,6 +294,7 @@ 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,
@@ -293,6 +311,7 @@ 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,6 +1,7 @@
 //! Process for compiling a single compilation unit.
 //! The input data.
 
+use revive_solc_json_interface::SolcStandardJsonInputSettingsPolkaVMMemory;
 use serde::Deserialize;
 use serde::Serialize;
 
@@ -22,6 +23,8 @@ 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 {
@@ -33,6 +36,7 @@ impl Input {
         optimizer_settings: revive_llvm_context::OptimizerSettings,
         debug_config: revive_llvm_context::DebugConfig,
         llvm_arguments: Vec<String>,
+        memory_config: SolcStandardJsonInputSettingsPolkaVMMemory,
     ) -> Self {
         Self {
             contract,
@@ -41,6 +45,7 @@ impl Input {
             optimizer_settings,
             debug_config,
             llvm_arguments,
+            memory_config,
         }
     }
 }

crates/solidity/src/process/mod.rs

@@ -50,6 +50,7 @@ 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,6 +5,7 @@ pub mod metadata;
 
 use std::collections::HashSet;
 
+use revive_solc_json_interface::SolcStandardJsonInputSettingsPolkaVMMemory;
 use serde::Deserialize;
 use serde::Serialize;
 use sha3::Digest;
@@ -78,6 +79,7 @@ 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);
@@ -123,6 +125,7 @@ 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,6 +67,7 @@ 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")]
@@ -83,6 +84,7 @@ impl Project {
                     optimizer_settings.clone(),
                     debug_config.clone(),
                     llvm_arguments.to_vec(),
+                    memory_config,
                 );
                 let process_output = {
                     #[cfg(target_os = "emscripten")]
@@ -319,6 +321,7 @@ 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
@@ -339,6 +342,7 @@ 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,9 +167,41 @@ pub struct Arguments {
     #[arg(long = "recursive-process-input")]
     pub recursive_process_input: Option<String>,
 
-    #[arg(long = "llvm-arg")]
     /// These are passed to LLVM as the command line to allow manual control.
+    #[arg(long = "llvm-arg")]
     pub llvm_arguments: Vec<String>,
+
+    /// The emulated EVM linear heap memory static buffer size in bytes.
+    ///
+    /// Unlike the EVM, due to the lack of dynamic memory metering, PVM contracts emulate
+    /// the EVM heap memory with a static buffer. Consequentially, instead of infinite
+    /// memory with exponentially growing gas costs, PVM contracts have a finite amount
+    /// of memory with constant gas costs available.
+    ///
+    /// If the contract uses more heap memory than configured, it will compile fine but
+    /// eventually revert execution at runtime!
+    ///
+    /// You are incentiviced to keep this value as small as possible:
+    /// 1.Increasing the heap size will increase startup costs.
+    /// 2.The heap size contributes to the total memory size a contract can use,
+    ///   which includes the contracts code size
+    #[arg(long = "heap-size")]
+    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 {
@@ -298,6 +330,22 @@ 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::cycles(),
+        None => revive_llvm_context::OptimizerSettings::size(),
     };
     if arguments.fallback_to_optimizing_for_size {
         optimizer_settings.enable_fallback_to_size();
@@ -148,6 +148,15 @@ 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(),
@@ -156,6 +165,7 @@ fn main_inner() -> anyhow::Result<()> {
             include_metadata_hash,
             debug_config,
             &arguments.llvm_arguments,
+            memory_config,
         )
     } else if arguments.llvm_ir {
         revive_solidity::llvm_ir(
@@ -164,6 +174,7 @@ fn main_inner() -> anyhow::Result<()> {
             include_metadata_hash,
             debug_config,
             &arguments.llvm_arguments,
+            memory_config,
         )
     } else if arguments.standard_json {
         revive_solidity::standard_json(
@@ -195,6 +206,7 @@ fn main_inner() -> anyhow::Result<()> {
             arguments.output_directory,
             arguments.overwrite,
             &arguments.llvm_arguments,
+            memory_config,
         )?;
         return Ok(());
     } else {
@@ -213,6 +225,7 @@ 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, 29);
+pub const LAST_SUPPORTED_VERSION: semver::Version = semver::Version::new(0, 8, 30);
 
 /// `--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,6 +98,7 @@ pub fn build_solidity_with_options(
         ),
         None,
         None,
+        None,
     )?;
 
     let mut output = solc.standard_json(input, None, vec![], None)?;
@@ -115,8 +116,13 @@ pub fn build_solidity_with_options(
         &debug_config,
     )?;
 
-    let build: crate::Build =
-        project.compile(optimizer_settings, false, debug_config, Default::default())?;
+    let build: crate::Build = project.compile(
+        optimizer_settings,
+        false,
+        debug_config,
+        Default::default(),
+        Default::default(),
+    )?;
     build.write_to_standard_json(&mut output, &solc_version)?;
 
     Ok(output)
@@ -157,6 +163,7 @@ pub fn build_solidity_with_options_evm(
         ),
         None,
         None,
+        None,
     )?;
 
     let mut output = solc.standard_json(input, None, vec![], None)?;
@@ -208,6 +215,7 @@ 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)?;
@@ -243,7 +251,13 @@ pub fn build_yul(source_code: &str) -> anyhow::Result<()> {
         source_code,
         None,
     )?;
-    let _build = project.compile(optimizer_settings, false, DEBUG_CONFIG, Default::default())?;
+    let _build = project.compile(
+        optimizer_settings,
+        false,
+        DEBUG_CONFIG,
+        Default::default(),
+        Default::default(),
+    )?;
 
     Ok(())
 }
@@ -275,6 +289,7 @@ 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,19 +1,33 @@
-import * as path from 'path';
+import * as path from 'path'
 
-const outputDir = 'artifacts';
-const binExtension = ':C.pvm';
-const asmExtension = ':C.pvmasm';
-const llvmExtension = '.ll';
-const contractSolFilename = 'contract.sol';
-const contractYulFilename = 'contract.yul';
-const contractOptimizedLLVMFilename = contractSolFilename + '.C.optimized';
-const contractUnoptimizedLLVMFilename = contractSolFilename + '.C.unoptimized';
-const pathToOutputDir = path.join(__dirname, '..', outputDir);
-const pathToContracts = path.join(__dirname, '..', 'src', 'contracts');
-const pathToBasicYulContract = path.join(pathToContracts, 'yul', contractYulFilename);
-const pathToBasicSolContract = path.join(pathToContracts, 'solidity', contractSolFilename);
-const pathToSolBinOutputFile = path.join(pathToOutputDir, contractSolFilename + binExtension);
-const pathToSolAsmOutputFile = path.join(pathToOutputDir, contractSolFilename + asmExtension);
+const outputDir = 'artifacts'
+const binExtension = ':C.pvm'
+const asmExtension = ':C.pvmasm'
+const llvmExtension = '.ll'
+const contractSolFilename = 'contract.sol'
+const contractYulFilename = 'contract.yul'
+const contractOptimizedLLVMFilename = contractSolFilename + '.C.optimized'
+const contractUnoptimizedLLVMFilename = contractSolFilename + '.C.unoptimized'
+const pathToOutputDir = path.join(__dirname, '..', outputDir)
+const pathToContracts = path.join(__dirname, '..', 'src', 'contracts')
+const pathToBasicYulContract = path.join(
+  pathToContracts,
+  'yul',
+  contractYulFilename
+)
+const pathToBasicSolContract = path.join(
+  pathToContracts,
+  'solidity',
+  contractSolFilename
+)
+const pathToSolBinOutputFile = path.join(
+  pathToOutputDir,
+  contractSolFilename + binExtension
+)
+const pathToSolAsmOutputFile = path.join(
+  pathToOutputDir,
+  contractSolFilename + asmExtension
+)
 
 export const paths = {
   outputDir: outputDir,
@@ -30,4 +44,4 @@ export const paths = {
   pathToBasicYulContract: pathToBasicYulContract,
   pathToSolBinOutputFile: pathToSolBinOutputFile,
   pathToSolAsmOutputFile: pathToSolAsmOutputFile,
-};
+}

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

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

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

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

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

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

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

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

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

@@ -209,6 +209,8 @@ 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)?;
 
@@ -261,6 +263,8 @@ where
         revive_llvm_context::PolkaVMRemainderFunction.into_llvm(context)?;
         revive_llvm_context::PolkaVMSignedRemainderFunction.into_llvm(context)?;
 
+        revive_llvm_context::PolkaVMSbrkFunction.into_llvm(context)?;
+
         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-0"] }
+inkwell = { workspace = true, features = ["target-riscv", "no-libffi-linking", "llvm18-1"] }
 
 [build-dependencies]
 revive-build-utils = { workspace = true }

eslint.config.mjs

@@ -0,0 +1,11 @@
+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/emscripten/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.29+commit.ab55807c.js";
+  "https://binaries.soliditylang.org/wasm/soljson-v0.8.30+commit.73712a01.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

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

js/emscripten/examples/node/resolc.wasm

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

js/emscripten/examples/web/resolc.wasm

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

js/emscripten/examples/web/resolc_web.js

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

js/emscripten/fixtures/instantiate.json

@@ -0,0 +1,19 @@
+{
+  "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/fixtures/instantiate_tokens.json

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

js/emscripten/package.json

@@ -2,7 +2,7 @@
   "name": "revive",
   "private": true,
   "dependencies": {
-    "solc": "^0.8.29"
+    "solc": ">=0.8.0 <=0.8.30"
   },
   "scripts": {
     "example:web": "http-server ./examples/web/",

js/emscripten/tests/node.test.mjs

@@ -0,0 +1,138 @@
+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

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

js/examples/node/resolc.wasm

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

js/examples/web/resolc.wasm

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

js/examples/web/resolc_web.js

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

js/fixtures/instantiate.json

@@ -1,20 +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/resolc/README.md

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

js/resolc/fixtures/bad_pragma.sol

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

js/resolc/fixtures/storage.sol

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

js/resolc/fixtures/storage_bad.sol

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

js/resolc/fixtures/token.sol

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

js/resolc/package.json

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

js/resolc/src/bin.ts

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

js/resolc/src/index.test.ts

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

js/resolc/src/index.ts

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

js/resolc/src/resolc.ts

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

js/resolc/src/resolc/resolc.js

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

js/resolc/src/resolc/resolc.wasm

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

js/resolc/src/solc.d.ts

@@ -0,0 +1,95 @@
+declare module 'solc/soljson' {}
+
+declare module 'solc' {
+  // Basic types for input/output handling
+  export interface CompileInput {
+    language: string
+    sources: {
+      [fileName: string]: {
+        content: string
+      }
+    }
+    settings?: {
+      optimizer?: {
+        enabled: boolean
+        runs: number
+      }
+      outputSelection: {
+        [fileName: string]: {
+          [contractName: string]: string[]
+        }
+      }
+    }
+  }
+
+  export interface CompileOutput {
+    errors?: Array<{
+      component: string
+      errorCode: string
+      formattedMessage: string
+      message: string
+      severity: string
+      sourceLocation?: {
+        file: string
+        start: number
+        end: number
+      }
+      type: string
+    }>
+    sources?: {
+      [fileName: string]: {
+        id: number
+        ast: object
+      }
+    }
+    contracts?: {
+      [fileName: string]: {
+        [contractName: string]: {
+          abi: object[]
+          evm: {
+            bytecode: {
+              object: string
+              sourceMap: string
+              linkReferences: {
+                [fileName: string]: {
+                  [libraryName: string]: Array<{
+                    start: number
+                    length: number
+                  }>
+                }
+              }
+            }
+            deployedBytecode: {
+              object: string
+              sourceMap: string
+              linkReferences: {
+                [fileName: string]: {
+                  [libraryName: string]: Array<{
+                    start: number
+                    length: number
+                  }>
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+
+  // Main exported functions
+  export function compile(
+    input: string | CompileInput,
+    options?: {
+      import: (path: string) =>
+        | {
+            contents: string
+            error?: undefined
+          }
+        | {
+            error: string
+            contents?: undefined
+          }
+    }
+  ): string
+}

js/resolc/tsconfig.json

@@ -0,0 +1,27 @@
+{
+    "compilerOptions": {
+        "baseUrl": ".",
+        "outDir": "dist",
+        "sourceMap": true,
+        "declaration": true,
+        "noFallthroughCasesInSwitch": true,
+        "allowJs": true,
+        "moduleResolution": "node",
+        "module": "commonjs",
+        "target": "ES2022",
+        "lib": ["ES2022"],
+        "strict": true,
+        "noImplicitAny": true,
+        "skipLibCheck": true,
+        "esModuleInterop": true,
+        "allowSyntheticDefaultImports": true,
+        "useUnknownInCatchVariables": true,
+        "types": ["node"],
+        "typeRoots": ["../../node_modules/@types", "./src"],
+        "paths": {
+            "#src/*": ["./src/*"]
+        },
+        "plugins": []
+    },
+    "include": ["src/**/*"]
+}