release resolc v0.3.0 (#354)

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

.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/workflows/release-llvm.yml

@@ -94,7 +94,7 @@ jobs:
 
       - name: Install LLVM Builder
         run: |
-          cargo install --path crates/llvm-builder
+          cargo install --locked --force --path crates/llvm-builder
 
       - name: Clone LLVM
         run: |

.github/workflows/release.yml

@@ -14,7 +14,7 @@ concurrency:
 
 env:
   CARGO_TERM_COLOR: always
-  RUST_MUSL_CROSS_IMAGE: messense/rust-musl-cross@sha256:68b86bc7cb2867259e6b233415a665ff4469c28b57763e78c3bfea1c68091561
+  RUST_MUSL_CROSS_IMAGE: messense/rust-musl-cross@sha256:c0154e992adb791c3b848dd008939d19862549204f8cb26f5ca7a00f629e6067
 
 jobs:
   check-version-changed:
@@ -44,7 +44,7 @@ jobs:
               exit 0
             fi
 
-          export PKG_VER=v$(cat Cargo.toml | grep -A 5 package] | grep version | cut -d '=' -f 2 | tr -d '"' | tr -d " ")
+          export PKG_VER=v$(cat crates/resolc/Cargo.toml | grep -A 5 package] | grep version | cut -d '=' -f 2 | tr -d '"' | tr -d " ")
           echo "Current tag $CURRENT_TAG"
           echo "Package version $PKG_VER"
           #
@@ -143,7 +143,7 @@ jobs:
     runs-on: ubuntu-24.04
     needs: [check-version-changed]
     env:
-      RELEASE_RESOLC_WASM_URI: https://github.com/paritytech/revive-workflow-test/releases/download/${{ github.ref_name }}/resolc.wasm
+      RELEASE_RESOLC_WASM_URI: https://github.com/paritytech/revive/releases/download/${{ github.ref_name }}/resolc.wasm
     steps:
       - uses: actions/checkout@v4
       - uses: actions-rust-lang/setup-rust-toolchain@v1
@@ -311,9 +311,6 @@ jobs:
           cp -f resolc.{wasm,js} js/resolc/src/resolc
           npm -w js/resolc run build
 
-      - name: Set version
-        run: npm -w js/resolc version --no-git-tag-version ${{github.event.release.tag_name}}
-
       - name: npm pack
         run: npm -w js/resolc pack
 

CHANGELOG.md

@@ -4,21 +4,55 @@
 
 This is a development pre-release.
 
-Supported `polkadot-sdk` rev:`c29e72a8628835e34deb6aa7db9a78a2e4eabcee`
+Supported `polkadot-sdk` rev: `2503.0.1`
+
+## v0.3.0
+
+This is a development pre-release.
+
+Supported `polkadot-sdk` rev: `2503.0.1`
+
+### Fixed
+
+- llvm-context: Bugfix the SAR YUL builtin translation.
+- runtime-api: Add the missing `memset` builtin.
+- npm package: Bugfix the exports field defined in the `package.json`.
+
+
+## v0.2.0
+
+This is a development pre-release.
+
+Supported `polkadot-sdk` rev: `2503.0.1`
+
+### Changed
+
+- Removed the license printer from the `resolc` binary.
+- EVM bytecode is no longer requested from solc (except in test utils) leading to less compilation work in the pipeline.
+
+### Fixed
+
+- solc-json-interface: Serializing of any custom key in the JSON input is only skipped if not provided.
+- npm package resolution no longer fails with an 'ERR_PACKAGE_PATH_NOT_EXPORTED' error for packages defining exports fields in the `package.json`.
 
 ## v0.1.0
 
 This is a development pre-release.
 
-Supported `polkadot-sdk` rev:`c29e72a8628835e34deb6aa7db9a78a2e4eabcee`
+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.15
+## v0.1.0-dev.16
 
 This is a development pre-release.
 

Cargo.toml

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

@@ -11,7 +11,7 @@
 	machete \
 	test \
 	test-integration \
-	test-solidity \
+	test-resolc \
 	test-workspace \
 	test-cli \
 	test-wasm \
