From 0571414ef44ad0898dc8a045edf0e5e919e60ce7 Mon Sep 17 00:00:00 2001
From: Lucas Meier <lucas@cronokirby.com>
Date: Thu, 18 Apr 2024 14:55:50 -0700
Subject: [PATCH] Make swap_claim check the exact epoch and block in circuit

---
 crates/bench/benches/swap_claim.rs            |   1 +
 crates/bin/pcli/tests/proof.rs                |   1 +
 .../dex/src/batch_swap_output_data.rs         |  47 ++++++++++--------
 .../src/component/circuit_breaker/value.rs    |  12 ++++-
 .../core/component/dex/src/component/dex.rs   |   2 +-
 .../src/component/router/route_and_fill.rs    |  21 ++++----
 .../dex/src/component/router/tests.rs         |  23 ++++++++-
 .../core/component/dex/src/component/tests.rs |  24 ++++++++-
 .../component/dex/src/swap_claim/proof.rs     |  31 ++++++++----
 .../crypto/proof-params/src/gen/convert_id.rs |   3 --
 .../proof-params/src/gen/convert_pk.bin       |   3 --
 .../proof-params/src/gen/convert_vk.param     | Bin 1256 -> 0 bytes
 .../proof-params/src/gen/delegator_vote_id.rs |   3 --
 .../src/gen/delegator_vote_pk.bin             |   3 --
 .../src/gen/delegator_vote_vk.param           | Bin 7304 -> 0 bytes
 .../src/gen/nullifier_derivation_id.rs        |   3 --
 .../src/gen/nullifier_derivation_pk.bin       |   3 --
 .../src/gen/nullifier_derivation_vk.param     | Bin 7112 -> 0 bytes
 .../crypto/proof-params/src/gen/output_id.rs  |   3 --
 .../crypto/proof-params/src/gen/output_pk.bin |   3 --
 .../proof-params/src/gen/output_vk.param      | Bin 968 -> 0 bytes
 .../crypto/proof-params/src/gen/spend_id.rs   |   3 --
 .../crypto/proof-params/src/gen/spend_pk.bin  |   3 --
 .../proof-params/src/gen/spend_vk.param       | Bin 1160 -> 0 bytes
 crates/crypto/proof-params/src/gen/swap_id.rs |   3 --
 .../crypto/proof-params/src/gen/swap_pk.bin   |   3 --
 .../crypto/proof-params/src/gen/swap_vk.param | Bin 1064 -> 0 bytes
 .../proof-params/src/gen/swapclaim_id.rs      |   4 +-
 .../proof-params/src/gen/swapclaim_pk.bin     |   4 +-
 .../proof-params/src/gen/swapclaim_vk.param   | Bin 2888 -> 8840 bytes
 .../src/gen/penumbra.core.component.dex.v1.rs |   3 ++
 .../penumbra.core.component.dex.v1.serde.rs   |  21 ++++++++
 .../proto/src/gen/proto_descriptor.bin.no_lfs | Bin 380322 -> 380506 bytes
 .../penumbra/core/component/dex/v1/dex.proto  |   2 +
 34 files changed, 144 insertions(+), 88 deletions(-)
 delete mode 100644 crates/crypto/proof-params/src/gen/convert_id.rs
 delete mode 100644 crates/crypto/proof-params/src/gen/convert_pk.bin
 delete mode 100644 crates/crypto/proof-params/src/gen/convert_vk.param
 delete mode 100644 crates/crypto/proof-params/src/gen/delegator_vote_id.rs
 delete mode 100644 crates/crypto/proof-params/src/gen/delegator_vote_pk.bin
 delete mode 100644 crates/crypto/proof-params/src/gen/delegator_vote_vk.param
 delete mode 100644 crates/crypto/proof-params/src/gen/nullifier_derivation_id.rs
 delete mode 100644 crates/crypto/proof-params/src/gen/nullifier_derivation_pk.bin
 delete mode 100644 crates/crypto/proof-params/src/gen/nullifier_derivation_vk.param
 delete mode 100644 crates/crypto/proof-params/src/gen/output_id.rs
 delete mode 100644 crates/crypto/proof-params/src/gen/output_pk.bin
 delete mode 100644 crates/crypto/proof-params/src/gen/output_vk.param
 delete mode 100644 crates/crypto/proof-params/src/gen/spend_id.rs
 delete mode 100644 crates/crypto/proof-params/src/gen/spend_pk.bin
 delete mode 100644 crates/crypto/proof-params/src/gen/spend_vk.param
 delete mode 100644 crates/crypto/proof-params/src/gen/swap_id.rs
 delete mode 100644 crates/crypto/proof-params/src/gen/swap_pk.bin
 delete mode 100644 crates/crypto/proof-params/src/gen/swap_vk.param

diff --git a/crates/bench/benches/swap_claim.rs b/crates/bench/benches/swap_claim.rs
index 2ba03515bb..bbeb2ea233 100644
--- a/crates/bench/benches/swap_claim.rs
+++ b/crates/bench/benches/swap_claim.rs
@@ -71,6 +71,7 @@ fn swap_claim_proving_time(c: &mut Criterion) {
         height: height.into(),
         trading_pair: swap_plaintext.trading_pair,
         epoch_starting_height: (epoch_duration * position.epoch()).into(),
+        sct_position_prefix: position,
     };
     let (lambda_1, lambda_2) = output_data.pro_rata_outputs((delta_1_i, delta_2_i));
 
diff --git a/crates/bin/pcli/tests/proof.rs b/crates/bin/pcli/tests/proof.rs
index a3eacf3860..ead865959e 100644
--- a/crates/bin/pcli/tests/proof.rs
+++ b/crates/bin/pcli/tests/proof.rs
@@ -279,6 +279,7 @@ fn swap_claim_parameters_vs_current_swap_claim_circuit() {
         height: height.into(),
         trading_pair: swap_plaintext.trading_pair,
         epoch_starting_height: (epoch_duration * position.epoch()).into(),
+        sct_position_prefix: position,
     };
     let (lambda_1, lambda_2) = output_data.pro_rata_outputs((delta_1_i, delta_2_i));
 
diff --git a/crates/core/component/dex/src/batch_swap_output_data.rs b/crates/core/component/dex/src/batch_swap_output_data.rs
index f40a446b46..8b29b6b8ac 100644
--- a/crates/core/component/dex/src/batch_swap_output_data.rs
+++ b/crates/core/component/dex/src/batch_swap_output_data.rs
@@ -6,11 +6,12 @@ use ark_r1cs_std::{
     select::CondSelectGadget,
 };
 use ark_relations::r1cs::{ConstraintSystemRef, SynthesisError};
-use decaf377::{r1cs::FqVar, Fq};
+use decaf377::Fq;
 use penumbra_proto::{penumbra::core::component::dex::v1 as pb, DomainType};
