fix(rs-drive-abci): Get rs-drive-abci to commit block 1

packages/dashmate/configs/system/base.js

@@ -143,7 +143,7 @@ module.exports = {
       },
       tenderdash: {
         docker: {
-          image: 'dashpay/tenderdash:0.12.0-dev.2',
+          image: 'dashpay/tenderdash:fix-CoreChainLockedHeight',
         },
         p2p: {
           port: 26656,

packages/rs-drive-abci/Cargo.toml

@@ -43,7 +43,7 @@ tracing-subscriber = { version = "0.3.16", default-features = false, features =
     "ansi",
 ], optional = true }
 atty = { version = "0.2.14", optional = true }
-tenderdash-abci = { git = "https://github.com/dashpay/rs-tenderdash-abci", optional = true }
+tenderdash-abci = { git = "https://github.com/dashpay/rs-tenderdash-abci", branch = "fix/signatures", optional = true }
 # tenderdash-abci = { path = "../../../rs-tenderdash-abci/abci", optional = true }
 anyhow = { version = "1.0.70" }
 lazy_static = "1.4.0"

packages/rs-drive-abci/src/abci/commit.rs

@@ -4,9 +4,10 @@ use crate::execution::finalize_block_cleaned_request::{CleanedBlockId, CleanedCo
 use dashcore_rpc::dashcore_rpc_json::QuorumType;
 use dpp::bls_signatures;
 use dpp::validation::{SimpleValidationResult, ValidationResult};
+use tenderdash_abci::proto;
 use tenderdash_abci::proto::abci::CommitInfo;
 use tenderdash_abci::proto::types::BlockId;
-use tenderdash_abci::proto::{self, signatures::SignDigest};
+use tenderdash_abci::signatures::SignDigest;
 
 use super::AbciError;
 
@@ -34,7 +35,8 @@ impl Commit {
                 block_id: Some(block_id.try_into().expect("cannot convert block id")),
                 height: height as i64,
                 round: ci.round as i32,
-                quorum_hash: ci.quorum_hash.to_vec(),
+                // we need to "un-reverse" quorum hash, as it was reversed in [CleanedCommitInfo::try_from]
+                quorum_hash: ci.quorum_hash.iter().rev().cloned().collect(),
                 threshold_block_signature: ci.block_signature.to_vec(),
                 threshold_vote_extensions: ci.threshold_vote_extensions.to_vec(),
             },
@@ -94,16 +96,20 @@ impl Commit {
 
         //todo: maybe cache this to lower the chance of a hashing based attack (forcing the
         // same calculation each time)
+        let quorum_hash = &self.inner.quorum_hash[..]
+            .try_into()
+            .expect("invalid quorum hash length");
+
         let hash = match self
             .inner
             .sign_digest(
                 &self.chain_id,
                 self.quorum_type as u8,
-                &self.inner.quorum_hash,
+                quorum_hash,
                 self.inner.height,
                 self.inner.round,
             )
-            .map_err(AbciError::TenderdashProto)
+            .map_err(AbciError::Tenderdash)
         {
             Ok(hash) => hash,
             Err(e) => return ValidationResult::new_with_error(e),
@@ -128,10 +134,8 @@ mod test {
         dashcore::hashes::sha256, dashcore::hashes::Hash, dashcore_rpc_json::QuorumType,
     };
     use dpp::bls_signatures::PublicKey;
-    use tenderdash_abci::proto::{
-        signatures::{SignBytes, SignDigest},
-        types::{BlockId, PartSetHeader, StateId},
-    };
+    use tenderdash_abci::proto::types::{BlockId, PartSetHeader, StateId};
+    use tenderdash_abci::signatures::{SignBytes, SignDigest};
 
     /// Given a commit info and a signature, check that the signature is verified correctly
     #[test]

packages/rs-drive-abci/src/abci/handlers.rs

@@ -33,7 +33,12 @@
 //!
 
 use crate::abci::server::AbciApplication;
+use crate::error::execution::ExecutionError;
+use crate::error::Error;
+use crate::execution::block_proposal::BlockProposal;
+use crate::execution::engine::BlockExecutionOutcome;
 use crate::rpc::core::CoreRPCLike;
+use dashcore_rpc::dashcore::hashes::hex::ToHex;
 use dpp::errors::consensus::codes::ErrorWithCode;
 use drive::fee::credits::SignedCredits;
 use tenderdash_abci::proto::abci::response_verify_vote_extension::VerifyStatus;
@@ -44,12 +49,7 @@ use tenderdash_abci::proto::abci::{
     RequestProcessProposal, RequestQuery, ResponseCheckTx, ResponseFinalizeBlock,
     ResponseInitChain, ResponsePrepareProposal, ResponseProcessProposal, ResponseQuery, TxRecord,
 };
-use tenderdash_abci::proto::types::{CoreChainLock, VoteExtensionType};
-
-use crate::error::execution::ExecutionError;
-use crate::error::Error;
-use crate::execution::block_proposal::BlockProposal;
-use crate::execution::engine::BlockExecutionOutcome;
+use tenderdash_abci::proto::types::VoteExtensionType;
 
 use super::withdrawal::WithdrawalTxs;
 use super::AbciError;
@@ -261,10 +261,15 @@ where
 
         let block_state_info = &block_execution_context.block_state_info;
 
-        if !block_state_info.matches_current_block(height as u64, round as u32, block_hash)? {
+        if !block_state_info.matches_current_block(
+            height as u64,
+            round as u32,
+            block_hash.clone(),
+        )? {
             return Err(Error::from(AbciError::RequestForWrongBlockReceived(format!(
-                "received request for height: {} round: {}, expected height: {} round: {}",
-                height, round, block_state_info.height, block_state_info.round
+                "received request for height: {} round: {}, block: {};  expected height: {} round: {}, block: {}",
+                height, round, block_hash.to_hex(),
+                block_state_info.height, block_state_info.round, block_state_info.block_hash.to_hex()
             )))
             .into());
         } else {
@@ -306,10 +311,15 @@ where
 
         let block_state_info = &block_execution_context.block_state_info;
 
-        if !block_state_info.matches_current_block(height as u64, round as u32, block_hash)? {
+        if !block_state_info.matches_current_block(
+            height as u64,
+            round as u32,
+            block_hash.clone(),
+        )? {
             return Err(Error::from(AbciError::RequestForWrongBlockReceived(format!(
-                "received request for height: {} round: {}, expected height: {} round: {}",
-                height, round, block_state_info.height, block_state_info.round
+                "received request for height: {} round: {}, block: {};  expected height: {} round: {}, block: {}",
+                height, round,block_hash.to_hex(),
+                block_state_info.height, block_state_info.round, block_state_info.block_hash.to_hex()
             )))
             .into());
         }

packages/rs-drive-abci/src/abci/messages.rs

@@ -45,22 +45,47 @@ use drive::fee::result::FeeResult;
 use serde::{de::DeserializeOwned, Deserialize, Serialize};
 use tenderdash_abci::proto::abci::RequestInitChain;
 use tenderdash_abci::proto::google::protobuf::Timestamp;
+use tenderdash_abci::proto::serializers::timestamp::ToMilis;
+
+use super::AbciError;
 
 /// A struct for handling chain initialization requests
 #[derive(Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct InitChainRequest {
     /// The genesis time in milliseconds
-    pub genesis_time_ms: TimestampMillis,
-    /// The system identity public keys
-    pub system_identity_public_keys: SystemIdentityPublicKeys,
+    pub genesis_time: TimestampMillis,
+
+    /// Initial core chain lock height.
+    pub initial_core_height: Option<u32>,
+}
+
+impl TryFrom<RequestInitChain> for InitChainRequest {
+    type Error = AbciError;
+    fn try_from(request: RequestInitChain) -> Result<Self, Self::Error> {
+        let genesis_time = request
+            .time
+            .ok_or(AbciError::BadRequest(
+                "genesis time is required in init chain".to_string(),
+            ))?
+            .to_milis() as TimestampMillis;
+        let initial_core_height = match request.initial_core_height {
+            0 => None,
+            h => Some(h),
+        };
+
+        Ok(Self {
+            genesis_time,
+            initial_core_height,
+        })
+    }
 }
 
 impl From<InitChainRequest> for RequestInitChain {
     fn from(value: InitChainRequest) -> Self {
         let InitChainRequest {
-            genesis_time_ms,
-            system_identity_public_keys: _,
+            genesis_time: genesis_time_ms,
+            initial_core_height,
         } = value;
         RequestInitChain {
             time: Some(Timestamp {
@@ -72,7 +97,7 @@ impl From<InitChainRequest> for RequestInitChain {
             validator_set: None,
             app_state_bytes: vec![],
             initial_height: 0,
-            initial_core_height: 0,
+            initial_core_height: initial_core_height.unwrap_or_default(),
         }
     }
 }

packages/rs-drive-abci/src/abci/mimic.rs

@@ -25,10 +25,10 @@ use tenderdash_abci::proto::google::protobuf::Timestamp;
 use tenderdash_abci::proto::types::{
     Block, BlockId, Data, EvidenceList, Header, PartSetHeader, VoteExtension, VoteExtensionType,
 };
-use tenderdash_abci::proto::version::Consensus;
 use tenderdash_abci::{
-    proto::{self, signatures::SignDigest},
-    Application,
+    signatures::SignDigest,
+    proto::{self, version::Consensus},
+    Application  
 };
 
 /// The outcome struct when mimicking block execution
@@ -243,11 +243,12 @@ impl<'a, C: CoreRPCLike> AbciApplication<'a, C> {
 
         //if not in testing this will default to true
         if self.platform.config.testing_configs.block_signing {
+            let quorum_hash:[u8;32] = current_quorum.quorum_hash[..].try_into().expect("wrong quorum hash len");
             let digest = commit
                 .sign_digest(
                     &chain_id,
                     quorum_type as u8,
-                    &current_quorum.quorum_hash,
+                    &quorum_hash,
                     height as i64,
                     0,
                 )

packages/rs-drive-abci/src/abci/withdrawal.rs

@@ -12,9 +12,9 @@ use drive::{
 use std::fmt::Display;
 use tenderdash_abci::proto::{
     abci::ExtendVoteExtension,
-    signatures::SignDigest,
     types::{VoteExtension, VoteExtensionType},
 };
+use tenderdash_abci::signatures::SignDigest;
 
 use super::AbciError;
 
@@ -130,14 +130,12 @@ impl<'a> WithdrawalTxs<'a> {
             let hash = match s.sign_digest(
                 chain_id,
                 quorum_type as u8,
-                quorum_hash,
+                quorum_hash.try_into().expect("invalid quorum hash length"),
                 height as i64,
                 round as i32,
             ) {
                 Ok(h) => h,
-                Err(e) => {
-                    return SimpleValidationResult::new_with_error(AbciError::TenderdashProto(e))
-                }
+                Err(e) => return SimpleValidationResult::new_with_error(AbciError::Tenderdash(e)),
             };
 
             let signature = match bls_signatures::Signature::from_bytes(&s.signature) {