From d8fea18a5f7e5a4e6804cbb53c0f38d8fddda0d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Zemanovi=C4=8D?= Date: Fri, 14 Oct 2022 11:14:11 +0200 Subject: [PATCH 1/2] shared/storage: fix the height recorded for a new epoch --- shared/src/ledger/storage/mod.rs | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/shared/src/ledger/storage/mod.rs b/shared/src/ledger/storage/mod.rs index 422bbe4d5e..782ed17e27 100644 --- a/shared/src/ledger/storage/mod.rs +++ b/shared/src/ledger/storage/mod.rs @@ -631,7 +631,7 @@ where let evidence_max_age_num_blocks: u64 = 100000; self.block .pred_epochs - .new_epoch(height + 1, evidence_max_age_num_blocks); + .new_epoch(height, evidence_max_age_num_blocks); tracing::info!("Began a new epoch {}", self.block.epoch); } self.update_epoch_in_merkle_tree()?; @@ -992,12 +992,20 @@ mod tests { block_height + epoch_duration.min_num_of_blocks); assert_eq!(storage.next_epoch_min_start_time, block_time + epoch_duration.min_duration); - assert_eq!(storage.block.pred_epochs.get_epoch(block_height), Some(epoch_before)); - assert_eq!(storage.block.pred_epochs.get_epoch(block_height + 1), Some(epoch_before.next())); + assert_eq!( + storage.block.pred_epochs.get_epoch(BlockHeight(block_height.0 - 1)), + Some(epoch_before)); + assert_eq!( + storage.block.pred_epochs.get_epoch(block_height), + Some(epoch_before.next())); } else { assert_eq!(storage.block.epoch, epoch_before); - assert_eq!(storage.block.pred_epochs.get_epoch(block_height), Some(epoch_before)); - assert_eq!(storage.block.pred_epochs.get_epoch(block_height + 1), Some(epoch_before)); + assert_eq!( + storage.block.pred_epochs.get_epoch(BlockHeight(block_height.0 - 1)), + Some(epoch_before)); + assert_eq!( + storage.block.pred_epochs.get_epoch(block_height), + Some(epoch_before)); } // Last epoch should only change when the block is committed assert_eq!(storage.last_epoch, epoch_before); From 2fa19cd9fe112b7627ea2fb138751654de1e6979 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Zemanovi=C4=8D?= Date: Fri, 14 Oct 2022 11:27:28 +0200 Subject: [PATCH 2/2] changelog: add #594 --- .changelog/unreleased/bug-fixes/594-fix-pred-epoch-height.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .changelog/unreleased/bug-fixes/594-fix-pred-epoch-height.md diff --git a/.changelog/unreleased/bug-fixes/594-fix-pred-epoch-height.md b/.changelog/unreleased/bug-fixes/594-fix-pred-epoch-height.md new file mode 100644 index 0000000000..03b7229bcc --- /dev/null +++ b/.changelog/unreleased/bug-fixes/594-fix-pred-epoch-height.md @@ -0,0 +1,2 @@ +- Fix the value recorded for epoch start block height. + ([#594](https://github.com/anoma/namada/pull/594)) \ No newline at end of file