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

package/Cargo.toml

@@ -1,11 +1,13 @@
 [package]
 name = "dashpay-contract"
 description = "DashPay 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]
+platform-version = { path = "../rs-platform-version" }
+thiserror = "1.0.56"
 serde_json = { version = "1.0" }
 platform-value = { path = "../rs-platform-value" }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dashevo/dashpay-contract",
-  "version": "1.0.0-dev.2",
+  "version": "1.0.0-dev.4",
   "description": "Reference contract of the DashPay DPA on Dash Evolution",
   "scripts": {
     "lint": "eslint .",
@@ -25,7 +25,7 @@
   },
   "homepage": "https://github.com/dashevo/dashpay-contract#readme",
   "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,9 @@
+mod error;
+pub mod v1;
+
+pub use crate::error::Error;
 use platform_value::{Identifier, IdentifierBytes32};
-use serde_json::Error;
+use platform_version::version::PlatformVersion;
 use serde_json::Value;
 
 pub const ID_BYTES: [u8; 32] = [
@@ -12,21 +16,26 @@ pub const OWNER_ID_BYTES: [u8; 32] = [
     215, 90, 101, 229, 15, 115, 5, 44, 117, 182, 217,
 ];
 
-pub mod document_types {
-    pub mod contact_request {
-        pub const NAME: &str = "contactRequest";
-
-        pub mod properties {
-            pub const TO_USER_ID: &str = "toUserId";
-            pub const CORE_HEIGHT_CREATED_AT: &str = "coreHeightCreatedAt";
-            pub const CORE_CHAIN_LOCKED_HEIGHT: &str = "coreChainLockedHeight";
-        }
-    }
-}
-
 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/dashpay.schema.json"))
+pub fn load_definitions(platform_version: &PlatformVersion) -> Result<Option<Value>, Error> {
+    match platform_version.system_data_contracts.dashpay {
+        1 => Ok(None),
+        version => Err(Error::UnknownVersionMismatch {
+            method: "dashpay_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.dashpay {
+        1 => v1::load_documents_schemas(),
+        version => Err(Error::UnknownVersionMismatch {
+            method: "dashpay_contract::load_documents_schemas".to_string(),
+            known_versions: vec![1],
+            received: version,
+        }),
+    }
 }

package/src/v1/mod.rs

@@ -0,0 +1,19 @@
+use crate::error::Error;
+use serde_json::Value;
+
+pub mod document_types {
+    pub mod contact_request {
+        pub const NAME: &str = "contactRequest";
+
+        pub mod properties {
+            pub const TO_USER_ID: &str = "toUserId";
+            pub const CORE_HEIGHT_CREATED_AT: &str = "coreHeightCreatedAt";
+            pub const CORE_CHAIN_LOCKED_HEIGHT: &str = "coreChainLockedHeight";
+        }
+    }
+}
+
+pub fn load_documents_schemas() -> Result<Value, Error> {
+    serde_json::from_str(include_str!("../../schema/v1/dashpay.schema.json"))
+        .map_err(Error::InvalidSchemaJson)
+}

package/test/unit/schema.spec.js

@@ -2,7 +2,7 @@ const { expect } = require('chai');
 const crypto = require('crypto');
 const { DashPlatformProtocol, JsonSchemaError } = require('@dashevo/wasm-dpp');
 const generateRandomIdentifier = require('@dashevo/wasm-dpp/lib/test/utils/generateRandomIdentifierAsync');
-const schema = require('../../schema/dashpay.schema.json');
+const schema = require('../../schema/v1/dashpay.schema.json');
 
 const whitepaperMasternodeText = 'Full nodes are servers running on a P2P network that allow peers to use them to receive updates about the events on the network. These nodes utilize significant amounts of traffic and other resources that incur a substantial cost. As a result, a steady decrease in the amount of these nodes has been observed for some time on the Bitcoin network and as a result, block propagation times have been upwards of 40 seconds. Many solutions have been proposed such as a new reward scheme by Microsoft Research and the Bitnodes incentive program';
 const encoded32Chars = '4fafc98bbfe597f7ba2c9f767d52036d';