Skip to content
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.

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

feat: instant send and chain lock verification with improved quorum in lists verification #56

Merged
merged 27 commits into from
Feb 27, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
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
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,12 @@
//! KeyIdVoting (renamed to voting_key_hash): This is the public key ID used for proposal voting.
//! Votes signed with this key are valid while the masternode is in the registered set.

use std::net::SocketAddr;

#[cfg(feature = "bincode")]
use bincode::{Decode, Encode};
use hashes::Hash;
use internals::hex::Case::Lower;
use std::net::SocketAddr;

use crate::address::Payload;
use crate::blockdata::transaction::special_transaction::SpecialTransactionBasePayloadEncodable;
Expand Down Expand Up @@ -257,10 +258,10 @@ impl Decodable for ProviderRegistrationPayload {

#[cfg(test)]
mod tests {
use hashes::Hash;
use hashes::hex::FromHex;
use std::net::{Ipv4Addr, SocketAddr, SocketAddrV4};

use hashes::Hash;

use crate::bls_sig_utils::BLSPublicKey;
use crate::consensus::{Encodable, deserialize};
use crate::hash_types::InputsHash;
Expand All @@ -272,10 +273,11 @@ mod tests {

#[cfg(feature = "signer")]
mod signer {
use internals::hex::display::DisplayHex;

use super::*;
use crate::Network;
use crate::transaction::special_transaction::SpecialTransactionBasePayloadEncodable;
use internals::hex::display::DisplayHex;

#[test]
fn test_collateral_provider_registration_transaction() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,6 @@ mod tests {
use crate::consensus::{Encodable, deserialize, serialize};
use crate::hash_types::{QuorumHash, QuorumVVecHash};
use crate::network::message::{NetworkMessage, RawNetworkMessage};
use crate::network::message_sml::MnListDiff;
use crate::sml::llmq_type::LLMQType;
use crate::transaction::special_transaction::quorum_commitment::{
QuorumCommitmentPayload, QuorumEntry,
Expand Down
20 changes: 19 additions & 1 deletion dash/src/ephemerealdata/chain_lock.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,10 @@ use hashes::{Hash, HashEngine};

use crate::bls_sig_utils::BLSSignature;
use crate::consensus::Encodable;
use crate::hash_types::QuorumSigningSignId;
use crate::internal_macros::impl_consensus_encoding;
use crate::{BlockHash, QuorumSigningRequestId, VarInt, io};
use crate::sml::llmq_type::LLMQType;
use crate::{BlockHash, QuorumHash, QuorumSigningRequestId, VarInt, io};

const CL_REQUEST_ID_PREFIX: &str = "clsig";

Expand Down Expand Up @@ -50,6 +52,22 @@ impl ChainLock {

Ok(QuorumSigningRequestId::from_engine(engine))
}

pub fn sign_id(
&self,
quorum_type: LLMQType,
quorum_hash: QuorumHash,
precomputed_request_id: Option<QuorumSigningRequestId>,
) -> Result<QuorumSigningSignId, io::Error> {
let mut engine = QuorumSigningSignId::engine();

engine.input(&[quorum_type as u8]);
engine.input(quorum_hash.as_byte_array());
engine.input(precomputed_request_id.unwrap_or(self.request_id()?).as_byte_array());
engine.input(self.block_hash.as_byte_array());

Ok(QuorumSigningSignId::from_engine(engine))
}
}

#[cfg(test)]
Expand Down
22 changes: 20 additions & 2 deletions dash/src/ephemerealdata/instant_lock.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,10 @@ use hashes::{Hash, HashEngine};

use crate::bls_sig_utils::BLSSignature;
use crate::consensus::Encodable;
use crate::hash_types::{CycleHash, QuorumSigningRequestId};
use crate::hash_types::{CycleHash, QuorumSigningRequestId, QuorumSigningSignId};
use crate::internal_macros::impl_consensus_encoding;
use crate::{OutPoint, Txid, VarInt, io};
use crate::sml::llmq_type::LLMQType;
use crate::{OutPoint, QuorumHash, Txid, VarInt, io};

const IS_LOCK_REQUEST_ID_PREFIX: &str = "islock";

Expand Down Expand Up @@ -71,6 +72,23 @@ impl InstantLock {

Ok(QuorumSigningRequestId::from_engine(engine))
}

/// Returns the sign id
pub fn sign_id(
&self,
quorum_type: LLMQType,
quorum_hash: QuorumHash,
precomputed_request_id: Option<QuorumSigningRequestId>,
) -> Result<QuorumSigningSignId, io::Error> {
let mut engine = QuorumSigningSignId::engine();

engine.input(&[quorum_type as u8]);
engine.input(quorum_hash.as_byte_array());
engine.input(precomputed_request_id.unwrap_or(self.request_id()?).as_byte_array());
engine.input(self.txid.as_byte_array());

Ok(QuorumSigningSignId::from_engine(engine))
}
}

impl Debug for InstantLock {
Expand Down
Loading
Loading