+use penumbra_tct::{r1cs::PositionVar, Position};
 use serde::{Deserialize, Serialize};
 
-use penumbra_num::fixpoint::{bit_constrain, U128x128, U128x128Var};
+use penumbra_num::fixpoint::{U128x128, U128x128Var};
 use penumbra_num::{Amount, AmountVar};
 
 use crate::TradingPairVar;
@@ -38,6 +39,8 @@ pub struct BatchSwapOutputData {
     pub trading_pair: TradingPair,
     /// The starting block height of the epoch for which the batch swap data is valid.
     pub epoch_starting_height: u64,
+    /// The position prefix where this batch swap occurred. The commitment index must be 0.
+    pub sct_position_prefix: Position,
 }
 
 impl BatchSwapOutputData {
@@ -116,20 +119,15 @@ impl ToConstraintField<Fq> for BatchSwapOutputData {
                 .to_field_elements()
                 .expect("U128x128 types are Bls12-377 field members"),
         );
-        public_inputs.extend(
-            Fq::from(self.height)
-                .to_field_elements()
-                .expect("Fq types are Bls12-377 field members"),
-        );
         public_inputs.extend(
             self.trading_pair
                 .to_field_elements()
                 .expect("trading_pair is a Bls12-377 field member"),
         );
         public_inputs.extend(
-            Fq::from(self.epoch_starting_height)
+            self.sct_position_prefix
                 .to_field_elements()
-                .expect("Fq types are Bls12-377 field members"),
+                .expect("Position types are Bls12-377 field members"),
         );
         Some(public_inputs)
     }
@@ -142,9 +140,8 @@ pub struct BatchSwapOutputDataVar {
     pub lambda_2: U128x128Var,
     pub unfilled_1: U128x128Var,
     pub unfilled_2: U128x128Var,
-    pub height: FqVar,
     pub trading_pair: TradingPairVar,
-    pub epoch_starting_height: FqVar,
+    pub sct_position_prefix: PositionVar,
 }
 
 impl AllocVar<BatchSwapOutputData, Fq> for BatchSwapOutputDataVar {
@@ -168,18 +165,13 @@ impl AllocVar<BatchSwapOutputData, Fq> for BatchSwapOutputDataVar {
         let unfilled_1 = U128x128Var::new_variable(cs.clone(), || Ok(unfilled_1_fixpoint), mode)?;
         let unfilled_2_fixpoint: U128x128 = output_data.unfilled_2.into();
         let unfilled_2 = U128x128Var::new_variable(cs.clone(), || Ok(unfilled_2_fixpoint), mode)?;
-        let height = FqVar::new_variable(cs.clone(), || Ok(Fq::from(output_data.height)), mode)?;
-        // Check the height is 64 bits
-        let _ = bit_constrain(height.clone(), 64);
         let trading_pair = TradingPairVar::new_variable_unchecked(
             cs.clone(),
             || Ok(output_data.trading_pair),
             mode,
         )?;
-        let epoch_starting_height =
-            FqVar::new_variable(cs, || Ok(Fq::from(output_data.epoch_starting_height)), mode)?;
-        // Check the epoch starting height is 64 bits
-        let _ = bit_constrain(epoch_starting_height.clone(), 64);
+        let sct_position_prefix =
+            PositionVar::new_variable(cs.clone(), || Ok(output_data.sct_position_prefix), mode)?;
 
         Ok(Self {
             delta_1,
@@ -189,8 +181,7 @@ impl AllocVar<BatchSwapOutputData, Fq> for BatchSwapOutputDataVar {
             unfilled_1,
             unfilled_2,
             trading_pair,
-            height,
-            epoch_starting_height,
+            sct_position_prefix,
         })
     }
 }
@@ -211,6 +202,7 @@ impl From<BatchSwapOutputData> for pb::BatchSwapOutputData {
             height: s.height,
             epoch_starting_height: s.epoch_starting_height,
             trading_pair: Some(s.trading_pair.into()),
+            sct_position_prefix: s.sct_position_prefix.into(),
         }
     }
 }
@@ -276,6 +268,14 @@ impl From<BatchSwapOutputData> for pb::BatchSwapOutputDataResponse {
 impl TryFrom<pb::BatchSwapOutputData> for BatchSwapOutputData {
     type Error = anyhow::Error;
     fn try_from(s: pb::BatchSwapOutputData) -> Result<Self, Self::Error> {
+        let sct_position_prefix = {
+            let prefix = Position::from(s.sct_position_prefix);
+            anyhow::ensure!(
+                prefix.commitment() == 0,
+                "sct_position_prefix.commitment() != 0"
+            );
+            prefix
+        };
         Ok(Self {
             delta_1: s
                 .delta_1
@@ -307,6 +307,7 @@ impl TryFrom<pb::BatchSwapOutputData> for BatchSwapOutputData {
                 .ok_or_else(|| anyhow!("Missing trading_pair"))?
                 .try_into()?,
             epoch_starting_height: s.epoch_starting_height,
+            sct_position_prefix,
         })
     }
 }
@@ -421,9 +422,10 @@ mod tests {
                     lambda_2: Amount::from(1u32),
                     unfilled_1: Amount::from(1u32),
                     unfilled_2: Amount::from(1u32),
-                    height: 1,
+                    height: 0,
                     trading_pair,
-                    epoch_starting_height: 1,
+                    epoch_starting_height: 0,
+                    sct_position_prefix: 0u64.into(),
                 },
             }
         }
@@ -445,6 +447,7 @@ mod tests {
             height: 0u64,
             trading_pair,
             epoch_starting_height: 0u64,
+            sct_position_prefix: 0u64.into(),
         };
 
         // Now suppose our user's contribution is:
diff --git a/crates/core/component/dex/src/component/circuit_breaker/value.rs b/crates/core/component/dex/src/component/circuit_breaker/value.rs
index ac76907569..5337549861 100644
--- a/crates/core/component/dex/src/component/circuit_breaker/value.rs
+++ b/crates/core/component/dex/src/component/circuit_breaker/value.rs
@@ -162,6 +162,7 @@ mod tests {
                     height: 1,
                     trading_pair: pair_1.into_directed_trading_pair().into(),
                     epoch_starting_height: 0,
+                    sct_position_prefix: Default::default(),
                 },
                 None,
                 None,
@@ -252,7 +253,16 @@ mod tests {
         let routing_params = state.routing_params().await.unwrap();
         // This call should panic due to the outflow of gn not being covered by the circuit breaker.
         state
-            .handle_batch_swaps(trading_pair, swap_flow, 0, 0, routing_params)
+            .handle_batch_swaps(
+                trading_pair,
+                swap_flow,
+                0,
+                Epoch {
+                    index: 0,
+                    start_height: 0,
+                },
+                routing_params,
+            )
             .await
             .expect("unable to process batch swaps");
     }
