Merge branch 'master' into 20150703_banlist_updates
5bc4fb7b602cUnpublished
Actions

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge branch 'master' into 20150703_banlist_updates

Details

Provenance

Luke Dashjr <luke-jr+git@utopios.org>	Authored on Jan 15 2016, 05:17
deadalnix	Pushed on May 14 2017, 22:04

Parents

rABCe8600c924d58: banlist (bugfix): allow CNode::SweepBanned() to run on interval
rABCc079d79c9a9c: Merge pull request #7327

Branches

Unknown

Tags

Unknown

Event Timeline

Luke Dashjr <luke-jr+git@utopios.org> committed rABC5bc4fb7b602c: Merge branch 'master' into 20150703_banlist_updates (authored by Luke Dashjr <luke-jr+git@utopios.org>).Jan 15 2016, 05:17

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.

c079d79c9a9c Merge pull request #7327
Author
Jonas Schnelli <dev@jonasschnelli.ch>
Browse Repository
No Builds
No Audits
30cdacea3c35 [Wallet] Transaction View: LastMonth calculation fixed
Author
crowning- <crowning-@users.noreply.github.com>
Browse Repository
No Builds
No Audits
17ef279304a9 Merge pull request #7332
Author
Wladimir J. van der Laan <laanwj@gmail.com>
Browse Repository
No Builds
No Audits
be6d5a617d29 Merge pull request #7312
Author
Wladimir J. van der Laan <laanwj@gmail.com>
Browse Repository
No Builds
No Audits
d11fc1695c04 [Wallet] Call notification signal when a transaction is abandoned
Author
Jonas Schnelli <dev@jonasschnelli.ch>
Browse Repository
No Builds
No Audits
df0e2226d998 Add RPC test for abandoned and conflicted transactions.
Author
Alex Morcos <morcos@chaincode.com>
Browse Repository
No Builds
No Audits
01e06d1fa365 Add new rpc call: abandontransaction
Author
Alex Morcos <morcos@chaincode.com>
Browse Repository
No Builds
No Audits
faf671bca6d2 [wallet] Clarify rpc help message with regard to rounding
Author
MarcoFalke <falke.marco@gmail.com>
Browse Repository
No Builds
No Audits
2cd004b1232a Merge pull request #7326
Author
Wladimir J. van der Laan <laanwj@gmail.com>
Browse Repository
No Builds
No Audits
c49551886a75 Merge pull request #7296
Author
Wladimir J. van der Laan <laanwj@gmail.com>
Browse Repository
No Builds
No Audits
18ca3fa84058 Merge pull request #7324
Author
Wladimir J. van der Laan <laanwj@gmail.com>
Browse Repository
No Builds
No Audits
3a9dfe9d14bd Fix typo, wrong information in gettxout help text.
Author
paveljanik <Pavel@Janik.cz>
Browse Repository
No Builds
No Audits
d570a1f41b9e doc/bips: Document BIP 125 support
Author
Luke Dashjr <luke-jr+git@utopios.org>
Browse Repository
No Builds
No Audits
dd1304ec216c Merge pull request #7081
Author
Wladimir J. van der Laan <laanwj@gmail.com>
Browse Repository
No Builds
No Audits
fdc202f4b028 Merge branch bytespersigop
Author
Luke Dashjr <luke-jr+git@utopios.org>
Browse Repository
No Builds
No Audits
93ca5a35b045 Merge pull request #7308
Author
Wladimir J. van der Laan <laanwj@gmail.com>
Browse Repository
No Builds
No Audits
9de541a9c95a Merge pull request #7306
Author
Wladimir J. van der Laan <laanwj@gmail.com>
Browse Repository
No Builds
No Audits
3b57e9cff09c Merge pull request #7317
Author
Wladimir J. van der Laan <laanwj@gmail.com>
Browse Repository
No Builds
No Audits
8a7f0001be88 [RPC] remove the option of having multiple timer interfaces
Author
Jonas Schnelli <dev@jonasschnelli.ch>
Browse Repository
No Builds
No Audits
db198d51a651 Fix RPCTimerInterface ordering issue Dispatching a QThread from a non Qt thread…
Author
Jonas Schnelli <dev@jonasschnelli.ch>
Browse Repository
No Builds
No Audits
9e697172542e Make wallet descendant searching more efficient
Author
Alex Morcos <morcos@chaincode.com>
Browse Repository
No Builds
No Audits
168915e6dec8 Eliminate race condition in sendheaders.py test
Author
Suhas Daftuar <sdaftuar@chaincode.com>
Browse Repository
No Builds
No Audits
82a0ce09b45a Add race-condition debugging tool to mininode
Author
Suhas Daftuar <sdaftuar@chaincode.com>
Browse Repository
No Builds
No Audits
b1cf0058d9b3 Merge pull request #7298
Author
Jonas Schnelli <dev@jonasschnelli.ch>
Browse Repository
No Builds
No Audits
7b0a9a804004 Merge pull request #7266
Author
Wladimir J. van der Laan <laanwj@gmail.com>
Browse Repository
No Builds
No Audits
554156093800 Merge pull request #7293
Author
Wladimir J. van der Laan <laanwj@gmail.com>
Browse Repository
No Builds
No Audits
d964b5bb1a1c Merge pull request #7229
Author
Wladimir J. van der Laan <laanwj@gmail.com>
Browse Repository
No Builds
No Audits
de9e5ea75e46 Merge pull request #7257
Author
Wladimir J. van der Laan <laanwj@gmail.com>
Browse Repository
No Builds
No Audits
41f1a3e99bfa Merge pull request #7302
Author
Wladimir J. van der Laan <laanwj@gmail.com>
Browse Repository
No Builds
No Audits
f61766b37beb Make sure conflicted wallet tx's update balances
Author
Alex Morcos <morcos@chaincode.com>
Browse Repository
No Builds
No Audits
bebe58b74853 SQUASHME: Fix rpc tests that assumed fallback to minRelayTxFee
Author
Alex Morcos <morcos@chaincode.com>
Browse Repository
No Builds
No Audits
3968922b9623 c++11: fix libbdb build against libc++ in c++11 mode
Author
Cory Fields <cory-nospam-@coryfields.com>
Browse Repository
No Builds
No Audits
57d2f62c99e7 c++11: CAccountingEntry must be defined before use in a list
Author
Cory Fields <cory-nospam-@coryfields.com>
Browse Repository
No Builds
No Audits
89f71c68c0fe c++11: don't throw from the reverselock destructor
Author
Cory Fields <cory-nospam-@coryfields.com>
Browse Repository
No Builds
No Audits
76ac35f36d87 c++11: detect and correct for boost builds with an incompatible abi
Author
Cory Fields <cory-nospam-@coryfields.com>
Browse Repository
No Builds
No Audits
faf538bfdbb4 [trivial] Merge test cases and replace CENT with COIN
Author
MarcoFalke <falke.marco@gmail.com>
Browse Repository
No Builds
No Audits
faf3299b73cc [qt] Intro: Display required space
Author
MarcoFalke <falke.marco@gmail.com>
Browse Repository
No Builds
No Audits
e420a1b15e3b Add sane fallback for fee estimation
Author
Alex Morcos <morcos@chaincode.com>
Browse Repository
No Builds
No Audits
995b9f385b93 Always respect GetRequiredFee for wallet txs
Author
Alex Morcos <morcos@chaincode.com>
Browse Repository
No Builds
No Audits
605c17844ea3 Merge pull request #7205
Author
Wladimir J. van der Laan <laanwj@gmail.com>
Browse Repository
No Builds
No Audits
aa413687de45 Merge pull request #7282
Author
Jonas Schnelli <dev@jonasschnelli.ch>
Browse Repository
No Builds
No Audits
2078495d9c5f Merge pull request #7193
Author
Wladimir J. van der Laan <laanwj@gmail.com>
Browse Repository
No Builds
No Audits
a10a7920c3ac Merge pull request #7217
Author
Wladimir J. van der Laan <laanwj@gmail.com>
Browse Repository
No Builds
No Audits
fa3c7e644f42 [wallet] Add regression test for vValue sort order
Author
MarcoFalke <falke.marco@gmail.com>
Browse Repository
No Builds
No Audits
45d13abf4ea1 Merge pull request #7253
Author
Wladimir J. van der Laan <laanwj@gmail.com>
Browse Repository
No Builds
No Audits
49a735cba4f7 Merge pull request #7250
Author
Wladimir J. van der Laan <laanwj@gmail.com>
Browse Repository
No Builds
No Audits
ac982a16e07d Merge pull request #7263
Author
Wladimir J. van der Laan <laanwj@gmail.com>
Browse Repository
No Builds
No Audits
c17301382159 Merge pull request #7274
Author
Wladimir J. van der Laan <laanwj@gmail.com>
Browse Repository
No Builds
No Audits
136abda59728 qt: periodic translations pull from transifex
Author
Wladimir J. van der Laan <laanwj@gmail.com>
Browse Repository
No Builds
No Audits
621bd6919f47 [Qt] fix coincontrol update issue when deleting a send coin entry
Author
Jonas Schnelli <dev@jonasschnelli.ch>
Browse Repository
No Builds
No Audits

