This merges (including conflict resolution) various pulls ACK'd for 0.6:
2011-12-16 "next" #705
pull luke-jr wants to merge 32 commits into bitcoin:master from luke-jr:next changing 41 files +2585 −472-
luke-jr commented at 8:04 PM on December 16, 2011: member
-
Execute command specified by -coinbaser when creating a new block, which can output data to control where the generation goes e9a0e4d7a2
-
coinbaser: replace %d in command line with available funds b3fb0d04fc
-
Support for TCP server coinbasers 4e6e221902
-
Save coinbase, not just extraNonce d6cc5ef85b
-
Replace nBits in coinbase scriptSig with arbitrary data set by setworkaux RPC call 29b32459f7
-
Bugfix/safeguard: never create a coinbase scriptSig over 100 bytes long 9c651437ca
-
Check for parse or overflow errors in setworkaux 96f969314d
-
3c54a7b923
Merge commit '96f9693' into coinbaser
Conflicts: src/main.cpp src/main.h src/rpc.cpp
-
Document -coinbaser option in --help a1efc8cb10
-
Port coinbaser code to Windows 59806427d0
-
80828e6da9
Merge branch 'coinbaser'
Conflicts: src/bitcoinrpc.cpp src/main.cpp Hand-merging: src/bitcoinrpc.cpp src/main.cpp src/main.h
-
Added QRCode generation functions via libqrencode 6b18ab4a24
-
Merge branch 'master' of https://github.com/bitcoin/bitcoin 5c3b3bd1a0
-
Merge with addressbook changes 6e15fce386
-
Collapse no-op ExtractAddress/ExtractAddressInner 97641d8f5f
-
Rework unit tests so test_bitcoin.cpp does not #include them all a3f397a2a7
-
1b714b5a8e
Support 3 new multisignature IsStandard transactions
Initial support for (a and b), (a or b), and 2-of-3 escrow transactions (where a, b, and c are keys).
-
Global fixture to send output to console instead of debug.log c4a533a7b5
-
f4cfa27932
OP_EVAL implementation
OP_EVAL is a new opcode that evaluates an item on the stack as a script. It enables a new type of bitcoin address that needs an arbitrarily complex script to redeem.
-
Put OP_EVAL string in coinbase of generated blocks 9db95d35d3
-
Disable addmultisigaddress if not testnet dad31429d9
-
Interpret OP_EVAL as OP_NOP until Feb 1, 2012 309e72221e
-
186b01d8f0
Use block times for 'hard' OP_EVAL switchover, and refactored EvalScript
so it takes a flag for how to interpret OP_EVAL. Also increased IsStandard size of scriptSigs to 500 bytes, so a 3-of-3 multisig transaction IsStandard.
-
Fix logic for IsChange() for send-to-self transactions. b6084f1583
-
a880b29cab
Bugfix: fForRelay should be false when deciding required fee to include in blocks
During the rushed transition from 0.01 BTC to 0.0005 BTC fees, we took the approach of dropping the relay and block-inclusion fee to 0.0005 BTC immediately, and only delayed adjusting the sending fee for the next release. Afterward, the relay fee was lowered to 0.0001 BTC to avoid having the same problem in the future. However, the block inclusion code was left setting fForRelay to true! This fixes that, so the lower 0.0001 BTC allowance is (as intended) only permitted for real relaying.
-
GetMinFee takes a mode parameter (GMF_{BLOCK,RELAY,SEND}) instead of fForRelay dbbf1d4a48
-
Merge branch 'minfee_modes' into next f654eef53f
-
Bitcoin-Qt signmessage GUI 3765dbfb38
-
Merge branch 'coinbaser' into next 791cdec5fa
-
dd24b285ba
Merge remote branch 'gavin/op_eval' into next
Conflicts (not autodetected): src/init.cpp src/main.cpp
-
Merge 'QR Code generation via libqrencode' into next 6746621755
-
84417ec3a0
Merge branch 'signmessage_gui' into next
Conflicts: src/qt/forms/addressbookpage.ui
-
luke-jr commented at 8:04 PM on December 16, 2011: member
Please discuss these changes on their own pull requests, not here!
- luke-jr closed this on Dec 16, 2011
- ptschip referenced this in commit dc8b016a5d on Jul 21, 2017
- kallewoof referenced this in commit eed409ad55 on Oct 4, 2019
- DrahtBot locked this on Sep 8, 2021