feat(dpp)!: dashpay payment detection keys and stealth derivation

packages/dashpay-contract/schema/v2/dashpay.schema.json

@@ -0,0 +1,271 @@
+{
+  "profile": {
+    "type": "object",
+    "indices": [
+      {
+        "name": "ownerId",
+        "properties": [
+          {
+            "$ownerId": "asc"
+          }
+        ],
+        "unique": true
+      },
+      {
+        "name": "ownerIdAndUpdatedAt",
+        "properties": [
+          {
+            "$ownerId": "asc"
+          },
+          {
+            "$updatedAt": "asc"
+          }
+        ]
+      }
+    ],
+    "properties": {
+      "avatarUrl": {
+        "type": "string",
+        "format": "uri",
+        "minLength": 1,
+        "maxLength": 2048,
+        "position": 0
+      },
+      "avatarHash": {
+        "type": "array",
+        "byteArray": true,
+        "minItems": 32,
+        "maxItems": 32,
+        "description": "SHA256 hash of the bytes of the image specified by avatarUrl",
+        "position": 1
+      },
+      "avatarFingerprint": {
+        "type": "array",
+        "byteArray": true,
+        "minItems": 8,
+        "maxItems": 8,
+        "description": "dHash the image specified by avatarUrl",
+        "position": 2
+      },
+      "publicMessage": {
+        "type": "string",
+        "minLength": 1,
+        "maxLength": 140,
+        "position": 3
+      },
+      "displayName": {
+        "type": "string",
+        "minLength": 1,
+        "maxLength": 25,
+        "position": 4
+      },
+      "corePaymentAddress": {
+        "type": "array",
+        "byteArray": true,
+        "minItems": 21,
+        "maxItems": 21,
+        "description": "Core chain address in storage form (type byte 0x00 P2PKH / 0x01 P2SH followed by the 20-byte HASH160, i.e. RIPEMD160 of SHA256, of the public key or redeem script) for public payments. Clients render it as Base58Check for the network they are on and MUST validate the type byte before paying. Payments to it are publicly linkable to this profile.",
+        "position": 5
+      },
+      "platformPaymentAddress": {
+        "type": "array",
+        "byteArray": true,
+        "minItems": 21,
+        "maxItems": 21,
+        "description": "Platform address in storage form (type byte 0x00 P2PKH / 0x01 P2SH followed by the 20-byte HASH160, i.e. RIPEMD160 of SHA256, of the public key or redeem script) for public payments",
+        "position": 6
+      }
+    },
+    "minProperties": 1,
+    "dependentRequired": {
+      "avatarUrl": ["avatarHash", "avatarFingerprint"],
+      "avatarHash": ["avatarUrl", "avatarFingerprint"],
+      "avatarFingerprint": ["avatarUrl", "avatarHash"]
+    },
+    "required": [
+      "$createdAt",
+      "$updatedAt"
+    ],
+    "additionalProperties": false
+  },
+  "contactInfo": {
+    "type": "object",
+    "indices": [
+      {
+        "name": "ownerIdAndKeys",
+        "properties": [
+          {
+            "$ownerId": "asc"
+          },
+          {
+            "rootEncryptionKeyIndex": "asc"
+          },
+          {
+            "derivationEncryptionKeyIndex": "asc"
+          }
+        ],
+        "unique": true
+      },
+      {
+        "name": "ownerIdAndUpdatedAt",
+        "properties": [
+          {
+            "$ownerId": "asc"
+          },
+          {
+            "$updatedAt": "asc"
+          }
+        ]
+      }
+    ],
+    "properties": {
+      "encToUserId": {
+        "type": "array",
+        "byteArray": true,
+        "minItems": 32,
+        "maxItems": 32,
+        "position": 0
+      },
+      "rootEncryptionKeyIndex": {
+        "type": "integer",
+        "minimum": 0,
+        "position": 1
+      },
+      "derivationEncryptionKeyIndex": {
+        "type": "integer",
+        "minimum": 0,
+        "position": 2
+      },
+      "privateData": {
+        "type": "array",
+        "byteArray": true,
+        "minItems": 48,
+        "maxItems": 2048,
+        "position": 3,
+        "description": "This is the encrypted values of aliasName + note + displayHidden encoded as an array in cbor"
+      }
+    },
+    "required": [
+      "$createdAt",
+      "$updatedAt",
+      "encToUserId",
+      "privateData",
+      "rootEncryptionKeyIndex",
+      "derivationEncryptionKeyIndex"
+    ],
+    "additionalProperties": false
+  },
+  "contactRequest": {
+    "documentsMutable": false,
+    "canBeDeleted": false,
+    "requiresIdentityEncryptionBoundedKey": 2,
+    "requiresIdentityDecryptionBoundedKey": 2,
+    "type": "object",
+    "indices": [
+      {
+        "name": "ownerIdUserIdAndAccountRef",
+        "properties": [
+          {
+            "$ownerId": "asc"
+          },
+          {
+            "toUserId": "asc"
+          },
+          {
+            "accountReference": "asc"
+          }
+        ],
+        "unique": true
+      },
+      {
+        "name": "ownerIdUserId",
+        "properties": [
+          {
+            "$ownerId": "asc"
+          },
+          {
+            "toUserId": "asc"
+          }
+        ]
+      },
+      {
+        "name": "userIdCreatedAt",
+        "properties": [
+          {
+            "toUserId": "asc"
+          },
+          {
+            "$createdAt": "asc"
+          }
+        ]
+      },
+      {
+        "name": "ownerIdCreatedAt",
+        "properties": [
+          {
+            "$ownerId": "asc"
+          },
+          {
+            "$createdAt": "asc"
+          }
+        ]
+      }
+    ],
+    "properties": {
+      "toUserId": {
+        "type": "array",
+        "byteArray": true,
+        "minItems": 32,
+        "maxItems": 32,
+        "position": 0,
+        "contentMediaType": "application/x.dash.dpp.identifier"
+      },
+      "encryptedPublicKey": {
+        "type": "array",
+        "byteArray": true,
+        "minItems": 96,
+        "maxItems": 96,
+        "position": 1
+      },
+      "senderKeyIndex": {
+        "type": "integer",
+        "minimum": 0,
+        "position": 2
+      },
+      "recipientKeyIndex": {
+        "type": "integer",
+        "minimum": 0,
+        "position": 3
+      },
+      "accountReference": {
+        "type": "integer",
+        "minimum": 0,
+        "position": 4
+      },
+      "encryptedAccountLabel": {
+        "type": "array",
+        "byteArray": true,
+        "minItems": 48,
+        "maxItems": 80,
+        "position": 5
+      },
+      "autoAcceptProof": {
+        "type": "array",
+        "byteArray": true,
+        "minItems": 38,
+        "maxItems": 102,
+        "position": 6
+      }
+    },
+    "required": [
+      "$createdAt",
+      "$createdAtCoreBlockHeight",
+      "toUserId",
+      "encryptedPublicKey",
+      "senderKeyIndex",
+      "recipientKeyIndex",
+      "accountReference"
+    ],
+    "additionalProperties": false
+  }
+}

