Merge branch 'master' into auth-jsonrpc

# Conflicts:
#	lbrynet/conf.py
#	lbrynet/core/Error.py
#	lbrynet/lbrynet_daemon/Daemon.py
#	lbrynet/lbrynet_daemon/DaemonControl.py
#	lbrynet/lbrynet_daemon/ExchangeRateManager.py

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.6.3
+current_version = 0.6.4
 commit = True
 tag = True
 

INSTALL.md

@@ -41,7 +41,6 @@ On Ubuntu or Mint you can install the prerequisites by running
 It is strongly recommended to create a new virtualenv for LBRY
 
  ```
- sudo apt-get install
  virtualenv lbry-venv
  source lbry-venv/bin/activate
  ```

lbrynet/__init__.py

@@ -1,6 +1,6 @@
 import logging
 
-__version__ = "0.6.3"
+__version__ = "0.6.4"
 version = tuple(__version__.split('.'))
 
 logging.getLogger(__name__).addHandler(logging.NullHandler())

lbrynet/conf.py

@@ -31,7 +31,7 @@ MAX_BLOB_INFOS_TO_REQUEST = 20
 BLOBFILES_DIR = ".blobfiles"
 BLOB_SIZE = 2**21
 
-MIN_BLOB_DATA_PAYMENT_RATE = .005  # points/megabyte
+MIN_BLOB_DATA_PAYMENT_RATE = .0001  # points/megabyte
 MIN_BLOB_INFO_PAYMENT_RATE = .02  # points/1000 infos
 MIN_VALUABLE_BLOB_INFO_PAYMENT_RATE = .05  # points/1000 infos
 MIN_VALUABLE_BLOB_HASH_PAYMENT_RATE = .05  # points/1000 infos
@@ -92,3 +92,5 @@ LOGGLY_TOKEN = 'LJEzATH4AzRgAwxjAP00LwZ2YGx3MwVgZTMuBQZ3MQuxLmOv'
 
 ANALYTICS_ENDPOINT = 'https://api.segment.io/v1'
 ANALYTICS_TOKEN = 'Ax5LZzR1o3q3Z3WjATASDwR5rKyHH0qOIRIbLmMXn2H='
+
+LBRYUM_WALLET_DIR = os.environ.get('LBRYUM_WALLET_DIR')

lbrynet/core/BlobAvailability.py

@@ -0,0 +1,89 @@
+import logging
+
+from twisted.internet import defer
+from twisted.internet.task import LoopingCall
+from decimal import Decimal
+
+log = logging.getLogger(__name__)
+
+
+class BlobAvailabilityTracker(object):
+    """
+    Class to track peer counts for known blobs, and to discover new popular blobs
+
+    Attributes:
+        availability (dict): dictionary of peers for known blobs
+    """
+
+    def __init__(self, blob_manager, peer_finder, dht_node):
+        self.availability = {}
+        self.last_mean_availability = Decimal(0.0)
+        self._blob_manager = blob_manager
+        self._peer_finder = peer_finder
+        self._dht_node = dht_node
+        self._check_popular = LoopingCall(self._update_most_popular)
+        self._check_mine = LoopingCall(self._update_mine)
+
+    def start(self):
+        log.info("Starting blob tracker")
+        self._check_popular.start(30)
+        self._check_mine.start(120)
+
+    def stop(self):
+        if self._check_popular.running:
+            self._check_popular.stop()
+        if self._check_mine.running:
+            self._check_mine.stop()
+
+    def get_blob_availability(self, blob):
+        def _get_peer_count(peers):
+            have_blob = sum(1 for peer in peers if peer.is_available())
+            return {blob: have_blob}
+
+        d = self._peer_finder.find_peers_for_blob(blob)
+        d.addCallback(_get_peer_count)
+        return d
+
+    def get_availability_for_blobs(self, blobs):
+        dl = [self.get_blob_availability(blob) for blob in blobs if blob]
+        d = defer.DeferredList(dl)
+        d.addCallback(lambda results: [val for success, val in results if success])
+        return d
+
+    def _update_peers_for_blob(self, blob):
+        def _save_peer_info(blob_hash, peers):
+            v = {blob_hash: peers}
+            self.availability.update(v)
+            return v
+
+        d = self._peer_finder.find_peers_for_blob(blob)
+        d.addCallback(lambda r: [[c.host, c.port, c.is_available()] for c in r])
+        d.addCallback(lambda peers: _save_peer_info(blob, peers))
+        return d
+
+    def _get_most_popular(self):
+        dl = []
+        for (hash, _) in self._dht_node.get_most_popular_hashes(100):
+            encoded = hash.encode('hex')
+            dl.append(self._update_peers_for_blob(encoded))
+        return defer.DeferredList(dl)
+
+    def _update_most_popular(self):
+        d = self._get_most_popular()
+        d.addCallback(lambda _: self._get_mean_peers())
+
+    def _update_mine(self):
+        def _get_peers(blobs):
+            dl = []
+            for hash in blobs:
+                dl.append(self._update_peers_for_blob(hash))
+            return defer.DeferredList(dl)
+
+        d = self._blob_manager.get_all_verified_blobs()
+        d.addCallback(_get_peers)
+        d.addCallback(lambda _: self._get_mean_peers())
+
+    def _get_mean_peers(self):
+        num_peers = [len(self.availability[blob]) for blob in self.availability]
+        mean = Decimal(sum(num_peers)) / Decimal(max(1, len(num_peers)))
+        self.last_mean_availability = mean

lbrynet/core/BlobManager.py

@@ -2,6 +2,7 @@ import logging
 import os
 import time
 import sqlite3
+
 from twisted.internet import threads, defer
 from twisted.python.failure import Failure
 from twisted.enterprise import adbapi
@@ -12,7 +13,6 @@ from lbrynet.core.cryptoutils import get_lbry_hash_obj
 from lbrynet.core.Error import NoSuchBlobError
 from lbrynet.core.sqlite_helpers import rerun_if_locked
 
-
 log = logging.getLogger(__name__)
 
 
@@ -70,6 +70,12 @@ class BlobManager(DHTHashSupplier):
     def get_all_verified_blobs(self):
         pass
 
+    def add_blob_to_download_history(self, blob_hash, host, rate):
+        pass
+
+    def add_blob_to_upload_history(self, blob_hash, host, rate):
+        pass
+
 
 class DiskBlobManager(BlobManager):
     """This class stores blobs on the hard disk"""
@@ -185,6 +191,14 @@ class DiskBlobManager(BlobManager):
         d.addCallback(self.completed_blobs)
         return d
 
+    def add_blob_to_download_history(self, blob_hash, host, rate):
+        d = self._add_blob_to_download_history(blob_hash, host, rate)
+        return d
+
+    def add_blob_to_upload_history(self, blob_hash, host, rate):
+        d = self._add_blob_to_upload_history(blob_hash, host, rate)
+        return d
+
     def _manage(self):
         from twisted.internet import reactor
 
@@ -243,12 +257,29 @@ class DiskBlobManager(BlobManager):
         # one that opened it. The individual connections in the pool are not used in multiple
         # threads.
         self.db_conn = adbapi.ConnectionPool('sqlite3', self.db_file, check_same_thread=False)
-        return self.db_conn.runQuery("create table if not exists blobs (" +
+
+        def create_tables(transaction):
+            transaction.execute("create table if not exists blobs (" +
                                 "    blob_hash text primary key, " +
                                 "    blob_length integer, " +
                                 "    last_verified_time real, " +
-                                     "    next_announce_time real"
+                                "    next_announce_time real)")
-                                     ")")
+
+            transaction.execute("create table if not exists download (" +
+                                "    id integer primary key autoincrement, " +
+                                "    blob text, " +
+                                "    host text, " +
+                                "    rate float, " +
+                                "    ts integer)")
+
+            transaction.execute("create table if not exists upload (" +
+                                "    id integer primary key autoincrement, " +
+                                "    blob text, " +
+                                "    host text, " +
+                                "    rate float, " +
+                                "    ts integer)")
+
+        return self.db_conn.runInteraction(create_tables)
 
     @rerun_if_locked
     def _add_completed_blob(self, blob_hash, length, timestamp, next_announce_time=None):
@@ -426,6 +457,18 @@ class DiskBlobManager(BlobManager):
         d.addCallback(lambda blobs: threads.deferToThread(get_verified_blobs, blobs))
         return d
 
+    @rerun_if_locked
+    def _add_blob_to_download_history(self, blob_hash, host, rate):
+        ts = int(time.time())
+        d = self.db_conn.runQuery("insert into download values (null, ?, ?, ?, ?) ", (blob_hash, str(host), float(rate), ts))
+        return d
+
+    @rerun_if_locked
+    def _add_blob_to_upload_history(self, blob_hash, host, rate):
+        ts = int(time.time())
+        d = self.db_conn.runQuery("insert into upload values (null, ?, ?, ?, ?) ", (blob_hash, str(host), float(rate), ts))
+        return d
+
 
 class TempBlobManager(BlobManager):
     """This class stores blobs in memory"""
@@ -526,7 +569,6 @@ class TempBlobManager(BlobManager):
         d.addCallback(lambda _: set_next_manage_call())
 
     def _delete_blobs_marked_for_deletion(self):
-
         def remove_from_list(b_h):
             del self.blob_hashes_to_delete[b_h]
             log.info("Deleted blob %s", blob_hash)

lbrynet/core/Error.py

@@ -89,11 +89,18 @@ class NoSuchStreamHashError(Exception):
 class InvalidBlobHashError(Exception):
     pass
 
+
 class InvalidHeaderError(Exception):
     pass
 
+
 class InvalidAuthenticationToken(Exception):
     pass
 
+
 class SubhandlerError(Exception):
     pass
+
+
+class NegotiationError(Exception):
+    pass

lbrynet/core/Offer.py

@@ -0,0 +1,62 @@
+from decimal import Decimal
+
+
+class Offer(object):
+    """A rate offer to download blobs from a host."""
+
+    RATE_ACCEPTED = "RATE_ACCEPTED"
+    RATE_TOO_LOW = "RATE_TOO_LOW"
+    RATE_UNSET = "RATE_UNSET"
+
+    def __init__(self, offer):
+        self._state = None
+        self.rate = None
+        if isinstance(offer, Decimal):
+            self.rate = round(offer, 5)
+        elif isinstance(offer, float):
+            self.rate = round(Decimal(offer), 5)
+        if self.rate is None or self.rate < Decimal(0.0):
+            self.unset()
+
+    @property
+    def is_accepted(self):
+        return self._state is Offer.RATE_ACCEPTED
+
+    @property
+    def is_too_low(self):
+        return self._state is Offer.RATE_TOO_LOW
+
+    @property
+    def is_unset(self):
+        return self._state is Offer.RATE_UNSET
+
+    @property
+    def message(self):
+        if self.is_accepted:
+            return Offer.RATE_ACCEPTED
+        elif self.is_too_low:
+            return Offer.RATE_TOO_LOW
+        elif self.is_unset:
+            return Offer.RATE_UNSET
+        return None
+
+    def accept(self):
+        if self.is_unset or self._state is None:
+            self._state = Offer.RATE_ACCEPTED
+
+    def reject(self):
+        if self.is_unset or self._state is None:
+            self._state = Offer.RATE_TOO_LOW
+
+    def unset(self):
+        self._state = Offer.RATE_UNSET
+
+    def handle(self, reply_message):
+        if reply_message == Offer.RATE_TOO_LOW:
+            self.reject()
+        elif reply_message == Offer.RATE_ACCEPTED:
+            self.accept()
+        elif reply_message == Offer.RATE_UNSET:
+            self.unset()
+        else:
+            raise Exception("Unknown offer reply %s" % str(reply_message))

lbrynet/core/PaymentRateManager.py

@@ -1,6 +1,10 @@
+from lbrynet.core.Strategy import get_default_strategy
+from lbrynet.conf import MIN_BLOB_DATA_PAYMENT_RATE, MIN_BLOB_INFO_PAYMENT_RATE
+
 class BasePaymentRateManager(object):
-    def __init__(self, rate):
+    def __init__(self, rate=MIN_BLOB_DATA_PAYMENT_RATE, info_rate=MIN_BLOB_INFO_PAYMENT_RATE):
         self.min_blob_data_payment_rate = rate
+        self.min_blob_info_payment_rate = info_rate
 
 
 class PaymentRateManager(object):
@@ -27,3 +31,43 @@ class PaymentRateManager(object):
 
     def record_points_paid(self, amount):
         self.points_paid += amount
+
+
+class NegotiatedPaymentRateManager(object):
+    def __init__(self, base, availability_tracker, generous=True):
+        """
+        @param base: a BasePaymentRateManager
+        @param availability_tracker: a BlobAvailabilityTracker
+        @param rate: the min blob data payment rate
+        """
+
+        self.base = base
+        self.points_paid = 0.0
+        self.blob_tracker = availability_tracker
+        self.generous = generous
+        self.strategy = get_default_strategy(self.blob_tracker,
+                                             base_price=self.base.min_blob_data_payment_rate,
+                                             is_generous=generous)
+
+    def get_rate_blob_data(self, peer, blobs):
+        response = self.strategy.make_offer(peer, blobs)
+        return response.rate
+
+    def accept_rate_blob_data(self, peer, blobs, offer):
+        offer = self.strategy.respond_to_offer(offer, peer, blobs)
+        self.strategy.update_accepted_offers(peer, offer)
+        return offer.is_accepted
+
+    def reply_to_offer(self, peer, blobs, offer):
+        reply = self.strategy.respond_to_offer(offer, peer, blobs)
+        self.strategy.update_accepted_offers(peer, reply)
+        return reply
+
+    def get_rate_for_peer(self, peer):
+        return self.strategy.accepted_offers.get(peer, False)
+
+    def record_points_paid(self, amount):
+        self.points_paid += amount
+
+    def record_offer_reply(self, peer, offer):
+        self.strategy.update_accepted_offers(peer, offer)

lbrynet/core/Peer.py

@@ -1,5 +1,6 @@
-from collections import defaultdict
 import datetime
+from collections import defaultdict
+from lbrynet.core import utils
 
 
 class Peer(object):
@@ -12,8 +13,7 @@ class Peer(object):
         self.stats = defaultdict(float)  # {string stat_type, float count}
 
     def is_available(self):
-        if (self.attempt_connection_at is None or
+        if self.attempt_connection_at is None or utils.today() > self.attempt_connection_at:
-            datetime.datetime.today() > self.attempt_connection_at):
             return True
         return False
 
@@ -24,7 +24,7 @@ class Peer(object):
     def report_down(self):
         self.down_count += 1
         timeout_time = datetime.timedelta(seconds=60 * self.down_count)
-        self.attempt_connection_at = datetime.datetime.today() + timeout_time
+        self.attempt_connection_at = utils.today() + timeout_time
 
     def update_score(self, score_change):
         self.score += score_change
@@ -37,4 +37,3 @@ class Peer(object):
 
     def __repr__(self):
         return 'Peer({!r}, {!r})'.format(self.host, self.port)
-

lbrynet/core/PriceModel.py

@@ -0,0 +1,47 @@
+from zope.interface import implementer
+from decimal import Decimal
+
+from lbrynet.interfaces import IBlobPriceModel
+from lbrynet.conf import MIN_BLOB_DATA_PAYMENT_RATE
+
+
+def get_default_price_model(blob_tracker, base_price, **kwargs):
+    return MeanAvailabilityWeightedPrice(blob_tracker, base_price, **kwargs)
+
+
+class MeanAvailabilityWeightedPrice(object):
+    """
+    Calculate mean-blob-availability and stream-position weighted price for a blob
+
+    Attributes:
+        base_price (float): base price
+        alpha (float): constant, > 0.0 and <= 1.0, used to more highly value blobs at the beginning of a stream.
+                       alpha defaults to 1.0, which has a null effect
+        blob_tracker (BlobAvailabilityTracker): blob availability tracker
+    """
+    implementer(IBlobPriceModel)
+
+    def __init__(self, tracker, base_price=MIN_BLOB_DATA_PAYMENT_RATE, alpha=1.0):
+        self.blob_tracker = tracker
+        self.base_price = Decimal(base_price)
+        self.alpha = Decimal(alpha)
+
+    def calculate_price(self, blob):
+        mean_availability = self.blob_tracker.last_mean_availability
+        availability = self.blob_tracker.availability.get(blob, [])
+        index = 0  # blob.index
+        price = self.base_price * (mean_availability / Decimal(max(1, len(availability)))) / self._frontload(index)
+        return round(price, 5)
+
+    def _frontload(self, index):
+        """
+        Get front-load multiplier, used to weight prices of blobs in a stream towards the front of the stream.
+
+        At index 0, returns 1.0
+        As index increases, return value approaches 2.0
+
+        @param index: blob position in stream
+        @return: front-load multiplier
+        """
+
+        return Decimal(2.0) - (self.alpha ** index)

lbrynet/core/Session.py

@@ -9,7 +9,8 @@ from lbrynet.core.client.DHTPeerFinder import DHTPeerFinder
 from lbrynet.core.HashAnnouncer import DummyHashAnnouncer
 from lbrynet.core.server.DHTHashAnnouncer import DHTHashAnnouncer
 from lbrynet.core.utils import generate_id
-from lbrynet.core.PaymentRateManager import BasePaymentRateManager
+from lbrynet.core.PaymentRateManager import BasePaymentRateManager, NegotiatedPaymentRateManager
+from lbrynet.core.BlobAvailability import BlobAvailabilityTracker
 from twisted.internet import threads, defer
 
 
@@ -26,9 +27,9 @@ class Session(object):
     the rate limiter, which attempts to ensure download and upload rates stay below a set maximum,
     and upnp, which opens holes in compatible firewalls so that remote peers can connect to this peer."""
     def __init__(self, blob_data_payment_rate, db_dir=None, lbryid=None, peer_manager=None, dht_node_port=None,
-                 known_dht_nodes=None, peer_finder=None, hash_announcer=None,
+                 known_dht_nodes=None, peer_finder=None, hash_announcer=None, blob_dir=None, blob_manager=None,
-                 blob_dir=None, blob_manager=None, peer_port=None, use_upnp=True,
+                 peer_port=None, use_upnp=True, rate_limiter=None, wallet=None, dht_node_class=node.Node,
-                 rate_limiter=None, wallet=None, dht_node_class=node.Node):
+                 blob_tracker_class=None, payment_rate_manager_class=None):
         """
         @param blob_data_payment_rate: The default payment rate for blob data
 
@@ -88,6 +89,9 @@ class Session(object):
         self.blob_dir = blob_dir
         self.blob_manager = blob_manager
 
+        self.blob_tracker = None
+        self.blob_tracker_class = blob_tracker_class or BlobAvailabilityTracker
+
         self.peer_port = peer_port
 
         self.use_upnp = use_upnp
@@ -103,6 +107,8 @@ class Session(object):
         self.dht_node = None
 
         self.base_payment_rate_manager = BasePaymentRateManager(blob_data_payment_rate)
+        self.payment_rate_manager = None
+        self.payment_rate_manager_class = payment_rate_manager_class or NegotiatedPaymentRateManager
 
     def setup(self):
         """Create the blob directory and database if necessary, start all desired services"""
@@ -136,6 +142,8 @@ class Session(object):
     def shut_down(self):
         """Stop all services"""
         ds = []
+        if self.blob_manager is not None:
+            ds.append(defer.maybeDeferred(self.blob_tracker.stop))
         if self.dht_node is not None:
             ds.append(defer.maybeDeferred(self.dht_node.stop))
         if self.rate_limiter is not None:
@@ -253,15 +261,26 @@ class Session(object):
             if self.blob_dir is None:
                 self.blob_manager = TempBlobManager(self.hash_announcer)
             else:
-                self.blob_manager = DiskBlobManager(self.hash_announcer, self.blob_dir, self.db_dir)
+                self.blob_manager = DiskBlobManager(self.hash_announcer,
+                                                    self.blob_dir,
+                                                    self.db_dir)
+
+        if self.blob_tracker is None:
+            self.blob_tracker = self.blob_tracker_class(self.blob_manager,
+                                                        self.peer_finder,
+                                                        self.dht_node)
+        if self.payment_rate_manager is None:
+            self.payment_rate_manager = self.payment_rate_manager_class(self.base_payment_rate_manager,
+                                                                        self.blob_tracker)
 
         self.rate_limiter.start()
         d1 = self.blob_manager.setup()
         d2 = self.wallet.start()
 
         dl = defer.DeferredList([d1, d2], fireOnOneErrback=True, consumeErrors=True)
+        dl.addCallback(lambda _: self.blob_tracker.start())
 
-        dl.addErrback(lambda err: err.value.subFailure)
+        dl.addErrback(self._subfailure)
         return dl
 
     def _unset_upnp(self):
@@ -282,3 +301,9 @@ class Session(object):
         d = threads.deferToThread(threaded_unset_upnp)
         d.addErrback(lambda err: str(err))
         return d
+
+    def _subfailure(self, err):
+        log.error(err.getTraceback())
+        return err.value
+
+

lbrynet/core/Strategy.py

