Skip to content
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

commits from bitcoin/master #329

Merged
merged 10 commits into from May 13, 2018
Merged

commits from bitcoin/master #329

merged 10 commits into from May 13, 2018

Conversation

Bushstar
Copy link
Collaborator

Feathercoin: Allow coins to generate on regtest

[qa] Handle disconnect_node race
bitcoin/bitcoin#13201

[tests] Fixed intermittent failure in p2p_sendheaders.py.
bitcoin/bitcoin#13192

[tests] Remove 'account' API from wallet functional tests
bitcoin/bitcoin#13075

Enable W191 indentation contains tabs and W291 trailing whitespace flake8 checks for Python files
bitcoin/bitcoin#13210

[Policy] Several transaction standardness rules
bitcoin/bitcoin#11423

Bugfix: ensure consistency of m_failed_blocks after reconsiderblock
bitcoin/bitcoin#13199

Bushstar and others added 10 commits May 13, 2018 16:00
Several tests call disconnect_nodes() on each node-pair in rapid
succession, resulting in a race condition if a node disconnects a peer
in-between the calculation of the nodeid's to disconnect and the
invocation of the disconnectnode rpc call.  Handle this.
Added handling for the case where headers are announced over more than one message.
refs #12453
Removes usage of account API from the following functional tests:

- wallet_listreceivedby.py
- wallet_basic.py
- wallet_keypool_topup.py
- wallet_txn_clone.py
- wallet_listsinceblock.py
- wallet_import_rescan.py
- wallet_listtransactions.py
- wallet_txn_doublespend.py
Remove trailing whitespace from Python files.
Convert tabs to spaces.
This disables OP_CODESEPARATOR in non-segwit scripts (even in an unexecuted branch), and makes a positive FindAndDelete result invalid. This ensures that the scriptCode serialized in SignatureHash() is always the same as the script passing to the EvalScript.
Tests showing that CONST_SCRIPTCODE is applied only to non-segwit transactions
A transaction with 1 segwit input and 1 P2WPHK output has non-witness size of 82 bytes. Anything smaller than this have unnecessary malloc overhead and are not relayed/mined.
@FeatherCoin FeatherCoin merged commit ca140a5 into FeatherCoin:master May 13, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants