Skip to content

Commit 5db08da

Browse files
committed
Merge branch 'refs/heads/staging' into 1947-featverification_layer-bump-eigensdk-to-v030
# Conflicts: # Makefile # config-files/config-aggregator.yaml # go.mod # go.sum
2 parents 47ddd9f + 13932a0 commit 5db08da

197 files changed

Lines changed: 23574 additions & 7344 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/golangci-lint.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ name: golangci-lint
22
on:
33
push:
44
branches:
5-
- master
6-
- main
5+
- testnet
6+
- staging
77
pull_request:
88
paths:
99
- 'operator/**'
@@ -26,13 +26,13 @@ jobs:
2626
- uses: actions/checkout@v4
2727
- uses: actions/setup-go@v5
2828
with:
29-
go-version: '1.22'
29+
go-version: '1.24'
3030
cache: false
3131
- name: golangci-lint
32-
uses: golangci/golangci-lint-action@v4
32+
uses: golangci/golangci-lint-action@v8
3333
with:
3434
# Require: The version of golangci-lint to use.
3535
# When `install-mode` is `binary` (default) the value can be v1.2 or v1.2.3 or `latest` to use the latest version.
3636
# When `install-mode` is `goinstall` the value can be v1.2.3, `latest`, or the hash of a commit.
37-
version: v1.54
37+
version: v2.1.6
3838
args: --timeout=5m

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,6 @@ nonce_*.bin
1818

1919
infra/ansible/playbooks/ini/**.ini
2020
infra/ansible/playbooks/files/**.pem
21+
22+
examples/l2/crates/l2/db
23+
examples/l2/crates/l2/zkvm_programs/sp1/elf/sp1_state_transition_program

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,3 +40,6 @@
4040
[submodule "contracts/eigenlayer_contracts/eigenlayer-contracts"]
4141
path = contracts/eigenlayer_contracts/eigenlayer-contracts
4242
url = https://github.com/Layr-Labs/eigenlayer-contracts.git
43+
[submodule "examples/l2/contracts/lib/forge-std"]
44+
path = examples/l2/contracts/lib/forge-std
45+
url = https://github.com/foundry-rs/forge-std

Makefile

Lines changed: 73 additions & 74 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)