Skip to content

feat(rs-drive-abci): generate validator set for tenderdash #880

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
QuantumExplorer merged 2 commits into from
Apr 3, 2023
Merged

feat(rs-drive-abci): generate validator set for tenderdash #880

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
08b90e9
feat(rs-drive-abci): generate validator set update
lklimek Mar 31, 2023
db765e6
chore(rs-drive-abci): integrate with dashcore_rpc get_quorum_listext…
lklimek Apr 3, 2023
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
748 changes: 577 additions & 171 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions packages/rs-drive-abci/.env.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@ INITIAL_CORE_CHAINLOCKED_HEIGHT=1243
# https://github.com/dashevo/dashcore-lib/blob/286c33a9d29d33f05d874c47a9b33764a0be0cf1/lib/constants/index.js#L42-L57
VALIDATOR_SET_LLMQ_TYPE=100
VALIDATOR_SET_QUORUM_ROTATION_BLOCK_COUNT=1024

DKG_INTERVAL=
MIN_QUORUM_VALID_MEMBERS=

# DPNS Contract

DPNS_MASTER_PUBLIC_KEY=02649a81b760e8635dd3a4fad8911388ed09d7c1680558a890180d4edc8bcece7e
Expand Down
2 changes: 1 addition & 1 deletion packages/rs-drive-abci/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ dashcore = { git = "https://github.com/dashevo/rust-dashcore", features = [
"signer",
"use-serde",
], default-features = false, rev = "51548a4a1b9eca7430f5f3caf94d9784886ff2e9" }
dashcore-rpc = { git = "https://github.com/jawid-h/rust-dashcore-rpc", branch = "fix/attempt-to-fix" }
dashcore-rpc = { git = "https://github.com/dashevo/rust-dashcore-rpc" } # path = "../../../rust-dashcore-rpc/client"

@QuantumExplorer QuantumExplorer Apr 3, 2023

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no it should be
dashcore-rpc = { git = "https://github.com/dashpay/rust-dashcore-rpc" } # path = "../../../rust-dashcore-rpc/client"

@QuantumExplorer QuantumExplorer Apr 3, 2023

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

dashpay

dpp = { path = "../rs-dpp", features = ["fixtures-and-mocks"] }
rust_decimal = "1.2.5"
rust_decimal_macros = "1.25.0"
Expand Down
5 changes: 5 additions & 0 deletions packages/rs-drive-abci/src/abci/error.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,13 @@ pub enum AbciError {
/// Bad request received from Tenderdash
#[error("bad request received from Tenderdash: {0}")]
BadRequest(String),

/// Error returned by tenderdash-abci library
#[cfg(feature = "server")]
#[error("tenderdash: {0}")]
Tenderdash(#[from] tenderdash_abci::Error),

/// Error occured during validator set creation
#[error("validator set: {0}")]
ValidatorSet(#[from] super::validator_set::ValSetError),
}
4 changes: 2 additions & 2 deletions packages/rs-drive-abci/src/abci/handlers.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,8 +251,8 @@ mod tests {
use crate::config::PlatformConfig;
use crate::rpc::core::MockCoreRPCLike;
use chrono::{Duration, Utc};
use dashcore::hashes::hex::FromHex;
use dashcore::BlockHash;
use dashcore_rpc::dashcore::hashes::hex::FromHex;
use dashcore_rpc::dashcore::BlockHash;
use dpp::contracts::withdrawals_contract;
use dpp::data_contract::DriveContractExt;
use dpp::identity::state_transition::identity_credit_withdrawal_transition::Pooling;
Expand Down
2 changes: 2 additions & 0 deletions packages/rs-drive-abci/src/abci/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ pub mod handlers;
// #[deprecated = "use tenderdash-proto crate whenever possible"]
pub mod messages;

mod validator_set;

// new code - config,
#[cfg(feature = "server")]
pub mod config;
Expand Down
7 changes: 2 additions & 5 deletions packages/rs-drive-abci/src/abci/server.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,9 @@ pub fn start(config: &PlatformConfig) -> Result<(), Error> {

loop {
tracing::info!("waiting for new connection");
let result = std::panic::catch_unwind(|| match server.handle_connection() {
Ok(_) => (),
match server.handle_connection() {
Err(e) => tracing::error!("tenderdash connection terminated: {:?}", e),
});
if let Err(_e) = result {
tracing::error!("panic: connection terminated");
Ok(_) => tracing::info!("tenderdash connection closed"),
}
}
}
Expand Down
Loading