Merge pull request bitcoin#9 from dooglus/defaultcoin

Defaultcoin

src/init.cpp

@@ -11,6 +11,7 @@
 
 #include "addrman.h"
 #include "amount.h"
+#include "base58.h"
 #include "chain.h"
 #include "chainparams.h"
 #include "checkpoints.h"
@@ -76,6 +77,8 @@ int64_t nMaxStakeValue;
 int64_t nSplitSize;
 int64_t nCombineLimit;
 bool fCombineAny;
+std::set<CBitcoinAddress> setSpendLastAddresses;
+std::set<CBitcoinAddress> setStakeAddresses;
 
 
 static const bool DEFAULT_PROXYRANDOMIZE = true;

src/rpc/blockchain.cpp

@@ -237,7 +237,7 @@ UniValue dumpbootstrap(const JSONRPCRequest& request)
         throw JSONRPCError(RPC_MISC_ERROR, "Error: Bootstrap dump failed!");
     }
 
-    return NullUniValue;
+    return strprintf("dumped %d blocks from %d to %d into %s", nEndBlock - nStartBlock + 1, nStartBlock, nEndBlock, pathDest);
 }
 
 

src/util.h

@@ -162,6 +162,15 @@ bool IsArgSet(const std::string& strArg);
  */
 std::string GetArg(const std::string& strArg, const std::string& strDefault);
 
+/**
+ * Return integer argument or default value
+ *
+ * @param strArg Argument to get (e.g. "-foo")
+ * @param default (e.g. 1)
+ * @return command-line argument or default value
+ */
+int64_t GetMoneyArg(const std::string& strArg, int64_t nDefault);
+
 /**
  * Return integer argument or default value
  *

src/wallet/rpcwallet.cpp

@@ -449,6 +449,10 @@ static void SendMoney(const CTxDestination &address, CAmount nValue, int64_t nCo
             strError = strprintf("Error: This transaction requires a transaction fee of at least %s", FormatMoney(nFeeRequired));
         throw JSONRPCError(RPC_WALLET_ERROR, strError);
     }
+
+    // LogPrintf("nFeeRequired is %s\n", FormatMoney(nFeeRequired));
+    // throw JSONRPCError(RPC_WALLET_ERROR, "not broadcasting");
+
     CValidationState state;
     if (!pwalletMain->CommitTransaction(wtxNew, reservekey, g_connman.get(), state)) {
         strError = strprintf("Error: The transaction was rejected! Reason given: %s", state.GetRejectReason());