Compare commits
4
Commits
misc_fixes
...
v0.18.2rc1
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
9ddbff8313 | ||
|
|
f799fcfbe2 | ||
|
|
c3d5014a08 | ||
|
|
c067959061 |
No files matched your search
+6
-1
@@ -13,7 +13,7 @@ at anytime.
|
||||
*
|
||||
|
||||
### Fixed
|
||||
*
|
||||
* Fixed import error in Wallet.py
|
||||
*
|
||||
|
||||
### Deprecated
|
||||
@@ -33,6 +33,11 @@ at anytime.
|
||||
*
|
||||
|
||||
|
||||
## [0.18.1] - 2018-01-22
|
||||
### Fixed
|
||||
* Fixed fetching the external ip
|
||||
|
||||
|
||||
## [0.18.0] - 2017-11-08
|
||||
### Fixed
|
||||
* Fixed amount of close nodes to add to list in case of extension to neighbouring k-buckets
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
import logging
|
||||
|
||||
__version__ = "0.18.0"
|
||||
__version__ = "0.18.2rc1"
|
||||
version = tuple(__version__.split('.'))
|
||||
|
||||
logging.getLogger(__name__).addHandler(logging.NullHandler())
|
||||
@@ -16,7 +16,7 @@ import lbryum.wallet
|
||||
from lbryum.network import Network
|
||||
from lbryum.simple_config import SimpleConfig
|
||||
from lbryum.constants import COIN
|
||||
from lbryum.commands import known_commands, Commands
|
||||
from lbryum.commands import Commands
|
||||
|
||||
from lbryschema.uri import parse_lbry_uri
|
||||
from lbryschema.claim import ClaimDict
|
||||
@@ -1283,17 +1283,18 @@ class LBRYumWallet(Wallet):
|
||||
# only makes a lbrum server query, use _run_cmd_as_defer_to_thread()
|
||||
def _run_cmd_as_defer_succeed(self, command_name, *args, **kwargs):
|
||||
cmd_runner = self._get_cmd_runner()
|
||||
cmd = known_commands[command_name]
|
||||
cmd = Commands.known_commands[command_name]
|
||||
func = getattr(cmd_runner, cmd.name)
|
||||
return defer.succeed(func(*args, **kwargs))
|
||||
|
||||
|
||||
# run commands as a deferToThread, lbryum commands that only make
|
||||
# queries to lbryum server should be run this way
|
||||
# TODO: keep track of running threads and cancel them on `stop`
|
||||
# otherwise the application will hang, waiting for threads to complete
|
||||
def _run_cmd_as_defer_to_thread(self, command_name, *args, **kwargs):
|
||||
cmd_runner = self._get_cmd_runner()
|
||||
cmd = known_commands[command_name]
|
||||
cmd = Commands.known_commands[command_name]
|
||||
func = getattr(cmd_runner, cmd.name)
|
||||
return threads.deferToThread(func, *args, **kwargs)
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@ import json
|
||||
import subprocess
|
||||
import os
|
||||
|
||||
from urllib2 import urlopen
|
||||
from urllib2 import urlopen, URLError
|
||||
from lbryschema import __version__ as lbryschema_version
|
||||
from lbryum import __version__ as LBRYUM_VERSION
|
||||
from lbrynet import build_type, __version__ as lbrynet_version
|
||||
@@ -37,10 +37,14 @@ def get_platform(get_ip=True):
|
||||
"build": build_type.BUILD, # CI server sets this during build step
|
||||
}
|
||||
|
||||
# TODO: remove this from get_platform and add a get_external_ip function using txrequests
|
||||
if get_ip:
|
||||
try:
|
||||
p['ip'] = json.load(urlopen('http://ipv4.jsonip.com'))['ip']
|
||||
except:
|
||||
response = json.loads(urlopen("https://api.lbry.io/ip").read())
|
||||
if not response['success']:
|
||||
raise URLError("failed to get external ip")
|
||||
p['ip'] = response['data']['ip']
|
||||
except (URLError, AssertionError):
|
||||
p['ip'] = "Could not determine IP"
|
||||
|
||||
return p
|
||||
+2
-2
@@ -14,8 +14,8 @@ gmpy==1.17
|
||||
jsonrpc==1.2
|
||||
jsonrpclib==0.1.7
|
||||
jsonschema==2.6.0
|
||||
git+https://github.com/lbryio/lbryum.git@v3.1.11#egg=lbryum
|
||||
git+https://github.com/lbryio/lbryschema.git@v0.0.14#egg=lbryschema
|
||||
git+https://github.com/lbryio/lbryum.git@v3.2.0rc10#egg=lbryum
|
||||
git+https://github.com/lbryio/lbryschema.git@v0.0.15rc2#egg=lbryschema
|
||||
miniupnpc==1.9
|
||||
pbkdf2==1.3
|
||||
pycrypto==2.6.1
|
||||
|
||||
Reference in new issue
Block a user