ci: the resolc version dictates binary releases (#341)

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

.github/workflows/release.yml

@@ -44,7 +44,7 @@ jobs:
               exit 0
             fi
 
-          export PKG_VER=v$(cat Cargo.toml | grep -A 5 package] | grep version | cut -d '=' -f 2 | tr -d '"' | tr -d " ")
+          export PKG_VER=v$(cat crates/resolc/Cargo.toml | grep -A 5 package] | grep version | cut -d '=' -f 2 | tr -d '"' | tr -d " ")
           echo "Current tag $CURRENT_TAG"
           echo "Package version $PKG_VER"
           #

CHANGELOG.md

@@ -6,6 +6,22 @@ This is a development pre-release.
 
 Supported `polkadot-sdk` rev: `2503.0.1`
 
+## v0.2.0
+
+This is a development pre-release.
+
+Supported `polkadot-sdk` rev: `2503.0.1`
+
+### Changed
+
+- Removed the license printer from the `resolc` binary.
+- EVM bytecode is no longer requested from solc (except in test utils) leading to less compilation work in the pipeline.
+
+### Fixed
+
+- solc-json-interface: Serializing of any custom key in the JSON input is only skipped if not provided.
+- npm package resolution no longer fails with an 'ERR_PACKAGE_PATH_NOT_EXPORTED' error for packages defining exports fields in the `package.json`.
+
 ## v0.1.0
 
 This is a development pre-release.

Cargo.lock

