diff --git a/configure.ac b/configure.ac index c4ff20a48..4b36bcc27 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ([2.60]) define(_CLIENT_VERSION_MAJOR, 0) define(_CLIENT_VERSION_MINOR, 12) define(_CLIENT_VERSION_REVISION, 0) -define(_CLIENT_VERSION_BUILD, 9) +define(_CLIENT_VERSION_BUILD, 10) define(_CLIENT_VERSION_IS_RELEASE, true) define(_COPYRIGHT_YEAR, 2015) AC_INIT([Dash Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[info@dashpay.io],[dash]) diff --git a/src/clientversion.h b/src/clientversion.h index 5e99ab048..965bf857e 100644 --- a/src/clientversion.h +++ b/src/clientversion.h @@ -17,7 +17,7 @@ #define CLIENT_VERSION_MAJOR 0 #define CLIENT_VERSION_MINOR 12 #define CLIENT_VERSION_REVISION 0 -#define CLIENT_VERSION_BUILD 9 +#define CLIENT_VERSION_BUILD 10 //! Set to true for release, false for prerelease or test build #define CLIENT_VERSION_IS_RELEASE true diff --git a/src/instantx.h b/src/instantx.h index 2609bf1b8..e7664bbed 100644 --- a/src/instantx.h +++ b/src/instantx.h @@ -27,7 +27,7 @@ class CConsensusVote; class CTransaction; class CTransactionLock; -static const int MIN_INSTANTX_PROTO_VERSION = 70083; +static const int MIN_INSTANTX_PROTO_VERSION = 70084; extern map mapTxLockReq; extern map mapTxLockReqRejected; diff --git a/src/masternode-budget.h b/src/masternode-budget.h index 0288f33fa..ad2d0aa8e 100644 --- a/src/masternode-budget.h +++ b/src/masternode-budget.h @@ -403,7 +403,7 @@ public: std::string strCommand = "dash-cli mnbudget vote " + strProposalName + " " + strURL + " " + boost::lexical_cast(nPayments); - strCommand += " " + boost::lexical_cast(nBlockStart) + " " + address2.ToString() + " " + boost::lexical_cast(nAmount) + " yes|no"; + strCommand += " " + boost::lexical_cast(nBlockStart) + " " + address2.ToString() + " " + boost::lexical_cast(nAmount/COIN) + " yes|no"; return strCommand; } diff --git a/src/version.h b/src/version.h index e23b0826a..6b1c20648 100644 --- a/src/version.h +++ b/src/version.h @@ -10,7 +10,7 @@ * network protocol versioning */ -static const int PROTOCOL_VERSION = 70083; +static const int PROTOCOL_VERSION = 70084; //! initial proto version, to be increased after version/verack negotiation static const int INIT_PROTO_VERSION = 209; @@ -22,16 +22,16 @@ static const int GETHEADERS_VERSION = 70077; static const int MIN_PEER_PROTO_VERSION = 70066; //! minimum peer version accepted by DarksendPool -static const int MIN_POOL_PEER_PROTO_VERSION = 70083; +static const int MIN_POOL_PEER_PROTO_VERSION = 70084; //! minimum peer version for masternode budgets -static const int MIN_BUDGET_PEER_PROTO_VERSION = 70083; +static const int MIN_BUDGET_PEER_PROTO_VERSION = 70084; //! minimum peer version that can receive masternode payments // V1 - Last protocol version before update // V2 - Newest protocol version static const int MIN_MASTERNODE_PAYMENT_PROTO_VERSION_1 = 70066; -static const int MIN_MASTERNODE_PAYMENT_PROTO_VERSION_2 = 70083; +static const int MIN_MASTERNODE_PAYMENT_PROTO_VERSION_2 = 70084; //! nTime field added to CAddress, starting with this version; //! if possible, avoid requesting addresses nodes older than this