diff --git a/android/gostcoin-qt-android.pro b/android/gostcoin-qt-android.pro
index 8151b06..39bb6e1 100644
--- a/android/gostcoin-qt-android.pro
+++ b/android/gostcoin-qt-android.pro
@@ -1,7 +1,7 @@
TEMPLATE = app
TARGET = gostcoin-qt
VERSION = 0.8.5.10
-INCLUDEPATH += ../src ../src/json ../src/qt ../i2psam
+INCLUDEPATH += ../src ../src/json ../src/qt ../src/i2psam
QT += core gui network androidextras
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
DEFINES += QT_GUI BOOST_THREAD_USE_LIB BOOST_SPIRIT_THREADSAFE BOOST_NO_CXX11_SCOPED_ENUMS
@@ -242,7 +242,7 @@ HEADERS += ../src/qt/bitcoingui.h \
../src/json/json_spirit_reader.h \
../src/json/json_spirit_error_position.h \
../src/json/json_spirit.h \
- ../i2psam/i2psam.h \
+ ../src/i2psam/i2psam.h \
../src/qt/clientmodel.h \
../src/qt/guiutil.h \
../src/qt/transactionrecord.h \
@@ -361,7 +361,7 @@ SOURCES += ../src/qt/gostcoin.cpp \
../src/txdb.cpp \
../src/qt/splashscreen.cpp \
../src/qt/showi2paddresses.cpp \
- ../i2psam/i2psam.cpp \
+ ../src/i2psam/i2psam.cpp \
../src/qt/setupdarknet.cpp
RESOURCES += ../src/qt/gostcoin.qrc
diff --git a/gostcoin-qt.pro b/gostcoin-qt.pro
index 05ab8ec..8f78feb 100644
--- a/gostcoin-qt.pro
+++ b/gostcoin-qt.pro
@@ -2,7 +2,7 @@ TEMPLATE = app
TARGET = gostcoin-qt
macx:TARGET = "GOSTcoin-Qt"
VERSION = 0.8.5.10
-INCLUDEPATH += src src/json src/qt i2psam
+INCLUDEPATH += src src/json src/qt src/i2psam
QT += core gui network
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
DEFINES += QT_GUI BOOST_THREAD_USE_LIB BOOST_SPIRIT_THREADSAFE BOOST_NO_CXX11_SCOPED_ENUMS
@@ -166,7 +166,7 @@ HEADERS += src/qt/bitcoingui.h \
src/json/json_spirit_reader.h \
src/json/json_spirit_error_position.h \
src/json/json_spirit.h \
- i2psam/i2psam.h \
+ src/i2psam/i2psam.h \
src/qt/clientmodel.h \
src/qt/guiutil.h \
src/qt/transactionrecord.h \
@@ -286,7 +286,7 @@ SOURCES += src/qt/gostcoin.cpp \
src/qt/splashscreen.cpp \
src/qt/showi2paddresses.cpp \
src/qt/setupdarknet.cpp \
- i2psam/i2psam.cpp
+ src/i2psam/i2psam.cpp
RESOURCES += src/qt/gostcoin.qrc
diff --git a/i2psam/i2psam.cpp b/src/i2psam/i2psam.cpp
similarity index 100%
rename from i2psam/i2psam.cpp
rename to src/i2psam/i2psam.cpp
diff --git a/i2psam/i2psam.h b/src/i2psam/i2psam.h
similarity index 100%
rename from i2psam/i2psam.h
rename to src/i2psam/i2psam.h
diff --git a/i2psam/makefile.linux-mingw b/src/i2psam/makefile.linux-mingw
similarity index 100%
rename from i2psam/makefile.linux-mingw
rename to src/i2psam/makefile.linux-mingw
diff --git a/i2psam/makefile.mingw b/src/i2psam/makefile.mingw
similarity index 100%
rename from i2psam/makefile.mingw
rename to src/i2psam/makefile.mingw
diff --git a/i2psam/makefile.unix b/src/i2psam/makefile.unix
similarity index 100%
rename from i2psam/makefile.unix
rename to src/i2psam/makefile.unix
diff --git a/src/makefile.linux-mingw b/src/makefile.linux-mingw
deleted file mode 100644
index 387ab62..0000000
--- a/src/makefile.linux-mingw
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright (c) 2009-2010 Satoshi Nakamoto
-# Distributed under the MIT/X11 software license, see the accompanying
-# file COPYING or http://www.opensource.org/licenses/mit-license.php.
-
-DEPSDIR:=/usr/i686-w64-mingw32
-
-CC := i686-w64-mingw32-gcc
-CXX := i686-w64-mingw32-g++
-
-USE_UPNP:=0
-USE_IPV6:=1
-
-INCLUDEPATHS= \
- -I"$(CURDIR)" \
- -I"$(CURDIR)"/obj \
- -I"$(DEPSDIR)/include" \
- -I"$(DEPSDIR)" \
- -I"../i2psam"
-
-LIBPATHS= \
- -L"$(DEPSDIR)/lib" \
- -L"../i2psam"
-
-LIBS= \
- $(CURDIR)/leveldb/libleveldb.a $(CURDIR)/leveldb/libmemenv.a \
- -l boost_system-mt-s \
- -l boost_filesystem-mt-s \
- -l boost_program_options-mt-s \
- -l boost_thread_win32-mt-s \
- -l boost_chrono-mt-s \
- -l db_cxx \
- -l ssl \
- -l crypto \
- -l i2psam
-
-DEFS=-D_MT -DWIN32 -D_WINDOWS -DBOOST_THREAD_USE_LIB -DBOOST_SPIRIT_THREADSAFE
-DEBUGFLAGS=-g
-xCXXFLAGS=-O2 -w -Wall -Wextra -Wformat -Wformat-security -Wno-unused-parameter $(DEBUGFLAGS) $(DEFS) $(INCLUDEPATHS) $(CXXFLAGS)
-# enable: ASLR, DEP and large address aware
-xLDFLAGS=-Wl,--dynamicbase -Wl,--nxcompat -Wl,--large-address-aware -static-libgcc -static-libstdc++ $(LDFLAGS)
-
-TESTDEFS = -DTEST_DATA_DIR=$(abspath test/data)
-
-ifndef USE_UPNP
- override USE_UPNP = -
-endif
-ifneq (${USE_UPNP}, -)
- LIBPATHS += -L"$(DEPSDIR)/miniupnpc"
- LIBS += -l miniupnpc -l iphlpapi
- DEFS += -DSTATICLIB -DUSE_UPNP=$(USE_UPNP)
-endif
-
-ifneq (${USE_IPV6}, -)
- DEFS += -DUSE_IPV6=$(USE_IPV6)
-endif
-
-LIBS += -l mingwthrd -l kernel32 -l user32 -l gdi32 -l comdlg32 -l winspool -l winmm -l shell32 -l comctl32 -l ole32 -l oleaut32 -l uuid -l rpcrt4 -l advapi32 -l ws2_32 -l mswsock -l shlwapi
-
-# I2P Support
-DEFS += -DUSE_NATIVE_I2P -I"../i2psam"
-LIBS += -L"../i2psam"
-
-# TODO: make the mingw builds smarter about dependencies, like the linux/osx builds are
-HEADERS = $(wildcard *.h)
-
-OBJS= \
- leveldb/libleveldb.a \
- obj/alert.o \
- obj/version.o \
- obj/checkpoints.o \
- obj/netbase.o \
- obj/addrman.o \
- obj/crypter.o \
- obj/key.o \
- obj/db.o \
- obj/init.o \
- obj/keystore.o \
- obj/irc.o \
- obj/i2p.o \
- obj/main.o \
- obj/net.o \
- obj/protocol.o \
- obj/bitcoinrpc.o \
- obj/rpcdump.o \
- obj/rpcnet.o \
- obj/rpcmining.o \
- obj/rpcwallet.o \
- obj/rpcblockchain.o \
- obj/rpcrawtransaction.o \
- obj/script.o \
- obj/scrypt.o \
- obj/sync.o \
- obj/util.o \
- obj/wallet.o \
- obj/walletdb.o \
- obj/noui.o \
- obj/hash.o \
- obj/bloom.o \
- obj/leveldb.o \
- obj/txdb.o
-
-ifdef USE_SSE2
-DEFS += -DUSE_SSE2
-OBJS_SSE2= obj/scrypt-sse2.o
-OBJS += $(OBJS_SSE2)
-endif
-
-all: anoncoind.exe
-
-DEFS += -I"$(CURDIR)/leveldb/include"
-DEFS += -I"$(CURDIR)/leveldb/helpers"
-leveldb/libleveldb.a:
- @echo "Building LevelDB ..." && cd leveldb && TARGET_OS=OS_WINDOWS_CROSSCOMPILE $(MAKE) CC=$(CC) CXX=$(CXX) OPT="$(xCXXFLAGS)" libleveldb.a libmemenv.a && i686-w64-mingw32-ranlib libleveldb.a && i686-w64-mingw32-ranlib libmemenv.a && cd ..
-
-obj/build.h: FORCE
- /bin/sh ../share/genbuild.sh obj/build.h
-version.cpp: obj/build.h
-DEFS += -DHAVE_BUILD_INFO
-
-obj/%-sse2.o: %-sse2.cpp
- $(CXX) -c $(xCXXFLAGS) -msse2 -mstackrealign -o $@ $<
-
-obj/%.o: %.cpp $(HEADERS)
- $(CXX) -c $(xCXXFLAGS) -o $@ $<
-
-anoncoind.exe: $(OBJS:obj/%=obj/%)
- $(CXX) $(xCXXFLAGS) $(xLDFLAGS) -o $@ $(LIBPATHS) $^ $(LIBS)
-
-TESTOBJS := $(patsubst test/%.cpp,obj-test/%.o,$(wildcard test/*.cpp))
-
-obj-test/%.o: test/%.cpp $(HEADERS)
- $(CXX) -c $(TESTDEFS) $(xCXXFLAGS) -o $@ $<
-
-test_anoncoin.exe: $(TESTOBJS) $(filter-out obj/init.o,$(OBJS:obj/%=obj/%))
- $(CXX) $(xCXXFLAGS) $(xLDFLAGS) -o $@ $(LIBPATHS) $^ -lboost_unit_test_framework-mt-s $(LIBS)
-
-
-clean:
- -rm -f obj/*.o
- -rm -f anoncoind.exe
- -rm -f obj-test/*.o
- -rm -f test_anoncoin.exe
- -rm -f obj/build.h
- cd leveldb && TARGET_OS=OS_WINDOWS_CROSSCOMPILE $(MAKE) clean && cd ..
-
-FORCE:
diff --git a/src/makefile.mingw b/src/makefile.mingw
index 46765ce..331e223 100644
--- a/src/makefile.mingw
+++ b/src/makefile.mingw
@@ -17,7 +17,7 @@
CXX ?= g++
-USE_IPV6:=0
+USE_IPV6:=1
USE_DEBUG:=0
DEPSDIR?=/usr/local
@@ -27,25 +27,25 @@ BOOST_SUFFIX?=-mt
INCLUDEPATHS= \
-I"$(CURDIR)" \
-I"$(DEPSDIR)/include" \
- -I"../i2psam"
+ -I"i2psam"
LIBPATHS= \
-L"$(CURDIR)/leveldb" \
-L"$(DEPSDIR)/lib" \
- -L"../i2psam"
+ -L"i2psam"
LIBS= \
- -l leveldb \
- -l memenv \
- -l boost_system$(BOOST_SUFFIX) \
- -l boost_filesystem$(BOOST_SUFFIX) \
- -l boost_program_options$(BOOST_SUFFIX) \
- -l boost_thread$(BOOST_SUFFIX) \
- -l boost_chrono$(BOOST_SUFFIX) \
- -l db_cxx \
- -l ssl \
- -l crypto \
- -l i2psam
+ -lleveldb \
+ -lmemenv \
+ -lboost_system$(BOOST_SUFFIX) \
+ -lboost_filesystem$(BOOST_SUFFIX) \
+ -lboost_program_options$(BOOST_SUFFIX) \
+ -lboost_thread$(BOOST_SUFFIX) \
+ -lboost_chrono$(BOOST_SUFFIX) \
+ -ldb_cxx \
+ -lssl \
+ -lcrypto \
+ -li2psam
DEFS=-D_MT -DWIN32 -D_WINDOWS -DWIN32_LEAN_AND_MEAN -DBOOST_THREAD_USE_LIB -DBOOST_SPIRIT_THREADSAFE
@@ -63,13 +63,13 @@ ifneq (${USE_IPV6}, -)
DEFS += -DUSE_IPV6=$(USE_IPV6)
endif
-LIBS += -l stdc++ -l mingwthrd -l kernel32 -l user32 -l gdi32 -l comdlg32 -l winspool -l winmm -l shell32 -l comctl32 -l ole32 -l oleaut32 -l uuid -l rpcrt4 -l advapi32 -l ws2_32 -l mswsock -l shlwapi -l pthread
+LIBS += -lstdc++ -lmingwthrd -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lws2_32 -lmswsock -lshlwapi -lpthread
# TODO: make the mingw builds smarter about dependencies, like the linux/osx builds are
HEADERS = $(wildcard *.h)
OBJS= \
- ../i2psam/libi2psam.a \
+ i2psam/libi2psam.a \
leveldb/libleveldb.a \
obj/alert.o \
obj/version.o \
@@ -128,8 +128,8 @@ leveldb/libleveldb.a:
# I2P Support
DEFS += -DUSE_NATIVE_I2P
-../i2psam/libi2psam.a:
- cd ../i2psam && $(MAKE) -f makefile.mingw && cd ../src
+i2psam/libi2psam.a:
+ cd i2psam && $(MAKE) -f makefile.mingw && cd ..
obj/build.h: FORCE
/bin/sh ../share/genbuild.sh obj/build.h
@@ -162,6 +162,6 @@ clean:
rm -f obj/*
rm -f obj-test/*
cd leveldb && $(MAKE) TARGET_OS=NATIVE_WINDOWS clean && cd ..
- cd ../i2psam && $(MAKE) -f makefile.mingw clean && cd ../src
+ cd i2psam && $(MAKE) -f makefile.mingw clean && cd ../src
FORCE:
diff --git a/src/makefile.osx b/src/makefile.osx
index f61fda2..a67cec2 100644
--- a/src/makefile.osx
+++ b/src/makefile.osx
@@ -14,12 +14,12 @@ INCLUDEPATHS= \
-I"$(CURDIR)"/obj \
-I"$(DEPSDIR)/include" \
-I"$(DEPSDIR)/include/db48" \
- -I"../i2psam"
+ -I"i2psam"
LIBPATHS= \
-L"$(DEPSDIR)/lib" \
-L"$(DEPSDIR)/lib/db48" \
- -L"../i2psam"
+ -L"i2psam"
USE_UPNP:=1
USE_IPV6:=1
@@ -55,7 +55,7 @@ LIBS += \
-lssl \
-lcrypto \
-lz \
- -l i2psam
+ -li2psam
TESTDEFS += -DBOOST_TEST_DYN_LINK
endif
@@ -70,16 +70,12 @@ else
DEBUGFLAGS = -g
endif
-
-# I2P Support
-DEFS += -DUSE_NATIVE_I2P -I"../i2psam"
-LIBS += -L"../i2psam"
-
# ppc doesn't work because we don't support big-endian
CFLAGS += -Wall -Wextra -Wformat -Wformat-security -Wno-unused-parameter \
$(DEBUGFLAGS) $(DEFS) $(INCLUDEPATHS)
OBJS= \
+ i2psam/libi2psam.a \
leveldb/libleveldb.a \
obj/alert.o \
obj/version.o \
@@ -115,12 +111,6 @@ OBJS= \
obj/leveldb.o \
obj/txdb.o
-ifdef USE_SSE2
-DEFS += -DUSE_SSE2
-OBJS_SSE2= obj/scrypt-sse2.o
-OBJS += $(OBJS_SSE2)
-endif
-
ifndef USE_UPNP
override USE_UPNP = -
endif
@@ -137,10 +127,10 @@ ifneq (${USE_IPV6}, -)
DEFS += -DUSE_IPV6=$(USE_IPV6)
endif
-all: anoncoind
+all: gostcoind
-test check: test_anoncoin FORCE
- ./test_anoncoin
+test check: test_gostcoin FORCE
+ ./test_gostcoin
#
# LevelDB support
@@ -151,6 +141,13 @@ DEFS += $(addprefix -I,$(CURDIR)/leveldb/helpers)
leveldb/libleveldb.a:
@echo "Building LevelDB ..." && cd leveldb && $(MAKE) CC=$(CC) CXX=$(CXX) OPT="$(CFLAGS)" libleveldb.a libmemenv.a && cd ..
+# I2P Support
+LIBS += -L"i2psam"
+DEFS += -DUSE_NATIVE_I2P -I"i2psam"
+
+i2psam/libi2psam.a:
+ @echo "Building libi2psam ..." && cd i2psam && $(MAKE) -f makefile.unix && cd ..
+
# auto-generated dependencies:
-include obj/*.P
-include obj-test/*.P
@@ -174,7 +171,7 @@ obj/%.o: %.cpp
-e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \
rm -f $(@:%.o=%.d)
-anoncoind: $(OBJS:obj/%=obj/%)
+gostcoind: $(OBJS:obj/%=obj/%)
$(CXX) $(CFLAGS) -o $@ $(LIBPATHS) $^ $(LIBS)
TESTOBJS := $(patsubst test/%.cpp,obj-test/%.o,$(wildcard test/*.cpp))
@@ -186,16 +183,17 @@ obj-test/%.o: test/%.cpp
-e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \
rm -f $(@:%.o=%.d)
-test_anoncoin: $(TESTOBJS) $(filter-out obj/init.o,$(OBJS:obj/%=obj/%))
+test_gostcoin: $(TESTOBJS) $(filter-out obj/init.o,$(OBJS:obj/%=obj/%))
$(CXX) $(CFLAGS) -o $@ $(LIBPATHS) $^ $(LIBS) $(TESTLIBS)
clean:
- -rm -f anoncoind test_anoncoin
+ -rm -f gostcoind test_gostcoin
-rm -f obj/*.o
-rm -f obj-test/*.o
-rm -f obj/*.P
-rm -f obj-test/*.P
-rm -f obj/build.h
+ -cd i2psam && $(MAKE) -f makefile.unix clean || true
-cd leveldb && $(MAKE) clean || true
FORCE:
diff --git a/src/makefile.unix b/src/makefile.unix
index 919665c..da5aec7 100644
--- a/src/makefile.unix
+++ b/src/makefile.unix
@@ -29,61 +29,61 @@ endif
# for boost 1.37, add -mt to the boost libraries
LIBS += \
- -Wl,-B$(LMODE) \
- -l boost_system$(BOOST_LIB_SUFFIX) \
- -l boost_filesystem$(BOOST_LIB_SUFFIX) \
- -l boost_program_options$(BOOST_LIB_SUFFIX) \
- -l boost_thread$(BOOST_LIB_SUFFIX) \
- -l db_cxx$(BDB_LIB_SUFFIX) \
- -l ssl \
- -l crypto
+ -Wl,-B$(LMODE) \
+ -lboost_system$(BOOST_LIB_SUFFIX) \
+ -lboost_filesystem$(BOOST_LIB_SUFFIX) \
+ -lboost_program_options$(BOOST_LIB_SUFFIX) \
+ -lboost_thread$(BOOST_LIB_SUFFIX) \
+ -ldb_cxx$(BDB_LIB_SUFFIX) \
+ -lssl \
+ -lcrypto
TESTLIBS += \
- -Wl,-B$(LMODE) \
- -l boost_unit_test_framework$(BOOST_LIB_SUFFIX)
+ -Wl,-B$(LMODE) \
+ -lboost_unit_test_framework$(BOOST_LIB_SUFFIX)
ifneq (${USE_IPV6}, -)
- DEFS += -DUSE_IPV6=$(USE_IPV6)
+ DEFS += -DUSE_IPV6=$(USE_IPV6)
endif
LIBS += \
- -Wl,-B$(LMODE2) \
- -l z \
- -l dl \
- -l pthread \
- -l i2psam
+ -Wl,-B$(LMODE2) \
+ -lz \
+ -ldl \
+ -lpthread \
+ -li2psam
# Hardening
# Make some classes of vulnerabilities unexploitable in case one is discovered.
#
- # This is a workaround for Ubuntu bug #691722, the default -fstack-protector causes
- # -fstack-protector-all to be ignored unless -fno-stack-protector is used first.
- # see: https://bugs.launchpad.net/ubuntu/+source/gcc-4.5/+bug/691722
- HARDENING=-fno-stack-protector
-
- # Stack Canaries
- # Put numbers at the beginning of each stack frame and check that they are the same.
- # If a stack buffer if overflowed, it writes over the canary number and then on return
- # when that number is checked, it won't be the same and the program will exit with
- # a "Stack smashing detected" error instead of being exploited.
- HARDENING+=-fstack-protector-all -Wstack-protector
-
- # Make some important things such as the global offset table read only as soon as
- # the dynamic linker is finished building it. This will prevent overwriting of addresses
- # which would later be jumped to.
- LDHARDENING+=-Wl,-z,relro -Wl,-z,now
-
- # Build position independent code to take advantage of Address Space Layout Randomization
- # offered by some kernels.
- # see doc/build-unix.txt for more information.
- ifdef PIE
- HARDENING+=-fPIE
- LDHARDENING+=-pie
- endif
-
- # -D_FORTIFY_SOURCE=2 does some checking for potentially exploitable code patterns in
- # the source such overflowing a statically defined buffer.
- HARDENING+=-D_FORTIFY_SOURCE=2
+ # This is a workaround for Ubuntu bug #691722, the default -fstack-protector causes
+ # -fstack-protector-all to be ignored unless -fno-stack-protector is used first.
+ # see: https://bugs.launchpad.net/ubuntu/+source/gcc-4.5/+bug/691722
+ HARDENING=-fno-stack-protector
+
+ # Stack Canaries
+ # Put numbers at the beginning of each stack frame and check that they are the same.
+ # If a stack buffer if overflowed, it writes over the canary number and then on return
+ # when that number is checked, it won't be the same and the program will exit with
+ # a "Stack smashing detected" error instead of being exploited.
+ HARDENING+=-fstack-protector-all -Wstack-protector
+
+ # Make some important things such as the global offset table read only as soon as
+ # the dynamic linker is finished building it. This will prevent overwriting of addresses
+ # which would later be jumped to.
+ LDHARDENING+=-Wl,-z,relro -Wl,-z,now
+
+ # Build position independent code to take advantage of Address Space Layout Randomization
+ # offered by some kernels.
+ # see doc/build-unix.txt for more information.
+ ifdef PIE
+ HARDENING+=-fPIE
+ LDHARDENING+=-pie
+ endif
+
+ # -D_FORTIFY_SOURCE=2 does some checking for potentially exploitable code patterns in
+ # the source such overflowing a statically defined buffer.
+ HARDENING+=-D_FORTIFY_SOURCE=2
#
ifneq (${USE_DEBUG}, 0)
@@ -93,54 +93,47 @@ endif
# CXXFLAGS can be specified on the make command line, so we use xCXXFLAGS that only
# adds some defaults in front. Unfortunately, CXXFLAGS=... $(CXXFLAGS) does not work.
xCXXFLAGS = -std=c++11 -O2 -pthread -Wall -Wextra -Wformat -Wformat-security -Wno-unused-parameter \
- $(DEBUGFLAGS) $(DEFS) $(HARDENING) $(CXXFLAGS)
+ $(DEBUGFLAGS) $(DEFS) $(HARDENING) $(CXXFLAGS)
# LDFLAGS can be specified on the make command line, so we use xLDFLAGS that only
# adds some defaults in front. Unfortunately, LDFLAGS=... $(LDFLAGS) does not work.
xLDFLAGS=$(LDHARDENING) $(LDFLAGS)
OBJS = \
- ../i2psam/libi2psam.a \
- leveldb/libleveldb.a \
- obj/alert.o \
- obj/version.o \
- obj/checkpoints.o \
- obj/netbase.o \
- obj/addrman.o \
- obj/crypter.o \
- obj/key.o \
- obj/db.o \
- obj/init.o \
- obj/keystore.o \
- obj/i2p.o \
- obj/Gost.o \
- obj/main.o \
- obj/net.o \
- obj/protocol.o \
- obj/bitcoinrpc.o \
- obj/rpcdump.o \
- obj/rpcnet.o \
- obj/rpcmining.o \
- obj/rpcwallet.o \
- obj/rpcblockchain.o \
- obj/rpcrawtransaction.o \
- obj/script.o \
- obj/sync.o \
- obj/util.o \
- obj/wallet.o \
- obj/walletdb.o \
- obj/hash.o \
- obj/bloom.o \
- obj/noui.o \
- obj/leveldb.o \
- obj/txdb.o
-
-
-ifdef USE_SSE2
-DEFS += -DUSE_SSE2
-OBJS_SSE2= obj/scrypt-sse2.o
-OBJS += $(OBJS_SSE2)
-endif
+ i2psam/libi2psam.a \
+ leveldb/libleveldb.a \
+ obj/alert.o \
+ obj/version.o \
+ obj/checkpoints.o \
+ obj/netbase.o \
+ obj/addrman.o \
+ obj/crypter.o \
+ obj/key.o \
+ obj/db.o \
+ obj/init.o \
+ obj/keystore.o \
+ obj/i2p.o \
+ obj/Gost.o \
+ obj/main.o \
+ obj/net.o \
+ obj/protocol.o \
+ obj/bitcoinrpc.o \
+ obj/rpcdump.o \
+ obj/rpcnet.o \
+ obj/rpcmining.o \
+ obj/rpcwallet.o \
+ obj/rpcblockchain.o \
+ obj/rpcrawtransaction.o \
+ obj/script.o \
+ obj/sync.o \
+ obj/util.o \
+ obj/wallet.o \
+ obj/walletdb.o \
+ obj/hash.o \
+ obj/bloom.o \
+ obj/noui.o \
+ obj/leveldb.o \
+ obj/txdb.o
all: gostcoind
@@ -154,14 +147,16 @@ MAKEOVERRIDES =
LIBS += $(CURDIR)/leveldb/libleveldb.a $(CURDIR)/leveldb/libmemenv.a
DEFS += $(addprefix -I,$(CURDIR)/leveldb/include)
DEFS += $(addprefix -I,$(CURDIR)/leveldb/helpers)
+
leveldb/libleveldb.a:
@echo "Building LevelDB ..." && cd leveldb && $(MAKE) CC=$(CC) CXX=$(CXX) OPT="$(xCXXFLAGS)" libleveldb.a libmemenv.a && cd ..
# I2P Support
-LIBS += -L"../i2psam"
-DEFS += -DUSE_NATIVE_I2P -I"../i2psam"
-../i2psam/libi2psam.a:
- @echo "Building libi2psam ..." && cd ../i2psam && $(MAKE) -f makefile.unix && cd ../src
+LIBS += -L"i2psam"
+DEFS += -DUSE_NATIVE_I2P -I"i2psam"
+
+i2psam/libi2psam.a:
+ @echo "Building libi2psam ..." && cd i2psam && $(MAKE) -f makefile.unix && cd ..
# auto-generated dependencies:
-include obj/*.P
@@ -169,22 +164,24 @@ DEFS += -DUSE_NATIVE_I2P -I"../i2psam"
obj/build.h: FORCE
/bin/sh ../share/genbuild.sh obj/build.h
+
version.cpp: obj/build.h
+
DEFS += -DHAVE_BUILD_INFO
obj/%-sse2.o: %-sse2.cpp
$(CXX) -c $(xCXXFLAGS) -msse2 -MMD -MF $(@:%.o=%.d) -o $@ $<
@cp $(@:%.o=%.d) $(@:%.o=%.P); \
- sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
- -e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \
- rm -f $(@:%.o=%.d)
+ sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
+ -e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \
+ rm -f $(@:%.o=%.d)
obj/%.o: %.cpp
$(CXX) -c $(xCXXFLAGS) -MMD -MF $(@:%.o=%.d) -o $@ $<
@cp $(@:%.o=%.d) $(@:%.o=%.P); \
- sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
- -e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \
- rm -f $(@:%.o=%.d)
+ sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
+ -e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \
+ rm -f $(@:%.o=%.d)
gostcoind: $(OBJS:obj/%=obj/%)
$(LINK) $(xCXXFLAGS) -o $@ $^ $(xLDFLAGS) $(LIBS)
@@ -194,9 +191,9 @@ TESTOBJS := $(patsubst test/%.cpp,obj-test/%.o,$(wildcard test/*.cpp))
obj-test/%.o: test/%.cpp
$(CXX) -c $(TESTDEFS) $(xCXXFLAGS) -MMD -MF $(@:%.o=%.d) -o $@ $<
@cp $(@:%.o=%.d) $(@:%.o=%.P); \
- sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
- -e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \
- rm -f $(@:%.o=%.d)
+ sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
+ -e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \
+ rm -f $(@:%.o=%.d)
test_gostcoin: $(TESTOBJS) $(filter-out obj/init.o,$(OBJS:obj/%=obj/%))
$(LINK) $(xCXXFLAGS) -o $@ $(LIBPATHS) $^ $(TESTLIBS) $(xLDFLAGS) $(LIBS)
@@ -208,7 +205,7 @@ clean:
-rm -f obj/*.P
-rm -f obj-test/*.P
-rm -f obj/build.h
- -cd ../i2psam && $(MAKE) -f makefile.unix clean || true
+ -cd i2psam && $(MAKE) -f makefile.unix clean || true
-cd leveldb && $(MAKE) clean || true
FORCE:
diff --git a/src/qt/gostcoin.cpp b/src/qt/gostcoin.cpp
index cca891e..0427a2a 100644
--- a/src/qt/gostcoin.cpp
+++ b/src/qt/gostcoin.cpp
@@ -2,6 +2,7 @@
* W.J. van der Laan 2011-2012
*/
// Copyright 2013 The Anoncoin Developers
+// Copyright 2017 The Gostcoin Developers
//
// I2P-patch
// Copyright (c) 2012-2013 giv
@@ -160,7 +161,7 @@ static std::string Translate(const char* psz)
static void handleRunawayException(std::exception *e)
{
PrintExceptionContinue(e, "Runaway exception");
- QMessageBox::critical(0, "Runaway exception", BitcoinGUI::tr("A fatal error occurred. Anoncoin can no longer continue safely and will quit.") + QString("\n\n") + QString::fromStdString(strMiscWarning));
+ QMessageBox::critical(0, "Runaway exception", BitcoinGUI::tr("A fatal error occurred. Gostcoin can no longer continue safely and will quit.") + QString("\n\n") + QString::fromStdString(strMiscWarning));
exit(1);
}
diff --git a/src/qt/locale/bitcoin_en.ts b/src/qt/locale/bitcoin_en.ts
index 47f4dda..7aedc59 100644
--- a/src/qt/locale/bitcoin_en.ts
+++ b/src/qt/locale/bitcoin_en.ts
@@ -5,13 +5,13 @@
AboutDialog
-
- About Anoncoin
+
+ About Gostcoin
-
- <b>Anoncoin</b> version
+
+ <b>Gostcoin</b> version
@@ -35,8 +35,8 @@ This product includes software developed by the OpenSSL Project for use in the O
-
- The Anoncoin developers
+
+ The Gostcoin developers
@@ -68,8 +68,8 @@ This product includes software developed by the OpenSSL Project for use in the O
-
- These are your Anoncoin addresses for receiving payments. You may want to give a different one to each sender so you can keep track of who is paying you.
+
+ These are your Gostcoin addresses for receiving payments. You may want to give a different one to each sender so you can keep track of who is paying you.
@@ -83,8 +83,8 @@ This product includes software developed by the OpenSSL Project for use in the O
-
- Sign a message to prove you own a Anoncoin address
+
+ Sign a message to prove you own a Gostcoin address
@@ -108,8 +108,8 @@ This product includes software developed by the OpenSSL Project for use in the O
-
- Verify a message to ensure it was signed with a specified Anoncoin address
+
+ Verify a message to ensure it was signed with a specified Gostcoin address
@@ -123,8 +123,8 @@ This product includes software developed by the OpenSSL Project for use in the O
-
- These are your Anoncoin addresses for sending payments. Always check the amount and the receiving address before sending coins.
+
+ These are your Gostcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.
@@ -276,8 +276,8 @@ This product includes software developed by the OpenSSL Project for use in the O
-
- Anoncoin will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your anoncoins from being stolen by malware infecting your computer.
+
+ Gostcoin will close now to finish the encryption process. Remember that encrypting your wallet cannot fully protect your anoncoins from being stolen by malware infecting your computer.
@@ -375,8 +375,8 @@ This product includes software developed by the OpenSSL Project for use in the O
-
- Show information about Anoncoin
+
+ Show information about Gostcoin
@@ -420,13 +420,13 @@ This product includes software developed by the OpenSSL Project for use in the O
-
- Send coins to a Anoncoin address
+
+ Send coins to a Gostcoin address
-
- Modify configuration options for Anoncoin
+
+ Modify configuration options for Gostcoin
@@ -456,8 +456,8 @@ This product includes software developed by the OpenSSL Project for use in the O
-
- Anoncoin
+
+ Gostcoin
@@ -481,8 +481,8 @@ This product includes software developed by the OpenSSL Project for use in the O
-
- &About Anoncoin
+
+ &About Gostcoin
@@ -501,13 +501,13 @@ This product includes software developed by the OpenSSL Project for use in the O
-
- Sign messages with your Anoncoin addresses to prove you own them
+
+ Sign messages with your Gostcoin addresses to prove you own them
-
- Verify messages to ensure they were signed with specified Anoncoin addresses
+
+ Verify messages to ensure they were signed with specified Gostcoin addresses
@@ -537,15 +537,15 @@ This product includes software developed by the OpenSSL Project for use in the O
-
- Anoncoin client
+
+ Gostcoin client
-
+
- %n active connection to Anoncoin network
- %n active connections to Anoncoin network
+ %n active connection to Gostcoin network
+ %n active connections to Gostcoin network
@@ -669,8 +669,8 @@ Address: %4
-
- URI can not be parsed! This can be caused by an invalid Anoncoin address or malformed URI parameters.
+
+ URI can not be parsed! This can be caused by an invalid Gostcoin address or malformed URI parameters.
@@ -684,8 +684,8 @@ Address: %4
-
- A fatal error occurred. Anoncoin can no longer continue safely and will quit.
+
+ A fatal error occurred. Gostcoin can no longer continue safely and will quit.
@@ -750,8 +750,8 @@ Address: %4
-
- The entered address "%1" is not a valid Anoncoin address.
+
+ The entered address "%1" is not a valid Gostcoin address.
@@ -769,8 +769,8 @@ Address: %4
-
- Anoncoin-Qt
+
+ Gostcoin-Qt
@@ -832,13 +832,13 @@ Address: %4
-
- Automatically start Anoncoin after logging in to the system.
+
+ Automatically start Gostcoin after logging in to the system.
-
- &Start Anoncoin on system login
+
+ &Start Gostcoin on system login
@@ -857,8 +857,8 @@ Address: %4
-
- Automatically open the Anoncoin client port on the router. This only works when your router supports UPnP and it is enabled.
+
+ Automatically open the Gostcoin client port on the router. This only works when your router supports UPnP and it is enabled.
@@ -867,8 +867,8 @@ Address: %4
-
- Connect to the Anoncoin network through a SOCKS proxy (e.g. when connecting through Tor).
+
+ Connect to the Gostcoin network through a SOCKS proxy (e.g. when connecting through Tor).
@@ -952,8 +952,8 @@ Address: %4
-
- The user interface language can be set here. This setting will take effect after restarting Anoncoin.
+
+ The user interface language can be set here. This setting will take effect after restarting Gostcoin.
@@ -967,8 +967,8 @@ Address: %4
-
- Whether to show Anoncoin addresses in the transaction list or not.
+
+ Whether to show Gostcoin addresses in the transaction list or not.
@@ -1019,8 +1019,8 @@ Address: %4
-
- This setting will take effect after restarting Anoncoin.
+
+ This setting will take effect after restarting Gostcoin.
@@ -1038,8 +1038,8 @@ Address: %4
-
- The displayed information may be out of date. Your wallet automatically synchronizes with the Anoncoin network after a connection is established, but this process has not completed yet.
+
+ The displayed information may be out of date. Your wallet automatically synchronizes with the Gostcoin network after a connection is established, but this process has not completed yet.
@@ -1242,8 +1242,8 @@ Address: %4
-
- Show the Anoncoin-Qt help message to get a list with possible Anoncoin command-line options.
+
+ Show the Gostcoin-Qt help message to get a list with possible Gostcoin command-line options.
@@ -1262,13 +1262,13 @@ Address: %4
-
- Anoncoin - Debug window
+
+ Gostcoin - Debug window
-
- Anoncoin Core
+
+ Gostcoin Core
@@ -1277,8 +1277,8 @@ Address: %4
-
- Open the Anoncoin debug log file from the current data directory. This can take a few seconds for large log files.
+
+ Open the Gostcoin debug log file from the current data directory. This can take a few seconds for large log files.
@@ -1287,8 +1287,8 @@ Address: %4
-
- Welcome to the Anoncoin RPC console.
+
+ Welcome to the Gostcoin RPC console.
@@ -1471,8 +1471,8 @@ Address: %4
-
- Enter a Anoncoin address (e.g. Ler4HNAEfwYhBmGXcFP2Po1NpRUEiK8km2)
+
+ Enter a Gostcoin address (e.g. Ger4HNAEfwYhBmGXcFP2Po1NpRUEiK8km2)
@@ -1536,8 +1536,8 @@ Address: %4
-
- Sign the message to prove you own this Anoncoin address
+
+ Sign the message to prove you own this Gostcoin address
@@ -1567,13 +1567,13 @@ Address: %4
-
- The address the message was signed with (e.g. Ler4HNAEfwYhBmGXcFP2Po1NpRUEiK8km2)
+
+ The address the message was signed with (e.g. Ger4HNAEfwYhBmGXcFP2Po1NpRUEiK8km2)
-
- Verify the message to ensure it was signed with the specified Anoncoin address
+
+ Verify the message to ensure it was signed with the specified Gostcoin address
@@ -1588,8 +1588,8 @@ Address: %4
-
- Enter a Anoncoin address (e.g. Ler4HNAEfwYhBmGXcFP2Po1NpRUEiK8km2)
+
+ Enter a Gostcoin address (e.g. Ger4HNAEfwYhBmGXcFP2Po1NpRUEiK8km2)
@@ -1598,8 +1598,8 @@ Address: %4
-
- Enter Anoncoin signature
+
+ Enter Gostcoin signature
@@ -1672,8 +1672,8 @@ Address: %4
SplashScreen
-
- The Anoncoin developers
+
+ The Gostcoin developers
@@ -2225,8 +2225,8 @@ Address: %4
bitcoin-core
-
- Anoncoin version
+
+ Gostcoin version
@@ -2344,7 +2344,7 @@ rpcpassword=%s
The username and password MUST NOT be the same.
If the file does not exist, create it with owner-readable-only file permissions.
It is also recommended to set alertnotify so you are notified of problems;
-for example: alertnotify=echo %%s | mail -s "Anoncoin Alert" admin@foo.com
+for example: alertnotify=echo %%s | mail -s "Gostcoin Alert" admin@foo.com
%s, you must set a rpcpassword in the configuration file:
%s
@@ -2355,7 +2355,7 @@ rpcpassword=%s
The username and password MUST NOT be the same.
If the file does not exist, create it with owner-readable-only file permissions.
It is also recommended to set alertnotify so you are notified of problems;
-for example: alertnotify=echo %%s | mail -s "Anoncoin Alert" admin@foo.com
+for example: alertnotify=echo %%s | mail -s "Gostcoin Alert" admin@foo.com
@@ -2370,8 +2370,8 @@ for example: alertnotify=echo %%s | mail -s "Anoncoin Alert" admin@foo
-
- Cannot obtain a lock on data directory %s. Anoncoin is probably already running.
+
+ Cannot obtain a lock on data directory %s. Gostcoin is probably already running.
@@ -2415,8 +2415,8 @@ for example: alertnotify=echo %%s | mail -s "Anoncoin Alert" admin@foo
-
- Warning: Please check that your computer's date and time are correct! If your clock is wrong Anoncoin will not work properly.
+
+ Warning: Please check that your computer's date and time are correct! If your clock is wrong Gostcoin will not work properly.
@@ -2665,8 +2665,8 @@ for example: alertnotify=echo %%s | mail -s "Anoncoin Alert" admin@foo
-
- SSL options: (see the Anoncoin Wiki for SSL setup instructions)
+
+ SSL options: (see the Gostcoin Wiki for SSL setup instructions)
@@ -2855,13 +2855,13 @@ for example: alertnotify=echo %%s | mail -s "Anoncoin Alert" admin@foo
-
- Error loading wallet.dat: Wallet requires newer version of Anoncoin
+
+ Error loading wallet.dat: Wallet requires newer version of Gostcoin
-
- Wallet needed to be rewritten: restart Anoncoin to complete
+
+ Wallet needed to be rewritten: restart Gostcoin to complete
@@ -2920,8 +2920,8 @@ for example: alertnotify=echo %%s | mail -s "Anoncoin Alert" admin@foo
-
- Unable to bind to %s on this computer. Anoncoin is probably already running.
+
+ Unable to bind to %s on this computer. Gostcoin is probably already running.
diff --git a/src/qt/locale/bitcoin_ru.ts b/src/qt/locale/bitcoin_ru.ts
index 2e61506..3cb63dd 100644
--- a/src/qt/locale/bitcoin_ru.ts
+++ b/src/qt/locale/bitcoin_ru.ts
@@ -33,8 +33,8 @@ This product includes software developed by the OpenSSL Project for use in the O
-
- Разработчики Anoncoin
+
+ Разработчики Gostcoin
diff --git a/src/qt/qrcodedialog.cpp b/src/qt/qrcodedialog.cpp
index d086eea..d18e051 100644
--- a/src/qt/qrcodedialog.cpp
+++ b/src/qt/qrcodedialog.cpp
@@ -85,7 +85,7 @@ void QRCodeDialog::genCode()
QString QRCodeDialog::getURI()
{
- QString ret = QString("anoncoin:%1").arg(address);
+ QString ret = QString("gostcoin:%1").arg(address);
int paramCount = 0;
ui->outUri->clear();
diff --git a/src/qt/transactiontablemodel.cpp b/src/qt/transactiontablemodel.cpp
index baf1e16..ce76f37 100644
--- a/src/qt/transactiontablemodel.cpp
+++ b/src/qt/transactiontablemodel.cpp
@@ -443,7 +443,7 @@ QVariant TransactionTableModel::txStatusDecoration(const TransactionRecord *wtx)
{
case TransactionStatus::Immature: {
int total = wtx->status.depth + wtx->status.matures_in;
- int part = (wtx->status.depth * 4 / total) + 1;
+ int part = (wtx->status.depth * 5 / total) + 1;
return QIcon(QString(":/icons/transaction_%1").arg(part));
}
case TransactionStatus::Mature: