@dashevo/token-history-contract 2.0.0-dev.1 → 2.0.0-rc.2

package/Cargo.toml

@@ -1,13 +1,13 @@
 [package]
 name = "token-history-contract"
 description = "Token history data contract schema and tools"
-version = "2.0.0-dev.1"
+version = "2.0.0-rc.2"
 edition = "2021"
 rust-version.workspace = true
 license = "MIT"
 
 [dependencies]
-thiserror = "1.0.64"
+thiserror = "2.0.12"
 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/token-history-contract",
-  "version": "2.0.0-dev.1",
+  "version": "2.0.0-rc.2",
   "description": "The token history contract",
   "scripts": {
     "lint": "eslint .",
@@ -16,7 +16,7 @@
   ],
   "license": "MIT",
   "devDependencies": {
-    "@dashevo/wasm-dpp": "2.0.0-dev.1",
+    "@dashevo/wasm-dpp": "2.0.0-rc.2",
     "chai": "^4.3.10",
     "dirty-chai": "^2.0.1",
     "eslint": "^8.53.0",

package/schema/v1/token-history-contract-documents.json

@@ -539,9 +539,6 @@
           {
             "tokenId": "asc"
           },
-          {
-            "recipientType": "asc"
-          },
           {
             "recipientId": "asc"
           },
@@ -551,16 +548,13 @@
         ]
       },
       {
-        "name": "byDistributionType",
+        "name": "byAmount",
         "properties": [
           {
             "tokenId": "asc"
           },
           {
-            "distributionType": "asc"
-          },
-          {
-            "$createdAt": "asc"
+            "amount": "asc"
           }
         ]
       }
@@ -593,7 +587,10 @@
       },
       "distributionType": {
         "type": "integer",
-        "minimum": 0,
+        "enum": [
+          0,
+          1
+        ],
         "description": "The type of distribution (0: PreProgrammed, 1: Perpetual)",
         "position": 3
       },
@@ -674,7 +671,7 @@
           0,
           1
         ],
-        "description": "The action we are performing. 0 - Pause, 1 - Resume",
+        "description": "The action we are performing (0: Pause, 1: Resume)",
         "position": 1
       }
     },
@@ -756,5 +753,152 @@
       "$createdAtBlockHeight"
     ],
     "additionalProperties": false
+  },
+  "directPricing": {
+    "type": "object",
+    "documentsMutable": false,
+    "canBeDeleted": false,
+    "creationRestrictionMode": 2,
+    "indices": [
+      {
+        "name": "byDate",
+        "properties": [
+          {
+            "tokenId": "asc"
+          },
+          {
+            "$createdAt": "asc"
+          }
+        ]
+      }
+    ],
+    "properties": {
+      "tokenId": {
+        "type": "array",
+        "byteArray": true,
+        "minItems": 32,
+        "maxItems": 32,
+        "description": "The token ID",
+        "position": 0,
+        "contentMediaType": "application/x.dash.dpp.identifier"
+      },
+      "priceSchedule": {
+        "type": "array",
+        "byteArray": true,
+        "minItems": 1,
+        "maxItems": 2048,
+        "description": "The serialized price schedule for direct token purchases",
+        "position": 1
+      },
+      "note": {
+        "type": "string",
+        "maxLength": 2048,
+        "description": "An optional note explaining the pricing change",
+        "position": 2
+      }
+    },
+    "required": [
+      "tokenId",
+      "$createdAt",
+      "$createdAtBlockHeight"
+    ],
+    "additionalProperties": false
+  },
+  "directPurchase": {
+    "type": "object",
+    "documentsMutable": false,
+    "canBeDeleted": false,
+    "creationRestrictionMode": 2,
+    "indices": [
+      {
+        "name": "byDate",
+        "properties": [
+          {
+            "tokenId": "asc"
+          },
+          {
+            "$createdAt": "asc"
+          }
+        ]
+      },
+      {
+        "name": "byOwnerIdForToken",
+        "properties": [
+          {
+            "tokenId": "asc"
+          },
+          {
+            "$ownerId": "asc"
+          },
+          {
+            "$createdAt": "asc"
+          }
+        ]
+      },
+      {
+        "name": "byOwnerId",
+        "properties": [
+          {
+            "$ownerId": "asc"
+          },
+          {
+            "$createdAt": "asc"
+          }
+        ]
+      },
+      {
+        "name": "byPurchaseCost",
+        "properties": [
+          {
+            "purchaseCost": "asc"
+          }
+        ]
+      },
+      {
+        "name": "byTokenAmount",
+        "properties": [
+          {
+            "tokenId": "asc"
+          },
+          {
+            "tokenAmount": "asc"
+          },
+          {
+            "$createdAt": "asc"
+          }
+        ]
+      }
+    ],
+    "properties": {
+      "tokenId": {
+        "type": "array",
+        "byteArray": true,
+        "minItems": 32,
+        "maxItems": 32,
+        "description": "The token ID",
+        "position": 0,
+        "contentMediaType": "application/x.dash.dpp.identifier"
+      },
+      "tokenAmount": {
+        "type": "integer",
+        "minimum": 1,
+        "description": "The number of tokens purchased",
+        "position": 1
+      },
+      "purchaseCost": {
+        "type": "integer",
+        "minimum": 0,
+        "description": "The cost paid for the tokens in credits",
+        "position": 2
+      }
+    },
+    "required": [
+      "tokenId",
+      "tokenAmount",
+      "purchaseCost",
+      "$createdAt",
+      "$createdAtBlockHeight"
+    ],
+    "additionalProperties": false
   }
-}
+}

package/src/lib.rs

@@ -16,20 +16,20 @@ pub const OWNER_ID_BYTES: [u8; 32] = [0; 32];
 pub const ID: Identifier = Identifier(IdentifierBytes32(ID_BYTES));
 pub const OWNER_ID: Identifier = Identifier(IdentifierBytes32(OWNER_ID_BYTES));
 pub fn load_definitions(platform_version: &PlatformVersion) -> Result<Option<Value>, Error> {
-    match platform_version.system_data_contracts.withdrawals {
+    match platform_version.system_data_contracts.token_history {
         1 => Ok(None),
         version => Err(Error::UnknownVersionMismatch {
-            method: "wallet_contract::load_definitions".to_string(),
+            method: "token_history_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 {
+    match platform_version.system_data_contracts.token_history {
         1 => v1::load_documents_schemas(),
         version => Err(Error::UnknownVersionMismatch {
-            method: "wallet_contract::load_documents_schemas".to_string(),
+            method: "token_history_contract::load_documents_schemas".to_string(),
             known_versions: vec![1],
             received: version,
         }),