refactor!: substrate 3 upgrade

node/Cargo.toml

@@ -7,7 +7,7 @@ homepage = 'https://github.com/galacticcouncil/hydradx-node'
 license = 'Unlicense'
 name = 'hydra-dx'
 repository = 'https://github.com/galacticcouncil/hydradx-node'
-version = '2.0.0'
+version = '3.0.0'
 
 [[bin]]
 name = 'hydra-dx'
@@ -24,50 +24,50 @@ serde_json = "1.0.61"
 structopt = '0.3.8'
 
 # local dependencies
-hydra-dx-runtime = {path = '../runtime', version = '2.0.0'}
-module-amm-rpc = {path = '../pallets/amm/rpc', version = '2.0.0'}
-primitives = {path = '../primitives', version = '2.0.0'}
+hydra-dx-runtime = {path = '../runtime', version = '3.0.0'}
+module-amm-rpc = {path = '../pallets/amm/rpc', version = '3.0.0'}
+primitives = {path = '../primitives', version = '3.0.0'}
 
 # Substrate dependencies
-frame-benchmarking = '2.0.0'
-frame-benchmarking-cli = {version = '2.0.0', optional = true}
+frame-benchmarking = '3.0.0'
+frame-benchmarking-cli = {version = '3.0.0', optional = true}
 futures = '0.3.4'
 hex-literal = "0.3.1"
-pallet-im-online = "2.0.0"
-pallet-staking = '2.0.0'
-pallet-transaction-payment-rpc = '2.0.0'
-sc-authority-discovery = '0.8.0'
-sc-basic-authorship = '0.8.0'
-sc-cli = {features = ['wasmtime'], version = '0.8.0'}
-sc-client-api = '2.0.0'
-sc-consensus = '0.8.0'
-sc-consensus-babe = '0.8.0'
-sc-consensus-babe-rpc = '0.8.0'
-sc-consensus-epochs = '0.8.0'
-sc-consensus-slots = '0.8.0'
-sc-executor = {features = ['wasmtime'], version = '0.8.0'}
-sc-finality-grandpa = '=0.8.0'
-sc-finality-grandpa-rpc = '=0.8.0'
-sc-keystore = '2.0.0'
-sc-network = '0.8.0'
-sc-rpc = '2.0.0'
-sc-rpc-api = '0.8.0'
-sc-service = '0.8.0'
-sc-telemetry = '2.0.0'
-sc-transaction-pool = '2.0.0'
-sp-api = '2.0.0'
-sp-authority-discovery = '2.0.0'
-sp-block-builder = '2.0.0'
-sp-blockchain = '2.0.0'
-sp-consensus = '0.8.0'
-sp-consensus-babe = '0.8.0'
-sp-core = '=2.0.0'
-sp-finality-grandpa = '2.0.0'
-sp-inherents = '2.0.0'
-sp-keystore = '0.8.0'
-sp-runtime = '2.0.0'
-sp-transaction-pool = '2.0.0'
-substrate-frame-rpc-system = '2.0.0'
+pallet-im-online = "3.0.0"
+pallet-staking = '3.0.0'
+pallet-transaction-payment-rpc = '3.0.0'
+sc-authority-discovery = '0.9.0'
+sc-basic-authorship = '0.9.0'
+sc-cli = {features = ['wasmtime'], version = '0.9.0'}
+sc-client-api = '3.0.0'
+sc-consensus = '0.9.0'
+sc-consensus-babe = '0.9.0'
+sc-consensus-babe-rpc = '0.9.0'
+sc-consensus-epochs = '0.9.0'
+sc-consensus-slots = '0.9.0'
+sc-executor = {features = ['wasmtime'], version = '0.9.0'}
+sc-finality-grandpa = '=0.9.0'
+sc-finality-grandpa-rpc = '=0.9.0'
+sc-keystore = '3.0.0'
+sc-network = '0.9.0'
+sc-rpc = '3.0.0'
+sc-rpc-api = '0.9.0'
+sc-service = '0.9.0'
+sc-telemetry = '3.0.0'
+sc-transaction-pool = '3.0.0'
+sp-api = '3.0.0'
+sp-authority-discovery = '3.0.0'
+sp-block-builder = '3.0.0'
+sp-blockchain = '3.0.0'
+sp-consensus = '0.9.0'
+sp-consensus-babe = '0.9.0'
+sp-core = '=3.0.0'
+sp-finality-grandpa = '3.0.0'
+sp-inherents = '3.0.0'
+sp-keystore = '0.9.0'
+sp-runtime = '3.0.0'
+sp-transaction-pool = '3.0.0'
+substrate-frame-rpc-system = '3.0.0'
 
 [features]
 default = [

node/src/command.rs

@@ -62,8 +62,9 @@ impl SubstrateCli for Cli {
 }
 
 fn set_ss58() {
-	use sp_core::crypto::Ss58AddressFormat;
-	sp_core::crypto::set_default_ss58_version(Ss58AddressFormat::HydraDXAccount);
+	// TODO: not yet avaiable in this Subsrate version
+	//use sp_core::crypto::Ss58AddressFormat;
+	//sp_core::crypto::set_default_ss58_version(Ss58AddressFormat::HydraDXAccount);
 }
 
 /// Parse and run command line arguments
@@ -152,6 +153,7 @@ pub fn run() -> sc_cli::Result<()> {
 					Role::Light => service::new_light(config),
 					_ => service::new_full(config).map(|(task_manager, _, _, _, _, _)| task_manager),
 				}
+				.map_err(sc_cli::Error::Service)
 			})
 		}
 	}