Changes (633)

Path

Size

.tx/

build-aux/

m4/

bitcoin_qt.m4

configure.ac

contrib/

debian/

manpages/

devtools/

fix-copyright-headers.py

optimize-pngs.py

security-check.py

symbol-check.py

test-security-check.py

update-translations.py

gitian-descriptors/

README.md

gitian-linux.yml

gitian-osx-signer.yml

gitian-osx.yml

gitian-win-signer.yml

gitian-win.yml

gitian-downloader/

bluematt-key.pgp

btcdrak-key.pgp

jonasschnelli-key.pgp

linux-download-config

prab-key.pgp

sipa-key.pgp

win32-download-config

init/

README.md

org.bitcoin.bitcoind.plist

seeds/

verify-commits/

verifysfbinaries/

depends/

packages/

patches/

qt/

pidlist_absolute.patch

doc/

release-notes/

release-notes-0.10.3.md

release-notes-0.11.1.md

release-notes-0.6.3.md

release-process.md

shared-libraries.md

tor.md

translation_process.md

translation_strings_policy.md

qa/

pull-tester/

run-bitcoind-for-test.sh.in

rpc-tests/

README.md

abandonconflict.py

bip65-cltv-p2p.py

	bip65-cltv.py
	bipdersig.py

fundrawtransaction.py

getblocktemplate_longpoll.py

getblocktemplate_proposals.py

getchaintips.py

httpbasics.py

invalidateblock.py

invalidblockrequest.py

mempool_coinbase_spends.py

mempool_limit.py

mempool_packages.py

	mempool_reorg.py
	mempool_coinbase_spends.py

mempool_resurrect_test.py

mempool_spendcoinbase.py

prioritise_transaction.py

test_framework/

share/

qt/

src/

Makefile.bench.include

Makefile.qt.include

Makefile.qttest.include

Makefile.test.include

compat/

consensus/

leveldb/

util/

policy/

primitives/

qt/

addresstablemodel.cpp

addresstablemodel.h

askpassphrasedialog.cpp

askpassphrasedialog.h

bitcoinamountfield.cpp

coincontroldialog.cpp

coincontroldialog.h

coincontroltreewidget.cpp

forms/

locale/

	bitcoin_bg_BG.ts
	bitcoin_cmn.ts

bitcoin_bs.ts

bitcoin_ca.ts

bitcoin_ca@valencia.ts

bitcoin_ca_ES.ts

bitcoin_cmn.ts

bitcoin_cs.ts

	bitcoin_cs_CZ.ts
	bitcoin_af_ZA.ts

	bitcoin_en_GB.ts
	bitcoin_en.ts

	bitcoin_zh.ts
	bitcoin_vi.ts

