Dori/Merge main-v0.13.2 into main

.github/workflows/blockifier_ci.yml

@@ -32,18 +32,6 @@ jobs:
       - run: cargo build -p blockifier
       - run: cargo test -p blockifier
 
-  run-python-tests:
-    runs-on: ubuntu-20.04
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
-        with:
-          python-version: '3.9'
-      - run: |
-          python -m pip install --upgrade pip
-          pip install pytest
-      - run: pytest scripts/merge_paths_test.py
-
   native-blockifier-artifacts-push:
     runs-on: ubuntu-20.04
     steps:

.github/workflows/committer_ci.yml

@@ -8,6 +8,9 @@ on:
     tags:
       - v[0-9].**
     paths:
+      - '.github/workflows/committer_ci.yml'
+      - 'Cargo.toml'
+      - 'Cargo.lock'
       - 'crates/committer/**'
       - 'crates/committer_cli/**'
 
@@ -19,6 +22,9 @@ on:
       - auto_merge_enabled
       - edited
     paths:
+      - '.github/workflows/committer_ci.yml'
+      - 'Cargo.toml'
+      - 'Cargo.lock'
       - 'crates/committer/**'
       - 'crates/committer_cli/**'
 
@@ -37,7 +43,7 @@ jobs:
       - uses: 'google-github-actions/setup-gcloud@v2'
       - run: echo "BENCH_INPUT_FILES_PREFIX=$(cat ./crates/committer_cli/src/tests/flow_test_files_prefix)" >> $GITHUB_ENV
       - run: gcloud storage cp -r gs://committer-testing-artifacts/$BENCH_INPUT_FILES_PREFIX/* ./crates/committer_cli/benches
-      - run: cargo test --release -- --include-ignored test_regression
+      - run: cargo test -p committer_cli --release -- --include-ignored test_regression
 
   benchmarking:
     runs-on: ubuntu-latest
@@ -59,10 +65,10 @@ jobs:
 
       # List the existing benchmarks.
       - run: |
-            cargo bench -- --list | grep ': benchmark$' | sed -e "s/: benchmark$//" > benchmarks_list.txt
+            cargo bench -p committer_cli -- --list | grep ': benchmark$' | sed -e "s/: benchmark$//" > benchmarks_list.txt
 
       # Benchmark the old code.
-      - run: cargo bench
+      - run: cargo bench -p committer_cli
 
       # Backup the downloaded files to avoid re-downloading them if they didn't change (overwritten by checkout).
       - run: mv ./crates/committer_cli/benches/tree_flow_inputs.json ./crates/committer_cli/benches/tree_flow_inputs.json_bu
@@ -139,4 +145,4 @@ jobs:
         uses: "google-github-actions/upload-cloud-storage@v2"
         with:
           path: "CLI_TARGET/release/committer_cli"
-          destination: "committer-products-external/${{ env.SHORT_HASH }}/release/"
+          destination: "committer-products-external/${{ env.SHORT_HASH }}/release/"

.github/workflows/merge_paths_ci.yml

@@ -0,0 +1,41 @@
+name: Merge-paths test
+
+on:
+  push:
+    branches:
+      - main
+      - main-v[0-9].**
+    tags:
+      - v[0-9].**
+    paths:
+      - '.github/workflows/merge_paths_ci.yml'
+      - 'scripts/merge_branches.json'
+      - 'scripts/merge_paths.json'
+      - 'scripts/merge_paths_test.py'
+      - 'scripts/merge_status.py'
+
+  pull_request:
+    types:
+      - opened
+      - reopened
+      - synchronize
+      - auto_merge_enabled
+      - edited
+    paths:
+      - '.github/workflows/merge_paths_ci.yml'
+      - 'scripts/merge_branches.json'
+      - 'scripts/merge_paths.json'
+      - 'scripts/merge_paths_test.py'
+      - 'scripts/merge_status.py'
+
+  merge-paths-test:
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
+        with:
+          python-version: '3.9'
+      - run: |
+          python -m pip install --upgrade pip
+          pip install pytest
+      - run: pytest scripts/merge_paths_test.py

Cargo.toml

@@ -53,8 +53,8 @@ ark-ec = "0.4.2"
 ark-ff = "0.4.0-alpha.7"
 ark-secp256k1 = "0.4.0"
 ark-secp256r1 = "0.4.0"
-assert_matches = "1.5.0"
 assert-json-diff = "2.0.2"
+assert_matches = "1.5.0"
 async-recursion = "1.1.0"
 async-stream = "0.3.3"
 async-trait = "0.1.79"
