pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-06-12 22:51:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add a build-sync-spec subcommand and remove the CHT roots from the light sync state. (#6999)

Browse Source 
* Move subcommands from sc-cli to nodes

* Add --build-sync-spec subcommand

* Remove CHTs from snapshots

* Keep ProvideChtRoots
This commit is contained in:
Ashley
2020-09-11 14:50:12 +02:00
committed by GitHub
parent 3abcd72f8f
commit 614c6a743f
9 changed files with 171 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/client/service/src/chain_ops/build_spec.rs → substrate/client/service/src/chain_ops/build_sync_spec.rs
+4 -29
View File
@@ -14,48 +14,23 @@
// You should have received a copy of the GNU General Public License
// along with Substrate. If not, see <http://www.gnu.org/licenses/>.
use sp_runtime::traits::{Block as BlockT, NumberFor, Saturating, One};
use sp_runtime::traits::Block as BlockT;
use sp_blockchain::HeaderBackend;
use std::sync::Arc;
use sp_runtime::generic::BlockId;
use sc_client_api::ProvideChtRoots;
/// Build a `LightSyncState` from the CHT roots stored in a backend.
pub fn build_light_sync_state<TBl, TCl, TBackend>(
pub fn build_light_sync_state<TBl, TCl>(
client: Arc<TCl>,
backend: Arc<TBackend>,
) -> Result<sc_chain_spec::LightSyncState<TBl>, sp_blockchain::Error>
where
TBl: BlockT,
TCl: HeaderBackend<TBl>,
TBackend: sc_client_api::Backend<TBl>,
<TBackend as sc_client_api::Backend<TBl>>::Blockchain: ProvideChtRoots<TBl>,
{
let cht_root_provider = backend.blockchain();
let finalized_hash = client.info().finalized_hash;
let finalized_number = client.info().finalized_number;
use sc_client_api::cht;
let mut chts = Vec::new();
// We can't fetch a CHT root later than `finalized_number - 2 * cht_size`.
let cht_size_x_2 = cht::size::<NumberFor::<TBl>>() * NumberFor::<TBl>::from(2);
let mut number = NumberFor::<TBl>::one();
while number <= finalized_number.saturating_sub(cht_size_x_2) {
match cht_root_provider.header_cht_root(cht::size(), number)? {
Some(cht_root) => chts.push(cht_root),
None => log::error!("No CHT found for block {}", number),
}
number += cht::size();
}
let header = client.header(BlockId::Hash(finalized_hash))?.unwrap();
Ok(sc_chain_spec::LightSyncState {
header: client.header(BlockId::Hash(finalized_hash))?.unwrap(),
chts,
header
})
}
substrate/client/service/src/chain_ops/mod.rs
+2 -2
View File
@@ -21,11 +21,11 @@ mod export_blocks;
mod export_raw_state;
mod import_blocks;
mod revert_chain;
mod build_spec;
mod build_sync_spec;
pub use check_block::*;
pub use export_blocks::*;
pub use export_raw_state::*;
pub use import_blocks::*;
pub use revert_chain::*;
pub use build_spec::*;
pub use build_sync_spec::*;