paymentrequestplus.cpp

qvalidatedlineedit.cpp

qvalidatedlineedit.h

qvaluecombobox.cpp

qvaluecombobox.h

receivecoinsdialog.cpp

receivecoinsdialog.h

receiverequestdialog.cpp

receiverequestdialog.h

recentrequeststablemodel.cpp

recentrequeststablemodel.h

signverifymessagedialog.cpp

signverifymessagedialog.h

splashscreen.cpp

splashscreen.h

test/

paymentrequestdata.h

paymentservertests.cpp

paymentservertests.h

test_main.cpp

uritests.h

trafficgraphwidget.cpp

trafficgraphwidget.h

transactiondesc.cpp

transactionrecord.cpp

transactiontablemodel.cpp

transactiontablemodel.h

walletmodeltransaction.cpp

rpcrawtransaction.cpp

script/

secp256k1/

build-aux/

m4/

ax_prog_cc_for_build.m4

lax_der_privatekey_parsing.h

	contrib/
	src/

	lax_der_privatekey_parsing.c
	eckey_impl.h

include/

src/

bench_schnorr_verify.c

	ecmult_const.h
	num_gmp.h

support/

allocators/

test/

Checkpoints_tests.cpp

arith_uint256_tests.cpp

data/

policyestimator_tests.cpp

prevector_tests.cpp

reverselock_tests.cpp

script_P2SH_tests.cpp

transaction_tests.cpp

txvalidationcache_tests.cpp

univalue/

build-aux/

m4/

gen/

include/

lib/

test/

validationinterface.h

wallet/

test/

zmq/

zmqnotificationinterface.cpp

zmqnotificationinterface.h

zmqpublishnotifier.cpp

rABC5bc4fb7b602c

View Options

.gitignore

View Options

.travis.yml

View Options

.tx/config

View Options

CONTRIBUTING.md

View Options

Makefile.am

View Options

README.md

View Options

build-aux/m4/bitcoin_qt.m4

View Options

configure.ac

View Options

contrib/debian/changelog

View Options

contrib/debian/control

View Options

contrib/debian/manpages/bitcoin-cli.1

View Options

contrib/debian/manpages/bitcoin-qt.1

View Options

contrib/debian/manpages/bitcoin.conf.5

View Options

contrib/debian/manpages/bitcoind.1

View Options

contrib/debian/watch

View Options

contrib/devtools/README.md

View Options

contrib/devtools/clang-format.py

View Options

contrib/devtools/fix-copyright-headers.py

View Options

contrib/devtools/optimize-pngs.py

View Options

contrib/devtools/security-check.py

View Options

contrib/devtools/symbol-check.py

View Options

contrib/devtools/test-security-check.py

View Options

contrib/devtools/update-translations.py

View Options

contrib/gitian-descriptors/README.md

View Options

contrib/gitian-descriptors/gitian-linux.yml

View Options

contrib/gitian-descriptors/gitian-osx-signer.yml

View Options

contrib/gitian-descriptors/gitian-osx.yml

View Options

contrib/gitian-descriptors/gitian-win-signer.yml

View Options

contrib/gitian-descriptors/gitian-win.yml

View Options

contrib/gitian-downloader/bluematt-key.pgp

View Options

contrib/gitian-downloader/btcdrak-key.pgp

View Options

contrib/gitian-downloader/jonasschnelli-key.pgp

View Options

contrib/gitian-downloader/linux-download-config

View Options

contrib/gitian-downloader/prab-key.pgp

View Options

contrib/gitian-downloader/sipa-key.pgp

View Options

contrib/gitian-downloader/win32-download-config

View Options

contrib/init/README.md

View Options

contrib/init/org.bitcoin.bitcoind.plist

View Options

contrib/seeds/generate-seeds.py

View Options

contrib/test-patches

View Options

contrib/test-patches/README.md

View Options

contrib/test-patches/temp-revert-2.patch

View Options

contrib/verify-commits/allow-revsig-commits

View Options

contrib/verify-commits/gpg.sh

View Options

contrib/verify-commits/pre-push-hook.sh

View Options

contrib/verify-commits/trusted-keys

View Options

contrib/verify-commits/verify-commits.sh

View Options

contrib/verifysfbinaries/verify.sh

View Options

depends/README.md

View Options

depends/config.guess

View Options

depends/config.sub

View Options

depends/packages/bdb.mk

View Options

depends/packages/boost.mk

View Options

depends/packages/miniupnpc.mk

View Options

depends/packages/native_ccache.mk

View Options

depends/packages/openssl.mk

View Options

depends/packages/qt.mk

View Options

depends/packages/zeromq.mk

View Options

depends/patches/qt/pidlist_absolute.patch

View Options

doc/Doxyfile

View Options

doc/README.md

View Options

doc/README_osx.txt

View Options

doc/README_windows.txt

View Options

doc/bips.md

View Options

doc/build-openbsd.md

View Options

doc/build-osx.md

View Options

doc/build-unix.md

View Options

doc/build-windows.md

View Options

doc/developer-notes.md

View Options

doc/dnsseed-policy.md

View Options

doc/files.md

View Options

doc/gitian-building.md

View Options

doc/init.md

View Options

doc/reduce-traffic.md

View Options

doc/release-notes.md

View Options

doc/release-notes/release-notes-0.10.3.md

View Options

doc/release-notes/release-notes-0.11.1.md

View Options

doc/release-notes/release-notes-0.6.3.md

View Options

doc/release-process.md

View Options

doc/shared-libraries.md

View Options

doc/tor.md

View Options

doc/translation_process.md

View Options

doc/translation_strings_policy.md

View Options

doc/unit-tests.md

View Options

doc/zmq.md

View Options

qa/README.md

View Options

qa/pull-tester/rpc-tests.py

View Options

qa/pull-tester/run-bitcoind-for-test.sh.in

View Options

qa/rpc-tests/README.md

View Options

qa/rpc-tests/abandonconflict.py

