Skip to content

Return witness in getblock #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 94 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
94 commits
Select commit Hold shift + click to select a range
9e940fa
[depends] Boost 1.59.0
fanquake Nov 10, 2015
17ad964
[depends] miniupnpc 1.9.20151026
fanquake Nov 10, 2015
26f8ea5
[depends] native ccache 3.2.4
fanquake Nov 10, 2015
10d3c77
[depends] Fix miniupnpc compilation on osx
fanquake Nov 11, 2015
23a3c47
[depends] zeromq 4.0.7
fanquake Nov 11, 2015
086ee67
Switch to a more efficient rolling Bloom filter
sipa Nov 27, 2015
ec73ef3
Replace setInventoryKnown with a rolling bloom filter.
gmaxwell Nov 26, 2015
e206724
Remove mruset as it is no longer used.
gmaxwell Nov 28, 2015
6b84935
Rename setInventoryKnown filterInventoryKnown
pstratem Nov 29, 2015
b6a0da4
Only use filterInventoryKnown with MSG_TX inventory messages.
pstratem Nov 29, 2015
d41e44c
Actually only use filterInventoryKnown with MSG_TX inventory messages.
gmaxwell Nov 29, 2015
aa4b0c2
When not filtering blocks, getdata sends more in one test
sipa Nov 30, 2015
b440409
Add missing automake package to deb-based UNIX install instructions.
posita Dec 2, 2015
110ff11
[Tests] Add mempool_limit.py test
jonasschnelli Nov 30, 2015
a3c3ddb
[Qt] add InMempool() info to transaction details
jonasschnelli Nov 30, 2015
6e76587
rpc: remove cs_main lock from `createrawtransaction`
laanwj Dec 2, 2015
eb30666
Fix mempool limiting for PrioritiseTransaction
sdaftuar Nov 19, 2015
9ef2a25
Update replace-by-fee logic to use fee deltas
sdaftuar Nov 30, 2015
27fae34
Use fee deltas for determining mempool acceptance
sdaftuar Dec 2, 2015
901b01d
Remove GetMinRelayFee
sdaftuar Dec 2, 2015
c12ff99
Now that 0.12 has been branched, master is 0.12.99
laanwj Dec 3, 2015
8843676
Merge pull request #7133
laanwj Dec 3, 2015
7632cf6
[Tests] Refactor some shared functions
jonasschnelli Dec 3, 2015
54a550b
Merge pull request #7113
laanwj Dec 3, 2015
5548d9c
Merge pull request #7152
laanwj Dec 3, 2015
6aadc75
Disconnect on mempool requests from peers when over the upload limit.
gmaxwell Dec 3, 2015
7922592
Merge pull request #7166
laanwj Dec 4, 2015
2f601d2
test: remove necessity to call create_callback_map
laanwj Dec 4, 2015
4c40ec0
tests: Disable Tor interaction
laanwj Dec 4, 2015
a2822b9
Merge pull request #7170
laanwj Dec 5, 2015
96918a2
Don't do mempool lookups for "mempool" command without a filter
TheBlueMatt Dec 5, 2015
075faae
Merge pull request #7174
gmaxwell Dec 5, 2015
5c03483
Coinselection prunes extraneous inputs from ApproximateBestSubset
murchandamus Sep 13, 2014
82bcf40
Merge pull request #7171
laanwj Dec 7, 2015
ca188c6
log bytes recv/sent per command
jonasschnelli Aug 25, 2015
dc0305d
Merge pull request #6589
laanwj Dec 7, 2015
9fc6ed6
net: Fix sent reject messages for blocks and transactions
laanwj Dec 7, 2015
e3bc5e0
net: Account for `sendheaders` `verack` messages
laanwj Dec 7, 2015
af9510e
Moved set reduction to the end of ApproximateBestSubset to reduce per…
murchandamus Dec 6, 2015
fc0f52d
Added a test for the pruning of extraneous inputs after ApproximateBe…
murchandamus Dec 6, 2015
16ccb74
Merge pull request #7180
laanwj Dec 8, 2015
0800092
Merge pull request #4906
laanwj Dec 8, 2015
2041190
test: Add basic test for `reject` code
laanwj Dec 8, 2015
e0769e1
[depends] Latest config.guess & config.sub
fanquake Dec 9, 2015
00b4b8d
Merge pull request #7154
laanwj Dec 9, 2015
5dc63ed
Merge pull request #7179
laanwj Dec 10, 2015
9bbe71b
net: Add and document network messages in protocol.h
laanwj Dec 7, 2015
00423e1
Set link from http:// to https://
SuriyaaKudoIsc Dec 10, 2015
e1030dd
Note that reviewers should mention the commit hash of the commits the…
pstratem Dec 8, 2015
f7f44b1
Merge pull request #7197
laanwj Dec 11, 2015
d1e17ff
Merge pull request #7181
laanwj Dec 11, 2015
9ee02cf
Merge pull request #7156
laanwj Dec 11, 2015
5400ef6
Replace trickle nodes with per-node/message Poisson delays
sipa Apr 8, 2015
b6915b8
checks for null data transaction before debug.log
accraze Dec 12, 2015
c611acc
wallet: check if tx scriptPubKey is unspendable
accraze Dec 12, 2015
d812daf
fix logic for error log
accraze Dec 12, 2015
daf6466
Add "NODE_BLOOM" to guiutil so that peers don't get UNKNOWN[4]
TheBlueMatt Dec 14, 2015
b7c704a
Merge pull request #7206
jonasschnelli Dec 14, 2015
ea0f5a2
Merge pull request #7185
laanwj Dec 14, 2015
979698c
[RPC-Tests] add option to run rpc test over QT clients
jonasschnelli Dec 14, 2015
5f3c670
Merge pull request #7068
laanwj Dec 14, 2015
dc511dc
Merge pull request #7200
laanwj Dec 14, 2015
7a50401
Merge pull request #7125
laanwj Dec 14, 2015
83cdcbd
test: don't override BITCOIND and BITCOINCLI if they're set
laanwj Dec 14, 2015
fa2f4bc
qt5: Use the fixed font the system recommends
Dec 14, 2015
37d271d
Rename OP_NOP2 to OP_CHECKLOCKTIMEVERIFY.
Dec 14, 2015
e18378e
Removed offline testnet DNSSeed 'alexykot.me'.
Dec 15, 2015
fa5769e
[qt] Fix misleading translation
Dec 16, 2015
d22245f
Merge pull request #7216
laanwj Dec 17, 2015
cd3f12c
Merge pull request #7209
laanwj Dec 17, 2015
8ea5ef1
Merge pull request #6980
laanwj Dec 18, 2015
9b41a5f
Add more tests to p2p-fullblocktest
sdaftuar Dec 15, 2015
c243379
Merge pull request #7062
laanwj Dec 21, 2015
ed095f0
Merge pull request #7226
laanwj Dec 22, 2015
595f939
Merge pull request #7213
laanwj Dec 22, 2015
a1c185b
Merge pull request #7218
jonasschnelli Dec 22, 2015
97d8373
Merge pull request #7153
laanwj Dec 22, 2015
be9a9a3
Merge pull request #7214
jonasschnelli Dec 23, 2015
4b9c6f7
Add segregated witness transaction serialization
sipa Nov 6, 2015
3a01bc0
Negotiate witness fetching via 'havewitness'
sipa Nov 16, 2015
b5bb104
Witness commitment validation
sipa Nov 6, 2015
78d7397
Produce blocks with witness commitment in coinbase
sipa Dec 4, 2015
b23d4ea
Script validation logic for witnesses
sipa Nov 8, 2015
dfbc48e
Enable SCRIPT_VERIFY_WITNESS for mempool transactions
sipa Nov 18, 2015
4a094b2
Activate script consensus rules in v5 blocks
sipa Nov 18, 2015
d90523b
Only download blocks from witness peers after fork
sipa Dec 29, 2015
70e8d4c
Witness script signing
sipa Dec 29, 2015
2289c4b
Signing tests
sipa Nov 20, 2015
450af0c
Make script validation observe input amounts
sipa Dec 26, 2015
5eeed44
Add signature version 1 with updated sighash
sipa Dec 27, 2015
6e8099e
Add witness address RPCs (using P2SH)
sipa Dec 30, 2015
08b1b32
Testchains: Don't check the genesis block
jtimon Jul 3, 2015
952e6f5
Create segnet
sipa Dec 31, 2015
de6520c
Return witness in getblock
jl2012 Jan 2, 2016
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,8 @@ Anyone may participate in peer review which is expressed by comments in the pull
- Concept ACK means "I agree in the general principle of this pull request";
- Nit refers to trivial, often non-blocking issues.

