Merge pull request #666 from galacticcouncil/polkadot-v1.11.0

chore: upgrade to polkadot v1.11.0

integration-tests/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "runtime-integration-tests"
-version = "1.0.2"
+version = "1.0.3"
 description = "Integration tests"
 authors = ["GalacticCouncil"]
 edition = "2021"
@@ -112,11 +112,11 @@ cumulus-test-relay-sproof-builder = { workspace = true }
 
 [dev-dependencies]
 xcm-emulator = { workspace = true }
-hex-literal = "0.4.1"
+hex-literal = { workspace = true }
 pallet-relaychain-info = { workspace = true }
-pretty_assertions = "1.2.1"
+pretty_assertions = { workspace = true }
 sp-arithmetic = { workspace = true }
-test-case = "3.1.0"
+test-case = { workspace = true }
 
 [features]
 default = ["std"]

integration-tests/src/cross_chain_transfer.rs

@@ -31,16 +31,17 @@ fn basilisk_should_receive_asset_when_transferred_from_relaychain() {
 		assert_ok!(basilisk_runtime::AssetRegistry::set_location(
 			basilisk_runtime::RuntimeOrigin::root(),
 			1,
-			basilisk_runtime::AssetLocation(MultiLocation::parent().into())
+			basilisk_runtime::AssetLocation(MultiLocation::parent())
 		));
 	});
 	Rococo::execute_with(|| {
-		assert_ok!(rococo_runtime::XcmPallet::reserve_transfer_assets(
+		assert_ok!(rococo_runtime::XcmPallet::limited_reserve_transfer_assets(
 			rococo_runtime::RuntimeOrigin::signed(ALICE.into()),
 			Box::new(Parachain(BASILISK_PARA_ID).into_versioned()),
 			Box::new(Junction::AccountId32 { id: BOB, network: None }.into_versioned()),
 			Box::new((Here, 300 * UNITS).into()),
 			0,
+			WeightLimit::Unlimited,
 		));
 
 		assert_eq!(
@@ -105,9 +106,10 @@ fn basilisk_should_receive_asset_when_sent_from_other_parachain() {
 		assert_ok!(basilisk_runtime::AssetRegistry::set_location(
 			basilisk_runtime::RuntimeOrigin::root(),
 			1,
-			basilisk_runtime::AssetLocation(
-				MultiLocation::new(1, X2(Junction::Parachain(OTHER_PARA_ID), Junction::GeneralIndex(0))).into()
-			)
+			basilisk_runtime::AssetLocation(MultiLocation::new(
+				1,
+				X2(Junction::Parachain(OTHER_PARA_ID), Junction::GeneralIndex(0))
+			))
 		));
 	});
 
@@ -474,7 +476,7 @@ fn assets_should_be_trapped_when_assets_are_unknown() {
 
 		expect_basilisk_event(basilisk_runtime::RuntimeEvent::PolkadotXcm(
 			pallet_xcm::Event::AssetsTrapped {
-				hash: hash,
+				hash,
 				origin: origin.try_into().unwrap(),
 				assets: vec![asset].into(),
 			},
@@ -621,7 +623,13 @@ fn polkadot_xcm_execute_extrinsic_should_not_be_allowed() {
 				Box::new(VersionedXcm::from(xcm_msg)),
 				Weight::from_parts(400_000_000_000, 0)
 			),
-			pallet_xcm::Error::<basilisk_runtime::Runtime>::Filtered
+			sp_runtime::DispatchErrorWithPostInfo {
+				post_info: frame_support::dispatch::PostDispatchInfo {
+					actual_weight: Some(Weight::from_parts(10355000, 0)),
+					pays_fee: frame_support::dispatch::Pays::Yes,
+				},
+				error: pallet_xcm::Error::<basilisk_runtime::Runtime>::Filtered.into()
+			}
 		);
 	});
 }

integration-tests/src/exchange_asset.rs

@@ -166,6 +166,35 @@ fn basilisk_should_swap_assets_coming_from_karura_when_onchain_route_present() {
 			))
 		));
 
