Merge branch 'master' of github.com:hot-stuff/libhotstuff

2 files changed, 13 insertions, 1 deletions

diff --git a/src/entity.cpp b/src/entity.cpp
index e90e0f2..59febac 100644
--- a/src/entity.cpp
+++ b/src/entity.cpp
@@ -62,4 +62,16 @@ void Block::unserialize(DataStream &s, HotStuffCore *hsc) {
     this->hash = salticidae::get_hash(*this);
 }
 
+bool Block::verify(const HotStuffCore *hsc) const {
+    return qc && qc->verify(hsc->get_config());
+}
+
+promise_t Block::verify(const HotStuffCore *hsc, VeriPool &vpool) const {
+    if (!qc)
+        return promise_t([](promise_t &pm) { pm.resolve(false); });
+    if (qc->get_obj_hash() == hsc->get_genesis()->get_hash())
+        return promise_t([](promise_t &pm) { pm.resolve(true); });
+    return qc->verify(hsc->get_config(), vpool);
+}
+
 }
diff --git a/src/hotstuff.cpp b/src/hotstuff.cpp
index 5ae0fe6..b584af0 100644
--- a/src/hotstuff.cpp
+++ b/src/hotstuff.cpp
@@ -184,7 +184,7 @@ promise_t HotStuffBase::async_deliver_blk(const uint256_t &blk_hash,
         for (const auto &phash: blk->get_parent_hashes())
             pms.push_back(async_deliver_blk(phash, replica_id));
         if (blk != get_genesis())
-            pms.push_back(blk->verify(get_config(), vpool));
+            pms.push_back(blk->verify(this, vpool));
         promise::all(pms).then([this, blk]() {
             on_deliver_blk(blk);
         });