chore: upgrade polkadot v1.7.2

node/src/command.rs

@@ -282,13 +282,6 @@ pub fn run() -> sc_cli::Result<()> {
 					return Err("It is not allowed to run a collator node with the benchmarking runtime.".into());
 				};
 
-				let hwbench = (!cli.no_hardware_benchmarks)
-					.then_some(config.database.path().map(|database_path| {
-						let _ = std::fs::create_dir_all(database_path);
-						sc_sysinfo::gather_hwbench(Some(database_path))
-					}))
-					.flatten();
-
 				let polkadot_cli = RelayChainCli::new(
 					&config,
 					[RelayChainCli::executable_name()]
@@ -325,7 +318,7 @@ pub fn run() -> sc_cli::Result<()> {
 					if config.role.is_authority() { "yes" } else { "no" }
 				);
 
-				crate::service::start_node(config, polkadot_config, cli.ethereum_config, collator_options, id, hwbench)
+				crate::service::start_node(config, polkadot_config, cli.ethereum_config, collator_options, id)
 					.await
 					.map(|r| r.0)
 					.map_err(Into::into)

node/src/rpc.rs

@@ -51,7 +51,6 @@ use sp_block_builder::BlockBuilder as BlockBuilderApi;
 use sp_blockchain::{Error as BlockChainError, HeaderBackend, HeaderMetadata};
 use sp_runtime::traits::{BlakeTwo256, Block as BlockT};
 
-//TODO: this is probably not correct for hydra.. verify what do
 pub struct HydraDxEGA;
 
 impl fc_rpc::EstimateGasAdapter for HydraDxEGA {

node/src/service.rs

@@ -206,7 +206,6 @@ async fn start_node_impl(
 	ethereum_config: evm::EthereumConfig,
 	collator_options: CollatorOptions,
 	para_id: ParaId,
-	hwbench: Option<sc_sysinfo::HwBench>,
 ) -> sc_service::error::Result<(TaskManager, Arc<ParachainClient>)> {
 	let parachain_config = prepare_node_config(parachain_config);
 
@@ -225,7 +224,7 @@ async fn start_node_impl(
 		telemetry_worker_handle,
 		&mut task_manager,
 		collator_options.clone(),
-		hwbench.clone(),
+		None,
 	)
 	.await
 	.map_err(|e| sc_service::Error::Application(Box::new(e) as Box<_>))?;
@@ -368,31 +367,6 @@ async fn start_node_impl(
 		pubsub_notification_sinks,
 	);
 
-	if let Some(hwbench) = hwbench {
-		sc_sysinfo::print_hwbench(&hwbench);
-		/*
-		// Here you can check whether the hardware meets your chains' requirements. Putting a link
-		// in there and swapping out the requirements for your own are probably a good idea. The
-		// requirements for a para-chain are dictated by its relay-chain.
-		if !frame_benchmarking_cli::SUBSTRATE_REFERENCE_HARDWARE.check_hardware(&hwbench) && validator {
-			log::warn!(
-				"⚠️  The hardware does not meet the minimal requirements for role 'Authority' find out more at:\n\
-			https://wiki.polkadot.network/docs/maintain-guides-how-to-validate-polkadot#reference-hardware"
-			);
-		}
-
-		 */
-
-		if let Some(ref mut telemetry) = telemetry {
-			let telemetry_handle = telemetry.handle();
-			task_manager.spawn_handle().spawn(
-				"telemetry_hwbench",
-				None,
-				sc_sysinfo::initialize_hwbench_telemetry(telemetry_handle, hwbench),
-			);
-		}
-	}
-
 	let announce_block = {
 		let sync_service = sync_service.clone();
 		Arc::new(move |hash, data| sync_service.announce_block(hash, data))
@@ -549,15 +523,13 @@ pub async fn start_node(
 	ethereum_config: evm::EthereumConfig,
 	collator_options: CollatorOptions,
 	para_id: ParaId,
-	hwbench: Option<sc_sysinfo::HwBench>,
 ) -> sc_service::error::Result<(TaskManager, Arc<ParachainClient>)> {
 	start_node_impl(
 		parachain_config,
 		polkadot_config,
 		ethereum_config,
 		collator_options,
 		para_id,
-		hwbench,
 	)
 	.await
 }

runtime/hydradx/src/governance.rs

@@ -17,7 +17,7 @@
 
 use super::*;
 use primitives::constants::{
-	currency::{deposit, CENTS, DOLLARS},
+	currency::{deposit, CENTS, DOLLARS, UNITS},
 	time::{DAYS, HOURS},
 };
 
@@ -125,14 +125,14 @@ impl pallet_treasury::Config for Runtime {
 	#[cfg(feature = "runtime-benchmarks")]
 	type SpendOrigin =
 		frame_system::EnsureWithSuccess<EnsureRoot<AccountId>, AccountId, crate::benches::BenchmarkMaxBalance>;
-	type AssetKind = ();
+	type AssetKind = (); // support only the native currency
 	type Beneficiary = AccountId;
 	type BeneficiaryLookup = IdentityLookup<AccountId>;
 	type Paymaster = PayFromTreasuryAccount;
 	type BalanceConverter = UnityAssetBalanceConversion;
 	type PayoutPeriod = TreasuryPayoutPeriod;
 	#[cfg(feature = "runtime-benchmarks")]
-	type BenchmarkHelper = ();
+	type BenchmarkHelper = (); // default impl is enough because we support only the native currency
 }
 
 parameter_types! {
@@ -381,7 +381,7 @@ parameter_types! {
 	pub const TipReportDepositBase: Balance = 10 * DOLLARS;
 	pub const TipReportDepositPerByte: Balance = CENTS;
 	pub const MaximumReasonLength: u32 = 1024;
-	pub const MaxTipAmount: u128 = 1_000 * DOLLARS; // TODO: check this
+	pub const MaxTipAmount: u128 = 5_000_000 * UNITS; // ~$100k
 }
 
 impl pallet_tips::Config for Runtime {

runtime/hydradx/src/lib.rs

@@ -751,11 +751,11 @@ impl_runtime_apis! {
 			}
 
 			parameter_types! {
-				pub const RandomParaId: ParaId = ParaId::new(22222222);
-				pub const ExistentialDeposit: u128= 0;
+				pub const RandomParaId: ParaId = ParaId::new(22_222_222);
+				pub const ExistentialDeposit: u128 = 0;
 			}
 
-			use polkadot_xcm::latest::prelude::{Location, AssetId, Fungible, Asset, ParentThen, Parachain, Parent};
+			use polkadot_xcm::latest::prelude::{Location, AssetId, Fungible, Asset, Parent};
 
 			impl pallet_xcm::benchmarking::Config for Runtime {
 				fn reachable_dest() -> Option<Location> {
@@ -773,13 +773,8 @@ impl_runtime_apis! {
 				}
 
 				fn reserve_transferable_asset_and_dest() -> Option<(Asset, Location)> {
-					Some((
-						Asset {
-							fun: Fungible(ExistentialDeposit::get()),
-							id: AssetId(Parent.into())
-						},
-						ParentThen(Parachain(RandomParaId::get().into()).into()).into(),
-					))
+					// TODO: https://github.com/galacticcouncil/HydraDX-node/issues/840
+					None
 				}
 			}
 

runtime/hydradx/src/xcm.rs

@@ -241,8 +241,8 @@ impl orml_xtokens::Config for Runtime {
 	type ReserveProvider = AbsoluteReserveProvider;
 	type MinXcmFee = ParachainMinFee;
 	type UniversalLocation = UniversalLocation;
-	type RateLimiter = (); //TODO: what do ?
-	type RateLimiterId = (); //TODO: what do ?
+	type RateLimiter = (); // do not use rate limiter
+	type RateLimiterId = ();
 }
 
 impl orml_unknown_tokens::Config for Runtime {
@@ -264,10 +264,7 @@ impl pallet_xcm::Config for Runtime {
 	type XcmExecuteFilter = AllowTransferAndSwap<MaxXcmDepth, MaxNumberOfInstructions, RuntimeCall>;
 	type XcmExecutor = XcmExecutor<XcmConfig>;
 	type XcmTeleportFilter = Nothing;
-	#[cfg(not(feature = "runtime-benchmarks"))]
 	type XcmReserveTransferFilter = Everything;
-	#[cfg(feature = "runtime-benchmarks")]
-	type XcmReserveTransferFilter = Nothing;
 	type Weigher = FixedWeightBounds<BaseXcmWeight, RuntimeCall, MaxInstructions>;
 	type UniversalLocation = UniversalLocation;
 	type RuntimeOrigin = RuntimeOrigin;