Merge main-v0.13.2 into main

.github/actions/bootstrap/action.yml

@@ -0,0 +1,5 @@
+runs:
+  using: "composite"
+  steps:
+    - name: Install rust.
+      uses: ./.github/actions/install_rust

.github/actions/install_rust/action.yml

@@ -1,4 +1,9 @@
+name: Bootsrap rust installation
+description: Setup rust environment and its components, also caching the build results.
+
 runs:
   using: "composite"
   steps:
     - uses: moonrepo/setup-rust@v1
+      with:
+        cache-base: main(-v[0-9].*)?

.github/workflows/blockifier_ci.yml

@@ -42,15 +42,15 @@ jobs:
     runs-on: starkware-ubuntu-20-04-medium
     steps:
       - uses: actions/checkout@v4
-      - uses: ./.github/actions/install_rust
+      - uses: ./.github/actions/bootstrap
       - run: cargo build -p blockifier
       - run: cargo test -p blockifier
 
   native-blockifier-artifacts-push:
     runs-on: starkware-ubuntu-20-04-medium
     steps:
       - uses: actions/checkout@v4
-      - uses: ./.github/actions/install_rust
+      - uses: ./.github/actions/bootstrap
       - name: Build native blockifier
         run: ./build_native_in_docker.sh scripts/build_native_blockifier.sh
 

.github/workflows/blockifier_compiled_cairo.yml

@@ -35,7 +35,7 @@ jobs:
     runs-on: starkware-ubuntu-20-04-medium
     steps:
       - uses: actions/checkout@v4
-      - uses: ./.github/actions/install_rust
+      - uses: ./.github/actions/bootstrap
 
       # Setup pypy and link to the location expected by .cargo/config.toml.
       - uses: actions/setup-python@v5

.github/workflows/blockifier_post-merge.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: starkware-ubuntu-20-04-medium
     steps:
       - uses: actions/checkout@v4
-      - uses: ./.github/actions/install_rust
+      - uses: ./.github/actions/bootstrap
       - uses: Noelware/setup-protoc@1.1.0
 
       # Setup pypy and link to the location expected by .cargo/config.toml.

.github/workflows/committer_ci.yml

@@ -39,11 +39,11 @@ concurrency:
 
 jobs:
   run-regression-tests:
-    runs-on: starkware-ubuntu-latest-small
+    runs-on: starkware-ubuntu-latest-medium
     if: ${{ github.event_name == 'pull_request' }}
     steps:
       - uses: actions/checkout@v4
-      - uses: ./.github/actions/install_rust
+      - uses: ./.github/actions/bootstrap
 
       - id: auth
         uses: "google-github-actions/auth@v2"
@@ -55,7 +55,7 @@ jobs:
       - run: cargo test -p committer_cli --release -- --include-ignored test_regression
 
   benchmarking:
-    runs-on: starkware-ubuntu-latest-small
+    runs-on: starkware-ubuntu-latest-medium
     if: ${{ github.event_name == 'pull_request' }}
     steps:
       # Checkout the base branch to get the old code.
@@ -123,7 +123,7 @@ jobs:
     runs-on: starkware-ubuntu-20-04-medium
     steps:
       - uses: actions/checkout@v4
-      - uses: ./.github/actions/install_rust
+      - uses: ./.github/actions/bootstrap
 
         # Commit hash on pull request event would be the head commit of the branch.
       - name: Get commit hash prefix for PR update

.github/workflows/main.yml

@@ -68,7 +68,7 @@ jobs:
         run: echo "LD_LIBRARY_PATH=${LD_LIBRARY_PATH}" >> $GITHUB_ENV
 
       # Install rust components.
-      - uses: ./.github/actions/install_rust
+      - uses: ./.github/actions/bootstrap
 
       # Run tests.
       - name: "Run rustfmt and clippy"
@@ -88,10 +88,10 @@ jobs:
 
 
   run-workspace-tests:
-    runs-on: starkware-ubuntu-latest-small
+    runs-on: starkware-ubuntu-latest-medium
     steps:
       - uses: actions/checkout@v4
-      - uses: ./.github/actions/install_rust
+      - uses: ./.github/actions/bootstrap
       - run: cargo test -p workspace_tests
 
   run-tests:
@@ -101,7 +101,7 @@ jobs:
         with:
           # Fetch the entire history.
           fetch-depth: 0
-      - uses: ./.github/actions/install_rust
+      - uses: ./.github/actions/bootstrap
       - uses: Noelware/setup-protoc@1.1.0
 
       # Setup pypy and link to the location expected by .cargo/config.toml.
@@ -166,7 +166,7 @@ jobs:
         with:
           # Fetch the entire history.
           fetch-depth: 0
-      - uses: ./.github/actions/install_rust
+      - uses: ./.github/actions/bootstrap
       - name: Set-Up
         run: |
           sudo apt-get update