diff --git a/crates/core/component/dex/src/component/dex.rs b/crates/core/component/dex/src/component/dex.rs
index bdb9ada0c5..1bbaf4e41e 100644
--- a/crates/core/component/dex/src/component/dex.rs
+++ b/crates/core/component/dex/src/component/dex.rs
@@ -69,7 +69,7 @@ impl Component for Dex {
                         .height
                         .try_into()
                         .expect("height is part of the end block data"),
-                    current_epoch.start_height,
+                    current_epoch,
                     // Always include both ends of the target pair as fixed candidates.
                     routing_params
                         .clone()
diff --git a/crates/core/component/dex/src/component/router/route_and_fill.rs b/crates/core/component/dex/src/component/router/route_and_fill.rs
index b18a786200..47dfd997e3 100644
--- a/crates/core/component/dex/src/component/router/route_and_fill.rs
+++ b/crates/core/component/dex/src/component/router/route_and_fill.rs
@@ -5,6 +5,7 @@ use async_trait::async_trait;
 use cnidarium::StateWrite;
 use penumbra_asset::{asset, Value};
 use penumbra_num::Amount;
+use penumbra_sct::epoch::Epoch;
 use tracing::instrument;
 
 use crate::{
@@ -23,21 +24,14 @@ use super::fill_route::FillError;
 /// a block's batch swap flows.
 #[async_trait]
 pub trait HandleBatchSwaps: StateWrite + Sized {
-    #[instrument(skip(
-        self,
-        trading_pair,
-        batch_data,
-        block_height,
-        epoch_starting_height,
-        params
-    ))]
+    #[instrument(skip(self, trading_pair, batch_data, block_height, epoch, params))]
     async fn handle_batch_swaps(
         self: &mut Arc<Self>,
         trading_pair: TradingPair,
         batch_data: SwapFlow,
         // TODO: why not read these 2 from the state?
         block_height: u64,
-        epoch_starting_height: u64,
+        epoch: Epoch,
         params: RoutingParams,
     ) -> Result<()>
     where
