Merge branch 'main' into as-release-json

.github/scripts/json_generator.py

@@ -2,6 +2,7 @@ import os
 import sys
 import json
 import requests
+from datetime import datetime
 
 def validate_github_token():
     """Validate that GITHUB_TOKEN environment variable is set."""
@@ -26,70 +27,26 @@ def fetch_release_data(repo, tag):
         print(f"Error fetching release data: {e}")
         sys.exit(1)
 
-def fetch_checksum_file(release_data):
-    """
-    Fetch the checksum.txt file from the release assets
-    and parse it into a dictionary mapping file names to their SHA256 checksums.
-    """
-    checksums = {}
-
-    # Find the checksum.txt asset URL
-    checksum_asset = None
-    for asset in release_data['assets']:
-        if asset['name'] == 'checksums.txt':
-            checksum_asset = asset
-            break
-
-    if not checksum_asset:
-        print("Warning: checksum.txt file not found in release assets.")
-        return checksums
-
-    # Download the checksum file
-    headers = {
-        'Authorization': f"Bearer {os.environ['GITHUB_TOKEN']}",
-        'Accept': 'application/octet-stream'
-    }
-
-    try:
-        response = requests.get(checksum_asset['browser_download_url'], headers=headers)
-        response.raise_for_status()
-
-        # Parse checksum file
-        for line in response.text.splitlines():
-            if line.strip():
-                checksum, filename = line.strip().split(None, 1)
-                checksums[filename] = checksum
-
-        return checksums
-    except requests.RequestException as e:
-        print(f"Error fetching checksum file: {e}")
-        return checksums
-    except Exception as e:
-        print(f"Error parsing checksum file: {e}")
-        return checksums
-
 def extract_build_hash(target_commitish):
     """Extract the first 8 characters of the commit hash."""
     return f"commit.{target_commitish[:8]}"
 
-def generate_asset_json(release_data, asset, checksums):
+def generate_asset_json(release_data, asset):
     """Generate JSON for a specific asset."""
     version = release_data['tag_name'].lstrip('v')
     build = extract_build_hash(release_data['target_commitish'])
     long_version = f"{version}+{build}"
-
+    path = f"{asset['name']}+{long_version}"
-    # Get SHA256 checksum if available
-    sha256 = checksums.get(asset['name'], "")
 
     return {
+        "path": path,
         "name": asset['name'],
         "version": version,
         "build": build,
         "longVersion": long_version,
         "url": asset['browser_download_url'],
-        "sha256": sha256,
+        "firstSolcVersion": os.environ["FIRST_SOLC_VERSION"],
-        "firstSolcVersion": os.environ.get("FIRST_SOLC_VERSION", ""),
+        "lastSolcVersion": os.environ["LAST_SOLC_VERSION"]
-        "lastSolcVersion": os.environ.get("LAST_SOLC_VERSION", "")
     }
 
 def save_platform_json(platform_folder, asset_json, tag):
@@ -112,14 +69,14 @@ def save_platform_json(platform_folder, asset_json, tag):
     # Remove any existing entry with the same path
     list_data['builds'] = [
         build for build in list_data['builds']
-        if build['version'] != asset_json['version']
+        if build['path'] != asset_json['path']
     ]
     # Add the new build
     list_data['builds'].append(asset_json)
 
     # Update releases
     version = asset_json['version']
-    list_data['releases'][version] = f"{asset_json['name']}+{asset_json['longVersion']}"
+    list_data['releases'][version] = asset_json['path']
 
     # Update latest release
     list_data['latestRelease'] = version
@@ -141,9 +98,6 @@ def main():
     # Fetch release data
     release_data = fetch_release_data(repo, tag)
 
