Merge remote-tracking branch 'upstream/release_025'

.gitignore

@@ -24,3 +24,14 @@ autoscan.log
 /win/xdag/x64/
 /win/xdaglib/x64/
 /win/xdagwallet/x64/
+
+#configs
+/secp256k1/src/libsecp256k1-config.h
+
+# xdag
+xdag
+*.log
+/client/.cmd.history
+/client/dnet_key.dat
+/client/storage
+/client/wallet.dat

automake/Makefile.am

@@ -2,15 +2,19 @@
 # created by [email protected] on 2018-03-29
 # modify by [email protected] on 2018-05-23
 
-SRCROOT  = ..
-client   = $(SRCROOT)/client
-dnet	 = $(SRCROOT)/dnet
-dfstools = $(SRCROOT)/dus/programs/dfstools/source
-dfslib	 = $(dfstools)/dfslib
-dar		 = $(SRCROOT)/dus/programs/dar/source
-ldusinc	 = $(SRCROOT)/ldus/source/include/ldus
-utils    = $(SRCROOT)/client/utils
-jsonrpc  = $(SRCROOT)/client/json-rpc
+SRCROOT             = ..
+client              = $(SRCROOT)/client
+dnet	            = $(SRCROOT)/dnet
+dfstools            = $(SRCROOT)/dus/programs/dfstools/source
+dfslib	            = $(dfstools)/dfslib
+dar		            = $(SRCROOT)/dus/programs/dar/source
+ldusinc	            = $(SRCROOT)/ldus/source/include/ldus
+utils               = $(SRCROOT)/client/utils
+jsonrpc             = $(SRCROOT)/client/json-rpc
+http                = $(SRCROOT)/client/http
+moving_statistics   = $(SRCROOT)/client/utils/moving_statistics
+secp256k1           = $(SRCROOT)/secp256k1
+
 
 sources = \
 	$(client)/sha256-mb-x86_64$(HOST_SUFFIX).s      \
@@ -52,11 +56,16 @@ sources = \
 	$(utils)/log.c                                  \
 	$(utils)/utils.c                                \
 	$(utils)/linenoise.c                            \
+	$(moving_statistics)/moving_average.c           \
 	$(jsonrpc)/cJSON.c                              \
 	$(jsonrpc)/cJSON_Utils.c                        \
 	$(jsonrpc)/rpc_procedures.c                     \
+	$(jsonrpc)/rpc_procedure.c                      \
 	$(jsonrpc)/rpc_service.c                        \
-	$(jsonrpc)/rpc_wrapper.c
+	$(jsonrpc)/rpc_wrapper.c                        \
+	$(http)/url.c                                   \
+	$(http)/http.c                                  \
+	$(secp256k1)/src/secp256k1.c
 
 
 headers = \
@@ -102,11 +111,15 @@ headers = \
 	$(utils)/log.h                                  \
 	$(utils)/utils.h                                \
 	$(utils)/linenoise.h                            \
+	$(moving_statistics)/moving_average.h           \
 	$(jsonrpc)/cJSON.h                              \
 	$(jsonrpc)/cJSON_Utils.h                        \
 	$(jsonrpc)/rpc_procedures.h                     \
+	$(jsonrpc)/rpc_procedure.h                      \
 	$(jsonrpc)/rpc_service.h                        \
-	$(jsonrpc)/rpc_wrapper.h
+	$(jsonrpc)/rpc_wrapper.h                        \
+	$(http)/url.h                                   \
+	$(http)/http.h                                  
 
 #program
 bin_PROGRAMS = xdag
@@ -127,7 +140,12 @@ _INCLUDES =                                         \
 	-I$(dar)                                        \
 	-I$(ldusinc)                                    \
 	-I$(utils)                                      \
-	-I$(jsonrpc)
+	-I$(moving_statistics)                          \
+	-I$(jsonrpc)                                    \
+	-I$(http)                                       \
+	-I$(secp256k1)/src                              \
+	-I$(secp256k1)/                                 
+
 
 xdag_SOURCES = $(sources)
 #xdag_LDADD = -lpthread -lcrypto -lssl -lm

client/Makefile

@@ -1,25 +1,27 @@
 # cheatcoin: Makefile; T13.656-T13.844; $DVS:time$
 
