handle eip7805 versioned entities

.gitignore

@@ -3,7 +3,7 @@
 *.dll
 *.so
 *.dylib
-
+*.ssz
 # Test binary, build with `go test -c`
 *.test
 

.golangci.yml

@@ -74,35 +74,9 @@ run:
 
 # output configuration options
 output:
-  # Format: colored-line-number|line-number|json|tab|checkstyle|code-climate|junit-xml|github-actions
-  #
-  # Multiple can be specified by separating them by comma, output can be provided
-  # for each of them by separating format name and path by colon symbol.
-  # Output path can be either `stdout`, `stderr` or path to the file to write to.
-  # Example: "checkstyle:report.json,colored-line-number"
-  #
-  # Default: colored-line-number
-  # format: json
-
-  # Print lines of code with issue.
-  # Default: true
-  # print-issued-lines: false
-
-  # Print linter name in the end of issue text.
-  # Default: true
-  # print-linter-name: false
-
-  # Make issues output unique by line.
-  # Default: true
-  # uniq-by-line: false
-
-  # Add a prefix to the output file references.
-  # Default is no prefix.
-  # path-prefix: ""
-
-  # Sort results by: filepath, line and column.
-  # sort-results: true
-
+  formats:
+    - format: colored-line-number
+      path: stderr
 
 # All available settings of specific linters.
 linters-settings:
@@ -183,7 +157,6 @@ linters:
     - dupl
     - exhaustive
     - exhaustruct
-    - exportloopref
     - forcetypeassert
     - funlen
     - gci
@@ -200,6 +173,7 @@ linters:
     - musttag
     - perfsprint
     - recvcheck
+    - tenv
     - varnamelen
     - wrapcheck
     - wsl

CHANGELOG.md

@@ -1,3 +1,47 @@
+0.27.0:
+  - support fulu
+    - introduce data column sidecar event api and corresponding event handler
+    - add blockcontents and signedblockcontents for fulu api
+    - add beaconstate container updates as per spec
+    - add fulu cases for all versioned spec, versioned api and http functions
+
+0.26.0:
+  - refactor http.Spec to allow more complex types in the keys
+  - support pending consolidations and deposits
+
+0.25.2:
+  - add multi/submitblindedproposal
+
+0.25.1:
+  - add Merkle tree and proof generation utils
+  - add convenience methods on versioned beaconstate for field access and proofs:
+    - ValidatorAtIndex
+    - ValidatorBalance
+    - FieldIndex
+    - FieldGeneralizedIndex
+    - FieldRoot
+    - FieldTree
+    - ProveField
+    - VerifyFieldProof
+
+0.25.0:
+  - update attestation pool endpoint to receive versioned attestations
+
+0.24.2:
+  - support single_attestation event
+  - support change to attestation event; this event now emits a spec.VersionedAttestation
+  - support change to attester_slashing event; this event now emits an electra.AttesterSlashing
+  - update Events endpoint to provide specific handlers for each event
+
+0.24.0:
+  - support electra
+    - the most notable change is that a number of functions now use spec.VersionedAttestation in place of phase0.Attestation
+    - this release uses a number of new beacon API endpoints, specifically:
+      - /eth/v2/validator/aggregate_attestation
+      - /eth/v2/validator/aggregate_and_proofs
+      - /eth/v2/beacon/pool/attestations
+      These endpoints are supported in all current releases of major beacon nodes at the time of release
+
 0.23.1:
   - add ability to override individual provider functions in mock client
 

README.md

