@dashevo/dpns-contract 1.0.0-pr.1937.B.3 → 1.0.0-rc.2

package/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "dpns-contract"
 description = "DPNS data contract schema and tools"
-version = "1.0.0-pr.1937.B.3"
+version = "1.0.0-rc.2"
 edition = "2021"
 rust-version = "1.76"
 license = "MIT"

package/lib/systemIds.js

@@ -1,4 +1,5 @@
 module.exports = {
-  ownerId: '4EfA9Jrvv3nnCFdSf7fad59851iiTRZ6Wcu6YVJ4iSeF',
+  ownerId: '11111111111111111111111111111111',
   contractId: 'GWRSAVFMjXx8HpQFaNJMqBV7MBgMK4br5UESsB4S31Ec',
+  dashTldDocumentId: '6Zft8WEaEPzfbSVMsd6xCw3KgCqAQEneupSB9wx2EhJ',
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dashevo/dpns-contract",
-  "version": "1.0.0-pr.1937.B.3",
+  "version": "1.0.0-rc.2",
   "description": "A contract and helper scripts for DPNS DApp",
   "scripts": {
     "lint": "eslint .",
@@ -31,7 +31,7 @@
   ],
   "license": "MIT",
   "devDependencies": {
-    "@dashevo/wasm-dpp": "1.0.0-pr.1937.B.3",
+    "@dashevo/wasm-dpp": "1.0.0-rc.2",
     "chai": "^4.3.10",
     "dirty-chai": "^2.0.1",
     "eslint": "^8.53.0",

package/schema/v1/dpns-contract-documents.json

@@ -1,6 +1,6 @@
 {
   "domain": {
-    "documentsMutable": true,
+    "documentsMutable": false,
     "canBeDeleted": true,
     "transferable": 1,
     "tradeMode": 1,
@@ -16,22 +16,24 @@
             "normalizedLabel": "asc"
           }
         ],
-        "unique": true
-      },
-      {
-        "name": "dashIdentityId",
-        "properties": [
-          {
-            "records.dashUniqueIdentityId": "asc"
-          }
-        ],
-        "unique": true
+        "unique": true,
+        "contested": {
+          "fieldMatches": [
+            {
+              "field": "normalizedLabel",
+              "regexPattern": "^[a-zA-Z01-]{3,19}$"
+            }
+          ],
+          "resolution": 0,
+          "description": "If the normalized label part of this index is less than 20 characters (all alphabet a-z, A-Z, 0, 1, and -) then a masternode vote contest takes place to give out the name"
+        }
       },
       {
-        "name": "dashAlias",
+        "name": "identityId",
+        "nullSearchable": false,
         "properties": [
           {
-            "records.dashAliasIdentityId": "asc"
+            "records.identity": "asc"
           }
         ]
       }
@@ -81,32 +83,19 @@
       "records": {
         "type": "object",
         "properties": {
-          "dashUniqueIdentityId": {
-            "type": "array",
-            "byteArray": true,
-            "minItems": 32,
-            "maxItems": 32,
-            "position": 0,
-            "contentMediaType": "application/x.dash.dpp.identifier",
-            "description": "Identity ID to be used to create the primary name the Identity",
-            "$comment": "Must be equal to the document owner"
-          },
-          "dashAliasIdentityId": {
+          "identity": {
             "type": "array",
             "byteArray": true,
             "minItems": 32,
             "maxItems": 32,
             "position": 1,
             "contentMediaType": "application/x.dash.dpp.identifier",
-            "description": "Identity ID to be used to create alias names for the Identity",
-            "$comment": "Must be equal to the document owner"
+            "description": "Identifier name record that refers to an Identity"
           }
         },
         "minProperties": 1,
-        "maxProperties": 1,
         "position": 5,
-        "additionalProperties": false,
-        "$comment": "Constraint with max and min properties ensure that only one identity record is used - either a `dashUniqueIdentityId` or a `dashAliasIdentityId`"
+        "additionalProperties": false
       },
       "subdomainRules": {
         "type": "object",
@@ -135,6 +124,9 @@
       "records",
       "subdomainRules"
     ],
+    "transient": [
+      "preorderSalt"
+    ],
     "additionalProperties": false,
     "$comment": "In order to register a domain you need to create a preorder. The preorder step is needed to prevent man-in-the-middle attacks. normalizedLabel + '.' + normalizedParentDomain must not be longer than 253 chars length as defined by RFC 1035. Domain documents are immutable: modification and deletion are restricted"
   },

package/src/lib.rs

@@ -11,9 +11,16 @@ pub const ID_BYTES: [u8; 32] = [
     196, 13, 87, 33, 246, 34, 191, 83, 197, 49, 85,
 ];
 
-pub const OWNER_ID_BYTES: [u8; 32] = [
-    48, 18, 193, 155, 152, 236, 0, 51, 173, 219, 54, 205, 100, 183, 245, 16, 103, 15, 42, 53, 26,
-    67, 4, 181, 246, 153, 65, 68, 40, 110, 253, 172,
+pub const OWNER_ID_BYTES: [u8; 32] = [0; 32];
+
+pub const DPNS_DASH_TLD_DOCUMENT_ID: [u8; 32] = [
+    215, 242, 197, 63, 70, 169, 23, 171, 110, 91, 57, 162, 215, 188, 38, 11, 100, 146, 137, 69, 55,
+    68, 209, 224, 212, 242, 106, 141, 142, 255, 55, 207,
+];
+
+pub const DPNS_DASH_TLD_PREORDER_SALT: [u8; 32] = [
+    224, 181, 8, 197, 163, 104, 37, 162, 6, 105, 58, 31, 65, 74, 161, 62, 219, 236, 244, 60, 65,
+    227, 199, 153, 234, 158, 115, 123, 79, 154, 162, 38,
 ];
 
 pub const ID: Identifier = Identifier(IdentifierBytes32(ID_BYTES));

package/test/unit/dpnsContract.spec.js

@@ -158,7 +158,7 @@ describe('DPNS Contract', () => {
           normalizedParentDomainName: 'dash',
           preorderSalt: crypto.randomBytes(32),
           records: {
-            dashUniqueIdentityId: await generateRandomIdentifier(),
+            identity: await generateRandomIdentifier(),
           },
           subdomainRules: {
             allowSubdomains: false,
@@ -468,54 +468,10 @@ describe('DPNS Contract', () => {
         });
 
         describe('Dash Identity', () => {
-          it('should have either `dashUniqueIdentityId` or `dashAliasIdentityId`', async () => {
-            rawDomainDocument.records = {
-              dashUniqueIdentityId: identityId,
-              dashAliasIdentityId: identityId,
-            };
-
-            const document = dpp.document.create(dataContract, identityId, 'domain', rawDomainDocument);
-            const validationResult = document.validate(dpp.protocolVersion);
-            const error = expectJsonSchemaError(validationResult);
-
-            expect(error.keyword)
-              .to
-              .equal('maxProperties');
-            expect(error.instancePath)
-              .to
-              .equal('/records');
-          });
-
-          describe('dashUniqueIdentityId', () => {
-            it('should no less than 32 bytes', async () => {
-              rawDomainDocument.records = {
-                dashUniqueIdentityId: crypto.randomBytes(30),
-              };
-
-              expect(() => {
-                dpp.document.create(dataContract, identityId, 'domain', rawDomainDocument);
-              })
-                .to
-                .throw();
-            });
-
-            it('should no more than 32 bytes', async () => {
-              rawDomainDocument.records = {
-                dashUniqueIdentityId: crypto.randomBytes(64),
-              };
-
-              expect(() => {
-                dpp.document.create(dataContract, identityId, 'domain', rawDomainDocument);
-              })
-                .to
-                .throw();
-            });
-          });
-
-          describe('dashAliasIdentityId', () => {
+          describe('identity record', () => {
             it('should no less than 32 bytes', async () => {
               rawDomainDocument.records = {
-                dashAliasIdentityId: crypto.randomBytes(30),
+                identity: crypto.randomBytes(30),
               };
 
               expect(() => {
@@ -527,7 +483,7 @@ describe('DPNS Contract', () => {
 
             it('should no more than 32 bytes', async () => {
               rawDomainDocument.records = {
-                dashAliasIdentityId: crypto.randomBytes(64),
+                identity: crypto.randomBytes(64),
               };
 
               expect(() => {