Reviewers should include the commit hash which they reviewed in their comments.

Project maintainers reserve the right to weigh the opinions of peer reviewers using common sense judgement and also may weight based on meritocracy: Those that have demonstrated a deeper commitment and understanding towards the project (over time) or have clear domain expertise may naturally have more weight, as one would expect in all walks of life.

Where a patch set affects consensus critical code, the bar will be set much higher in terms of discussion and peer review requirements, keeping in mind that mistakes could be very costly to the wider community. This includes refactoring of consensus critical code.
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ License
-------

Bitcoin Core is released under the terms of the MIT license. See [COPYING](COPYING) for more
information or see http://opensource.org/licenses/MIT.
information or see https://opensource.org/licenses/MIT.

Development Process
-------------------
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
AC_PREREQ([2.60])
define(_CLIENT_VERSION_MAJOR, 0)
define(_CLIENT_VERSION_MINOR, 11)
define(_CLIENT_VERSION_MINOR, 12)
define(_CLIENT_VERSION_REVISION, 99)
define(_CLIENT_VERSION_BUILD, 0)
define(_CLIENT_VERSION_IS_RELEASE, false)
Expand Down
2 changes: 1 addition & 1 deletion contrib/gitian-descriptors/gitian-linux.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
name: "bitcoin-linux-0.12"
name: "bitcoin-linux-0.13"
enable_cache: true
suites:
- "trusty"
Expand Down
2 changes: 1 addition & 1 deletion contrib/gitian-descriptors/gitian-osx.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
name: "bitcoin-osx-0.12"
name: "bitcoin-osx-0.13"
enable_cache: true
suites:
- "trusty"
Expand Down
2 changes: 1 addition & 1 deletion contrib/gitian-descriptors/gitian-win.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
name: "bitcoin-win-0.12"
name: "bitcoin-win-0.13"
enable_cache: true
suites:
- "trusty"
Expand Down
5 changes: 4 additions & 1 deletion depends/config.guess
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Attempt to guess a canonical system name.
# Copyright 1992-2015 Free Software Foundation, Inc.

