galacticcouncil · mrq1911 · Oct 3, 2024 · Aug 7, 2024 · Aug 7, 2024 · Aug 7, 2024
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
diff --git a/integration-tests/Cargo.toml b/integration-tests/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "runtime-integration-tests"
-version = "1.23.4"
+version = "1.23.5"
 description = "Integration tests"
 authors = ["GalacticCouncil"]
 edition = "2021"
@@ -11,7 +11,7 @@ repository = "https://github.com/galacticcouncil/HydraDX-node"
 [dependencies]
 hex-literal = { workspace = true }
 frame-remote-externalities = { workspace = true }
-tokio = { version = "1", features = ["macros", "rt-multi-thread"] }
+tokio = { workspace = true }
 scraper = { workspace = true }
 primitives = { workspace = true }
 hydradx-runtime = { workspace = true }
@@ -133,7 +133,7 @@ polkadot-runtime-parachains = { workspace = true }
 rococo-runtime = { workspace = true }
 
 [dev-dependencies]
-pretty_assertions = "1.2.1"
+pretty_assertions = {  workspace = true }
 pallet-relaychain-info = { workspace = true }
 xcm-emulator = { workspace = true }
 test-utils = { workspace = true }

diff --git a/integration-tests/src/cross_chain_transfer.rs b/integration-tests/src/cross_chain_transfer.rs
@@ -45,12 +45,13 @@ fn hydra_should_receive_asset_when_transferred_from_rococo_relay_chain() {
 
 	Rococo::execute_with(|| {
 		//Act
-		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(HYDRA_PARA_ID).into_versioned()),
 			Box::new(Junction::AccountId32 { id: BOB, network: None }.into_versioned()),
 			Box::new((Here, 300 * UNITS).into()),
 			0,
+			WeightLimit::Unlimited,
 		));
 
 		//Assert
@@ -489,7 +490,7 @@ fn claim_trapped_asset_should_work() {
 	Hydra::execute_with(|| {
 		assert_eq!(
 			hydradx_runtime::Tokens::free_balance(1, &AccountId::from(BOB)),
-			1_029_939_717_395_149 //1000 * UNITS + 30 * UNITS - fee
+			1_029_929_954_984_403 //1000 * UNITS + 30 * UNITS - fee
 		);
 
 		let origin = MultiLocation::new(1, X1(Junction::Parachain(ACALA_PARA_ID)));

diff --git a/integration-tests/src/evm.rs b/integration-tests/src/evm.rs
@@ -253,8 +253,9 @@ mod account_conversion {
 			let fee_raw = hydradx_runtime::TransactionPayment::compute_fee_details(len, &info, 0);
 			let fee = fee_raw.final_fee();
 
-			// simple test that the fee is approximately 10/4 HDX (it was originally 10 HDX, but we divided the fee by 4 in the config)
-			assert_eq!(fee / UNITS, 10 / 4);
+			// assert that the fee is within some range
+			assert!(fee > 2 * UNITS);
+			assert!(fee < 4 * UNITS);
 		});
 	}
 

diff --git a/integration-tests/src/evm_permit.rs b/integration-tests/src/evm_permit.rs
@@ -746,7 +746,7 @@ fn evm_permit_set_currency_dispatch_should_pay_evm_fee_in_chosen_currency() {
 		let user_dai_balance = user_acc.balance(DAI);
 		assert!(user_dai_balance < initial_user_dai_balance);
 		let dai_diff = initial_user_dai_balance - user_dai_balance;
-		assert_eq!(dai_diff, 1_636_422_440_118_273);
+		assert_eq!(dai_diff, 1_639_386_316_054_024);
 	})
 }
 
@@ -1141,7 +1141,7 @@ fn dispatch_permit_should_increase_account_nonce_correctly() {
 
 		let hdx_balance = user_acc.balance(HDX);
 		let tx_fee = initial_user_hdx_balance - hdx_balance;
-		assert_eq!(tx_fee, 1_797_084_195_590);
+		assert_eq!(tx_fee, 1_809_384_860_344);
 	})
 }
 

