Make (de)serialization of BlockIssuerKeys consistent using new method…

…s from iota.go

pkg/model/account_diff.go

@@ -1,12 +1,10 @@
 package model
 
 import (
-	"context"
 	"io"
 
 	"github.com/iotaledger/hive.go/ierrors"
 	"github.com/iotaledger/hive.go/lo"
-	"github.com/iotaledger/hive.go/serializer/v2"
 	"github.com/iotaledger/hive.go/serializer/v2/stream"
 	iotago "github.com/iotaledger/iota.go/v4"
 )
@@ -98,11 +96,11 @@ func (d *AccountDiff) Bytes() ([]byte, error) {
 		return nil, ierrors.Wrap(err, "unable to write PreviousOutputID in the diff")
 	}
 
-	if err := writeBlockIssuerKeys(byteBuffer, d.BlockIssuerKeysAdded); err != nil {
-		return nil, err
+	if err := stream.WriteObject(byteBuffer, d.BlockIssuerKeysAdded, iotago.BlockIssuerKeys.Bytes); err != nil {
+		return nil, ierrors.Wrap(err, "unable to write added blockIssuerKeys in the diff")
 	}
-	if err := writeBlockIssuerKeys(byteBuffer, d.BlockIssuerKeysRemoved); err != nil {
-		return nil, err
+	if err := stream.WriteObject(byteBuffer, d.BlockIssuerKeysRemoved, iotago.BlockIssuerKeys.Bytes); err != nil {
+		return nil, ierrors.Wrap(err, "unable to write removed blockIssuerKeys in the diff")
 	}
 
 	if err := stream.Write(byteBuffer, d.ValidatorStakeChange); err != nil {
@@ -127,7 +125,7 @@ func (d *AccountDiff) Bytes() ([]byte, error) {
 	return byteBuffer.Bytes()
 }
 
-func AccountDiffFromReader(reader io.Reader) (*AccountDiff, error) {
+func AccountDiffFromReader(reader io.ReadSeeker) (*AccountDiff, error) {
 	var err error
 	d := NewAccountDiff()
 
@@ -150,18 +148,12 @@ func AccountDiffFromReader(reader io.Reader) (*AccountDiff, error) {
 		return nil, ierrors.Wrap(err, "unable to read previous outputID in the diff")
 	}
 
-	// TODO: refactor serialization of blockIssuerKeys
-	keysAdded, _, err := readBlockIssuerKeys(reader)
-	if err != nil {
+	if d.BlockIssuerKeysAdded, err = stream.ReadObjectFromReader(reader, iotago.BlockIssuerKeysFromReader); err != nil {
 		return nil, ierrors.Wrap(err, "unable to read added blockIssuerKeys in the diff")
 	}
-	d.BlockIssuerKeysAdded = keysAdded
-
-	keysRemoved, _, err := readBlockIssuerKeys(reader)
-	if err != nil {
+	if d.BlockIssuerKeysRemoved, err = stream.ReadObjectFromReader(reader, iotago.BlockIssuerKeysFromReader); err != nil {
 		return nil, ierrors.Wrap(err, "unable to read removed blockIssuerKeys in the diff")
 	}
-	d.BlockIssuerKeysRemoved = keysRemoved
 
 	if d.ValidatorStakeChange, err = stream.Read[int64](reader); err != nil {
 		return nil, ierrors.Wrap(err, "unable to read validator stake change in the diff")
@@ -192,38 +184,3 @@ func AccountDiffFromBytes(b []byte) (*AccountDiff, int, error) {
 
 	return a, reader.BytesRead(), err
 }
-
-func writeBlockIssuerKeys(byteBuffer *stream.ByteBuffer, blockIssuerKeys iotago.BlockIssuerKeys) error {
-	// TODO: improve this
-
-	blockIssuerKeysBytes, err := iotago.CommonSerixAPI().Encode(context.TODO(), blockIssuerKeys)
-	if err != nil {
-		return ierrors.Wrap(err, "unable to encode blockIssuerKeys in the diff")
-	}
-
-	if err := stream.WriteBytesWithSize(byteBuffer, blockIssuerKeysBytes, serializer.SeriLengthPrefixTypeAsUint64); err != nil {
-		return ierrors.Wrap(err, "unable to write blockIssuerKeysBytes in the diff")
-	}
-
-	return nil
-}
-
-func readBlockIssuerKeys(reader io.Reader) (iotago.BlockIssuerKeys, int, error) {
-	// TODO: improve this
-	var bytesConsumed int
-
-	blockIssuerKeysBytes, err := stream.ReadBytesWithSize(reader, serializer.SeriLengthPrefixTypeAsUint64)
-	if err != nil {
-		return nil, bytesConsumed, ierrors.Wrap(err, "unable to read blockIssuerKeysBytes in the diff")
-	}
-
-	bytesConsumed += serializer.UInt64ByteSize // add the blob size
-	bytesConsumed += len(blockIssuerKeysBytes)
-
-	var blockIssuerKeys iotago.BlockIssuerKeys
-	if _, err := iotago.CommonSerixAPI().Decode(context.TODO(), blockIssuerKeysBytes, &blockIssuerKeys); err != nil {
-		return nil, bytesConsumed, ierrors.Wrap(err, "unable to decode blockIssuerKeys in the diff")
-	}
-
-	return blockIssuerKeys, bytesConsumed, nil
-}

pkg/model/poolstats.go

@@ -15,7 +15,7 @@ type PoolsStats struct {
 	ProfitMargin        uint64
 }
 
-func PoolStatsFromReader(reader io.Reader) (*PoolsStats, error) {
+func PoolStatsFromReader(reader io.ReadSeeker) (*PoolsStats, error) {
 	p := new(PoolsStats)
 
 	var err error
@@ -68,7 +68,7 @@ type PoolRewards struct {
 	FixedCost iotago.Mana
 }
 
-func PoolRewardsFromReader(reader io.Reader) (*PoolRewards, error) {
+func PoolRewardsFromReader(reader io.ReadSeeker) (*PoolRewards, error) {
 	var err error
 	p := new(PoolRewards)
 

pkg/model/validator_performance.go

@@ -34,7 +34,7 @@ func ValidatorPerformanceFromBytes(bytes []byte) (*ValidatorPerformance, int, er
 	return v, byteReader.BytesRead(), nil
 }
 
-func ValidatorPerformanceFromReader(reader io.Reader) (*ValidatorPerformance, error) {
+func ValidatorPerformanceFromReader(reader io.ReadSeeker) (*ValidatorPerformance, error) {
 	var err error
 	v := NewValidatorPerformance()
 

pkg/protocol/engine/accounts/accounts.go

@@ -1,13 +1,10 @@
 package accounts
 
 import (
-	"encoding/binary"
 	"io"
 
-	"github.com/iotaledger/hive.go/crypto/ed25519"
 	"github.com/iotaledger/hive.go/ierrors"
 	"github.com/iotaledger/hive.go/runtime/options"
-	"github.com/iotaledger/hive.go/serializer/v2"
 	"github.com/iotaledger/hive.go/serializer/v2/stream"
 	"github.com/iotaledger/iota-core/pkg/model"
 	iotago "github.com/iotaledger/iota.go/v4"
@@ -77,8 +74,7 @@ func (a *AccountData) Clone() *AccountData {
 	}
 }
 
-func AccountDataFromReader(reader io.Reader) (*AccountData, error) {
-
+func AccountDataFromReader(reader io.ReadSeeker) (*AccountData, error) {
 	accountID, err := stream.Read[iotago.AccountID](reader)
 	if err != nil {
 		return nil, ierrors.Wrap(err, "unable to read accountID")
@@ -96,34 +92,7 @@ func AccountDataFromReader(reader io.Reader) (*AccountData, error) {
 		return nil, ierrors.Wrap(err, "unable to read outputID")
 	}
 
-	if err := stream.ReadCollection(reader, serializer.SeriLengthPrefixTypeAsByte, func(i int) error {
-		// TODO: improve this
-		var blockIssuerKeyType iotago.BlockIssuerKeyType
-		if err := binary.Read(reader, binary.LittleEndian, &blockIssuerKeyType); err != nil {
-			return ierrors.Wrapf(err, "unable to read block issuer key type for accountID %s", a.ID)
-		}
-
-		switch blockIssuerKeyType {
-		case iotago.BlockIssuerKeyEd25519PublicKey:
-			var ed25519PublicKey ed25519.PublicKey
-			_, err = io.ReadFull(reader, ed25519PublicKey[:])
-			if err != nil {
-				return ierrors.Wrapf(err, "unable to read public key index %d for accountID %s", i, a.ID)
-			}
-			a.BlockIssuerKeys.Add(iotago.Ed25519PublicKeyBlockIssuerKeyFromPublicKey(ed25519PublicKey))
-		case iotago.BlockIssuerKeyPublicKeyHash:
-			var implicitAccountCreationAddress iotago.ImplicitAccountCreationAddress
-			_, err = io.ReadFull(reader, implicitAccountCreationAddress[:])
-			if err != nil {
-				return ierrors.Wrapf(err, "unable to read address %d for accountID %s", i, a.ID)
-			}
-			a.BlockIssuerKeys.Add(iotago.Ed25519PublicKeyHashBlockIssuerKeyFromImplicitAccountCreationAddress(&implicitAccountCreationAddress))
-		default:
-			return ierrors.Wrapf(err, "unsupported block issuer key type %d for accountID %s at offset %d", blockIssuerKeyType, a.ID, i)
-		}
-
-		return nil
-	}); err != nil {
+	if a.BlockIssuerKeys, err = stream.ReadObjectFromReader(reader, iotago.BlockIssuerKeysFromReader); err != nil {
 		return nil, ierrors.Wrap(err, "unable to read block issuer keys")
 	}
 
@@ -174,16 +143,7 @@ func (a *AccountData) Bytes() ([]byte, error) {
 		return nil, ierrors.Wrap(err, "failed to write OutputID")
 	}
 
-	if err := stream.WriteCollection(byteBuffer, serializer.SeriLengthPrefixTypeAsByte, func() (elementsCount int, err error) {
-		// TODO: write this properly as object (depends on how we read it)
-		for _, key := range a.BlockIssuerKeys {
-			if _, err = byteBuffer.Write(key.Bytes()); err != nil {
-				return 0, ierrors.Wrap(err, "failed to write BlockIssuerKey")
-			}
-		}
-
-		return len(a.BlockIssuerKeys), nil
-	}); err != nil {
+	if err := stream.WriteObject(byteBuffer, a.BlockIssuerKeys, iotago.BlockIssuerKeys.Bytes); err != nil {
 		return nil, ierrors.Wrap(err, "failed to write BlockIssuerKeys")
 	}
 

pkg/protocol/engine/utxoledger/slot_diff.go

@@ -70,7 +70,7 @@ func (sd *SlotDiff) kvStorableLoad(manager *Manager, key []byte, value []byte) e
 
 	byteReader := stream.NewByteReader(value)
 
-	outputsCount, err := stream.PeekCollectionSize(byteReader, serializer.SeriLengthPrefixTypeAsUint32)
+	outputsCount, err := stream.Peek(byteReader, serializer.SeriLengthPrefixTypeAsUint32)
 	if err != nil {
 		return ierrors.Wrap(err, "unable to peek outputs count")
 	}
@@ -94,7 +94,7 @@ func (sd *SlotDiff) kvStorableLoad(manager *Manager, key []byte, value []byte) e
 		return ierrors.Wrapf(err, "unable to read slot diff outputs")
 	}
 
-	spentsCount, err := stream.PeekCollectionSize(byteReader, serializer.SeriLengthPrefixTypeAsUint32)
+	spentsCount, err := stream.Peek(byteReader, serializer.SeriLengthPrefixTypeAsUint32)
 	if err != nil {
 		return ierrors.Wrap(err, "unable to peek spents count")
 	}