Skip to content

Commit 11436eb

Browse files
ARR552ARR552
committed
Merge remote-tracking branch 'origin/main' into feature/balance_nullifier_tree
2 parents e825ee9 + ab071fd commit 11436eb

File tree

4 files changed

+28
-25
lines changed

4 files changed

+28
-25
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,15 @@ on:
66
push:
77
branches: [main]
88

9+
permissions:
10+
contents: read
11+
912
concurrency:
1013
group: ci-${{ github.event.pull_request.number || github.ref }}
1114
cancel-in-progress: true
1215

1316
env:
14-
GO_VERSION: "1.23" # https://go.dev/dl/
17+
GO_VERSION: "1.23" # https://go.dev/dl/
1518
FOUNDRY_VERSION: stable
1619

1720
jobs:
@@ -35,10 +38,10 @@ jobs:
3538
runs-on: ubuntu-latest
3639
steps:
3740
- uses: actions/checkout@v4
38-
41+
3942
- name: gen-doc
4043
run: make gen-doc
41-
44+
4245
- name: Check if generated files are up to date
4346
run: |
4447
if [[ -n $(git status --porcelain) ]]; then
@@ -56,7 +59,7 @@ jobs:
5659
runs-on: ubuntu-latest
5760
steps:
5861
- uses: actions/checkout@v4
59-
62+
6063
- name: gen-proto
6164
run: make gen-proto
6265

@@ -77,10 +80,10 @@ jobs:
7780
runs-on: ubuntu-latest
7881
steps:
7982
- uses: actions/checkout@v4
80-
83+
8184
- name: gen-go-bindings
8285
run: make gen-go-bindings
83-
86+
8487
- name: Check if generated files are up to date
8588
run: |
8689
if [[ -n $(git status --porcelain) ]]; then
@@ -101,7 +104,7 @@ jobs:
101104

102105
- name: gen-load-test-modes
103106
run: make gen-load-test-modes
104-
107+
105108
- name: Check if generated files are up to date
106109
run: |
107110
if [[ -n $(git status --porcelain) ]]; then
@@ -122,7 +125,7 @@ jobs:
122125

123126
- name: gen-json-rpc-types
124127
run: make gen-json-rpc-types
125-
128+
126129
- name: Check if generated files are up to date
127130
run: |
128131
if [[ -n $(git status --porcelain) ]]; then
@@ -158,7 +161,7 @@ jobs:
158161
with:
159162
go-version: ${{ env.GO_VERSION }}
160163
- name: Install Foundry
161-
uses: foundry-rs/foundry-toolchain@v1
164+
uses: foundry-rs/foundry-toolchain@82dee4ba654bd2146511f85f0d013af94670c4de # v1.4.0
162165
with:
163166
version: ${{ env.FOUNDRY_VERSION }}
164167
- name: Install Geth

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
run: echo "tag=$(git describe --tags --exact-match HEAD)" >> $GITHUB_ENV
4141

4242
- name: Publish binaries
43-
uses: svenstaro/upload-release-action@v2
43+
uses: svenstaro/upload-release-action@04733e069f2d7f7f0b4aebc4fbdbce8613b03ccd # 2.9.0
4444
with:
4545
repo_token: ${{ secrets.GITHUB_TOKEN }}
4646
tag: ${{ env.tag }}

