Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1c00129f76 | ||
|
|
454700af05 | ||
|
|
d9b482d90a | ||
|
|
09c2c97069 | ||
|
|
88faf0ce78 | ||
|
|
aef83eec31 | ||
|
|
5bd222c266 | ||
|
|
d3e7f789b2 | ||
|
|
87c6e292f1 | ||
|
|
b597ad0b3f | ||
|
|
40dd99dea3 | ||
|
|
6ea2686219 | ||
|
|
6bca90c4f7 | ||
|
|
20fa7bd852 | ||
|
|
6b80119eff | ||
|
|
1fc5469eb1 | ||
|
|
bf2769a0c2 | ||
|
|
325b601bea | ||
|
|
126642912e | ||
|
|
57ee16d565 | ||
|
|
9f0fba063d | ||
|
|
757fb51415 | ||
|
|
b1c5655138 | ||
|
|
4d97dcaa93 | ||
|
|
96db1b4685 | ||
|
|
9e21c52d04 | ||
|
|
5fa801f9f2 | ||
|
|
0301768b79 | ||
|
|
4c6dedfa4f | ||
|
|
6652d55455 | ||
|
|
3e03dd3e80 | ||
|
|
84b8a22423 | ||
|
|
ada03e12fc | ||
|
|
d66c801350 |
No files matched your search
+3
-1
@@ -145,6 +145,7 @@ build:windows:
|
||||
variables:
|
||||
GIT_STRATEGY: none
|
||||
script:
|
||||
- "[ -f lbrynet-${OS}.zip ]" # check that asset exists before trying to upload
|
||||
- pip install awscli
|
||||
- S3_PATH="daemon/gitlab-build-${CI_PIPELINE_ID}_commit-${CI_COMMIT_SHA:0:7}$( if [ ! -z ${CI_COMMIT_TAG} ]; then echo _tag-${CI_COMMIT_TAG}; else echo _branch-${CI_COMMIT_REF_NAME}; fi )"
|
||||
- AWS_ACCESS_KEY_ID=${ARTIFACTS_KEY} AWS_SECRET_ACCESS_KEY=${ARTIFACTS_SECRET} AWS_REGION=${ARTIFACTS_REGION}
|
||||
@@ -174,6 +175,7 @@ s3:windows:
|
||||
variables:
|
||||
GIT_STRATEGY: none
|
||||
script:
|
||||
- "[ -f lbrynet-${OS}.zip ]" # check that asset exists before trying to upload. githubrelease won't error if its missing
|
||||
- pip install githubrelease
|
||||
- githubrelease --no-progress --github-token ${GITHUB_CI_USER_ACCESS_TOKEN} asset lbryio/lbry-sdk upload ${CI_COMMIT_TAG} lbrynet-${OS}.zip
|
||||
|
||||
@@ -203,4 +205,4 @@ publish:
|
||||
- pip install githubrelease
|
||||
- githubrelease --no-progress --github-token ${GITHUB_CI_USER_ACCESS_TOKEN} release lbryio/lbry-sdk publish ${CI_COMMIT_TAG}
|
||||
- >
|
||||
curl -X POST -H 'Content-type: application/json' --data '{"text":"<!channel> There's a new SDK release: https://github.com/lbryio/lbry-sdk/releases/tag/'"${CI_COMMIT_TAG}"'\n'"$(curl -s "https://api.github.com/repos/lbryio/lbry-sdk/releases/tags/${CI_COMMIT_TAG}" | egrep '\w*\"body\":' | cut -d':' -f 2- | tail -c +3 | head -c -2)"'", "channel":"tech"}' "$(echo ${SLACK_WEBHOOK_URL_BASE64} | base64 -d)"
|
||||
curl -X POST -H 'Content-type: application/json' --data '{"text":"<!channel> There is a new SDK release: https://github.com/lbryio/lbry-sdk/releases/tag/'"${CI_COMMIT_TAG}"'\n'"$(curl -s "https://api.github.com/repos/lbryio/lbry-sdk/releases/tags/${CI_COMMIT_TAG}" | egrep '\w*\"body\":' | cut -d':' -f 2- | tail -c +3 | head -c -2)"'", "channel":"tech"}' "$(echo ${SLACK_WEBHOOK_URL_BASE64} | base64 -d)"
|
||||
-19
@@ -114,25 +114,6 @@ jobs:
|
||||
- sha256sum -b lbrynet-windows.zip
|
||||
- ./lbrynet.exe --version
|
||||
|
||||
- if: tag IS present
|
||||
stage: build
|
||||
name: "Wallet Server Docker Image - Tagged Release"
|
||||
script:
|
||||
- set -e
|
||||
- echo "$DOCKER_PASSWORD" | docker login --username "$DOCKER_USERNAME" --password-stdin
|
||||
- travis_retry docker build -t lbry/wallet-server:$TRAVIS_TAG -t lbry/wallet-server:latest-release -f docker/Dockerfile.wallet_server .
|
||||
- docker push lbry/wallet-server:$TRAVIS_TAG
|
||||
- docker push lbry/wallet-server:latest-release
|
||||
|
||||
- if: tag IS blank AND branch = master AND NOT type IN (pull_request)
|
||||
stage: build
|
||||
name: "Wallet Server Docker Image - Master"
|
||||
script:
|
||||
- set -e
|
||||
- echo "$DOCKER_PASSWORD" | docker login --username "$DOCKER_USERNAME" --password-stdin
|
||||
- travis_retry docker build -t lbry/wallet-server:master -f docker/Dockerfile.wallet_server .
|
||||
- docker push lbry/wallet-server:master
|
||||
|
||||
cache:
|
||||
directories:
|
||||
- $HOME/venv
|
||||
|
||||
+1
-1018
File diff suppressed because it is too large.
Load diff
@@ -1,4 +1,4 @@
|
||||
# <img src="https://raw.githubusercontent.com/lbryio/lbry-sdk/master/lbry/lbry.png" alt="LBRY" width="48" height="36" /> LBRY SDK [](https://travis-ci.org/lbryio/lbry-sdk)
|
||||
# <img src="https://raw.githubusercontent.com/lbryio/lbry-sdk/master/lbry/lbry.png" alt="LBRY" width="48" height="36" /> LBRY SDK [](https://ci.lbry.tech/lbry/lbry-sdk)
|
||||
|
||||
LBRY is a decentralized peer-to-peer protocol for publishing and accessing digital content. It utilizes the [LBRY blockchain](https://github.com/lbryio/lbrycrd) as a global namespace and database of digital content. Blockchain entries contain searchable content metadata, identities, rights and access rules. LBRY also provides a data network that consists of peers (seeders) uploading and downloading data from other peers, possibly in exchange for payments, as well as a distributed hash table used by peers to discover other peers.
|
||||
|
||||
|
||||
@@ -7,6 +7,7 @@ ARG projects_dir=/home/$user
|
||||
RUN apt-get update && \
|
||||
apt-get -y --no-install-recommends install \
|
||||
wget \
|
||||
tar unzip \
|
||||
build-essential \
|
||||
python3 \
|
||||
python3-dev \
|
||||
|
||||
@@ -2,14 +2,22 @@
|
||||
|
||||
# entrypoint for wallet server Docker image
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
SNAPSHOT_URL="${SNAPSHOT_URL:-}" #off by default. latest snapshot at https://lbry.com/snapshot/wallet
|
||||
|
||||
if [[ -n "$SNAPSHOT_URL" ]] && [[ ! -f /database/claims.db ]]; then
|
||||
files="$(ls)"
|
||||
echo "Downloading wallet snapshot from $SNAPSHOT_URL"
|
||||
wget --no-verbose -O wallet_snapshot.tar.bz2 "$SNAPSHOT_URL"
|
||||
wget --no-verbose --trust-server-names --content-disposition "$SNAPSHOT_URL"
|
||||
echo "Extracting snapshot..."
|
||||
tar xvjf wallet_snapshot.tar.bz2 --directory /database
|
||||
rm wallet_snapshot.tar.bz2
|
||||
filename="$(grep -vf <(echo "$files") <(ls))" # finds the file that was not there before
|
||||
case "$filename" in
|
||||
*.tgz|*.tar.gz|*.tar.bz2 ) tar xvf "$filename" --directory /database ;;
|
||||
*.zip ) unzip "$filename" -d /database ;;
|
||||
* ) echo "Don't know how to extract ${filename}. SNAPSHOT COULD NOT BE LOADED" && exit 1 ;;
|
||||
esac
|
||||
rm "$filename"
|
||||
fi
|
||||
|
||||
/home/lbry/.local/bin/torba-server "$@"
|
||||
@@ -1,4 +1,4 @@
|
||||
__name__ = "lbry"
|
||||
__version__ = "0.50.0"
|
||||
__version__ = "0.51.2"
|
||||
version = tuple(__version__.split('.'))
|
||||
|
||||
@@ -224,7 +224,7 @@ class PingQueue:
|
||||
self._protocol.add_peer(peer)
|
||||
return
|
||||
await self._protocol.get_rpc_peer(peer).ping()
|
||||
except asyncio.TimeoutError:
|
||||
except (asyncio.TimeoutError, RemoteException):
|
||||
pass
|
||||
|
||||
task = self._loop.create_task(ping_task())
|
||||
@@ -668,7 +668,7 @@ class KademliaProtocol(DatagramProtocol):
|
||||
log.debug("peer %s:%i is running an incompatible version of lbrynet", peer.address, peer.udp_port)
|
||||
return peer.node_id, False
|
||||
if 'Invalid token' not in str(err):
|
||||
log.exception("Unexpected error while storing blob_hash")
|
||||
log.warning("Unexpected error while storing blob_hash: %s", err)
|
||||
return peer.node_id, False
|
||||
self.peer_manager.clear_token(peer.node_id)
|
||||
if not retry:
|
||||
|
||||
@@ -27,7 +27,7 @@ from lbry.blob_exchange.downloader import download_blob
|
||||
from lbry.dht.peer import make_kademlia_peer
|
||||
from lbry.error import (
|
||||
DownloadSDTimeoutError, ComponentsNotStartedError, ComponentStartConditionNotMetError,
|
||||
CommandError, CommandDoesNotExistError
|
||||
CommandDoesNotExistError
|
||||
)
|
||||
from lbry.extras import system_info
|
||||
from lbry.extras.daemon import analytics
|
||||
@@ -212,44 +212,46 @@ class JSONRPCError:
|
||||
CODE_AUTHENTICATION_ERROR: 401,
|
||||
}
|
||||
|
||||
def __init__(self, message, code=CODE_APPLICATION_ERROR, traceback=None, data=None, name=None):
|
||||
assert isinstance(code, int), "'code' must be an int"
|
||||
assert (data is None or isinstance(data, dict)), "'data' must be None or a dict"
|
||||
def __init__(self, code: int, message: str, data: dict = None):
|
||||
assert code and isinstance(code, int), "'code' must be an int"
|
||||
assert message and isinstance(message, str), "'message' must be a string"
|
||||
assert data is None or isinstance(data, dict), "'data' must be None or a dict"
|
||||
self.code = code
|
||||
self.name = name or 'Exception'
|
||||
if message is None:
|
||||
message = self.MESSAGES[code] if code in self.MESSAGES else "API Error"
|
||||
self.message = message
|
||||
self.data = {} if data is None else data
|
||||
self.traceback = []
|
||||
if traceback is not None:
|
||||
self.traceback = trace_lines = traceback.split("\n")
|
||||
for i, t in enumerate(trace_lines):
|
||||
if "--- <exception caught here> ---" in t:
|
||||
if len(trace_lines) > i + 1:
|
||||
self.traceback = [j for j in trace_lines[i + 1:] if j]
|
||||
break
|
||||
self.data = data or {}
|
||||
|
||||
def to_dict(self):
|
||||
return {
|
||||
'code': self.code,
|
||||
'name': self.name,
|
||||
'message': self.message,
|
||||
'data': self.data,
|
||||
'traceback': self.traceback
|
||||
}
|
||||
|
||||
@classmethod
|
||||
def create_command_exception(cls, e, command, args, kwargs, traceback):
|
||||
if 'password' in kwargs and isinstance(kwargs['password'], str):
|
||||
kwargs['password'] = '*'*len(kwargs['password'])
|
||||
return cls(str(e), traceback=traceback, name=e.__class__.__name__, data={
|
||||
'command': command, 'args': args, 'kwargs': kwargs,
|
||||
})
|
||||
@staticmethod
|
||||
def filter_traceback(traceback):
|
||||
result = []
|
||||
if traceback is not None:
|
||||
result = trace_lines = traceback.split("\n")
|
||||
for i, t in enumerate(trace_lines):
|
||||
if "--- <exception caught here> ---" in t:
|
||||
if len(trace_lines) > i + 1:
|
||||
result = [j for j in trace_lines[i + 1:] if j]
|
||||
break
|
||||
return result
|
||||
|
||||
@classmethod
|
||||
def create_rpc_exception(cls, e, code):
|
||||
return cls(str(e), name=e.__class__.__name__, code=code)
|
||||
def create_command_exception(cls, command, args, kwargs, exception, traceback):
|
||||
if 'password' in kwargs and isinstance(kwargs['password'], str):
|
||||
kwargs['password'] = '*'*len(kwargs['password'])
|
||||
return cls(
|
||||
cls.CODE_APPLICATION_ERROR, str(exception), {
|
||||
'name': exception.__class__.__name__,
|
||||
'traceback': cls.filter_traceback(traceback),
|
||||
'command': command,
|
||||
'args': args,
|
||||
'kwargs': kwargs,
|
||||
}
|
||||
)
|
||||
|
||||
|
||||
class UnknownAPIMethodError(Exception):
|
||||
@@ -514,8 +516,9 @@ class Daemon(metaclass=JSONRPCServerType):
|
||||
except:
|
||||
log.exception('Failed to encode JSON RPC result:')
|
||||
encoded_result = jsonrpc_dumps_pretty(JSONRPCError(
|
||||
JSONRPCError.CODE_APPLICATION_ERROR,
|
||||
'After successfully executing the command, failed to encode result for JSON RPC response.',
|
||||
JSONRPCError.CODE_APPLICATION_ERROR, format_exc()
|
||||
{'traceback': format_exc()}
|
||||
), ledger=ledger)
|
||||
return web.Response(
|
||||
text=encoded_result,
|
||||
@@ -569,17 +572,17 @@ class Daemon(metaclass=JSONRPCServerType):
|
||||
try:
|
||||
function_name = data['method']
|
||||
except KeyError:
|
||||
return JSONRPCError.create_rpc_exception(
|
||||
CommandError("Missing 'method' value in request."),
|
||||
JSONRPCError.CODE_METHOD_NOT_FOUND
|
||||
return JSONRPCError(
|
||||
JSONRPCError.CODE_METHOD_NOT_FOUND,
|
||||
"Missing 'method' value in request."
|
||||
)
|
||||
|
||||
try:
|
||||
fn = self._get_jsonrpc_method(function_name)
|
||||
except UnknownAPIMethodError:
|
||||
return JSONRPCError.create_rpc_exception(
|
||||
CommandDoesNotExistError(function_name),
|
||||
JSONRPCError.CODE_METHOD_NOT_FOUND
|
||||
return JSONRPCError(
|
||||
JSONRPCError.CODE_METHOD_NOT_FOUND,
|
||||
str(CommandDoesNotExistError(function_name))
|
||||
)
|
||||
|
||||
if args in ([{}], []):
|
||||
@@ -594,9 +597,9 @@ class Daemon(metaclass=JSONRPCServerType):
|
||||
isinstance(args[0], list) and isinstance(args[1], dict):
|
||||
_args, _kwargs = args
|
||||
else:
|
||||
return JSONRPCError.create_rpc_exception(
|
||||
CommandError(f"Invalid parameters format: {args}"),
|
||||
JSONRPCError.CODE_INVALID_PARAMS
|
||||
return JSONRPCError(
|
||||
JSONRPCError.CODE_INVALID_PARAMS,
|
||||
f"Invalid parameters format: {args}"
|
||||
)
|
||||
|
||||
if is_transactional_function(function_name):
|
||||
@@ -608,9 +611,9 @@ class Daemon(metaclass=JSONRPCServerType):
|
||||
params_error, function_name, ', '.join(erroneous_params)
|
||||
)
|
||||
log.warning(params_error_message)
|
||||
return JSONRPCError.create_rpc_exception(
|
||||
CommandError(params_error_message),
|
||||
JSONRPCError.CODE_INVALID_PARAMS
|
||||
return JSONRPCError(
|
||||
JSONRPCError.CODE_INVALID_PARAMS,
|
||||
params_error_message,
|
||||
)
|
||||
|
||||
try:
|
||||
@@ -624,7 +627,7 @@ class Daemon(metaclass=JSONRPCServerType):
|
||||
except Exception as e: # pylint: disable=broad-except
|
||||
log.exception("error handling api request")
|
||||
return JSONRPCError.create_command_exception(
|
||||
e, function_name, _args, _kwargs, format_exc()
|
||||
command=function_name, args=_args, kwargs=_kwargs, exception=e, traceback=format_exc()
|
||||
)
|
||||
|
||||
def _verify_method_is_callable(self, function_path):
|
||||
@@ -1025,6 +1028,8 @@ class Daemon(metaclass=JSONRPCServerType):
|
||||
(dict) Updated dictionary of daemon settings
|
||||
"""
|
||||
with self.conf.update_config() as c:
|
||||
if value and isinstance(value, str) and value[0] in ('[', '{'):
|
||||
value = json.loads(value)
|
||||
attr: Setting = getattr(type(c), key)
|
||||
cleaned = attr.deserialize(value)
|
||||
setattr(c, key, cleaned)
|
||||
|
||||
@@ -65,7 +65,7 @@ def do_migration(conf):
|
||||
added_on
|
||||
from file;
|
||||
|
||||
insert into new_content_claim (stream_hash, bt_infohash, claim_outpoint)
|
||||
insert or ignore into new_content_claim (stream_hash, bt_infohash, claim_outpoint)
|
||||
select stream_hash, NULL, claim_outpoint from content_claim;
|
||||
|
||||
drop table file;
|
||||
|
||||
@@ -223,7 +223,7 @@ class CommandTestCase(IntegrationTestCase):
|
||||
if confirm:
|
||||
await self.ledger.wait(tx)
|
||||
await self.generate(1)
|
||||
await self.ledger.wait(tx)
|
||||
await self.ledger.wait(tx, self.blockchain.block_expected)
|
||||
return self.sout(tx)
|
||||
|
||||
def create_upload_file(self, data, prefix=None, suffix=None):
|
||||
|
||||
@@ -107,7 +107,10 @@ class MainNetLedger(BaseLedger):
|
||||
await super().start()
|
||||
await asyncio.gather(*(a.maybe_migrate_certificates() for a in self.accounts))
|
||||
await asyncio.gather(*(a.save_max_gap() for a in self.accounts))
|
||||
await self._report_state()
|
||||
if len(self.accounts) > 10:
|
||||
log.info("Loaded %i accounts", len(self.accounts))
|
||||
else:
|
||||
await self._report_state()
|
||||
self.on_transaction.listen(self._reset_balance_cache)
|
||||
|
||||
async def _report_state(self):
|
||||
|
||||
@@ -226,7 +226,7 @@ class LbryWalletManager(BaseWalletManager):
|
||||
try:
|
||||
await self.ledger.broadcast(tx)
|
||||
if blocking:
|
||||
await self.ledger.wait(tx)
|
||||
await self.ledger.wait(tx, timeout=None)
|
||||
except:
|
||||
await self.ledger.release_tx(tx)
|
||||
raise
|
||||
@@ -188,6 +188,7 @@ class SQLDB:
|
||||
cursor.setrowtrace(lambda cursor, row: tpl(*row))
|
||||
return True
|
||||
self.db.setexectrace(exec_factory)
|
||||
self.execute(self.PRAGMAS)
|
||||
self.execute(self.CREATE_TABLES_QUERY)
|
||||
register_canonical_functions(self.db)
|
||||
register_trending_functions(self.db)
|
||||
|
||||
@@ -285,14 +285,14 @@ def get_dsn(args):
|
||||
|
||||
|
||||
def get_servers(args):
|
||||
if '..' in args.server_range:
|
||||
start, end = args.server_range.split('..')
|
||||
else:
|
||||
start = end = args.server_range
|
||||
return [
|
||||
args.server_url.format(i)
|
||||
for i in range(int(start), int(end)+1)
|
||||
]
|
||||
servers = []
|
||||
for s in args.server_range.split(","):
|
||||
if '..' in s:
|
||||
start, end = s.split('..')
|
||||
servers.extend(range(int(start), int(end)+1))
|
||||
else:
|
||||
servers.append(int(s))
|
||||
return [args.server_url.format(i) for i in servers]
|
||||
|
||||
|
||||
def get_slack_client(args):
|
||||
|
||||
@@ -36,16 +36,17 @@ class PurchaseCommandTests(CommandTestCase):
|
||||
await self.ledger.wait(purchase)
|
||||
return claim_id
|
||||
|
||||
async def assertStreamPurchased(self, stream: Transaction, purchase: Transaction):
|
||||
stream_txo, purchase_txo = stream.outputs[0], purchase.outputs[0]
|
||||
stream_fee = stream_txo.claim.stream.fee
|
||||
self.assertEqual(stream_fee.dewies, purchase_txo.amount)
|
||||
self.assertEqual(stream_fee.address, purchase_txo.get_address(self.ledger))
|
||||
async def assertStreamPurchased(self, stream: Transaction, operation):
|
||||
|
||||
await self.account.release_all_outputs()
|
||||
buyer_balance = await self.account.get_balance()
|
||||
merchant_balance = lbc_to_dewies(str(await self.blockchain.get_balance()))
|
||||
pre_purchase_count = (await self.daemon.jsonrpc_purchase_list())['total_items']
|
||||
purchase = await operation()
|
||||
stream_txo, purchase_txo = stream.outputs[0], purchase.outputs[0]
|
||||
stream_fee = stream_txo.claim.stream.fee
|
||||
self.assertEqual(stream_fee.dewies, purchase_txo.amount)
|
||||
self.assertEqual(stream_fee.address, purchase_txo.get_address(self.ledger))
|
||||
|
||||
await self.ledger.wait(purchase)
|
||||
await self.generate(1)
|
||||
@@ -76,8 +77,7 @@ class PurchaseCommandTests(CommandTestCase):
|
||||
claim_id = stream.outputs[0].claim_id
|
||||
|
||||
# explicit purchase of claim
|
||||
tx = await self.daemon.jsonrpc_purchase_create(claim_id)
|
||||
await self.assertStreamPurchased(stream, tx)
|
||||
await self.assertStreamPurchased(stream, lambda: self.daemon.jsonrpc_purchase_create(claim_id))
|
||||
|
||||
# check that `get` doesn't purchase it again
|
||||
balance = await self.account.get_balance()
|
||||
@@ -88,8 +88,12 @@ class PurchaseCommandTests(CommandTestCase):
|
||||
|
||||
# `get` does purchase a stream we don't have yet
|
||||
another_stream = await self.priced_stream('another')
|
||||
response = await self.daemon.jsonrpc_get('lbry://another')
|
||||
await self.assertStreamPurchased(another_stream, response.content_fee)
|
||||
|
||||
async def imagine_its_a_lambda():
|
||||
response = await self.daemon.jsonrpc_get('lbry://another')
|
||||
return response.content_fee
|
||||
|
||||
await self.assertStreamPurchased(another_stream, imagine_its_a_lambda)
|
||||
|
||||
# purchase non-existent claim fails
|
||||
with self.assertRaisesRegex(Exception, "Could not find claim with claim_id"):
|
||||
@@ -105,13 +109,13 @@ class PurchaseCommandTests(CommandTestCase):
|
||||
await self.daemon.jsonrpc_purchase_create(claim_id)
|
||||
|
||||
# force purchasing claim you already own
|
||||
tx = await self.daemon.jsonrpc_purchase_create(claim_id, allow_duplicate_purchase=True)
|
||||
await self.assertStreamPurchased(stream, tx)
|
||||
await self.assertStreamPurchased(
|
||||
stream, lambda: self.daemon.jsonrpc_purchase_create(claim_id, allow_duplicate_purchase=True)
|
||||
)
|
||||
|
||||
# purchase by uri
|
||||
abc_stream = await self.priced_stream('abc')
|
||||
tx = await self.daemon.jsonrpc_purchase_create(url='lbry://abc')
|
||||
await self.assertStreamPurchased(abc_stream, tx)
|
||||
await self.assertStreamPurchased(abc_stream, lambda: self.daemon.jsonrpc_purchase_create(url='lbry://abc'))
|
||||
|
||||
async def test_purchase_and_transaction_list(self):
|
||||
self.assertItemCount(await self.daemon.jsonrpc_purchase_list(), 0)
|
||||
|
||||
@@ -265,7 +265,7 @@ class ResolveAfterReorg(BaseResolveTestCase):
|
||||
|
||||
async def reorg(self, start):
|
||||
blocks = self.ledger.headers.height - start
|
||||
self.blockchain._block_expected = start - 1
|
||||
self.blockchain.block_expected = start - 1
|
||||
# go back to start
|
||||
await self.blockchain.invalidate_block(self.ledger.headers.hash(start).decode())
|
||||
# go to previous + 1
|
||||
|
||||
@@ -575,7 +575,7 @@ class BaseLedger(metaclass=LedgerRegistry):
|
||||
# broadcast can't be a retriable call yet
|
||||
return self.network.broadcast(hexlify(tx.raw).decode())
|
||||
|
||||
async def wait(self, tx: basetransaction.BaseTransaction, height=-1, timeout=None):
|
||||
async def wait(self, tx: basetransaction.BaseTransaction, height=-1, timeout=1):
|
||||
addresses = set()
|
||||
for txi in tx.inputs:
|
||||
if txi.txo_ref.txo is not None:
|
||||
@@ -593,4 +593,12 @@ class BaseLedger(metaclass=LedgerRegistry):
|
||||
)) for address_record in records
|
||||
], timeout=timeout)
|
||||
if pending:
|
||||
raise asyncio.TimeoutError('Timed out waiting for transaction.')
|
||||
for record in records:
|
||||
found = False
|
||||
_, local_history = await self.get_local_status_and_history(None, history=record['history'])
|
||||
for txid, local_height in local_history:
|
||||
if txid == tx.id and local_height >= height:
|
||||
found = True
|
||||
if not found:
|
||||
print(record['history'], addresses, tx.id)
|
||||
raise asyncio.TimeoutError('Timed out waiting for transaction.')
|
||||
@@ -232,7 +232,7 @@ class BaseNetwork:
|
||||
|
||||
def get_transaction(self, tx_hash, known_height=None):
|
||||
# use any server if its old, otherwise restrict to who gave us the history
|
||||
restricted = not known_height or 0 > known_height > self.remote_height - 10
|
||||
restricted = known_height in (None, -1, 0) or 0 > known_height > self.remote_height - 10
|
||||
return self.rpc('blockchain.transaction.get', [tx_hash], restricted)
|
||||
|
||||
def get_transaction_height(self, tx_hash, known_height=None):
|
||||
|
||||
@@ -281,7 +281,7 @@ class BlockchainNode:
|
||||
self.data_path = None
|
||||
self.protocol = None
|
||||
self.transport = None
|
||||
self._block_expected = 0
|
||||
self.block_expected = 0
|
||||
self.hostname = 'localhost'
|
||||
self.peerport = 9246 + 2 # avoid conflict with default peer port
|
||||
self.rpcport = 9245 + 2 # avoid conflict with default rpc port
|
||||
@@ -294,7 +294,7 @@ class BlockchainNode:
|
||||
return f'http://{self.rpcuser}:{self.rpcpassword}@{self.hostname}:{self.rpcport}/'
|
||||
|
||||
def is_expected_block(self, e: BlockHeightEvent):
|
||||
return self._block_expected == e.height
|
||||
return self.block_expected == e.height
|
||||
|
||||
@property
|
||||
def exists(self):
|
||||
@@ -383,7 +383,7 @@ class BlockchainNode:
|
||||
return out.decode().strip()
|
||||
|
||||
def generate(self, blocks):
|
||||
self._block_expected += blocks
|
||||
self.block_expected += blocks
|
||||
return self._cli_cmnd('generate', str(blocks))
|
||||
|
||||
def invalidate_block(self, blockhash):
|
||||
|
||||
@@ -11,7 +11,6 @@ import asyncio
|
||||
import itertools
|
||||
import time
|
||||
from abc import ABC, abstractmethod
|
||||
from asyncio import Lock, sleep
|
||||
from collections import defaultdict
|
||||
|
||||
import attr
|
||||
@@ -104,7 +103,8 @@ class MemPool:
|
||||
self.refresh_secs = refresh_secs
|
||||
self.log_status_secs = log_status_secs
|
||||
# Prevents mempool refreshes during fee histogram calculation
|
||||
self.lock = Lock()
|
||||
self.lock = asyncio.Lock()
|
||||
self.wakeup = asyncio.Event()
|
||||
|
||||
async def _logging(self, synchronized_event):
|
||||
"""Print regular logs of mempool stats."""
|
||||
@@ -117,7 +117,7 @@ class MemPool:
|
||||
while True:
|
||||
self.logger.info(f'{len(self.txs):,d} txs '
|
||||
f'touching {len(self.hashXs):,d} addresses')
|
||||
await sleep(self.log_status_secs)
|
||||
await asyncio.sleep(self.log_status_secs)
|
||||
await synchronized_event.wait()
|
||||
|
||||
async def _refresh_histogram(self, synchronized_event):
|
||||
@@ -126,7 +126,7 @@ class MemPool:
|
||||
async with self.lock:
|
||||
# Threaded as can be expensive
|
||||
await asyncio.get_event_loop().run_in_executor(None, self._update_histogram, 100_000)
|
||||
await sleep(self.coin.MEMPOOL_HISTOGRAM_REFRESH_SECS)
|
||||
await asyncio.sleep(self.coin.MEMPOOL_HISTOGRAM_REFRESH_SECS)
|
||||
|
||||
def _update_histogram(self, bin_size):
|
||||
# Build a histogram by fee rate
|
||||
@@ -212,7 +212,13 @@ class MemPool:
|
||||
synchronized_event.set()
|
||||
synchronized_event.clear()
|
||||
await self.api.on_mempool(touched, height)
|
||||
await sleep(self.refresh_secs)
|
||||
try:
|
||||
# we wait up to `refresh_secs` but go early if a broadcast happens (which triggers wakeup event)
|
||||
await asyncio.wait_for(self.wakeup.wait(), timeout=self.refresh_secs)
|
||||
except asyncio.TimeoutError:
|
||||
pass
|
||||
finally:
|
||||
self.wakeup.clear()
|
||||
|
||||
async def _process_mempool(self, all_hashes):
|
||||
# Re-sync with the new set of hashes
|
||||
|
||||
@@ -286,7 +286,7 @@ class SessionManager:
|
||||
def _get_info(self):
|
||||
"""A summary of server state."""
|
||||
group_map = self._group_map()
|
||||
method_counts = collections.defaultdict(0)
|
||||
method_counts = collections.defaultdict(int)
|
||||
error_count = 0
|
||||
logged = 0
|
||||
paused = 0
|
||||
@@ -567,6 +567,7 @@ class SessionManager:
|
||||
|
||||
async def broadcast_transaction(self, raw_tx):
|
||||
hex_hash = await self.daemon.broadcast_transaction(raw_tx)
|
||||
self.mempool.wakeup.set()
|
||||
self.txs_sent += 1
|
||||
return hex_hash
|
||||
|
||||
|
||||
Reference in new issue
Block a user