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.

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

Enable warp sync #901

Merged
merged 42 commits into from
May 6, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
89f7f00
Substrate updates
Dinonard Mar 24, 2023
6c3820c
Everything required except XCM
Dinonard Mar 24, 2023
8cbd0fc
Fix deps
Dinonard Mar 24, 2023
817d40a
Fix messed dependencies repos
Dinonard Mar 24, 2023
d48798f
Progress with Shibuya XCM & some leftover for other parts
Dinonard Mar 24, 2023
f0d4ca1
Frontier miss
Dinonard Mar 27, 2023
cdd8ac1
Shibuya fixes
Dinonard Mar 27, 2023
751200c
Additional bumps & fixes
Dinonard Mar 27, 2023
ebae80e
Shibuya compiles
Dinonard Mar 27, 2023
a208ccd
Shibuya additonal change
Dinonard Mar 27, 2023
84541e8
Local runtime
Dinonard Mar 27, 2023
478df92
Shiden compiles
Dinonard Mar 27, 2023
4b8633f
Astar
Dinonard Mar 27, 2023
306960a
xcm-tools fix
Dinonard Mar 27, 2023
92b974c
client progress
Dinonard Mar 27, 2023
a9e33e3
Client finished
Dinonard Mar 27, 2023
01fc717
evm-tracing adjustment
Dinonard Mar 27, 2023
421ab82
Bump
Dinonard Mar 31, 2023
c6533d0
Updated xc-asset-config & added migration
Dinonard Mar 31, 2023
d1d4298
Sorting out some TODOs
Dinonard Apr 3, 2023
1d088b6
Progress with xcm-simulator
Dinonard Apr 3, 2023
b77f602
xcm simulator tests - 1 issue remains
Dinonard Apr 3, 2023
806266e
Xcm simulator resolved
Dinonard Apr 3, 2023
adb33e2
Fix CI issue
Dinonard Apr 3, 2023
bdd1a11
Another fix
Dinonard Apr 3, 2023
7adf671
Additional updates & TODOs resolution
Dinonard Apr 3, 2023
14094c5
Updated SafeCallFilter - more work required
Dinonard Apr 4, 2023
62f1a9f
PoV size as part of unit weight cost
Dinonard Apr 4, 2023
cef4fb1
Latest dapps-staking benchmarks code
Dinonard Apr 4, 2023
2113d44
Updated weights in astar-frame
Dinonard Apr 4, 2023
1818e3a
Add pallet-xcm to benchmarks
Dinonard Apr 4, 2023
2e1135a
Improved safe call filter
Dinonard Apr 4, 2023
207f5d5
Weight re-work
Dinonard Apr 5, 2023
b6ecc49
XCM weights from benchmarks
Dinonard Apr 5, 2023
16c50e1
SafeCallFilter for Astar
Dinonard Apr 5, 2023
89bc043
Deps bump
Dinonard Apr 5, 2023
aa06997
Enable warp sync
shunsukew Apr 6, 2023
5516e67
remove WarpSync from local node
shunsukew Apr 7, 2023
b7bafc2
resolved conflicts
shunsukew Apr 13, 2023
7086dd5
fix block import queue verifier
shunsukew Apr 24, 2023
13c5c93
bump version
shunsukew May 6, 2023
c87702d
merged master
shunsukew May 6, 2023
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
Prev Previous commit
Next Next commit
client progress
  • Loading branch information
Dinonard committed Mar 27, 2023
commit 92b974c81ceee3347afef1a441a3b21ee75932e8
2 changes: 1 addition & 1 deletion bin/collator/src/local/service.rs
Original file line number Diff line number Diff line change
Expand Up @@ -489,7 +489,7 @@ pub fn start_node(config: Configuration) -> Result<TaskManager, ServiceError> {
spawn_handle: task_manager.spawn_handle(),
import_queue,
block_announce_validator_builder: None,
warp_sync: None,
warp_sync_params: None,
})?;

