From a70845a6f86721e8cd60238b20c59e46f5c0ef84 Mon Sep 17 00:00:00 2001
From: Gijs van Dam <gijs@lightning.engineering>
Date: Wed, 18 Sep 2024 17:50:50 +0200
Subject: [PATCH] fixup! taprpc: Add 'include_leased' flag to ListBalances

---
 taprpc/taprootassets.pb.go        | 38 +++++++++++++++----------------
 taprpc/taprootassets.swagger.json | 14 ++++++------
 2 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/taprpc/taprootassets.pb.go b/taprpc/taprootassets.pb.go
index 900ae248a..15fbaf63b 100644
--- a/taprpc/taprootassets.pb.go
+++ b/taprpc/taprootassets.pb.go
@@ -2259,15 +2259,15 @@ type ListBalancesRequest struct {
 	//	*ListBalancesRequest_AssetId
 	//	*ListBalancesRequest_GroupKey
 	GroupBy isListBalancesRequest_GroupBy `protobuf_oneof:"group_by"`
-	// An option to include previous leased assets in the balances.
-	IncludeLeased bool `protobuf:"varint,3,opt,name=include_leased,json=includeLeased,proto3" json:"include_leased,omitempty"`
 	// If the query results should grouped by asset ids, then an optional asset
 	// filter may be provided to query balance of a specific asset.
-	AssetFilter []byte `protobuf:"bytes,4,opt,name=asset_filter,json=assetFilter,proto3" json:"asset_filter,omitempty"`
+	AssetFilter []byte `protobuf:"bytes,3,opt,name=asset_filter,json=assetFilter,proto3" json:"asset_filter,omitempty"`
 	// If the query results should be grouped by group keys, then an optional
 	// group key filter may be provided to query the balance of a specific
 	// asset group.
-	GroupKeyFilter []byte `protobuf:"bytes,5,opt,name=group_key_filter,json=groupKeyFilter,proto3" json:"group_key_filter,omitempty"`
+	GroupKeyFilter []byte `protobuf:"bytes,4,opt,name=group_key_filter,json=groupKeyFilter,proto3" json:"group_key_filter,omitempty"`
+	// An option to include previous leased assets in the balances.
+	IncludeLeased bool `protobuf:"varint,5,opt,name=include_leased,json=includeLeased,proto3" json:"include_leased,omitempty"`
 }
 
 func (x *ListBalancesRequest) Reset() {
@@ -2323,13 +2323,6 @@ func (x *ListBalancesRequest) GetGroupKey() bool {
 	return false
 }
 
-func (x *ListBalancesRequest) GetIncludeLeased() bool {
-	if x != nil {
-		return x.IncludeLeased
-	}
-	return false
-}
-
 func (x *ListBalancesRequest) GetAssetFilter() []byte {
 	if x != nil {
 		return x.AssetFilter
@@ -2344,6 +2337,13 @@ func (x *ListBalancesRequest) GetGroupKeyFilter() []byte {
 	return nil
 }
 
+func (x *ListBalancesRequest) GetIncludeLeased() bool {
+	if x != nil {
+		return x.IncludeLeased
+	}
+	return false
+}
+
 type isListBalancesRequest_GroupBy interface {
 	isListBalancesRequest_GroupBy()
 }
@@ -6091,14 +6091,14 @@ var file_taprootassets_proto_rawDesc = []byte{
 	0x73, 0x65, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x48, 0x00, 0x52, 0x07,
 	0x61, 0x73, 0x73, 0x65, 0x74, 0x49, 0x64, 0x12, 0x1d, 0x0a, 0x09, 0x67, 0x72, 0x6f, 0x75, 0x70,
 	0x5f, 0x6b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x48, 0x00, 0x52, 0x08, 0x67, 0x72,
-	0x6f, 0x75, 0x70, 0x4b, 0x65, 0x79, 0x12, 0x25, 0x0a, 0x0e, 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64,
-	0x65, 0x5f, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0d,
-	0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x4c, 0x65, 0x61, 0x73, 0x65, 0x64, 0x12, 0x21, 0x0a,
-	0x0c, 0x61, 0x73, 0x73, 0x65, 0x74, 0x5f, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x18, 0x04, 0x20,
-	0x01, 0x28, 0x0c, 0x52, 0x0b, 0x61, 0x73, 0x73, 0x65, 0x74, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72,
-	0x12, 0x28, 0x0a, 0x10, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x5f, 0x6b, 0x65, 0x79, 0x5f, 0x66, 0x69,
-	0x6c, 0x74, 0x65, 0x72, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0e, 0x67, 0x72, 0x6f, 0x75,
-	0x70, 0x4b, 0x65, 0x79, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x42, 0x0a, 0x0a, 0x08, 0x67, 0x72,
+	0x6f, 0x75, 0x70, 0x4b, 0x65, 0x79, 0x12, 0x21, 0x0a, 0x0c, 0x61, 0x73, 0x73, 0x65, 0x74, 0x5f,
+	0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0b, 0x61, 0x73,
+	0x73, 0x65, 0x74, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x12, 0x28, 0x0a, 0x10, 0x67, 0x72, 0x6f,
+	0x75, 0x70, 0x5f, 0x6b, 0x65, 0x79, 0x5f, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x18, 0x04, 0x20,
+	0x01, 0x28, 0x0c, 0x52, 0x0e, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x4b, 0x65, 0x79, 0x46, 0x69, 0x6c,
+	0x74, 0x65, 0x72, 0x12, 0x25, 0x0a, 0x0e, 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x5f, 0x6c,
+	0x65, 0x61, 0x73, 0x65, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0d, 0x69, 0x6e, 0x63,
+	0x6c, 0x75, 0x64, 0x65, 0x4c, 0x65, 0x61, 0x73, 0x65, 0x64, 0x42, 0x0a, 0x0a, 0x08, 0x67, 0x72,
 	0x6f, 0x75, 0x70, 0x5f, 0x62, 0x79, 0x22, 0x62, 0x0a, 0x0c, 0x41, 0x73, 0x73, 0x65, 0x74, 0x42,
 	0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x12, 0x38, 0x0a, 0x0d, 0x61, 0x73, 0x73, 0x65, 0x74, 0x5f,
 	0x67, 0x65, 0x6e, 0x65, 0x73, 0x69, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e,
diff --git a/taprpc/taprootassets.swagger.json b/taprpc/taprootassets.swagger.json
index a26c7f14b..37bb3f60a 100644
--- a/taprpc/taprootassets.swagger.json
+++ b/taprpc/taprootassets.swagger.json
@@ -253,13 +253,6 @@
             "required": false,
             "type": "boolean"
           },
-          {
-            "name": "include_leased",
-            "description": "An option to include previous leased assets in the balances.",
-            "in": "query",
-            "required": false,
-            "type": "boolean"
-          },
           {
             "name": "asset_filter",
             "description": "If the query results should grouped by asset ids, then an optional asset\nfilter may be provided to query balance of a specific asset.",
@@ -275,6 +268,13 @@
             "required": false,
             "type": "string",
             "format": "byte"
+          },
+          {
+            "name": "include_leased",
+            "description": "An option to include previous leased assets in the balances.",
+            "in": "query",
+            "required": false,
+            "type": "boolean"
           }
         ],
         "tags": [