Merge pull request #218 from syscoin/dev-3.x

Release 3.0.5.0

Former-commit-id: f89e43d

configure.ac

@@ -2,8 +2,8 @@ dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
 AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 3)
 define(_CLIENT_VERSION_MINOR, 0)
-define(_CLIENT_VERSION_REVISION, 4)
-define(_CLIENT_VERSION_BUILD, 1)
+define(_CLIENT_VERSION_REVISION, 5)
+define(_CLIENT_VERSION_BUILD, 0)
 define(_CLIENT_VERSION_IS_RELEASE, true)
 define(_DASH_VERSION_MAJOR, 0)
 define(_DASH_VERSION_MINOR, 12)

doc/masternode-budget.md

@@ -148,7 +148,7 @@ The following RPC commands are supported:
   - projection         - Show the projection of which proposals will be paid the next cycle
   - vote               - Vote on a proposal by single masternode (using syscoin.conf setup)
   - vote-many          - Vote on a proposal by all masternodes (using masternode.conf setup)
-  - vote-alias         - Vote on a proposal by alias
+  - vote-name         - Vote on a proposal by name
  - mnfinalbudget "command"... ( "passphrase" )
   - vote-many   - Vote on a finalized budget
   - vote        - Vote on a finalized budget

doc/masternode_conf.md

@@ -6,7 +6,7 @@ Syscoin Core allows controlling multiple remote masternodes from a single wallet
  * Mac OS: ~/Library/Application Support/SyscoinCore/
  * Unix/Linux: ~/.syscoincore/
 
-`masternode.conf` is a space separated text file. Each line consists of an alias, IP address followed by port, masternode private key, collateral output transaction id and collateral output index.
+`masternode.conf` is a space separated text file. Each line consists of a name, IP address followed by port, masternode private key, collateral output transaction id and collateral output index.
 
 Example:
 ```
@@ -22,7 +22,7 @@ _Note: IPs like 127.0.0.* are not allowed actually, we are using them here for e
 
 The following RPC commands are available (type `help masternode` in Console for more info):
 * list-conf
-* start-alias \<alias\>
+* initialize \<name\>
 * start-all
 * start-missing
 * start-disabled

src/Makefile.am

@@ -86,6 +86,12 @@ SYSCOIN_CORE_H = \
   escrow.h \
   feedback.h \
   auxpow.h \
+  thread_pool.hpp \
+  thread_pool/fixed_function.hpp \
+  thread_pool/mpmc_bounded_queue.hpp \
+  thread_pool/thread_pool.hpp \
+  thread_pool/thread_pool_options.hpp \
+  thread_pool/worker.hpp \
   addrdb.h \
   activemasternode.h \
   addressindex.h \

src/Makefile.test.include

@@ -83,7 +83,6 @@ SYSCOIN_TESTS =\
   test/arith_uint256_tests.cpp \
   test/scriptnum10.h \
   test/addrman_tests.cpp \
-  test/alert_tests.cpp \
   test/amount_tests.cpp \
   test/allocator_tests.cpp \
   test/base32_tests.cpp \