Support PositionClose within the planner

proto/proto/buf.lock

@@ -8,7 +8,7 @@ deps:
   - remote: buf.build
     owner: cosmos
     repository: cosmos-sdk
-    commit: c45ce7be3e1c4556a8fe3c045379277c
+    commit: 172f6ce4e9054eb4af8b96e8131da354
   - remote: buf.build
     owner: cosmos
     repository: gogo-proto

transaction/src/effect_hash.rs

@@ -230,6 +230,9 @@ impl TransactionPlan {
         for position_open in self.position_openings() {
             state.update(position_open.effect_hash().as_bytes());
         }
+        for position_close in self.position_closings() {
+            state.update(position_close.effect_hash().as_bytes());
+        }
         let num_clues = self.clue_plans.len() as u32;
         state.update(&num_clues.to_le_bytes());
         for clue_plan in self.clue_plans() {

transaction/src/plan.rs

@@ -10,8 +10,8 @@ use rand::{CryptoRng, Rng};
 use serde::{Deserialize, Serialize};
 
 use crate::action::{
-    DaoDeposit, DaoOutput, DaoSpend, Delegate, IbcAction, PositionOpen, ProposalDepositClaim,
-    ProposalSubmit, ProposalWithdraw, Undelegate, ValidatorVote,
+    DaoDeposit, DaoOutput, DaoSpend, Delegate, IbcAction, PositionClose, PositionOpen,
+    ProposalDepositClaim, ProposalSubmit, ProposalWithdraw, Undelegate, ValidatorVote,
 };
 
 mod action;
@@ -226,6 +226,16 @@ impl TransactionPlan {
         })
     }
 
+    pub fn position_closings(&self) -> impl Iterator<Item = &PositionClose> {
+        self.actions.iter().filter_map(|action| {
+            if let ActionPlan::PositionClose(v) = action {
+                Some(v)
+            } else {
+                None
+            }
+        })
+    }
+
     /// Convenience method to get all the destination addresses for each `OutputPlan`s.
     pub fn dest_addresses(&self) -> Vec<Address> {
         self.output_plans()

transaction/src/plan/build.rs

@@ -151,6 +151,9 @@ impl TransactionPlan {
         for position_open in self.position_openings().cloned() {
             actions.push(Action::PositionOpen(position_open))
         }
+        for position_close in self.position_closings().cloned() {
+            actions.push(Action::PositionClose(position_close))
+        }
 
         let transaction_body = TransactionBody {
             actions,
@@ -355,6 +358,9 @@ impl TransactionPlan {
         for position_open in self.position_openings().cloned() {
             actions.push(Action::PositionOpen(position_open))
         }
+        for position_close in self.position_closings().cloned() {
+            actions.push(Action::PositionClose(position_close))
+        }
 
         let transaction_body = TransactionBody {
             actions,

transaction/src/transaction.rs

@@ -22,8 +22,8 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     action::{
-        DaoDeposit, DaoOutput, DaoSpend, Delegate, DelegatorVote, IbcAction, Output, PositionOpen,
-        ProposalSubmit, ProposalWithdraw, Spend, Swap, Undelegate, ValidatorVote,
+        DaoDeposit, DaoOutput, DaoSpend, Delegate, DelegatorVote, IbcAction, Output, PositionClose,
+        PositionOpen, ProposalSubmit, ProposalWithdraw, Spend, Swap, Undelegate, ValidatorVote,
     },
     view::{action_view::OutputView, MemoView, TransactionBodyView},
     Action, ActionView, Id, IsAction, TransactionPerspective, TransactionView,
@@ -362,6 +362,16 @@ impl Transaction {
         })
     }
 
+    pub fn position_closings(&self) -> impl Iterator<Item = &PositionClose> {
+        self.actions().filter_map(|action| {
+            if let Action::PositionClose(d) = action {
+                Some(d)
+            } else {
+                None
+            }
+        })
+    }
+
     pub fn transaction_body(&self) -> TransactionBody {
         self.transaction_body.clone()
     }

view/src/planner.rs

@@ -23,8 +23,8 @@ use penumbra_proto::view::v1alpha1::{NotesForVotingRequest, NotesRequest};
 use penumbra_tct as tct;
 use penumbra_transaction::{
     action::{
-        DaoDeposit, PositionOpen, Proposal, ProposalDepositClaim, ProposalSubmit, ProposalWithdraw,
-        ValidatorVote, Vote,
+        DaoDeposit, PositionClose, PositionOpen, Proposal, ProposalDepositClaim, ProposalSubmit,
+        ProposalWithdraw, ValidatorVote, Vote,
     },
     plan::{
         ActionPlan, DelegatorVotePlan, MemoPlan, OutputPlan, SpendPlan, SwapClaimPlan, SwapPlan,
@@ -164,6 +164,15 @@ impl<R: RngCore + CryptoRng> Planner<R> {
         self
     }
 
+    /// Close a liquidity position in the order book.
+    #[instrument(skip(self))]
+    pub fn position_close(&mut self, position: Position) -> &mut Self {
+        self.action(ActionPlan::PositionClose(PositionClose {
+            position_id: position.id(),
+        }));
+        self
+    }
+
     /// Perform a swap claim based on an input swap NFT with a pre-paid fee.
     #[instrument(skip(self))]
     pub fn swap_claim(&mut self, plan: SwapClaimPlan) -> &mut Self {