From 9ed7177c95fe7f5d3a47e49ced3c71dacf65c881 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Zemanovi=C4=8D?= <tomas@heliax.dev>
Date: Wed, 22 Feb 2023 09:53:42 +0000
Subject: [PATCH 1/3] shared/ledger/queries: add token balance client-only
 method

---
 shared/src/ledger/queries/vp/token.rs | 39 +++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/shared/src/ledger/queries/vp/token.rs b/shared/src/ledger/queries/vp/token.rs
index cbad27005f..1a2ab3a1bd 100644
--- a/shared/src/ledger/queries/vp/token.rs
+++ b/shared/src/ledger/queries/vp/token.rs
@@ -1,3 +1,5 @@
+//! Token validity predicate queries
+
 use namada_core::ledger::storage::{DBIter, StorageHasher, DB};
 use namada_core::ledger::storage_api;
 use namada_core::ledger::storage_api::token::read_denom;
@@ -41,3 +43,40 @@ where
 {
     read_denom(ctx.wl_storage, &addr, None)
 }
+
+#[cfg(any(test, feature = "async-client"))]
+pub mod client_only_methods {
+    use borsh::BorshDeserialize;
+
+    use super::Token;
+    use crate::ledger::queries::{Client, RPC};
+    use crate::types::address::Address;
+    use crate::types::token;
+
+    impl Token {
+        /// Get the balance of the given `token` belonging to the given `owner`.
+        pub async fn balance<CLIENT>(
+            &self,
+            client: &CLIENT,
+            token: &Address,
+            owner: &Address,
+        ) -> Result<token::Amount, <CLIENT as Client>::Error>
+        where
+            CLIENT: Client + Sync,
+        {
+            let balance_key = token::balance_key(token, owner);
+            let response = RPC
+                .shell()
+                .storage_value(client, None, None, false, &balance_key)
+                .await?;
+
+            let balance = if response.data.is_empty() {
+                token::Amount::default()
+            } else {
+                token::Amount::try_from_slice(&response.data)
+                    .unwrap_or_default()
+            };
+            Ok(balance)
+        }
+    }
+}

From 223753f65f852ae67f48c0eb1de5bd509ab4420c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Zemanovi=C4=8D?= <tomas@heliax.dev>
Date: Wed, 22 Feb 2023 09:56:08 +0000
Subject: [PATCH 2/3] client/rpc: use the new token balance method

---
 apps/src/lib/client/rpc.rs | 2 +-
 apps/src/lib/client/tx.rs  | 3 +--
 shared/src/ledger/rpc.rs   | 8 ++++----
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/apps/src/lib/client/rpc.rs b/apps/src/lib/client/rpc.rs
index 44955967d0..38f79b83c1 100644
--- a/apps/src/lib/client/rpc.rs
+++ b/apps/src/lib/client/rpc.rs
@@ -1098,7 +1098,7 @@ pub async fn get_token_balance<C: namada::ledger::queries::Client + Sync>(
     client: &C,
     token: &Address,
     owner: &Address,
-) -> Option<token::Amount> {
+) -> token::Amount {
     namada::ledger::rpc::get_token_balance(client, token, owner).await
 }
 
diff --git a/apps/src/lib/client/tx.rs b/apps/src/lib/client/tx.rs
index d70f8c7e6f..0b228e6a2b 100644
--- a/apps/src/lib/client/tx.rs
+++ b/apps/src/lib/client/tx.rs
@@ -702,8 +702,7 @@ where
 
         let balance =
             rpc::get_token_balance(client, &ctx.native_token, &proposal.author)
-                .await
-                .unwrap_or_default();
+                .await;
         if balance
             < token::Amount::from_uint(
                 governance_parameters.min_proposal_fund,
diff --git a/shared/src/ledger/rpc.rs b/shared/src/ledger/rpc.rs
index 90d05ebd13..5979229721 100644
--- a/shared/src/ledger/rpc.rs
+++ b/shared/src/ledger/rpc.rs
@@ -36,7 +36,6 @@ use crate::types::governance::{ProposalVote, VotePower};
 use crate::types::hash::Hash;
 use crate::types::key::*;
 use crate::types::storage::{BlockHeight, BlockResults, Epoch, PrefixValue};
-use crate::types::token::balance_key;
 use crate::types::{storage, token};
 
 /// Query the status of a given transaction.
@@ -137,9 +136,10 @@ pub async fn get_token_balance<C: crate::ledger::queries::Client + Sync>(
     client: &C,
     token: &Address,
     owner: &Address,
-) -> Option<token::Amount> {
-    let balance_key = balance_key(token, owner);
-    query_storage_value(client, &balance_key).await
+) -> token::Amount {
+    unwrap_client_response::<C, _>(
+        RPC.vp().token().balance(client, token, owner).await,
+    )
 }
 
 /// Get account's public key stored in its storage sub-space

From d03df95e8774d314e42d1ac571c0f3b109efb35a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Zemanovi=C4=8D?= <tomas@heliax.dev>
Date: Wed, 12 Jul 2023 08:54:50 +0100
Subject: [PATCH 3/3] changelog: add #1173

---
 .changelog/unreleased/improvements/1173-token-balance-query.md | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 .changelog/unreleased/improvements/1173-token-balance-query.md

diff --git a/.changelog/unreleased/improvements/1173-token-balance-query.md b/.changelog/unreleased/improvements/1173-token-balance-query.md
new file mode 100644
index 0000000000..e5a9ea2322
--- /dev/null
+++ b/.changelog/unreleased/improvements/1173-token-balance-query.md
@@ -0,0 +1,2 @@
+- Added a reusable token balance query method.
+  ([\#1173](https://github.com/anoma/namada/pull/1173))
\ No newline at end of file