Skip to content
Merged
Show file tree
Hide file tree
Changes from 5 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
6 changes: 3 additions & 3 deletions Cargo.lock

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

12 changes: 3 additions & 9 deletions packages/rs-drive-abci/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,8 @@ tracing-subscriber = { version = "0.3.16", default-features = false, features =
"tracing-log",
], optional = true }
atty = { version = "0.2.14", optional = true }
tenderdash-abci = { git = "https://github.com/dashpay/rs-tenderdash-abci", branch = "master", optional = true }
tenderdash-abci = { git = "https://github.com/dashpay/rs-tenderdash-abci", branch = "feat/canonical_vote_sign_digest" }
# tenderdash-abci = { path = "../../../rs-tenderdash-abci/abci" }
anyhow = { version = "1.0.70" }
lazy_static = "1.4.0"
itertools = { version = "0.10.5" }
Expand All @@ -68,14 +69,7 @@ base64 = "0.20.0"

[features]
default = ["server"]
server = [
"tenderdash-abci",
"clap",
"dotenvy",
"tracing-subscriber",
"atty",
"mockall",
]
server = ["clap", "dotenvy", "tracing-subscriber", "atty", "mockall"]

[[bin]]
name = "drive-abci"
Expand Down
10 changes: 7 additions & 3 deletions packages/rs-drive-abci/src/abci/commit.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,14 @@ use tenderdash_abci::signatures::SignDigest;
use super::AbciError;

/// Represents block commit
#[derive(Clone, Debug)]
pub struct Commit {
inner: proto::types::Commit,
chain_id: String,
quorum_type: QuorumType,
/// Commit in Tenderdash format
pub inner: proto::types::Commit,
/// ID of chain used to sign this commit
pub chain_id: String,
/// Type of quorum used to sign this commit
pub quorum_type: QuorumType,
}

impl Commit {
Expand Down
4 changes: 0 additions & 4 deletions packages/rs-drive-abci/src/abci/handlers.rs
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,8 @@ use tenderdash_abci::proto::types::VoteExtensionType;

use super::withdrawal::WithdrawalTxs;
use super::AbciError;

use dpp::consensus::ConsensusError;
use dpp::platform_value::string_encoding::{encode, Encoding};
use dpp::serialization_traits::PlatformSerializable;
use dpp::validation::ValidationResult;
use drive::fee::result::FeeResult;
use serde_json::Map;

impl<'a, C> tenderdash_abci::Application for AbciApplication<'a, C>
Expand Down
Loading