@@ -111,7 +111,7 @@ func main() {
 
 ## Maintainers
 
-Jim McDonald: [@mcdee](https://github.com/mcdee).
+Chris Berry: [@bez625](https://github.com/Bez625).
 
 ## Contribute
 

api/blobsidecars.go

@@ -20,13 +20,13 @@ import (
 
 // BlobSidecars is an API construct to allow decoding an array of blob sidecars.
 type BlobSidecars struct {
-	Sidecars []*deneb.BlobSidecar `ssz-max:"6"`
+	Sidecars []*deneb.BlobSidecar `ssz-max:"12"`
 }
 
 // UnmarshalSSZ ssz unmarshals the BlobSidecars object.
 // This is a hand-crafted function, as automatic generation does not support immediate arrays.
 func (b *BlobSidecars) UnmarshalSSZ(buf []byte) error {
-	num, err := ssz.DivideInt2(len(buf), 131928, 6)
+	num, err := ssz.DivideInt2(len(buf), 131928, 12)
 	if err != nil {
 		return err
 	}

api/eventsopts.go

@@ -0,0 +1,116 @@
+// Copyright © 2025 Attestant Limited.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package api
+
+import (
+	"context"
+
+	apiv1 "github.com/attestantio/go-eth2-client/api/v1"
+	"github.com/attestantio/go-eth2-client/spec"
+	"github.com/attestantio/go-eth2-client/spec/altair"
+	"github.com/attestantio/go-eth2-client/spec/capella"
+	"github.com/attestantio/go-eth2-client/spec/electra"
+	"github.com/attestantio/go-eth2-client/spec/phase0"
+)
+
+// EventsOpts are the options for obtaining events.
+type EventsOpts struct {
+	Common CommonOpts
+
+	// Topics are the topics of events to which we want to listen.
+	Topics []string
+
+	// Handler is a generic handler function to which to send all events.
+	// In general, it is better to use event-specific handlers as they avoid casting, and also provide a context.
+	Handler EventHandlerFunc
+
+	// AttestationHandler is a handler for the attestation event.
+	AttestationHandler AttestationEventHandlerFunc
+	// AttesterSlashingHandler is a handler for the attester_slashing event.
+	AttesterSlashingHandler AttesterSlashingEventHandlerFunc
+	// BlobSidecarHandler is a handler for the blob_sidecar event.
+	BlobSidecarHandler BlobSidecarEventHandlerFunc
+	// BlockHandler is a handler for the block event.
+	BlockHandler BlockEventHandlerFunc
+	// BlockGossipHandler is a handler for the block_gossip event.
+	BlockGossipHandler BlockGossipEventHandlerFunc
+	// BLSToExecutionChangeHandler is a handler for the bls_to_execution_change event.
+	BLSToExecutionChangeHandler BLSToExecutionChangeEventHandlerFunc
+	// ChainReorgHandler is a handler for the chain_reorg event.
+	ChainReorgHandler ChainReorgEventHandlerFunc
+	// ContributionAndProofHandler is a handler for the contribution_and_proof event.
+	ContributionAndProofHandler ContributionAndProofEventHandlerFunc
+	// DataColumnSidecarHandler is a handler for the data_column_sidecar event.
+	DataColumnSidecarHandler DataColumnSidecarEventHandlerFunc
+	// FinalizedCheckpointHandler is a handler for the finalized_checkpoint event.
+	FinalizedCheckpointHandler FinalizedCheckpointEventHandlerFunc
+	// HeadHandler is a handler for the head event.
+	HeadHandler HeadEventHandlerFunc
+	// PayloadAttributesHandler is a handler for the payload_attributes event.
+	PayloadAttributesHandler PayloadAttributesEventHandlerFunc
+	// ProposerSlashingHandler is a handler for the proposer_slashing event.
+	ProposerSlashingHandler ProposerSlashingEventHandlerFunc
+	// SingleAttestationHandler is a handler for the single_attestation event.
+	SingleAttestationHandler SingleAttestationEventHandlerFunc
+	// VoluntaryExitHandler is a handler for the voluntary_exit event.
+	VoluntaryExitHandler VoluntaryExitEventHandlerFunc
+}
+
+// EventHandlerFunc is the handler for generic events.
+type EventHandlerFunc func(*apiv1.Event)
+
+// AttestationEventHandlerFunc is the handler for attestation events.
+type AttestationEventHandlerFunc func(context.Context, *spec.VersionedAttestation)
+
+// AttesterSlashingEventHandlerFunc is the handler for attestation_slashing events.
+type AttesterSlashingEventHandlerFunc func(context.Context, *electra.AttesterSlashing)
+
+// BlobSidecarEventHandlerFunc is the handler for blob_sidecar events.
+type BlobSidecarEventHandlerFunc func(context.Context, *apiv1.BlobSidecarEvent)
+
+// BlockEventHandlerFunc is the handler for block events.
+type BlockEventHandlerFunc func(context.Context, *apiv1.BlockEvent)
+
+// BlockGossipEventHandlerFunc is the handler for block_gossip events.
+type BlockGossipEventHandlerFunc func(context.Context, *apiv1.BlockGossipEvent)
+
+// BLSToExecutionChangeEventHandlerFunc is the handler for bls_to_execution_change events.
+type BLSToExecutionChangeEventHandlerFunc func(context.Context, *capella.SignedBLSToExecutionChange)
+
+// ChainReorgEventHandlerFunc is the handler for chain_reorg events.
+type ChainReorgEventHandlerFunc func(context.Context, *apiv1.ChainReorgEvent)
+
+// ContributionAndProofEventHandlerFunc is the handler for contribution_and_proof events.
+type ContributionAndProofEventHandlerFunc func(context.Context, *altair.SignedContributionAndProof)
+
+// FinalizedCheckpointEventHandlerFunc is the handler for finalized_checkpoint events.
+type FinalizedCheckpointEventHandlerFunc func(context.Context, *apiv1.FinalizedCheckpointEvent)
+
+// HeadEventHandlerFunc is the handler for head events.
+type HeadEventHandlerFunc func(context.Context, *apiv1.HeadEvent)
+
+// PayloadAttributesEventHandlerFunc is the handler for payload_attributes events.
+type PayloadAttributesEventHandlerFunc func(context.Context, *apiv1.PayloadAttributesEvent)
+
+// ProposerSlashingEventHandlerFunc is the handler for proposer_slashing events.
+type ProposerSlashingEventHandlerFunc func(context.Context, *phase0.ProposerSlashing)
+
+// SingleAttestationEventHandlerFunc is the handler for single_attestation events.
+type SingleAttestationEventHandlerFunc func(context.Context, *electra.SingleAttestation)
+
+// VoluntaryExitEventHandlerFunc is the handler for voluntary_exit events.
+type VoluntaryExitEventHandlerFunc func(context.Context, *phase0.SignedVoluntaryExit)
+
+// DataColumnSidecarEventHandlerFunc is the handler for data_column_sidecar events.
+type DataColumnSidecarEventHandlerFunc func(context.Context, *apiv1.DataColumnSidecarEvent)

api/pendingconsolidationsopts.go

@@ -0,0 +1,23 @@
+// Copyright © 2025 Attestant Limited.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package api
+
+// PendingConsolidationsOpts are the options for obtaining pending consolidations.
+type PendingConsolidationsOpts struct {
+	Common CommonOpts
+
+	// State is the state at which the data is obtained.
+	// It can be a slot number or state root, or one of the special values "genesis", "head", "justified" or "finalized".
+	State string
+}

api/pendingdepositsopts.go

@@ -0,0 +1,23 @@
+// Copyright © 2025 Attestant Limited.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package api
+
+// PendingDepositsOpts are the options for obtaining pending deposits.
+type PendingDepositsOpts struct {
+	Common CommonOpts
+
+	// State is the state at which the data is obtained.
+	// It can be a slot number or state root, or one of the special values "genesis", "head", "justified" or "finalized".
+	State string
+}

api/pendingpartialwithdrawalsopts.go

@@ -0,0 +1,23 @@
+// Copyright © 2025 Attestant Limited.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package api
+
+// PendingPartialWithdrawalsOpts are the options for obtaining pending partial withdrawals.
+type PendingPartialWithdrawalsOpts struct {
+	Common CommonOpts
+
+	// State is the state at which the data is obtained.
+	// It can be a slot number or state root, or one of the special values "genesis", "head", "justified" or "finalized".
+	State string
+}

api/v1/bellatrix/blindedbeaconblock_test.go

@@ -171,7 +171,7 @@ func TestBlindedBeaconBlockYAML(t *testing.T) {
 				require.NoError(t, err)
 				assert.Equal(t, res.String(), string(rt))
 				rt = bytes.TrimSuffix(rt, []byte("\n"))
-				assert.Equal(t, string(test.input), string(rt))
+				assert.YAMLEq(t, string(test.input), string(rt))
 			}
 		})
 	}

api/v1/bellatrix/blindedbeaconblockbody_test.go

@@ -261,7 +261,7 @@ func TestBlindedBeaconBlockBodyYAML(t *testing.T) {
 				require.NoError(t, err)
 				assert.Equal(t, res.String(), string(rt))
 				rt = bytes.TrimSuffix(rt, []byte("\n"))
-				assert.Equal(t, string(test.input), string(rt))
+				assert.YAMLEq(t, string(test.input), string(rt))
 			}
 		})
 	}

