2018-05-30 23:57:13 +03:00
|
|
|
// 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.
|
|
|
|
|
2018-12-08 02:59:40 +03:00
|
|
|
use grin_chain as chain;
|
|
|
|
use grin_core as core;
|
|
|
|
|
|
|
|
use grin_util as util;
|
2018-05-30 23:57:13 +03:00
|
|
|
|
2018-08-03 05:16:16 +03:00
|
|
|
use std::collections::HashSet;
|
|
|
|
use std::fs::{self, File, OpenOptions};
|
2018-09-12 14:17:36 +03:00
|
|
|
use std::iter::FromIterator;
|
2018-08-03 05:16:16 +03:00
|
|
|
use std::path::{Path, PathBuf};
|
2018-05-30 23:57:13 +03:00
|
|
|
use std::sync::Arc;
|
[1.1.0] Merge master into 1.1.0 (#2720)
* 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 ca8447f3bd49e80578770da841e5fbbac2c23cde
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
2019-04-01 13:47:48 +03:00
|
|
|
use std::time::{SystemTime, UNIX_EPOCH};
|
2018-05-30 23:57:13 +03:00
|
|
|
|
2018-12-08 02:59:40 +03:00
|
|
|
use crate::chain::store::ChainStore;
|
|
|
|
use crate::chain::txhashset;
|
|
|
|
use crate::core::core::BlockHeader;
|
|
|
|
use crate::util::file;
|
2018-05-30 23:57:13 +03:00
|
|
|
|
|
|
|
fn clean_output_dir(dir_name: &str) {
|
|
|
|
let _ = fs::remove_dir_all(dir_name);
|
|
|
|
}
|
|
|
|
|
2018-08-03 05:16:16 +03:00
|
|
|
#[test]
|
|
|
|
fn test_unexpected_zip() {
|
[1.1.0] Merge master into 1.1.0 (#2720)
* 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 ca8447f3bd49e80578770da841e5fbbac2c23cde
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
2019-04-01 13:47:48 +03:00
|
|
|
let now = SystemTime::now();
|
|
|
|
let rand = now.duration_since(UNIX_EPOCH).unwrap().subsec_micros();
|
|
|
|
|
2018-08-03 05:16:16 +03:00
|
|
|
let db_root = format!(".grin_txhashset_zip");
|
|
|
|
clean_output_dir(&db_root);
|
2019-04-16 01:00:24 +03:00
|
|
|
{
|
2019-04-16 13:24:43 +03:00
|
|
|
let chain_store = ChainStore::new(&db_root).unwrap();
|
2019-04-16 01:00:24 +03:00
|
|
|
let store = Arc::new(chain_store);
|
|
|
|
txhashset::TxHashSet::open(db_root.clone(), store.clone(), None).unwrap();
|
|
|
|
// First check if everything works out of the box
|
|
|
|
assert!(txhashset::zip_read(db_root.clone(), &BlockHeader::default(), Some(rand)).is_ok());
|
|
|
|
let zip_path = Path::new(&db_root).join(format!("txhashset_snapshot_{}.zip", rand));
|
|
|
|
let zip_file = File::open(&zip_path).unwrap();
|
|
|
|
assert!(txhashset::zip_write(
|
|
|
|
PathBuf::from(db_root.clone()),
|
|
|
|
zip_file,
|
|
|
|
&BlockHeader::default()
|
|
|
|
)
|
|
|
|
.is_ok());
|
|
|
|
// Remove temp txhashset dir
|
|
|
|
fs::remove_dir_all(Path::new(&db_root).join(format!("txhashset_zip_{}", rand))).unwrap();
|
|
|
|
// Then add strange files in the original txhashset folder
|
|
|
|
write_file(db_root.clone());
|
|
|
|
assert!(txhashset::zip_read(db_root.clone(), &BlockHeader::default(), Some(rand)).is_ok());
|
|
|
|
// Check that the temp dir dos not contains the strange files
|
|
|
|
let txhashset_zip_path = Path::new(&db_root).join(format!("txhashset_zip_{}", rand));
|
|
|
|
assert!(txhashset_contains_expected_files(
|
|
|
|
format!("txhashset_zip_{}", rand),
|
|
|
|
txhashset_zip_path.clone()
|
|
|
|
));
|
|
|
|
fs::remove_dir_all(Path::new(&db_root).join(format!("txhashset_zip_{}", rand))).unwrap();
|
2018-08-03 05:16:16 +03:00
|
|
|
|
2019-04-16 01:00:24 +03:00
|
|
|
let zip_file = File::open(zip_path).unwrap();
|
|
|
|
assert!(txhashset::zip_write(
|
|
|
|
PathBuf::from(db_root.clone()),
|
|
|
|
zip_file,
|
|
|
|
&BlockHeader::default()
|
|
|
|
)
|
|
|
|
.is_ok());
|
|
|
|
// Check that the txhashset dir dos not contains the strange files
|
|
|
|
let txhashset_path = Path::new(&db_root).join("txhashset");
|
|
|
|
assert!(txhashset_contains_expected_files(
|
|
|
|
"txhashset".to_string(),
|
|
|
|
txhashset_path.clone()
|
|
|
|
));
|
|
|
|
fs::remove_dir_all(Path::new(&db_root).join("txhashset")).unwrap();
|
|
|
|
}
|
|
|
|
// Cleanup chain directory
|
|
|
|
clean_output_dir(&db_root);
|
2018-08-03 05:16:16 +03:00
|
|
|
}
|
|
|
|
|
2018-09-12 14:17:36 +03:00
|
|
|
fn write_file(db_root: String) {
|
2018-08-03 05:16:16 +03:00
|
|
|
OpenOptions::new()
|
|
|
|
.create(true)
|
|
|
|
.write(true)
|
2018-09-12 14:17:36 +03:00
|
|
|
.open(
|
|
|
|
Path::new(&db_root)
|
|
|
|
.join("txhashset")
|
|
|
|
.join("kernel")
|
|
|
|
.join("strange0"),
|
2018-12-08 02:59:40 +03:00
|
|
|
)
|
|
|
|
.unwrap();
|
2018-08-03 05:16:16 +03:00
|
|
|
OpenOptions::new()
|
|
|
|
.create(true)
|
|
|
|
.write(true)
|
2018-09-12 14:17:36 +03:00
|
|
|
.open(Path::new(&db_root).join("txhashset").join("strange1"))
|
|
|
|
.unwrap();
|
2018-08-03 05:16:16 +03:00
|
|
|
fs::create_dir(Path::new(&db_root).join("txhashset").join("strange_dir")).unwrap();
|
|
|
|
OpenOptions::new()
|
|
|
|
.create(true)
|
|
|
|
.write(true)
|
2018-09-12 14:17:36 +03:00
|
|
|
.open(
|
|
|
|
Path::new(&db_root)
|
|
|
|
.join("txhashset")
|
|
|
|
.join("strange_dir")
|
|
|
|
.join("strange2"),
|
2018-12-08 02:59:40 +03:00
|
|
|
)
|
|
|
|
.unwrap();
|
2018-09-12 14:17:36 +03:00
|
|
|
fs::create_dir(
|
|
|
|
Path::new(&db_root)
|
|
|
|
.join("txhashset")
|
|
|
|
.join("strange_dir")
|
|
|
|
.join("strange_subdir"),
|
2018-12-08 02:59:40 +03:00
|
|
|
)
|
|
|
|
.unwrap();
|
2018-08-03 05:16:16 +03:00
|
|
|
OpenOptions::new()
|
|
|
|
.create(true)
|
|
|
|
.write(true)
|
2018-09-12 14:17:36 +03:00
|
|
|
.open(
|
|
|
|
Path::new(&db_root)
|
|
|
|
.join("txhashset")
|
|
|
|
.join("strange_dir")
|
|
|
|
.join("strange_subdir")
|
|
|
|
.join("strange3"),
|
2018-12-08 02:59:40 +03:00
|
|
|
)
|
|
|
|
.unwrap();
|
2018-08-03 05:16:16 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
fn txhashset_contains_expected_files(dirname: String, path_buf: PathBuf) -> bool {
|
|
|
|
let list_zip_files = file::list_files(path_buf.into_os_string().into_string().unwrap());
|
|
|
|
let zip_files_hashset: HashSet<_> = HashSet::from_iter(list_zip_files.iter().cloned());
|
2018-09-12 14:17:36 +03:00
|
|
|
let expected_files = vec![
|
|
|
|
dirname,
|
|
|
|
"output".to_string(),
|
|
|
|
"rangeproof".to_string(),
|
|
|
|
"kernel".to_string(),
|
|
|
|
"pmmr_hash.bin".to_string(),
|
|
|
|
"pmmr_data.bin".to_string(),
|
|
|
|
];
|
2018-08-03 05:16:16 +03:00
|
|
|
let expected_files_hashset = HashSet::from_iter(expected_files.iter().cloned());
|
2018-09-12 14:17:36 +03:00
|
|
|
let intersection: HashSet<_> = zip_files_hashset
|
|
|
|
.difference(&expected_files_hashset)
|
|
|
|
.collect();
|
2019-02-25 09:57:56 +03:00
|
|
|
intersection.is_empty()
|
2018-09-12 14:17:36 +03:00
|
|
|
}
|