View Options

qa/rpc-tests/bip65-cltv-p2p.py

View Options

qa/rpc-tests/bip65-cltv.py

View Options

qa/rpc-tests/bipdersig.py

View Options

qa/rpc-tests/blockchain.py

View Options

qa/rpc-tests/decodescript.py

View Options

qa/rpc-tests/disablewallet.py

View Options

qa/rpc-tests/forknotify.py

View Options

qa/rpc-tests/fundrawtransaction.py

View Options

qa/rpc-tests/getblocktemplate_longpoll.py

View Options

qa/rpc-tests/getblocktemplate_proposals.py

View Options

qa/rpc-tests/getchaintips.py

View Options

qa/rpc-tests/httpbasics.py

View Options

qa/rpc-tests/invalidateblock.py

View Options

qa/rpc-tests/invalidblockrequest.py

View Options

qa/rpc-tests/invalidtxrequest.py

View Options

qa/rpc-tests/keypool.py

View Options

qa/rpc-tests/listtransactions.py

View Options

qa/rpc-tests/maxblocksinflight.py

View Options

qa/rpc-tests/maxuploadtarget.py

View Options

qa/rpc-tests/mempool_coinbase_spends.py

View Options

qa/rpc-tests/mempool_limit.py

View Options

qa/rpc-tests/mempool_packages.py

View Options

qa/rpc-tests/mempool_reorg.py

View Options

qa/rpc-tests/mempool_resurrect_test.py

View Options

qa/rpc-tests/mempool_spendcoinbase.py

View Options

qa/rpc-tests/merkle_blocks.py

View Options

qa/rpc-tests/multi_rpc.py

View Options

qa/rpc-tests/nodehandling.py

View Options

qa/rpc-tests/p2p-acceptblock.py

View Options

qa/rpc-tests/p2p-fullblocktest.py

View Options

qa/rpc-tests/prioritise_transaction.py

View Options

qa/rpc-tests/pruning.py

View Options

qa/rpc-tests/rawtransactions.py

View Options

qa/rpc-tests/receivedby.py

View Options

qa/rpc-tests/reindex.py

View Options

qa/rpc-tests/replace-by-fee.py

View Options

qa/rpc-tests/rest.py

View Options

qa/rpc-tests/rpcbind_test.py

View Options

qa/rpc-tests/script_test.py

View Options

qa/rpc-tests/sendheaders.py

View Options

qa/rpc-tests/smartfees.py

View Options

qa/rpc-tests/test_framework/authproxy.py

View Options

qa/rpc-tests/test_framework/comptool.py

View Options

qa/rpc-tests/test_framework/coverage.py

View Options

qa/rpc-tests/test_framework/mininode.py

View Options

qa/rpc-tests/test_framework/netutil.py

View Options

qa/rpc-tests/test_framework/script.py

View Options

qa/rpc-tests/test_framework/test_framework.py

View Options

qa/rpc-tests/test_framework/util.py

View Options

qa/rpc-tests/txn_clone.py

View Options

qa/rpc-tests/txn_doublespend.py

View Options

qa/rpc-tests/wallet.py

View Options

qa/rpc-tests/walletbackup.py

View Options

qa/rpc-tests/zapwallettxes.py

View Options

share/qt/make_windows_icon.sh

View Options

share/rpcuser/README.md

View Options

share/rpcuser/rpcuser.py

View Options

src/.clang-format

View Options

src/Makefile.am

View Options

src/Makefile.bench.include

View Options

src/Makefile.qt.include

View Options

src/Makefile.qttest.include

View Options

src/Makefile.test.include

View Options

src/addrman.cpp

View Options

src/addrman.h

View Options

src/alert.cpp

View Options

src/alert.h

View Options

src/amount.cpp

View Options

src/amount.h

View Options

src/arith_uint256.h

View Options

src/base58.cpp

View Options

src/base58.h

View Options

src/bench/.gitignore

View Options

src/bench/Examples.cpp

View Options

src/bench/bench.cpp

View Options

src/bench/bench.h

View Options

src/bench/bench_bitcoin.cpp

View Options

src/bitcoin-cli.cpp

View Options

src/bitcoin-tx.cpp

View Options

src/bitcoind.cpp

View Options

src/bloom.cpp

View Options

src/bloom.h

View Options

src/chain.cpp

View Options

src/chain.h

View Options

src/chainparams.cpp

View Options

src/chainparams.h

View Options

src/chainparamsbase.cpp

View Options

src/chainparamsbase.h

View Options

src/checkpoints.cpp

View Options

src/checkpoints.h

View Options

src/checkqueue.h

View Options

src/clientversion.h

View Options

src/coincontrol.h

View Options

src/coins.cpp

View Options

src/coins.h

View Options

src/compat.h

View Options

src/compat/endian.h

View Options

src/consensus/consensus.h

View Options

src/consensus/merkle.cpp

View Options

src/consensus/merkle.h

View Options

src/consensus/params.h

View Options

src/consensus/validation.h

View Options

src/core_io.h

View Options

src/core_memusage.h

View Options

src/core_read.cpp

View Options

src/core_write.cpp

View Options

src/dbwrapper.cpp

View Options

src/dbwrapper.h

View Options

src/eccryptoverify.cpp

View Options

src/eccryptoverify.h

View Options

src/ecwrapper.cpp

View Options

src/ecwrapper.h

View Options

src/hash.cpp

View Options

src/hash.h

View Options

src/httprpc.cpp

View Options

src/httpserver.cpp

View Options

src/httpserver.h

View Options

src/init.cpp

View Options

src/init.h

View Options

src/key.cpp

View Options

src/key.h

View Options

src/keystore.cpp

View Options

src/keystore.h

View Options

src/leveldb/util/env_win.cc

View Options

src/leveldbwrapper.cpp

View Options

src/leveldbwrapper.h

View Options

src/limitedmap.h

View Options

src/main.cpp

View Options

src/main.h

View Options

src/memusage.h

View Options

