Primecoin: Merge from bitcoin-0.8.2
Conflicts: .gitignore bitcoin-qt.pro contrib/verifysfbinaries/verify.sh doc/README doc/README_windows.txt doc/release-notes.txt share/setup.nsi src/bitcoinrpc.cpp src/checkpoints.cpp src/clientversion.h src/init.cpp src/main.cpp src/main.h src/makefile.linux-mingw src/net.cpp src/qt/bitcoingui.cpp src/qt/res/bitcoin-qt.rc src/qt/res/icons/toolbar.png src/qt/res/icons/toolbar_testnet.png src/test/checkblock_tests.cpp
This commit is contained in:
Sunny King
commit
2ed87758ee
250 changed files with 52471 additions and 19620 deletions
5
.gitignore
vendored
5
.gitignore
vendored
|
|
@ -15,6 +15,11 @@ src/test_primecoin
|
|||
*.qm
|
||||
Makefile
|
||||
primecoin-qt
|
||||
Primecoin-Qt.app
|
||||
|
||||
# Unit-tests
|
||||
Makefile.test
|
||||
primecoin-qt_test
|
||||
|
||||
# Resources cpp
|
||||
qrc_*.cpp
|
||||
|
|
|
|||
12
README.md
12
README.md
|
|
@ -3,7 +3,7 @@ Bitcoin integration/staging tree
|
|||
|
||||
http://www.bitcoin.org
|
||||
|
||||
Copyright (c) 2009-2012 Bitcoin Developers
|
||||
Copyright (c) 2009-2013 Bitcoin Developers
|
||||
|
||||
What is Bitcoin?
|
||||
----------------
|
||||
|
|
@ -60,18 +60,18 @@ submit new unit tests for old code.
|
|||
|
||||
Unit tests for the core code are in `src/test/`. To compile and run them:
|
||||
|
||||
cd src; make -f makefile.linux test
|
||||
cd src; make -f makefile.unix test
|
||||
|
||||
Unit tests for the GUI code are in `src/qt/test/`. To compile and run them:
|
||||
|
||||
qmake BITCOIN_QT_TEST=1 -o Makefile.test bitcoin-qt.pro
|
||||
make -f Makefile.test
|
||||
./Bitcoin-Qt
|
||||
./bitcoin-qt_test
|
||||
|
||||
Every pull request is built for both Windows and Linux on a dedicated server,
|
||||
and unit and sanity tests are automatically run. The binaries produced may be
|
||||
used for manual QA testing -- a link to them will appear in a comment on the
|
||||
pull request posted by 'BitcoinPullTester'. See `https://github.com/TheBlueMatt/test-scripts`
|
||||
used for manual QA testing — a link to them will appear in a comment on the
|
||||
pull request posted by [BitcoinPullTester](https://github.com/BitcoinPullTester). See https://github.com/TheBlueMatt/test-scripts
|
||||
for the build/test scripts.
|
||||
|
||||
### Manual Quality Assurance (QA) Testing
|
||||
|
|
@ -79,4 +79,4 @@ for the build/test scripts.
|
|||
Large changes should have a test plan, and should be tested by somebody other
|
||||
than the developer who wrote the code.
|
||||
|
||||
See `https://github.com/bitcoin/QA/` for how to create a test plan.
|
||||
See https://github.com/bitcoin/QA/ for how to create a test plan.
|
||||
|
|
|
|||
|
|
@ -1,7 +1,9 @@
|
|||
TEMPLATE = app
|
||||
TARGET = primecoin-qt
|
||||
VERSION = 0.8.1
|
||||
macx:TARGET = "Primecoin-Qt"
|
||||
VERSION = 0.8.2
|
||||
INCLUDEPATH += src src/json src/qt
|
||||
QT += network
|
||||
DEFINES += QT_GUI BOOST_THREAD_USE_LIB BOOST_SPIRIT_THREADSAFE
|
||||
CONFIG += no_include_pwd
|
||||
CONFIG += thread
|
||||
|
|
@ -28,10 +30,8 @@ contains(RELEASE, 1) {
|
|||
macx:QMAKE_OBJECTIVE_CFLAGS += -mmacosx-version-min=10.5 -arch i386 -isysroot /Developer/SDKs/MacOSX10.5.sdk
|
||||
|
||||
!win32:!macx {
|
||||
# Linux: static link
|
||||
# Linux: static link and extra security (see: https://wiki.debian.org/Hardening)
|
||||
LIBS += -Wl,-Bstatic -Wl,-z,relro -Wl,-z,now
|
||||
# for extra security (see: https://wiki.debian.org/Hardening)
|
||||
QMAKE_CXXFLAGS *= -D_FORTIFY_SOURCE=2
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -42,6 +42,8 @@ contains(RELEASE, 1) {
|
|||
# Exclude on Windows cross compile with MinGW 4.2.x, as it will result in a non-working executable!
|
||||
# This can be enabled for Windows, when we switch to MinGW >= 4.4.x.
|
||||
}
|
||||
# for extra security (see: https://wiki.debian.org/Hardening): this flag is GCC compiler-specific
|
||||
QMAKE_CXXFLAGS *= -D_FORTIFY_SOURCE=2
|
||||
# for extra security on Windows: enable ASLR and DEP via GCC linker flags
|
||||
win32:QMAKE_LFLAGS *= -Wl,--dynamicbase -Wl,--nxcompat
|
||||
# on Windows: enable GCC large address aware linker flag
|
||||
|
|
@ -99,14 +101,15 @@ contains(BITCOIN_NEED_QT_PLUGINS, 1) {
|
|||
INCLUDEPATH += src/leveldb/include src/leveldb/helpers
|
||||
LIBS += $$PWD/src/leveldb/libleveldb.a $$PWD/src/leveldb/libmemenv.a
|
||||
!win32 {
|
||||
genleveldb.commands = cd $$PWD/src/leveldb && CC=$$QMAKE_CC CXX=$$QMAKE_CXX $(MAKE) OPT=\"$$QMAKE_CXXFLAGS\" libleveldb.a libmemenv.a
|
||||
# we use QMAKE_CXXFLAGS_RELEASE even without RELEASE=1 because we use RELEASE to indicate linking preferences not -O preferences
|
||||
genleveldb.commands = cd $$PWD/src/leveldb && CC=$$QMAKE_CC CXX=$$QMAKE_CXX $(MAKE) OPT=\"$$QMAKE_CXXFLAGS $$QMAKE_CXXFLAGS_RELEASE\" libleveldb.a libmemenv.a
|
||||
} else {
|
||||
# make an educated guess about what the ranlib command is called
|
||||
isEmpty(QMAKE_RANLIB) {
|
||||
QMAKE_RANLIB = $$replace(QMAKE_STRIP, strip, ranlib)
|
||||
}
|
||||
LIBS += -lshlwapi
|
||||
genleveldb.commands = cd $$PWD/src/leveldb && CC=$$QMAKE_CC CXX=$$QMAKE_CXX TARGET_OS=OS_WINDOWS_CROSSCOMPILE $(MAKE) OPT=\"$$QMAKE_CXXFLAGS\" libleveldb.a libmemenv.a && $$QMAKE_RANLIB $$PWD/src/leveldb/libleveldb.a && $$QMAKE_RANLIB $$PWD/src/leveldb/libmemenv.a
|
||||
genleveldb.commands = cd $$PWD/src/leveldb && CC=$$QMAKE_CC CXX=$$QMAKE_CXX TARGET_OS=OS_WINDOWS_CROSSCOMPILE $(MAKE) OPT=\"$$QMAKE_CXXFLAGS $$QMAKE_CXXFLAGS_RELEASE\" libleveldb.a libmemenv.a && $$QMAKE_RANLIB $$PWD/src/leveldb/libleveldb.a && $$QMAKE_RANLIB $$PWD/src/leveldb/libmemenv.a
|
||||
}
|
||||
genleveldb.target = $$PWD/src/leveldb/libleveldb.a
|
||||
genleveldb.depends = FORCE
|
||||
|
|
@ -157,7 +160,6 @@ HEADERS += src/qt/bitcoingui.h \
|
|||
src/walletdb.h \
|
||||
src/script.h \
|
||||
src/init.h \
|
||||
src/irc.h \
|
||||
src/bloom.h \
|
||||
src/mruset.h \
|
||||
src/checkqueue.h \
|
||||
|
|
@ -184,6 +186,9 @@ HEADERS += src/qt/bitcoingui.h \
|
|||
src/qt/transactionfilterproxy.h \
|
||||
src/qt/transactionview.h \
|
||||
src/qt/walletmodel.h \
|
||||
src/qt/walletview.h \
|
||||
src/qt/walletstack.h \
|
||||
src/qt/walletframe.h \
|
||||
src/bitcoinrpc.h \
|
||||
src/qt/overviewpage.h \
|
||||
src/qt/csvmodelwriter.h \
|
||||
|
|
@ -195,7 +200,7 @@ HEADERS += src/qt/bitcoingui.h \
|
|||
src/qt/askpassphrasedialog.h \
|
||||
src/protocol.h \
|
||||
src/qt/notificator.h \
|
||||
src/qt/qtipcserver.h \
|
||||
src/qt/paymentserver.h \
|
||||
src/allocators.h \
|
||||
src/ui_interface.h \
|
||||
src/qt/rpcconsole.h \
|
||||
|
|
@ -204,9 +209,12 @@ HEADERS += src/qt/bitcoingui.h \
|
|||
src/clientversion.h \
|
||||
src/txdb.h \
|
||||
src/leveldb.h \
|
||||
src/threadsafety.h
|
||||
src/threadsafety.h \
|
||||
src/limitedmap.h \
|
||||
src/qt/splashscreen.h
|
||||
|
||||
SOURCES += src/qt/bitcoin.cpp src/qt/bitcoingui.cpp \
|
||||
SOURCES += src/qt/bitcoin.cpp \
|
||||
src/qt/bitcoingui.cpp \
|
||||
src/qt/transactiontablemodel.cpp \
|
||||
src/qt/addresstablemodel.cpp \
|
||||
src/qt/optionsdialog.cpp \
|
||||
|
|
@ -227,7 +235,6 @@ SOURCES += src/qt/bitcoin.cpp src/qt/bitcoingui.cpp \
|
|||
src/main.cpp \
|
||||
src/init.cpp \
|
||||
src/net.cpp \
|
||||
src/irc.cpp \
|
||||
src/bloom.cpp \
|
||||
src/checkpoints.cpp \
|
||||
src/addrman.cpp \
|
||||
|
|
@ -247,6 +254,9 @@ SOURCES += src/qt/bitcoin.cpp src/qt/bitcoingui.cpp \
|
|||
src/qt/transactionfilterproxy.cpp \
|
||||
src/qt/transactionview.cpp \
|
||||
src/qt/walletmodel.cpp \
|
||||
src/qt/walletview.cpp \
|
||||
src/qt/walletstack.cpp \
|
||||
src/qt/walletframe.cpp \
|
||||
src/bitcoinrpc.cpp \
|
||||
src/rpcdump.cpp \
|
||||
src/rpcnet.cpp \
|
||||
|
|
@ -264,18 +274,17 @@ SOURCES += src/qt/bitcoin.cpp src/qt/bitcoingui.cpp \
|
|||
src/qt/askpassphrasedialog.cpp \
|
||||
src/protocol.cpp \
|
||||
src/qt/notificator.cpp \
|
||||
src/qt/qtipcserver.cpp \
|
||||
src/qt/paymentserver.cpp \
|
||||
src/qt/rpcconsole.cpp \
|
||||
src/noui.cpp \
|
||||
src/leveldb.cpp \
|
||||
src/txdb.cpp \
|
||||
src/prime.cpp
|
||||
src/prime.cpp \
|
||||
src/qt/splashscreen.cpp
|
||||
|
||||
RESOURCES += \
|
||||
src/qt/bitcoin.qrc
|
||||
RESOURCES += src/qt/bitcoin.qrc
|
||||
|
||||
FORMS += \
|
||||
src/qt/forms/sendcoinsdialog.ui \
|
||||
FORMS += src/qt/forms/sendcoinsdialog.ui \
|
||||
src/qt/forms/addressbookpage.ui \
|
||||
src/qt/forms/signverifymessagedialog.ui \
|
||||
src/qt/forms/aboutdialog.ui \
|
||||
|
|
@ -301,6 +310,7 @@ DEPENDPATH += src/qt/test
|
|||
QT += testlib
|
||||
TARGET = bitcoin-qt_test
|
||||
DEFINES += BITCOIN_QT_TEST
|
||||
macx: CONFIG -= app_bundle
|
||||
}
|
||||
|
||||
CODECFORTR = UTF-8
|
||||
|
|
@ -323,8 +333,14 @@ TSQM.CONFIG = no_link
|
|||
QMAKE_EXTRA_COMPILERS += TSQM
|
||||
|
||||
# "Other files" to show in Qt Creator
|
||||
OTHER_FILES += \
|
||||
doc/*.rst doc/*.txt doc/README README.md res/bitcoin-qt.rc src/test/*.cpp src/test/*.h src/qt/test/*.cpp src/qt/test/*.h
|
||||
OTHER_FILES += README.md \
|
||||
doc/*.rst \
|
||||
doc/*.txt \
|
||||
src/qt/res/bitcoin-qt.rc \
|
||||
src/test/*.cpp \
|
||||
src/test/*.h \
|
||||
src/qt/test/*.cpp \
|
||||
src/qt/test/*.h
|
||||
|
||||
# platform specific defaults, if not overridden on command line
|
||||
isEmpty(BOOST_LIB_SUFFIX) {
|
||||
|
|
@ -382,10 +398,10 @@ macx:OBJECTIVE_SOURCES += src/qt/macdockiconhandler.mm
|
|||
macx:LIBS += -framework Foundation -framework ApplicationServices -framework AppKit
|
||||
macx:DEFINES += MAC_OSX MSG_NOSIGNAL=0
|
||||
macx:ICON = src/qt/res/icons/bitcoin.icns
|
||||
macx:TARGET = "Bitcoin-Qt"
|
||||
macx:QMAKE_CFLAGS_THREAD += -pthread
|
||||
macx:QMAKE_LFLAGS_THREAD += -pthread
|
||||
macx:QMAKE_CXXFLAGS_THREAD += -pthread
|
||||
macx:QMAKE_INFO_PLIST = share/qt/Info.plist
|
||||
|
||||
# Set libraries and includes at end, to use platform-defined defaults if not overridden
|
||||
INCLUDEPATH += $$BOOST_INCLUDE_PATH $$BDB_INCLUDE_PATH $$OPENSSL_INCLUDE_PATH $$QRENCODE_INCLUDE_PATH
|
||||
|
|
@ -395,6 +411,7 @@ LIBS += -lssl -lcrypto -ldb_cxx$$BDB_LIB_SUFFIX
|
|||
win32:LIBS += -lws2_32 -lshlwapi -lmswsock -lole32 -loleaut32 -luuid -lgdi32
|
||||
LIBS += -lboost_system$$BOOST_LIB_SUFFIX -lboost_filesystem$$BOOST_LIB_SUFFIX -lboost_program_options$$BOOST_LIB_SUFFIX -lboost_thread$$BOOST_THREAD_LIB_SUFFIX
|
||||
win32:LIBS += -lboost_chrono$$BOOST_LIB_SUFFIX
|
||||
macx:LIBS += -lboost_chrono$$BOOST_LIB_SUFFIX
|
||||
|
||||
contains(RELEASE, 1) {
|
||||
!win32:!macx {
|
||||
|
|
@ -403,4 +420,4 @@ contains(RELEASE, 1) {
|
|||
}
|
||||
}
|
||||
|
||||
system($$QMAKE_LRELEASE -silent $$_PRO_FILE_)
|
||||
system($$QMAKE_LRELEASE -silent $$TRANSLATIONS)
|
||||
|
|
|
|||
|
|
@ -1,14 +0,0 @@
|
|||
#!/bin/sh
|
||||
|
||||
set -e
|
||||
|
||||
umask 077
|
||||
|
||||
basedir=~/.bitcoin
|
||||
cfgfile="$basedir/bitcoin.conf"
|
||||
|
||||
[ -e "$basedir" ] || mkdir "$basedir"
|
||||
|
||||
[ -e "$cfgfile" ] || perl -le 'print"rpcpassword=",map{(a..z,A..Z,0..9)[rand 62]}0..9' > "$cfgfile"
|
||||
|
||||
exec /usr/lib/bitcoin/bitcoind "$@"
|
||||
|
|
@ -7,6 +7,6 @@ Comment[tr]=Bitcoin, eşten eşe kriptografik sanal para birimi
|
|||
Exec=/usr/bin/bitcoin-qt
|
||||
Terminal=false
|
||||
Type=Application
|
||||
Icon=/usr/share/pixmaps/bitcoin80.xpm
|
||||
Icon=/usr/share/pixmaps/bitcoin128.png
|
||||
MimeType=x-scheme-handler/bitcoin;
|
||||
Categories=Office;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
bitcoin-qt usr/bin
|
||||
share/pixmaps/bitcoin32.xpm usr/share/pixmaps
|
||||
share/pixmaps/bitcoin80.xpm usr/share/pixmaps
|
||||
share/pixmaps/bitcoin16.xpm usr/share/pixmaps
|
||||
share/pixmaps/bitcoin128.png usr/share/pixmaps
|
||||
debian/bitcoin-qt.desktop usr/share/applications
|
||||
debian/bitcoin-qt.protocol usr/share/kde4/services/
|
||||
|
|
|
|||
|
|
@ -1,2 +1 @@
|
|||
debian/bin/bitcoind usr/bin
|
||||
src/bitcoind usr/lib/bitcoin
|
||||
src/bitcoind usr/bin
|
||||
|
|
|
|||
|
|
@ -1,3 +1,45 @@
|
|||
bitcoin (0.8.1-natty3) natty; urgency=low
|
||||
|
||||
* New pixmaps
|
||||
|
||||
-- Jonas Schnelli <jonas.schnelli@include7.ch> Mon, 13 May 2013 16:14:00 +0100
|
||||
|
||||
bitcoin (0.8.1-natty2) natty; urgency=low
|
||||
|
||||
* Remove dumb broken launcher script
|
||||
|
||||
-- Matt Corallo <matt@bluematt.me> Sun, 24 Mar 2013 20:01:00 -0400
|
||||
|
||||
bitcoin (0.8.1-natty1) natty; urgency=low
|
||||
|
||||
* New upstream release.
|
||||
|
||||
-- Matt Corallo <matt@bluematt.me> Tue, 19 Mar 2013 13:03:00 -0400
|
||||
|
||||
bitcoin (0.8.0-natty1) natty; urgency=low
|
||||
|
||||
* New upstream release.
|
||||
|
||||
-- Matt Corallo <matt@bluematt.me> Sat, 23 Feb 2013 16:01:00 -0500
|
||||
|
||||
bitcoin (0.7.2-natty1) natty; urgency=low
|
||||
|
||||
* New upstream release.
|
||||
|
||||
-- Matt Corallo <matt@bluematt.me> Sat, 15 Dec 2012 10:59:00 -0400
|
||||
|
||||
bitcoin (0.7.1-natty1) natty; urgency=low
|
||||
|
||||
* New upstream release.
|
||||
|
||||
-- Matt Corallo <matt@bluematt.me> Wed, 24 Oct 2012 15:06:00 -0400
|
||||
|
||||
bitcoin (0.7.0-natty1) natty; urgency=low
|
||||
|
||||
* New upstream release.
|
||||
|
||||
-- Matt Corallo <matt@bluematt.me> Mon, 17 Sep 2012 13:45:00 +0200
|
||||
|
||||
bitcoin (0.6.3-natty1) natty; urgency=low
|
||||
|
||||
* New upstream release.
|
||||
|
|
|
|||
|
|
@ -33,8 +33,6 @@ Description: peer-to-peer network based digital currency - daemon
|
|||
transact directly with each other, with the help of a P2P network to
|
||||
check for double-spending.
|
||||
.
|
||||
By default connects to an IRC network to discover other peers.
|
||||
.
|
||||
Full transaction history is stored locally at each client. This
|
||||
requires 2+ GB of space, slowly growing.
|
||||
.
|
||||
|
|
@ -51,8 +49,6 @@ Description: peer-to-peer network based digital currency - Qt GUI
|
|||
transact directly with each other, with the help of a P2P network to
|
||||
check for double-spending.
|
||||
.
|
||||
By default connects to an IRC network to discover other peers.
|
||||
.
|
||||
Full transaction history is stored locally at each client. This
|
||||
requires 2+ GB of space, slowly growing.
|
||||
.
|
||||
|
|
|
|||
|
|
@ -18,10 +18,6 @@
|
|||
#connect=69.164.218.197
|
||||
#connect=10.0.0.1:8333
|
||||
|
||||
# Do not use Internet Relay Chat (irc.lfnet.org #bitcoin channel) to
|
||||
# find other peers.
|
||||
#noirc=1
|
||||
|
||||
# Maximum number of inbound+outbound connections.
|
||||
#maxconnections=
|
||||
|
||||
|
|
|
|||
206
contrib/debian/manpages/bitcoin-qt.1
Normal file
206
contrib/debian/manpages/bitcoin-qt.1
Normal file
|
|
@ -0,0 +1,206 @@
|
|||
.TH BITCOIN-QT "1" "April 2013" "bitcoin-qt 1"
|
||||
.SH NAME
|
||||
bitcoin-qt \- peer-to-peer network based digital currency
|
||||
.SH DESCRIPTION
|
||||
.SS "Usage:"
|
||||
.IP
|
||||
bitcoin\-qt [command\-line options]
|
||||
.SH OPTIONS
|
||||
.TP
|
||||
\-?
|
||||
This help message
|
||||
.TP
|
||||
\fB\-conf=\fR<file>
|
||||
Specify configuration file (default: bitcoin.conf)
|
||||
.TP
|
||||
\fB\-pid=\fR<file>
|
||||
Specify pid file (default: bitcoind.pid)
|
||||
.TP
|
||||
\fB\-gen\fR
|
||||
Generate coins
|
||||
.TP
|
||||
\fB\-gen\fR=\fI0\fR
|
||||
Don't generate coins
|
||||
.TP
|
||||
\fB\-datadir=\fR<dir>
|
||||
Specify data directory
|
||||
.TP
|
||||
\fB\-dbcache=\fR<n>
|
||||
Set database cache size in megabytes (default: 25)
|
||||
.TP
|
||||
\fB\-timeout=\fR<n>
|
||||
Specify connection timeout in milliseconds (default: 5000)
|
||||
.TP
|
||||
\fB\-proxy=\fR<ip:port>
|
||||
Connect through socks proxy
|
||||
.TP
|
||||
\fB\-socks=\fR<n>
|
||||
Select the version of socks proxy to use (4\-5, default: 5)
|
||||
.TP
|
||||
\fB\-tor=\fR<ip:port>
|
||||
Use proxy to reach tor hidden services (default: same as \fB\-proxy\fR)
|
||||
.TP
|
||||
\fB\-dns\fR
|
||||
Allow DNS lookups for \fB\-addnode\fR, \fB\-seednode\fR and \fB\-connect\fR
|
||||
.TP
|
||||
\fB\-port=\fR<port>
|
||||
Listen for connections on <port> (default: 8333 or testnet: 18333)
|
||||
.TP
|
||||
\fB\-maxconnections=\fR<n>
|
||||
Maintain at most <n> connections to peers (default: 125)
|
||||
.TP
|
||||
\fB\-addnode=\fR<ip>
|
||||
Add a node to connect to and attempt to keep the connection open
|
||||
.TP
|
||||
\fB\-connect=\fR<ip>
|
||||
Connect only to the specified node(s)
|
||||
.TP
|
||||
\fB\-seednode=\fR<ip>
|
||||
Connect to a node to retrieve peer addresses, and disconnect
|
||||
.TP
|
||||
\fB\-externalip=\fR<ip>
|
||||
Specify your own public address
|
||||
.TP
|
||||
\fB\-onlynet=\fR<net>
|
||||
Only connect to nodes in network <net> (IPv4, IPv6 or Tor)
|
||||
.TP
|
||||
\fB\-discover\fR
|
||||
Discover own IP address (default: 1 when listening and no \fB\-externalip\fR)
|
||||
.TP
|
||||
\fB\-checkpoints\fR
|
||||
Only accept block chain matching built\-in checkpoints (default: 1)
|
||||
.TP
|
||||
\fB\-listen\fR
|
||||
Accept connections from outside (default: 1 if no \fB\-proxy\fR or \fB\-connect\fR)
|
||||
.TP
|
||||
\fB\-bind=\fR<addr>
|
||||
Bind to given address and always listen on it. Use [host]:port notation for IPv6
|
||||
.TP
|
||||
\fB\-dnsseed\fR
|
||||
Find peers using DNS lookup (default: 1 unless \fB\-connect\fR)
|
||||
.TP
|
||||
\fB\-banscore=\fR<n>
|
||||
Threshold for disconnecting misbehaving peers (default: 100)
|
||||
.TP
|
||||
\fB\-bantime=\fR<n>
|
||||
Number of seconds to keep misbehaving peers from reconnecting (default: 86400)
|
||||
.TP
|
||||
\fB\-maxreceivebuffer=\fR<n>
|
||||
Maximum per\-connection receive buffer, <n>*1000 bytes (default: 5000)
|
||||
.TP
|
||||
\fB\-maxsendbuffer=\fR<n>
|
||||
Maximum per\-connection send buffer, <n>*1000 bytes (default: 1000)
|
||||
.TP
|
||||
\fB\-upnp\fR
|
||||
Use UPnP to map the listening port (default: 1 when listening)
|
||||
.TP
|
||||
\fB\-paytxfee=\fR<amt>
|
||||
Fee per KB to add to transactions you send
|
||||
.TP
|
||||
\fB\-server\fR
|
||||
Accept command line and JSON\-RPC commands
|
||||
.TP
|
||||
\fB\-testnet\fR
|
||||
Use the test network
|
||||
.TP
|
||||
\fB\-debug\fR
|
||||
Output extra debugging information. Implies all other \fB\-debug\fR* options
|
||||
.TP
|
||||
\fB\-debugnet\fR
|
||||
Output extra network debugging information
|
||||
.TP
|
||||
\fB\-logtimestamps\fR
|
||||
Prepend debug output with timestamp
|
||||
.TP
|
||||
\fB\-shrinkdebugfile\fR
|
||||
Shrink debug.log file on client startup (default: 1 when no \fB\-debug\fR)
|
||||
.TP
|
||||
\fB\-printtoconsole\fR
|
||||
Send trace/debug info to console instead of debug.log file
|
||||
.TP
|
||||
\fB\-rpcuser=\fR<user>
|
||||
Username for JSON\-RPC connections
|
||||
.TP
|
||||
\fB\-rpcpassword=\fR<pw>
|
||||
Password for JSON\-RPC connections
|
||||
.TP
|
||||
\fB\-rpcport=\fR<port>
|
||||
Listen for JSON\-RPC connections on <port> (default: 8332 or testnet: 18332)
|
||||
.TP
|
||||
\fB\-rpcallowip=\fR<ip>
|
||||
Allow JSON\-RPC connections from specified IP address
|
||||
.TP
|
||||
\fB\-rpcthreads=\fR<n>
|
||||
Set the number of threads to service RPC calls (default: 4)
|
||||
.TP
|
||||
\fB\-blocknotify=\fR<cmd>
|
||||
Execute command when the best block changes (%s in cmd is replaced by block hash)
|
||||
.TP
|
||||
\fB\-walletnotify=\fR<cmd>
|
||||
Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)
|
||||
.TP
|
||||
\fB\-alertnotify=\fR<cmd>
|
||||
Execute command when a relevant alert is received (%s in cmd is replaced by message)
|
||||
.TP
|
||||
\fB\-upgradewallet\fR
|
||||
Upgrade wallet to latest format
|
||||
.TP
|
||||
\fB\-keypool=\fR<n>
|
||||
Set key pool size to <n> (default: 100)
|
||||
.TP
|
||||
\fB\-rescan\fR
|
||||
Rescan the block chain for missing wallet transactions
|
||||
.TP
|
||||
\fB\-salvagewallet\fR
|
||||
Attempt to recover private keys from a corrupt wallet.dat
|
||||
.TP
|
||||
\fB\-checkblocks=\fR<n>
|
||||
How many blocks to check at startup (default: 288, 0 = all)
|
||||
.TP
|
||||
\fB\-checklevel=\fR<n>
|
||||
How thorough the block verification is (0\-4, default: 3)
|
||||
.TP
|
||||
\fB\-txindex\fR
|
||||
Maintain a full transaction index (default: 0)
|
||||
.TP
|
||||
\fB\-loadblock=\fR<file>
|
||||
Imports blocks from external blk000??.dat file
|
||||
.TP
|
||||
\fB\-reindex\fR
|
||||
Rebuild block chain index from current blk000??.dat files
|
||||
.TP
|
||||
\fB\-par=\fR<n>
|
||||
Set the number of script verification threads (1\-16, 0=auto, default: 0)
|
||||
.SS "Block creation options:"
|
||||
.TP
|
||||
\fB\-blockminsize=\fR<n>
|
||||
Set minimum block size in bytes (default: 0)
|
||||
.TP
|
||||
\fB\-blockmaxsize=\fR<n>
|
||||
Set maximum block size in bytes (default: 250000)
|
||||
.HP
|
||||
\fB\-blockprioritysize=\fR<n> Set maximum size of high\-priority/low\-fee transactions in bytes (default: 27000)
|
||||
.PP
|
||||
SSL options: (see the Bitcoin Wiki for SSL setup instructions)
|
||||
.TP
|
||||
\fB\-rpcssl\fR
|
||||
Use OpenSSL (https) for JSON\-RPC connections
|
||||
.TP
|
||||
\fB\-rpcsslcertificatechainfile=\fR<file.cert>
|
||||
Server certificate file (default: server.cert)
|
||||
.TP
|
||||
\fB\-rpcsslprivatekeyfile=\fR<file.pem>
|
||||
Server private key (default: server.pem)
|
||||
.TP
|
||||
\fB\-rpcsslciphers=\fR<ciphers>
|
||||
Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)
|
||||
.SS "UI options:"
|
||||
.TP
|
||||
\fB\-lang=\fR<lang>
|
||||
Set language, for example "de_DE" (default: system locale)
|
||||
.TP
|
||||
\fB\-min\fR
|
||||
Start minimized
|
||||
.TP
|
||||
\fB\-splash\fR
|
||||
Show splash screen on startup (default: 1)
|
||||
|
|
@ -2,11 +2,11 @@
|
|||
.SH NAME
|
||||
bitcoin.conf \- bitcoin configuration file
|
||||
.SH SYNOPSIS
|
||||
All command-line options (except for '-datadir' and '-conf') may be specified in a configuration file, and all configuration file options may also be specified on the command line. Command-line options override values set in the configuration file.
|
||||
All command-line options (except for '\-datadir' and '\-conf') may be specified in a configuration file, and all configuration file options may also be specified on the command line. Command-line options override values set in the configuration file.
|
||||
.TP
|
||||
The configuration file is a list of 'setting=value' pairs, one per line, with optional comments starting with the '#' character.
|
||||
.TP
|
||||
The configuration file is not automatically created; you can create it using your favorite plain-text editor. By default, bitcoind(1) will look for a file named bitcoin.conf(5) in the bitcoin data directory, but both the data directory and the configuration file path may be changed using the '-datadir' and '-conf' command-line arguments.
|
||||
The configuration file is not automatically created; you can create it using your favorite plain-text editor. By default, bitcoind(1) will look for a file named bitcoin.conf(5) in the bitcoin data directory, but both the data directory and the configuration file path may be changed using the '\-datadir' and '\-conf' command-line arguments.
|
||||
.SH LOCATION
|
||||
bitcoin.conf should be located in $HOME/.bitcoin
|
||||
.SH NETWORK-RELATED SETTINGS
|
||||
|
|
@ -24,9 +24,6 @@ Use as many *addnode=* settings as you like to connect to specific peers.
|
|||
\fBconnect=\fR\fI'10.0.0.1:8333'\fR
|
||||
Use as many *connect=* settings as you like to connect ONLY to specific peers.
|
||||
.TP
|
||||
\fBnoirc=\fR[\fI'1'\fR|\fI'0'\fR]
|
||||
Use or Do not use Internet Relay Chat (irc.lfnet.org #bitcoin channel) to find other peers.
|
||||
.TP
|
||||
\fRmaxconnections=\fR\fI'value'\fR
|
||||
Maximum number of inbound+outbound connections.
|
||||
.SH JSON-RPC OPTIONS
|
||||
|
|
@ -53,9 +50,10 @@ Listen for RPC connections on this TCP port.
|
|||
You can use *bitcoin* or *bitcoind(1)* to send commands to *bitcoin*/*bitcoind(1)* running on another host using this option.
|
||||
.TP
|
||||
\fBrpcssl=\fR\fI'1'\fR
|
||||
Use Secure Sockets Layer (also known as TLS or HTTPS) to communicate with *bitcoin* '-server' or *bitcoind(1)*. Example of OpenSSL settings used when *rpcssl*='1':
|
||||
Use Secure Sockets Layer (also known as TLS or HTTPS) to communicate with *bitcoin* '\-server' or *bitcoind(1)*. Example of OpenSSL settings used when *rpcssl*='1':
|
||||
.TP
|
||||
\fBrpcsslciphers=\fR\fI'TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH'\fR
|
||||
\fB\-rpcsslciphers=\fR<ciphers>
|
||||
Acceptable ciphers (default: TLSv1+HIGH:\:!SSLv2:\:!aNULL:\:!eNULL:\:!AH:\:!3DES:\:@STRENGTH)
|
||||
.TP
|
||||
\fBrpcsslcertificatechainfile=\fR\fI'server.cert'\fR
|
||||
.TP
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ bitcoind \- peer-to-peer network based digital currency
|
|||
.SH SYNOPSIS
|
||||
bitcoin [options] <command> [params]
|
||||
.TP
|
||||
bitcoin [options] help <command> - Get help for a command
|
||||
bitcoin [options] help <command> \- Get help for a command
|
||||
.SH DESCRIPTION
|
||||
This manual page documents the bitcoind program. Bitcoin is a peer-to-peer digital currency. Peer-to-peer (P2P) means that there is no central authority to issue new money or keep track of transactions. Instead, these tasks are managed collectively by the nodes of the network. Advantages:
|
||||
|
||||
|
|
@ -75,7 +75,7 @@ Server certificate file (default: server.cert)
|
|||
Server private key (default: server.pem)
|
||||
.TP
|
||||
\fB\-rpcsslciphers=\fR<ciphers>
|
||||
Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)
|
||||
Acceptable ciphers (default: TLSv1+HIGH:\:!SSLv2:\:!aNULL:\:!eNULL:\:!AH:\:!3DES:\:@STRENGTH)
|
||||
.TP
|
||||
\-?
|
||||
This help message
|
||||
|
|
@ -115,7 +115,7 @@ Returns the proof-of-work difficulty as a multiple of the minimum difficulty.
|
|||
Returns boolean true if server is trying to generate bitcoins, false otherwise.
|
||||
.TP
|
||||
\fBsetgenerate 'generate' ['genproclimit']\fR
|
||||
Generation is limited to ['genproclimit'] processors, -1 is unlimited.
|
||||
Generation is limited to ['genproclimit'] processors, \-1 is unlimited.
|
||||
.TP
|
||||
\fBgethashespersec\fR
|
||||
Returns a recent hashes per second performance measurement while generating.
|
||||
|
|
@ -166,7 +166,7 @@ List accounts and their current balances.
|
|||
"confirmations" : number of confirmations of the most recent transaction included.
|
||||
.TP
|
||||
\fBlisttransactions 'account' ['count=10']\fR
|
||||
Returns a list of the last ['count'] transactions for 'account' - for all accounts if 'account' is not specified or is "*". Each entry in the list may contain:
|
||||
Returns a list of the last ['count'] transactions for 'account' \- for all accounts if 'account' is not specified or is "*". Each entry in the list may contain:
|
||||
|
||||
"category" : will be generate, send, receive, or move.
|
||||
"amount" : amount of transaction.
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@ packages:
|
|||
- "zip"
|
||||
- "faketime"
|
||||
- "wine"
|
||||
- "psmisc"
|
||||
reference_datetime: "2011-01-30 00:00:00"
|
||||
remotes: []
|
||||
files:
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ script: |
|
|||
cd bitcoin
|
||||
mkdir -p $OUTDIR/src
|
||||
git archive HEAD | tar -x -C $OUTDIR/src
|
||||
cp $OUTDIR/src/doc/README $OUTDIR
|
||||
cp $OUTDIR/src/doc/README.md $OUTDIR
|
||||
cp $OUTDIR/src/COPYING $OUTDIR
|
||||
cd src
|
||||
make -f makefile.unix STATIC=1 OPENSSL_INCLUDE_PATH="$INSTDIR/include" OPENSSL_LIB_PATH="$INSTDIR/lib" $MAKEOPTS bitcoind USE_UPNP=0 DEBUGFLAGS=
|
||||
|
|
|
|||
32
contrib/homebrew/bitcoin.qt.pro.patch
Normal file
32
contrib/homebrew/bitcoin.qt.pro.patch
Normal file
|
|
@ -0,0 +1,32 @@
|
|||
diff --git a/bitcoin-qt.pro b/bitcoin-qt.pro
|
||||
index d938c07..e1dd4ec 100644
|
||||
--- a/bitcoin-qt.pro
|
||||
+++ b/bitcoin-qt.pro
|
||||
@@ -353,7 +353,7 @@
|
||||
}
|
||||
|
||||
isEmpty(BDB_LIB_PATH) {
|
||||
- macx:BDB_LIB_PATH = /opt/local/lib/db48
|
||||
+ macx:BDB_LIB_PATH = /usr/local/opt/berkeley-db4/lib
|
||||
}
|
||||
|
||||
isEmpty(BDB_LIB_SUFFIX) {
|
||||
@@ -361,15 +361,15 @@
|
||||
}
|
||||
|
||||
isEmpty(BDB_INCLUDE_PATH) {
|
||||
- macx:BDB_INCLUDE_PATH = /opt/local/include/db48
|
||||
+ macx:BDB_INCLUDE_PATH = /usr/local/opt/berkeley-db4/include
|
||||
}
|
||||
|
||||
isEmpty(BOOST_LIB_PATH) {
|
||||
- macx:BOOST_LIB_PATH = /opt/local/lib
|
||||
+ macx:BOOST_LIB_PATH = /usr/local/opt/boost/lib
|
||||
}
|
||||
|
||||
isEmpty(BOOST_INCLUDE_PATH) {
|
||||
- macx:BOOST_INCLUDE_PATH = /opt/local/include
|
||||
+ macx:BOOST_INCLUDE_PATH = /usr/local/opt/boost/include
|
||||
}
|
||||
|
||||
win32:DEFINES += WIN32
|
||||
47
contrib/homebrew/makefile.osx.patch
Normal file
47
contrib/homebrew/makefile.osx.patch
Normal file
|
|
@ -0,0 +1,47 @@
|
|||
diff --git a/src/makefile.osx b/src/makefile.osx
|
||||
index 8b7c559..8a0560c 100644
|
||||
--- a/src/makefile.osx
|
||||
+++ b/src/makefile.osx
|
||||
@@ -7,17 +7,21 @@
|
||||
# Originally by Laszlo Hanyecz (solar@heliacal.net)
|
||||
|
||||
CXX=llvm-g++
|
||||
-DEPSDIR=/opt/local
|
||||
+DEPSDIR=/usr/local
|
||||
+DB4DIR=/usr/local/opt/berkeley-db4
|
||||
+OPENSSLDIR=/usr/local/opt/openssl
|
||||
|
||||
INCLUDEPATHS= \
|
||||
-I"$(CURDIR)" \
|
||||
- -I"$(CURDIR)"/obj \
|
||||
+ -I"$(CURDIR)/obj" \
|
||||
-I"$(DEPSDIR)/include" \
|
||||
- -I"$(DEPSDIR)/include/db48"
|
||||
+ -I"$(DB4DIR)/include" \
|
||||
+ -I"$(OPENSSLDIR)/include"
|
||||
|
||||
LIBPATHS= \
|
||||
-L"$(DEPSDIR)/lib" \
|
||||
- -L"$(DEPSDIR)/lib/db48"
|
||||
+ -L"$(DB4DIR)/lib" \
|
||||
+ -L"$(OPENSSLDIR)/lib"
|
||||
|
||||
USE_UPNP:=1
|
||||
USE_IPV6:=1
|
||||
@@ -31,13 +35,13 @@ ifdef STATIC
|
||||
TESTLIBS += \
|
||||
$(DEPSDIR)/lib/libboost_unit_test_framework-mt.a
|
||||
LIBS += \
|
||||
- $(DEPSDIR)/lib/db48/libdb_cxx-4.8.a \
|
||||
+ $(DB4DIR)/lib/libdb_cxx-4.8.a \
|
||||
$(DEPSDIR)/lib/libboost_system-mt.a \
|
||||
$(DEPSDIR)/lib/libboost_filesystem-mt.a \
|
||||
$(DEPSDIR)/lib/libboost_program_options-mt.a \
|
||||
$(DEPSDIR)/lib/libboost_thread-mt.a \
|
||||
- $(DEPSDIR)/lib/libssl.a \
|
||||
- $(DEPSDIR)/lib/libcrypto.a \
|
||||
+ $(OPENSSLDIR)/lib/libssl.a \
|
||||
+ $(OPENSSLDIR)/lib/libcrypto.a \
|
||||
-lz
|
||||
else
|
||||
TESTLIBS += \
|
||||
4
contrib/test-patches/README
Normal file
4
contrib/test-patches/README
Normal file
|
|
@ -0,0 +1,4 @@
|
|||
These patches are applied when the automated pull-tester
|
||||
tests each pull and when master is tested using jenkins.
|
||||
You can find more information about the tests run at
|
||||
http://jenkins.bluematt.me/pull-tester/files/
|
||||
196
contrib/test-patches/bitcoind-comparison.patch
Normal file
196
contrib/test-patches/bitcoind-comparison.patch
Normal file
|
|
@ -0,0 +1,196 @@
|
|||
diff --git a/contrib/test-patches/bitcoind-comparison.patch b/contrib/test-patches/bitcoind-comparison.patch
|
||||
index 04a8618..519429a 100644
|
||||
--- a/src/main.cpp
|
||||
+++ b/src/main.cpp
|
||||
@@ -31,8 +31,8 @@ CTxMemPool mempool;
|
||||
unsigned int nTransactionsUpdated = 0;
|
||||
|
||||
map<uint256, CBlockIndex*> mapBlockIndex;
|
||||
-uint256 hashGenesisBlock("0x000000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f");
|
||||
-static CBigNum bnProofOfWorkLimit(~uint256(0) >> 32);
|
||||
+uint256 hashGenesisBlock("0x0f9188f13cb7b2c71f2a335e3a4fc328bf5beb436012afca590b1a11466e2206");
|
||||
+static CBigNum bnProofOfWorkLimit(~uint256(0) >> 1);
|
||||
CBlockIndex* pindexGenesisBlock = NULL;
|
||||
int nBestHeight = -1;
|
||||
uint256 nBestChainWork = 0;
|
||||
@@ -1055,7 +1055,7 @@ int64 static GetBlockValue(int nHeight, int64 nFees)
|
||||
int64 nSubsidy = 50 * COIN;
|
||||
|
||||
// Subsidy is cut in half every 210000 blocks, which will occur approximately every 4 years
|
||||
- nSubsidy >>= (nHeight / 210000);
|
||||
+ nSubsidy >>= (nHeight / 150);
|
||||
|
||||
return nSubsidy + nFees;
|
||||
}
|
||||
@@ -2736,9 +2736,9 @@ bool InitBlockIndex() {
|
||||
block.hashPrevBlock = 0;
|
||||
block.hashMerkleRoot = block.BuildMerkleTree();
|
||||
block.nVersion = 1;
|
||||
- block.nTime = 1231006505;
|
||||
- block.nBits = 0x1d00ffff;
|
||||
- block.nNonce = 2083236893;
|
||||
+ block.nTime = 1296688602;
|
||||
+ block.nBits = 0x207fffff;
|
||||
+ block.nNonce = 2;
|
||||
|
||||
if (fTestNet)
|
||||
{
|
||||
@@ -3024,7 +3024,7 @@ bool static AlreadyHave(const CInv& inv)
|
||||
// The message start string is designed to be unlikely to occur in normal data.
|
||||
// The characters are rarely used upper ASCII, not valid as UTF-8, and produce
|
||||
// a large 4-byte int at any alignment.
|
||||
-unsigned char pchMessageStart[4] = { 0xf9, 0xbe, 0xb4, 0xd9 };
|
||||
+unsigned char pchMessageStart[4] = { 0xfa, 0xbf, 0xb5, 0xda };
|
||||
|
||||
|
||||
void static ProcessGetData(CNode* pfrom)
|
||||
diff --git a/src/test/miner_tests.cpp b/src/test/miner_tests.cpp
|
||||
index af28465..ee9a4db 100644
|
||||
--- a/src/test/miner_tests.cpp
|
||||
+++ b/src/test/miner_tests.cpp
|
||||
@@ -15,34 +15,117 @@ struct {
|
||||
unsigned char extranonce;
|
||||
unsigned int nonce;
|
||||
} blockinfo[] = {
|
||||
- {4, 0xa4a3e223}, {2, 0x15c32f9e}, {1, 0x0375b547}, {1, 0x7004a8a5},
|
||||
- {2, 0xce440296}, {2, 0x52cfe198}, {1, 0x77a72cd0}, {2, 0xbb5d6f84},
|
||||
- {2, 0x83f30c2c}, {1, 0x48a73d5b}, {1, 0xef7dcd01}, {2, 0x6809c6c4},
|
||||
- {2, 0x0883ab3c}, {1, 0x087bbbe2}, {2, 0x2104a814}, {2, 0xdffb6daa},
|
||||
- {1, 0xee8a0a08}, {2, 0xba4237c1}, {1, 0xa70349dc}, {1, 0x344722bb},
|
||||
- {3, 0xd6294733}, {2, 0xec9f5c94}, {2, 0xca2fbc28}, {1, 0x6ba4f406},
|
||||
- {2, 0x015d4532}, {1, 0x6e119b7c}, {2, 0x43e8f314}, {2, 0x27962f38},
|
||||
- {2, 0xb571b51b}, {2, 0xb36bee23}, {2, 0xd17924a8}, {2, 0x6bc212d9},
|
||||
- {1, 0x630d4948}, {2, 0x9a4c4ebb}, {2, 0x554be537}, {1, 0xd63ddfc7},
|
||||
- {2, 0xa10acc11}, {1, 0x759a8363}, {2, 0xfb73090d}, {1, 0xe82c6a34},
|
||||
- {1, 0xe33e92d7}, {3, 0x658ef5cb}, {2, 0xba32ff22}, {5, 0x0227a10c},
|
||||
- {1, 0xa9a70155}, {5, 0xd096d809}, {1, 0x37176174}, {1, 0x830b8d0f},
|
||||
- {1, 0xc6e3910e}, {2, 0x823f3ca8}, {1, 0x99850849}, {1, 0x7521fb81},
|
||||
- {1, 0xaacaabab}, {1, 0xd645a2eb}, {5, 0x7aea1781}, {5, 0x9d6e4b78},
|
||||
- {1, 0x4ce90fd8}, {1, 0xabdc832d}, {6, 0x4a34f32a}, {2, 0xf2524c1c},
|
||||
- {2, 0x1bbeb08a}, {1, 0xad47f480}, {1, 0x9f026aeb}, {1, 0x15a95049},
|
||||
- {2, 0xd1cb95b2}, {2, 0xf84bbda5}, {1, 0x0fa62cd1}, {1, 0xe05f9169},
|
||||
- {1, 0x78d194a9}, {5, 0x3e38147b}, {5, 0x737ba0d4}, {1, 0x63378e10},
|
||||
- {1, 0x6d5f91cf}, {2, 0x88612eb8}, {2, 0xe9639484}, {1, 0xb7fabc9d},
|
||||
- {2, 0x19b01592}, {1, 0x5a90dd31}, {2, 0x5bd7e028}, {2, 0x94d00323},
|
||||
- {1, 0xa9b9c01a}, {1, 0x3a40de61}, {1, 0x56e7eec7}, {5, 0x859f7ef6},
|
||||
- {1, 0xfd8e5630}, {1, 0x2b0c9f7f}, {1, 0xba700e26}, {1, 0x7170a408},
|
||||
- {1, 0x70de86a8}, {1, 0x74d64cd5}, {1, 0x49e738a1}, {2, 0x6910b602},
|
||||
- {0, 0x643c565f}, {1, 0x54264b3f}, {2, 0x97ea6396}, {2, 0x55174459},
|
||||
- {2, 0x03e8779a}, {1, 0x98f34d8f}, {1, 0xc07b2b07}, {1, 0xdfe29668},
|
||||
- {1, 0x3141c7c1}, {1, 0xb3b595f4}, {1, 0x735abf08}, {5, 0x623bfbce},
|
||||
- {2, 0xd351e722}, {1, 0xf4ca48c9}, {1, 0x5b19c670}, {1, 0xa164bf0e},
|
||||
- {2, 0xbbbeb305}, {2, 0xfe1c810a},
|
||||
+{4, 2762203683},
|
||||
+{2, 365113248},
|
||||
+{1, 58045772},
|
||||
+{1, 1879353512},
|
||||
+{2, 3460563607},
|
||||
+{2, 1389355416},
|
||||
+{1, 2007444690},
|
||||
+{2, 3143462790},
|
||||
+{2, 2213743660},
|
||||
+{1, 1218919771},
|
||||
+{1, 4017999107},
|
||||
+{2, 1745471173},
|
||||
+{2, 142846780},
|
||||
+{1, 142326754},
|
||||
+{2, 553953301},
|
||||
+{2, 3757796778},
|
||||
+{1, 4002023946},
|
||||
+{2, 3124901826},
|
||||
+{1, 2802010589},
|
||||
+{1, 877077181},
|
||||
+{3, 3593029427},
|
||||
+{2, 3969866902},
|
||||
+{2, 3392125996},
|
||||
+{1, 1805972490},
|
||||
+{2, 22889779},
|
||||
+{1, 1846647676},
|
||||
+{2, 1139340052},
|
||||
+{2, 664153912},
|
||||
+{2, 3044128027},
|
||||
+{2, 3010194979},
|
||||
+{2, 3514377385},
|
||||
+{2, 1807880922},
|
||||
+{1, 1661815113},
|
||||
+{2, 2588692156},
|
||||
+{2, 1431037239},
|
||||
+{1, 3594379210},
|
||||
+{2, 2701839377},
|
||||
+{1, 1973060452},
|
||||
+{2, 4218620174},
|
||||
+{1, 3895224884},
|
||||
+{1, 3812528857},
|
||||
+{3, 1703867851},
|
||||
+{2, 3123904294},
|
||||
+{5, 36151564},
|
||||
+{1, 2846294357},
|
||||
+{5, 3499546633},
|
||||
+{1, 924279160},
|
||||
+{1, 2198572304},
|
||||
+{1, 3336802574},
|
||||
+{2, 2185182379},
|
||||
+{1, 2575632458},
|
||||
+{1, 1965161345},
|
||||
+{1, 2865408940},
|
||||
+{1, 3594887915},
|
||||
+{5, 2062161796},
|
||||
+{5, 2641251194},
|
||||
+{1, 1290342362},
|
||||
+{1, 2883355438},
|
||||
+{6, 1244984107},
|
||||
+{2, 4065479712},
|
||||
+{2, 465481866},
|
||||
+{1, 2907174016},
|
||||
+{1, 2667735788},
|
||||
+{1, 363417673},
|
||||
+{2, 3519780275},
|
||||
+{2, 4165713317},
|
||||
+{1, 262548689},
|
||||
+{1, 3764359529},
|
||||
+{1, 2027001003},
|
||||
+{5, 1043862655},
|
||||
+{5, 1937481940},
|
||||
+{1, 1664585233},
|
||||
+{1, 1834979792},
|
||||
+{2, 2288070330},
|
||||
+{2, 3915617412},
|
||||
+{1, 3086662813},
|
||||
+{2, 430970259},
|
||||
+{1, 1519443249},
|
||||
+{2, 1540874280},
|
||||
+{2, 2496660261},
|
||||
+{1, 2847522842},
|
||||
+{1, 977329763},
|
||||
+{1, 1458040519},
|
||||
+{5, 2241822454},
|
||||
+{1, 4253963824},
|
||||
+{1, 722247551},
|
||||
+{1, 3127905834},
|
||||
+{1, 1903207432},
|
||||
+{1, 1893631657},
|
||||
+{1, 1960201429},
|
||||
+{1, 1239890082},
|
||||
+{2, 1762702850},
|
||||
+{0, 1681675873},
|
||||
+{1, 1411795775},
|
||||
+{2, 2548720534},
|
||||
+{2, 1427588186},
|
||||
+{2, 65566621},
|
||||
+{1, 2566081936},
|
||||
+{1, 3229297415},
|
||||
+{1, 3756168812},
|
||||
+{1, 826394561},
|
||||
+{1, 3015022068},
|
||||
+{1, 1935326986},
|
||||
+{5, 1648098256},
|
||||
+{2, 3545360164},
|
||||
+{1, 4106897609},
|
||||
+{1, 1528415857},
|
||||
+{1, 2707734286},
|
||||
+{2, 3149837061},
|
||||
+{2, 4263280906},
|
||||
+
|
||||
};
|
||||
|
||||
// NOTE: These tests rely on CreateNewBlock doing its own self-validation!
|
||||
21
contrib/test-patches/temp-revert-1.patch
Normal file
21
contrib/test-patches/temp-revert-1.patch
Normal file
|
|
@ -0,0 +1,21 @@
|
|||
commit 4dcc8701ac0eb09d8992d19fb411cee3c9aaf394
|
||||
Author: Matt Corallo <git@bluematt.me>
|
||||
Date: Sun Mar 24 20:45:44 2013 -0400
|
||||
|
||||
Revert "Update unit test to match rule enforcement starts 21 March"
|
||||
|
||||
This reverts commit d3e8c6a9d3fad68b0eee4434401ec7b3066399a2.
|
||||
|
||||
diff --git a/src/test/checkblock_tests.cpp b/src/test/checkblock_tests.cpp
|
||||
index 3cfb6db..e167def 100644
|
||||
--- a/src/test/checkblock_tests.cpp
|
||||
+++ b/src/test/checkblock_tests.cpp
|
||||
@@ -52,7 +52,7 @@ BOOST_AUTO_TEST_CASE(May15)
|
||||
if (read_block("Mar12Fork.dat", forkingBlock))
|
||||
{
|
||||
CValidationState state;
|
||||
- forkingBlock.nTime = tMay15-1; // Invalidates PoW
|
||||
+ BOOST_CHECK(!forkingBlock.CheckBlock(state, true, true));
|
||||
BOOST_CHECK(!forkingBlock.CheckBlock(state, false, false));
|
||||
|
||||
// After May 15'th, big blocks are OK:
|
||||
20
contrib/test-patches/temp-revert-2.patch
Normal file
20
contrib/test-patches/temp-revert-2.patch
Normal file
|
|
@ -0,0 +1,20 @@
|
|||
commit cfae26916dba311f6f75d444301c1f9362267c3e
|
||||
Author: Matt Corallo <git@bluematt.me>
|
||||
Date: Sun Mar 24 20:45:50 2013 -0400
|
||||
|
||||
Revert "Checkpoint at first block in 11 March chain fork"
|
||||
|
||||
This reverts commit f817c496a1482d05b22c8e539de67f07db1c09d9.
|
||||
|
||||
diff --git a/src/checkpoints.cpp b/src/checkpoints.cpp
|
||||
index 62234b9..9b11f0b 100644
|
||||
--- a/src/checkpoints.cpp
|
||||
+++ b/src/checkpoints.cpp
|
||||
@@ -44,7 +44,6 @@ namespace Checkpoints
|
||||
(193000, uint256("0x000000000000059f452a5f7340de6682a977387c17010ff6e6c3bd83ca8b1317"))
|
||||
(210000, uint256("0x000000000000048b95347e83192f69cf0366076336c639f9b7228e9ba171342e"))
|
||||
(216116, uint256("0x00000000000001b4f4b433e81ee46494af945cf96014816a4e2370f11b23df4e"))
|
||||
- (225430, uint256("0x00000000000001c108384350f74090433e7fcf79a606b8e797f065b130575932"))
|
||||
;
|
||||
static const CCheckpointData data = {
|
||||
&mapCheckpoints,
|
||||
34
contrib/test-patches/temp-revert-3.patch
Normal file
34
contrib/test-patches/temp-revert-3.patch
Normal file
|
|
@ -0,0 +1,34 @@
|
|||
commit ba84709c65b911798ddae1285d807f4cd036990d
|
||||
Author: Matt Corallo <git@bluematt.me>
|
||||
Date: Sun Mar 24 20:45:56 2013 -0400
|
||||
|
||||
Revert "Before 15 May, limit created block size to 500K"
|
||||
|
||||
This reverts commit 402f19b64530775a7e4ded025c80d8c16a55e454.
|
||||
|
||||
diff --git a/src/main.cpp b/src/main.cpp
|
||||
index 22baf0f..51ada0a 100644
|
||||
--- a/src/main.cpp
|
||||
+++ b/src/main.cpp
|
||||
@@ -2057,8 +2057,8 @@ bool CBlock::CheckBlock(CValidationState &state, bool fCheckPOW, bool fCheckMerk
|
||||
return state.DoS(100, error("CheckBlock() : size limits failed"));
|
||||
|
||||
// Special short-term limits to avoid 10,000 BDB lock limit:
|
||||
- if (GetBlockTime() >= 1363867200 && // start enforcing 21 March 2013, noon GMT
|
||||
- GetBlockTime() < 1368576000) // stop enforcing 15 May 2013 00:00:00
|
||||
+ if (GetBlockTime() > 1363039171 && // 11 March 2013, timestamp of block before the big fork
|
||||
+ GetBlockTime() < 1368576000) // 15 May 2013 00:00:00
|
||||
{
|
||||
// Rule is: #unique txids referenced <= 4,500
|
||||
// ... to prevent 10,000 BDB lock exhaustion on old clients
|
||||
@@ -4155,10 +4155,6 @@ CBlockTemplate* CreateNewBlock(CReserveKey& reservekey)
|
||||
// Limit to betweeen 1K and MAX_BLOCK_SIZE-1K for sanity:
|
||||
nBlockMaxSize = std::max((unsigned int)1000, std::min((unsigned int)(MAX_BLOCK_SIZE-1000), nBlockMaxSize));
|
||||
|
||||
- // Special compatibility rule before 15 May: limit size to 500,000 bytes:
|
||||
- if (GetAdjustedTime() < 1368576000)
|
||||
- nBlockMaxSize = std::min(nBlockMaxSize, (unsigned int)(MAX_BLOCK_SIZE_GEN));
|
||||
-
|
||||
// How much of the block should be dedicated to high-priority transactions,
|
||||
// included regardless of the fees they pay
|
||||
unsigned int nBlockPrioritySize = GetArg("-blockprioritysize", 27000);
|
||||
110
contrib/test-patches/temp-revert-4.patch
Normal file
110
contrib/test-patches/temp-revert-4.patch
Normal file
|
|
@ -0,0 +1,110 @@
|
|||
commit ca96b88b61f647d4f56d5d06321dda08a43bf92f
|
||||
Author: Matt Corallo <git@bluematt.me>
|
||||
Date: Sun Mar 24 20:46:01 2013 -0400
|
||||
|
||||
Revert "CheckBlock rule until 15-May for 10,000 BDB lock compatibility"
|
||||
|
||||
This reverts commit 8c222dca4f961ad13ec64d690134a40d09b20813.
|
||||
|
||||
diff --git a/src/main.cpp b/src/main.cpp
|
||||
index 51ada0a..9a06dbf 100644
|
||||
--- a/src/main.cpp
|
||||
+++ b/src/main.cpp
|
||||
@@ -2056,25 +2056,6 @@ bool CBlock::CheckBlock(CValidationState &state, bool fCheckPOW, bool fCheckMerk
|
||||
if (vtx.empty() || vtx.size() > MAX_BLOCK_SIZE || ::GetSerializeSize(*this, SER_NETWORK, PROTOCOL_VERSION) > MAX_BLOCK_SIZE)
|
||||
return state.DoS(100, error("CheckBlock() : size limits failed"));
|
||||
|
||||
- // Special short-term limits to avoid 10,000 BDB lock limit:
|
||||
- if (GetBlockTime() > 1363039171 && // 11 March 2013, timestamp of block before the big fork
|
||||
- GetBlockTime() < 1368576000) // 15 May 2013 00:00:00
|
||||
- {
|
||||
- // Rule is: #unique txids referenced <= 4,500
|
||||
- // ... to prevent 10,000 BDB lock exhaustion on old clients
|
||||
- set<uint256> setTxIn;
|
||||
- for (size_t i = 0; i < vtx.size(); i++)
|
||||
- {
|
||||
- setTxIn.insert(vtx[i].GetHash());
|
||||
- if (i == 0) continue; // skip coinbase txin
|
||||
- BOOST_FOREACH(const CTxIn& txin, vtx[i].vin)
|
||||
- setTxIn.insert(txin.prevout.hash);
|
||||
- }
|
||||
- size_t nTxids = setTxIn.size();
|
||||
- if (nTxids > 4500)
|
||||
- return error("CheckBlock() : 15 May maxlocks violation");
|
||||
- }
|
||||
-
|
||||
// Check proof of work matches claimed amount
|
||||
if (fCheckPOW && !CheckProofOfWork(GetHash(), nBits))
|
||||
return state.DoS(50, error("CheckBlock() : proof of work failed"));
|
||||
diff --git a/src/test/checkblock_tests.cpp b/src/test/checkblock_tests.cpp
|
||||
deleted file mode 100644
|
||||
index e167def..0000000
|
||||
--- a/src/test/checkblock_tests.cpp
|
||||
+++ /dev/null
|
||||
@@ -1,66 +0,0 @@
|
||||
-//
|
||||
-// Unit tests for block.CheckBlock()
|
||||
-//
|
||||
-#include <algorithm>
|
||||
-
|
||||
-#include <boost/assign/list_of.hpp> // for 'map_list_of()'
|
||||
-#include <boost/date_time/posix_time/posix_time_types.hpp>
|
||||
-#include <boost/test/unit_test.hpp>
|
||||
-#include <boost/foreach.hpp>
|
||||
-
|
||||
-#include "main.h"
|
||||
-#include "wallet.h"
|
||||
-#include "net.h"
|
||||
-#include "util.h"
|
||||
-
|
||||
-BOOST_AUTO_TEST_SUITE(CheckBlock_tests)
|
||||
-
|
||||
-bool
|
||||
-read_block(const std::string& filename, CBlock& block)
|
||||
-{
|
||||
- namespace fs = boost::filesystem;
|
||||
- fs::path testFile = fs::current_path() / "test" / "data" / filename;
|
||||
-#ifdef TEST_DATA_DIR
|
||||
- if (!fs::exists(testFile))
|
||||
- {
|
||||
- testFile = fs::path(BOOST_PP_STRINGIZE(TEST_DATA_DIR)) / filename;
|
||||
- }
|
||||
-#endif
|
||||
- FILE* fp = fopen(testFile.string().c_str(), "rb");
|
||||
- if (!fp) return false;
|
||||
-
|
||||
- fseek(fp, 8, SEEK_SET); // skip msgheader/size
|
||||
-
|
||||
- CAutoFile filein = CAutoFile(fp, SER_DISK, CLIENT_VERSION);
|
||||
- if (!filein) return false;
|
||||
-
|
||||
- filein >> block;
|
||||
-
|
||||
- return true;
|
||||
-}
|
||||
-
|
||||
-BOOST_AUTO_TEST_CASE(May15)
|
||||
-{
|
||||
- // Putting a 1MB binary file in the git repository is not a great
|
||||
- // idea, so this test is only run if you manually download
|
||||
- // test/data/Mar12Fork.dat from
|
||||
- // http://sourceforge.net/projects/bitcoin/files/Bitcoin/blockchain/Mar12Fork.dat/download
|
||||
- unsigned int tMay15 = 1368576000;
|
||||
- SetMockTime(tMay15); // Test as if it was right at May 15
|
||||
-
|
||||
- CBlock forkingBlock;
|
||||
- if (read_block("Mar12Fork.dat", forkingBlock))
|
||||
- {
|
||||
- CValidationState state;
|
||||
- BOOST_CHECK(!forkingBlock.CheckBlock(state, true, true));
|
||||
- BOOST_CHECK(!forkingBlock.CheckBlock(state, false, false));
|
||||
-
|
||||
- // After May 15'th, big blocks are OK:
|
||||
- forkingBlock.nTime = tMay15; // Invalidates PoW
|
||||
- BOOST_CHECK(forkingBlock.CheckBlock(state, false, false));
|
||||
- }
|
||||
-
|
||||
- SetMockTime(0);
|
||||
-}
|
||||
-
|
||||
-BOOST_AUTO_TEST_SUITE_END()
|
||||
|
|
@ -18,7 +18,7 @@ WORKINGDIR="/tmp/bitcoin"
|
|||
TMPFILE="hashes.tmp"
|
||||
|
||||
#this URL is used if a version number is not specified as an argument to the script
|
||||
SIGNATUREFILE="http://downloads.sourceforge.net/project/bitcoin/Bitcoin/bitcoin-0.8.1/SHA256SUMS.asc"
|
||||
SIGNATUREFILE="http://downloads.sourceforge.net/project/bitcoin/Bitcoin/bitcoin-0.8.2/SHA256SUMS.asc"
|
||||
|
||||
SIGNATUREFILENAME="SHA256SUMS.asc"
|
||||
RCSUBDIR="test/"
|
||||
|
|
|
|||
33
doc/README
33
doc/README
|
|
@ -1,33 +0,0 @@
|
|||
Bitcoin 0.8.1 BETA
|
||||
|
||||
Copyright (c) 2009-2013 Bitcoin Developers
|
||||
Distributed under the MIT/X11 software license, see the accompanying
|
||||
file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||
This product includes software developed by the OpenSSL Project for use in
|
||||
the OpenSSL Toolkit (http://www.openssl.org/). This product includes
|
||||
cryptographic software written by Eric Young (eay@cryptsoft.com).
|
||||
|
||||
|
||||
Intro
|
||||
-----
|
||||
Bitcoin is a free open source peer-to-peer electronic cash system that is
|
||||
completely decentralized, without the need for a central server or trusted
|
||||
parties. Users hold the crypto keys to their own money and transact directly
|
||||
with each other, with the help of a P2P network to check for double-spending.
|
||||
|
||||
|
||||
Setup
|
||||
-----
|
||||
You need the Qt4 run-time libraries to run Bitcoin-Qt. On Debian or Ubuntu:
|
||||
sudo apt-get install libqtgui4
|
||||
|
||||
Unpack the files into a directory and run:
|
||||
bin/32/bitcoin-qt (GUI, 32-bit)
|
||||
bin/32/bitcoind (headless, 32-bit)
|
||||
bin/64/bitcoin-qt (GUI, 64-bit)
|
||||
bin/64/bitcoind (headless, 64-bit)
|
||||
|
||||
|
||||
See the documentation at the bitcoin wiki:
|
||||
https://en.bitcoin.it/wiki/Main_Page
|
||||
for help and more information.
|
||||
46
doc/README.md
Normal file
46
doc/README.md
Normal file
|
|
@ -0,0 +1,46 @@
|
|||
Bitcoin 0.8.2 BETA
|
||||
====================
|
||||
|
||||
Copyright (c) 2009-2013 Bitcoin Developers
|
||||
|
||||
Distributed under the MIT/X11 software license, see the accompanying
|
||||
file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||
This product includes software developed by the OpenSSL Project for use in the [OpenSSL Toolkit](http://www.openssl.org/). This product includes
|
||||
cryptographic software written by Eric Young ([eay@cryptsoft.com](mailto:eay@cryptsoft.com)), and UPnP software written by Thomas Bernard.
|
||||
|
||||
|
||||
Intro
|
||||
---------------------
|
||||
Bitcoin is a free open source peer-to-peer electronic cash system that is
|
||||
completely decentralized, without the need for a central server or trusted
|
||||
parties. Users hold the crypto keys to their own money and transact directly
|
||||
with each other, with the help of a P2P network to check for double-spending.
|
||||
|
||||
|
||||
Setup
|
||||
---------------------
|
||||
You need the Qt4 run-time libraries to run Bitcoin-Qt. On Debian or Ubuntu:
|
||||
`sudo apt-get install libqtgui4`
|
||||
|
||||
Unpack the files into a directory and run:
|
||||
|
||||
- bin/32/bitcoin-qt (GUI, 32-bit)
|
||||
- bin/32/bitcoind (headless, 32-bit)
|
||||
- bin/64/bitcoin-qt (GUI, 64-bit)
|
||||
- bin/64/bitcoind (headless, 64-bit)
|
||||
|
||||
See the documentation at the [Bitcoin Wiki](https://en.bitcoin.it/wiki/Main_Page)
|
||||
for help and more information.
|
||||
|
||||
|
||||
Other Pages
|
||||
---------------------
|
||||
- [Unix Build Notes](build-unix.md)
|
||||
- [OSX Build Notes](build-osx.md)
|
||||
- [Windows Build Notes](build-msw.md)
|
||||
- [Coding Guidelines](coding.md)
|
||||
- [Release Process](release-process.md)
|
||||
- [Release Notes](release-notes.md)
|
||||
- [Multiwallet Qt Development](multiwallet-qt.md)
|
||||
- [Unit Tests](unit-tests.md)
|
||||
- [Translation Process](translation_process.md)
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
Bitcoin 0.8.1 BETA
|
||||
Bitcoin 0.8.2 BETA
|
||||
|
||||
Copyright (c) 2009-2013 Bitcoin Developers
|
||||
Distributed under the MIT/X11 software license, see the accompanying
|
||||
|
|
@ -20,15 +20,10 @@ Setup
|
|||
-----
|
||||
Unpack the files into a directory and run bitcoin-qt.exe.
|
||||
|
||||
If you have Microsoft Security Essentials, you need to add bitcoin.exe to its
|
||||
"Excluded processes" list. Microsoft Security Essentials->Settings tab,
|
||||
select Excluded processes, press Add, select bitcoin.exe, OK, Save changes.
|
||||
|
||||
The software automatically finds other nodes to connect to. You can
|
||||
enable Universal Plug and Play using a menu entry or set your firewall
|
||||
to forward port 8333 (TCP) to your computer so you can receive
|
||||
incoming connections. Bitcoin works without incoming connections,
|
||||
but allowing incoming connections helps the Bitcoin network.
|
||||
Bitcoin-Qt is the original Bitcoin client and it builds the backbone of the network.
|
||||
However, it downloads and stores the entire history of Bitcoin transactions;
|
||||
depending on the speed of your computer and network connection, the synchronization
|
||||
process can take anywhere from a few hours to a day or more.
|
||||
|
||||
See the bitcoin wiki at:
|
||||
https://en.bitcoin.it/wiki/Main_Page
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ TOR SUPPORT IN BITCOIN
|
|||
|
||||
It is possible to run Bitcoin as a Tor hidden service, and connect to such services.
|
||||
|
||||
The following assumes you have a Tor proxy running on port 9050. Many distributions
|
||||
The following directions assume you have a Tor proxy running on port 9050. Many distributions
|
||||
default to having a SOCKS proxy listening on port 9050, but others may not.
|
||||
In particular, the Tor Browser Bundle defaults to listening on a random port. See
|
||||
https://www.torproject.org/docs/faq.html.en#TBBSocksPort for how to properly
|
||||
|
|
@ -77,7 +77,7 @@ In a typical situation, where you're only reachable via Tor, this should suffice
|
|||
|
||||
./bitcoind -proxy=127.0.0.1:9050 -externalip=57qr3yd1nyntf5k.onion -listen
|
||||
|
||||
(obviously replace the Onion address with your own). If you don't care too much
|
||||
(obviously, replace the Onion address with your own). If you don't care too much
|
||||
about hiding your node, and want to be reachable on IPv4 as well, additionally
|
||||
specify:
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
Icon: src/qt/res/icons/clock*.png, src/qt/res/icons/tx*.png,
|
||||
src/qt/res/src/*.svg
|
||||
src/qt/res/src/clock_green.svg, src/qt/res/src/clock1.svg,
|
||||
src/qt/res/src/clock2.svg, src/qt/res/src/clock3.svg,
|
||||
src/qt/res/src/clock4.svg, src/qt/res/src/clock5.svg,
|
||||
src/qt/res/src/inout.svg, src/qt/res/src/questionmark.svg
|
||||
Designer: Wladimir van der Laan
|
||||
License: MIT
|
||||
|
||||
|
|
@ -35,23 +38,21 @@ Designer: http://www.everaldo.com
|
|||
Icon Pack: Crystal SVG
|
||||
License: LGPL
|
||||
|
||||
Icon: src/qt/res/icons/bitcoin.png, src/qt/res/icons/toolbar.png
|
||||
Designer: Bitboy (optimized for 16x16 by Wladimir van der Laan)
|
||||
License: Public Domain
|
||||
Site: https://bitcointalk.org/?topic=1756.0
|
||||
|
||||
Icon: scripts/img/reload.xcf (modified),src/qt/res/movies/update_spinner.mng
|
||||
Icon: scripts/img/reload.xcf (modified), src/qt/res/movies/update_spinner.mng
|
||||
Icon Pack: Kids
|
||||
Designer: Everaldo (Everaldo Coelho)
|
||||
License: GNU/GPL
|
||||
Site: http://findicons.com/icon/17102/reload?id=17102
|
||||
|
||||
Image: src/qt/res/images/splash2.jpg (Wallet image)
|
||||
Designer: Crobbo (forum)
|
||||
Site: https://bitcointalk.org/index.php?topic=32273.0
|
||||
License: Public domain
|
||||
|
||||
Icon: src/qt/res/icons/debugwindow.png
|
||||
Designer: Vignoni David
|
||||
Site: http://www.oxygen-icons.org/
|
||||
License: Oxygen icon theme is dual licensed. You may copy it under the Creative Common Attribution-ShareAlike 3.0 License or the GNU Library General Public License.
|
||||
|
||||
Icon: src/qt/res/icons/bitcoin.icns, src/qt/res/src/bitcoin.svg,
|
||||
src/qt/res/src/bitcoin.ico, src/qt/res/src/bitcoin.png,
|
||||
src/qt/res/src/bitcoin_testnet.png, docs/bitcoin_logo_doxygen.png,
|
||||
src/qt/res/icons/toolbar.png, src/qt/res/icons/toolbar_testnet.png,
|
||||
src/qt/res/images/splash.png, src/qt/res/images/splash_testnet.png
|
||||
Designer: Jonas Schnelli (based on the original bitcoin logo from Bitboy)
|
||||
License: MIT
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 5.6 KiB After Width: | Height: | Size: 4.6 KiB |
|
|
@ -1,10 +1,9 @@
|
|||
Copyright (c) 2009-2012 Bitcoin Developers
|
||||
Copyright (c) 2009-2013 Bitcoin Developers
|
||||
|
||||
Distributed under the MIT/X11 software license, see the accompanying
|
||||
file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||
This product includes software developed by the OpenSSL Project for use in
|
||||
the OpenSSL Toolkit (http://www.openssl.org/). This product includes
|
||||
cryptographic software written by Eric Young (eay@cryptsoft.com) and UPnP
|
||||
software written by Thomas Bernard.
|
||||
This product includes software developed by the OpenSSL Project for use in the [OpenSSL Toolkit](http://www.openssl.org/). This product includes
|
||||
cryptographic software written by Eric Young ([eay@cryptsoft.com](mailto:eay@cryptsoft.com)), and UPnP software written by Thomas Bernard.
|
||||
|
||||
|
||||
See readme-qt.rst for instructions on building Bitcoin-Qt, the
|
||||
|
|
@ -30,55 +29,62 @@ Boost \boost-1.50.0-mgw http://www.boost.org/users/download/
|
|||
miniupnpc \miniupnpc-1.6-mgw http://miniupnp.tuxfamily.org/files/
|
||||
|
||||
Their licenses:
|
||||
OpenSSL Old BSD license with the problematic advertising requirement
|
||||
Berkeley DB New BSD license with additional requirement that linked software must be free open source
|
||||
Boost MIT-like license
|
||||
miniupnpc New (3-clause) BSD license
|
||||
|
||||
OpenSSL Old BSD license with the problematic advertising requirement
|
||||
Berkeley DB New BSD license with additional requirement that linked software must be free open source
|
||||
Boost MIT-like license
|
||||
miniupnpc New (3-clause) BSD license
|
||||
|
||||
Versions used in this release:
|
||||
OpenSSL 1.0.1c
|
||||
Berkeley DB 4.8.30.NC
|
||||
Boost 1.50.0
|
||||
miniupnpc 1.6
|
||||
|
||||
OpenSSL 1.0.1c
|
||||
Berkeley DB 4.8.30.NC
|
||||
Boost 1.50.0
|
||||
miniupnpc 1.6
|
||||
|
||||
|
||||
OpenSSL
|
||||
-------
|
||||
MSYS shell:
|
||||
|
||||
un-tar sources with MSYS 'tar xfz' to avoid issue with symlinks (OpenSSL ticket 2377)
|
||||
change 'MAKE' env. variable from 'C:\MinGW32\bin\mingw32-make.exe' to '/c/MinGW32/bin/mingw32-make.exe'
|
||||
|
||||
cd /c/openssl-1.0.1c-mgw
|
||||
./config
|
||||
make
|
||||
cd /c/openssl-1.0.1c-mgw
|
||||
./config
|
||||
make
|
||||
|
||||
Berkeley DB
|
||||
-----------
|
||||
MSYS shell:
|
||||
cd /c/db-4.8.30.NC-mgw/build_unix
|
||||
sh ../dist/configure --enable-mingw --enable-cxx
|
||||
make
|
||||
|
||||
cd /c/db-4.8.30.NC-mgw/build_unix
|
||||
sh ../dist/configure --enable-mingw --enable-cxx
|
||||
make
|
||||
|
||||
Boost
|
||||
-----
|
||||
DOS prompt:
|
||||
downloaded boost jam 3.1.18
|
||||
cd \boost-1.50.0-mgw
|
||||
bjam toolset=gcc --build-type=complete stage
|
||||
|
||||
downloaded boost jam 3.1.18
|
||||
cd \boost-1.50.0-mgw
|
||||
bjam toolset=gcc --build-type=complete stage
|
||||
|
||||
MiniUPnPc
|
||||
---------
|
||||
UPnP support is optional, make with USE_UPNP= to disable it.
|
||||
UPnP support is optional, make with `USE_UPNP=` to disable it.
|
||||
|
||||
MSYS shell:
|
||||
cd /c/miniupnpc-1.6-mgw
|
||||
make -f Makefile.mingw
|
||||
mkdir miniupnpc
|
||||
cp *.h miniupnpc/
|
||||
|
||||
cd /c/miniupnpc-1.6-mgw
|
||||
make -f Makefile.mingw
|
||||
mkdir miniupnpc
|
||||
cp *.h miniupnpc/
|
||||
|
||||
Bitcoin
|
||||
-------
|
||||
DOS prompt:
|
||||
cd \bitcoin\src
|
||||
mingw32-make -f makefile.mingw
|
||||
strip bitcoind.exe
|
||||
|
||||
cd \bitcoin\src
|
||||
mingw32-make -f makefile.mingw
|
||||
strip bitcoind.exe
|
||||
185
doc/build-osx.md
Normal file
185
doc/build-osx.md
Normal file
|
|
@ -0,0 +1,185 @@
|
|||