.github/workflows/papyrus_ci.yml

@@ -46,7 +46,7 @@ jobs:
     runs-on: starkware-ubuntu-latest-medium
     steps:
       - uses: actions/checkout@v4
-      - uses: ./.github/actions/install_rust
+      - uses: ./.github/actions/bootstrap
       - uses: Noelware/setup-protoc@1.1.0
         with:
           version: ${{env.PROTOC_VERSION}}
@@ -64,7 +64,7 @@ jobs:
     runs-on: starkware-ubuntu-latest-medium
     steps:
       - uses: actions/checkout@v4
-      - uses: ./.github/actions/install_rust
+      - uses: ./.github/actions/bootstrap
       - uses: Noelware/setup-protoc@1.1.0
         with:
           version: ${{env.PROTOC_VERSION}}
@@ -100,7 +100,7 @@ jobs:
     runs-on: starkware-ubuntu-latest-medium
     steps:
       - uses: actions/checkout@v4
-      - uses: ./.github/actions/install_rust
+      - uses: ./.github/actions/bootstrap
       - uses: Noelware/setup-protoc@1.1.0
         with:
           version: ${{env.PROTOC_VERSION}}
@@ -116,7 +116,7 @@ jobs:
     runs-on: starkware-ubuntu-latest-medium
     steps:
       - uses: actions/checkout@v4
-      - uses: ./.github/actions/install_rust
+      - uses: ./.github/actions/bootstrap
       - uses: Noelware/setup-protoc@1.1.0
 
       - run: |
@@ -163,7 +163,7 @@ jobs:
           filters: |
             target_directory:
               - 'crates/papyrus_storage/src/db/**'
-      - uses: ./.github/actions/install_rust
+      - uses: ./.github/actions/bootstrap
       # repeat this job 32 times. this is a random test for part of the code that may cause a corrupted database.
       - run: for run in {1..32}; do cargo test -r -p papyrus_storage -- --include-ignored common_prefix_compare_with_simple_table_random; done
         if: steps.changes.outputs.target_directory == 'true'

.github/workflows/papyrus_nightly-tests-call.yml

@@ -21,7 +21,7 @@ jobs:
     runs-on: ${{ inputs.os }}
     steps:
       - uses: actions/checkout@v4
-      - uses: ./.github/actions/install_rust
+      - uses: ./.github/actions/bootstrap
       - run: sudo apt update; sudo apt -y install libclang-dev
         # Install libclang-dev that is not a part of the ubuntu vm in github actions.
         if: runner.os == 'Linux'

.github/workflows/papyrus_nightly-tests.yml

@@ -13,7 +13,7 @@ jobs:
   GW-integration-test-ubuntu:
     uses: ./.github/workflows/papyrus_nightly-tests-call.yml
     with:
-      os: starkware-ubuntu-latest-small
+      os: starkware-ubuntu-latest-medium
     secrets:
       INTEGRATION_TESTNET_NODE_URL: ${{ secrets.INTEGRATION_TESTNET_NODE_URL }}
       INTEGRATION_TESTNET_SENDER_PRIVATE_KEY: ${{ secrets.INTEGRATION_TESTNET_SENDER_PRIVATE_KEY }}
@@ -37,7 +37,7 @@ jobs:
     if: github.event.schedule == '30 0 * * *'
     steps:
       - uses: actions/checkout@v4
-      - uses: ./.github/actions/install_rust
+      - uses: ./.github/actions/bootstrap
 
       - run: mkdir data
 
@@ -56,7 +56,7 @@ jobs:
     if: github.event.schedule == '30 0 * * *'
     steps:
       - uses: actions/checkout@v4
-      - uses: ./.github/actions/install_rust
+      - uses: ./.github/actions/bootstrap
       - run: npm install -g ganache@7.4.3
 
       - run: brew install protobuf@$PROTOC_VERSION
@@ -71,15 +71,15 @@ jobs:
     if: github.event.schedule == '30 0 * * *'
     steps:
       - uses: actions/checkout@v4
-      - uses: ./.github/actions/install_rust
+      - uses: ./.github/actions/bootstrap
       - run: cargo build -r -p papyrus_load_test
 
   integration-test:
     runs-on: macos-latest
     if: github.event.schedule == '30 0 * * *'
     steps:
       - uses: actions/checkout@v4
-      - uses: ./.github/actions/install_rust
+      - uses: ./.github/actions/bootstrap
       - run: >
           cargo test -r
           --test latency_histogram
@@ -91,8 +91,8 @@ jobs:
   # TODO(dvir): make this run only if the path 'crates/papyrus_storage/src/db/**' (same path as in the CI)  was changed on the
   # last day and increase the number of repetitions.
   random-table-test:
-    runs-on: starkware-ubuntu-latest-small
+    runs-on: starkware-ubuntu-latest-medium
     steps:
       - uses: actions/checkout@v4
