回复：版本 0.3.13，请升级

时间

2010年10月3日 20:02 UTC

类型

论坛发言

渠道

BitcoinTalk 论坛

译文状态

简体中文全文

原始发布页

打开来源页面

查看 1 个交叉存档

• Satoshi Nakamoto Institute

上一篇 回复：版本 0.3.13，请升级下一篇 SMF PHP 代码

代码（保持原样）：

diff -u old\main.cpp new\main.cpp
\--- old\main.cpp Sun Oct 03 20:57:20 2010
+++ new\main.cpp Sun Oct 03 20:57:54 2010
@@ -2831,6 +2831,10 @@
bool fUseSSE2 = ((fIntel && nFamily \* 10000 + nModel >= 60026) ||
(fAMD && nFamily \* 10000 + nModel >= 160010));

\+ // AMD reports a lower model number in 64-bit mode
\+ if (fAMD && sizeof(void\*) > 4 && nFamily \* 10000 + nModel >= 160004)
\+ fUseSSE2 = true;
+
static bool fPrinted;
if (!fPrinted)
{
@@ -2989,6 +2993,17 @@

// Transaction fee based on block size
int64 nMinFee = tx.GetMinFee(nBlockSize);
\+ //////// temporary code
\+ if (nBlockSize < MAX\_BLOCK\_SIZE\_GEN / 10 && GetWarnings("statusbar") == "")
\+ {
\+ if (nBestHeight < 91000)
\+ nMinFee = 0;
\+ if (nBestHeight < 100000 && nTxSize < 2000)
\+ nMinFee = 0;
\+ if (nBestHeight < 110000 && nBestHeight % 10 == 0)
\+ nMinFee = 0;
\+ }
\+ //////// temporary code

map<uint256, CTxIndex> mapTestPoolTmp(mapTestPool);
if (!tx.ConnectInputs(txdb, mapTestPoolTmp, CDiskTxPos(1,1,1), pindexPrev, nFees, false, true, nMinFee))
diff -u old\serialize.h new\serialize.h
\--- old\serialize.h Sun Oct 03 20:57:45 2010
+++ new\serialize.h Sun Oct 03 20:57:54 2010
@@ -22,8 +22,8 @@
class CAutoFile;
static const unsigned int MAX\_SIZE = 0x02000000;

\-static const int VERSION = 31300;
\-static const char\* pszSubVer = "";
+static const int VERSION = 31301;
+static const char\* pszSubVer = " test1";

英文原文

展开英文原文

Code:

diff -u old\main.cpp new\main.cpp --- old\main.cpp Sun Oct 03 20:57:20 2010 +++ new\main.cpp Sun Oct 03 20:57:54 2010 @@ -2831,6 +2831,10 @@ bool fUseSSE2 = ((fIntel && nFamily * 10000 + nModel >= 60026) || (fAMD && nFamily * 10000 + nModel >= 160010));

+ // AMD reports a lower model number in 64-bit mode + if (fAMD && sizeof(void*) > 4 && nFamily * 10000 + nModel >= 160004) + fUseSSE2 = true; + static bool fPrinted; if (!fPrinted) { @@ -2989,6 +2993,17 @@

// Transaction fee based on block size int64 nMinFee = tx.GetMinFee(nBlockSize); + //////// temporary code + if (nBlockSize < MAX_BLOCK_SIZE_GEN / 10 && GetWarnings("statusbar") == "") + { + if (nBestHeight < 91000) + nMinFee = 0; + if (nBestHeight < 100000 && nTxSize < 2000) + nMinFee = 0; + if (nBestHeight < 110000 && nBestHeight % 10 == 0) + nMinFee = 0; + } + //////// temporary code

map<uint256, CTxIndex> mapTestPoolTmp(mapTestPool); if (!tx.ConnectInputs(txdb, mapTestPoolTmp, CDiskTxPos(1,1,1), pindexPrev, nFees, false, true, nMinFee)) diff -u old\serialize.h new\serialize.h --- old\serialize.h Sun Oct 03 20:57:45 2010 +++ new\serialize.h Sun Oct 03 20:57:54 2010 @@ -22,8 +22,8 @@ class CAutoFile; static const unsigned int MAX_SIZE = 0x02000000;

-static const int VERSION = 31300; -static const char* pszSubVer = ""; +static const int VERSION = 31301; +static const char* pszSubVer = " test1";