fix: dispatch with extra gas transaction charges previous currency by khuzama98 · Pull Request #1372 · galacticcouncil/hydration-node

khuzama98 · 2026-02-26T11:20:58Z

Description

Fixes fee currency resolution for dispatch_with_extra_gas wrapping set_currency calls.
When users submitted dispatch_with_extra_gas { set_currency { currency: X } }, the transaction fee was incorrectly charged in the previous account currency instead of the newly specified currency X. Direct set_currency calls worked correctly.

This affected both substrate accounts (issue #1296) and EVM accounts (issue #1293).

Root Cause

The pallet's resolve_currency_from_call function had duplicate currency resolution logic that was missing the dispatch_with_extra_gas handler, while the runtime's TryCallCurrency implementation already handled it correctly. The two resolvers diverged over time.

Fix

Replaced the duplicate pattern-matching logic in resolve_currency_from_call with a simple delegation to T::TryCallCurrency::try_convert(). This ensures both code paths use the same authoritative resolver and eliminates future divergence.

Related Issue

Fixes: #1296 #1293

Motivation and Context

How Has This Been Tested?

Integration tests have been added to test the scenario in which new currencies are being charged successfully.

Checklist:

I have updated the documentation if necessary.
I have added tests to cover my changes, regression test if fixing an issue.
This is a breaking change.

…ng of set_currency calls

github-actions · 2026-02-26T11:22:10Z

Crate versions that have been updated:

runtime-integration-tests: v1.76.2 -> v1.77.0
pallet-transaction-multi-payment: v10.4.0 -> v10.5.0

Runtime version has not been increased.

dmoka · 2026-03-03T08:36:25Z

I cannot run cargo test command from root hydration-node/pallets/transaction-multi-payment, could you please fix that?

you prolly need to do add std feature in cargo.toml, cor currencies

[dev-dependencies]
pallet-currencies = { workspace = true, features = ["std"] }
...

dmoka · 2026-03-03T08:11:33Z

+			bob_btc_after < bob_btc_before,
+			"BTC balance should decrease — fee must be charged in the new currency"
+		);
+		// HDX must not be touched.


Suggested change

// HDX must not be touched.

dmoka · 2026-03-03T08:11:54Z

+			1_000_000_000_000_000_000i128,
+		));
+
+		// EVM accounts have WETH automatically set as their fee currency on account creation


Suggested change

// EVM accounts have WETH automatically set as their fee currency on account creation

dmoka · 2026-03-03T08:12:20Z

+		let weth_after = hydradx_runtime::Tokens::free_balance(WETH, &evm_acc);
+		let dai_after = hydradx_runtime::Tokens::free_balance(DAI, &evm_acc);
+
+		// Fee must be charged in DAI (the new currency), not WETH (EVM default).


Suggested change

// Fee must be charged in DAI (the new currency), not WETH (EVM default).

i am removing these comments because in the assert you place very similar error message, so the comments feel redundant. small details...

dmoka · 2026-03-03T08:13:02Z

+			dai_after < dai_before,
+			"DAI balance should decrease — fee must be charged in the new currency"
+		);
+		// WETH must not be touched.


Suggested change

// WETH must not be touched.

dmoka · 2026-03-03T08:13:14Z

+
+		let bob_btc_after = hydradx_runtime::Tokens::free_balance(BTC, &AccountId::from(BOB));
+
+		// BTC must not be charged — the resolver did not reach the nested set_currency.


Suggested change

// BTC must not be charged — the resolver did not reach the nested set_currency.

dmoka · 2026-03-03T08:45:12Z

 impl<T, MC, DF, FR, WF> TransferFees<T, MC, DF, FR, WF>
 where
-	T: Config + pallet_utility::Config,
+	T: Config,


i think you can do the same bound cleanups in the OnChargeTransaction impl for TransferFees

…-node into fix/set-currency-charges

…proved clarity and consistency

…-node into fix/set-currency-charges

…and runtime-integration-tests

Copilot

Pull request overview

Fixes fee-currency resolution for set_currency when it is wrapped by dispatch_with_extra_gas, ensuring transaction fees are charged in the newly selected currency (matching the runtime’s authoritative call-to-currency resolver) and adds integration coverage for both Substrate and EVM accounts.

Changes:

Remove duplicated call-pattern matching in TransferFees::resolve_currency_from_call and delegate to T::TryCallCurrency::try_convert.
Update test mock configuration to use a call-currency converter that recognizes set_currency/batch patterns.
Add integration tests covering dispatch_with_extra_gas { set_currency } for both Substrate and EVM accounts, plus a negative test for deeper nesting; bump runtime/pallet versions accordingly.

Reviewed changes

Copilot reviewed 7 out of 8 changed files in this pull request and generated 2 comments.

Show a summary per file

File	Description
runtime/hydradx/src/lib.rs	Bumps runtime `spec_version` to reflect the behavior change.
runtime/hydradx/Cargo.toml	Bumps runtime crate version.
pallets/transaction-multi-payment/src/lib.rs	Delegates fee-currency resolution to `T::TryCallCurrency` to avoid divergence and fix the dispatcher-wrapped `set_currency` case.
pallets/transaction-multi-payment/src/mock.rs	Switches test runtime to a call-currency resolver that supports `set_currency` + utility batching patterns.
pallets/transaction-multi-payment/Cargo.toml	Bumps pallet version and adjusts std/dev-dependency features for test/build compatibility.
integration-tests/src/non_native_fee.rs	Adds regression tests for dispatcher-wrapped `set_currency` fee charging (Substrate + EVM) and a nested-negative case.
integration-tests/Cargo.toml	Bumps integration tests crate version.
Cargo.lock	Updates lockfile for the version bumps.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2026-04-10T06:49:35Z

