diff --git a/src/main.cpp b/src/main.cpp index 4b9b683b..8188706b 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -542,6 +542,7 @@ bool IsStandardTx(const CTransaction& tx, string& reason) { if (!::IsStandard(txout.scriptPubKey, whichType)) { + LogPrintf("tx-nonstd: %s %s\n", txout.ToString(), whichType); reason = "scriptpubkey"; return false; } @@ -558,7 +559,7 @@ bool IsStandardTx(const CTransaction& tx, string& reason) } } - // only one OP_RETURN txout is permitted + // allow one OP_RETURN per txout if (nDataOut > nTxnOut) { reason = "multi-op-return"; diff --git a/src/main.h b/src/main.h index fc2c37c4..bec0ac32 100644 --- a/src/main.h +++ b/src/main.h @@ -778,7 +778,7 @@ public: } int GetAlgo() const { return ::GetAlgo(nVersion); } - + CDiskBlockPos GetBlockPos() const { CDiskBlockPos ret; if (nStatus & BLOCK_HAVE_DATA) { @@ -829,7 +829,7 @@ public: return (CBigNum(1)<<256) / (bnTarget+1); } - int GetAlgoWorkFactor() const + int GetAlgoWorkFactor() const { if (!TestNet() && (nHeight < nBlockAlgoWorkWeightStart)) { @@ -842,7 +842,7 @@ public: switch (GetAlgo()) { case ALGO_SHA256D: - return 1; + return 1; // work factor = absolute work ratio * optimisation factor case ALGO_SCRYPT: return 1024 * 4; @@ -863,7 +863,7 @@ public: bnRes = GetBlockWork() * GetAlgoWorkFactor(); return bnRes; } - + bool CheckIndex() const { int algo = GetAlgo(); diff --git a/src/qt/forms/addressbookpage.ui b/src/qt/forms/addressbookpage.ui index f40c4460..b6b7ff62 100644 --- a/src/qt/forms/addressbookpage.ui +++ b/src/qt/forms/addressbookpage.ui @@ -6,7 +6,7 @@ 0 0 - 760 + 960 380