feat: release new versions of zkevm-contracts image (#407)

* ci: small change for zkevm-contracts fork11 images

* chore: pin foundry version in ci and docker images

* ci: pin foundry version in toolbox

* chore: bump to latest toolbox img

* fix: re-build all zkevm-contracts images

* fix: enable the build

* ci: revert force-push

* feat: enable to append a patch version at the end of the zkevm-contracts img

* docs: update docker docs

* fix: typo

* fix: patch version

* fix: `get_fork_id()`

* feat: update zkevm-contracts images

* fix: cdk version matrix

* chore: nit

* ci: fix cdk e2e tests

* test: use latest cdk e2e tests

.github/actions/setup-kurtosis-cdk/action.yml

@@ -6,7 +6,11 @@ inputs:
   kurtosis-version:
     description: The version of kurtosis
     required: false
-    default: '1.4.1' # https://github.com/kurtosis-tech/kurtosis/releases
+    default: 1.4.2 # Should be aligned with .github/workflows/lint.yml
+  foundry-version:
+    description: The version of foundry
+    required: false
+    default: nightly-27cabbd6c905b1273a5ed3ba7c10acce90833d76 # https://github.com/foundry-rs/foundry/releases/tag/nightly-27cabbd6c905b1273a5ed3ba7c10acce90833d76 - 2024-11-29
 
 runs:
   using: "composite"
@@ -38,3 +42,5 @@ runs:
 
     - name: Install foundry
       uses: foundry-rs/foundry-toolchain@v1
+      with:
+        version: ${{ inputs.foundry-version }}

.github/tests/combinations/fork11-legacy-zkevm-stack-rollup.yml

@@ -1,6 +1,6 @@
 args:
   verbosity: debug
-  zkevm_contracts_image: leovct/zkevm-contracts:v7.0.0-rc.2-fork.11
+  zkevm_contracts_image: leovct/zkevm-contracts:v7.0.0-rc.2-fork.11-patch.1
   zkevm_prover_image: hermeznetwork/zkevm-prover:v7.0.4-fork.11
   cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.60.0
   zkevm_node_image: hermeznetwork/zkevm-node:v0.7.0-fork11

.github/tests/combinations/fork11-new-cdk-stack-cdk-validium.yml

@@ -1,6 +1,6 @@
 args:
   verbosity: debug
-  zkevm_contracts_image: leovct/zkevm-contracts:v7.0.0-rc.2-fork.11
+  zkevm_contracts_image: leovct/zkevm-contracts:v7.0.0-rc.2-fork.11-patch.1
   zkevm_prover_image: hermeznetwork/zkevm-prover:v7.0.4-fork.11
   cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.60.0
   zkevm_node_image: hermeznetwork/zkevm-node:v0.7.0-fork11

.github/tests/combinations/fork11-new-cdk-stack-rollup.yml

@@ -1,6 +1,6 @@
 args:
   verbosity: debug
-  zkevm_contracts_image: leovct/zkevm-contracts:v7.0.0-rc.2-fork.11
+  zkevm_contracts_image: leovct/zkevm-contracts:v7.0.0-rc.2-fork.11-patch.1
   zkevm_prover_image: hermeznetwork/zkevm-prover:v7.0.4-fork.11
   cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.60.0
   zkevm_node_image: hermeznetwork/zkevm-node:v0.7.0-fork11

.github/tests/combinations/fork12-new-cdk-stack-cdk-validium.yml

@@ -1,6 +1,6 @@
 args:
   verbosity: debug
-  zkevm_contracts_image: leovct/zkevm-contracts:v8.0.0-fork.12
+  zkevm_contracts_image: leovct/zkevm-contracts:v8.0.0-fork.12-patch.1
   zkevm_prover_image: hermeznetwork/zkevm-prover:v8.0.0-RC14-fork.12
   cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.60.0
   zkevm_da_image: 0xpolygon/cdk-data-availability:0.0.10

.github/tests/combinations/fork12-new-cdk-stack-rollup.yml

@@ -1,6 +1,6 @@
 args:
   verbosity: debug
-  zkevm_contracts_image: leovct/zkevm-contracts:v8.0.0-fork.12
+  zkevm_contracts_image: leovct/zkevm-contracts:v8.0.0-fork.12-patch.1
   zkevm_prover_image: hermeznetwork/zkevm-prover:v8.0.0-RC14-fork.12
   cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.60.0
   zkevm_da_image: 0xpolygon/cdk-data-availability:0.0.10

.github/tests/combinations/fork13-new-cdk-stack-cdk-validium.yml

@@ -1,6 +1,6 @@
 args:
   verbosity: debug
-  zkevm_contracts_image: leovct/zkevm-contracts:v8.1.0-rc.1-fork.13
+  zkevm_contracts_image: leovct/zkevm-contracts:v8.1.0-rc.1-fork.13-patch.1
   zkevm_prover_image: hermeznetwork/zkevm-prover:v9.0.0-RC2-fork.13
   cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.60.0
   zkevm_da_image: 0xpolygon/cdk-data-availability:0.0.10

.github/tests/combinations/fork13-new-cdk-stack-rollup.yml

@@ -1,6 +1,6 @@
 args:
   verbosity: debug
-  zkevm_contracts_image: leovct/zkevm-contracts:v8.1.0-rc.1-fork.13
+  zkevm_contracts_image: leovct/zkevm-contracts:v8.1.0-rc.1-fork.13-patch.1
   zkevm_prover_image: hermeznetwork/zkevm-prover:v9.0.0-RC2-fork.13
   cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.60.0
   zkevm_da_image: 0xpolygon/cdk-data-availability:0.0.10

.github/tests/combinations/fork9-legacy-zkevm-stack-cdk-validium.yml

@@ -1,6 +1,6 @@
 args:
   verbosity: debug
-  zkevm_contracts_image: leovct/zkevm-contracts:v6.0.0-rc.1-fork.9
+  zkevm_contracts_image: leovct/zkevm-contracts:v6.0.0-rc.1-fork.9-patch.1
   zkevm_prover_image: hermeznetwork/zkevm-prover:v6.0.8
   cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.60.0
   zkevm_node_image: hermeznetwork/zkevm-node:v0.7.3

.github/tests/combinations/fork9-legacy-zkevm-stack-rollup.yml

@@ -1,6 +1,6 @@
 args:
   verbosity: debug
-  zkevm_contracts_image: leovct/zkevm-contracts:v6.0.0-rc.1-fork.9
+  zkevm_contracts_image: leovct/zkevm-contracts:v6.0.0-rc.1-fork.9-patch.1
   zkevm_prover_image: hermeznetwork/zkevm-prover:v6.0.8
   cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.60.0
   zkevm_node_image: hermeznetwork/zkevm-node:v0.7.3

.github/tests/combinations/fork9-new-cdk-stack-cdk-validium.yml

@@ -1,6 +1,6 @@
 args:
   verbosity: debug
-  zkevm_contracts_image: leovct/zkevm-contracts:v6.0.0-rc.1-fork.9
+  zkevm_contracts_image: leovct/zkevm-contracts:v6.0.0-rc.1-fork.9-patch.1
   zkevm_prover_image: hermeznetwork/zkevm-prover:v6.0.8
   cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.60.0
   zkevm_node_image: hermeznetwork/zkevm-node:v0.7.3

.github/tests/combinations/fork9-new-cdk-stack-rollup.yml

@@ -1,6 +1,6 @@
 args:
   verbosity: debug
-  zkevm_contracts_image: leovct/zkevm-contracts:v6.0.0-rc.1-fork.9
+  zkevm_contracts_image: leovct/zkevm-contracts:v6.0.0-rc.1-fork.9-patch.1
   zkevm_prover_image: hermeznetwork/zkevm-prover:v6.0.8
   cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.60.0
   zkevm_node_image: hermeznetwork/zkevm-node:v0.7.3

.github/tests/combine-ymls.sh

@@ -77,8 +77,8 @@ for fork in "${forks[@]}"; do
                             source: "https://github.com/0xPolygonHermez/zkevm-prover/releases/tag/\(.args.zkevm_prover_image | split(":")[1] | split("-fork")[0])",
                         },
                         zkevm_contracts: {
-                            version: .args.zkevm_contracts_image | split(":")[1],
-                            source: "https://github.com/0xPolygonHermez/zkevm-contracts/releases/tag/\(.args.zkevm_contracts_image | split(":")[1])",
+                            version: .args.zkevm_contracts_image | split(":")[1] | split("-patch.")[0],
+                            source: "https://github.com/0xPolygonHermez/zkevm-contracts/releases/tag/\(.args.zkevm_contracts_image | split(":")[1] | split("-patch.")[0])",
                         },
                         data_availability: {
                             version: .args.zkevm_da_image | split(":")[1],

.github/tests/forks/fork11.yml

@@ -2,7 +2,7 @@ args:
   verbosity: debug
 
   # https://hub.docker.com/repository/docker/leovct/zkevm-contracts/tags?name=fork.11
-  zkevm_contracts_image: leovct/zkevm-contracts:v7.0.0-rc.2-fork.11
+  zkevm_contracts_image: leovct/zkevm-contracts:v7.0.0-rc.2-fork.11-patch.1
 
   # https://hub.docker.com/r/hermeznetwork/zkevm-prover/tags?name=fork.11
   zkevm_prover_image: hermeznetwork/zkevm-prover:v7.0.4-fork.11

.github/tests/forks/fork12.yml

@@ -2,7 +2,7 @@ args:
   verbosity: debug
 
   # https://hub.docker.com/repository/docker/leovct/zkevm-contracts/tags?name=fork.12
-  zkevm_contracts_image: leovct/zkevm-contracts:v8.0.0-fork.12
+  zkevm_contracts_image: leovct/zkevm-contracts:v8.0.0-fork.12-patch.1
 
   # https://hub.docker.com/r/hermeznetwork/zkevm-prover/tags?name=v8
   zkevm_prover_image: hermeznetwork/zkevm-prover:v8.0.0-RC14-fork.12

.github/tests/forks/fork13.yml

@@ -2,7 +2,7 @@ args:
   verbosity: debug
 
   # https://hub.docker.com/repository/docker/leovct/zkevm-contracts/tags?name=fork.13
-  zkevm_contracts_image: leovct/zkevm-contracts:v8.1.0-rc.1-fork.13
+  zkevm_contracts_image: leovct/zkevm-contracts:v8.1.0-rc.1-fork.13-patch.1
 
   # https://hub.docker.com/r/hermeznetwork/zkevm-prover/tags?name=v9
   zkevm_prover_image: hermeznetwork/zkevm-prover:v9.0.0-RC2-fork.13

.github/tests/forks/fork9.yml

@@ -2,7 +2,7 @@ args:
   verbosity: debug
 
   # https://hub.docker.com/repository/docker/leovct/zkevm-contracts/tags?name=fork.9
-  zkevm_contracts_image: leovct/zkevm-contracts:v6.0.0-rc.1-fork.9
+  zkevm_contracts_image: leovct/zkevm-contracts:v6.0.0-rc.1-fork.9-patch.1
 
   # https://hub.docker.com/r/hermeznetwork/zkevm-prover/tags?name=v6
   zkevm_prover_image: hermeznetwork/zkevm-prover:v6.0.8

.github/workflows/docker-image-builder.yml

@@ -8,10 +8,14 @@ on:
       zkevm_contracts_version:
         description: The ZkEVM contracts version tag to build (e.g., v8.1.0-rc.1-fork.13 or a commit hash)
         required: true
+      patch_version:
+        description: The version for the patch (e.g., 1, 2 or a string)
+        required: false
 
 env:
   IMAGE_NAME: leovct/zkevm-contracts
-  POLYCLI_VERSION: main
+  POLYCLI_VERSION: v0.1.64 # https://github.com/0xPolygon/polygon-cli/releases/tag/v0.1.64 - 2024-11-25
+  FOUNDRY_VERSION: nightly-27cabbd6c905b1273a5ed3ba7c10acce90833d76 # https://github.com/foundry-rs/foundry/releases/tag/nightly-27cabbd6c905b1273a5ed3ba7c10acce90833d76 - 2024-11-29
 
 jobs:
   zkevm-contracts:
@@ -28,14 +32,27 @@ jobs:
       - name: Determine full tag
         id: determine_tag
         run: |
+          # Append the fork id to the image tag.
           TAG=${{ github.event.inputs.zkevm_contracts_version }}
-          if [[ $TAG == *pp ]]; then
+          if [[ $TAG == *-fork.10 ]]; then
+            # Custom rule to label fork10 tags as fork11.
+            FULL_TAG="${TAG%-fork.10}-fork.11"
+          elif [[ $TAG == *pp ]]; then
+            # Custom rule to label pp tags as fork12.
             FULL_TAG="${TAG}-fork.12"
           elif [[ $TAG != *-fork.[0-9]* ]]; then
+            # Custom rule to label undefined tags as fork13.
             FULL_TAG="${TAG}-fork.13"
           else
             FULL_TAG=$TAG
           fi
+
+          # If provided, append the patch version at the end of the image tag.
+          PATCH_VERSION=${{ github.event.inputs.patch_version }}
+          if [[ -n "$PATCH_VERSION" ]]; then
+            FULL_TAG="${FULL_TAG}-patch.${PATCH_VERSION}"
+          fi
+
           echo "full_tag=$FULL_TAG" >> $GITHUB_OUTPUT
 
       - name: Check if image already exists
@@ -58,6 +75,7 @@ jobs:
           build-args: |
             ZKEVM_CONTRACTS_BRANCH=${{ github.event.inputs.zkevm_contracts_version }}
             POLYCLI_VERSION=${{ env.POLYCLI_VERSION }}
+            FOUNDRY_VERSION=${{ env.FOUNDRY_VERSION }}
           push: true
           tags: ${{ env.IMAGE_NAME }}:${{ steps.determine_tag.outputs.full_tag }}
           cache-from: type=gha

.github/workflows/lint.yml

@@ -11,7 +11,7 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  KURTOSIS_VERSION: 0.90.1
+  KURTOSIS_VERSION: 1.4.2 # Should be aligned with .github/actions/setup-kurtosis-cdk/action.yml
 
 jobs:
   lint:

.github/workflows/test.yml

@@ -13,8 +13,9 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  POLYCLI_VERSION: v0.1.64
-  CDK_VERSION: a6422912423e05f8b1494a3959de000e992499f9 # https://github.com/0xPolygon/cdk/commit/a6422912423e05f8
+  POLYCLI_VERSION: v0.1.64 # https://github.com/0xPolygon/polygon-cli/releases/tag/v0.1.64 - 2024-11-25
+  # Use fork instead of cdk repository until they migrate to the new version of kurtosis-cdk.
+  CDK_VERSION: d9845e94bf3c93fb297f81942e1673bc01fd2701 # https://github.com/leovct/cdk/commit/d9845e94bf3c93fb297f81942e1673bc01fd2701
 
 jobs:
   build-cdk-image:
@@ -26,7 +27,9 @@ jobs:
     - name: Checkout cdk repository
       uses: actions/checkout@v4
       with:
-        repository: 0xPolygon/cdk
+        # Use fork instead of cdk repository until they migrate to the new version of kurtosis-cdk.
+        # repository: 0xPolygon/cdk
+        repository: leovct/cdk
         path: cdk
         ref: ${{ env.CDK_VERSION }}
 
@@ -91,7 +94,9 @@ jobs:
     - name: Checkout cdk repository
       uses: actions/checkout@v4
       with:
-        repository: 0xPolygon/cdk
+        # Use fork instead of cdk repository until they migrate to the new version of kurtosis-cdk.
+        # repository: 0xPolygon/cdk
+        repository: leovct/cdk
         path: cdk
         ref: ${{ env.CDK_VERSION }}
 

docker/README.md

@@ -6,23 +6,15 @@ We maintain a suite of custom Docker images tailored specifically for deploying
 
 ### ZkEVM Contracts
 
-Kurtosis CDK's zkevm contracts images are [hosted](https://hub.docker.com/repository/docker/leovct/zkevm-contracts/general) on the Docker Hub.
+- They are [hosted](https://hub.docker.com/repository/docker/leovct/zkevm-contracts/general) on the Docker Hub.
+- They share the same tags as [0xPolygonHermez/zkevm-contracts](https://github.com/0xPolygonHermez/zkevm-contracts).
+- They have been suffixed with `-fork.<id>` to work properly with Kurtosis CDK. For example, pessimistic tags have been prefixed with `-fork.12`, e.g. the zkevm-contracts tag `v9.0.0-rc.2-pp` corresponds to `leovct/zkevm-contracts:v9.0.0-rc.2-pp-fork.12`.
+- Because of some dependency breaking changes with `foundry`, we have introduced patch images. They are not compatible with all the versions of kurtosis-cdk!
 
-These images share the same tags as [0xPolygonHermez/zkevm-contracts](https://github.com/0xPolygonHermez/zkevm-contracts).
-
-> **🚨 Images must be suffixed with `-fork.<id>` to work properly with Kurtosis CDK!**
-
-| Fork ID   | zkEVM Contracts Tag / Commit | Image                                           |
-| --------- | ---------------------------- | ----------------------------------------------- |
-| 13-RC1    | `v8.1.0-rc.1-fork.13`        | `leovct/zkevm-contracts:v8.1.0-rc.1-fork.13`    |
-| 12-PP-RC2 | `v9.0.0-rc.2-pp`             | `leovct/zkevm-contracts:v9.0.0-rc.2-pp-fork.12` |
-| 12-PP-RC1 | `v9.0.0-rc.1-pp`             | `leovct/zkevm-contracts:v9.0.0-rc.1-pp-fork.12` |
-| 12-RC4    | `v8.0.0-rc.4-fork.12`        | `leovct/zkevm-contracts:v8.0.0-rc.4-fork.12`    |
-| 12-RC3    | `v8.0.0-rc.3-fork.12`        | `leovct/zkevm-contracts:v8.0.0-rc.3-fork.12`    |
-| 12-RC2    | `v8.0.0-rc.2-fork.12`        | `leovct/zkevm-contracts:v8.0.0-rc.2-fork.12`    |
-| 12-RC1    | `v8.0.0-rc.1-fork.12`        | `leovct/zkevm-contracts:v8.0.0-rc.1-fork.12`    |
-| 11-RC2    | `v7.0.0-rc.2-fork.10`        | `leovct/zkevm-contracts:v7.0.0-rc.2-fork.11`    |
-| 9-RC1     | `v6.0.0-rc.1-fork.9`         | `leovct/zkevm-contracts:v6.0.0-rc.1-fork.9` |
+  | Patch Version | Foundry Version | Polycli Version | Compatibility with kurtosis-cdk |
+  | ------------- | --------------- | --------------- | --------------- |
+  | None | [nightly-31dd1f77fd9156d09836486d97963cec7f555343](https://github.com/foundry-rs/foundry/releases/tag/nightly-31dd1f77fd9156d09836486d97963cec7f555343) | [v0.1.64](https://github.com/0xPolygon/polygon-cli/releases/tag/v0.1.64) | <= `v0.2.22` |
+  | `patch1` | [nightly-27cabbd6c905b1273a5ed3ba7c10acce90833d76](https://github.com/foundry-rs/foundry/tree/nightly-27cabbd6c905b1273a5ed3ba7c10acce90833d76) | [v0.1.64](https://github.com/0xPolygon/polygon-cli/releases/tag/v0.1.64) | > `v0.2.22` |
 
 ### ZkEVM Bridge UI
 
@@ -81,6 +73,7 @@ docker build . \
   --tag local/zkevm-contracts:$version \
   --build-arg ZKEVM_CONTRACTS_BRANCH=$version \
   --build-arg POLYCLI_VERSION=main \
+  --build-arg FOUNDRY_VERSION=nightly \
   --file zkevm-contracts.Dockerfile
 ```
 
@@ -131,6 +124,7 @@ Build the `toolbox` image.
 docker build . \
   --tag local/toolbox:local \
   --build-arg POLYCLI_VERSION=main \
+  --build-arg FOUNDRY_VERSION=nightly \
   --file toolbox.Dockerfile
 ```
 

docker/toolbox.Dockerfile

@@ -6,6 +6,7 @@ RUN git clone --branch ${POLYCLI_VERSION} https://github.com/maticnetwork/polygo
 
 
 FROM ubuntu:24.04
+ARG FOUNDRY_VERSION
 LABEL author="[email protected]"
 LABEL description="Blockchain toolbox"
 
@@ -23,5 +24,5 @@ RUN apt-get update \
   && pipx ensurepath \
   && pipx install yq \
   && curl --silent --location --proto "=https" https://foundry.paradigm.xyz | bash \
-  && /root/.foundry/bin/foundryup \
+  && /root/.foundry/bin/foundryup --version ${FOUNDRY_VERSION} \
   && cp /root/.foundry/bin/* /usr/local/bin

docker/zkevm-contracts.Dockerfile

@@ -19,6 +19,7 @@ RUN git clone https://github.com/0xPolygonHermez/zkevm-contracts . \
   && npx hardhat compile
 
 # STEP 2: Install tools.
+ARG FOUNDRY_VERSION
 COPY --from=polycli-builder /opt/polygon-cli/out/polycli /usr/bin/polycli
 WORKDIR /opt
 # WARNING (DL3008): Pin versions in apt get install.
@@ -32,7 +33,7 @@ RUN apt-get update \
   && pipx ensurepath \
   && pipx install yq \
   && curl --silent --location --proto "=https" https://foundry.paradigm.xyz | bash \
-  && /root/.foundry/bin/foundryup \
+  && /root/.foundry/bin/foundryup --version ${FOUNDRY_VERSION} \
   && cp /root/.foundry/bin/* /usr/local/bin
 
 USER node

docs/edit-contracts.md

@@ -164,6 +164,7 @@ docker build . \
  --tag local/zkevm-contracts:v6.0.0-rc.1-fork.9 \
  --build-arg ZKEVM_CONTRACTS_BRANCH=v6.0.0-rc.1-fork.9 \
  --build-arg POLYCLI_VERSION=main \
+--build-arg FOUNDRY_VERSION=nightly \
  --file zkevm-contracts.Dockerfile
 ```
 

input_parser.star

@@ -36,7 +36,7 @@ DEFAULT_IMAGES = {
     "zkevm_bridge_proxy_image": "haproxy:3.1-bookworm",  # https://hub.docker.com/_/haproxy/tags
     "zkevm_bridge_service_image": "hermeznetwork/zkevm-bridge-service:v0.6.0-RC2",  # https://hub.docker.com/r/hermeznetwork/zkevm-bridge-service/tags
     "zkevm_bridge_ui_image": "leovct/zkevm-bridge-ui:multi-network",  # https://hub.docker.com/r/leovct/zkevm-bridge-ui/tags
-    "zkevm_contracts_image": "leovct/zkevm-contracts:v8.0.0-fork.12",  # https://hub.docker.com/repository/docker/leovct/zkevm-contracts/tags
+    "zkevm_contracts_image": "leovct/zkevm-contracts:v8.0.0-fork.12-patch.1",  # https://hub.docker.com/repository/docker/leovct/zkevm-contracts/tags
     "zkevm_da_image": "0xpolygon/cdk-data-availability:0.0.10",  # https://hub.docker.com/r/0xpolygon/cdk-data-availability/tags
     "zkevm_node_image": "hermeznetwork/zkevm-node:v0.7.3",  # https://hub.docker.com/r/hermeznetwork/zkevm-node/tags
     "zkevm_pool_manager_image": "hermeznetwork/zkevm-pool-manager:v0.1.2",  # https://hub.docker.com/r/hermeznetwork/zkevm-pool-manager/tags
@@ -417,18 +417,20 @@ def get_fork_id(zkevm_contracts_image):
     Extract the fork identifier and fork name from a zkevm contracts image name.
 
     The zkevm contracts tags follow the convention:
-    v<SEMVER>-rc.<RC_NUMBER>-fork.<FORK_ID>
+    v<SEMVER>-rc.<RC_NUMBER>-fork.<FORK_ID>[-patch.<PATCH_NUMBER>]
 
     Where:
     - <SEMVER> is the semantic versioning (MAJOR.MINOR.PATCH).
     - <RC_NUMBER> is the release candidate number.
     - <FORK_ID> is the fork identifier.
+    - -patch.<PATCH_NUMBER> is optional and represents the patch number.
 
     Example:
     - v8.0.0-rc.2-fork.12
     - v7.0.0-rc.1-fork.10
+    - v7.0.0-rc.1-fork.11-patch.1
     """
-    result = zkevm_contracts_image.split("fork.")
+    result = zkevm_contracts_image.split("-patch.")[0].split("-fork.")
     if len(result) != 2:
         fail(
             "The zkevm contracts image tag '{}' does not follow the standard v<SEMVER>-rc.<RC_NUMBER>-fork.<FORK_ID>".format(

src/package_io/constants.star

@@ -11,4 +11,4 @@ SEQUENCER_TYPE = struct(
     ZKEVM="zkevm",
 )
 
-TX_SPAMMER_IMG = "leovct/toolbox:0.0.5"
+TX_SPAMMER_IMG = "leovct/toolbox:0.0.7"