-      - uses: ./.github/actions/install_rust
+      - uses: ./.github/actions/bootstrap
       - run: for run in {1..100}; do cargo test -r -p papyrus_storage -- --include-ignored common_prefix_compare_with_simple_table_random; done

.github/workflows/verify-deps.yml

@@ -11,7 +11,7 @@ jobs:
     continue-on-error: true
     steps:
       - uses: actions/checkout@v4
-      - uses: ./.github/actions/install_rust
+      - uses: ./.github/actions/bootstrap
       - name: Update Dependencies
         run: cargo update --verbose
       - name: Build

scripts/publish_crates.py

@@ -0,0 +1,115 @@
+import argparse
+import subprocess
+import sys
+from typing import List, Tuple
+import toml
+import json
+import asyncio
+
+
+async def crate_version_exists(crate_name: str, version: str) -> bool:
+
+    response = subprocess.run(
+        ["curl", "-s", f"https://crates.io/api/v1/crates/{crate_name}"],
+        capture_output=True,
+        text=True,
+    )
+
+    crate_metadata = json.loads(response.stdout)
+    already_published = version in [v["num"] for v in crate_metadata["versions"]]
+    print(
+        f"Crate {crate_name} version {version} "
+        f"{'exists' if already_published else 'does not exist'} on crates.io"
+    )
+    return already_published
+
+
+def get_workspace_version() -> str:
+    try:
+        cargo_data = toml.load("Cargo.toml")
+
+        return cargo_data["workspace"]["package"]["version"]
+    except (KeyError, TypeError):
+        raise ValueError("Version key not found in Cargo.toml")
+
+
+async def verify_unpublished(crates: List[str]):
+    """
+    Asserts that none of the crates in the set have been published.
+    """
+
+    version = get_workspace_version()
+
+    tasks = [crate_version_exists(crate_name=crate, version=version) for crate in crates]
+    results = await asyncio.gather(*tasks)
+
+    already_published = [crate for crate, unpublished in zip(crates, results) if unpublished]
+
+    assert (
+        not already_published
+    ), f"Crates {already_published} have already been published with {version=}."
+
+
+def get_package_and_dependencies_in_order(crate: str) -> List[str]:
+    """
+    Returns a list of all local (member) crates that the input crate depends on, in topological
+    order. I.e, if crate A depends on crate B, then B will appear before A in the list.
+    The output list also includes the input crate (last element).
+    """
+    # We use the `depth` prefix to easily sort the dependencies in topological order: higher depth
+    # means the crate is depended on by the crate at the lower depth.
+    prefixed_tree = (
+        subprocess.check_output(["cargo", "tree", "-p", crate, "--prefix", "depth"])
+        .decode()
+        .splitlines()
+    )
+    # Clean up the lines to only keep the *local* crate names with their depth prefix.
+    # Skip all non-local crates ('(/home' should appear in lines describing local crates).
+    prefixed_local_crates = [line.split()[0].strip() for line in prefixed_tree if "(/home" in line]
+
+    # Reverse order to iterate in descending depth order.
+    ordered_dependencies = []
+    for dependency_with_depth in reversed(sorted(prefixed_local_crates)):
+        # Strip the leading depth number (package names do not start with integers).
+        dependency = dependency_with_depth.lstrip("0123456789")
+        # The same package may appear multiple times, and with different depths. Always keep the
+        # highest depth only.
+        if dependency not in ordered_dependencies:
+            ordered_dependencies.append(dependency)
+    return ordered_dependencies
+
+
+async def publish_crate_and_dependencies(crate: str, dry_run: bool):
+    dependencies = get_package_and_dependencies_in_order(crate=crate)
+    assert crate == dependencies[-1], f"{crate} should be the last element of '{dependencies}'."
+
+    # Do not attempt to publish anything if even one of the dependencies is already published.
+    await verify_unpublished(crates=dependencies)
+
+    base_command_template = "cargo publish -p {crate}" + f"{' --dry-run' if dry_run else ''}"
+    # Publish order is important.
+    cmd = " && ".join(
+        [base_command_template.format(crate=dependency) for dependency in dependencies]
+    )
+
+    print(f"Publishing {crate} ({dry_run=}) and its dependencies: {dependencies}...")
+    print(cmd, flush=True)
+    subprocess.run(cmd, check=True, shell=True)
+    print(f"Done.")
+
+
+async def main():
+    parser = argparse.ArgumentParser(
+        description="Publish a crate and it's dependencies in the local workspace."
+    )
+    parser.add_argument(
+        "--crate", type=str, help="Crate to publish (dependencies will also be published)."
+    )
+    parser.add_argument("--dry_run", required=False, action="store_true", help="Dry run.")
+    args = parser.parse_args()
+
+    await publish_crate_and_dependencies(crate=args.crate, dry_run=args.dry_run)
+
+
+if __name__ == "__main__":
+    sys.exit(asyncio.run(main()))