@@ -167,9 +167,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-eips"
-version = "1.0.7"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fa190bfa5340aee544ac831114876fa73bc8da487095b49a5ea153a6a4656ea"
+checksum = "3056872f6da48046913e76edb5ddced272861f6032f09461aea1a2497be5ae5d"
 dependencies = [
  "alloy-eip2124",
  "alloy-eip2930",
@@ -187,9 +187,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-genesis"
-version = "1.0.7"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b81b2dfd278d58af8bfde8753fa4685407ba8fbad8bc88a2bb0e065eed48478"
+checksum = "c98fb40f07997529235cc474de814cd7bd9de561e101716289095696c0e4639d"
 dependencies = [
  "alloy-eips",
  "alloy-primitives 1.1.2",
@@ -300,9 +300,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-serde"
-version = "1.0.7"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b7d927aa39ca51545ae4c9cf4bdb2cbc1f6b46ab4b54afc3ed9255f93eedbce"
+checksum = "730e8f2edf2fc224cabd1c25d090e1655fa6137b2e409f92e5eec735903f1507"
 dependencies = [
  "alloy-primitives 1.1.2",
  "serde",
@@ -1749,9 +1749,9 @@ dependencies = [
 
 [[package]]
 name = "camino"
-version = "1.1.9"
+version = "1.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b96ec4966b5813e2c0507c1f86115c8c5abaadc3980879c3424042a02fd1ad3"
+checksum = "0da45bc31171d8d6960122e222a67740df867c1dd53b4d51caa297084c185cab"
 dependencies = [
  "serde",
 ]
@@ -1787,9 +1787,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"
 
 [[package]]
 name = "cc"
-version = "1.2.24"
+version = "1.2.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16595d3be041c03b09d08d0858631facccee9221e579704070e6e9e4915d3bc7"
+checksum = "d0fc897dc1e865cc67c0e05a836d9d3f1df3cbe442aa4a9473b18e12624a4951"
 dependencies = [
  "jobserver",
  "libc",
@@ -1851,9 +1851,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.38"
+version = "4.5.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed93b9805f8ba930df42c2590f05453d5ec36cbb85d018868a5b24d31f6ac000"
+checksum = "fd60e63e9be68e5fb56422e397cf9baddded06dae1d2e523401542383bc72a9f"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -1861,9 +1861,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.38"
+version = "4.5.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "379026ff283facf611b0ea629334361c4211d1b12ee01024eec1591133b04120"
+checksum = "89cc6392a1f72bbeb820d71f32108f61fdaf18bc526e1d23954168a67759ef51"
 dependencies = [
  "anstream",
  "anstyle",
@@ -3315,9 +3315,9 @@ dependencies = [
 
 [[package]]
 name = "frame-benchmarking"
-version = "40.1.0"
+version = "40.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aaf87febd8e05e4fc404a4ff2654319f86baf02863d5ab19a1fa5cee5162e03d"
+checksum = "4a9e5fcdb30bb83b2d97d7e718127230e0fbbad82b9c32dedf63971f08709def"
 dependencies = [
  "frame-support",
  "frame-support-procedural",
@@ -4086,17 +4086,21 @@ dependencies = [
 
 [[package]]
 name = "hyper-util"
-version = "0.1.12"
+version = "0.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf9f1e950e0d9d1d3c47184416723cf29c0d1f93bd8cccf37e4beb6b44f31710"
+checksum = "b1c293b6b3d21eca78250dc7dbebd6b9210ec5530e038cbfe0661b5c47ab06e8"
 dependencies = [
+ "base64 0.22.1",
  "bytes",
  "futures-channel",
+ "futures-core",
  "futures-util",
  "http",
  "http-body",
  "hyper",
+ "ipnet",
  "libc",
+ "percent-encoding",
  "pin-project-lite",
  "socket2",
  "tokio",
@@ -4408,6 +4412,16 @@ version = "2.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130"
 
+[[package]]
+name = "iri-string"
+version = "0.7.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dbc5ebe9c3a1a7a5127f920a418f7585e9e758e911d0466ed004f393b0e380b2"
+dependencies = [
+ "memchr",
+ "serde",
+]
+
 [[package]]
 name = "is-terminal"
 version = "0.4.16"
@@ -4679,7 +4693,7 @@ checksum = "241eaef5fd12c88705a01fc1066c48c4b36e0dd4377dcdc7ec3942cea7a69956"
 
 [[package]]
 name = "lld-sys"
-version = "0.1.0-dev.16"
+version = "0.1.0"
 dependencies = [
  "cc",
  "libc",
@@ -4702,9 +4716,9 @@ dependencies = [
 
 [[package]]
 name = "lock_api"
-version = "0.4.12"
+version = "0.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
+checksum = "96936507f153605bddfcda068dd804796c84324ed2510809e5b2a624c81da765"
 dependencies = [
  "autocfg",
  "scopeguard",
@@ -5040,11 +5054,11 @@ dependencies = [
 
 [[package]]
 name = "num_cpus"
-version = "1.16.0"
+version = "1.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
+checksum = "91df4bbde75afed763b708b7eee1e8e7651e02d97f6d5dd763e89367e957b23b"
 dependencies = [
- "hermit-abi 0.3.9",
+ "hermit-abi 0.5.1",
  "libc",
 ]
 
@@ -5108,9 +5122,9 @@ checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381"
 
 [[package]]
 name = "openssl"
-version = "0.10.72"
+version = "0.10.73"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fedfea7d58a1f73118430a55da6a286e7b044961736ce96a16a17068ea25e5da"
+checksum = "8505734d46c8ab1e19a1dce3aef597ad87dcb4c37e7188231769bd6bd51cebf8"
 dependencies = [
  "bitflags 2.9.1",
  "cfg-if",
@@ -5140,9 +5154,9 @@ checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e"
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.108"
+version = "0.9.109"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e145e1651e858e820e4860f7b9c5e169bc1d8ce1c86043be79fa7b7634821847"
+checksum = "90096e2e47630d78b7d1c20952dc621f957103f8bc2c8359ec81290d75238571"
 dependencies = [
  "cc",
  "libc",
@@ -6651,9 +6665,9 @@ dependencies = [
 
 [[package]]
 name = "pallet-scheduler"
-version = "41.1.0"
+version = "41.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "954531ea38dea2298c19a10df060572ac9722d79bbe326039c8809b86bcf5d13"
+checksum = "3cb7b2e47ad83f06891cd6a7fb1bd3ea670272c2b1248e9ae1c832df3678f720"
 dependencies = [
  "docify",
  "frame-benchmarking",
@@ -7045,9 +7059,9 @@ dependencies = [
 
 [[package]]
 name = "pallet-xcm"
-version = "19.1.1"
+version = "19.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2634c61cdfe53073384659adea1ae2c4e0a4c1e35a9f7e7fc0acb68891df4c39"
+checksum = "ca27d506282f4c9cd2cac6fb0d199edd89d366635f04801319e7145912547a68"
 dependencies = [
  "bounded-collections",
  "frame-benchmarking",
@@ -7087,9 +7101,9 @@ dependencies = [
 
 [[package]]
 name = "pallet-xcm-bridge-hub"
-version = "0.16.2"
+version = "0.16.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a43dee4426efca33b8b02930f66b637ea7381cde3657ca0bd6d681823d236a6"
+checksum = "479b09d5317c91725370e1ef6fef92f5ec7c1c8b029e5f316a49cd3a57164cb0"
 dependencies = [
  "bp-messages",
  "bp-runtime",
@@ -7240,9 +7254,9 @@ checksum = "e1ad0aff30c1da14b1254fcb2af73e1fa9a28670e584a626f53a369d0e157304"
 
 [[package]]
 name = "parking_lot"
-version = "0.12.3"
+version = "0.12.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
+checksum = "70d58bf43669b5795d1576d0641cfb6fbb2057bf629506267a92807158584a13"
 dependencies = [
  "lock_api",
  "parking_lot_core",
@@ -7250,9 +7264,9 @@ dependencies = [
 
 [[package]]
 name = "parking_lot_core"
-version = "0.9.10"
+version = "0.9.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
+checksum = "bc838d2a56b5b1a6c25f55575dfc605fabb63bb2365f6c2353ef9159aa69e4a5"
 dependencies = [
  "cfg-if",
  "libc",
@@ -8114,9 +8128,9 @@ dependencies = [
 
 [[package]]
 name = "prettyplease"
-version = "0.2.32"
+version = "0.2.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "664ec5419c51e34154eec046ebcba56312d5a2fc3b09a06da188e1ad21afadf6"
+checksum = "9dee91521343f4c5c6a63edd65e54f31f5c92fe8978c40a4282f8372194c6a7d"
 dependencies = [
  "proc-macro2",
  "syn 2.0.101",
@@ -8493,14 +8507,13 @@ checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
 
 [[package]]
 name = "reqwest"
-version = "0.12.15"
+version = "0.12.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d19c46a6fdd48bc4dab94b6103fccc55d34c67cc0ad04653aad4ea2a07cd7bbb"
+checksum = "a2f8e5513d63f2e5b386eb5106dc67eaf3f84e95258e210489136b8b92ad6119"
 dependencies = [
  "base64 0.22.1",
  "bytes",
  "futures-core",
- "futures-util",
  "http",
  "http-body",
  "http-body-util",
@@ -8515,7 +8528,7 @@ dependencies = [
  "once_cell",
  "percent-encoding",
  "pin-project-lite",
- "rustls-pemfile",
+ "rustls-pki-types",
  "serde",
  "serde_json",
  "serde_urlencoded",
@@ -8523,17 +8536,17 @@ dependencies = [
  "tokio",
  "tokio-native-tls",
  "tower",
+ "tower-http",
  "tower-service",
  "url",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "web-sys",
- "windows-registry",
 ]
 
 [[package]]
 name = "resolc"
-version = "0.1.0-dev.16"
+version = "0.2.0"
 dependencies = [
  "anyhow",
  "clap",
@@ -8558,7 +8571,7 @@ dependencies = [
 
 [[package]]
 name = "revive-benchmarks"
-version = "0.1.0-dev.16"
+version = "0.1.0"
 dependencies = [
  "alloy-primitives 1.1.2",
  "criterion",
@@ -8570,18 +8583,18 @@ dependencies = [
 
 [[package]]
 name = "revive-build-utils"
-version = "0.1.0-dev.16"
+version = "0.1.0"
 
 [[package]]
 name = "revive-builtins"
-version = "0.1.0-dev.16"
+version = "0.1.0"
 dependencies = [
  "revive-build-utils",
 ]
 
 [[package]]
 name = "revive-common"
-version = "0.1.0-dev.16"
+version = "0.1.0"
 dependencies = [
  "anyhow",
  "serde",
@@ -8591,7 +8604,7 @@ dependencies = [
 
 [[package]]
 name = "revive-differential"
-version = "0.1.0-dev.16"
+version = "0.1.0"
 dependencies = [
  "alloy-genesis",
  "alloy-primitives 1.1.2",
@@ -8604,7 +8617,7 @@ dependencies = [
 
 [[package]]
 name = "revive-integration"
-version = "0.1.0-dev.16"
+version = "0.1.0"
 dependencies = [
  "alloy-primitives 1.1.2",
  "alloy-sol-types 1.1.2",
@@ -8620,7 +8633,7 @@ dependencies = [
 
 [[package]]
 name = "revive-linker"
-version = "0.1.0-dev.16"
+version = "0.1.0"
 dependencies = [
  "anyhow",
  "libc",
@@ -8632,7 +8645,7 @@ dependencies = [
 
 [[package]]
 name = "revive-llvm-builder"
-version = "0.1.0-dev.16"
+version = "0.1.0"
 dependencies = [
  "anyhow",
  "assert_cmd",
@@ -8654,7 +8667,7 @@ dependencies = [
 
 [[package]]
 name = "revive-llvm-context"
-version = "0.1.0-dev.16"
+version = "0.2.0"
 dependencies = [
  "anyhow",
  "hex",
@@ -8676,7 +8689,7 @@ dependencies = [
 
 [[package]]
 name = "revive-runner"
-version = "0.1.0-dev.16"
+version = "0.1.0"
 dependencies = [
  "alloy-primitives 1.1.2",
  "anyhow",
@@ -8695,7 +8708,7 @@ dependencies = [
 
 [[package]]
 name = "revive-runtime-api"
-version = "0.1.0-dev.16"
+version = "0.1.0"
 dependencies = [
  "anyhow",
  "inkwell",
@@ -8705,7 +8718,7 @@ dependencies = [
 
 [[package]]
 name = "revive-solc-json-interface"
-version = "0.1.0-dev.16"
+version = "0.2.0"
 dependencies = [
  "anyhow",
  "rayon",
@@ -8717,7 +8730,7 @@ dependencies = [
 
 [[package]]
 name = "revive-stdlib"
-version = "0.1.0-dev.16"
+version = "0.1.0"
 dependencies = [
  "inkwell",
  "revive-build-utils",
@@ -8725,7 +8738,7 @@ dependencies = [
 
 [[package]]
 name = "revive-yul"
-version = "0.1.0-dev.16"
+version = "0.2.0"
 dependencies = [
  "anyhow",
  "inkwell",
@@ -8917,15 +8930,6 @@ dependencies = [
  "windows-sys 0.59.0",
 ]
 
-[[package]]
-name = "rustls-pemfile"
-version = "2.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50"
-dependencies = [
- "rustls-pki-types",
-]
-
 [[package]]
 name = "rustls-pki-types"
 version = "1.12.0"
@@ -11059,6 +11063,24 @@ dependencies = [
  "tower-service",
 ]
 
+[[package]]
+name = "tower-http"
+version = "0.6.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "adc82fd73de2a9722ac5da747f12383d2bfdb93591ee6c58486e0097890f05f2"
+dependencies = [
+ "bitflags 2.9.1",
+ "bytes",
+ "futures-util",
+ "http",
+ "http-body",
+ "iri-string",
+ "pin-project-lite",
+ "tower",
+ "tower-layer",
+ "tower-service",
+]
+
 [[package]]
 name = "tower-layer"
 version = "0.3.3"
@@ -11824,41 +11846,6 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
-[[package]]
-name = "windows-link"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76840935b766e1b0a05c0066835fb9ec80071d4c09a16f6bd5f7e655e3c14c38"
-
-[[package]]
-name = "windows-registry"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4286ad90ddb45071efd1a66dfa43eb02dd0dfbae1545ad6cc3c51cf34d7e8ba3"
-dependencies = [
- "windows-result",
- "windows-strings",
- "windows-targets 0.53.0",
-]
-
-[[package]]
-name = "windows-result"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6"
-dependencies = [
- "windows-link",
-]
-
-[[package]]
-name = "windows-strings"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87fa48cc5d406560701792be122a10132491cff9d0aeb23583cc2dcafc847319"
-dependencies = [
- "windows-link",
-]
-
 [[package]]
 name = "windows-sys"
 version = "0.45.0"
@@ -11934,29 +11921,13 @@ dependencies = [
  "windows_aarch64_gnullvm 0.52.6",
  "windows_aarch64_msvc 0.52.6",
  "windows_i686_gnu 0.52.6",
- "windows_i686_gnullvm 0.52.6",
+ "windows_i686_gnullvm",
  "windows_i686_msvc 0.52.6",
  "windows_x86_64_gnu 0.52.6",
  "windows_x86_64_gnullvm 0.52.6",
  "windows_x86_64_msvc 0.52.6",
 ]
 
-[[package]]
-name = "windows-targets"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1e4c7e8ceaaf9cb7d7507c974735728ab453b67ef8f18febdd7c11fe59dca8b"
-dependencies = [
- "windows_aarch64_gnullvm 0.53.0",
- "windows_aarch64_msvc 0.53.0",
- "windows_i686_gnu 0.53.0",
- "windows_i686_gnullvm 0.53.0",
- "windows_i686_msvc 0.53.0",
- "windows_x86_64_gnu 0.53.0",
- "windows_x86_64_gnullvm 0.53.0",
- "windows_x86_64_msvc 0.53.0",
-]
-
 [[package]]
 name = "windows_aarch64_gnullvm"
 version = "0.42.2"
@@ -11975,12 +11946,6 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
 
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764"
-
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.42.2"
@@ -11999,12 +11964,6 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
 
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c"
-
 [[package]]
 name = "windows_i686_gnu"
 version = "0.42.2"
@@ -12023,24 +11982,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
 
-[[package]]
-name = "windows_i686_gnu"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3"
-
 [[package]]
 name = "windows_i686_gnullvm"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
 
-[[package]]
-name = "windows_i686_gnullvm"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11"
-
 [[package]]
 name = "windows_i686_msvc"
 version = "0.42.2"
@@ -12059,12 +12006,6 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
 
-[[package]]
-name = "windows_i686_msvc"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d"
-
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.42.2"
@@ -12083,12 +12024,6 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
 
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba"
-
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.42.2"
@@ -12107,12 +12042,6 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
 
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57"
-
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.42.2"
@@ -12131,12 +12060,6 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486"
-
 [[package]]
 name = "winnow"
 version = "0.7.10"

Cargo.toml

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

RELEASE.md

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

crates/differential/Cargo.toml

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

crates/llvm-context/Cargo.toml

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

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

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

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

@@ -25,6 +25,8 @@ use inkwell::debug_info::AsDIScope;
 use inkwell::debug_info::DIScope;
 use inkwell::types::BasicType;
 use inkwell::values::BasicValue;
+use revive_solc_json_interface::PolkaVMDefaultHeapMemorySize;
+use revive_solc_json_interface::PolkaVMDefaultStackMemorySize;
 use revive_solc_json_interface::SolcStandardJsonInputSettingsPolkaVMMemory;
 
 use crate::optimizer::settings::Settings as OptimizerSettings;
@@ -233,7 +235,13 @@ where
         Self::set_data_layout(llvm, &module);
         Self::link_stdlib_module(llvm, &module);
         Self::link_polkavm_imports(llvm, &module);
-        Self::set_polkavm_stack_size(llvm, &module, memory_config.stack_size);
+        Self::set_polkavm_stack_size(
+            llvm,
+            &module,
+            memory_config
+                .stack_size
+                .unwrap_or(PolkaVMDefaultStackMemorySize),
+        );
         Self::set_module_flags(llvm, &module);
 
         let intrinsics = Intrinsics::new(llvm, &module);
@@ -1443,7 +1451,11 @@ where
     }
 
     pub fn heap_size(&self) -> inkwell::values::IntValue<'ctx> {
-        self.xlen_type()
+        self.xlen_type().const_int(
-            .const_int(self.memory_config.heap_size as u64, false)
+            self.memory_config
+                .heap_size
+                .unwrap_or(PolkaVMDefaultHeapMemorySize) as u64,
+            false,
+        )
     }
 }

crates/resolc/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "resolc"
-version.workspace = true
+version = "0.2.0"
 license.workspace = true
 edition.workspace = true
 repository.workspace = true
@@ -37,7 +37,7 @@ revive-solc-json-interface = { workspace = true, features = ["resolc"] }
 revive-yul = { workspace = true }
 
 [target.'cfg(target_env = "musl")'.dependencies]
-mimalloc = { version = "*", default-features = false }
+mimalloc = { version = "0.1.46", default-features = false }
 
 [target.'cfg(target_os = "emscripten")'.dependencies]
 libc = { workspace = true }

crates/resolc/build.rs

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

crates/resolc/src/lib.rs

@@ -229,7 +229,7 @@ pub fn standard_json<T: Compiler>(
         revive_llvm_context::OptimizerSettings::try_from(&solc_input.settings.optimizer)?;
 
     let polkavm_settings = solc_input.settings.polkavm.unwrap_or_default();
-    debug_config.emit_debug_info = polkavm_settings.debug_information;
+    debug_config.emit_debug_info = polkavm_settings.debug_information.unwrap_or_default();
 
     let include_metadata_hash = match solc_input.settings.metadata {
         Some(ref metadata) => metadata.bytecode_hash != Some(MetadataHash::None),
@@ -265,7 +265,9 @@ pub fn standard_json<T: Compiler>(
             include_metadata_hash,
             debug_config,
             llvm_arguments,
-            polkavm_settings.memory_config,
+            polkavm_settings
+                .memory_config
+                .unwrap_or_else(SolcStandardJsonInputSettingsPolkaVMMemory::default),
         )?;
         build.write_to_standard_json(&mut solc_output, &solc_version)?;
     }

crates/resolc/src/resolc/arguments.rs

@@ -23,10 +23,6 @@ pub struct Arguments {
     #[arg(long = "supported-solc-versions")]
     pub supported_solc_versions: bool,
 
-    /// Print the licence and exit.
-    #[arg(long = "license")]
-    pub license: bool,
-
     /// Specify the input paths and remappings.
     /// If an argument contains a '=', it is considered a remapping.
     /// Multiple Solidity files can be passed in the default Solidity mode.

crates/resolc/src/resolc/main.rs

@@ -51,14 +51,6 @@ fn main_inner() -> anyhow::Result<()> {
         return Ok(());
     }
 
-    if arguments.license {
-        let license_mit = include_str!("../../../../LICENSE-MIT");
-        let license_apache = include_str!("../../../../LICENSE-APACHE");
-
-        writeln!(std::io::stdout(), "{}\n{}\n", license_mit, license_apache)?;
-        return Ok(());
-    }
-
     #[cfg(feature = "parallel")]
     rayon::ThreadPoolBuilder::new()
         .stack_size(RAYON_WORKER_STACK_SIZE)
@@ -150,14 +142,10 @@ fn main_inner() -> anyhow::Result<()> {
         None => true,
     };
 
-    let mut memory_config =
+    let memory_config = revive_solc_json_interface::SolcStandardJsonInputSettingsPolkaVMMemory::new(
-        revive_solc_json_interface::SolcStandardJsonInputSettingsPolkaVMMemory::default();
+        arguments.heap_size,
-    if let Some(heap_size) = arguments.heap_size {
+        arguments.stack_size,
-        memory_config.heap_size = heap_size
+    );
-    }
-    if let Some(stack_size) = arguments.stack_size {
-        memory_config.stack_size = stack_size
-    }
 
     let build = if arguments.yul {
         resolc::yul(

crates/resolc/src/test_utils.rs

@@ -89,7 +89,7 @@ pub fn build_solidity_with_options(
         sources.clone(),
         libraries.clone(),
         remappings,
-        SolcStandardJsonInputSettingsSelection::new_required(),
+        SolcStandardJsonInputSettingsSelection::new_required_for_tests(),
         SolcStandardJsonInputSettingsOptimizer::new(
             solc_optimizer_enabled,
             optimizer_settings.middle_end_as_string().chars().last(),
@@ -154,7 +154,7 @@ pub fn build_solidity_with_options_evm(
         sources.clone(),
         libraries.clone(),
         remappings,
-        SolcStandardJsonInputSettingsSelection::new_required(),
+        SolcStandardJsonInputSettingsSelection::new_required_for_tests(),
         SolcStandardJsonInputSettingsOptimizer::new(
             solc_optimizer_enabled,
             None,
@@ -211,7 +211,7 @@ pub fn build_solidity_and_detect_missing_libraries(
         sources.clone(),
         libraries.clone(),
         None,
-        SolcStandardJsonInputSettingsSelection::new_required(),
+        SolcStandardJsonInputSettingsSelection::new_required_for_tests(),
         SolcStandardJsonInputSettingsOptimizer::new(true, None, &solc_version.default, false),
         None,
         None,
@@ -285,7 +285,7 @@ pub fn check_solidity_warning(
         sources.clone(),
         libraries,
         None,
-        SolcStandardJsonInputSettingsSelection::new_required(),
+        SolcStandardJsonInputSettingsSelection::new_required_for_tests(),
         SolcStandardJsonInputSettingsOptimizer::new(true, None, &solc_version.default, false),
         None,
         suppressed_warnings,

crates/solc-json-interface/Cargo.toml

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

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

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

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

@@ -46,7 +46,7 @@ pub struct Settings {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub metadata: Option<Metadata>,
     /// The resolc custom PolkaVM settings.
-    #[serde(skip_serializing)]
+    #[serde(skip_serializing_if = "Option::is_none")]
     pub polkavm: Option<PolkaVM>,
 }
 
@@ -75,6 +75,7 @@ impl Settings {
 
     /// Sets the necessary defaults.
     pub fn normalize(&mut self, version: &semver::Version) {
+        self.polkavm = None;
         self.optimizer.normalize(version);
     }
 

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

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

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

@@ -2,20 +2,35 @@
 
 use serde::{Deserialize, Serialize};
 
+pub const DEFAULT_HEAP_SIZE: u32 = 64 * 1024;
+pub const DEFAULT_STACK_SIZE: u32 = 32 * 1024;
+
 /// 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,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub heap_size: Option<u32>,
     /// The PVM stack size in bytes.
-    pub stack_size: u32,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub stack_size: Option<u32>,
+}
+
+impl MemoryConfig {
+    /// A shorthand constructor.
+    pub fn new(heap_size: Option<u32>, stack_size: Option<u32>) -> Self {
+        Self {
+            heap_size,
+            stack_size,
+        }
+    }
 }
 
 impl Default for MemoryConfig {
     fn default() -> Self {
         Self {
-            heap_size: 64 * 1024,
+            heap_size: Some(DEFAULT_HEAP_SIZE),
-            stack_size: 32 * 1024,
+            stack_size: Some(DEFAULT_STACK_SIZE),
         }
     }
 }

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

@@ -11,16 +11,18 @@ pub mod memory;
 #[derive(Clone, Copy, Default, Debug, Serialize, Deserialize)]
 pub struct PolkaVM {
     /// The PolkaVM target machine memory configuration settings.
-    pub memory_config: MemoryConfig,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub memory_config: Option<MemoryConfig>,
     /// Instruct LLVM to emit debug information.
-    pub debug_information: bool,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub debug_information: Option<bool>,
 }
 
 impl PolkaVM {
     pub fn new(memory_config: Option<MemoryConfig>, debug_information: bool) -> Self {
         Self {
-            memory_config: memory_config.unwrap_or_default(),
+            memory_config,
-            debug_information,
+            debug_information: Some(debug_information),
         }
     }
 }

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

@@ -21,8 +21,20 @@ pub struct File {
 }
 
 impl File {
-    /// Creates the selection required by our compilation process.
+    /// Creates the selection required for production compilation (excludes EVM bytecode).
     pub fn new_required() -> Self {
+        Self {
+            per_file: Some(HashSet::from_iter([SelectionFlag::AST])),
+            per_contract: Some(HashSet::from_iter([
+                SelectionFlag::MethodIdentifiers,
+                SelectionFlag::Metadata,
+                SelectionFlag::Yul,
+            ])),
+        }
+    }
+
+    /// Creates the selection required for test compilation (includes EVM bytecode).
+    pub fn new_required_for_tests() -> Self {
         Self {
             per_file: Some(HashSet::from_iter([SelectionFlag::AST])),
             per_contract: Some(HashSet::from_iter([
@@ -49,3 +61,38 @@ impl File {
         self
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn production_excludes_evm_bytecode() {
+        let selection = File::new_required();
+        let per_contract = selection.per_contract.unwrap();
+
+        // Production should NOT include EVM bytecode flags
+        assert!(!per_contract.contains(&SelectionFlag::EVMBC));
+        assert!(!per_contract.contains(&SelectionFlag::EVMDBC));
+
+        // But should include other required flags
+        assert!(per_contract.contains(&SelectionFlag::MethodIdentifiers));
+        assert!(per_contract.contains(&SelectionFlag::Metadata));
+        assert!(per_contract.contains(&SelectionFlag::Yul));
+    }
+
+    #[test]
+    fn tests_include_evm_bytecode() {
+        let selection = File::new_required_for_tests();
+        let per_contract = selection.per_contract.unwrap();
+
+        // Tests should include EVM bytecode flags
+        assert!(per_contract.contains(&SelectionFlag::EVMBC));
+        assert!(per_contract.contains(&SelectionFlag::EVMDBC));
+
+        // And should also include other required flags
+        assert!(per_contract.contains(&SelectionFlag::MethodIdentifiers));
+        assert!(per_contract.contains(&SelectionFlag::Metadata));
+        assert!(per_contract.contains(&SelectionFlag::Yul));
+    }
+}

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

@@ -29,6 +29,14 @@ impl Selection {
         }
     }
 
+    /// Creates the selection required for test compilation (includes EVM bytecode).
+    pub fn new_required_for_tests() -> Self {
+        Self {
+            all: Some(FileSelection::new_required_for_tests()),
+            files: BTreeMap::new(),
+        }
+    }
+
     /// Extends the user's output selection with flag required by our compilation process.
     pub fn extend_with_required(&mut self) -> &mut Self {
         self.all

crates/yul/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "revive-yul"
 description = "The revive YUL parser library."
-version.workspace = true
+version = "0.2.0"
 authors.workspace = true
 license.workspace = true
 edition.workspace = true

js/resolc/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@parity/resolc",
     "license": "Apache-2.0",
-    "version": "0.1.0-dev.16",
+    "version": "0.2.0",
     "author": "Parity <admin@parity.io> (https://parity.io)",
     "module": "index.ts",
     "types": "./dist/index.d.ts",
@@ -32,6 +32,7 @@
         "@types/node": "^22.9.0",
         "commander": "^13.1.0",
         "package-json": "^10.0.1",
+        "resolve-pkg": "^2.0.0",
         "solc": ">=0.8.0 <=0.8.30"
     }
 }

js/resolc/src/index.ts

@@ -3,6 +3,7 @@ import { spawn } from 'child_process'
 import { resolc, version as resolcVersion } from './resolc'
 import path from 'path'
 import { existsSync, readFileSync } from 'fs'
+import resolvePkg from 'resolve-pkg'
 
 export type SolcInput = {
   [contractName: string]: {
@@ -149,17 +150,15 @@ export function tryResolveImport(importPath: string) {
   const specifiedVersion = match[2] // "1.2.3" (optional)
   const relativePath = match[3] // "/path/to/file.sol"
 
-  let packageJsonPath
+  const packageRoot = resolvePkg(basePackage)
-  try {
+  if (!packageRoot) {
-    packageJsonPath = require.resolve(path.join(basePackage, 'package.json'))
+    throw new Error(`Package ${basePackage} not found.`)
-  } 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')
+      readFileSync(path.join(packageRoot, 'package.json'), 'utf-8')
     ).version
 
     if (installedVersion !== specifiedVersion) {
@@ -169,8 +168,6 @@ export function tryResolveImport(importPath: string) {
     }
   }
 
-  const packageRoot = path.dirname(packageJsonPath)
-
   // Construct full path to the requested file
   const resolvedPath = path.join(packageRoot, relativePath)
   if (existsSync(resolvedPath)) {

package-lock.json

@@ -44,12 +44,13 @@
     },
     "js/resolc": {
       "name": "@parity/resolc",
-      "version": "0.1.0-dev.16",
+      "version": "0.2.0",
       "license": "Apache-2.0",
       "dependencies": {
         "@types/node": "^22.9.0",
         "commander": "^13.1.0",
         "package-json": "^10.0.1",
+        "resolve-pkg": "^2.0.0",
         "solc": ">=0.8.0 <=0.8.30"
       },
       "bin": {
@@ -5601,6 +5602,27 @@
         "node": ">=4"
       }
     },
+    "node_modules/resolve-pkg": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-pkg/-/resolve-pkg-2.0.0.tgz",
+      "integrity": "sha512-+1lzwXehGCXSeryaISr6WujZzowloigEofRB+dj75y9RRa/obVcYgbHJd53tdYw8pvZj8GojXaaENws8Ktw/hQ==",
+      "license": "MIT",
+      "dependencies": {
+        "resolve-from": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/resolve-pkg/node_modules/resolve-from": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
+      "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/resolve.exports": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.3.tgz",