commits from bitcoin/master #359
Merged
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
tostring() is deprecated as of python 3.7 and results in stderr output causing tests to fail
This commit removes the `CBloomFilter::CBloomFilter(const unsigned int, const double, const unsigned int)` constructor, which became obsolete with 086ee67.
0-input transactions can be ambiguously deserialized as being witness transactions. Since the unsigned transaction is never serialized as a witness transaction as it has no witnesses, we should always deserialize it as a non-witness transaction and set the serialization flags as such. Also always serialize the unsigned transaction as a non-witness transaction.
… as witness Strip out the witnesses when serializing the non-witness utxo. However witness serializations are allowed, so make sure we always deserialize as witness.
Qt's configure grabs the path to xkb's data root during configure, but the build changes in 5.8 apparently broke the handling for cross builds. As a result, the string embedded in the binary depends on whether or not some files are present in the builder's filesystem. The "-xkb-config-root" configure setting is intended to allow manual overriding but it is also broken. See: https://bugreports.qt.io/browse/QTBUG-60005 This has since been fixed upstream, so just hard-code the path for now. We can drop this patch when we bump to a fixed Qt. Also, fix the "-qt-xkbcommon-x11" config param which was renamed. This does not appear to affect build results, presumably because auto-detection is working, but it does not hurt to be explicit.
Clicking on the proxy icon will open settings showing the network tab Create enum Tab in OptionsModel Use new connect syntax Use lambda for private slots
This commit does the following changes:
- [wallet] Remove 'account' argument from GetLegacyBalance()
- GetLegacyBalance() is never called with an account argument.
Remove the argument and helper functions.
- [wallet] Remove CWallet::ListAccountCreditDebit()
- Function no longer used.
- [wallet] Remove AccountMove()
- Function no longer used.
- [wallet] Remove AddAccountingEntry()
- Function no longer used.
- [wallet] Remove GetAccountCreditDebit()
- Function no longer used.
- [wallet] Don't rewrite accounting entries when reordering wallet transactions.
- Accounting entries are deprecated. Don't rewrite them to the wallet
database when re-ordering transactions.
- [wallet] Remove WriteAccountingEntry()
- Function no longer used.
- [wallet] Don't read acentry key-values from wallet on load.
- [wallet] Remove ListAccountCreditDebit()
- Function no longer used.
- [wallet] Remove CAccountingEntry class
- No longer used
- [wallet] Remove GetLabelDestination
- Function no longer used.
- [wallet] Delete unused account functions
- ReadAccount
- WriteAccount
- EraseAccount
- DeleteLabel
- [wallet] Remove fromAccount argument from CommitTransaction()
- [wallet] Remove strFromAccount.
- No longer used.
- [wallet] Remove strSentAccount from GetAmounts().
- No longer used.
- [wallet] Update zapwallettxes comment to remove accounts.
- [wallet] Remove CAccount
- No longer used
- [docs] fix typo in release notes for PR 14023
-BEGIN VERIFY SCRIPT- sed -i --regexp-extended -e 's/(test_witness_block|test_transaction_acceptance)\((self\.nodes\[.\])\.rpc/\1(\2/g' test/functional/p2p_segwit.py -END VERIFY SCRIPT-
-BEGIN VERIFY SCRIPT- sed -i --regexp-extended -e "s/sync_blocks\((.*?), (True|False), (1.?), /sync_blocks(\1, success=\2, reject_code=\3, reject_reason=/g" ./test/functional/feature_block.py -END VERIFY SCRIPT-
Code change also avoids out-of-bounds script access bug.
Suggested by MarcoFalke <falke.marco@gmail.com> in bitcoin/bitcoin#10605 (comment)
They should also work with any other mutex type which std::unique_lock supports. There is no change in behavior for current code that calls these macros with CCriticalSection mutexes.
Instead of std::unique_lock.
Move AnnotatedMixin closer to where it's used, and after the DEBUG_LOCKORDER function declarations so it can call them.
Call sync.h primitives "locks" and "mutexes" instead of "blocks" and "waitable
critical sections" to match current coding conventions and c++11 standard
names.
This PR does not rename the "CCriticalSection" class (though this could be done
as a followup) because it is used everywhere and would swamp the other changes
in this PR. Plain mutexes should mostly be preferred instead of recursive
mutexes in new code anyway.
-BEGIN VERIFY SCRIPT-
set -x
set -e
ren() { git grep -l $1 | xargs sed -i s/$1/$2/; }
ren CCriticalBlock UniqueLock
ren CWaitableCriticalSection Mutex
ren CConditionVariable std::condition_variable
ren cs_GenesisWait g_genesis_wait_mutex
ren condvar_GenesisWait g_genesis_wait_cv
perl -0777 -pi -e 's/.*typedef.*condition_variable.*\n\n?//g' src/sync.h
-END VERIFY SCRIPT-
FeatherCoin
approved these changes
Sep 4, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
ui: Compile boost::signals2 only once
bitcoin/bitcoin#13634
tests: Replace usage of tostring() with tobytes()
bitcoin/bitcoin#13963
Remove unused dummy_tx variable from FillPSBT
bitcoin/bitcoin#13962
trivial: Removes unsed
CBloomFilterconstructor.bitcoin/bitcoin#13948
tests: Fix extended functional tests fail
bitcoin/bitcoin#13965
Fix PSBT deserialization of 0-input transactions
bitcoin/bitcoin#13960
Additional safety checks in PSBT signer
bitcoin/bitcoin#13917
ci: Add Appveyor CI
bitcoin/bitcoin#13964
[trivial] Fix typo in CDiskBlockPos struct's ToString
bitcoin/bitcoin#13974
refactor: use fs:: over boost::filesystem::
bitcoin/bitcoin#13982
[RPC] Remove getinfo deprecation warning
bitcoin/bitcoin#13891
rpc: Add submitheader
bitcoin/bitcoin#13399
[trivial] Fix slightly confusing mispelling in feature_blocksdir.py log message
bitcoin/bitcoin#13985
[build] Add risc-v support to gitian
bitcoin/bitcoin#13665
appveyor: fetch the latest port data
bitcoin/bitcoin#13997
depends: fix qt determinism
bitcoin/bitcoin#14000
[gui] Make proxy icon from statusbar clickable
bitcoin/bitcoin#13248
[qt] TransactionView: highlight replacement tx after fee bump
bitcoin/bitcoin#12818
[wallet] couple of walletcreatefundedpsbt fixes
bitcoin/bitcoin#13968
Use new Qt5 connect syntax
bitcoin/bitcoin#13529
Add const modifier to HTTPRequest methods
bitcoin/bitcoin#14006
Add PSBT documentation
bitcoin/bitcoin#13941
[walletdb] don't report minversion wallet entry as unknown
bitcoin/bitcoin#13967
Add checks for settxfee reasonableness
bitcoin/bitcoin#13988
contrib: add gitian build support for github pull request
bitcoin/bitcoin#13765
p2p: Remove dead code for nVersion=10300
bitcoin/bitcoin#14025
Avoid locking cs_main in some wallet RPC
bitcoin/bitcoin#12559
qa: Add TestNode::assert_debug_log
bitcoin/bitcoin#14024
Add CMerkleTx::IsImmatureCoinBase method
bitcoin/bitcoin#13631
Return the script type from Solver
bitcoin/bitcoin#13429
p2p: Clarify control flow in ProcessMessage
bitcoin/bitcoin#13946
util: Replace boost::signals2 with std::function
bitcoin/bitcoin#13961
tests: Add usage note to check-rpc-mappings.py
bitcoin/bitcoin#13707
Show "bip125-replaceable" flag, when retrieving mempool entries
bitcoin/bitcoin#12676
Add compile time checking for cs_main runtime locking assertions
bitcoin/bitcoin#13083
Move cs_main locking annotations from .cpp to .h
bitcoin/bitcoin#14063
qa: Use assert not BOOST_CHECK_* from multithreaded tests
bitcoin/bitcoin#14069
BIP 158: Compact Block Filters for Light Clients
bitcoin/bitcoin#12254
build: generate MSVC project files via python script
bitcoin/bitcoin#14062
qa: Stop txindex thread before calling destructor
bitcoin/bitcoin#14071
Docs: Fix help message typo optiona -> optional
bitcoin/bitcoin#14056
travis: Run unit tests --with-sanitizers=undefined
bitcoin/bitcoin#14036
Make IS_TRIVIALLY_CONSTRUCTIBLE consistent on GCC < 5, don't patch clang
bitcoin/bitcoin#14031
Remove ambiguity in construction of prevector
bitcoin/bitcoin#14030
test: Add testing of value_ret for SelectCoinsBnB
bitcoin/bitcoin#13861
Report minfeefilter value in getpeerinfo rpc
bitcoin/bitcoin#13987
contrib: Adjust output to current test format
bitcoin/bitcoin#13935
Remove accounts rpcs
bitcoin/bitcoin#14023
Mark single-argument constructors "explicit"
bitcoin/bitcoin#13769
Remove redundant assignments (dead stores)
bitcoin/bitcoin#13767
[Tests] Make combine_logs.py handle multi-line logs
bitcoin/bitcoin#14051
PSBT key path cleanups
bitcoin/bitcoin#13723
qa: Add some actual witness in rpc_rawtransaction
bitcoin/bitcoin#14052
fix walletcreatefundedpsbt deriv paths, add test
bitcoin/bitcoin#14055
tests: Fix accidental trunction from int to bool
bitcoin/bitcoin#14093
utils: drop boost::interprocess::file_lock
bitcoin/bitcoin#13862
Remove the boost/algorithm/string/case_conv.hpp dependency
bitcoin/bitcoin#13671
Explicitly initialize prevector _union
bitcoin/bitcoin#14028
Add tests for RPC help
bitcoin/bitcoin#14020
tx pool: Avoid passing redundant hash into addUnchecked (scripted-diff)
bitcoin/bitcoin#13792
validation: Log FormatStateMessage on ConnectBlock error in ConnectTip
bitcoin/bitcoin#14097
docs: Fix broken Doxygen comments
bitcoin/bitcoin#14103
util: Add Clang thread safety annotations for variables guarded by cs_args
bitcoin/bitcoin#13126
[wallet] Kill accounts
bitcoin/bitcoin#13825
[contrib] Support ARM and RISC-V symbol check
bitcoin/bitcoin#13724
Add README.md to linux release tarballs
bitcoin/bitcoin#14037
qa: Use named args in validation acceptance tests
bitcoin/bitcoin#14101
Don't close old debug log file handle prematurely when trying to re-open (on SIGHUP)
bitcoin/bitcoin#13159
blockfilter: Avoid out-of-bounds script access.
bitcoin/bitcoin#14073
tests: Add missing locking annotations and locks (g_cs_orphans)
bitcoin/bitcoin#14108
tests: Don't assert(...) with side effects
bitcoin/bitcoin#14088
Add AssertLockHeld assertions in CWallet::ListCoins
bitcoin/bitcoin#10605
Make LOCK, LOCK2, TRY_LOCK work with CWaitableCriticalSection
bitcoin/bitcoin#11640
scripted-diff: Small locking rename
bitcoin/bitcoin#11599
Test rpc_help.py failed: Check whether ZMQ is enabled or not.
bitcoin/bitcoin#14122
Notes about control port and read access to cookie
bitcoin/bitcoin#14120