Skip to content

feat(dash)!: decode and encode ProRegTx version 3 #1152

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
ZocoLini merged 1 commit into from
Oct 11, 2026
Merged

feat(dash)!: decode and encode ProRegTx version 3 #1152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
912 changes: 865 additions & 47 deletions dash/src/blockdata/transaction/special_transaction/provider_registration.rs
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dash/src/blockdata/transaction/special_transaction/provider_update_service.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1028,7 +1028,7 @@ mod tests {
pro_reg_payload.masternode_type
);
println!(
" Service address: {}",
" Service address: {:?}",
pro_reg_payload.service_address
);
println!(
Expand Down
17 changes: 13 additions & 4 deletions key-wallet-ffi/src/special_payload.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,16 +125,20 @@ pub struct FFIProviderRegistrationPayload {

impl From<&ProviderRegistrationPayload> for FFIProviderRegistrationPayload {
fn from(p: &ProviderRegistrationPayload) -> Self {
let service = p
.service_address
.primary_service_address()
.unwrap_or_else(|| SocketAddr::new(Ipv6Addr::UNSPECIFIED.into(), 0));
let (script_payout, script_payout_len) = script_to_raw(&p.script_payout);
FFIProviderRegistrationPayload {
version: p.version,
masternode_type: p.masternode_type as u16,
masternode_mode: p.masternode_mode,
collateral_txid: p.collateral_outpoint.txid.to_byte_array(),
collateral_vout: p.collateral_outpoint.vout,
service_address: socket_addr_to_cstring(&p.service_address),
service_ip: socket_addr_to_ipv6_octets(&p.service_address),
service_port: p.service_address.port(),
service_address: socket_addr_to_cstring(&service),
service_ip: socket_addr_to_ipv6_octets(&service),
service_port: service.port(),
owner_key_hash: p.owner_key_hash.to_byte_array(),
voting_key_hash: p.voting_key_hash.to_byte_array(),
operator_public_key: bls_public_key_bytes(&p.operator_public_key),
Expand Down Expand Up @@ -379,6 +383,7 @@ impl Drop for FFISpecialTransactionPayload {
#[cfg(test)]
pub(crate) fn mainnet_shape_proreg_payload() -> ProviderRegistrationPayload {
use dashcore::blockdata::transaction::special_transaction::provider_registration::ProviderMasternodeType;
use dashcore::sml::masternode_list_entry::MasternodeNetInfo;
use std::str::FromStr;

let key_hash = dashcore::PubkeyHash::from_str("70993555a01f7e8d6179d6135b5c56809d2d1d36")
Expand All @@ -394,7 +399,9 @@ pub(crate) fn mainnet_shape_proreg_payload() -> ProviderRegistrationPayload {
.expect("txid"),
vout: 1,
},
service_address: SocketAddr::from_str("54.148.58.128:9999").expect("socket addr"),
service_address: MasternodeNetInfo::Legacy(
SocketAddr::from_str("54.148.58.128:9999").expect("socket addr"),
),
owner_key_hash: key_hash,
operator_public_key: BLSPublicKey::from([0x11; 48]),
voting_key_hash: key_hash,
Expand All @@ -407,6 +414,8 @@ pub(crate) fn mainnet_shape_proreg_payload() -> ProviderRegistrationPayload {
platform_node_id: None,
platform_p2p_port: None,
platform_http_port: None,
payouts: None,
shared_collateral: None,
}
}

Expand Down
6 changes: 5 additions & 1 deletion key-wallet/src/tests/keep_finalized_transactions_tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,9 @@ fn proreg_tx_and_owner_match() -> (Transaction, AccountMatch) {
txid: Txid::from_slice(&[0x19; 32]).expect("txid"),
vout: 1,
},
service_address: SocketAddr::from_str("54.148.58.128:9999").expect("socket addr"),
service_address: MasternodeNetInfo::Legacy(
SocketAddr::from_str("54.148.58.128:9999").expect("socket addr"),
),
owner_key_hash: key_hash,
operator_public_key: BLSPublicKey::from([0x11; 48]),
voting_key_hash: key_hash,
Expand All @@ -262,6 +264,8 @@ fn proreg_tx_and_owner_match() -> (Transaction, AccountMatch) {
platform_node_id: None,
platform_p2p_port: None,
platform_http_port: None,
payouts: None,
shared_collateral: None,
};
let tx = Transaction {
version: 3,
Expand Down
7 changes: 6 additions & 1 deletion key-wallet/src/tests/special_transaction_matching_tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ use dashcore::blockdata::transaction::txout::TxOut;
use dashcore::blockdata::transaction::Transaction;
use dashcore::blockdata::witness::Witness;
use dashcore::hashes::Hash;
use dashcore::sml::masternode_list_entry::MasternodeNetInfo;
use dashcore::{BlockHash, Txid};

const TEST_NETWORK: Network = Network::Testnet;
Expand Down Expand Up @@ -305,7 +306,9 @@ fn prov_reg_tx(
txid: Txid::from_byte_array([1u8; 32]),
vout: 0,
},
service_address: "127.0.0.1:19999".parse().expect("service address"),
service_address: MasternodeNetInfo::Legacy(
"127.0.0.1:19999".parse().expect("service address"),
),
owner_key_hash,
operator_public_key,
voting_key_hash,
Expand All @@ -317,6 +320,8 @@ fn prov_reg_tx(
platform_node_id,
platform_p2p_port: platform_node_id.map(|_| 26656),
platform_http_port: platform_node_id.map(|_| 8080),
payouts: None,
shared_collateral: None,
},
)),
}
Expand Down
6 changes: 5 additions & 1 deletion key-wallet/src/tests/special_transaction_tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,9 @@ fn create_special_transaction(tx_type: SpecialTransactionType) -> Transaction {
txid: Txid::from_byte_array([2u8; 32]),
vout: 0,
},
service_address: "127.0.0.1:19999".parse::<SocketAddr>().unwrap(),
service_address: MasternodeNetInfo::Legacy(
"127.0.0.1:19999".parse::<SocketAddr>().unwrap(),
),
owner_key_hash: PubkeyHash::from_byte_array([3u8; 20]),
operator_public_key: BLSPublicKey::from([4u8; 48]),
voting_key_hash: PubkeyHash::from_byte_array([5u8; 20]),
Expand All @@ -210,6 +212,8 @@ fn create_special_transaction(tx_type: SpecialTransactionType) -> Transaction {
platform_node_id: Some(PlatformNodeId::from_bytes([8u8; 20])),
platform_p2p_port: Some(26656),
platform_http_port: Some(443),
payouts: None,
shared_collateral: None,
};
tx.special_transaction_payload =
Some(TransactionPayload::ProviderRegistrationPayloadType(payload));
Expand Down
32 changes: 20 additions & 12 deletions key-wallet/src/transaction_checking/transaction_router/tests/provider.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,9 +206,9 @@ async fn test_provider_registration_transaction_routing_check_owner_only() {
txid: Txid::from_byte_array([1u8; 32]),
vout: 0,
},
service_address: "127.0.0.1:19999"
.parse()
.expect("Failed to parse service address"),
service_address: MasternodeNetInfo::Legacy(
"127.0.0.1:19999".parse().expect("Failed to parse service address"),
),
owner_key_hash: *owner_address
.payload()
.as_pubkey_hash()
Expand All @@ -226,6 +226,8 @@ async fn test_provider_registration_transaction_routing_check_owner_only() {
platform_node_id: None,
platform_p2p_port: None,
platform_http_port: None,
payouts: None,
shared_collateral: None,
},
)),
};
Expand Down Expand Up @@ -341,9 +343,9 @@ async fn test_provider_registration_transaction_routing_check_voting_only() {
txid: Txid::from_byte_array([1u8; 32]),
vout: 0,
},
service_address: "127.0.0.1:19999"
.parse()
.expect("Failed to parse service address"),
service_address: MasternodeNetInfo::Legacy(
"127.0.0.1:19999".parse().expect("Failed to parse service address"),
),
owner_key_hash: *owner_address
.payload()
.as_pubkey_hash()
Expand All @@ -361,6 +363,8 @@ async fn test_provider_registration_transaction_routing_check_voting_only() {
platform_node_id: None,
platform_p2p_port: None,
platform_http_port: None,
payouts: None,
shared_collateral: None,
},
)),
};
Expand Down Expand Up @@ -477,9 +481,9 @@ async fn test_provider_registration_transaction_routing_check_operator_only() {
txid: Txid::from_byte_array([1u8; 32]),
vout: 0,
},
service_address: "127.0.0.1:19999"
.parse()
.expect("Failed to parse service address"),
service_address: MasternodeNetInfo::Legacy(
"127.0.0.1:19999".parse().expect("Failed to parse service address"),
),
owner_key_hash: *owner_address
.payload()
.as_pubkey_hash()
Expand All @@ -497,6 +501,8 @@ async fn test_provider_registration_transaction_routing_check_operator_only() {
platform_node_id: None,
platform_p2p_port: None,
platform_http_port: None,
payouts: None,
shared_collateral: None,
},
)),
};
Expand Down Expand Up @@ -681,9 +687,9 @@ async fn test_provider_registration_transaction_routing_check_platform_only() {
txid: Txid::from_byte_array([1u8; 32]),
vout: 0,
},
service_address: "127.0.0.1:19999"
.parse()
.expect("Failed to parse service address"),
service_address: MasternodeNetInfo::Legacy(
"127.0.0.1:19999".parse().expect("Failed to parse service address"),
),
owner_key_hash: *owner_address
.payload()
.as_pubkey_hash()
Expand All @@ -707,6 +713,8 @@ async fn test_provider_registration_transaction_routing_check_platform_only() {
)),
platform_p2p_port: Some(26656),
platform_http_port: Some(8080),
payouts: None,
shared_collateral: None,
},
)),
};
Expand Down
Loading