aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-06-26Merge pull request #6124Wladimir J. van der Laan
ffd75ad Enable CHECKLOCKTIMEVERIFY as a standard script verify flag (Peter Todd) bc60b2b Replace NOP2 with CHECKLOCKTIMEVERIFY (BIP65) (Peter Todd) 48e9c57 Move LOCKTIME_THRESHOLD to src/script/script.h (Peter Todd) 99088d6 Make CScriptNum() take nMaxNumSize as an argument (Peter Todd)
2015-06-25Merge pull request #6333Wladimir J. van der Laan
b932953 Hardcoded seeds update June 2015 (Wladimir J. van der Laan) 884454a contrib: Add port parsing to makeseeds.py (Wladimir J. van der Laan) ccd4369 contrib: Improvements to hardcoded seeds scripts (Wladimir J. van der Laan)
2015-06-25Merge pull request #6233Wladimir J. van der Laan
3e91433 Advance pindexLastCommonBlock for blocks in chainActive (Suhas Daftuar)
2015-06-25Merge pull request #6339Wladimir J. van der Laan
77aeb7c UniValue: don't escape solidus, keep espacing of reverse solidus (Jonas Schnelli)
2015-06-25UniValue: don't escape solidus, keep espacing of reverse solidusJonas Schnelli
2015-06-25Hardcoded seeds update June 2015Wladimir J. van der Laan
2015-06-25contrib: Add port parsing to makeseeds.pyWladimir J. van der Laan
Allow for non-8333 nodes to appear in the internal seeds. This will allow bitcoind to bypas a filter on 8333. This also makes it possible to use the same tool for e.g. testnet. As hosts with multiple nodes per IP are likely abusive, add a filter to remove these (the ASN check will take care of them for IPv4, but not IPv6 or onion).
2015-06-25contrib: Improvements to hardcoded seeds scriptsWladimir J. van der Laan
- Moved all seed related scripts to contrib/seeds for consistency - Updated `makeseeds.py` to handle IPv6 and onions, fix regular expression for recent Bitcoin Core versions - Fixed a bug in `generate-seeds.py` with regard to IPv6 parsing
2015-06-23Merge pull request #6088Wladimir J. van der Laan
2085895 fundrawtransaction tests (Jonas Schnelli) 21bbd92 Add fundrawtransaction RPC method (Matt Corallo) 1e0d1a2 Add FundTransaction method to wallet (Matt Corallo) 2d84e22 Small tweaks to CCoinControl for fundrawtransaction (Matt Corallo) 9b4e7d9 Add DummySignatureCreator which just creates zeroed sigs (Pieter Wuille)
2015-06-22Merge pull request #6303Wladimir J. van der Laan
d08cfc2 gitian: add a gitian-win-signer descriptor (Cory Fields)
2015-06-22Merge pull request #6319Wladimir J. van der Laan
88d8525 doc: update mailing list address (Wladimir J. van der Laan)
2015-06-22Merge pull request #6318Wladimir J. van der Laan
7c2c270 build: comparison tool NPE fix (Cory Fields)
2015-06-22Merge pull request #6316Wladimir J. van der Laan
b666820 build: Remove -DBOOST_SPIRIT_THREADSAFE (Wladimir J. van der Laan)
2015-06-22doc: update mailing list addressWladimir J. van der Laan
Move from sourceforge to linux foundation. Also get rid of some other stale mentions of sourceforge.
2015-06-22Enable CHECKLOCKTIMEVERIFY as a standard script verify flagPeter Todd
Transactions that fail CLTV verification will be rejected from the mempool, making it easy to test the feature. However blocks containing "invalid" CLTV-using transactions will still be accepted; this is *not* the soft-fork required to actually enable CLTV for production use.
2015-06-21Replace NOP2 with CHECKLOCKTIMEVERIFY (BIP65)Peter Todd
<nLockTime> CHECKLOCKTIMEVERIFY -> <nLockTime> Fails if tx.nLockTime < nLockTime, allowing the funds in a txout to be locked until some block height or block time in the future is reached. Only the logic and unittests are implemented; this commit does not have any actual soft-fork logic in it. Thanks to Pieter Wuille for rebase. Credit goes to Gregory Maxwell for the suggestion of comparing the argument against the transaction nLockTime rather than the current time/blockheight directly.
2015-06-21build: comparison tool NPE fixCory Fields
This should fix the spurious comparison tool failures. See discussion here: https://github.com/bitcoin/bitcoin/pull/6305 The race fix was cherry-picked on top of the version we're currently using, so it should be functionally identical otherwise.
2015-06-21build: Remove -DBOOST_SPIRIT_THREADSAFEWladimir J. van der Laan
Now that boost spirit is no longer used, `-DBOOST_SPIRIT_THREADSAFE` doesn't need to be passed to the compiler anymore.
2015-06-19Merge pull request #6262Wladimir J. van der Laan
506bae3 Return all available information via validateaddress (dexX7)
2015-06-19Merge pull request #6290Wladimir J. van der Laan
57092ed rpc: make `gettxoutsettinfo` run lock-free (Wladimir J. van der Laan)
2015-06-19Merge pull request #6307Wladimir J. van der Laan
1c043d5 fix lock issue for QT node diconnect and RPC disconnectnode (Jonas Schnelli) 932687b setban: add IPv6 tests (Jonas Schnelli) 62909f6 fix missing lock in CNode::ClearBanned() (Jonas Schnelli)
2015-06-19fix lock issue for QT node diconnect and RPC disconnectnodeJonas Schnelli
2015-06-19Merge pull request #6301Wladimir J. van der Laan
82e6487 Adding pgp public key for cdecker as requested by @jonasschnelli in bitcoin/gitian.sigs#182 (Christian Decker)
2015-06-19Merge pull request #6305Wladimir J. van der Laan
a4d9f95 build: comparison tool swap (Cory Fields)
2015-06-19setban: add IPv6 testsJonas Schnelli
2015-06-19fix missing lock in CNode::ClearBanned()Jonas Schnelli
2015-06-19build: comparison tool swapCory Fields
This should be functionally identical to what's in place now. It was built from https://github.com/theuni/bitcoinj/commit/be0eef774462409df277b2a83d71c30451f107c5 That commit is the same as this pruned commit in TheBlueMatt's repo: https://github.com/TheBlueMatt/bitcoinj/commit/0f7b5d8 Now we'll be able to trust the line numbers in the stack traces.
2015-06-18gitian: add a gitian-win-signer descriptorCory Fields
This is exactly like the current OSX signing process. osslsigncode has been patched to detach and re-attach Windows signatures. The changes can be seen here: https://github.com/theuni/osslsigncode/commits/attach-signature There's a pull-request open upstream for the changes: https://sourceforge.net/p/osslsigncode/osslsigncode/merge-requests/3/ This work has been back-ported to the stable 1.7.1 release of osslsigncode, so that a smaller patch can be reviewed.
2015-06-18Adding pgp public key for cdecker as requested by @jonasschnelli in ↵Christian Decker
bitcoin/gitian.sigs#182
2015-06-18Merge pull request #6272Wladimir J. van der Laan
edbdf88 tests: Extend RPC proxy tests (Wladimir J. van der Laan) baf0507 Improve proxy initialization (Wladimir J. van der Laan)
2015-06-18Merge pull request #6158Wladimir J. van der Laan
9d79afe add RPC tests for setban & disconnectnode (Jonas Schnelli) 1f02b80 setban: add RPCErrorCode (Jonas Schnelli) d624167 fix CSubNet comparison operator (Jonas Schnelli) 4e36e9b setban: rewrite to UniValue, allow absolute bantime (Jonas Schnelli) 3de24d7 rename json field "bannedtill" to "banned_until" (Jonas Schnelli) 433fb1a [RPC] extend setban to allow subnets (Jonas Schnelli) e8b9347 [net] remove unused return type bool from CNode::Ban() (Jonas Schnelli) 1086ffb [QA] add setban/listbanned/clearbanned tests (Jonas Schnelli) d930b26 [RPC] add setban/listbanned/clearbanned RPC commands (Jonas Schnelli) 2252fb9 [net] extend core functionallity for ban/unban/listban (Jonas Schnelli)
2015-06-18Merge pull request #6282Wladimir J. van der Laan
0ce30ea fix crash on shutdown when e.g. changing -txindex and abort action (Philip Kaufmann)
2015-06-17add RPC tests for setban & disconnectnodeJonas Schnelli
2015-06-17setban: add RPCErrorCodeJonas Schnelli
2015-06-17fix CSubNet comparison operatorJonas Schnelli
2015-06-17setban: rewrite to UniValue, allow absolute bantimeJonas Schnelli
2015-06-17rename json field "bannedtill" to "banned_until"Jonas Schnelli
2015-06-17[RPC] extend setban to allow subnetsJonas Schnelli
2015-06-17[net] remove unused return type bool from CNode::Ban()Jonas Schnelli
2015-06-17[QA] add setban/listbanned/clearbanned testsJonas Schnelli
2015-06-17[RPC] add setban/listbanned/clearbanned RPC commandsJonas Schnelli
2015-06-17[net] extend core functionallity for ban/unban/listbanJonas Schnelli
2015-06-17Merge pull request #6280Wladimir J. van der Laan
b19a88b depends: fix Boost 1.55 build on GCC 5 (Jacob Welsh)
2015-06-17Merge pull request #6286Wladimir J. van der Laan
a3a80c2 remove berkeley-db4 workaround (rion)
2015-06-16fix crash on shutdown when e.g. changing -txindex and abort actionPhilip Kaufmann
- fixes #3136 - the problem is related to Boost path and a static initialized internal pointer - using a std::string in CDBEnv::EnvShutdown() prevents the problem - this removes the boost::filesystem::path path field from CDBEnv
2015-06-16Merge pull request #6271Wladimir J. van der Laan
60dbe73 New RPC command disconnectnode (Alex van der Peet)
2015-06-16New RPC command disconnectnodeAlex van der Peet
2015-06-16Merge pull request #6283Wladimir J. van der Laan
26a639e remove using namespace std from addrman.cpp (Philip Kaufmann) 40c592a make CAddrMan::size() return the correct type of size_t (Philip Kaufmann)
2015-06-16Merge pull request #6285Wladimir J. van der Laan
72bf90d Fix scheduler build with some boost versions. (Cory Fields)
2015-06-16rpc: make `gettxoutsettinfo` run lock-freeWladimir J. van der Laan
For leveldb "An iterator operates on a snapshot of the database taken when the iterator is created". This means that it is unnecessary to lock out other threads while computing statistics, and neither to hold cs_main for the whole time. Let the thread run free.