Merge branch 'yuji/fix_header_hash' (#298)

* yuji/fix_header_hash: fix header hash
anoma · Oct 20, 2022 · 780e8a6 · 780e8a6
2 parents 9ba054d + d41b2ef
commit 780e8a6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/apps/src/lib/node/ledger/shims/abcipp_shim.rs b/apps/src/lib/node/ledger/shims/abcipp_shim.rs
@@ -149,7 +149,6 @@ impl AbcippShim {
                         self.begin_block_request.take().unwrap().into();
                     let hash = self.get_hash();
                     end_block_request.hash = BlockHash::from(hash.clone());
-                    end_block_request.header.hash = hash;
                     end_block_request.txs = txs;
                     self.service
                         .call(Request::FinalizeBlock(end_block_request))

diff --git a/apps/src/lib/node/ledger/shims/abcipp_shim_types.rs b/apps/src/lib/node/ledger/shims/abcipp_shim_types.rs
@@ -249,7 +249,8 @@ pub mod shim {
                 FinalizeBlock {
                     hash: BlockHash::default(),
                     header: Header {
-                        hash: Hash::default(),
+                        hash: Hash::try_from(header.app_hash.as_slice())
+                            .unwrap_or_default(),
                         time: DateTimeUtc::try_from(header.time.unwrap())
                             .unwrap(),
                         next_validators_hash: Hash::try_from(