Merge pull request #52 from JoyStream/development

dev to master - v0.2.0

Author: mnaamani

conan_package/base.py

@@ -3,14 +3,14 @@
 
 class ExtensionBase(ConanFile):
     name = "Extension"
-    version = "0.1.6"
+    version = "0.2.0"
     license = "(c) JoyStream Inc. 2016-2017"
     url = "https://github.com/JoyStream/extension-cpp.git"
     repo_ssh_url = "git@github.com:JoyStream/extension-cpp.git"
     repo_https_url = "https://github.com/JoyStream/extension-cpp.git"
     settings = "os", "compiler", "build_type", "arch"
     generators = "cmake"
-    requires = "ProtocolSession/0.1.4@joystream/stable", "Libtorrent/1.1.1@joystream/stable"
+    requires = "ProtocolSession/0.2.1@joystream/stable", "Libtorrent/1.1.1@joystream/stable", "Common/0.1.3@joystream/stable"
     build_policy = "missing"
 
     def source(self):

sources/include/extension/Alert.hpp

@@ -548,6 +548,19 @@ namespace alert {
         const Coin::KeyPair contractKeyPair;
         const Coin::PubKeyHash finalPkHash;
     };
+
+    struct AllSellersGone : public libtorrent::torrent_alert {
+
+        AllSellersGone(libtorrent::aux::stack_allocator& alloc,
+                       const libtorrent::torrent_handle & h)
+            : libtorrent::torrent_alert(alloc, h) {}
+
+        TORRENT_DEFINE_ALERT(DownloadStarted, libtorrent::user_alert_id + 32)
+        static const int static_category = alert::status_notification;
+        virtual std::string message() const override {
+            return torrent_alert::message() + " all sellers gone";
+        }
+    };
 }
 }
 }

sources/include/extension/TorrentPlugin.hpp

@@ -14,6 +14,7 @@
 #include <libtorrent/torrent.hpp>
 #include <libtorrent/alert_types.hpp>
 #include <map>
+#include <chrono>
 
 namespace joystream {
 namespace extension {
@@ -215,6 +216,7 @@ class TorrentPlugin : public libtorrent::torrent_plugin {
     protocol_session::AnchorAnnounced<libtorrent::peer_id> anchorAnnounced();
     protocol_session::ReceivedValidPayment<libtorrent::peer_id> receivedValidPayment();
     protocol_session::SentPayment<libtorrent::peer_id> sentPayment();
+    protocol_session::AllSellersGone allSellersGone();
 
     /// Members
 
@@ -297,16 +299,11 @@ class TorrentPlugin : public libtorrent::torrent_plugin {
 
     /// Sell mode spesific state
 
-    // While selling, this maintains mapping between piece index and peers that are
-    // waiting for this piece to be read from disk.
-    // Will typically just be one, but may be multiple - hence set is used
-    std::map<int, std::set<libtorrent::peer_id> > _outstandingLoadPieceForBuyerCalls;
+    // While selling, this maintains set of pieces peers are waiting for to be read from disk.
+    std::set<int> _outstandingLoadPieceForBuyers;
 
     /// Buy mode spesific state
 
-    // While buying, this maintains mapping between piece index and the single
-    // peer waiting for it to be validated and stored.
-    std::map<int, libtorrent::peer_id> _outstandingFullPieceArrivedCalls;
 
     /// Utilities
 

sources/src/PeerPlugin.cpp

@@ -241,6 +241,20 @@ namespace extension {
             return true;
         }
 
+        // Only communicate with peers with same protocol major version number
+        if(_protocolVersionOfPeer.major() != protocol_statemachine::CBStateMachine::protocolVersion.major()) {
+          // Mark peer as not supporting this extension
+          _peerPaymentBEPSupportStatus = BEPSupportStatus::not_supported;
+
+          // Remove peer
+          std::clog << "Dropping Peer: (incompatible protocol vesrion)" << std::endl;
+          libtorrent::error_code ec;
+          drop(ec);
+
+          // Keep us around
+          return true;
+        }
+
         // Try to extract m key, if its not present, then we are done
         libtorrent::bdecode_node m = handshake.dict_find_dict("m");