Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions packages/rs-drive-abci/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ tenderdash-abci = { git = "https://github.com/dashpay/rs-tenderdash-abci", branc
# tenderdash-abci = { path = "/home/lklimek/git/lklimek/tenderdash-abci-rs/abci", optional = true }
anyhow = { version = "1.0.70" }
lazy_static = "1.4.0"
sha2 = "0.10.6"

[dev-dependencies]
itertools = { version = "0.10.5" }
Expand Down
23 changes: 8 additions & 15 deletions packages/rs-drive-abci/src/execution/engine.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
use dashcore_rpc::json::{ProTxHash, QuorumMasternodeListItem};
use dpp::consensus::basic::identity::IdentityInsufficientBalanceError;
use dpp::consensus::ConsensusError;
use dpp::identity::factory::IDENTITY_PROTOCOL_VERSION;
use dpp::identity::{Identity, KeyType, Purpose, SecurityLevel};
use dpp::platform_value::BinaryData;
use dpp::prelude::{Identifier, IdentityPublicKey};
use dpp::state_transition::StateTransition;
use dpp::validation::{
ConsensusValidationResult, SimpleConsensusValidationResult, SimpleValidationResult,
Expand All @@ -9,6 +14,7 @@ use drive::drive::block_info::BlockInfo;
use drive::error::Error::GroveDB;
use drive::fee::result::FeeResult;
use drive::grovedb::{Transaction, TransactionArg};
use std::collections::BTreeMap;
use tenderdash_abci::proto::abci::{ExecTxResult, RequestFinalizeBlock};

use crate::abci::AbciError;
Expand Down Expand Up @@ -183,20 +189,6 @@ where
Ok((aggregate_fee_result, exec_tx_results))
}

/// Update of the masternode identities
pub fn update_masternode_identities(
&self,
previous_core_height: u32,
current_core_height: u32,
) -> Result<(), Error> {
if previous_core_height != current_core_height {
//todo:
// self.drive.fetch_full_identity()
// self.drive.add_new_non_unique_keys_to_identity()
}
Ok(())
}

/// Run a block proposal, either from process proposal, or prepare proposal
pub fn run_block_proposal(
&self,
Expand Down Expand Up @@ -291,7 +283,8 @@ where
transaction,
)?;

self.update_masternode_identities(previous_core_height, core_chain_locked_height)?;
// TODO: re-enable
// self.update_masternode_identities(previous_core_height, core_chain_locked_height)?;

let root_hash = self
.drive
Expand Down
Loading