Skip to content

Commit

Permalink
Merge branch 'murisi/conversion-loading-fix' (#1244) into maint-0.14
Browse files Browse the repository at this point in the history
* murisi/conversion-loading-fix:
  Now load conversions from storage even for epoch 1.
  Added record to changelog.
  • Loading branch information
juped committed Mar 28, 2023
2 parents a93a77f + 52b6d93 commit effd040
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- Now load conversions from storage even for epoch 1.
([\#1244](https://github.com/anoma/namada/pull/1244))
2 changes: 1 addition & 1 deletion core/src/ledger/storage/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,7 @@ where
// Rebuild Merkle tree
self.block.tree = MerkleTree::new(merkle_tree_stores)
.or_else(|_| self.get_merkle_tree(height))?;
if self.last_epoch.0 > 1 {
if self.last_epoch.0 > 0 {
// The derived conversions will be placed in MASP address space
let masp_addr = masp();
let key_prefix: Key = masp_addr.to_db_key().into();
Expand Down

0 comments on commit effd040

Please sign in to comment.