timestamp='2015-10-21'
timestamp='2015-11-19'

# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
Expand Down Expand Up @@ -1393,6 +1393,9 @@ EOF
x86_64:VMkernel:*:*)
echo ${UNAME_MACHINE}-unknown-esx
exit ;;
amd64:Isilon\ OneFS:*:*)
echo x86_64-unknown-onefs
exit ;;
esac

cat >&2 <<EOF
Expand Down
8 changes: 4 additions & 4 deletions depends/config.sub
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Configuration validation subroutine script.
# Copyright 1992-2015 Free Software Foundation, Inc.

timestamp='2015-08-20'
timestamp='2015-11-22'

# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
Expand Down Expand Up @@ -53,8 +53,7 @@ timestamp='2015-08-20'
me=`echo "$0" | sed -e 's,.*/,,'`

usage="\
Usage: $0 [OPTION] CPU-MFR-OPSYS
$0 [OPTION] ALIAS
Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS

Canonicalize a configuration name.

Expand Down Expand Up @@ -1399,7 +1398,8 @@ case $os in
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
| -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*)
| -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
| -onefs* | -tirtos*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
Expand Down
6 changes: 3 additions & 3 deletions depends/packages/boost.mk
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package=boost
$(package)_version=1_58_0
$(package)_download_path=http://sourceforge.net/projects/boost/files/boost/1.58.0
$(package)_version=1_59_0
$(package)_download_path=http://sourceforge.net/projects/boost/files/boost/1.59.0
$(package)_file_name=$(package)_$($(package)_version).tar.bz2
$(package)_sha256_hash=fdfc204fc33ec79c99b9a74944c3e54bd78be4f7f15e260c0e2700a36dc7d3e5
$(package)_sha256_hash=727a932322d94287b62abb1bd2d41723eec4356a7728909e38adb65ca25241ca