src/merkleblock.cpp

View Options

src/merkleblock.h

View Options

src/miner.cpp

View Options

src/miner.h

View Options

src/mruset.h

View Options

src/net.cpp

View Options

src/net.h

View Options

src/netbase.cpp

View Options

src/netbase.h

View Options

src/policy/fees.cpp

View Options

src/policy/fees.h

View Options

src/policy/policy.cpp

View Options

src/policy/policy.h

View Options

src/pow.cpp

View Options

src/pow.h

View Options

src/prevector.h

View Options

src/primitives/block.cpp

View Options

src/primitives/block.h

View Options

src/primitives/transaction.cpp

View Options

src/primitives/transaction.h

View Options

src/protocol.cpp

View Options

src/protocol.h

View Options

src/pubkey.cpp

View Options

src/pubkey.h

View Options

src/qt/addressbookpage.cpp

View Options

src/qt/addressbookpage.h

View Options

src/qt/addresstablemodel.cpp

View Options

src/qt/addresstablemodel.h

View Options

src/qt/askpassphrasedialog.cpp

View Options

src/qt/askpassphrasedialog.h

View Options

src/qt/bantablemodel.cpp

View Options

src/qt/bantablemodel.h

View Options

src/qt/bitcoin.cpp

View Options

src/qt/bitcoin_locale.qrc

View Options

src/qt/bitcoinamountfield.cpp

View Options

src/qt/bitcoinamountfield.h

View Options

src/qt/bitcoingui.cpp

View Options

src/qt/bitcoingui.h

View Options

src/qt/bitcoinstrings.cpp

View Options

src/qt/bitcoinunits.cpp

View Options

src/qt/bitcoinunits.h

View Options

src/qt/clientmodel.cpp

View Options

src/qt/clientmodel.h

View Options

src/qt/coincontroldialog.cpp

View Options

src/qt/coincontroldialog.h

View Options

src/qt/coincontroltreewidget.cpp

View Options

src/qt/editaddressdialog.h

View Options

src/qt/forms/debugwindow.ui

View Options

src/qt/guiconstants.h

View Options

src/qt/guiutil.cpp

View Options

src/qt/guiutil.h

View Options

src/qt/intro.cpp

View Options

src/qt/intro.h

View Options

src/qt/locale/bitcoin_ach.ts

View Options

src/qt/locale/bitcoin_af_ZA.ts

View Options

src/qt/locale/bitcoin_ar.ts

View Options

src/qt/locale/bitcoin_be_BY.ts

View Options

src/qt/locale/bitcoin_bg.ts

View Options

src/qt/locale/bitcoin_bg_BG.ts

View Options

src/qt/locale/bitcoin_bs.ts

View Options

src/qt/locale/bitcoin_ca.ts

View Options

src/qt/locale/bitcoin_ca@valencia.ts

View Options

src/qt/locale/bitcoin_ca_ES.ts

View Options

src/qt/locale/bitcoin_cmn.ts

View Options

src/qt/locale/bitcoin_cs.ts

View Options

src/qt/locale/bitcoin_cs_CZ.ts

View Options

src/qt/locale/bitcoin_cy.ts

View Options

src/qt/locale/bitcoin_da.ts

View Options

src/qt/locale/bitcoin_de.ts

View Options

src/qt/locale/bitcoin_el.ts

View Options

src/qt/locale/bitcoin_el_GR.ts

View Options

src/qt/locale/bitcoin_en.ts

View Options

src/qt/locale/bitcoin_en_GB.ts

View Options

src/qt/locale/bitcoin_eo.ts

View Options

src/qt/locale/bitcoin_es.ts

View Options

src/qt/locale/bitcoin_es_CL.ts

View Options

src/qt/locale/bitcoin_es_DO.ts

View Options

src/qt/locale/bitcoin_es_ES.ts

View Options

src/qt/locale/bitcoin_es_MX.ts

View Options

src/qt/locale/bitcoin_es_UY.ts

View Options

src/qt/locale/bitcoin_es_VE.ts

View Options

src/qt/locale/bitcoin_et.ts

View Options

src/qt/locale/bitcoin_eu_ES.ts

View Options

src/qt/locale/bitcoin_fa.ts

View Options

src/qt/locale/bitcoin_fa_IR.ts

View Options

src/qt/locale/bitcoin_fi.ts

View Options

src/qt/locale/bitcoin_fr.ts

View Options

src/qt/locale/bitcoin_fr_CA.ts

View Options

src/qt/locale/bitcoin_fr_FR.ts

View Options

src/qt/locale/bitcoin_gl.ts

View Options

src/qt/locale/bitcoin_gu_IN.ts

View Options

src/qt/locale/bitcoin_he.ts

View Options

src/qt/locale/bitcoin_hi_IN.ts

View Options

src/qt/locale/bitcoin_hr.ts

View Options

src/qt/locale/bitcoin_hu.ts

View Options

src/qt/locale/bitcoin_id_ID.ts

View Options

src/qt/locale/bitcoin_it.ts

View Options

src/qt/locale/bitcoin_ja.ts

View Options

src/qt/locale/bitcoin_ka.ts

View Options

src/qt/locale/bitcoin_kk_KZ.ts

View Options

src/qt/locale/bitcoin_ko_KR.ts

View Options

src/qt/locale/bitcoin_ky.ts

View Options

src/qt/locale/bitcoin_la.ts

View Options

src/qt/locale/bitcoin_lt.ts

View Options

src/qt/locale/bitcoin_lv_LV.ts

View Options

src/qt/locale/bitcoin_mk_MK.ts

View Options

src/qt/locale/bitcoin_mn.ts

View Options

src/qt/locale/bitcoin_ms_MY.ts

View Options

src/qt/locale/bitcoin_nb.ts

View Options

src/qt/locale/bitcoin_nl.ts

View Options

src/qt/locale/bitcoin_pam.ts

View Options

src/qt/locale/bitcoin_pl.ts

View Options