+		assert_ok!(basilisk_runtime::Tokens::set_balance(
+			frame_system::RawOrigin::Root.into(),
+			ALICE.into(),
+			KAR,
+			100 * UNITS,
+			0,
+		));
+		assert_ok!(basilisk_runtime::Router::sell(
+			basilisk_runtime::RuntimeOrigin::signed(ALICE.into()),
+			KAR,
+			KSM,
+			10_000, // make a small swap to not move the price a lot
+			0,
+			vec![
+				Trade {
+					pool: PoolType::XYK,
+					asset_in: KAR,
+					asset_out: BSX,
+				},
+				Trade {
+					pool: PoolType::XYK,
+					asset_in: BSX,
+					asset_out: KSM,
+				}
+			]
+		));
+
+		basilisk_run_to_next_block();
+
 		//Register onchain route from KAR to KSM
 		assert_ok!(basilisk_runtime::Router::set_route(
 			RuntimeOrigin::signed(CHARLIE.into()),
@@ -215,13 +244,13 @@ fn basilisk_should_swap_assets_coming_from_karura_when_onchain_route_present() {
 		));
 	});
 
-	let fees = 27_500_000_000_000;
+	let fees = 27_500_000_000_005;
 	Basilisk::execute_with(|| {
 		assert_eq!(
 			basilisk_runtime::Tokens::free_balance(KAR, &AccountId::from(BOB)),
 			95000000000000 - fees
 		);
-		let received = 4969548790555;
+		let received = 4969548790553;
 		assert_eq!(
 			basilisk_runtime::Tokens::free_balance(KSM, &AccountId::from(BOB)),
 			received

integration-tests/src/fees.rs

@@ -120,6 +120,8 @@ fn transaction_fees_should_be_as_expected_when_nft_is_minted() {
 			format_num(min_multiplier_rust_fees * 10_000 / UNITS, 4),
 		);
 
+		// before trying to fix this test, make sure that CREATE_COLLECTION_OFFSET and MINT_OFFSET
+		// were added to the rebenchmarked weights.
 		assert_eq_approx!(
 			rust_encoded_fees,
 			expected_rust_encoded_fees,
@@ -133,8 +135,8 @@ fn transaction_fees_should_be_as_expected_when_nft_is_minted() {
 #[test]
 fn transaction_fees_should_be_as_expected_when_nft_collection_is_created() {
 	Basilisk::execute_with(|| {
-		let expected_rust_encoded_fees = 76_492 * UNITS / 100; //764.92
-		let expected_ui_fees = 76_597 * UNITS / 100; //765.97
+		let expected_rust_encoded_fees = 61_167 * UNITS / 100; //611.67
+		let expected_ui_fees = 61_167 * UNITS / 100; //611.67
 
 		let call = pallet_nft::Call::<basilisk_runtime::Runtime>::create_collection {
 			collection_id: 0,

integration-tests/src/kusama_test_net.rs

@@ -48,7 +48,7 @@ use frame_support::assert_ok;
 use frame_support::traits::OnInitialize;
 use pallet_transaction_multi_payment::Price;
 pub use pallet_xyk::types::AssetPair;
-use polkadot_primitives::v6::{BlockNumber, MAX_CODE_SIZE, MAX_POV_SIZE};
+use polkadot_primitives::v7::{BlockNumber, MAX_CODE_SIZE, MAX_POV_SIZE};
 use polkadot_runtime_parachains::configuration::HostConfiguration;
 use pretty_assertions::assert_eq;
 use primitives::{AssetId, Balance};
@@ -75,7 +75,7 @@ decl_test_networks! {
 }
 
 decl_test_relay_chains! {
-	#[api_version(10)]
+	#[api_version(11)]
 	pub struct RococoRelayChain {
 		genesis = rococo::genesis(),
 		on_init = (),
@@ -144,8 +144,6 @@ pub mod rococo {
 			max_code_size: MAX_CODE_SIZE,
 			max_pov_size: MAX_POV_SIZE,
 			max_head_data_size: 32 * 1024,
-			group_rotation_frequency: 20,
-			paras_availability_period: 4,
 			max_upward_queue_count: 8,
 			max_upward_queue_size: 1024 * 1024,
 			max_downward_message_size: 1024,
@@ -256,7 +254,7 @@ pub mod rococo {
 			},
 			babe: rococo_runtime::BabeConfig {
 				authorities: Default::default(),
-				epoch_config: Some(rococo_runtime::BABE_GENESIS_EPOCH_CONFIG),
+				epoch_config: rococo_runtime::BABE_GENESIS_EPOCH_CONFIG,
 				..Default::default()
 			},
 			configuration: rococo_runtime::ConfigurationConfig {
@@ -512,6 +510,22 @@ pub fn vesting_account() -> AccountId {
 	VestingPalletId::get().into_account_truncating()
 }
 
+pub fn basilisk_run_to_next_block() {
+	use frame_support::traits::OnFinalize;
+
+	let b = basilisk_runtime::System::block_number();
+
+	basilisk_runtime::System::on_finalize(b);
+	basilisk_runtime::EmaOracle::on_finalize(b);
+	basilisk_runtime::MultiTransactionPayment::on_finalize(b);
+
+	basilisk_runtime::System::on_initialize(b + 1);
+	basilisk_runtime::EmaOracle::on_initialize(b + 1);
+	basilisk_runtime::MultiTransactionPayment::on_initialize(b + 1);
+
+	basilisk_runtime::System::set_block_number(b + 1);
+}
+
 pub fn set_relaychain_block_number(number: BlockNumber) {
 	use basilisk_runtime::ParachainSystem;
 	use basilisk_runtime::RuntimeOrigin;

integration-tests/src/non_native_fee.rs

@@ -11,7 +11,6 @@ use frame_support::{
 		traits::SignedExtension,
 		transaction_validity::{InvalidTransaction, TransactionValidityError},
 	},
-	traits::{OnFinalize, OnInitialize},
 	weights::Weight,
 };
 use hydradx_traits::AMM;
@@ -21,20 +20,6 @@ use pallet_transaction_multi_payment::Price;
 use primitives::AssetId;
 use xcm_emulator::TestExt;
 
-pub fn basilisk_run_to_next_block() {
-	let b = basilisk_runtime::System::block_number();
-
-	basilisk_runtime::System::on_finalize(b);
-	basilisk_runtime::EmaOracle::on_finalize(b);
-	basilisk_runtime::MultiTransactionPayment::on_finalize(b);
-
-	basilisk_runtime::System::on_initialize(b + 1);
-	basilisk_runtime::EmaOracle::on_initialize(b + 1);
-	basilisk_runtime::MultiTransactionPayment::on_initialize(b + 1);
-
-	basilisk_runtime::System::set_block_number(b + 1);
-}
-
 #[test]
 fn non_native_fee_payment_works_with_configured_price() {
 	TestNet::reset();

integration-tests/src/oracle.rs

@@ -3,26 +3,11 @@
 use crate::kusama_test_net::*;
 
 use basilisk_runtime::{EmaOracle, RuntimeOrigin, XYKOracleSourceIdentifier, XYK};
-use frame_support::{
-	assert_ok,
-	traits::{OnFinalize, OnInitialize},
-};
+use frame_support::assert_ok;
 use hydradx_traits::{AggregatedPriceOracle, OraclePeriod::*};
 use pallet_ema_oracle::OracleError;
 use xcm_emulator::TestExt;
 
-pub fn basilisk_run_to_next_block() {
-	let b = basilisk_runtime::System::block_number();
-
-	basilisk_runtime::System::on_finalize(b);
-	basilisk_runtime::EmaOracle::on_finalize(b);
-
-	basilisk_runtime::System::on_initialize(b + 1);
-	basilisk_runtime::EmaOracle::on_initialize(b + 1);
-
-	basilisk_runtime::System::set_block_number(b + 1);
-}
-
 #[test]
 fn xyk_trades_are_ingested_into_oracle() {
 	TestNet::reset();

integration-tests/src/router.rs

@@ -375,7 +375,7 @@ mod xyk_router_tests {
 					0,
 					trades
 				),
-				pallet_route_executor::Error::<basilisk_runtime::Runtime>::InsufficientBalance
+				pallet_xyk::Error::<basilisk_runtime::Runtime>::InsufficientAssetBalance
 			);
 
 			assert_trader_bsx_balance!(BOB_INITIAL_BSX_BALANCE);

integration-tests/src/transact_call_filter.rs

@@ -54,7 +54,7 @@ fn allowed_transact_call_should_pass_filter() {
 		let message = Xcm(vec![
 			WithdrawAsset(asset_to_withdraw.into()),
 			BuyExecution {
-				fees: asset_for_buy_execution.into(),
+				fees: asset_for_buy_execution,
 				weight_limit: Unlimited,
 			},
 			Transact {
@@ -247,7 +247,7 @@ fn safe_call_filter_should_respect_runtime_call_filter() {
 	});
 
 	//Assert
-	Basilisk::execute_with(|| assert_xcm_message_processing_failed());
+	Basilisk::execute_with(assert_xcm_message_processing_failed);
 }
 
 fn basilisk_location() -> Location {

launch-configs/zombienet/local.json

@@ -4,7 +4,7 @@
     "provider": "native"
   },
   "relaychain": {
-    "default_command": "../../../polkadot/target/release/polkadot",
+    "default_command": "../../../polkadot-sdk/target/release/polkadot",
     "chain": "rococo-local",
     "default_args": [
       "--no-hardware-benchmarks",

node/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "basilisk"
-version = "14.0.0"
+version = "15.0.0"
 description = "Basilisk node"
 authors = ["GalacticCouncil"]
 edition = "2021"
@@ -19,14 +19,14 @@ targets = ["x86_64-unknown-linux-gnu"]
 hydra-dx-build-script-utils = { workspace = true }
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "3.4.0" }
-hex-literal = "0.4.1"
-jsonrpsee = { version = "0.20.3", features = ["server", "macros"] }
-log = "0.4.17"
-serde = { version = "1.0.136", features = ["derive"] }
-serde_json = "1.0.85"
-clap = { version = "4.1.8", features = [ "derive" ] }
-futures = "0.3.21"
+codec = { workspace = true }
+hex-literal = { workspace = true }
+jsonrpsee = { workspace = true }
+log = { workspace = true }
+serde = { workspace = true }
+serde_json = { workspace = true }
+clap = { workspace = true }
+futures = { workspace = true }
 
 # local dependencies
 basilisk-runtime = { path = "../runtime/basilisk" }
@@ -81,7 +81,7 @@ sp-authority-discovery = { workspace = true }
 frame-try-runtime = { workspace = true, optional = true }
 substrate-state-trie-migration-rpc = { workspace = true }
 
-trie-db = "0.28.0"
+trie-db = { workspace = true }
 sp-state-machine = { workspace = true }
 
 # Cumulus dependencies

node/src/command.rs

@@ -17,18 +17,18 @@
 
 use crate::chain_spec;
 use crate::cli::{Cli, RelayChainCli, Subcommand};
-use crate::service::{new_partial, BasiliskNativeExecutor};
+use crate::service::new_partial;
 
 use basilisk_runtime::Block;
 use codec::Encode;
+use cumulus_client_service::storage_proof_size::HostFunctions as ReclaimHostFunctions;
 use cumulus_primitives_core::ParaId;
 use frame_benchmarking_cli::{BenchmarkCmd, SUBSTRATE_REFERENCE_HARDWARE};
 use log::info;
 use sc_cli::{
 	ChainSpec, CliConfiguration, DefaultConfigurationValues, ImportParams, KeystoreParams, NetworkParams, Result,
 	RuntimeVersion, SharedParams, SubstrateCli,
 };
-use sc_executor::{sp_wasm_interface::ExtendedHostFunctions, NativeExecutionDispatch};
 use sc_service::config::{BasePath, PrometheusConfig};
 use sp_core::hexdisplay::HexDisplay;
 use sp_runtime::traits::Block as BlockT;
@@ -193,12 +193,7 @@ pub fn run() -> sc_cli::Result<()> {
 			match cmd {
 				BenchmarkCmd::Pallet(cmd) => {
 					if cfg!(feature = "runtime-benchmarks") {
-						runner.sync_run(|config| {
-							cmd.run::<Block, ExtendedHostFunctions<
-								sp_io::SubstrateHostFunctions,
-								<BasiliskNativeExecutor as NativeExecutionDispatch>::ExtendHostFunctions,
-							>>(config)
-						})
+						runner.sync_run(|config| cmd.run_with_spec::<sp_runtime::traits::HashingFor<Block>, ReclaimHostFunctions>(Some(config.chain_spec)))
 					} else {
 						Err("Benchmarking wasn't enabled when building the node. \
 			   You can enable it with `--features runtime-benchmarks`."
@@ -301,7 +296,7 @@ pub fn run() -> sc_cli::Result<()> {
 				let id = ParaId::from(para_id);
 
 				let parachain_account =
-					AccountIdConversion::<polkadot_primitives::v6::AccountId>::into_account_truncating(&id);
+					AccountIdConversion::<polkadot_primitives::v7::AccountId>::into_account_truncating(&id);
 
 				let state_version = Cli::runtime_version().state_version();