Browse Source

add sphynx documentation

Malte Kraus 8 years ago
parent
commit
d77bf3b335

+ 2 - 0
.gitignore

@@ -1,2 +1,4 @@
 __pycache__
 __pycache__
 .venv
 .venv
+/doc/_autosummary/
+/doc/_build/

+ 225 - 0
doc/Makefile

@@ -0,0 +1,225 @@
+# Makefile for Sphinx documentation
+#
+
+# You can set these variables from the command line.
+SPHINXOPTS    =
+SPHINXBUILD   = sphinx-build
+PAPER         =
+BUILDDIR      = _build
+
+# Internal variables.
+PAPEROPT_a4     = -D latex_paper_size=a4
+PAPEROPT_letter = -D latex_paper_size=letter
+ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
+# the i18n builder cannot share the environment and doctrees with the others
+I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
+
+.PHONY: help
+help:
+	@echo "Please use \`make <target>' where <target> is one of"
+	@echo "  html       to make standalone HTML files"
+	@echo "  dirhtml    to make HTML files named index.html in directories"
+	@echo "  singlehtml to make a single large HTML file"
+	@echo "  pickle     to make pickle files"
+	@echo "  json       to make JSON files"
+	@echo "  htmlhelp   to make HTML files and a HTML help project"
+	@echo "  qthelp     to make HTML files and a qthelp project"
+	@echo "  applehelp  to make an Apple Help Book"
+	@echo "  devhelp    to make HTML files and a Devhelp project"
+	@echo "  epub       to make an epub"
+	@echo "  epub3      to make an epub3"
+	@echo "  latex      to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
+	@echo "  latexpdf   to make LaTeX files and run them through pdflatex"
+	@echo "  latexpdfja to make LaTeX files and run them through platex/dvipdfmx"
+	@echo "  text       to make text files"
+	@echo "  man        to make manual pages"
+	@echo "  texinfo    to make Texinfo files"
+	@echo "  info       to make Texinfo files and run them through makeinfo"
+	@echo "  gettext    to make PO message catalogs"
+	@echo "  changes    to make an overview of all changed/added/deprecated items"
+	@echo "  xml        to make Docutils-native XML files"
+	@echo "  pseudoxml  to make pseudoxml-XML files for display purposes"
+	@echo "  linkcheck  to check all external links for integrity"
+	@echo "  doctest    to run all doctests embedded in the documentation (if enabled)"
+	@echo "  coverage   to run coverage check of the documentation (if enabled)"
+	@echo "  dummy      to check syntax errors of document sources"
+
+.PHONY: clean
+clean:
+	rm -rf $(BUILDDIR)/* _autosummary/*
+
+.PHONY: html
+html:
+	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
+	@echo
+	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
+
+.PHONY: dirhtml
+dirhtml:
+	$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
+	@echo
+	@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
+
+.PHONY: singlehtml
+singlehtml:
+	$(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml
+	@echo
+	@echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml."
+
+.PHONY: pickle
+pickle:
+	$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
+	@echo
+	@echo "Build finished; now you can process the pickle files."
+
+.PHONY: json
+json:
+	$(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
+	@echo
+	@echo "Build finished; now you can process the JSON files."
+
+.PHONY: htmlhelp
+htmlhelp:
+	$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
+	@echo
+	@echo "Build finished; now you can run HTML Help Workshop with the" \
+	      ".hhp project file in $(BUILDDIR)/htmlhelp."
+
+.PHONY: qthelp
+qthelp:
+	$(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
+	@echo
+	@echo "Build finished; now you can run "qcollectiongenerator" with the" \
+	      ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
+	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/blockchain.qhcp"
+	@echo "To view the help file:"
+	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/blockchain.qhc"
+
+.PHONY: applehelp
+applehelp:
+	$(SPHINXBUILD) -b applehelp $(ALLSPHINXOPTS) $(BUILDDIR)/applehelp
+	@echo
+	@echo "Build finished. The help book is in $(BUILDDIR)/applehelp."
+	@echo "N.B. You won't be able to view it unless you put it in" \
+	      "~/Library/Documentation/Help or install it in your application" \
+	      "bundle."
+
+.PHONY: devhelp
+devhelp:
+	$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
+	@echo
+	@echo "Build finished."
+	@echo "To view the help file:"
+	@echo "# mkdir -p $$HOME/.local/share/devhelp/blockchain"
+	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/blockchain"
+	@echo "# devhelp"
+
+.PHONY: epub
+epub:
+	$(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
+	@echo
+	@echo "Build finished. The epub file is in $(BUILDDIR)/epub."
+
+.PHONY: epub3
+epub3:
+	$(SPHINXBUILD) -b epub3 $(ALLSPHINXOPTS) $(BUILDDIR)/epub3
+	@echo
+	@echo "Build finished. The epub3 file is in $(BUILDDIR)/epub3."
+
+.PHONY: latex
+latex:
+	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+	@echo
+	@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
+	@echo "Run \`make' in that directory to run these through (pdf)latex" \
+	      "(use \`make latexpdf' here to do that automatically)."
+
+.PHONY: latexpdf
+latexpdf:
+	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+	@echo "Running LaTeX files through pdflatex..."
+	$(MAKE) -C $(BUILDDIR)/latex all-pdf
+	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
+
+.PHONY: latexpdfja
+latexpdfja:
+	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+	@echo "Running LaTeX files through platex and dvipdfmx..."
+	$(MAKE) -C $(BUILDDIR)/latex all-pdf-ja
+	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
+
+.PHONY: text
+text:
+	$(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text
+	@echo
+	@echo "Build finished. The text files are in $(BUILDDIR)/text."
+
+.PHONY: man
+man:
+	$(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man
+	@echo
+	@echo "Build finished. The manual pages are in $(BUILDDIR)/man."
+
+.PHONY: texinfo
+texinfo:
+	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
+	@echo
+	@echo "Build finished. The Texinfo files are in $(BUILDDIR)/texinfo."
+	@echo "Run \`make' in that directory to run these through makeinfo" \
+	      "(use \`make info' here to do that automatically)."
+
+.PHONY: info
+info:
+	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
+	@echo "Running Texinfo files through makeinfo..."
+	make -C $(BUILDDIR)/texinfo info
+	@echo "makeinfo finished; the Info files are in $(BUILDDIR)/texinfo."
+
+.PHONY: gettext
+gettext:
+	$(SPHINXBUILD) -b gettext $(I18NSPHINXOPTS) $(BUILDDIR)/locale
+	@echo
+	@echo "Build finished. The message catalogs are in $(BUILDDIR)/locale."
+
+.PHONY: changes
+changes:
+	$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
+	@echo
+	@echo "The overview file is in $(BUILDDIR)/changes."
+
+.PHONY: linkcheck
+linkcheck:
+	$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
+	@echo
+	@echo "Link check complete; look for any errors in the above output " \
+	      "or in $(BUILDDIR)/linkcheck/output.txt."
+
+.PHONY: doctest
+doctest:
+	$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
+	@echo "Testing of doctests in the sources finished, look at the " \
+	      "results in $(BUILDDIR)/doctest/output.txt."
+
+.PHONY: coverage
+coverage:
+	$(SPHINXBUILD) -b coverage $(ALLSPHINXOPTS) $(BUILDDIR)/coverage
+	@echo "Testing of coverage in the sources finished, look at the " \
+	      "results in $(BUILDDIR)/coverage/python.txt."
+
+.PHONY: xml
+xml:
+	$(SPHINXBUILD) -b xml $(ALLSPHINXOPTS) $(BUILDDIR)/xml
+	@echo
+	@echo "Build finished. The XML files are in $(BUILDDIR)/xml."
+
+.PHONY: pseudoxml
+pseudoxml:
+	$(SPHINXBUILD) -b pseudoxml $(ALLSPHINXOPTS) $(BUILDDIR)/pseudoxml
+	@echo
+	@echo "Build finished. The pseudo-XML files are in $(BUILDDIR)/pseudoxml."
+
+.PHONY: dummy
+dummy:
+	$(SPHINXBUILD) -b dummy $(ALLSPHINXOPTS) $(BUILDDIR)/dummy
+	@echo
+	@echo "Build finished. Dummy builder generates no files."

+ 0 - 0
doc/_static/.gitkeep


+ 0 - 0
doc/_templates/.gitkeep


+ 374 - 0
doc/conf.py

@@ -0,0 +1,374 @@
+# -*- coding: utf-8 -*-
+#
+# blockchain documentation build configuration file, created by
+# sphinx-quickstart on Mon Mar  6 15:54:51 2017.
+#
+# This file is execfile()d with the current directory set to its
+# containing dir.
+#
+# Note that not all possible configuration values are present in this
+# autogenerated file.
+#
+# All configuration values have a default; values that are commented out
+# serve to show the default.
+
+# If extensions (or modules to document with autodoc) are in another directory,
+# add these directories to sys.path here. If the directory is relative to the
+# documentation root, use os.path.abspath to make it absolute, like shown here.
+#
+import os
+import sys
+sys.path.insert(0, os.path.split(os.path.split(__file__)[0])[0])
+
+# -- General configuration ------------------------------------------------
+
+# If your documentation needs a minimal Sphinx version, state it here.
+#
+# needs_sphinx = '1.0'
+
+# Add any Sphinx extension module names here, as strings. They can be
+# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
+# ones.
+extensions = [
+    'sphinx.ext.autodoc',
+    'sphinx.ext.autosummary',
+    'sphinx.ext.doctest',
+    'sphinx.ext.coverage',
+]
+autosummary_generate = True
+
+# Add any paths that contain templates here, relative to this directory.
+templates_path = ['_templates']
+
+# The suffix(es) of source filenames.
+# You can specify multiple suffix as a list of string:
+#
+# source_suffix = ['.rst', '.md']
+source_suffix = '.rst'
+
+# The encoding of source files.
+#
+# source_encoding = 'utf-8-sig'
+
+# The master toctree document.
+master_doc = 'index'
+
+# General information about the project.
+project = u'blockchain'
+copyright = u'2017, blockchain authors'
+author = u'blockchain authors'
+
+# The version info for the project you're documenting, acts as replacement for
+# |version| and |release|, also used in various other places throughout the
+# built documents.
+#
+# The short X.Y version.
+version = u'0.1'
+# The full version, including alpha/beta/rc tags.
+release = u'0.1'
+
+# The language for content autogenerated by Sphinx. Refer to documentation
+# for a list of supported languages.
+#
+# This is also used if you do content translation via gettext catalogs.
+# Usually you set "language" from the command line for these cases.
+language = None
+
+# There are two options for replacing |today|: either, you set today to some
+# non-false value, then it is used:
+#
+# today = ''
+#
+# Else, today_fmt is used as the format for a strftime call.
+#
+# today_fmt = '%B %d, %Y'
+
+# List of patterns, relative to source directory, that match files and
+# directories to ignore when looking for source files.
+# This patterns also effect to html_static_path and html_extra_path
+exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store']
+
+# The reST default role (used for this markup: `text`) to use for all
+# documents.
+#
+# default_role = None
+
+# If true, '()' will be appended to :func: etc. cross-reference text.
+#
+# add_function_parentheses = True
+
+# If true, the current module name will be prepended to all description
+# unit titles (such as .. function::).
+#
+# add_module_names = True
+
+# If true, sectionauthor and moduleauthor directives will be shown in the
+# output. They are ignored by default.
+#
+# show_authors = False
+
+# The name of the Pygments (syntax highlighting) style to use.
+pygments_style = 'sphinx'
+
+# A list of ignored prefixes for module index sorting.
+# modindex_common_prefix = []
+
+# If true, keep warnings as "system message" paragraphs in the built documents.
+# keep_warnings = False
+
+# If true, `todo` and `todoList` produce output, else they produce nothing.
+todo_include_todos = False
+
+
+# -- Options for HTML output ----------------------------------------------
+
+# The theme to use for HTML and HTML Help pages.  See the documentation for
+# a list of builtin themes.
+#
+html_theme = 'alabaster'
+
+# Theme options are theme-specific and customize the look and feel of a theme
+# further.  For a list of options available for each theme, see the
+# documentation.
+#
+# html_theme_options = {}
+
+# Add any paths that contain custom themes here, relative to this directory.
+# html_theme_path = []
+
+# The name for this set of Sphinx documents.
+# "<project> v<release> documentation" by default.
+#
+# html_title = u'blockchain v0.1'
+
+# A shorter title for the navigation bar.  Default is the same as html_title.
+#
+# html_short_title = None
+
+# The name of an image file (relative to this directory) to place at the top
+# of the sidebar.
+#
+# html_logo = None
+
+# The name of an image file (relative to this directory) to use as a favicon of
+# the docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
+# pixels large.
+#
+# html_favicon = None
+
+# Add any paths that contain custom static files (such as style sheets) here,
+# relative to this directory. They are copied after the builtin static files,
+# so a file named "default.css" will overwrite the builtin "default.css".
+html_static_path = ['_static']
+
+# Add any extra paths that contain custom files (such as robots.txt or
+# .htaccess) here, relative to this directory. These files are copied
+# directly to the root of the documentation.
+#
+# html_extra_path = []
+
+# If not None, a 'Last updated on:' timestamp is inserted at every page
+# bottom, using the given strftime format.
+# The empty string is equivalent to '%b %d, %Y'.
+#
+# html_last_updated_fmt = None
+
+# If true, SmartyPants will be used to convert quotes and dashes to
+# typographically correct entities.
+#
+# html_use_smartypants = True
+
+# Custom sidebar templates, maps document names to template names.
+#
+# html_sidebars = {}
+
+# Additional templates that should be rendered to pages, maps page names to
+# template names.
+#
+# html_additional_pages = {}
+
+# If false, no module index is generated.
+#
+# html_domain_indices = True
+
+# If false, no index is generated.
+#
+# html_use_index = True
+
+# If true, the index is split into individual pages for each letter.
+#
+# html_split_index = False
+
+# If true, links to the reST sources are added to the pages.
+#
+# html_show_sourcelink = True
+
+# If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
+#
+# html_show_sphinx = True
+
+# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
+#
+# html_show_copyright = True
+
+# If true, an OpenSearch description file will be output, and all pages will
+# contain a <link> tag referring to it.  The value of this option must be the
+# base URL from which the finished HTML is served.
+#
+# html_use_opensearch = ''
+
+# This is the file name suffix for HTML files (e.g. ".xhtml").
+# html_file_suffix = None
+
+# Language to be used for generating the HTML full-text search index.
+# Sphinx supports the following languages:
+#   'da', 'de', 'en', 'es', 'fi', 'fr', 'hu', 'it', 'ja'
+#   'nl', 'no', 'pt', 'ro', 'ru', 'sv', 'tr', 'zh'
+#
+# html_search_language = 'en'
+
+# A dictionary with options for the search language support, empty by default.
+# 'ja' uses this config value.
+# 'zh' user can custom change `jieba` dictionary path.
+#
+# html_search_options = {'type': 'default'}
+
+# The name of a javascript file (relative to the configuration directory) that
+# implements a search results scorer. If empty, the default will be used.
+#
+# html_search_scorer = 'scorer.js'
+
+# Output file base name for HTML help builder.
+htmlhelp_basename = 'blockchaindoc'
+
+# -- Options for LaTeX output ---------------------------------------------
+
+latex_elements = {
+     # The paper size ('letterpaper' or 'a4paper').
+     #
+     # 'papersize': 'letterpaper',
+
+     # The font size ('10pt', '11pt' or '12pt').
+     #
+     # 'pointsize': '10pt',
+
+     # Additional stuff for the LaTeX preamble.
+     #
+     # 'preamble': '',
+
+     # Latex figure (float) alignment
+     #
+     # 'figure_align': 'htbp',
+}
+
+# Grouping the document tree into LaTeX files. List of tuples
+# (source start file, target name, title,
+#  author, documentclass [howto, manual, or own class]).
+latex_documents = [
+    (master_doc, 'blockchain.tex', u'blockchain Documentation',
+     u'blockchain authors', 'manual'),
+]
+
+# The name of an image file (relative to this directory) to place at the top of
+# the title page.
+#
+# latex_logo = None
+
+# For "manual" documents, if this is true, then toplevel headings are parts,
+# not chapters.
+#
+# latex_use_parts = False
+
+# If true, show page references after internal links.
+#
+# latex_show_pagerefs = False
+
+# If true, show URL addresses after external links.
+#
+# latex_show_urls = False
+
+# Documents to append as an appendix to all manuals.
+#
+# latex_appendices = []
+
+# It false, will not define \strong, \code, 	itleref, \crossref ... but only
+# \sphinxstrong, ..., \sphinxtitleref, ... To help avoid clash with user added
+# packages.
+#
+# latex_keep_old_macro_names = True
+
+# If false, no module index is generated.
+#
+# latex_domain_indices = True
+
+
+# -- Options for manual page output ---------------------------------------
+
+# One entry per manual page. List of tuples
+# (source start file, name, description, authors, manual section).
+man_pages = [
+    (master_doc, 'blockchain', u'blockchain Documentation',
+     [author], 1)
+]
+
+# If true, show URL addresses after external links.
+#
+# man_show_urls = False
+
+
+# -- Options for Texinfo output -------------------------------------------
+
+# Grouping the document tree into Texinfo files. List of tuples
+# (source start file, target name, title, author,
+#  dir menu entry, description, category)
+texinfo_documents = [
+    (master_doc, 'blockchain', u'blockchain Documentation',
+     author, 'blockchain', 'One line description of project.',
+     'Miscellaneous'),
+]
+
+# Documents to append as an appendix to all manuals.
+#
+# texinfo_appendices = []
+
+# If false, no module index is generated.
+#
+# texinfo_domain_indices = True
+
+# How to display URL addresses: 'footnote', 'no', or 'inline'.
+#
+# texinfo_show_urls = 'footnote'
+
+# If true, do not generate a @detailmenu in the "Top" node's menu.
+#
+# texinfo_no_detailmenu = False
+
+
+
+
+# Ugly hack for filtering autosummary-generated documentation to only include
+# module members included in `__all__`.
+# This probably won't be neccessary from sphynx 1.6 on.
+
+from sphinx.ext.autosummary import Autosummary
+
+def monkey_get_items():
+    import importlib
+    orig = Autosummary.get_items
+    def get_items(self, names):
+        names = orig(self, names)
+        filtered_names = []
+        for nam in names:
+            full_name = nam[-1]
+            try:
+                mod = importlib.import_module(full_name.rpartition(".")[0])
+            except ValueError:
+                filtered_names.append(nam)
+                continue
+
+            if not hasattr(mod, '__all__') or nam[0] in mod.__all__:
+                filtered_names.append(nam)
+        return filtered_names
+    Autosummary.get_items = get_items
+
+monkey_get_items()

+ 38 - 0
doc/index.rst

@@ -0,0 +1,38 @@
+.. blockchain documentation master file, created by
+   sphinx-quickstart on Mon Mar  6 15:54:51 2017.
+   You can adapt this file completely to your liking, but it should at least
+   contain the root `toctree` directive.
+
+Welcome to blockchain's documentation!
+======================================
+
+Contents:
+
+.. toctree::
+   :maxdepth: 2
+
+
+.. autosummary::
+    :toctree: _autosummary
+
+    src
+    src.blockchain
+    src.block
+    src.chainbuilder
+    src.crypto
+    src.merkle
+    src.mining
+    src.mining_strategy
+    src.proof_of_work
+    src.protocol
+    src.transaction
+
+
+
+Indices and tables
+==================
+
+* :ref:`genindex`
+* :ref:`modindex`
+* :ref:`search`
+

+ 281 - 0
doc/make.bat

@@ -0,0 +1,281 @@
+@ECHO OFF
+
+REM Command file for Sphinx documentation
+
+if "%SPHINXBUILD%" == "" (
+	set SPHINXBUILD=sphinx-build
+)
+set BUILDDIR=_build
+set ALLSPHINXOPTS=-d %BUILDDIR%/doctrees %SPHINXOPTS% .
+set I18NSPHINXOPTS=%SPHINXOPTS% .
+if NOT "%PAPER%" == "" (
+	set ALLSPHINXOPTS=-D latex_paper_size=%PAPER% %ALLSPHINXOPTS%
+	set I18NSPHINXOPTS=-D latex_paper_size=%PAPER% %I18NSPHINXOPTS%
+)
+
+if "%1" == "" goto help
+
+if "%1" == "help" (
+	:help
+	echo.Please use `make ^<target^>` where ^<target^> is one of
+	echo.  html       to make standalone HTML files
+	echo.  dirhtml    to make HTML files named index.html in directories
+	echo.  singlehtml to make a single large HTML file
+	echo.  pickle     to make pickle files
+	echo.  json       to make JSON files
+	echo.  htmlhelp   to make HTML files and a HTML help project
+	echo.  qthelp     to make HTML files and a qthelp project
+	echo.  devhelp    to make HTML files and a Devhelp project
+	echo.  epub       to make an epub
+	echo.  epub3      to make an epub3
+	echo.  latex      to make LaTeX files, you can set PAPER=a4 or PAPER=letter
+	echo.  text       to make text files
+	echo.  man        to make manual pages
+	echo.  texinfo    to make Texinfo files
+	echo.  gettext    to make PO message catalogs
+	echo.  changes    to make an overview over all changed/added/deprecated items
+	echo.  xml        to make Docutils-native XML files
+	echo.  pseudoxml  to make pseudoxml-XML files for display purposes
+	echo.  linkcheck  to check all external links for integrity
+	echo.  doctest    to run all doctests embedded in the documentation if enabled
+	echo.  coverage   to run coverage check of the documentation if enabled
+	echo.  dummy      to check syntax errors of document sources
+	goto end
+)
+
+if "%1" == "clean" (
+	for /d %%i in (%BUILDDIR%\*) do rmdir /q /s %%i
+	del /q /s %BUILDDIR%\*
+	goto end
+)
+
+
+REM Check if sphinx-build is available and fallback to Python version if any
+%SPHINXBUILD% 1>NUL 2>NUL
+if errorlevel 9009 goto sphinx_python
+goto sphinx_ok
+
+:sphinx_python
+
+set SPHINXBUILD=python -m sphinx.__init__
+%SPHINXBUILD% 2> nul
+if errorlevel 9009 (
+	echo.
+	echo.The 'sphinx-build' command was not found. Make sure you have Sphinx
+	echo.installed, then set the SPHINXBUILD environment variable to point
+	echo.to the full path of the 'sphinx-build' executable. Alternatively you
+	echo.may add the Sphinx directory to PATH.
+	echo.
+	echo.If you don't have Sphinx installed, grab it from
+	echo.http://sphinx-doc.org/
+	exit /b 1
+)
+
+:sphinx_ok
+
+
+if "%1" == "html" (
+	%SPHINXBUILD% -b html %ALLSPHINXOPTS% %BUILDDIR%/html
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The HTML pages are in %BUILDDIR%/html.
+	goto end
+)
+
+if "%1" == "dirhtml" (
+	%SPHINXBUILD% -b dirhtml %ALLSPHINXOPTS% %BUILDDIR%/dirhtml
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The HTML pages are in %BUILDDIR%/dirhtml.
+	goto end
+)
+
+if "%1" == "singlehtml" (
+	%SPHINXBUILD% -b singlehtml %ALLSPHINXOPTS% %BUILDDIR%/singlehtml
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The HTML pages are in %BUILDDIR%/singlehtml.
+	goto end
+)
+
+if "%1" == "pickle" (
+	%SPHINXBUILD% -b pickle %ALLSPHINXOPTS% %BUILDDIR%/pickle
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished; now you can process the pickle files.
+	goto end
+)
+
+if "%1" == "json" (
+	%SPHINXBUILD% -b json %ALLSPHINXOPTS% %BUILDDIR%/json
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished; now you can process the JSON files.
+	goto end
+)
+
+if "%1" == "htmlhelp" (
+	%SPHINXBUILD% -b htmlhelp %ALLSPHINXOPTS% %BUILDDIR%/htmlhelp
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished; now you can run HTML Help Workshop with the ^
+.hhp project file in %BUILDDIR%/htmlhelp.
+	goto end
+)
+
+if "%1" == "qthelp" (
+	%SPHINXBUILD% -b qthelp %ALLSPHINXOPTS% %BUILDDIR%/qthelp
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished; now you can run "qcollectiongenerator" with the ^
+.qhcp project file in %BUILDDIR%/qthelp, like this:
+	echo.^> qcollectiongenerator %BUILDDIR%\qthelp\blockchain.qhcp
+	echo.To view the help file:
+	echo.^> assistant -collectionFile %BUILDDIR%\qthelp\blockchain.ghc
+	goto end
+)
+
+if "%1" == "devhelp" (
+	%SPHINXBUILD% -b devhelp %ALLSPHINXOPTS% %BUILDDIR%/devhelp
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished.
+	goto end
+)
+
+if "%1" == "epub" (
+	%SPHINXBUILD% -b epub %ALLSPHINXOPTS% %BUILDDIR%/epub
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The epub file is in %BUILDDIR%/epub.
+	goto end
+)
+
+if "%1" == "epub3" (
+	%SPHINXBUILD% -b epub3 %ALLSPHINXOPTS% %BUILDDIR%/epub3
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The epub3 file is in %BUILDDIR%/epub3.
+	goto end
+)
+
+if "%1" == "latex" (
+	%SPHINXBUILD% -b latex %ALLSPHINXOPTS% %BUILDDIR%/latex
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished; the LaTeX files are in %BUILDDIR%/latex.
+	goto end
+)
+
+if "%1" == "latexpdf" (
+	%SPHINXBUILD% -b latex %ALLSPHINXOPTS% %BUILDDIR%/latex
+	cd %BUILDDIR%/latex
+	make all-pdf
+	cd %~dp0
+	echo.
+	echo.Build finished; the PDF files are in %BUILDDIR%/latex.
+	goto end
+)
+
+if "%1" == "latexpdfja" (
+	%SPHINXBUILD% -b latex %ALLSPHINXOPTS% %BUILDDIR%/latex
+	cd %BUILDDIR%/latex
+	make all-pdf-ja
+	cd %~dp0
+	echo.
+	echo.Build finished; the PDF files are in %BUILDDIR%/latex.
+	goto end
+)
+
+if "%1" == "text" (
+	%SPHINXBUILD% -b text %ALLSPHINXOPTS% %BUILDDIR%/text
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The text files are in %BUILDDIR%/text.
+	goto end
+)
+
+if "%1" == "man" (
+	%SPHINXBUILD% -b man %ALLSPHINXOPTS% %BUILDDIR%/man
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The manual pages are in %BUILDDIR%/man.
+	goto end
+)
+
+if "%1" == "texinfo" (
+	%SPHINXBUILD% -b texinfo %ALLSPHINXOPTS% %BUILDDIR%/texinfo
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The Texinfo files are in %BUILDDIR%/texinfo.
+	goto end
+)
+
+if "%1" == "gettext" (
+	%SPHINXBUILD% -b gettext %I18NSPHINXOPTS% %BUILDDIR%/locale
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The message catalogs are in %BUILDDIR%/locale.
+	goto end
+)
+
+if "%1" == "changes" (
+	%SPHINXBUILD% -b changes %ALLSPHINXOPTS% %BUILDDIR%/changes
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.The overview file is in %BUILDDIR%/changes.
+	goto end
+)
+
+if "%1" == "linkcheck" (
+	%SPHINXBUILD% -b linkcheck %ALLSPHINXOPTS% %BUILDDIR%/linkcheck
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Link check complete; look for any errors in the above output ^
+or in %BUILDDIR%/linkcheck/output.txt.
+	goto end
+)
+
+if "%1" == "doctest" (
+	%SPHINXBUILD% -b doctest %ALLSPHINXOPTS% %BUILDDIR%/doctest
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Testing of doctests in the sources finished, look at the ^
+results in %BUILDDIR%/doctest/output.txt.
+	goto end
+)
+
+if "%1" == "coverage" (
+	%SPHINXBUILD% -b coverage %ALLSPHINXOPTS% %BUILDDIR%/coverage
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Testing of coverage in the sources finished, look at the ^
+results in %BUILDDIR%/coverage/python.txt.
+	goto end
+)
+
+if "%1" == "xml" (
+	%SPHINXBUILD% -b xml %ALLSPHINXOPTS% %BUILDDIR%/xml
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The XML files are in %BUILDDIR%/xml.
+	goto end
+)
+
+if "%1" == "pseudoxml" (
+	%SPHINXBUILD% -b pseudoxml %ALLSPHINXOPTS% %BUILDDIR%/pseudoxml
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. The pseudo-XML files are in %BUILDDIR%/pseudoxml.
+	goto end
+)
+
+if "%1" == "dummy" (
+	%SPHINXBUILD% -b dummy %ALLSPHINXOPTS% %BUILDDIR%/dummy
+	if errorlevel 1 exit /b 1
+	echo.
+	echo.Build finished. Dummy builder generates no files.
+	goto end
+)
+
+:end

+ 15 - 0
requirements.txt

@@ -0,0 +1,15 @@
+alabaster==0.7.10
+Babel==2.3.4
+docutils==0.13.1
+imagesize==0.7.1
+Jinja2==2.9.5
+MarkupSafe==0.23
+pkg-resources==0.0.0
+pycrypto==2.6.1
+Pygments==2.2.0
+pytz==2016.10
+requests==2.13.0
+six==1.10.0
+snowballstemmer==1.2.1
+Sphinx==1.5.3
+treelib==1.3.5

BIN
src/__init__.pyc


+ 4 - 2
src/block.py

@@ -6,6 +6,8 @@ from .merkle import merkle_tree
 from .crypto import get_hasher
 from .crypto import get_hasher
 from .proof_of_work import verify_proof_of_work, GENESIS_DIFFICULTY
 from .proof_of_work import verify_proof_of_work, GENESIS_DIFFICULTY
 
 
+__all__ = ['Block', 'GENESIS_BLOCK', 'GENESIS_BLOCK_HASH']
+
 class Block:
 class Block:
     """ A block. """
     """ A block. """
 
 
@@ -38,10 +40,10 @@ class Block:
     def from_json_compatible(cls):
     def from_json_compatible(cls):
         return cls(unhexlify(val['hash']),
         return cls(unhexlify(val['hash']),
                    unhexlify(val['prev_block_hash']),
                    unhexlify(val['prev_block_hash']),
-                   datetime.fromtimestamp(int(val['time'])),
+                   datetime.fromtimestamp(float(val['time'])),
                    int(val['nonce']),
                    int(val['nonce']),
                    int(val['height']),
                    int(val['height']),
-                   datetime.now()
+                   datetime.now(),
                    int(val['difficulty']),
                    int(val['difficulty']),
                    unhexlify(val['merkle_root_hash']),
                    unhexlify(val['merkle_root_hash']),
                    [Transaction.from_json_compatible(t) for t in list(val['transactions'])])
                    [Transaction.from_json_compatible(t) for t in list(val['transactions'])])

+ 1 - 0
src/blockchain.py

@@ -1,3 +1,4 @@
+__all__ = ['Blockchain']
 
 
 class Blockchain:
 class Blockchain:
     def __init__(self, blocks: list):
     def __init__(self, blocks: list):

+ 2 - 0
src/chainbuilder.py

@@ -1,6 +1,8 @@
 from .block import GENESIS_BLOCK, GENESIS_BLOCK_HASH
 from .block import GENESIS_BLOCK, GENESIS_BLOCK_HASH
 from .blockchain import Blockchain
 from .blockchain import Blockchain
 
 
+__all__ = ['ChainBuilder']
+
 class ChainBuilder:
 class ChainBuilder:
     """
     """
     Maintains the current longest confirmed (primary) block chain as well as one candidate for an even longer
     Maintains the current longest confirmed (primary) block chain as well as one candidate for an even longer

+ 16 - 5
src/crypto.py

@@ -1,30 +1,41 @@
 """ Cryptographic primitives. """
 """ Cryptographic primitives. """
 
 
-from Crypto.Signature import PKCS1_v1_5
+from Crypto.Signature import PKCS1_PSS
 from Crypto.Hash import SHA512
 from Crypto.Hash import SHA512
 from Crypto.PublicKey import RSA
 from Crypto.PublicKey import RSA
 
 
+__all__ = ['get_hasher', 'Signing', 'MAX_HASH']
 
 
 def get_hasher():
 def get_hasher():
-    """ Returns a object that you can use for hashing. Currently SHA512, swap it out for something if you feel like it! """
+    """
+    Returns a object that you can use for hashing. Currently SHA512, swap it
+    out for something if you feel like it!
+    """
     return SHA512.new()
     return SHA512.new()
 
 
-MAX_HASH = (1 << 512) - 1
+
+MAX_HASH = (1 << 512) - 1 # the largest possible hash value
+
 
 
 class Signing:
 class Signing:
+    """
+    Functionality for creating and verifying signatures, and their
+    public/private keys.
+    """
+
     def __init__(self, byte_repr):
     def __init__(self, byte_repr):
         self.rsa = RSA.importKey(byte_repr)
         self.rsa = RSA.importKey(byte_repr)
 
 
     def verify_sign(self, hashed_value, signature):
     def verify_sign(self, hashed_value, signature):
         """ Verify a signature for a already hashed value and a public key. """
         """ Verify a signature for a already hashed value and a public key. """
-        ver = PKCS1_v1_5.new(self.rsa)
+        ver = PKCS1_PSS.new(self.rsa)
         h = get_hasher()
         h = get_hasher()
         h.update(hashed_value)
         h.update(hashed_value)
         return ver.verify(h, signature)
         return ver.verify(h, signature)
 
 
     def sign(self, hashed_value):
     def sign(self, hashed_value):
         """ Sign a hashed value with a private key. """
         """ Sign a hashed value with a private key. """
-        signer = PKCS1_v1_5.new(self.rsa)
+        signer = PKCS1_PSS.new(self.rsa)
         h = get_hasher()
         h = get_hasher()
         h.update(hashed_value)
         h.update(hashed_value)
         return signer.sign(h)
         return signer.sign(h)

+ 6 - 5
src/merkle.py

@@ -1,8 +1,12 @@
 import json
 import json
+from binascii import hexlify
 from treelib import Node, Tree
 from treelib import Node, Tree
+from itertools import zip_longest
 
 
 from .crypto import get_hasher
 from .crypto import get_hasher
 
 
+__all__ = ['merkle_tree', 'MerkleNode']
+
 class MerkleNode:
 class MerkleNode:
     """ A hash tree node, pointing to a leaf value or another node. """
     """ A hash tree node, pointing to a leaf value or another node. """
 
 
@@ -21,7 +25,7 @@ class MerkleNode:
 
 
     def _get_tree(self, tree, parent):
     def _get_tree(self, tree, parent):
         """ Recursively build a treelib tree for nice pretty printing. """
         """ Recursively build a treelib tree for nice pretty printing. """
-        tree.create_node(self.get_hash()[:10], self, parent)
+        tree.create_node(hexlify(self.get_hash())[:36].decode() + "...", self, parent)
         if isinstance(self.v1, MerkleNode):
         if isinstance(self.v1, MerkleNode):
             self.v1._get_tree(tree, self)
             self.v1._get_tree(tree, self)
         elif self.v1 is not None:
         elif self.v1 is not None:
@@ -48,12 +52,9 @@ def merkle_tree(values):
 
 
     while len(values) > 1:
     while len(values) > 1:
         nodes = []
         nodes = []
-        for (v1, v2) in zip(values[0::2], values[1::2]):
+        for (v1, v2) in zip_longest(values[0::2], values[1::2]):
             nodes.append(MerkleNode(v1, v2))
             nodes.append(MerkleNode(v1, v2))
 
 
-        if len(values) % 2:
-            nodes.append(MerkleNode(values[-1], None))
-
         values = nodes
         values = nodes
 
 
     return values[0]
     return values[0]

+ 2 - 0
src/mining.py

@@ -6,6 +6,8 @@ from .protocol import Protocol
 from threading import Thread
 from threading import Thread
 from time import sleep
 from time import sleep
 
 
+__all__ = ['Miner']
+
 class Miner:
 class Miner:
     def __init__(self, proto, reward_pubkey):
     def __init__(self, proto, reward_pubkey):
         self.proto = proto
         self.proto = proto

+ 2 - 0
src/mining_strategy.py

@@ -6,6 +6,8 @@ from .transaction import Transaction, TransactionTarget
 
 
 from Crypto.PublicKey import RSA
 from Crypto.PublicKey import RSA
 
 
+__all__ = ['create_block']
+
 def create_block(blockchain, unconfirmed_transactions, reward_pubkey):
 def create_block(blockchain, unconfirmed_transactions, reward_pubkey):
     """
     """
     Creates a new block that can be mined.
     Creates a new block that can be mined.

+ 2 - 0
src/proof_of_work.py

@@ -1,5 +1,7 @@
 from .crypto import MAX_HASH
 from .crypto import MAX_HASH
 
 
+__all__ = ['verify_proof_of_work', 'GENESIS_DIFFICULTY', 'ProofOfWork']
+
 def verify_proof_of_work(block):
 def verify_proof_of_work(block):
     """ Verify the proof of work on a block. """
     """ Verify the proof of work on a block. """
     return int.from_bytes(block.hash, byteorder='little', signed=False) > block.difficulty
     return int.from_bytes(block.hash, byteorder='little', signed=False) > block.difficulty

+ 19 - 13
src/protocol.py

@@ -1,11 +1,13 @@
-from src.mining import Miner
 import json
 import json
 from enum import Enum
 from enum import Enum
 import socket
 import socket
+import socketserver
 from threading import Thread
 from threading import Thread
 import logging
 import logging
 from queue import Queue
 from queue import Queue
 
 
+__all__ = ['Protocol']
+
 MAX_PEERS = 10
 MAX_PEERS = 10
 HELLO_MSG = b"bl0ckch41n"
 HELLO_MSG = b"bl0ckch41n"
 
 
@@ -29,20 +31,23 @@ class PeerConnection:
         if self.socket.recv(len(HELLO_MSG)) != HELLO_MSG:
         if self.socket.recv(len(HELLO_MSG)) != HELLO_MSG:
             return
             return
         self.is_connected = True
         self.is_connected = True
-        Thread.start(target=self.close_on_error, args=(self.reader_thread,))
-        self.close_on_error(self.writer_thread)
+        Thread.start(target=self.reader_thread)
+        self.writer_thread()
 
 
-    def close_on_error(self, cmd):
-        try:
-            cmd()
-        except Exception:
-            logging.exception()
-        while not self.outgoing_msgs.empty():
-            self.outgoing_msgs.get_nowait()
-        self.outgoing_msgs.put(None)
-        self.is_connected = False
-        self.socket.close()
+    def close_on_error(fn):
+        def wrapper(self, *args, **kwargs):
+            try:
+                fn(self, *args, **kwargs)
+            except Exception:
+                logging.exception()
+            while not self.outgoing_msgs.empty():
+                self.outgoing_msgs.get_nowait()
+            self.outgoing_msgs.put(None)
+            self.is_connected = False
+            self.socket.close()
+        return wrapper
 
 
+    @close_on_error
     def writer_thread(self):
     def writer_thread(self):
         while True:
         while True:
             item = self.outgoing_msgs.get()
             item = self.outgoing_msgs.get()
@@ -52,6 +57,7 @@ class PeerConnection:
             self.socket.sendall(item)
             self.socket.sendall(item)
             self.outgoing_msgs.task_done()
             self.outgoing_msgs.task_done()
 
 
+    @close_on_error
     def reader_thread(self):
     def reader_thread(self):
         while True:
         while True:
             buf = b""
             buf = b""

+ 9 - 4
src/transaction.py

@@ -1,12 +1,17 @@
 from collections import namedtuple
 from collections import namedtuple
 from binascii import hexlify, unhexlify
 from binascii import hexlify, unhexlify
+from .blockchain import Blockchain
+from .block import Block
 
 
 from .crypto import get_hasher, Signing
 from .crypto import get_hasher, Signing
 
 
-""" The recipient of a transaction ('coin'). """
+__all__ = ['TransactionTarget', 'TransactionInput', 'Transaction']
+
 TransactionTarget = namedtuple("TransactionTarget", ["recipient_pk", "amount"])
 TransactionTarget = namedtuple("TransactionTarget", ["recipient_pk", "amount"])
-""" One transaction input (pointer to 'coin'). """
+""" The recipient of a transaction ('coin'). """
+
 TransactionInput = namedtuple("TransactionInput", ["transaction_hash", "output_idx"])
 TransactionInput = namedtuple("TransactionInput", ["transaction_hash", "output_idx"])
+""" One transaction input (pointer to 'coin'). """
 
 
 from typing import List
 from typing import List
 SigningListType = List[Signing]
 SigningListType = List[Signing]
@@ -14,7 +19,7 @@ SigningListType = List[Signing]
 
 
 class Transaction:
 class Transaction:
 
 
-    def __init__(self, inputs: list, targets: list, signatures=None: list, iv=None: bytes):
+    def __init__(self, inputs: list, targets: list, signatures:list=None, iv:bytes=None):
         self.inputs = inputs
         self.inputs = inputs
         self.targets = targets
         self.targets = targets
         self.signatures = signatures or []
         self.signatures = signatures or []
@@ -108,6 +113,6 @@ class Transaction:
                 return False
                 return False
         return True
         return True
 
 
-    def verify(self, chain: Blockchain, prev_block=None: Block):
+    def verify(self, chain: Blockchain, prev_block:Block=None):
         """ Verifies that this transaction is completely valid. """
         """ Verifies that this transaction is completely valid. """
         return self._verify_single_spend(chain, prev_block) and self._verify_signatures(chain)
         return self._verify_single_spend(chain, prev_block) and self._verify_signatures(chain)

+ 1 - 1
tests/test_merkle.py

@@ -1,4 +1,4 @@
-from merkle import merkle_tree
+from src.merkle import merkle_tree
 
 
 class Val:
 class Val:
     def __init__(self, hash_val):
     def __init__(self, hash_val):