src/qt/locale/bitcoin_pt_BR.ts

View Options

src/qt/locale/bitcoin_pt_PT.ts

View Options

src/qt/locale/bitcoin_ro_RO.ts

View Options

src/qt/locale/bitcoin_ru.ts

View Options

src/qt/locale/bitcoin_ru_RU.ts

View Options

src/qt/locale/bitcoin_sah.ts

View Options

src/qt/locale/bitcoin_sk.ts

View Options

src/qt/locale/bitcoin_sl_SI.ts

View Options

src/qt/locale/bitcoin_sq.ts

View Options

src/qt/locale/bitcoin_sr.ts

View Options

src/qt/locale/bitcoin_sv.ts

View Options

src/qt/locale/bitcoin_th_TH.ts

View Options

src/qt/locale/bitcoin_tr.ts

View Options

src/qt/locale/bitcoin_tr_TR.ts

View Options

src/qt/locale/bitcoin_uk.ts

View Options

src/qt/locale/bitcoin_ur_PK.ts

View Options

src/qt/locale/bitcoin_uz@Cyrl.ts

View Options

src/qt/locale/bitcoin_vi.ts

View Options

src/qt/locale/bitcoin_vi_VN.ts

View Options

src/qt/locale/bitcoin_zh.ts

View Options

src/qt/locale/bitcoin_zh_CN.ts

View Options

src/qt/locale/bitcoin_zh_HK.ts

View Options

src/qt/locale/bitcoin_zh_TW.ts

View Options

src/qt/macdockiconhandler.h

View Options

src/qt/networkstyle.cpp

View Options

src/qt/notificator.h

View Options

src/qt/openuridialog.h

View Options

src/qt/optionsdialog.cpp

View Options

src/qt/optionsdialog.h

View Options

src/qt/optionsmodel.cpp

View Options

src/qt/optionsmodel.h

View Options

src/qt/overviewpage.cpp

View Options

src/qt/overviewpage.h

View Options

src/qt/paymentrequestplus.cpp

View Options

src/qt/paymentrequestplus.h

View Options

src/qt/paymentserver.cpp

View Options

src/qt/paymentserver.h

View Options

src/qt/peertablemodel.cpp

View Options

src/qt/peertablemodel.h

View Options

src/qt/qvalidatedlineedit.cpp

View Options

src/qt/qvalidatedlineedit.h

View Options

src/qt/qvaluecombobox.cpp

View Options

src/qt/qvaluecombobox.h

View Options

src/qt/receivecoinsdialog.cpp

View Options

src/qt/receivecoinsdialog.h

View Options

src/qt/receiverequestdialog.cpp

View Options

src/qt/receiverequestdialog.h

View Options

src/qt/recentrequeststablemodel.cpp

View Options

src/qt/recentrequeststablemodel.h

View Options

src/qt/rpcconsole.cpp

View Options

src/qt/rpcconsole.h

View Options

src/qt/sendcoinsdialog.cpp

View Options

src/qt/sendcoinsdialog.h

View Options

src/qt/sendcoinsentry.cpp

View Options

src/qt/sendcoinsentry.h

View Options

src/qt/signverifymessagedialog.cpp

View Options

src/qt/signverifymessagedialog.h

View Options

src/qt/splashscreen.cpp

View Options

src/qt/splashscreen.h

View Options

src/qt/test/paymentrequestdata.h

View Options

src/qt/test/paymentservertests.cpp

View Options

src/qt/test/paymentservertests.h

View Options

src/qt/test/test_main.cpp

View Options

src/qt/test/uritests.h

View Options

src/qt/trafficgraphwidget.cpp

View Options

src/qt/trafficgraphwidget.h

View Options

src/qt/transactiondesc.cpp

View Options

src/qt/transactionrecord.cpp

View Options

src/qt/transactiontablemodel.cpp

View Options

src/qt/transactiontablemodel.h

View Options

src/qt/transactionview.cpp

View Options

src/qt/transactionview.h

View Options

src/qt/utilitydialog.cpp

View Options

src/qt/utilitydialog.h

View Options

src/qt/walletframe.cpp

View Options

src/qt/walletframe.h

View Options

src/qt/walletmodel.cpp

View Options

src/qt/walletmodel.h

View Options

src/qt/walletmodeltransaction.cpp

View Options

src/qt/walletview.cpp

View Options

src/qt/walletview.h

View Options

src/random.cpp

View Options

src/rest.cpp

View Options

src/reverselock.h

View Options

src/rpcblockchain.cpp

View Options

src/rpcclient.cpp

View Options

src/rpcclient.h

View Options

src/rpcmining.cpp

View Options

src/rpcmisc.cpp

View Options

src/rpcnet.cpp

View Options

src/rpcprotocol.cpp

View Options

src/rpcprotocol.h

View Options

src/rpcrawtransaction.cpp

View Options

src/rpcserver.cpp

View Options

src/rpcserver.h

View Options

src/script/bitcoinconsensus.cpp

View Options

src/script/bitcoinconsensus.h

View Options

src/script/interpreter.cpp

View Options

src/script/interpreter.h

View Options

src/script/script.cpp

View Options

src/script/script.h

View Options

src/script/sigcache.cpp

View Options

src/script/sigcache.h

View Options

src/script/sign.cpp

View Options

src/script/sign.h

View Options

src/script/standard.cpp

View Options

src/script/standard.h

View Options

src/secp256k1/.gitignore

View Options

src/secp256k1/.travis.yml

View Options

src/secp256k1/Makefile.am

View Options

src/secp256k1/build-aux/m4/ax_prog_cc_for_build.m4

View Options

src/secp256k1/build-aux/m4/bitcoin_secp.m4

View Options

src/secp256k1/configure.ac

View Options

src/secp256k1/contrib/lax_der_parsing.c

View Options

src/secp256k1/contrib/lax_der_parsing.h

View Options

src/secp256k1/contrib/lax_der_privatekey_parsing.c

View Options

