Update conformance to v1 without Ancestry (#423)

Author: bamzedev

internal/statetransition/state_transition.go

@@ -54,10 +54,6 @@ func UpdateState(s *state.State, newBlock block.Block, chain *store.Chain, trie
 		return err
 	}
 
-	if err := ValidatePreimages(newBlock.Extrinsic.EP, s.Services); err != nil {
-		return err
-	}
-
 	// TODO: verify header offenders marker.
 
 	// Update SAFROLE state.
@@ -80,6 +76,10 @@ func UpdateState(s *state.State, newBlock block.Block, chain *store.Chain, trie
 		return fmt.Errorf("failed to verify block header: %w", err)
 	}
 
+	if err := ValidatePreimages(newBlock.Extrinsic.EP, s.Services); err != nil {
+		return err
+	}
+
 	// ρ‡ ≺ (EA, ρ†) (eq. 4.13 v0.7.0) and R* ≺ (EA, ρ†) (eq 4.15 v0.7.0)
 	intermediateCoreAssignments, availableWorkReports, err := assuring.CalculateIntermediateCoreAssignmentsAndAvailableWorkReports(newBlock.Extrinsic.EA, s.ValidatorState.CurrentValidators, intermediateCoreAssignments, newBlock.Header)
 	if err != nil {
@@ -184,9 +184,6 @@ func isPreimagesSortedUnique(preimages block.PreimageExtrinsic) bool {
 // ValidatePreimages implements equations 12.39 and 12.40 v0.7.0
 // checks that the preimages are ordered, unique and solicited by a service
 func ValidatePreimages(preimages block.PreimageExtrinsic, serviceState service.ServiceState) error {
-	if !isPreimagesSortedUnique(preimages) {
-		return errors.New("preimages not sorted unique")
-	}
 
 	for _, preimage := range preimages {
 		serviceId := block.ServiceId(preimage.ServiceIndex)
@@ -198,6 +195,9 @@ func ValidatePreimages(preimages block.PreimageExtrinsic, serviceState service.S
 			return errors.New("preimage unneeded")
 		}
 	}
+	if !isPreimagesSortedUnique(preimages) {
+		return errors.New("preimages not sorted unique")
+	}
 
 	return nil
 }

pkg/conformance/cmd/main.go

@@ -0,0 +1,43 @@
+package main
+
+import (
+	"flag"
+	"log"
+
+	"github.com/eigerco/strawberry/internal/store"
+	"github.com/eigerco/strawberry/pkg/conformance"
+	"github.com/eigerco/strawberry/pkg/db/pebble"
+)
+
+func main() {
+	socketPath := flag.String("socket", "/tmp/jam_target.sock", "Path to the socket for the fuzzer to connect to")
+	flag.Parse()
+
+	// Ensure no extra positional arguments
+	if flag.NArg() > 0 {
+		log.Fatalf("unexpected arguments: %v", flag.Args())
+	}
+
+	db, err := pebble.NewKVStore()
+	if err != nil {
+		log.Fatalf("failed to create kv store: %v", err)
+	}
+
+	defer func() {
+		if err := db.Close(); err != nil {
+			log.Printf("error closing database: %v", err)
+		}
+	}()
+
+	chain := store.NewChain(db)
+	trieStore := store.NewTrie(chain)
+
+	appName := []byte("strawberry")
+	appVersion := conformance.Version{Major: 0, Minor: 0, Patch: 1}
+	jamVersion := conformance.Version{Major: 0, Minor: 7, Patch: 0}
+	features := conformance.FeatureFork
+	node := conformance.NewNode(*socketPath, chain, trieStore, appName, appVersion, jamVersion, features)
+	if err := node.Start(); err != nil {
+		log.Fatalf("Failed to start Node: %v", err)
+	}
+}

pkg/conformance/messages.go

@@ -36,7 +36,7 @@ func (v Version) String() string {
 
 type PeerInfo struct {
 	FuzzVersion  uint8
-	FuzzFeatures uint32
+	FuzzFeatures Features
 	JamVersion   Version
 	AppVersion   Version
 	Name         []byte

pkg/conformance/node.go

@@ -23,6 +23,16 @@ import (
 	"github.com/eigerco/strawberry/internal/store"
 )
 
+type Features uint32
+
+const (
+	FeatureNone            Features = 0
+	FeatureAncestry        Features = 1
+	FeatureFork            Features = 2
+	FeatureAncestryAndFork Features = 3
+	FeatureReserved        Features = 2147483648
+)
+
 // Node is a conformance testing node complying with fuzzer protocol https://github.com/davxy/jam-stuff/tree/main/fuzz-proto
 // opens a connection via a unix socket and listens to fuzzer messages and updates the state accordingly
 type Node struct {
@@ -38,11 +48,13 @@ type Node struct {
 }
 
 // NewNode create a new conformance testing node
-func NewNode(socketPath string, chain *store.Chain, trie *store.Trie, appName []byte, appVersion, jamVersion Version) *Node {
+func NewNode(socketPath string, chain *store.Chain, trie *store.Trie, appName []byte, appVersion, jamVersion Version, features Features) *Node {
 	peerInfo := PeerInfo{
-		Name:       appName,
-		AppVersion: appVersion,
-		JamVersion: jamVersion,
+		FuzzVersion:  1,
+		FuzzFeatures: features,
+		JamVersion:   jamVersion,
+		AppVersion:   appVersion,
+		Name:         appName,
 	}
 	return &Node{
 		socketPath:    socketPath,
@@ -56,8 +68,11 @@ func NewNode(socketPath string, chain *store.Chain, trie *store.Trie, appName []
 
 // Start starts the node server
 func (n *Node) Start() error {
+	// If the socket file exists, try to remove it.
 	if _, err := os.Stat(n.socketPath); err == nil {
-		os.Remove(n.socketPath)
+		if err := os.Remove(n.socketPath); err != nil {
+			return fmt.Errorf("failed to remove existing socket file: %v", err)
+		}
 	}
 
 	// Listen on the Unix socket
@@ -83,7 +98,11 @@ func (n *Node) Stop() error {
 }
 
 func (n *Node) handleConnection(conn net.Conn) {
-	defer conn.Close()
+	defer func() {
+		if err := conn.Close(); err != nil {
+			log.Printf("error closing connection: %v", err)
+		}
+	}()
 	for {
 		ctx := context.Background()
 
@@ -116,8 +135,17 @@ func (n *Node) handleConnection(conn net.Conn) {
 				responseMsg = NewMessage(Error{Message: []byte("Chain error: block header verification failure: BadSealSignature")})
 			} else if strings.Contains(err.Error(), "unexpected author") {
 				responseMsg = NewMessage(Error{Message: []byte("Chain error: block header verification failure: UnexpectedAuthor")})
+				// responseMsg = NewMessage(Error{Message: []byte("Chain error: block verification failure: unexpected author")}) //fauty vectors have the error in different format
 			} else if strings.Contains(err.Error(), "epoch marker") {
 				responseMsg = NewMessage(Error{Message: []byte("Chain error: block header verification failure: InvalidEpochMark")})
+				// responseMsg = NewMessage(Error{Message: []byte("Chain error: block header verification failure: InvalidEpochMark")}) //fauty vectors have the error in different format
+			} else if strings.Contains(err.Error(), "winning ticket marker") {
+				responseMsg = NewMessage(Error{Message: []byte("Chain error: block header verification failure: InvalidTicketsMark")})
+				// responseMsg = NewMessage(Error{Message: []byte("Chain error: block verification failure: invalid tickets mark")}) //fauty vectors have the error in different format
+			} else if strings.Contains(err.Error(), "core unauthorized") {
+				responseMsg = NewMessage(Error{Message: []byte("Chain error: block execution failure: reports error: code unauthorized")})
+			} else if strings.Contains(err.Error(), "future report slot") {
+				responseMsg = NewMessage(Error{Message: []byte("Chain error: block execution failure: reports error: report refers to slot in the future")})
 			} else {
 				return
 			}

pkg/conformance/node_test.go

@@ -46,9 +46,10 @@ func TestMessage(t *testing.T) {
 	appName := []byte("app name")
 	appVersion := Version{1, 2, 3}
 	jamVersion := Version{4, 5, 6}
+	features := FeatureFork
 
 	go func() {
-		n := NewNode(socketPath, chain, trieStore, appName, appVersion, jamVersion)
+		n := NewNode(socketPath, chain, trieStore, appName, appVersion, jamVersion, features)
 		if err := n.Start(); err != nil {
 			t.Logf("failed to start Node: %v", err)
 		}

pkg/conformance/traces_test.go

@@ -60,7 +60,7 @@ func (StateRootChoice) isFuzzerType()   {}
 func (ImportBlockChoice) isFuzzerType() {}
 func (GetStateChoice) isFuzzerType()    {}
 
-var tracesDir = "traces/no_forks"
+var tracesDir = "traces/forks"
 
 func getFuzzerFileNames(t *testing.T) []string {
 	files, err := filepath.Glob(tracesDir + "/*fuzzer*.bin")
@@ -142,7 +142,8 @@ func createTargetNode(t *testing.T) (*Node, func()) {
 	appName := []byte("polkajam")
 	appVersion := Version{Major: 0, Minor: 1, Patch: 25}
 	jamVersion := Version{Major: 0, Minor: 7, Patch: 0}
-	node := NewNode(socketPath, chain, trieStore, appName, appVersion, jamVersion)
+	features := FeatureFork
+	node := NewNode(socketPath, chain, trieStore, appName, appVersion, jamVersion, features)
 	cleanup := func() {
 		db.Close()
 		os.Remove(socketPath)
@@ -193,6 +194,13 @@ func TestNoForksTraces(t *testing.T) {
 			respMsg := &Message{}
 			err = jam.Unmarshal(response.Content, respMsg)
 			require.NoError(t, err)
+			// If running the faulty folder traces/faulty
+			// 29 is expected to return wrong state root in order to trigger the fuzzer to request `GetState`
+			// 30 is supposed to return wrong state as we have different state compared expected due to 20
+			// `In this scenario, the target responds with its current state, which is expected not to match a correctly computed state.`
+			// if i != 29 && i != 30 {
+			// 	require.Equal(t, respMsg.Get(), expected)
+			// }
 			require.Equal(t, respMsg.Get(), expected)
 		})
 	}