-SRCROOT  = ..
-dnet	 = ../dnet
-dfstools = ../dus/programs/dfstools/source
-dfslib	 = $(dfstools)/dfslib
-dar		 = ../dus/programs/dar/source
-ldusinc	 = ../ldus/source/include/ldus
-utils    = ./utils
+SRCROOT  		= ..
+dnet	 		= ../dnet
+dfstools 		= ../dus/programs/dfstools/source
+dfslib			= $(dfstools)/dfslib
+dar		        = ../dus/programs/dar/source
+ldusinc	 		= ../ldus/source/include/ldus
+utils    		= ./utils
+moving_statistics 	= ./utils/moving_statistics
+secp256k1               = ../secp256k1
 OS	:= $(shell uname)
 
 ifeq ($(OS), Darwin)
-	asm_src = \
+	asm_src = 						\
 		sha256-mb-x86_64-mac.s		\
 		x86_64cpuid-mac.s
 else
-	asm_src = \
+	asm_src = 						\
 		sha256-mb-x86_64.s			\
 		x86_64cpuid.s
 endif
 
-sources = \
+sources = 							\
 	address.c						\
 	block.c							\
 	crypt.c							\
@@ -38,35 +40,38 @@ sources = \
 	wallet.c						\
 	commands.c						\
 	terminal.c						\
-	$(dnet)/dnet_crypt.c			\
-	$(dnet)/dnet_database.c			\
-	$(dnet)/dnet_main.c				\
-	$(dnet)/dnet_threads.c			\
-	$(dnet)/dnet_connection.c		\
-	$(dnet)/dnet_stream.c			\
-	$(dnet)/dnet_packet.c			\
-	$(dnet)/dnet_command.c			\
-	$(dnet)/dnet_log.c				\
-	$(dnet)/dnet_files.c			\
-	$(dnet)/dnet_tap.c				\
-	$(dfslib)/dfslib_crypt.c		\
-	$(dfslib)/dfslib_random.c		\
-	$(dfslib)/dfslib_string.c		\
-	$(dfstools)/lib/dfsrsa.c		\
-	$(dar)/lib/crc_c.c				\
-	$(utils)/utils.c				\
-	$(utils)/log.c					\
-	$(utils)/linenoise.c			\
-	./json-rpc/cJSON.c				\
-	./json-rpc/cJSON_Utils.c		\
-	./json-rpc/rpc_procedures.c		\
-	./json-rpc/rpc_service.c		\
-	./json-rpc/rpc_wrapper.c		\
-	./http/url.c					\
-	./http/http.c					\
+	network.c						\
+	$(dnet)/dnet_crypt.c					\
+	$(dnet)/dnet_database.c					\
+	$(dnet)/dnet_main.c						\
+	$(dnet)/dnet_threads.c					\
+	$(dnet)/dnet_connection.c				\
+	$(dnet)/dnet_stream.c					\
+	$(dnet)/dnet_packet.c					\
+	$(dnet)/dnet_command.c					\
+	$(dnet)/dnet_log.c						\
+	$(dnet)/dnet_files.c					\
+	$(dnet)/dnet_tap.c						\
+	$(dfslib)/dfslib_crypt.c				\
+	$(dfslib)/dfslib_random.c				\
+	$(dfslib)/dfslib_string.c				\
+	$(dfstools)/lib/dfsrsa.c				\
+	$(dar)/lib/crc_c.c						\
+	$(utils)/utils.c						\
+	$(utils)/log.c							\
+	$(utils)/linenoise.c					\
+	$(moving_statistics)/moving_average.c	\
+	./json-rpc/cJSON.c						\
+	./json-rpc/cJSON_Utils.c				\
+	./json-rpc/rpc_procedure.c				\
+	./json-rpc/rpc_procedures.c				\
+	./json-rpc/rpc_service.c				\
+	./json-rpc/rpc_wrapper.c				\
+	./http/url.c							\
+	./http/http.c							\
 
 
-headers = \
+headers = 							\
 	address.h						\
 	block.h							\
 	crypt.h							\
@@ -85,56 +90,62 @@ headers = \
 	wallet.h						\
 	commands.h						\
 	terminal.h						\
