From e1c32dcffbde90927f4d0238ce581b09ee5106d3 Mon Sep 17 00:00:00 2001 From: pk910 Date: Sat, 27 Dec 2025 22:50:09 +0100 Subject: [PATCH 1/2] add support for fusaka blob format in `generate_blob_transactions` task --- pkg/coordinator/tasks/generate_blob_transactions/config.go | 1 + pkg/coordinator/tasks/generate_blob_transactions/task.go | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/pkg/coordinator/tasks/generate_blob_transactions/config.go b/pkg/coordinator/tasks/generate_blob_transactions/config.go index 0860716a..ad8f02b2 100644 --- a/pkg/coordinator/tasks/generate_blob_transactions/config.go +++ b/pkg/coordinator/tasks/generate_blob_transactions/config.go @@ -30,6 +30,7 @@ type Config struct { BlobData string `yaml:"blobData" json:"blobData"` RandomAmount bool `yaml:"randomAmount" json:"randomAmount"` Amount *big.Int `yaml:"amount" json:"amount"` + LegacyBlobTx bool `yaml:"legacyBlobTx" json:"legacyBlobTx"` ClientPattern string `yaml:"clientPattern" json:"clientPattern"` ExcludeClientPattern string `yaml:"excludeClientPattern" json:"excludeClientPattern"` diff --git a/pkg/coordinator/tasks/generate_blob_transactions/task.go b/pkg/coordinator/tasks/generate_blob_transactions/task.go index cced7bf2..6eafe5f0 100644 --- a/pkg/coordinator/tasks/generate_blob_transactions/task.go +++ b/pkg/coordinator/tasks/generate_blob_transactions/task.go @@ -302,6 +302,13 @@ func (t *Task) generateTransaction(ctx context.Context, transactionIdx uint64, c Sidecar: blobSidecar, } + if !t.config.LegacyBlobTx { + err = blobSidecar.ToV1() + if err != nil { + return nil, err + } + } + return ethtypes.NewTx(txObj), nil }) if err != nil { From 1b9c41408e13bb403f34ce2905abb3922a63baa4 Mon Sep 17 00:00:00 2001 From: pk910 Date: Sat, 27 Dec 2025 22:52:41 +0100 Subject: [PATCH 2/2] bump go to `v1.25` --- .github/workflows/_shared-build.yaml | 10 +++++----- .github/workflows/_shared-check.yaml | 2 +- Dockerfile | 2 +- Dockerfile-local | 2 +- docs/01-setup.md | 2 +- go.mod | 4 +--- 6 files changed, 10 insertions(+), 12 deletions(-) diff --git a/.github/workflows/_shared-build.yaml b/.github/workflows/_shared-build.yaml index 54c0fabd..d4cec18b 100644 --- a/.github/workflows/_shared-build.yaml +++ b/.github/workflows/_shared-build.yaml @@ -54,7 +54,7 @@ jobs: - name: Set up go uses: actions/setup-go@4dc6199c7b1a012772edbd06daecab0f50c9053c # v6.1.0 with: - go-version: 1.24.x + go-version: 1.25.x # setup project dependencies - name: Get dependencies @@ -88,7 +88,7 @@ jobs: - name: Set up go uses: actions/setup-go@4dc6199c7b1a012772edbd06daecab0f50c9053c # v6.1.0 with: - go-version: 1.24.x + go-version: 1.25.x # setup cross build libs - name: Get cross build dependencies @@ -128,7 +128,7 @@ jobs: - name: Set up go uses: actions/setup-go@4dc6199c7b1a012772edbd06daecab0f50c9053c # v6.1.0 with: - go-version: 1.24.x + go-version: 1.25.x # setup project dependencies - name: Get dependencies @@ -162,7 +162,7 @@ jobs: - name: Set up go uses: actions/setup-go@4dc6199c7b1a012772edbd06daecab0f50c9053c # v6.1.0 with: - go-version: 1.24.x + go-version: 1.25.x # setup project dependencies - name: Get dependencies @@ -196,7 +196,7 @@ jobs: - name: Set up go uses: actions/setup-go@4dc6199c7b1a012772edbd06daecab0f50c9053c # v6.1.0 with: - go-version: 1.24.x + go-version: 1.25.x # setup project dependencies - name: Get dependencies diff --git a/.github/workflows/_shared-check.yaml b/.github/workflows/_shared-check.yaml index 57acb0af..24c5af80 100644 --- a/.github/workflows/_shared-check.yaml +++ b/.github/workflows/_shared-check.yaml @@ -15,7 +15,7 @@ jobs: - name: Set up go uses: actions/setup-go@4dc6199c7b1a012772edbd06daecab0f50c9053c # v6.1.0 with: - go-version: 1.24.x + go-version: 1.25.x - name: Verify dependencies run: go mod verify diff --git a/Dockerfile b/Dockerfile index 3b08b770..6998feca 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1 -FROM golang:1.24 AS builder +FROM golang:1.25 AS builder WORKDIR /src COPY go.sum go.mod ./ RUN go mod download diff --git a/Dockerfile-local b/Dockerfile-local index e3dbbbf6..8644ca75 100644 --- a/Dockerfile-local +++ b/Dockerfile-local @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1 -FROM golang:1.24 AS builder +FROM golang:1.25 AS builder WORKDIR /src COPY go.sum go.mod ./ RUN go mod download diff --git a/docs/01-setup.md b/docs/01-setup.md index e9a9443b..25e59f6d 100644 --- a/docs/01-setup.md +++ b/docs/01-setup.md @@ -16,7 +16,7 @@ Assertoor provides distribution-specific executables for Windows, Linux, and mac ## Build from Source -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. +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. 1. **Clone the Repository**:\ Use the following commands to clone the Assertoor repository and navigate to its directory: diff --git a/go.mod b/go.mod index 5eb17618..075b7acf 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,6 @@ module github.com/ethpandaops/assertoor -go 1.24.0 - -toolchain go1.24.1 +go 1.25.0 require ( github.com/attestantio/go-eth2-client v0.27.1