Merge pull request #37 from edgeware-network/burp-28_rebased

v4.0.1
edgeware-network · Oct 18, 2022 · d5d1430 · d5d1430
2 parents 83354a3 + 36e20f5
commit d5d1430
Show file tree

Hide file tree

Showing 18 changed files with 3,110 additions and 42 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/node/cli/Cargo.toml b/node/cli/Cargo.toml
@@ -64,7 +64,7 @@ sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "pol
 sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.19", default-features = false }
 sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.19", default-features = false }
 sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.19", default-features = false }
-sc-consensus-aura = { git = "https://github.com/edgeware-network/edg-aura", default-features = false }
+sc-consensus-aura = { path = "../consensus-transition/aura", default-features = false }
 sc-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.19", default-features = false }
 sc-consensus-slots =  { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.19", default-features = false }
 sc-client-db = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.19", default-features = false }
@@ -179,3 +179,6 @@ runtime-benchmarks = [
 fast-runtime = [
 	"edgeware-runtime/fast-runtime",
 ]
+beresheet-runtime = [
+	"edgeware-runtime/beresheet-runtime",
+]
diff --git a/node/cli/src/command.rs b/node/cli/src/command.rs
@@ -25,7 +25,7 @@ impl SubstrateCli for Cli {
 	}
 
 	fn impl_version() -> String {
-		"4.0.0".into()
+		"4.0.1".into()
 	}
 
 	fn description() -> String {

diff --git a/node/cli/src/service.rs b/node/cli/src/service.rs
@@ -20,7 +20,7 @@
 
 use crate::Cli;
 use edgeware_cli_opt::{EthApi as EthApiCmd, RpcConfig};
-use edgeware_primitives::Block;
+use edgeware_primitives::{Block, BlockNumber};
 use fc_db::DatabaseSource;
 use edgeware_runtime::RuntimeApi;
 // use maplit::hashmap;
@@ -29,7 +29,7 @@ use fc_consensus::FrontierBlockImport;
 use sc_client_api::BlockBackend;
 use fc_rpc_core::types::{FeeHistoryCache, FilterPool};
 use futures::prelude::*;
-use sc_consensus_aura::{self, ImportQueueParams, SlotProportion, StartAuraParams};
+use sc_consensus_aura::{self, CompatibilityMode, ImportQueueParams, SlotProportion, StartAuraParams};
 use sc_network::{Event, NetworkService};
 use sc_service::{config::{Configuration, /*PrometheusConfig*/}, error::Error as ServiceError, RpcHandlers,BasePath, ChainSpec, TaskManager};
 use sc_telemetry::{Telemetry, TelemetryWorker, TelemetryWorkerHandle};
@@ -264,6 +264,10 @@ pub fn new_partial(
 		    can_author_with: sp_consensus::CanAuthorWithNativeVersion::new(client.executor().clone()),
 		    check_for_equivocation: Default::default(),
 		    telemetry: telemetry.as_ref().map(|x| x.handle()),
+		    #[cfg(feature = "beresheet-runtime")]
+			compatibility_mode: CompatibilityMode::UseInitializeBlock { until: BlockNumber::from(8888u32) },
+		    #[cfg(not(feature = "beresheet-runtime"))]
+			compatibility_mode: CompatibilityMode::UseInitializeBlock { until: BlockNumber::from(14_555_555u32) },
 		}
 	)?;
 
@@ -307,7 +311,7 @@ pub struct NewFullBase {
 
 /// Creates a full service from the configuration.
 pub fn new_full_base(mut config: Configuration,
-	cli: &Cli, 
+	cli: &Cli,
 	rpc_config: RpcConfig
 ) -> Result<NewFullBase, ServiceError> {
 	let sc_service::PartialComponents {
@@ -468,7 +472,7 @@ pub fn new_full_base(mut config: Configuration,
 			fee_history_cache_limit: fee_history_cache_limit,
 			overrides: overrides.clone(),
 			block_data_cache: block_data_cache.clone(),
-			command_sink: None, 
+			command_sink: None,
 		};
 		#[allow(unused_mut)]
 		let mut io = edgeware_rpc::create_full(deps, subscription_task_executor.clone());
@@ -549,6 +553,10 @@ pub fn new_full_base(mut config: Configuration,
 				block_proposal_slot_portion: SlotProportion::new(2f32 / 3f32),
 				max_block_proposal_slot_portion: None,
 				telemetry: telemetry.as_ref().map(|x| x.handle()),
+				#[cfg(feature = "beresheet-runtime")]
+				compatibility_mode: CompatibilityMode::UseInitializeBlock { until: BlockNumber::from(8888u32) },
+				#[cfg(not(feature = "beresheet-runtime"))]
+				compatibility_mode: CompatibilityMode::UseInitializeBlock { until: BlockNumber::from(14_555_555u32) },
 			},
 		)?;