[Pkg-bitcoin-commits] [libblkmaker] 01/01: Imported Upstream version 0.5.1

Dmitry Smirnov onlyjob at moszumanska.debian.org
Mon Apr 6 02:45:12 UTC 2015


This is an automated email from the git hooks/post-receive script.

onlyjob pushed a commit to branch upstream
in repository libblkmaker.

commit 2175ba0 (upstream)
Author: Dmitry Smirnov <onlyjob at member.fsf.org>
Date:   Mon Apr 6 02:44:15 2015

    Imported Upstream version 0.5.1
---
 .gitignore                |  25 ++
 AUTHORS                   |   1 +
 ChangeLog                 | 687 ----------------------------------------------
 blkmaker.h                |   2 +-
 blkmaker_jansson.c        |   4 +-
 blktemplate.c             |   2 +
 configure.ac              |   4 +-
 libblkmaker_jansson.pc.in |   1 +
 8 files changed, 34 insertions(+), 692 deletions(-)

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..c2e17c6
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,25 @@
+*~
+*.so
+*.o
+a.*
+todo*
+example
+.*.kate-swp
+configure
+Makefile
+Makefile.in
+*.la
+*.pc
+ltmain.sh
+libtool
+install-sh
+missing
+depcomp
+.libs
+.deps
+aclocal.m4
+autom4te.cache
+*.lo
+config.*
+ii
+ar-lib
diff --git a/AUTHORS b/AUTHORS
index 985b89a..b50c216 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1 +1,2 @@
 Luke Dashjr <luke_libblkmaker at dashjr.org>
