Skip to content

Commit

Permalink
Big Update
Browse files Browse the repository at this point in the history
  • Loading branch information
ElpidioMC committed Jan 13, 2020
1 parent a6596d1 commit 5fc0e39
Show file tree
Hide file tree
Showing 345 changed files with 49,881 additions and 53,538 deletions.
79 changes: 37 additions & 42 deletions Arepacoin-qt.pro → ArepaCoin-qt.pro
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
TEMPLATE = app
TARGET = Arepacoin-qt
VERSION = 1.0.1.8
TARGET = ArepaCoin-qt
VERSION = 1.2.0.0
INCLUDEPATH += src src/json src/qt
QT += network
DEFINES += QT_GUI BOOST_THREAD_USE_LIB BOOST_SPIRIT_THREADSAFE
DEFINES += ENABLE_WALLET
DEFINES += BOOST_THREAD_USE_LIB BOOST_SPIRIT_THREADSAFE
CONFIG += no_include_pwd
CONFIG += thread

Expand All @@ -12,8 +13,6 @@ greaterThan(QT_MAJOR_VERSION, 4) {
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
}

QMAKE_LFLAGS += -no-pie

# for boost 1.37, add -mt to the boost libraries
# use: qmake BOOST_LIB_SUFFIX=-mt
# for boost thread win32 with _win32 sufix
Expand All @@ -30,8 +29,8 @@ UI_DIR = build