‎go.mod‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ require (
1010
github.com/cenkalti/backoff/v4 v4.3.0
1111
github.com/chzyer/readline v1.5.1 // indirect
1212
github.com/cockroachdb/pebble v1.1.5
13-
github.com/ethereum/go-ethereum v1.15.8
13+
github.com/ethereum/go-ethereum v1.15.10
1414
github.com/gizak/termui/v3 v3.1.1-0.20231111080052-b3569a6cd52d
1515
github.com/google/gofuzz v1.2.0
1616
github.com/hashicorp/golang-lru v1.0.2
@@ -34,7 +34,7 @@ require (
3434
golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c
3535
golang.org/x/text v0.24.0
3636
golang.org/x/time v0.11.0
37-
google.golang.org/api v0.229.0
37+
google.golang.org/api v0.231.0
3838
google.golang.org/protobuf v1.36.6
3939
)
4040

@@ -140,8 +140,8 @@ require (
140140
golang.org/x/term v0.31.0 // indirect
141141
google.golang.org/genproto v0.0.0-20250303144028-a0af3efb3deb // indirect
142142
google.golang.org/genproto/googleapis/api v0.0.0-20250414145226-207652e42e2e // indirect
143-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250414145226-207652e42e2e // indirect
144-
google.golang.org/grpc v1.71.1 // indirect
143+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250425173222-7b384671a197 // indirect
144+
google.golang.org/grpc v1.72.0 // indirect
145145
gopkg.in/yaml.v3 v3.0.1 // indirect
146146
lukechampine.com/blake3 v1.3.0 // indirect
147147
rsc.io/tmplfunc v0.0.3 // indirect
@@ -159,7 +159,7 @@ require (
159159
)
160160

161161
require (
162-
cloud.google.com/go/auth v0.16.0 // indirect
162+
cloud.google.com/go/auth v0.16.1 // indirect
163163
cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
164164
cloud.google.com/go/iam v1.5.0 // indirect
165165
cloud.google.com/go/longrunning v0.6.6 // indirect

‎go.sum‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
22
cloud.google.com/go v0.120.0 h1:wc6bgG9DHyKqF5/vQvX1CiZrtHnxJjBlKUyF9nP6meA=
33
cloud.google.com/go v0.120.0/go.mod h1:/beW32s8/pGRuj4IILWQNd4uuebeT4dkOhKmkfit64Q=
4-
cloud.google.com/go/auth v0.16.0 h1:Pd8P1s9WkcrBE2n/PhAwKsdrR35V3Sg2II9B+ndM3CU=
5-
cloud.google.com/go/auth v0.16.0/go.mod h1:1howDHJ5IETh/LwYs3ZxvlkXF48aSqqJUM+5o02dNOI=
4+
cloud.google.com/go/auth v0.16.1 h1:XrXauHMd30LhQYVRHLGvJiYeczweKQXZxsTbV9TiguU=
5+
cloud.google.com/go/auth v0.16.1/go.mod h1:1howDHJ5IETh/LwYs3ZxvlkXF48aSqqJUM+5o02dNOI=
66
cloud.google.com/go/auth/oauth2adapt v0.2.8 h1:keo8NaayQZ6wimpNSmW5OPc283g65QNIiLpZnkHRbnc=
77
cloud.google.com/go/auth/oauth2adapt v0.2.8/go.mod h1:XQ9y31RkqZCcwJWNSx2Xvric3RrU88hAYYbjDWYDL+c=
88
cloud.google.com/go/compute/metadata v0.6.0 h1:A6hENjEsCDtC1k8byVsgwvVcioamEHvZ4j01OwKxG9I=
@@ -145,8 +145,8 @@ github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1m
145145
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
146146
github.com/ethereum/c-kzg-4844 v1.0.3 h1:IEnbOHwjixW2cTvKRUlAAUOeleV7nNM/umJR+qy4WDs=
147147
github.com/ethereum/c-kzg-4844 v1.0.3/go.mod h1:VewdlzQmpT5QSrVhbBuGoCdFJkpaJlO1aQputP83wc0=
148-
github.com/ethereum/go-ethereum v1.15.8 h1:H6NilvRXFVoHiXZ3zkuTqKW5XcxjLZniV5UjxJt1GJU=
149-
github.com/ethereum/go-ethereum v1.15.8/go.mod h1:+S9k+jFzlyVTNcYGvqFhzN/SFhI6vA+aOY4T5tLSPL0=
148+
github.com/ethereum/go-ethereum v1.15.10 h1:UxqBhpsF2TNF1f7Z/k3RUUHEuLvDGAlHuh/lQ99ZA0w=
149+
github.com/ethereum/go-ethereum v1.15.10/go.mod h1:+S9k+jFzlyVTNcYGvqFhzN/SFhI6vA+aOY4T5tLSPL0=
150150
github.com/ethereum/go-verkle v0.2.2 h1:I2W0WjnrFUIzzVPwm8ykY+7pL2d4VhlsePn4j7cnFk8=
151151
github.com/ethereum/go-verkle v0.2.2/go.mod h1:M3b90YRnzqKyyzBEWJGqj8Qff4IDeXnzFw0P9bFw3uk=
152152
github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg=
@@ -649,8 +649,8 @@ golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8T
649649
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
650650
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
651651
golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8=
652-
google.golang.org/api v0.229.0 h1:p98ymMtqeJ5i3lIBMj5MpR9kzIIgzpHHh8vQ+vgAzx8=
653-
google.golang.org/api v0.229.0/go.mod h1:wyDfmq5g1wYJWn29O22FDWN48P7Xcz0xz+LBpptYvB0=
652+
google.golang.org/api v0.231.0 h1:LbUD5FUl0C4qwia2bjXhCMH65yz1MLPzA/0OYEsYY7Q=
653+
google.golang.org/api v0.231.0/go.mod h1:H52180fPI/QQlUc0F4xWfGZILdv09GCWKt2bcsn164A=
654654
google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
655655
google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
656656
google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
@@ -660,15 +660,15 @@ google.golang.org/genproto v0.0.0-20250303144028-a0af3efb3deb h1:ITgPrl429bc6+2Z
660660
google.golang.org/genproto v0.0.0-20250303144028-a0af3efb3deb/go.mod h1:sAo5UzpjUwgFBCzupwhcLcxHVDK7vG5IqI30YnwX2eE=
661661
google.golang.org/genproto/googleapis/api v0.0.0-20250414145226-207652e42e2e h1:UdXH7Kzbj+Vzastr5nVfccbmFsmYNygVLSPk1pEfDoY=
662662
google.golang.org/genproto/googleapis/api v0.0.0-20250414145226-207652e42e2e/go.mod h1:085qFyf2+XaZlRdCgKNCIZ3afY2p4HHZdoIRpId8F4A=
663-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250414145226-207652e42e2e h1:ztQaXfzEXTmCBvbtWYRhJxW+0iJcz2qXfd38/e9l7bA=
664-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250414145226-207652e42e2e/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A=
663+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250425173222-7b384671a197 h1:29cjnHVylHwTzH66WfFZqgSQgnxzvWE+jvBwpZCLRxY=
664+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250425173222-7b384671a197/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A=
665665
google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
666666
google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
667667
google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
668668
google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
669669
google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc=
670-
google.golang.org/grpc v1.71.1 h1:ffsFWr7ygTUscGPI0KKK6TLrGz0476KUvvsbqWK0rPI=
671-
google.golang.org/grpc v1.71.1/go.mod h1:H0GRtasmQOh9LkFoCPDu3ZrwUtD1YGE+b2vYBYd/8Ec=
670+
google.golang.org/grpc v1.72.0 h1:S7UkcVa60b5AAQTaO6ZKamFp1zMZSU0fGDK2WZLbBnM=
671+
google.golang.org/grpc v1.72.0/go.mod h1:wH5Aktxcg25y1I3w7H69nHfXdOG3UiadoBtjh3izSDM=
672672
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
673673
google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
674674
google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=

0 commit comments

Comments
 (0)