@@ -0,0 +1,124 @@
+from zope.interface import implementer
+from decimal import Decimal
+from lbrynet.interfaces import INegotiationStrategy
+from lbrynet.core.Offer import Offer
+from lbrynet.core.PriceModel import MeanAvailabilityWeightedPrice
+
+
+def get_default_strategy(blob_tracker, **kwargs):
+    return BasicAvailabilityWeightedStrategy(blob_tracker, **kwargs)
+
+
+class Strategy(object):
+    """
+    Base for negotiation strategies
+    """
+    implementer(INegotiationStrategy)
+
+    def __init__(self, price_model, max_rate, min_rate, is_generous=True):
+        self.price_model = price_model
+        self.is_generous = is_generous
+        self.accepted_offers = {}
+        self.offers_sent = {}
+        self.offers_received = {}
+        self.max_rate = max_rate or Decimal(self.price_model.base_price * 100)
+        self.min_rate = Decimal(min_rate)
+
+    def _make_rate_offer(self, rates, offer_count):
+        return NotImplementedError()
+
+    def _get_response_rate(self, rates, offer_count):
+        return NotImplementedError()
+
+    def make_offer(self, peer, blobs):
+        offer_count = self.offers_sent.get(peer, 0)
+        self._add_offer_sent(peer)
+        if peer in self.accepted_offers:
+            # if there was a previous accepted offer, use that
+            offer = self.accepted_offers[peer]
+        elif offer_count == 0 and self.is_generous:
+            # Try asking for it for free
+            offer = Offer(Decimal(0.0))
+        else:
+            rates = [self.price_model.calculate_price(blob) for blob in blobs]
+            price = self._make_rate_offer(rates, offer_count)
+            offer = Offer(price)
+        return offer
+
+    def respond_to_offer(self, offer, peer, blobs):
+        offer_count = self.offers_received.get(peer, 0)
+        self._add_offer_received(peer)
+        rates = [self.price_model.calculate_price(blob) for blob in blobs]
+        price = self._get_response_rate(rates, offer_count)
+
+        if peer in self.accepted_offers:
+            offer = self.accepted_offers[peer]
+        elif offer.rate == 0.0 and offer_count == 0 and self.is_generous:
+            # give blobs away for free by default on the first request
+            offer.accept()
+            self.accepted_offers.update({peer: offer})
+        elif offer.rate >= price:
+            offer.accept()
+            self.accepted_offers.update({peer: offer})
+        else:
+            offer.reject()
+            if peer in self.accepted_offers:
+                del self.accepted_offers[peer]
+        return offer
+
+    def update_accepted_offers(self, peer, offer):
+        if not offer.is_accepted and peer in self.accepted_offers:
+            del self.accepted_offers[peer]
+        if offer.is_accepted:
+            self.accepted_offers.update({peer: offer})
+
+    def _add_offer_sent(self, peer):
+        turn = self.offers_sent.get(peer, 0) + 1
+        self.offers_sent.update({peer: turn})
+
+    def _add_offer_received(self, peer):
+        turn = self.offers_received.get(peer, 0) + 1
+        self.offers_received.update({peer: turn})
+
+    def _bounded_price(self, price):
+        price_for_return = Decimal(min(self.max_rate, max(price, self.min_rate)))
+        return price_for_return
+
+
+class BasicAvailabilityWeightedStrategy(Strategy):
+    """
+    Basic strategy to target blob prices based on supply relative to mean supply
+
+    Discount price target with each incoming request, and raise it with each outgoing from the modeled price
+    until the rate is accepted or a threshold is reached
+    """
+    implementer(INegotiationStrategy)
+
+    def __init__(self, blob_tracker, acceleration=1.25, deceleration=0.9, max_rate=None, min_rate=0.0,
+                                    is_generous=True, base_price=0.0001, alpha=1.0):
+        price_model = MeanAvailabilityWeightedPrice(blob_tracker, base_price=base_price, alpha=alpha)
+        Strategy.__init__(self, price_model, max_rate, min_rate, is_generous)
+        self._acceleration = Decimal(acceleration)  # rate of how quickly to ramp offer
+        self._deceleration = Decimal(deceleration)
+
+    def _get_mean_rate(self, rates):
+        mean_rate = Decimal(sum(rates)) / Decimal(max(len(rates), 1))
+        return mean_rate
+
+    def _premium(self, rate, turn):
+        return rate * (self._acceleration ** Decimal(turn))
+
+    def _discount(self, rate, turn):
+        return rate * (self._deceleration ** Decimal(turn))
+
+    def _get_response_rate(self, rates, offer_count):
+        rate = self._get_mean_rate(rates)
+        discounted = self._discount(rate, offer_count)
+        rounded_price = round(discounted, 5)
+        return self._bounded_price(rounded_price)
+
+    def _make_rate_offer(self, rates, offer_count):
+        rate = self._get_mean_rate(rates)
+        with_premium = self._premium(rate, offer_count)
+        rounded_price = round(with_premium, 5)
+        return self._bounded_price(rounded_price)

lbrynet/core/Wallet.py

@@ -13,6 +13,7 @@ from twisted.python.failure import Failure
 from twisted.enterprise import adbapi
 from collections import defaultdict, deque
 from zope.interface import implements
+from jsonschema import ValidationError
 from decimal import Decimal
 
 from lbryum import SimpleConfig, Network
@@ -338,7 +339,7 @@ class Wallet(object):
 
         try:
             metadata = Metadata(json.loads(result['value']))
-        except (ValueError, TypeError):
+        except ValidationError:
             return Failure(InvalidStreamInfoError(name))
 
         txid = result['txid']
@@ -421,7 +422,7 @@ class Wallet(object):
                 meta_ver = metadata.version
                 sd_hash = metadata['sources']['lbry_sd_hash']
                 d = self._save_name_metadata(name, txid, sd_hash)
-            except AssertionError:
+            except ValidationError:
                 metadata = claim['value']
                 meta_ver = "Non-compliant"
                 d = defer.succeed(None)
@@ -550,6 +551,9 @@ class Wallet(object):
         d.addCallback(_decode)
         return d
 
+    def get_claim_metadata_for_sd_hash(self, sd_hash):
+        return self._get_claim_metadata_for_sd_hash(sd_hash)
+
     def get_name_and_validity_for_sd_hash(self, sd_hash):
         d = self._get_claim_metadata_for_sd_hash(sd_hash)
         d.addCallback(lambda name_txid: self._get_status_of_claim(name_txid[1], name_txid[0], sd_hash) if name_txid is not None else None)
@@ -1110,9 +1114,9 @@ class LBRYcrdWallet(Wallet):
 
 class LBRYumWallet(Wallet):
 
-    def __init__(self, db_dir):
+    def __init__(self, db_dir, config=None):
         Wallet.__init__(self, db_dir)
-        self.config = None
+        self._config = config
         self.network = None
         self.wallet = None
         self.cmd_runner = None
@@ -1131,7 +1135,7 @@ class LBRYumWallet(Wallet):
         network_start_d = defer.Deferred()
 
         def setup_network():
-            self.config = SimpleConfig({'auto_connect': True})
+            self.config = make_config(self._config)
             self.network = Network(self.config)
             alert.info("Loading the wallet...")
             return defer.succeed(self.network.start())
@@ -1499,3 +1503,9 @@ class LBRYcrdAddressQueryHandler(object):
             return defer.fail(Failure(ValueError("Expected but did not receive an address request")))
         else:
             return defer.succeed({})
+
+
+def make_config(config=None):
+    if config is None:
+        config = {}
+    return SimpleConfig(config) if type(config) == type({}) else config

lbrynet/core/client/BlobRequester.py

@@ -1,25 +1,35 @@
-from collections import defaultdict
 import logging
+from collections import defaultdict
+from decimal import Decimal
+
 from twisted.internet import defer
 from twisted.python.failure import Failure
 from zope.interface import implements
-from lbrynet.core.Error import PriceDisagreementError, DownloadCanceledError, InsufficientFundsError
+
-from lbrynet.core.Error import InvalidResponseError, RequestCanceledError, NoResponseError
 from lbrynet.core.Error import ConnectionClosedBeforeResponseError
+from lbrynet.core.Error import InvalidResponseError, RequestCanceledError, NoResponseError
+from lbrynet.core.Error import PriceDisagreementError, DownloadCanceledError, InsufficientFundsError
 from lbrynet.core.client.ClientRequest import ClientRequest, ClientBlobRequest
 from lbrynet.interfaces import IRequestCreator
+from lbrynet.core.Offer import Offer
 
 
 log = logging.getLogger(__name__)
 
 
 def get_points(num_bytes, rate):
+    if isinstance(rate, float):
         return 1.0 * num_bytes * rate / 2**20
+    elif isinstance(rate, Decimal):
+        return 1.0 * num_bytes * float(rate) / 2**20
+    else:
+        raise Exception("Unknown rate type")
 
 
 def cache(fn):
     """Caches the function call for each instance"""
     attr = '__{}_value'.format(fn.__name__)
+
     def helper(self):
         if not hasattr(self, attr):
             value = fn(self)
@@ -42,6 +52,7 @@ class BlobRequester(object):
         self._unavailable_blobs = defaultdict(list)  # {Peer: [blob_hash]}}
         self._protocol_prices = {}  # {ClientProtocol: price}
         self._price_disagreements = []  # [Peer]
+        self._protocol_tries = {}
         self._incompatible_peers = []
 
     ######## IRequestCreator #########
@@ -65,9 +76,9 @@ class BlobRequester(object):
 
     def _send_next_request(self, peer, protocol):
         log.debug('Sending a blob request for %s and %s', peer, protocol)
-        availability = AvailabilityRequest(self, peer, protocol)
+        availability = AvailabilityRequest(self, peer, protocol, self.payment_rate_manager)
-        download = DownloadRequest(self, peer, protocol, self.wallet, self.payment_rate_manager)
+        download = DownloadRequest(self, peer, protocol, self.payment_rate_manager, self.wallet)
-        price = PriceRequest(self, peer, protocol)
+        price = PriceRequest(self, peer, protocol, self.payment_rate_manager)
 
         sent_request = False
         if availability.can_make_request():
@@ -161,10 +172,11 @@ class BlobRequester(object):
 
 
 class RequestHelper(object):
-    def __init__(self, requestor, peer, protocol):
+    def __init__(self, requestor, peer, protocol, payment_rate_manager):
         self.requestor = requestor
         self.peer = peer
         self.protocol = protocol
+        self.payment_rate_manager = payment_rate_manager
 
     @property
     def protocol_prices(self):
@@ -197,10 +209,10 @@ class RequestHelper(object):
             return
         return reason
 
-    def get_and_save_rate_for_protocol(self):
+    def get_and_save_rate(self):
         rate = self.protocol_prices.get(self.protocol)
         if rate is None:
-            rate = self.requestor.payment_rate_manager.get_rate_blob_data(self.peer)
+            rate = self.payment_rate_manager.get_rate_blob_data(self.peer, self.available_blobs)
             self.protocol_prices[self.protocol] = rate
         return rate
 
@@ -322,12 +334,59 @@ class AvailabilityRequest(RequestHelper):
             self.unavailable_blobs.remove(blob_hash)
 
 
+class PriceRequest(RequestHelper):
+    """Ask a peer if a certain price is acceptable"""
+    def can_make_request(self):
+        return self.get_and_save_rate() is not None
+
+    def make_request_and_handle_response(self):
+        request = self._get_price_request()
+        self._handle_price_request(request)
+
+    def _get_price_request(self):
+        rate = self.get_and_save_rate()
+        if rate is None:
+            log.debug("No blobs to request from %s", self.peer)
+            raise Exception('Cannot make a price request without a payment rate')
+        log.debug("Offer rate %s to %s for %i blobs", rate, self.peer, len(self.available_blobs))
+
+        request_dict = {'blob_data_payment_rate': rate}
+        return ClientRequest(request_dict, 'blob_data_payment_rate')
+
+    def _handle_price_request(self, price_request):
+        d = self.protocol.add_request(price_request)
+        d.addCallback(self._handle_price_response, price_request)
+        d.addErrback(self._request_failed, "price request")
+
+    def _handle_price_response(self, response_dict, request):
+        assert request.response_identifier == 'blob_data_payment_rate'
+        if 'blob_data_payment_rate' not in response_dict:
+            return InvalidResponseError("response identifier not in response")
+        assert self.protocol in self.protocol_prices
+        rate = self.protocol_prices[self.protocol]
+        offer = Offer(rate)
+        offer.handle(response_dict['blob_data_payment_rate'])
+        self.payment_rate_manager.record_offer_reply(self.peer.host, offer)
+
+        if offer.is_accepted:
+            log.debug("Offered rate %f/mb accepted by %s", rate, str(self.peer.host))
+            return True
+        elif offer.is_too_low:
+            log.debug("Offered rate %f/mb rejected by %s", rate, str(self.peer.host))
+            del self.protocol_prices[self.protocol]
+            return True
+        else:
+            log.warning("Price disagreement")
+            del self.protocol_prices[self.protocol]
+            self.requestor._price_disagreements.append(self.peer)
+            return False
+
+
 class DownloadRequest(RequestHelper):
     """Choose a blob and download it from a peer and also pay the peer for the data."""
-    def __init__(self, requestor, peer, protocol, wallet, payment_rate_manager):
+    def __init__(self, requester, peer, protocol, payment_rate_manager, wallet):
-        RequestHelper.__init__(self, requestor, peer, protocol)
+        RequestHelper.__init__(self, requester, peer, protocol, payment_rate_manager)
         self.wallet = wallet
-        self.payment_rate_manager = payment_rate_manager
 
     def can_make_request(self):
         return self.get_blob_details()
@@ -413,6 +472,9 @@ class DownloadRequest(RequestHelper):
     def _pay_or_cancel_payment(self, arg, reserved_points, blob):
         if self._can_pay_peer(blob, arg):
             self._pay_peer(blob.length, reserved_points)
+            d = self.requestor.blob_manager.add_blob_to_download_history(str(blob),
+                                                                         str(self.peer.host),
+                                                                         float(self.protocol_prices[self.protocol]))
         else:
             self._cancel_points(reserved_points)
         return arg
@@ -425,7 +487,7 @@ class DownloadRequest(RequestHelper):
 
     def _pay_peer(self, num_bytes, reserved_points):
         assert num_bytes != 0
-        rate = self.get_and_save_rate_for_protocol()
+        rate = self.get_and_save_rate()
         point_amount = get_points(num_bytes, rate)
         self.wallet.send_points(reserved_points, point_amount)
         self.payment_rate_manager.record_points_paid(point_amount)
@@ -452,7 +514,7 @@ class DownloadRequest(RequestHelper):
         # not yet been set for this protocol or for it to have been
         # removed so instead I switched it to check if a rate has been set
         # and calculate it if it has not
-        rate = self.get_and_save_rate_for_protocol()
+        rate = self.get_and_save_rate()
         points_to_reserve = get_points(num_bytes, rate)
         return self.wallet.reserve_points(self.peer, points_to_reserve)
 
@@ -482,38 +544,3 @@ class BlobDownloadDetails(object):
     def counting_write_func(self, data):
         self.peer.update_stats('blob_bytes_downloaded', len(data))
         return self.write_func(data)
-
-
-class PriceRequest(RequestHelper):
-    """Ask a peer if a certain price is acceptable"""
-    def can_make_request(self):
-        return self.get_and_save_rate_for_protocol() is not None
-
-    def make_request_and_handle_response(self):
-        request = self._get_price_request()
-        self._handle_price_request(request)
-
-    def _get_price_request(self):
-        rate = self.get_and_save_rate_for_protocol()
-        if rate is None:
-            raise Exception('Cannot make a price request without a payment rate')
-        request_dict = {'blob_data_payment_rate': rate}
-        return ClientRequest(request_dict, 'blob_data_payment_rate')
-
-    def _handle_price_request(self, price_request):
-        d = self.protocol.add_request(price_request)
-        d.addCallback(self._handle_price_response, price_request)
-        d.addErrback(self._request_failed, "price request")
-
-    def _handle_price_response(self, response_dict, request):
-        assert request.response_identifier == 'blob_data_payment_rate'
-        if 'blob_data_payment_rate' not in response_dict:
-            return InvalidResponseError("response identifier not in response")
-        assert self.protocol in self.protocol_prices
-        response = response_dict['blob_data_payment_rate']
-        if response == "RATE_ACCEPTED":
-            return True
-        else:
-            del self.protocol_prices[self.protocol]
-            self.requestor._price_disagreements.append(self.peer)
-        return True

lbrynet/core/client/ClientProtocol.py

@@ -1,5 +1,6 @@
 import json
 import logging
+from decimal import Decimal
 from twisted.internet import error, defer
 from twisted.internet.protocol import Protocol, ClientFactory
 from twisted.python import failure
@@ -14,6 +15,12 @@ from zope.interface import implements
 log = logging.getLogger(__name__)
 
 
+def encode_decimal(obj):
+    if isinstance(obj, Decimal):
+        return float(obj)
+    raise TypeError(repr(obj) + " is not JSON serializable")
+
+
 class ClientProtocol(Protocol):
     implements(IRequestSender, IRateLimited)
 
@@ -132,7 +139,7 @@ class ClientProtocol(Protocol):
     def _send_request_message(self, request_msg):
         # TODO: compare this message to the last one. If they're the same,
         # TODO: incrementally delay this message.
-        m = json.dumps(request_msg)
+        m = json.dumps(request_msg, default=encode_decimal)
         self.transport.write(m)
 
     def _get_valid_response(self, response_msg):
@@ -191,6 +198,8 @@ class ClientProtocol(Protocol):
             for success, result in results:
                 if success is False:
                     failed = True
+                    if not isinstance(result.value, DownloadCanceledError):
+                        log.info(result.value)
                         log.info("The connection is closing due to an error: %s", str(result.getTraceback()))
             if failed is False:
                 log.debug("Asking for another request.")
@@ -215,7 +224,7 @@ class ClientProtocol(Protocol):
             # TODO: always be this way. it's done this way now because the client has no other way
             # TODO: of telling the server it wants the download to stop. It would be great if the
             # TODO: protocol had such a mechanism.
