@dashevo/dpns-contract 1.0.0-dev.2 → 1.0.0-dev.4

package/Cargo.toml

@@ -1,11 +1,13 @@
 [package]
 name = "dpns-contract"
 description = "DPNS data contract schema and tools"
-version = "1.0.0-dev.2"
+version = "1.0.0-dev.4"
 edition = "2021"
 rust-version = "1.73"
 license = "MIT"
 
 [dependencies]
+thiserror = "1.0.56"
+platform-version = { path = "../rs-platform-version" }
 serde_json = { version = "1.0" }
 platform-value = { path = "../rs-platform-value" }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dashevo/dpns-contract",
-  "version": "1.0.0-dev.2",
+  "version": "1.0.0-dev.4",
   "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-dev.2",
+    "@dashevo/wasm-dpp": "1.0.0-dev.4",
     "chai": "^4.3.10",
     "dirty-chai": "^2.0.1",
     "eslint": "^8.53.0",

package/src/error.rs

@@ -0,0 +1,17 @@
+use platform_version::version::FeatureVersion;
+
+#[derive(thiserror::Error, Debug)]
+pub enum Error {
+    /// Platform expected some specific versions
+    #[error("platform unknown version on {method}, received: {received}")]
+    UnknownVersionMismatch {
+        /// method
+        method: String,
+        /// the allowed versions for this method
+        known_versions: Vec<FeatureVersion>,
+        /// requested core height
+        received: FeatureVersion,
+    },
+    #[error("schema deserialize error: {0}")]
+    InvalidSchemaJson(#[from] serde_json::Error),
+}

package/src/lib.rs

@@ -1,5 +1,10 @@
+mod error;
+pub mod v1;
+
+pub use crate::error::Error;
 use platform_value::{Identifier, IdentifierBytes32};
-use serde_json::{Error, Value};
+use platform_version::version::PlatformVersion;
+use serde_json::Value;
 
 pub const ID_BYTES: [u8; 32] = [
     230, 104, 198, 89, 175, 102, 174, 225, 231, 44, 24, 109, 222, 123, 91, 126, 10, 29, 113, 42, 9,
@@ -11,27 +16,25 @@ 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"))
+pub fn load_definitions(platform_version: &PlatformVersion) -> Result<Option<Value>, Error> {
+    match platform_version.system_data_contracts.withdrawals {
+        1 => Ok(None),
+        version => Err(Error::UnknownVersionMismatch {
+            method: "dpns_contract::load_definitions".to_string(),
+            known_versions: vec![1],
+            received: version,
+        }),
+    }
+}
+pub fn load_documents_schemas(platform_version: &PlatformVersion) -> Result<Value, Error> {
+    match platform_version.system_data_contracts.withdrawals {
+        1 => v1::load_documents_schemas(),
+        version => Err(Error::UnknownVersionMismatch {
+            method: "dpns_contract::load_documents_schemas".to_string(),
+            known_versions: vec![1],
+            received: version,
+        }),
+    }
 }

package/src/v1/mod.rs

@@ -0,0 +1,25 @@
+use crate::Error;
+use serde_json::Value;
+
+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 fn load_documents_schemas() -> Result<Value, Error> {
+    serde_json::from_str(include_str!("../../schema/v1/dpns-contract-documents.json"))
+        .map_err(Error::InvalidSchemaJson)
+}

package/test/unit/dpnsContract.spec.js

@@ -6,7 +6,7 @@ const {
 const generateRandomIdentifier = require('@dashevo/wasm-dpp/lib/test/utils/generateRandomIdentifierAsync');
 
 const { expect } = require('chai');
-const dpnsContractDocumentsSchema = require('../../schema/dpns-contract-documents.json');
+const dpnsContractDocumentsSchema = require('../../schema/v1/dpns-contract-documents.json');
 
 const expectJsonSchemaError = (validationResult, errorCount = 1) => {
   const errors = validationResult.getErrors();