From e5a5a7db6e88de80d13b6bef171b6acf7a519e13 Mon Sep 17 00:00:00 2001 From: Asad Haider Date: Tue, 4 Mar 2014 10:06:51 +0000 Subject: [PATCH 1/6] Update init.cpp Removed semicolon at the end of the -wallet argument in the help message which was preventing everything below it from showing up. --- src/init.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/init.cpp b/src/init.cpp index 557d96255..22473e631 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -303,7 +303,7 @@ std::string HelpMessage() " -pid= " + _("Specify pid file (default: dogecoind.pid)") + "\n" + " -gen " + _("Generate coins (default: 0)") + "\n" + " -datadir= " + _("Specify data directory") + "\n" + - " -wallet= " + _("Specify wallet file (within data directory)") + "\n"; + " -wallet= " + _("Specify wallet file (within data directory)") + "\n" + " -dbcache= " + _("Set database cache size in megabytes (default: 100)") + "\n" + " -timeout= " + _("Specify connection timeout in milliseconds (default: 5000)") + "\n" + " -proxy= " + _("Connect through socks proxy") + "\n" + From 6e5881a000e5b926b93143c70cd2fb00239d78f8 Mon Sep 17 00:00:00 2001 From: ummjackson Date: Wed, 12 Mar 2014 23:28:59 -0400 Subject: [PATCH 2/6] Bumping min peer proto version To ensure post-fork clients don't get hit with old nodes. --- src/version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/version.h b/src/version.h index 9d9fd5bac..dff5562f2 100644 --- a/src/version.h +++ b/src/version.h @@ -32,7 +32,7 @@ static const int PROTOCOL_VERSION = 70002; static const int INIT_PROTO_VERSION = 209; // disconnect from peers older than this proto version -static const int MIN_PEER_PROTO_VERSION = 70001; +static const int MIN_PEER_PROTO_VERSION = 70002; // nTime field added to CAddress, starting with this version; // if possible, avoid requesting addresses nodes older than this From 9c0fbf5c2ceb6f3287c156916a839a41bd6ab271 Mon Sep 17 00:00:00 2001 From: Alan Westbrook Date: Wed, 12 Mar 2014 20:41:24 -0700 Subject: [PATCH 3/6] update mac version numbers too plist contains info, yay! --- src/mac/Info.plist | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mac/Info.plist b/src/mac/Info.plist index 98bbd75fe..8b631e637 100644 --- a/src/mac/Info.plist +++ b/src/mac/Info.plist @@ -14,9 +14,9 @@ CFBundleShortVersionString - 1.5.2 + 1.6.0 CFBundleVersion - 1.5.2 + 1.6.0 NSPrincipalClass NSApplication CFBundleIconFile From 15e78bf2c7c03d61e481b943446645f110a1f224 Mon Sep 17 00:00:00 2001 From: ummjackson Date: Thu, 13 Mar 2014 00:10:45 -0400 Subject: [PATCH 4/6] Notching back min proto version. Risk for sync issues, will need to update later. --- src/version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/version.h b/src/version.h index dff5562f2..9d9fd5bac 100644 --- a/src/version.h +++ b/src/version.h @@ -32,7 +32,7 @@ static const int PROTOCOL_VERSION = 70002; static const int INIT_PROTO_VERSION = 209; // disconnect from peers older than this proto version -static const int MIN_PEER_PROTO_VERSION = 70002; +static const int MIN_PEER_PROTO_VERSION = 70001; // nTime field added to CAddress, starting with this version; // if possible, avoid requesting addresses nodes older than this From 71dea1269716b200362c9655cc72a6ee21943525 Mon Sep 17 00:00:00 2001 From: Casey Fleser Date: Sun, 16 Mar 2014 16:34:21 -0500 Subject: [PATCH 5/6] back out caching changes in CWalletTx::GetAmounts --- src/wallet.cpp | 18 +----------------- src/wallet.h | 6 ------ 2 files changed, 1 insertion(+), 23 deletions(-) diff --git a/src/wallet.cpp b/src/wallet.cpp index 3e9da77e8..8b1c6c56b 100644 --- a/src/wallet.cpp +++ b/src/wallet.cpp @@ -664,27 +664,13 @@ void CWalletTx::GetAmounts(list >& listReceived, nFee = nDebit - nValueOut; } - if (!fMineCached) - vfMine.resize(vout.size()); - // Sent/received. for (unsigned int i = 0; i < vout.size(); i++) { const CTxOut &txout = vout[i]; bool isMine = false; bool warnUnkownTX = false; - if (!fMineCached) { - address = CNoDestination(); - warnUnkownTX = !ExtractDestinationAndMine(*pwallet, txout.scriptPubKey, address, &isMine); - vfMine[i] = isMine; - } - else { - if (vfMine[i]) { - isMine = true; // already know this is ours, just fetch address - address = CNoDestination(); - warnUnkownTX = !ExtractDestination(txout.scriptPubKey, address); - } - } + warnUnkownTX = !ExtractDestinationAndMine(*pwallet, txout.scriptPubKey, address, &isMine); if (warnUnkownTX) { printf("CWalletTx::GetAmounts: Unknown transaction type found, txid %s\n", this->GetHash().ToString().c_str()); } @@ -699,8 +685,6 @@ void CWalletTx::GetAmounts(list >& listReceived, if (isMine) listReceived.push_back(make_pair(address, txout.nValue)); } - - fMineCached = true; } void CWalletTx::GetAccountAmounts(const string& strAccount, int64& nReceived, diff --git a/src/wallet.h b/src/wallet.h index bcce10c96..d5f9bb783 100644 --- a/src/wallet.h +++ b/src/wallet.h @@ -384,8 +384,6 @@ public: int64 nOrderPos; // position in ordered transaction list // memory only - mutable std::vector vfMine; // which outputs are mine - mutable bool fMineCached; mutable bool fDebitCached; mutable bool fCreditCached; mutable bool fImmatureCreditCached; @@ -429,8 +427,6 @@ public: fFromMe = false; strFromAccount.clear(); vfSpent.clear(); - vfMine.clear(); - fMineCached = false; fDebitCached = false; fCreditCached = false; fImmatureCreditCached = false; @@ -524,8 +520,6 @@ public: // make sure balances are recalculated void MarkDirty() { - vfMine.clear(); - fMineCached = false; fCreditCached = false; fAvailableCreditCached = false; fDebitCached = false; From 47c2995abfdceae7f9096ccc5a925e8cb0e685d9 Mon Sep 17 00:00:00 2001 From: Derek Bender Date: Tue, 18 Mar 2014 10:15:24 -0500 Subject: [PATCH 6/6] Update to reflect static block rewards change --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e838ba0cf..9ca7a4c5a 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ Scrypt Proof of Work 1 Minute Block Targets, 4 Hour Diff Readjustments -Special reward system: Random block rewards +Special reward system: Random block rewards before block 145,000. Static block reward of 250,00 afterwards. 1-100,000: 0-1,000,000 Dogecoin Reward