# use: qmake "RELEASE=1"
contains(RELEASE, 1) {
# Mac: compile for maximum compatibility (10.13, 64-bit)
macx:QMAKE_CXXFLAGS += -mmacosx-version-min=10.13 -arch x86_64 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk
# Mac: compile for maximum compatibility (10.5, 32-bit)
macx:QMAKE_CXXFLAGS += -mmacosx-version-min=10.5 -arch x86_64 -isysroot /Developer/SDKs/MacOSX10.5.sdk

!windows:!macx {
# Linux: static link
Expand All @@ -48,7 +47,7 @@ QMAKE_LFLAGS *= -fstack-protector-all --param ssp-buffer-size=1
}
# for extra security on Windows: enable ASLR and DEP via GCC linker flags
win32:QMAKE_LFLAGS *= -Wl,--dynamicbase -Wl,--nxcompat
win32:QMAKE_LFLAGS += -static -static-libgcc -static-libstdc++ -lpthread
win32:QMAKE_LFLAGS += -static-libgcc -static-libstdc++

# use: qmake "USE_QRCODE=1"
# libqrencode (http://fukuchi.org/works/qrencode/index.en.html) must be installed for support
Expand All @@ -69,7 +68,7 @@ contains(USE_UPNP, -) {
count(USE_UPNP, 0) {
USE_UPNP=1
}
DEFINES += USE_UPNP=$$USE_UPNP STATICLIB
DEFINES += USE_UPNP=$$USE_UPNP MINIUPNP_STATICLIB STATICLIB
INCLUDEPATH += $$MINIUPNPC_INCLUDE_PATH
LIBS += $$join(MINIUPNPC_LIB_PATH,,-L,) -lminiupnpc
win32:LIBS += -liphlpapi
Expand Down Expand Up @@ -136,7 +135,7 @@ contains(USE_O3, 1) {
QMAKE_CFLAGS += -msse2
}

QMAKE_CXXFLAGS_WARN_ON = -fdiagnostics-show-option -Wall -Wextra -Wno-ignored-qualifiers -Wformat -Wformat-security -Wno-unused-parameter -Wstack-protector -Wno-reorder
QMAKE_CXXFLAGS_WARN_ON = -fdiagnostics-show-option -Wall -Wextra -Wno-ignored-qualifiers -Wformat -Wformat-security -Wno-unused-parameter -Wstack-protector

# Input
DEPENDPATH += src src/json src/qt
Expand All @@ -156,34 +155,27 @@ HEADERS += src/qt/bitcoingui.h \
src/addrman.h \
src/base58.h \
src/bignum.h \
src/chainparams.h \
src/chainparamsseeds.h \
src/checkpoints.h \
src/compat.h \
src/coincontrol.h \
src/sync.h \
src/util.h \
src/hash.h \
src/uint256.h \
src/kernel.h \
src/scrypt.h \
src/pbkdf2.h \
src/zerocoin/Accumulator.h \
src/zerocoin/AccumulatorProofOfKnowledge.h \
src/zerocoin/Coin.h \
src/zerocoin/CoinSpend.h \
src/zerocoin/Commitment.h \
src/zerocoin/ParamGeneration.h \
src/zerocoin/Params.h \
src/zerocoin/SerialNumberSignatureOfKnowledge.h \
src/zerocoin/SpendMetaData.h \
src/zerocoin/ZeroTest.h \
src/zerocoin/Zerocoin.h \
src/serialize.h \
src/strlcpy.h \
src/core.h \
src/main.h \
src/miner.h \
src/net.h \
src/key.h \
src/db.h \
src/txdb.h \
src/txmempool.h \
src/walletdb.h \
src/script.h \
src/init.h \
Expand Down Expand Up @@ -212,7 +204,10 @@ HEADERS += src/qt/bitcoingui.h \
src/qt/transactionfilterproxy.h \
src/qt/transactionview.h \
src/qt/walletmodel.h \
src/bitcoinrpc.h \
src/rpcclient.h \
src/rpcprotocol.h \
src/rpcserver.h \
src/timedata.h \
src/qt/overviewpage.h \
src/qt/csvmodelwriter.h \
src/crypter.h \
Expand All @@ -230,7 +225,8 @@ HEADERS += src/qt/bitcoingui.h \
src/version.h \
src/netbase.h \
src/clientversion.h \
src/threadsafety.h
src/threadsafety.h \
src/tinyformat.h

SOURCES += src/qt/bitcoin.cpp src/qt/bitcoingui.cpp \
src/qt/transactiontablemodel.cpp \
Expand All @@ -245,12 +241,16 @@ SOURCES += src/qt/bitcoin.cpp src/qt/bitcoingui.cpp \
src/qt/editaddressdialog.cpp \
src/qt/bitcoinaddressvalidator.cpp \
src/alert.cpp \
src/chainparams.cpp \
src/version.cpp \
src/sync.cpp \
src/txmempool.cpp \
src/util.cpp \
src/hash.cpp \
src/netbase.cpp \
src/key.cpp \
src/script.cpp \
src/core.cpp \
src/main.cpp \
src/miner.cpp \
src/init.cpp \
Expand All @@ -274,13 +274,17 @@ SOURCES += src/qt/bitcoin.cpp src/qt/bitcoingui.cpp \
src/qt/transactionfilterproxy.cpp \
src/qt/transactionview.cpp \
src/qt/walletmodel.cpp \
src/bitcoinrpc.cpp \
src/rpcclient.cpp \
src/rpcprotocol.cpp \
src/rpcserver.cpp \
src/rpcdump.cpp \
src/rpcmisc.cpp \
src/rpcnet.cpp \
src/rpcmining.cpp \
src/rpcwallet.cpp \
src/rpcblockchain.cpp \
src/rpcrawtransaction.cpp \
src/timedata.cpp \
src/qt/overviewpage.cpp \
src/qt/csvmodelwriter.cpp \
src/crypter.cpp \
Expand All @@ -299,17 +303,7 @@ SOURCES += src/qt/bitcoin.cpp src/qt/bitcoingui.cpp \
src/scrypt-x86.S \
src/scrypt-x86_64.S \
src/scrypt.cpp \
src/pbkdf2.cpp \
src/zerocoin/Accumulator.cpp \
src/zerocoin/AccumulatorProofOfKnowledge.cpp \
src/zerocoin/Coin.cpp \
src/zerocoin/CoinSpend.cpp \
src/zerocoin/Commitment.cpp \
src/zerocoin/ParamGeneration.cpp \
src/zerocoin/Params.cpp \
src/zerocoin/SerialNumberSignatureOfKnowledge.cpp \
src/zerocoin/SpendMetaData.cpp \
src/zerocoin/ZeroTest.cpp
src/pbkdf2.cpp

RESOURCES += \
src/qt/bitcoin.qrc
Expand Down Expand Up @@ -360,11 +354,12 @@ OTHER_FILES += \
# platform specific defaults, if not overridden on command line
isEmpty(BOOST_LIB_SUFFIX) {
macx:BOOST_LIB_SUFFIX = -mt
windows:BOOST_LIB_SUFFIX = -mgw44-mt-s-1_57
windows:BOOST_LIB_SUFFIX = -mt
}

isEmpty(BOOST_THREAD_LIB_SUFFIX) {
BOOST_THREAD_LIB_SUFFIX = $$BOOST_LIB_SUFFIX
win32:BOOST_THREAD_LIB_SUFFIX = _win32$$BOOST_LIB_SUFFIX
else:BOOST_THREAD_LIB_SUFFIX = $$BOOST_LIB_SUFFIX
}

isEmpty(BDB_LIB_PATH) {
Expand Down Expand Up @@ -401,12 +396,12 @@ windows:!contains(MINGW_THREAD_BUGFIX, 0) {
QMAKE_LIBS_QT_ENTRY = -lmingwthrd $$QMAKE_LIBS_QT_ENTRY
}

macx:HEADERS += src/qt/macdockiconhandler.h src/qt/macnotificationhandler.h
macx:OBJECTIVE_SOURCES += src/qt/macdockiconhandler.mm src/qt/macnotificationhandler.mm
macx:HEADERS += src/qt/macdockiconhandler.h
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/arepa.icns
macx:TARGET = "arepacoin-Qt"
macx:ICON = src/qt/res/icons/bitcoin.icns
macx:TARGET = "ArepaCoin-Qt"
macx:QMAKE_CFLAGS_THREAD += -pthread
macx:QMAKE_LFLAGS_THREAD += -pthread
macx:QMAKE_CXXFLAGS_THREAD += -pthread
Expand Down
4 changes: 2 additions & 2 deletions COPYING
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Copyright (c) 2014 arepacoin Developers
Copyright (c) 2014-2015 ArepaCoin Developers
Copyright (c) 2013-2014 NovaCoin Developers
Copyright (c) 2011-2012 PPCoin Developers
Copyright (c) 2009-2014 Bitcoin Developers
Copyright (c) 2009-2015 Bitcoin Developers

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
8 changes: 4 additions & 4 deletions INSTALL
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Building arepacoin
Building ArepaCoin

See doc/readme-qt.rst for instructions on building arepacoin QT,
See doc/readme-qt.rst for instructions on building ArepaCoin QT,
the intended-for-end-users, nice-graphical-interface, reference
implementation of arepacoin.
implementation of ArepaCoin.

See doc/build-*.txt for instructions on building arepacoind,
the intended-for-services, no-graphical-interface, reference
implementation of arepacoin.
implementation of ArepaCoin.
2 changes: 1 addition & 1 deletion contrib/debian/bin/arepacoin-qt → contrib/debian/bin/blackcoin-qt
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ cfgfile="$basedir/arepacoin.conf"

[ -e "$basedir" ] || mkdir "$basedir"

# Novacoin does not clean up DB log files by default
# Blackcoin does not clean up DB log files by default
[ -e "$dbfile" ] || echo 'set_flags DB_LOG_AUTOREMOVE' > "$dbfile"

exec /usr/lib/arepacoin/arepacoin-qt "$@"
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@
Encoding=UTF-8
Name=ArepaCoin
Comment=ArepaCoin P2P Cryptocurrency
Comment[fr]=ArepaCoin, monnaie virtuelle cryptographique pair à pair
Comment[tr]=ArepaCoin, eşten eşe kriptografik sanal para birimi
Exec=/usr/bin/arepacoin-qt
Terminal=false
Type=Application
Icon=/usr/share/pixmaps/bitcoin80.xpm
MimeType=x-scheme-handler/arepacoin;
Categories=Office;
Name[es]=arepacoin-qt.desktop
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
7 changes: 3 additions & 4 deletions contrib/debian/changelog
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
arepacoin (0.4.0~dfsg-1) unstable; urgency=low
arepacoin (1.1.2.1) unstable; urgency=low

[ Balthazar ]
* Initial release.
* Update debian package scripts for use by arepacoin.

-- Balthazar <balthazar@yandex.ru> Mon, 15 Apr 2013 22:15:22 +0100
-- Xerxes Rånby <xerxes@gudinna.com> Mon, 22 December 2014 17:58:43 +0100
8 changes: 4 additions & 4 deletions contrib/debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ Build-Depends: debhelper,
libqt4-dev,
libqrencode-dev
Standards-Version: 3.9.2
Homepage: http://www.arepacoin.su/
Vcs-Git: git://github.com/CryptoManiac/arepacoin.git
Vcs-Browser: http://github.com/CryptoManiac/arepacoin
Homepage: http://www.arepacoin.co/
Vcs-Git: git://github.com/CoinBlack/arepacoin.git
Vcs-Browser: http://github.com/CoinBlack/arepacoin

Package: arepacoind
Architecture: any
Expand Down Expand Up @@ -56,4 +56,4 @@ Description: peer-to-peer network based digital currency - Qt GUI
Full transaction history is stored locally at each client. This
requires 2+ GB of space, slowly growing.
.
This package provides Novacoin-Qt, a GUI for Novacoin based on Qt.
This package provides Blackcoin-Qt, a GUI for Blackcoin based on Qt.
2 changes: 1 addition & 1 deletion contrib/debian/copyright
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ License: GPL-3+
Comment: Icon Pack: Kids
Site: http://findicons.com/icon/17102/reload?id=17102

Files: src/qt/res/images/splash2.png
Files: src/qt/res/images/splash2.jpg
License: PUB-DOM
Copyright: Crobbo (forum)
Comment: Site: https://bitcointalk.org/index.php?topic=32273.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
#proxy=127.0.0.1:9050

# Use as many addnode= settings as you like to connect to specific peers
#addnode=188.120.246.137:34957
#addnode=188.120.246.137:15714

# ... or use as many connect= settings as you like to connect ONLY
# to specific peers:
#connect=188.120.246.137:34957
#connect=188.120.246.137:15714

# Do not use Internet Relay Chat (irc.lfnet.org #arepacoin channel) to
# find other peers.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.TH AREPACOIN.CONF "8" "April 2013" "arepacoin.conf 3.19"
.TH BLACKCOIN.CONF "8" "Juli 2014" "arepacoin.conf 3.19"
.SH NAME
arepacoin.conf \- arepacoin configuration file
.SH SYNOPSIS
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.TH AREPACOIND "7" "April 2013" "arepacoind 3.19"
.TH BLACKCOIND "7" "July 2014" "arepacoind 3.19"
.SH NAME
arepacoind \- peer-to-peer network based digital currency
.SH SYNOPSIS
Expand Down
Empty file modified contrib/debian/rules
100644 → 100755
Empty file.
2 changes: 1 addition & 1 deletion contrib/debian/watch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Run the "uscan" command to check for upstream updates and more.
version=4
opts=uversionmangle=s/(\d)(alpha|beta|rc)/$1~$2/,dversionmangle=s/~dfsg\d*// \
http://githubredir.debian.net/github/CryptoManiac/arepacoin v(.*).tar.gz
http://githubredir.debian.net/github/CoinBlack/arepacoin v(.*).tar.gz
6 changes: 3 additions & 3 deletions contrib/gitian-descriptors/README
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Sanity checks:

Once you've got the right hardware and software:

git clone git://github.com/bitcoin/bitcoin.git
git clone git://github.com/CoinBlack/arepacoin.git
git clone git://github.com/devrandom/gitian-builder.git
mkdir gitian-builder/inputs
wget 'http://miniupnp.tuxfamily.org/files/download.php?file=miniupnpc-1.6.tar.gz' -O gitian-builder/inputs/miniupnpc-1.6.tar.gz
Expand All @@ -24,8 +24,8 @@ Once you've got the right hardware and software:
cd ..

# To build
cd bitcoin
cd arepacoin
git pull
cd ../gitian-builder
git pull
./bin/gbuild --commit bitcoin=HEAD ../bitcoin/contrib/gitian.yml
./bin/gbuild --commit bitcoin=HEAD ../arepacoin/contrib/gitian-descriptors/gitian.yml
2 changes: 1 addition & 1 deletion contrib/gitian-descriptors/deps-win32.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ script: |
make $MAKEOPTS
cd ..
#
zip -r $OUTDIR/ppcoin-deps-0.0.1.zip \
zip -r $OUTDIR/arepacoin-deps-0.0.1.zip \
$(ls qrencode-*/{qrencode.h,.libs/libqrencode.{,l}a} | sort) \
$(ls db-*/build_unix/{libdb_cxx.a,db.h,db_cxx.h,libdb.a,.libs/libdb_cxx-?.?.a} | sort) \
$(find openssl-* -name '*.a' -o -name '*.h' | sort) \
Expand Down
Loading

0 comments on commit 5fc0e39

Please sign in to comment.