-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
2、添加头签名验证(mainnet为399100块,testnet为391993块)。 3、添加对bitcore-RPC调用的支持,使用/configure --enable-bitcore-rpc以启用。 4、使垃圾邮件过滤器禁止列表持久化。 5、为块启用垃圾邮件筛选器。 6、添加对强化检查点的支持。 7、修复一个阻止所见标桩组正常工作的错误。 8、修复一个阻止从OSX中的qt wallet打开qtum.conf文件的错误。 9、修复pos块的getblockstats rpc调用。 10、修复CallContract导致msg.sender在指定gaslimit时返回错误值的错误。 11、修复对python脚本的线性化。 12、将参数-notusechangeaddress重命名为-usechangeaddress。 13、当区块数达到240000后取消月利息 14、优化gettransactionreceipt返回参数,便于浏览器显示调用
- Loading branch information
1 parent
93b0d95
commit 3eed6d2
Showing
786 changed files
with
38,218 additions
and
226,766 deletions.
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
src/clientversion.cpp export-subst |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,130 @@ | ||
*.tar.gz | ||
|
||
*.exe | ||
src/bitcoin | ||
src/bitcoind | ||
src/bitcoin-cli | ||
src/bitcoin-tx | ||
src/test/test_bitcoin | ||
src/test/test_bitcoin_fuzzy | ||
src/qt/test/test_bitcoin-qt | ||
|
||
# autoreconf | ||
Makefile.in | ||
aclocal.m4 | ||
autom4te.cache/ | ||
build-aux/config.guess | ||
build-aux/config.sub | ||
build-aux/depcomp | ||
build-aux/install-sh | ||
build-aux/ltmain.sh | ||
build-aux/m4/libtool.m4 | ||
build-aux/m4/lt~obsolete.m4 | ||
build-aux/m4/ltoptions.m4 | ||
build-aux/m4/ltsugar.m4 | ||
build-aux/m4/ltversion.m4 | ||
build-aux/missing | ||
build-aux/compile | ||
build-aux/test-driver | ||
config.log | ||
config.status | ||
configure | ||
libtool | ||
src/config/bitcoin-config.h | ||
src/config/bitcoin-config.h.in | ||
src/config/stamp-h1 | ||
share/setup.nsi | ||
share/qt/Info.plist | ||
|
||
src/univalue/gen | ||
|
||
src/qt/*.moc | ||
src/qt/moc_*.cpp | ||
src/qt/forms/ui_*.h | ||
|
||
src/qt/test/moc*.cpp | ||
|
||
src/qt/bitcoin-qt.config | ||
src/qt/bitcoin-qt.creator | ||
src/qt/bitcoin-qt.creator.user | ||
src/qt/bitcoin-qt.files | ||
src/qt/bitcoin-qt.includes | ||
|
||
.deps | ||
.dirstamp | ||
.libs | ||
.*.swp | ||
*.*~* | ||
*.bak | ||
*.rej | ||
*.orig | ||
*.pyc | ||
*.o | ||
*.o-* | ||
*.patch | ||
*.a | ||
*.pb.cc | ||
*.pb.h | ||
|
||
*.log | ||
*.trs | ||
*.dmg | ||
|
||
*.json.h | ||
*.raw.h | ||
|
||
#libtool object files | ||
*.lo | ||
*.la | ||
|
||
# Compilation and Qt preprocessor part | ||
*.qm | ||
Makefile | ||
bitcoin-qt | ||
Bitcoin-Qt.app | ||
background.tiff* | ||
|
||
# Unit-tests | ||
Makefile.test | ||
bitcoin-qt_test | ||
|
||
# Resources cpp | ||
qrc_*.cpp | ||
|
||
# Mac specific | ||
.DS_Store | ||
build | ||
|
||
#lcov | ||
*.gcno | ||
*.gcda | ||
/*.info | ||
test_bitcoin.coverage/ | ||
total.coverage/ | ||
coverage_percent.txt | ||
|
||
#build tests | ||
linux-coverage-build | ||
linux-build | ||
win32-build | ||
test/config.ini | ||
test/cache/* | ||
|
||
!src/leveldb*/Makefile | ||
|
||
/doc/doxygen/ | ||
|
||
libbitcoinconsensus.pc | ||
contrib/devtools/split-debug.sh | ||
.cproject | ||
.project | ||
.settings/language.settings.xml | ||
src/silubium-cli | ||
src/silubium-tx | ||
src/silubiumd | ||
src/bench/bench_silubium | ||
src/qt/silubium-qt | ||
src/qt/test/test_silubium-qt | ||
src/test/buildenv.py | ||
src/test/test_silubium | ||
src/test/test_silubium_fuzzy |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
[submodule "src/cpp-ethereum"] | ||
path = src/cpp-ethereum | ||
url = https://github.com/silubiumproject/cpp-eth-silubium.git |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,164 @@ | ||
dist: trusty | ||
os: linux | ||
language: minimal | ||
cache: | ||
ccache: true | ||
directories: | ||
- depends/built | ||
- depends/sdk-sources | ||
- $HOME/.ccache | ||
stages: | ||
- lint | ||
- test | ||
env: | ||
global: | ||
- MAKEJOBS=-j3 | ||
- RUN_TESTS=false | ||
- RUN_BENCH=false # Set to true for any one job that has debug enabled, to quickly check bench is not crashing or hitting assertions | ||
- DOCKER_NAME_TAG=ubuntu:18.04 | ||
- LC_ALL=C.UTF-8 | ||
- BOOST_TEST_RANDOM=1$TRAVIS_BUILD_ID | ||
- CCACHE_SIZE=100M | ||
- CCACHE_TEMPDIR=/tmp/.ccache-temp | ||
- CCACHE_COMPRESS=1 | ||
- CCACHE_DIR=$HOME/.ccache | ||
- BASE_OUTDIR=$TRAVIS_BUILD_DIR/out | ||
- SDK_URL=https://bitcoincore.org/depends-sources/sdks | ||
- WINEDEBUG=fixme-all | ||
- DOCKER_PACKAGES="build-essential libtool autotools-dev automake pkg-config bsdmainutils curl git ca-certificates ccache" | ||
before_install: | ||
- export PATH=$(echo $PATH | tr ':' "\n" | sed '/\/opt\/python/d' | tr "\n" ":" | sed "s|::|:|g") | ||
- BEGIN_FOLD () { echo ""; CURRENT_FOLD_NAME=$1; echo "travis_fold:start:${CURRENT_FOLD_NAME}"; } | ||
- END_FOLD () { RET=$?; echo "travis_fold:end:${CURRENT_FOLD_NAME}"; return $RET; } | ||
install: | ||
- travis_retry docker pull $DOCKER_NAME_TAG | ||
- env | grep -E '^(CCACHE_|WINEDEBUG|LC_ALL|BOOST_TEST_RANDOM|CONFIG_SHELL)' | tee /tmp/env | ||
- if [[ $HOST = *-mingw32 ]]; then DOCKER_ADMIN="--cap-add SYS_ADMIN"; fi | ||
- DOCKER_ID=$(docker run $DOCKER_ADMIN -idt --mount type=bind,src=$TRAVIS_BUILD_DIR,dst=$TRAVIS_BUILD_DIR --mount type=bind,src=$CCACHE_DIR,dst=$CCACHE_DIR -w $TRAVIS_BUILD_DIR --env-file /tmp/env $DOCKER_NAME_TAG) | ||
- DOCKER_EXEC () { docker exec $DOCKER_ID bash -c "cd $PWD && $*"; } | ||
- if [ -n "$DPKG_ADD_ARCH" ]; then DOCKER_EXEC dpkg --add-architecture "$DPKG_ADD_ARCH" ; fi | ||
- travis_retry DOCKER_EXEC apt-get update | ||
- travis_retry DOCKER_EXEC apt-get install --no-install-recommends --no-upgrade -qq $PACKAGES $DOCKER_PACKAGES | ||
before_script: | ||
- DOCKER_EXEC echo \> \$HOME/.bitcoin # Make sure default datadir does not exist and is never read by creating a dummy file | ||
- mkdir -p depends/SDKs depends/sdk-sources | ||
- if [ -n "$OSX_SDK" -a ! -f depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.gz ]; then curl --location --fail $SDK_URL/MacOSX${OSX_SDK}.sdk.tar.gz -o depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.gz; fi | ||
- if [ -n "$OSX_SDK" -a -f depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.gz ]; then tar -C depends/SDKs -xf depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.gz; fi | ||
- if [[ $HOST = *-mingw32 ]]; then DOCKER_EXEC update-alternatives --set $HOST-g++ \$\(which $HOST-g++-posix\); fi | ||
- if [ -z "$NO_DEPENDS" ]; then DOCKER_EXEC CONFIG_SHELL= make $MAKEJOBS -C depends HOST=$HOST $DEP_OPTS; fi | ||
script: | ||
- export TRAVIS_COMMIT_LOG=`git log --format=fuller -1` | ||
- OUTDIR=$BASE_OUTDIR/$TRAVIS_PULL_REQUEST/$TRAVIS_JOB_NUMBER-$HOST | ||
- BITCOIN_CONFIG_ALL="--disable-dependency-tracking --prefix=$TRAVIS_BUILD_DIR/depends/$HOST --bindir=$OUTDIR/bin --libdir=$OUTDIR/lib" | ||
- if [ -z "$NO_DEPENDS" ]; then DOCKER_EXEC ccache --max-size=$CCACHE_SIZE; fi | ||
- BEGIN_FOLD autogen; test -n "$CONFIG_SHELL" && DOCKER_EXEC "$CONFIG_SHELL" -c "./autogen.sh" || DOCKER_EXEC ./autogen.sh; END_FOLD | ||
- mkdir build && cd build | ||
- BEGIN_FOLD configure; DOCKER_EXEC ../configure --cache-file=config.cache $BITCOIN_CONFIG_ALL $BITCOIN_CONFIG || ( cat config.log && false); END_FOLD | ||
- BEGIN_FOLD distdir; DOCKER_EXEC make distdir VERSION=$HOST; END_FOLD | ||
- cd bitcoin-$HOST | ||
- BEGIN_FOLD configure; DOCKER_EXEC ./configure --cache-file=../config.cache $BITCOIN_CONFIG_ALL $BITCOIN_CONFIG || ( cat config.log && false); END_FOLD | ||
- BEGIN_FOLD build; DOCKER_EXEC make $MAKEJOBS $GOAL || ( echo "Build failure. Verbose build follows." && DOCKER_EXEC make $GOAL V=1 ; false ); END_FOLD | ||
- if [ "$RUN_TESTS" = "true" ]; then BEGIN_FOLD unit-tests; DOCKER_EXEC LD_LIBRARY_PATH=$TRAVIS_BUILD_DIR/depends/$HOST/lib make $MAKEJOBS check VERBOSE=1; END_FOLD; fi | ||
- if [ "$RUN_BENCH" = "true" ]; then BEGIN_FOLD bench; DOCKER_EXEC LD_LIBRARY_PATH=$TRAVIS_BUILD_DIR/depends/$HOST/lib $OUTDIR/bin/bench_bitcoin -scaling=0.001 ; END_FOLD; fi | ||
- if [ "$TRAVIS_EVENT_TYPE" = "cron" ]; then extended="--extended --exclude feature_pruning,feature_dbcrash"; fi | ||
- if [ "$RUN_TESTS" = "true" ]; then BEGIN_FOLD functional-tests; DOCKER_EXEC test/functional/test_runner.py --combinedlogslen=4000 --coverage --quiet --failfast ${extended}; END_FOLD; fi | ||
after_script: | ||
- echo $TRAVIS_COMMIT_RANGE | ||
- echo $TRAVIS_COMMIT_LOG | ||
jobs: | ||
include: | ||
# ARM | ||
- stage: test | ||
env: >- | ||
HOST=arm-linux-gnueabihf | ||
PACKAGES="g++-arm-linux-gnueabihf" | ||
DEP_OPTS="NO_QT=1" | ||
GOAL="install" | ||
BITCOIN_CONFIG="--enable-glibc-back-compat --enable-reduce-exports" | ||
# Win32 | ||
- stage: test | ||
env: >- | ||
HOST=i686-w64-mingw32 | ||
DPKG_ADD_ARCH="i386" | ||
DEP_OPTS="NO_QT=1" | ||
PACKAGES="python3 nsis g++-mingw-w64-i686 wine-binfmt wine32" | ||
RUN_TESTS=true | ||
GOAL="install" | ||
BITCOIN_CONFIG="--enable-reduce-exports" | ||
# Win64 | ||
- stage: test | ||
env: >- | ||
HOST=x86_64-w64-mingw32 | ||
DEP_OPTS="NO_QT=1" | ||
PACKAGES="python3 nsis g++-mingw-w64-x86-64 wine-binfmt wine64" | ||
RUN_TESTS=true | ||
GOAL="install" | ||
BITCOIN_CONFIG="--enable-reduce-exports" | ||
# 32-bit + dash | ||
- stage: test | ||
env: >- | ||
HOST=i686-pc-linux-gnu | ||
PACKAGES="g++-multilib python3-zmq" | ||
DEP_OPTS="NO_QT=1" | ||
RUN_TESTS=true | ||
GOAL="install" | ||
BITCOIN_CONFIG="--enable-zmq --enable-glibc-back-compat --enable-reduce-exports LDFLAGS=-static-libstdc++" | ||
CONFIG_SHELL="/bin/dash" | ||
# x86_64 Linux (uses qt5 dev package instead of depends Qt to speed up build and avoid timeout) | ||
- stage: test | ||
env: >- | ||
HOST=x86_64-unknown-linux-gnu | ||
PACKAGES="python3-zmq qtbase5-dev qttools5-dev-tools protobuf-compiler libdbus-1-dev libharfbuzz-dev libprotobuf-dev" | ||
DEP_OPTS="NO_QT=1 NO_UPNP=1 DEBUG=1 ALLOW_HOST_PACKAGES=1" | ||
RUN_TESTS=true | ||
RUN_BENCH=true | ||
GOAL="install" | ||
BITCOIN_CONFIG="--enable-zmq --with-gui=qt5 --enable-glibc-back-compat --enable-reduce-exports --enable-debug CXXFLAGS=\"-g0 -O2\"" | ||
# x86_64 Linux (Qt5 & system libs) | ||
- stage: test | ||
env: >- | ||
HOST=x86_64-unknown-linux-gnu | ||
PACKAGES="python3-zmq qtbase5-dev qttools5-dev-tools libssl1.0-dev libevent-dev bsdmainutils libboost-system-dev libboost-filesystem-dev libboost-chrono-dev libboost-test-dev libboost-thread-dev libdb5.3++-dev libminiupnpc-dev libzmq3-dev libprotobuf-dev protobuf-compiler libqrencode-dev" | ||
NO_DEPENDS=1 | ||
RUN_TESTS=true | ||
GOAL="install" | ||
BITCOIN_CONFIG="--enable-zmq --with-incompatible-bdb --enable-glibc-back-compat --enable-reduce-exports --with-gui=qt5 CPPFLAGS=-DDEBUG_LOCKORDER" | ||
# x86_64 Linux, No wallet | ||
- stage: test | ||
env: >- | ||
HOST=x86_64-unknown-linux-gnu | ||
PACKAGES="python3" | ||
DEP_OPTS="NO_WALLET=1" | ||
RUN_TESTS=true | ||
GOAL="install" | ||
BITCOIN_CONFIG="--enable-glibc-back-compat --enable-reduce-exports" | ||
# Cross-Mac | ||
- stage: test | ||
env: >- | ||
HOST=x86_64-apple-darwin14 | ||
PACKAGES="cmake imagemagick libcap-dev librsvg2-bin libz-dev libbz2-dev libtiff-tools python-dev python3-setuptools-git" | ||
OSX_SDK=10.11 | ||
GOAL="all deploy" | ||
BITCOIN_CONFIG="--enable-gui --enable-reduce-exports --enable-werror" | ||
- stage: lint | ||
env: | ||
cache: false | ||
language: python | ||
python: '3.6' | ||
install: | ||
- travis_retry pip install flake8==3.5.0 | ||
before_script: | ||
- git fetch --unshallow | ||
script: | ||
- if [ "$TRAVIS_EVENT_TYPE" = "pull_request" ]; then test/lint/commit-script-check.sh $TRAVIS_COMMIT_RANGE; fi | ||
- test/lint/git-subtree-check.sh src/crypto/ctaes | ||
- test/lint/git-subtree-check.sh src/secp256k1 | ||
- test/lint/git-subtree-check.sh src/univalue | ||
- test/lint/git-subtree-check.sh src/leveldb | ||
- test/lint/check-doc.py | ||
- test/lint/check-rpc-mappings.py . | ||
- test/lint/lint-all.sh | ||
- if [ "$TRAVIS_REPO_SLUG" = "bitcoin/bitcoin" -a "$TRAVIS_EVENT_TYPE" = "cron" ]; then | ||
while read LINE; do travis_retry gpg --keyserver hkp://subset.pool.sks-keyservers.net --recv-keys $LINE; done < contrib/verify-commits/trusted-keys && | ||
travis_wait 50 contrib/verify-commits/verify-commits.py; | ||
fi |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
[main] | ||
host = https://www.transifex.com | ||
|
||
[bitcoin.qt-translation-017x] | ||
file_filter = src/qt/locale/bitcoin_<lang>.ts | ||
source_file = src/qt/locale/bitcoin_en.ts | ||
source_lang = en |
Oops, something went wrong.