@@ -24,24 +24,24 @@
 install: install-bin install-npm
 
 install-bin:
-	cargo install --locked --path crates/solidity
+	cargo install --force --locked --path crates/resolc
 
 install-npm:
 	npm install && npm fund
 
 install-wasm: install-npm
-	cargo build --target wasm32-unknown-emscripten -p revive-solidity --release --no-default-features
+	cargo build --target wasm32-unknown-emscripten -p resolc --release --no-default-features
 	npm run build:package
 
 install-llvm-builder:
-	cargo install --path crates/llvm-builder
+	cargo install --force --locked --path crates/llvm-builder
 
 install-llvm: install-llvm-builder
 	revive-llvm clone
 	revive-llvm build --llvm-projects lld --llvm-projects clang
 
 install-revive-runner:
-	cargo install --path crates/runner --no-default-features --locked
+	cargo install --locked --force --path crates/runner --no-default-features
 
 format:
 	cargo fmt --all --check
@@ -58,8 +58,8 @@ test: format clippy machete test-cli test-workspace install-revive-runner
 test-integration: install-bin
 	cargo test --package revive-integration
 
-test-solidity: install
-	cargo test --package revive-solidity
+test-resolc: install
+	cargo test --package resolc
 
 test-workspace: install
 	cargo test --workspace --exclude revive-llvm-builder
@@ -90,6 +90,6 @@ clean:
 	cargo clean ; \
 	revive-llvm clean ; \
 	rm -rf node_modules ; \
-	rm -rf crates/solidity/src/tests/cli-tests/artifacts ; \
-	cargo uninstall revive-solidity ; \
+	rm -rf crates/resolc/src/tests/cli-tests/artifacts ; \
+	cargo uninstall resolc ; \
 	cargo uninstall revive-llvm-builder ;

README.md

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

RELEASE.md

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

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/differential/Cargo.toml

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

crates/integration/Cargo.toml

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

crates/integration/contracts/SAR.sol

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

crates/integration/src/cases.rs

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

crates/integration/src/tests.rs

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

crates/llvm-builder/Cargo.toml

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

crates/llvm-builder/src/build_type.rs

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

crates/llvm-builder/src/ccache_variant.rs

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

crates/llvm-builder/src/lib.rs

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

crates/llvm-builder/src/llvm_project.rs

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

crates/llvm-builder/src/lock.rs

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

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

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

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

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

crates/llvm-builder/src/sanitizer.rs

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

crates/llvm-builder/src/target_env.rs

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

crates/llvm-builder/src/target_triple.rs

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

crates/llvm-builder/src/utils.rs

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

crates/llvm-context/Cargo.toml

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

crates/llvm-context/src/lib.rs

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

crates/llvm-context/src/memory.rs

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

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

@@ -1,6 +1,7 @@
 //! The entry function.
 
 use inkwell::types::BasicType;
+use revive_solc_json_interface::PolkaVMDefaultHeapMemorySize;
 
 use crate::polkavm::context::address_space::AddressSpace;
 use crate::polkavm::context::function::runtime;
@@ -38,9 +39,12 @@ impl Entry {
             context.xlen_type().const_zero(),
         );
 