if config.offchain_worker.enabled {
Expand Down
12 changes: 8 additions & 4 deletions bin/collator/src/parachain/service.rs
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,7 @@ use sc_client_api::BlockchainEvents;
use sc_consensus::{import_queue::BasicQueue, ImportQueue};
use sc_executor::NativeElseWasmExecutor;
use sc_network::{NetworkBlock, NetworkService};
use sc_service::{
Configuration, PartialComponents, TFullBackend, TFullClient, TaskManager, WarpSyncParams,
};
use sc_service::{Configuration, PartialComponents, TFullBackend, TFullClient, TaskManager};
use sc_telemetry::{Telemetry, TelemetryHandle, TelemetryWorker, TelemetryWorkerHandle};
use sp_api::ConstructRuntimeApi;
use sp_consensus_aura::sr25519::AuthorityId as AuraId;
Expand Down Expand Up @@ -423,7 +421,7 @@ where
block_announce_validator_builder: Some(Box::new(|_| {
Box::new(block_announce_validator)
})),
warp_sync: None,
warp_sync_params: None,
})?;

let filter_pool: FilterPool = Arc::new(std::sync::Mutex::new(BTreeMap::new()));
Expand Down Expand Up @@ -530,6 +528,10 @@ where

let relay_chain_slot_duration = Duration::from_secs(6);

let overseer_handle = relay_chain_interface
.overseer_handle()
.map_err(|e| sc_service::Error::Application(Box::new(e)))?;

if is_authority {
let parachain_consensus = build_consensus(
client.clone(),
Expand Down Expand Up @@ -558,6 +560,7 @@ where
import_queue: import_queue_service,
collator_key: collator_key.expect("Command line arguments do not allow this. qed"),
relay_chain_slot_duration,
recovery_handle: Box::new(overseer_handle),
};

start_collator(params).await?;
Expand All @@ -570,6 +573,7 @@ where
relay_chain_interface,
relay_chain_slot_duration,
import_queue: import_queue_service,
recovery_handle: Box::new(overseer_handle),
};

start_full_node(params)?;
Expand Down
2 changes: 1 addition & 1 deletion bin/collator/src/parachain/shell_upgrade.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ use sc_consensus::{import_queue::Verifier as VerifierT, BlockImportParams};
use sp_api::ApiExt;
use sp_consensus::CacheKeyId;
use sp_consensus_aura::{sr25519::AuthorityId as AuraId, AuraApi};
use sp_runtime::{generic::BlockId, traits::Header as HeaderT};
use sp_runtime::traits::Header as HeaderT;
use std::sync::Arc;

use crate::primitives::*;
Expand Down
4 changes: 2 additions & 2 deletions runtime/astar/src/xcm_config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -150,11 +150,11 @@ match_types! {
/// 3. Have a defined proof size weight, e.g. no unbounded vecs in call parameters.
pub struct SafeCallFilter;
impl Contains<RuntimeCall> for SafeCallFilter {
fn contains(call: &RuntimeCall) -> bool {
fn contains(_call: &RuntimeCall) -> bool {
#[cfg(feature = "runtime-benchmarks")]
{
if matches!(
call,
_call,
RuntimeCall::System(frame_system::Call::remark_with_event { .. })
) {
return true;
Expand Down
4 changes: 2 additions & 2 deletions runtime/shibuya/src/xcm_config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -153,11 +153,11 @@ match_types! {
/// 3. Have a defined proof size weight, e.g. no unbounded vecs in call parameters.
pub struct SafeCallFilter;
impl Contains<RuntimeCall> for SafeCallFilter {
fn contains(call: &RuntimeCall) -> bool {
fn contains(_call: &RuntimeCall) -> bool {
#[cfg(feature = "runtime-benchmarks")]
{
if matches!(
call,
_call,
RuntimeCall::System(frame_system::Call::remark_with_event { .. })
) {
return true;
Expand Down
4 changes: 2 additions & 2 deletions runtime/shiden/src/xcm_config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -149,11 +149,11 @@ match_types! {
/// 3. Have a defined proof size weight, e.g. no unbounded vecs in call parameters.
pub struct SafeCallFilter;
impl Contains<RuntimeCall> for SafeCallFilter {
fn contains(call: &RuntimeCall) -> bool {
fn contains(_call: &RuntimeCall) -> bool {
#[cfg(feature = "runtime-benchmarks")]
{
if matches!(
call,
_call,
RuntimeCall::System(frame_system::Call::remark_with_event { .. })
) {
return true;
Expand Down