node/src/service.rs

@@ -59,6 +59,7 @@ pub fn new_partial(
 
 	let transaction_pool = sc_transaction_pool::BasicPool::new_full(
 		config.transaction_pool.clone(),
+		config.role.is_authority().into(),
 		config.prometheus_registry(),
 		task_manager.spawn_handle(),
 		client.clone(),
@@ -93,7 +94,8 @@ pub fn new_partial(
 		let justification_stream = grandpa_link.justification_stream();
 		let shared_authority_set = grandpa_link.shared_authority_set().clone();
 		let shared_voter_state = sc_finality_grandpa::SharedVoterState::empty();
-		let finality_proof_provider = GrandpaFinalityProofProvider::new_for_service(backend.clone(), client.clone());
+		let finality_proof_provider =
+			GrandpaFinalityProofProvider::new_for_service(backend.clone(), Some(shared_authority_set.clone()));
 
 		let rpc_setup = shared_voter_state.clone();
 
@@ -176,8 +178,8 @@ pub fn new_full(
 
 	config
 		.network
-		.notifications_protocols
-		.push(sc_finality_grandpa::GRANDPA_PROTOCOL_NAME.into());
+		.extra_sets
+		.push(sc_finality_grandpa::grandpa_peers_set_config());
 
 	let (network, network_status_sinks, system_rpc_tx, network_starter) =
 		sc_service::build_network(sc_service::BuildNetworkParams {
@@ -205,9 +207,9 @@ pub fn new_full(
 	let name = config.network.node_name.clone();
 	let enable_grandpa = !config.disable_grandpa;
 	let prometheus_registry = config.prometheus_registry().cloned();
-	let telemetry_connection_sinks = sc_service::TelemetryConnectionSinks::default();
+	//let telemetry_connection_sinks = sc_service::TelemetryConnectionSinks::default();
 
-	sc_service::spawn_tasks(sc_service::SpawnTasksParams {
+	let (_rpc_handlers, telemetry_connection_notifier) = sc_service::spawn_tasks(sc_service::SpawnTasksParams {
 		config,
 		backend: backend,
 		client: client.clone(),
@@ -218,7 +220,6 @@ pub fn new_full(
 		task_manager: &mut task_manager,
 		on_demand: None,
 		remote_blockchain: None,
-		telemetry_connection_sinks: telemetry_connection_sinks.clone(),
 		network_status_sinks: network_status_sinks.clone(),
 		system_rpc_tx,
 	})?;
@@ -301,7 +302,7 @@ pub fn new_full(
 		name: Some(name),
 		observer_enabled: false,
 		keystore,
-		is_authority: role.is_network_authority(),
+		is_authority: role.is_authority(),
 	};
 
 	if enable_grandpa {
@@ -315,7 +316,7 @@ pub fn new_full(
 			config: grandpa_config,
 			link: grandpa_link,
 			network: network.clone(),
-			telemetry_on_connect: Some(telemetry_connection_sinks.on_connect_stream()),
+			telemetry_on_connect: telemetry_connection_notifier.map(|x| x.on_connect_stream()),
 			voting_rule: sc_finality_grandpa::VotingRulesBuilder::default().build(),
 			prometheus_registry: prometheus_registry,
 			shared_voter_state,
@@ -403,7 +404,6 @@ pub fn new_light(config: Configuration) -> Result<TaskManager, ServiceError> {
 		task_manager: &mut task_manager,
 		on_demand: Some(on_demand),
 		rpc_extensions_builder: Box::new(|_, _| ()),
-		telemetry_connection_sinks: sc_service::TelemetryConnectionSinks::default(),
 		config,
 		client,
 		keystore: keystore_container.sync_keystore(),

pallets/amm/Cargo.toml

@@ -6,7 +6,7 @@ homepage = 'https://github.com/galacticcouncil/hydradx-node'
 license = 'Unlicense'
 name = 'pallet-amm'
 repository = 'https://github.com/galacticcouncil/hydradx-node'
-version = '2.0.0'
+version = '3.0.0'
 
 [package.metadata.docs.rs]
 targets = ['x86_64-unknown-linux-gnu']
@@ -19,7 +19,7 @@ wasm-builder-runner = {package = 'substrate-wasm-builder-runner', version = '1.0
 default-features = false
 features = ['derive']
 package = 'parity-scale-codec'
-version = '1.3.4'
+version = '2.0.0'
 
 [dependencies]
 primitive-types = {default-features = false, version = '0.8.0'}
@@ -28,25 +28,25 @@ serde = {features = ['derive'], optional = true, version = '1.0.101'}
 hydra-dx-math = {default-features = false, version = "0.1.0", git = "https://github.com/galacticcouncil/hydraDX-math", tag="v0.1.0"}
 
 # Local dependencies
-pallet-asset-registry = {path = '../asset-registry', default-features = false, version = '2.0.0'}
-primitives = {path = '../../primitives', default-features = false, version = '2.0.0'}
+pallet-asset-registry = {path = '../asset-registry', default-features = false, version = '3.0.0'}
+primitives = {path = '../../primitives', default-features = false, version = '3.0.0'}
 
 # ORML dependencies
-orml-tokens = {default-features = false, version = "0.3.3-dev"}
-orml-traits = {default-features = false, version = "0.3.3-dev"}
-orml-utilities = {default-features = false, version = "0.3.3-dev"}
+orml-tokens = {default-features = false, version = "0.4.1-dev"}
+orml-traits = {default-features = false, version = "0.4.1-dev"}
+orml-utilities = {default-features = false, version = "0.4.1-dev"}
 
 # Substrate dependencies
-frame-benchmarking = {default-features = false, optional = true, version = '2.0.0'}
-frame-support = {default-features = false, version = '2.0.0'}
-frame-system = {default-features = false, version = '2.0.0'}
-frame-system-benchmarking = {default-features = false, optional = true, version = '2.0.0'}
-sp-core = {default-features = false, version = '2.0.0'}
-sp-runtime = {default-features = false, version = '2.0.0'}
-sp-std = {default-features = false, version = '2.0.0'}
+frame-benchmarking = {default-features = false, optional = true, version = '3.0.0'}
+frame-support = {default-features = false, version = '3.0.0'}
+frame-system = {default-features = false, version = '3.0.0'}
+frame-system-benchmarking = {default-features = false, optional = true, version = '3.0.0'}
+sp-core = {default-features = false, version = '3.0.0'}
+sp-runtime = {default-features = false, version = '3.0.0'}
+sp-std = {default-features = false, version = '3.0.0'}
 
 [dev-dependencies]
-sp-io = {default-features = false, version = '2.0.0'}
+sp-io = {default-features = false, version = '3.0.0'}
 
 [features]
 default = ['std']
@@ -56,6 +56,7 @@ runtime-benchmarks = [
   "frame-support/runtime-benchmarks",
 ]
 std = [
+  'serde',
   'codec/std',
   'frame-support/std',
   'frame-system/std',

pallets/amm/rpc/Cargo.toml

@@ -2,13 +2,13 @@
 authors = ['GalacticCouncil']
 edition = "2018"
 name = "module-amm-rpc"
-version = '2.0.0'
+version = '3.0.0'
 
 [dependencies.module-amm-rpc-runtime-api]
 default-features = false
 package = 'module-amm-rpc-runtime-api'
 path = 'runtime-api'
-version = '2.0.0'
+version = '3.0.0'
 
 [package.metadata.docs.rs]
 targets = ['x86_64-unknown-linux-gnu']
@@ -21,7 +21,7 @@ wasm-builder-runner = {package = 'substrate-wasm-builder-runner', version = '1.0
 default-features = false
 features = ['derive']
 package = 'parity-scale-codec'
-version = '1.3.4'
+version = '2.0.0'
 
 [dependencies]
 jsonrpc-core = {default-features = false, version = '15.0.0'}
@@ -30,10 +30,10 @@ jsonrpc-derive = {default-features = false, version = '15.0.0'}
 serde = {features = ['derive'], optional = true, version = '1.0.101'}
 
 # Substrate dependencies
-sp-api = {default-features = false, version = '2.0.0'}
-sp-blockchain = {default-features = false, version = '2.0.0'}
-sp-runtime = {default-features = false, version = '2.0.0'}
-sp-std = {default-features = false, version = '2.0.0'}
+sp-api = {default-features = false, version = '3.0.0'}
+sp-blockchain = {default-features = false, version = '3.0.0'}
+sp-runtime = {default-features = false, version = '3.0.0'}
+sp-std = {default-features = false, version = '3.0.0'}
 
 [features]
 default = ['std']

pallets/amm/rpc/runtime-api/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 authors = ['GalacticCouncil']
 name = "module-amm-rpc-runtime-api"
-version = '2.0.0'
+version = '3.0.0'
 edition = "2018"
 
 [package.metadata.docs.rs]
@@ -15,15 +15,15 @@ wasm-builder-runner = { package = 'substrate-wasm-builder-runner', version = '1.
 default-features = false
 features = ['derive']
 package = 'parity-scale-codec'
-version = '1.3.4'
+version = '2.0.0'
 
 [dependencies]
 serde = { features = ['derive'], optional = true, version = '1.0.101' }
 
 # Substrate dependencies
-sp-std = { default-features = false, version = '2.0.0' }
-sp-api = { default-features = false, version = '2.0.0' }
-sp-runtime = { default-features = false, version = '2.0.0' }
+sp-std = { default-features = false, version = '3.0.0' }
+sp-api = { default-features = false, version = '3.0.0' }
+sp-runtime = { default-features = false, version = '3.0.0' }
 
 [features]
 default = ["std"]

pallets/amm/src/benchmarking.rs

@@ -37,9 +37,6 @@ fn funded_account<T: Config>(name: &'static str, index: u32) -> T::AccountId {
 }
 
 benchmarks! {
-	_ {
-	}
-
 	create_pool {
 		let caller = funded_account::<T>("caller", 0);