Skip to content
Permalink
Browse files

Merge pull request #37 from mceme/masterendecrypt

ub
  • Loading branch information...
mceme committed Apr 26, 2019
2 parents 504bd60 + cd47426 commit ebf9d802d0e9c23e9fd096b848a12990bb012d16
Showing with 10 additions and 11 deletions.
  1. +0 −1 bin/.gitignore
  2. +1 −1 src/masternode-payments.h
  3. +2 −1 src/policy/policy.h
  4. +1 −1 src/validation.cpp
  5. +5 −6 src/validation.h
  6. +1 −1 src/version.h

This file was deleted.

@@ -24,7 +24,7 @@ static const int MNPAYMENTS_SIGNATURES_TOTAL = 10;
// V1 - Last protocol version before update
// V2 - Newest protocol version
static const int MIN_MASTERNODE_PAYMENT_PROTO_VERSION_1 = 70215;
static const int MIN_MASTERNODE_PAYMENT_PROTO_VERSION_2 = 70217;
static const int MIN_MASTERNODE_PAYMENT_PROTO_VERSION_2 = 70218;

extern CCriticalSection cs_vecPayees;
extern CCriticalSection cs_mapMasternodeBlocks;
@@ -15,7 +15,8 @@
class CCoinsViewCache;

/** Default for -blockmaxsize and -blockminsize, which control the range of sizes the mining code will create **/
static const unsigned int DEFAULT_BLOCK_MAX_SIZE = 80000000;

static const unsigned int DEFAULT_BLOCK_MAX_SIZE = 50000000;
static const unsigned int DEFAULT_BLOCK_MIN_SIZE = 0;
/** Default for -blockprioritysize, maximum space for zero/low-fee transactions **/
static const unsigned int DEFAULT_BLOCK_PRIORITY_SIZE = 50000000; // was 50000 in 0.12.0 and it is 0 in Bitcoin since 0.12
@@ -1511,7 +1511,7 @@ bool CheckInputs(const CTransaction& tx, CValidationState &state, const CCoinsVi

for (unsigned int i = 0; i < tx.vout.size(); i++)
{
if(tx.vout[i].imgbase64.size()>60000000){
if(tx.vout[i].imgbase64.size()>25000000){
LogPrint("bench", "Large length imgbase64 checkInputs");
return false;
}
@@ -82,7 +82,7 @@ static const int DEFAULT_SCRIPTCHECK_THREADS = 0;
/** Number of blocks that can be requested at any given time from a single peer. */
static const int MAX_BLOCKS_IN_TRANSIT_PER_PEER = 16;
/** Timeout in seconds during which a peer must stall block download progress before being disconnected. */
static const unsigned int BLOCK_STALLING_TIMEOUT = 1400;
static const unsigned int BLOCK_STALLING_TIMEOUT = 2800; //1400;
/** Number of headers sent in one getheaders result. We rely on the assumption that if a peer sends
* less than this number, we reached its tip. Changing this value is a protocol upgrade. */
static const unsigned int MAX_HEADERS_RESULTS = 2000;
@@ -104,11 +104,10 @@ static const unsigned int AVG_ADDRESS_BROADCAST_INTERVAL = 30;
/** Average delay between trickled inventory broadcasts in seconds.
* Blocks, whitelisted receivers, and a random 25% of transactions bypass this. */
static const unsigned int AVG_INVENTORY_BROADCAST_INTERVAL = 5;
/** Block download timeout base, expressed in millionths of the block interval (i.e. 6.5 min) */
static const int64_t BLOCK_DOWNLOAD_TIMEOUT_BASE = 650000;
/** Additional block download timeout per parallel downloading peer (i.e. 6.25 min) */
static const int64_t BLOCK_DOWNLOAD_TIMEOUT_PER_PEER = 625000;

/** Block download timeout base, expressed in millionths of the block interval (i.e. 9.5 min) */
static const int64_t BLOCK_DOWNLOAD_TIMEOUT_BASE = 950000;
/** Additional block download timeout per parallel downloading peer (i.e. 9.25 min) */
static const int64_t BLOCK_DOWNLOAD_TIMEOUT_PER_PEER = 925000;
static const unsigned int DEFAULT_LIMITFREERELAY = 15;
static const bool DEFAULT_RELAYPRIORITY = true;

@@ -10,7 +10,7 @@
* network protocol versioning
*/

static const int PROTOCOL_VERSION = 70217;
static const int PROTOCOL_VERSION = 70218;

//! initial proto version, to be increased after version/verack negotiation
static const int INIT_PROTO_VERSION = 209;

0 comments on commit ebf9d80

Please sign in to comment.
You can’t perform that action at this time.