@@ -97,7 +91,7 @@ pub trait HandleBatchSwaps: StateWrite + Sized {
         };
         let output_data = BatchSwapOutputData {
             height: block_height,
-            epoch_starting_height,
+            epoch_starting_height: epoch.start_height,
             trading_pair,
             delta_1,
             delta_2,
@@ -105,6 +99,13 @@ pub trait HandleBatchSwaps: StateWrite + Sized {
             lambda_2,
             unfilled_1,
             unfilled_2,
+            sct_position_prefix: (
+                u16::try_from(epoch.index).expect("epoch index should be small enough"),
+                u16::try_from(block_height - epoch.start_height)
+                    .expect("block index should be small enough"),
+                0,
+            )
+                .into(),
         };
 
         // Fetch the swap execution object that should have been modified during the routing and filling.
diff --git a/crates/core/component/dex/src/component/router/tests.rs b/crates/core/component/dex/src/component/router/tests.rs
index bd9c5f4de6..42048a30fd 100644
--- a/crates/core/component/dex/src/component/router/tests.rs
+++ b/crates/core/component/dex/src/component/router/tests.rs
@@ -5,6 +5,7 @@ use core::panic;
 use futures::StreamExt;
 use penumbra_asset::{asset, Value};
 use penumbra_num::{fixpoint::U128x128, Amount};
+use penumbra_sct::epoch::Epoch;
 use rand_core::OsRng;
 use std::sync::Arc;
 
@@ -1024,7 +1025,16 @@ async fn best_position_route_and_fill() -> anyhow::Result<()> {
         .unwrap();
     let routing_params = state.routing_params().await.unwrap();
     state
-        .handle_batch_swaps(trading_pair, swap_flow, 0u32.into(), 0, routing_params)
+        .handle_batch_swaps(
+            trading_pair,
+            swap_flow,
+            0u32.into(),
+            Epoch {
+                index: 0,
+                start_height: 0,
+            },
+            routing_params,
+        )
         .await
         .expect("unable to process batch swaps");
 
@@ -1165,7 +1175,16 @@ async fn multi_hop_route_and_fill() -> anyhow::Result<()> {
         .unwrap();
     let routing_params = state.routing_params().await.unwrap();
     state
-        .handle_batch_swaps(trading_pair, swap_flow, 0u32.into(), 0, routing_params)
+        .handle_batch_swaps(
+            trading_pair,
+            swap_flow,
+            0u32.into(),
+            Epoch {
+                index: 0,
+                start_height: 0,
+            },
+            routing_params,
+        )
         .await
         .expect("unable to process batch swaps");
 
diff --git a/crates/core/component/dex/src/component/tests.rs b/crates/core/component/dex/src/component/tests.rs
index 69baee6c9b..72ecda092d 100644
--- a/crates/core/component/dex/src/component/tests.rs
+++ b/crates/core/component/dex/src/component/tests.rs
@@ -6,6 +6,7 @@ use cnidarium::{ArcStateDeltaExt, StateDelta, TempStorage};
 use futures::StreamExt;
 use penumbra_asset::{asset, Value};
 use penumbra_num::Amount;
+use penumbra_sct::epoch::Epoch;
 use rand_core::OsRng;
 
 use crate::lp::action::PositionOpen;
@@ -632,7 +633,16 @@ async fn swap_execution_tests() -> anyhow::Result<()> {
         .unwrap();
     let routing_params = state.routing_params().await.unwrap();
     state
-        .handle_batch_swaps(trading_pair, swap_flow, 0, 0, routing_params)
+        .handle_batch_swaps(
+            trading_pair,
+            swap_flow,
+            0,
+            Epoch {
+                index: 0,
+                start_height: 0,
+            },
+            routing_params,
+        )
         .await
         .expect("unable to process batch swaps");
 
@@ -740,7 +750,16 @@ async fn swap_execution_tests() -> anyhow::Result<()> {
         .unwrap();
     let routing_params = state.routing_params().await.unwrap();
     state
-        .handle_batch_swaps(trading_pair, swap_flow, 0u32.into(), 0, routing_params)
+        .handle_batch_swaps(
+            trading_pair,
+            swap_flow,
+            0u32.into(),
+            Epoch {
+                index: 0,
+                start_height: 0,
+            },
+            routing_params,
+        )
         .await
         .expect("unable to process batch swaps");
 
@@ -758,6 +777,7 @@ async fn swap_execution_tests() -> anyhow::Result<()> {
             height: 0,
             epoch_starting_height: 0,
             trading_pair,
+            sct_position_prefix: Default::default(),
         }
     );
 
diff --git a/crates/core/component/dex/src/swap_claim/proof.rs b/crates/core/component/dex/src/swap_claim/proof.rs
index c8698d131c..7484e1d307 100644
--- a/crates/core/component/dex/src/swap_claim/proof.rs
+++ b/crates/core/component/dex/src/swap_claim/proof.rs
@@ -123,11 +123,16 @@ fn check_satisfaction(
         anyhow::bail!("claim fee did not match public input");
     }
 
-    let block: u64 = private.state_commitment_proof.position().block().into();
-    let note_commitment_block_height: u64 = public.output_data.epoch_starting_height + block;
-    if note_commitment_block_height != public.output_data.height {
-        anyhow::bail!("swap commitment height did not match public input");
-    }
+    anyhow::ensure!(
+        private.state_commitment_proof.position().block()
+            == public.output_data.sct_position_prefix.block(),
+        "scm block did not match batch swap"
+    );
+    anyhow::ensure!(
+        private.state_commitment_proof.position().epoch()
+            == public.output_data.sct_position_prefix.epoch(),
+        "scm epoch did not match batch swap"
+    );
 
     if private.swap_plaintext.trading_pair != public.output_data.trading_pair {
         anyhow::bail!("trading pair did not match public input");
@@ -255,12 +260,14 @@ impl ConstraintSynthesizer<Fq> for SwapClaimCircuit {
         claimed_fee_var.enforce_equal(&swap_plaintext_var.claim_fee)?;
 
         // Validate the swap commitment's height matches the output data's height (i.e. the clearing price height).
-        let block = position_var.block()?;
-        let note_commitment_block_height_var =
-            output_data_var.epoch_starting_height.clone() + block;
         output_data_var
-            .height
-            .enforce_equal(&note_commitment_block_height_var)?;
+            .sct_position_prefix
+            .block()?
+            .enforce_equal(&position_var.block()?)?;
+        output_data_var
+            .sct_position_prefix
+            .epoch()?
+            .enforce_equal(&position_var.epoch()?)?;
 
         // Validate that the output data's trading pair matches the note commitment's trading pair.
         output_data_var
@@ -360,6 +367,7 @@ impl DummyWitness for SwapClaimCircuit {
             height: 0,
             trading_pair: swap_plaintext.trading_pair,
             epoch_starting_height: 0,
+            sct_position_prefix: Default::default(),
         };
         let note_blinding_1 = Fq::from(1);
         let note_blinding_2 = Fq::from(1);
@@ -643,6 +651,7 @@ mod tests {
             height: height.into(),
             trading_pair: swap_plaintext.trading_pair,
             epoch_starting_height: (epoch_duration * position.epoch()).into(),
+            sct_position_prefix: Default::default(),
         };
         let (lambda_1, lambda_2) = output_data.pro_rata_outputs((delta_1_i, delta_2_i));
 
@@ -775,6 +784,7 @@ mod tests {
             height: height.into(),
             trading_pair: swap_plaintext.trading_pair,
             epoch_starting_height: (epoch_duration * position.epoch()).into(),
+            sct_position_prefix: Default::default()
         };
         let (lambda_1, lambda_2) = output_data.pro_rata_outputs((delta_1_i, delta_2_i));
 
@@ -875,6 +885,7 @@ mod tests {
             height: height.into(),
             trading_pair: swap_plaintext.trading_pair,
             epoch_starting_height: (epoch_duration * dummy_position.epoch()).into(),
+            sct_position_prefix: Default::default()
         };
         let (lambda_1, lambda_2) = output_data.pro_rata_outputs((delta_1_i, delta_2_i));
 
diff --git a/crates/crypto/proof-params/src/gen/convert_id.rs b/crates/crypto/proof-params/src/gen/convert_id.rs
deleted file mode 100644
index eac6947907..0000000000
--- a/crates/crypto/proof-params/src/gen/convert_id.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-
-pub const PROVING_KEY_ID: &'static str = "groth16pk1x4m7qnm4czf3mtys3s8p8fnzpcz22fv26udz7cgql3x047rqn6nqquqh7t";
-pub const VERIFICATION_KEY_ID: &'static str = "groth16vk1eu7tznfakx6dh3kzfrtfzt034ypzc69eaqdmjptyayxjqp0jt84s94hy8m";
diff --git a/crates/crypto/proof-params/src/gen/convert_pk.bin b/crates/crypto/proof-params/src/gen/convert_pk.bin
deleted file mode 100644
index 8b10cb9535..0000000000
--- a/crates/crypto/proof-params/src/gen/convert_pk.bin
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:882527eb795af2819f8df4f6233d5844757768fb03d51a000f11b100eeea573f
-size 7926960
diff --git a/crates/crypto/proof-params/src/gen/convert_vk.param b/crates/crypto/proof-params/src/gen/convert_vk.param
deleted file mode 100644
index 342c631cbed5b253a9b6b53f3fe21cad668df4c7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1256
zcmV<E1Q+|tM7=emik@;ou>@2T$&>7iHB}~@X*^%<3LP1{05Ax%<64nR#hpL$LfR-&
zGob<86>Ibd5tpZX`FuE)^AFmeU0OVWB=Z4=47_HP#vPXW`SilIz5l=a1lW{I$d>@C
zp8QLmMev14g{2*`E>HxI_i=gmZ{GEp4}JS(N0Zg^V!TcpYby9HsptTq0R#cG#bO5A
zMqu07Dcy4kW#W3z;{sIA^~&_<PLIxXkI7*RbbdO_EZ2k=GXNcV+B^ZN-BzQ_flITb
z9_Be{nt0dW75Kt3e`iSvNiQCU+oTTc$1XA>;9N=0IG=Eat$zW&mFk&s3d&?S?|AvG
zOn!TYc~msDv@kd7NH~wZ#^!q7gjV7FggR9i8Fq9?UKaqCQ2>08<l}S#R8zZBpNMgr
zYui`#0i}L1P(C1W@MXmT9fYHzFqX*vg~xHefP?}5YN2lW{%f-4Z}-21nfP4Z$(aYv
zJ|gGK&QWIWcPCTTK(Vn=THJ6kKmg}JVCn$hP5lW(36$_Ie2i^~h|lr_(lYph!dT>3
znzVFs?E~Jl@3PBlb70wfZ$w>Y4QT+AkL!ie&7s)~CsJNNxOqat1mn&cuwx|g8(BT9
z5$|EDa2ge(om8F}RfE!>7WjbpL0S`BX9i(rPA9Qb<;JD*#U#>~FRrK1>(3#Yf}Sor
z?uRisQOODqhq!3#`aA*pa~}9eogd3GzY!&!18aS6|DlY&nUpBfPQ>=$Nvjy>(LiD>
z2EUTJD7FC#$fp1S)#eSb%-k9PkwJN`+g{>NOW~92cD!T($K@{6rzU=J=GJdWF#B?y
z8v~Ga_VEBk`NMmE5nv@1H2xg1Y_0s4egi2%DNpbJ{V0E+ou-$l=;V7L9`9M3AA}RO
zZr6YY000000002rhba7)d92sEv6(jwF8yYhe+*cJ{l8Y8)6B?@AL%OedvNSF2)Dl#
zgX#KmKxY6V85)#k%+r9tmmCN|Pet@k<s#Rea1crqZ@KoSL8pmE>osGD__+N;u$dob
z`6z)V$O`r>7kx$1q%pus#~a}{VCnmNA?jrZ**Pe1#wNtC%ez1WH&DUuU)dkxuekuD
z7v1`3gfgU&SdxRheV|;BiQYl|;R|^Y=f*~@tI-Al!zH4>_vP|nAe?Ob2b+Pn3+C(Y
zY#F5*ZttX!7j1JqqY>nOshoYc`Plw|X~G$IH>$1%u}?e1S==ZT5D5UMfQAuk$5eX3
zWq=lxI<tnT`{RuN&EEbJcNi({Z(s_p_HdqZeygct5WJ)MV2J>auJzcL55-7=30*pM
zeiv1DRiWAv^qzXyyF#Sro;vrJv6anK`VEC1pshs4aCQJnV<rS_xhoH(awXdoa?Q}G
zQF<F`&5l3usS#dpEp-?6OV0lq_0s-ChvYowF=BxY=vk&i>Uz!h{aEVlB)3VjWbAeS
zPNEeA!ok~Gp`G|eKenpc7=bIkKyR6cHM9WQzmha(fsS<QufIQh%w#5ACgCs&A>jQl
zkU|4OTjYf&9S->ZqKOz4CRCft^~nI@e29?X+|3HtyO<1bH2v$tpFw^nrUkEu1N?%+
zMF}Nu%*a0=W^bi1b9xoZxEKMRDRV*PHhQ@Q&YPdS=`8@S8S8*9mYS*HjR_rMs9hJZ
SeroHXWBwW{Fq1J!rn&$sK5<_F

diff --git a/crates/crypto/proof-params/src/gen/delegator_vote_id.rs b/crates/crypto/proof-params/src/gen/delegator_vote_id.rs
deleted file mode 100644
index ea04ca5f90..0000000000
--- a/crates/crypto/proof-params/src/gen/delegator_vote_id.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-
-pub const PROVING_KEY_ID: &'static str = "groth16pk1wquddkhlkp3tj3fsjt7qtgaevfpndp2ejptvp7lxhafa0ddxqetqtp52ja";
-pub const VERIFICATION_KEY_ID: &'static str = "groth16vk1j8jt9leawttxhqdye26apdtfkju4nmhzf40y3339g774ca73qyusq7wpcn";
diff --git a/crates/crypto/proof-params/src/gen/delegator_vote_pk.bin b/crates/crypto/proof-params/src/gen/delegator_vote_pk.bin
deleted file mode 100644
index b7d0e5ba44..0000000000
--- a/crates/crypto/proof-params/src/gen/delegator_vote_pk.bin
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6712a90216c7c0cfb12ef2a37d48ffae666f8d2bd9a722836864d0a70064dce7
-size 21943632
diff --git a/crates/crypto/proof-params/src/gen/delegator_vote_vk.param b/crates/crypto/proof-params/src/gen/delegator_vote_vk.param
deleted file mode 100644
index d826f0ac1b46c27673aaa448c9baf5ecd6dcbfcd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7304
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

diff --git a/crates/crypto/proof-params/src/gen/nullifier_derivation_id.rs b/crates/crypto/proof-params/src/gen/nullifier_derivation_id.rs
deleted file mode 100644
index 70a79236e8..0000000000
--- a/crates/crypto/proof-params/src/gen/nullifier_derivation_id.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-
-pub const PROVING_KEY_ID: &'static str = "groth16pk1e79gm2pkg5rlkyeectfh4yualrjy9qdlez22l4f56g5tjqkqfv3syrrzsm";
-pub const VERIFICATION_KEY_ID: &'static str = "groth16vk1ylw2upegj9ppaz9s0hd0czh8yeqxvqc4s39468733cnfcch2cfwqnm4gqj";
diff --git a/crates/crypto/proof-params/src/gen/nullifier_derivation_pk.bin b/crates/crypto/proof-params/src/gen/nullifier_derivation_pk.bin
deleted file mode 100644
index 0e349558b5..0000000000
--- a/crates/crypto/proof-params/src/gen/nullifier_derivation_pk.bin
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ac9568335c1c158edddb2a70212c7b98d7c7aeff633b485a088049ecc01cc0ef
-size 232368
diff --git a/crates/crypto/proof-params/src/gen/nullifier_derivation_vk.param b/crates/crypto/proof-params/src/gen/nullifier_derivation_vk.param
deleted file mode 100644
index d28fe881b403d834e5443ce628bdc87c7ecd819f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7112
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

diff --git a/crates/crypto/proof-params/src/gen/output_id.rs b/crates/crypto/proof-params/src/gen/output_id.rs
deleted file mode 100644
index 6ee9e3ae19..0000000000
--- a/crates/crypto/proof-params/src/gen/output_id.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-
-pub const PROVING_KEY_ID: &'static str = "groth16pk1cq4kzdw0gksjch329u7dwznuutgswt084w259ef9aul3zpsnvmxqmjqwwu";
-pub const VERIFICATION_KEY_ID: &'static str = "groth16vk1clsj7lwhfqkvvuy6syd37a4ghnpgle67qefxtfm4fmkwf2yr6cmst2axts";
diff --git a/crates/crypto/proof-params/src/gen/output_pk.bin b/crates/crypto/proof-params/src/gen/output_pk.bin
deleted file mode 100644
index 490d0a21c4..0000000000
--- a/crates/crypto/proof-params/src/gen/output_pk.bin
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a8c5ccc9d6c74150a21a8411e90d523e6ebb0f2a2985327d9fb4ef690600461e
-size 7257360
diff --git a/crates/crypto/proof-params/src/gen/output_vk.param b/crates/crypto/proof-params/src/gen/output_vk.param
deleted file mode 100644
index 2fbd0568f2e20eb376f749999c867064141b80c8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 968
zcmV;(12_D$?+Jgo@wp$Nw{T5R(6lG-UI$Bf_BjUw%OExU_yH!4=YU5h_9O!P(o}YS
zw4wnMZPn?f-&M*lk37%vDM;M!B$kk~1e0;!)m)@Aj<C71fO|yE$qcx6@|6*tRkHvt
z*j!!bJIz7-wu#`>sO@-+tUF5rgjO_=>CFQ~O79wApa(ueX#_0_w;-?rkdXmgPW|Dr
zWSdmOjy;-JRiXR%gesw36aZU91{7K=JNQ#c_#&ENVW;Cw##q-Hf^q?kc_dWY&0e0l
zXTI<~Ydm=Ay?5&x7*b;z<mDFHdbq-ddj=e>sP8aa%Jk6WVif_`Avr`K0<7frUN#uR
zw)-WTG5iL>avp`j1PQ<wHWul7HyKgh8~_8A0$8pVSt$UPQ2>08<l}S#R8zZBpNMgr
zYui`#0i}L1P(C1W@MXmT9fYHzFqX*vg~xHefP?}5YN2lW{%f-4Z}-21nfP4Z$(aYv
zJ|gGK&QWIWcPCTTK(Vn=THJ6kKmg}JVCn$hP5lW(36$_Ie2i^~h|lr_(lYph!dT>3
znzVFs?E~Jl@3PBlb70wfZ$w>Y4QT+AkL!ie&7s)~CsJNNxOqat1mn&cuwx|g8(BT9
z5$|EDa2ge(om8F}RfE!>7Wjbd^$wF}eTGYrM!1zB@`xy#Kz3emD;RN_cd!>&1H@Hz
zA3Bc_reEQ~8#dxM;t&DvaW?=SJFY^@sI(WumZAxY)@E7yIQJ9uzKy9&BKYa|7f1|c
z;Ua6u7``_0LO20pC2?@|*j{ZKP9cpiYqw)$B1f-3rjz{tGTDJlHM%ay#@-B0Ya9=;
zjrB17x0nDeSH%l{xgzS`ie(sBcE4fKw`T3TumOuDx3T4+fB=@wAXPPIHFkE-4*JU~
z&S(Gw000000002VACy95g_^zMa0>)nfLj%I>AJ73OU01sH2T*5+-Xh{t{0aWB&5J~
z<kn=^=1u_Nw_IPBjjpDIX+|{h>$R+?O)(99HjeoA(OYL5UvFUL>+qD4SaB<hj%tG8
z8>E374iu$h&V;48oppW3yLPoFc$H*kf?{sMAbP*+73YVS4I<??0yprDPH20{0674B
z&3L$^x_R{w>*6O+7V^a1VGo;>SF$oBt8M7HHggRHx6XpISjM+~hp0n<_f>&U%lo5R
z{J>8~Bs+__cP9UJd*&m?nEgZadNwZN){1;I#woxtW6-O1qx+K~%bWm7j5%IoShSq`
qTfRPpfA(~oAkYX~XAlbfru<_gPRD;$1qDIpg}HYE0mJ(_s;hxPe%0Lo

diff --git a/crates/crypto/proof-params/src/gen/spend_id.rs b/crates/crypto/proof-params/src/gen/spend_id.rs
deleted file mode 100644
index 8a81dea3b1..0000000000
--- a/crates/crypto/proof-params/src/gen/spend_id.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-
-pub const PROVING_KEY_ID: &'static str = "groth16pk1q5g33sdz9u9thkpj67rzacrlashgumzjnzenu589tn3dx6798q2qwx3z59";
-pub const VERIFICATION_KEY_ID: &'static str = "groth16vk1v7rahtkzn3045auj3h24pf3du7dlhjyfwgvya4pwvtq4jhfmw7vqawpf33";
diff --git a/crates/crypto/proof-params/src/gen/spend_pk.bin b/crates/crypto/proof-params/src/gen/spend_pk.bin
deleted file mode 100644
index 190bb16ce6..0000000000
--- a/crates/crypto/proof-params/src/gen/spend_pk.bin
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:69694b15abd96fdbeba5bbe1ba982d2240129be05813a9693acce31a1b43b0fd
-size 21187632
diff --git a/crates/crypto/proof-params/src/gen/spend_vk.param b/crates/crypto/proof-params/src/gen/spend_vk.param
deleted file mode 100644
index 1ca209a13a438980ac67baff3d64b6690994ecb0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1160
zcmV;31b6#2zQ#uH6D4V=+1Dz`pHKzyPCaMbz0BO6s1~#of6_tjtgLosV%KDL*LP|&
z4>17~Ra1)U*S&yYDpieCqr|vu6x#w5JZ|o1-oB%=Rz~B~=*>&WM<Mj0AM`y;w50&A
zQ2_$&!3pA^Rm%GoNmud7Yh(_NOz8^}(-nqFdv6)($P2CaYl^D6F&lm|mLLEHPro_N
z{dfzFYo8<nvU;HOMGE;a)|6tgYARB<4!YrC7@jS=(lOkMqU9*&N>u<mXD5AnAbJ#Z
zHQ^v+1#*@qs)Sk?$@e<=t!18WQvFCP$;pNxE<~t5T=a>pw`u^f&mR!j;F`nS0R|dK
z48A?^Plki~KsaPnH*6+&mRwHLDmV?k0{|>Tnhv;*=Y@fmQ2>08<l}S#R8zZBpNMgr
zYui`#0i}L1P(C1W@MXmT9fYHzFqX*vg~xHefP?}5YN2lW{%f-4Z}-21nfP4Z$(aYv
zJ|gGK&QWIWcPCTTK(Vn=THJ6kKmg}JVCn$hP5lW(36$_Ie2i^~h|lr_(lYph!dT>3
znzVFs?E~Jl@3PBlb70wfZ$w>Y4QT+AkL!ie&7s)~CsJNNxOqat1mn&cuwx|g8(BT9
z5$|EDa2ge(om8F}RfE!>7Wjat_!-hZB(p$C+;haKEL&aJnj2MD*OvlI6jHCcG-CLJ
zoI=C{z4L4wkcgT7SAzgYl3eO97)>o(#k3cqhXKjhu9C3@9y1lSZ1<WCX#RQz1RsYY
z8}k&3OCS!MWdZ=6PTlWrN!o!uVK3Xr)K7pD_o4^NuJf2n|2`#h!`Wc|^-(BgN(M`Z
z^50YFI4uBX)K1P2aKKEXEqC(O6RF1_e$DPA^D@-$jft$HyaX1QMkw4t_R6@dwBHA(
zfldGg000000002A?$uQA|2TdLDP9?Cc+Hr)BpP1@5heS*fzgp~ZegS6pLucgMPlTr
zz0XsbS116@zg2!L4%$iFb#z=9f(>uY<uZijVA5oSDaFz8f+uGU5^{pjT~T1^Z0-dO
z{;PosiqZZuoPUYs8_=0(%_aaSCDk}RiM+s~wr13N#l?d*S6}<w0*&6}6JJU1MTr5#
zwiy@o=XaGUh1XLoL)Dv90SS1v?i=FhsC*W`_yk2McDrl+oFgT8lv`I7S&aZF6h)5x
z=^>u+B)-7GOekzRuuq~Se~EiyxBY>XPO%rBfai%Zj2mh+_6*TSz)1n_lR0z@TN%o4
zNC>kH^65fiV~6RtoZ)!fVM?`3_JVlnk|*k&3vWE8aCCgSw2A=AwGa*mT7m{Wl3;pZ
zC};cGTx^)FoLnrsY{yQsiMcpM;sHE}59$t)A@TxAdu;$d$5@K;C*I`K6M?I5r!_xj
z$ja~xw;wCNNOV~n%5(yqKKoyZ9HZVqI~VX4E=mA+%$s5_ZJ>T_kqkI-?*p`izkWkm
z0|y|TOv}Ave$iT=Ekj8{za-D1V(x<OlNAAjWPC(Wxb6%f5;OkorH!yExo6<jwyL=c
aR9kUN2cfx9?6TrRUoF{UoKosJ77u|27b%kf

diff --git a/crates/crypto/proof-params/src/gen/swap_id.rs b/crates/crypto/proof-params/src/gen/swap_id.rs
deleted file mode 100644
index 376279bbdd..0000000000
--- a/crates/crypto/proof-params/src/gen/swap_id.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-
-pub const PROVING_KEY_ID: &'static str = "groth16pk1uly6kxvkvmygl9n74zm27nujqj2deg793c6kcjwsmt43akt9jw3qulqxqc";
-pub const VERIFICATION_KEY_ID: &'static str = "groth16vk1pzv7jlra2tmkwxnchzqm2rd5pq8wvhkx5j3vpe5xspw3h6lyygqquqjjed";
diff --git a/crates/crypto/proof-params/src/gen/swap_pk.bin b/crates/crypto/proof-params/src/gen/swap_pk.bin
deleted file mode 100644
index 0a805cb3d9..0000000000
--- a/crates/crypto/proof-params/src/gen/swap_pk.bin
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3d75cac8a227cd8c6680cd40f94a436b89f10d9b9bb1a118cf4479f1aa9b3fef
-size 14019984
diff --git a/crates/crypto/proof-params/src/gen/swap_vk.param b/crates/crypto/proof-params/src/gen/swap_vk.param
deleted file mode 100644
index c3915c8be2c9bc7373dcc7cb457406ffd8e652a4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1064
zcmV+@1lRk;F!`fnlI<%dqTpXITW0c<qBe@SSe0t^4$hh>it%wNsA<Xj@fB#ibZWKC
z88-mI0iOJp5;9kYWvy#HctRiKt<*8s9p2(`luo;pw>Jii(#XB6>(JH<B-F6B(;b0@
z6eXX%H(ul2b^1uco>>9bPT=R#0sEDC^`m(5YLIQVdc#G%|6;*&^bEpg0vrG|2(~6I
zKHqbWem(Tvqkj0oHDDvA4(M)5b_oc>x0Q=|;D6&pfL{6dD28y+lk@;bM1nQPrcBXy
z7v)yfpMV)nT^$HXI}zRxISF%Rw^9np%B;m~GT^L~G&ZhJ8La_fJV_M^FkFK)qs}=#
zFCDg$R%b0`xM|YfdeIkI8oi1?mQPBI0br9*^pdN1AX<TzQ2>08<l}S#R8zZBpNMgr
zYui`#0i}L1P(C1W@MXmT9fYHzFqX*vg~xHefP?}5YN2lW{%f-4Z}-21nfP4Z$(aYv
zJ|gGK&QWIWcPCTTK(Vn=THJ6kKmg}JVCn$hP5lW(36$_Ie2i^~h|lr_(lYph!dT>3
znzVFs?E~Jl@3PBlb70wfZ$w>Y4QT+AkL!ie&7s)~CsJNNxOqat1mn&cuwx|g8(BT9
z5$|EDa2ge(om8F}RfE!>7WjZ$3;g*(xL@&&gWF6P!uU<>^a+(5Iql80uE-Wtrz3dZ
zJ10{}3!+Bkf~vo*SD667<N@7A$vJ;^EIVrAHY>04yqZ_r&dr8C7$2M#f1q@Z$$r4L
z<6KTcyj&re$FKk`L}0|AcI+ij)C$g+YnHOIb1creD%8_9E9U+~u-d7Z&W~EaB;4#H
z)fX28L`wmINRA#BwYZl_>nNM8R&62tLtL{c&<jN|UWThaqsZ1Da`}I%4395X8>F{X
zSA_rs000000000k;i*8ZRi2Dt1*;R$ma|*t2}hlkelq@YpjJ&R$Isb8;W(fyMk=?~
ziakR>3v~h8vjh@~sdv1QJU^cv`19XLK>42|3_oXmqF@0q>VczZkp-#w>YR?@IlYsO
z*&qOV)T2>YaK)f5+GOSi!%Yu{Ct`leD{%0<^YO}TAir~bFVoB}VVImzyWXw))@K2j
zMxYi#*1(2i!%B6)2694gepxCTV*lQ05*SI2{z~K;hN{@xTeBa58WN>+>^XsQc~Tc|
zSWViUYUt_MQ>oC@{WV_rmJiO8Yz1L6hBEJZvgJZqce32-KDlu5eO>{*Vc9hQ88MUa
z>fF)J=VSTE+dXMM=_)aUE`;f_$w4skw+$b~ZFzf={4qE%g`<J<xtjx_=AsG+<su>N
zZ6z3z)_(b_Td2xNna~1jZ2Tj`ywSA44|?hCA{89@c^m+FUov9@t)ePX(Kop=0-gPY
iV36QGl4Am%_MCn6PuR6g47Co~5MIk{@ff1=eDZ+U6%Q%^

diff --git a/crates/crypto/proof-params/src/gen/swapclaim_id.rs b/crates/crypto/proof-params/src/gen/swapclaim_id.rs
index 0293098666..4745bf8515 100644
--- a/crates/crypto/proof-params/src/gen/swapclaim_id.rs
+++ b/crates/crypto/proof-params/src/gen/swapclaim_id.rs
@@ -1,3 +1,3 @@
 
-pub const PROVING_KEY_ID: &'static str = "groth16pk1vs60etmlvwfzmn2ve0ljz0vfkzjlrhjpue5svm5ry6l076qukjcsw566rp";
-pub const VERIFICATION_KEY_ID: &'static str = "groth16vk18qjn0kxmypk8gmfc6zhjukhyxk0agmunfnhpxmf3yxq266q6sgaqwe94rc";
+pub const PROVING_KEY_ID: &'static str = "groth16pk19hg2sshv5t4d3fhexjr4vhq4d8tuxr5nfsw7mkzucwxmsjcf2kxql9gdte";
+pub const VERIFICATION_KEY_ID: &'static str = "groth16vk18pt0t8685e8h7y4dz494a2pamunadu4x3rtrttsaf4cd37gdsnhqsqkqgv";
diff --git a/crates/crypto/proof-params/src/gen/swapclaim_pk.bin b/crates/crypto/proof-params/src/gen/swapclaim_pk.bin
index 96b1d164b6..8ff04c4e53 100644
--- a/crates/crypto/proof-params/src/gen/swapclaim_pk.bin
+++ b/crates/crypto/proof-params/src/gen/swapclaim_pk.bin
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8501f1dad9ac85d80c6421b17b838f8c6478431babfa836d3d33b5398fa6b6ad
-size 26003952
+oid sha256:5331fa2cf2f005c969125a2b61d2cf8a41f8f52b81360ad4d157c28d08aeee8b
+size 25972272
diff --git a/crates/crypto/proof-params/src/gen/swapclaim_vk.param b/crates/crypto/proof-params/src/gen/swapclaim_vk.param
index 4bd2b584a5dd9a63a3f92eace8fdf9fb648339ac..efe58c0c56c3c4fb1bc6c67eb264ca8103fdff3b 100644
GIT binary patch
delta 8725
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

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

diff --git a/crates/proto/src/gen/penumbra.core.component.dex.v1.rs b/crates/proto/src/gen/penumbra.core.component.dex.v1.rs
index 316658f996..86e9a47b7c 100644
--- a/crates/proto/src/gen/penumbra.core.component.dex.v1.rs
+++ b/crates/proto/src/gen/penumbra.core.component.dex.v1.rs
@@ -475,6 +475,9 @@ pub struct BatchSwapOutputData {
     /// The starting block height of the epoch for which the batch swap data is valid.
     #[prost(uint64, tag = "9")]
     pub epoch_starting_height: u64,
+    /// The prefix (epoch, block) of the position where this batch swap occurred.
+    #[prost(uint64, tag = "10")]
+    pub sct_position_prefix: u64,
 }
 impl ::prost::Name for BatchSwapOutputData {
     const NAME: &'static str = "BatchSwapOutputData";
diff --git a/crates/proto/src/gen/penumbra.core.component.dex.v1.serde.rs b/crates/proto/src/gen/penumbra.core.component.dex.v1.serde.rs
index b7294296fc..20ca700579 100644
--- a/crates/proto/src/gen/penumbra.core.component.dex.v1.serde.rs
+++ b/crates/proto/src/gen/penumbra.core.component.dex.v1.serde.rs
@@ -614,6 +614,9 @@ impl serde::Serialize for BatchSwapOutputData {
         if self.epoch_starting_height != 0 {
             len += 1;
         }
+        if self.sct_position_prefix != 0 {
+            len += 1;
+        }
         let mut struct_ser = serializer.serialize_struct("penumbra.core.component.dex.v1.BatchSwapOutputData", len)?;
         if let Some(v) = self.delta_1.as_ref() {
             struct_ser.serialize_field("delta1", v)?;
@@ -644,6 +647,10 @@ impl serde::Serialize for BatchSwapOutputData {
             #[allow(clippy::needless_borrow)]
             struct_ser.serialize_field("epochStartingHeight", ToString::to_string(&self.epoch_starting_height).as_str())?;
         }
+        if self.sct_position_prefix != 0 {
+            #[allow(clippy::needless_borrow)]
+            struct_ser.serialize_field("sctPositionPrefix", ToString::to_string(&self.sct_position_prefix).as_str())?;
+        }
         struct_ser.end()
     }
 }
@@ -671,6 +678,8 @@ impl<'de> serde::Deserialize<'de> for BatchSwapOutputData {
             "tradingPair",
             "epoch_starting_height",
             "epochStartingHeight",
+            "sct_position_prefix",
+            "sctPositionPrefix",
         ];
 
         #[allow(clippy::enum_variant_names)]
@@ -684,6 +693,7 @@ impl<'de> serde::Deserialize<'de> for BatchSwapOutputData {
             Height,
             TradingPair,
             EpochStartingHeight,
+            SctPositionPrefix,
             __SkipField__,
         }
         impl<'de> serde::Deserialize<'de> for GeneratedField {
@@ -715,6 +725,7 @@ impl<'de> serde::Deserialize<'de> for BatchSwapOutputData {
                             "height" => Ok(GeneratedField::Height),
                             "tradingPair" | "trading_pair" => Ok(GeneratedField::TradingPair),
                             "epochStartingHeight" | "epoch_starting_height" => Ok(GeneratedField::EpochStartingHeight),
+                            "sctPositionPrefix" | "sct_position_prefix" => Ok(GeneratedField::SctPositionPrefix),
                             _ => Ok(GeneratedField::__SkipField__),
                         }
                     }
@@ -743,6 +754,7 @@ impl<'de> serde::Deserialize<'de> for BatchSwapOutputData {
                 let mut height__ = None;
                 let mut trading_pair__ = None;
                 let mut epoch_starting_height__ = None;
+                let mut sct_position_prefix__ = None;
                 while let Some(k) = map_.next_key()? {
                     match k {
                         GeneratedField::Delta1 => {
@@ -803,6 +815,14 @@ impl<'de> serde::Deserialize<'de> for BatchSwapOutputData {
                                 Some(map_.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0)
                             ;
                         }
+                        GeneratedField::SctPositionPrefix => {
+                            if sct_position_prefix__.is_some() {
+                                return Err(serde::de::Error::duplicate_field("sctPositionPrefix"));
+                            }
+                            sct_position_prefix__ = 
+                                Some(map_.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0)
+                            ;
+                        }
                         GeneratedField::__SkipField__ => {
                             let _ = map_.next_value::<serde::de::IgnoredAny>()?;
                         }
@@ -818,6 +838,7 @@ impl<'de> serde::Deserialize<'de> for BatchSwapOutputData {
                     height: height__.unwrap_or_default(),
                     trading_pair: trading_pair__,
                     epoch_starting_height: epoch_starting_height__.unwrap_or_default(),
+                    sct_position_prefix: sct_position_prefix__.unwrap_or_default(),
                 })
             }
         }
diff --git a/crates/proto/src/gen/proto_descriptor.bin.no_lfs b/crates/proto/src/gen/proto_descriptor.bin.no_lfs
index 8a26d29b046550f594d789bdc692d546f5431d8b..8f030d1fee28902f54fcb7b0fbca3040b720a132 100644
GIT binary patch
delta 9374
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
E0nf$5KmY&$

delta 9054
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
Z07C7+iv4#m{BisV{K?_{cleur^M5#Kc$)wK

diff --git a/proto/penumbra/penumbra/core/component/dex/v1/dex.proto b/proto/penumbra/penumbra/core/component/dex/v1/dex.proto
index 4ba3cbb394..1076e03ecf 100644
--- a/proto/penumbra/penumbra/core/component/dex/v1/dex.proto
+++ b/proto/penumbra/penumbra/core/component/dex/v1/dex.proto
@@ -227,6 +227,8 @@ message BatchSwapOutputData {
   TradingPair trading_pair = 8;
   // The starting block height of the epoch for which the batch swap data is valid.
   uint64 epoch_starting_height = 9;
+  // The prefix (epoch, block) of the position where this batch swap occurred.
+  uint64 sct_position_prefix = 10;
 }
 
 // The trading function for a specific pair.