Merge pull request #5168 from oasisprotocol/ptrus/fix/validator-p2p-c…

…heck go/consensus/supplementarysanity: Fix checks for legacy validators
oasisprotocol · Feb 7, 2023 · 82199f2 · 82199f2
2 parents fd955b7 + f790a1f
commit 82199f2
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/.changelog/5168.internal.md b/.changelog/5168.internal.md
@@ -0,0 +1 @@
+go/consensus/supplementarysanity: Fix checks for legacy validators
diff --git a/go/common/node/node.go b/go/common/node/node.go
@@ -62,7 +62,7 @@ const (
 	LatestNodeDescriptorVersion = 3
 
 	// Minimum and maximum descriptor versions that are allowed.
-	minNodeDescriptorVersion = 2
+	minNodeDescriptorVersion = 3
 	maxNodeDescriptorVersion = LatestNodeDescriptorVersion
 
 	nodeSoftwareVersionMaxLength = 128

diff --git a/go/registry/api/api.go b/go/registry/api/api.go
@@ -706,9 +706,10 @@ func VerifyRegisterNodeArgs( // nolint: gocyclo
 	}
 	expectedSigners = append(expectedSigners, n.P2P.ID)
 	p2pAddressRequired := n.HasRoles(P2PAddressRequiredRoles)
-	switch isGenesis {
+	switch isGenesis || isSanityCheck {
 	case true:
 		// Allow legacy descriptor with optional p2p address for validator.
+		// XXX: Remove this after 23.0.x.
 		if n.HasRoles(node.RoleValidator) {
 			p2pAddressRequired = false
 		}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		go/consensus/supplementarysanity: Fix checks for legacy validators