api/v1/bellatrix/signedblindedbeaconblock_test.go

@@ -126,7 +126,7 @@ func TestSignedBlindedBeaconBlockYAML(t *testing.T) {
 				require.NoError(t, err)
 				assert.Equal(t, res.String(), string(rt))
 				rt = bytes.TrimSuffix(rt, []byte("\n"))
-				assert.Equal(t, string(test.input), string(rt))
+				assert.YAMLEq(t, string(test.input), string(rt))
 			}
 		})
 	}

api/v1/capella/blindedbeaconblock_test.go

@@ -20,8 +20,8 @@ import (
 
 	"github.com/attestantio/go-eth2-client/api/v1/capella"
 	"github.com/goccy/go-yaml"
-	require "github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/assert"
+	require "github.com/stretchr/testify/require"
 )
 
 func TestBlindedBeaconBlockJSON(t *testing.T) {
@@ -161,7 +161,7 @@ func TestBlindedBeaconBlockYAML(t *testing.T) {
 				require.NoError(t, err)
 				assert.Equal(t, res.String(), string(rt))
 				rt = bytes.TrimSuffix(rt, []byte("\n"))
-				assert.Equal(t, string(test.input), string(rt))
+				assert.YAMLEq(t, string(test.input), string(rt))
 			}
 		})
 	}

