Nightly 22apr23

Cargo.toml

@@ -5,6 +5,8 @@ members = [
     "packages/wasm-dpp",
     "packages/rs-drive",
     "packages/rs-platform-value",
+    "packages/rs-platform-serialization",
+    "packages/rs-platform-value-convertible",
     "packages/rs-drive-abci",
     "packages/dashpay-contract",
     "packages/withdrawals-contract",

packages/rs-dpp/Cargo.toml

@@ -2,7 +2,7 @@
 name = "dpp"
 version = "0.1.0"
 edition = "2018"
-authors = ["Anton Suprunchuk <anton.suprunchuk@gmail.com>"]
+authors = ["Anton Suprunchuk <anton.suprunchuk@gmail.com>", "Samuel Westrich <sam@dash.org>", "Ivan Shumkov <ivan@shumkov.ru>", "Djavid Gabibiyan <djavid@dash.org>"]
 
 [dependencies]
 anyhow = { version = "1.0.70" }
@@ -15,7 +15,7 @@ chrono = { version = "0.4.20", default-features = false, features = [
     "wasmbind",
     "clock",
 ] }
-ciborium = { git = "https://github.com/qrayven/ciborium", branch = "feat-ser-null-as-undefined" }
+ciborium = { git = "https://github.com/qrayven/ciborium", branch = "feat-ser-null-as-undefined" , optional = true}
 dashcore = { git = "https://github.com/dashpay/rust-dashcore", features = [
     "std",
     "secp-recovery",
@@ -50,6 +50,8 @@ thiserror = { version = "1.0" }
 mockall = { version = "0.11.3", optional = true }
 data-contracts = { path = "../data-contracts" }
 platform-value = { path = "../rs-platform-value" }
+platform-value-convertible = { path = "../rs-platform-value-convertible" }
+platform-serialization = { path = "../rs-platform-serialization" }
 derive_more = "0.99.17"
 ed25519-dalek = {version = "2.0.0-rc.2", features = ["rand_core"] }
 
@@ -60,4 +62,5 @@ pretty_assertions = { version = "1.3.0" }
 
 [features]
 default = ["fixtures-and-mocks"]
+cbor = ["ciborium"]
 fixtures-and-mocks = ["mockall"]

packages/rs-dpp/src/block/block_info.rs

@@ -1,10 +1,14 @@
 use crate::block::epoch::Epoch;
+use crate::serialization_traits::{PlatformDeserializable, PlatformSerializable};
 use crate::ProtocolError;
 use bincode::config;
 use bincode::{Decode, Encode};
+use platform_serialization::{PlatformDeserialize, PlatformSerialize};
 
 /// Block information
-#[derive(Clone, Default, Encode, Decode)]
+#[derive(Clone, Default, Encode, Decode, PlatformSerialize, PlatformDeserialize)]
+#[platform_error_type(ProtocolError)]
+#[platform_deserialize_limit(15000)]
 pub struct BlockInfo {
     /// Block time in milliseconds
     pub time_ms: u64,
@@ -42,27 +46,4 @@ impl BlockInfo {
             ..Default::default()
         }
     }
-
-    /// Serialize block info
-    pub fn serialize(&self) -> Result<Vec<u8>, ProtocolError> {
-        let config = config::standard().with_big_endian().with_no_limit();
-        bincode::encode_to_vec(self, config).map_err(|e| {
-            ProtocolError::EncodingError(format!("unable to serialize data contract {e}"))
-        })
-    }
-
-    /// The size of serialized block info
-    pub fn serialized_size(&self) -> Result<usize, ProtocolError> {
-        self.serialize().map(|a| a.len())
-    }
-
-    /// Deserialization of block info
-    pub fn deserialize(bytes: &[u8]) -> Result<Self, ProtocolError> {
-        let config = config::standard().with_big_endian().with_limit::<15000>();
-        bincode::decode_from_slice(bytes, config)
-            .map_err(|e| {
-                ProtocolError::EncodingError(format!("unable to deserialize block info {}", e))
-            })
-            .map(|(a, _)| a)
-    }
 }

packages/rs-dpp/src/convertible.rs

@@ -18,5 +18,6 @@ pub trait Convertible {
     fn to_json(&self) -> Result<JsonValue, ProtocolError>;
     /// Returns the cbor-encoded bytes representation of the object. The data is prefixed by 4 bytes containing
     /// the Protocol Version
-    fn to_buffer(&self) -> Result<Vec<u8>, ProtocolError>;
+    #[cfg(feature = "cbor")]
+    fn to_cbor_buffer(&self) -> Result<Vec<u8>, ProtocolError>;
 }

packages/rs-dpp/src/data_contract/contract_config.rs

@@ -1,3 +1,4 @@
+use bincode::{Decode, Encode};
 use serde::{Deserialize, Serialize};
 
 pub const DEFAULT_CONTRACT_KEEPS_HISTORY: bool = false;
@@ -14,7 +15,7 @@ pub mod property {
     pub const DOCUMENTS_MUTABLE_CONTRACT_DEFAULT: &str = "documentsMutableContractDefault";
 }
 
-#[derive(Serialize, Deserialize, Debug, Clone, Copy, PartialEq, Eq)]
+#[derive(Serialize, Deserialize, Encode, Decode, Debug, Clone, Copy, PartialEq, Eq)]
 #[serde(rename_all = "camelCase", default)]
 pub struct ContractConfig {
     /// Can the contract ever be deleted