Merge branch 'v0.8'

Author: petertodd

bitcoin/__init__.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2016 The python-bitcoinlib developers
+# Copyright (C) 2012-2017 The python-bitcoinlib developers
 #
 # This file is part of python-bitcoinlib.
 #
@@ -16,7 +16,7 @@
 # Note that setup.py can break if __init__.py imports any external
 # dependencies, as these might not be installed when setup.py runs. In this
 # case __version__ could be moved to a separate version.py and imported here.
-__version__ = '0.7.1-SNAPSHOT'
+__version__ = '0.9.0-PENDING'
 
 class MainParams(bitcoin.core.CoreMainParams):
     MESSAGE_START = b'\xf9\xbe\xb4\xd9'

bitcoin/core/__init__.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2015 The python-bitcoinlib developers
+# Copyright (C) 2012-2017 The python-bitcoinlib developers
 #
 # This file is part of python-bitcoinlib.
 #
@@ -486,10 +486,14 @@ def GetTxid(self):
             txid = Hash(self.serialize())
         return txid
 
+# preserve GetHash so our AttributeError-raising stub works
+def __make_CMutableTransaction_mutable(cls):
+    get_hash_fn = cls.GetHash
+    cls = __make_mutable(cls)
+    cls.GetHash = get_hash_fn
+    return cls
 
-
-
-@__make_mutable
+@__make_CMutableTransaction_mutable
 class CMutableTransaction(CTransaction):
     """A mutable transaction"""
     __slots__ = []
@@ -521,8 +525,6 @@ def from_tx(cls, tx):
         return cls(vin, vout, tx.nLockTime, tx.nVersion, tx.wit)
 
 
-
-
 class CBlockHeader(ImmutableSerializable):
     """A block header"""
     __slots__ = ['nVersion', 'hashPrevBlock', 'hashMerkleRoot', 'nTime', 'nBits', 'nNonce']

bitcoin/core/scripteval.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2014 The python-bitcoinlib developers
+# Copyright (C) 2012-2017 The python-bitcoinlib developers
 #
 # This file is part of python-bitcoinlib.
 #
@@ -816,7 +816,7 @@ def VerifySignature(txFrom, txTo, inIdx):
         raise VerifySignatureError("txin prevout.n >= len(txFrom.vout)")
     txout = txFrom.vout[txin.prevout.n]
 
-    if txin.prevout.hash != txFrom.GetHash():
+    if txin.prevout.hash != txFrom.GetTxid():
         raise VerifySignatureError("prevout hash does not match txFrom")
 
     VerifyScript(txin.scriptSig, txout.scriptPubKey, txTo, inIdx)

bitcoin/tests/test_scripteval.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2014 The python-bitcoinlib developers
+# Copyright (C) 2013-2017 The python-bitcoinlib developers
 #
 # This file is part of python-bitcoinlib.
 #
@@ -89,7 +89,7 @@ def create_test_txs(self, scriptSig, scriptPubKey):
         txCredit = CTransaction([CTxIn(COutPoint(), CScript([OP_0, OP_0]), nSequence=0xFFFFFFFF)],
                                 [CTxOut(0, scriptPubKey)],
                                 nLockTime=0)
-        txSpend = CTransaction([CTxIn(COutPoint(txCredit.GetHash(), 0), scriptSig, nSequence=0xFFFFFFFF)],
+        txSpend = CTransaction([CTxIn(COutPoint(txCredit.GetTxid(), 0), scriptSig, nSequence=0xFFFFFFFF)],
                                [CTxOut(0, CScript())],
                                nLockTime=0)
         return (txCredit, txSpend)

release-notes.md

@@ -1,8 +1,29 @@
-python-bitcoinlib release notes
-===============================
+# python-bitcoinlib release notes
 
-v0.7.0
-======
+## v0.8.0
+
+Major breaking API change!
+
+While this interim release doesn't by itself include segwit support, it does
+change the name of the `CTransaction/CMutableTransaction` method `GetHash()` to
+`GetTxid()` to prepare for a future segwit-enabled release.  Incorrect calls to
+`GetHash()` will now raise a `AttributeError` exception with an explanation.
+
+Since this release doesn't yet include segwit support, you will need to set the
+Bitcoin Core `-rpcserialversion=0` option, either as a command line argument,
+or in your `bitcoin.conf` file. Otherwise the RPC interface will return
+segwit-serialized transactions that this release's RPC support doesn't
+understand.
+
+Other changes:
+
+* Cookie file RPC authentication is now supported.
+* `msg_header` now correctly uses `CBlockHeader` rather than `CBlock`.
+* RPC `getbalance` now supports `include_watchonly`
+* RPC `unlockwallet` is now supported
+
+
+## v0.7.0
 
 Breaking API changes:
 
@@ -25,8 +46,7 @@ Bugfixes:
 * Fixed a spurious `AttributeError` when `bitcoin.rpc.Proxy()` fails.
 
 
-v0.6.1
-======
+## v0.6.1
 
 New features:
 
@@ -36,8 +56,7 @@ New features:
   subtractfeefromamount arguments.
 
 
-v0.6.0
-======
+## v0.6.0
 
 Breaking API changes:
 
@@ -55,8 +74,7 @@ Breaking API changes:
   did anything with it anyway)
 
 
-v0.5.1
-======
+## v0.5.1
 
 Various small bugfixes; see git history.
 
@@ -66,8 +84,7 @@ New features:
 * OP_CHECKLOCKTIMEVERIFY opcode constant
 
 
-v0.5.0
-======
+## v0.5.0
 
 Major fix: Fixed OpenSSL related crashes on OSX and Arch Linux. Big thanks to
 everyone who helped fix this!
@@ -90,8 +107,7 @@ Notable bugfixes:
 * getinfo() now works where disablewallet=1
 
 
-v0.4.0
-======
+## v0.4.0
 
 Major fix: OpenSSL 1.0.1k rejects non-canonical DER signatures, which Bitcoin
 Core does not, so we now canonicalize signatures prior to passing them to
@@ -117,8 +133,7 @@ New features:
 * Added support for IPv6 addr messages
 
 
-v0.3.0
-======
+## v0.3.0
 
 Major change: cleaned up what symbols are exported by modules. \_\_all\_\_ is now
 used extensively, which may break some applications that were not importing the
@@ -134,8 +149,7 @@ Other notable changes:
 * Various code cleanups and minor bug fixes.
 
 
-v0.2.1
-======
+## v0.2.1
 
 * Improve bitcoin address handling. P2SH and P2PKH addresses now get their own
   classes - P2SHBitcoinAddress and P2PKHBitcoinAddress respectively - and P2PKH
@@ -146,8 +160,7 @@ v0.2.1
 * License is now LGPL v3 or later.
 
 
-v0.2.0
-======
+## v0.2.0
 
 Major change: CTransaction, CBlock, etc. now come in immutable (default) and
 mutable forms. In most cases mutable and immutable can be used interchangeably;