From 480ffac2b02d827f36163d56e90f5e99250adf28 Mon Sep 17 00:00:00 2001
From: Erwan Or <erwanor@penumbralabs.xyz>
Date: Tue, 14 Jan 2025 13:26:51 -0800
Subject: [PATCH 1/3] protos(view): add subaccount index to `OwnedPositionIds`
 rpc

---
 crates/proto/src/gen/penumbra.view.v1.rs      |   6 ++++
 .../proto/src/gen/penumbra.view.v1.serde.rs   |  34 ++++++++++++++++++
 .../proto/src/gen/proto_descriptor.bin.no_lfs | Bin 649637 -> 650000 bytes
 proto/penumbra/penumbra/view/v1/view.proto    |   9 +++--
 4 files changed, 46 insertions(+), 3 deletions(-)

diff --git a/crates/proto/src/gen/penumbra.view.v1.rs b/crates/proto/src/gen/penumbra.view.v1.rs
index 5ec54bf491..662c7df3e8 100644
--- a/crates/proto/src/gen/penumbra.view.v1.rs
+++ b/crates/proto/src/gen/penumbra.view.v1.rs
@@ -1543,6 +1543,9 @@ pub struct OwnedPositionIdsRequest {
     pub trading_pair: ::core::option::Option<
         super::super::core::component::dex::v1::TradingPair,
     >,
+    /// If present, return only positions for this subaccount index.
+    #[prost(message, optional, tag = "3")]
+    pub subaccount: ::core::option::Option<super::super::core::keys::v1::AddressIndex>,
 }
 impl ::prost::Name for OwnedPositionIdsRequest {
     const NAME: &'static str = "OwnedPositionIdsRequest";
@@ -1558,6 +1561,9 @@ pub struct OwnedPositionIdsResponse {
     pub position_id: ::core::option::Option<
         super::super::core::component::dex::v1::PositionId,
     >,
+    /// The subaccount this position belongs to.
+    #[prost(message, optional, tag = "2")]
+    pub subaccount: ::core::option::Option<super::super::core::keys::v1::AddressIndex>,
 }
 impl ::prost::Name for OwnedPositionIdsResponse {
     const NAME: &'static str = "OwnedPositionIdsResponse";
diff --git a/crates/proto/src/gen/penumbra.view.v1.serde.rs b/crates/proto/src/gen/penumbra.view.v1.serde.rs
index d5b11ff8db..44858b4f5f 100644
--- a/crates/proto/src/gen/penumbra.view.v1.serde.rs
+++ b/crates/proto/src/gen/penumbra.view.v1.serde.rs
@@ -4196,6 +4196,9 @@ impl serde::Serialize for OwnedPositionIdsRequest {
         if self.trading_pair.is_some() {
             len += 1;
         }
+        if self.subaccount.is_some() {
+            len += 1;
+        }
         let mut struct_ser = serializer.serialize_struct("penumbra.view.v1.OwnedPositionIdsRequest", len)?;
         if let Some(v) = self.position_state.as_ref() {
             struct_ser.serialize_field("positionState", v)?;
@@ -4203,6 +4206,9 @@ impl serde::Serialize for OwnedPositionIdsRequest {
         if let Some(v) = self.trading_pair.as_ref() {
             struct_ser.serialize_field("tradingPair", v)?;
         }
+        if let Some(v) = self.subaccount.as_ref() {
+            struct_ser.serialize_field("subaccount", v)?;
+        }
         struct_ser.end()
     }
 }
@@ -4217,12 +4223,14 @@ impl<'de> serde::Deserialize<'de> for OwnedPositionIdsRequest {
             "positionState",
             "trading_pair",
             "tradingPair",
+            "subaccount",
         ];
 
         #[allow(clippy::enum_variant_names)]
         enum GeneratedField {
             PositionState,
             TradingPair,
+            Subaccount,
             __SkipField__,
         }
         impl<'de> serde::Deserialize<'de> for GeneratedField {
@@ -4247,6 +4255,7 @@ impl<'de> serde::Deserialize<'de> for OwnedPositionIdsRequest {
                         match value {
                             "positionState" | "position_state" => Ok(GeneratedField::PositionState),
                             "tradingPair" | "trading_pair" => Ok(GeneratedField::TradingPair),
+                            "subaccount" => Ok(GeneratedField::Subaccount),
                             _ => Ok(GeneratedField::__SkipField__),
                         }
                     }
@@ -4268,6 +4277,7 @@ impl<'de> serde::Deserialize<'de> for OwnedPositionIdsRequest {
             {
                 let mut position_state__ = None;
                 let mut trading_pair__ = None;
+                let mut subaccount__ = None;
                 while let Some(k) = map_.next_key()? {
                     match k {
                         GeneratedField::PositionState => {
@@ -4282,6 +4292,12 @@ impl<'de> serde::Deserialize<'de> for OwnedPositionIdsRequest {
                             }
                             trading_pair__ = map_.next_value()?;
                         }
+                        GeneratedField::Subaccount => {
+                            if subaccount__.is_some() {
+                                return Err(serde::de::Error::duplicate_field("subaccount"));
+                            }
+                            subaccount__ = map_.next_value()?;
+                        }
                         GeneratedField::__SkipField__ => {
                             let _ = map_.next_value::<serde::de::IgnoredAny>()?;
                         }
@@ -4290,6 +4306,7 @@ impl<'de> serde::Deserialize<'de> for OwnedPositionIdsRequest {
                 Ok(OwnedPositionIdsRequest {
                     position_state: position_state__,
                     trading_pair: trading_pair__,
+                    subaccount: subaccount__,
                 })
             }
         }
@@ -4307,10 +4324,16 @@ impl serde::Serialize for OwnedPositionIdsResponse {
         if self.position_id.is_some() {
             len += 1;
         }
+        if self.subaccount.is_some() {
+            len += 1;
+        }
         let mut struct_ser = serializer.serialize_struct("penumbra.view.v1.OwnedPositionIdsResponse", len)?;
         if let Some(v) = self.position_id.as_ref() {
             struct_ser.serialize_field("positionId", v)?;
         }
+        if let Some(v) = self.subaccount.as_ref() {
+            struct_ser.serialize_field("subaccount", v)?;
+        }
         struct_ser.end()
     }
 }
@@ -4323,11 +4346,13 @@ impl<'de> serde::Deserialize<'de> for OwnedPositionIdsResponse {
         const FIELDS: &[&str] = &[
             "position_id",
             "positionId",
+            "subaccount",
         ];
 
         #[allow(clippy::enum_variant_names)]
         enum GeneratedField {
             PositionId,
+            Subaccount,
             __SkipField__,
         }
         impl<'de> serde::Deserialize<'de> for GeneratedField {
@@ -4351,6 +4376,7 @@ impl<'de> serde::Deserialize<'de> for OwnedPositionIdsResponse {
                     {
                         match value {
                             "positionId" | "position_id" => Ok(GeneratedField::PositionId),
+                            "subaccount" => Ok(GeneratedField::Subaccount),
                             _ => Ok(GeneratedField::__SkipField__),
                         }
                     }
@@ -4371,6 +4397,7 @@ impl<'de> serde::Deserialize<'de> for OwnedPositionIdsResponse {
                     V: serde::de::MapAccess<'de>,
             {
                 let mut position_id__ = None;
+                let mut subaccount__ = None;
                 while let Some(k) = map_.next_key()? {
                     match k {
                         GeneratedField::PositionId => {
@@ -4379,6 +4406,12 @@ impl<'de> serde::Deserialize<'de> for OwnedPositionIdsResponse {
                             }
                             position_id__ = map_.next_value()?;
                         }
+                        GeneratedField::Subaccount => {
+                            if subaccount__.is_some() {
+                                return Err(serde::de::Error::duplicate_field("subaccount"));
+                            }
+                            subaccount__ = map_.next_value()?;
+                        }
                         GeneratedField::__SkipField__ => {
                             let _ = map_.next_value::<serde::de::IgnoredAny>()?;
                         }
@@ -4386,6 +4419,7 @@ impl<'de> serde::Deserialize<'de> for OwnedPositionIdsResponse {
                 }
                 Ok(OwnedPositionIdsResponse {
                     position_id: position_id__,
+                    subaccount: subaccount__,
                 })
             }
         }
diff --git a/crates/proto/src/gen/proto_descriptor.bin.no_lfs b/crates/proto/src/gen/proto_descriptor.bin.no_lfs
index 895f0f725959cf9de6b287980a762aa4d11be6ff..4c9fd7802b5a9aa7677fc3dc5748a000c76c7db3 100644
GIT binary patch
delta 13393
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
JNq(aG{{Y}jqtpNZ

delta 13069
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

diff --git a/proto/penumbra/penumbra/view/v1/view.proto b/proto/penumbra/penumbra/view/v1/view.proto
index 5f1ffb41b5..2af3e5cc52 100644
--- a/proto/penumbra/penumbra/view/v1/view.proto
+++ b/proto/penumbra/penumbra/view/v1/view.proto
@@ -153,8 +153,7 @@ service ViewService {
 
 // There's only one transparent address per wallet, so this request has no parameters;
 // the message exists to satisfy forward-compatibility properties.
-message TransparentAddressRequest {
-}
+message TransparentAddressRequest {}
 
 message TransparentAddressResponse {
   // The raw (binary) transparent address
@@ -700,10 +699,14 @@ message OwnedPositionIdsRequest {
   core.component.dex.v1.PositionState position_state = 1;
   // If present, return only positions for this trading pair.
   core.component.dex.v1.TradingPair trading_pair = 2;
+  // If present, return only positions for this subaccount index.
+  core.keys.v1.AddressIndex subaccount = 3;
 }
 
 message OwnedPositionIdsResponse {
   core.component.dex.v1.PositionId position_id = 1;
+  // The subaccount this position belongs to.
+  core.keys.v1.AddressIndex subaccount = 2;
 }
 
 // Requests information on an asset by asset id
@@ -786,4 +789,4 @@ message UnbondingTokensByAddressIndexResponse {
   // `true` if the `unbonding_delay` (from `StakeParameters`) has passed or the
   // validator has unbonded.
   bool claimable = 2;
-}
\ No newline at end of file
+}

From 4c3c816f1eada38d72875a12592bc906379a7208 Mon Sep 17 00:00:00 2001
From: Erwan Or <erwanor@penumbralabs.xyz>
Date: Tue, 14 Jan 2025 13:59:37 -0800
Subject: [PATCH 2/3] view: ignore the subaccount field in the client/server

---
 crates/view/src/client.rs  | 1 +
 crates/view/src/service.rs | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/crates/view/src/client.rs b/crates/view/src/client.rs
index be7edbccd8..25fdf2315f 100644
--- a/crates/view/src/client.rs
+++ b/crates/view/src/client.rs
@@ -709,6 +709,7 @@ where
                 tonic::Request::new(pb::OwnedPositionIdsRequest {
                     trading_pair: trading_pair.map(TryInto::try_into).transpose()?,
                     position_state: position_state.map(TryInto::try_into).transpose()?,
+                    ..Default::default()
                 }),
             );
 
diff --git a/crates/view/src/service.rs b/crates/view/src/service.rs
index 8e3c8ce26c..cd116b4cfa 100644
--- a/crates/view/src/service.rs
+++ b/crates/view/src/service.rs
@@ -1717,6 +1717,7 @@ impl ViewService for ViewServer {
         let pb::OwnedPositionIdsRequest {
             position_state,
             trading_pair,
+            subaccount: _,
         } = request.into_inner();
 
         let position_state: Option<position::State> = position_state
@@ -1741,6 +1742,9 @@ impl ViewService for ViewServer {
             for id in ids {
                 yield pb::OwnedPositionIdsResponse{
                     position_id: Some(id.into()),
+                    // The rust view server does not index positions by subaccount,
+                    // so this information is invisible to it.
+                    subaccount: None,
                 }
             }
         };

From c5ae0ba99c3ea7680978ee1d45448875daf656a2 Mon Sep 17 00:00:00 2001
From: Erwan Or <erwan.ounn.84@gmail.com>
Date: Fri, 17 Jan 2025 10:23:13 -0800
Subject: [PATCH 3/3] view: use explicit struct instantiation
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Lúcás Meier <lucas@cronokirby.com>
Signed-off-by: Erwan Or <erwan.ounn.84@gmail.com>
---
 crates/view/src/client.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/view/src/client.rs b/crates/view/src/client.rs
index 25fdf2315f..18d3a11a25 100644
--- a/crates/view/src/client.rs
+++ b/crates/view/src/client.rs
@@ -709,7 +709,7 @@ where
                 tonic::Request::new(pb::OwnedPositionIdsRequest {
                     trading_pair: trading_pair.map(TryInto::try_into).transpose()?,
                     position_state: position_state.map(TryInto::try_into).transpose()?,
-                    ..Default::default()
+                    subaccount: None,
                 }),
             );