Merge branch 'master' into feat/longer-oracles

Author: enthusiastmartin

Cargo.lock

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

Cargo.toml

@@ -4860,7 +4860,16 @@ mod aave_atoken {
 	use super::*;
 	use hydradx_runtime::DCA;
 
-	const PATH_TO_SNAPSHOT: &str = "dca-snapshot/SNAPSHOT";
+	// Snapshot at block 12309734, produced with:
+	//
+	//   ./target/release/scraper save-storage --slim \
+	//       --uri wss://hydration.dotters.network \
+	//       --at 0x5bfd245dd5612800f2291cef550a5e3f76b569e6de4d52d1c6cb122e674d838e \
+	//       --pallet Omnipool Stableswap AssetRegistry EVM DynamicFees EmaOracle \
+	//                MultiTransactionPayment Tokens Balances EVMAccounts Ethereum \
+	//                EVMChainId HSM Router System Aura Timestamp DCA \
+	//       --path integration-tests/dca-snapshot
+	const PATH_TO_SNAPSHOT: &str = "dca-snapshot/SNAPSHOT_12309734";
 
 	//Ignored as snapshot too big
 	//To verify locally, download snapshot with command `./target/release/scraper save-storage --uri wss://paseo-rpc.play.hydration.cloud --at 0x3db005212a4ae320a2808c6813880b583dacbf7df60b0314420e88f4f2dfe989`
@@ -4885,6 +4894,62 @@ mod aave_atoken {
 			assert!(schedule.is_some());
 		});
 	}
+
+	use frame_support::traits::OnInitialize;
+
+	#[test]
+	fn dca_should_succeed_after_retry_when_insufficient_balance_error_due_to_off_by_one_error() {
+		TestNet::reset();
+
+		hydra_live_ext(PATH_TO_SNAPSHOT).execute_with(|| {
+			//Arrange
+			assert_eq!(hydradx_runtime::System::block_number(), 12309734);
+			let schedule_id = 30972;
+			assert!(DCA::schedules(schedule_id).is_some());
+
+			//Act 1: first attempt fails with InsufficientBalance and is retried
+			DCA::on_initialize(12309735);
+			assert_trade_failed_with_omnipool_insufficient_balance(schedule_id);
+			assert_eq!(
+				DCA::retries_on_error(schedule_id),
+				1,
+				"first attempt should have been retried"
+			);
+			let retry_block =
+				DCA::schedule_execution_block(schedule_id).expect("schedule should be replanned to a retry block");
+
+			//Act 2: simulate elapsed time so aave liquidity index drifts (rounding boundary moves)
+			let now = hydradx_runtime::Timestamp::get();
+			hydradx_runtime::Timestamp::set_timestamp(now + 240_000);
+
+			//Act 3: run DCA at the retry block
+			DCA::on_initialize(retry_block);
+
+			//Assert: schedule still alive and retry counter reset (= the trade succeeded)
+			assert!(DCA::schedules(schedule_id).is_some(), "schedule must survive retry");
+			assert_eq!(
+				DCA::retries_on_error(schedule_id),
+				0,
+				"retry should have succeeded and reset the counter"
+			);
+		});
+	}
+
+	fn assert_trade_failed_with_omnipool_insufficient_balance(schedule_id: u32) {
+		let expected: sp_runtime::DispatchError = pallet_omnipool::Error::<Runtime>::InsufficientBalance.into();
+		let events = last_hydra_events(20);
+		let found = events.iter().any(|e| {
+			matches!(
+				e,
+				RuntimeEvent::DCA(pallet_dca::Event::TradeFailed { id, error, .. })
+				if *id == schedule_id && *error == expected
+			)
+		});
+		assert!(
+			found,
+			"expected TradeFailed event with omnipool::InsufficientBalance for schedule {schedule_id}"
+		);
+	}
 }
 
 fn create_xyk_pool_with_amounts(asset_a: u32, amount_a: u128, asset_b: u32, amount_b: u128) {

integration-tests/Cargo.toml

@@ -298,11 +298,11 @@ fn unified_event_context_should_be_cleared_when_error_happens_in_xcm_prepare() {
 
 	// Act
 	Acala::execute_with(|| {
-		//We make a big xcm so it results in error
-		const ARRAY_REPEAT_VALUE: cumulus_primitives_core::Instruction<()> =
-			cumulus_primitives_core::Instruction::RefundSurplus;
-		let message: cumulus_primitives_core::Xcm<()> =
-			cumulus_primitives_core::Xcm([ARRAY_REPEAT_VALUE; 10000].to_vec());
+		let message = Xcm(vec![Transact {
+			fallback_max_weight: None,
+			origin_kind: OriginKind::SovereignAccount,
+			call: vec![0xff].into(),
+		}]);
 
 		let dest_hydradx = Location::new(1, [cumulus_primitives_core::Junction::Parachain(HYDRA_PARA_ID)]);
 

integration-tests/dca-snapshot/SNAPSHOT_12309734

@@ -8,7 +8,7 @@
         "signer": "0x33a5e905fB83FcFB62B0Dd1595DfBc06792E054e"
       }
     },
-    "priority": 100000
+    "priority": 18446744073709551614
   },
   {
     "module": "Ethereum",
@@ -19,6 +19,6 @@
         "signer": "0xff0c624016c873d359dde711b42a2f475a5a07d3"
       }
     },
-    "priority": 100000
+    "priority": 18446744073709551614
   }
 ]

integration-tests/src/dca.rs

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

integration-tests/src/xcm.rs

@@ -930,6 +930,11 @@ impl Contains<DispatchError> for RetryOnErrorForDca {
 		let errors: Vec<DispatchError> = vec![
 			pallet_omnipool::Error::<Runtime>::AssetNotFound.into(),
 			pallet_omnipool::Error::<Runtime>::NotAllowed.into(),
+			// Off-by-one rounding on aToken balanceOf can trip the omnipool's
+			// pre-trade ensure_can_withdraw. Retry on a later block — the aave
+			// liquidity index is timestamp-dependent, so the rounding boundary
+			// shifts and a later attempt may pass.
+			pallet_omnipool::Error::<Runtime>::InsufficientBalance.into(),
 			pallet_dispatcher::Error::<Runtime>::EvmOutOfGas.into(),
 			pallet_circuit_breaker::Error::<Runtime>::DepositLimitExceededForWhitelistedAccount.into(),
 		];

node/src/tx_priority.json

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