+/// (which requires `pallet_dispatcher` dependency).
+pub struct TestCallCurrency<T>(PhantomData<T>);


TestCallCurrency is documented as “Test-only” but is defined in the main pallet module without any cfg(test)/feature gating. This makes it part of the pallet’s public API (and can be accidentally used in production runtimes), and can also increase compiled artifact size/complexity unnecessarily. Consider moving this helper into mock.rs (or a #[cfg(test)] module) or gating the type/impl behind #[cfg(test)] (or a dedicated test feature) so it’s only available for unit tests.

Suggested change

/// (which requires `pallet_dispatcher` dependency).

pub struct TestCallCurrency<T>(PhantomData<T>);

/// (which requires `pallet_dispatcher` dependency).

#[cfg(test)]

pub struct TestCallCurrency<T>(PhantomData<T>);

#[cfg(test)]

Copilot · 2026-04-10T06:49:35Z

 use crate::polkadot_test_net::*;
+use frame_support::sp_runtime::codec::Encode;
 use frame_support::{
 	assert_ok,
-	dispatch::DispatchInfo,
+	dispatch::{DispatchInfo, GetDispatchInfo},
 	sp_runtime::{traits::DispatchTransaction, FixedU128, Permill},


In integration tests, other modules import Encode directly from sp_runtime::codec::Encode rather than via the frame_support::sp_runtime re-export. For consistency (and to avoid relying on a re-export that could change), consider switching this import to sp_runtime::codec::Encode like the other integration test files.

github-actions · 2026-04-10T13:54:34Z

Quick benchmark at commit 889ad50 has been executed successfully.
View results

Refactor currency resolution logic in TransferFees to simplify handli…

a22e502

…ng of set_currency calls

khuzama98 requested review from cl0w5 and enthusiastmartin February 26, 2026 11:20

Implement TestCallCurrency for unit tests to handle set_currency calls

9583536

dmoka approved these changes Mar 3, 2026

View reviewed changes

khuzama98 added 2 commits March 4, 2026 15:44

Merge branch 'master' of https://github.com/galacticcouncil/hydration…

032aa1e

…-node into fix/set-currency-charges

Refactor currency handling in transaction multi-payment pallet for im…

71dd4ab

…proved clarity and consistency

khuzama98 requested a review from dmoka March 5, 2026 08:58

enthusiastmartin and others added 5 commits March 6, 2026 11:28

Merge branch 'master' into fix/set-currency-charges

4ca9ccd

Merge branch 'master' of https://github.com/galacticcouncil/hydration…

0609686

…-node into fix/set-currency-charges

Merge branch 'master' into fix/set-currency-charges

a45a1ef

Merge branch 'master' into fix/set-currency-charges

4680d13

Merge branch 'master' into fix/set-currency-charges

fae3fdc

mrq1911 enabled auto-merge April 9, 2026 11:39

bump versions for hydradx-runtime, pallet-transaction-multi-payment, …

4a37508

…and runtime-integration-tests

Copilot AI review requested due to automatic review settings April 10, 2026 06:45

Copilot started reviewing on behalf of khuzama98 April 10, 2026 06:46 View session

Copilot AI reviewed Apr 10, 2026

View reviewed changes

khuzama98 and others added 3 commits April 10, 2026 13:08

Merge branch 'master' into fix/set-currency-charges

6c15136

refactor: simplify currency setting logic in transaction calls

80d077c

Merge branch 'master' into fix/set-currency-charges

889ad50

mrq1911 merged commit ff231b0 into master Apr 10, 2026
10 checks passed


		let bob_btc_after = hydradx_runtime::Tokens::free_balance(BTC, &AccountId::from(BOB));

		// BTC must not be charged — the resolver did not reach the nested set_currency.

		/// (which requires `pallet_dispatcher` dependency).
		pub struct TestCallCurrency<T>(PhantomData<T>);

Conversation

khuzama98 commented Feb 26, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Root Cause

Fix

Related Issue

Motivation and Context

How Has This Been Tested?

Checklist:

Uh oh!

github-actions bot commented Feb 26, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

dmoka commented Mar 3, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

dmoka Mar 3, 2026

Choose a reason for hiding this comment

Uh oh!

dmoka Mar 3, 2026

Choose a reason for hiding this comment

Uh oh!

dmoka Mar 3, 2026

Choose a reason for hiding this comment

Uh oh!

dmoka Mar 3, 2026

Choose a reason for hiding this comment

Uh oh!

dmoka Mar 3, 2026

Choose a reason for hiding this comment

Uh oh!

dmoka Mar 3, 2026

Choose a reason for hiding this comment

Uh oh!

dmoka Mar 3, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Copilot AI Apr 10, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Apr 10, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

github-actions bot commented Apr 10, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

khuzama98 commented Feb 26, 2026 •

edited

Loading

github-actions bot commented Feb 26, 2026 •

edited

Loading

dmoka commented Mar 3, 2026 •

edited

Loading