UserID constraint extended to identity messages too

app/lib/constants.js

@@ -49,6 +49,12 @@ module.exports = {
     SENDER: exact(PUBKEY),
     SOURCE: exact(INTEGER + ":(T|D|F):" + FINGERPRINT),
     TARGET: exact(PUBKEY + ":" + POSITIVE_INT)
+  },
+
+  setUDID2Format: function () {
+    module.exports.USER_ID = module.exports.UDID2_FORMAT;
+    module.exports.CERT.SELF.UID = exact("UID:" + UDID2);
+    module.exports.IDENTITY.INLINE = exact(PUBKEY + ":" + SIGNATURE + ":" + TIMESTAMP + ":" + UDID2);
   }
 };
 

bin/ucoind

@@ -416,7 +416,7 @@ program
 
     if (conf.udid2) {
       // UserID must match udid2 format
-      constants.USER_ID = constants.UDID2_FORMAT;
+      constants.setUDID2Format();
     }
 
     // server