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 #355

Merged
merged 24 commits into from
Jul 16, 2018
Merged

commits from bitcoin/master #355

merged 24 commits into from
Jul 16, 2018

Conversation

Bushstar
Copy link
Collaborator

[tests] skip rpc_zmq functional test as necessary
bitcoin/bitcoin#13645

[wallet] ScanforWalletTransactions should mark input txns as dirty
bitcoin/bitcoin#12944

qa: Fix some TODOs in p2p_segwit
bitcoin/bitcoin#13626

Drop unused pindexRet arg to CMerkleTx::GetDepthInMainChain
bitcoin/bitcoin#13630

build: add missing leveldb defines
bitcoin/bitcoin#13659

Fix get balance
bitcoin/bitcoin#13566

[net] Tighten scope in net_processing
bitcoin/bitcoin#13417

During IBD, when doing pruning, prune 10% extra to avoid pruning again soon after
bitcoin/bitcoin#11658

[moveonly] Extract CWallet::MarkInputsDirty, and privatize AddToWalletIfInvolvingMe
bitcoin/bitcoin#13651

Update createmultisig RPC to support segwit
bitcoin/bitcoin#13072

[tests] Remove accounts from wallet_importprunedfunds.py
bitcoin/bitcoin#13138

Update gitian-build.sh for docker
bitcoin/bitcoin#13368

jamesob and others added 24 commits July 16, 2018 08:43
Also refactors zmq-related test skipping logic into distinct functions.
src/leveldb/build_detect_platform shows how upstream defines them.

These platform may not be able to fully build or run Bitcoin, but defining all
known to leveldb saves future hassle.

Now that all possible platforms are enumerated, specifying an unknown one is an
error.
GetBalance() can now take an ismine filter, which is passed down to
GetAvailableCredit. This allows GetBalance to be used to get watch-only
balances.
Mark everything else static or in an anonymous namespace.
…n soon after

Pruning forces a chainstate flush, which can defeat the dbcache and harm performance significantly.
To avoid repeated implementations.
Moves OutputType into its own module
Makes AddAndGetDestinationForScript use a generic CKeyStore rather than
the wallet, and makes it always add the script to the keystore, rather
than only adding related (redeem) scripts.
@Bushstar Bushstar merged commit a4b23a5 into FeatherCoin:master Jul 16, 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.