Merge branch 'main' into cw/fix-rlp-encode-util

kkrt-labs · Oct 2, 2024 · 7762435 · 7762435
2 parents c127f02 + 886d039
commit 7762435
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -23,6 +23,8 @@ jobs:
       kakarot_scripts: ${{ steps.filter.outputs.kakarot_scripts }}
       solidity: ${{ steps.filter.outputs.solidity }}
       tests: ${{ steps.filter.outputs.tests }}
+      makefile: ${{ steps.filter.outputs.makefile }}
+      rust: ${{ steps.filter.outputs.rust }}
     steps:
       - uses: actions/checkout@v4
       - uses: dorny/paths-filter@v3
@@ -37,13 +39,19 @@ jobs:
               - 'solidity_contracts/**'
             tests:
               - 'tests/**'
+            makefile:
+              - 'Makefile'
+            rust:
+              - 'rust-toolchain'
 
   build:
     runs-on: ubuntu-latest
     needs: paths-filter
     if:
       needs.paths-filter.outputs.src == 'true' ||
-      needs.paths-filter.outputs.kakarot_scripts == 'true'
+      needs.paths-filter.outputs.kakarot_scripts == 'true' ||
+      needs.paths-filter.outputs.makefile == 'true' ||
+      needs.paths-filter.outputs.rust == 'true'
     steps:
       - uses: actions/checkout@v4
       - uses: astral-sh/setup-uv@v2
@@ -105,7 +113,9 @@ jobs:
       needs.paths-filter.outputs.src == 'true' ||
       needs.paths-filter.outputs.kakarot_scripts == 'true' ||
       needs.paths-filter.outputs.solidity == 'true' ||
-      needs.paths-filter.outputs.tests == 'true'
+      needs.paths-filter.outputs.tests == 'true' ||
+      needs.paths-filter.outputs.makefile == 'true' ||
+      needs.paths-filter.outputs.rust == 'true'
     steps:
       - uses: actions/checkout@v4
       - name: Extract Katana Version

diff --git a/Makefile b/Makefile
@@ -10,7 +10,7 @@ endif
 KKRT_SSJ_RELEASE_ID = 176384150
 # Kakarot SSJ artifacts for precompiles.
 KKRT_SSJ_BUILD_ARTIFACT_URL = $(shell curl -L https://api.github.com/repos/kkrt-labs/kakarot-ssj/releases/${KKRT_SSJ_RELEASE_ID} | jq -r '.assets[0].browser_download_url')
-KATANA_VERSION = v1.0.0-alpha.12
+KATANA_VERSION = v1.0.0-alpha.13
 ROOT_DIR:=$(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
 
 BUILD_DIR = build

diff --git a/rust-toolchain b/rust-toolchain
@@ -1 +1 @@
-1.80.0
+1.81.0