Merge branch 'origin/tomas/pos-data-history' (#1733)

* origin/tomas/pos-data-history: changelog: add #1733 pos/epoched: keep 2 past epochs of data by default
anoma · Jul 21, 2023 · e956a37 · e956a37
2 parents d5af059 + 641f9e0
commit e956a37
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/.changelog/unreleased/miscellaneous/1733-pos-data-history.md b/.changelog/unreleased/miscellaneous/1733-pos-data-history.md
@@ -0,0 +1,2 @@
+- PoS: Keep the data for last two epochs by default.
+  ([\#1733](https://github.com/anoma/namada/pull/1733))
diff --git a/proof_of_stake/src/epoched.rs b/proof_of_stake/src/epoched.rs
@@ -24,11 +24,14 @@ pub const LAST_UPDATE_SUB_KEY: &str = "last_update";
 /// Sub-key for an epoched data structure's oldest epoch with some data
 pub const OLDEST_EPOCH_SUB_KEY: &str = "oldest_epoch";
 
+/// Default number of past epochs to keep.
+const DEFAULT_NUM_PAST_EPOCHS: u64 = 2;
+
 /// Discrete epoched data handle
 pub struct Epoched<
     Data,
     FutureEpochs,
-    const NUM_PAST_EPOCHS: u64 = 0,
+    const NUM_PAST_EPOCHS: u64 = DEFAULT_NUM_PAST_EPOCHS,
     SON = collections::Simple,
 > {
     storage_prefix: storage::Key,
@@ -38,8 +41,11 @@ pub struct Epoched<
 }
 
 /// Discrete epoched data handle with nested lazy structure
-pub type NestedEpoched<Data, FutureEpochs, const NUM_PAST_EPOCHS: u64 = 0> =
-    Epoched<Data, FutureEpochs, NUM_PAST_EPOCHS, collections::Nested>;
+pub type NestedEpoched<
+    Data,
+    FutureEpochs,
+    const NUM_PAST_EPOCHS: u64 = DEFAULT_NUM_PAST_EPOCHS,
+> = Epoched<Data, FutureEpochs, NUM_PAST_EPOCHS, collections::Nested>;
 
 /// Delta epoched data handle
 pub struct EpochedDelta<Data, FutureEpochs, const NUM_PAST_EPOCHS: u64> {