Merge pull request #483 from cosmos/gjermund/merge-main

chore: backport main to release/v1.0.x

Author: gjermundgaraba

.dockerignore

@@ -1 +1,2 @@
 target/**
+programs/relayer/Dockerfile

.github/actions/e2e-setup/action.yml

@@ -25,7 +25,8 @@ runs:
         path: |
           ~/.cargo/bin/relayer
           ~/.cargo/bin/operator
-        key: ${{ runner.os }}-relayer-${{ hashFiles('Cargo.lock', 'packages/**', 'programs/**', 'abi/**') }}
+          ./target/elf-compilation/riscv32im-succinct-zkvm-elf/release/*
+        key: ${{ runner.os }}-relayer-${{ hashFiles('Cargo.lock', 'Cargo.toml', 'packages/**', 'programs/**', 'abi/**') }}
 
     - name: Install SP1 toolchain
       if: (steps.cache-relayer.outputs.cache-hit != 'true')
@@ -49,6 +50,14 @@ runs:
         command: install
         args: --bin relayer --path programs/relayer --locked
 
+    - name: Install just
+      if: (steps.cache-relayer.outputs.cache-hit != 'true')
+      uses: extractions/setup-just@v2
+    - name: Build SP1 Programs
+      if: (steps.cache-relayer.outputs.cache-hit != 'true')
+      shell: bash
+      run: just build-sp1-programs
+
     - name: Setup Kurtosis
       if: env.ETH_TESTNET_TYPE == 'pos'
       shell: bash

.github/mergify.yml

@@ -0,0 +1,9 @@
+pull_request_rules:
+  - name: backport patches to v1.0.x branch
+    conditions:
+      - base=main
+      - label=backport-to-v1.0.x
+    actions:
+      backport:
+        branches:
+          - release/v1.0.x

.github/workflows/abigen.yaml

@@ -16,8 +16,7 @@ on:
       - 'packages/go-abigen/**'
 
 jobs:
-  abigen-check:
-    name: Check for abigen changes
+  check:
     runs-on: depot-ubuntu-22.04-4
     steps:
       - uses: actions/checkout@v4
@@ -33,13 +32,19 @@ jobs:
       - name: Install abigen
         run: go install github.com/ethereum/go-ethereum/cmd/abigen@latest
 
-      - name: Check that generating files from go does not create any changes
-        uses: nickcharlton/diff-check@main
-        with: 
-          command: just generate-abi
+      - name: Run abigen
+        run: just generate-abi
 
-  abigen-golangci:
-    name: lint abigen
+      - name: Check for diffs in go-abigen
+        run: |
+          if ! git diff --quiet HEAD -- packages/go-abigen; then
+            echo "Git diff found in the selected directory. Failing the job."
+            exit 1
+          else
+            echo "No changes detected in the selected directory."
+          fi
+
+  golangci:
     runs-on: depot-ubuntu-22.04-4
     steps:
       - uses: actions/checkout@v4
@@ -54,7 +59,7 @@ jobs:
           version: v1.63
           working-directory: packages/go-abigen
 
-  abigen-test:
+  test:
     runs-on: depot-ubuntu-22.04-4
     steps:
       - uses: actions/checkout@v4
@@ -65,20 +70,3 @@ jobs:
 
       - name: Unit test abigen
         run: cd packages/go-abigen && go test -v ./...
-
-  ethgenesis-golangci:
-    name: lint ethgenesis
-    runs-on: depot-ubuntu-22.04-4
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-go@v4
-        with:
-          go-version: 1.23
-          cache-dependency-path: scripts/ethgenesis/go.sum
-
-      - name: golangci-lint
-        uses: golangci/golangci-lint-action@v6
-        with:
-          version: v1.63
-          args: --timeout=5m
-          working-directory: scripts/ethgenesis

.github/workflows/rust.yml

@@ -21,18 +21,6 @@ jobs:
       - name: Set up environment
         uses: ./.github/actions/foundry-setup
 
-      - name: Install SP1 toolchain
-        shell: bash
-        run: |
-          curl -L https://sp1.succinct.xyz | bash
-          ~/.sp1/bin/sp1up --token ${{ secrets.GITHUB_TOKEN }}
-          ~/.sp1/bin/cargo-prove prove --version
-
-      - name: Install just
-        uses: extractions/setup-just@v2
-      - name: Build SP1 Programs
-        run: just build-sp1-programs
-
       - name: Run cargo fmt
         uses: actions-rs/cargo@v1
         with:
@@ -51,12 +39,6 @@ jobs:
       - name: Set up environment
         uses: ./.github/actions/foundry-setup
 
-      - name: Install SP1 toolchain
-        shell: bash
-        run: |
-          curl -L https://sp1.succinct.xyz | bash
-          ~/.sp1/bin/sp1up --token ${{ secrets.GITHUB_TOKEN }}
-          ~/.sp1/bin/cargo-prove prove --version
       - name: Install just
         uses: extractions/setup-just@v2
       - name: Run unit tests
@@ -72,12 +54,6 @@ jobs:
       - uses: actions/checkout@v4
       - name: Set up environment
         uses: ./.github/actions/foundry-setup
-      - name: Install SP1 toolchain
-        shell: bash
-        run: |
-          curl -L https://sp1.succinct.xyz | bash
-          ~/.sp1/bin/sp1up --token ${{ secrets.GITHUB_TOKEN }}
-          ~/.sp1/bin/cargo-prove prove --version
       - name: Build
         uses: actions-rs/cargo@v1
         with:
@@ -92,12 +68,6 @@ jobs:
       - uses: actions/checkout@v4
       - name: Set up environment
         uses: ./.github/actions/foundry-setup
-      - name: Install SP1 toolchain
-        shell: bash
-        run: |
-          curl -L https://sp1.succinct.xyz | bash
-          ~/.sp1/bin/sp1up --token ${{ secrets.GITHUB_TOKEN }}
-          ~/.sp1/bin/cargo-prove prove --version
       - name: Build
         uses: actions-rs/cargo@v1
         with: