Update codec vectors to latest

internal/block/block.go

@@ -9,8 +9,8 @@ type Block struct {
 // Extrinsic represents the block extrinsic data
 type Extrinsic struct {
 	ET TicketExtrinsic
-	ED DisputeExtrinsic
 	EP PreimageExtrinsic
-	EA AssurancesExtrinsic
 	EG GuaranteesExtrinsic
+	EA AssurancesExtrinsic
+	ED DisputeExtrinsic
 }

internal/block/block_test.go

@@ -3,15 +3,15 @@ package block
 import (
 	"crypto/ed25519"
 	"crypto/rand"
-	"github.com/eigerco/strawberry/pkg/serialization/codec/jam"
 	"testing"
 
-	"github.com/eigerco/strawberry/internal/common"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 
+	"github.com/eigerco/strawberry/internal/common"
 	"github.com/eigerco/strawberry/internal/crypto"
 	"github.com/eigerco/strawberry/internal/testutils"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
+	"github.com/eigerco/strawberry/pkg/serialization/codec/jam"
 )
 
 func Test_BlockEncodeDecode(t *testing.T) {
@@ -156,6 +156,7 @@ func Test_BlockEncodeDecode(t *testing.T) {
 							Output:                 WorkResultOutputOrError{CodeTooLarge},
 						},
 					},
+					SegmentRootLookup: make(map[crypto.Hash]crypto.Hash),
 				},
 				Credentials: []CredentialSignature{
 					{

internal/block/guarantee.go

@@ -26,32 +26,31 @@ type CredentialSignature struct {
 	Signature      [crypto.Ed25519SignatureSize]byte // The Ed25519 signature
 }
 
-// WorkReport represents a work report in the JAM state (equation 118 v0.4.5)
+// WorkReport represents a work report in the JAM state (equation 11.2 v0.5.0)
 // TODO: The total serialized size of a work-report may be no greater than MaxWorkPackageSizeBytes.
 type WorkReport struct {
-	WorkPackageSpecification WorkPackageSpecification // Work-package specification (s)
-	RefinementContext        RefinementContext        // Refinement context (x)
-	CoreIndex                uint16                   // Core index (c) - Max value: TotalNumberOfCores
-	AuthorizerHash           crypto.Hash              // HeaderHash of the authorizer (a)
-	Output                   []byte                   // Output of the work report (o)
-	WorkResults              []WorkResult             // Results of the evaluation of each of the items in the work-package (r) - Min value: MinWorkPackageResultsSize. Max value: MaxWorkPackageResultsSize.
-
-	// TODO ignore this field for now as the test vectors still do not include it
-	SegmentRootLookup map[crypto.Hash]crypto.Hash `json:"-" jam:"-"` // A segment-root lookup dictionary (l ∈ D⟨H → H⟩)
+	WorkPackageSpecification WorkPackageSpecification    // Work-package specification (s)
+	RefinementContext        RefinementContext           // Refinement context (x)
+	CoreIndex                uint16                      // Core index (c) - Max value: TotalNumberOfCores
+	AuthorizerHash           crypto.Hash                 // HeaderHash of the authorizer (a)
+	Output                   []byte                      // Output of the work report (o)
+	SegmentRootLookup        map[crypto.Hash]crypto.Hash // A segment-root lookup dictionary (l ∈ D⟨H → H⟩)
+	WorkResults              []WorkResult                // Results of the evaluation of each of the items in the work-package (r) - Min value: MinWorkPackageResultsSize. Max value: MaxWorkPackageResultsSize.
 }
 
 type WorkPackageSpecification struct {
 	WorkPackageHash           crypto.Hash // Hash of the work-package (h)
 	AuditableWorkBundleLength uint32      // Length of the auditable work bundle (l)
 	ErasureRoot               crypto.Hash // Erasure root (u) - is the root of a binary Merkle tree which functions as a commitment to all data required for the auditing of the report and for use by later workpackages should they need to retrieve any data yielded. It is thus used by assurers to verify the correctness of data they have been sent by guarantors, and it is later verified as correct by auditors.
 	SegmentRoot               crypto.Hash // Segment root (e) - root of a constant-depth, left-biased and zero-hash-padded binary Merkle tree committing to the hashes of each of the exported segments of each work-item. These are used by guarantors to verify the correctness of any reconstructed segments they are called upon to import for evaluation of some later work-package.
+	SegmentCount              uint16      // Segment count (n)
 }
 
 // RefinementContext describes the context of the chain at the point that the report’s corresponding work-package was evaluated.
 type RefinementContext struct {
 	Anchor                  RefinementContextAnchor       // Historical block anchor
 	LookupAnchor            RefinementContextLookupAnchor // Historical block anchor
-	PrerequisiteWorkPackage *crypto.Hash                  // Prerequisite work package (p) (optional)
+	PrerequisiteWorkPackage []crypto.Hash                 // Prerequisite work package (p) (optional)
 }
 
 type RefinementContextAnchor struct {

internal/block/header.go

@@ -4,6 +4,7 @@ import (
 	"crypto/ed25519"
 	"errors"
 	"fmt"
+
 	"github.com/eigerco/strawberry/pkg/db"
 	"github.com/eigerco/strawberry/pkg/db/pebble"
 
@@ -30,8 +31,9 @@ type Header struct {
 // EpochMarker consists of epoch randomness and a sequence of
 // Bandersnatch keys defining the Bandersnatch validator keys (kb) beginning in the next epoch.
 type EpochMarker struct {
-	Entropy crypto.Hash
-	Keys    [common.NumberOfValidators]crypto.BandersnatchPublicKey
+	Entropy        crypto.Hash
+	TicketsEntropy crypto.Hash
+	Keys           [common.NumberOfValidators]crypto.BandersnatchPublicKey
 }
 
 type WinningTicketMarker [jamtime.TimeslotsPerEpoch]Ticket

internal/state/block_seal_test.go

@@ -3,14 +3,15 @@ package state
 import (
 	"testing"
 
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+
 	"github.com/eigerco/strawberry/internal/block"
 	"github.com/eigerco/strawberry/internal/crypto"
 	"github.com/eigerco/strawberry/internal/safrole"
 	"github.com/eigerco/strawberry/internal/testutils"
 	"github.com/eigerco/strawberry/internal/validator"
 	"github.com/eigerco/strawberry/pkg/serialization/codec/jam"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
 )
 
 func TestEncodeUnsealedHeader(t *testing.T) {

internal/state/merkle/helpers_test.go

@@ -4,9 +4,12 @@ import (
 	"crypto/ed25519"
 	"errors"
 	"fmt"
-	"github.com/eigerco/strawberry/internal/state"
 	"testing"
 
+	"github.com/eigerco/strawberry/internal/state"
+
+	"github.com/stretchr/testify/require"
+
 	"github.com/eigerco/strawberry/internal/block"
 	"github.com/eigerco/strawberry/internal/common"
 	"github.com/eigerco/strawberry/internal/crypto"
@@ -15,7 +18,6 @@ import (
 	"github.com/eigerco/strawberry/internal/testutils"
 	"github.com/eigerco/strawberry/internal/validator"
 	"github.com/eigerco/strawberry/pkg/serialization/codec/jam"
-	"github.com/stretchr/testify/require"
 )
 
 func RandomValidatorsData(t *testing.T) safrole.ValidatorsData {
@@ -116,10 +118,11 @@ func RandomCoreAssignments(t *testing.T) state.CoreAssignments {
 					LookupAnchor:            block.RefinementContextLookupAnchor{HeaderHash: testutils.RandomHash(t), Timeslot: testutils.RandomTimeslot()},
 					PrerequisiteWorkPackage: nil,
 				},
-				CoreIndex:      uint16(i),
-				AuthorizerHash: testutils.RandomHash(t),
-				Output:         []byte("output"),
-				WorkResults:    []block.WorkResult{RandomWorkResult(t)},
+				CoreIndex:         uint16(i),
+				AuthorizerHash:    testutils.RandomHash(t),
+				Output:            []byte("output"),
+				SegmentRootLookup: make(map[crypto.Hash]crypto.Hash),
+				WorkResults:       []block.WorkResult{RandomWorkResult(t)},
 			},
 			Time: testutils.RandomTimeslot(),
 		}
@@ -182,10 +185,11 @@ func RandomWorkReport(t *testing.T) block.WorkReport {
 				Timeslot:   testutils.RandomTimeslot(),
 			},
 		},
-		CoreIndex:      testutils.RandomUint16(),
-		AuthorizerHash: testutils.RandomHash(t),
-		Output:         []byte("random output"),
-		WorkResults:    []block.WorkResult{RandomWorkResult(t)},
+		CoreIndex:         testutils.RandomUint16(),
+		AuthorizerHash:    testutils.RandomHash(t),
+		Output:            []byte("random output"),
+		SegmentRootLookup: make(map[crypto.Hash]crypto.Hash),
+		WorkResults:       []block.WorkResult{RandomWorkResult(t)},
 	}
 }
 

internal/state/merkle/serialization_test.go

@@ -1,12 +1,14 @@
 package state
 
 import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+
 	"github.com/eigerco/strawberry/internal/crypto"
 	"github.com/eigerco/strawberry/internal/safrole"
 	"github.com/eigerco/strawberry/pkg/serialization/codec/jam"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-	"testing"
 )
 
 func TestSerializeState(t *testing.T) {