diff --git a/integration-tests/src/exchange_asset.rs b/integration-tests/src/exchange_asset.rs
@@ -330,7 +330,7 @@ fn transfer_and_swap_should_work_with_4_hops() {
 
 		assert_eq!(
 			hydradx_runtime::Currencies::free_balance(IBTC, &AccountId::from(BOB)),
-			549839246387064
+			549813213291742
 		);
 		let fee = hydradx_runtime::Tokens::free_balance(IBTC, &hydradx_runtime::Treasury::account_id());
 
@@ -515,7 +515,7 @@ pub mod zeitgeist_use_cases {
 		Zeitgeist::execute_with(|| {
 			pretty_assertions::assert_eq!(
 				hydradx_runtime::Tokens::free_balance(HDX_ON_OTHER_PARACHAIN, &AccountId::from(ALICE)),
-				8142821444432895
+				8129541527696052
 			);
 		});
 	}
@@ -730,7 +730,7 @@ pub mod zeitgeist_use_cases {
 		Zeitgeist::execute_with(|| {
 			pretty_assertions::assert_eq!(
 				hydradx_runtime::Tokens::free_balance(IBTC, &AccountId::from(ALICE)),
-				9839246387064
+				9813213291742
 			);
 		});
 	}
@@ -1003,7 +1003,7 @@ pub mod zeitgeist_use_cases {
 		Zeitgeist::execute_with(|| {
 			pretty_assertions::assert_eq!(
 				hydradx_runtime::Tokens::free_balance(IBTC, &AccountId::from(ALICE)),
-				9839246387064
+				9813213291742
 			);
 		});
 	}

diff --git a/integration-tests/src/non_native_fee.rs b/integration-tests/src/non_native_fee.rs
@@ -47,7 +47,7 @@ fn non_native_fee_payment_works_with_oracle_price_based_on_onchain_route() {
 			)
 		);
 		let bob_balance = hydradx_runtime::Tokens::free_balance(BTC, &AccountId::from(BOB));
-		assert_eq!(bob_balance, 999991);
+		assert_eq!(bob_balance, 999990);
 
 		assert_ok!(hydradx_runtime::Balances::force_set_balance(
 			hydradx_runtime::RuntimeOrigin::root(),
@@ -76,7 +76,7 @@ fn non_native_fee_payment_works_with_oracle_price_based_on_onchain_route() {
 		);
 
 		let dave_balance = hydradx_runtime::Tokens::free_balance(DAI, &AccountId::from(DAVE));
-		assert_eq!(dave_balance, 999_998_091_159_455_519_200);
+		assert_eq!(dave_balance, 999_997_998_229_378_745_200);
 	});
 }
 
@@ -109,7 +109,7 @@ fn set_currency_should_work_in_batch_transaction_when_first_tx() {
 			)
 		);
 		let bob_balance = hydradx_runtime::Tokens::free_balance(BTC, &AccountId::from(BOB));
-		assert_eq!(bob_balance, 999991);
+		assert_eq!(bob_balance, 999990);
 	});
 
 	TestNet::reset();
@@ -139,7 +139,7 @@ fn set_currency_should_work_in_batch_transaction_when_first_tx() {
 			)
 		);
 		let bob_balance = hydradx_runtime::Tokens::free_balance(BTC, &AccountId::from(BOB));
-		assert_eq!(bob_balance, 999991);
+		assert_eq!(bob_balance, 999990);
 	});
 
 	TestNet::reset();
@@ -169,7 +169,7 @@ fn set_currency_should_work_in_batch_transaction_when_first_tx() {
 			)
 		);
 		let bob_balance = hydradx_runtime::Tokens::free_balance(BTC, &AccountId::from(BOB));
-		assert_eq!(bob_balance, 999991);
+		assert_eq!(bob_balance, 999990);
 	});
 }
 