@@ -176,7 +176,14 @@ zstd = "0.13.1"
 future-incompatible = "deny"
 nonstandard-style = "deny"
 rust-2018-idioms = "deny"
-unused = "deny"
+# See [here](https://github.com/taiki-e/cargo-llvm-cov/issues/370) for a discussion on why this is
+# needed (from rust 1.80).
+unexpected_cfgs = { level = "warn", check-cfg = ['cfg(coverage_nightly)'] }
+# Need a priority of `-1` so it is before the `warnings` lint. See
+# [here](https://github.com/rust-lang/cargo/issues/12918) for details on the issue, and
+# [here](https://rust-lang.github.io/rust-clippy/master/index.html#/lint_groups_priority) for the
+# clippy failure this solves.
+unused = { level = "deny", priority = -1 }
 warnings = "deny"
 
 [workspace.lints.clippy]

commitlint.config.js

@@ -21,38 +21,47 @@ const Configuration = {
         'scope-enum': [2, 'always', [
             'base_layer',
             'block_builder',
+            'block_hash',
             'ci',
             'common',
+            'concurrency',
             'config',
             'consensus',
             'execution',
+            'fee',
+            'gateway',
             'helm',
             'JSON-RPC',
             'load_test',
+            'mempool_node',
+            'mempool',
             'monitoring',
+            'native_blockifier',
             'network',
             'node',
             'protobuf',
             'release',
+            'skeleton',
             'starknet_client',
+            'state',
             'storage',
             'sync',
             'test_utils',
+<<<<<<< HEAD
             'ci',
             'gateway',
             'mempool',
             'mempool_infra',
             'mempool_node',
+||||||| cd310745
+            'ci',
+            'gateway',
+            'mempool',
+            'mempool_node',
+=======
+>>>>>>> origin/main-v0.13.2
             'tests-integration',
-            'concurrency',
-            'execution',
-            'fee',
-            'native_blockifier',
-            'state',
             'transaction',
-            'block_hash',
-            'ci',
-            'skeleton',
             'types',
         ]],
     },

crates/blockifier/src/lib.rs

@@ -2,12 +2,7 @@
 // length to pointer type ([not necessarily true](https://github.com/rust-lang/rust/issues/65473),
 // but it is a reasonable assumption for now), this attribute protects against potential overflow
 // when converting usize to u128.
-#![cfg(any(
-    target_pointer_width = "16",
-    target_pointer_width = "32",
-    target_pointer_width = "64",
-    target_pointer_width = "128"
-))]
+#![cfg(any(target_pointer_width = "16", target_pointer_width = "32", target_pointer_width = "64",))]
 
 #[cfg(feature = "jemalloc")]
 // Override default allocator.

crates/committer/src/patricia_merkle_tree/updated_skeleton_tree/create_tree_helper.rs

@@ -41,6 +41,7 @@ impl TempSkeletonNode {
 /// Assumes the nodes are:
 /// * Descendants of the given index.
 /// * A non-empty array.
+///
 /// Note that the if the LCA is the root, the path will be empty (0 length).
 fn get_path_to_lca(
     root_index: &NodeIndex,

crates/committer_cli/benches/bench_split_and_prepare_post.sh

@@ -8,7 +8,7 @@ benchmark_results=${2}
 # TODO: split the output file instead.
 cat ${benchmarks_list} |
     while read line; do
-        cargo bench $line > ${line}.txt;
+        cargo bench -p committer_cli $line > ${line}.txt;
         sed -i '/'"${line}"'/,$!d' ${line}.txt;
     done
 

crates/mempool_infra/src/component_client/local_component_client.rs

@@ -11,7 +11,7 @@ use crate::component_definitions::ComponentRequestAndResponseSender;
 ///
 /// # Fields
 /// - `tx`: An asynchronous sender channel for transmitting
-/// `ComponentRequestAndResponseSender<Request, Response>` messages.
+///   `ComponentRequestAndResponseSender<Request, Response>` messages.
 ///
 /// # Example
 /// ```rust

crates/native_blockifier/src/lib.rs

@@ -1,10 +1,5 @@
 // The blockifier crate supports only these specific architectures.
-#![cfg(any(
-    target_pointer_width = "16",
-    target_pointer_width = "32",
-    target_pointer_width = "64",
-    target_pointer_width = "128"
-))]
+#![cfg(any(target_pointer_width = "16", target_pointer_width = "32", target_pointer_width = "64",))]
 
 pub mod errors;
 pub mod py_block_executor;