-
Notifications
You must be signed in to change notification settings - Fork 36.6k
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
2011-12-16 "next" #705
Closed
Closed
2011-12-16 "next" #705
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ich can output data to control where the generation goes
Conflicts: src/main.cpp src/main.h src/rpc.cpp
Conflicts: src/bitcoinrpc.cpp src/main.cpp Hand-merging: src/bitcoinrpc.cpp src/main.cpp src/main.h
Initial support for (a and b), (a or b), and 2-of-3 escrow transactions (where a, b, and c are keys).
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.
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.
…de 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.
Conflicts (not autodetected): src/init.cpp src/main.cpp
Conflicts: src/qt/forms/addressbookpage.ui
Please discuss these changes on their own pull requests, not here! |
ptschip
pushed a commit
to ptschip/bitcoin
that referenced
this pull request
Jul 21, 2017
Preventing node isolation after hard fork
kallewoof
pushed a commit
to kallewoof/bitcoin
that referenced
this pull request
Oct 4, 2019
…afed, add basic test 08eee04 RPC: Fix tweakfedpegscript for dynafed, add basic test (Gregory Sanders) Pull request description: Backport of ElementsProject/elements#704. Tree-SHA512: 9ab616d0afcbc5ff58085f949f8012f10d7c82af12222d686b91b673b2449f3d8789502a9120b6570e8d586676149de095c72faa88388e7c05f5207423bd97e9
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This merges (including conflict resolution) various pulls ACK'd for 0.6: