From ae81168ea87b9c992c8924bdcd84bae7bc9dfb40 Mon Sep 17 00:00:00 2001 From: syjn99 Date: Mon, 2 Dec 2024 17:05:41 +0900 Subject: [PATCH] Debug logs: MUST be removed 2 --- http/signedbeaconblock.go | 2 +- spec/electra/beaconblock_ssz.go | 5 ++++- spec/electra/beaconblockbody_ssz.go | 5 ++++- spec/electra/signedbeaconblock_ssz.go | 5 ++++- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/http/signedbeaconblock.go b/http/signedbeaconblock.go index 0cbd1ec..d41dfbb 100644 --- a/http/signedbeaconblock.go +++ b/http/signedbeaconblock.go @@ -151,7 +151,7 @@ func (s *Service) signedBeaconBlockFromSSZ(ctx context.Context, err = response.Data.Electra.UnmarshalSSZ(res.body) } if err != nil { - return nil, errors.Join(errors.New("failed to decode electra signed block contents, customSpecSupport: " + fmt.Sprintf("%v", s.customSpecSupport)), err) + return nil, errors.Join(errors.New("failed to decode electra signed block contents"), err) } default: return nil, fmt.Errorf("unhandled block version %s", res.consensusVersion) diff --git a/spec/electra/beaconblock_ssz.go b/spec/electra/beaconblock_ssz.go index 0436b00..16ba2df 100644 --- a/spec/electra/beaconblock_ssz.go +++ b/spec/electra/beaconblock_ssz.go @@ -4,6 +4,9 @@ package electra import ( + "errors" + "fmt" + "github.com/attestantio/go-eth2-client/spec/phase0" ssz "github.com/ferranbt/fastssz" ) @@ -70,7 +73,7 @@ func (b *BeaconBlock) UnmarshalSSZ(buf []byte) error { } if o4 != 84 { - return ssz.ErrInvalidVariableOffset + return errors.Join(ssz.ErrInvalidVariableOffset, errors.New("Inside BeaconBlock, o4 " + fmt.Sprintf("%d", o4) + " is not equal to 84")) } // Field (4) 'Body' diff --git a/spec/electra/beaconblockbody_ssz.go b/spec/electra/beaconblockbody_ssz.go index 28f5ea5..52e7f01 100644 --- a/spec/electra/beaconblockbody_ssz.go +++ b/spec/electra/beaconblockbody_ssz.go @@ -4,6 +4,9 @@ package electra import ( + "errors" + "fmt" + "github.com/attestantio/go-eth2-client/spec/deneb" "github.com/attestantio/go-eth2-client/spec/phase0" ssz "github.com/ferranbt/fastssz" @@ -195,7 +198,7 @@ func (b *BeaconBlockBody) UnmarshalSSZ(buf []byte) error { } if o3 != 232 { - return ssz.ErrInvalidVariableOffset + return errors.Join(ssz.ErrInvalidVariableOffset, errors.New("Inside BeaconBlockBody, o3 " + fmt.Sprintf("%d", o3) + " is not equal to 232")) } // Offset (4) 'AttesterSlashings' diff --git a/spec/electra/signedbeaconblock_ssz.go b/spec/electra/signedbeaconblock_ssz.go index fd5e642..10df412 100644 --- a/spec/electra/signedbeaconblock_ssz.go +++ b/spec/electra/signedbeaconblock_ssz.go @@ -4,6 +4,9 @@ package electra import ( + "errors" + "fmt" + ssz "github.com/ferranbt/fastssz" ) @@ -48,7 +51,7 @@ func (s *SignedBeaconBlock) UnmarshalSSZ(buf []byte) error { } if o0 != 100 { - return ssz.ErrInvalidVariableOffset + return errors.Join(ssz.ErrInvalidVariableOffset, errors.New("Inside SignedBeaconBlock, o0 " + fmt.Sprintf("%d", o0) + " is not equal to 100")) } // Field (1) 'Signature'