Hard Fork: Staking Bonanza

A hard fork at block #610000 with many protocol changes.
a0li · Apr 24, 2014 · de0fe1f · de0fe1f
1 parent 28bb179
commit de0fe1f
Show file tree

Hide file tree

Showing 68 changed files with 665 additions and 419 deletions.
diff --git a/orbitcoin-qt.pro b/orbitcoin-qt.pro
@@ -1,6 +1,6 @@
 TEMPLATE = app
 TARGET = orbitcoin-qt
-VERSION = 1.4.0.2
+VERSION = 1.4.1.0
 INCLUDEPATH += src src/json src/qt
 DEFINES += QT_GUI BOOST_THREAD_USE_LIB BOOST_SPIRIT_THREADSAFE
 CONFIG += no_include_pwd

diff --git a/share/images/reload.png b/share/images/reload.png
diff --git a/share/images/reload.svg b/share/images/reload.svg
diff --git a/share/qt/make_spinner.py → share/make_spinner.py b/share/qt/make_spinner.py → share/make_spinner.py
@@ -1,25 +1,25 @@
 #!/usr/bin/env python
 # W.J. van der Laan, 2011
-# Make spinning .mng animation from a .png
+# Make spinning animation from a .png
 # Requires imagemagick 6.7+
 from __future__ import division
 from os import path
 from PIL import Image
 from subprocess import Popen
 
-SRC='img/reload_scaled.png'
-DST='../../src/qt/res/movies/update_spinner.mng'
-TMPDIR='/tmp'
-TMPNAME='tmp-%03i.png'
-NUMFRAMES=35
-FRAMERATE=10.0
-CONVERT='convert'
+# The source icon is copyright (c) 2014 John Doering <[email protected]>
+# under the terms of the MIT Licence (see ../LICENCE)
+SRC='images/reload.png'
+TMPDIR='../src/qt/res/movies/'
+TMPNAME='spinner-%02i.png'
+NUMFRAMES=25
 CLOCKWISE=True
+FLIP=False
 DSIZE=(16,16)
 
 im_src = Image.open(SRC)
 
-if CLOCKWISE:
+if FLIP:
     im_src = im_src.transpose(Image.FLIP_LEFT_RIGHT)
 
 def frame_to_filename(frame):
@@ -35,9 +35,3 @@ def frame_to_filename(frame):
     outfile = frame_to_filename(frame)
     im_new.save(outfile, 'png')
     frame_files.append(outfile)
-
-p = Popen([CONVERT, "-delay", str(FRAMERATE), "-dispose", "2"] + frame_files + [DST])
-p.communicate()
-
-
-
diff --git a/share/qt/img/reload.xcf b/share/qt/img/reload.xcf
diff --git a/src/checkpoints.cpp b/src/checkpoints.cpp
@@ -26,7 +26,7 @@ namespace Checkpoints
         boost::assign::map_list_of
         ( 0,     std::make_pair(hashGenesisBlock, 1375030725) )
         ( 433333, std::make_pair(uint256("0x2ecb07c0bb2e53f0af0bd79d24510e73de3be324e622bfef5dbe28896c37ad75"), 1392829201) )
-        ( 584322, std::make_pair(uint256("0x6835501d5d31d7c55f264d5e7722f4632ab31c6d5aa7af8de0de123377dcd50c"), 1397631212) )
+        ( 600000, std::make_pair(uint256("0x00000025e4214dd10eb7a4d7d088935dbc5c05b18574b56574d19c839e48e8ff"), 1398098754) )
     ;
 
     // TestNet has no checkpoints

diff --git a/src/clientversion.h b/src/clientversion.h
@@ -8,8 +8,8 @@
 // These need to be macros, as version.cpp's and bitcoin-qt.rc's voodoo requires it
 #define CLIENT_VERSION_MAJOR       1
 #define CLIENT_VERSION_MINOR       4
-#define CLIENT_VERSION_REVISION    0
-#define CLIENT_VERSION_BUILD       2
+#define CLIENT_VERSION_REVISION    1
+#define CLIENT_VERSION_BUILD       0
 
 // Converts the parameter X to a string after macro replacement on X has been performed.
 // Don't merge these into one macro!

diff --git a/src/irc.cpp b/src/irc.cpp
@@ -307,10 +307,10 @@ void ThreadIRCSeed2(void* parg)
             // randomly join #orbitcoin00-#orbitcoin05
             // int channel_number = GetRandInt(5);
 
-            // Channel number is always 0 for initial release
+            /* Use a single channel currently */
             int channel_number = 0;
-            Send(hSocket, strprintf("JOIN #Orbitcoin%02d\r", channel_number).c_str());
-            Send(hSocket, strprintf("WHO #Orbitcoin%02d\r", channel_number).c_str());
+            Send(hSocket, strprintf("JOIN #orbitcoin%02d\r", channel_number).c_str());
+            Send(hSocket, strprintf("WHO #orbitcoin%02d\r", channel_number).c_str());
         }
 
         int64 nStart = GetTime();

diff --git a/src/kernel.cpp b/src/kernel.cpp
@@ -10,7 +10,7 @@
 using namespace std;
 
 extern int nStakeMaxAge;
-extern int nStakeTargetSpacing;
+extern int nBaseTargetSpacing;
 
 typedef std::map<int, unsigned int> MapModifierCheckpoints;
 
@@ -157,7 +157,7 @@ bool ComputeNextStakeModifier(const CBlockIndex* pindexPrev, uint64& nStakeModif
 
     // Sort candidate blocks by timestamp
     vector<pair<int64, uint256> > vSortedByTimestamp;
-    vSortedByTimestamp.reserve(64 * nModifierInterval / nStakeTargetSpacing);
+    vSortedByTimestamp.reserve(64 * nModifierInterval / nBaseTargetSpacing);
     int64 nSelectionInterval = GetStakeModifierSelectionInterval();
     int64 nSelectionIntervalStart = (pindexPrev->GetBlockTime() / nModifierInterval) * nModifierInterval - nSelectionInterval;
     const CBlockIndex* pindex = pindexPrev;