Merge pull request #2552 from oasislabs/peterjgilbert/disable_consens…

…us_addr_check_genesis Temporarily disable consensus address checks at genesis
oasisprotocol · Jan 14, 2020 · 4363b0a · 4363b0a
2 parents f059460 + 4af892f
commit 4363b0a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/.changelog/2552.bugfix.md b/.changelog/2552.bugfix.md
@@ -0,0 +1 @@
+Temporarily disable consensus address checks at genesis
diff --git a/go/registry/api/api.go b/go/registry/api/api.go
@@ -479,13 +479,18 @@ func VerifyRegisterNodeArgs( // nolint: gocyclo
 		return nil, ErrInvalidArgument
 	}
 	consensusAddressRequired := n.HasRoles(ConsensusAddressRequiredRoles)
-	if err := verifyAddresses(params, consensusAddressRequired, n.Consensus.Addresses); err != nil {
-		addrs, _ := json.Marshal(n.Consensus.Addresses)
-		logger.Error("RegisterNode: missing/invalid consensus addresses",
-			"node", n,
-			"consensus_addrs", addrs,
-		)
-		return nil, err
+	if !isGenesis {
+		// XXX: Re-enable consensus address checks at genesis after
+		// existing deployments have cleaned up registries.
+		// https://github.com/oasislabs/oasis-core/issues/2428
+		if err := verifyAddresses(params, consensusAddressRequired, n.Consensus.Addresses); err != nil {
+			addrs, _ := json.Marshal(n.Consensus.Addresses)
+			logger.Error("RegisterNode: missing/invalid consensus addresses",
+				"node", n,
+				"consensus_addrs", addrs,
+			)
+			return nil, err
+		}
 	}
 
 	// If node is a key manager, ensure that it is owned by the key manager
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Temporarily disable consensus address checks at genesis