diff --git a/integration-tests/src/polkadot_test_net.rs b/integration-tests/src/polkadot_test_net.rs
@@ -2,7 +2,7 @@
 use frame_support::{
 	assert_ok,
 	sp_runtime::{
-		traits::{AccountIdConversion, Block as BlockT, Dispatchable},
+		traits::{AccountIdConversion, Block as BlockT, Dispatchable, HashingFor},
 		BuildStorage, FixedU128, Permill,
 	},
 	traits::{GetCallMetadata, OnInitialize},
@@ -18,7 +18,7 @@ use hex_literal::hex;
 use hydradx_runtime::{evm::WETH_ASSET_LOCATION, Referrals, RuntimeOrigin};
 pub use hydradx_traits::{evm::InspectEvmAccounts, registry::Mutate};
 use pallet_referrals::{FeeDistribution, Level};
-pub use polkadot_primitives::v6::{BlockNumber, MAX_CODE_SIZE, MAX_POV_SIZE};
+pub use polkadot_primitives::v7::{BlockNumber, MAX_CODE_SIZE, MAX_POV_SIZE};
 use polkadot_runtime_parachains::configuration::HostConfiguration;
 use sp_consensus_beefy::ecdsa_crypto::AuthorityId as BeefyId;
 use sp_core::storage::Storage;
@@ -120,7 +120,7 @@ decl_test_networks! {
 }
 
 decl_test_relay_chains! {
-	#[api_version(10)]
+	#[api_version(11)]
 	pub struct RococoRelayChain {
 		genesis = rococo::genesis(),
 		on_init = {
@@ -259,8 +259,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,
@@ -378,7 +376,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()
 			},
 			..Default::default()
@@ -767,7 +765,7 @@ pub fn rococo_run_to_block(to: BlockNumber) {
 
 pub fn hydra_live_ext(
 	path_to_snapshot: &str,
-) -> frame_remote_externalities::RemoteExternalities<hydradx_runtime::Block> {
+) -> frame_remote_externalities::RemoteExternalities<HashingFor<hydradx_runtime::Block>> {
 	let ext = tokio::runtime::Builder::new_current_thread()
 		.enable_all()
 		.build()

diff --git a/integration-tests/src/router.rs b/integration-tests/src/router.rs
@@ -1352,7 +1352,6 @@ mod omnipool_router_tests {
 				let extra_ed_charge = UNITS / 10;
 				assert_balance!(ALICE.into(), HDX, 1000 * UNITS - ed);
 
-				let amount_to_sell = amount_to_sell;
 				assert_ok!(Router::sell(
 					hydradx_runtime::RuntimeOrigin::signed(ALICE.into()),
 					insufficient_asset_1,
@@ -5408,7 +5407,6 @@ mod sell_all {
 				assert_balance!(ALICE.into(), pool_id, 0);
 
 				//Act
-				let amount_to_sell = 3000 * UNITS;
 				assert_ok!(Router::sell_all(
 					hydradx_runtime::RuntimeOrigin::signed(ALICE.into()),
 					stable_asset_1,

diff --git a/math/Cargo.toml b/math/Cargo.toml
@@ -6,31 +6,36 @@ license = 'Apache-2.0'
 name = "hydra-dx-math"
 description = "A collection of utilities to make performing liquidity pool calculations more convenient."
 repository = 'https://github.com/galacticcouncil/hydradx-math'
-version = "8.1.2"
+version = "8.1.3"
 
 [dependencies]
-primitive-types = {default-features = false, version = '0.12.0'}
-num-traits = {default-features = false, version = "0.2.14"}
-fixed = { version = "=1.15.0", features = ["num-traits"] }
+primitive-types = {  workspace = true }
+num-traits = {  workspace = true }
+fixed = {  workspace = true, features = ["num-traits"] }
 # Added because of use of the FixedU128, used to implement `Ratio`
-codec = { package = "parity-scale-codec", version = "3.4.0", default-features = false, features = ["derive", "max-encoded-len"] }
-scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
+codec = {  workspace = true, features = ["derive", "max-encoded-len"] }
+scale-info = {  workspace = true }
 sp-arithmetic = { workspace = true }
 sp-std = { workspace = true }
-serde = { version = "1.0.136", default-features = false }
+serde = {  workspace = true }
 
 [dev-dependencies]
-approx = "0.5.1"
-criterion = "0.4.0"
-proptest = "1.0.0"
-rand = { version = "0.8.5", default-features = false, features= ["std_rng"] }
-rand_xoshiro = "0.6.0"
-rug = { version = "1.17.0", features = ["num-traits"] }
-test-case = "2.2.1"
+approx = {  workspace = true }
+criterion = {  workspace = true }
+proptest = {  workspace = true }
+rand = {  workspace = true, features= ["std_rng"] }
+rand_xoshiro = {  workspace = true }
+rug = {  workspace = true }
+test-case = {  workspace = true }
 
 [features]
 default = ["std"]
-std = ["codec/std", "serde/std", "sp-arithmetic/std", "sp-std/std"]
+std = [
+    "codec/std",
+    "serde/std",
+    "sp-arithmetic/std",
+    "sp-std/std"
+]
 runtime-benchmarks = []
 
 [[bench]]

diff --git a/node/Cargo.toml b/node/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "hydradx"
-version = "13.1.2"
+version = "14.0.0"
 description = "Hydration node"
 authors = ["GalacticCouncil"]
 edition = "2021"
@@ -18,15 +18,15 @@ 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.3.4"
-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"
-async-trait = "0.1"
+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 }
+async-trait = { workspace = true }
 
 # local dependencies
 hydradx-runtime = { workspace = true , features = ["std"] }
@@ -82,7 +82,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

diff --git a/node/src/command.rs b/node/src/command.rs
@@ -20,6 +20,7 @@ use crate::cli::{Cli, RelayChainCli, Subcommand};
 use crate::service::new_partial;
 
 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 hydradx_runtime::Block;
@@ -28,7 +29,6 @@ use sc_cli::{
 	ChainSpec, CliConfiguration, DefaultConfigurationValues, ImportParams, KeystoreParams, NetworkParams, Result,
 	RuntimeVersion, SharedParams, SubstrateCli,
 };
-use sc_executor::sp_wasm_interface::ExtendedHostFunctions;
 use sc_service::config::{BasePath, PrometheusConfig};
 use sp_core::hexdisplay::HexDisplay;
 use sp_runtime::{
@@ -194,12 +194,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,
-								frame_benchmarking::benchmarking::HostFunctions,
-							>>(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`."
@@ -296,7 +291,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();