17372468680

Committed 01 Sep 2025 08:43AM UTC coverage: 60.111% (-1.0%) from 61.105%

Build # 17372468680

Build Type

push

github

Committed by

SWvheerden

Commit Message

feat: improve header sync (#7421)

Description
---
When we have a valid PoW equal to or higher than what we have or what
has been advertised by the sync peer, we need to commit the headers, so
any downstream block sync error does not invalidate the headers that
have been downloaded.

_**Edit:** When block sync fails, we also make sure to swap to the best
PoW chain, also preserving banked headers if we do not need to reorg._

Closes #7342

Motivation and Context
---
See #7342

How Has This Been Tested?
---
System-level tests passed:
- Synching a previously synced node, a couple of days old.
- Syncing from scratch, encountering multiple block-sync failures, but
using the good PoW headers already banked.
```rust
   51952: 2025-08-18 16:07:02.097680100 [c::bn::block_sync] DEBUG Validating block body #22624 (PoW = RandomXTari, input(s): 1, output(s): 54, kernel(s): 2, latency: 108.00µs)
   51961: 2025-08-18 16:07:02.111648900 [c::bn::block_sync] DEBUG Validated in 14ms. Storing block body #22624 (PoW = RandomXTari, input(s): 1, output(s): 54, kernel(s): 2)
   51962: 2025-08-18 16:07:02.111668100 [c::bn::block_sync] TRACE Hash: <a class=hub.com/tari-project/tari/commit/91a1fbccc1f94e2aa93b6efdaf9c3fbf16d0588c">91a1fbccc<a href="https://github.com/tari-project/tari/commit/6fb8d66c20efe20d9ba71db70213e46332f9e8f5">3458b7ef444e605f62375077
   54024: 2025-08-18 16:11:06.389482300 [c::bn::block_sync] WARN  Peer did not supply all the blocks they claimed they had: Their claim - height: 74721, accumulated difficulty: <a class="double-link" href="https://github.com/tari-project/tari/commit/4089235547434023187024157117581153168163">408923554</a><a href="https://github.com/tari-project/tari/commit/6fb8d66c20efe20d9ba71db70213e46332f9e8f5">715651441378. Our status after block sync - height: 22624, accumulated difficulty: </a><a class="double-link" href="https://github.com/tari-project/tari/commit/1547640955349056263010512134240412613668">154764095</a><a href="https://github.com/tari-project/tari/commit/6fb8d66c20efe20d9ba71db70213e46332f9e8f5">889130919000
   54028: 2025-08-18 16:11:06.390047900 [c::bn::block_sync] WARN  Block sync failed - best header: 74723/1bcf293971df2d6c888a6589dca3a323b, best block: 22624/91a1fbccc1f94e2aa93b6efdaf9c3fbf16d0588c3458b7ef444e605f62375077. No more sync peers available: Block sync failed
   54109: 2025-08-18 16:11:11.596105400 [c::bn::header_sync] DEBUG Starting header sync.
   54110: 2025-08-18 16:11:11.59617... (continued)

Run Details

33 of 132 new or added lines in 3 files covered. (25.0%)

1427 existing lines in 30 files now uncovered.

71522 of 118983 relevant lines covered (60.11%)

536188.7 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

73.24

/base_layer/common_types/src/types/fixed_hash.rs

//  Copyright 2022. The Tari Project
//
//  Redistribution and use in source and binary forms, with or without modification, are permitted provided that the
//  following conditions are met:
//
//  1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following
//  disclaimer.
//
//  2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the
//  following disclaimer in the documentation and/or other materials provided with the distribution.
//
//  3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote
//  products derived from this software without specific prior written permission.
//
//  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
//  INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
//  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
//  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
//  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
//  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
//  USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

use std::{
    convert::TryFrom,
    fmt::{Display, Formatter},
    ops::{Deref, DerefMut},
};

use borsh::{BorshDeserialize, BorshSerialize};
use digest::{consts::U32, generic_array};
use serde::{Deserialize, Serialize};
use tari_utilities::hex::{Hex, HexError};
use utoipa::ToSchema;

const ZERO_HASH: [u8; FixedHash::byte_size()] = [0u8; FixedHash::byte_size()];

#[derive(thiserror::Error, Debug)]
#[error("Invalid size")]
pub struct FixedHashSizeError;

#[derive(
    Clone,
    Copy,
    PartialEq,
    Eq,
    PartialOrd,
    Ord,
    Debug,
    Default,
    Hash,
    Deserialize,
    Serialize,
    BorshSerialize,
    BorshDeserialize,
    ToSchema,
)]
#[serde(transparent)]
pub struct FixedHash([u8; FixedHash::byte_size()]);

impl FixedHash {
    pub const fn new(hash: [u8; FixedHash::byte_size()]) -> Self {
        Self(hash)
    }

    pub const fn byte_size() -> usize {
        32
    }

    pub const fn zero() -> Self {
        Self(ZERO_HASH)
    }

    pub const fn into_array(self) -> [u8; 32] {
        self.0
    }

    pub fn as_slice(&self) -> &[u8] {
        &self.0
    }
}

impl From<[u8; FixedHash::byte_size()]> for FixedHash {
    fn from(hash: [u8; FixedHash::byte_size()]) -> Self {
        Self(hash)
    }
}

impl TryFrom<Vec<u8>> for FixedHash {
    type Error = FixedHashSizeError;

    fn try_from(value: Vec<u8>) -> Result<Self, Self::Error> {
        TryFrom::try_from(value.as_slice())
    }
}

impl TryFrom<&[u8]> for FixedHash {
    type Error = FixedHashSizeError;

    fn try_from(bytes: &[u8]) -> Result<Self, Self::Error> {
        if bytes.len() != FixedHash::byte_size() {
            return Err(FixedHashSizeError);
        }

        let mut buf = [0u8; FixedHash::byte_size()];
        buf.copy_from_slice(bytes);
        Ok(Self(buf))
    }
}

impl From<generic_array::GenericArray<u8, U32>> for FixedHash {
    fn from(hash: generic_array::GenericArray<u8, U32>) -> Self {
        Self(hash.into())
    }
}

impl PartialEq<[u8]> for FixedHash {
    fn eq(&self, other: &[u8]) -> bool {
        self.0[..].eq(other)
    }
}

impl PartialEq<FixedHash> for [u8] {
    fn eq(&self, other: &FixedHash) -> bool {
        self[..].eq(&other.0)
    }
}

impl PartialEq<Vec<u8>> for FixedHash {
    fn eq(&self, other: &Vec<u8>) -> bool {
        self == other.as_slice()
    }
}
impl PartialEq<FixedHash> for Vec<u8> {
    fn eq(&self, other: &FixedHash) -> bool {
        self == other.as_slice()
    }
}

impl AsRef<[u8]> for FixedHash {
    fn as_ref(&self) -> &[u8] {
        self.as_slice()
    }
}

impl Hex for FixedHash {
    fn from_hex(hex: &str) -> Result<Self, HexError>
    where Self: Sized {
        let hash = <[u8; FixedHash::byte_size()] as Hex>::from_hex(hex)?;
        Ok(Self(hash))
    }

    fn to_hex(&self) -> String {
        self.0.to_hex()
    }
}

impl Deref for FixedHash {
    type Target = [u8; FixedHash::byte_size()];

    fn deref(&self) -> &Self::Target {
        &self.0
    }
}

impl DerefMut for FixedHash {
    fn deref_mut(&mut self) -> &mut Self::Target {
        &mut self.0
    }
}

impl Display for FixedHash {
    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
        for b in self.0 {
            write!(f, "{b:02x}")?;
        }
        Ok(())
    }
}

1	// Copyright 2022. The Tari Project
2	//
3	// Redistribution and use in source and binary forms, with or without modification, are permitted provided that the
4	// following conditions are met:
5	//
6	// 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following
7	// disclaimer.
8	//
9	// 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the
10	// following disclaimer in the documentation and/or other materials provided with the distribution.
11	//
12	// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote
13	// products derived from this software without specific prior written permission.
14	//
15	// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
16	// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
17	// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
18	// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
19	// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
20	// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
21	// USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
22
23	use std::{
24	convert::TryFrom,
25	fmt::{Display, Formatter},
26	ops::{Deref, DerefMut},
27	};
28
29	use borsh::{BorshDeserialize, BorshSerialize};
30	use digest::{consts::U32, generic_array};
31	use serde::{Deserialize, Serialize};
32	use tari_utilities::hex::{Hex, HexError};
33	use utoipa::ToSchema;
34
35	const ZERO_HASH: [u8; FixedHash::byte_size()] = [0u8; FixedHash::byte_size()];
36
37	#[derive(thiserror::Error, Debug)]
38	#[error("Invalid size")]
39	pub struct FixedHashSizeError;
40
41	#[derive(
42	Clone,
43	Copy,
44	PartialEq,
45	Eq,
46	PartialOrd,
47	Ord,
48	Debug,
49	Default,
50	Hash,
51	Deserialize,	8,168✔
52	Serialize,
53	BorshSerialize,	×
54	BorshDeserialize,	×
55	ToSchema,	×
56	)]
57	#[serde(transparent)]
58	pub struct FixedHash([u8; FixedHash::byte_size()]);
59
60	impl FixedHash {
61	pub const fn new(hash: [u8; FixedHash::byte_size()]) -> Self {	×
62	Self(hash)	×
63	}	×
64
65	pub const fn byte_size() -> usize {	1,001✔
66	32	1,001✔
67	}	1,001✔
68
69	pub const fn zero() -> Self {	9,165✔
70	Self(ZERO_HASH)	9,165✔
71	}	9,165✔
72
73	pub const fn into_array(self) -> [u8; 32] {	4✔
74	self.0	4✔
75	}	4✔
76
77	pub fn as_slice(&self) -> &[u8] {	26,214✔
78	&self.0	26,214✔
79	}	26,214✔
80	}
81
82	impl From<[u8; FixedHash::byte_size()]> for FixedHash {
83	fn from(hash: [u8; FixedHash::byte_size()]) -> Self {	12,057✔
84	Self(hash)	12,057✔
85	}	12,057✔
86	}
87
88	impl TryFrom<Vec<u8>> for FixedHash {
89	type Error = FixedHashSizeError;
90
91	fn try_from(value: Vec<u8>) -> Result<Self, Self::Error> {	298✔
92	TryFrom::try_from(value.as_slice())	298✔
93	}	298✔
94	}
95
96	impl TryFrom<&[u8]> for FixedHash {
97	type Error = FixedHashSizeError;
98
99	fn try_from(bytes: &[u8]) -> Result<Self, Self::Error> {	393✔
100	if bytes.len() != FixedHash::byte_size() {	393✔
101	return Err(FixedHashSizeError);	×
102	}	393✔
103		393✔
104	let mut buf = [0u8; FixedHash::byte_size()];	393✔
105	buf.copy_from_slice(bytes);	393✔
106	Ok(Self(buf))	393✔
107	}	393✔
108	}
109
110	impl From<generic_array::GenericArray<u8, U32>> for FixedHash {
111	fn from(hash: generic_array::GenericArray<u8, U32>) -> Self {	52,072✔
112	Self(hash.into())	52,072✔
113	}	52,072✔
114	}
115
116	impl PartialEq<[u8]> for FixedHash {
UNCOV 117	fn eq(&self, other: &[u8]) -> bool {	×
UNCOV 118	self.0[..].eq(other)	×
UNCOV 119	}	×
120	}
121
122	impl PartialEq<FixedHash> for [u8] {
123	fn eq(&self, other: &FixedHash) -> bool {	×
124	self[..].eq(&other.0)	×
125	}	×
126	}
127
128	impl PartialEq<Vec<u8>> for FixedHash {
UNCOV 129	fn eq(&self, other: &Vec<u8>) -> bool {	×
UNCOV 130	self == other.as_slice()	×
UNCOV 131	}	×
132	}
133	impl PartialEq<FixedHash> for Vec<u8> {
134	fn eq(&self, other: &FixedHash) -> bool {	×
135	self == other.as_slice()	×
136	}	×
137	}
138
139	impl AsRef<[u8]> for FixedHash {
140	fn as_ref(&self) -> &[u8] {	157✔
141	self.as_slice()	157✔
142	}	157✔
143	}
144
145	impl Hex for FixedHash {
146	fn from_hex(hex: &str) -> Result<Self, HexError>	605✔
147	where Self: Sized {	605✔
148	let hash = <[u8; FixedHash::byte_size()] as Hex>::from_hex(hex)?;	605✔
149	Ok(Self(hash))	605✔
150	}	605✔
151
152	fn to_hex(&self) -> String {	124✔
153	self.0.to_hex()	124✔
154	}	124✔
155	}
156
157	impl Deref for FixedHash {
158	type Target = [u8; FixedHash::byte_size()];
159
160	fn deref(&self) -> &Self::Target {	14,630✔
161	&self.0	14,630✔
162	}	14,630✔
163	}
164
165	impl DerefMut for FixedHash {
166	fn deref_mut(&mut self) -> &mut Self::Target {	1✔
167	&mut self.0	1✔
168	}	1✔
169	}
170
171	impl Display for FixedHash {
172	fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {	23✔
173	for b in self.0 {	759✔
174	write!(f, "{b:02x}")?;	736✔
175	}
176	Ok(())	23✔
177	}	23✔
178	}

tari-project / tari / 17372468680

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous