Skip to content

Commit 492bbcd

Browse files
ajtownsajtowns
committed
Merge remote-tracking branch 'origin/master' into netconf-refactor-track
2 parents 5b2517e + 5f0c6a7 commit 492bbcd

File tree

116 files changed

+2359
-2056
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

116 files changed

+2359
-2056
lines changed

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ before_script:
6464
- if [ "$NEED_XVFB" = 1 ]; then export DISPLAY=:99.0; /sbin/start-stop-daemon --start --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac; fi
6565
script:
6666
- if [ "$CHECK_DOC" = 1 -a "$TRAVIS_REPO_SLUG" = "bitcoin/bitcoin" -a "$TRAVIS_PULL_REQUEST" = "false" ]; then while read LINE; do travis_retry gpg --keyserver hkp://subset.pool.sks-keyservers.net --recv-keys $LINE; done < contrib/verify-commits/trusted-keys; fi
67-
- if [ "$CHECK_DOC" = 1 -a "$TRAVIS_REPO_SLUG" = "bitcoin/bitcoin" -a "$TRAVIS_PULL_REQUEST" = "false" ]; then contrib/verify-commits/verify-commits.sh; fi
67+
- if [ "$CHECK_DOC" = 1 -a "$TRAVIS_REPO_SLUG" = "bitcoin/bitcoin" -a "$TRAVIS_EVENT_TYPE" = "cron" ]; then travis_wait 30 contrib/verify-commits/verify-commits.sh; fi
6868
- export TRAVIS_COMMIT_LOG=`git log --format=fuller -1`
6969
- if [ -n "$USE_SHELL" ]; then export CONFIG_SHELL="$USE_SHELL"; fi
7070
- OUTDIR=$BASE_OUTDIR/$TRAVIS_PULL_REQUEST/$TRAVIS_JOB_NUMBER-$HOST

‎Makefile.am‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -293,6 +293,5 @@ clean-docs:
293293
rm -rf doc/doxygen
294294

295295
clean-local: clean-docs
296-
rm -rf coverage_percent.txt test_bitcoin.coverage/ total.coverage/ test/tmp/ cache/ $(OSX_APP)
296+
rm -rf coverage_percent.txt test_bitcoin.coverage/ total.coverage/ test/tmp/ cache/ $(OSX_APP) src/qt/moc_*
297297
rm -rf test/functional/__pycache__ test/functional/test_framework/__pycache__ test/cache
298-

‎doc/developer-notes.md‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -625,6 +625,19 @@ GUI
625625
should not interact with the user. That's where View classes come in. The converse also
626626
holds: try to not directly access core data structures from Views.
627627

628+
- Avoid adding slow or blocking code in the GUI thread. In particular do not
629+
add new `interface::Node` and `interface::Wallet` method calls, even if they
630+
may be fast now, in case they are changed to lock or communicate across
631+
processes in the future.
632+
633+
Prefer to offload work from the GUI thread to worker threads (see
634+
`RPCExecutor` in console code as an example) or take other steps (see
635+
https://doc.qt.io/archives/qq/qq27-responsive-guis.html) to keep the GUI
636+
responsive.
637+
638+
- *Rationale*: Blocking the GUI thread can increase latency, and lead to
639+
hangs and deadlocks.
640+
628641
Subtrees
629642
----------
630643

‎doc/tor.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ outgoing connections be anonymized, but more is possible.
3131

3232
In a typical situation, this suffices to run behind a Tor proxy:
3333

34-
./bitcoin -proxy=127.0.0.1:9050
34+
./bitcoind -proxy=127.0.0.1:9050
3535

3636

3737
2. Run a bitcoin hidden server
@@ -86,7 +86,7 @@ and open port 8333 on your firewall (or use -upnp).
8686
If you only want to use Tor to reach onion addresses, but not use it as a proxy
8787
for normal IPv4/IPv6 communication, use:
8888

89-
./bitcoin -onion=127.0.0.1:9050 -externalip=57qr3yd1nyntf5k.onion -discover
89+
./bitcoind -onion=127.0.0.1:9050 -externalip=57qr3yd1nyntf5k.onion -discover
9090

9191
3. Automatically listen on Tor
9292
--------------------------------

‎src/Makefile.am‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ DIST_SUBDIRS = secp256k1 univalue
77
AM_LDFLAGS = $(PTHREAD_CFLAGS) $(LIBTOOL_LDFLAGS) $(HARDENED_LDFLAGS) $(GPROF_LDFLAGS) $(SANITIZER_LDFLAGS)
88
AM_CXXFLAGS = $(HARDENED_CXXFLAGS) $(ERROR_CXXFLAGS) $(GPROF_CXXFLAGS) $(SANITIZER_CXXFLAGS)
99
AM_CPPFLAGS = $(HARDENED_CPPFLAGS)
10+
AM_LIBTOOLFLAGS = --preserve-dup-deps
1011
EXTRA_LIBRARIES =
1112

1213
if EMBEDDED_UNIVALUE
@@ -104,6 +105,9 @@ BITCOIN_CORE_H = \
104105
httpserver.h \
105106
indirectmap.h \
106107
init.h \
108+
interface/handler.h \
109+
interface/node.h \
110+
interface/wallet.h \
107111
key.h \
108112
key_io.h \
109113
keystore.h \
@@ -245,6 +249,7 @@ endif
245249
libbitcoin_wallet_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES)
246250
libbitcoin_wallet_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
247251
libbitcoin_wallet_a_SOURCES = \
252+
interface/wallet.cpp \
248253
wallet/crypter.cpp \
249254
wallet/db.cpp \
250255
wallet/feebumper.cpp \
@@ -357,6 +362,8 @@ libbitcoin_util_a_SOURCES = \
357362
compat/glibcxx_sanity.cpp \
358363
compat/strnlen.cpp \
359364
fs.cpp \
365+
interface/handler.cpp \
366+
interface/node.cpp \
360367
random.cpp \
361368
rpc/protocol.cpp \
362369
rpc/util.cpp \

‎src/Makefile.qt.include‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,7 @@ if TARGET_WINDOWS
402402
endif
403403
qt_bitcoin_qt_LDADD = qt/libbitcoinqt.a $(LIBBITCOIN_SERVER)
404404
if ENABLE_WALLET
405-
qt_bitcoin_qt_LDADD += $(LIBBITCOIN_WALLET)
405+
qt_bitcoin_qt_LDADD += $(LIBBITCOIN_UTIL) $(LIBBITCOIN_WALLET)
406406
endif
407407
if ENABLE_ZMQ
408408
qt_bitcoin_qt_LDADD += $(LIBBITCOIN_ZMQ) $(ZMQ_LIBS)
@@ -411,7 +411,7 @@ qt_bitcoin_qt_LDADD += $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL)
411411
$(BOOST_LIBS) $(QT_LIBS) $(QT_DBUS_LIBS) $(QR_LIBS) $(PROTOBUF_LIBS) $(BDB_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS) $(LIBSECP256K1) \
412412
$(EVENT_PTHREADS_LIBS) $(EVENT_LIBS)
413413
qt_bitcoin_qt_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(QT_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)
414-
qt_bitcoin_qt_LIBTOOLFLAGS = --tag CXX
414+
qt_bitcoin_qt_LIBTOOLFLAGS = $(AM_LIBTOOLFLAGS) --tag CXX
415415

416416
#locale/foo.ts -> locale/foo.qm
417417
QT_QM=$(QT_TS:.ts=.qm)

‎src/Makefile.qttest.include‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ nodist_qt_test_test_bitcoin_qt_SOURCES = $(TEST_QT_MOC_CPP)
5252

5353
qt_test_test_bitcoin_qt_LDADD = $(LIBBITCOINQT) $(LIBBITCOIN_SERVER)
5454
if ENABLE_WALLET
55-
qt_test_test_bitcoin_qt_LDADD += $(LIBBITCOIN_WALLET)
55+
qt_test_test_bitcoin_qt_LDADD += $(LIBBITCOIN_UTIL) $(LIBBITCOIN_WALLET)
5656
endif
5757
if ENABLE_ZMQ
5858
qt_test_test_bitcoin_qt_LDADD += $(LIBBITCOIN_ZMQ) $(ZMQ_LIBS)

‎src/bitcoin-cli.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
#include <util.h>
1616
#include <utilstrencodings.h>
1717

18+
#include <memory>
1819
#include <stdio.h>
1920

2021
#include <event2/buffer.h>

‎src/bitcoin-tx.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
#include <utilmoneystr.h>
2323
#include <utilstrencodings.h>
2424

25+
#include <memory>
2526
#include <stdio.h>
2627

2728
#include <boost/algorithm/string.hpp>

‎src/chainparams.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
#include <utilstrencodings.h>
1212

1313
#include <assert.h>
14+
#include <memory>
1415

1516
#include <chainparamsseeds.h>
1617

0 commit comments

Comments
 (0)