src/secp256k1/contrib/lax_der_privatekey_parsing.h

View Options

src/secp256k1/include/secp256k1.h

View Options

src/secp256k1/include/secp256k1_ecdh.h

View Options

src/secp256k1/include/secp256k1_recovery.h

View Options

src/secp256k1/include/secp256k1_schnorr.h

View Options

src/secp256k1/src/basic-config.h

View Options

src/secp256k1/src/bench.h

View Options

src/secp256k1/src/bench_ecdh.c

View Options

src/secp256k1/src/bench_internal.c

View Options

src/secp256k1/src/bench_recover.c

View Options

src/secp256k1/src/bench_schnorr_verify.c

View Options

src/secp256k1/src/bench_sign.c

View Options

src/secp256k1/src/bench_verify.c

View Options

src/secp256k1/src/ecdsa.h

View Options

src/secp256k1/src/ecdsa_impl.h

View Options

src/secp256k1/src/eckey.h

View Options

src/secp256k1/src/eckey_impl.h

View Options

src/secp256k1/src/ecmult.h

View Options

src/secp256k1/src/ecmult_const.h

View Options

src/secp256k1/src/ecmult_const_impl.h

View Options

src/secp256k1/src/ecmult_gen.h

View Options

src/secp256k1/src/ecmult_gen_impl.h

View Options

src/secp256k1/src/ecmult_impl.h

View Options

src/secp256k1/src/field.h

View Options

src/secp256k1/src/field_10x26.h

View Options

src/secp256k1/src/field_10x26_impl.h

View Options

src/secp256k1/src/field_5x52.h

View Options

src/secp256k1/src/field_5x52_impl.h

View Options

src/secp256k1/src/field_impl.h

View Options

src/secp256k1/src/gen_context.c

View Options

src/secp256k1/src/group.h

View Options

src/secp256k1/src/group_impl.h

View Options

src/secp256k1/src/hash.h

View Options

src/secp256k1/src/hash_impl.h

View Options

src/secp256k1/src/modules/ecdh/Makefile.am.include

View Options

src/secp256k1/src/modules/ecdh/main_impl.h

View Options

src/secp256k1/src/modules/ecdh/tests_impl.h

View Options

src/secp256k1/src/modules/recovery/Makefile.am.include

View Options

src/secp256k1/src/modules/recovery/main_impl.h

View Options

src/secp256k1/src/modules/recovery/tests_impl.h

View Options

src/secp256k1/src/modules/schnorr/Makefile.am.include

View Options

src/secp256k1/src/modules/schnorr/main_impl.h

View Options

src/secp256k1/src/modules/schnorr/schnorr.h

View Options

src/secp256k1/src/modules/schnorr/schnorr_impl.h

View Options

src/secp256k1/src/modules/schnorr/tests_impl.h

View Options

src/secp256k1/src/num.h

View Options

src/secp256k1/src/num_gmp.h

View Options

src/secp256k1/src/num_gmp_impl.h

View Options

src/secp256k1/src/scalar.h

View Options

src/secp256k1/src/scalar_4x64.h

View Options

src/secp256k1/src/scalar_4x64_impl.h

View Options

src/secp256k1/src/scalar_8x32.h

View Options

src/secp256k1/src/scalar_8x32_impl.h

View Options

src/secp256k1/src/scalar_impl.h

View Options

src/secp256k1/src/secp256k1.c

View Options

src/secp256k1/src/testrand.h

View Options

src/secp256k1/src/testrand_impl.h

View Options

src/secp256k1/src/tests.c

View Options

src/secp256k1/src/util.h

View Options

src/serialize.h

View Options

src/streams.h

View Options

src/support/allocators/secure.h

View Options

src/support/allocators/zeroafterfree.h

View Options

src/support/pagelocker.cpp

View Options

src/support/pagelocker.h

View Options

src/sync.cpp

View Options

src/sync.h

View Options

src/test/Checkpoints_tests.cpp

View Options

src/test/DoS_tests.cpp

View Options

src/test/README.md

View Options

src/test/accounting_tests.cpp

View Options

src/test/addrman_tests.cpp

View Options

src/test/alert_tests.cpp

View Options

src/test/allocator_tests.cpp

View Options

src/test/arith_uint256_tests.cpp

View Options

src/test/base32_tests.cpp

View Options

src/test/base58_tests.cpp

View Options

src/test/base64_tests.cpp

View Options

src/test/bignum.h

View Options

src/test/bip32_tests.cpp

View Options

src/test/bloom_tests.cpp

View Options

src/test/checkblock_tests.cpp

View Options

src/test/coins_tests.cpp

View Options

src/test/compress_tests.cpp

View Options

src/test/crypto_tests.cpp

View Options

src/test/data/script_invalid.json

View Options

src/test/data/script_valid.json

View Options

src/test/data/tx_invalid.json

View Options

src/test/data/tx_valid.json

View Options

src/test/dbwrapper_tests.cpp

View Options

src/test/getarg_tests.cpp

View Options

src/test/hash_tests.cpp

View Options

src/test/key_tests.cpp

View Options

src/test/main_tests.cpp

View Options

src/test/mempool_tests.cpp

View Options

src/test/merkle_tests.cpp

View Options

src/test/miner_tests.cpp

View Options

src/test/mruset_tests.cpp

View Options

src/test/netbase_tests.cpp

View Options

src/test/pmt_tests.cpp

View Options

src/test/policyestimator_tests.cpp

View Options

src/test/prevector_tests.cpp

View Options

src/test/reverselock_tests.cpp

View Options

src/test/rpc_tests.cpp

View Options

src/test/rpc_wallet_tests.cpp

View Options

src/test/sanity_tests.cpp

View Options

src/test/scheduler_tests.cpp

View Options

src/test/script_P2SH_tests.cpp

View Options

src/test/script_tests.cpp

View Options

src/test/scriptnum10.h

View Options

src/test/scriptnum_tests.cpp

View Options

src/test/serialize_tests.cpp

View Options

