Skip to content

Commit da8c529

Browse files
authored
Merge pull request #133 from ethpandaops/pk910/blob-v1
add support for fusaka blob format in `generate_blob_transactions` task
2 parents a4ae566 + 1b9c414 commit da8c529

File tree

8 files changed

+18
-12
lines changed

8 files changed

+18
-12
lines changed

.github/workflows/_shared-build.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
- name: Set up go
5555
uses: actions/setup-go@4dc6199c7b1a012772edbd06daecab0f50c9053c # v6.1.0
5656
with:
57-
go-version: 1.24.x
57+
go-version: 1.25.x
5858

5959
# setup project dependencies
6060
- name: Get dependencies
@@ -88,7 +88,7 @@ jobs:
8888
- name: Set up go
8989
uses: actions/setup-go@4dc6199c7b1a012772edbd06daecab0f50c9053c # v6.1.0
9090
with:
91-
go-version: 1.24.x
91+
go-version: 1.25.x
9292

9393
# setup cross build libs
9494
- name: Get cross build dependencies
@@ -128,7 +128,7 @@ jobs:
128128
- name: Set up go
129129
uses: actions/setup-go@4dc6199c7b1a012772edbd06daecab0f50c9053c # v6.1.0
130130
with:
131-
go-version: 1.24.x
131+
go-version: 1.25.x
132132

133133
# setup project dependencies
134134
- name: Get dependencies
@@ -162,7 +162,7 @@ jobs:
162162
- name: Set up go
163163
uses: actions/setup-go@4dc6199c7b1a012772edbd06daecab0f50c9053c # v6.1.0
164164
with:
165-
go-version: 1.24.x
165+
go-version: 1.25.x
166166

167167
# setup project dependencies
168168
- name: Get dependencies
@@ -196,7 +196,7 @@ jobs:
196196
- name: Set up go
197197
uses: actions/setup-go@4dc6199c7b1a012772edbd06daecab0f50c9053c # v6.1.0
198198
with:
199-
go-version: 1.24.x
199+
go-version: 1.25.x
200200

201201
# setup project dependencies
202202
- name: Get dependencies

.github/workflows/_shared-check.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- name: Set up go
1616
uses: actions/setup-go@4dc6199c7b1a012772edbd06daecab0f50c9053c # v6.1.0
1717
with:
18-
go-version: 1.24.x
18+
go-version: 1.25.x
1919

2020
- name: Verify dependencies
2121
run: go mod verify

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# syntax=docker/dockerfile:1
2-
FROM golang:1.24 AS builder
2+
FROM golang:1.25 AS builder
33
WORKDIR /src
44
COPY go.sum go.mod ./
55
RUN go mod download

Dockerfile-local

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# syntax=docker/dockerfile:1
2-
FROM golang:1.24 AS builder
2+
FROM golang:1.25 AS builder
33
WORKDIR /src
44
COPY go.sum go.mod ./
55
RUN go mod download

docs/01-setup.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Assertoor provides distribution-specific executables for Windows, Linux, and mac
1616
1717
## Build from Source
1818
19-
If you prefer to build Assertoor from source, ensure you have [Go](https://go.dev/) `>= 1.24` and Make installed on your machine. Assertoor is tested on Debian, but it should work on other operating systems as well.
19+
If you prefer to build Assertoor from source, ensure you have [Go](https://go.dev/) `>= 1.25` and Make installed on your machine. Assertoor is tested on Debian, but it should work on other operating systems as well.
2020
2121
1. **Clone the Repository**:\
2222
Use the following commands to clone the Assertoor repository and navigate to its directory:

go.mod

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
module github.com/ethpandaops/assertoor
22

3-
go 1.24.0
4-
5-
toolchain go1.24.1
3+
go 1.25.0
64

75
require (
86
github.com/attestantio/go-eth2-client v0.27.1

pkg/coordinator/tasks/generate_blob_transactions/config.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ type Config struct {
3030
BlobData string `yaml:"blobData" json:"blobData"`
3131
RandomAmount bool `yaml:"randomAmount" json:"randomAmount"`
3232
Amount *big.Int `yaml:"amount" json:"amount"`
33+
LegacyBlobTx bool `yaml:"legacyBlobTx" json:"legacyBlobTx"`
3334

3435
ClientPattern string `yaml:"clientPattern" json:"clientPattern"`
3536
ExcludeClientPattern string `yaml:"excludeClientPattern" json:"excludeClientPattern"`

pkg/coordinator/tasks/generate_blob_transactions/task.go

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -302,6 +302,13 @@ func (t *Task) generateTransaction(ctx context.Context, transactionIdx uint64, c
302302
Sidecar: blobSidecar,
303303
}
304304

305+
if !t.config.LegacyBlobTx {
306+
err = blobSidecar.ToV1()
307+
if err != nil {
308+
return nil, err
309+
}
310+
}
311+
305312
return ethtypes.NewTx(txObj), nil
306313
})
307314
if err != nil {

0 commit comments

Comments
 (0)