@dashevo/dpns-contract 0.25.0-dev.9 → 0.25.1

package/Cargo.toml

@@ -1,9 +1,10 @@
 [package]
 name = "dpns-contract"
 description = "DPNS data contract schema and tools"
-version = "0.24.0-dev.1"
+version = "0.25.0"
 edition = "2021"
 license = "MIT"
 
 [dependencies]
 serde_json = { version = "1.0" }
+platform-value = { path = "../rs-platform-value" }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dashevo/dpns-contract",
-  "version": "0.25.0-dev.9",
+  "version": "0.25.1",
   "description": "A contract and helper scripts for DPNS DApp",
   "scripts": {
     "lint": "eslint .",
@@ -31,8 +31,8 @@
   ],
   "license": "MIT",
   "devDependencies": {
-    "@dashevo/dpp": "0.25.0-dev.9",
-    "chai": "^4.3.4",
+    "@dashevo/dpp": "0.25.1",
+    "chai": "^4.3.9",
     "dirty-chai": "^2.0.1",
     "eslint": "^7.32.0",
     "eslint-config-airbnb-base": "^14.2.1",

package/schema/dpns-contract-documents.json

@@ -42,18 +42,25 @@
       },
       "normalizedLabel": {
         "type": "string",
-        "pattern": "^[a-z0-9][a-z0-9-]{0,61}[a-z0-9]$",
+        "pattern": "^[a-hj-km-np-z0-9][a-hj-km-np-z0-9-]{0,61}[a-hj-km-np-z0-9]$",
         "maxLength": 63,
-        "description": "Domain label in lowercase for case-insensitive uniqueness validation. e.g. 'bob'",
-        "$comment": "Must be equal to the label in lowercase. This property will be deprecated due to case insensitive indices"
+        "description": "Domain label converted to lowercase for case-insensitive uniqueness validation. \"o\", \"i\" and \"l\" replaced with \"0\" and \"1\" to mitigate homograph attack. e.g. 'b0b'",
+        "$comment": "Must be equal to the label in lowercase. \"o\", \"i\" and \"l\" must be replaced with \"0\" and \"1\"."
+      },
+      "parentDomainName": {
+        "type": "string",
+        "pattern": "^$|^[a-zA-Z0-9][a-zA-Z0-9-]{0,61}[a-zA-Z0-9]$",
+        "minLength": 0,
+        "maxLength": 63,
+        "description": "A full parent domain name. e.g. 'dash'."
       },
       "normalizedParentDomainName": {
         "type": "string",
-        "pattern": "^$|^[a-z0-9][a-z0-9-\\.]{0,61}[a-z0-9]$",
+        "pattern": "^$|^[a-hj-km-np-z0-9][a-hj-km-np-z0-9-\\.]{0,61}[a-hj-km-np-z0-9]$",
         "minLength": 0,
         "maxLength": 63,
-        "description": "A full parent domain name in lowercase for case-insensitive uniqueness validation. e.g. 'dash'",
-        "$comment": "Must either be equal to an existing domain or empty to create a top level domain. Only the data contract owner can create top level domains."
+        "description": "A parent domain name in lowercase for case-insensitive uniqueness validation. \"o\", \"i\" and \"l\" replaced with \"0\" and \"1\" to mitigate homograph attack. e.g. 'dash'",
+        "$comment": "Must either be equal to an existing domain or empty to create a top level domain. \"o\", \"i\" and \"l\" must be replaced with \"0\" and \"1\". Only the data contract owner can create top level domains."
       },
       "preorderSalt": {
         "type": "array",

package/src/lib.rs

@@ -1,3 +1,4 @@
+use platform_value::{Identifier, IdentifierBytes32};
 use serde_json::{Error, Value};
 
 pub const ID_BYTES: [u8; 32] = [
@@ -10,6 +11,27 @@ pub const OWNER_ID_BYTES: [u8; 32] = [
     67, 4, 181, 246, 153, 65, 68, 40, 110, 253, 172,
 ];
 
+pub mod document_types {
+    pub mod domain {
+        pub const NAME: &str = "domain";
+
+        pub mod properties {
+            pub const LABEL: &str = "label";
+            pub const NORMALIZED_LABEL: &str = "normalizedLabel";
+            pub const PARENT_DOMAIN_NAME: &str = "parentDomainName";
+            pub const NORMALIZED_PARENT_DOMAIN_NAME: &str = "normalizedParentDomainName";
+            pub const PREORDER_SALT: &str = "preorderSalt";
+            pub const ALLOW_SUBDOMAINS: &str = "subdomainRules.allowSubdomains";
+            pub const RECORDS: &str = "records";
+            pub const DASH_UNIQUE_IDENTITY_ID: &str = "dashUniqueIdentityId";
+            pub const DASH_ALIAS_IDENTITY_ID: &str = "dashAliasIdentityId";
+        }
+    }
+}
+
+pub const ID: Identifier = Identifier(IdentifierBytes32(ID_BYTES));
+pub const OWNER_ID: Identifier = Identifier(IdentifierBytes32(OWNER_ID_BYTES));
+
 pub fn load_documents_schemas() -> Result<Value, Error> {
     serde_json::from_str(include_str!("../schema/dpns-contract-documents.json"))
 }

package/test/unit/dpnsContract.spec.js

@@ -159,7 +159,7 @@ describe('DPNS Contract', () => {
       beforeEach(() => {
         rawDomainDocument = {
           label: 'Wallet',
-          normalizedLabel: 'wallet',
+          normalizedLabel: 'wa11et', // lower case and base58 chars only
           normalizedParentDomainName: 'dash',
           preorderSalt: crypto.randomBytes(32),
           records: {