From 4b339b43ea1d1e500bef245499d666fefd6aea14 Mon Sep 17 00:00:00 2001
From: Dino Pacandi <dino.pacandi@gmail.com>
Date: Sat, 16 Nov 2024 01:04:40 +0700
Subject: [PATCH 1/3] Zero refund check for FungibleAdapter

---
 .../frame/transaction-payment/src/payment.rs  | 17 +++++----
 .../frame/transaction-payment/src/tests.rs    | 37 +++++++++++++++++++
 2 files changed, 46 insertions(+), 8 deletions(-)

diff --git a/substrate/frame/transaction-payment/src/payment.rs b/substrate/frame/transaction-payment/src/payment.rs
index 4b39cd3fe53b..b8a047fee3e6 100644
--- a/substrate/frame/transaction-payment/src/payment.rs
+++ b/substrate/frame/transaction-payment/src/payment.rs
@@ -155,14 +155,15 @@ where
 		if let Some(paid) = already_withdrawn {
 			// Calculate how much refund we should return
 			let refund_amount = paid.peek().saturating_sub(corrected_fee);
-			// refund to the the account that paid the fees if it exists. otherwise, don't refind
-			// anything.
-			let refund_imbalance = if F::total_balance(who) > F::Balance::zero() {
-				F::deposit(who, refund_amount, Precision::BestEffort)
-					.unwrap_or_else(|_| Debt::<T::AccountId, F>::zero())
-			} else {
-				Debt::<T::AccountId, F>::zero()
-			};
+			// Refund to the the account that paid the fees if it exists & refund is non-zero.
+			// Otherwise, don't refund anything.
+			let refund_imbalance =
+				if refund_amount > Zero::zero() && F::total_balance(who) > F::Balance::zero() {
+					F::deposit(who, refund_amount, Precision::BestEffort)
+						.unwrap_or_else(|_| Debt::<T::AccountId, F>::zero())
+				} else {
+					Debt::<T::AccountId, F>::zero()
+				};
 			// merge the imbalance caused by paying the fees and refunding parts of it again.
 			let adjusted_paid: Credit<T::AccountId, F> = paid
 				.offset(refund_imbalance)
diff --git a/substrate/frame/transaction-payment/src/tests.rs b/substrate/frame/transaction-payment/src/tests.rs
index dde696f09c2a..ca108d227bab 100644
--- a/substrate/frame/transaction-payment/src/tests.rs
+++ b/substrate/frame/transaction-payment/src/tests.rs
@@ -863,3 +863,40 @@ fn no_fee_and_no_weight_for_other_origins() {
 		assert_eq!(post_info.actual_weight, Some(info.call_weight));
 	})
 }
+
+#[test]
+fn fungible_adapter_no_zero_refund_action() {
+	type FungibleAdapterT = payment::FungibleAdapter<Balances, DealWithFees>;
+
+	ExtBuilder::default().balance_factor(10).build().execute_with(|| {
+		System::set_block_number(10);
+
+		let dummy_acc = 1;
+		let (actual_fee, no_tip) = (10, 0);
+		let already_paid = <FungibleAdapterT as OnChargeTransaction<Runtime>>::withdraw_fee(
+			&dummy_acc,
+			CALL,
+			&CALL.get_dispatch_info(),
+			actual_fee,
+			no_tip,
+		).expect("Account must have enough funds.");
+
+		// Correction action with no expected side effect.
+		assert!(<FungibleAdapterT as OnChargeTransaction<Runtime>>::correct_and_deposit_fee(
+			&dummy_acc,
+			&CALL.get_dispatch_info(),
+			&default_post_info(),
+			actual_fee,
+			no_tip,
+			already_paid,
+		).is_ok());
+
+		// Ensure no zero amount deposit event is emitted.
+		let events = System::events();
+		assert!(!events
+			.iter()
+			.any(|record| matches!(record.event, RuntimeEvent::Balances(pallet_balances::Event::Deposit { amount, .. }) if amount.is_zero())),
+    		"No zero amount deposit amount event should be emitted.",
+		);
+	});
+}

From 92c42161d6b344832794d5f93dc23ee7a43f3067 Mon Sep 17 00:00:00 2001
From: GitHub Action <action@github.com>
Date: Fri, 15 Nov 2024 20:11:55 +0000
Subject: [PATCH 2/3] Update from franciscoaguirre running command 'prdoc'

---
 prdoc/pr_6506.prdoc | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 prdoc/pr_6506.prdoc

diff --git a/prdoc/pr_6506.prdoc b/prdoc/pr_6506.prdoc
new file mode 100644
index 000000000000..5f894a3cb1db
--- /dev/null
+++ b/prdoc/pr_6506.prdoc
@@ -0,0 +1,10 @@
+title: Zero refund check for FungibleAdapter
+doc:
+- audience: Todo
+  description: |-
+    `FungibleAdapter` will now check if the _refund amount_ is zero before calling deposit & emitting an event.
+
+    Fixes https://github.com/paritytech/polkadot-sdk/issues/6469.
+crates:
+- name: pallet-transaction-payment
+  bump: major

From cd48560480f78c3b6c18b0dfa755fb167d7d17cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dino=20Pa=C4=8Dandi?=
 <3002868+Dinonard@users.noreply.github.com>
Date: Sat, 16 Nov 2024 10:06:23 +0700
Subject: [PATCH 3/3] Update pr_6506.prdoc

---
 prdoc/pr_6506.prdoc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/prdoc/pr_6506.prdoc b/prdoc/pr_6506.prdoc
index 5f894a3cb1db..7c6164a9959a 100644
--- a/prdoc/pr_6506.prdoc
+++ b/prdoc/pr_6506.prdoc
@@ -1,10 +1,10 @@
 title: Zero refund check for FungibleAdapter
 doc:
-- audience: Todo
+- audience: Runtime User
   description: |-
     `FungibleAdapter` will now check if the _refund amount_ is zero before calling deposit & emitting an event.
 
     Fixes https://github.com/paritytech/polkadot-sdk/issues/6469.
 crates:
 - name: pallet-transaction-payment
-  bump: major
+  bump: patch