bump salticidae version and make some minor changes

3 files changed, 43 insertions, 38 deletions

diff --git a/src/consensus.cpp b/src/consensus.cpp
index 7a577c5..9de7cc2 100644
--- a/src/consensus.cpp
+++ b/src/consensus.cpp
@@ -53,7 +53,7 @@ block_t HotStuffCore::get_delivered_blk(const uint256_t &blk_hash) {
     block_t blk = storage->find_blk(blk_hash);
     if (blk == nullptr || !blk->delivered)
         throw std::runtime_error("block not delivered");
-    return std::move(blk);
+    return blk;
 }
 
 bool HotStuffCore::on_deliver_blk(const block_t &blk) {
@@ -279,10 +279,10 @@ void HotStuffCore::prune(uint32_t staleness) {
     }
 }
 
-void HotStuffCore::add_replica(ReplicaID rid, const NetAddr &addr,
+void HotStuffCore::add_replica(ReplicaID rid, const PeerId &peer_id,
                                 pubkey_bt &&pub_key) {
-    config.add_replica(rid, 
-            ReplicaInfo(rid, addr, std::move(pub_key)));
+    config.add_replica(rid,
+            ReplicaInfo(rid, peer_id, std::move(pub_key)));
     b0->voted.insert(rid);
 }
 
@@ -351,7 +351,7 @@ HotStuffCore::operator std::string () const {
       << "b_exec=" << get_hex10(b_exec->get_hash()) << " "
       << "vheight=" << std::to_string(vheight) << " "
       << "tails=" << std::to_string(tails.size()) << ">";
-    return std::move(s);
+    return s;
 }
 
 }