-        let heap_memory_type = context
-            .byte_type()
-            .array_type(context.memory_config.heap_size);
+        let heap_memory_type = context.byte_type().array_type(
+            context
+                .memory_config
+                .heap_size
+                .unwrap_or(PolkaVMDefaultHeapMemorySize),
+        );
         context.set_global(
             crate::polkavm::GLOBAL_HEAP_MEMORY,
             heap_memory_type,

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

@@ -25,8 +25,10 @@ use inkwell::debug_info::AsDIScope;
 use inkwell::debug_info::DIScope;
 use inkwell::types::BasicType;
 use inkwell::values::BasicValue;
+use revive_solc_json_interface::PolkaVMDefaultHeapMemorySize;
+use revive_solc_json_interface::PolkaVMDefaultStackMemorySize;
+use revive_solc_json_interface::SolcStandardJsonInputSettingsPolkaVMMemory;
 
-use crate::memory::MemoryConfig;
 use crate::optimizer::settings::Settings as OptimizerSettings;
 use crate::optimizer::Optimizer;
 use crate::polkavm::DebugConfig;
@@ -88,7 +90,7 @@ where
     /// The extra LLVM arguments that were used during target initialization.
     llvm_arguments: &'ctx [String],
     /// The PVM memory configuration.
-    memory_config: MemoryConfig,
+    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
@@ -228,12 +230,18 @@ where
         include_metadata_hash: bool,
         debug_config: DebugConfig,
         llvm_arguments: &'ctx [String],
-        memory_config: MemoryConfig,
+        memory_config: SolcStandardJsonInputSettingsPolkaVMMemory,
     ) -> Self {
         Self::set_data_layout(llvm, &module);
         Self::link_stdlib_module(llvm, &module);
         Self::link_polkavm_imports(llvm, &module);
-        Self::set_polkavm_stack_size(llvm, &module, memory_config.stack_size);
+        Self::set_polkavm_stack_size(
+            llvm,
+            &module,
+            memory_config
+                .stack_size
+                .unwrap_or(PolkaVMDefaultStackMemorySize),
+        );
         Self::set_module_flags(llvm, &module);
 
         let intrinsics = Intrinsics::new(llvm, &module);
@@ -1443,7 +1451,11 @@ where
     }
 
     pub fn heap_size(&self) -> inkwell::values::IntValue<'ctx> {
-        self.xlen_type()
-            .const_int(self.memory_config.heap_size as u64, false)
+        self.xlen_type().const_int(
+            self.memory_config
+                .heap_size
+                .unwrap_or(PolkaVMDefaultHeapMemorySize) as u64,
+            false,
+        )
     }
 }

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

@@ -204,7 +204,7 @@ where
             &context.word_type().const_all_ones(),
             overflow_negative_block,
         ),
-        (&context.word_const(0), overflow_block),
+        (&context.word_const(0), overflow_positive_block),
     ]);
     Ok(result.as_basic_value())
 }

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

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

crates/resolc/Cargo.toml

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

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

crates/resolc/src/lib.rs

@@ -7,7 +7,6 @@ pub(crate) mod process;
 pub(crate) mod project;
 pub(crate) mod solc;
 pub(crate) mod version;
-pub(crate) mod yul;
 
 pub use self::build::contract::Contract as ContractBuild;
 pub use self::build::Build;