-    # Fetch checksums
-    checksums = fetch_checksum_file(release_data)
-
     # Mapping of asset names to platform folders
     platform_mapping = {
         'resolc-x86_64-unknown-linux-musl': 'linux',
@@ -157,7 +111,7 @@ def main():
         platform_name = platform_mapping.get(asset['name'])
         if platform_name:
             platform_folder = os.path.join(platform_name)
-            asset_json = generate_asset_json(release_data, asset, checksums)
+            asset_json = generate_asset_json(release_data, asset)
             save_platform_json(platform_folder, asset_json, tag)
             print(f"Processed {asset['name']} for {platform_name}")
 

.github/workflows/release.yml

@@ -249,15 +249,6 @@ jobs:
           chmod +x resolc-x86_64-unknown-linux-musl
           chmod +x resolc-universal-apple-darwin
 
-      - name: Create sha-256 checksum
-        run: |
-          shasum -a 256 resolc-x86_64-unknown-linux-musl > checksums.txt
-          shasum -a 256 resolc-universal-apple-darwin >> checksums.txt
-          shasum -a 256 resolc-x86_64-pc-windows-msvc.exe >> checksums.txt
-          shasum -a 256 resolc.js >> checksums.txt
-          shasum -a 256 resolc.wasm >> checksums.txt
-          shasum -a 256 resolc_web.js >> checksums.txt
-
       - uses: actions/create-github-app-token@v1
         id: app-token
         with:
@@ -285,4 +276,3 @@ jobs:
             resolc.js
             resolc.wasm
             resolc_web.js
-            checksums.txt

CHANGELOG.md

@@ -4,10 +4,6 @@
 
 This is a development pre-release.
 
-## v0.1.0-dev.13
-
-This is a development pre-release.
-
 Supported `polkadot-sdk` rev:`c29e72a8628835e34deb6aa7db9a78a2e4eabcee`
 
 ### Added
@@ -18,7 +14,7 @@ Supported `polkadot-sdk` rev:`c29e72a8628835e34deb6aa7db9a78a2e4eabcee`
 
 ### 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.
+- Runner `resolc` using webkit is no longer supported.
 
 ### Fixed
 - A missing byte swap for the create2 salt value.

Cargo.lock

@@ -4553,7 +4553,7 @@ checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104"
 
 [[package]]
 name = "lld-sys"
-version = "0.1.0-dev.13"
+version = "0.1.0-dev.12"
 dependencies = [
  "cc",
  "libc",
@@ -8266,7 +8266,7 @@ dependencies = [
 
 [[package]]
 name = "revive-benchmarks"
-version = "0.1.0-dev.13"
+version = "0.1.0-dev.12"
 dependencies = [
  "alloy-primitives",
  "criterion",
@@ -8278,18 +8278,18 @@ dependencies = [
 
 [[package]]
 name = "revive-build-utils"
-version = "0.1.0-dev.13"
+version = "0.1.0-dev.12"
 
 [[package]]
 name = "revive-builtins"
-version = "0.1.0-dev.13"
+version = "0.1.0-dev.12"
 dependencies = [
  "revive-build-utils",
 ]
 
 [[package]]
 name = "revive-common"
-version = "0.1.0-dev.13"
+version = "0.1.0-dev.12"
 dependencies = [
  "anyhow",
  "serde",
@@ -8299,7 +8299,7 @@ dependencies = [
 
 [[package]]
 name = "revive-differential"
-version = "0.1.0-dev.13"
+version = "0.1.0-dev.12"
 dependencies = [
  "alloy-genesis",
  "alloy-primitives",
@@ -8312,7 +8312,7 @@ dependencies = [
 
 [[package]]
 name = "revive-integration"
-version = "0.1.0-dev.13"
+version = "0.1.0-dev.12"
 dependencies = [
  "alloy-primitives",
  "alloy-sol-types",
@@ -8328,7 +8328,7 @@ dependencies = [
 
 [[package]]
 name = "revive-linker"
-version = "0.1.0-dev.13"
+version = "0.1.0-dev.12"
 dependencies = [
  "anyhow",
  "libc",
@@ -8340,7 +8340,7 @@ dependencies = [
 
 [[package]]
 name = "revive-llvm-builder"
-version = "0.1.0-dev.13"
+version = "0.1.0-dev.12"
 dependencies = [
  "anyhow",
  "assert_cmd",
@@ -8362,7 +8362,7 @@ dependencies = [
 
 [[package]]
 name = "revive-llvm-context"
-version = "0.1.0-dev.13"
+version = "0.1.0-dev.12"
 dependencies = [
  "anyhow",
  "hex",
@@ -8384,7 +8384,7 @@ dependencies = [
 
 [[package]]
 name = "revive-runner"
-version = "0.1.0-dev.13"
+version = "0.1.0-dev.12"
 dependencies = [
  "alloy-primitives",
  "hex",
@@ -8400,7 +8400,7 @@ dependencies = [
 
 [[package]]
 name = "revive-runtime-api"
-version = "0.1.0-dev.13"
+version = "0.1.0-dev.12"
 dependencies = [
  "anyhow",
  "inkwell",
@@ -8410,7 +8410,7 @@ dependencies = [
 
 [[package]]
 name = "revive-solc-json-interface"
-version = "0.1.0-dev.13"
+version = "0.1.0-dev.12"
 dependencies = [
  "anyhow",
  "rayon",
@@ -8422,7 +8422,7 @@ dependencies = [
 
 [[package]]
 name = "revive-solidity"
-version = "0.1.0-dev.13"
+version = "0.1.0-dev.12"
 dependencies = [
  "anyhow",
  "clap",
@@ -8449,7 +8449,7 @@ dependencies = [
 
 [[package]]
 name = "revive-stdlib"
-version = "0.1.0-dev.13"
+version = "0.1.0-dev.12"
 dependencies = [
  "inkwell",
  "revive-build-utils",
@@ -11117,9 +11117,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.44.2"
+version = "1.43.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6b88822cbe49de4185e3a4cbf8321dd487cf5fe0c5c65695fef6346371e9c48"
+checksum = "3d61fa4ffa3de412bfea335c6ecff681de2b609ba3c77ef3e00e521813a9ed9e"
 dependencies = [
  "backtrace",
  "bytes",

Cargo.toml

@@ -3,7 +3,7 @@ resolver = "2"
 members = ["crates/*"]
 
 [workspace.package]
-version = "0.1.0-dev.13"
+version = "0.1.0-dev.12"
 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.13", path = "crates/benchmarks" }
+revive-benchmarks = { version = "0.1.0-dev.12", path = "crates/benchmarks" }
-revive-builtins = { version = "0.1.0-dev.13", path = "crates/builtins" }
+revive-builtins = { version = "0.1.0-dev.12", path = "crates/builtins" }
-revive-common = { version = "0.1.0-dev.13", path = "crates/common" }
+revive-common = { version = "0.1.0-dev.12", path = "crates/common" }
-revive-differential = { version = "0.1.0-dev.13", path = "crates/differential" }
+revive-differential = { version = "0.1.0-dev.12", path = "crates/differential" }
-revive-integration = { version = "0.1.0-dev.13", path = "crates/integration" }
+revive-integration = { version = "0.1.0-dev.12", path = "crates/integration" }
-revive-linker = { version = "0.1.0-dev.13", path = "crates/linker" }
+revive-linker = { version = "0.1.0-dev.12", path = "crates/linker" }
-lld-sys = { version = "0.1.0-dev.13", path = "crates/lld-sys" }
+lld-sys = { version = "0.1.0-dev.12", path = "crates/lld-sys" }
-revive-llvm-context = { version = "0.1.0-dev.13", path = "crates/llvm-context" }
+revive-llvm-context = { version = "0.1.0-dev.12", path = "crates/llvm-context" }
-revive-runtime-api = { version = "0.1.0-dev.13", path = "crates/runtime-api" }
+revive-runtime-api = { version = "0.1.0-dev.12", path = "crates/runtime-api" }
-revive-runner = { version = "0.1.0-dev.13", path = "crates/runner" }
+revive-runner = { version = "0.1.0-dev.12", path = "crates/runner" }
-revive-solc-json-interface = { version = "0.1.0-dev.13", path = "crates/solc-json-interface" }
+revive-solc-json-interface = { version = "0.1.0-dev.12", path = "crates/solc-json-interface" }
-revive-solidity = { version = "0.1.0-dev.13", path = "crates/solidity" }
+revive-solidity = { version = "0.1.0-dev.12", path = "crates/solidity" }
-revive-stdlib = { version = "0.1.0-dev.13", path = "crates/stdlib" }
+revive-stdlib = { version = "0.1.0-dev.12", path = "crates/stdlib" }
-revive-build-utils = { version = "0.1.0-dev.13", path = "crates/build-utils" }
+revive-build-utils = { version = "0.1.0-dev.12", path = "crates/build-utils" }
 
 hex = "0.4.3"
 cc = "1.2"

Dockerfile

@@ -11,7 +11,7 @@ RUN make install-llvm-builder
 RUN revive-llvm --target-env musl clone
 RUN revive-llvm --target-env musl build  --llvm-projects lld --llvm-projects clang
 
-FROM messense/rust-musl-cross@sha256:68b86bc7cb2867259e6b233415a665ff4469c28b57763e78c3bfea1c68091561 AS resolc-builder
+FROM messense/rust-musl-cross:x86_64-musl AS resolc-builder
 WORKDIR /opt/revive
 
 RUN apt update && \