Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/_shared-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/_shared-check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile-local
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion docs/01-setup.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 1 addition & 3 deletions go.mod
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 1 addition & 0 deletions pkg/coordinator/tasks/generate_blob_transactions/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"`
Expand Down
7 changes: 7 additions & 0 deletions pkg/coordinator/tasks/generate_blob_transactions/task.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down