Add compiler optimizer option to npm package (#310 )

Run lint:fix
2026-06-14 19:11:04 +00:00 · 2025-05-08 12:38:27 +02:00 · 2025-05-08 12:20:38 +02:00
128 changed files with 2924 additions and 2935 deletions
@@ -3,7 +3,7 @@ inputs:
  version:
    description: ""
    required: false
-    default: "4.0.9"
+    default: "3.1.64"


 runs:
@@ -19,7 +19,7 @@ runs:
      shell: bash
      run: |
        mkdir -p solc
-        curl -sSL --output solc/solc https://github.com/ethereum/solidity/releases/download/v0.8.30/${SOLC_NAME}
+        curl -sSL --output solc/solc https://github.com/ethereum/solidity/releases/download/v0.8.29/${SOLC_NAME}

    - name: Make Solc Executable
      if: ${{ runner.os == 'Windows' }}
@@ -94,7 +94,7 @@ jobs:

      - name: Install LLVM Builder
        run: |
-          cargo install --locked --force --path crates/llvm-builder
+          cargo install --path crates/llvm-builder

      - name: Clone LLVM
        run: |
@@ -14,7 +14,7 @@ concurrency:

 env:
  CARGO_TERM_COLOR: always
-  RUST_MUSL_CROSS_IMAGE: messense/rust-musl-cross@sha256:c0154e992adb791c3b848dd008939d19862549204f8cb26f5ca7a00f629e6067
+  RUST_MUSL_CROSS_IMAGE: messense/rust-musl-cross@sha256:68b86bc7cb2867259e6b233415a665ff4469c28b57763e78c3bfea1c68091561

 jobs:
  check-version-changed:
@@ -143,7 +143,7 @@ jobs:
    runs-on: ubuntu-24.04
    needs: [check-version-changed]
    env:
-      RELEASE_RESOLC_WASM_URI: https://github.com/paritytech/revive/releases/download/${{ github.ref_name }}/resolc.wasm
+      RELEASE_RESOLC_WASM_URI: https://github.com/paritytech/revive-workflow-test/releases/download/${{ github.ref_name }}/resolc.wasm
    steps:
      - uses: actions/checkout@v4
      - uses: actions-rust-lang/setup-rust-toolchain@v1
@@ -181,7 +181,7 @@ jobs:
      - name: Basic Sanity Check
        run: |
          mkdir -p solc
-          curl -sSLo solc/soljson.js https://github.com/ethereum/solidity/releases/download/v0.8.30/soljson.js
+          curl -sSLo solc/soljson.js https://github.com/ethereum/solidity/releases/download/v0.8.29/soljson.js
          node -e "
          const soljson = require('solc/soljson');
          const createRevive = require('./target/wasm32-unknown-emscripten/release/resolc.js');
@@ -311,6 +311,12 @@ jobs:
          cp -f resolc.{wasm,js} js/resolc/src/resolc
          npm -w js/resolc run build

+      - name: Set version
+        run: |
+          VERSION="${{ github.event.release.tag_name }}"
+          STRIPPED_VERSION="${VERSION#v}"
+          npm -w js/resolc version --no-git-tag-version "$STRIPPED_VERSION"
+
      - name: npm pack
        run: npm -w js/resolc pack

@@ -4,45 +4,21 @@

 This is a development pre-release.

-Supported `polkadot-sdk` rev: `2503.0.1`
+Supported `polkadot-sdk` rev:`c29e72a8628835e34deb6aa7db9a78a2e4eabcee`

 ## 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.
@@ -50,16 +26,13 @@ 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.
+- 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
@@ -69,19 +42,16 @@ This is a development pre-release.
 Supported `polkadot-sdk` rev:`c29e72a8628835e34deb6aa7db9a78a2e4eabcee`

 ### Added
-
 - Support for solc v0.8.29
 - Decouples the solc JSON-input-output type definitions from the Solidity fronted and expose them via a dedicated crate.
 - `--supported-solc-versions` for `resolc` binary to return a `semver` range of supported `solc` versions.
 - Support for passing LLVM command line options via the prcoess input or providing one or more `--llvm-arg='..'` resolc CLI flag. This allows more fine-grained control over the LLVM backend configuration.

 ### Changed
-
 - Storage keys and values are big endian. This was a pre-mature optimization because for the contract itself it this is a no-op and thus not observable. However we should consider the storage layout as part of the contract ABI. The endianness of transient storage values are still kept as-is.
 - Running `resolc` using webkit is no longer supported.

 ### Fixed
-
 - A missing byte swap for the create2 salt value.

 ## v0.1.0-dev.12
@@ -91,12 +61,10 @@ This is a development pre-release.
 Supported `polkadot-sdk` rev: `21f6f0705e53c15aa2b8a5706b208200447774a9`

 ### Added
-
 - Per file output selection for `--standard-json` mode.
 - The `ir` output selection option for `--standard-json` mode.

 ### Changed
-
 - Improved code size: Large contracts compile to smaller code blobs when enabling aggressive size optimizations (`-Oz`).

 ### Fixed
@@ -112,7 +80,6 @@ Supported `polkadot-sdk` rev: `274a781e8ca1a9432c7ec87593bd93214abbff50`
 ### Changed

 ### Fixed
-
 - A bug causing incorrect loads from the emulated EVM linear memory.
 - A missing integer truncate after switching to 64bit.

@@ -123,12 +90,10 @@ This is a development pre-release.
 Supported `polkadot-sdk` rev: `274a781e8ca1a9432c7ec87593bd93214abbff50`

 ### Added
-
 - Support for the `coinbase` opcode.
 - The resolc web JS version.

 ### Changed
-
 - Missing the `--overwrite` flag emits an error instead of a warning.
 - The `resolc` executable prints the help by default.
 - Removed support for legacy EVM assembly (EVMLA) translation.
@@ -138,7 +103,6 @@ Supported `polkadot-sdk` rev: `274a781e8ca1a9432c7ec87593bd93214abbff50`
  If detected, the re-entrant call flag is not set and 0 deposit limit is endowed.

 ### Fixed
-
 - Solidity: Add the solc `--libraries` files to sources.
 - A data race in tests.
 - Fix `broken pipe` errors.
@@ -152,11 +116,9 @@ This is a development pre-release.
 ### Added

 ### Changed
-
 - Syscalls with more than 6 arguments now pack them into registers.

 ### Fixed
-
 - Remove reloading of the resolc.js file (fix issue with relative path in web worker)

 ## v0.1.0-dev.8
@@ -164,18 +126,15 @@ This is a development pre-release.
 This is a development pre-release.

 ### Added
-
 - The `revive-llvm-builder` crate with the `revive-llvm` helper utility for streamlined management of the LLVM framework dependency.
 - Initial support for running `resolc` in the browser.

 ### Changed
-
 - Suported contracts runtime is polkadot-sdk git version `d62a90c8c729acd98c7e9a5cab9803b8b211ffc5`.
 - The minimum supported Rust version is `1.81.0`.
 - Error out early instead of invoking `solc` with invalid base or include path flags.

 ### Fixed
-
 - Decouple the LLVM target dependency from the LLVM host dependency.
 - Do not error out if no files and no errors were produced. This aligns resolc closer to solc.
 - Fixes input normalization in the Wasm version.
@@ -185,20 +144,17 @@ This is a development pre-release.
 This is a development pre-release.

 ### Added
-
 - Implement the `GASPRICE` opcode.
 - Implement the `BASEFEE` opcode.
 - Implement the `GASLIMIT` opcode.

 ### Changed
-
 - The `GAS` opcode now returns the remaining `ref_time`.
 - Contracts can now be supplied call data input of arbitrary size.
- Some syscalls now return the value in a register, slightly improving emitted contract code.
+- Some syscalls now return the value in a register, slightly improving  emitted contract code.
 - Calls forward maximum weight limits instead of 0, anticipating a change in polkadot-sdk where weight limits of 0 no longer interprets as uncapped limit.

 ### Fixed
-
 - A linker bug which was preventing certain contracts from linking with the PVM linker.
 - JS: Fix encoding conversion from JS string (UTF-16) to UTF-8.
 - The git commit hash slug is always displayed in the version string.
@@ -208,7 +164,6 @@ This is a development pre-release.
 This is a development pre-release.

 # Added
-
 - Implement the `BLOCKHASH` opcode.
 - Implement delegate calls.
 - Implement the `GASPRICE` opcode. Currently hard-coded to return `1`.
@@ -216,24 +171,21 @@ This is a development pre-release.
 - Initial support for emitting debug info (opt in via the `-g` flag)

 # Changed
-
 - resolc now emits 64bit PolkaVM blobs, reducing contract code size and execution time.
 - The RISC-V bit-manipulation target feature (`zbb`) is enabled.

 # Fixed
-
 - Compilation to Wasm (for usage in node and web browsers)

+
 ## v0.1.0-dev.5

 This is development pre-release.

 # Added
-
 - Implement the `CODESIZE` and `EXTCODESIZE` opcodes.

 # Changed
-
 - Include the full revive version in the contract metadata.

 # Fixed
@@ -243,11 +195,9 @@ This is development pre-release.
 This is development pre-release.

 # Added
-
 - Support the `ORIGIN` opcode.

 # Changed
-
 - Update polkavm to `v0.14.0`.
 - Enable the `a`, `fast-unaligned-access` and `xtheadcondmov` LLVM target features, decreasing the code size for some contracts.

@@ -3,7 +3,7 @@ resolver = "2"
 members = ["crates/*"]

 [workspace.package]
-version = "0.1.0"
+version = "0.1.0-dev.14"
 authors = [
    "Cyrill Leutwiler <cyrill@parity.io>",
    "Parity Technologies <admin@parity.io>",
@@ -11,60 +11,59 @@ authors = [
 license = "MIT/Apache-2.0"
 edition = "2021"
 repository = "https://github.com/paritytech/revive"
-rust-version = "1.85.0"
+rust-version = "1.81.0"

 [workspace.dependencies]
-resolc  = { version = "0.1.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.0", 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.1.0", path = "crates/llvm-context" }
-revive-runtime-api = { version = "0.1.0", path = "crates/runtime-api" }
-revive-runner = { version = "0.1.0", path = "crates/runner" }
-revive-solc-json-interface = { version = "0.1.0", path = "crates/solc-json-interface" }
-revive-stdlib = { version = "0.1.0", path = "crates/stdlib" }
-revive-build-utils = { version = "0.1.0", path = "crates/build-utils" }
-revive-yul = { version = "0.1.0", path = "crates/yul" }
+revive-benchmarks = { version = "0.1.0-dev.14", path = "crates/benchmarks" }
+revive-builtins = { version = "0.1.0-dev.14", path = "crates/builtins" }
+revive-common = { version = "0.1.0-dev.14", path = "crates/common" }
+revive-differential = { version = "0.1.0-dev.14", path = "crates/differential" }
+revive-integration = { version = "0.1.0-dev.14", path = "crates/integration" }
+revive-linker = { version = "0.1.0-dev.14", path = "crates/linker" }
+lld-sys = { version = "0.1.0-dev.14", path = "crates/lld-sys" }
+revive-llvm-context = { version = "0.1.0-dev.14", path = "crates/llvm-context" }
+revive-runtime-api = { version = "0.1.0-dev.14", path = "crates/runtime-api" }
+revive-runner = { version = "0.1.0-dev.14", path = "crates/runner" }
+revive-solc-json-interface = { version = "0.1.0-dev.14", path = "crates/solc-json-interface" }
+revive-solidity = { version = "0.1.0-dev.14", path = "crates/solidity" }
+revive-stdlib = { version = "0.1.0-dev.14", path = "crates/stdlib" }
+revive-build-utils = { version = "0.1.0-dev.14", path = "crates/build-utils" }

 hex = "0.4.3"
 cc = "1.2"
-libc = "0.2.172"
-tempfile = "3.20"
+libc = "0.2.169"
+tempfile = "3.17"
 anyhow = "1.0"
 semver = { version = "1.0", features = ["serde"] }
 itertools = "0.14"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = { version = "1.0", features = ["arbitrary_precision"] }
-regex = "1.11"
-once_cell = "1.21"
+regex = "1.10"
+once_cell = "1.20"
 num = "0.4.3"
 sha1 = "0.10"
 sha3 = "0.10"
 thiserror = "2.0"
 which = "7.0"
 path-slash = "0.2"
-rayon = "1.10"
+rayon = "1.8"
 clap = { version = "4", default-features = false, features = ["derive"] }
-polkavm-common = "0.24.0"
-polkavm-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 }
+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 }
 downloader = "0.2.8"
-flate2 = "1.1"
-fs_extra = "1.3"
+flate2 = "1.0.35"
+fs_extra = "1.3.0"
 num_cpus = "1"
 tar = "0.4"
 toml = "0.8"
@@ -72,15 +71,16 @@ assert_cmd = "2.0"
 assert_fs = "1.1"

 # polkadot-sdk and friends
-codec = { version = "3.7.5", default-features = false, package = "parity-scale-codec" }
+codec = { version = "3.6.12", default-features = false, package = "parity-scale-codec" }
 scale-info = { version = "2.11.6", default-features = false }
-polkadot-sdk = { version = "2503.0.1" }
+polkadot-sdk = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c29e72a8628835e34deb6aa7db9a78a2e4eabcee" }

 # llvm
 [workspace.dependencies.inkwell]
-version = "0.6.0"
+git = "https://github.com/TheDan64/inkwell.git"
+rev = "7b410298b6a93450adaa90b1841d5805a3038f12"
 default-features = false
-features = ["serde", "llvm18-1", "no-libffi-linking", "target-riscv"]
+features = ["serde", "llvm18-0", "no-libffi-linking", "target-riscv"]

 [profile.bench]
 inherits = "release"
@@ -1,4 +1,4 @@
-FROM rust:1.85.0 AS llvm-builder
+FROM rust:1.84.0 AS llvm-builder
 WORKDIR /opt/revive

 RUN apt update && \ 
@@ -11,7 +11,7 @@ RUN make install-llvm-builder
 RUN revive-llvm --target-env musl clone
 RUN revive-llvm --target-env musl build  --llvm-projects lld --llvm-projects clang

-FROM messense/rust-musl-cross@sha256:c0154e992adb791c3b848dd008939d19862549204f8cb26f5ca7a00f629e6067 AS resolc-builder
+FROM messense/rust-musl-cross@sha256:68b86bc7cb2867259e6b233415a665ff4469c28b57763e78c3bfea1c68091561 AS resolc-builder
 WORKDIR /opt/revive

 RUN apt update && \ 
@@ -11,7 +11,7 @@
 	machete \
 	test \
 	test-integration \
-	test-resolc \
+	test-solidity \
 	test-workspace \
 	test-cli \
 	test-wasm \
@@ -24,24 +24,24 @@
 install: install-bin install-npm

 install-bin:
-	cargo install --force --locked --path crates/resolc
+	cargo install --locked --path crates/solidity

 install-npm:
 	npm install && npm fund

 install-wasm: install-npm
-	cargo build --target wasm32-unknown-emscripten -p resolc --release --no-default-features
+	cargo build --target wasm32-unknown-emscripten -p revive-solidity --release --no-default-features
 	npm run build:package

 install-llvm-builder:
-	cargo install --force --locked --path crates/llvm-builder
+	cargo install --path crates/llvm-builder

 install-llvm: install-llvm-builder
 	revive-llvm clone
 	revive-llvm build --llvm-projects lld --llvm-projects clang

 install-revive-runner:
-	cargo install --locked --force --path crates/runner --no-default-features
+	cargo install --path crates/runner --no-default-features --locked

 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-resolc: install
-	cargo test --package resolc
+test-solidity: install
+	cargo test --package revive-solidity

 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/resolc/src/tests/cli-tests/artifacts ; \
-	cargo uninstall resolc ; \
+	rm -rf crates/solidity/src/tests/cli-tests/artifacts ; \
+	cargo uninstall revive-solidity ; \
 	cargo uninstall revive-llvm-builder ;
@@ -14,39 +14,7 @@ This is experimental software in active development and not ready just yet for p
 Discussion around the development is hosted on the [Polkadot Forum](https://forum.polkadot.network/t/contracts-update-solidity-on-polkavm/6949#a-new-solidity-compiler-1).

 ## Installation
-Building Solidity contracts for PolkaVM requires installing the following two compilers:
- `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.
+Please consult [the documentation](https://contracts.polkadot.io/revive_compiler/installation) for installation instructions.

 ## Building from source

@@ -131,6 +99,8 @@ Ensure that your branch passes `make test` locally when submitting a pull reques
 ### Design overview
 See the [relevant section in our documentation](https://contracts.polkadot.io/revive_compiler/architecture) to learn more about how the compiler works. 

+[Frontend](https://github.com/matter-labs/era-compiler-solidity) and [code generator](https://github.com/matter-labs/era-compiler-llvm-context) are based of ZKSync `zksolc` (the project started as a fork of the era compiler).
+
 ### Tests

 Before running the tests, ensure that Geth (Go Ethereum) is installed on your system. Follow the installation guide here: [Installing Geth](https://geth.ethereum.org/docs/getting-started/installing-geth).
@@ -139,8 +109,3 @@ Once Geth is installed, you can run the tests using the following command:
 ```sh
 make test
 ```
-# Acknowledgements
-
-The revive compiler project, after some early experiments with EVM bytecode translations, decided to fork the `era-compiler` framework.
-[Frontend](https://github.com/matter-labs/era-compiler-solidity), [code generator](https://github.com/matter-labs/era-compiler-llvm-context) and some supporting libraries are based of ZKSync `zksolc`. I'd like to express my gratitude and thank the original authors for providing a useable code base under a generous license.
-
@@ -4,19 +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 versions in the workspace `Cargo.toml` and updates the `CHANGELOG.md` accordingly.
+1. Create a release PR which updates the `-dev.X` versions in the workspace `Cargo.toml` and updates the `CHANGELOG.md` accordingly.
 2. If the CI passes, merge the release PR.
-3. Push a `vX.Y.Z` tag that has the same version as in `Cargo.toml`
+3. Push a tag that has the same `-dev.X` version as in `Cargo.toml`
 4. The release workflow will attempt to build and publish a new pre-release if the latest tag does match the cargo package version.
-5. Wait for the `Release` workflow to finish. It should create the pre-release with the same name.
+5. Wait for the `Release` workflow to finish. It should create the pre-release with the same `-dev.X` name.
 6. Check that pre-release was created on the [Releases page](https://github.com/paritytech/revive/releases) with all artifacts.
 7. After the release is published, another workflow should start automatically and update json files in https://github.com/paritytech/resolc-bin. Check the changes.
 8. Update the [contract-docs](https://github.com/paritytech/contract-docs/) accordingly

-# `resolc` NPM package release
-
-Will happen automatically.
-
 # LLVM release

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

-resolc = { workspace = true }
+revive-solidity = { workspace = true }
 revive-runner = { workspace = true }
 revive-llvm-context = { workspace = true }

@@ -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 {
@@ -38,7 +38,7 @@ pub const MUSL_SNAPSHOTS_URL: &str = "https://git.musl-libc.org/cgit/musl/snapsh
 pub const EMSDK_SOURCE_URL: &str = "https://github.com/emscripten-core/emsdk.git";

 /// The emscripten SDK version.
-pub const EMSDK_VERSION: &str = "4.0.9";
+pub const EMSDK_VERSION: &str = "3.1.64";

 /// The subprocess runner.
 ///
@@ -5,6 +5,7 @@ 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;
@@ -75,6 +76,7 @@ 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;
@@ -25,8 +25,8 @@ 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::memory::MemoryConfig;
 use crate::optimizer::settings::Settings as OptimizerSettings;
 use crate::optimizer::Optimizer;
 use crate::polkavm::DebugConfig;
@@ -88,7 +88,7 @@ where
    /// The extra LLVM arguments that were used during target initialization.
    llvm_arguments: &'ctx [String],
    /// The PVM memory configuration.
-    memory_config: SolcStandardJsonInputSettingsPolkaVMMemory,
+    memory_config: MemoryConfig,

    /// The project dependency manager. It can be any entity implementing the trait.
    /// The manager is used to get information about contracts and their dependencies during
@@ -228,7 +228,7 @@ where
        include_metadata_hash: bool,
        debug_config: DebugConfig,
        llvm_arguments: &'ctx [String],
-        memory_config: SolcStandardJsonInputSettingsPolkaVMMemory,
+        memory_config: MemoryConfig,
    ) -> Self {
        Self::set_data_layout(llvm, &module);
        Self::link_stdlib_module(llvm, &module);
@@ -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;
@@ -91,7 +91,7 @@ pub trait Dependency {
        include_metadata_hash: bool,
        debug_config: DebugConfig,
        llvm_arguments: &[String],
-        memory_config: SolcStandardJsonInputSettingsPolkaVMMemory,
+        memory_config: MemoryConfig,
    ) -> 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: SolcStandardJsonInputSettingsPolkaVMMemory,
+        _memory_config: MemoryConfig,
    ) -> anyhow::Result<String> {
        Ok(String::new())
    }
@@ -17,7 +17,7 @@ path = "src/main.rs"
 [features]
 std = ["polkadot-sdk/std"]
 default = ["solidity"]
-solidity = ["resolc", "revive-differential", "revive-llvm-context"]
+solidity = ["revive-solidity", "revive-differential", "revive-llvm-context"]

 [dependencies]
 env_logger = { workspace = true }
@@ -39,6 +39,6 @@ polkadot-sdk.features = [
    "pallet-timestamp"
 ]

-resolc = { workspace = true, optional = true }
+revive-solidity = { workspace = true, optional = true }
 revive-differential = { workspace = true, optional = true }
 revive-llvm-context = { workspace = true, optional = true }
@@ -44,7 +44,7 @@ pub use crate::specs::*;
 mod runtime;
 mod specs;

-#[cfg(not(feature = "resolc"))]
+#[cfg(not(feature = "revive-solidity"))]
 pub(crate) const NO_SOLIDITY_FRONTEND: &str =
    "revive-runner was built without the solidity frontend; please enable the 'solidity' feature!";

@@ -234,7 +234,7 @@ impl CallResult {

 #[derive(Clone, Debug, Serialize, Deserialize)]
 pub enum Code {
-    #[cfg(feature = "resolc")]
+    #[cfg(feature = "revive-solidity")]
    /// Compile a single solidity source and use the blob of `contract`
    Solidity {
        path: Option<std::path::PathBuf>,
@@ -270,7 +270,7 @@ impl From<Code> for pallet_revive::Code {
                let Ok(source_code) = std::fs::read_to_string(&path) else {
                    panic!("Failed to reead source code from {}", path.display());
                };
-                pallet_revive::Code::Upload(resolc::test_utils::compile_blob_with_options(
+                pallet_revive::Code::Upload(revive_solidity::test_utils::compile_blob_with_options(
                    &contract,
                    &source_code,
                    solc_optimizer.unwrap_or(true),
@@ -94,12 +94,6 @@ impl FindAuthor<<Runtime as frame_system::Config>::AccountId> for Runtime {
    where
        I: 'a + IntoIterator<Item = (frame_support::ConsensusEngineId, &'a [u8])>,
    {
-        Some(
-            [[0xff; 20].as_slice(), [0xee; 12].as_slice()]
-                .concat()
-                .as_slice()
-                .try_into()
-                .unwrap(),
-        )
+        Some([0xff; 32].into())
    }
 }
@@ -4,12 +4,12 @@ use serde::{Deserialize, Serialize};

 use crate::*;
 use alloy_primitives::keccak256;
-#[cfg(feature = "resolc")]
+#[cfg(feature = "revive-solidity")]
 use alloy_primitives::Address;
-#[cfg(feature = "resolc")]
-use resolc::test_utils::*;
-#[cfg(feature = "resolc")]
+#[cfg(feature = "revive-solidity")]
 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 = "resolc")]
+                #[cfg(feature = "revive-solidity")]
                Code::Bytes(bytes) if bytes.is_empty() => {
                    let contract_source = match std::fs::read_to_string(contract_path) {
                        Err(err) => panic!("unable to read {contract_path}: {err}"),
@@ -264,9 +264,9 @@ impl Specs {
                    };
                    *bytes = compile_blob(contract_name, &contract_source)
                }
-                #[cfg(not(feature = "resolc"))]
+                #[cfg(not(feature = "revive-solidity"))]
                Code::Bytes(_) => panic!("{NO_SOLIDITY_FRONTEND}"),
-                #[cfg(feature = "resolc")]
+                #[cfg(feature = "revive-solidity")]
                Code::Solidity { path, .. } if path.is_none() => *path = Some(contract_path.into()),
                _ => continue,
            }
@@ -9,7 +9,7 @@ description = "Implements the low level runtime API bindings with pallet contrac

 [dependencies]
 anyhow = { workspace = true }
-inkwell = { workspace = true, features = ["target-riscv", "no-libffi-linking", "llvm18-1"] }
+inkwell = { workspace = true, features = ["target-riscv", "no-libffi-linking", "llvm18-0"] }

 revive-common = { workspace = true }

@@ -8,8 +8,6 @@ pub use self::standard_json::input::language::Language as SolcStandardJsonInputL
 pub use self::standard_json::input::settings::metadata::Metadata as SolcStandardJsonInputSettingsMetadata;
 pub use self::standard_json::input::settings::metadata_hash::MetadataHash as SolcStandardJsonInputSettingsMetadataHash;
 pub use self::standard_json::input::settings::optimizer::Optimizer as SolcStandardJsonInputSettingsOptimizer;
-pub use self::standard_json::input::settings::polkavm::memory::MemoryConfig as SolcStandardJsonInputSettingsPolkaVMMemory;
-pub use self::standard_json::input::settings::polkavm::PolkaVM as SolcStandardJsonInputSettingsPolkaVM;
 pub use self::standard_json::input::settings::selection::file::flag::Flag as SolcStandardJsonInputSettingsSelectionFileFlag;
 pub use self::standard_json::input::settings::selection::file::File as SolcStandardJsonInputSettingsSelectionFile;
 pub use self::standard_json::input::settings::selection::Selection as SolcStandardJsonInputSettingsSelection;
@@ -18,14 +18,13 @@ use crate::standard_json::input::settings::optimizer::Optimizer as SolcStandardJ
 use crate::standard_json::input::settings::selection::Selection as SolcStandardJsonInputSettingsSelection;
 #[cfg(feature = "resolc")]
 use crate::warning::Warning;
-use crate::SolcStandardJsonInputSettingsPolkaVM;

 use self::language::Language;
 use self::settings::Settings;
 use self::source::Source;

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

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

 use std::collections::BTreeMap;
@@ -14,11 +13,10 @@ use serde::Serialize;

 use self::metadata::Metadata;
 use self::optimizer::Optimizer;
-use self::polkavm::PolkaVM;
 use self::selection::Selection;

 /// The `solc --standard-json` input settings.
-#[derive(Clone, Debug, Serialize, Deserialize)]
+#[derive(Debug, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct Settings {
    /// The target EVM version.
@@ -45,9 +43,6 @@ pub struct Settings {
    /// The metadata settings.
    #[serde(skip_serializing_if = "Option::is_none")]
    pub metadata: Option<Metadata>,
-    /// The resolc custom PolkaVM settings.
-    #[serde(skip_serializing)]
-    pub polkavm: Option<PolkaVM>,
 }

 impl Settings {
@@ -59,7 +54,6 @@ impl Settings {
        output_selection: Selection,
        optimizer: Optimizer,
        metadata: Option<Metadata>,
-        polkavm: Option<PolkaVM>,
    ) -> Self {
        Self {
            evm_version,
@@ -69,7 +63,6 @@ impl Settings {
            optimizer,
            metadata,
            via_ir: Some(true),
-            polkavm,
        }
    }

@@ -4,7 +4,7 @@ use serde::Deserialize;
 use serde::Serialize;

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

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

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

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

 /// The `solc --standard-json` input source.
-#[derive(Clone, Debug, Serialize, Deserialize)]
+#[derive(Debug, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct Source {
    /// The source code file content.
@@ -1,5 +1,5 @@
 [package]
-name = "resolc"
+name = "revive-solidity"
 version.workspace = true
 license.workspace = true
 edition.workspace = true
@@ -18,30 +18,33 @@ path = "src/resolc/main.rs"
 doctest = false

 [dependencies]
-anyhow = { workspace = true }
 clap = { workspace = true }
-hex = { workspace = true }
-inkwell = { workspace = true }
-once_cell = { workspace = true }
+thiserror = { workspace = true }
+anyhow = { workspace = true }
+which = { workspace = true }
 path-slash = { workspace = true }
 rayon = { workspace = true, optional = true }
-semver = { workspace = true }
+
 serde = { workspace = true }
 serde_json = { workspace = true }
+semver = { workspace = true }
+once_cell = { workspace = true }
+regex = { workspace = true }
+hex = { workspace = true }
+num = { workspace = true }
 sha3 = { workspace = true }
-which = { workspace = true }
+inkwell = { workspace = true }

 revive-common = { workspace = true }
 revive-llvm-context = { workspace = true }
 revive-solc-json-interface = { workspace = true, features = ["resolc"] }
-revive-yul = { workspace = true }

 [target.'cfg(target_env = "musl")'.dependencies]
 mimalloc = { version = "*", default-features = false }

 [target.'cfg(target_os = "emscripten")'.dependencies]
 libc = { workspace = true }
-inkwell = { workspace = true, features = ["target-riscv", "llvm18-1-no-llvm-linking"]}
+inkwell = { workspace = true, features = ["target-riscv", "llvm18-0-no-llvm-linking"]}

 [build-dependencies]
 git2 = { workspace = true, default-features = false }
@@ -7,6 +7,7 @@ pub(crate) mod process;
 pub(crate) mod project;
 pub(crate) mod solc;
 pub(crate) mod version;
+pub(crate) mod yul;

 pub use self::build::contract::Contract as ContractBuild;
 pub use self::build::Build;
@@ -44,8 +45,6 @@ use revive_solc_json_interface::ResolcWarning;
 use revive_solc_json_interface::SolcStandardJsonInput;
 use revive_solc_json_interface::SolcStandardJsonInputLanguage;
 use revive_solc_json_interface::SolcStandardJsonInputSettingsOptimizer;
-use revive_solc_json_interface::SolcStandardJsonInputSettingsPolkaVM;
-use revive_solc_json_interface::SolcStandardJsonInputSettingsPolkaVMMemory;
 use revive_solc_json_interface::SolcStandardJsonInputSettingsSelection;

 /// Runs the Yul mode.
@@ -56,7 +55,7 @@ pub fn yul<T: Compiler>(
    include_metadata_hash: bool,
    debug_config: revive_llvm_context::DebugConfig,
    llvm_arguments: &[String],
-    memory_config: SolcStandardJsonInputSettingsPolkaVMMemory,
+    memory_config: revive_llvm_context::MemoryConfig,
 ) -> anyhow::Result<Build> {
    let path = match input_files.len() {
        1 => input_files.first().expect("Always exists"),
@@ -95,7 +94,7 @@ pub fn llvm_ir(
    include_metadata_hash: bool,
    debug_config: revive_llvm_context::DebugConfig,
    llvm_arguments: &[String],
-    memory_config: SolcStandardJsonInputSettingsPolkaVMMemory,
+    memory_config: revive_llvm_context::MemoryConfig,
 ) -> anyhow::Result<Build> {
    let path = match input_files.len() {
        1 => input_files.first().expect("Always exists"),
@@ -136,7 +135,7 @@ pub fn standard_output<T: Compiler>(
    suppressed_warnings: Option<Vec<ResolcWarning>>,
    debug_config: revive_llvm_context::DebugConfig,
    llvm_arguments: &[String],
-    memory_config: SolcStandardJsonInputSettingsPolkaVMMemory,
+    memory_config: revive_llvm_context::MemoryConfig,
 ) -> anyhow::Result<Build> {
    let solc_version = solc.version()?;

@@ -155,10 +154,6 @@ pub fn standard_output<T: Compiler>(
        ),
        None,
        suppressed_warnings,
-        Some(SolcStandardJsonInputSettingsPolkaVM::new(
-            Some(memory_config),
-            debug_config.emit_debug_info,
-        )),
    )?;

    let source_code_files = solc_input
@@ -213,8 +208,9 @@ pub fn standard_json<T: Compiler>(
    base_path: Option<String>,
    include_paths: Vec<String>,
    allow_paths: Option<String>,
-    mut debug_config: revive_llvm_context::DebugConfig,
+    debug_config: revive_llvm_context::DebugConfig,
    llvm_arguments: &[String],
+    memory_config: revive_llvm_context::MemoryConfig,
 ) -> anyhow::Result<()> {
    let solc_version = solc.version()?;

@@ -228,9 +224,6 @@ pub fn standard_json<T: Compiler>(
    let optimizer_settings =
        revive_llvm_context::OptimizerSettings::try_from(&solc_input.settings.optimizer)?;

-    let polkavm_settings = solc_input.settings.polkavm.unwrap_or_default();
-    debug_config.emit_debug_info = polkavm_settings.debug_information;
-
    let include_metadata_hash = match solc_input.settings.metadata {
        Some(ref metadata) => metadata.bytecode_hash != Some(MetadataHash::None),
        None => true,
@@ -265,7 +258,7 @@ pub fn standard_json<T: Compiler>(
            include_metadata_hash,
            debug_config,
            llvm_arguments,
-            polkavm_settings.memory_config,
+            memory_config,
        )?;
        build.write_to_standard_json(&mut solc_output, &solc_version)?;
    }
@@ -293,7 +286,7 @@ pub fn combined_json<T: Compiler>(
    output_directory: Option<PathBuf>,
    overwrite: bool,
    llvm_arguments: &[String],
-    memory_config: SolcStandardJsonInputSettingsPolkaVMMemory,
+    memory_config: revive_llvm_context::MemoryConfig,
 ) -> anyhow::Result<()> {
    let build = standard_output(
        input_files,
@@ -1,7 +1,6 @@
 //! Process for compiling a single compilation unit.
 //! The input data.

-use revive_solc_json_interface::SolcStandardJsonInputSettingsPolkaVMMemory;
 use serde::Deserialize;
 use serde::Serialize;

@@ -24,7 +23,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: SolcStandardJsonInputSettingsPolkaVMMemory,
+    pub memory_config: revive_llvm_context::MemoryConfig,
 }

 impl Input {
@@ -36,7 +35,7 @@ impl Input {
        optimizer_settings: revive_llvm_context::OptimizerSettings,
        debug_config: revive_llvm_context::DebugConfig,
        llvm_arguments: Vec<String>,
-        memory_config: SolcStandardJsonInputSettingsPolkaVMMemory,
+        memory_config: revive_llvm_context::MemoryConfig,
    ) -> Self {
        Self {
            contract,
@@ -8,7 +8,7 @@ use std::collections::HashSet;
 use serde::Deserialize;
 use serde::Serialize;

-use revive_yul::parser::statement::object::Object;
+use crate::yul::parser::statement::object::Object;

 use self::llvm_ir::LLVMIR;
 use self::yul::Yul;
@@ -5,7 +5,7 @@ use std::collections::HashSet;
 use serde::Deserialize;
 use serde::Serialize;

-use revive_yul::parser::statement::object::Object;
+use crate::yul::parser::statement::object::Object;

 /// The contract Yul source code.
 #[derive(Debug, Serialize, Deserialize, Clone)]
@@ -5,7 +5,6 @@ pub mod metadata;

 use std::collections::HashSet;

-use revive_solc_json_interface::SolcStandardJsonInputSettingsPolkaVMMemory;
 use serde::Deserialize;
 use serde::Serialize;
 use sha3::Digest;
@@ -79,7 +78,7 @@ impl Contract {
        include_metadata_hash: bool,
        debug_config: revive_llvm_context::DebugConfig,
        llvm_arguments: &[String],
-        memory_config: SolcStandardJsonInputSettingsPolkaVMMemory,
+        memory_config: revive_llvm_context::MemoryConfig,
    ) -> anyhow::Result<ContractBuild> {
        let llvm = inkwell::context::Context::create();
        let optimizer = revive_llvm_context::Optimizer::new(optimizer_settings);
@@ -9,14 +9,11 @@ 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;
@@ -25,6 +22,8 @@ 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;

@@ -68,7 +67,7 @@ impl Project {
        include_metadata_hash: bool,
        debug_config: revive_llvm_context::DebugConfig,
        llvm_arguments: &[String],
-        memory_config: revive_solc_json_interface::SolcStandardJsonInputSettingsPolkaVMMemory,
+        memory_config: revive_llvm_context::MemoryConfig,
    ) -> anyhow::Result<Build> {
        let project = self.clone();
        #[cfg(feature = "parallel")]
@@ -322,7 +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,
+        memory_config: revive_llvm_context::MemoryConfig,
    ) -> anyhow::Result<String> {
        let contract_path = project.resolve_path(identifier)?;
        let contract = project
@@ -185,8 +185,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")]
-    pub heap_size: Option<u32>,
+    #[arg(long = "heap-size", default_value = "65536")]
+    pub heap_size: u32,

    /// The contracts total stack size in bytes.
    ///
@@ -200,8 +200,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")]
-    pub stack_size: Option<u32>,
+    #[arg(long = "stack-size", default_value = "32768")]
+    pub stack_size: u32,
 }

 impl Arguments {
@@ -330,22 +330,6 @@ impl Arguments {
            if self.metadata_hash.is_some() {
                anyhow::bail!("Metadata hash mode must specified in standard JSON input settings.");
            }
-
-            if self.heap_size.is_some() {
-                anyhow::bail!(
-                    "Heap size must be specified in standard JSON input polkavm memory settings."
-                );
-            }
-            if self.stack_size.is_some() {
-                anyhow::bail!(
-                    "Stack size must be specified in standard JSON input polkavm memory settings."
-                );
-            }
-            if self.emit_source_debug_info {
-                anyhow::bail!(
-                    "Debug info must be requested in standard JSON input polkavm settings."
-                );
-            }
        }

        Ok(())
@@ -5,7 +5,7 @@ pub mod arguments;
 use std::io::Write;
 use std::str::FromStr;

-use resolc::Process;
+use revive_solidity::Process;

 use self::arguments::Arguments;

@@ -36,7 +36,7 @@ fn main_inner() -> anyhow::Result<()> {
            std::io::stdout(),
            "{} version {}",
            env!("CARGO_PKG_DESCRIPTION"),
-            resolc::ResolcVersion::default().long
+            revive_solidity::ResolcVersion::default().long
        )?;
        return Ok(());
    }
@@ -45,8 +45,8 @@ fn main_inner() -> anyhow::Result<()> {
        writeln!(
            std::io::stdout(),
            ">={},<={}",
-            resolc::SolcFirstSupportedVersion,
-            resolc::SolcLastSupportedVersion,
+            revive_solidity::SolcFirstSupportedVersion,
+            revive_solidity::SolcLastSupportedVersion,
        )?;
        return Ok(());
    }
@@ -71,20 +71,20 @@ fn main_inner() -> anyhow::Result<()> {
            let mut infile = std::fs::File::open(fname)?;
            #[cfg(target_os = "emscripten")]
            {
-                return resolc::WorkerProcess::run(Some(&mut infile));
+                return revive_solidity::WorkerProcess::run(Some(&mut infile));
            }
            #[cfg(not(target_os = "emscripten"))]
            {
-                return resolc::NativeProcess::run(Some(&mut infile));
+                return revive_solidity::NativeProcess::run(Some(&mut infile));
            }
        }
        #[cfg(target_os = "emscripten")]
        {
-            return resolc::WorkerProcess::run(None);
+            return revive_solidity::WorkerProcess::run(None);
        }
        #[cfg(not(target_os = "emscripten"))]
        {
-            return resolc::NativeProcess::run(None);
+            return revive_solidity::NativeProcess::run(None);
        }
    }

@@ -111,16 +111,14 @@ fn main_inner() -> anyhow::Result<()> {
    let mut solc = {
        #[cfg(target_os = "emscripten")]
        {
-            resolc::SoljsonCompiler
+            revive_solidity::SoljsonCompiler
        }

        #[cfg(not(target_os = "emscripten"))]
        {
-            resolc::SolcCompiler::new(
-                arguments
-                    .solc
-                    .unwrap_or_else(|| resolc::SolcCompiler::DEFAULT_EXECUTABLE_NAME.to_owned()),
-            )?
+            revive_solidity::SolcCompiler::new(arguments.solc.unwrap_or_else(|| {
+                revive_solidity::SolcCompiler::DEFAULT_EXECUTABLE_NAME.to_owned()
+            }))?
        }
    };

@@ -150,17 +148,13 @@ 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 memory_config = revive_llvm_context::MemoryConfig {
+        heap_size: arguments.heap_size,
+        stack_size: arguments.stack_size,
+    };

    let build = if arguments.yul {
-        resolc::yul(
+        revive_solidity::yul(
            input_files.as_slice(),
            &mut solc,
            optimizer_settings,
@@ -170,7 +164,7 @@ fn main_inner() -> anyhow::Result<()> {
            memory_config,
        )
    } else if arguments.llvm_ir {
-        resolc::llvm_ir(
+        revive_solidity::llvm_ir(
            input_files.as_slice(),
            optimizer_settings,
            include_metadata_hash,
@@ -179,7 +173,7 @@ fn main_inner() -> anyhow::Result<()> {
            memory_config,
        )
    } else if arguments.standard_json {
-        resolc::standard_json(
+        revive_solidity::standard_json(
            &mut solc,
            arguments.detect_missing_libraries,
            arguments.base_path,
@@ -187,10 +181,11 @@ 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 {
-        resolc::combined_json(
+        revive_solidity::combined_json(
            format,
            input_files.as_slice(),
            arguments.libraries,
@@ -212,7 +207,7 @@ fn main_inner() -> anyhow::Result<()> {
        )?;
        return Ok(());
    } else {
-        resolc::standard_output(
+        revive_solidity::standard_output(
            input_files.as_slice(),
            arguments.libraries,
            &mut solc,
@@ -19,7 +19,7 @@ use self::version::Version;
 pub const FIRST_SUPPORTED_VERSION: semver::Version = semver::Version::new(0, 8, 0);

 /// The last supported version of `solc`.
-pub const LAST_SUPPORTED_VERSION: semver::Version = semver::Version::new(0, 8, 30);
+pub const LAST_SUPPORTED_VERSION: semver::Version = semver::Version::new(0, 8, 29);

 /// `--include-path` was introduced in solc `0.8.8` <https://github.com/ethereum/solidity/releases/tag/v0.8.8>
 pub const FIRST_INCLUDE_PATH_VERSION: semver::Version = semver::Version::new(0, 8, 8);
@@ -98,7 +98,6 @@ pub fn build_solidity_with_options(
        ),
        None,
        None,
-        None,
    )?;

    let mut output = solc.standard_json(input, None, vec![], None)?;
@@ -163,7 +162,6 @@ pub fn build_solidity_with_options_evm(
        ),
        None,
        None,
-        None,
    )?;

    let mut output = solc.standard_json(input, None, vec![], None)?;
@@ -215,7 +213,6 @@ pub fn build_solidity_and_detect_missing_libraries(
        SolcStandardJsonInputSettingsOptimizer::new(true, None, &solc_version.default, false),
        None,
        None,
-        None,
    )?;

    let mut output = solc.standard_json(input, None, vec![], None)?;
@@ -289,7 +286,6 @@ pub fn check_solidity_warning(
        SolcStandardJsonInputSettingsOptimizer::new(true, None, &solc_version.default, false),
        None,
        suppressed_warnings,
-        None,
    )?;

    let output = solc.standard_json(input, None, vec![], None)?;
@@ -1,7 +1,7 @@
 //! The Yul IR error.

-use crate::lexer::error::Error as LexerError;
-use crate::parser::error::Error as ParserError;
+use crate::yul::lexer::error::Error as LexerError;
+use crate::yul::parser::error::Error as ParserError;

 /// The Yul IR error.
 #[derive(Debug, thiserror::Error, PartialEq, Eq)]
@@ -1,6 +1,6 @@
 //! The Yul IR lexer error.

-use crate::lexer::token::location::Location;
+use crate::yul::lexer::token::location::Location;

 /// The Yul IR lexer error.
 #[derive(Debug, thiserror::Error, PartialEq, Eq)]
@@ -42,7 +42,6 @@ impl Lexer {
    }

    /// Advances the lexer, returning the next lexeme.
-    #[allow(clippy::should_implement_trait)]
    pub fn next(&mut self) -> Result<Token, Error> {
        if let Some(peeked) = self.peeked.take() {
            return Ok(peeked);
@@ -1,9 +1,9 @@
 //! The Yul IR lexer tests.

-use crate::lexer::error::Error;
-use crate::lexer::token::lexeme::Lexeme;
-use crate::lexer::token::location::Location;
-use crate::lexer::Lexer;
+use crate::yul::lexer::error::Error;
+use crate::yul::lexer::token::lexeme::Lexeme;
+use crate::yul::lexer::token::location::Location;
+use crate::yul::lexer::Lexer;

 #[test]
 fn default() {
@@ -3,7 +3,7 @@
 pub mod multi_line;
 pub mod single_line;

-use crate::lexer::token::Token;
+use crate::yul::lexer::token::Token;

 use self::multi_line::Comment as MultiLineComment;
 use self::single_line::Comment as SingleLineComment;
@@ -1,8 +1,8 @@
 //! The multi-line comment lexeme.

-use crate::lexer::token::lexeme::Lexeme;
-use crate::lexer::token::location::Location;
-use crate::lexer::token::Token;
+use crate::yul::lexer::token::lexeme::Lexeme;
+use crate::yul::lexer::token::location::Location;
+use crate::yul::lexer::token::Token;

 /// The multi-line comment lexeme.
 #[derive(Debug, Clone, PartialEq, Eq)]
@@ -1,8 +1,8 @@
 //! The single-line comment lexeme.

-use crate::lexer::token::lexeme::Lexeme;
-use crate::lexer::token::location::Location;
-use crate::lexer::token::Token;
+use crate::yul::lexer::token::lexeme::Lexeme;
+use crate::yul::lexer::token::location::Location;
+use crate::yul::lexer::token::Token;

 /// The single-line comment lexeme.
 #[derive(Debug, Clone, PartialEq, Eq)]
@@ -1,9 +1,9 @@
 //! The identifier lexeme.

-use crate::lexer::token::lexeme::keyword::Keyword;
-use crate::lexer::token::lexeme::Lexeme;
-use crate::lexer::token::location::Location;
-use crate::lexer::token::Token;
+use crate::yul::lexer::token::lexeme::keyword::Keyword;
+use crate::yul::lexer::token::lexeme::Lexeme;
+use crate::yul::lexer::token::location::Location;
+use crate::yul::lexer::token::Token;

 /// The identifier lexeme.
 #[derive(Debug, Clone, PartialEq, Eq)]
@@ -1,10 +1,10 @@
 //! The keyword lexeme.

-use crate::lexer::token::lexeme::literal::boolean::Boolean as BooleanLiteral;
-use crate::lexer::token::lexeme::literal::Literal;
-use crate::lexer::token::lexeme::Lexeme;
-use crate::lexer::token::location::Location;
-use crate::lexer::token::Token;
+use crate::yul::lexer::token::lexeme::literal::boolean::Boolean as BooleanLiteral;
+use crate::yul::lexer::token::lexeme::literal::Literal;
+use crate::yul::lexer::token::lexeme::Lexeme;
+use crate::yul::lexer::token::location::Location;
+use crate::yul::lexer::token::Token;

 /// The keyword lexeme.
 #[derive(Debug, Clone, PartialEq, Eq)]
@@ -3,7 +3,7 @@
 use serde::Deserialize;
 use serde::Serialize;

-use crate::lexer::token::lexeme::keyword::Keyword;
+use crate::yul::lexer::token::lexeme::keyword::Keyword;

 /// The boolean literal lexeme.
 #[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Eq)]
@@ -3,10 +3,10 @@
 use serde::Deserialize;
 use serde::Serialize;

-use crate::lexer::token::lexeme::Lexeme;
-use crate::lexer::token::lexeme::Literal;
-use crate::lexer::token::location::Location;
-use crate::lexer::token::Token;
+use crate::yul::lexer::token::lexeme::Lexeme;
+use crate::yul::lexer::token::lexeme::Literal;
+use crate::yul::lexer::token::location::Location;
+use crate::yul::lexer::token::Token;

 /// The integer literal lexeme.
 #[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Eq)]
@@ -3,10 +3,10 @@
 use serde::Deserialize;
 use serde::Serialize;

-use crate::lexer::token::lexeme::Lexeme;
-use crate::lexer::token::lexeme::Literal;
-use crate::lexer::token::location::Location;
-use crate::lexer::token::Token;
+use crate::yul::lexer::token::lexeme::Lexeme;
+use crate::yul::lexer::token::lexeme::Literal;
+use crate::yul::lexer::token::location::Location;
+use crate::yul::lexer::token::Token;

 /// The string literal lexeme.
 #[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Eq)]
@@ -1,8 +1,8 @@
 //! The symbol lexeme.

-use crate::lexer::token::lexeme::Lexeme;
-use crate::lexer::token::location::Location;
-use crate::lexer::token::Token;
+use crate::yul::lexer::token::lexeme::Lexeme;
+use crate::yul::lexer::token::location::Location;
+use crate::yul::lexer::token::Token;

 /// The symbol lexeme.
 #[derive(Debug, Clone, PartialEq, Eq)]
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
PG Herveou	761fd8d6a4	Add compiler optimizer option to npm package (#310 )	2025-05-08 12:38:27 +02:00
pgherveou	8b1a36eddf	Run lint:fix	2025-05-08 12:20:38 +02:00