Commit 97fb33c5 authored by LaurentMT's avatar LaurentMT
Browse files

Merge branch 'develop' into 'master'

Merge develop into master for new version

See merge request !11
parents 885d4d0f 4399a16e
......@@ -200,7 +200,7 @@ These snapshots can be downloaded at the urls:
- https://oxt.me/static/share/whirlpool/whirlpool_mix_txs_`denom`.csv (list of mix transactions)
- https://oxt.me/static/share/whirlpool/whirlpool_tx0s_`denom`.csv (list of mix tx0s)
- https://oxt.me/static/share/whirlpool/whirlpool_links_`denom`.csv (list of edges between the transactions)
where `denom` is a code identifying the pool denomination (valid codes = 05, 005, 001)
where `denom` is a code identifying the pool denomination (valid codes = 05, 005, 001, 0001)
## Contributors
......
......@@ -13,13 +13,13 @@ class build_ext(_build_ext):
setup(
name='whirlpool_stats',
packages=find_packages(),
version='0.1.0',
version='0.2.0',
description='A set of python scripts allowing to compute statistics about Whirlpool.',
author='laurentmt',
author_email='laurentmt145@gmail.com',
maintainer='laurentmt',
url='https://github.com/Samourai-Wallet/whirlpool_stats',
download_url='https://github.com/Samourai-Wallet/whirlpool_stats/tarball/0.1.0',
download_url='https://code.samourai.io/whirlpool/whirlpool_stats/-/archive/v0.2.0/whirlpool_stats-v0.2.0.tar.gz',
keywords=['bitcoin', 'privacy'],
classifiers=['Development Status :: 3 - Alpha', 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License',
'Natural Language :: English', 'Programming Language :: Python :: 3.4',
......
......@@ -74,13 +74,14 @@ def usage():
'''
Usage message for this module
'''
sys.stdout.write('python download_snapshot.py [--target_dir=/tmp] [--denoms=05,005,001] [--socks5=localhost:9050]\n')
sys.stdout.write('python download_snapshot.py [--target_dir=/tmp] [--denoms=05,005,001,0001] [--socks5=localhost:9050]\n')
sys.stdout.write('\n\n[-t OR --target_dir] = Path of the directory that will store the snapshot files.')
sys.stdout.write('\n\n[-d OR --denoms] = List of codes identifying the mix denominations of interest.')
sys.stdout.write('\n Available denomination codes are :')
sys.stdout.write('\n 05 (O.5 BTC pools')
sys.stdout.write('\n 005 (O.05 BTC pools')
sys.stdout.write('\n 001 (O.01 BTC pools')
sys.stdout.write('\n 0001 (O.001 BTC pools')
sys.stdout.write('\n\n[-s OR --socks5] = Url of the socks5 proxy to use for downloading the snapshot.')
sys.stdout.flush()
......
......@@ -25,7 +25,7 @@ class TxScores(object):
for a transaction (tx0 or mix) identified by its TXID
Parameters:
txid = Transaction id
denom (optional) = Pool denomination (05, 005, 001)
denom (optional) = Pool denomination (05, 005, 001, 0001)
'''
print('Processing scores for transaction %s' % txid)
......
......@@ -22,11 +22,13 @@ FILENAME_TEMPLATES = [
DENOM_05 = '05'
DENOM_005 = '005'
DENOM_001 = '001'
DENOM_0001 = '0001'
ALL_DENOMS = [
DENOM_05,
DENOM_005,
DENOM_001
DENOM_001,
DENOM_0001
]
# Number of participants per mix
......
......@@ -104,7 +104,7 @@ Examples:
def do_download(self, args):
'''
Downloads the snapshot(s) for one or several pool denominations
Available denomnination codes are 05, 005, 001
Available denomnination codes are 05, 005, 001, 0001
Examples:
download 05 => downloads the snapshot of the 0.5BTC pools
download 005,001 => downloads the snapshots of the 0.05BTC and 0.01BTC pools
......@@ -121,7 +121,7 @@ Examples:
'''
Loads in memory the snapshot of a given denomination
and computes its metrics
Available denomnination codes are 05, 005, 001
Available denomnination codes are 05, 005, 001, 0001
Examples:
compute 05 => compute metrics for snaphot of the 0.5BTC pools
'''
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment