5cb8025ddd
* cleanup legacy "3 dot" check (#2625)
* Allow to peers behind NAT to get up to preferred_max connections (#2543)
Allow to peers behind NAT to get up to preffered_max connections
If peer has only outbound connections it's mot likely behind NAT and we should not stop it from getting more outbound connections
* Reduce usage of unwrap in p2p crate (#2627)
Also change store crate a bit
* Simplify (and fix) output_pos cleanup during chain compaction (#2609)
* expose leaf pos iterator
use it for various things in txhashset when iterating over outputs
* fix
* cleanup
* rebuild output_pos index (and clear it out first) when compacting the chain
* fixup tests
* refactor to match on (output, proof) tuple
* add comments to compact() to explain what is going on.
* get rid of some boxing around the leaf_set iterator
* cleanup
* [docs] Add switch commitment documentation (#2526)
* remove references to no-longer existing switch commitment hash
(as switch commitments were removed in ca8447f3bd
and moved into the blinding factor of the Pedersen Commitment)
* some rewording (points vs curves) and fix of small formatting issues
* Add switch commitment documentation
* [docs] Documents in grin repo had translated in Korean. (#2604)
* Start to M/W intro translate in Korean
* translate in Korean
* add korean translation on intro
* table_of_content.md translate in Korean.
* table_of_content_KR.md finish translate in Korean, start to translate State_KR.md
* add state_KR.md & commit some translation in State_KR.md
* WIP stat_KR.md translation
* add build_KR.md && stratum_KR.md
* finish translate stratum_KR.md & table_of_content_KR.md
* rename intro.KR.md to intro_KR.md
* add intro_KR.md file path each language's intro.md
* add Korean translation file path to stratum.md & table_of_contents.md
* fix difference with grin/master
* Fix TxHashSet file filter for Windows. (#2641)
* Fix TxHashSet file filter for Windows.
* rustfmt
* Updating regexp
* Adding in test case
* Display the current download rate rather than the average when syncing the chain (#2633)
* When syncing the chain, calculate the displayed download speed using the current rate from the most recent iteration, rather than the average download speed from the entire syncing process.
* Replace the explicitly ignored variables in the pattern with an implicit ignore
* remove root = true from editorconfig (#2655)
* Add Medium post to intro (#2654)
Spoke to @yeastplume who agreed it makes sense to add the "Grin Transactions Explained, Step-by-Step" Medium post to intro.md
Open for suggestions on a better location.
* add a new configure item for log_max_files (#2601)
* add a new configure item for log_max_files
* rustfmt
* use a constant instead of multiple 32
* rustfmt
* Fix the build warning of deprecated trim_right_matches (#2662)
* [DOC] state.md, build.md and chain directory documents translate in Korean. (#2649)
* add md files for translation.
* start to translation fast-sync, code_structure. add file build_KR.md, states_KR.md
* add dandelion_KR.md && simulation_KR.md for Korean translation.
* add md files for translation.
* start to translation fast-sync, code_structure. add file build_KR.md, states_KR.md
* add dandelion_KR.md && simulation_KR.md for Korean translation.
* remove some useless md files for translation. this is rearrange set up translation order.
* add dot end of sentence & translate build.md in korean
* remove fast-sync_KR.md
* finish build_KR.md translation
* finish build_KR.md translation
* finish translation state_KR.md & add phrase in state.md to move other language md file
* translate blocks_and_headers.md && chain_sync.md in Korean
* add . in chain_sync.md , translation finished in doc/chain dir.
* fix some miss typos
* Api documentation fixes (#2646)
* Fix the API documentation for Chain Validate (v1/chain/validate). It was documented as a POST, but it is actually a GET request, which can be seen in its handler ChainValidationHandler
* Update the API V1 route list response to include the headers and merkleproof routes. Also clarify that for the chain/outputs route you must specify either byids or byheight to select outputs.
* refactor(ci): reorganize CI related code (#2658)
Break-down the CI related code into smaller more maintainable pieces.
* Specify grin or nanogrins in API docs where applicable (#2642)
* Set Content-Type in API client (#2680)
* Reduce number of unwraps in chain crate (#2679)
* fix: the restart of state sync doesn't work sometimes (#2687)
* let check_txhashset_needed return true on abnormal case (#2684)
* Reduce number of unwwaps in api crate (#2681)
* Reduce number of unwwaps in api crate
* Format use section
* Small QoL improvements for wallet developers (#2651)
* Small changes for wallet devs
* Move create_nonce into Keychain trait
* Replace match by map_err
* Add flag to Slate to skip fee check
* Fix secp dependency
* Remove check_fee flag in Slate
* Add Japanese edition of build.md (#2697)
* catch the panic to avoid peer thread quit early (#2686)
* catch the panic to avoid peer thread quit before taking the chance to ban
* move catch wrapper logic down into the util crate
* log the panic info
* keep txhashset.rs untouched
* remove a warning
* [DOC] dandelion.md, simulation.md ,fast-sync.md and pruning.md documents translate in Korean. (#2678)
* Show response code in API client error message (#2683)
It's hard to investigate what happens when an API client error is
printed out
* Add some better logging for get_outputs_by_id failure states (#2705)
* Switch commitment doc fixes (#2645)
Fix some typos and remove the use of parentheses in a
couple of places to make the reading flow a bit better.
* docs: update/add new README.md badges (#2708)
Replace existing badges with SVG counterparts and add a bunch of new ones.
* Update intro.md (#2702)
Add mention of censoring attack prevented by range proofs
* use sandbox folder for txhashset validation on state sync (#2685)
* use sandbox folder for txhashset validation on state sync
* rustfmt
* use temp directory as the sandbox instead actual db_root txhashset dir
* rustfmt
* move txhashset overwrite to the end of full validation
* fix travis-ci test
* rustfmt
* fix: hashset have 2 folders including txhashset and header
* rustfmt
*
(1)switch to rebuild_header_mmr instead of copy the sandbox header mmr
(2)lock txhashset when overwriting and opening and rebuild
* minor improve on sandbox_dir
* add Japanese edition of state.md (#2703)
* Attempt to fix broken TUI locale (#2713)
Can confirm that on the same machine 1.0.2 TUI looks great and is broken on
the current master. Bump of `cursive` version fixed it for me.
Fixes #2676
* clean the header folder in sandbox (#2716)
* forgot to clean the header folder in sandbox in #2685
* Reduce number of unwraps in servers crate (#2707)
It doesn't include stratum server which is sufficiently changed in 1.1
branch and adapters, which is big enough for a separate PR.
* rustfmt
* change version to beta
208 lines
5.9 KiB
Rust
208 lines
5.9 KiB
Rust
// Copyright 2018 The Grin Developers
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
//! The Grin leaf_set implementation.
|
|
//! Compact (roaring) bitmap representing the set of leaf positions
|
|
//! that exist and are not currently pruned in the MMR.
|
|
|
|
use std::path::{Path, PathBuf};
|
|
|
|
use croaring::Bitmap;
|
|
|
|
use crate::core::core::hash::Hashed;
|
|
use crate::core::core::pmmr;
|
|
use crate::core::core::BlockHeader;
|
|
use crate::prune_list::PruneList;
|
|
use crate::{read_bitmap, save_via_temp_file};
|
|
|
|
use std::fs::File;
|
|
use std::io::{self, BufWriter, Write};
|
|
|
|
/// Compact (roaring) bitmap representing the set of positions of
|
|
/// leaves that are currently unpruned in the MMR.
|
|
pub struct LeafSet {
|
|
path: PathBuf,
|
|
bitmap: Bitmap,
|
|
bitmap_bak: Bitmap,
|
|
}
|
|
|
|
impl LeafSet {
|
|
/// Open the remove log file.
|
|
/// The content of the file will be read in memory for fast checking.
|
|
pub fn open<P: AsRef<Path>>(path: P) -> io::Result<LeafSet> {
|
|
let file_path = path.as_ref();
|
|
let bitmap = if file_path.exists() {
|
|
read_bitmap(&file_path)?
|
|
} else {
|
|
Bitmap::create()
|
|
};
|
|
|
|
Ok(LeafSet {
|
|
path: file_path.to_path_buf(),
|
|
bitmap_bak: bitmap.clone(),
|
|
bitmap,
|
|
})
|
|
}
|
|
|
|
/// Copies a snapshot of the utxo file into the primary utxo file.
|
|
pub fn copy_snapshot<P: AsRef<Path>>(path: P, cp_path: P) -> io::Result<()> {
|
|
let cp_file_path = cp_path.as_ref();
|
|
|
|
if !cp_file_path.exists() {
|
|
debug!(
|
|
"leaf_set: rewound leaf file not found: {}",
|
|
cp_file_path.display()
|
|
);
|
|
return Ok(());
|
|
}
|
|
|
|
let bitmap = read_bitmap(&cp_file_path)?;
|
|
debug!(
|
|
"leaf_set: copying rewound file {} to {}",
|
|
cp_file_path.display(),
|
|
path.as_ref().display()
|
|
);
|
|
|
|
let mut leaf_set = LeafSet {
|
|
path: path.as_ref().to_path_buf(),
|
|
bitmap_bak: bitmap.clone(),
|
|
bitmap,
|
|
};
|
|
|
|
leaf_set.flush()?;
|
|
Ok(())
|
|
}
|
|
|
|
/// Calculate the set of unpruned leaves
|
|
/// up to and including the cutoff_pos.
|
|
/// Only applicable for the output MMR.
|
|
fn unpruned_pre_cutoff(&self, cutoff_pos: u64, prune_list: &PruneList) -> Bitmap {
|
|
(1..=cutoff_pos)
|
|
.filter(|&x| pmmr::is_leaf(x))
|
|
.filter(|&x| !prune_list.is_pruned(x))
|
|
.map(|x| x as u32)
|
|
.collect()
|
|
}
|
|
|
|
/// Calculate the set of pruned positions
|
|
/// up to and including the cutoff_pos.
|
|
/// Uses both the leaf_set and the prune_list to determine prunedness.
|
|
pub fn removed_pre_cutoff(
|
|
&self,
|
|
cutoff_pos: u64,
|
|
rewind_rm_pos: &Bitmap,
|
|
prune_list: &PruneList,
|
|
) -> Bitmap {
|
|
let mut bitmap = self.bitmap.clone();
|
|
|
|
// First remove pos from leaf_set that were
|
|
// added after the point we are rewinding to.
|
|
let marker_from = cutoff_pos;
|
|
let marker_to = self.bitmap.maximum() as u64;
|
|
let rewind_add_pos: Bitmap = ((marker_from + 1)..=marker_to).map(|x| x as u32).collect();
|
|
bitmap.andnot_inplace(&rewind_add_pos);
|
|
|
|
// Then add back output pos to the leaf_set
|
|
// that were removed.
|
|
bitmap.or_inplace(&rewind_rm_pos);
|
|
|
|
// Invert bitmap for the leaf pos and return the resulting bitmap.
|
|
bitmap
|
|
.flip(1..(cutoff_pos + 1))
|
|
.and(&self.unpruned_pre_cutoff(cutoff_pos, prune_list))
|
|
}
|
|
|
|
/// Rewinds the leaf_set back to a previous state.
|
|
/// Removes all pos after the cutoff.
|
|
/// Adds back all pos in rewind_rm_pos.
|
|
pub fn rewind(&mut self, cutoff_pos: u64, rewind_rm_pos: &Bitmap) {
|
|
// First remove pos from leaf_set that were
|
|
// added after the point we are rewinding to.
|
|
let marker_from = cutoff_pos;
|
|
let marker_to = self.bitmap.maximum() as u64;
|
|
let rewind_add_pos: Bitmap = ((marker_from + 1)..=marker_to).map(|x| x as u32).collect();
|
|
self.bitmap.andnot_inplace(&rewind_add_pos);
|
|
|
|
// Then add back output pos to the leaf_set
|
|
// that were removed.
|
|
self.bitmap.or_inplace(&rewind_rm_pos);
|
|
}
|
|
|
|
/// Append a new position to the leaf_set.
|
|
pub fn add(&mut self, pos: u64) {
|
|
self.bitmap.add(pos as u32);
|
|
}
|
|
|
|
/// Remove the provided position from the leaf_set.
|
|
pub fn remove(&mut self, pos: u64) {
|
|
self.bitmap.remove(pos as u32);
|
|
}
|
|
|
|
/// Saves the utxo file tagged with block hash as filename suffix.
|
|
/// Needed during fast-sync as the receiving node cannot rewind
|
|
/// after receiving the txhashset zip file.
|
|
pub fn snapshot(&self, header: &BlockHeader) -> io::Result<()> {
|
|
let mut cp_bitmap = self.bitmap.clone();
|
|
cp_bitmap.run_optimize();
|
|
|
|
let cp_path = format!("{}.{}", self.path.to_str().unwrap(), header.hash());
|
|
let mut file = BufWriter::new(File::create(cp_path)?);
|
|
file.write_all(&cp_bitmap.serialize())?;
|
|
file.flush()?;
|
|
Ok(())
|
|
}
|
|
|
|
/// Flush the leaf_set to file.
|
|
pub fn flush(&mut self) -> io::Result<()> {
|
|
// First run the optimization step on the bitmap.
|
|
self.bitmap.run_optimize();
|
|
|
|
// Write the updated bitmap file to disk.
|
|
save_via_temp_file(&self.path, ".tmp", |w| {
|
|
let mut w = BufWriter::new(w);
|
|
w.write_all(&self.bitmap.serialize())?;
|
|
w.flush()
|
|
})?;
|
|
|
|
// Make sure our backup in memory is up to date.
|
|
self.bitmap_bak = self.bitmap.clone();
|
|
|
|
Ok(())
|
|
}
|
|
|
|
/// Discard any pending changes.
|
|
pub fn discard(&mut self) {
|
|
self.bitmap = self.bitmap_bak.clone();
|
|
}
|
|
|
|
/// Whether the leaf_set includes the provided position.
|
|
pub fn includes(&self, pos: u64) -> bool {
|
|
self.bitmap.contains(pos as u32)
|
|
}
|
|
|
|
/// Number of positions stored in the leaf_set.
|
|
pub fn len(&self) -> usize {
|
|
self.bitmap.cardinality() as usize
|
|
}
|
|
|
|
/// Is the leaf_set empty.
|
|
pub fn is_empty(&self) -> bool {
|
|
self.len() == 0
|
|
}
|
|
|
|
/// Iterator over positionns in the leaf_set (all leaf positions).
|
|
pub fn iter(&self) -> impl Iterator<Item = u64> + '_ {
|
|
self.bitmap.iter().map(|x| x as u64)
|
|
}
|
|
}
|