Depcrate epoch_starting_height in BSOD

crates/bench/benches/swap_claim.rs

@@ -70,7 +70,6 @@ fn swap_claim_proving_time(c: &mut Criterion) {
         unfilled_2: Amount::from(50u64),
         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));

crates/bin/pcli/tests/proof.rs

@@ -278,7 +278,6 @@ fn swap_claim_parameters_vs_current_swap_claim_circuit() {
         unfilled_2: Amount::from(50u64),
         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));

crates/core/component/dex/src/batch_swap_output_data.rs

@@ -37,8 +37,6 @@ pub struct BatchSwapOutputData {
     pub height: u64,
     /// The trading pair associated with the batch swap.
     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,
 }
@@ -192,6 +190,7 @@ impl DomainType for BatchSwapOutputData {
 
 impl From<BatchSwapOutputData> for pb::BatchSwapOutputData {
     fn from(s: BatchSwapOutputData) -> Self {
+        #[allow(deprecated)]
         pb::BatchSwapOutputData {
             delta_1: Some(s.delta_1.into()),
             delta_2: Some(s.delta_2.into()),
@@ -200,9 +199,12 @@ impl From<BatchSwapOutputData> for pb::BatchSwapOutputData {
             unfilled_1: Some(s.unfilled_1.into()),
             unfilled_2: Some(s.unfilled_2.into()),
             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(),
+            // Deprecated fields we explicitly fill with defaults.
+            // We could instead use a `..Default::default()` here, but that would silently
+            // work if we were to add fields to the domain type.
+            epoch_starting_height: Default::default(),
         }
     }
 }
@@ -306,7 +308,6 @@ impl TryFrom<pb::BatchSwapOutputData> for BatchSwapOutputData {
                 .trading_pair
                 .ok_or_else(|| anyhow!("Missing trading_pair"))?
                 .try_into()?,
-            epoch_starting_height: s.epoch_starting_height,
             sct_position_prefix,
         })
     }
@@ -424,7 +425,6 @@ mod tests {
                     unfilled_2: Amount::from(1u32),
                     height: 0,
                     trading_pair,
-                    epoch_starting_height: 0,
                     sct_position_prefix: 0u64.into(),
                 },
             }
@@ -446,7 +446,6 @@ mod tests {
             unfilled_2: Amount::from(50u64),
             height: 0u64,
             trading_pair,
-            epoch_starting_height: 0u64,
             sct_position_prefix: 0u64.into(),
         };
 

crates/core/component/dex/src/component/circuit_breaker/value.rs

@@ -161,7 +161,6 @@ mod tests {
                     unfilled_2: 0u64.into(),
                     height: 1,
                     trading_pair: pair_1.into_directed_trading_pair().into(),
-                    epoch_starting_height: 0,
                     sct_position_prefix: Default::default(),
                 },
                 None,

crates/core/component/dex/src/component/router/route_and_fill.rs

@@ -91,7 +91,6 @@ pub trait HandleBatchSwaps: StateWrite + Sized {
         let epoch = self.get_current_epoch().await.expect("epoch is set");
         let output_data = BatchSwapOutputData {
             height: block_height,
-            epoch_starting_height: epoch.start_height,
             trading_pair,
             delta_1,
             delta_2,

crates/core/component/dex/src/component/tests.rs

@@ -756,7 +756,6 @@ async fn swap_execution_tests() -> anyhow::Result<()> {
             unfilled_1: 0u32.into(),
             unfilled_2: 0u32.into(),
             height: 0,
-            epoch_starting_height: 0,
             trading_pair,
             sct_position_prefix: Default::default(),
         }

crates/core/component/dex/src/swap_claim/proof.rs

@@ -366,7 +366,6 @@ impl DummyWitness for SwapClaimCircuit {
             unfilled_2: Amount::from(10u64),
             height: 0,
             trading_pair: swap_plaintext.trading_pair,
-            epoch_starting_height: 0,
             sct_position_prefix: Default::default(),
         };
         let note_blinding_1 = Fq::from(1);
@@ -650,7 +649,6 @@ mod tests {
             unfilled_2: test_bsod.unfilled_2,
             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));
@@ -783,7 +781,6 @@ mod tests {
             unfilled_2: test_bsod.unfilled_2,
             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));
@@ -884,7 +881,6 @@ mod tests {
             unfilled_2: test_bsod.unfilled_2,
             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));

crates/proto/src/gen/penumbra.core.component.dex.v1.rs

@@ -473,6 +473,7 @@ pub struct BatchSwapOutputData {
     #[prost(message, optional, tag = "8")]
     pub trading_pair: ::core::option::Option<TradingPair>,
     /// The starting block height of the epoch for which the batch swap data is valid.
+    #[deprecated]
     #[prost(uint64, tag = "9")]
     pub epoch_starting_height: u64,
     /// The prefix (epoch, block) of the position where this batch swap occurred.

proto/penumbra/penumbra/core/component/dex/v1/dex.proto

@@ -226,7 +226,7 @@ message BatchSwapOutputData {
   // The trading pair associated with the batch swap.
   TradingPair trading_pair = 8;
   // The starting block height of the epoch for which the batch swap data is valid.
-  uint64 epoch_starting_height = 9;
+  uint64 epoch_starting_height = 9 [deprecated = true];
   // The prefix (epoch, block) of the position where this batch swap occurred.
   uint64 sct_position_prefix = 10;
 }