wip

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

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

@@ -5,6 +5,7 @@ inputs:
     required: false
     default: "3.1.64"
 
+
 runs:
   using: "composite"
   steps:

.github/workflows/npm-release.yml

@@ -1,49 +0,0 @@
-name: NPM Release
-
-on:
-    release:
-        types: [released]
-
-env:
-    CI: true
-
-jobs:
-    publish:
-        name: Build & Publish to NPM
-        runs-on: ubuntu-latest
-        steps:
-            - name: Checkout
-              uses: actions/checkout@v4
-
-            - name: Setup Node.js
-              uses: actions/setup-node@v4
-              with:
-                  node-version: 22.x
-
-            - name: Install
-              run: yarn install --immutable
-
-            - name: update-resolc
-              run: yarn update-resolc
-
-            - name: Build
-              run: yarn build
-
-            - name: Set version
-              run: npm version --no-git-tag-version ${{github.event.release.tag_name}}
-
-            - name: npm pack
-              run: npm pack
-
-            - uses: actions/upload-artifact@v4
-              with:
-                  name: package
-                  path: 'parity-revive-*.tgz'
-
-            - uses: octokit/request-action@bbedc70b1981e610d89f1f8de88311a1fc02fb83
-              with:
-                  route: POST /repos/paritytech/npm_publish_automation/actions/workflows/publish.yml/dispatches
-                  ref: main
-                  inputs: '${{ format(''{{ "repo": "{0}", "run_id": "{1}" }}'', github.repository, github.run_id) }}'
-              env:
-                  GITHUB_TOKEN: ${{ secrets.NPM_PUBLISH_AUTOMATION_TOKEN }}

.github/workflows/release-llvm.yml

@@ -37,15 +37,7 @@ jobs:
   build:
     strategy:
       matrix:
-        target:
+        target: [x86_64-unknown-linux-gnu, x86_64-unknown-linux-musl, wasm32-unknown-emscripten, aarch64-apple-darwin, x86_64-apple-darwin, x86_64-pc-windows-msvc]
-          [
-            x86_64-unknown-linux-gnu,
-            x86_64-unknown-linux-musl,
-            wasm32-unknown-emscripten,
-            aarch64-apple-darwin,
-            x86_64-apple-darwin,
-            x86_64-pc-windows-msvc,
-          ]
         include:
           - target: x86_64-unknown-linux-gnu
             builder-arg: gnu

.github/workflows/test-llvm-builder.yml

@@ -4,9 +4,9 @@ on:
     branches: ["main"]
     types: [opened, synchronize]
     paths:
-      - "LLVM.lock"
+      - 'LLVM.lock'
-      - "crates/llvm-builder/**"
+      - 'crates/llvm-builder/**'
-      - ".github/workflows/test-llvm-builder.yml"
+      - '.github/workflows/test-llvm-builder.yml'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}

.gitignore

@@ -1,5 +1,4 @@
 /target
-/js/resolc/dist
 target-llvm
 *.dot
 .vscode/

CHANGELOG.md

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

Cargo.lock

@@ -4553,7 +4553,7 @@ checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104"
 
 [[package]]
 name = "lld-sys"
