mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-06-13 22:11:06 +00:00
CLI option to enable authoring when offline (#2104)
* CLI option to enable authoring when offline * Update core/service/src/config.rs Co-Authored-By: arkpar <arkady.paronyan@gmail.com>
This commit is contained in:
@@ -470,6 +470,8 @@ where
|
|||||||
config.telemetry_endpoints = Some(TelemetryEndpoints::new(cli.telemetry_endpoints));
|
config.telemetry_endpoints = Some(TelemetryEndpoints::new(cli.telemetry_endpoints));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
config.force_authoring = cli.force_authoring;
|
||||||
|
|
||||||
Ok(config)
|
Ok(config)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -325,6 +325,10 @@ pub struct RunCmd {
|
|||||||
#[allow(missing_docs)]
|
#[allow(missing_docs)]
|
||||||
#[structopt(flatten)]
|
#[structopt(flatten)]
|
||||||
pub keyring: Keyring,
|
pub keyring: Keyring,
|
||||||
|
|
||||||
|
/// Enable authoring even when offline.
|
||||||
|
#[structopt(long = "force-authoring")]
|
||||||
|
pub force_authoring: bool,
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Stores all required Cli values for a keyring test account.
|
/// Stores all required Cli values for a keyring test account.
|
||||||
|
|||||||
@@ -160,6 +160,7 @@ pub fn start_aura_thread<B, C, E, I, P, SO, Error, OnExit>(
|
|||||||
sync_oracle: SO,
|
sync_oracle: SO,
|
||||||
on_exit: OnExit,
|
on_exit: OnExit,
|
||||||
inherent_data_providers: InherentDataProviders,
|
inherent_data_providers: InherentDataProviders,
|
||||||
|
force_authoring: bool,
|
||||||
) -> Result<(), consensus_common::Error> where
|
) -> Result<(), consensus_common::Error> where
|
||||||
B: Block + 'static,
|
B: Block + 'static,
|
||||||
C: Authorities<B> + ChainHead<B> + Send + Sync + 'static,
|
C: Authorities<B> + ChainHead<B> + Send + Sync + 'static,
|
||||||
@@ -176,7 +177,13 @@ pub fn start_aura_thread<B, C, E, I, P, SO, Error, OnExit>(
|
|||||||
Error: ::std::error::Error + Send + From<::consensus_common::Error> + 'static,
|
Error: ::std::error::Error + Send + From<::consensus_common::Error> + 'static,
|
||||||
{
|
{
|
||||||
let worker = AuraWorker {
|
let worker = AuraWorker {
|
||||||
client: client.clone(), block_import, env, local_key, inherent_data_providers: inherent_data_providers.clone(), sync_oracle: sync_oracle.clone(),
|
client: client.clone(),
|
||||||
|
block_import,
|
||||||
|
env,
|
||||||
|
local_key,
|
||||||
|
inherent_data_providers: inherent_data_providers.clone(),
|
||||||
|
sync_oracle: sync_oracle.clone(),
|
||||||
|
force_authoring,
|
||||||
};
|
};
|
||||||
|
|
||||||
aura_slots::start_slot_worker_thread::<_, _, _, _, AuraSlotCompatible, _>(
|
aura_slots::start_slot_worker_thread::<_, _, _, _, AuraSlotCompatible, _>(
|
||||||
@@ -199,6 +206,7 @@ pub fn start_aura<B, C, E, I, P, SO, Error, OnExit>(
|
|||||||
sync_oracle: SO,
|
sync_oracle: SO,
|
||||||
on_exit: OnExit,
|
on_exit: OnExit,
|
||||||
inherent_data_providers: InherentDataProviders,
|
inherent_data_providers: InherentDataProviders,
|
||||||
|
force_authoring: bool,
|
||||||
) -> Result<impl Future<Item=(), Error=()>, consensus_common::Error> where
|
) -> Result<impl Future<Item=(), Error=()>, consensus_common::Error> where
|
||||||
B: Block,
|
B: Block,
|
||||||
C: Authorities<B> + ChainHead<B>,
|
C: Authorities<B> + ChainHead<B>,
|
||||||
@@ -215,7 +223,13 @@ pub fn start_aura<B, C, E, I, P, SO, Error, OnExit>(
|
|||||||
OnExit: Future<Item=(), Error=()>,
|
OnExit: Future<Item=(), Error=()>,
|
||||||
{
|
{
|
||||||
let worker = AuraWorker {
|
let worker = AuraWorker {
|
||||||
client: client.clone(), block_import, env, local_key, inherent_data_providers: inherent_data_providers.clone(), sync_oracle: sync_oracle.clone(),
|
client: client.clone(),
|
||||||
|
block_import,
|
||||||
|
env,
|
||||||
|
local_key,
|
||||||
|
inherent_data_providers: inherent_data_providers.clone(),
|
||||||
|
sync_oracle: sync_oracle.clone(),
|
||||||
|
force_authoring,
|
||||||
};
|
};
|
||||||
aura_slots::start_slot_worker::<_, _, _, _, AuraSlotCompatible, _>(
|
aura_slots::start_slot_worker::<_, _, _, _, AuraSlotCompatible, _>(
|
||||||
slot_duration,
|
slot_duration,
|
||||||
@@ -234,6 +248,7 @@ struct AuraWorker<C, E, I, P, SO> {
|
|||||||
local_key: Arc<P>,
|
local_key: Arc<P>,
|
||||||
sync_oracle: SO,
|
sync_oracle: SO,
|
||||||
inherent_data_providers: InherentDataProviders,
|
inherent_data_providers: InherentDataProviders,
|
||||||
|
force_authoring: bool,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<B: Block, C, E, I, P, Error, SO> SlotWorker<B> for AuraWorker<C, E, I, P, SO> where
|
impl<B: Block, C, E, I, P, Error, SO> SlotWorker<B> for AuraWorker<C, E, I, P, SO> where
|
||||||
@@ -287,7 +302,7 @@ impl<B: Block, C, E, I, P, Error, SO> SlotWorker<B> for AuraWorker<C, E, I, P, S
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
if self.sync_oracle.is_offline() && authorities.len() > 1 {
|
if !self.force_authoring && self.sync_oracle.is_offline() && authorities.len() > 1 {
|
||||||
debug!(target: "aura", "Skipping proposal slot. Waiting for the network.");
|
debug!(target: "aura", "Skipping proposal slot. Waiting for the network.");
|
||||||
telemetry!(CONSENSUS_DEBUG; "aura.skipping_proposal_slot";
|
telemetry!(CONSENSUS_DEBUG; "aura.skipping_proposal_slot";
|
||||||
"authorities_len" => authorities.len()
|
"authorities_len" => authorities.len()
|
||||||
@@ -808,6 +823,7 @@ mod tests {
|
|||||||
DummyOracle,
|
DummyOracle,
|
||||||
futures::empty(),
|
futures::empty(),
|
||||||
inherent_data_providers,
|
inherent_data_providers,
|
||||||
|
false,
|
||||||
).expect("Starts aura");
|
).expect("Starts aura");
|
||||||
|
|
||||||
runtime.spawn(aura);
|
runtime.spawn(aura);
|
||||||
|
|||||||
@@ -68,6 +68,8 @@ pub struct Configuration<C, G: Serialize + DeserializeOwned + BuildStorage> {
|
|||||||
pub telemetry_endpoints: Option<TelemetryEndpoints>,
|
pub telemetry_endpoints: Option<TelemetryEndpoints>,
|
||||||
/// The default number of 64KB pages to allocate for Wasm execution
|
/// The default number of 64KB pages to allocate for Wasm execution
|
||||||
pub default_heap_pages: Option<u64>,
|
pub default_heap_pages: Option<u64>,
|
||||||
|
/// Enable authoring even when offline.
|
||||||
|
pub force_authoring: bool,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<C: Default, G: Serialize + DeserializeOwned + BuildStorage> Configuration<C, G> {
|
impl<C: Default, G: Serialize + DeserializeOwned + BuildStorage> Configuration<C, G> {
|
||||||
@@ -93,6 +95,7 @@ impl<C: Default, G: Serialize + DeserializeOwned + BuildStorage> Configuration<C
|
|||||||
rpc_ws: None,
|
rpc_ws: None,
|
||||||
telemetry_endpoints: None,
|
telemetry_endpoints: None,
|
||||||
default_heap_pages: None,
|
default_heap_pages: None,
|
||||||
|
force_authoring: false,
|
||||||
};
|
};
|
||||||
configuration.network.boot_nodes = configuration.chain_spec.boot_nodes().to_vec();
|
configuration.network.boot_nodes = configuration.chain_spec.boot_nodes().to_vec();
|
||||||
|
|
||||||
|
|||||||
@@ -120,6 +120,7 @@ fn node_config<F: ServiceFactory> (
|
|||||||
rpc_ws: None,
|
rpc_ws: None,
|
||||||
telemetry_endpoints: None,
|
telemetry_endpoints: None,
|
||||||
default_heap_pages: None,
|
default_heap_pages: None,
|
||||||
|
force_authoring: false,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -73,6 +73,7 @@ construct_service_factory! {
|
|||||||
service.network(),
|
service.network(),
|
||||||
service.on_exit(),
|
service.on_exit(),
|
||||||
service.config.custom.inherent_data_providers.clone(),
|
service.config.custom.inherent_data_providers.clone(),
|
||||||
|
service.config.force_authoring,
|
||||||
)?);
|
)?);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -97,6 +97,7 @@ construct_service_factory! {
|
|||||||
service.network(),
|
service.network(),
|
||||||
service.on_exit(),
|
service.on_exit(),
|
||||||
service.config.custom.inherent_data_providers.clone(),
|
service.config.custom.inherent_data_providers.clone(),
|
||||||
|
service.config.force_authoring,
|
||||||
)?);
|
)?);
|
||||||
|
|
||||||
info!("Running Grandpa session as Authority {}", key.public());
|
info!("Running Grandpa session as Authority {}", key.public());
|
||||||
|
|||||||
Reference in New Issue
Block a user