Merge pull request #1471 from galacticcouncil/feat/synth-logs-node-indexing

Author: enthusiastmartin

.dockerignore

@@ -1,3 +1,8 @@
 target/
 !target/release/hydradx
 Dockerfile
+.git
+**/node_modules
+launch-configs/fork/data
+launch-configs/fork/state.json
+launch-configs/fork/forked-chainspec.json

Cargo.lock

@@ -0,0 +1,33 @@
+# Self-contained build of the synth-logs node: compiles from source in a builder
+# stage, then ships just the binary. Builder and runtime share glibc (bookworm
+# 2.36), so no host/base libc mismatch.
+FROM rust:1.88-bookworm AS builder
+
+RUN apt-get update && apt-get install -y --no-install-recommends \
+	clang protobuf-compiler cmake pkg-config libssl-dev git \
+	&& rm -rf /var/lib/apt/lists/*
+
+WORKDIR /build
+COPY . .
+
+ENV CXXFLAGS="-include cstdint"
+RUN cargo build --release --locked --config net.git-fetch-with-cli=true -p hydradx
+
+FROM debian:bookworm-slim
+LABEL org.opencontainers.image.source = "https://github.com/galacticcouncil/hydration-node"
+
+RUN apt-get update && apt-get install -y --no-install-recommends ca-certificates \
+	&& rm -rf /var/lib/apt/lists/*
+
+RUN useradd -m -u 1000 -U -s /bin/sh -d /hydra hydra && \
+	mkdir -p /hydra/.local/share && \
+	chown -R hydra:hydra /hydra
+
+COPY --from=builder /build/target/release/hydradx /usr/local/bin/hydradx
+
+USER hydra
+EXPOSE 30333 9933 9944 9615
+VOLUME ["/hydra/.local/share"]
+
+ENTRYPOINT ["/usr/local/bin/hydradx"]
+CMD ["--prometheus-external", "--", "--execution=wasm" ,"--telemetry-url", "wss://telemetry.hydradx.io:9000/submit/ 0"]

Dockerfile.with-builder

@@ -52,6 +52,7 @@ pallet-gigahdx = { workspace = true }
 pallet-gigahdx-rewards = { workspace = true }
 liquidation-worker-support = { workspace = true }
 pallet-broadcast = { workspace = true }
+ethereum-types = { workspace = true }
 pallet-duster = { workspace = true }
 pallet-duster-rpc-runtime-api = { workspace = true }
 

integration-tests/Cargo.toml

@@ -3719,14 +3719,12 @@ mod stableswap {
 
 				assert_eq!(
 					alice_stable_shares_after, 0,
-					"User should have 0 pool shares since DCA execution failed. Got {}",
-					alice_stable_shares_after
+					"User should have 0 pool shares since DCA execution failed. Got {alice_stable_shares_after}"
 				);
 
 				assert_eq!(
 					router_reserved_shares, 0,
-					"Router should have 0 reserved shares. Got {}",
-					router_reserved_shares
+					"Router should have 0 reserved shares. Got {router_reserved_shares}"
 				);
 
 				TransactionOutcome::Commit(DispatchResult::Ok(()))
@@ -5552,9 +5550,7 @@ mod extra_gas_erc20 {
 
 			assert!(
 				fee_with_extra > base_fee,
-				"Fee with extra gas ({}) should be > base fee ({})",
-				fee_with_extra,
-				base_fee
+				"Fee with extra gas ({fee_with_extra}) should be > base fee ({base_fee})"
 			);
 
 			// The first attempt charged base fee (before extra gas was added)

integration-tests/src/dca.rs

@@ -101,7 +101,7 @@ fn dispatch_as_aave_admin_can_modify_supply_cap_on_testnet() {
 			RuntimeEvent::Dispatcher(pallet_dispatcher::Event::AaveManagerCallDispatched {
 				result: Ok(..), ..
 			}) => {}
-			_ => panic!("Unexpected event: {:?}", event),
+			_ => panic!("Unexpected event: {event:?}"),
 		}
 	});
 }
@@ -248,8 +248,7 @@ fn dispatch_with_extra_gas_should_pay_for_extra_gas_used_when_it_is_not_used() {
 		let gas_eater_paid_fee = initial_alice_hdx_balance - alice_balance_final;
 		assert_eq!(
 			gas_eater_paid_fee, hydra_paid_fee,
-			"GasEater transfer should cost the same as HydraToken transfer: {:?} == {:?}",
-			gas_eater_paid_fee, hydra_paid_fee
+			"GasEater transfer should cost the same as HydraToken transfer: {gas_eater_paid_fee:?} == {hydra_paid_fee:?}"
 		);
 	});
 }
@@ -363,17 +362,13 @@ fn dispatch_with_extra_gas_should_not_refund_extra_gas_correctly() {
 	// Fee charged on tx submit should be higher in the second case
 	assert!(
 		fee_charge_2 > fee_charge_1,
-		"Fee charged on tx submit should be higher in the second case: {:?} > {:?}",
-		fee_charge_2,
-		fee_charge_1
+		"Fee charged on tx submit should be higher in the second case: {fee_charge_2:?} > {fee_charge_1:?}"
 	);
 
 	// the two tx fees should be the same because it should refund correctly the unused gas
 	assert!(
 		actual_fee_paid_1 < actual_fee_paid_2,
-		"Paid fee should be higher for the second tx: {:?} < {:?}",
-		actual_fee_paid_1,
-		actual_fee_paid_2
+		"Paid fee should be higher for the second tx: {actual_fee_paid_1:?} < {actual_fee_paid_2:?}"
 	);
 }
 

integration-tests/src/dispatcher.rs

@@ -834,10 +834,10 @@ fn fees_should_be_applied_correctly_when_min_equals_max_in_dynamic_config() {
 	println!("DOT asset fee: 1% (applied on DOT being sold)");
 	println!("HDX protocol fee: 0.5% (applied on HDX being received)");
 	println!("---");
-	println!("Amount received with zero fees: {}", amount_out_with_zero_fee);
-	println!("Amount received with fees: {}", amount_out_with_fee);
-	println!("Difference: {}", actual_difference);
-	println!("Actual percentage difference: {:.4}%", actual_percentage_value);
+	println!("Amount received with zero fees: {amount_out_with_zero_fee}");
+	println!("Amount received with fees: {amount_out_with_fee}");
+	println!("Difference: {actual_difference}");
+	println!("Actual percentage difference: {actual_percentage_value:.4}%");
 	println!("====================================\n");
 
 	// Verify the fees were applied (should see some difference)
@@ -850,16 +850,10 @@ fn fees_should_be_applied_correctly_when_min_equals_max_in_dynamic_config() {
 
 	assert!(
 		actual_percentage_value >= expected_percentage - tolerance,
-		"Actual fee percentage ({:.4}%) is lower than expected ({:.2}% - {:.2}%)",
-		actual_percentage_value,
-		expected_percentage,
-		tolerance
+		"Actual fee percentage ({actual_percentage_value:.4}%) is lower than expected ({expected_percentage:.2}% - {tolerance:.2}%)"
 	);
 	assert!(
 		actual_percentage_value <= expected_percentage + tolerance,
-		"Actual fee percentage ({:.4}%) is higher than expected ({:.2}% + {:.2}%)",
-		actual_percentage_value,
-		expected_percentage,
-		tolerance
+		"Actual fee percentage ({actual_percentage_value:.4}%) is higher than expected ({expected_percentage:.2}% + {tolerance:.2}%)"
 	);
 }

integration-tests/src/dynamic_fees.rs

@@ -350,7 +350,7 @@ mod account_conversion {
 				ExitReason::Succeed(ExitSucceed::Stopped)
 			);
 
-			println!("{:?}", res);
+			println!("{res:?}");
 		});
 	}
 
@@ -3833,9 +3833,7 @@ fn compare_fee_in_eth_between_evm_and_native_omnipool_calls() {
 		let native_fee = new_alice_currency_balance - alice_currency_balance_pre_dispatch;
 		assert!(
 			evm_fee > native_fee,
-			"assertion failed evm_fee > native fee. Evm fee: {:?} Native fee: {:?}",
-			evm_fee,
-			native_fee
+			"assertion failed evm_fee > native fee. Evm fee: {evm_fee:?} Native fee: {native_fee:?}"
 		);
 
 		let fee_difference = evm_fee - native_fee;
@@ -3846,9 +3844,7 @@ fn compare_fee_in_eth_between_evm_and_native_omnipool_calls() {
 		// EVM fees should be not higher than 20%
 		assert!(
 			relative_fee_difference < tolerated_fee_difference,
-			"relative_fee_difference: {:?} is bigger than tolerated {:?}",
-			relative_fee_difference,
-			tolerated_fee_difference
+			"relative_fee_difference: {relative_fee_difference:?} is bigger than tolerated {tolerated_fee_difference:?}"
 		);
 	})
 }
@@ -4850,7 +4846,10 @@ impl PrecompileHandle for MockHandle {
 	}
 
 	fn log(&mut self, _: H160, _: Vec<H256>, _: Vec<u8>) -> Result<(), ExitError> {
-		unimplemented!()
+		// no-op: tests using this mock handle don't inspect emitted logs;
+		// the precompile (e.g. multicurrency) calls `handle.log(...)` to emit
+		// the ERC-20 Transfer event inline, which we accept silently here.
+		Ok(())
 	}
 
 	fn code_address(&self) -> H160 {

integration-tests/src/evm.rs

@@ -169,9 +169,7 @@ fn compare_fee_in_hdx_between_evm_and_native_omnipool_calls_when_permit_is_dispa
 		// EVM fees should be not higher than 20%
 		assert!(
 			relative_fee_difference < tolerated_fee_difference,
-			"relative_fee_difference: {:?} is bigger than tolerated {:?}",
-			relative_fee_difference,
-			tolerated_fee_difference
+			"relative_fee_difference: {relative_fee_difference:?} is bigger than tolerated {tolerated_fee_difference:?}"
 		);
 	})
 }
@@ -1195,13 +1193,11 @@ fn evm_permit_set_currency_dispatch_should_pay_evm_fee_in_insufficient_asset() {
 			let payed_fee = initial_user_insufficient_balance - user_insufficient_asset_balance;
 			assert!(
 				payed_fee > 50_000_000,
-				"payed_fee: {:?} is less than 50_000_000",
-				payed_fee
+				"payed_fee: {payed_fee:?} is less than 50_000_000"
 			);
 			assert!(
 				payed_fee < 120_000_000,
-				"payed_fee: {:?} is more than 120_000_000",
-				payed_fee
+				"payed_fee: {payed_fee:?} is more than 120_000_000"
 			);
 
 			TransactionOutcome::Commit(DispatchResult::Ok(()))

integration-tests/src/evm_permit.rs

@@ -32,7 +32,7 @@ fn xcm_message_withdraw_deposit(token_location: Location, amount: Balance) -> Xc
 	Xcm(vec![
 		WithdrawAsset(asset.clone().into()),
 		BuyExecution {
-			fees: asset.into(),
+			fees: asset,
 			weight_limit: Unlimited,
 		},
 		DepositReserveAsset {
@@ -54,7 +54,7 @@ fn set_dot_external_and_get_transfer_call() -> hydradx_runtime::RuntimeCall {
 
 	let dot: Asset = Asset {
 		id: cumulus_primitives_core::AssetId(DOT_ASSET_LOCATION.into()),
-		fun: Fungible(1 * UNITS),
+		fun: Fungible(UNITS),
 	};
 
 	let bob_beneficiary = Location::new(
@@ -195,7 +195,7 @@ fn xtokens_transfer_should_fail_when_lockdown_active_and_asset_is_egress() {
 
 		let call = RuntimeCall::XTokens(orml_xtokens::Call::transfer {
 			currency_id: HDX,
-			amount: 1 * UNITS,
+			amount: UNITS,
 			dest: Box::new(bob_location.into_versioned()),
 			dest_weight_limit: WeightLimit::Unlimited,
 		});
@@ -238,7 +238,7 @@ fn on_charge_transaction_skips_global_withdraw_accounting_for_native_asset() {
 		let call = RuntimeCall::System(frame_system::Call::remark { remark: vec![1, 2, 3] });
 
 		// Act
-		let fee_amount = 1 * UNITS;
+		let fee_amount = UNITS;
 		let _ = <hydradx_runtime::Runtime as pallet_transaction_payment::Config>::OnChargeTransaction::withdraw_fee(
 			&alice,
 			&call,
@@ -264,7 +264,7 @@ fn on_charge_transaction_skips_global_withdraw_accounting_for_native_asset() {
 			Currencies::withdraw(
 				HDX,
 				&BOB.into(),
-				1 * UNITS,
+				UNITS,
 				frame_support::traits::ExistenceRequirement::AllowDeath
 			),
 			pallet_circuit_breaker::Error::<hydradx_runtime::Runtime>::WithdrawLockdownActive
@@ -311,7 +311,7 @@ fn on_charge_transaction_skips_global_withdraw_accounting_for_external_asset() {
 		let call = RuntimeCall::System(frame_system::Call::remark { remark: vec![1, 2, 3] });
 
 		// Act
-		let fee_amount = 1 * UNITS;
+		let fee_amount = UNITS;
 		let _ = <hydradx_runtime::Runtime as pallet_transaction_payment::Config>::OnChargeTransaction::withdraw_fee(
 			&alice,
 			&call,
@@ -337,7 +337,7 @@ fn on_charge_transaction_skips_global_withdraw_accounting_for_external_asset() {
 			Currencies::withdraw(
 				DOT,
 				&ALICE.into(),
-				1 * UNITS,
+				UNITS,
 				frame_support::traits::ExistenceRequirement::AllowDeath
 			),
 			pallet_circuit_breaker::Error::<hydradx_runtime::Runtime>::WithdrawLockdownActive
@@ -407,7 +407,7 @@ fn evm_on_charge_transaction_skips_global_withdraw_accounting() {
 			Currencies::withdraw(
 				WETH,
 				&evm_account,
-				1 * UNITS,
+				UNITS,
 				frame_support::traits::ExistenceRequirement::AllowDeath
 			),
 			pallet_circuit_breaker::Error::<hydradx_runtime::Runtime>::WithdrawLockdownActive
@@ -804,7 +804,7 @@ fn dot_external_limit_trigger_fails_then_decays_to_zero() {
 		assert_ok!(AssetRegistry::set_location(DOT, DOT_ASSET_LOCATION));
 
 		let alice: AccountId = ALICE.into();
-		let amount = 1 * UNITS;
+		let amount = UNITS;
 		assert!(
 			Currencies::free_balance(DOT, &alice) >= amount * 3,
 			"Test requires Alice to have enough DOT"
@@ -877,7 +877,7 @@ fn dot_external_lockdown_blocks_withdraw_but_regular_dot_transfer_still_works()
 
 		let alice: AccountId = ALICE.into();
 		let bob: AccountId = BOB.into();
-		let amount = 1 * UNITS;
+		let amount = UNITS;
 		assert!(Currencies::free_balance(DOT, &alice) >= amount * 2);
 		assert_eq!(CircuitBreaker::withdraw_limit_accumulator().0, 0);