cleanup

cluster/cluster_internal_test.go

@@ -115,13 +115,7 @@ func randomDefinition(t *testing.T, op0, op1 Operator) Definition {
 		rand.New(rand.NewSource(1)))
 	require.NoError(t, err)
 
-	// TODO(xenowits): Remove the line below when v1.3 is the current version.
-	definition.Version = v1_3
-
-	resp, err := definition.SetDefinitionHashes()
-	require.NoError(t, err)
-
-	return resp
+	return definition
 }
 
 func TestSupportEIP712Sigs(t *testing.T) {

cluster/cluster_test.go

@@ -61,9 +61,12 @@ func TestEncode(t *testing.T) {
 					},
 				},
 				rand.New(rand.NewSource(0)),
+				func(d *cluster.Definition) {
+					d.Version = version
+					d.Timestamp = "2022-07-19T18:19:58+02:00" // Make deterministic
+				},
 			)
 			require.NoError(t, err)
-			definition.Version = version
 
 			// Definition version prior to v1.3.0 don't support EIP712 signatures.
 			if version == "v1.0.0" || version == "v1.1.0" || version == "v1.2.0" {
@@ -74,8 +77,6 @@ func TestEncode(t *testing.T) {
 				}
 			}
 
-			definition.Timestamp = "2022-07-19T18:19:58+02:00" // Make deterministic
-
 			t.Run("definition_json_"+vStr, func(t *testing.T) {
 				testutil.RequireGoldenJSON(t, definition,
 					testutil.WithFilename("cluster_definition_"+vStr+".json"))

cluster/definition.go

@@ -42,8 +42,9 @@ type NodeIdx struct {
 }
 
 // NewDefinition returns a new definition populated with the latest version, timestamp and UUID.
+// The hashes are also populated accordingly. Note that the hashes need to be recalculated when any field is modified.
 func NewDefinition(name string, numVals int, threshold int, feeRecipientAddress string, withdrawalAddress string,
-	forkVersionHex string, operators []Operator, random io.Reader,
+	forkVersionHex string, operators []Operator, random io.Reader, opts ...func(*Definition),
 ) (Definition, error) {
 	def := Definition{
 		Version:             currentVersion,
@@ -64,7 +65,11 @@ func NewDefinition(name string, numVals int, threshold int, feeRecipientAddress
 		return Definition{}, err
 	}
 
-	return def, nil
+	for _, opt := range opts {
+		opt(&def)
+	}
+
+	return def.SetDefinitionHashes()
 }
 
 // Definition defines an intended charon cluster configuration excluding validators.

cluster/lock.go

@@ -97,15 +97,6 @@ func (l *Lock) UnmarshalJSON(data []byte) error {
 		return errors.New("unsupported version")
 	}
 
-	hash, err := hashLock(lock)
-	if err != nil {
-		return errors.Wrap(err, "hash lock")
-	}
-
-	if !bytes.Equal(lock.LockHash, hash[:]) {
-		return errors.New("invalid lock hash")
-	}
-
 	*l = lock
 
 	return nil

cluster/test_cluster.go

@@ -116,14 +116,7 @@ func NewForT(t *testing.T, dv, k, n, seed int, opts ...func(*Definition)) (Lock,
 
 	def, err := NewDefinition("test cluster", dv, k,
 		testutil.RandomETHAddress(), testutil.RandomETHAddress(),
-		"0x00000000", ops, random)
-	require.NoError(t, err)
-
-	for _, opt := range opts {
-		opt(&def)
-	}
-
-	def, err = def.SetDefinitionHashes()
+		"0x00000000", ops, random, opts...)
 	require.NoError(t, err)
 
 	// Definition version prior to v1.3.0 don't support EIP712 signatures.
@@ -133,6 +126,7 @@ func NewForT(t *testing.T, dv, k, n, seed int, opts ...func(*Definition)) (Lock,
 			require.NoError(t, err)
 		}
 
+		// Recalculate definition hash after adding signatures.
 		def, err = def.SetDefinitionHashes()
 		require.NoError(t, err)
 	}

cmd/createcluster_internal_test.go

@@ -142,7 +142,7 @@ func testCreateCluster(t *testing.T, conf clusterConfig) {
 
 		var lock cluster.Lock
 		require.NoError(t, json.Unmarshal(b, &lock))
-
+		require.NoError(t, lock.VerifyHashes())
 		require.NoError(t, lock.VerifySignatures())
 	})
 }

cmd/createdkg.go

@@ -141,14 +141,20 @@ func runCreateDKG(ctx context.Context, conf createDKGConfig) (err error) {
 		return err
 	}
 
-	def, err := cluster.NewDefinition(conf.Name, conf.NumValidators, conf.Threshold, conf.FeeRecipient, conf.WithdrawalAddress,
-		forkVersion, operators, crand.Reader)
+	def, err := cluster.NewDefinition(
+		conf.Name, conf.NumValidators, conf.Threshold,
+		conf.FeeRecipient, conf.WithdrawalAddress,
+		forkVersion, operators, crand.Reader,
+		func(d *cluster.Definition) {
+			d.DKGAlgorithm = conf.DKGAlgo
+		})
 	if err != nil {
 		return err
 	}
 
-	def.DKGAlgorithm = conf.DKGAlgo
-
+	if err := def.VerifyHashes(); err != nil {
+		return err
+	}
 	if err := def.VerifySignatures(); err != nil {
 		return err
 	}