api/v1/capella/blindedbeaconblockbody_test.go

@@ -266,7 +266,7 @@ func TestBlindedBeaconBlockBodyYAML(t *testing.T) {
 				require.NoError(t, err)
 				assert.Equal(t, res.String(), string(rt))
 				rt = bytes.TrimSuffix(rt, []byte("\n"))
-				assert.Equal(t, string(test.input), string(rt))
+				assert.YAMLEq(t, string(test.input), string(rt))
 			}
 		})
 	}

api/v1/capella/signedblindedbeaconblock_test.go

@@ -20,8 +20,8 @@ import (
 
 	"github.com/attestantio/go-eth2-client/api/v1/capella"
 	"github.com/goccy/go-yaml"
-	require "github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/assert"
+	require "github.com/stretchr/testify/require"
 )
 
 func TestSignedBlindedBeaconBlockJSON(t *testing.T) {
@@ -116,7 +116,7 @@ func TestSignedBlindedBeaconBlockYAML(t *testing.T) {
 				require.NoError(t, err)
 				assert.Equal(t, res.String(), string(rt))
 				rt = bytes.TrimSuffix(rt, []byte("\n"))
-				assert.Equal(t, string(test.input), string(rt))
+				assert.YAMLEq(t, string(test.input), string(rt))
 			}
 		})
 	}