+Andy Alness <andy.alness at gmail.com>
diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644
index db9a50f..0000000
--- a/ChangeLog
+++ /dev/null
@@ -1,687 +0,0 @@
-2014-09-10  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Bump versions for 0.5.0
-
-2014-09-02  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* jansson: Read time header mutation parameters
-
-2014-09-02  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Read tmpl->target as an optional hash (breaks ABI)
-
-2014-09-02  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Bugfix: example: Set b58_sha256_impl
-
-2014-09-02  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Remove unused blktemplate_t fields (breaks ABI)
-
-2014-09-02  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* NULL-Merge commit '5a9a96a'
-
-2014-09-02  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Merge commit 'e86fe28'
-
-2014-09-02  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* NULL-Merge commit '09921de'
-
-2014-09-02  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Merge branch '0.4.x'
-
-2014-09-02  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Keep correct ordered hash in txn->hash[1] for use internally while remaining ABI-safe
-
-2014-09-02  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* blktemplate.h: Add warning against allocating blktemplate_t
-
-2014-09-02  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Merge branch '0.3.x' into 0.4.x
-
-2014-09-02  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Merge branch '0.2.x' into 0.3.x
-
-2014-09-02  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Merge branch '0.1.x' into 0.2.x
-
-2014-09-02  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Revert "Bugfix: Provide correctly-ordered transaction hash (using new key hash_ for backward compatibility)" (broke ABI)
-
-2014-09-02  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Bugfix: enum types are not guaranteed to be large enough for a bitmask, so explicitly use uint32_t for gbt_capabilities_t/blkmutations_t bitmasks (this breaks ABI)
-
-2014-09-01  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Merge branch 'proposals'
-
-2014-09-01  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Merge branch 'aux'
-
-2014-09-01  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Merge branch '0.4.x'
-
-2014-09-01  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Merge branch '0.3.x' into 0.4.x
-
-2014-09-01  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Merge branch '0.2.x' into 0.3.x
-
-2014-09-01  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Bugfix: blkmk_init_generation: Fail if scriptsz is longer than we properly handle, rather than creating an invalid block
-
-2014-09-01  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Parse and use coinbaseaux
-
-2014-08-24  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* blkmaker_jansson: Support for constructing BIP 23 block proposals
-
-2014-08-29  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* base58: Remove now-unused b58digits array
-
-2014-08-22  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Use libbase58 for base58 decoding
-
-2014-08-29  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* configure: Require only automake 1.11, since that is sufficient
-
-2014-08-24  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Move submission block assembly code to base libblkmaker
-
-2014-08-22  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Merge branch '0.4.x'
-
-2014-08-22  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Merge branch '0.3.x' into 0.4.x
-
-2014-08-22  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Merge branch '0.2.x' into 0.3.x
-
-2014-08-18  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Bugfix: b58tobin: Correct zeromask for multiple-of-four binary buffer sizes
-
-2014-08-18  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Avoid unsafe casting
-
-2014-08-22  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Include extern "C" wrapper in headers so they can be used from C++ code
-
-2014-08-18  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* b58check: Check binsz is long enough for checksum
-
-2014-08-22  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Switch to tar.xz dist
-
-2014-08-22  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Merge branch '0.4.x'
-
-2014-08-22  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Merge branch '0.3.x' into 0.4.x
-
-2014-08-22  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Merge branch '0.2.x' into 0.3.x
-
-2014-08-22  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Bugfix: Include private.h in SOURCES
-
-2014-08-22  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Merge branch '0.1.x' into 0.2.x
-
-2014-08-22  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Bugfix: Include documents in "make dist" output
-
-2014-08-22  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* No longer call configure from autogen.sh
-
-2014-05-26  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Bump libtool version for 0.3.3
-
-2014-05-26  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Merge commit '1cbe9c3'
-
-2014-05-26  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Bugfix: Optimise building merkle branches for no-transactions case, avoiding a malloc(0)
-
-2014-05-07  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Bump versions for 0.4.0
-
-2014-05-03  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Merge branch 'work2d'
-
-2014-05-03  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* blkmk_get_mdata: Accept can_roll_ntime as an argument
-
-2014-02-27  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Add blkmk_append_coinbase_safe2 which can understand mdata use
-
-2014-02-27  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Add blkmk_get_mdata function for miners which need to build the merkle root themselves
-
-2014-02-27  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Optimise merkle root creation by reusing a merkle branch
-
-2014-02-27  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Internal code abstraction into blkmk_set_times
-
-2014-02-27  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Merge branch '0.3.x'
-
-2014-02-27  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Merge branch '0.2.x' into 0.3.x
-
-2014-02-27  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Merge branch '0.1.x' into 0.2.x
-
-2014-02-27  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Implement blkmk_get_data's out_expire argument
-
-2014-02-24  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Merge branch '0.3.x'
-
-2014-02-24  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Merge branch '0.2.x' into 0.3.x
-
-2014-02-24  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Merge branch '0.1.x' into 0.2.x
-
-2014-02-24  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Bugfix: Provide correctly-ordered transaction hash (using new key hash_ for backward compatibility)
-
-2014-01-19  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Update copyright headers
-
-2014-01-19  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Merge branch '0.3.x'
-
-2014-01-19  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Merge branch '0.3.x' (early part)
-
-2014-01-19  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Merge branch '0.3.x' (early part)
-
-2014-01-19  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Merge branch '0.2.x' into 0.3.x
-
-2014-01-19  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Merge branch '0.2.x' (early part) into 0.3.x
-
-2014-01-19  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Null-Merge branch '0.2.x' (early part) into 0.3.x
-
-2014-01-19  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Merge branch '0.1.x' into 0.2.x
-
-2014-01-19  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Merge branch '0.1.x' (early part) into 0.2.x
-
-2014-01-19  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Null-Merge tag 'v0.1.5' into 0.2.x
-
-2014-01-19  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Update copyright headers
-
-2014-01-19  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Remove autogenerated INSTALL and unused ChangeLog/NEWS files from git
-
-2014-01-19  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* COPYING: Update copyright year to 2014
-
-2014-01-19  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Build silently when supported by automake
-
-2014-01-19  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Bugfix: blkmk_init_generation2 needs a return value
-
-2014-01-14  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Bugfix: Avoid breaking strict aliasing rules by copying nonce with memcpy
-
-2013-08-28  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Merge branch '0.3.x'
-
-2013-08-24  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Bump libtool version for 0.3.2
-
-2013-08-24  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Bump libtool version for 0.2.4
-
-2013-08-24  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Bump libtool version for 0.1.5
-
-2013-08-24  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* blkmk_init_generation3 capable of overriding a provided coinbasetxn if the generation mutation is allowed
-
-2013-08-24  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Merge branch '0.2.x' into 0.3.x
-
-2013-08-24  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Merge branch '0.1.x' into 0.2.x
-
-2013-08-24  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Merge commit '57f81f1' into 0.1.x
-
-2013-08-24  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Bugfix: Advertise support for version/* mutations and submit/{coinbase,truncate} abbreviations
-
-2013-06-25  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Merge branch '0.2.x' into 0.3.x
-
-2013-06-25  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Null-Merge branch '0.2.x' (early part) into 0.3.x
-
-2013-06-25  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Merge branch '0.1.x' into 0.2.x
-
-2013-06-25  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Null-Merge branch '0.1.x' (early part) into 0.2.x
-
-2013-06-25  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Merge commit '17d6193' into 0.1.x
-
-2013-06-25  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Bugfix: blktmpl_add_* returns a const char * for errors, not false (for template already populated)
-
-2013-06-13  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Bump libtool version for 0.1.4
-
-2013-06-01  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Add missing copyright headers
-
-2013-06-01  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Add missing copyright headers
-
-2013-06-01  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Add missing copyright headers
-
-2013-05-01  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Merge branch '0.2.x'
-
-2013-05-01  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Merge branch '0.1.x' into 0.2.x
-
-2013-05-01  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Bugfix: Install header for libblkmaker_jansson
-
-2013-05-01  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Merge commit 'e39b2ac' into 0.1.x
-
-2013-04-05  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Bump libtool version and BLKMAKER_VERSION for 0.3.0
-
-2013-04-05  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Add "foreign" submit function to create a call suitable for a local bitcoind
-
-2013-04-03  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Merge commit 'e39b2ac'
-
-2013-04-03  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Support for finding jansson with pkg-config
-
-2013-01-22  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Bump libtool version for 0.2.2
-
-2012-12-29  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Merge branch 'bugfix_b58_padcheck'
-
-2012-12-29  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Bugfix: _blkmk_b58check: Check that zero-padding on base58check input matches output
-
-2012-12-04  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Bump libtool version for 0.2.1
-
-2012-12-04  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* blkmk_init_generation2 can assign a boolean on whether it had to create a new coinbase transaction
-
-2012-12-04  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Merge branch 'bugfix_generate_append'
-
-2012-12-04  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Bugfix: When providing our own coinbase transaction, enable coinbase mutations
-
-2012-11-17  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Merge branch 'bugfix_limits_opt'
-
-2012-11-17  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Merge branch 'bugfix_limits_opt' into 0.1.x
-
-2012-11-17  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Bugfix: sigoplimit and sizelimit should be optional
-
-2012-11-03  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Abstract GETNUM_O and GETNUM_O2 (read optional number) macros
-
-2012-10-28  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Bump libtool version and BLKMAKER_VERSION for 0.2.0
-
-2012-10-28  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Merge branch '0.1.x'
-
-2012-10-28  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Merge branch 'bugfix_cbgen'
-
-2012-10-28  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Bugfix: Build correct pay-to-scripthash script
-
-2012-10-18  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Merge branch 'bugfix_unistd' into 0.1.x
-
-2012-10-18  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Merge branch 'bugfix_no_expires' into 0.1.x
-
-2012-10-18  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Merge branch 'bugfix_capnames_sz' into 0.1.x
-
-2012-10-18  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Merge branch 'bugfix_getdata_no_cbtxn' into 0.1.x
-
-2012-10-12  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Merge branch 'bugfix_unistd'
-
-2012-10-12  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Bugfix: ssize_t requires unistd.h
-
-2012-10-12  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Merge branch 'bugfix_cbgen'
-
-2012-10-12  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Bugfix: Correct allocation check in blkmk_init_generation
-
-2012-10-12  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Bugfix: Include required block height in generated coinbase scriptSigs
-
-2012-10-12  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Bugfix: Build correct pay-to-pubkeyhash script
-
-2012-10-12  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Merge branch 'bugfix_no_expires'
-
-2012-10-12  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Bugfix: "expires" is optional
-
-2012-10-12  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Merge branch 'bugfix_capnames_sz'
-
-2012-10-12  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Bugfix: sizeof(capnames) is not the count, but the size in bytes of the array (so generally 4x the count); use GBT_CAPABILITY_COUNT
-
-2012-10-12  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Merge branch 'bugfix_getdata_no_cbtxn'
-
-2012-10-12  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Bugfix: blkmk_get_data needs to check that templates have a coinbase transaction and return 0 (error) instead of segfaulting
-
-2012-10-12  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* New blkmk_init_generation and blkmk_address_to_script functions to create a coinbase transaction if it isn't provided
-
-2012-10-12  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Expose dblsha256 wrapper to private.h
-
-2012-10-12  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Move hexadecimal<->binary functions to hex.c (included via new not-installed private.h)
-
-2012-10-08  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Bump libtool version for 0.1.2
-
-2012-09-30  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Bugfix: AM_PROG_AR is not recognized by older automake, so only use it when defined
-
-2012-09-29  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Use AM_PROG_AR to support Cygwin
-
-2012-09-29  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Bugfix: Correct signed/unsigned warnings
-
-2012-09-27  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Bugfix: Add missing unistd.h include (for ssize_t)
-
-2012-09-27  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Bump libtool version for 0.1.1
-
-2012-09-27  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Accept const append data into blkmk_append_coinbase_safe
-
-2012-09-27  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* blkmk_append_coinbase_safe function to append arbitrary data to coinbase scriptSig
-
-2012-09-15  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Bugfix: Catch a possible calloc failure
-
-2012-09-15  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Explicitly include .libs dir in library path so libtool can relink it for install
-
-2012-09-15  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Initial Windows port
-
-2012-09-15  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Automake build system
-
-2012-09-15  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Makefile: clean example
-
-2012-09-15  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* gitignore .*.kate-swp
-
-2012-09-15  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Bugfix: Read "expires" key to correct blkmk_work_left
-
-2012-09-15  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Check block version for compatibility, honouring version/force and version/reduce mutations if allowed
-
-2012-09-15  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Export BIP 22 long polling information (and accept lpid to make requests)
-
-2012-09-14  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Bugfix: Fix extranonce value
-
-2012-09-12  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Bugfix: Correct "id" in requests (the 0 was leaked and the 2 double-freed)
-
-2012-09-11  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Bugfix: Consider extranonce rolling in jansson submissions
-
-2012-09-11  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Support for extranonce using BIP 23 coinbase/append mutation
-
-2012-09-11  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Invert "bits" in testinput.c to restore nonce found
-
-2012-09-11  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Support for BIP 23 submit/coinbase and submit/truncate abbreviations
-
-2012-09-11  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Bugfix: Correct internal capnames string array to match enum
-
-2012-09-11  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Bugfix: "bits" must be inverted order for blocks
-
-2012-09-11  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Accept const json_t * for blktmpl_add_jansson
-
-2012-09-06  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Self-contained test case that finds a share quickly with libgcrypt CPU miner
-
-2012-09-05  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Bugfix: libblkmaker_jansson should depend on libblkmaker (core)
-
-2012-09-05  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Add usage of "maxversion" request, and update capability enum for version/* mutations
-
-2012-09-05  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Bugfix: No longer double-free in some error conditions
-
-2012-09-05  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Abstract out my_bin2hex
-
-2012-09-05  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Correct default capabilities to reflect current support
-
-2012-09-04  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Build example by default
-
-2012-09-04  Luke Dashjr  <luke-jr+git at utopios.org>
-
-	* Initial import
diff --git a/blkmaker.h b/blkmaker.h
index 757860e..70a3c86 100644
--- a/blkmaker.h
+++ b/blkmaker.h
@@ -12,7 +12,7 @@ extern "C" {
 #endif
 
 #define BLKMAKER_VERSION (6L)
-#define BLKMAKER_MAX_BLOCK_VERSION (2)
+#define BLKMAKER_MAX_BLOCK_VERSION (3)
 
 extern bool (*blkmk_sha256_impl)(void *hash_out, const void *data, size_t datasz);
 
diff --git a/blkmaker_jansson.c b/blkmaker_jansson.c
index 83e9bb2..fcf803f 100644
--- a/blkmaker_jansson.c
+++ b/blkmaker_jansson.c
@@ -263,10 +263,10 @@ const char *blktmpl_add_jansson(blktemplate_t *tmpl, const json_t *json, time_t
 		}
 	}
 	
-	if (tmpl->version > 2 || (tmpl->version == 2 && !tmpl->height))
+	if (tmpl->version > BLKMAKER_MAX_BLOCK_VERSION || (tmpl->version >= 2 && !tmpl->height))
 	{
 		if (tmpl->mutations & BMM_VERDROP)
-			tmpl->version = tmpl->height ? 2 : 1;
+			tmpl->version = tmpl->height ? BLKMAKER_MAX_BLOCK_VERSION : 1;
 		else
 		if (!(tmpl->mutations & BMM_VERFORCE))
 			return "Unrecognized block version, and not allowed to reduce or force it";
diff --git a/blktemplate.c b/blktemplate.c
index ce129a1..32875c2 100644
--- a/blktemplate.c
+++ b/blktemplate.c
@@ -54,6 +54,8 @@ gbt_capabilities_t blktmpl_getcapability(const char *n) {
 	for (unsigned int i = 0; i < GBT_CAPABILITY_COUNT; ++i)
 		if (capnames[i] && !strcasecmp(n, capnames[i]))
 			return 1 << i;
+	if (!strcasecmp(n, "transactions"))
+		return BMM_TXNADD;  // Odd one as it's overloaded w/"transactions/add" per spec
 	return 0;
 }
 
diff --git a/configure.ac b/configure.ac
index b8a6eb2..cf81819 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@ dnl * under the terms of the standard MIT license.  See COPYING for more details
 
 AC_INIT(
 	[libblkmaker],
-	[0.1],
+	[0.5.1],
 	[luke_libblkmaker at dashjr.org],
 	[libblkmaker],
 	[http://gitorious.org/bitcoin/libblkmaker])
@@ -19,7 +19,7 @@ m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
 LT_INIT([disable-static])
 
 # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
-AC_SUBST([LIBBLKMAKER_SO_VERSION], [6:0:0])
+AC_SUBST([LIBBLKMAKER_SO_VERSION], [6:1:0])
 AC_SUBST([LIBBLKMAKER_API_VERSION], [0.1])
 
 AC_CONFIG_FILES([Makefile
diff --git a/libblkmaker_jansson.pc.in b/libblkmaker_jansson.pc.in
index 77a98cc..fc86e20 100644
--- a/libblkmaker_jansson.pc.in
+++ b/libblkmaker_jansson.pc.in
@@ -9,3 +9,4 @@ Version: @PACKAGE_VERSION@
 URL: @PACKAGE_URL@
 Libs: -L${libdir} -lblkmaker- at LIBBLKMAKER_API_VERSION@ -lblkmaker_jansson- at LIBBLKMAKER_API_VERSION@
 Cflags: -I${includedir}/libblkmaker- at LIBBLKMAKER_API_VERSION@
+Requires.private: libbase58

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-bitcoin/libblkmaker.git



More information about the Pkg-bitcoin-commits mailing list