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

Dev 3.x 3.0.4.1 hotfix Former-commit-id: 2086103
syscoin · May 26, 2018 · 4646547 · 4646547
2 parents a509c4a + 1143b5f
commit 4646547
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/configure.ac b/configure.ac
@@ -3,7 +3,7 @@ AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 3)
 define(_CLIENT_VERSION_MINOR, 0)
 define(_CLIENT_VERSION_REVISION, 4)
-define(_CLIENT_VERSION_BUILD, 0)
+define(_CLIENT_VERSION_BUILD, 1)
 define(_CLIENT_VERSION_IS_RELEASE, true)
 define(_DASH_VERSION_MAJOR, 0)
 define(_DASH_VERSION_MINOR, 12)

diff --git a/src/alias.cpp b/src/alias.cpp
@@ -1365,9 +1365,9 @@ UniValue syscointxfund(const JSONRPCRequest& request) {
 		int numSigs = 0;
 		CCountSigsVisitor(*pwalletMain, numSigs).Process(coin.out.scriptPubKey);
 		if(tx.nVersion == SYSCOIN_TX_VERSION && params.size() > 1)
-			nFees += GetFee(numSigs*150);
+			nFees += GetFee(numSigs*200);
 		else
-			nFees += GetFee(numSigs * 150, fUseInstantSend);
+			nFees += GetFee(numSigs*200, fUseInstantSend);
 	}
 	for (auto& vout : tx.vout) {
 		const unsigned int nBytes = ::GetSerializeSize(vout, SER_NETWORK, PROTOCOL_VERSION);
@@ -1415,7 +1415,7 @@ UniValue syscointxfund(const JSONRPCRequest& request) {
 					int numSigs = 0;
 					CCountSigsVisitor(*pwalletMain, numSigs).Process(scriptPubKey);
 					// add fees to account for every input added to this transaction
-					nFees += GetFee(numSigs*150);
+					nFees += GetFee(numSigs*200);
 					tx.vin.push_back(txIn);
 					nCurrentAmount += nValue;
 					if (nCurrentAmount >= (nDesiredAmount + nFees)) {
@@ -1453,7 +1453,7 @@ UniValue syscointxfund(const JSONRPCRequest& request) {
 				int numSigs = 0;
 				CCountSigsVisitor(*pwalletMain, numSigs).Process(scriptPubKey);
 				// add fees to account for every input added to this transaction
-				nFees += GetFee(numSigs*150, fUseInstantSend);
+				nFees += GetFee(numSigs*200, fUseInstantSend);
 				tx.vin.push_back(txIn);
 				nCurrentAmount += nValue;
 				if (nCurrentAmount >= (nDesiredAmount + nFees)) {
@@ -2634,7 +2634,7 @@ bool IsOutpointMature(const COutPoint& outpoint, bool fUseInstantSend)
 	GetUTXOCoin(outpoint, coin);
 	if (coin.IsSpent())
 		return false;
-	int numConfirmationsNeeded = 2;
+	int numConfirmationsNeeded = 1;
 	if (coin.IsCoinBase())
 		numConfirmationsNeeded = COINBASE_MATURITY;
 	if (fUseInstantSend)

diff --git a/src/clientversion.h b/src/clientversion.h
@@ -17,7 +17,7 @@
 #define CLIENT_VERSION_MAJOR 3
 #define CLIENT_VERSION_MINOR 0
 #define CLIENT_VERSION_REVISION 4
-#define CLIENT_VERSION_BUILD 0
+#define CLIENT_VERSION_BUILD 1
 
 //! Set to true for release, false for prerelease or test build
 #define CLIENT_VERSION_IS_RELEASE true

diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
@@ -67,7 +67,7 @@ static const bool DEFAULT_SEND_FREE_TRANSACTIONS = false;
 //! Default for -walletrejectlongchains
 static const bool DEFAULT_WALLET_REJECT_LONG_CHAINS = false;
 //! -txconfirmtarget default
-static const unsigned int DEFAULT_TX_CONFIRM_TARGET = 2;
+static const unsigned int DEFAULT_TX_CONFIRM_TARGET = 1;
 //! Largest (in bytes) free transaction we're willing to create
 static const unsigned int MAX_FREE_TRANSACTION_CREATE_SIZE = 1000;
 static const bool DEFAULT_WALLETBROADCAST = true;