Browse Source

Reversed incorrect commit.

cn_merge
Jianping Wu 6 years ago
parent
commit
caef63a27f
  1. 3
      src/consensus/consensus.h
  2. 4
      src/rpc/mining.cpp

3
src/consensus/consensus.h

@ -16,8 +16,7 @@ static const unsigned int MAX_BLOCK_WEIGHT = 6000000; @@ -16,8 +16,7 @@ static const unsigned int MAX_BLOCK_WEIGHT = 6000000;
/** The maximum allowed number of signature check operations in a block (network rule) */
static const int64_t MAX_BLOCK_SIGOPS_COST = 80000;
/** Coinbase transaction outputs can only be spent after this number of new blocks (network rule) */
//static const int COINBASE_MATURITY = 100;
static const int COINBASE_MATURITY = 7;
static const int COINBASE_MATURITY = 100;
static const int WITNESS_SCALE_FACTOR = 4;

4
src/rpc/mining.cpp

@ -440,13 +440,13 @@ UniValue getblocktemplate(const JSONRPCRequest& request) @@ -440,13 +440,13 @@ UniValue getblocktemplate(const JSONRPCRequest& request)
if(!g_connman)
throw JSONRPCError(RPC_CLIENT_P2P_DISABLED, "Error: Peer-to-peer functionality missing or disabled");
#if 0
if (g_connman->GetNodeCount(CConnman::CONNECTIONS_ALL) == 0)
throw JSONRPCError(RPC_CLIENT_NOT_CONNECTED, "Kevacoin is not connected!");
if (IsInitialBlockDownload())
throw JSONRPCError(RPC_CLIENT_IN_INITIAL_DOWNLOAD, "Kevacoin is downloading blocks...");
#endif
static unsigned int nTransactionsUpdatedLast;
if (!lpval.isNull())

Loading…
Cancel
Save