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.

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

Jump to bottom

[r2r] NMC BlockHeader deserializing bug fix #1409

Merged
merged 5 commits into from
Aug 10, 2022
Merged

[r2r] NMC BlockHeader deserializing bug fix #1409

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
31fa0bc
Fixes NMC deserializing bug
borngraced Jul 28, 2022
78a5832
Removed println!()
borngraced Jul 28, 2022
0513d0d
PR review fixes
borngraced Jul 29, 2022
ae7466d
Fixed failing tests
borngraced Jul 29, 2022
e181a05
Merge branch 'dev' of https://github.com/KomodoPlatform/atomicDEX-API…
borngraced Aug 10, 2022
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
30 changes: 27 additions & 3 deletions mm2src/mm2_bitcoin/chain/src/block_header.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ impl From<BlockHeaderBits> for Compact {
}

const AUX_POW_VERSION_DOGE: u32 = 6422788;
const AUX_POW_VERSION_NMC: u32 = 65796;
const AUX_POW_VERSION_SYS: u32 = 537919744;
const MTP_POW_VERSION: u32 = 0x20001000u32;
const PROG_POW_SWITCH_TIME: u32 = 1635228000;
Expand Down Expand Up @@ -248,7 +249,10 @@ impl Deserializable for BlockHeader {
let solution = if version == 4 { Some(reader.read_list()?) } else { None };

// https://en.bitcoin.it/wiki/Merged_mining_specification#Merged_mining_coinbase
let aux_pow = if version == AUX_POW_VERSION_DOGE || version == AUX_POW_VERSION_SYS {
let aux_pow = if matches!(
version,
AUX_POW_VERSION_DOGE | AUX_POW_VERSION_SYS | AUX_POW_VERSION_NMC
) {
let coinbase_tx = deserialize_tx(reader, TxType::StandardWithWitness)?;
let parent_block_hash = reader.read()?;
let coinbase_branch = reader.read()?;
Expand Down Expand Up @@ -371,9 +375,11 @@ impl From<BlockHeader> for ExtBlockHeader {
#[cfg(test)]
mod tests {
use super::ExtBlockHeader;
use block_header::{BlockHeader, BlockHeaderBits, BlockHeaderNonce, AUX_POW_VERSION_DOGE, AUX_POW_VERSION_SYS,
BIP9_NO_SOFT_FORK_BLOCK_HEADER_VERSION, KAWPOW_VERSION, MTP_POW_VERSION, PROG_POW_SWITCH_TIME};
use block_header::{BlockHeader, BlockHeaderBits, BlockHeaderNonce, AUX_POW_VERSION_DOGE, AUX_POW_VERSION_NMC,
AUX_POW_VERSION_SYS, BIP9_NO_SOFT_FORK_BLOCK_HEADER_VERSION, KAWPOW_VERSION, MTP_POW_VERSION,
PROG_POW_SWITCH_TIME};
use hex::FromHex;
use primitives::bytes::Bytes;
use ser::{deserialize, serialize, serialize_list, CoinVariant, Error as ReaderError, Reader, Stream};

#[test]
Expand Down Expand Up @@ -1034,6 +1040,24 @@ mod tests {
assert_eq!(serialized.take(), headers_bytes);
}

#[test]
fn test_nmc_block_headers_serde_11() {
// NMC block headers
// start - #622807
// end - #622796
// Ref: https://chainz.cryptoid.info/nmc/block.dws?622807.htm
Copy link
Collaborator

Choose a reason for hiding this comment

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

This is a very nice block explorer that shows the raw header with it's fields and the same for transactions for a lot of coins, this should be handy in a lot of similar serialization/deserialization issues :)

Copy link
Member Author

Choose a reason for hiding this comment

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

Right, it helped a lot while debugging 💯💯

let headers_bytes: Bytes = include_str!("for_tests/nmc_block_headers_hex").into();
let headers_bytes = headers_bytes.as_slice();
let mut reader = Reader::new(headers_bytes);
let headers = reader.read_list::<BlockHeader>().unwrap();
for header in headers.iter() {
assert_eq!(header.version, AUX_POW_VERSION_NMC);
assert!(header.aux_pow.is_some());
}
let serialized = serialize_list(&headers);
assert_eq!(serialized.take(), headers_bytes);
}

#[test]
fn test_verus_block_headers_serde_11() {
let headers_bytes: &[u8] = &[
Expand Down
Loading