Merge branch 'main' into feat/jamtime

internal/block/block.go

@@ -8,7 +8,7 @@ type Block struct {
 
 // Extrinsic represents the block extrinsic data
 type Extrinsic struct {
-	ET []*TicketProof
+	ET *TicketExtrinsic
 	EP *PreimageExtrinsic
 	ED *DisputeExtrinsic
 	EA *AssurancesExtrinsic

internal/block/ticket.go

@@ -18,3 +18,8 @@ type TicketProof struct {
 	EntryIndex uint8                 // r ∈ Nn (0, 1)
 	Proof      [ticketProofSize]byte // RingVRF proof
 }
+
+// TicketExtrinsic represents the E_T extrinsic
+type TicketExtrinsic struct {
+	TicketProofs []TicketProof
+}

pkg/serialization/codec/codec.go

@@ -0,0 +1,6 @@
+package codec
+
+type Codec interface {
+	Marshal(v interface{}) ([]byte, error)
+	Unmarshal(data []byte, v interface{}) error
+}

pkg/serialization/codec/json_codec.go

@@ -0,0 +1,16 @@
+package codec
+
+import (
+	"encoding/json"
+)
+
+// JSONCodec implements the Codec interface for JSON encoding and decoding.
+type JSONCodec struct{}
+
+func (j *JSONCodec) Marshal(v interface{}) ([]byte, error) {
+	return json.Marshal(v)
+}
+
+func (j *JSONCodec) Unmarshal(data []byte, v interface{}) error {
+	return json.Unmarshal(data, v)
+}

pkg/serialization/codec/scale_codec.go

@@ -0,0 +1,14 @@
+package codec
+
+import "github.com/ChainSafe/gossamer/pkg/scale"
+
+// SCALECodec implements the Codec interface for SCALE encoding and decoding.
+type SCALECodec struct{}
+
+func (s *SCALECodec) Marshal(v interface{}) ([]byte, error) {
+	return scale.Marshal(v)
+}
+
+func (s *SCALECodec) Unmarshal(data []byte, v interface{}) error {
+	return scale.Unmarshal(data, v)
+}

pkg/serialization/serializer.go

@@ -0,0 +1,23 @@
+package serialization
+
+import "github.com/eigerco/strawberry/pkg/serialization/codec"
+
+// Serializer provides methods to encode and decode using a specified codec.
+type Serializer struct {
+	codec codec.Codec
+}
+
+// NewSerializer initializes a new Serializer with the given codec.
+func NewSerializer(c codec.Codec) *Serializer {
+	return &Serializer{codec: c}
+}
+
+// Encode serializes the given value using the codec.
+func (s *Serializer) Encode(v interface{}) ([]byte, error) {
+	return s.codec.Marshal(v)
+}
+
+// Decode deserializes the given data into the specified value using the codec.
+func (s *Serializer) Decode(data []byte, v interface{}) error {
+	return s.codec.Unmarshal(data, v)
+}

pkg/serialization/serializer_test.go

@@ -0,0 +1,52 @@
+package serialization_test
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+
+	"github.com/eigerco/strawberry/pkg/serialization"
+	"github.com/eigerco/strawberry/pkg/serialization/codec"
+)
+
+type PayloadExample struct {
+	ID   int    `json:"id"`
+	Data []byte `json:"data"`
+}
+
+func TestJSONSerializer(t *testing.T) {
+	jsonCodec := &codec.JSONCodec{}
+	serializer := serialization.NewSerializer(jsonCodec)
+
+	example := PayloadExample{ID: 1, Data: []byte{1, 2, 3}}
+
+	// Test Encoding
+	encoded, err := serializer.Encode(&example)
+	require.NoError(t, err)
+	require.NotNil(t, encoded)
+
+	// Test Decoding
+	var decoded PayloadExample
+	err = serializer.Decode(encoded, &decoded)
+	require.NoError(t, err)
+	assert.Equal(t, example, decoded)
+}
+
+func TestSCALESerializer(t *testing.T) {
+	scaleCodec := &codec.SCALECodec{}
+	serializer := serialization.NewSerializer(scaleCodec)
+
+	example := PayloadExample{ID: 2, Data: []byte{1, 2, 3}}
+
+	// Test Encoding
+	encoded, err := serializer.Encode(example)
+	require.NoError(t, err)
+	require.NotNil(t, encoded)
+
+	// Test Decoding
+	var decoded PayloadExample
+	err = serializer.Decode(encoded, &decoded)
+	require.NoError(t, err)
+	assert.Equal(t, example, decoded)
+}