Skip to content

Commit

Permalink
v1.2.0.0 Exploit Fix
Browse files Browse the repository at this point in the history
  • Loading branch information
MotoAcidic authored Jan 27, 2019
1 parent 0d7f879 commit e0d0858
Show file tree
Hide file tree
Showing 352 changed files with 21,760 additions and 12,084 deletions.
2 changes: 1 addition & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# Auto detect text files and perform LF normalization
* text=auto
* text=auto
101 changes: 40 additions & 61 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ reset-files.bash
*.tar.gz

*.exe
src/adultchain
src/adultchaind
src/adultchain-cli
src/adultchain-tx
src/test/test_adultchain
src/qt/test/test_adultchain-qt
src/poseidon
src/poseidond
src/poseidon-cli
src/poseidon-tx
src/test/test_poseidon
src/qt/test/test_poseidon-qt

# autoreconf
Makefile.in
Expand All @@ -37,8 +37,8 @@ confdefs.h
conftest.cpp
conftest.err
libtool
src/config/adultchain-config.h
src/config/adultchain-config.h.in
src/config/poseidon-config.h
src/config/poseidon-config.h.in
src/config/stamp-h1
share/setup.nsi
share/qt/Info.plist
Expand All @@ -63,7 +63,7 @@ src/qt/test/moc*.cpp
*.pyc
*.o
*.o-*
.adultchain
.poseidon
*.a
*.pb.cc
*.pb.h
Expand All @@ -82,12 +82,12 @@ src/qt/test/moc*.cpp
# Compilation and Qt preprocessor part
*.qm
Makefile
adultchain-qt
adultchain-Qt.app
poseidon-qt
poseidon-Qt.app

# Unit-tests
Makefile.test
adultchain-qt_test
poseidon-qt_test
src/test/buildenv.py