-version = "0.1.0-dev.14"
+version = "0.1.0-dev.13"
 dependencies = [
  "cc",
  "libc",
@@ -8266,7 +8266,7 @@ dependencies = [
 
 [[package]]
 name = "revive-benchmarks"
-version = "0.1.0-dev.14"
+version = "0.1.0-dev.13"
 dependencies = [
  "alloy-primitives",
  "criterion",
@@ -8278,18 +8278,18 @@ dependencies = [
 
 [[package]]
 name = "revive-build-utils"
-version = "0.1.0-dev.14"
+version = "0.1.0-dev.13"
 
 [[package]]
 name = "revive-builtins"
-version = "0.1.0-dev.14"
+version = "0.1.0-dev.13"
 dependencies = [
  "revive-build-utils",
 ]
 
 [[package]]
 name = "revive-common"
-version = "0.1.0-dev.14"
+version = "0.1.0-dev.13"
 dependencies = [
  "anyhow",
  "serde",
@@ -8299,7 +8299,7 @@ dependencies = [
 
 [[package]]
 name = "revive-differential"
-version = "0.1.0-dev.14"
+version = "0.1.0-dev.13"
 dependencies = [
  "alloy-genesis",
  "alloy-primitives",
@@ -8312,7 +8312,7 @@ dependencies = [
 
 [[package]]
 name = "revive-integration"
-version = "0.1.0-dev.14"
+version = "0.1.0-dev.13"
 dependencies = [
  "alloy-primitives",
  "alloy-sol-types",
@@ -8328,7 +8328,7 @@ dependencies = [
 
 [[package]]
 name = "revive-linker"
-version = "0.1.0-dev.14"
+version = "0.1.0-dev.13"
 dependencies = [
  "anyhow",
  "libc",
@@ -8340,7 +8340,7 @@ dependencies = [
 
 [[package]]
 name = "revive-llvm-builder"
-version = "0.1.0-dev.14"
+version = "0.1.0-dev.13"
 dependencies = [
  "anyhow",
  "assert_cmd",
@@ -8362,7 +8362,7 @@ dependencies = [
 
 [[package]]
 name = "revive-llvm-context"
-version = "0.1.0-dev.14"
+version = "0.1.0-dev.13"
 dependencies = [
  "anyhow",
  "hex",
@@ -8384,12 +8384,9 @@ dependencies = [
 
 [[package]]
 name = "revive-runner"
-version = "0.1.0-dev.14"
+version = "0.1.0-dev.13"
 dependencies = [
  "alloy-primitives",
- "anyhow",
- "clap",
- "env_logger 0.11.6",
  "hex",
  "parity-scale-codec",
  "polkadot-sdk 0.1.0",
@@ -8403,7 +8400,7 @@ dependencies = [
 
 [[package]]
 name = "revive-runtime-api"
-version = "0.1.0-dev.14"
+version = "0.1.0-dev.13"
 dependencies = [
  "anyhow",
  "inkwell",
@@ -8413,7 +8410,7 @@ dependencies = [
 
 [[package]]
 name = "revive-solc-json-interface"
-version = "0.1.0-dev.14"
+version = "0.1.0-dev.13"
 dependencies = [
  "anyhow",
  "rayon",
@@ -8425,7 +8422,7 @@ dependencies = [
 
 [[package]]
 name = "revive-solidity"
-version = "0.1.0-dev.14"
+version = "0.1.0-dev.13"
 dependencies = [
  "anyhow",
  "clap",
@@ -8452,7 +8449,7 @@ dependencies = [
 
 [[package]]
 name = "revive-stdlib"
-version = "0.1.0-dev.14"
+version = "0.1.0-dev.13"
 dependencies = [
  "inkwell",
  "revive-build-utils",

Cargo.toml

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

Makefile

@@ -5,7 +5,6 @@
 	install-wasm \
 	install-llvm-builder \
 	install-llvm \
-	install-revive-runner \
 	format \
 	clippy \
 	machete \
@@ -40,9 +39,6 @@ install-llvm: install-llvm-builder
 	revive-llvm clone
 	revive-llvm build --llvm-projects lld --llvm-projects clang
 
-install-revive-runner:
-	cargo install --path crates/runner --no-default-features --locked
-
 format:
 	cargo fmt --all --check
 
@@ -53,7 +49,7 @@ machete:
 	cargo install cargo-machete
 	cargo machete
 
-test: format clippy machete test-cli test-workspace install-revive-runner
+test: format clippy machete test-cli test-workspace
 
 test-integration: install-bin
 	cargo test --package revive-integration

README.md

@@ -14,7 +14,6 @@ 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 from source
@@ -31,13 +30,11 @@ Building revive requires a [stable Rust installation](https://rustup.rs/) and a
 Download the [latest LLVM build](https://github.com/paritytech/revive/releases?q=LLVM+binaries+release&expanded=true) from our releases.
 
 > **MacOS** users need to clear the `downloaded` attribute from all binaries after extracting the archive:
->
 > ```sh
 > xattr -rc </path/to/the/extracted/archive>/target-llvm/gnu/target-final/bin/*
 > ```
 
 After extracting the archive, point `$LLVM_SYS_181_PREFIX` to it:
-
 ```sh
 export LLVM_SYS_181_PREFIX=</path/to/the/extracted/archive>/target-llvm/gnu/target-final
 ```
@@ -47,7 +44,7 @@ export LLVM_SYS_181_PREFIX=</path/to/the/extracted/archive>/target-llvm/gnu/targ
 <details>
   <summary>Building from source</summary>
 
-Use the provided [revive-llvm](crates/llvm-builder/README.md) utility to compile a compatible LLVM build locally and point `$LLVM_SYS_181_PREFIX` to the installation afterwards.
+ Use the provided [revive-llvm](crates/llvm-builder/README.md) utility to compile a compatible LLVM build locally and point `$LLVM_SYS_181_PREFIX` to the installation afterwards.
 
 The `Makefile` provides a shortcut target to obtain a compatible LLVM build:
 
@@ -100,7 +97,6 @@ Please consult the [Makefile](Makefile) targets to learn how to run tests and be
 Ensure that your branch passes `make test` locally when submitting a pull request.
 
 ### 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).

crates/benchmarks/BENCHMARKS.md

@@ -16,13 +16,13 @@
 ### Baseline
 
 |         | `EVM`                    | `PVMInterpreter`                 |
-| :------ | :------------------------ | :------------------------------- |
+|:--------|:-------------------------|:-------------------------------- |
 | **`0`** | `10.08 us` (✅ **1.00x**) | `10.32 us` (✅ **1.02x slower**)  |
 
 ### OddPorduct
 
 |              | `EVM`                     | `PVMInterpreter`                 |
-| :----------- | :------------------------- | :------------------------------- |
+|:-------------|:--------------------------|:-------------------------------- |
 | **`10000`**  | `3.60 ms` (✅ **1.00x**)   | `1.57 ms` (🚀 **2.28x faster**)   |
 | **`100000`** | `34.72 ms` (✅ **1.00x**)  | `14.82 ms` (🚀 **2.34x faster**)  |
 | **`300000`** | `105.01 ms` (✅ **1.00x**) | `44.11 ms` (🚀 **2.38x faster**)  |
@@ -30,7 +30,7 @@
 ### TriangleNumber
 
 |              | `EVM`                    | `PVMInterpreter`                 |
-| :----------- | :------------------------ | :------------------------------- |
+|:-------------|:-------------------------|:-------------------------------- |
 | **`10000`**  | `2.43 ms` (✅ **1.00x**)  | `1.12 ms` (🚀 **2.17x faster**)   |
 | **`100000`** | `24.20 ms` (✅ **1.00x**) | `10.86 ms` (🚀 **2.23x faster**)  |
 | **`360000`** | `88.69 ms` (✅ **1.00x**) | `38.46 ms` (🚀 **2.31x faster**)  |
@@ -38,7 +38,7 @@
 ### FibonacciRecursive
 
 |          | `EVM`                     | `PVMInterpreter`                  |
-| :------- | :------------------------- | :-------------------------------- |
+|:---------|:--------------------------|:--------------------------------- |
 | **`12`** | `144.17 us` (✅ **1.00x**) | `150.85 us` (✅ **1.05x slower**)  |
 | **`16`** | `938.71 us` (✅ **1.00x**) | `922.11 us` (✅ **1.02x faster**)  |
 | **`20`** | `6.54 ms` (✅ **1.00x**)   | `6.20 ms` (✅ **1.05x faster**)    |
@@ -47,27 +47,27 @@
 ### FibonacciIterative
 
 |           | `EVM`                    | `PVMInterpreter`                 |
-| :-------- | :------------------------ | :------------------------------- |
+|:----------|:-------------------------|:-------------------------------- |
-| **`64`**  | `23.00 us` (✅ **1.00x**) | `31.88 us` (❌ _1.39x slower_)   |
+| **`64`**  | `23.00 us` (✅ **1.00x**) | `31.88 us` (❌ *1.39x slower*)    |
-| **`128`** | `35.28 us` (✅ **1.00x**) | `42.43 us` (❌ _1.20x slower_)   |
+| **`128`** | `35.28 us` (✅ **1.00x**) | `42.43 us` (❌ *1.20x slower*)    |
 | **`256`** | `60.12 us` (✅ **1.00x**) | `61.20 us` (✅ **1.02x slower**)  |
 
 ### FibonacciBinet
 
 |           | `EVM`                    | `PVMInterpreter`                 |
-| :-------- | :------------------------ | :----------------------------- |
+|:----------|:-------------------------|:-------------------------------- |
-| **`64`**  | `23.01 us` (✅ **1.00x**) | `47.74 us` (❌ _2.07x slower_) |
+| **`64`**  | `23.01 us` (✅ **1.00x**) | `47.74 us` (❌ *2.07x slower*)    |
-| **`128`** | `25.44 us` (✅ **1.00x**) | `49.67 us` (❌ _1.95x slower_) |
+| **`128`** | `25.44 us` (✅ **1.00x**) | `49.67 us` (❌ *1.95x slower*)    |
-| **`256`** | `28.66 us` (✅ **1.00x**) | `53.01 us` (❌ _1.85x slower_) |
+| **`256`** | `28.66 us` (✅ **1.00x**) | `53.01 us` (❌ *1.85x slower*)    |
 
 ### SHA1
 
 |           | `EVM`                     | `PVMInterpreter`                  |
-| :-------- | :------------------------- | :------------------------------ |
+|:----------|:--------------------------|:--------------------------------- |
-| **`1`**   | `135.87 us` (✅ **1.00x**) | `243.75 us` (❌ _1.79x slower_) |
+| **`1`**   | `135.87 us` (✅ **1.00x**) | `243.75 us` (❌ *1.79x slower*)    |
-| **`64`**  | `258.45 us` (✅ **1.00x**) | `355.70 us` (❌ _1.38x slower_) |
+| **`64`**  | `258.45 us` (✅ **1.00x**) | `355.70 us` (❌ *1.38x slower*)    |
 | **`512`** | `1.10 ms` (✅ **1.00x**)   | `1.09 ms` (✅ **1.01x faster**)    |
 
 ---
-
 Made with [criterion-table](https://github.com/nu11ptr/criterion-table)
+

crates/integration/codesize.json

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

crates/llvm-builder/README.md

@@ -6,7 +6,6 @@ Parity fork of the [Matter Labs zksync LLVM builder](https://github.com/matter-l
 
 The LLVM compiler framework for revive must be built with our tool called `revive-llvm`.
 This is because the revive compiler has requirements not fullfilled in upstream builds:
-
 - Special builds for compiling the frontend into statically linked ELF binaries and also Wasm executables
 - The RISC-V target (the PolkaVM target)
 - The compiler-rt builtins for the PolkaVM target
@@ -18,23 +17,20 @@ Obtain a compatible build for your host platform from the release section of thi
 <details>
 <summary>1. Install the system prerequisites.</summary>
 
-- Linux (Debian):
+   * Linux (Debian):
 
       Install the following packages:
-
       ```shell
       apt install cmake ninja-build curl git libssl-dev pkg-config clang lld
       ```
-
+   * Linux (Arch):
-- Linux (Arch):
 
       Install the following packages:
-
       ```shell
       pacman -Syu which cmake ninja curl git pkg-config clang lld
       ```
 
-- MacOS:
+   * MacOS:
 
       * Install the [HomeBrew](https://brew.sh) package manager.
       * Install the following packages:
@@ -44,27 +40,24 @@ Obtain a compatible build for your host platform from the release section of thi
          ```
 
       * Install your choice of a recent LLVM/[Clang](https://clang.llvm.org) compiler, e.g. via [Xcode](https://developer.apple.com/xcode/), [Apple’s Command Line Tools](https://developer.apple.com/library/archive/technotes/tn2339/_index.html), or your preferred package manager.
-
+</details>
-  </details>
 
 <details>
 <summary>2. Install Rust.</summary>
 
-- Follow the latest [official instructions](https://www.rust-lang.org/tools/install:
+   * Follow the latest [official instructions](https://www.rust-lang.org/tools/install:
-  `shell
+      ```shell
       curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
       . ${HOME}/.cargo/env
-      `
+      ```
 
       > Currently we are not pinned to any specific version of Rust, so just install the latest stable build for your   platform.
-
+</details>
-  </details>
 
 <details>
 <summary>3. Install the revive LLVM framework builder.</summary>
 
-- Install the builder using `cargo`:
+   * Install the builder using `cargo`:
-
       ```shell
       cargo install --git https://github.com/paritytech/revive-llvm-builder --force --locked
       ```
@@ -76,7 +69,7 @@ Obtain a compatible build for your host platform from the release section of thi
 <details>
 <summary>4. (Optional) Create the `LLVM.lock` file.</summary>
 
-- The `LLVM.lock` dictates the LLVM source tree being used.
+   * The `LLVM.lock` dictates the LLVM source tree being used.
      A default `./LLVM.lock` pointing to the release used for development is already provided.
 
 </details>
@@ -84,7 +77,7 @@ Obtain a compatible build for your host platform from the release section of thi
 <details>
 <summary>5. Build LLVM.</summary>
 
-- Clone and build the LLVM framework using the `revive-llvm` tool.
+   * Clone and build the LLVM framework using the `revive-llvm` tool.
 
      The clang and lld projects are required for the `resolc` Solidity frontend executable; they are enabled by default. LLVM assertions are also enabled by default.
 
@@ -103,7 +96,6 @@ Obtain a compatible build for your host platform from the release section of thi
 ## Supported target architectures
 
 The following target platforms are supported:
-
 - Linux GNU (x86)
 - Linux MUSL (x86)
 - MacOS (aarch64)
@@ -113,12 +105,11 @@ The following target platforms are supported:
 <details>
 <summary>Building for MUSL</summary>
 
-- Via a musl build we can build revive into fully static ELF binaries.
+   * Via a musl build we can build revive into fully static ELF binaries.
      Which is desirable for reproducible Solidity contracts builds.
      The resulting binary is also very portable, akin to the`solc` frontend binary distribution.
 
      Clone and build the LLVM framework using the `revive-llvm` tool:
-
       ```shell
       revive-llvm --target-env musl clone
       revive-llvm --target-env musl build --enable-assertions --llvm-projects clang --llvm-projects lld 
@@ -129,13 +120,13 @@ The following target platforms are supported:
 <details>
 <summary>Building for Emscripten</summary>
 
-- Via an emsdk build we can run revive in the browser and on node.js.
+   * Via an emsdk build we can run revive in the browser and on node.js.
 
      Clone and build the LLVM framework using the `revive-llvm` tool:
-
       ```shell
       revive-llvm --target-env emscripten clone
       revive-llvm --target-env emscripten build --enable-assertions --llvm-projects clang --llvm-projects lld 
       ```
 
 </details>
+

crates/llvm-context/src/lib.rs

@@ -5,7 +5,6 @@ use std::sync::OnceLock;
 
 pub use self::debug_config::ir_type::IRType as DebugConfigIR;
 pub use self::debug_config::DebugConfig;
-pub use self::memory::MemoryConfig;
 pub use self::optimizer::settings::size_level::SizeLevel as OptimizerSettingsSizeLevel;
 pub use self::optimizer::settings::Settings as OptimizerSettings;
 pub use self::optimizer::Optimizer;
@@ -29,7 +28,6 @@ pub use self::polkavm::context::function::runtime::entry::Entry as PolkaVMEntryF
 pub use self::polkavm::context::function::runtime::revive::Exit as PolkaVMExitFunction;
 pub use self::polkavm::context::function::runtime::revive::WordToPointer as PolkaVMWordToPointerFunction;
 pub use self::polkavm::context::function::runtime::runtime_code::RuntimeCode as PolkaVMRuntimeCodeFunction;
-pub use self::polkavm::context::function::runtime::sbrk::Sbrk as PolkaVMSbrkFunction;
 pub use self::polkavm::context::function::runtime::FUNCTION_DEPLOY_CODE as PolkaVMFunctionDeployCode;
 pub use self::polkavm::context::function::runtime::FUNCTION_ENTRY as PolkaVMFunctionEntry;
 pub use self::polkavm::context::function::runtime::FUNCTION_RUNTIME_CODE as PolkaVMFunctionRuntimeCode;
@@ -62,6 +60,7 @@ pub use self::polkavm::evm::ext_code as polkavm_evm_ext_code;
 pub use self::polkavm::evm::immutable as polkavm_evm_immutable;
 pub use self::polkavm::evm::immutable::Load as PolkaVMLoadImmutableDataFunction;
 pub use self::polkavm::evm::immutable::Store as PolkaVMStoreImmutableDataFunction;
+
 pub use self::polkavm::evm::math as polkavm_evm_math;
 pub use self::polkavm::evm::memory as polkavm_evm_memory;
 pub use self::polkavm::evm::r#return as polkavm_evm_return;
@@ -76,7 +75,6 @@ pub use self::target_machine::target::Target;
 pub use self::target_machine::TargetMachine;
 
 pub(crate) mod debug_config;
-pub(crate) mod memory;
 pub(crate) mod optimizer;
 pub(crate) mod polkavm;
 pub(crate) mod target_machine;

crates/llvm-context/src/memory.rs

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

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

@@ -9,12 +9,6 @@ pub static XLEN: usize = revive_common::BIT_LENGTH_X32;
 /// The calldata size global variable name.
 pub static GLOBAL_CALLDATA_SIZE: &str = "calldatasize";
 
-/// The heap size global variable name.
-pub static GLOBAL_HEAP_SIZE: &str = "__heap_size";
-
-/// The heap memory global variable name.
-pub static GLOBAL_HEAP_MEMORY: &str = "__heap_memory";
-
 /// The spill buffer global variable name.
 pub static GLOBAL_ADDRESS_SPILL_BUFFER: &str = "address_spill_buffer";
 

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

@@ -31,23 +31,6 @@ impl Entry {
             context.xlen_type().get_undef(),
         );
 
-        context.set_global(
-            crate::polkavm::GLOBAL_HEAP_SIZE,
-            context.xlen_type(),
-            AddressSpace::Stack,
-            context.xlen_type().const_zero(),
-        );
-
-        let heap_memory_type = context
-            .byte_type()
-            .array_type(context.memory_config.heap_size);
-        context.set_global(
-            crate::polkavm::GLOBAL_HEAP_MEMORY,
-            heap_memory_type,
-            AddressSpace::Stack,
-            heap_memory_type.const_zero(),
-        );
-
         let address_type = context.integer_type(revive_common::BIT_LENGTH_ETH_ADDRESS);
         context.set_global(
             crate::polkavm::GLOBAL_ADDRESS_SPILL_BUFFER,

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

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

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

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

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

@@ -26,7 +26,6 @@ use inkwell::debug_info::DIScope;
 use inkwell::types::BasicType;
 use inkwell::values::BasicValue;
 
-use crate::memory::MemoryConfig;
 use crate::optimizer::settings::Settings as OptimizerSettings;
 use crate::optimizer::Optimizer;
 use crate::polkavm::DebugConfig;
@@ -34,7 +33,6 @@ use crate::polkavm::Dependency;
 use crate::target_machine::target::Target;
 use crate::target_machine::TargetMachine;
 use crate::PolkaVMLoadHeapWordFunction;
-use crate::PolkaVMSbrkFunction;
 use crate::PolkaVMStoreHeapWordFunction;
 
 use self::address_space::AddressSpace;
@@ -87,8 +85,6 @@ where
     loop_stack: Vec<Loop<'ctx>>,
     /// The extra LLVM arguments that were used during target initialization.
     llvm_arguments: &'ctx [String],
-    /// The PVM memory configuration.
-    memory_config: MemoryConfig,
 
     /// The project dependency manager. It can be any entity implementing the trait.
     /// The manager is used to get information about contracts and their dependencies during
@@ -120,6 +116,9 @@ where
     /// The loop stack default capacity.
     const LOOP_STACK_INITIAL_CAPACITY: usize = 16;
 
+    /// The PolkaVM minimum stack size.
+    const POLKAVM_STACK_SIZE: u32 = 0x4000;
+
     /// Link in the stdlib module.
     fn link_stdlib_module(
         llvm: &'ctx inkwell::context::Context,
@@ -219,7 +218,6 @@ where
     }
 
     /// Initializes a new LLVM context.
-    #[allow(clippy::too_many_arguments)]
     pub fn new(
         llvm: &'ctx inkwell::context::Context,
         module: inkwell::module::Module<'ctx>,
@@ -228,12 +226,11 @@ where
         include_metadata_hash: bool,
         debug_config: DebugConfig,
         llvm_arguments: &'ctx [String],
-        memory_config: MemoryConfig,
     ) -> Self {
         Self::set_data_layout(llvm, &module);
         Self::link_stdlib_module(llvm, &module);
         Self::link_polkavm_imports(llvm, &module);
-        Self::set_polkavm_stack_size(llvm, &module, memory_config.stack_size);
+        Self::set_polkavm_stack_size(llvm, &module, Self::POLKAVM_STACK_SIZE);
         Self::set_module_flags(llvm, &module);
 
         let intrinsics = Intrinsics::new(llvm, &module);
@@ -257,7 +254,6 @@ where
             current_function: None,
             loop_stack: Vec::with_capacity(Self::LOOP_STACK_INITIAL_CAPACITY),
             llvm_arguments,
-            memory_config,
 
             dependency_manager,
             include_metadata_hash,
@@ -648,7 +644,6 @@ where
                     self.include_metadata_hash,
                     self.debug_config.clone(),
                     self.llvm_arguments,
-                    self.memory_config,
                 )
             })
     }
@@ -778,27 +773,49 @@ where
             .into())
     }
 
-    /// Builds a stack load instruction.
+    /// Builds a stack load instruction with a direct assignment.
     /// Sets the alignment to 256 bits for the stack and 1 bit for the heap, parent, and child.
-    pub fn build_load(
+    pub fn build_load_assign(
         &self,
         pointer: Pointer<'ctx>,
         name: &str,
-    ) -> anyhow::Result<inkwell::values::BasicValueEnum<'ctx>> {
+        assignment_pointer: &mut Option<inkwell::values::PointerValue<'ctx>>,
+    ) -> anyhow::Result<Option<inkwell::values::BasicValueEnum<'ctx>>> {
         match pointer.address_space {
             AddressSpace::Heap => {
-                let name = <PolkaVMLoadHeapWordFunction as RuntimeFunction<D>>::NAME;
                 let declaration =
                     <PolkaVMLoadHeapWordFunction as RuntimeFunction<D>>::declaration(self);
-                let arguments = [self
+                match assignment_pointer.take() {
-                    .builder()
+                    Some(assignment_pointer) => {
-                    .build_ptr_to_int(pointer.value, self.xlen_type(), "offset_ptrtoint")?
+                        let arguments = [
-                    .as_basic_value_enum()];
+                            self.builder()
-                Ok(self
+                                .build_ptr_to_int(
-                    .build_call(declaration, &arguments, "heap_load")
+                                    pointer.value,
-                    .unwrap_or_else(|| {
+                                    self.xlen_type(),
-                        panic!("revive runtime function {name} should return a value")
+                                    "offset_ptrtoint",
-                    }))
+                                )?
+                                .as_basic_value_enum(),
+                            assignment_pointer.into(),
+                        ];
+                        self.build_call(declaration, &arguments, "heap_load");
+                        Ok(None)
+                    }
+                    None => {
+                        let pointer = self.build_alloca_at_entry(self.word_type(), "pointer");
+                        let arguments = [
+                            self.builder()
+                                .build_ptr_to_int(
+                                    pointer.value,
+                                    self.xlen_type(),
+                                    "offset_ptrtoint",
+                                )?
+                                .as_basic_value_enum(),
+                            pointer.value.into(),
+                        ];
+                        self.build_call(declaration, &arguments, "heap_load");
+                        Ok(Some(self.build_load(pointer, "storage_value")?))
+                    }
+                }
             }
             AddressSpace::Stack => {
                 let value = self
@@ -811,11 +828,23 @@ where
                     .set_alignment(revive_common::BYTE_LENGTH_STACK_ALIGN as u32)
                     .expect("Alignment is valid");
 
-                Ok(value)
+                Ok(Some(value))
             }
         }
     }
 
+    /// Builds a stack load instruction.
+    /// Sets the alignment to 256 bits for the stack and 1 bit for the heap, parent, and child.
+    pub fn build_load(
+        &self,
+        pointer: Pointer<'ctx>,
+        name: &str,
+    ) -> anyhow::Result<inkwell::values::BasicValueEnum<'ctx>> {
+        Ok(self
+            .build_load_assign(pointer, name, &mut None)?
+            .expect("without an assignment pointer loads return a value"))
+    }
+
     /// Builds a stack store instruction.
     /// Sets the alignment to 256 bits for the stack and 1 bit for the heap, parent, and child.
     pub fn build_store<V>(&self, pointer: Pointer<'ctx>, value: V) -> anyhow::Result<()>
@@ -1089,40 +1118,32 @@ where
         offset: inkwell::values::IntValue<'ctx>,
         size: inkwell::values::IntValue<'ctx>,
     ) -> anyhow::Result<inkwell::values::PointerValue<'ctx>> {
-        let call_site_value = self.builder().build_call(
+        Ok(self
-            <PolkaVMSbrkFunction as RuntimeFunction<D>>::declaration(self).function_value(),
+            .builder()
+            .build_call(
+                self.runtime_api_method(revive_runtime_api::polkavm_imports::SBRK),
                 &[offset.into(), size.into()],
-            "alloc_start",
+                "call_sbrk",
-        )?;
+            )?
-
-        call_site_value.add_attribute(
-            inkwell::attributes::AttributeLoc::Return,
-            self.llvm
-                .create_enum_attribute(Attribute::NonNull as u32, 0),
-        );
-        call_site_value.add_attribute(
-            inkwell::attributes::AttributeLoc::Return,
-            self.llvm
-                .create_enum_attribute(Attribute::NoUndef as u32, 0),
-        );
-
-        Ok(call_site_value
             .try_as_basic_value()
             .left()
-            .unwrap_or_else(|| {
+            .expect("sbrk returns a pointer")
-                panic!(
-                    "revive runtime function {} should return a value",
-                    <PolkaVMSbrkFunction as RuntimeFunction<D>>::NAME,
-                )
-            })
             .into_pointer_value())
     }
 
     /// Build a call to PolkaVM `msize` for querying the linear memory size.
     pub fn build_msize(&self) -> anyhow::Result<inkwell::values::IntValue<'ctx>> {
-        Ok(self
+        let memory_size_pointer = self
-            .get_global_value(crate::polkavm::GLOBAL_HEAP_SIZE)?
+            .module()
-            .into_int_value())
+            .get_global(revive_runtime_api::polkavm_imports::MEMORY_SIZE)
+            .expect("the memory size symbol should have been declared")
+            .as_pointer_value();
+        let memory_size_value = self.builder().build_load(
+            self.xlen_type(),
+            memory_size_pointer,
+            "memory_size_value",
+        )?;
+        Ok(memory_size_value.into_int_value())
     }
 
     /// Returns a pointer to `offset` into the heap, allocating
@@ -1441,9 +1462,4 @@ where
     pub fn optimizer_settings(&self) -> &OptimizerSettings {
         self.optimizer.settings()
     }
-
-    pub fn heap_size(&self) -> inkwell::values::IntValue<'ctx> {
-        self.xlen_type()
-            .const_int(self.memory_config.heap_size as u64, false)
-    }
 }

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

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

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

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

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

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

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

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

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

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

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

@@ -7,7 +7,6 @@ pub mod evm;
 pub use self::r#const::*;
 
 use crate::debug_config::DebugConfig;
-use crate::memory::MemoryConfig;
 use crate::optimizer::settings::Settings as OptimizerSettings;
 
 use anyhow::Context as AnyhowContext;
@@ -91,7 +90,6 @@ pub trait Dependency {
         include_metadata_hash: bool,
         debug_config: DebugConfig,
         llvm_arguments: &[String],
-        memory_config: MemoryConfig,
     ) -> anyhow::Result<String>;
 
     /// Resolves a full contract path.
@@ -113,7 +111,6 @@ impl Dependency for DummyDependency {
         _include_metadata_hash: bool,
         _debug_config: DebugConfig,
         _llvm_arguments: &[String],
-        _memory_config: MemoryConfig,
     ) -> anyhow::Result<String> {
         Ok(String::new())
     }

crates/runner/Cargo.toml

@@ -10,19 +10,12 @@ description = "Execute revive contracts in a simulated blockchain runtime"
 [package.metadata.cargo-machete]
 ignored = ["codec", "scale-info"]
 
-[[bin]]
-name = "revive-runner"
-path = "src/main.rs"
-
 [features]
 std = ["polkadot-sdk/std"]
 default = ["solidity"]
-solidity = ["revive-solidity", "revive-differential", "revive-llvm-context"]
+solidity = ["revive-solidity", "revive-differential"]
 
 [dependencies]
-env_logger = { workspace = true }
-clap = { workspace = true, features = ["help", "std", "derive"] }
-anyhow = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
 hex = { workspace = true, features = ["serde"] }
@@ -41,4 +34,4 @@ polkadot-sdk.features = [
 
 revive-solidity = { workspace = true, optional = true }
 revive-differential = { workspace = true, optional = true }
-revive-llvm-context = { workspace = true, optional = true }
+revive-llvm-context = { workspace = true }

crates/runner/README.md

@@ -1,27 +0,0 @@
-# revive-runner
-
-The revive runner is a helper utility aiding in contract debugging.
-
-Given a PVM contract blob, it will upload, deploy and call that contract using a local, stand-alone un-blockchained pallet revive (which is our execution layer).
-
-This is somewhat similar to the geth `evm` utility binary.
-
-## Installation
-
-The `revive-runner` does not depend on the compiler itself, hence installing this utility does not depend on LLVM, so no LLVM build is required.
-
-Inside the root `revive` repository directory, execute:
-
-```bash
-make install-revive-runner
-```
-
-Which will install the `revive-runner` using `cargo`.
-
-## Usage
-
-Set the `RUST_LOG` environment varibale to the `trace` level to see the full PolkaVM execution trace. For example:
-
-```bash
-RUST_LOG=trace revive-runner -f mycontract.pvm -c a9059cbb000000000000000000000000f24ff3a9cf04c71dbc94d0b566f7a27b94566cac0000000000000000000000000000000000000000000000000000000000000000
-```

crates/runner/src/main.rs

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

crates/runner/src/specs.rs

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

crates/runtime-api/src/polkavm_imports.c

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

crates/runtime-api/src/polkavm_imports.rs

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

crates/solidity/src/lib.rs

@@ -55,7 +55,6 @@ pub fn yul<T: Compiler>(
     include_metadata_hash: bool,
     debug_config: revive_llvm_context::DebugConfig,
     llvm_arguments: &[String],
-    memory_config: revive_llvm_context::MemoryConfig,
 ) -> anyhow::Result<Build> {
     let path = match input_files.len() {
         1 => input_files.first().expect("Always exists"),
@@ -81,7 +80,6 @@ pub fn yul<T: Compiler>(
         include_metadata_hash,
         debug_config,
         llvm_arguments,
-        memory_config,
     )?;
 
     Ok(build)
@@ -94,7 +92,6 @@ pub fn llvm_ir(
     include_metadata_hash: bool,
     debug_config: revive_llvm_context::DebugConfig,
     llvm_arguments: &[String],
-    memory_config: revive_llvm_context::MemoryConfig,
 ) -> anyhow::Result<Build> {
     let path = match input_files.len() {
         1 => input_files.first().expect("Always exists"),
@@ -112,7 +109,6 @@ pub fn llvm_ir(
         include_metadata_hash,
         debug_config,
         llvm_arguments,
-        memory_config,
     )?;
 
     Ok(build)
@@ -135,7 +131,6 @@ pub fn standard_output<T: Compiler>(
     suppressed_warnings: Option<Vec<ResolcWarning>>,
     debug_config: revive_llvm_context::DebugConfig,
     llvm_arguments: &[String],
-    memory_config: revive_llvm_context::MemoryConfig,
 ) -> anyhow::Result<Build> {
     let solc_version = solc.version()?;
 
@@ -194,14 +189,12 @@ pub fn standard_output<T: Compiler>(
         include_metadata_hash,
         debug_config,
         llvm_arguments,
-        memory_config,
     )?;
 
     Ok(build)
 }
 
 /// Runs the standard JSON mode.
-#[allow(clippy::too_many_arguments)]
 pub fn standard_json<T: Compiler>(
     solc: &mut T,
     detect_missing_libraries: bool,
@@ -210,7 +203,6 @@ pub fn standard_json<T: Compiler>(
     allow_paths: Option<String>,
     debug_config: revive_llvm_context::DebugConfig,
     llvm_arguments: &[String],
-    memory_config: revive_llvm_context::MemoryConfig,
 ) -> anyhow::Result<()> {
     let solc_version = solc.version()?;
 
@@ -258,7 +250,6 @@ pub fn standard_json<T: Compiler>(
             include_metadata_hash,
             debug_config,
             llvm_arguments,
-            memory_config,
         )?;
         build.write_to_standard_json(&mut solc_output, &solc_version)?;
     }
@@ -286,7 +277,6 @@ pub fn combined_json<T: Compiler>(
     output_directory: Option<PathBuf>,
     overwrite: bool,
     llvm_arguments: &[String],
-    memory_config: revive_llvm_context::MemoryConfig,
 ) -> anyhow::Result<()> {
     let build = standard_output(
         input_files,
@@ -303,7 +293,6 @@ pub fn combined_json<T: Compiler>(
         suppressed_warnings,
         debug_config,
         llvm_arguments,
-        memory_config,
     )?;
 
     let mut combined_json = solc.combined_json(input_files, format.as_str())?;

crates/solidity/src/process/input.rs

@@ -22,8 +22,6 @@ pub struct Input {
     pub debug_config: revive_llvm_context::DebugConfig,
     /// The extra LLVM arguments give used for manual control.
     pub llvm_arguments: Vec<String>,
-    /// The PVM memory configuration.
-    pub memory_config: revive_llvm_context::MemoryConfig,
 }
 
 impl Input {
@@ -35,7 +33,6 @@ impl Input {
         optimizer_settings: revive_llvm_context::OptimizerSettings,
         debug_config: revive_llvm_context::DebugConfig,
         llvm_arguments: Vec<String>,
-        memory_config: revive_llvm_context::MemoryConfig,
     ) -> Self {
         Self {
             contract,
@@ -44,7 +41,6 @@ impl Input {
             optimizer_settings,
             debug_config,
             llvm_arguments,
-            memory_config,
         }
     }
 }

crates/solidity/src/process/mod.rs

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

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

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

crates/solidity/src/project/mod.rs

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

crates/solidity/src/resolc/arguments.rs

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

crates/solidity/src/resolc/main.rs

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

crates/solidity/src/test_utils.rs

@@ -115,13 +115,8 @@ pub fn build_solidity_with_options(
         &debug_config,
     )?;
 
-    let build: crate::Build = project.compile(
+    let build: crate::Build =
-        optimizer_settings,
+        project.compile(optimizer_settings, false, debug_config, Default::default())?;
-        false,
-        debug_config,
-        Default::default(),
-        Default::default(),
-    )?;
     build.write_to_standard_json(&mut output, &solc_version)?;
 
     Ok(output)
@@ -248,13 +243,7 @@ pub fn build_yul(source_code: &str) -> anyhow::Result<()> {
         source_code,
         None,
     )?;
-    let _build = project.compile(
+    let _build = project.compile(optimizer_settings, false, DEBUG_CONFIG, Default::default())?;
-        optimizer_settings,
-        false,
-        DEBUG_CONFIG,
-        Default::default(),
-        Default::default(),
-    )?;
 
     Ok(())
 }

crates/solidity/src/tests/cli-tests/src/contracts/compiled/1.json

@@ -90,10 +90,14 @@
         },
         "outputSelection": {
             "*": {
-        "": ["ast"]
+                "": [
+                    "ast"
+                ]
             }
         },
         "evmVersion": "berlin",
-    "remappings": ["forge-std/=lib/forge-std/src/"]
+        "remappings": [
+            "forge-std/=lib/forge-std/src/"
+        ]
     }
 }

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

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

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

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

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

@@ -1,11 +1,12 @@
-import { executeCommand } from "../src/helper";
+import {executeCommand} from "../src/helper";
-import { paths } from "../src/entities";
+import { paths } from '../src/entities';
+
 
 //id1746
 describe("Run with --asm by default", () => {
   const command = `resolc ${paths.pathToBasicSolContract} --asm`;
   const result = executeCommand(command);
-  const commandInvalid = "resolc --asm";
+  const commandInvalid = 'resolc --asm';
   const resultInvalid = executeCommand(commandInvalid);
 
   it("Valid command exit code = 0", () => {
@@ -27,9 +28,7 @@ describe("Run with --asm by default", () => {
   });
 
   it("run invalid: resolc --asm", () => {
-    expect(resultInvalid.output).toMatch(
+    expect(resultInvalid.output).toMatch(/(No input sources specified|Compilation aborted)/i);
-      /(No input sources specified|Compilation aborted)/i,
-    );
   });
   
   it("Invalid command exit code = 1", () => {
@@ -37,7 +36,7 @@ describe("Run with --asm by default", () => {
   });
 
   it("Invalid solc exit code == Invalid resolc exit code", () => {
-    const command = "solc --asm";
+    const command = 'solc --asm';
     const solcResult = executeCommand(command);
     expect(solcResult.exitCode).toBe(resultInvalid.exitCode);
   });

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

@@ -1,16 +1,12 @@
-import {
+import { executeCommand, isFolderExist, isFileExist, isFileEmpty } from "../src/helper";
-  executeCommand,
+import { paths } from '../src/entities';
-  isFolderExist,
+import * as shell from 'shelljs';
-  isFileExist,
+import * as path from 'path';
-  isFileEmpty,
+
-} from "../src/helper";
-import { paths } from "../src/entities";
-import * as shell from "shelljs";
-import * as path from "path";
 
 //id1762
 describe("Run resolc without any options", () => {
-  const command = "resolc";
+    const command = 'resolc';
     const result = executeCommand(command);
 
     it("Info with help is presented", () => {
@@ -22,14 +18,16 @@ describe("Run resolc without any options", () => {
     });
 
     it("solc exit code == resolc exit code", () => {
-    const command = "solc";
+        const command = 'solc';
         const solcResult = executeCommand(command);
         expect(solcResult.exitCode).toBe(result.exitCode);
     });
 });
 
+
 //#1713
 describe("Default run a command from the help", () => {
+
     const command = `resolc ${paths.pathToBasicSolContract} --overwrite -O3 --bin --output-dir "${paths.pathToOutputDir}"`; // potential issue on resolc with full path on Windows cmd
     const result = executeCommand(command);
 
@@ -42,15 +40,8 @@ describe("Default run a command from the help", () => {
     it("Output dir is created", () => {
         expect(isFolderExist(paths.pathToOutputDir)).toBe(true);
     });
-  xit("Output file is created", () => {
+    xit("Output file is created", () => { // a bug on windows
-    // a bug on windows
+        expect(isFileExist(paths.pathToOutputDir, paths.contractSolFilename, paths.binExtension)).toBe(true);
-    expect(
-      isFileExist(
-        paths.pathToOutputDir,
-        paths.contractSolFilename,
-        paths.binExtension,
-      ),
-    ).toBe(true);
     });
     it("the output file is not empty", () => {
         expect(isFileEmpty(paths.pathToSolBinOutputFile)).toBe(false);
@@ -62,6 +53,7 @@ describe("Default run a command from the help", () => {
 
 //#1818
 describe("Default run a command from the help", () => {
+
     const command = `resolc ${paths.pathToBasicSolContract} --overwrite -O3 --bin --asm --output-dir "${paths.pathToOutputDir}"`; // potential issue on resolc with full path on Windows cmd
     const result = executeCommand(command);
 
@@ -74,22 +66,9 @@ describe("Default run a command from the help", () => {
     it("Output dir is created", () => {
         expect(isFolderExist(paths.pathToOutputDir)).toBe(true);
     });
-  xit("Output files are created", () => {
+    xit("Output files are created", () => { // a bug on windows
-    // a bug on windows
+        expect(isFileExist(paths.pathToOutputDir, paths.contractSolFilename, paths.binExtension)).toBe(true);
-    expect(
+        expect(isFileExist(paths.pathToOutputDir, paths.contractSolFilename, paths.asmExtension)).toBe(true);
-      isFileExist(
-        paths.pathToOutputDir,
-        paths.contractSolFilename,
-        paths.binExtension,
-      ),
-    ).toBe(true);
-    expect(
-      isFileExist(
-        paths.pathToOutputDir,
-        paths.contractSolFilename,
-        paths.asmExtension,
-      ),
-    ).toBe(true);
     });
     it("the output files are not empty", () => {
         expect(isFileEmpty(paths.pathToSolBinOutputFile)).toBe(false);
@@ -103,7 +82,7 @@ describe("Default run a command from the help", () => {
 describe("Run resolc with source debug information", () => {
     const commands = [
         `resolc -g ${paths.pathToBasicSolContract} --overwrite --bin --asm --output-dir "${paths.pathToOutputDir}"`,
-    `resolc --disable-solc-optimizer -g ${paths.pathToBasicSolContract} --overwrite --bin --asm --output-dir "${paths.pathToOutputDir}"`,
+        `resolc --disable-solc-optimizer -g ${paths.pathToBasicSolContract} --overwrite --bin --asm --output-dir "${paths.pathToOutputDir}"`
     ]; // potential issue on resolc with full path on Windows cmd`;
 
     for (var idx in commands) {
@@ -119,22 +98,9 @@ describe("Run resolc with source debug information", () => {
         it("Output dir is created", () => {
             expect(isFolderExist(paths.pathToOutputDir)).toBe(true);
         });
-    it("Output files are created", () => {
+        it("Output files are created", () => { // a bug on windows
-      // a bug on windows
+            expect(isFileExist(paths.pathToOutputDir, paths.contractSolFilename, paths.binExtension)).toBe(true);
-      expect(
+            expect(isFileExist(paths.pathToOutputDir, paths.contractSolFilename, paths.asmExtension)).toBe(true);
-        isFileExist(
-          paths.pathToOutputDir,
-          paths.contractSolFilename,
-          paths.binExtension,
-        ),
-      ).toBe(true);
-      expect(
-        isFileExist(
-          paths.pathToOutputDir,
-          paths.contractSolFilename,
-          paths.asmExtension,
-        ),
-      ).toBe(true);
         });
         it("the output files are not empty", () => {
             expect(isFileEmpty(paths.pathToSolBinOutputFile)).toBe(false);
@@ -149,7 +115,7 @@ describe("Run resolc with source debug information", () => {
 describe("Run resolc with source debug information, check LLVM debug-info", () => {
     const commands = [
         `resolc -g ${paths.pathToBasicSolContract} --overwrite --debug-output-dir="${paths.pathToOutputDir}"`,
-    `resolc -g --disable-solc-optimizer ${paths.pathToBasicSolContract} --overwrite --debug-output-dir="${paths.pathToOutputDir}"`,
+        `resolc -g --disable-solc-optimizer ${paths.pathToBasicSolContract} --overwrite --debug-output-dir="${paths.pathToOutputDir}"`
     ]; // potential issue on resolc with full path on Windows cmd`;
 
     for (var idx in commands) {
@@ -165,22 +131,9 @@ describe("Run resolc with source debug information, check LLVM debug-info", () =
         it("Output dir is created", () => {
             expect(isFolderExist(paths.pathToOutputDir)).toBe(true);
         });
-    it("Output files are created", () => {
+        it("Output files are created", () => { // a bug on windows
-      // a bug on windows
+            expect(isFileExist(paths.pathToOutputDir, paths.contractOptimizedLLVMFilename, paths.llvmExtension)).toBe(true);
-      expect(
+            expect(isFileExist(paths.pathToOutputDir, paths.contractUnoptimizedLLVMFilename, paths.llvmExtension)).toBe(true);
-        isFileExist(
-          paths.pathToOutputDir,
-          paths.contractOptimizedLLVMFilename,
-          paths.llvmExtension,
-        ),
-      ).toBe(true);
-      expect(
-        isFileExist(
-          paths.pathToOutputDir,
-          paths.contractUnoptimizedLLVMFilename,
-          paths.llvmExtension,
-        ),
-      ).toBe(true);
         });
         it("the output files are not empty", () => {
             expect(isFileEmpty(paths.pathToSolBinOutputFile)).toBe(false);
@@ -192,33 +145,33 @@ describe("Run resolc with source debug information, check LLVM debug-info", () =
     }
 });
 
+
+
 describe("Standard JSON compilation with path options", () => {
-  const contractsDir = path.join(shell.tempdir(), "contracts-test");
+    const contractsDir = path.join(shell.tempdir(), 'contracts-test');
-  const inputFile = path.join(__dirname, "..", "src/contracts/compiled/1.json");
+    const inputFile = path.join(__dirname, '..', 'src/contracts/compiled/1.json');
 
     beforeAll(() => {
-    shell.mkdir("-p", contractsDir);
+        shell.mkdir('-p', contractsDir);
 
         const input = JSON.parse(shell.cat(inputFile).toString());
 
-    Object.entries(input.sources).forEach(
+        Object.entries(input.sources).forEach(([sourcePath, source]: [string, any]) => {
-      ([sourcePath, source]: [string, any]) => {
             const filePath = path.join(contractsDir, sourcePath);
-        shell.mkdir("-p", path.dirname(filePath));
+            shell.mkdir('-p', path.dirname(filePath));
             shell.ShellString(source.content).to(filePath);
-      },
+        });
-    );
     });
 
     afterAll(() => {
-    shell.rm("-rf", contractsDir);
+        shell.rm('-rf', contractsDir);
     });
 
     describe("Output with all path options", () => {
         let result: { exitCode: number; output: string };
 
         beforeAll(() => {
-      const tempInputFile = path.join(contractsDir, "temp-input.json");
+            const tempInputFile = path.join(contractsDir, 'temp-input.json');
             shell.cp(inputFile, tempInputFile);
             const inputContent = shell.cat(inputFile).toString();
 
@@ -227,15 +180,12 @@ describe("Standard JSON compilation with path options", () => {
             result = executeCommand(command, inputContent);
 
             shell.rm(tempInputFile);
+
         });
 
         it("Compiler run successful without emiting warnings", () => {
-      const parsedResults = JSON.parse(result.output);
+            const parsedResults = JSON.parse(result.output)
-      expect(
+            expect(parsedResults.errors.filter((error: { type: string; }) => error.type != 'Warning')).toEqual([]);
-        parsedResults.errors.filter(
-          (error: { type: string }) => error.type != "Warning",
-        ),
-      ).toEqual([]);
         });
     });
 });

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

@@ -1,11 +1,12 @@
-import { executeCommand } from "../src/helper";
+import {executeCommand} from "../src/helper";
-import { paths } from "../src/entities";
+import { paths } from '../src/entities';
+
 
 //id1743
 describe("Run with --yul by default", () => {
   const command = `resolc ${paths.pathToBasicYulContract} --yul`;
   const result = executeCommand(command);
-  const commandInvalid = "resolc --yul";
+  const commandInvalid = 'resolc --yul';
   const resultInvalid = executeCommand(commandInvalid);
 
   it("Valid command exit code = 0", () => {
@@ -17,8 +18,8 @@ describe("Run with --yul by default", () => {
     expect(result.output).toMatch(/(No output requested)/i);
   });
 
-  xit("solc exit code == resolc exit code", () => {
+
-    // unknown solc issue for datatype of the contract
+  xit("solc exit code == resolc exit code", () => { // unknown solc issue for datatype of the contract
       const command = `solc ${paths.pathToBasicSolContract} --yul`;
       const solcResult = executeCommand(command);
       expect(solcResult.exitCode).toBe(result.exitCode);
@@ -32,7 +33,7 @@ describe("Run with --yul by default", () => {
   });
 
   it("Invalid solc exit code == Invalid resolc exit code", () => {
-    const command = "solc --yul";
+    const command = 'solc --yul';
     const solcResult = executeCommand(command);
     expect(solcResult.exitCode).toBe(resultInvalid.exitCode);
   });

crates/solidity/src/tests/cli-tests/tsconfig.json

@@ -2,6 +2,6 @@
   "compilerOptions": {
     "target": "ES6",
     "module": "CommonJS",
-    "outDir": "./dist"
+    "outDir": "./dist",
   }
 }

crates/solidity/src/tests/combined-json.tests.ts

@@ -1,21 +1,11 @@
 import { executeCommand } from "../src/helper";
-import { paths } from "../src/entities";
+import { paths } from '../src/entities';
+
 
 describe("Set of --combined-json tests", () => {
-  const zksolcCommand = "zksolc";
+    const zksolcCommand = 'zksolc';
-  const solcCommand = "solc";
+    const solcCommand = 'solc';
-  const json_args: string[] = [
+    const json_args: string[] = [`abi`, `hashes`, `metadata`, `devdoc`, `userdoc`, `storage-layout`, `ast`, `asm`, `bin`, `bin-runtime`];
-    `abi`,
-    `hashes`,
-    `metadata`,
-    `devdoc`,
-    `userdoc`,
-    `storage-layout`,
-    `ast`,
-    `asm`,
-    `bin`,
-    `bin-runtime`,
-  ];
 
     //id1742:I
     describe(`Run ${zksolcCommand} with just --combined-json`, () => {
@@ -27,9 +17,7 @@ describe("Set of --combined-json tests", () => {
         });
 
         it("--combined-json error is presented", () => {
-      expect(result.output).toMatch(
+            expect(result.output).toMatch(/(requires a value but none was supplied)/i);
-        /(requires a value but none was supplied)/i,
-      );
         });
 
         it("solc exit code == zksolc exit code", () => {
@@ -48,9 +36,7 @@ describe("Set of --combined-json tests", () => {
         });
 
         it("--combined-json error is presented", () => {
-      expect(result.output).toMatch(
+            expect(result.output).toMatch(/(requires a value but none was supplied)/i);
-        /(requires a value but none was supplied)/i,
-      );
         });
 
         it("solc exit code == zksolc exit code", () => {
@@ -62,11 +48,7 @@ describe("Set of --combined-json tests", () => {
     //id1742:III
     for (let i = 0; i < json_args.length; i++) {
         describe(`Run ${zksolcCommand} with Sol, --combined-json and ARG: ${json_args[i]}`, () => {
-      const args = [
+            const args = [`${paths.pathToBasicSolContract}`, `--combined-json`, `${json_args[i]}`];
-        `${paths.pathToBasicSolContract}`,
-        `--combined-json`,
-        `${json_args[i]}`,
-      ];
             const result = executeCommand(zksolcCommand, args);
 
             it("Valid command exit code = 0", () => {
@@ -87,11 +69,7 @@ describe("Set of --combined-json tests", () => {
     //id1829:I
     for (let i = 0; i < json_args.length; i++) {
         describe(`Run ${zksolcCommand} with Sol, --combined-json and wrong ARG: --${json_args[i]}`, () => {
-      const args = [
+            const args = [`${paths.pathToBasicSolContract}`, `--combined-json`, `--${json_args[i]}`];
-        `${paths.pathToBasicSolContract}`,
-        `--combined-json`,
-        `--${json_args[i]}`,
-      ];
             const result = executeCommand(zksolcCommand, args);
 
             it("Valid command exit code = 1", () => {
@@ -112,12 +90,7 @@ describe("Set of --combined-json tests", () => {
     //id1829:II
     for (let i = 0; i < json_args.length; i++) {
         describe(`Run ${zksolcCommand} with Sol, --combined-json and multiple ARG: ${json_args[i]} ${json_args[i]}`, () => {
-      const args = [
+            const args = [`${paths.pathToBasicSolContract}`, `--combined-json`, `${json_args[i]}`, `${json_args[i]}`];
-        `${paths.pathToBasicSolContract}`,
-        `--combined-json`,
-        `${json_args[i]}`,
-        `${json_args[i]}`,
-      ];
             const result = executeCommand(zksolcCommand, args);
 
             xit("Valid command exit code = 1", () => {
@@ -125,9 +98,7 @@ describe("Set of --combined-json tests", () => {
             });
 
             it("--combined-json error is presented", () => {
-        expect(result.output).toMatch(
+                expect(result.output).toMatch(/(No such file or directory|cannot find the file specified)/i); // Hopefully we should have more precise message here!
-          /(No such file or directory|cannot find the file specified)/i,
-        ); // Hopefully we should have more precise message here!
             });
 
             xit("solc exit code == zksolc exit code", () => {
@@ -140,13 +111,7 @@ describe("Set of --combined-json tests", () => {
     //id1829:III
     for (let i = 0; i < json_args.length; i++) {
         describe(`Run ${zksolcCommand} with Sol, and multiple (--combined-json ${json_args[i]})`, () => {
-      const args = [
+            const args = [`${paths.pathToBasicSolContract}`, `--combined-json`, `${json_args[i]}`, `--combined-json`, `${json_args[i]}`];
-        `${paths.pathToBasicSolContract}`,
-        `--combined-json`,
-        `${json_args[i]}`,
-        `--combined-json`,
-        `${json_args[i]}`,
-      ];
             const result = executeCommand(zksolcCommand, args);
 
             it("Valid command exit code = 1", () => {
@@ -167,11 +132,7 @@ describe("Set of --combined-json tests", () => {
     //id1830
     for (let i = 0; i < json_args.length; i++) {
         describe(`Run ${zksolcCommand} with Yul, and --combined-json ${json_args[i]}`, () => {
-      const args = [
+            const args = [`${paths.pathToBasicYulContract}`, `--combined-json`, `${json_args[i]}`];
-        `${paths.pathToBasicYulContract}`,
-        `--combined-json`,
-        `${json_args[i]}`,
-      ];
             const result = executeCommand(zksolcCommand, args);
 
             it("Valid command exit code = 1", () => {
@@ -181,7 +142,7 @@ describe("Set of --combined-json tests", () => {
             it("--combined-json error is presented", () => {
                 expect(result.output).toMatch(/(ParserError: Expected identifier)/i);
             });
-      asd;
+            asd
 
             it("solc exit code == zksolc exit code", () => {
                 const solcResult = executeCommand(solcCommand, args);

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

js/build.js

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

js/examples/node/resolc.js

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

js/examples/web/resolc.wasm

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

js/fixtures/instantiate.json

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

js/fixtures/instantiate_tokens.json

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

js/resolc/.prettierrc.json

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

js/resolc/README.md

@@ -1,20 +0,0 @@
-# @parity/revive
-
-Node.js module to compile Solidity contracts to Polkavm bytecode, using [Revive](https://github.com/paritytech/revive)
-
-# Usage from Node.js
-
-```typescript
-const sources = {
-["contracts/1_Storage.sol"]: {
-    content: readFileSync("fixtures/storage.sol", "utf8"),
-}
-
-const out = await compile(sources);
-```
-
-# Usage from shell
-
-```bash
- npx @parity/revive@latest --bin contracts/1_Storage.sol
-```

js/resolc/eslint.config.mjs

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

js/resolc/fixtures/bad_pragma.sol

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

js/resolc/fixtures/storage.sol

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

js/resolc/fixtures/storage_bad.sol

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

js/resolc/fixtures/token.sol

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

js/resolc/package.json

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

js/resolc/src/bin.ts

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

js/resolc/src/index.test.ts

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

js/resolc/src/index.ts

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

js/resolc/src/resolc.ts

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

js/resolc/src/resolc/resolc.js

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

js/resolc/src/resolc/resolc.wasm

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

js/resolc/src/solc.d.ts

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

js/resolc/tsconfig.json

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

js/tests/node.test.mjs

@@ -65,15 +65,15 @@ describe("Compile Function Tests", function () {
       expect(result).to.be.a("string");
       const output = JSON.parse(result);
       expect(output).to.have.property("contracts");
-      expect(
+      expect(output.contracts["fixtures/instantiate_tokens.sol"]).to.have.property(
-        output.contracts["fixtures/instantiate_tokens.sol"],
+        "TokensFactory",
-      ).to.have.property("TokensFactory");
+      );
-      expect(
+      expect(output.contracts["fixtures/instantiate_tokens.sol"].TokensFactory).to.have.property(
-        output.contracts["fixtures/instantiate_tokens.sol"].TokensFactory,
+        "abi",
-      ).to.have.property("abi");
+      );
-      expect(
+      expect(output.contracts["fixtures/instantiate_tokens.sol"].TokensFactory).to.have.property(
-        output.contracts["fixtures/instantiate_tokens.sol"].TokensFactory,
+        "evm",
-      ).to.have.property("evm");
+      );
       expect(
         output.contracts["fixtures/instantiate_tokens.sol"].TokensFactory.evm,
       ).to.have.property("bytecode");
@@ -117,26 +117,27 @@ describe("Compile Function Tests", function () {
     expect(output.contracts["fixtures/instantiate.sol"]).to.have.property(
       "ChildContract",
     );
-    expect(
+    expect(output.contracts["fixtures/instantiate.sol"].ChildContract).to.have.property(
-      output.contracts["fixtures/instantiate.sol"].ChildContract,
+      "abi",
-    ).to.have.property("abi");
+    );
-    expect(
+    expect(output.contracts["fixtures/instantiate.sol"].ChildContract).to.have.property(
-      output.contracts["fixtures/instantiate.sol"].ChildContract,
+      "evm",
-    ).to.have.property("evm");
+    );
     expect(
       output.contracts["fixtures/instantiate.sol"].ChildContract.evm,
     ).to.have.property("bytecode");
     expect(output.contracts["fixtures/instantiate.sol"]).to.have.property(
       "MainContract",
     );
-    expect(
+    expect(output.contracts["fixtures/instantiate.sol"].MainContract).to.have.property(
-      output.contracts["fixtures/instantiate.sol"].MainContract,
+      "abi",
-    ).to.have.property("abi");
+    );
-    expect(
+    expect(output.contracts["fixtures/instantiate.sol"].MainContract).to.have.property(
-      output.contracts["fixtures/instantiate.sol"].MainContract,
+      "evm",
-    ).to.have.property("evm");
+    );
     expect(
       output.contracts["fixtures/instantiate.sol"].MainContract.evm,
     ).to.have.property("bytecode");
   });
+
 });

js/wasm/examples/node/resolc.js

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

js/wasm/examples/node/resolc.wasm

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

js/wasm/fixtures/instantiate.json

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

package.json

@@ -3,14 +3,11 @@
     "private": true,
     "scripts": {
         "test:cli": "npm run test -w crates/solidity/src/tests/cli-tests",
-    "test:wasm": "npm run test:node -w js/wasm",
+        "test:wasm": "npm run test:node -w js",
-    "build:package": "npm run build:package -w js/wasm",
+        "build:package": "npm run build:package -w js"
-    "lint": "npx eslint 'js/**/*.{cjs,mjs,ts}' && npx prettier --check '**/*.{ts,json,yml,md}'",
-    "lint:fix": "npx prettier --write '**/*.{mjs,cjs,ts,json,yml,md}'"
     },
     "workspaces": [
         "crates/solidity/src/tests/cli-tests",
-    "js/wasm",
+        "js"
-    "js/resolc"
     ]
 }