Synthesis of #936, #1431, #1526, #1549, #1355, #1409, #1393, #1583, and #1647
next 2012-08-13 #1671
pull luke-jr wants to merge 29 commits into bitcoin:master from luke-jr:4a57037 changing 21 files +1127 −227-
luke-jr commented at 7:33 AM on August 13, 2012: member
-
ee9eecb54d
Treat generation (mined) transactions less different from receive transactions
- Show address receiving the generation, and include it in the correct "account" - Multiple entries in listtransactions output if the coinbase has multiple outputs to us - Classify generation as "receive" category, so it doesn't require special treatment for payment services - Add new "status" key to wallet transactions, which is: - - "confirmed" -- 6+ confirmations (120+ for generation) - - "processing" -- 2+ confirmations (100+ for generation) - - "validating" -- 0+ confirmations ( 1+ for generation) - - "invalid" -- negative confirmations (contradicted in main chain)
-
eff8ee03f3
Block height in coinbase as a new block rule
"Version 2" blocks are blocks that have nVersion=2 and have the block height as the first item in their coinbase. Block-height-in-the-coinbase is strictly enforced when version=2 blocks are a supermajority in the block chain (750 of the last 1,000 blocks on main net, 51 of 100 for testnet). This does not affect old clients/miners at all, which will continue producing nVersion=1 blocks, and which will continue to be valid.
-
fa174be9b5
Reject block.nVersion<=1 blocks if network has upgraded to version=2
If 950 of the last 1,000 blocks are nVersion=2, reject nVersion=1 (or zero, but no bitcoin release has created block.nVersion=0) blocks -- 75 of last 100 on testnet3. This rule is being put in place now so that we don't have to go through another "express support" process to get what we really want, which is for every single new block to include the block height in the coinbase.
-
Make IPv6 support buildtime-optional again (defaults to enabled) 17cfc3a864
-
Bugfix: Make USE_UPNP=- work with makefile.{linux-mingw,mingw,osx} too 787027ca38
-
Allow building with IPv6 support, but it disabled by default 751b8eb120
-
Run BDB disk-less for test_bitcoin 45469095e6
-
b645451a1f
Store a fixed order of transactions (and accounting) in the wallet
For backward compatibility, new accounting data is stored after a \0 in the comment string. This way, old versions and third-party software should load and store them, but all actual use (listtransactions, for example) ignores it.
-
JSON-RPC: Add "blocktime" and (for wallet transactions) "timereceived" to transaction Object outputs 9b49f8ef45
-
f45fa25bb9
Choose reasonable "smart" times to display for transactions
Logic: - If sending a transaction, assign its timestamp to the current time. - If receiving a transaction outside a block, assign its timestamp to the current time. - If receiving a block with a future timestamp, assign all its (not already known) transactions' timestamps to the current time. - If receiving a block with a past timestamp, before the most recent known transaction (that we care about), assign all its (not already known) transactions' timestamps to the same timestamp as that most-recent-known transaction. - If receiving a block with a past timestamp, but after the most recent known transaction, assign all its (not already known) transactions' timestamps to the block time.
-
CreateNewBlock: Consider parent transactions in the "cost" of child transactions until confirmed, and confirm them together 27b24244c4
-
3390014fd0
Minimal BIP 22 (getblocktemplate) support
- Replaces getmemorypool with new getblocktemplate - Add missing keys: coinbaseaux, target, mutable, noncerange, sigoplimit, sizelimit, and height - Accept and send parameter Objects, checking "mode" key if present - Return rejection reason "rejected" for submit mode
-
44427fa833
Merge branch 'gmp_bip_0.6.0' into gmp_bip
Conflicts: src/bitcoinrpc.cpp
-
46d089cab5
Use a copy in place of mapMultiArgs["-addnode"].
Also moves the DNS lookup of -addnode nodes into the repeated loop, allowing -addnode to follow DNS changes.
-
Make ThreadOpenAddedConnections2 exit quicker if(GetNameProxy()). 203dbbfdb8
-
Add addnode RPC command. e9ea8d8344
-
Add a getaddednodeinfo RPC. 07c8938a1e
-
Try more than the first address for a DNS -addnode. c6de971557
-
getblocktemplate: longpolling support 650ea32bbd
-
Merge branch 'gmp_bip' into next a2bba9ff00
-
Merge branch 'opt_ipv6' into next 7ff0f48d4d
-
Merge remote-tracking branch 'gavin/heightincoinbase' into next 7787b7672d
-
Merge remote-tracking branch 'matt/addnoderpc' into next 9b5409c1a1
-
Merge branch 'gmp_longpoll' into next 16e1681dd4
-
Merge branch 'listtx_generate_fold' into next 73d335af49
-
Merge branch 'refactor_times' into next 56f2e1161d
-
2c63ef9156
JSON-RPC method: prioritisetransaction <txid> <priority delta> <priority tx fee>
Accepts the transaction into mined blocks at a higher (or lower) priority
-
Merge branch 'rpc_priotxn' into next 1c4bc89a14
-
4a57037c0b
Merge branch 'minedeps' into next
Conflicts: src/main.cpp
-
BitcoinPullTester commented at 1:24 PM on August 13, 2012: none
Automatic sanity-testing: PASSED, see http://jenkins.bluematt.me/pull-tester/4a57037c0b19f3aa95444a90795d27e6d9592038 for binaries and test log.
-
Diapolo commented at 9:08 PM on August 13, 2012: none
What is the sense of this all-in-one pull?
-
gmaxwell commented at 11:56 PM on August 13, 2012: contributor
I just wanted it built. :) But the pull request is actually mildly helpful for documentation / tracking purposes.
-
laanwj commented at 3:51 AM on August 14, 2012: member
It's funny for this time, but I'm not looking forward to everyone submitting their code as pull request just to get it built for free by BlueMatt :p
-
luke-jr commented at 4:51 AM on August 14, 2012: member
I built the real binaries with gitian anyway ;)
-
sipa commented at 12:52 PM on August 17, 2012: member
@gmaxwell You can request a view of changes from github without there being a pull request for it. The URL for this one would be: https://github.com/luke-jr/bitcoin/compare/63046fcf6...next (where 63046fcf6 is the current master).
- luke-jr closed this on Aug 24, 2012
-
jtimon commented at 12:35 PM on April 25, 2015: contributor
I didn't knew that there was a problem in making travis build many branches of bitcoin. I remember asking BlueMatt about this and he answering something on the lines of "that's what is there for". I'm sorry for abusing it, but as said I didn't know that was bad.
-
sipa commented at 12:56 PM on April 25, 2015: member
Why are you replying to a 2-year old PR? Whatever information in here is totally out of date. We weren't even using Travis at the time...
- DrahtBot locked this on Sep 8, 2021