Skip to content

Commit 964cd06

Browse files
pk910pk910
committed
Merge branch 'master' into gloas-support
2 parents fcde75d + d2df3ec commit 964cd06

53 files changed

Lines changed: 2800 additions & 808 deletions

Some content is hidden

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

‎.github/workflows/_shared-build.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ jobs:
8888

8989
# setup global dependencies
9090
- name: Set up go
91-
uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6.3.0
91+
uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
9292
with:
9393
go-version: 1.25.x
9494

@@ -129,7 +129,7 @@ jobs:
129129

130130
# setup global dependencies
131131
- name: Set up go
132-
uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6.3.0
132+
uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
133133
with:
134134
go-version: 1.25.x
135135

@@ -170,7 +170,7 @@ jobs:
170170

171171
# setup global dependencies
172172
- name: Set up go
173-
uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6.3.0
173+
uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
174174
with:
175175
go-version: 1.25.x
176176

@@ -211,7 +211,7 @@ jobs:
211211

212212
# setup global dependencies
213213
- name: Set up go
214-
uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6.3.0
214+
uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
215215
with:
216216
go-version: 1.25.x
217217

@@ -252,7 +252,7 @@ jobs:
252252

253253
# setup global dependencies
254254
- name: Set up go
255-
uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6.3.0
255+
uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
256256
with:
257257
go-version: 1.25.x
258258

‎.github/workflows/_shared-check.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313

1414
# setup global dependencies
1515
- name: Set up go
16-
uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6.3.0
16+
uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
1717
with:
1818
go-version: 1.25.x
1919
- name: Set up node

‎.github/workflows/build-master.yml‎

