Ensure length for deposit proofs.

Add a length check for deposit proofs, and fix the many bad tests where
an incorrect proof length was used.

Fixes ##54

api/v1/deneb/blindedblobsidecar_json.go

@@ -35,6 +35,7 @@ type blindedBlobSidecarJSON struct {
 	KzgProof        deneb.KzgProof      `json:"kzg_proof"`
 }
 
+// MarshalJSON implements json.Marshaler.
 func (b *BlindedBlobSidecar) MarshalJSON() ([]byte, error) {
 	return json.Marshal(&blindedBlobSidecarJSON{
 		BlockRoot:       b.BlockRoot,
@@ -48,6 +49,7 @@ func (b *BlindedBlobSidecar) MarshalJSON() ([]byte, error) {
 	})
 }
 
+// UnmarshalJSON implements json.Unmarshaler.
 func (b *BlindedBlobSidecar) UnmarshalJSON(input []byte) error {
 	raw, err := codecs.RawJSON(&blindedBlobSidecarJSON{}, input)
 	if err != nil {

api/v1/payloadattributesevent.go

@@ -40,7 +40,7 @@ type PayloadAttributesData struct {
 	V2 *PayloadAttributesV2
 }
 
-// PayloadAttributes represents the payload attributes.
+// PayloadAttributesV1 represents the payload attributes.
 type PayloadAttributesV1 struct {
 	// Timestamp is the timestamp of the payload.
 	Timestamp uint64
@@ -93,7 +93,7 @@ type payloadAttributesV2JSON struct {
 	Withdrawals           []*capella.Withdrawal `json:"withdrawals"`
 }
 
-// MarshalJSON implements json.Marshaler.
+// UnmarshalJSON implements json.Unmarshaler.
 func (p *PayloadAttributesV1) UnmarshalJSON(input []byte) error {
 	var payloadAttributes payloadAttributesV1JSON
 	if err := json.Unmarshal(input, &payloadAttributes); err != nil {
@@ -140,7 +140,7 @@ func (p *PayloadAttributesV1) unpack(data *payloadAttributesV1JSON) error {
 	return nil
 }
 
-// MarshalJSON implements json.Marshaler.
+// UnmarshalJSON implements json.Unmarshaler.
 func (p *PayloadAttributesV2) UnmarshalJSON(input []byte) error {
 	var payloadAttributes payloadAttributesV2JSON
 	if err := json.Unmarshal(input, &payloadAttributes); err != nil {

codecs/json.go

@@ -22,7 +22,7 @@ import (
 	"github.com/pkg/errors"
 )
 
-// UnmarshalRawMessage generates raw JSON for a struct,
+// RawJSON generates raw JSON for a struct,
 // ensuring that all values are present.
 func RawJSON(b any, input []byte) (map[string]json.RawMessage, error) {
 	// Make generic map from input.

spec/deneb/blobidentifier_json.go

@@ -28,13 +28,15 @@ type blobIdentifierJSON struct {
 	Index     string      `json:"index"`
 }
 
+// MarshalJSON implements json.Marshaler.
 func (b *BlobIdentifier) MarshalJSON() ([]byte, error) {
 	return json.Marshal(&blobIdentifierJSON{
 		BlockRoot: b.BlockRoot,
 		Index:     fmt.Sprintf("%d", b.Index),
 	})
 }
 
+// UnmarshalJSON implements json.Unmarshaler.
 func (b *BlobIdentifier) UnmarshalJSON(input []byte) error {
 	raw, err := codecs.RawJSON(&blobIdentifierJSON{}, input)
 	if err != nil {

spec/deneb/blobsidecar_json.go

@@ -34,6 +34,7 @@ type blobSidecarJSON struct {
 	KzgProof        KzgProof      `json:"kzg_proof"`
 }
 
+// MarshalJSON implements json.Marshaler.
 func (b *BlobSidecar) MarshalJSON() ([]byte, error) {
 	return json.Marshal(&blobSidecarJSON{
 		BlockRoot:       b.BlockRoot,
@@ -47,6 +48,7 @@ func (b *BlobSidecar) MarshalJSON() ([]byte, error) {
 	})
 }
 
+// UnmarshalJSON implements json.Unmarshaler.
 func (b *BlobSidecar) UnmarshalJSON(input []byte) error {
 	raw, err := codecs.RawJSON(&blobSidecarJSON{}, input)
 	if err != nil {

spec/deneb/consensusspec_test.go

@@ -14,6 +14,7 @@
 package deneb_test
 
 import (
+	"bytes"
 	"fmt"
 	"os"
 	"path/filepath"
@@ -254,3 +255,17 @@ func TestConsensusSpec(t *testing.T) {
 		}))
 	}
 }
+
+func testYAMLFormat(input []byte) string {
+	val := make(map[string]any)
+	if err := yaml.UnmarshalWithOptions(input, &val, yaml.UseOrderedMap()); err != nil {
+		panic(err)
+	}
+
+	res, err := yaml.MarshalWithOptions(val, yaml.Flow(true))
+	if err != nil {
+		panic(err)
+	}
+
+	return string(bytes.ToLower(bytes.ReplaceAll(res, []byte(`"`), []byte(`'`))))
+}

spec/deneb/executionpayload_test.go

@@ -14,14 +14,13 @@
 package deneb_test
 
 import (
-	"bytes"
 	"encoding/json"
 	"testing"
 
 	"github.com/attestantio/go-eth2-client/spec/deneb"
 	"github.com/goccy/go-yaml"
-	require "github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/assert"
+	require "github.com/stretchr/testify/require"
 )
 
 func TestExecutionPayloadJSON(t *testing.T) {
@@ -384,20 +383,6 @@ func TestExecutionPayloadJSON(t *testing.T) {
 	}
 }
 
-func testYAMLFormat(input []byte) string {
-	val := make(map[string]any)
-	if err := yaml.UnmarshalWithOptions(input, &val, yaml.UseOrderedMap()); err != nil {
-		panic(err)
-	}
-
-	res, err := yaml.MarshalWithOptions(val, yaml.Flow(true))
-	if err != nil {
-		panic(err)
-	}
-
-	return string(bytes.ToLower(bytes.ReplaceAll(res, []byte(`"`), []byte(`'`))))
-}
-
 func TestExecutionPayloadYAML(t *testing.T) {
 	tests := []struct {
 		name  string

spec/phase0/aggregateandproof_test.go

@@ -16,16 +16,12 @@ package phase0_test
 import (
 	"bytes"
 	"encoding/json"
-	"fmt"
-	"os"
-	"path/filepath"
 	"testing"
 
 	"github.com/attestantio/go-eth2-client/spec/phase0"
 	"github.com/goccy/go-yaml"
-	"github.com/golang/snappy"
-	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 func TestAggregateAndProofJSON(t *testing.T) {
@@ -150,48 +146,3 @@ func TestAggregateAndProofYAML(t *testing.T) {
 		})
 	}
 }
-
-func TestAggregateAndProofSpec(t *testing.T) {
-	if os.Getenv("ETH2_SPEC_TESTS_DIR") == "" {
-		t.Skip("ETH2_SPEC_TESTS_DIR not suppplied, not running spec tests")
-	}
-	baseDir := filepath.Join(os.Getenv("ETH2_SPEC_TESTS_DIR"), "tests", "mainnet", "phase0", "ssz_static", "AggregateAndProof", "ssz_random")
-	require.NoError(t, filepath.Walk(baseDir, func(path string, info os.FileInfo, err error) error {
-		if path == baseDir {
-			// Only interested in subdirectories.
-			return nil
-		}
-		require.NoError(t, err)
-		if info.IsDir() {
-			t.Run(info.Name(), func(t *testing.T) {
-				specYAML, err := os.ReadFile(filepath.Join(path, "value.yaml"))
-				require.NoError(t, err)
-				var res phase0.AggregateAndProof
-				require.NoError(t, yaml.Unmarshal(specYAML, &res))
-
-				compressedSpecSSZ, err := os.ReadFile(filepath.Join(path, "serialized.ssz_snappy"))
-				require.NoError(t, err)
-				var specSSZ []byte
-				specSSZ, err = snappy.Decode(specSSZ, compressedSpecSSZ)
-				require.NoError(t, err)
-
-				unmarshalled := &phase0.AggregateAndProof{}
-				require.NoError(t, unmarshalled.UnmarshalSSZ(specSSZ))
-				remarshalled, err := unmarshalled.MarshalSSZ()
-				require.NoError(t, err)
-				require.Equal(t, specSSZ, remarshalled)
-
-				ssz, err := res.MarshalSSZ()
-				require.NoError(t, err)
-				require.Equal(t, specSSZ, ssz)
-
-				root, err := res.HashTreeRoot()
-				require.NoError(t, err)
-				rootsYAML, err := os.ReadFile(filepath.Join(path, "roots.yaml"))
-				require.NoError(t, err)
-				require.Equal(t, string(rootsYAML), fmt.Sprintf("{root: '%#x'}\n", root))
-			})
-		}
-		return nil
-	}))
-}

spec/phase0/attestation_test.go

@@ -16,16 +16,12 @@ package phase0_test
 import (
 	"bytes"
 	"encoding/json"
-	"fmt"
-	"os"
-	"path/filepath"
 	"testing"
 
 	"github.com/attestantio/go-eth2-client/spec/phase0"
 	"github.com/goccy/go-yaml"
-	"github.com/golang/snappy"
-	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 func TestAttestationJSON(t *testing.T) {
@@ -145,48 +141,3 @@ func TestAttestationYAML(t *testing.T) {
 		})
 	}
 }
-
-func TestAttestationSpec(t *testing.T) {
-	if os.Getenv("ETH2_SPEC_TESTS_DIR") == "" {
-		t.Skip("ETH2_SPEC_TESTS_DIR not suppplied, not running spec tests")
-	}
-	baseDir := filepath.Join(os.Getenv("ETH2_SPEC_TESTS_DIR"), "tests", "mainnet", "phase0", "ssz_static", "Attestation", "ssz_random")
-	require.NoError(t, filepath.Walk(baseDir, func(path string, info os.FileInfo, err error) error {
-		if path == baseDir {
-			// Only interested in subdirectories.
-			return nil
-		}
-		require.NoError(t, err)
-		if info.IsDir() {
-			t.Run(info.Name(), func(t *testing.T) {
-				specYAML, err := os.ReadFile(filepath.Join(path, "value.yaml"))
-				require.NoError(t, err)
-				var res phase0.Attestation
-				require.NoError(t, yaml.Unmarshal(specYAML, &res))
-
-				compressedSpecSSZ, err := os.ReadFile(filepath.Join(path, "serialized.ssz_snappy"))
-				require.NoError(t, err)
-				var specSSZ []byte
-				specSSZ, err = snappy.Decode(specSSZ, compressedSpecSSZ)
-				require.NoError(t, err)
-
-				unmarshalled := &phase0.Attestation{}
-				require.NoError(t, unmarshalled.UnmarshalSSZ(specSSZ))
-				remarshalled, err := unmarshalled.MarshalSSZ()
-				require.NoError(t, err)
-				require.Equal(t, specSSZ, remarshalled)
-
-				ssz, err := res.MarshalSSZ()
-				require.NoError(t, err)
-				require.Equal(t, specSSZ, ssz)
-
-				root, err := res.HashTreeRoot()
-				require.NoError(t, err)
-				rootsYAML, err := os.ReadFile(filepath.Join(path, "roots.yaml"))
-				require.NoError(t, err)
-				require.Equal(t, string(rootsYAML), fmt.Sprintf("{root: '%#x'}\n", root))
-			})
-		}
-		return nil
-	}))
-}

spec/phase0/attestationdata_test.go

@@ -16,16 +16,12 @@ package phase0_test
 import (
 	"bytes"
 	"encoding/json"
-	"fmt"
-	"os"
-	"path/filepath"
 	"testing"
 
 	"github.com/attestantio/go-eth2-client/spec/phase0"
 	"github.com/goccy/go-yaml"
-	"github.com/golang/snappy"
-	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 func TestAttestationDataJSON(t *testing.T) {
@@ -200,48 +196,3 @@ func TestAttestationDataYAML(t *testing.T) {
 		})
 	}
 }
-
-func TestAttestationDataSpec(t *testing.T) {
-	if os.Getenv("ETH2_SPEC_TESTS_DIR") == "" {
-		t.Skip("ETH2_SPEC_TESTS_DIR not suppplied, not running spec tests")
-	}
-	baseDir := filepath.Join(os.Getenv("ETH2_SPEC_TESTS_DIR"), "tests", "mainnet", "phase0", "ssz_static", "AttestationData", "ssz_random")
-	require.NoError(t, filepath.Walk(baseDir, func(path string, info os.FileInfo, err error) error {
-		if path == baseDir {
-			// Only interested in subdirectories.
-			return nil
-		}
-		require.NoError(t, err)
-		if info.IsDir() {
-			t.Run(info.Name(), func(t *testing.T) {
-				specYAML, err := os.ReadFile(filepath.Join(path, "value.yaml"))
-				require.NoError(t, err)
-				var res phase0.AttestationData
-				require.NoError(t, yaml.Unmarshal(specYAML, &res))
-
-				compressedSpecSSZ, err := os.ReadFile(filepath.Join(path, "serialized.ssz_snappy"))
-				require.NoError(t, err)
-				var specSSZ []byte
-				specSSZ, err = snappy.Decode(specSSZ, compressedSpecSSZ)
-				require.NoError(t, err)
-
-				unmarshalled := &phase0.AttestationData{}
-				require.NoError(t, unmarshalled.UnmarshalSSZ(specSSZ))
-				remarshalled, err := unmarshalled.MarshalSSZ()
-				require.NoError(t, err)
-				require.Equal(t, specSSZ, remarshalled)
-
-				ssz, err := res.MarshalSSZ()
-				require.NoError(t, err)
-				require.Equal(t, specSSZ, ssz)
-
-				root, err := res.HashTreeRoot()
-				require.NoError(t, err)
-				rootsYAML, err := os.ReadFile(filepath.Join(path, "roots.yaml"))
-				require.NoError(t, err)
-				require.Equal(t, string(rootsYAML), fmt.Sprintf("{root: '%#x'}\n", root))
-			})
-		}
-		return nil
-	}))
-}