From 5dfc94fb241314662b68eb16ab4efc20550a0206 Mon Sep 17 00:00:00 2001
From: Jeeyong Um <conr2d@proton.me>
Date: Thu, 2 Jan 2025 16:38:15 +0800
Subject: [PATCH] refactor: Make AccountData return an empty vec by default

---
 frame/solana/src/lib.rs          | 9 +++++++--
 frame/solana/src/runtime/bank.rs | 7 ++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/frame/solana/src/lib.rs b/frame/solana/src/lib.rs
index 2b66b60f..6473ff60 100644
--- a/frame/solana/src/lib.rs
+++ b/frame/solana/src/lib.rs
@@ -204,8 +204,13 @@ pub mod pallet {
 
 	#[pallet::storage]
 	#[pallet::getter(fn account_data)]
-	pub type AccountData<T: Config> =
-		StorageMap<_, Twox64Concat, T::AccountId, BoundedVec<u8, T::MaxPermittedDataLength>>;
+	pub type AccountData<T: Config> = StorageMap<
+		_,
+		Twox64Concat,
+		T::AccountId,
+		BoundedVec<u8, T::MaxPermittedDataLength>,
+		ValueQuery,
+	>;
 
 	#[pallet::genesis_config]
 	#[derive_where(Default)]
diff --git a/frame/solana/src/runtime/bank.rs b/frame/solana/src/runtime/bank.rs
index 97eadad1..92ee2b65 100644
--- a/frame/solana/src/runtime/bank.rs
+++ b/frame/solana/src/runtime/bank.rs
@@ -560,13 +560,10 @@ impl<T: Config> TransactionProcessingCallback for Bank<T> {
 		let account = <AccountMeta<T>>::get(&pubkey)?;
 		let lamports =
 			<Lamports<T>>::new(T::Currency::reducible_balance(&pubkey, Preserve, Polite));
-		let data = <AccountData<T>>::get(&pubkey);
+		let data = <AccountData<T>>::get(&pubkey).into();
 		Some(AccountSharedData::from(Account {
 			lamports: lamports.get(),
-			data: match data {
-				Some(data) => data.into(),
-				None => vec![],
-			},
+			data,
 			owner: account.owner,
 			executable: account.executable,
 			rent_epoch: account.rent_epoch,