Lines changed: 28 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -104,98 +104,52 @@ jobs:
104104
} catch (e) {
105105
console.log(e)
106106
}
107-
- name: Create snapshot release
108-
uses: actions/create-release@0cb9c9b65d5d1901c1f53e5e66eaf4afd303e70e # v1.1.4
109-
id: create_release
110-
with:
111-
draft: false
112-
prerelease: true
113-
release_name: "Dev Snapshot"
114-
tag_name: "snapshot"
115-
body: |
116-
## Latest automatically built executables. (Unstable development snapshot)
117-
Built from master branch (commit: ${{ github.sha }})
118-
119-
Please read the [wiki](https://github.com/ethpandaops/dora/wiki) for setup / configuration instructions.
120-
121-
### Release Artifacts
122-
| Release File | Description |
123-
| ------------- | ------------- |
124-
| [dora_snapshot_windows_amd64.zip](https://github.com/ethpandaops/dora/releases/download/snapshot/dora_snapshot_windows_amd64.zip) | dora executables for windows/amd64 |
125-
| [dora_snapshot_linux_amd64.tar.gz](https://github.com/ethpandaops/dora/releases/download/snapshot/dora_snapshot_linux_amd64.tar.gz) | dora executables for linux/amd64 |
126-
| [dora_snapshot_linux_arm64.tar.gz](https://github.com/ethpandaops/dora/releases/download/snapshot/dora_snapshot_linux_arm64.tar.gz) | dora executables for linux/arm64 |
127-
| [dora_snapshot_darwin_amd64.tar.gz](https://github.com/ethpandaops/dora/releases/download/snapshot/dora_snapshot_darwin_amd64.tar.gz) | dora executable for macos/amd64 |
128-
| [dora_snapshot_darwin_arm64.tar.gz](https://github.com/ethpandaops/dora/releases/download/snapshot/dora_snapshot_darwin_arm64.tar.gz) | dora executable for macos/arm64 |
129-
env:
130-
GITHUB_TOKEN: ${{ github.token }}
131-
132-
# generate & upload release artifacts
107+
# generate release artifacts
133108
- name: "Generate release package: dora_snapshot_windows_amd64.zip"
134109
run: |
135110
cd explorer_windows_amd64
136111
zip -r -q ../dora_snapshot_windows_amd64.zip .
137-
- name: "Upload snapshot release artifact: dora_snapshot_windows_amd64.zip"
138-
uses: actions/upload-release-asset@e8f9f06c4b078e705bd2ea027f0926603fc9b4d5 # v1.0.2
139-
with:
140-
upload_url: ${{ steps.create_release.outputs.upload_url }}
141-
asset_path: ./dora_snapshot_windows_amd64.zip
142-
asset_name: dora_snapshot_windows_amd64.zip
143-
asset_content_type: application/octet-stream
144-
env:
145-
GITHUB_TOKEN: ${{ github.token }}
146-
147112
- name: "Generate release package: dora_snapshot_linux_amd64.tar.gz"
148113
run: |
149114
cd explorer_linux_amd64
150115
tar -czf ../dora_snapshot_linux_amd64.tar.gz .
151-
- name: "Upload snapshot release artifact: dora_snapshot_linux_amd64.tar.gz"
152-
uses: actions/upload-release-asset@e8f9f06c4b078e705bd2ea027f0926603fc9b4d5 # v1.0.2
153-
with:
154-
upload_url: ${{ steps.create_release.outputs.upload_url }}
155-
asset_path: ./dora_snapshot_linux_amd64.tar.gz
156-
asset_name: dora_snapshot_linux_amd64.tar.gz
157-
asset_content_type: application/octet-stream
158-
env:
159-
GITHUB_TOKEN: ${{ github.token }}
160-
161116
- name: "Generate release package: dora_snapshot_linux_arm64.tar.gz"
162117
run: |
163118
cd explorer_linux_arm64
164119
tar -czf ../dora_snapshot_linux_arm64.tar.gz .
165-
- name: "Upload snapshot release artifact: dora_snapshot_linux_arm64.tar.gz"
166-
uses: actions/upload-release-asset@e8f9f06c4b078e705bd2ea027f0926603fc9b4d5 # v1.0.2
167-
with:
168-
upload_url: ${{ steps.create_release.outputs.upload_url }}
169-
asset_path: ./dora_snapshot_linux_arm64.tar.gz
170-
asset_name: dora_snapshot_linux_arm64.tar.gz
171-
asset_content_type: application/octet-stream
172-
env:
173-
GITHUB_TOKEN: ${{ github.token }}
174-
175120
- name: "Generate release package: dora_snapshot_darwin_amd64.tar.gz"
176121
run: |
177122
cd explorer_darwin_amd64
178123
tar -czf ../dora_snapshot_darwin_amd64.tar.gz .
179-
- name: "Upload snapshot release artifact: dora_snapshot_darwin_amd64.tar.gz"
180-
uses: actions/upload-release-asset@e8f9f06c4b078e705bd2ea027f0926603fc9b4d5 # v1.0.2
181-
with:
182-
upload_url: ${{ steps.create_release.outputs.upload_url }}
183-
asset_path: ./dora_snapshot_darwin_amd64.tar.gz
184-
asset_name: dora_snapshot_darwin_amd64.tar.gz
185-
asset_content_type: application/octet-stream
186-
env:
187-
GITHUB_TOKEN: ${{ github.token }}
188-
189124
- name: "Generate release package: dora_snapshot_darwin_arm64.tar.gz"
190125
run: |
191126
cd explorer_darwin_arm64
192127
tar -czf ../dora_snapshot_darwin_arm64.tar.gz .
193-
- name: "Upload snapshot release artifact: dora_snapshot_darwin_arm64.tar.gz"
194-
uses: actions/upload-release-asset@e8f9f06c4b078e705bd2ea027f0926603fc9b4d5 # v1.0.2
128+
129+
- name: Create snapshot release
130+
uses: softprops/action-gh-release@153bb8e04406b158c6c84fc1615b65b24149a1fe # v2.6.1
195131
with:
196-
upload_url: ${{ steps.create_release.outputs.upload_url }}
197-
asset_path: ./dora_snapshot_darwin_arm64.tar.gz
198-
asset_name: dora_snapshot_darwin_arm64.tar.gz
199-
asset_content_type: application/octet-stream
200-
env:
201-
GITHUB_TOKEN: ${{ github.token }}
132+
draft: false
133+
prerelease: true
134+
name: "Dev Snapshot"
135+
tag_name: "snapshot"
136+
body: |
137+
## Latest automatically built executables. (Unstable development snapshot)
138+
Built from master branch (commit: ${{ github.sha }})
139+
140+
Please read the [wiki](https://github.com/ethpandaops/dora/wiki) for setup / configuration instructions.
141+
142+
### Release Artifacts
143+
| Release File | Description |
144+
| ------------- | ------------- |
145+
| [dora_snapshot_windows_amd64.zip](https://github.com/ethpandaops/dora/releases/download/snapshot/dora_snapshot_windows_amd64.zip) | dora executables for windows/amd64 |
146+
| [dora_snapshot_linux_amd64.tar.gz](https://github.com/ethpandaops/dora/releases/download/snapshot/dora_snapshot_linux_amd64.tar.gz) | dora executables for linux/amd64 |
147+
| [dora_snapshot_linux_arm64.tar.gz](https://github.com/ethpandaops/dora/releases/download/snapshot/dora_snapshot_linux_arm64.tar.gz) | dora executables for linux/arm64 |
148+
| [dora_snapshot_darwin_amd64.tar.gz](https://github.com/ethpandaops/dora/releases/download/snapshot/dora_snapshot_darwin_amd64.tar.gz) | dora executable for macos/amd64 |
149+
| [dora_snapshot_darwin_arm64.tar.gz](https://github.com/ethpandaops/dora/releases/download/snapshot/dora_snapshot_darwin_arm64.tar.gz) | dora executable for macos/arm64 |
150+
files: |
151+
dora_snapshot_windows_amd64.zip
152+
dora_snapshot_linux_amd64.tar.gz
153+
dora_snapshot_linux_arm64.tar.gz
154+
dora_snapshot_darwin_amd64.tar.gz
155+
dora_snapshot_darwin_arm64.tar.gz

‎.github/workflows/build-release.yml‎

Lines changed: 30 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -77,14 +77,34 @@ jobs:
7777
- name: "Download build artifacts"
7878
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
7979

80-
# create draft release
80+
# generate release artifacts
81+
- name: "Generate release package: dora_${{ inputs.version }}_windows_amd64.zip"
82+
run: |
83+
cd explorer_windows_amd64
84+
zip -r -q ../dora_${{ inputs.version }}_windows_amd64.zip .
85+
- name: "Generate release package: dora_${{ inputs.version }}_linux_amd64.tar.gz"
86+
run: |
87+
cd explorer_linux_amd64
88+
tar -czf ../dora_${{ inputs.version }}_linux_amd64.tar.gz .
89+
- name: "Generate release package: dora_${{ inputs.version }}_linux_arm64.tar.gz"
90+
run: |
91+
cd explorer_linux_arm64
92+
tar -czf ../dora_${{ inputs.version }}_linux_arm64.tar.gz .
93+
- name: "Generate release package: dora_${{ inputs.version }}_darwin_amd64.tar.gz"
94+
run: |
95+
cd explorer_darwin_amd64
96+
tar -czf ../dora_${{ inputs.version }}_darwin_amd64.tar.gz .
97+
- name: "Generate release package: dora_${{ inputs.version }}_darwin_arm64.tar.gz"
98+
run: |
99+
cd explorer_darwin_arm64
100+
tar -czf ../dora_${{ inputs.version }}_darwin_arm64.tar.gz .
101+
81102
- name: Create latest release
82-
uses: actions/create-release@0cb9c9b65d5d1901c1f53e5e66eaf4afd303e70e # v1.1.4
83-
id: create_release
103+
uses: softprops/action-gh-release@153bb8e04406b158c6c84fc1615b65b24149a1fe # v2.6.1
84104
with:
85105
draft: false
86106
prerelease: false
87-
release_name: "v${{ inputs.version }}"
107+
name: "v${{ inputs.version }}"
88108
tag_name: "v${{ inputs.version }}"
89109
body: |
90110
### Major Changes
@@ -106,76 +126,9 @@ jobs:
106126
| [dora_${{ inputs.version }}_linux_arm64.tar.gz](https://github.com/ethpandaops/dora/releases/download/v${{ inputs.version }}/dora_${{ inputs.version }}_linux_arm64.tar.gz) | dora executables for linux/arm64 |
107127
| [dora_${{ inputs.version }}_darwin_amd64.tar.gz](https://github.com/ethpandaops/dora/releases/download/v${{ inputs.version }}/dora_${{ inputs.version }}_darwin_amd64.tar.gz) | dora executable for macos/amd64 |
108128
| [dora_${{ inputs.version }}_darwin_arm64.tar.gz](https://github.com/ethpandaops/dora/releases/download/v${{ inputs.version }}/dora_${{ inputs.version }}_darwin_arm64.tar.gz) | dora executable for macos/arm64 |
109-
env:
110-
GITHUB_TOKEN: ${{ github.token }}
111-
112-
# generate & upload release artifacts
113-
- name: "Generate release package: dora_${{ inputs.version }}_windows_amd64.zip"
114-
run: |
115-
cd explorer_windows_amd64
116-
zip -r -q ../dora_${{ inputs.version }}_windows_amd64.zip .
117-
- name: "Upload release artifact: dora_${{ inputs.version }}_windows_amd64.zip"
118-
uses: actions/upload-release-asset@e8f9f06c4b078e705bd2ea027f0926603fc9b4d5 # v1.0.2
119-
with:
120-
upload_url: ${{ steps.create_release.outputs.upload_url }}
121-
asset_path: ./dora_${{ inputs.version }}_windows_amd64.zip
122-
asset_name: dora_${{ inputs.version }}_windows_amd64.zip
123-
asset_content_type: application/octet-stream
124-
env:
125-
GITHUB_TOKEN: ${{ github.token }}
126-
127-
- name: "Generate release package: dora_${{ inputs.version }}_linux_amd64.tar.gz"
128-
run: |
129-
cd explorer_linux_amd64
130-
tar -czf ../dora_${{ inputs.version }}_linux_amd64.tar.gz .
131-
- name: "Upload release artifact: dora_${{ inputs.version }}_linux_amd64.tar.gz"
132-
uses: actions/upload-release-asset@e8f9f06c4b078e705bd2ea027f0926603fc9b4d5 # v1.0.2
133-
with:
134-
upload_url: ${{ steps.create_release.outputs.upload_url }}
135-
asset_path: ./dora_${{ inputs.version }}_linux_amd64.tar.gz
136-
asset_name: dora_${{ inputs.version }}_linux_amd64.tar.gz
137-
asset_content_type: application/octet-stream
138-
env:
139-
GITHUB_TOKEN: ${{ github.token }}
140-
141-
- name: "Generate release package: dora_${{ inputs.version }}_linux_arm64.tar.gz"
142-
run: |
143-
cd explorer_linux_arm64
144-
tar -czf ../dora_${{ inputs.version }}_linux_arm64.tar.gz .
145-
- name: "Upload release artifact: dora_${{ inputs.version }}_linux_arm64.tar.gz"
146-
uses: actions/upload-release-asset@e8f9f06c4b078e705bd2ea027f0926603fc9b4d5 # v1.0.2
147-
with:
148-
upload_url: ${{ steps.create_release.outputs.upload_url }}
149-
asset_path: ./dora_${{ inputs.version }}_linux_arm64.tar.gz
150-
asset_name: dora_${{ inputs.version }}_linux_arm64.tar.gz
151-
asset_content_type: application/octet-stream
152-
env:
153-
GITHUB_TOKEN: ${{ github.token }}
154-
155-
- name: "Generate release package: dora_${{ inputs.version }}_darwin_amd64.tar.gz"
156-
run: |
157-
cd explorer_darwin_amd64
158-
tar -czf ../dora_${{ inputs.version }}_darwin_amd64.tar.gz .
159-
- name: "Upload release artifact: dora_${{ inputs.version }}_darwin_amd64.tar.gz"
160-
uses: actions/upload-release-asset@e8f9f06c4b078e705bd2ea027f0926603fc9b4d5 # v1.0.2
161-
with:
162-
upload_url: ${{ steps.create_release.outputs.upload_url }}
163-
asset_path: ./dora_${{ inputs.version }}_darwin_amd64.tar.gz
164-
asset_name: dora_${{ inputs.version }}_darwin_amd64.tar.gz
165-
asset_content_type: application/octet-stream
166-
env:
167-
GITHUB_TOKEN: ${{ github.token }}
168-
169-
- name: "Generate release package: dora_${{ inputs.version }}_darwin_arm64.tar.gz"
170-
run: |
171-
cd explorer_darwin_arm64
172-
tar -czf ../dora_${{ inputs.version }}_darwin_arm64.tar.gz .
173-
- name: "Upload release artifact: dora_${{ inputs.version }}_darwin_arm64.tar.gz"
174-
uses: actions/upload-release-asset@e8f9f06c4b078e705bd2ea027f0926603fc9b4d5 # v1.0.2
175-
with:
176-
upload_url: ${{ steps.create_release.outputs.upload_url }}
177-
asset_path: ./dora_${{ inputs.version }}_darwin_arm64.tar.gz
178-
asset_name: dora_${{ inputs.version }}_darwin_arm64.tar.gz
179-
asset_content_type: application/octet-stream
180-
env:
181-
GITHUB_TOKEN: ${{ github.token }}
129+
files: |
130+
dora_${{ inputs.version }}_windows_amd64.zip
131+
dora_${{ inputs.version }}_linux_amd64.tar.gz
132+
dora_${{ inputs.version }}_linux_arm64.tar.gz
133+
dora_${{ inputs.version }}_darwin_amd64.tar.gz
134+
dora_${{ inputs.version }}_darwin_arm64.tar.gz

‎cmd/dora-explorer/main.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,7 @@ func startFrontend(router *mux.Router) {
225225
router.HandleFunc("/validators/slashings", handlers.Slashings).Methods("GET")
226226
router.HandleFunc("/validators/el_withdrawals", handlers.ElWithdrawals).Methods("GET")
227227
router.HandleFunc("/validators/withdrawals", handlers.Withdrawals).Methods("GET")
228+
router.HandleFunc("/validators/withdrawals/filtered", handlers.WithdrawalsList).Methods("GET")
228229
router.HandleFunc("/validators/queued_withdrawals", handlers.QueuedWithdrawals).Methods("GET")
229230
router.HandleFunc("/validators/consolidations", handlers.Consolidations).Methods("GET")
230231
router.HandleFunc("/validators/queued_consolidations", handlers.QueuedConsolidations).Methods("GET")

0 commit comments

Comments
 (0)