-            log.info("Closing the connection to %s because the download of blob %s was canceled",
+            log.debug("Closing the connection to %s because the download of blob %s was canceled",
                      str(self.peer), str(self._blob_download_request.blob))
             #self.transport.loseConnection()
             #return True

lbrynet/core/log_support.py

@@ -73,12 +73,12 @@ def _log_decorator(fn):
 
 def disable_third_party_loggers():
     logging.getLogger('requests').setLevel(logging.WARNING)
+    logging.getLogger('urllib3').setLevel(logging.WARNING)
     logging.getLogger('BitcoinRPC').setLevel(logging.INFO)
 
 def disable_noisy_loggers():
     logging.getLogger('lbrynet.analytics.api').setLevel(logging.INFO)
-    logging.getLogger('lbrynet.core.client').setLevel(logging.INFO)
+    logging.getLogger('lbrynet.core').setLevel(logging.INFO)
-    logging.getLogger('lbrynet.core.server').setLevel(logging.INFO)
     logging.getLogger('lbrynet.dht').setLevel(logging.INFO)
     logging.getLogger('lbrynet.lbrynet_daemon').setLevel(logging.INFO)
     logging.getLogger('lbrynet.core.Wallet').setLevel(logging.INFO)

lbrynet/core/server/BlobAvailabilityHandler.py

@@ -40,7 +40,7 @@ class BlobAvailabilityHandler(object):
 
     def handle_queries(self, queries):
         if self.query_identifiers[0] in queries:
-            log.debug("Received the client's list of requested blobs")
+            log.info("Received the client's list of requested blobs")
             d = self._get_available_blobs(queries[self.query_identifiers[0]])
 
             def set_field(available_blobs):

lbrynet/core/server/BlobRequestHandler.py

@@ -1,8 +1,11 @@
 import logging
+
 from twisted.internet import defer
 from twisted.protocols.basic import FileSender
 from twisted.python.failure import Failure
 from zope.interface import implements
+
+from lbrynet.core.Offer import Offer
 from lbrynet.interfaces import IQueryHandlerFactory, IQueryHandler, IBlobSender
 
 
@@ -34,18 +37,20 @@ class BlobRequestHandler(object):
     implements(IQueryHandler, IBlobSender)
     PAYMENT_RATE_QUERY = 'blob_data_payment_rate'
     BLOB_QUERY = 'requested_blob'
+    AVAILABILITY_QUERY = 'requested_blobs'
 
     def __init__(self, blob_manager, wallet, payment_rate_manager):
         self.blob_manager = blob_manager
         self.payment_rate_manager = payment_rate_manager
         self.wallet = wallet
-        self.query_identifiers = [self.PAYMENT_RATE_QUERY, self.BLOB_QUERY]
+        self.query_identifiers = [self.PAYMENT_RATE_QUERY, self.BLOB_QUERY, self.AVAILABILITY_QUERY]
         self.peer = None
         self.blob_data_payment_rate = None
         self.read_handle = None
         self.currently_uploading = None
         self.file_sender = None
         self.blob_bytes_uploaded = 0
+        self._blobs_requested = []
 
     ######### IQueryHandler #########
 
@@ -55,51 +60,19 @@ class BlobRequestHandler(object):
         request_handler.register_blob_sender(self)
 
     def handle_queries(self, queries):
-        response = {}
+        response = defer.succeed({})
+        log.debug("Handle query: %s", str(queries))
+
+        if self.AVAILABILITY_QUERY in queries:
+            self._blobs_requested = queries[self.AVAILABILITY_QUERY]
+            response.addCallback(lambda r: self._reply_to_availability(r, self._blobs_requested))
         if self.PAYMENT_RATE_QUERY in queries:
-            self._handle_payment_rate_query(response, queries[self.PAYMENT_RATE_QUERY])
+            offered_rate = queries[self.PAYMENT_RATE_QUERY]
+            offer = Offer(offered_rate)
+            response.addCallback(lambda r: self._handle_payment_rate_query(offer, r))
         if self.BLOB_QUERY in queries:
-            return self._handle_blob_query(response, queries[self.BLOB_QUERY])
+            incoming = queries[self.BLOB_QUERY]
-        else:
+            response.addCallback(lambda r: self._reply_to_send_request(r, incoming))
-            return defer.succeed(response)
-
-    def _handle_payment_rate_query(self, response, query):
-        if not self.handle_blob_data_payment_rate(query):
-            response['blob_data_payment_rate'] = "RATE_TOO_LOW"
-        else:
-            response['blob_data_payment_rate'] = 'RATE_ACCEPTED'
-
-    def _handle_blob_query(self, response, query):
-        log.debug("Received the client's request to send a blob")
-        response['incoming_blob'] = {}
-
-        if self.blob_data_payment_rate is None:
-            response['incoming_blob']['error'] = "RATE_UNSET"
-            return defer.succeed(response)
-        else:
-            return self._send_blob(response, query)
-
-    def _send_blob(self, response, query):
-        d = self.blob_manager.get_blob(query, True)
-        d.addCallback(self.open_blob_for_reading, response)
-        return d
-
-    def open_blob_for_reading(self, blob, response):
-        def failure(msg):
-            log.warning("We can not send %s: %s", blob, msg)
-            response['incoming_blob']['error'] = "BLOB_UNAVAILABLE"
-            return response
-        if not blob.is_validated():
-            return failure("blob can't be validated")
-        read_handle = blob.open_for_reading()
-        if read_handle is None:
-            return failure("blob can't be opened")
-
-        self.currently_uploading = blob
-        self.read_handle = read_handle
-        log.info("Sending %s to client", blob)
-        response['incoming_blob']['blob_hash'] = blob.blob_hash
-        response['incoming_blob']['length'] = blob.length
         return response
 
     ######### IBlobSender #########
@@ -118,12 +91,91 @@ class BlobRequestHandler(object):
 
     ######### internal #########
 
-    def handle_blob_data_payment_rate(self, requested_payment_rate):
+    def _reply_to_availability(self, request, blobs):
-        if not self.payment_rate_manager.accept_rate_blob_data(self.peer, requested_payment_rate):
+        d = self._get_available_blobs(blobs)
-            return False
+
+        def set_available(available_blobs):
+            log.debug("available blobs: %s", str(available_blobs))
+            request.update({'available_blobs': available_blobs})
+            return request
+
+        d.addCallback(set_available)
+        return d
+
+    def _handle_payment_rate_query(self, offer, request):
+        blobs = self._blobs_requested
+        log.debug("Offered rate %f LBC/mb for %i blobs", offer.rate, len(blobs))
+        reply = self.payment_rate_manager.reply_to_offer(self.peer, blobs, offer)
+        if reply.is_accepted:
+            self.blob_data_payment_rate = offer.rate
+            request[self.PAYMENT_RATE_QUERY] = "RATE_ACCEPTED"
+            log.debug("Accepted rate: %f", offer.rate)
+        elif reply.is_too_low:
+            request[self.PAYMENT_RATE_QUERY] = "RATE_TOO_LOW"
+            log.debug("Reject rate: %f", offer.rate)
+        elif reply.is_unset:
+            log.warning("Rate unset")
+            request['incoming_blob'] = {'error': 'RATE_UNSET'}
+        log.debug("Returning rate query result: %s", str(request))
+
+        return request
+
+    def _handle_blob_query(self, response, query):
+        log.debug("Received the client's request to send a blob")
+        response['incoming_blob'] = {}
+
+        if self.blob_data_payment_rate is None:
+            response['incoming_blob'] = {'error': "RATE_UNSET"}
+            return response
         else:
-            self.blob_data_payment_rate = requested_payment_rate
+            return self._send_blob(response, query)
-            return True
+
+    def _send_blob(self, response, query):
+        d = self.blob_manager.get_blob(query, True)
+        d.addCallback(self.open_blob_for_reading, response)
+        return d
+
+    def open_blob_for_reading(self, blob, response):
+        response_fields = {}
+        d = defer.succeed(None)
+        if blob.is_validated():
+            read_handle = blob.open_for_reading()
+            if read_handle is not None:
+                self.currently_uploading = blob
+                self.read_handle = read_handle
+                log.info("Sending %s to client", str(blob))
+                response_fields['blob_hash'] = blob.blob_hash
+                response_fields['length'] = blob.length
+                response['incoming_blob'] = response_fields
+                d.addCallback(lambda _: self.record_transaction(blob))
+                d.addCallback(lambda _: response)
+                return d
+        log.debug("We can not send %s", str(blob))
+        response['incoming_blob'] = {'error': 'BLOB_UNAVAILABLE'}
+        d.addCallback(lambda _: response)
+        return d
+
+    def record_transaction(self, blob):
+        d = self.blob_manager.add_blob_to_upload_history(str(blob), self.peer.host, self.blob_data_payment_rate)
+        return d
+
+    def _reply_to_send_request(self, response, incoming):
+        response_fields = {}
+        response['incoming_blob'] = response_fields
+
+        if self.blob_data_payment_rate is None:
+            log.debug("Rate not set yet")
+            response['incoming_blob'] = {'error': 'RATE_UNSET'}
+            return defer.succeed(response)
+        else:
+            log.debug("Requested blob: %s", str(incoming))
+            d = self.blob_manager.get_blob(incoming, True)
+            d.addCallback(lambda blob: self.open_blob_for_reading(blob, response))
+            return d
+
+    def _get_available_blobs(self, requested_blobs):
+        d = self.blob_manager.completed_blobs(requested_blobs)
+        return d
 
     def send_file(self, consumer):
 
@@ -165,6 +217,6 @@ class BlobRequestHandler(object):
                 self.currently_uploading = None
             self.file_sender = None
             if reason is not None and isinstance(reason, Failure):
-                log.info("Upload has failed. Reason: %s", reason.getErrorMessage())
+                log.warning("Upload has failed. Reason: %s", reason.getErrorMessage())
 
         return _send_file()

lbrynet/core/utils.py

@@ -4,6 +4,7 @@ import random
 import os
 import json
 import yaml
+import datetime
 
 from lbrynet.core.cryptoutils import get_lbry_hash_obj
 
@@ -77,3 +78,7 @@ def save_settings(path, settings):
     f = open(path, 'w')
     f.write(encoder(settings))
     f.close()
+
+
+def today():
+    return datetime.datetime.today()

lbrynet/cryptstream/client/CryptStreamDownloader.py

@@ -48,7 +48,7 @@ class CryptStreamDownloader(object):
 
         @param blob_manager: A BlobManager object
 
-        @param payment_rate_manager: A PaymentRateManager object
+        @param payment_rate_manager: A NegotiatedPaymentRateManager object
 
         @param wallet: An object which implements the IWallet interface
 

lbrynet/dht/protocol.py

@@ -7,6 +7,7 @@
 # The docstrings in this module contain epytext markup; API documentation
 # may be created by processing this file with epydoc: http://epydoc.sf.net
 
+import logging
 import binascii
 import time
 
@@ -21,6 +22,8 @@ import msgformat
 from contact import Contact
 
 reactor = twisted.internet.reactor
+log = logging.getLogger(__name__)
+
 
 class TimeoutError(Exception):
     """ Raised when a RPC times out """
@@ -118,6 +121,9 @@ class KademliaProtocol(protocol.DatagramProtocol):
         except encoding.DecodeError:
             # We received some rubbish here
             return
+        except IndexError:
+            log.warning("Couldn't decode dht datagram from %s", address)
+            return
         
         message = self._translator.fromPrimitive(msgPrimitive)
         remoteContact = Contact(message.nodeID, address[0], address[1], self)

lbrynet/interfaces.py

@@ -648,3 +648,59 @@ class IWallet(Interface):
 
         @return: None
         """
+
+
+class IBlobPriceModel(Interface):
+    """
+    A blob price model
+
+    Used by INegotiationStrategy classes
+    """
+
+    def calculate_price(self, blob):
+        """
+        Calculate the price for a blob
+
+        @param blob: a blob hash
+        @type blob: str
+
+        @return: blob price target
+        @type: Decimal
+        """
+
+
+class INegotiationStrategy(Interface):
+    """
+    Strategy to negotiate download payment rates
+    """
+
+    def make_offer(self, peer, blobs):
+        """
+        Make a rate offer for the given peer and blobs
+
+        @param peer: peer to make an offer to
+        @type: str
+
+        @param blobs: blob hashes to make an offer for
+        @type: list
+
+        @return: rate offer
+        @rtype: Offer
+        """
+
+    def respond_to_offer(self, offer, peer, blobs):
+        """
+        Respond to a rate offer given by a peer
+
+        @param offer: offer to reply to
+        @type: Offer
+
+        @param peer: peer to make an offer to
+        @type: str
+
+        @param blobs: blob hashes to make an offer for
+        @type: list
+
+        @return: accepted, rejected, or unset offer
+        @rtype: Offer
+        """

lbrynet/lbryfile/client/EncryptedFileOptions.py

@@ -14,16 +14,16 @@ class EncryptedFileOptions(object):
         prm = payment_rate_manager
 
         def get_default_data_rate_description():
-            if prm.min_blob_data_payment_rate is None:
+            if prm.base.min_blob_data_payment_rate is None:
                 return "Application default (%s LBC/MB)" % str(prm.base.min_blob_data_payment_rate)
             else:
-                return "%f LBC/MB" % prm.min_blob_data_payment_rate
+                return "%f LBC/MB" % prm.base.min_blob_data_payment_rate
 
         rate_choices = []
-        rate_choices.append(DownloadOptionChoice(prm.min_blob_data_payment_rate,
+        rate_choices.append(DownloadOptionChoice(prm.base.min_blob_data_payment_rate,
                                                  "No change - %s" % get_default_data_rate_description(),
                                                  "No change - %s" % get_default_data_rate_description()))
-        if prm.min_blob_data_payment_rate is not None:
+        if prm.base.min_blob_data_payment_rate is not None:
             rate_choices.append(DownloadOptionChoice(None,
                                                      "Application default (%s LBC/MB)" % str(prm.base.min_blob_data_payment_rate),
                                                      "Application default (%s LBC/MB)" % str(prm.base.min_blob_data_payment_rate)))
@@ -36,7 +36,7 @@ class EncryptedFileOptions(object):
                 rate_choices,
                 "Rate which will be paid for data",
                 "data payment rate",
-                prm.min_blob_data_payment_rate,
+                prm.base.min_blob_data_payment_rate,
                 get_default_data_rate_description()
             ),
             DownloadOption(

lbrynet/lbryfilemanager/EncryptedFileDownloader.py

@@ -41,7 +41,7 @@ class ManagedEncryptedFileDownloader(EncryptedFileSaver):
         def _save_sd_hash(sd_hash):
             if len(sd_hash):
                 self.sd_hash = sd_hash[0]
-                d = self.wallet._get_claim_metadata_for_sd_hash(self.sd_hash)
+                d = self.wallet.get_claim_metadata_for_sd_hash(self.sd_hash)
             else:
                 d = defer.succeed(None)
 
@@ -122,13 +122,12 @@ class ManagedEncryptedFileDownloader(EncryptedFileSaver):
     def _start(self):
 
         d = EncryptedFileSaver._start(self)
-
+        d.addCallback(lambda _: self.stream_info_manager.get_sd_blob_hashes_for_stream(self.stream_hash))
-        d.addCallback(lambda _: self.stream_info_manager._get_sd_blob_hashes_for_stream(self.stream_hash))
 
         def _save_sd_hash(sd_hash):
             if len(sd_hash):
                 self.sd_hash = sd_hash[0]
-                d = self.wallet._get_claim_metadata_for_sd_hash(self.sd_hash)
+                d = self.wallet.get_claim_metadata_for_sd_hash(self.sd_hash)
             else:
                 d = defer.succeed(None)
 

lbrynet/lbryfilemanager/EncryptedFileManager.py

@@ -9,10 +9,10 @@ from twisted.enterprise import adbapi
 from twisted.internet import defer, task, reactor
 from twisted.python.failure import Failure
 
+from lbrynet.core.PaymentRateManager import NegotiatedPaymentRateManager
 from lbrynet.lbryfilemanager.EncryptedFileDownloader import ManagedEncryptedFileDownloader
 from lbrynet.lbryfilemanager.EncryptedFileDownloader import ManagedEncryptedFileDownloaderFactory
 from lbrynet.lbryfile.StreamDescriptor import EncryptedFileStreamType
-from lbrynet.core.PaymentRateManager import PaymentRateManager
 from lbrynet.cryptstream.client.CryptStreamDownloader import AlreadyStoppedError, CurrentlyStoppingError
 from lbrynet.core.sqlite_helpers import rerun_if_locked
 
@@ -74,7 +74,8 @@ class EncryptedFileManager(object):
     def _start_lbry_files(self):
 
         def set_options_and_restore(rowid, stream_hash, options):
-            payment_rate_manager = PaymentRateManager(self.session.base_payment_rate_manager)
+            payment_rate_manager = NegotiatedPaymentRateManager(self.session.base_payment_rate_manager,
+                                                                self.session.blob_tracker)
             d = self.start_lbry_file(rowid, stream_hash, payment_rate_manager,
                                      blob_data_rate=options)
             d.addCallback(lambda downloader: downloader.restore())

lbrynet/lbrylive/PaymentRateManager.py

@@ -19,11 +19,18 @@ class LiveStreamPaymentRateManager(object):
     def accept_rate_live_blob_info(self, peer, payment_rate):
         return payment_rate >= self.get_effective_min_live_blob_info_payment_rate()
 
-    def get_rate_blob_data(self, peer):
+    def get_rate_blob_data(self, peer, blobs):
-        return self.get_effective_min_blob_data_payment_rate()
+        response = self._payment_rate_manager.strategy.make_offer(peer, blobs)
+        return response.rate
 
-    def accept_rate_blob_data(self, peer, payment_rate):
+    def accept_rate_blob_data(self, peer, blobs, offer):
-        return payment_rate >= self.get_effective_min_blob_data_payment_rate()
+        response = self._payment_rate_manager.strategy.respond_to_offer(offer, peer, blobs)
+        return response.accepted
+
+    def reply_to_offer(self, peer, blobs, offer):
+        reply = self._payment_rate_manager.strategy.respond_to_offer(offer, peer, blobs)
+        self._payment_rate_manager.strategy.offer_accepted(peer, reply)
+        return reply
 
     def get_effective_min_blob_data_payment_rate(self):
         rate = self.min_blob_data_payment_rate

lbrynet/lbrylive/client/LiveStreamDownloader.py

@@ -144,7 +144,7 @@ class FullLiveStreamDownloaderFactory(object):
 
     def make_downloader(self, metadata, options, payment_rate_manager):
         # TODO: check options for payment rate manager parameters
-        payment_rate_manager = LiveStreamPaymentRateManager(self.default_payment_rate_manager,
+        prm = LiveStreamPaymentRateManager(self.default_payment_rate_manager,
                                                             payment_rate_manager)
 
         def save_source_if_blob(stream_hash):
@@ -161,7 +161,7 @@ class FullLiveStreamDownloaderFactory(object):
         def create_downloader(stream_hash):
             stream_downloader = FullLiveStreamDownloader(stream_hash, self.peer_finder, self.rate_limiter,
                                                          self.blob_manager, self.stream_info_manager,
-                                                         payment_rate_manager, self.wallet, True)
+                                                         prm, self.wallet, True)
             # TODO: change upload_allowed=True above to something better
             d = stream_downloader.set_stream_info()
             d.addCallback(lambda _: stream_downloader)

lbrynet/lbrynet_console/Console.py

@@ -20,7 +20,6 @@ from lbrynet.conf import MIN_BLOB_DATA_PAYMENT_RATE, API_CONNECTION_STRING  # ,
 from lbrynet.core.utils import generate_id
 from lbrynet.core.StreamDescriptor import StreamDescriptorIdentifier
 from lbrynet.core.PaymentRateManager import PaymentRateManager
-from lbrynet.core.server.BlobAvailabilityHandler import BlobAvailabilityHandlerFactory
 from lbrynet.core.server.BlobRequestHandler import BlobRequestHandlerFactory
 from lbrynet.core.server.ServerProtocol import ServerProtocolFactory
 from lbrynet.core.PTCWallet import PTCWallet
@@ -363,19 +362,14 @@ class Console():
 
     def _setup_query_handlers(self):
         handlers = [
-            #CryptBlobInfoQueryHandlerFactory(self.lbry_file_metadata_manager, self.session.wallet,
-            #                                 self._server_payment_rate_manager),
-            BlobAvailabilityHandlerFactory(self.session.blob_manager),
-            #BlobRequestHandlerFactory(self.session.blob_manager, self.session.wallet,
-            #                          self._server_payment_rate_manager),
             self.session.wallet.get_wallet_info_query_handler_factory(),
         ]
 
         def get_blob_request_handler_factory(rate):
-            self.blob_request_payment_rate_manager = PaymentRateManager(
+            self.blob_request_payment_rate_manager = PaymentRateManager(self.session.base_payment_rate_manager,
-                self.session.base_payment_rate_manager, rate
+                                                                        rate)
-            )
+            handlers.append(BlobRequestHandlerFactory(self.session.blob_manager,
-            handlers.append(BlobRequestHandlerFactory(self.session.blob_manager, self.session.wallet,
+                                                      self.session.wallet,
                                                       self.blob_request_payment_rate_manager))
 
         d1 = self.settings.get_server_data_payment_rate()

lbrynet/lbrynet_console/ControlHandlers.py

@@ -644,7 +644,7 @@ class AddStream(CommandHandler):
         for option, option_value in zip(self.download_options, self.options_chosen):
             if option.short_description == "data payment rate":
                 if option_value == None:
-                    rate = self.payment_rate_manager.get_effective_min_blob_data_payment_rate()
+                    rate = 0.0
                 else:
                     rate = option_value
                 stream_size = None

lbrynet/lbrynet_daemon/Daemon.py

@@ -21,12 +21,11 @@ from twisted.web import server
 from twisted.internet import defer, threads, error, reactor, task
 from twisted.internet.task import LoopingCall
 from txjsonrpc import jsonrpclib
+from jsonschema import ValidationError
 
 from lbrynet import __version__ as lbrynet_version
 from lbryum.version import LBRYUM_VERSION as lbryum_version
 from lbrynet import analytics
-from lbrynet.core.PaymentRateManager import PaymentRateManager
-from lbrynet.core.server.BlobAvailabilityHandler import BlobAvailabilityHandlerFactory
 from lbrynet.core.server.BlobRequestHandler import BlobRequestHandlerFactory
 from lbrynet.core.server.ServerProtocol import ServerProtocolFactory
 from lbrynet.core.Error import UnknownNameError, InsufficientFundsError, InvalidNameError
@@ -44,12 +43,13 @@ from lbrynet.core import log_support
 from lbrynet.core import utils
 from lbrynet.core.utils import generate_id
 from lbrynet.lbrynet_console.Settings import Settings
-from lbrynet.conf import MIN_BLOB_DATA_PAYMENT_RATE, DEFAULT_MAX_SEARCH_RESULTS, \
+from lbrynet.conf import MIN_BLOB_DATA_PAYMENT_RATE, DEFAULT_MAX_SEARCH_RESULTS
-                         KNOWN_DHT_NODES, DEFAULT_MAX_KEY_FEE, DEFAULT_WALLET, \
+from lbrynet.conf import KNOWN_DHT_NODES, DEFAULT_MAX_KEY_FEE, DEFAULT_WALLET
-                         DEFAULT_SEARCH_TIMEOUT, DEFAULT_CACHE_TIME, DEFAULT_UI_BRANCH, \
+from lbrynet.conf import DEFAULT_SEARCH_TIMEOUT, DEFAULT_CACHE_TIME
-                         LOG_POST_URL, LOG_FILE_NAME, REFLECTOR_SERVERS
+from lbrynet.conf import LOG_POST_URL, LOG_FILE_NAME, REFLECTOR_SERVERS, SEARCH_SERVERS
-from lbrynet.conf import DEFAULT_SD_DOWNLOAD_TIMEOUT
+from lbrynet.conf import DEFAULT_SD_DOWNLOAD_TIMEOUT, DEFAULT_UI_BRANCH
 from lbrynet.conf import DEFAULT_TIMEOUT
+from lbrynet import conf
 from lbrynet.core.StreamDescriptor import StreamDescriptorIdentifier, download_sd_blob, BlobStreamDescriptorReader
 from lbrynet.core.Session import Session
 from lbrynet.core.PTCWallet import PTCWallet
@@ -306,6 +306,8 @@ class Daemon(AuthJSONRPCServer):
         else:
             log.info("Using the default wallet type %s", DEFAULT_WALLET)
             self.wallet_type = DEFAULT_WALLET
+        if self.wallet_type not in conf.WALLET_TYPES:
+            raise ValueError('Wallet Type {} is not valid'.format(wallet_type))
         #
         ####
         self.delete_blobs_on_remove = self.session_settings['delete_blobs_on_remove']
@@ -326,27 +328,10 @@ class Daemon(AuthJSONRPCServer):
         else:
             self.name_cache = {}
 
-        if os.name == "nt":
+        self.set_wallet_attributes()
-            from lbrynet.winhelpers.knownpaths import get_path, FOLDERID, UserHandle
-            self.lbrycrdd_path = "lbrycrdd.exe"
-            if self.wallet_type == "lbrycrd":
-                self.wallet_dir = os.path.join(get_path(FOLDERID.RoamingAppData, UserHandle.current), "lbrycrd")
-            else:
-                self.wallet_dir = os.path.join(get_path(FOLDERID.RoamingAppData, UserHandle.current), "lbryum")
-        elif sys.platform == "darwin":
-            self.lbrycrdd_path = get_darwin_lbrycrdd_path()
-            if self.wallet_type == "lbrycrd":
-                self.wallet_dir = user_data_dir("lbrycrd")
-            else:
-                self.wallet_dir = user_data_dir("LBRY")
-        else:
-            self.lbrycrdd_path = "lbrycrdd"
-            if self.wallet_type == "lbrycrd":
-                self.wallet_dir = os.path.join(os.path.expanduser("~"), ".lbrycrd")
-            else:
-                self.wallet_dir = os.path.join(os.path.expanduser("~"), ".lbryum")
 
         if os.name != 'nt':
+            # TODO: are we still using this?
             lbrycrdd_path_conf = os.path.join(os.path.expanduser("~"), ".lbrycrddpath.conf")
             if not os.path.isfile(lbrycrdd_path_conf):
                 f = open(lbrycrdd_path_conf, "w")
@@ -359,9 +344,6 @@ class Daemon(AuthJSONRPCServer):
             self.created_data_dir = True
 
         self.blobfile_dir = os.path.join(self.db_dir, "blobfiles")
-        self.lbrycrd_conf = os.path.join(self.wallet_dir, "lbrycrd.conf")
-        self.autofetcher_conf = os.path.join(self.wallet_dir, "autofetcher.conf")
-        self.wallet_conf = os.path.join(self.wallet_dir, "lbrycrd.conf")
         self.wallet_user = None
         self.wallet_password = None
 
@@ -402,6 +384,24 @@ class Daemon(AuthJSONRPCServer):
             raise Exception("Command not available in lbryum")
         return True
 
+    def set_wallet_attributes(self):
+        self.wallet_dir = None
+        if self.wallet_type != "lbrycrd":
+            return
+        if os.name == "nt":
+            from lbrynet.winhelpers.knownpaths import get_path, FOLDERID, UserHandle
+            self.lbrycrdd_path = "lbrycrdd.exe"
+            user_app_dir = get_path(FOLDERID.RoamingAppData, UserHandle.current)
+            self.wallet_dir = os.path.join(user_app_dir, "lbrycrd")
+        elif sys.platform == "darwin":
+            self.lbrycrdd_path = get_darwin_lbrycrdd_path()
+            self.wallet_dir = user_data_dir("lbrycrd")
+        else:
+            self.lbrycrdd_path = "lbrycrdd"
+            self.wallet_dir = os.path.join(os.path.expanduser("~"), ".lbrycrd")
+        self.lbrycrd_conf = os.path.join(self.wallet_dir, "lbrycrd.conf")
+        self.wallet_conf = os.path.join(self.wallet_dir, "lbrycrd.conf")
+
     def setup(self, branch=DEFAULT_UI_BRANCH, user_specified=False, branch_specified=False, host_ui=True):
         def _log_starting_vals():
             log.info("Starting balance: " + str(self.session.wallet.wallet_balance))
@@ -457,7 +457,6 @@ class Daemon(AuthJSONRPCServer):
         d.addCallback(lambda _: add_lbry_file_to_sd_identifier(self.sd_identifier))
         d.addCallback(lambda _: self._setup_stream_identifier())
         d.addCallback(lambda _: self._setup_lbry_file_manager())
-        d.addCallback(lambda _: self._setup_lbry_file_opener())
         d.addCallback(lambda _: self._setup_query_handlers())
         d.addCallback(lambda _: self._setup_server())
         d.addCallback(lambda _: _log_starting_vals())
@@ -545,7 +544,7 @@ class Daemon(AuthJSONRPCServer):
                 )
                 self.git_lbryum_version = version
                 return defer.succeed(None)
-            except:
+            except Exception:
                 log.info("Failed to get lbryum version from git")
                 self.git_lbryum_version = None
                 return defer.fail(None)
@@ -560,7 +559,7 @@ class Daemon(AuthJSONRPCServer):
                 )
                 self.git_lbrynet_version = version
                 return defer.succeed(None)
-            except:
+            except Exception:
                 log.info("Failed to get lbrynet version from git")
                 self.git_lbrynet_version = None
                 return defer.fail(None)
@@ -590,7 +589,6 @@ class Daemon(AuthJSONRPCServer):
         # TODO: this was blatantly copied from jsonrpc_start_lbry_file. Be DRY.
         def _start_file(f):
             d = self.lbry_file_manager.toggle_lbry_file_running(f)
-            d.addCallback(lambda _: self.lighthouse_client.announce_sd(f.sd_hash))
             return defer.succeed("Started LBRY file")
 
         def _get_and_start_file(name):
@@ -689,20 +687,13 @@ class Daemon(AuthJSONRPCServer):
 
     def _setup_query_handlers(self):
         handlers = [
-            # CryptBlobInfoQueryHandlerFactory(self.lbry_file_metadata_manager, self.session.wallet,
+            BlobRequestHandlerFactory(self.session.blob_manager, self.session.wallet,
-            #                                 self._server_payment_rate_manager),
+                                      self.session.payment_rate_manager),
-            BlobAvailabilityHandlerFactory(self.session.blob_manager),
-            # BlobRequestHandlerFactory(self.session.blob_manager, self.session.wallet,
-            #                          self._server_payment_rate_manager),
             self.session.wallet.get_wallet_info_query_handler_factory(),
         ]
 
         def get_blob_request_handler_factory(rate):
-            self.blob_request_payment_rate_manager = PaymentRateManager(
+            self.blob_request_payment_rate_manager = self.session.payment_rate_manager
-                self.session.base_payment_rate_manager, rate
-            )
-            handlers.append(BlobRequestHandlerFactory(self.session.blob_manager, self.session.wallet,
-                                                      self.blob_request_payment_rate_manager))
 
         d1 = self.settings.get_server_data_payment_rate()
         d1.addCallback(get_blob_request_handler_factory)
@@ -961,19 +952,22 @@ class Daemon(AuthJSONRPCServer):
         def get_wallet():
             if self.wallet_type == "lbrycrd":
                 log.info("Using lbrycrd wallet")
-                d = defer.succeed(LBRYcrdWallet(self.db_dir, wallet_dir=self.wallet_dir, wallet_conf=self.lbrycrd_conf,
+                wallet = LBRYcrdWallet(self.db_dir,
-                                                lbrycrdd_path=self.lbrycrdd_path))
+                                       wallet_dir=self.wallet_dir,
+                                       wallet_conf=self.lbrycrd_conf,
+                                       lbrycrdd_path=self.lbrycrdd_path)
+                d = defer.succeed(wallet)
             elif self.wallet_type == "lbryum":
                 log.info("Using lbryum wallet")
-                d = defer.succeed(LBRYumWallet(self.db_dir))
+                config = {'auto-connect': True}
+                if conf.LBRYUM_WALLET_DIR:
+                    config['lbryum_path'] = conf.LBRYUM_WALLET_DIR
+                d = defer.succeed(LBRYumWallet(self.db_dir, config))
             elif self.wallet_type == "ptc":
                 log.info("Using PTC wallet")
                 d = defer.succeed(PTCWallet(self.db_dir))
             else:
-                # TODO: should fail here.  Can't switch to lbrycrd because the wallet_dir, conf and path won't be set
+                raise ValueError('Wallet Type {} is not valid'.format(self.wallet_type))
-                log.info("Requested unknown wallet '%s', using default lbryum", self.wallet_type)
-                d = defer.succeed(LBRYumWallet(self.db_dir))
-
             d.addCallback(lambda wallet: {"wallet": wallet})
             return d
 
@@ -1012,14 +1006,6 @@ class Daemon(AuthJSONRPCServer):
         self.sd_identifier.add_stream_downloader_factory(EncryptedFileStreamType, file_opener_factory)
         return defer.succeed(None)
 
-    def _setup_lbry_file_opener(self):
-
-        downloader_factory = EncryptedFileOpenerFactory(self.session.peer_finder, self.session.rate_limiter,
-                                                   self.session.blob_manager, self.stream_info_manager,
-                                                   self.session.wallet)
-        self.sd_identifier.add_stream_downloader_factory(EncryptedFileStreamType, downloader_factory)
-        return defer.succeed(True)
-
     def _download_sd_blob(self, sd_hash, timeout=DEFAULT_SD_DOWNLOAD_TIMEOUT):
         def cb(result):
             if not r.called:
@@ -1031,7 +1017,7 @@ class Daemon(AuthJSONRPCServer):
 
         r = defer.Deferred(None)
         reactor.callLater(timeout, eb)
-        d = download_sd_blob(self.session, sd_hash, PaymentRateManager(self.session.base_payment_rate_manager))
+        d = download_sd_blob(self.session, sd_hash, self.session.payment_rate_manager)
         d.addCallback(BlobStreamDescriptorReader)
         d.addCallback(lambda blob: blob.get_info())
         d.addCallback(cb)
@@ -1457,6 +1443,16 @@ class Daemon(AuthJSONRPCServer):
         """
 
         platform_info = self._get_platform()
+        try:
+            lbrynet_update_available = utils.version_is_greater_than(
+                self.git_lbrynet_version, lbrynet_version)
+        except AttributeError:
+            lbrynet_update_available = False
+        try:
+            lbryum_update_available = utils.version_is_greater_than(
+                self.git_lbryum_version, lbryum_version)
+        except AttributeError:
+            lbryum_update_available = False
         msg = {
             'platform': platform_info['platform'],
             'os_release': platform_info['os_release'],
@@ -1466,8 +1462,8 @@ class Daemon(AuthJSONRPCServer):
             'ui_version': self.ui_version,
             'remote_lbrynet': self.git_lbrynet_version,
             'remote_lbryum': self.git_lbryum_version,
-            'lbrynet_update_available': utils.version_is_greater_than(self.git_lbrynet_version, lbrynet_version),
+            'lbrynet_update_available': lbrynet_update_available,
-            'lbryum_update_available': utils.version_is_greater_than(self.git_lbryum_version, lbryum_version),
+            'lbryum_update_available': lbryum_update_available
         }
 
         log.info("Get version info: " + json.dumps(msg))
@@ -1819,13 +1815,8 @@ class Daemon(AuthJSONRPCServer):
         """
 
         name = p['name']
-        force = p.get('force', False)
 
-        if force:
         d = self._get_est_cost(name)
-        else:
-            d = self._search(name)
-            d.addCallback(lambda r: [i['cost'] for i in r][0])
         d.addCallback(lambda r: self._render_response(r, OK_CODE))
         return d
 
@@ -1939,7 +1930,7 @@ class Daemon(AuthJSONRPCServer):
             metadata = Metadata(p['metadata'])
             make_lbry_file = False
             sd_hash = metadata['sources']['lbry_sd_hash']
-        except AssertionError:
+        except ValidationError:
             make_lbry_file = True
             sd_hash = None
             metadata = p['metadata']
@@ -2507,6 +2498,65 @@ class Daemon(AuthJSONRPCServer):
         d.addCallback(lambda r: self._render_response(r, OK_CODE))
         return d
 
+    def jsonrpc_get_search_servers(self):
+        """
+        Get list of lighthouse servers
+        Args:
+            None
+        Returns:
+            List of address:port
+        """
+
+        d = self._render_response(SEARCH_SERVERS, OK_CODE)
+        return d
+
+    def jsonrpc_get_mean_availability(self):
+        """
+        Get mean blob availability
+
+        Args:
+            None
+        Returns:
+            Mean peers for a blob
+        """
+
+        d = self._render_response(self.session.blob_tracker.last_mean_availability, OK_CODE)
+        return d
+
+    def jsonrpc_get_availability(self, p):
+        """
+        Get stream availability for a winning claim
+
+        Arg:
+            name (str): lbry uri
+
+        Returns:
+             peers per blob / total blobs
+        """
+
+        def _get_mean(blob_availabilities):
+            peer_counts = []
+            for blob_availability in blob_availabilities:
+                for blob, peers in blob_availability.iteritems():
+                    peer_counts.append(peers)
+            if peer_counts:
+                return round(1.0 * sum(peer_counts) / len(peer_counts), 2)
+            else:
+                return 0.0
+
+        name = p['name']
+
+        d = self._resolve_name(name, force_refresh=True)
+        d.addCallback(get_sd_hash)
+        d.addCallback(self._download_sd_blob)
+        d.addCallbacks(lambda descriptor: [blob.get('blob_hash') for blob in descriptor['blobs']],
+                       lambda _: [])
+        d.addCallback(self.session.blob_tracker.get_availability_for_blobs)
+        d.addCallback(_get_mean)
+        d.addCallback(lambda result: self._render_response(result, OK_CODE))
+
+        return d
+
 
 def get_lbrynet_version_from_github():
     """Return the latest released version from github."""

lbrynet/lbrynet_daemon/DaemonControl.py

@@ -14,9 +14,10 @@ from jsonrpc.proxy import JSONRPCProxy
 from lbrynet.core import log_support
 from lbrynet.lbrynet_daemon.auth.auth import PasswordChecker, HttpPasswordRealm
 from lbrynet.lbrynet_daemon.auth.util import initialize_api_key_file
-from lbrynet.lbrynet_daemon.DaemonServer import DaemonServer, DaemonRequest
+from lbrynet.lbrynet_daemon.DaemonServer import DaemonServer
-from lbrynet.conf import API_CONNECTION_STRING, API_INTERFACE, API_PORT, \
+from lbrynet.lbrynet_daemon.DaemonRequest import DaemonRequest
-                         UI_ADDRESS, DEFAULT_UI_BRANCH, LOG_FILE_NAME
+from lbrynet.conf import API_CONNECTION_STRING, API_INTERFACE, API_PORT
+from lbrynet.conf import UI_ADDRESS, DEFAULT_UI_BRANCH, LOG_FILE_NAME
 from lbrynet.conf import DATA_DIR as log_dir
 
 if not os.path.isdir(log_dir):

lbrynet/lbrynet_daemon/DaemonRequest.py

@@ -0,0 +1,187 @@
+import time
+import cgi
+import mimetools
+import os
+import tempfile
+from twisted.web import server
+
+
+class DaemonRequest(server.Request):
+    """
+    For LBRY specific request functionality. Currently just provides
+    handling for large multipart POST requests, taken from here:
+    http://sammitch.ca/2013/07/handling-large-requests-in-twisted/
+
+    For multipart POST requests, this populates self.args with temp
+    file objects instead of strings. Note that these files don't auto-delete
+    on close because we want to be able to move and rename them.
+
+    """
+
+    # max amount of memory to allow any ~single~ request argument [ie: POSTed file]
+    # note: this value seems to be taken with a grain of salt, memory usage may spike
+    #       FAR above this value in some cases.
+    #       eg: set the memory limit to 5 MB, write 2 blocks of 4MB, mem usage will
+    #           have spiked to 8MB before the data is rolled to disk after the
+    #           second write completes.
+    memorylimit = 1024*1024*100
+
+    # enable/disable debug logging
+    do_log = False
+
+    # re-defined only for debug/logging purposes
+    def gotLength(self, length):
+        if self.do_log:
+            print '%f Headers received, Content-Length: %d' % (time.time(), length)
+        server.Request.gotLength(self, length)
+
+    # re-definition of twisted.web.server.Request.requestreceived, the only difference
+    # is that self.parse_multipart() is used rather than cgi.parse_multipart()
+    def requestReceived(self, command, path, version):
+        from twisted.web.http import parse_qs
+        if self.do_log:
+            print '%f Request Received' % time.time()
+
+        self.content.seek(0,0)
+        self.args = {}
+        self.stack = []
+
+        self.method, self.uri = command, path
+        self.clientproto = version
+        x = self.uri.split(b'?', 1)
+
+        if len(x) == 1:
+            self.path = self.uri
+        else:
+            self.path, argstring = x
+            self.args = parse_qs(argstring, 1)
+
+        # cache the client and server information, we'll need this later to be
+        # serialized and sent with the request so CGIs will work remotely
+        self.client = self.channel.transport.getPeer()
+        self.host = self.channel.transport.getHost()
+
+        # Argument processing
+        args = self.args
+        ctype = self.requestHeaders.getRawHeaders(b'content-type')
+        if ctype is not None:
+            ctype = ctype[0]
+
+        if self.method == b"POST" and ctype:
+            mfd = b'multipart/form-data'
+            key, pdict = cgi.parse_header(ctype)
+            if key == b'application/x-www-form-urlencoded':
+                args.update(parse_qs(self.content.read(), 1))
+            elif key == mfd:
+                try:
+                    self.content.seek(0,0)
+                    args.update(self.parse_multipart(self.content, pdict))
+                    #args.update(cgi.parse_multipart(self.content, pdict))
+
+                except KeyError as e:
+                    if e.args[0] == b'content-disposition':
+                        # Parse_multipart can't cope with missing
+                        # content-dispostion headers in multipart/form-data
+                        # parts, so we catch the exception and tell the client
+                        # it was a bad request.
+                        self.channel.transport.write(
+                                b"HTTP/1.1 400 Bad Request\r\n\r\n")
+                        self.channel.transport.loseConnection()
+                        return
+                    raise
+
+            self.content.seek(0, 0)
+
+        self.process()
+
+    # re-definition of cgi.parse_multipart that uses a single temporary file to store
+    # data rather than storing 2 to 3 copies in various lists.
+    def parse_multipart(self, fp, pdict):
+        if self.do_log:
+            print '%f Parsing Multipart data: ' % time.time()
+        rewind = fp.tell() #save cursor
+        fp.seek(0,0) #reset cursor
+
+        boundary = ""
+        if 'boundary' in pdict:
+            boundary = pdict['boundary']
+        if not cgi.valid_boundary(boundary):
+            raise ValueError,  ('Invalid boundary in multipart form: %r'
+                                % (boundary,))
+
+        nextpart = "--" + boundary
+        lastpart = "--" + boundary + "--"
+        partdict = {}
+        terminator = ""
+
+        while terminator != lastpart:
+            c_bytes = -1
+
+            data = tempfile.NamedTemporaryFile(delete=False)
+            if terminator:
+                # At start of next part.  Read headers first.
+                headers = mimetools.Message(fp)
+                clength = headers.getheader('content-length')
+                if clength:
+                    try:
+                        c_bytes = int(clength)
+                    except ValueError:
+                        pass
+                if c_bytes > 0:
+                    data.write(fp.read(c_bytes))
+            # Read lines until end of part.
+            while 1:
+                line = fp.readline()
+                if not line:
+                    terminator = lastpart # End outer loop
+                    break
+                if line[:2] == "--":
+                    terminator = line.strip()
+                    if terminator in (nextpart, lastpart):
+                        break
+                data.write(line)
+            # Done with part.
+            if data.tell() == 0:
+                continue
+            if c_bytes < 0:
+                # if a Content-Length header was not supplied with the MIME part
+                # then the trailing line break must be removed.
+                # we have data, read the last 2 bytes
+                rewind = min(2, data.tell())
+                data.seek(-rewind, os.SEEK_END)
+                line = data.read(2)
+                if line[-2:] == "\r\n":
+                    data.seek(-2, os.SEEK_END)
+                    data.truncate()
+                elif line[-1:] == "\n":
+                    data.seek(-1, os.SEEK_END)
+                    data.truncate()
+
+            line = headers['content-disposition']
+            if not line:
+                continue
+            key, params = cgi.parse_header(line)
+            if key != 'form-data':
+                continue
+            if 'name' in params:
+                name = params['name']
+                # kludge in the filename
+                if 'filename' in params:
+                    fname_index = name + '_filename'
+                    if fname_index in partdict:
+                        partdict[fname_index].append(params['filename'])
+                    else:
+                        partdict[fname_index] = [params['filename']]
+            else:
+                # Unnamed parts are not returned at all.
+                continue
+            data.seek(0,0)
+            if name in partdict:
+                partdict[name].append(data)
+            else:
+                partdict[name] = [data]
+
+        fp.seek(rewind)  # Restore cursor
+        return partdict
+
+

lbrynet/lbrynet_daemon/DaemonServer.py

@@ -1,23 +1,12 @@
 import logging
 import os
-import shutil
-import json
 import sys
-import mimetypes
-import mimetools
-import tempfile
-import time
-import cgi
 
 from appdirs import user_data_dir
-from twisted.web import server, static, resource
+from twisted.internet import defer
-from twisted.internet import abstract, defer, interfaces, error, reactor, task
-
-from zope.interface import implementer
-
 from lbrynet.lbrynet_daemon.Daemon import Daemon
-from lbrynet.lbryfilemanager.EncryptedFileDownloader import ManagedEncryptedFileDownloader
+from lbrynet.lbrynet_daemon.Resources import LBRYindex, HostedEncryptedFile, EncryptedFileUpload
-from lbrynet.conf import API_ADDRESS, UI_ADDRESS, DEFAULT_UI_BRANCH, LOG_FILE_NAME
+from lbrynet.conf import API_ADDRESS, DEFAULT_UI_BRANCH, LOG_FILE_NAME
 
 
 # TODO: omg, this code is essentially duplicated in Daemon
@@ -32,365 +21,6 @@ lbrynet_log = os.path.join(data_dir, LOG_FILE_NAME)
 log = logging.getLogger(__name__)
 
 
-class DaemonRequest(server.Request):
-    """
-    For LBRY specific request functionality. Currently just provides
-    handling for large multipart POST requests, taken from here:
-    http://sammitch.ca/2013/07/handling-large-requests-in-twisted/
-
-    For multipart POST requests, this populates self.args with temp
-    file objects instead of strings. Note that these files don't auto-delete
-    on close because we want to be able to move and rename them.
-
-    """
-
-    # max amount of memory to allow any ~single~ request argument [ie: POSTed file]
-    # note: this value seems to be taken with a grain of salt, memory usage may spike
-    #       FAR above this value in some cases.
-    #       eg: set the memory limit to 5 MB, write 2 blocks of 4MB, mem usage will
-    #           have spiked to 8MB before the data is rolled to disk after the
-    #           second write completes.
-    memorylimit = 1024*1024*100
-
-    # enable/disable debug logging
-    do_log = False
-
-    # re-defined only for debug/logging purposes
-    def gotLength(self, length):
-        if self.do_log:
-            print '%f Headers received, Content-Length: %d' % (time.time(), length)
-        server.Request.gotLength(self, length)
-
-    # re-definition of twisted.web.server.Request.requestreceived, the only difference
-    # is that self.parse_multipart() is used rather than cgi.parse_multipart()
-    def requestReceived(self, command, path, version):
-        from twisted.web.http import parse_qs
-        if self.do_log:
-            print '%f Request Received' % time.time()
-
-        self.content.seek(0,0)
-        self.args = {}
-        self.stack = []
-
-        self.method, self.uri = command, path
-        self.clientproto = version
-        x = self.uri.split(b'?', 1)
-
-        if len(x) == 1:
-            self.path = self.uri
-        else:
-            self.path, argstring = x
-            self.args = parse_qs(argstring, 1)
-
-        # cache the client and server information, we'll need this later to be
-        # serialized and sent with the request so CGIs will work remotely
-        self.client = self.channel.transport.getPeer()
-        self.host = self.channel.transport.getHost()
-
-        # Argument processing
-        args = self.args
-        ctype = self.requestHeaders.getRawHeaders(b'content-type')
-        if ctype is not None:
-            ctype = ctype[0]
-
-        if self.method == b"POST" and ctype:
-            mfd = b'multipart/form-data'
-            key, pdict = cgi.parse_header(ctype)
-            if key == b'application/x-www-form-urlencoded':
-                args.update(parse_qs(self.content.read(), 1))
-            elif key == mfd:
-                try:
-                    self.content.seek(0,0)
-                    args.update(self.parse_multipart(self.content, pdict))
-                    #args.update(cgi.parse_multipart(self.content, pdict))
-
-                except KeyError as e:
-                    if e.args[0] == b'content-disposition':
-                        # Parse_multipart can't cope with missing
-                        # content-dispostion headers in multipart/form-data
-                        # parts, so we catch the exception and tell the client
-                        # it was a bad request.
-                        self.channel.transport.write(
-                                b"HTTP/1.1 400 Bad Request\r\n\r\n")
-                        self.channel.transport.loseConnection()
-                        return
-                    raise
-
-            self.content.seek(0, 0)
-
-        self.process()
-
-    # re-definition of cgi.parse_multipart that uses a single temporary file to store
-    # data rather than storing 2 to 3 copies in various lists.
-    def parse_multipart(self, fp, pdict):
-        if self.do_log:
-            print '%f Parsing Multipart data: ' % time.time()
-        rewind = fp.tell() #save cursor
-        fp.seek(0,0) #reset cursor
-
-        boundary = ""
-        if 'boundary' in pdict:
-            boundary = pdict['boundary']
-        if not cgi.valid_boundary(boundary):
-            raise ValueError,  ('Invalid boundary in multipart form: %r'
-                                % (boundary,))
-
-        nextpart = "--" + boundary
-        lastpart = "--" + boundary + "--"
-        partdict = {}
-        terminator = ""
-
-        while terminator != lastpart:
-            c_bytes = -1
-
-            data = tempfile.NamedTemporaryFile(delete=False)
-            if terminator:
-                # At start of next part.  Read headers first.
-                headers = mimetools.Message(fp)
-                clength = headers.getheader('content-length')
-                if clength:
-                    try:
-                        c_bytes = int(clength)
-                    except ValueError:
-                        pass
-                if c_bytes > 0:
-                    data.write(fp.read(c_bytes))
-            # Read lines until end of part.
-            while 1:
-                line = fp.readline()
-                if not line:
-                    terminator = lastpart # End outer loop
-                    break
-                if line[:2] == "--":
-                    terminator = line.strip()
-                    if terminator in (nextpart, lastpart):
-                        break
-                data.write(line)
-            # Done with part.
-            if data.tell() == 0:
-                continue
-            if c_bytes < 0:
-                # if a Content-Length header was not supplied with the MIME part
-                # then the trailing line break must be removed.
-                # we have data, read the last 2 bytes
-                rewind = min(2, data.tell())
-                data.seek(-rewind, os.SEEK_END)
-                line = data.read(2)
-                if line[-2:] == "\r\n":
-                    data.seek(-2, os.SEEK_END)
-                    data.truncate()
-                elif line[-1:] == "\n":
-                    data.seek(-1, os.SEEK_END)
-                    data.truncate()
-
-            line = headers['content-disposition']
-            if not line:
-                continue
-            key, params = cgi.parse_header(line)
-            if key != 'form-data':
-                continue
-            if 'name' in params:
-                name = params['name']
-                # kludge in the filename
-                if 'filename' in params:
-                    fname_index = name + '_filename'
-                    if fname_index in partdict:
-                        partdict[fname_index].append(params['filename'])
-                    else:
-                        partdict[fname_index] = [params['filename']]
-            else:
-                # Unnamed parts are not returned at all.
-                continue
-            data.seek(0,0)
-            if name in partdict:
-                partdict[name].append(data)
-            else:
-                partdict[name] = [data]
-
-        fp.seek(rewind)  # Restore cursor
-        return partdict
-
-class LBRYindex(resource.Resource):
-    def __init__(self, ui_dir):
-        resource.Resource.__init__(self)
-        self.ui_dir = ui_dir
-
-    isLeaf = False
-
-    def _delayed_render(self, request, results):
-        request.write(str(results))
-        request.finish()
-
-    def getChild(self, name, request):
-        if name == '':
-            return self
-        return resource.Resource.getChild(self, name, request)
-
-    def render_GET(self, request):
-        request.setHeader('cache-control','no-cache, no-store, must-revalidate')
-        request.setHeader('expires', '0')
-        return static.File(os.path.join(self.ui_dir, "index.html")).render_GET(request)
-
-
-@implementer(interfaces.IPushProducer)
-class EncryptedFileStreamer(object):
-    """
-    Writes LBRY stream to request; will pause to wait for new data if the file
-    is downloading.
-
-    No support for range requests (some browser players can't handle it when
-    the full video data isn't available on request).
-    """
-
-    bufferSize = abstract.FileDescriptor.bufferSize
-
-
-    # How long to wait between sending blocks (needed because some
-    # video players freeze up if you try to send data too fast)
-    stream_interval = 0.005
-
-    # How long to wait before checking if new data has been appended to the file
-    new_data_check_interval = 0.25
-
-
-    def __init__(self, request, path, stream, file_manager):
-        def _set_content_length_header(length):
-            self._request.setHeader('content-length', length)
-            return defer.succeed(None)
-
-        self._request = request
-        self._file = open(path, 'rb')
-        self._stream = stream
-        self._file_manager = file_manager
-        self._headers_sent = False
-
-        self._running = True
-
-        self._request.setResponseCode(200)
-        self._request.setHeader('accept-ranges', 'none')
-        self._request.setHeader('content-type', mimetypes.guess_type(path)[0])
-        self._request.setHeader("Content-Security-Policy", "sandbox")
-
-        self._deferred = stream.get_total_bytes()
-        self._deferred.addCallback(_set_content_length_header)
-        self._deferred.addCallback(lambda _: self.resumeProducing())
-
-    def _check_for_new_data(self):
-        def _recurse_or_stop(stream_status):
-            if not self._running:
-                return
-
-            if stream_status != ManagedEncryptedFileDownloader.STATUS_FINISHED:
-                self._deferred.addCallback(lambda _: task.deferLater(reactor, self.new_data_check_interval, self._check_for_new_data))
-            else:
-                self.stopProducing()
-
-        if not self._running:
-            return
-
-        # Clear the file's EOF indicator by seeking to current position
-        self._file.seek(self._file.tell())
-
-        data = self._file.read(self.bufferSize)
-        if data:
-            self._request.write(data)
-            if self._running:  # .write() can trigger a pause
-                self._deferred.addCallback(lambda _: task.deferLater(reactor, self.stream_interval, self._check_for_new_data))
-        else:
-            self._deferred.addCallback(lambda _: self._file_manager.get_lbry_file_status(self._stream))
-            self._deferred.addCallback(_recurse_or_stop)
-
-    def pauseProducing(self):
-        self._running = False
-
-    def resumeProducing(self):
-        self._running = True
-        self._check_for_new_data()
-
-    def stopProducing(self):
-        self._running = False
-        self._file.close()
-        self._deferred.addErrback(lambda err: err.trap(defer.CancelledError))
-        self._deferred.addErrback(lambda err: err.trap(error.ConnectionDone))
-        self._deferred.cancel()
-        self._request.unregisterProducer()
-        self._request.finish()
-
-
-class HostedEncryptedFile(resource.Resource):
-    def __init__(self, api):
-        self._api = api
-        resource.Resource.__init__(self)
-
-    def _make_stream_producer(self, request, stream):
-        path = os.path.join(self._api.download_directory, stream.file_name)
-
-        producer = EncryptedFileStreamer(request, path, stream, self._api.lbry_file_manager)
-        request.registerProducer(producer, streaming=True)
-
-        d = request.notifyFinish()
-        d.addErrback(self._responseFailed, d)
-        return d
-
-    def render_GET(self, request):
-        request.setHeader("Content-Security-Policy", "sandbox")
-        if 'name' in request.args.keys():
-            if request.args['name'][0] != 'lbry' and request.args['name'][0] not in self._api.waiting_on.keys():
-                d = self._api._download_name(request.args['name'][0])
-                d.addCallback(lambda stream: self._make_stream_producer(request, stream))
-            elif request.args['name'][0] in self._api.waiting_on.keys():
-                request.redirect(UI_ADDRESS + "/?watch=" + request.args['name'][0])
-                request.finish()
-            else:
-                request.redirect(UI_ADDRESS)
-                request.finish()
-            return server.NOT_DONE_YET
-
-    def _responseFailed(self, err, call):
-        call.addErrback(lambda err: err.trap(error.ConnectionDone))
-        call.addErrback(lambda err: err.trap(defer.CancelledError))
-        call.addErrback(lambda err: log.info("Error: " + str(err)))
-        call.cancel()
-
-class EncryptedFileUpload(resource.Resource):
-    """
-    Accepts a file sent via the file upload widget in the web UI, saves
-    it into a temporary dir, and responds with a JSON string containing
-    the path of the newly created file.
-    """
-
-    def __init__(self, api):
-        self._api = api
-
-    def render_POST(self, request):
-        origfilename = request.args['file_filename'][0]
-        uploaded_file = request.args['file'][0]  # Temp file created by request
-
-        # Move to a new temporary dir and restore the original file name
-        newdirpath = tempfile.mkdtemp()
-        newpath = os.path.join(newdirpath, origfilename)
-        if os.name == "nt":
-            shutil.copy(uploaded_file.name, newpath)
-            # TODO Still need to remove the file
-
-            # TODO deal with pylint error in cleaner fashion than this
-            try:
-                from exceptions import WindowsError as win_except
-            except ImportError as e:
-                log.error("This shouldn't happen")
-                win_except = Exception
-
-            try:
-                os.remove(uploaded_file.name)
-            except win_except as e:
-                pass
-        else:
-            shutil.move(uploaded_file.name, newpath)
-        self._api.uploaded_temp_files.append(newpath)
-
-        return json.dumps(newpath)
-
-
 class DaemonServer(object):
     def _setup_server(self, wallet):
         self.root = LBRYindex(os.path.join(os.path.join(data_dir, "lbry-ui"), "active"))

lbrynet/lbrynet_daemon/Downloader.py

@@ -9,7 +9,6 @@ from twisted.internet import defer
 from twisted.internet.task import LoopingCall
 
 from lbrynet.core.Error import InsufficientFundsError, KeyFeeAboveMaxAllowed
-from lbrynet.core.PaymentRateManager import PaymentRateManager
 from lbrynet.core.StreamDescriptor import download_sd_blob
 from lbrynet.metadata.Fee import FeeValidator
 from lbrynet.lbryfilemanager.EncryptedFileDownloader import ManagedEncryptedFileDownloaderFactory
@@ -48,11 +47,10 @@ class GetStream(object):
         self.description = None
         self.fee = None
         self.data_rate = data_rate
-        self.name = None
         self.file_name = file_name
         self.session = session
         self.exchange_rate_manager = exchange_rate_manager
-        self.payment_rate_manager = PaymentRateManager(self.session.base_payment_rate_manager)
+        self.payment_rate_manager = self.session.payment_rate_manager
         self.lbry_file_manager = lbry_file_manager
         self.sd_identifier = sd_identifier
         self.stream_hash = None
@@ -148,7 +146,7 @@ class GetStream(object):
         return self.finished
 
     def _start_download(self, downloader):
-        log.info('Starting download for %s', self.name)
+        log.info('Starting download for %s', self.resolved_name)
         self.downloader = downloader
         self.download_path = os.path.join(downloader.download_directory, downloader.file_name)
 

lbrynet/lbrynet_daemon/ExchangeRateManager.py

@@ -37,28 +37,34 @@ class MarketFeed(object):
         self._updater = LoopingCall(self._update_price)
 
     def _make_request(self):
+        try:
             r = requests.get(self.url, self.params)
-        return r.text
+            return defer.succeed(r.text)
+        except Exception as err:
+            log.error(err)
+            return defer.fail(err)
 
     def _handle_response(self, response):
         return NotImplementedError
 
     def _subtract_fee(self, from_amount):
+        # increase amount to account for market fees
         return defer.succeed(from_amount / (1.0 - self.fee))
 
     def _save_price(self, price):
         log.debug("Saving price update %f for %s" % (price, self.market))
         self.rate = ExchangeRate(self.market, price, int(time.time()))
 
-    def _log_error(self):
+    def _log_error(self, err):
-        log.warning("%s failed to update exchange rate information", self.name)
+        log.error(err)
+        log.warning("There was a problem updating %s exchange rate information from %s", self.market, self.name)
 
     def _update_price(self):
-        d = defer.succeed(self._make_request())
+        d = self._make_request()
         d.addCallback(self._handle_response)
         d.addCallback(self._subtract_fee)
         d.addCallback(self._save_price)
-        d.addErrback(lambda _: self._log_error())
+        d.addErrback(self._log_error)
 
     def start(self):
         if not self._updater.running:
@@ -98,7 +104,11 @@ class GoogleBTCFeed(MarketFeed):
         )
 
     def _make_request(self):
-        return googlefinance.getQuotes('CURRENCY:USDBTC')[0]
+        try:
+            r = googlefinance.getQuotes('CURRENCY:USDBTC')[0]
+            return defer.succeed(r)
+        except Exception as err:
+            return defer.fail(err)
 
     def _handle_response(self, response):
         return float(response['LastTradePrice'])

lbrynet/lbrynet_daemon/FileStreamer.py

@@ -0,0 +1,104 @@
+import logging
+import os
+import sys
+import mimetypes
+
+from appdirs import user_data_dir
+from zope.interface import implements
+from twisted.internet import defer, error, interfaces, abstract, task, reactor
+
+
+# TODO: omg, this code is essentially duplicated in Daemon
+if sys.platform != "darwin":
+    data_dir = os.path.join(os.path.expanduser("~"), ".lbrynet")
+else:
+    data_dir = user_data_dir("LBRY")
+if not os.path.isdir(data_dir):
+    os.mkdir(data_dir)
+
+log = logging.getLogger(__name__)
+STATUS_FINISHED = 'finished'
+
+class EncryptedFileStreamer(object):
+    """
+    Writes LBRY stream to request; will pause to wait for new data if the file
+    is downloading.
+
+    No support for range requests (some browser players can't handle it when
+    the full video data isn't available on request).
+    """
+    implements(interfaces.IPushProducer)
+
+    bufferSize = abstract.FileDescriptor.bufferSize
+
+
+    # How long to wait between sending blocks (needed because some
+    # video players freeze up if you try to send data too fast)
+    stream_interval = 0.005
+
+    # How long to wait before checking if new data has been appended to the file
+    new_data_check_interval = 0.25
+
+
+    def __init__(self, request, path, stream, file_manager):
+        def _set_content_length_header(length):
+            self._request.setHeader('content-length', length)
+            return defer.succeed(None)
+
+        self._request = request
+        self._file = open(path, 'rb')
+        self._stream = stream
+        self._file_manager = file_manager
+        self._headers_sent = False
+
+        self._running = True
+
+        self._request.setResponseCode(200)
+        self._request.setHeader('accept-ranges', 'none')
+        self._request.setHeader('content-type', mimetypes.guess_type(path)[0])
+        self._request.setHeader("Content-Security-Policy", "sandbox")
+
+        self._deferred = stream.get_total_bytes()
+        self._deferred.addCallback(_set_content_length_header)
+        self._deferred.addCallback(lambda _: self.resumeProducing())
+
+    def _check_for_new_data(self):
+        def _recurse_or_stop(stream_status):
+            if not self._running:
+                return
+
+            if stream_status != STATUS_FINISHED:
+                self._deferred.addCallback(lambda _: task.deferLater(reactor, self.new_data_check_interval, self._check_for_new_data))
+            else:
+                self.stopProducing()
+
+        if not self._running:
+            return
+
+        # Clear the file's EOF indicator by seeking to current position
+        self._file.seek(self._file.tell())
+
+        data = self._file.read(self.bufferSize)
+        if data:
+            self._request.write(data)
+            if self._running:  # .write() can trigger a pause
+                self._deferred.addCallback(lambda _: task.deferLater(reactor, self.stream_interval, self._check_for_new_data))
+        else:
+            self._deferred.addCallback(lambda _: self._file_manager.get_lbry_file_status(self._stream))
+            self._deferred.addCallback(_recurse_or_stop)
+
+    def pauseProducing(self):
+        self._running = False
+
+    def resumeProducing(self):
+        self._running = True
+        self._check_for_new_data()
+
+    def stopProducing(self):
+        self._running = False
+        self._file.close()
+        self._deferred.addErrback(lambda err: err.trap(defer.CancelledError))
+        self._deferred.addErrback(lambda err: err.trap(error.ConnectionDone))
+        self._deferred.cancel()
+        self._request.unregisterProducer()
+        self._request.finish()

lbrynet/lbrynet_daemon/Publisher.py

@@ -9,7 +9,6 @@ from appdirs import user_data_dir
 from lbrynet.core.Error import InsufficientFundsError
 from lbrynet.lbryfilemanager.EncryptedFileCreator import create_lbry_file
 from lbrynet.lbryfile.StreamDescriptor import publish_sd_blob
-from lbrynet.core.PaymentRateManager import PaymentRateManager
 from lbrynet.metadata.Metadata import Metadata
 from lbrynet.lbryfilemanager.EncryptedFileDownloader import ManagedEncryptedFileDownloader
 from lbrynet import reflector
@@ -102,7 +101,7 @@ class Publisher(object):
 
     def add_to_lbry_files(self, stream_hash):
         self.stream_hash = stream_hash
-        prm = PaymentRateManager(self.session.base_payment_rate_manager)
+        prm = self.session.payment_rate_manager
         d = self.lbry_file_manager.add_lbry_file(stream_hash, prm)
         d.addCallback(self.set_lbry_file)
         return d
@@ -161,4 +160,4 @@ class Publisher(object):
 
 
 def get_content_type(filename):
-    return mimetypes.guess_type(filename)[0]
+    return mimetypes.guess_type(filename)[0] or 'application/octet-stream'

lbrynet/lbrynet_daemon/Resources.py

@@ -0,0 +1,133 @@
+import logging
+import os
+import shutil
+import json
+import sys
+import tempfile
+
+
+from appdirs import user_data_dir
+from twisted.web import server, static, resource
+from twisted.internet import defer, error
+
+from lbrynet.conf import UI_ADDRESS
+from lbrynet.lbrynet_daemon.FileStreamer import EncryptedFileStreamer
+
+# TODO: omg, this code is essentially duplicated in Daemon
+
+if sys.platform != "darwin":
+    data_dir = os.path.join(os.path.expanduser("~"), ".lbrynet")
+else:
+    data_dir = user_data_dir("LBRY")
+if not os.path.isdir(data_dir):
+    os.mkdir(data_dir)
+
+log = logging.getLogger(__name__)
+
+
+class NoCacheStaticFile(static.File):
+    def _set_no_cache(self, request):
+        request.setHeader('cache-control', 'no-cache, no-store, must-revalidate')
+        request.setHeader('expires', '0')
+
+    def render_GET(self, request):
+        self._set_no_cache(request)
+        return static.File.render_GET(self, request)
+
+
+class LBRYindex(resource.Resource):
+    def __init__(self, ui_dir):
+        resource.Resource.__init__(self)
+        self.ui_dir = ui_dir
+
+    isLeaf = False
+
+    def _delayed_render(self, request, results):
+        request.write(str(results))
+        request.finish()
+
+    def getChild(self, name, request):
+        request.setHeader('cache-control', 'no-cache, no-store, must-revalidate')
+        request.setHeader('expires', '0')
+
+        if name == '':
+            return self
+        return resource.Resource.getChild(self, name, request)
+
+    def render_GET(self, request):
+        return NoCacheStaticFile(os.path.join(self.ui_dir, "index.html")).render_GET(request)
+
+
+class HostedEncryptedFile(resource.Resource):
+    def __init__(self, api):
+        self._api = api
+        resource.Resource.__init__(self)
+
+    def _make_stream_producer(self, request, stream):
+        path = os.path.join(self._api.download_directory, stream.file_name)
+
+        producer = EncryptedFileStreamer(request, path, stream, self._api.lbry_file_manager)
+        request.registerProducer(producer, streaming=True)
+
+        d = request.notifyFinish()
+        d.addErrback(self._responseFailed, d)
+        return d
+
+    def render_GET(self, request):
+        request.setHeader("Content-Security-Policy", "sandbox")
+        if 'name' in request.args.keys():
+            if request.args['name'][0] != 'lbry' and request.args['name'][0] not in self._api.waiting_on.keys():
+                d = self._api._download_name(request.args['name'][0])
+                d.addCallback(lambda stream: self._make_stream_producer(request, stream))
+            elif request.args['name'][0] in self._api.waiting_on.keys():
+                request.redirect(UI_ADDRESS + "/?watch=" + request.args['name'][0])
+                request.finish()
+            else:
+                request.redirect(UI_ADDRESS)
+                request.finish()
+            return server.NOT_DONE_YET
+
+    def _responseFailed(self, err, call):
+        call.addErrback(lambda err: err.trap(error.ConnectionDone))
+        call.addErrback(lambda err: err.trap(defer.CancelledError))
+        call.addErrback(lambda err: log.info("Error: " + str(err)))
+        call.cancel()
+
+
+class EncryptedFileUpload(resource.Resource):
+    """
+    Accepts a file sent via the file upload widget in the web UI, saves
+    it into a temporary dir, and responds with a JSON string containing
+    the path of the newly created file.
+    """
+
+    def __init__(self, api):
+        self._api = api
+
+    def render_POST(self, request):
+        origfilename = request.args['file_filename'][0]
+        uploaded_file = request.args['file'][0]  # Temp file created by request
+
+        # Move to a new temporary dir and restore the original file name
+        newdirpath = tempfile.mkdtemp()
+        newpath = os.path.join(newdirpath, origfilename)
+        if os.name == "nt":
+            shutil.copy(uploaded_file.name, newpath)
+            # TODO Still need to remove the file
+
+            # TODO deal with pylint error in cleaner fashion than this
+            try:
+                from exceptions import WindowsError as win_except
+            except ImportError as e:
+                log.error("This shouldn't happen")
+                win_except = Exception
+
+            try:
+                os.remove(uploaded_file.name)
+            except win_except as e:
+                pass
+        else:
+            shutil.move(uploaded_file.name, newpath)
+        self._api.uploaded_temp_files.append(newpath)
+
+        return json.dumps(newpath)

lbrynet/lbrynet_daemon/UIManager.py

@@ -6,10 +6,10 @@ import json
 
 from urllib2 import urlopen
 from StringIO import StringIO
-from twisted.web import static
 from twisted.internet import defer
 from twisted.internet.task import LoopingCall
 from lbrynet.conf import DEFAULT_UI_BRANCH, LOG_FILE_NAME
+from lbrynet.lbrynet_daemon.Resources import NoCacheStaticFile
 from lbrynet import __version__ as lbrynet_version
 from lbryum.version import LBRYUM_VERSION as lbryum_version
 from zipfile import ZipFile
@@ -235,5 +235,5 @@ class UIManager(object):
 
     def _load_ui(self):
         for d in [i[0] for i in os.walk(self.active_dir) if os.path.dirname(i[0]) == self.active_dir]:
-            self.root.putChild(os.path.basename(d), static.File(d))
+            self.root.putChild(os.path.basename(d), NoCacheStaticFile(d))
         return defer.succeed(True)

lbrynet/metadata/Fee.py

@@ -1,116 +1,39 @@
 import logging
+import fee_schemas
 
-from lbrynet.metadata.Validator import Validator, skip_validate
+from lbrynet.metadata.StructuredDict import StructuredDict
-from lbrynet.conf import CURRENCIES
 
 log = logging.getLogger(__name__)
 
 
-def verify_supported_currency(fee):
+class FeeValidator(StructuredDict):
-    assert len(fee) == 1
-    for c in fee:
-        assert c in CURRENCIES
-    return True
-
-
-def verify_amount(x):
-    return isinstance(x, float) or isinstance(x, int) and x > 0
-
-
-class LBCFeeValidator(Validator):
-    FV001 = "0.0.1"
-    CURRENT_FEE_VERSION = FV001
-
-    FEE_REVISIONS = {}
-
-    FEE_REVISIONS[FV001] = [
-        (Validator.REQUIRE, 'amount', verify_amount),
-        (Validator.REQUIRE, 'address', skip_validate),
-    ]
-
-    FEE_MIGRATIONS = []
-
-    current_version = CURRENT_FEE_VERSION
-    versions = FEE_REVISIONS
-    migrations = FEE_MIGRATIONS
-
     def __init__(self, fee):
-        Validator.__init__(self, fee)
+        self._versions = [
-
+            ('0.0.1', fee_schemas.VER_001, None)
-
-class BTCFeeValidator(Validator):
-    FV001 = "0.0.1"
-    CURRENT_FEE_VERSION = FV001
-
-    FEE_REVISIONS = {}
-
-    FEE_REVISIONS[FV001] = [
-        (Validator.REQUIRE, 'amount',verify_amount),
-        (Validator.REQUIRE, 'address', skip_validate),
         ]
 
-    FEE_MIGRATIONS = []
+        StructuredDict.__init__(self, fee, fee.get('ver', '0.0.1'))
 
-    current_version = CURRENT_FEE_VERSION
-    versions = FEE_REVISIONS
-    migrations = FEE_MIGRATIONS
-
-    def __init__(self, fee):
-        Validator.__init__(self, fee)
-
-
-class USDFeeValidator(Validator):
-    FV001 = "0.0.1"
-    CURRENT_FEE_VERSION = FV001
-
-    FEE_REVISIONS = {}
-
-    FEE_REVISIONS[FV001] = [
-        (Validator.REQUIRE, 'amount',verify_amount),
-        (Validator.REQUIRE, 'address', skip_validate),
-    ]
-
-    FEE_MIGRATIONS = []
-
-    current_version = CURRENT_FEE_VERSION
-    versions = FEE_REVISIONS
-    migrations = FEE_MIGRATIONS
-
-    def __init__(self, fee):
-        Validator.__init__(self, fee)
-
-
-class FeeValidator(Validator):
-    CV001 = "0.0.1"
-    CURRENT_CURRENCY_VERSION = CV001
-
-    CURRENCY_REVISIONS = {}
-
-    CURRENCY_REVISIONS[CV001] = [
-        (Validator.OPTIONAL, 'BTC', BTCFeeValidator.validate),
-        (Validator.OPTIONAL, 'USD', USDFeeValidator.validate),
-        (Validator.OPTIONAL, 'LBC', LBCFeeValidator.validate),
-    ]
-
-    CURRENCY_MIGRATIONS = []
-
-    current_version = CURRENT_CURRENCY_VERSION
-    versions = CURRENCY_REVISIONS
-    migrations = CURRENCY_MIGRATIONS
-
-    def __init__(self, fee_dict):
-        Validator.__init__(self, fee_dict)
         self.currency_symbol = self.keys()[0]
         self.amount = self._get_amount()
         self.address = self[self.currency_symbol]['address']
 
     def _get_amount(self):
         amt = self[self.currency_symbol]['amount']
-        if isinstance(amt, float):
-            return amt
-        else:
         try:
             return float(amt)
         except TypeError:
-                log.error('Failed to convert %s to float', amt)
+            log.error('Failed to convert fee amount %s to float', amt)
             raise
+
+
+class LBCFeeValidator(StructuredDict):
+    pass
+
+
+class BTCFeeValidator(StructuredDict):
+    pass
+
+
+class USDFeeValidator(StructuredDict):
+    pass

lbrynet/metadata/Metadata.py

@@ -1,8 +1,7 @@
 import logging
 
-from lbrynet.metadata.Validator import Validator, skip_validate
+from lbrynet.metadata.StructuredDict import StructuredDict
-from lbrynet.metadata.Fee import FeeValidator, verify_supported_currency
+import metadata_schemas
-from lbrynet.conf import SOURCE_TYPES
 
 log = logging.getLogger(__name__)
 NAME_ALLOWED_CHARSET = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0987654321-'
@@ -13,74 +12,27 @@ def verify_name_characters(name):
         assert c in NAME_ALLOWED_CHARSET, "Invalid character"
     return True
 
+def migrate_001_to_002(metadata):
+    metadata['ver'] = '0.0.2'
+    metadata['nsfw'] = False
 
-def validate_sources(sources):
+def migrate_002_to_003(metadata):
-    for source in sources:
+    metadata['ver'] = '0.0.3'
-        assert source in SOURCE_TYPES, "Unknown source type: %s" % str(source)
+    if 'content-type' in metadata:
-    return True
+        metadata['content_type'] = metadata['content-type']
+        del metadata['content-type']
 
 
-class Metadata(Validator):
+class Metadata(StructuredDict):
-    MV001 = "0.0.1"
+    current_version = '0.0.3'
-    MV002 = "0.0.2"
-    MV003 = "0.0.3"
-    CURRENT_METADATA_VERSION = MV003
 
-    METADATA_REVISIONS = {}
+    _versions = [
-
+        ('0.0.1', metadata_schemas.VER_001, None),
-    METADATA_REVISIONS[MV001] = [
+        ('0.0.2', metadata_schemas.VER_002, migrate_001_to_002),
-        (Validator.REQUIRE, 'title', skip_validate),
+        ('0.0.3', metadata_schemas.VER_003, migrate_002_to_003)
-        (Validator.REQUIRE, 'description', skip_validate),
-        (Validator.REQUIRE, 'author', skip_validate),
-        (Validator.REQUIRE, 'language', skip_validate),
-        (Validator.REQUIRE, 'license', skip_validate),
-        (Validator.REQUIRE, 'content-type', skip_validate),
-        (Validator.REQUIRE, 'sources', validate_sources),
-        (Validator.OPTIONAL, 'thumbnail', skip_validate),
-        (Validator.OPTIONAL, 'preview', skip_validate),
-        (Validator.OPTIONAL, 'fee', verify_supported_currency),
-        (Validator.OPTIONAL, 'contact', skip_validate),
-        (Validator.OPTIONAL, 'pubkey', skip_validate),
     ]
 
-    METADATA_REVISIONS[MV002] = [
+    def __init__(self, metadata, migrate=True, target_version=None):
-        (Validator.REQUIRE, 'nsfw', skip_validate),
+        starting_version = metadata.get('ver', '0.0.1')
-        (Validator.REQUIRE, 'ver', skip_validate),
-        (Validator.OPTIONAL, 'license_url', skip_validate),
-    ]
 
-    METADATA_REVISIONS[MV003] = [
+        StructuredDict.__init__(self, metadata, starting_version, migrate, target_version)
-        (Validator.REQUIRE, 'content_type', skip_validate),
-        (Validator.SKIP, 'content-type'),
-        (Validator.OPTIONAL, 'sig', skip_validate),
-        (Validator.IF_KEY, 'sig', (Validator.REQUIRE, 'pubkey', skip_validate), Validator.DO_NOTHING),
-        (Validator.IF_KEY, 'pubkey', (Validator.REQUIRE, 'sig', skip_validate), Validator.DO_NOTHING),
-    ]
-
-    MIGRATE_MV001_TO_MV002 = [
-        (Validator.IF_KEY, 'nsfw', Validator.DO_NOTHING, (Validator.LOAD, 'nsfw', False)),
-        (Validator.IF_KEY, 'ver', Validator.DO_NOTHING, (Validator.LOAD, 'ver', MV002)),
-    ]
-
-    MIGRATE_MV002_TO_MV003 = [
-        (Validator.IF_KEY, 'content-type', (Validator.UPDATE, 'content-type', 'content_type'), Validator.DO_NOTHING),
-        (Validator.IF_VAL, 'ver', MV002, (Validator.LOAD, 'ver', MV003), Validator.DO_NOTHING),
-    ]
-
-    METADATA_MIGRATIONS = [
-        MIGRATE_MV001_TO_MV002,
-        MIGRATE_MV002_TO_MV003,
-    ]
-
-    current_version = CURRENT_METADATA_VERSION
-    versions = METADATA_REVISIONS
-    migrations = METADATA_MIGRATIONS
-
-    def __init__(self, metadata, process_now=True):
-        Validator.__init__(self, metadata, process_now)
-        self.meta_version = self.get('ver', Metadata.MV001)
-        self._load_fee()
-
-    def _load_fee(self):
-        if 'fee' in self:
-            self.update({'fee': FeeValidator(self['fee'])})

lbrynet/metadata/StructuredDict.py

@@ -0,0 +1,62 @@
+import jsonschema
+import logging
+
+from jsonschema import ValidationError
+
+log = logging.getLogger(__name__)
+
+
+class StructuredDict(dict):
+    """
+    A dictionary that enforces a structure specified by a schema, and supports
+    migration between different versions of the schema.
+    """
+
+    # To be specified in sub-classes, an array in the format
+    # [(version, schema, migration), ...]
+    _versions = []
+
+    # Used internally to allow schema lookups by version number
+    _schemas = {}
+
+    version = None
+
+    def __init__(self, value, starting_version, migrate=True, target_version=None):
+        dict.__init__(self, value)
+
+        self.version = starting_version
+        self._schemas = dict([(version, schema) for (version, schema, _) in self._versions])
+
+        self.validate(starting_version)
+
+        if migrate:
+            self.migrate(target_version)
+
+    def _upgrade_version_range(self, start_version, end_version):
+        after_starting_version = False
+        for version, schema, migration in self._versions:
+            if not after_starting_version:
+                if version == self.version:
+                    after_starting_version = True
+                continue
+
+            yield version, schema, migration
+
+            if end_version and version == end_version:
+                break
+
+    def validate(self, version):
+        jsonschema.validate(self, self._schemas[version])
+
+    def migrate(self, target_version=None):
+        if target_version:
+            assert self._versions.index(target_version) > self.versions.index(self.version), "Current version is above target version"
+
+        for version, schema, migration in self._upgrade_version_range(self.version, target_version):
+            migration(self)
+            try:
+                self.validate(version)
+            except ValidationError as e:
+                raise ValidationError, "Could not migrate to version %s due to validation error: %s" % (version, e.message)
+
+            self.version = version

lbrynet/metadata/Validator.py

@@ -1,155 +0,0 @@
-import json
-import logging
-from copy import deepcopy
-from distutils.version import StrictVersion
-from lbrynet.core.utils import version_is_greater_than
-
-log = logging.getLogger(__name__)
-
-
-def skip_validate(value):
-    return True
-
-
-def processor(cls):
-    for methodname in dir(cls):
-        method = getattr(cls, methodname)
-        if hasattr(method, 'cmd_name'):
-            cls.commands.update({method.cmd_name: methodname})
-    return cls
-
-
-def cmd(cmd_name):
-    def wrapper(func):
-        func.cmd_name = cmd_name
-        return func
-    return wrapper
-
-
-@processor
-class Validator(dict):
-    """
-    Base class for validated dictionaries
-    """
-
-    # override these
-    current_version = None
-    versions = {}
-    migrations = []
-
-    # built in commands
-    DO_NOTHING = "do_nothing"
-    UPDATE = "update_key"
-    IF_KEY = "if_key"
-    REQUIRE = "require"
-    SKIP = "skip"
-    OPTIONAL = "optional"
-    LOAD = "load"
-    IF_VAL = "if_val"
-
-    commands = {}
-
-    @classmethod
-    def load_from_hex(cls, hex_val):
-        return cls(json.loads(hex_val.decode('hex')))
-
-    @classmethod
-    def validate(cls, value):
-        if cls(value):
-            return True
-        else:
-            return False
-
-    def __init__(self, value, process_now=False):
-        dict.__init__(self)
-        self._skip = []
-        value_to_load = deepcopy(value)
-        if process_now:
-            self.process(value_to_load)
-        self._verify_value(value_to_load)
-        self.version = self.get('ver', "0.0.1")
-
-    def process(self, value):
-        if self.migrations is not None:
-            self._migrate_value(value)
-
-    @cmd(DO_NOTHING)
-    def _do_nothing(self):
-        pass
-
-    @cmd(SKIP)
-    def _add_to_skipped(self, rx_value, key):
-        if key not in self._skip:
-            self._skip.append(key)
-
-    @cmd(UPDATE)
-    def _update(self, rx_value, old_key, new_key):
-        rx_value.update({new_key: rx_value.pop(old_key)})
-
-    @cmd(IF_KEY)
-    def _if_key(self, rx_value, key, if_true, if_else):
-        if key in rx_value:
-            return self._handle(if_true, rx_value)
-        return self._handle(if_else, rx_value)
-
-    @cmd(IF_VAL)
-    def _if_val(self, rx_value, key, val, if_true, if_else):
-        if key in rx_value:
-            if rx_value[key] == val:
-                return self._handle(if_true, rx_value)
-        return self._handle(if_else, rx_value)
-
-    @cmd(LOAD)
-    def _load(self, rx_value, key, value):
-        rx_value.update({key: value})
-
-    @cmd(REQUIRE)
-    def _require(self, rx_value, key, validator=None):
-        if key not in self._skip:
-            assert key in rx_value, "Key is missing: %s" % key
-            if isinstance(validator, type):
-                assert isinstance(rx_value[key], validator), "%s: %s isn't required %s" % (key, type(rx_value[key]), validator)
-            elif callable(validator):
-                assert validator(rx_value[key]), "Failed to validate %s" % key
-            self.update({key: rx_value.pop(key)})
-
-    @cmd(OPTIONAL)
-    def _optional(self, rx_value, key, validator=None):
-        if key in rx_value and key not in self._skip:
-            if isinstance(validator, type):
-                assert isinstance(rx_value[key], validator), "%s type %s isn't required %s" % (key, type(rx_value[key]), validator)
-            elif callable(validator):
-                assert validator(rx_value[key]), "Failed to validate %s" % key
-            self.update({key: rx_value.pop(key)})
-
-    def _handle(self, cmd_tpl, value):
-        if cmd_tpl == Validator.DO_NOTHING:
-            return
-        command = cmd_tpl[0]
-        f = getattr(self, self.commands[command])
-        if len(cmd_tpl) > 1:
-            args = (value,) + cmd_tpl[1:]
-            f(*args)
-        else:
-            f()
-
-    def _load_revision(self, version, value):
-        for k in self.versions[version]:
-            self._handle(k, value)
-
-    def _verify_value(self, value):
-        val_ver = value.get('ver', "0.0.1")
-        # verify version requirements in reverse order starting from the version asserted in the value
-        versions = sorted([v for v in self.versions if not version_is_greater_than(v, val_ver)], key=StrictVersion, reverse=True)
-        for version in versions:
-            self._load_revision(version, value)
-        assert value == {} or value.keys() == self._skip, "Unknown keys: %s" % json.dumps(value)
-
-    def _migrate_value(self, value):
-        for migration in self.migrations:
-            self._run_migration(migration, value)
-
-    def _run_migration(self, commands, value):
-        for cmd in commands:
-            self._handle(cmd, value)
-

lbrynet/metadata/fee_schemas.py

@@ -0,0 +1,16 @@
+VER_001 = {
+    '$schema': 'http://json-schema.org/draft-04/schema#',
+    'title': 'LBRY fee schema 0.0.1',
+    'type': 'object',
+
+    'properties': {
+        'amount': {
+            'type': 'number',
+            'minimum': 0,
+            'exclusiveMinimum': True,
+        },
+        'address': {
+            'type': 'string'
+        }
+    },
+}

lbrynet/metadata/metadata_schemas.py

@@ -0,0 +1,269 @@
+VER_001 = {
+    '$schema': 'http://json-schema.org/draft-04/schema#',
+    'title': 'LBRY metadata schema 0.0.1',
+    'definitions': {
+        'fee_info': {
+            'type': 'object',
+            'properties': {
+                'amount': {
+                    'type': 'number',
+                    'minimum': 0,
+                    'exclusiveMinimum': True,
+                },
+                'address': {
+                    'type': 'string'
+                }
+            },
+        }
+    },
+    'type': 'object',
+
+    'properties': {
+        'ver': {
+            'type': 'string',
+            'default': '0.0.1'
+        },
+        'title': {
+            'type': 'string'
+        },
+        'description': {
+            'type': 'string'
+        },
+        'author': {
+            'type': 'string'
+        },
+        'language': {
+            'type': 'string'
+        },
+        'license': {
+            'type': 'string'
+        },
+        'content-type': {
+            'type': 'string'
+        },
+        'sources': {
+            'type': 'object',
+            'properties': {
+                'lbry_sd_hash': {
+                    'type': 'string'
+                },
+                'btih': {
+                    'type': 'string'
+                },
+                'url': {
+                    'type': 'string'
+                }
+            },
+            'additionalProperties': False
+        },
+        'thumbnail': {
+            'type': 'string'
+        },
+        'preview': {
+            'type': 'string'
+        },
+        'fee': {
+            'properties': {
+                'LBC': { '$ref': '#/definitions/fee_info' },
+                'BTC': { '$ref': '#/definitions/fee_info' },
+                'USD': { '$ref': '#/definitions/fee_info' }
+            }
+        },
+        'contact': {
+            'type': 'number'
+        },
+        'pubkey': {
+            'type': 'string'
+        },
+    },
+    'required': ['title', 'description', 'author',  'language', 'license', 'content-type', 'sources'],
+    'additionalProperties': False
+}
+
+
+VER_002 = {
+    '$schema': 'http://json-schema.org/draft-04/schema#',
+    'title': 'LBRY metadata schema 0.0.2',
+    'definitions': {
+        'fee_info': {
+            'type': 'object',
+            'properties': {
+                'amount': {
+                    'type': 'number',
+                    'minimum': 0,
+                    'exclusiveMinimum': True,
+                },
+                'address': {
+                    'type': 'string'
+                }
+            },
+        }
+    },
+    'type': 'object',
+
+    'properties': {
+        'ver': {
+            'type': 'string',
+            'enum': ['0.0.2'],
+        },
+        'title': {
+            'type': 'string'
+        },
+        'description': {
+            'type': 'string'
+        },
+        'author': {
+            'type': 'string'
+        },
+        'language': {
+            'type': 'string'
+        },
+        'license': {
+            'type': 'string'
+        },
+        'content-type': {
+            'type': 'string'
+        },
+        'sources': {
+            'type': 'object',
+            'properties': {
+                'lbry_sd_hash': {
+                    'type': 'string'
+                },
+                'btih': {
+                    'type': 'string'
+                },
+                'url': {
+                    'type': 'string'
+                }
+            },
+            'additionalProperties': False
+        },
+        'thumbnail': {
+            'type': 'string'
+        },
+        'preview': {
+            'type': 'string'
+        },
+        'fee': {
+            'properties': {
+                'LBC': { '$ref': '#/definitions/fee_info' },
+                'BTC': { '$ref': '#/definitions/fee_info' },
+                'USD': { '$ref': '#/definitions/fee_info' }
+            }
+        },
+        'contact': {
+            'type': 'number'
+        },
+        'pubkey': {
+            'type': 'string'
+        },
+        'license_url': {
+            'type': 'string'
+        },
+        'nsfw': {
+            'type': 'boolean',
+            'default': False
+        },
+
+    },
+    'required': ['ver', 'title', 'description', 'author',  'language', 'license', 'content-type', 'sources', 'nsfw'],
+    'additionalProperties': False
+}
+
+
+VER_003 = {
+    '$schema': 'http://json-schema.org/draft-04/schema#',
+    'title': 'LBRY metadata schema 0.0.3',
+    'definitions': {
+        'fee_info': {
+            'type': 'object',
+            'properties': {
+                'amount': {
+                    'type': 'number',
+                    'minimum': 0,
+                    'exclusiveMinimum': True,
+                },
+                'address': {
+                    'type': 'string'
+                }
+            },
+        }
+    },
+    'type': 'object',
+
+    'properties': {
+        'ver': {
+            'type': 'string',
+            'enum': ['0.0.3'],
+        },
+        'title': {
+            'type': 'string'
+        },
+        'description': {
+            'type': 'string'
+        },
+        'author': {
+            'type': 'string'
+        },
+        'language': {
+            'type': 'string'
+        },
+        'license': {
+            'type': 'string'
+        },
+        'content_type': {
+            'type': 'string'
+        },
+        'sources': {
+            'type': 'object',
+            'properties': {
+                'lbry_sd_hash': {
+                    'type': 'string'
+                },
+                'btih': {
+                    'type': 'string'
+                },
+                'url': {
+                    'type': 'string'
+                }
+            },
+            'additionalProperties': False
+        },
+        'thumbnail': {
+            'type': 'string'
+        },
+        'preview': {
+            'type': 'string'
+        },
+        'fee': {
+            'properties': {
+                'LBC': { '$ref': '#/definitions/fee_info' },
+                'BTC': { '$ref': '#/definitions/fee_info' },
+                'USD': { '$ref': '#/definitions/fee_info' }
+            }
+        },
+        'contact': {
+            'type': 'number'
+        },
+        'pubkey': {
+            'type': 'string'
+        },
+        'license_url': {
+            'type': 'string'
+        },
+        'nsfw': {
+            'type': 'boolean',
+            'default': False
+        },
+        'sig': {
+            'type': 'string'
+        }
+    },
+    'required': ['ver', 'title', 'description', 'author',  'language', 'license', 'content_type', 'sources', 'nsfw'],
+    'additionalProperties': False,
+    'dependencies': {
+        'pubkey': ['sig'],
+        'sig': ['pubkey']
+    }
+}

packaging/ubuntu/lbry.desktop

@@ -1,5 +1,5 @@
 [Desktop Entry]
-Version=0.6.3
+Version=0.6.4
 Name=LBRY
 Comment=The world's first user-owned content marketplace
 Icon=lbry

requirements.txt

@@ -8,6 +8,7 @@ ecdsa==0.13
 gmpy==1.17
 jsonrpc==1.2
 jsonrpclib==0.1.7
+jsonschema==2.5.1
 https://github.com/lbryio/lbryum/tarball/master/#egg=lbryum
 loggly-python-handler==1.0.0
 miniupnpc==1.9

setup.py

@@ -40,6 +40,7 @@ requires = [
     'lbryum',
     'jsonrpc',
     'simplejson',
+    'jsonschema',
     'appdirs',
     'six==1.9.0',
     'base58',

tests/functional/test_misc.py

@@ -13,13 +13,10 @@ from Crypto.Hash import MD5
 from lbrynet.conf import MIN_BLOB_DATA_PAYMENT_RATE
 from lbrynet.conf import MIN_BLOB_INFO_PAYMENT_RATE
 from lbrynet.lbrylive.LiveStreamCreator import FileLiveStreamCreator
-from lbrynet.lbrylive.PaymentRateManager import BaseLiveStreamPaymentRateManager
-from lbrynet.lbrylive.PaymentRateManager import LiveStreamPaymentRateManager
 from lbrynet.lbrylive.LiveStreamMetadataManager import DBLiveStreamMetadataManager
 from lbrynet.lbrylive.LiveStreamMetadataManager import TempLiveStreamMetadataManager
 from lbrynet.lbryfile.EncryptedFileMetadataManager import TempEncryptedFileMetadataManager, DBEncryptedFileMetadataManager
 from lbrynet.lbryfilemanager.EncryptedFileManager import EncryptedFileManager
-from lbrynet.core.PaymentRateManager import PaymentRateManager
 from lbrynet.core.PTCWallet import PointTraderKeyQueryHandlerFactory, PointTraderKeyExchanger
 from lbrynet.core.Session import Session
 from lbrynet.core.client.StandaloneBlobDownloader import StandaloneBlobDownloader
@@ -29,22 +26,19 @@ from lbrynet.core.StreamDescriptor import download_sd_blob
 from lbrynet.lbryfilemanager.EncryptedFileCreator import create_lbry_file
 from lbrynet.lbryfile.client.EncryptedFileOptions import add_lbry_file_to_sd_identifier
 from lbrynet.lbryfile.StreamDescriptor import get_sd_info
-from twisted.internet import defer, threads, task, error
+from twisted.internet import defer, threads, task
 from twisted.trial.unittest import TestCase
 from twisted.python.failure import Failure
 import os
+from lbrynet.dht.node import Node
+from tests.mocks import DummyBlobAvailabilityTracker
 from lbrynet.core.PeerManager import PeerManager
 from lbrynet.core.RateLimiter import DummyRateLimiter, RateLimiter
-from lbrynet.core.server.BlobAvailabilityHandler import BlobAvailabilityHandlerFactory
 from lbrynet.core.server.BlobRequestHandler import BlobRequestHandlerFactory
 from lbrynet.core.server.ServerProtocol import ServerProtocolFactory
 from lbrynet.lbrylive.server.LiveBlobInfoQueryHandler import CryptBlobInfoQueryHandlerFactory
 from lbrynet.lbrylive.client.LiveStreamOptions import add_live_stream_to_sd_identifier
 from lbrynet.lbrylive.client.LiveStreamDownloader import add_full_live_stream_downloader_to_sd_identifier
-from lbrynet.core.BlobManager import TempBlobManager
-from lbrynet.reflector.client.client import EncryptedFileReflectorClientFactory
-from lbrynet.reflector.server.server import ReflectorServerFactory
-from lbrynet.lbryfile.StreamDescriptor import publish_sd_blob
 
 
 log_format = "%(funcName)s(): %(message)s"
@@ -106,6 +100,9 @@ class FakeWallet(object):
     def set_public_key_for_peer(self, peer, public_key):
         pass
 
+    def get_claim_metadata_for_sd_hash(self, sd_hash):
+        return "fakeuri", "faketxid"
+
 
 class FakePeerFinder(object):
     def __init__(self, start_port, peer_manager, num_peers):
@@ -212,15 +209,11 @@ test_create_stream_sd_file = {
 
 
 def start_lbry_uploader(sd_hash_queue, kill_event, dead_event, file_size, ul_rate_limit=None):
-
+    if sys.platform.startswith("linux"):
         sys.modules = sys.modules.copy()
-
         del sys.modules['twisted.internet.reactor']
-
         import twisted.internet
-
         twisted.internet.reactor = twisted.internet.epollreactor.EPollReactor()
-
         sys.modules['twisted.internet.reactor'] = twisted.internet.reactor
 
     from twisted.internet import reactor
@@ -239,12 +232,14 @@ def start_lbry_uploader(sd_hash_queue, kill_event, dead_event, file_size, ul_rat
     rate_limiter = RateLimiter()
     sd_identifier = StreamDescriptorIdentifier()
 
+
     db_dir = "server"
     os.mkdir(db_dir)
 
     session = Session(MIN_BLOB_DATA_PAYMENT_RATE, db_dir=db_dir, lbryid="abcd",
                           peer_finder=peer_finder, hash_announcer=hash_announcer, peer_port=5553,
-                          use_upnp=False, rate_limiter=rate_limiter, wallet=wallet)
+                          use_upnp=False, rate_limiter=rate_limiter, wallet=wallet, blob_tracker_class=DummyBlobAvailabilityTracker,
+                          dht_node_class=Node)
 
     stream_info_manager = TempEncryptedFileMetadataManager()
 
@@ -274,9 +269,8 @@ def start_lbry_uploader(sd_hash_queue, kill_event, dead_event, file_size, ul_rat
         server_port = None
 
         query_handler_factories = {
-            BlobAvailabilityHandlerFactory(session.blob_manager): True,
             BlobRequestHandlerFactory(session.blob_manager, session.wallet,
-                                      PaymentRateManager(session.base_payment_rate_manager)): True,
+                                      session.payment_rate_manager): True,
             session.wallet.get_wallet_info_query_handler_factory(): True,
         }
 
@@ -322,19 +316,17 @@ def start_lbry_uploader(sd_hash_queue, kill_event, dead_event, file_size, ul_rat
         sd_hash_queue.put(sd_hash)
 
     reactor.callLater(1, start_all)
+    if not reactor.running:
         reactor.run()
 
 
 def start_lbry_reuploader(sd_hash, kill_event, dead_event, ready_event, n, ul_rate_limit=None):
 
+    if sys.platform.startswith("linux"):
         sys.modules = sys.modules.copy()
-
         del sys.modules['twisted.internet.reactor']
-
         import twisted.internet
-
         twisted.internet.reactor = twisted.internet.epollreactor.EPollReactor()
-
         sys.modules['twisted.internet.reactor'] = twisted.internet.reactor
 
     from twisted.internet import reactor
@@ -362,7 +354,7 @@ def start_lbry_reuploader(sd_hash, kill_event, dead_event, ready_event, n, ul_ra
     session = Session(MIN_BLOB_DATA_PAYMENT_RATE, db_dir=db_dir, lbryid="abcd" + str(n),
                           peer_finder=peer_finder, hash_announcer=hash_announcer,
                           blob_dir=None, peer_port=peer_port,
-                          use_upnp=False, rate_limiter=rate_limiter, wallet=wallet)
+                          use_upnp=False, rate_limiter=rate_limiter, wallet=wallet, blob_tracker_class=DummyBlobAvailabilityTracker)
 
     stream_info_manager = TempEncryptedFileMetadataManager()
 
@@ -379,7 +371,7 @@ def start_lbry_reuploader(sd_hash, kill_event, dead_event, ready_event, n, ul_ra
         return factories[0].make_downloader(metadata, chosen_options, prm)
 
     def download_file():
-        prm = PaymentRateManager(session.base_payment_rate_manager)
+        prm = session.payment_rate_manager
         d = download_sd_blob(session, sd_hash, prm)
         d.addCallback(sd_identifier.get_metadata_for_sd_blob)
         d.addCallback(make_downloader, prm)
@@ -402,9 +394,8 @@ def start_lbry_reuploader(sd_hash, kill_event, dead_event, ready_event, n, ul_ra
         server_port = None
 
         query_handler_factories = {
-            BlobAvailabilityHandlerFactory(session.blob_manager): True,
             BlobRequestHandlerFactory(session.blob_manager, session.wallet,
-                                      PaymentRateManager(session.base_payment_rate_manager)): True,
+                                      session.payment_rate_manager): True,
             session.wallet.get_wallet_info_query_handler_factory(): True,
         }
 
@@ -438,20 +429,17 @@ def start_lbry_reuploader(sd_hash, kill_event, dead_event, ready_event, n, ul_ra
 
     d = task.deferLater(reactor, 1.0, start_transfer)
     d.addCallback(lambda _: start_server())
-
+    if not reactor.running:
         reactor.run()
 
 
 def start_live_server(sd_hash_queue, kill_event, dead_event):
 
+    if sys.platform.startswith("linux"):
         sys.modules = sys.modules.copy()
-
         del sys.modules['twisted.internet.reactor']
-
         import twisted.internet
-
         twisted.internet.reactor = twisted.internet.epollreactor.EPollReactor()
-
         sys.modules['twisted.internet.reactor'] = twisted.internet.reactor
 
     from twisted.internet import reactor
@@ -470,18 +458,14 @@ def start_live_server(sd_hash_queue, kill_event, dead_event):
     rate_limiter = DummyRateLimiter()
     sd_identifier = StreamDescriptorIdentifier()
 
+
     db_dir = "server"
     os.mkdir(db_dir)
 
     session = Session(MIN_BLOB_DATA_PAYMENT_RATE, db_dir=db_dir, lbryid="abcd",
                       peer_finder=peer_finder, hash_announcer=hash_announcer, peer_port=5553,
-                          use_upnp=False, rate_limiter=rate_limiter, wallet=wallet)
+                      use_upnp=False, rate_limiter=rate_limiter, wallet=wallet,
-
+                      blob_tracker_class=DummyBlobAvailabilityTracker)
-    base_payment_rate_manager = BaseLiveStreamPaymentRateManager(MIN_BLOB_INFO_PAYMENT_RATE)
-    data_payment_rate_manager = PaymentRateManager(session.base_payment_rate_manager)
-    payment_rate_manager = LiveStreamPaymentRateManager(base_payment_rate_manager,
-                                                        data_payment_rate_manager)
-
     stream_info_manager = DBLiveStreamMetadataManager(session.db_dir, hash_announcer)
 
     logging.debug("Created the session")
@@ -492,10 +476,9 @@ def start_live_server(sd_hash_queue, kill_event, dead_event):
         logging.debug("Starting the server protocol")
         query_handler_factories = {
             CryptBlobInfoQueryHandlerFactory(stream_info_manager, session.wallet,
-                                             payment_rate_manager): True,
+                                             session.payment_rate_manager): True,
-            BlobAvailabilityHandlerFactory(session.blob_manager): True,
             BlobRequestHandlerFactory(session.blob_manager, session.wallet,
-                                      payment_rate_manager): True,
+                                      session.payment_rate_manager): True,
             session.wallet.get_wallet_info_query_handler_factory(): True,
         }
 
@@ -563,12 +546,9 @@ def start_live_server(sd_hash_queue, kill_event, dead_event):
         return d
 
     def enable_live_stream():
-        base_live_stream_payment_rate_manager = BaseLiveStreamPaymentRateManager(
+        add_live_stream_to_sd_identifier(sd_identifier, session.base_payment_rate_manager)
-            MIN_BLOB_INFO_PAYMENT_RATE
-        )
-        add_live_stream_to_sd_identifier(sd_identifier, base_live_stream_payment_rate_manager)
         add_full_live_stream_downloader_to_sd_identifier(session, stream_info_manager, sd_identifier,
-                                                         base_live_stream_payment_rate_manager)
+                                                         session.base_payment_rate_manager)
 
     def run_server():
         d = session.setup()
@@ -581,19 +561,17 @@ def start_live_server(sd_hash_queue, kill_event, dead_event):
         return d
 
     reactor.callLater(1, run_server)
+    if not reactor.running:
         reactor.run()
 
 
 def start_blob_uploader(blob_hash_queue, kill_event, dead_event, slow):
 
+    if sys.platform.startswith("linux"):
         sys.modules = sys.modules.copy()
-
         del sys.modules['twisted.internet.reactor']
-
         import twisted.internet
-
         twisted.internet.reactor = twisted.internet.epollreactor.EPollReactor()
-
         sys.modules['twisted.internet.reactor'] = twisted.internet.reactor
 
     from twisted.internet import reactor
@@ -621,7 +599,7 @@ def start_blob_uploader(blob_hash_queue, kill_event, dead_event, slow):
     session = Session(MIN_BLOB_DATA_PAYMENT_RATE, db_dir=db_dir, lbryid="efgh",
                           peer_finder=peer_finder, hash_announcer=hash_announcer,
                           blob_dir=blob_dir, peer_port=peer_port,
-                          use_upnp=False, rate_limiter=rate_limiter, wallet=wallet)
+                          use_upnp=False, rate_limiter=rate_limiter, wallet=wallet, blob_tracker_class=DummyBlobAvailabilityTracker)
 
     if slow is True:
         session.rate_limiter.set_ul_limit(2**11)
@@ -643,9 +621,7 @@ def start_blob_uploader(blob_hash_queue, kill_event, dead_event, slow):
         server_port = None
 
         query_handler_factories = {
-            BlobAvailabilityHandlerFactory(session.blob_manager): True,
+            BlobRequestHandlerFactory(session.blob_manager, session.wallet, session.payment_rate_manager): True,
-            BlobRequestHandlerFactory(session.blob_manager, session.wallet,
-                                      PaymentRateManager(session.base_payment_rate_manager)): True,
             session.wallet.get_wallet_info_query_handler_factory(): True,
         }
 
@@ -686,6 +662,7 @@ def start_blob_uploader(blob_hash_queue, kill_event, dead_event, slow):
         logging.debug("blob hash has been added to the queue")
 
     reactor.callLater(1, start_all)
+    if not reactor.running:
         reactor.run()
 
 
@@ -768,7 +745,6 @@ class TestTransfer(TestCase):
 
         return d
 
-    @unittest.skip("Sadly skipping failing test instead of fixing it")
     def test_lbry_transfer(self):
         sd_hash_queue = Queue()
         kill_event = Event()
@@ -786,6 +762,7 @@ class TestTransfer(TestCase):
         rate_limiter = DummyRateLimiter()
         sd_identifier = StreamDescriptorIdentifier()
 
+
         db_dir = "client"
         blob_dir = os.path.join(db_dir, "blobfiles")
         os.mkdir(db_dir)
@@ -794,7 +771,8 @@ class TestTransfer(TestCase):
         self.session = Session(MIN_BLOB_DATA_PAYMENT_RATE, db_dir=db_dir, lbryid="abcd",
                                    peer_finder=peer_finder, hash_announcer=hash_announcer,
                                    blob_dir=blob_dir, peer_port=5553,
-                                   use_upnp=False, rate_limiter=rate_limiter, wallet=wallet)
+                                   use_upnp=False, rate_limiter=rate_limiter, wallet=wallet, blob_tracker_class=DummyBlobAvailabilityTracker,
+                                   dht_node_class=Node)
 
         self.stream_info_manager = TempEncryptedFileMetadataManager()
 
@@ -808,7 +786,7 @@ class TestTransfer(TestCase):
             return factories[0].make_downloader(metadata, chosen_options, prm)
 
         def download_file(sd_hash):
-            prm = PaymentRateManager(self.session.base_payment_rate_manager)
+            prm = self.session.payment_rate_manager
             d = download_sd_blob(self.session, sd_hash, prm)
             d.addCallback(sd_identifier.get_metadata_for_sd_blob)
             d.addCallback(make_downloader, prm)
@@ -855,7 +833,7 @@ class TestTransfer(TestCase):
 
         return d
 
-    @require_system('Linux')
+    @unittest.skip("Sadly skipping failing test instead of fixing it")
     def test_live_transfer(self):
 
         sd_hash_queue = Queue()
@@ -878,7 +856,8 @@ class TestTransfer(TestCase):
 
         self.session = Session(MIN_BLOB_DATA_PAYMENT_RATE, db_dir=db_dir, lbryid="abcd",
                                    peer_finder=peer_finder, hash_announcer=hash_announcer, blob_dir=None,
-                                   peer_port=5553, use_upnp=False, rate_limiter=rate_limiter, wallet=wallet)
+                                   peer_port=5553, use_upnp=False, rate_limiter=rate_limiter, wallet=wallet,
+                                   blob_tracker_class=DummyBlobAvailabilityTracker, dht_node_class=Node)
 
         self.stream_info_manager = TempLiveStreamMetadataManager(hash_announcer)
 
@@ -893,12 +872,10 @@ class TestTransfer(TestCase):
 
         def start_lbry_file(lbry_file):
             lbry_file = lbry_file
-            logging.debug("Calling lbry_file.start()")
             return lbry_file.start()
 
         def download_stream(sd_blob_hash):
-            logging.debug("Downloaded the sd blob. Reading it now")
+            prm = self.session.payment_rate_manager
-            prm = PaymentRateManager(self.session.base_payment_rate_manager)
             d = download_sd_blob(self.session, sd_blob_hash, prm)
             d.addCallback(sd_identifier.get_metadata_for_sd_blob)
             d.addCallback(create_downloader, prm)
@@ -907,20 +884,17 @@ class TestTransfer(TestCase):
 
         def do_download(sd_blob_hash):
             logging.debug("Starting the download")
+
             d = self.session.setup()
             d.addCallback(lambda _: enable_live_stream())
             d.addCallback(lambda _: download_stream(sd_blob_hash))
             return d
 
         def enable_live_stream():
-            base_live_stream_payment_rate_manager = BaseLiveStreamPaymentRateManager(
+            add_live_stream_to_sd_identifier(sd_identifier, self.session.payment_rate_manager)
-                MIN_BLOB_INFO_PAYMENT_RATE
-            )
-            add_live_stream_to_sd_identifier(sd_identifier,
-                                             base_live_stream_payment_rate_manager)
             add_full_live_stream_downloader_to_sd_identifier(self.session, self.stream_info_manager,
                                                              sd_identifier,
-                                                             base_live_stream_payment_rate_manager)
+                                                             self.session.payment_rate_manager)
 
         d.addCallback(do_download)
 
@@ -951,7 +925,6 @@ class TestTransfer(TestCase):
         d.addBoth(stop)
         return d
 
-    @require_system('Linux')
     def test_last_blob_retrieval(self):
 
         kill_event = Event()
@@ -976,6 +949,7 @@ class TestTransfer(TestCase):
         hash_announcer = FakeAnnouncer()
         rate_limiter = DummyRateLimiter()
 
+
         db_dir = "client"
         blob_dir = os.path.join(db_dir, "blobfiles")
         os.mkdir(db_dir)
@@ -984,7 +958,7 @@ class TestTransfer(TestCase):
         self.session = Session(MIN_BLOB_DATA_PAYMENT_RATE, db_dir=db_dir, lbryid="abcd",
                                    peer_finder=peer_finder, hash_announcer=hash_announcer,
                                    blob_dir=blob_dir, peer_port=5553,
-                                   use_upnp=False, rate_limiter=rate_limiter, wallet=wallet)
+                                   use_upnp=False, rate_limiter=rate_limiter, wallet=wallet, blob_tracker_class=DummyBlobAvailabilityTracker)
 
         d1 = self.wait_for_hash_from_queue(blob_hash_queue_1)
         d2 = self.wait_for_hash_from_queue(blob_hash_queue_2)
@@ -997,7 +971,7 @@ class TestTransfer(TestCase):
         d.addCallback(get_blob_hash)
 
         def download_blob(blob_hash):
-            prm = PaymentRateManager(self.session.base_payment_rate_manager)
+            prm = self.session.payment_rate_manager
             downloader = StandaloneBlobDownloader(blob_hash, self.session.blob_manager, peer_finder,
                                                   rate_limiter, prm, wallet)
             d = downloader.download()
@@ -1036,7 +1010,6 @@ class TestTransfer(TestCase):
 
         return d
 
-    @unittest.skip("Sadly skipping failing test instead of fixing it")
     def test_double_download(self):
         sd_hash_queue = Queue()
         kill_event = Event()
@@ -1054,6 +1027,7 @@ class TestTransfer(TestCase):
         rate_limiter = DummyRateLimiter()
         sd_identifier = StreamDescriptorIdentifier()
 
+
         downloaders = []
 
         db_dir = "client"
@@ -1064,10 +1038,9 @@ class TestTransfer(TestCase):
         self.session = Session(MIN_BLOB_DATA_PAYMENT_RATE, db_dir=db_dir, lbryid="abcd",
                                    peer_finder=peer_finder, hash_announcer=hash_announcer,
                                    blob_dir=blob_dir, peer_port=5553, use_upnp=False,
-                                   rate_limiter=rate_limiter, wallet=wallet)
+                                   rate_limiter=rate_limiter, wallet=wallet, blob_tracker_class=DummyBlobAvailabilityTracker)
 
         self.stream_info_manager = DBEncryptedFileMetadataManager(self.session.db_dir)
-
         self.lbry_file_manager = EncryptedFileManager(self.session, self.stream_info_manager, sd_identifier)
 
         def make_downloader(metadata, prm):
@@ -1082,7 +1055,7 @@ class TestTransfer(TestCase):
             return downloader
 
         def download_file(sd_hash):
-            prm = PaymentRateManager(self.session.base_payment_rate_manager)
+            prm = self.session.payment_rate_manager
             d = download_sd_blob(self.session, sd_hash, prm)
             d.addCallback(sd_identifier.get_metadata_for_sd_blob)
             d.addCallback(make_downloader, prm)
@@ -1115,7 +1088,6 @@ class TestTransfer(TestCase):
             return d
 
         def start_transfer(sd_hash):
-
             logging.debug("Starting the transfer")
 
             d = self.session.setup()
@@ -1172,6 +1144,7 @@ class TestTransfer(TestCase):
         rate_limiter = DummyRateLimiter()
         sd_identifier = StreamDescriptorIdentifier()
 
+
         db_dir = "client"
         blob_dir = os.path.join(db_dir, "blobfiles")
         os.mkdir(db_dir)
@@ -1180,7 +1153,7 @@ class TestTransfer(TestCase):
         self.session = Session(MIN_BLOB_DATA_PAYMENT_RATE, db_dir=db_dir, lbryid="abcd",
                                    peer_finder=peer_finder, hash_announcer=hash_announcer,
                                    blob_dir=None, peer_port=5553,
-                                   use_upnp=False, rate_limiter=rate_limiter, wallet=wallet)
+                                   use_upnp=False, rate_limiter=rate_limiter, wallet=wallet, blob_tracker_class=DummyBlobAvailabilityTracker)
 
         self.stream_info_manager = TempEncryptedFileMetadataManager()
 
@@ -1205,7 +1178,7 @@ class TestTransfer(TestCase):
             return factories[0].make_downloader(metadata, chosen_options, prm)
 
         def download_file(sd_hash):
-            prm = PaymentRateManager(self.session.base_payment_rate_manager)
+            prm = self.session.payment_rate_manager
             d = download_sd_blob(self.session, sd_hash, prm)
             d.addCallback(sd_identifier.get_metadata_for_sd_blob)
             d.addCallback(make_downloader, prm)
@@ -1290,6 +1263,7 @@ class TestStreamify(TestCase):
         rate_limiter = DummyRateLimiter()
         sd_identifier = StreamDescriptorIdentifier()
 
+
         db_dir = "client"
         blob_dir = os.path.join(db_dir, "blobfiles")
         os.mkdir(db_dir)
@@ -1298,7 +1272,7 @@ class TestStreamify(TestCase):
         self.session = Session(MIN_BLOB_DATA_PAYMENT_RATE, db_dir=db_dir, lbryid="abcd",
                                    peer_finder=peer_finder, hash_announcer=hash_announcer,
                                    blob_dir=blob_dir, peer_port=5553,
-                                   use_upnp=False, rate_limiter=rate_limiter, wallet=wallet)
+                                   use_upnp=False, rate_limiter=rate_limiter, wallet=wallet, blob_tracker_class=DummyBlobAvailabilityTracker)
 
         self.stream_info_manager = TempEncryptedFileMetadataManager()
 
@@ -1342,6 +1316,7 @@ class TestStreamify(TestCase):
         rate_limiter = DummyRateLimiter()
         sd_identifier = StreamDescriptorIdentifier()
 
+
         db_dir = "client"
         blob_dir = os.path.join(db_dir, "blobfiles")
         os.mkdir(db_dir)
@@ -1350,7 +1325,7 @@ class TestStreamify(TestCase):
         self.session = Session(MIN_BLOB_DATA_PAYMENT_RATE, db_dir=db_dir, lbryid="abcd",
                                    peer_finder=peer_finder, hash_announcer=hash_announcer,
                                    blob_dir=blob_dir, peer_port=5553,
-                                   use_upnp=False, rate_limiter=rate_limiter, wallet=wallet)
+                                   use_upnp=False, rate_limiter=rate_limiter, wallet=wallet, blob_tracker_class=DummyBlobAvailabilityTracker)
 
         self.stream_info_manager = DBEncryptedFileMetadataManager(self.session.db_dir)
 
@@ -1363,7 +1338,7 @@ class TestStreamify(TestCase):
 
         def combine_stream(stream_hash):
 
-            prm = PaymentRateManager(self.session.base_payment_rate_manager)
+            prm = self.session.payment_rate_manager
             d = self.lbry_file_manager.add_lbry_file(stream_hash, prm)
             d.addCallback(start_lbry_file)
 

tests/functional/test_reflector.py

@@ -12,6 +12,7 @@ from lbrynet.core import PeerManager
 from lbrynet.core import RateLimiter
 from lbrynet.core import Session
 from lbrynet.core import StreamDescriptor
+from lbrynet.dht.node import Node
 from lbrynet.lbryfile import EncryptedFileMetadataManager
 from lbrynet.lbryfile.client import EncryptedFileOptions
 from lbrynet.lbryfilemanager import EncryptedFileCreator
@@ -91,7 +92,9 @@ class TestReflector(unittest.TestCase):
             peer_port=5553,
             use_upnp=False,
             rate_limiter=rate_limiter,
-            wallet=wallet
+            wallet=wallet,
+            blob_tracker_class=mocks.DummyBlobAvailabilityTracker,
+            dht_node_class=Node
         )
 
         self.stream_info_manager = EncryptedFileMetadataManager.TempEncryptedFileMetadataManager()

tests/mocks.py

@@ -1,9 +1,11 @@
 import io
 
 from Crypto.PublicKey import RSA
+from decimal import Decimal
 from twisted.internet import defer, threads, task, error
 
 from lbrynet.core import PTCWallet
+from lbrynet.core.BlobAvailability import BlobAvailabilityTracker
 
 
 class Node(object):
@@ -134,6 +136,43 @@ class GenFile(io.RawIOBase):
         return output
 
 
+class DummyBlobAvailabilityTracker(BlobAvailabilityTracker):
+    """
+    Class to track peer counts for known blobs, and to discover new popular blobs
+
+    Attributes:
+        availability (dict): dictionary of peers for known blobs
+    """
+
+    def __init__(self, blob_manager=None, peer_finder=None, dht_node=None):
+        self.availability = {
+            '91dc64cf1ff42e20d627b033ad5e4c3a4a96856ed8a6e3fb4cd5fa1cfba4bf72eefd325f579db92f45f4355550ace8e7': ['1.2.3.4'],
+            'b2e48bb4c88cf46b76adf0d47a72389fae0cd1f19ed27dc509138c99509a25423a4cef788d571dca7988e1dca69e6fa0': ['1.2.3.4', '1.2.3.4'],
+            '6af95cd062b4a179576997ef1054c9d2120f8592eea045e9667bea411d520262cd5a47b137eabb7a7871f5f8a79c92dd': ['1.2.3.4', '1.2.3.4', '1.2.3.4'],
+            '6d8017aba362e5c5d0046625a039513419810a0397d728318c328a5cc5d96efb589fbca0728e54fe5adbf87e9545ee07': ['1.2.3.4', '1.2.3.4', '1.2.3.4', '1.2.3.4'],
+            '5a450b416275da4bdff604ee7b58eaedc7913c5005b7184fc3bc5ef0b1add00613587f54217c91097fc039ed9eace9dd': ['1.2.3.4', '1.2.3.4', '1.2.3.4', '1.2.3.4', '1.2.3.4'],
+            'd7c82e6cac093b3f16107d2ae2b2c75424f1fcad2c7fbdbe66e4a13c0b6bd27b67b3a29c403b82279ab0f7c1c48d6787': ['1.2.3.4', '1.2.3.4', '1.2.3.4', '1.2.3.4', '1.2.3.4', '1.2.3.4'],
+            '9dbda74a472a2e5861a5d18197aeba0f5de67c67e401124c243d2f0f41edf01d7a26aeb0b5fc9bf47f6361e0f0968e2c': ['1.2.3.4', '1.2.3.4', '1.2.3.4', '1.2.3.4', '1.2.3.4', '1.2.3.4', '1.2.3.4'],
+            '8c70d5e2f5c3a6085006198e5192d157a125d92e7378794472007a61947992768926513fc10924785bdb1761df3c37e6': ['1.2.3.4', '1.2.3.4', '1.2.3.4', '1.2.3.4', '1.2.3.4', '1.2.3.4', '1.2.3.4', '1.2.3.4'],
+            'f99d24cd50d4bfd77c2598bfbeeb8415bf0feef21200bdf0b8fbbde7751a77b7a2c68e09c25465a2f40fba8eecb0b4e0': ['1.2.3.4', '1.2.3.4', '1.2.3.4', '1.2.3.4', '1.2.3.4', '1.2.3.4', '1.2.3.4', '1.2.3.4', '1.2.3.4'],
+            'c84aa1fd8f5009f7c4e71e444e40d95610abc1480834f835eefb267287aeb10025880a3ce22580db8c6d92efb5bc0c9c': ['1.2.3.4', '1.2.3.4', '1.2.3.4', '1.2.3.4', '1.2.3.4', '1.2.3.4', '1.2.3.4', '1.2.3.4', '1.2.3.4', '1.2.3.4'],
+        }
+        self.last_mean_availability = Decimal(0.0)
+        self._blob_manager = None
+        self._peer_finder = PeerFinder(11223, 11224, 2)
+        self._dht_node = None
+        self._check_popular = None
+        self._check_mine = None
+        self._get_mean_peers()
+
+    def start(self):
+        pass
+
+    def stop(self):
+        pass
+
+
+
 create_stream_sd_file = {
     'stream_name': '746573745f66696c65',
     'blobs': [

tests/unit/core/server/test_BlobRequestHandler.py

@@ -1,24 +1,24 @@
 import StringIO
 
 import mock
-from twisted.internet import defer, protocol
+from twisted.internet import defer
 from twisted.test import proto_helpers
 from twisted.trial import unittest
 
 from lbrynet.core import Peer
 from lbrynet.core.server import BlobRequestHandler
+from lbrynet.core.PaymentRateManager import NegotiatedPaymentRateManager, BasePaymentRateManager
+from tests.mocks import DummyBlobAvailabilityTracker
 
 
 class TestBlobRequestHandlerQueries(unittest.TestCase):
     def setUp(self):
         self.blob_manager = mock.Mock()
-        self.payment_rate_manager = mock.Mock()
+        self.payment_rate_manager = NegotiatedPaymentRateManager(BasePaymentRateManager(0.001), DummyBlobAvailabilityTracker())
-        self.handler = BlobRequestHandler.BlobRequestHandler(
+        self.handler = BlobRequestHandler.BlobRequestHandler(self.blob_manager, None, self.payment_rate_manager)
-            self.blob_manager, None, self.payment_rate_manager)
 
     def test_empty_response_when_empty_query(self):
-        self.assertEqual(
+        self.assertEqual({}, self.successResultOf(self.handler.handle_queries({})))
-            {}, self.successResultOf(self.handler.handle_queries({})))
 
     def test_error_set_when_rate_is_missing(self):
         query = {'requested_blob': 'blob'}
@@ -27,9 +27,8 @@ class TestBlobRequestHandlerQueries(unittest.TestCase):
         self.assertEqual(response, self.successResultOf(deferred))
 
     def test_error_set_when_rate_too_low(self):
-        self.payment_rate_manager.accept_rate_blob_data.return_value = False
         query = {
-            'blob_data_payment_rate': 'way_too_low',
+            'blob_data_payment_rate': '-1.0',
             'requested_blob': 'blob'
         }
         deferred = self.handler.handle_queries(query)
@@ -40,9 +39,8 @@ class TestBlobRequestHandlerQueries(unittest.TestCase):
         self.assertEqual(response, self.successResultOf(deferred))
 
     def test_response_when_rate_too_low(self):
-        self.payment_rate_manager.accept_rate_blob_data.return_value = False
         query = {
-            'blob_data_payment_rate': 'way_too_low',
+            'blob_data_payment_rate': '-1.0',
         }
         deferred = self.handler.handle_queries(query)
         response = {
@@ -51,12 +49,11 @@ class TestBlobRequestHandlerQueries(unittest.TestCase):
         self.assertEqual(response, self.successResultOf(deferred))
 
     def test_blob_unavailable_when_blob_not_validated(self):
-        self.payment_rate_manager.accept_rate_blob_data.return_value = True
         blob = mock.Mock()
         blob.is_validated.return_value = False
         self.blob_manager.get_blob.return_value = defer.succeed(blob)
         query = {
-            'blob_data_payment_rate': 'rate',
+            'blob_data_payment_rate': 1.0,
             'requested_blob': 'blob'
         }
         deferred = self.handler.handle_queries(query)
@@ -67,13 +64,12 @@ class TestBlobRequestHandlerQueries(unittest.TestCase):
         self.assertEqual(response, self.successResultOf(deferred))
 
     def test_blob_unavailable_when_blob_cannot_be_opened(self):
-        self.payment_rate_manager.accept_rate_blob_data.return_value = True
         blob = mock.Mock()
         blob.is_validated.return_value = True
         blob.open_for_reading.return_value = None
         self.blob_manager.get_blob.return_value = defer.succeed(blob)
         query = {
-            'blob_data_payment_rate': 'rate',
+            'blob_data_payment_rate': 0.0,
             'requested_blob': 'blob'
         }
         deferred = self.handler.handle_queries(query)
@@ -84,15 +80,17 @@ class TestBlobRequestHandlerQueries(unittest.TestCase):
         self.assertEqual(response, self.successResultOf(deferred))
 
     def test_blob_details_are_set_when_all_conditions_are_met(self):
-        self.payment_rate_manager.accept_rate_blob_data.return_value = True
         blob = mock.Mock()
         blob.is_validated.return_value = True
         blob.open_for_reading.return_value = True
         blob.blob_hash = 'DEADBEEF'
         blob.length = 42
+        peer = mock.Mock()
+        peer.host = "1.2.3.4"
+        self.handler.peer = peer
         self.blob_manager.get_blob.return_value = defer.succeed(blob)
         query = {
-            'blob_data_payment_rate': 'rate',
+            'blob_data_payment_rate': 1.0,
             'requested_blob': 'blob'
         }
         deferred = self.handler.handle_queries(query)
@@ -103,7 +101,8 @@ class TestBlobRequestHandlerQueries(unittest.TestCase):
                 'length': 42
             }
         }
-        self.assertEqual(response, self.successResultOf(deferred))
+        result = self.successResultOf(deferred)
+        self.assertEqual(response, result)
 
 
 class TestBlobRequestHandlerSender(unittest.TestCase):

tests/unit/core/test_ExchangeRateManager.py

@@ -1,5 +1,5 @@
 import mock
-from lbrynet.metadata import Metadata
+from lbrynet.metadata import Fee
 from lbrynet.lbrynet_daemon import ExchangeRateManager
 
 from twisted.trial import unittest
@@ -13,7 +13,7 @@ class FeeFormatTest(unittest.TestCase):
                 'address': "bRcHraa8bYJZL7vkh5sNmGwPDERFUjGPP9"
             }
         }
-        fee = Metadata.FeeValidator(fee_dict)
+        fee = Fee.FeeValidator(fee_dict)
         self.assertEqual(10.0, fee['USD']['amount'])
 
 

tests/unit/core/test_Metadata.py

@@ -1,14 +1,14 @@
 from lbrynet.metadata import Metadata
 from twisted.trial import unittest
-
+from jsonschema import ValidationError
 
 class MetadataTest(unittest.TestCase):
-    def test_assertion_if_no_metadata(self):
+    def test_validation_error_if_no_metadata(self):
         metadata = {}
-        with self.assertRaises(AssertionError):
+        with self.assertRaises(ValidationError):
             Metadata.Metadata(metadata)
 
-    def test_assertion_if_source_is_missing(self):
+    def test_validation_error_if_source_is_missing(self):
         metadata = {
             'license': 'Oscilloscope Laboratories',
             'description': 'Four couples meet for Sunday brunch only to discover they are stuck in a house together as the world may be about to end.',
@@ -18,7 +18,7 @@ class MetadataTest(unittest.TestCase):
             'content-type': 'audio/mpeg',
             'thumbnail': 'http://ia.media-imdb.com/images/M/MV5BMTQwNjYzMTQ0Ml5BMl5BanBnXkFtZTcwNDUzODM5Nw@@._V1_SY1000_CR0,0,673,1000_AL_.jpg',
         }
-        with self.assertRaises(AssertionError):
+        with self.assertRaises(ValidationError):
             Metadata.Metadata(metadata)
 
     def test_metadata_works_without_fee(self):
@@ -36,7 +36,7 @@ class MetadataTest(unittest.TestCase):
         m = Metadata.Metadata(metadata)
         self.assertFalse('fee' in m)
 
-    def test_assertion_if_invalid_source(self):
+    def test_validation_error_if_invalid_source(self):
         metadata = {
             'license': 'Oscilloscope Laboratories',
             'description': 'Four couples meet for Sunday brunch only to discover they are stuck in a house together as the world may be about to end.',
@@ -48,10 +48,10 @@ class MetadataTest(unittest.TestCase):
             'content-type': 'audio/mpeg',
             'thumbnail': 'http://ia.media-imdb.com/images/M/MV5BMTQwNjYzMTQ0Ml5BMl5BanBnXkFtZTcwNDUzODM5Nw@@._V1_SY1000_CR0,0,673,1000_AL_.jpg',
         }
-        with self.assertRaises(AssertionError):
+        with self.assertRaises(ValidationError):
             Metadata.Metadata(metadata)
 
-    def test_assertion_if_missing_v001_field(self):
+    def test_validation_error_if_missing_v001_field(self):
         metadata = {
             'license': 'Oscilloscope Laboratories',
             'fee': {'LBC': {'amount': 50.0, 'address': 'bRQJASJrDbFZVAvcpv3NoNWoH74LQd5JNV'}},
@@ -63,7 +63,7 @@ class MetadataTest(unittest.TestCase):
             'content-type': 'audio/mpeg',
             'thumbnail': 'http://ia.media-imdb.com/images/M/MV5BMTQwNjYzMTQ0Ml5BMl5BanBnXkFtZTcwNDUzODM5Nw@@._V1_SY1000_CR0,0,673,1000_AL_.jpg'
         }
-        with self.assertRaises(AssertionError):
+        with self.assertRaises(ValidationError):
             Metadata.Metadata(metadata)
 
     def test_version_is_001_if_all_fields_are_present(self):
@@ -78,10 +78,10 @@ class MetadataTest(unittest.TestCase):
             'content-type': 'audio/mpeg',
             'thumbnail': 'http://ia.media-imdb.com/images/M/MV5BMTQwNjYzMTQ0Ml5BMl5BanBnXkFtZTcwNDUzODM5Nw@@._V1_SY1000_CR0,0,673,1000_AL_.jpg',
         }
-        m = Metadata.Metadata(metadata, process_now=False)
+        m = Metadata.Metadata(metadata, migrate=False)
         self.assertEquals('0.0.1', m.version)
 
-    def test_assertion_if_there_is_an_extra_field(self):
+    def test_validation_error_if_there_is_an_extra_field(self):
         metadata = {
             'license': 'Oscilloscope Laboratories',
             'description': 'Four couples meet for Sunday brunch only to discover they are stuck in a house together as the world may be about to end.',
@@ -94,8 +94,8 @@ class MetadataTest(unittest.TestCase):
             'thumbnail': 'http://ia.media-imdb.com/images/M/MV5BMTQwNjYzMTQ0Ml5BMl5BanBnXkFtZTcwNDUzODM5Nw@@._V1_SY1000_CR0,0,673,1000_AL_.jpg',
             'MYSTERYFIELD': '?'
         }
-        with self.assertRaises(AssertionError):
+        with self.assertRaises(ValidationError):
-            Metadata.Metadata(metadata, process_now=False)
+            Metadata.Metadata(metadata, migrate=False)
 
     def test_version_is_002_if_all_fields_are_present(self):
         metadata = {
@@ -112,7 +112,7 @@ class MetadataTest(unittest.TestCase):
             'content-type': 'video/mp4',
             'thumbnail': 'https://svs.gsfc.nasa.gov/vis/a010000/a012000/a012034/Combined.00_08_16_17.Still004.jpg'
         }
-        m = Metadata.Metadata(metadata, process_now=False)
+        m = Metadata.Metadata(metadata, migrate=False)
         self.assertEquals('0.0.2', m.version)
 
     def test_version_is_003_if_all_fields_are_present(self):
@@ -130,7 +130,7 @@ class MetadataTest(unittest.TestCase):
             'content_type': 'video/mp4',
             'thumbnail': 'https://svs.gsfc.nasa.gov/vis/a010000/a012000/a012034/Combined.00_08_16_17.Still004.jpg'
         }
-        m = Metadata.Metadata(metadata, process_now=False)
+        m = Metadata.Metadata(metadata, migrate=False)
         self.assertEquals('0.0.3', m.version)
 
     def test_version_claimed_is_001_but_version_is_002(self):
@@ -148,8 +148,8 @@ class MetadataTest(unittest.TestCase):
             'content-type': 'video/mp4',
             'thumbnail': 'https://svs.gsfc.nasa.gov/vis/a010000/a012000/a012034/Combined.00_08_16_17.Still004.jpg'
         }
-        with self.assertRaises(AssertionError):
+        with self.assertRaises(ValidationError):
-            Metadata.Metadata(metadata, process_now=False)
+            Metadata.Metadata(metadata, migrate=False)
 
     def test_version_claimed_is_002_but_version_is_003(self):
         metadata = {
@@ -166,8 +166,8 @@ class MetadataTest(unittest.TestCase):
             'content_type': 'video/mp4',
             'thumbnail': 'https://svs.gsfc.nasa.gov/vis/a010000/a012000/a012034/Combined.00_08_16_17.Still004.jpg'
         }
-        with self.assertRaises(AssertionError):
+        with self.assertRaises(ValidationError):
-            Metadata.Metadata(metadata, process_now=False)
+            Metadata.Metadata(metadata, migrate=False)
 
     def test_version_001_ports_to_003(self):
         metadata = {
@@ -181,7 +181,7 @@ class MetadataTest(unittest.TestCase):
             'content-type': 'audio/mpeg',
             'thumbnail': 'http://ia.media-imdb.com/images/M/MV5BMTQwNjYzMTQ0Ml5BMl5BanBnXkFtZTcwNDUzODM5Nw@@._V1_SY1000_CR0,0,673,1000_AL_.jpg',
         }
-        m = Metadata.Metadata(metadata, process_now=True)
+        m = Metadata.Metadata(metadata, migrate=True)
         self.assertEquals('0.0.3', m.version)
 
     def test_version_002_ports_to_003(self):
@@ -199,5 +199,5 @@ class MetadataTest(unittest.TestCase):
             'content-type': 'video/mp4',
             'thumbnail': 'https://svs.gsfc.nasa.gov/vis/a010000/a012000/a012034/Combined.00_08_16_17.Still004.jpg'
         }
-        m = Metadata.Metadata(metadata, process_now=True)
+        m = Metadata.Metadata(metadata, migrate=True)
         self.assertEquals('0.0.3', m.version)

tests/unit/core/test_Strategy.py

@@ -0,0 +1,125 @@
+import itertools
+from twisted.trial import unittest
+import random
+import mock
+from lbrynet.core.PaymentRateManager import NegotiatedPaymentRateManager, BasePaymentRateManager
+from lbrynet.core.Strategy import BasicAvailabilityWeightedStrategy
+from lbrynet.core.Offer import Offer
+from tests.mocks import DummyBlobAvailabilityTracker
+
+MAX_NEGOTIATION_TURNS = 10
+random.seed(12345)
+
+
+def get_random_sample(list_to_sample):
+    result = list_to_sample[random.randint(1, len(list_to_sample)):random.randint(1, len(list_to_sample))]
+    if not result:
+        return get_random_sample(list_to_sample)
+    return result
+
+
+def calculate_negotation_turns(client_base, host_base, host_is_generous=True, client_is_generous=True):
+    blobs = [
+        'b2e48bb4c88cf46b76adf0d47a72389fae0cd1f19ed27dc509138c99509a25423a4cef788d571dca7988e1dca69e6fa0',
+        'd7c82e6cac093b3f16107d2ae2b2c75424f1fcad2c7fbdbe66e4a13c0b6bd27b67b3a29c403b82279ab0f7c1c48d6787',
+        '5a450b416275da4bdff604ee7b58eaedc7913c5005b7184fc3bc5ef0b1add00613587f54217c91097fc039ed9eace9dd',
+        'f99d24cd50d4bfd77c2598bfbeeb8415bf0feef21200bdf0b8fbbde7751a77b7a2c68e09c25465a2f40fba8eecb0b4e0',
+        '9dbda74a472a2e5861a5d18197aeba0f5de67c67e401124c243d2f0f41edf01d7a26aeb0b5fc9bf47f6361e0f0968e2c',
+        '91dc64cf1ff42e20d627b033ad5e4c3a4a96856ed8a6e3fb4cd5fa1cfba4bf72eefd325f579db92f45f4355550ace8e7',
+        '6d8017aba362e5c5d0046625a039513419810a0397d728318c328a5cc5d96efb589fbca0728e54fe5adbf87e9545ee07',
+        '6af95cd062b4a179576997ef1054c9d2120f8592eea045e9667bea411d520262cd5a47b137eabb7a7871f5f8a79c92dd',
+        '8c70d5e2f5c3a6085006198e5192d157a125d92e7378794472007a61947992768926513fc10924785bdb1761df3c37e6',
+        'c84aa1fd8f5009f7c4e71e444e40d95610abc1480834f835eefb267287aeb10025880a3ce22580db8c6d92efb5bc0c9c'
+    ]
+
+    host = mock.Mock()
+    host.host = "1.2.3.4"
+    client = mock.Mock()
+    client.host = "1.2.3.5"
+
+    client_base_prm = BasePaymentRateManager(client_base)
+    client_prm = NegotiatedPaymentRateManager(client_base_prm,
+                                              DummyBlobAvailabilityTracker(),
+                                              generous=client_is_generous)
+    host_base_prm = BasePaymentRateManager(host_base)
+    host_prm = NegotiatedPaymentRateManager(host_base_prm,
+                                            DummyBlobAvailabilityTracker(),
+                                            generous=host_is_generous)
+    blobs_to_query = get_random_sample(blobs)
+    accepted = False
+    turns = 0
+    while not accepted:
+        rate = client_prm.get_rate_blob_data(host, blobs_to_query)
+        offer = Offer(rate)
+        accepted = host_prm.accept_rate_blob_data(client, blobs_to_query, offer)
+        turns += 1
+    return turns
+
+
+class AvailabilityWeightedStrategyTests(unittest.TestCase):
+    def test_first_offer_is_zero_and_second_is_not_if_offer_not_accepted(self):
+        strategy = BasicAvailabilityWeightedStrategy(DummyBlobAvailabilityTracker())
+        peer = "1.1.1.1"
+
+        blobs = strategy.price_model.blob_tracker.availability.keys()
+        offer1 = strategy.make_offer(peer, blobs)
+
+        offer2 = strategy.make_offer(peer, blobs)
+
+        self.assertEquals(offer1.rate, 0.0)
+        self.assertNotEqual(offer2.rate, 0.0)
+
+    def test_accept_zero_and_persist_if_accepted(self):
+        host_strategy = BasicAvailabilityWeightedStrategy(DummyBlobAvailabilityTracker())
+        client_strategy = BasicAvailabilityWeightedStrategy(DummyBlobAvailabilityTracker())
+
+        client = "1.1.1.1"
+        host = "1.1.1.2"
+        blobs = host_strategy.price_model.blob_tracker.availability.keys()
+
+        offer = client_strategy.make_offer(host, blobs)
+        response1 = host_strategy.respond_to_offer(offer, client, blobs)
+        client_strategy.update_accepted_offers(host, response1)
+
+        offer = client_strategy.make_offer(host, blobs)
+        response2 = host_strategy.respond_to_offer(offer, client, blobs)
+        client_strategy.update_accepted_offers(host, response2)
+
+        self.assertEquals(response1.is_too_low, False)
+        self.assertEquals(response1.is_accepted, True)
+        self.assertEquals(response1.rate, 0.0)
+
+        self.assertEquals(response2.is_too_low, False)
+        self.assertEquals(response2.is_accepted, True)
+        self.assertEquals(response2.rate, 0.0)
+
+    def test_how_many_turns_before_accept_with_similar_rate_settings(self):
+        base_rates = [0.0001 * n for n in range(1, 10)]
+        for host_base, client_base in itertools.product(base_rates, base_rates):
+            turns = calculate_negotation_turns(host_base,
+                                               client_base,
+                                               client_is_generous=False,
+                                               host_is_generous=False)
+            self.assertGreater(MAX_NEGOTIATION_TURNS, turns)
+
+    def test_generous_connects_in_one_turn(self):
+        base_rates = [0.0001 * n for n in range(1, 10)]
+        for host_base, client_base in itertools.product(base_rates, base_rates):
+            turns = calculate_negotation_turns(host_base, client_base)
+            self.assertEqual(1, turns)
+
+    def test_how_many_turns_with_generous_client(self):
+        base_rates = [0.0001 * n for n in range(1, 10)]
+        for host_base, client_base in itertools.product(base_rates, base_rates):
+            turns = calculate_negotation_turns(host_base,
+                                               client_base,
+                                               host_is_generous=False)
+            self.assertGreater(MAX_NEGOTIATION_TURNS, turns)
+
+    def test_how_many_turns_with_generous_host(self):
+        base_rates = [0.0001 * n for n in range(1, 10)]
+        for host_base, client_base in itertools.product(base_rates, base_rates):
+            turns = calculate_negotation_turns(host_base,
+                                               client_base,
+                                               client_is_generous=False)
+            self.assertGreater(MAX_NEGOTIATION_TURNS, turns)