diff --git a/src/entity.cpp b/src/entity.cpp
index 59febac..649ce19 100644
--- a/src/entity.cpp
+++ b/src/entity.cpp
@@ -26,16 +26,11 @@ void Block::serialize(DataStream &s) const {
     s << htole((uint32_t)cmds.size());
     for (auto cmd: cmds)
         s << cmd;
-    if (qc)
-        s << (uint8_t)1 << *qc;
-    else
-        s << (uint8_t)0;
-    s << htole((uint32_t)extra.size()) << extra;
+    s << *qc << htole((uint32_t)extra.size()) << extra;
 }
 
 void Block::unserialize(DataStream &s, HotStuffCore *hsc) {
     uint32_t n;
-    uint8_t flag;
     s >> n;
     n = letoh(n);
     parent_hashes.resize(n);
@@ -48,8 +43,7 @@ void Block::unserialize(DataStream &s, HotStuffCore *hsc) {
         s >> cmd;
 //    for (auto &cmd: cmds)
 //        cmd = hsc->parse_cmd(s);
-    s >> flag;
-    qc = flag ? hsc->parse_quorum_cert(s) : nullptr;
+    qc = hsc->parse_quorum_cert(s);
     s >> n;
     n = letoh(n);
     if (n == 0)
@@ -63,12 +57,12 @@ void Block::unserialize(DataStream &s, HotStuffCore *hsc) {
 }
 
 bool Block::verify(const HotStuffCore *hsc) const {
-    return qc && qc->verify(hsc->get_config());
+    if (qc->get_obj_hash() == hsc->get_genesis()->get_hash())
+        return true;
+    return 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 b584af0..ad2ed55 100644
--- a/src/hotstuff.cpp
+++ b/src/hotstuff.cpp
@@ -97,7 +97,7 @@ void HotStuffBase::on_fetch_blk(const block_t &blk) {
     }
 }
 
-void HotStuffBase::on_deliver_blk(const block_t &blk) {
+bool HotStuffBase::on_deliver_blk(const block_t &blk) {
     const uint256_t &blk_hash = blk->get_hash();
     bool valid;
     /* sanity check: all parents must be delivered */
@@ -116,6 +116,7 @@ void HotStuffBase::on_deliver_blk(const block_t &blk) {
         LOG_WARN("dropping invalid block");
     }
 
+    bool res = true;
     auto it = blk_delivery_waiting.find(blk_hash);
     if (it != blk_delivery_waiting.end())
     {
@@ -133,14 +134,16 @@ void HotStuffBase::on_deliver_blk(const block_t &blk) {
         else
         {
             pm.reject(blk);
+            res = false;
             // TODO: do we need to also free it from storage?
         }
         blk_delivery_waiting.erase(it);
     }
+    return res;
 }
 
 promise_t HotStuffBase::async_fetch_blk(const uint256_t &blk_hash,
-                                        const NetAddr *replica_id,
+                                        const PeerId *replica,
                                         bool fetch_now) {
     if (storage->is_blk_fetched(blk_hash))
         return promise_t([this, &blk_hash](promise_t pm){
@@ -157,13 +160,13 @@ promise_t HotStuffBase::async_fetch_blk(const uint256_t &blk_hash,
                 blk_hash,
                 BlockFetchContext(blk_hash, this))).first;
     }
-    if (replica_id != nullptr)
-        it->second.add_replica(*replica_id, fetch_now);
+    if (replica != nullptr)
+        it->second.add_replica(*replica, fetch_now);
     return static_cast<promise_t &>(it->second);
 }
 
 promise_t HotStuffBase::async_deliver_blk(const uint256_t &blk_hash,
-                                        const NetAddr &replica_id) {
+                                        const PeerId &replica) {
     if (storage->is_blk_delivered(blk_hash))
         return promise_t([this, &blk_hash](promise_t pm) {
             pm.resolve(storage->find_blk(blk_hash));
@@ -174,26 +177,30 @@ promise_t HotStuffBase::async_deliver_blk(const uint256_t &blk_hash,
     BlockDeliveryContext pm{[](promise_t){}};
     it = blk_delivery_waiting.insert(std::make_pair(blk_hash, pm)).first;
     /* otherwise the on_deliver_batch will resolve */
-    async_fetch_blk(blk_hash, &replica_id).then([this, replica_id](block_t blk) {
+    async_fetch_blk(blk_hash, &replica).then([this, replica](block_t blk) {
         /* qc_ref should be fetched */
         std::vector<promise_t> pms;
         const auto &qc = blk->get_qc();
-        if (qc)
-            pms.push_back(async_fetch_blk(qc->get_obj_hash(), &replica_id));
+        assert(qc);
+        if (blk == get_genesis())
+            pms.push_back(promise_t([](promise_t &pm){ pm.resolve(true); }));
+        else
+            pms.push_back(blk->verify(this, vpool));
+        pms.push_back(async_fetch_blk(qc->get_obj_hash(), &replica));
         /* the parents should be delivered */
         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(this, vpool));
-        promise::all(pms).then([this, blk]() {
-            on_deliver_blk(blk);
+            pms.push_back(async_deliver_blk(phash, replica));
+        promise::all(pms).then([this, blk](const promise::values_t values) {
+            auto ret = promise::any_cast<bool>(values[0]) && this->on_deliver_blk(blk);
+            if (!ret)
+                HOTSTUFF_LOG_WARN("verification failed during async delivery");
         });
     });
     return static_cast<promise_t &>(pm);
 }
 
 void HotStuffBase::propose_handler(MsgPropose &&msg, const Net::conn_t &conn) {
-    const NetAddr &peer = conn->get_peer_addr();
+    const PeerId &peer = conn->get_peer_id();
     if (peer.is_null()) return;
     msg.postponed_parse(this);
     auto &prop = msg.proposal;
@@ -207,7 +214,7 @@ void HotStuffBase::propose_handler(MsgPropose &&msg, const Net::conn_t &conn) {
 }
 
 void HotStuffBase::vote_handler(MsgVote &&msg, const Net::conn_t &conn) {
-    const NetAddr &peer = conn->get_peer_addr();
+    const auto &peer = conn->get_peer_id();
     if (peer.is_null()) return;
     msg.postponed_parse(this);
     //auto &vote = msg.vote;
@@ -224,7 +231,7 @@ void HotStuffBase::vote_handler(MsgVote &&msg, const Net::conn_t &conn) {
 }
 
 void HotStuffBase::req_blk_handler(MsgReqBlock &&msg, const Net::conn_t &conn) {
-    const NetAddr replica = conn->get_peer_addr();
+    const PeerId replica = conn->get_peer_id();
     if (replica.is_null()) return;
     auto &blk_hashes = msg.blk_hashes;
     std::vector<promise_t> pms;
@@ -302,7 +309,7 @@ void HotStuffBase::print_stat() const {
         size_t nrb = conn->get_nrecvb();
         conn->clear_msgstat();
         LOG_INFO("%s: %u(%u), %u(%u), %u",
-            std::string(replica).c_str(), ns, nsb, nr, nrb, part_fetched_replica[replica]);
+            get_hex10(replica).c_str(), ns, nsb, nr, nrb, part_fetched_replica[replica]);
         _nsent += ns;
         _nrecv += nr;
         part_fetched_replica[replica] = 0;
@@ -372,7 +379,7 @@ void HotStuffBase::do_vote(ReplicaID last_proposer, const Vote &vote) {
             //on_receive_vote(vote);
         }
         else
-            pn.send_msg(MsgVote(vote), get_config().get_addr(proposer));
+            pn.send_msg(MsgVote(vote), get_config().get_peer_id(proposer));
     });
 }
 
@@ -399,12 +406,16 @@ void HotStuffBase::start(
     for (size_t i = 0; i < replicas.size(); i++)
     {
         auto &addr = std::get<0>(replicas[i]);
-        HotStuffCore::add_replica(i, addr, std::move(std::get<1>(replicas[i])));
-        valid_tls_certs.insert(std::move(std::get<2>(replicas[i])));
+        auto cert_hash = std::move(std::get<2>(replicas[i]));
+        valid_tls_certs.insert(cert_hash);
+        salticidae::PeerId peer{cert_hash};
+        HotStuffCore::add_replica(i, peer, std::move(std::get<1>(replicas[i])));
         if (addr != listen_addr)
         {
-            peers.push_back(addr);
-            pn.add_peer(addr);
+            peers.push_back(peer);
+            pn.add_peer(peer);
+            pn.set_peer_addr(peer, addr);
+            pn.conn_peer(peer);
         }
     }