From 584b5da522f19a6e67facfbd9d1435fbaf73cb1c Mon Sep 17 00:00:00 2001 From: Roberto Bayardo Date: Mon, 8 May 2023 19:58:04 -0700 Subject: [PATCH] update ssz.go with latest changes --- types/ssz/ssz.go | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/types/ssz/ssz.go b/types/ssz/ssz.go index efd4f1385..72a6440bb 100644 --- a/types/ssz/ssz.go +++ b/types/ssz/ssz.go @@ -21,7 +21,6 @@ import ( libcommon "github.com/ledgerwatch/erigon-lib/common" "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/types/clonable" ) @@ -45,8 +44,7 @@ type Marshaler interface { } type Unmarshaler interface { - DecodeSSZ(buf []byte) error - DecodeSSZWithVersion(buf []byte, version int) error + DecodeSSZ(buf []byte, version int) error clonable.Clonable } @@ -87,7 +85,7 @@ func UnmarshalUint64SSZ(x []byte) uint64 { return binary.LittleEndian.Uint64(x) } -func DecodeDynamicList[T Unmarshaler](bytes []byte, start, end uint32, max uint64) ([]T, error) { +func DecodeDynamicList[T Unmarshaler](bytes []byte, start, end uint32, max uint64, version int) ([]T, error) { if start > end || len(bytes) < int(end) { return nil, ErrBadOffset } @@ -115,7 +113,7 @@ func DecodeDynamicList[T Unmarshaler](bytes []byte, start, end uint32, max uint6 return nil, ErrBadOffset } objs[i] = objs[i].Clone().(T) - if err := objs[i].DecodeSSZ(buf[currentOffset:endOffset]); err != nil { + if err := objs[i].DecodeSSZ(buf[currentOffset:endOffset], version); err != nil { return nil, err } currentOffset = endOffset @@ -123,7 +121,7 @@ func DecodeDynamicList[T Unmarshaler](bytes []byte, start, end uint32, max uint6 return objs, nil } -func DecodeStaticList[T Unmarshaler](bytes []byte, start, end, bytesPerElement uint32, max uint64) ([]T, error) { +func DecodeStaticList[T Unmarshaler](bytes []byte, start, end, bytesPerElement uint32, max uint64, version int) ([]T, error) { if start > end || len(bytes) < int(end) { return nil, ErrBadOffset } @@ -139,7 +137,7 @@ func DecodeStaticList[T Unmarshaler](bytes []byte, start, end, bytesPerElement u objs := make([]T, elementsNum) for i := range objs { objs[i] = objs[i].Clone().(T) - if err := objs[i].DecodeSSZ(buf[i*int(bytesPerElement):]); err != nil { + if err := objs[i].DecodeSSZ(buf[i*int(bytesPerElement):], version); err != nil { return nil, err } }