packages/dashpay-contract/src/lib.rs

@@ -1,5 +1,6 @@
 mod error;
 pub mod v1;
+pub mod v2;
 
 pub use crate::error::Error;
 use platform_value::{Identifier, IdentifierBytes32};
@@ -18,20 +19,21 @@ 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.dashpay {
-        1 => Ok(None),
+        1 | 2 => Ok(None),
         version => Err(Error::UnknownVersionMismatch {
             method: "dashpay_contract::load_definitions".to_string(),
-            known_versions: vec![1],
+            known_versions: vec![1, 2],
             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(),
+        2 => v2::load_documents_schemas(),
         version => Err(Error::UnknownVersionMismatch {
             method: "dashpay_contract::load_documents_schemas".to_string(),
-            known_versions: vec![1],
+            known_versions: vec![1, 2],
             received: version,
         }),
     }

packages/dashpay-contract/src/v2/mod.rs

@@ -0,0 +1,11 @@
+use crate::error::Error;
+use serde_json::Value;
+
+// Document-type name and property constants live in `crate::v1::document_types`;
+// v2 does not change any names v1 defined, it only adds the optional
+// `corePaymentAddress` / `platformPaymentAddress` properties to `profile`.
+
+pub fn load_documents_schemas() -> Result<Value, Error> {
+    serde_json::from_str(include_str!("../../schema/v2/dashpay.schema.json"))
+        .map_err(Error::InvalidSchemaJson)
+}

packages/kotlin-sdk/KotlinExampleApp/app/src/main/java/org/dashfoundation/example/ui/identity/AddIdentityKeyScreen.kt

@@ -413,6 +413,8 @@ private fun KeyPurpose.displayName(): String = when (this) {
     KeyPurpose.SYSTEM -> "System"
     KeyPurpose.VOTING -> "Voting"
     KeyPurpose.OWNER -> "Owner"
+    KeyPurpose.PAYMENT_SCAN -> "Payment Scan"
+    KeyPurpose.PAYMENT_SPEND -> "Payment Spend"
 }
 
 private fun SecurityLevel.displayName(): String = when (this) {

packages/kotlin-sdk/sdk/src/main/kotlin/org/dashfoundation/dashsdk/identity/IdentityUpdates.kt

@@ -32,6 +32,8 @@ enum class KeyPurpose(val ffiValue: Int) {
     SYSTEM(4),
     VOTING(5),
     OWNER(6),
+    PAYMENT_SCAN(7),
+    PAYMENT_SPEND(8),
 }
 
 /**

packages/rs-dpp/src/address_funds/witness_verification_operations.rs

@@ -20,8 +20,8 @@ pub struct AddressWitnessVerificationOperations {
     /// Hash160 = RIPEMD160(SHA256(pubkey))
     pub pubkey_hash_verifications: u16,
 
-    /// Number of script hash (SHA256) verifications performed.
-    /// Used to verify P2SH redeem scripts.
+    /// Number of script hash (Hash160) verifications performed.
+    /// Hash160 = RIPEMD160(SHA256(redeem_script)); used to verify P2SH redeem scripts.
     pub script_hash_verifications: u16,
 
     /// Size of the signable bytes in bytes.