From c15a457e80e90afdcf7ab304a31d523173946d9f Mon Sep 17 00:00:00 2001
From: toteki <63419657+toteki@users.noreply.github.com>
Date: Thu, 12 Jan 2023 18:02:42 -0700
Subject: [PATCH 1/2] fix: skip blacklisted tokens in QueryMaxBorrow and
 QueryMaxWithdraw

---
 CHANGELOG.md                    | 1 +
 x/leverage/keeper/grpc_query.go | 8 ++++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 79101814db..74954b9d87 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -53,6 +53,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
 ### Fixes
 
 - [1680](https://github.com/umee-network/umee/pull/1680) Add amino support for MsgMaxWithdraw.
+- [XXXX](https://github.com/umee-network/umee/pull/XXXX) Skip blacklisted tokens in MaxBorrow and MAxWithdraw queries.
 
 ### Features
 
diff --git a/x/leverage/keeper/grpc_query.go b/x/leverage/keeper/grpc_query.go
index 31a6f14f20..3d537b3d4b 100644
--- a/x/leverage/keeper/grpc_query.go
+++ b/x/leverage/keeper/grpc_query.go
@@ -298,7 +298,9 @@ func (q Querier) MaxWithdraw(
 	} else {
 		// Denom not specified
 		for _, t := range q.Keeper.GetAllRegisteredTokens(ctx) {
-			denoms = append(denoms, t.BaseDenom)
+			if !t.Blacklist {
+				denoms = append(denoms, t.BaseDenom)
+			}
 		}
 	}
 
@@ -359,7 +361,9 @@ func (q Querier) MaxBorrow(
 	} else {
 		// Denom not specified
 		for _, t := range q.Keeper.GetAllRegisteredTokens(ctx) {
-			denoms = append(denoms, t.BaseDenom)
+			if !t.Blacklist {
+				denoms = append(denoms, t.BaseDenom)
+			}
 		}
 	}
 

From d8df8b5d656359c7540eabd899440279a97c0cdf Mon Sep 17 00:00:00 2001
From: Adam Moser <63419657+toteki@users.noreply.github.com>
Date: Thu, 12 Jan 2023 18:03:37 -0700
Subject: [PATCH 2/2] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 74954b9d87..6dacc5c10a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -53,7 +53,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
 ### Fixes
 
 - [1680](https://github.com/umee-network/umee/pull/1680) Add amino support for MsgMaxWithdraw.
-- [XXXX](https://github.com/umee-network/umee/pull/XXXX) Skip blacklisted tokens in MaxBorrow and MAxWithdraw queries.
+- [1710](https://github.com/umee-network/umee/pull/1710) Skip blacklisted tokens in MaxBorrow and MaxWithdraw queries.
 
 ### Features