# Resources cpp
Expand All @@ -103,7 +103,7 @@ build
#lcov
*.gcno
/*.info
test_adultchain.coverage/
test_poseidon.coverage/
total.coverage/
coverage_percent.txt

Expand All @@ -128,54 +128,33 @@ CMakeLists.txt
cmake-build-debug
config.log
config.status
/.vs/ccbc/v15/Browse.VC.db
/.vs/ccbc/v15/Browse.VC.opendb
/.vs/ProjectSettings.json
/.vs/slnx.sqlite
/.vs/ccbc/v15/.suo
/.vs/VSWorkspaceState.json
.vs/ccbc/v15/ipch/AutoPCH/265c25126fc6063c/GUIUTIL.ipch
.vs/ccbc/v15/ipch/AutoPCH/3fc496d53ea39c11/BLOCKEXPLORER.ipch
.vs/ccbc/v15/ipch/AutoPCH/5296bec56a7191ec/MASTERNODEMAN.ipch
.vs/ccbc/v15/ipch/AutoPCH/6883191c1916ca26/AMOUNT.ipch
.vs/ccbc/v15/ipch/AutoPCH/8d46eca7c6902300/INIT.ipch
.vs/CCBC/v15/.suo
.vs/CCBC/v15/Browse.VC.db
.vs/CCBC/v15/Browse.VC.opendb
.vs/CCBC/v15/ipch/AutoPCH/9a0c471bdb4f68f4/BITCOINGUI.ipch
.vs/CCBC/v15/ipch/AutoPCH/1d92aff8c171a719/PARAMGENERATION.ipch
.vs/CCBC/v15/ipch/AutoPCH/41c8d4b10f5772ab/PARAMGEN.ipch
.vs/slnx.sqlite-journal
.vs/CCBC/v15/ipch/AutoPCH/7a053cc9182e9c0c/GUIUTIL.ipch
.vs/CCBC/v15/ipch/AutoPCH/7b7311dfb0c553fa/TRANSACTIONRECORD.ipch
.vs/CCBC/v15/ipch/AutoPCH/d6fbcfae9fa9feb4/PAYMENTSERVER.ipch
.vs/CCBC/v15/ipch/AutoPCH/aee126f7c87e321c/MASTERNODEMAN.ipch
.vs/CCBC/v15/ipch/AutoPCH/40dadb20cea31fa0/BITCOINCONSENSUS.ipch
.vs/CCBC/v15/ipch/AutoPCH/713ff23d09b32455/RPCDUMP.ipch
.vs/CCBC/v15/ipch/AutoPCH/78d5b3ed1536249e/BITCOINGUI.ipch
.vs/ccbc/v15/.suo
.vs/ccbc/v15/Browse.VC.db
.vs/ccbc/v15/Browse.VC.opendb
.vs/ccbc/v15/ipch/AutoPCH/6128fda3004a16a7/HISTOGRAM.ipch
.vs/ccbc/v15/ipch/AutoPCH/867168a137692ac6/MASTERNODEMAN.ipch
.vs/ProjectSettings.json
.vs/slnx.sqlite
.vs/VSWorkspaceState.json
.vs/CCBC/v15/ipch/AutoPCH/39e800a96980bfb0/TRANSACTIONRECORD.ipch
.vs/CCBC/v15/ipch/AutoPCH/3e4badd4568fd837/NET.ipch
.vs/CCBC/v15/ipch/AutoPCH/47ea7bab20a03820/RPCCLIENT.ipch
.vs/CCBC/v15/ipch/AutoPCH/5acf5b26d7b06fe7/RPCCONSOLE.ipch
.vs/CCBC/v15/ipch/AutoPCH/5bd79ca3052e20c2/NETBASE.ipch
.vs/CCBC/v15/ipch/AutoPCH/9e59def887d3f8e9/NOTIFICATOR.ipch
.vs/CCBC/v15/ipch/AutoPCH/bac51a75c75f068e/RPCNET.ipch
.vs/CCBC/v15/ipch/AutoPCH/cd51b7a38a10eaac/TRAFFICGRAPHWIDGET.ipch
.vs/CCBC/v15/ipch/AutoPCH/cf13db34be1232da/INIT.ipch
.vs/CCBC/v15/ipch/AutoPCH/d04b48ec25101b9c/TRANSACTIONDESC.ipch
.vs/CCBC/v15/ipch/AutoPCH/da9e7932fe7625fd/SCHEDULER.ipch
.vs/CCBC/v15/ipch/AutoPCH/db308ae62eb1061d/WALLETMODELTRANSACTION.ipch
.vs/CCBC/v15/ipch/AutoPCH/dbdd799cdbf5c2b3/ABITCOINGUI.ipch
.vs/CCBC/v15/ipch/AutoPCH/e391866a0dc9dccb/BLOCKEXPLORER.ipch
.vs/CCBC/v15/ipch/AutoPCH/fb4db16ec65083b9/OVERVIEWPAGE.ipch
.vs/CCBC/v15/ipch/AutoPCH/ffe96ac68f786478/POW.ipch
.vs/config/applicationhost.config
.vs/CCBC/v15/ipch/AutoPCH/3e4badd4568fd837/NET.ipch
.vs/CCBC/v15/ipch/AutoPCH/afae31017abe89a9/CLIENTVERSION.ipch
.vs/CCBC/v15/ipch/AutoPCH/61ec4997d723899f/PRIVACYDIALOG.ipch
.vs/CCBC/v15/ipch/AutoPCH/ca6d783b7809f7b3/CLIENTVERSION.ipch
.vs/CCBC/v15/ipch/AutoPCH/f23d24a681de1e86/INFOPAGE.ipch
.vs/CCBC/v15/ipch/AutoPCH/ef6b69bb996d1ba4/INFORMATIONPAGE.ipch
.vs/CCBC/v15/ipch/AutoPCH/de790643649912e3/OVERVIEWPAGE.ipch
.vs/CCBC/v15/ipch/AutoPCH/d86baddcca175037/OVERVIEWPAGE.ipch
.vs/CCBC/v15/ipch/AutoPCH/d1ef3eb8a21365f3/BITCOINGUI.ipch
.vs/CCBC/v15/ipch/AutoPCH/cea00ee08fcf5234/BITCOINGUI.ipch
.vs/CCBC/v15/ipch/AutoPCH/ca08e325c2dfb89e/BITCOINGUI.ipch
.vs/CCBC/v15/ipch/AutoPCH/b8977c721c017288/BITCOINGUI.ipch
.vs/CCBC/v15/ipch/AutoPCH/8270e7731e7c780b/OVERVIEWPAGE.ipch
.vs/CCBC/v15/ipch/AutoPCH/68386e8ece743ee3/OVERVIEWPAGE.ipch
.vs/CCBC/v15/ipch/AutoPCH/17a9e86b3fc8b7b0/BITCOINGUI.ipch
.vs/CCBC/v15/ipch/AutoPCH/177e9d87b59f1805/PRIVACYDIALOG.ipch
.vs/CCBC/v15/ipch/AutoPCH/97cdf6ca85efe74/PROTOCOL.ipch
.vs/CCBC/v15/ipch/AutoPCH/f836824dc3c97f9a/CCBC-CLI.ipch
.vs/CCBC/v15/ipch/AutoPCH/9303b40c10f48ee/PROTOCOL.ipch
.vs/CCBC/v15/ipch/AutoPCH/8e27fc15d56f71b3/STATSPAGE.ipch
.vs/CCBC/v15/ipch/AutoPCH/8e27fc15d56f71b3/STATSPAGE.ipch
.vs/CCBC/v15/ipch/AutoPCH/825640fe6bc8e9a9/STATSPAGE.ipch
.vs/CCBC/v15/ipch/AutoPCH/afe6a5de1e24fc45/PRIVACYDIALOG.ipch
.vs/CCBC/v15/ipch/AutoPCH/78d5b3ed1536249e/BITCOINGUI.ipch
.vs/CCBC/v15/ipch/AutoPCH/7af4be6023f44dd6/MASTERNODEMAN.ipch
.vs/CCBC/v15/ipch/AutoPCH/77d567438d4ebca2/POW.ipch
.vs/CCBC/v15/ipch/AutoPCH/6a677560f076cf6a/ECCRYPTOVERIFY.ipch
.vs/CCBC/v15/ipch/AutoPCH/e042c7e57ec7e763/SPORKDB.ipch
8 changes: 8 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,14 @@ dist: trusty
os: linux
language: minimal
cache:

ccache: true

directories:
- depends/built
- depends/sdk-sources
- $HOME/.ccache

stages:
- lint
- test
Expand All @@ -18,10 +21,12 @@ env:
- RUN_FUNCTIONAL_TESTS=false # Not Yet Implemented
- 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

- 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
Expand All @@ -36,10 +41,12 @@ before_script:
- set -o errexit; source .travis/test_05_before_script.sh
script:
- set -o errexit; source .travis/test_06_script.sh

after_script:
- echo $TRAVIS_COMMIT_RANGE
- echo $TRAVIS_COMMIT_LOG


jobs:
include:
# lint stage
Expand Down Expand Up @@ -147,3 +154,4 @@ jobs:
RUN_FUNCTIONAL_TESTS=false
GOAL="all deploy"
BITCOIN_CONFIG="--enable-gui --enable-reduce-exports --enable-werror"
2 changes: 2 additions & 0 deletions .travis/lint_06_script.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@

export LC_ALL=C


chmod +x contrib/devtools/git-subtree-check.sh

contrib/devtools/git-subtree-check.sh src/secp256k1
contrib/devtools/git-subtree-check.sh src/univalue
contrib/devtools/git-subtree-check.sh src/leveldb
Expand Down
2 changes: 2 additions & 0 deletions .travis/test_05_before_script.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,10 @@

export LC_ALL=C.UTF-8


#DOCKER_EXEC echo \> \$HOME/.pivx # 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
Expand Down
4 changes: 4 additions & 0 deletions .travis/test_06_script.sh
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,10 @@ BEGIN_FOLD distdir
DOCKER_EXEC make distdir VERSION=$HOST
END_FOLD


cd "pivx-$HOST" || (echo "could not enter distdir pivx-$HOST"; exit 1)


BEGIN_FOLD configure
DOCKER_EXEC ./configure --cache-file=../config.cache $BITCOIN_CONFIG_ALL $BITCOIN_CONFIG || ( cat config.log && false)
END_FOLD
Expand All @@ -52,7 +54,9 @@ fi

if [ "$RUN_BENCH" = "true" ]; then
BEGIN_FOLD bench

DOCKER_EXEC LD_LIBRARY_PATH=$TRAVIS_BUILD_DIR/depends/$HOST/lib $OUTDIR/bin/bench_pivx -scaling=0.001

END_FOLD
fi

Expand Down
16 changes: 8 additions & 8 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Contributing to Ccbc Core
Contributing to CCBC Core
============================

The Ccbc Core project operates an open contributor model where anyone is
The CCBC Core project operates an open contributor model where anyone is
welcome to contribute towards development in the form of peer review, testing
and patches. This document explains the practical process and guidelines for
contributing.
Expand Down Expand Up @@ -157,10 +157,10 @@ where possible keep them short, un-complex and easy to verify.
"Decision Making" Process
-------------------------

The following applies to code changes to the Ccbc Core project, and is not to be
confused with overall Ccbc Network Protocol consensus changes.
The following applies to code changes to the CCBC Core project, and is not to be
confused with overall CCBC Network Protocol consensus changes.

Whether a pull request is merged into Ccbc Core rests with the project merge
Whether a pull request is merged into CCBC Core rests with the project merge
maintainers and ultimately the project lead.

Maintainers will take into consideration if a patch is in line with the general
Expand All @@ -174,7 +174,7 @@ In general, all pull requests must:
- be well peer reviewed;
- follow code style guidelines;

Patches that change Ccbc consensus rules are considerably more involved than
Patches that change CCBC consensus rules are considerably more involved than
normal because they affect the entire ecosystem and so must be preceded by
extensive discussions and clear detailing. While each case will be different,
one should be prepared to expend more time and effort than for other kinds of
Expand Down Expand Up @@ -214,7 +214,7 @@ higher in terms of discussion and peer review requirements, keeping in mind that
mistakes could be very costly to the wider community. This includes refactoring
of consensus critical code.

Where a patch set proposes to change the Ccbc consensus, it must have been
Where a patch set proposes to change the CCBC consensus, it must have been
discussed extensively on the forums and Slack, be accompanied by a widely
discussed Proposal and have a generally widely perceived technical consensus of being
a worthwhile change based on the judgement of the maintainers.
Expand Down Expand Up @@ -254,7 +254,7 @@ about:
Release Policy
--------------

The project leader is the release manager for each Ccbc Core release.
The project leader is the release manager for each CCBC Core release.

Copyright
---------
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ RUN deps="alpine-sdk curl autoconf automake libtool boost-dev openssl-dev libeve
make install && \
mkdir /wallet &&\
cd /wallet && \
git clone https://github.com/CryptoCashBack-Hub/CCBC.git . &&\
git clone https://github.com/Poseidon-CCBC/CCBC.git . &&\
./autogen.sh && \
./configure LDFLAGS=-L/opt/db/lib CPPFLAGS=-I/opt/db/include \
&& \
Expand Down
4 changes: 2 additions & 2 deletions INSTALL
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Building Ccbc
Building CCBC

Use the autogen script to prepare the build environment.

Expand All @@ -10,4 +10,4 @@ Always verify the signatures and checksums.

See doc/build-*.md for instructions on building ccbcd,
the intended-for-services, no-graphical-interface, reference
implementation of Ccbc.
implementation of CCBC.
21 changes: 0 additions & 21 deletions LICENSE

This file was deleted.

2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,11 @@

[![Build Status](https://travis-ci.org/SubiPlatform/subi.svg?branch=master)](https://travis-ci.org/CryptoCashBack-Hub/CCBC) <a href="https://discord.gg/7z4wmzp"><img src="https://discordapp.com/api/guilds/454464504290476033/embed.png" alt="Discord server" /><a href="https://twitter.com/CCBcoin"><img src="https://img.shields.io/twitter/follow/CCBcoin.svg?style=social&logo=twitter" alt="follow on Twitter"></a>


[Website](https://ccbcoin.club/)[Wallet](https://github.com/CryptoCashBack-Hub/CCBC/releases/)[Block Explorer](https://explorer.ccbcoin.club/)[Discord](https://discord.gg/7z4wmzp)[Forum](https://bitcointalk.org/index.php?topic=5089897.0)[Telegram](https://t.me/CCBCofficial)[Twitter](https://twitter.com/CCBcoin)



### CCBC is a fork of [PIVX](https://github.com/PIVX-Project/PIVX) that forked [Dash](https://github.com/dashpay/dash) that forked [Bitcoin](https://github.com/bitcoin/bitcoinp)


Expand Down
6 changes: 3 additions & 3 deletions configure.ac
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
AC_PREREQ([2.60])
define(_CLIENT_VERSION_MAJOR, 1)
define(_CLIENT_VERSION_MINOR, 1)
define(_CLIENT_VERSION_MINOR, 2)
define(_CLIENT_VERSION_REVISION, 0)
define(_CLIENT_VERSION_BUILD, 2)
define(_CLIENT_VERSION_BUILD, 0)

define(_CLIENT_VERSION_IS_RELEASE, true)
define(_COPYRIGHT_YEAR, 2018)
AC_INIT([Ccbc Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[www.ccbcoin.club],[ccbc])
AC_INIT([CCBC Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[www.ccbcoin.club],[ccbc])
AC_CONFIG_SRCDIR([src/main.cpp])
AC_CONFIG_HEADERS([src/config/ccbc-config.h])
AC_CONFIG_AUX_DIR([build-aux])
Expand Down
4 changes: 2 additions & 2 deletions contrib/bitrpc/bitrpc.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@


if rpcpass == "":
access = ServiceProxy("http://127.0.0.1:15520")
access = ServiceProxy("http://127.0.0.1:15510")
else:
access = ServiceProxy("http://"+rpcuser+":"+rpcpass+"@127.0.0.1:15520")
access = ServiceProxy("http://"+rpcuser+":"+rpcpass+"@127.0.0.1:15510")
cmd = sys.argv[1].lower()

if cmd == "backupwallet":
Expand Down
8 changes: 4 additions & 4 deletions contrib/debian/ccbc-qt.desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[Desktop Entry]
Encoding=UTF-8
Name=Ccbc
Comment=Ccbc P2P Cryptocurrency
Comment[fr]=Ccbc, monnaie virtuelle cryptographique pair à pair
Comment[tr]=Ccbc, eşten eşe kriptografik sanal para birimi
Name=CCBC
Comment=CCBC P2P Cryptocurrency
Comment[fr]=CCBC, monnaie virtuelle cryptographique pair à pair
Comment[tr]=CCBC, eşten eşe kriptografik sanal para birimi
Exec=ccbc-qt %u
Terminal=false
Type=Application
Expand Down
Loading

0 comments on commit e0d0858

Please sign in to comment.