Merge pull request #1396 from galacticcouncil/xcm_egress

fix: Account for egress on partially executed xcm

Author: enthusiastmartin

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "runtime-integration-tests"
-version = "1.75.0"
+version = "1.75.1"
 description = "Integration tests"
 authors = ["GalacticCouncil"]
 edition = "2021"

integration-tests/Cargo.toml

@@ -1460,3 +1460,71 @@ fn inbound_xcm_buffer_is_clean_between_messages() {
 		);
 	});
 }
+
+#[test]
+fn inbound_xcm_incomplete_message_still_accounts_egress() {
+	TestNet::reset();
+
+	let sovereign = parachain_reserve_account();
+
+	Hydra::execute_with(|| {
+		init_global_withdraw_limit_params();
+
+		assert_ok!(CircuitBreaker::set_asset_category(
+			hydradx_runtime::RuntimeOrigin::root(),
+			HDX,
+			Some(GlobalAssetCategory::Local)
+		));
+
+		assert_ok!(hydradx_runtime::Balances::transfer_allow_death(
+			hydradx_runtime::RuntimeOrigin::signed(ALICE.into()),
+			sovereign.clone(),
+			500 * UNITS,
+		));
+
+		assert_eq!(CircuitBreaker::withdraw_limit_accumulator().0, 0);
+		assert_eq!(Currencies::free_balance(HDX, &sovereign), 500 * UNITS);
+	});
+
+	Acala::execute_with(|| {
+		let hdx_loc = Location::new(
+			1,
+			[
+				cumulus_primitives_core::Junction::Parachain(HYDRA_PARA_ID),
+				cumulus_primitives_core::Junction::GeneralIndex(0),
+			],
+		);
+		let amount = 100 * UNITS;
+		let asset: Asset = Asset {
+			id: cumulus_primitives_core::AssetId(hdx_loc),
+			fun: Fungible(amount),
+		};
+
+		let message = Xcm(vec![
+			WithdrawAsset(asset.clone().into()),
+			BuyExecution {
+				fees: asset,
+				weight_limit: Unlimited,
+			},
+			Trap(1),
+		]);
+
+		assert_ok!(hydradx_runtime::PolkadotXcm::send_xcm(
+			Here,
+			Location::new(1, [cumulus_primitives_core::Junction::Parachain(HYDRA_PARA_ID)]),
+			message
+		));
+	});
+
+	Hydra::execute_with(|| {
+		assert_xcm_message_processing_failed();
+		assert!(
+			Currencies::free_balance(HDX, &sovereign) < 500 * UNITS,
+			"Incomplete inbound XCM must have withdrawn funds from the sovereign account"
+		);
+		assert!(
+			CircuitBreaker::withdraw_limit_accumulator().0 > 0,
+			"Incomplete inbound XCM with real egress must still increment the accumulator"
+		);
+	});
+}

integration-tests/src/global_withdraw_limit.rs

@@ -1,6 +1,6 @@
 [package]
 name = "hydradx-runtime"
-version = "404.0.0"
+version = "405.0.0"
 authors = ["GalacticCouncil"]
 edition = "2021"
 license = "Apache 2.0"

runtime/hydradx/Cargo.toml

@@ -129,7 +129,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	spec_name: Cow::Borrowed("hydradx"),
 	impl_name: Cow::Borrowed("hydradx"),
 	authoring_version: 1,
-	spec_version: 404,
+	spec_version: 405,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 1,

runtime/hydradx/src/lib.rs

@@ -482,11 +482,9 @@ where
 		let result = MessageProcessor::process_message(message, origin, meter, id);
 
 		if let Some((withdrawn, deposited)) = pallet_circuit_breaker::XcmEgressBuffer::<Runtime>::take() {
-			if matches!(result, Ok(true)) {
-				let net = withdrawn.saturating_sub(deposited);
-				if !net.is_zero() {
-					let _ = pallet_circuit_breaker::Pallet::<Runtime>::note_egress(net);
-				}
+			let net = withdrawn.saturating_sub(deposited);
+			if !net.is_zero() {
+				let _ = pallet_circuit_breaker::Pallet::<Runtime>::note_egress(net);
 			}
 		}
 		result