-	$(dnet)/dnet_crypt.h			\
-	$(dnet)/dnet_database.h			\
-	$(dnet)/dnet_history.h			\
-	$(dnet)/dnet_threads.h			\
-	$(dnet)/dnet_connection.h		\
-	$(dnet)/dnet_stream.h			\
-	$(dnet)/dnet_packet.h			\
-	$(dnet)/dnet_command.h			\
-	$(dnet)/dnet_log.h				\
-	$(dnet)/dnet_files.h			\
-	$(dnet)/dnet_tap.h				\
-	$(dnet)/dthread.h				\
-	$(dfslib)/dfslib_crypt.h		\
-	$(dfslib)/dfslib_random.h		\
-	$(dfslib)/dfslib_string.h		\
-	$(dfslib)/dfslib_types.h		\
-	$(dfstools)/include/dfsrsa.h	\
-	$(dar)/include/crc.h			\
-	$(ldusinc)/atomic.h				\
-	$(ldusinc)/list.h				\
-	$(ldusinc)/rbtree.h				\
-	$(utils)/utils.h				\
-	$(utils)/log.h					\
-	$(utils)/linenoise.h			\
-	./json-rpc/cJSON.h				\
-	./json-rpc/cJSON_Utils.h		\
-	./json-rpc/rpc_procedures.h		\
-	./json-rpc/rpc_service.h		\
-	./json-rpc/rpc_wrapper.h		\
-	./http/url.h					\
-	./http/http.h					\
+	types.h							\
+	network.h						\
+	$(dnet)/dnet_crypt.h					\
+	$(dnet)/dnet_database.h					\
+	$(dnet)/dnet_history.h					\
+	$(dnet)/dnet_threads.h					\
+	$(dnet)/dnet_connection.h				\
+	$(dnet)/dnet_stream.h					\
+	$(dnet)/dnet_packet.h					\
+	$(dnet)/dnet_command.h					\
+	$(dnet)/dnet_log.h						\
+	$(dnet)/dnet_files.h					\
+	$(dnet)/dnet_tap.h						\
+	$(dnet)/dthread.h						\
+	$(dfslib)/dfslib_crypt.h				\
+	$(dfslib)/dfslib_random.h				\
+	$(dfslib)/dfslib_string.h				\
+	$(dfslib)/dfslib_types.h				\
+	$(dfstools)/include/dfsrsa.h			\
+	$(dar)/include/crc.h					\
+	$(ldusinc)/atomic.h						\
+	$(ldusinc)/list.h						\
+	$(ldusinc)/rbtree.h						\
+	$(utils)/utils.h						\
+	$(utils)/log.h							\
+	$(utils)/linenoise.h					\
+	$(moving_statistics)/moving_average.h	\
+	./json-rpc/cJSON.h						\
+	./json-rpc/cJSON_Utils.h				\
+	./json-rpc/rpc_procedure.h				\
+	./json-rpc/rpc_procedures.h				\
+	./json-rpc/rpc_service.h				\
+	./json-rpc/rpc_wrapper.h				\
+	./http/url.h							\
+	./http/http.h							\
 
 
 
 ifeq ($(OS), Darwin)
-
 	flags = -std=gnu11 -O3 -DDFSTOOLS -DCHEATCOIN -DNDEBUG -g -lpthread -lcrypto -lssl -lm -Wall -Wmissing-prototypes -Wno-unused-result
 else
-	flags = -std=gnu11 -O3 -DDFSTOOLS -DCHEATCOIN -DNDEBUG -g -lpthread -lcrypto -lssl -lm -Wall -Wmissing-prototypes -Wno-unused-result -Wl,--export-dynamic
-
+	flags = -std=gnu11 -O3 -DDFSTOOLS -DCHEATCOIN -DNDEBUG -g -lpthread -lcrypto -lgmp -lssl -lm -Wall -Wmissing-prototypes -Wno-unused-result -Wl,--export-dynamic
 endif
 
 
-all: xdag
+all: secp256k1 xdag
 
 xdag: $(sources) $(headers) Makefile
-	gcc -o xdag $(sources) $(asm_src) -DSHA256_USE_OPENSSL_TXFM -DSHA256_OPENSSL_MBLOCK -I$(SRCROOT) -I$(utils) $(flags)
+	cc -o xdag secp256k1.o $(sources) $(asm_src) -DSHA256_USE_OPENSSL_TXFM -DSHA256_OPENSSL_MBLOCK -I$(SRCROOT) -I$(utils) -isystem$(secp256k1)/include/  $(flags)
+
+secp256k1:
+	cc -O3 -I$(secp256k1)/src/ -I$(secp256k1) -c $(secp256k1)/src/secp256k1.c -lgmp
 
 clean:
 	rm xdag
+	rm secp256k1.o
 
 install: xdag
 	sudo cp xdag /usr/local/bin/xdag