add update_name

lbrynet/core/LBRYcrdWallet.py

@@ -408,8 +408,10 @@ class LBRYWallet(object):
         d.addCallback(self._get_decoded_tx)
         return d
 
-    # def update_name(self, name_value):
+    def update_name(self, name, value, amount):
-    #     return self._update_name(name_value)
+        d = self._get_value_for_name(name)
+        d.addCallback(lambda r: self._update_name(r['txid'], json.dumps(value), amount))
+        return d
 
     def get_name_and_validity_for_sd_hash(self, sd_hash):
         d = self._get_claim_metadata_for_sd_hash(sd_hash)
@@ -565,6 +567,9 @@ class LBRYWallet(object):
     def _send_abandon(self, txid, address, amount):
         return defer.fail(NotImplementedError())
 
+    def _update_name(self, txid, value, amount):
+        return defer.fail(NotImplementedError())
+
     def _do_send_many(self, payments_to_send):
         return defer.fail(NotImplementedError())
 
@@ -697,6 +702,9 @@ class LBRYcrdWallet(LBRYWallet):
     def _send_abandon(self, txid, address, amount):
         return threads.deferToThread(self._send_abandon_rpc, txid, address, amount)
 
+    def _update_name(self, txid, value, amount):
+        return threads.deferToThread(self._update_name_rpc, txid, value, amount)
+
     def get_claims_from_tx(self, txid):
         return threads.deferToThread(self._get_claims_from_tx_rpc, txid)
 
@@ -847,9 +855,9 @@ class LBRYcrdWallet(LBRYWallet):
         rpc_conn = self._get_rpc_conn()
         return rpc_conn.getvalueforname(name)
 
-    # def _update_name_rpc(self, name_value):
+    def _update_name_rpc(self, txid, value, amount):
-    #     rpc_conn = self._get_rpc_conn()
+        rpc_conn = self._get_rpc_conn()
-    #     return rpc_conn.updatename(name_value)
+        return rpc_conn.updatename(txid, value, amount)
 
     @_catch_connection_error
     def _send_name_claim_rpc(self, name, value, amount):

lbrynet/lbrynet_daemon/LBRYDaemon.py

@@ -39,7 +39,8 @@ from lbrynet.lbrynet_daemon.LBRYPublisher import Publisher
 from lbrynet.core.utils import generate_id
 from lbrynet.lbrynet_console.LBRYSettings import LBRYSettings
 from lbrynet.conf import MIN_BLOB_DATA_PAYMENT_RATE, DEFAULT_MAX_SEARCH_RESULTS, KNOWN_DHT_NODES, DEFAULT_MAX_KEY_FEE, \
-    DEFAULT_WALLET, DEFAULT_SEARCH_TIMEOUT, DEFAULT_CACHE_TIME, DEFAULT_UI_BRANCH, LOG_POST_URL, LOG_FILE_NAME
+    DEFAULT_WALLET, DEFAULT_SEARCH_TIMEOUT, DEFAULT_CACHE_TIME, DEFAULT_UI_BRANCH, LOG_POST_URL, LOG_FILE_NAME, \
+    BASE_METADATA_FIELDS, OPTIONAL_METADATA_FIELDS, SOURCE_TYPES
 from lbrynet.conf import DEFAULT_TIMEOUT, WALLET_TYPES
 from lbrynet.core.StreamDescriptor import StreamDescriptorIdentifier, download_sd_blob
 from lbrynet.core.Session import LBRYSession
@@ -47,7 +48,7 @@ from lbrynet.core.PTCWallet import PTCWallet
 from lbrynet.core.LBRYcrdWallet import LBRYcrdWallet, LBRYumWallet
 from lbrynet.lbryfilemanager.LBRYFileManager import LBRYFileManager
 from lbrynet.lbryfile.LBRYFileMetadataManager import DBLBRYFileMetadataManager, TempLBRYFileMetadataManager
-from lbryum import LOG_PATH as lbryum_log
+# from lbryum import LOG_PATH as lbryum_log
 
 log = logging.getLogger(__name__)
 
@@ -67,12 +68,13 @@ handler = logging.handlers.RotatingFileHandler(lbrynet_log, maxBytes=2097152, ba
 log.addHandler(handler)
 log.setLevel(logging.INFO)
 
-if os.path.isfile(lbryum_log):
+# if os.path.isfile(lbryum_log):
-    f = open(lbryum_log, 'r')
+#     f = open(lbryum_log, 'r')
-    PREVIOUS_LBRYUM_LOG = len(f.read())
+#     PREVIOUS_LBRYUM_LOG = len(f.read())
-    f.close()
+#     f.close()
-else:
+# else:
-    PREVIOUS_LBRYUM_LOG = 0
+#     PREVIOUS_LBRYUM_LOG = 0
+
 if os.path.isfile(lbrynet_log):
     f = open(lbrynet_log, 'r')
     PREVIOUS_LBRYNET_LOG = len(f.read())
@@ -634,11 +636,11 @@ class LBRYDaemon(jsonrpc.JSONRPC):
 
     def _upload_log(self, log_type=None, exclude_previous=False, force=False):
         if self.upload_log or force:
-            for lm, lp in [('lbrynet', lbrynet_log), ('lbryum', lbryum_log)]:
+            for lm, lp in [('lbrynet', lbrynet_log)]: #, ('lbryum', lbryum_log)]:
                 if os.path.isfile(lp):
                     if exclude_previous:
                         f = open(lp, "r")
-                        f.seek(PREVIOUS_LBRYNET_LOG if lm == 'lbrynet' else PREVIOUS_LBRYUM_LOG)
+                        f.seek(PREVIOUS_LBRYNET_LOG) # if lm == 'lbrynet' else PREVIOUS_LBRYUM_LOG)
                         log_contents = f.read()
                         f.close()
                     else:
@@ -2130,25 +2132,26 @@ class LBRYDaemon(jsonrpc.JSONRPC):
         d.addCallback(lambda r: self._render_response(r, OK_CODE))
         return d
 
-    # def jsonrpc_update_name(self, metadata):
+    def jsonrpc_update_name(self, p):
-    #     def _disp(x):
+        """
-    #         print x
+        Update name claim
-    #         return x
+
-    #
+        Args:
-    #     metadata = json.loads(metadata)
+            'name': the uri of the claim to be updated
-    #
+            'value': new metadata dict
-    #     required = ['name', 'file_path', 'bid']
+            'amount': bid amount of updated claim
-    #
+        Returns:
-    #     for r in required:
+            txid
-    #         if not r in metadata.keys():
+        """
-    #             return defer.fail()
+        
-    #
+        name = p['name']
-    #     d = defer.Deferred()
+        value = p['value'] if isinstance(p['value'], dict) else json.loads(p['value'])
-    #     d.addCallback(lambda _: self.session.wallet.update_name(metadata))
+        amount = p['amount']
-    #     d.addCallback(_disp)
+
-    #     d.callback(None)
+        d = self.session.wallet.update_name(name, value, amount)
-    #
+        d.addCallback(lambda r: self._render_response(r, OK_CODE))
-    #     return d
+
+        return d
 
     def jsonrpc_log(self, p):
         """