From 1b2dd6117bd04afa7ecd8e45b2d63be0460daab5 Mon Sep 17 00:00:00 2001
From: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Date: Mon, 22 Feb 2021 12:32:41 +0100
Subject: [PATCH] Allow `transfer_keep_alive` to transfer all free balance
 (#8125)

---
 substrate/frame/balances/src/lib.rs   |  2 +-
 substrate/frame/balances/src/tests.rs | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/substrate/frame/balances/src/lib.rs b/substrate/frame/balances/src/lib.rs
index ddaab519fa..cc82497293 100644
--- a/substrate/frame/balances/src/lib.rs
+++ b/substrate/frame/balances/src/lib.rs
@@ -1069,7 +1069,7 @@ impl<T: Config<I>, I: 'static> Currency<T::AccountId> for Pallet<T, I> where
 						//   may not even be a provider.
 						let allow_death = existence_requirement == ExistenceRequirement::AllowDeath;
 						let allow_death = allow_death && !system::Pallet::<T>::is_provider_required(transactor);
-						ensure!(allow_death || from_account.free >= ed, Error::<T, I>::KeepAlive);
+						ensure!(allow_death || from_account.total() >= ed, Error::<T, I>::KeepAlive);
 
 						Ok(())
 					}
diff --git a/substrate/frame/balances/src/tests.rs b/substrate/frame/balances/src/tests.rs
index ef5823b3bc..776cda140e 100644
--- a/substrate/frame/balances/src/tests.rs
+++ b/substrate/frame/balances/src/tests.rs
@@ -961,5 +961,18 @@ macro_rules! decl_tests {
 					assert_storage_noop!(assert_eq!(Balances::slash(&1337, 42).1, 42));
 				});
 		}
+
+		#[test]
+		fn transfer_keep_alive_all_free_succeed() {
+			<$ext_builder>::default()
+				.existential_deposit(100)
+				.build()
+				.execute_with(|| {
+					assert_ok!(Balances::set_balance(Origin::root(), 1, 100, 100));
+					assert_ok!(Balances::transfer_keep_alive(Some(1).into(), 2, 100));
+					assert_eq!(Balances::total_balance(&1), 100);
+					assert_eq!(Balances::total_balance(&2), 100);
+				});
+		}
 	}
 }