define $(package)_set_vars
$(package)_config_opts_release=variant=release
Expand Down
6 changes: 3 additions & 3 deletions depends/packages/miniupnpc.mk
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package=miniupnpc
$(package)_version=1.9.20151008
$(package)_version=1.9.20151026
$(package)_download_path=http://miniupnp.free.fr/files
$(package)_file_name=$(package)-$($(package)_version).tar.gz
$(package)_sha256_hash=e444ac3b587ce82709c4d0cfca1fe71f44f9fc433e9f946b12b9e1bfe667a633
$(package)_sha256_hash=f3cf9a5a31588a917d4d9237e5bc50f84d00c5aa48e27ed50d9b88dfa6a25d47

define $(package)_set_vars
$(package)_build_opts=CC="$($(package)_cc)"
$(package)_build_opts_darwin=OS=Darwin
$(package)_build_opts_darwin=OS=Darwin LIBTOOL="$($(package)_libtool)"
$(package)_build_opts_mingw32=-f Makefile.mingw
$(package)_build_env+=CFLAGS="$($(package)_cflags) $($(package)_cppflags)" AR="$($(package)_ar)"
endef
Expand Down
4 changes: 2 additions & 2 deletions depends/packages/native_ccache.mk
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package=native_ccache
$(package)_version=3.2.3
$(package)_version=3.2.4
$(package)_download_path=http://samba.org/ftp/ccache
$(package)_file_name=ccache-$($(package)_version).tar.bz2
$(package)_sha256_hash=b07165d4949d107d17f2f84b90b52953617bf1abbf249d5cc20636f43337c98c
$(package)_sha256_hash=ffeb967edb549e67da0bd5f44f729a2022de9fdde65dfd80d2a7204d7f75332e

define $(package)_set_vars
$(package)_config_opts=
Expand Down
4 changes: 2 additions & 2 deletions depends/packages/zeromq.mk
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package=zeromq
$(package)_version=4.0.4
$(package)_version=4.0.7
$(package)_download_path=http://download.zeromq.org
$(package)_file_name=$(package)-$($(package)_version).tar.gz
$(package)_sha256_hash=1ef71d46e94f33e27dd5a1661ed626cd39be4d2d6967792a275040e34457d399
$(package)_sha256_hash=e00b2967e074990d0538361cc79084a0a92892df2c6e7585da34e4c61ee47b03

define $(package)_set_vars
$(package)_config_opts=--without-documentation --disable-shared
Expand Down
2 changes: 1 addition & 1 deletion doc/Doxyfile
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ PROJECT_NAME = Bitcoin
# This could be handy for archiving the generated documentation or
# if some version control system is used.

PROJECT_NUMBER = 0.11.99
PROJECT_NUMBER = 0.12.99

# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer
Expand Down
2 changes: 1 addition & 1 deletion doc/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Bitcoin Core 0.11.99
Bitcoin Core 0.12.99
=====================

Setup
Expand Down
2 changes: 1 addition & 1 deletion doc/README_windows.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Bitcoin Core 0.11.99
Bitcoin Core 0.12.99
=====================

Intro
Expand Down
2 changes: 1 addition & 1 deletion doc/build-unix.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ Dependency Build Instructions: Ubuntu & Debian
----------------------------------------------
Build requirements:

sudo apt-get install build-essential libtool autotools-dev autoconf pkg-config libssl-dev libevent-dev bsdmainutils
sudo apt-get install build-essential libtool autotools-dev automake pkg-config libssl-dev libevent-dev bsdmainutils

On at least Ubuntu 14.04+ and Debian 7+ there are generic names for the
individual boost development packages, so the following can be used to only
Expand Down
Loading