ci: update dependencies (#1118)

Please check the type of change your PR introduces: - [ ] Bugfix - [ ] Feature - [ ] Code style update (formatting, renaming) - [ ] Refactoring (no functional changes, no api changes) - [x] Build related changes - [ ] Documentation content changes - [ ] Other (please describe): ## What is the current behavior?   - bump some deps in CI - -  - - - This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/kkrt-labs/kakarot/1118)
kkrt-labs · Apr 22, 2024 · fd7ddb2 · fd7ddb2
1 parent d354fbd
commit fd7ddb2
Show file tree

Hide file tree

Showing 9 changed files with 727 additions and 705 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -22,15 +22,15 @@ jobs:
       CI_COMMIT_MESSAGE: CI Formatting Auto Commit
       CI_COMMIT_AUTHOR: ${{ github.event.repository.name }} CI
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       # Python setup
-      - name: Set up Python 3.9
+      - name: Set up Python 3.10.14
         uses: actions/setup-python@v4
         with:
-          python-version: 3.9
+          python-version: 3.10.14
       - name: Load cached Poetry installation
         id: cached-poetry
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.local
           key: poetry-${{ runner.os }}
@@ -44,7 +44,7 @@ jobs:
       - run: poetry config installer.modern-installation false
       - name: Load cached venv
         id: cached-poetry-dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: .venv
           key: venv-${{ runner.os }}-${{ hashFiles('**/poetry.lock') }}
@@ -68,14 +68,14 @@ jobs:
     env:
       PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION: python
     steps:
-      - uses: actions/checkout@v3
-      - name: Set up Python 3.9
+      - uses: actions/checkout@v4
+      - name: Set up Python 3.10.14
         uses: actions/setup-python@v4
         with:
-          python-version: 3.9
+          python-version: 3.10.14
       - name: Load cached Poetry installation
         id: cached-poetry
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.local
           key: poetry-${{ runner.os }}
@@ -89,7 +89,7 @@ jobs:
       - run: poetry config installer.modern-installation false
       - name: Load cached venv
         id: cached-poetry-dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: .venv
           key: venv-${{ runner.os }}-${{ hashFiles('**/poetry.lock') }}
@@ -113,14 +113,19 @@ jobs:
       STARKNET_NETWORK: katana
       PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION: python
     steps:
-      - uses: actions/checkout@v3
-      - name: Set up Python 3.9
+      - uses: actions/checkout@v4
+      - name: Extract Katana Version
+        id: extract_katana_version
+        run: |
+          KATANA_VERSION=$(grep -oP '^KATANA_VERSION = \K.*' Makefile)
+          echo "katana_version=$KATANA_VERSION" >> "$GITHUB_OUTPUT"
+      - name: Set up Python 3.10
         uses: actions/setup-python@v4
         with:
-          python-version: 3.9
+          python-version: 3.10.14
       - name: Load cached Poetry installation
         id: cached-poetry
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.local
           key: poetry-${{ runner.os }}
@@ -134,7 +139,7 @@ jobs:
       - run: poetry config installer.modern-installation false
       - name: Load cached venv
         id: cached-poetry-dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: .venv
           key: venv-${{ runner.os }}-${{ hashFiles('**/poetry.lock') }}
@@ -147,10 +152,10 @@ jobs:
           version: nightly
       - name: Load cached katana
         id: cached-katana
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.cargo/bin
-          key: katana-v0.6.0-alpha.2
+          key: katana-${{ steps.extract_katana_version.outputs.katana_version }}
       - name: Install Katana
         if: steps.cached-katana.outputs.cache-hit != 'true'
         run: make install-katana
@@ -165,11 +170,11 @@ jobs:
     needs: build
     steps:
       - name: Checkout ef-tests
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: kkrt-labs/ef-tests
       - name: Checkout local skip file
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           sparse-checkout: |
             blockchain-tests-skip.yml
@@ -196,7 +201,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          python-version: 3.x
+          python-version: 3.10.14
       - name: run tests
         run: |
           set -o pipefail
@@ -216,14 +221,14 @@ jobs:
     runs-on: ubuntu-latest
     needs: ef-tests
     steps:
-      - uses: actions/checkout@v3
-      - name: Set up Python 3.9
+      - uses: actions/checkout@v4
+      - name: Set up Python 3.10.14
         uses: actions/setup-python@v4
         with:
-          python-version: 3.9
+          python-version: 3.10.14
       - name: Load cached Poetry installation
         id: cached-poetry
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.local
           key: poetry-${{ runner.os }}
@@ -237,7 +242,7 @@ jobs:
       - run: poetry config installer.modern-installation false
       - name: Load cached venv
         id: cached-poetry-dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: .venv
           key: venv-${{ runner.os }}-${{ hashFiles('**/poetry.lock') }}

diff --git a/.github/workflows/deployments.yml b/.github/workflows/deployments.yml
@@ -20,13 +20,13 @@ jobs:
       PRIVATE_KEY: ${{ secrets.PRIVATE_KEY }}
       INFURA_KEY: ${{ secrets.INFURA_KEY }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-python@v4
         with:
-          python-version: 3.9.13
+          python-version: 3.10.14
       - name: Load cached Poetry installation
         id: cached-poetry
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.local
           key: poetry-${{ runner.os }}
@@ -40,7 +40,7 @@ jobs:
       - run: poetry config installer.modern-installation false
       - name: Load cached venv
         id: cached-poetry-dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: .venv
           key: venv-${{ runner.os }}-${{ hashFiles('**/poetry.lock') }}

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -4,6 +4,8 @@ name: Release
 on:
   release:
     types: [published]
+  # trunk-ignore(yamllint/empty-values)
+  workflow_dispatch:
 
 env:
   REGISTRY_IMAGE: ghcr.io/${{ github.repository }}/deployer
@@ -12,19 +14,19 @@ jobs:
   build_and_push_docker_deployer:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Build and push
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           push: true
           tags:
@@ -37,14 +39,14 @@ jobs:
   build_and_push_artifacts:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - name: Set up Python 3.9
+      - uses: actions/checkout@v4
+      - name: Set up Python 3.10
         uses: actions/setup-python@v4
         with:
-          python-version: 3.9
+          python-version: 3.10.14
       - name: Load cached Poetry installation
         id: cached-poetry
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.local
           key: poetry-${{ runner.os }}
@@ -58,7 +60,7 @@ jobs:
       - run: poetry config installer.modern-installation false
       - name: Load cached venv
         id: cached-poetry-dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: .venv
           key: venv-${{ runner.os }}-${{ hashFiles('**/poetry.lock') }}

diff --git a/Makefile b/Makefile
@@ -8,7 +8,7 @@ endif
 
 # Kakarot SSJ artifacts for precompiles
 KKRT_SSJ_BUILD_ARTIFACT_URL = $(shell curl -L https://api.github.com/repos/kkrt-labs/kakarot-ssj/releases/latest | jq -r '.assets[0].browser_download_url')
-
+KATANA_VERSION = v0.6.1-alpha.3
 build: check
 	$(MAKE) clean
 	poetry run python ./kakarot_scripts/compile_kakarot.py
@@ -65,7 +65,7 @@ build-sol:
 	forge build --names --force
 
 install-katana:
-	cargo install --git https://github.com/dojoengine/dojo --locked --tag v0.6.1-alpha.3 katana
+	cargo install --git https://github.com/dojoengine/dojo --locked --tag "${KATANA_VERSION}" katana
 
 run-katana:
 	katana --chain-id test --validate-max-steps 4000000 --invoke-max-steps 6000000 --eth-gas-price 0 --strk-gas-price 0 --disable-fee
diff --git a/docker/deployer/Dockerfile b/docker/deployer/Dockerfile
@@ -11,6 +11,7 @@ HEALTHCHECK NONE
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
     curl \
+    git \
     && rm -rf /var/lib/apt/lists/*
 
 ENV POETRY_NO_INTERACTION=1 \

diff --git a/kakarot_scripts/utils/kakarot.py b/kakarot_scripts/utils/kakarot.py
@@ -380,7 +380,8 @@ async def eth_send_transaction(
     transaction_events = [
         event
         for event in receipt.events
-        if event.from_address == evm_account.address
+        # TODO: from_address=0 in new katana version, no reason why
+        if event.from_address in [evm_account.address, 0]
         and event.keys[0] == starknet_keccak(b"transaction_executed")
     ]
     if len(transaction_events) != 1:
-Original file line number
+Diff line change
@@ Expand Up / @@ -11,6 +11,7 @@ HEALTHCHECK NONE @@
     RUN apt-get update && apt-get install -y --no-install-recommends \
         curl \
+        git \
         && rm -rf /var/lib/apt/lists/*
     ENV POETRY_NO_INTERACTION=1 \
@@ Expand Down @@