src/test/sighash_tests.cpp

View Options

src/test/sigopcount_tests.cpp

View Options

src/test/skiplist_tests.cpp

View Options

src/test/streams_tests.cpp

View Options

src/test/test_bitcoin.cpp

View Options

src/test/test_bitcoin.h

View Options

src/test/timedata_tests.cpp

View Options

src/test/transaction_tests.cpp

View Options

src/test/txvalidationcache_tests.cpp

View Options

src/test/uint256_tests.cpp

View Options

src/test/util_tests.cpp

View Options

src/timedata.cpp

View Options

src/torcontrol.cpp

View Options

src/torcontrol.h

View Options

src/txdb.cpp

View Options

src/txdb.h

View Options

src/txmempool.cpp

View Options

src/txmempool.h

View Options

src/ui_interface.h

View Options

src/uint256.cpp

View Options

src/uint256.h

View Options

src/univalue/.gitignore

View Options

src/univalue/.travis.yml

View Options

src/univalue/Makefile.am

View Options

src/univalue/build-aux/m4/.empty

View Options

src/univalue/build-aux/m4/.gitignore

View Options

src/univalue/configure.ac

View Options

src/univalue/gen/gen.cpp

View Options

src/univalue/include/univalue.h

View Options

src/univalue/lib/.gitignore

View Options

src/univalue/lib/univalue.cpp

View Options

src/univalue/lib/univalue_escapes.h

View Options

src/univalue/lib/univalue_read.cpp

View Options

src/univalue/lib/univalue_write.cpp

View Options

src/univalue/test/.gitignore

View Options

src/univalue/test/fail35.json

View Options

src/univalue/test/fail36.json

View Options

src/univalue/test/fail37.json

View Options

src/univalue/test/round1.json

View Options

src/univalue/test/unitester.cpp

View Options

src/util.cpp

View Options

src/util.h

View Options

src/utilmoneystr.cpp

View Options

src/utilmoneystr.h

View Options

src/utilstrencodings.cpp

View Options

src/utilstrencodings.h

View Options

src/utiltime.cpp

View Options

src/utiltime.h

View Options

src/validationinterface.h

View Options

src/version.h

View Options

src/wallet/crypter.cpp

View Options

src/wallet/crypter.h

View Options

src/wallet/db.cpp

View Options

src/wallet/db.h

View Options

src/wallet/rpcdump.cpp

View Options

src/wallet/rpcwallet.cpp

View Options

src/wallet/test/wallet_tests.cpp

View Options

src/wallet/wallet.cpp

View Options

src/wallet/wallet.h

View Options

src/wallet/wallet_ismine.cpp

View Options

src/wallet/wallet_ismine.h

View Options

src/wallet/walletdb.cpp

View Options

src/wallet/walletdb.h

View Options

src/zmq/zmqnotificationinterface.cpp

View Options

src/zmq/zmqnotificationinterface.h

View Options

src/zmq/zmqpublishnotifier.cpp

Merge branch 'master' into 20150703_banlist_updates5bc4fb7b602cUnpublishedActions

Unpublished Commit · Learn More

Description

Details

Event Timeline

Merged Changes

Changes (633)

rABC5bc4fb7b602c

.gitignore

.travis.yml

.tx/config

CONTRIBUTING.md

Makefile.am

README.md

build-aux/m4/bitcoin_qt.m4

configure.ac

contrib/debian/changelog

contrib/debian/control

contrib/debian/manpages/bitcoin-cli.1

contrib/debian/manpages/bitcoin-qt.1

contrib/debian/manpages/bitcoin.conf.5

contrib/debian/manpages/bitcoind.1

contrib/debian/watch

contrib/devtools/README.md

contrib/devtools/clang-format.py

contrib/devtools/fix-copyright-headers.py

contrib/devtools/optimize-pngs.py

contrib/devtools/security-check.py

contrib/devtools/symbol-check.py

contrib/devtools/test-security-check.py

contrib/devtools/update-translations.py

contrib/gitian-descriptors/README.md

contrib/gitian-descriptors/gitian-linux.yml

contrib/gitian-descriptors/gitian-osx-signer.yml

contrib/gitian-descriptors/gitian-osx.yml

contrib/gitian-descriptors/gitian-win-signer.yml

contrib/gitian-descriptors/gitian-win.yml

contrib/gitian-downloader/bluematt-key.pgp

contrib/gitian-downloader/btcdrak-key.pgp

contrib/gitian-downloader/jonasschnelli-key.pgp

contrib/gitian-downloader/linux-download-config

contrib/gitian-downloader/prab-key.pgp

contrib/gitian-downloader/sipa-key.pgp

contrib/gitian-downloader/win32-download-config

contrib/init/README.md

contrib/init/org.bitcoin.bitcoind.plist

contrib/seeds/generate-seeds.py

contrib/test-patches

contrib/test-patches/README.md

contrib/test-patches/temp-revert-2.patch

contrib/verify-commits/allow-revsig-commits

contrib/verify-commits/gpg.sh

contrib/verify-commits/pre-push-hook.sh

contrib/verify-commits/trusted-keys

contrib/verify-commits/verify-commits.sh

contrib/verifysfbinaries/verify.sh

depends/README.md

depends/config.guess

depends/config.sub

depends/packages/bdb.mk

depends/packages/boost.mk

depends/packages/miniupnpc.mk

depends/packages/native_ccache.mk

depends/packages/openssl.mk

depends/packages/qt.mk

depends/packages/zeromq.mk

depends/patches/qt/pidlist_absolute.patch

doc/Doxyfile

doc/README.md

doc/README_osx.txt

doc/README_windows.txt

doc/bips.md

doc/build-openbsd.md

doc/build-osx.md

doc/build-unix.md

doc/build-windows.md

doc/developer-notes.md

doc/dnsseed-policy.md

doc/files.md

doc/gitian-building.md

Merge branch 'master' into 20150703_banlist_updates
5bc4fb7b602cUnpublished
Actions