Merge branch 'main' into miniblock_max_payload_size

matter-labs · Apr 16, 2024 · 245e12f · 245e12f
2 parents a22ce74 + 02f7cd5
commit 245e12f
Show file tree

Hide file tree

Showing 264 changed files with 6,030 additions and 3,791 deletions.
diff --git a/.github/release-please/config.json b/.github/release-please/config.json
@@ -4,10 +4,17 @@
   "bootstrap-sha": "691a7008f6d1f88fb9a5b6b8d92592e1199f37ea",
   "bump-minor-pre-major": true,
   "bump-patch-for-minor-pre-major": true,
+  "include-component-in-tag": true,
   "packages": {
       "core": {
         "release-type": "simple",
-        "component": "core"
+        "component": "core",
+        "extra-files": [
+          {
+            "type": "generic",
+            "path": "bin/external_node/Cargo.toml"
+          }
+        ]
       },
       "prover": {
         "release-type": "simple",

diff --git a/.github/release-please/manifest.json b/.github/release-please/manifest.json
@@ -1,4 +1,4 @@
 {
-  "core": "22.1.0",
+  "core": "23.0.0",
   "prover": "12.2.0"
 }
diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml
@@ -17,13 +17,11 @@ jobs:
     steps:
       - name: Run release-please
         id: release
-        uses: google-github-actions/release-please-action@v3
+        uses: google-github-actions/release-please-action@v4
         with:
             token: ${{ secrets.RELEASE_TOKEN }}
-            command: manifest
             config-file: .github/release-please/config.json
             manifest-file: .github/release-please/manifest.json
-            monorepo-tags: true
 
       - name: Send Release Info
         if: ${{ steps.release.outputs.releases_created }}

diff --git a/.github/workflows/vm-perf-comparison.yml b/.github/workflows/vm-perf-comparison.yml
@@ -46,7 +46,7 @@ jobs:
           ci_run zk
           ci_run zk compiler system-contracts
           ci_run cargo bench --package vm-benchmark --bench iai | tee base-iai
-          ci_run cd core/tests/vm_benchmark && cargo run --release --bin instruction-counts | tee base-opcodes || touch base-opcodes
+          ci_run cargo run --package vm-benchmark --release --bin instruction-counts | tee base-opcodes || touch base-opcodes
           ci_run yarn workspace system-contracts clean
 
       - name: checkout PR
@@ -58,7 +58,7 @@ jobs:
           ci_run zk
           ci_run zk compiler system-contracts
           ci_run cargo bench --package vm-benchmark --bench iai | tee pr-iai
-          ci_run cd core/tests/vm_benchmark && cargo run --release --bin instruction-counts | tee pr-opcodes || touch pr-opcodes
+          ci_run cargo run --package vm-benchmark --release --bin instruction-counts | tee pr-opcodes || touch pr-opcodes
 
           EOF=$(dd if=/dev/urandom bs=15 count=1 status=none | base64)
           echo "speedup<<$EOF" >> $GITHUB_OUTPUT