@@ -45,6 +44,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,7 +56,7 @@ pub fn yul<T: Compiler>(
     include_metadata_hash: bool,
     debug_config: revive_llvm_context::DebugConfig,
     llvm_arguments: &[String],
-    memory_config: revive_llvm_context::MemoryConfig,
+    memory_config: SolcStandardJsonInputSettingsPolkaVMMemory,
 ) -> anyhow::Result<Build> {
     let path = match input_files.len() {
         1 => input_files.first().expect("Always exists"),
@@ -94,7 +95,7 @@ pub fn llvm_ir(
     include_metadata_hash: bool,
     debug_config: revive_llvm_context::DebugConfig,
     llvm_arguments: &[String],
-    memory_config: revive_llvm_context::MemoryConfig,
+    memory_config: SolcStandardJsonInputSettingsPolkaVMMemory,
 ) -> anyhow::Result<Build> {
     let path = match input_files.len() {
         1 => input_files.first().expect("Always exists"),
@@ -135,7 +136,7 @@ pub fn standard_output<T: Compiler>(
     suppressed_warnings: Option<Vec<ResolcWarning>>,
     debug_config: revive_llvm_context::DebugConfig,
     llvm_arguments: &[String],
-    memory_config: revive_llvm_context::MemoryConfig,
+    memory_config: SolcStandardJsonInputSettingsPolkaVMMemory,
 ) -> anyhow::Result<Build> {
     let solc_version = solc.version()?;
 
@@ -154,6 +155,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
@@ -208,9 +213,8 @@ pub fn standard_json<T: Compiler>(
     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],
-    memory_config: revive_llvm_context::MemoryConfig,
 ) -> anyhow::Result<()> {
     let solc_version = solc.version()?;
 
@@ -224,6 +228,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.unwrap_or_default();
+
     let include_metadata_hash = match solc_input.settings.metadata {
         Some(ref metadata) => metadata.bytecode_hash != Some(MetadataHash::None),
         None => true,
@@ -258,7 +265,9 @@ pub fn standard_json<T: Compiler>(
             include_metadata_hash,
             debug_config,
             llvm_arguments,
-            memory_config,
+            polkavm_settings
+                .memory_config
+                .unwrap_or_else(SolcStandardJsonInputSettingsPolkaVMMemory::default),
         )?;
         build.write_to_standard_json(&mut solc_output, &solc_version)?;
     }
@@ -286,7 +295,7 @@ pub fn combined_json<T: Compiler>(
     output_directory: Option<PathBuf>,
     overwrite: bool,
     llvm_arguments: &[String],
-    memory_config: revive_llvm_context::MemoryConfig,
+    memory_config: SolcStandardJsonInputSettingsPolkaVMMemory,
 ) -> anyhow::Result<()> {
     let build = standard_output(
         input_files,

crates/resolc/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;
 
@@ -23,7 +24,7 @@ pub struct Input {
     /// The extra LLVM arguments give used for manual control.
     pub llvm_arguments: Vec<String>,
     /// The PVM memory configuration.
-    pub memory_config: revive_llvm_context::MemoryConfig,
+    pub memory_config: SolcStandardJsonInputSettingsPolkaVMMemory,
 }
 
 impl Input {
@@ -35,7 +36,7 @@ impl Input {
         optimizer_settings: revive_llvm_context::OptimizerSettings,
         debug_config: revive_llvm_context::DebugConfig,
         llvm_arguments: Vec<String>,
-        memory_config: revive_llvm_context::MemoryConfig,
+        memory_config: SolcStandardJsonInputSettingsPolkaVMMemory,
     ) -> Self {
         Self {
             contract,

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

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

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

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

crates/resolc/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,7 +79,7 @@ impl Contract {
         include_metadata_hash: bool,
         debug_config: revive_llvm_context::DebugConfig,
         llvm_arguments: &[String],
-        memory_config: revive_llvm_context::MemoryConfig,
+        memory_config: SolcStandardJsonInputSettingsPolkaVMMemory,
     ) -> anyhow::Result<ContractBuild> {
         let llvm = inkwell::context::Context::create();
         let optimizer = revive_llvm_context::Optimizer::new(optimizer_settings);

crates/resolc/src/project/mod.rs

@@ -9,11 +9,14 @@ use std::path::Path;
 
 #[cfg(feature = "parallel")]
 use rayon::iter::{IntoParallelIterator, ParallelIterator};
-use revive_solc_json_interface::SolcStandardJsonOutput;
 use serde::Deserialize;
 use serde::Serialize;
 use sha3::Digest;
 
+use revive_solc_json_interface::SolcStandardJsonOutput;
+use revive_yul::lexer::Lexer;
+use revive_yul::parser::statement::object::Object;
+
 use crate::build::contract::Contract as ContractBuild;
 use crate::build::Build;
 use crate::missing_libraries::MissingLibraries;
@@ -22,8 +25,6 @@ use crate::process::Process;
 use crate::project::contract::ir::IR;
 use crate::solc::version::Version as SolcVersion;
 use crate::solc::Compiler;
-use crate::yul::lexer::Lexer;
-use crate::yul::parser::statement::object::Object;
 
 use self::contract::Contract;
 
@@ -67,7 +68,7 @@ impl Project {
         include_metadata_hash: bool,
         debug_config: revive_llvm_context::DebugConfig,
         llvm_arguments: &[String],
-        memory_config: revive_llvm_context::MemoryConfig,
+        memory_config: revive_solc_json_interface::SolcStandardJsonInputSettingsPolkaVMMemory,
     ) -> anyhow::Result<Build> {
         let project = self.clone();
         #[cfg(feature = "parallel")]
@@ -154,8 +155,8 @@ impl Project {
             .iter()
             .flat_map(|(file, names)| {
                 names
-                    .iter()
-                    .map(|(name, _address)| format!("{file}:{name}"))
+                    .keys()
+                    .map(|name| format!("{file}:{name}"))
                     .collect::<HashSet<String>>()
             })
             .collect::<HashSet<String>>();
@@ -321,7 +322,7 @@ impl revive_llvm_context::PolkaVMDependency for Project {
         include_metadata_hash: bool,
         debug_config: revive_llvm_context::DebugConfig,
         llvm_arguments: &[String],
-        memory_config: revive_llvm_context::MemoryConfig,
+        memory_config: revive_solc_json_interface::SolcStandardJsonInputSettingsPolkaVMMemory,
     ) -> anyhow::Result<String> {
         let contract_path = project.resolve_path(identifier)?;
         let contract = project

crates/resolc/src/resolc/arguments.rs

@@ -23,10 +23,6 @@ pub struct Arguments {
     #[arg(long = "supported-solc-versions")]
     pub supported_solc_versions: bool,
 
-    /// Print the licence and exit.
-    #[arg(long = "license")]
-    pub license: bool,
-
     /// Specify the input paths and remappings.
     /// If an argument contains a '=', it is considered a remapping.
     /// Multiple Solidity files can be passed in the default Solidity mode.
@@ -185,8 +181,8 @@ pub struct Arguments {
     /// 1.Increasing the heap size will increase startup costs.
     /// 2.The heap size contributes to the total memory size a contract can use,
     ///   which includes the contracts code size
-    #[arg(long = "heap-size", default_value = "65536")]
-    pub heap_size: u32,
+    #[arg(long = "heap-size")]
+    pub heap_size: Option<u32>,
 
     /// The contracts total stack size in bytes.
     ///
@@ -200,8 +196,8 @@ pub struct Arguments {
     /// 1.Increasing the heap size will increase startup costs.
     /// 2.The stack size contributes to the total memory size a contract can use,
     ///   which includes the contracts code size
-    #[arg(long = "stack-size", default_value = "32768")]
-    pub stack_size: u32,
+    #[arg(long = "stack-size")]
+    pub stack_size: Option<u32>,
 }
 
 impl Arguments {
@@ -330,6 +326,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/resolc/src/resolc/main.rs

@@ -5,7 +5,7 @@ pub mod arguments;
 use std::io::Write;
 use std::str::FromStr;
 
-use revive_solidity::Process;
+use resolc::Process;
 
 use self::arguments::Arguments;
 
@@ -36,7 +36,7 @@ fn main_inner() -> anyhow::Result<()> {
             std::io::stdout(),
             "{} version {}",
             env!("CARGO_PKG_DESCRIPTION"),
-            revive_solidity::ResolcVersion::default().long
+            resolc::ResolcVersion::default().long
         )?;
         return Ok(());
     }
@@ -45,20 +45,12 @@ fn main_inner() -> anyhow::Result<()> {
         writeln!(
             std::io::stdout(),
             ">={},<={}",
-            revive_solidity::SolcFirstSupportedVersion,
-            revive_solidity::SolcLastSupportedVersion,
+            resolc::SolcFirstSupportedVersion,
+            resolc::SolcLastSupportedVersion,
         )?;
         return Ok(());
     }
 
-    if arguments.license {
-        let license_mit = include_str!("../../../../LICENSE-MIT");
-        let license_apache = include_str!("../../../../LICENSE-APACHE");
-
-        writeln!(std::io::stdout(), "{}\n{}\n", license_mit, license_apache)?;
-        return Ok(());
-    }
-
     #[cfg(feature = "parallel")]
     rayon::ThreadPoolBuilder::new()
         .stack_size(RAYON_WORKER_STACK_SIZE)
@@ -71,20 +63,20 @@ fn main_inner() -> anyhow::Result<()> {
             let mut infile = std::fs::File::open(fname)?;
             #[cfg(target_os = "emscripten")]
             {
-                return revive_solidity::WorkerProcess::run(Some(&mut infile));
+                return resolc::WorkerProcess::run(Some(&mut infile));
             }
             #[cfg(not(target_os = "emscripten"))]
             {
-                return revive_solidity::NativeProcess::run(Some(&mut infile));
+                return resolc::NativeProcess::run(Some(&mut infile));
             }
         }
         #[cfg(target_os = "emscripten")]
         {
-            return revive_solidity::WorkerProcess::run(None);
+            return resolc::WorkerProcess::run(None);
         }
         #[cfg(not(target_os = "emscripten"))]
         {
-            return revive_solidity::NativeProcess::run(None);
+            return resolc::NativeProcess::run(None);
         }
     }
 
@@ -111,14 +103,16 @@ fn main_inner() -> anyhow::Result<()> {
     let mut solc = {
         #[cfg(target_os = "emscripten")]
         {
-            revive_solidity::SoljsonCompiler
+            resolc::SoljsonCompiler
         }
 
         #[cfg(not(target_os = "emscripten"))]
         {
-            revive_solidity::SolcCompiler::new(arguments.solc.unwrap_or_else(|| {
-                revive_solidity::SolcCompiler::DEFAULT_EXECUTABLE_NAME.to_owned()
-            }))?
+            resolc::SolcCompiler::new(
+                arguments
+                    .solc
+                    .unwrap_or_else(|| resolc::SolcCompiler::DEFAULT_EXECUTABLE_NAME.to_owned()),
+            )?
         }
     };
 
@@ -148,13 +142,13 @@ fn main_inner() -> anyhow::Result<()> {
         None => true,
     };
 
-    let memory_config = revive_llvm_context::MemoryConfig {
-        heap_size: arguments.heap_size,
-        stack_size: arguments.stack_size,
-    };
+    let memory_config = revive_solc_json_interface::SolcStandardJsonInputSettingsPolkaVMMemory::new(
+        arguments.heap_size,
+        arguments.stack_size,
+    );
 
     let build = if arguments.yul {
-        revive_solidity::yul(
+        resolc::yul(
             input_files.as_slice(),
             &mut solc,
             optimizer_settings,
@@ -164,7 +158,7 @@ fn main_inner() -> anyhow::Result<()> {
             memory_config,
         )
     } else if arguments.llvm_ir {
-        revive_solidity::llvm_ir(
+        resolc::llvm_ir(
             input_files.as_slice(),
             optimizer_settings,
             include_metadata_hash,
@@ -173,7 +167,7 @@ fn main_inner() -> anyhow::Result<()> {
             memory_config,
         )
     } else if arguments.standard_json {
-        revive_solidity::standard_json(
+        resolc::standard_json(
             &mut solc,
             arguments.detect_missing_libraries,
             arguments.base_path,
@@ -181,11 +175,10 @@ fn main_inner() -> anyhow::Result<()> {
             arguments.allow_paths,
             debug_config,
             &arguments.llvm_arguments,
-            memory_config,
         )?;
         return Ok(());
     } else if let Some(format) = arguments.combined_json {
-        revive_solidity::combined_json(
+        resolc::combined_json(
             format,
             input_files.as_slice(),
             arguments.libraries,
@@ -207,7 +200,7 @@ fn main_inner() -> anyhow::Result<()> {
         )?;
         return Ok(());
     } else {
-        revive_solidity::standard_output(
+        resolc::standard_output(
             input_files.as_slice(),
             arguments.libraries,
             &mut solc,
@@ -247,9 +240,7 @@ fn main_inner() -> anyhow::Result<()> {
 
                 writeln!(
                     std::io::stdout(),
-                    "Contract `{}` assembly:\n\n{}",
-                    path,
-                    assembly_text
+                    "Contract `{path}` assembly:\n\n{assembly_text}"
                 )?;
             }
             if arguments.output_binary {

crates/resolc/src/test_utils.rs

@@ -89,7 +89,7 @@ pub fn build_solidity_with_options(
         sources.clone(),
         libraries.clone(),
         remappings,
-        SolcStandardJsonInputSettingsSelection::new_required(),
+        SolcStandardJsonInputSettingsSelection::new_required_for_tests(),
         SolcStandardJsonInputSettingsOptimizer::new(
             solc_optimizer_enabled,
             optimizer_settings.middle_end_as_string().chars().last(),
@@ -98,6 +98,7 @@ pub fn build_solidity_with_options(
         ),
         None,
         None,
+        None,
     )?;
 
     let mut output = solc.standard_json(input, None, vec![], None)?;
@@ -153,7 +154,7 @@ pub fn build_solidity_with_options_evm(
         sources.clone(),
         libraries.clone(),
         remappings,
-        SolcStandardJsonInputSettingsSelection::new_required(),
+        SolcStandardJsonInputSettingsSelection::new_required_for_tests(),
         SolcStandardJsonInputSettingsOptimizer::new(
             solc_optimizer_enabled,
             None,
@@ -162,6 +163,7 @@ pub fn build_solidity_with_options_evm(
         ),
         None,
         None,
+        None,
     )?;
 
     let mut output = solc.standard_json(input, None, vec![], None)?;
@@ -209,10 +211,11 @@ pub fn build_solidity_and_detect_missing_libraries(
         sources.clone(),
         libraries.clone(),
         None,
-        SolcStandardJsonInputSettingsSelection::new_required(),
+        SolcStandardJsonInputSettingsSelection::new_required_for_tests(),
         SolcStandardJsonInputSettingsOptimizer::new(true, None, &solc_version.default, false),
         None,
         None,
+        None,
     )?;
 
     let mut output = solc.standard_json(input, None, vec![], None)?;
@@ -282,10 +285,11 @@ pub fn check_solidity_warning(
         sources.clone(),
         libraries,
         None,
-        SolcStandardJsonInputSettingsSelection::new_required(),
+        SolcStandardJsonInputSettingsSelection::new_required_for_tests(),
         SolcStandardJsonInputSettingsOptimizer::new(true, None, &solc_version.default, false),
         None,
         suppressed_warnings,
+        None,
     )?;
 
     let output = solc.standard_json(input, None, vec![], None)?;
@@ -357,7 +361,7 @@ fn compile_evm(
     .expect("source should compile");
     let object = &contracts
         .get(contract_name)
-        .unwrap_or_else(|| panic!("contract '{}' didn't produce bin-runtime", contract_name));
+        .unwrap_or_else(|| panic!("contract '{contract_name}' didn't produce bin-runtime"));
     let code = if runtime {
         object.1.object.as_str()
     } else {

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

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

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

@@ -15,6 +15,11 @@ const pathToBasicYulContract = path.join(
   'yul',
   contractYulFilename
 )
+const pathToMemsetYulContract = path.join(
+  pathToContracts,
+  'yul',
+  'memset.yul'
+)
 const pathToBasicSolContract = path.join(
   pathToContracts,
   'solidity',
@@ -42,6 +47,7 @@ export const paths = {
   pathToContracts: pathToContracts,
   pathToBasicSolContract: pathToBasicSolContract,
   pathToBasicYulContract: pathToBasicYulContract,
+  pathToMemsetYulContract: pathToMemsetYulContract,
   pathToSolBinOutputFile: pathToSolBinOutputFile,
   pathToSolAsmOutputFile: pathToSolAsmOutputFile,
 }

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

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

crates/resolc/src/tests/optimizer.rs

@@ -121,10 +121,10 @@ fn optimizer() {
 
     assert!(
         size_when_optimized_for_cycles < size_when_unoptimized,
-        "Expected the cycles-optimized bytecode to be smaller than the unoptimized. Optimized: {}B, Unoptimized: {}B", size_when_optimized_for_cycles, size_when_unoptimized,
+        "Expected the cycles-optimized bytecode to be smaller than the unoptimized. Optimized: {size_when_optimized_for_cycles}B, Unoptimized: {size_when_unoptimized}B",
     );
     assert!(
         size_when_optimized_for_size < size_when_unoptimized,
-        "Expected the size-optimized bytecode to be smaller than the unoptimized. Optimized: {}B, Unoptimized: {}B", size_when_optimized_for_size, size_when_unoptimized,
+        "Expected the size-optimized bytecode to be smaller than the unoptimized. Optimized: {size_when_optimized_for_size}B, Unoptimized: {size_when_unoptimized}B",
     );
 }

crates/runner/Cargo.toml

@@ -17,7 +17,7 @@ path = "src/main.rs"
 [features]
 std = ["polkadot-sdk/std"]
 default = ["solidity"]
-solidity = ["revive-solidity", "revive-differential", "revive-llvm-context"]
+solidity = ["resolc", "revive-differential", "revive-llvm-context"]
 
 [dependencies]
 env_logger = { workspace = true }
@@ -39,6 +39,6 @@ polkadot-sdk.features = [
     "pallet-timestamp"
 ]
 
-revive-solidity = { workspace = true, optional = true }
+resolc = { workspace = true, optional = true }
 revive-differential = { workspace = true, optional = true }
 revive-llvm-context = { workspace = true, optional = true }

crates/runner/src/lib.rs

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

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

@@ -4,12 +4,12 @@ use serde::{Deserialize, Serialize};
 
 use crate::*;
 use alloy_primitives::keccak256;
-#[cfg(feature = "revive-solidity")]
+#[cfg(feature = "resolc")]
 use alloy_primitives::Address;
-#[cfg(feature = "revive-solidity")]
+#[cfg(feature = "resolc")]
+use resolc::test_utils::*;
+#[cfg(feature = "resolc")]
 use revive_differential::{Evm, EvmLog};
-#[cfg(feature = "revive-solidity")]
-use revive_solidity::test_utils::*;
 
 const SPEC_MARKER_BEGIN: &str = "/* runner.json";
 const SPEC_MARKER_END: &str = "*/";
@@ -256,7 +256,7 @@ impl Specs {
             };
 
             match code {
-                #[cfg(feature = "revive-solidity")]
+                #[cfg(feature = "resolc")]
                 Code::Bytes(bytes) if bytes.is_empty() => {
                     let contract_source = match std::fs::read_to_string(contract_path) {
                         Err(err) => panic!("unable to read {contract_path}: {err}"),
@@ -264,9 +264,9 @@ impl Specs {
                     };
                     *bytes = compile_blob(contract_name, &contract_source)
                 }
-                #[cfg(not(feature = "revive-solidity"))]
+                #[cfg(not(feature = "resolc"))]
                 Code::Bytes(_) => panic!("{NO_SOLIDITY_FRONTEND}"),
-                #[cfg(feature = "revive-solidity")]
+                #[cfg(feature = "resolc")]
                 Code::Solidity { path, .. } if path.is_none() => *path = Some(contract_path.into()),
                 _ => continue,
             }

crates/runtime-api/Cargo.toml

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

crates/runtime-api/build.rs

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

crates/runtime-api/src/polkavm_imports.c

@@ -30,6 +30,13 @@ void * memmove(void *dst, const void *src, size_t n) {
 	return dst;
 }
 
+void * memset(void *b, int c, size_t len) {
+    uint8_t *dest = b;
+    uint8_t val = (uint8_t)c;
+    while (len-- > 0) *dest++ = val;
+    return b;
+}
+
 // Imports
 
 POLKAVM_IMPORT(void, address, uint32_t)

crates/solc-json-interface/Cargo.toml

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

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

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

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

@@ -18,13 +18,14 @@ use crate::standard_json::input::settings::optimizer::Optimizer as SolcStandardJ
 use crate::standard_json::input::settings::selection::Selection as SolcStandardJsonInputSettingsSelection;
 #[cfg(feature = "resolc")]
 use crate::warning::Warning;
+use crate::SolcStandardJsonInputSettingsPolkaVM;
 
 use self::language::Language;
 use self::settings::Settings;
 use self::source::Source;
 
 /// The `solc --standard-json` input.
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Clone, Debug, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct Input {
     /// The input language.
@@ -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/metadata.rs

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

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

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

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

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

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

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