From 5aee49250bf347f5c79deafa55b7afe78b1c8f25 Mon Sep 17 00:00:00 2001
From: zathras-crypto <zathrasc@gmail.com>
Date: Sat, 29 Nov 2014 19:28:55 -0800
Subject: [PATCH 1/3] UI form for tx history

---
 src/qt/forms/txhistorydialog.ui | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 src/qt/forms/txhistorydialog.ui

diff --git a/src/qt/forms/txhistorydialog.ui b/src/qt/forms/txhistorydialog.ui
new file mode 100644
index 0000000000000..941d74c579eda
--- /dev/null
+++ b/src/qt/forms/txhistorydialog.ui
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>txHistoryDialog</class>
+ <widget class="QWidget" name="txHistoryDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>664</width>
+    <height>474</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QVBoxLayout" name="topLayout">
+   <item>
+    <layout class="QVBoxLayout" name="verticalLayout">
+     <property name="topMargin">
+      <number>0</number>
+     </property>
+     <item>
+      <widget class="QTableWidget" name="txHistoryTable"/>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

From dedb916aebb9d2371a38c4d1552d05a267a99ec3 Mon Sep 17 00:00:00 2001
From: zathras-crypto <zathrasc@gmail.com>
Date: Mon, 8 Dec 2014 13:38:33 -0800
Subject: [PATCH 2/3] Add commit to getinfo_MP

---
 src/mastercore_rpc.cpp |  4 +++-
 src/version.cpp        | 10 ++++++++++
 src/version.h          |  2 +-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/mastercore_rpc.cpp b/src/mastercore_rpc.cpp
index 7748628aec4b9..bac4027b7479f 100644
--- a/src/mastercore_rpc.cpp
+++ b/src/mastercore_rpc.cpp
@@ -4,6 +4,7 @@
 #include "util.h"
 #include "init.h"
 #include "wallet.h"
+#include "clientversion.h"
 
 #include <stdint.h>
 #include <string.h>
@@ -1883,9 +1884,10 @@ Value getinfo_MP(const Array& params, bool fHelp)
     Object infoResponse;
     // other bits of info we want to report should be included here
 
-    // provide the mastercore and bitcoin version
+    // provide the mastercore and bitcoin version and if available commit id
     infoResponse.push_back(Pair("mastercoreversion", "0.0." + boost::lexical_cast<string>((double)OMNICORE_VERSION_BASE/10) + OMNICORE_VERSION_TYPE ));
     infoResponse.push_back(Pair("bitcoincoreversion", "0." + boost::lexical_cast<string>((int)CLIENT_VERSION/100)));
+    infoResponse.push_back(Pair("commitinfo", COMMIT_INFO));
 
     // provide the current block details
     uint64_t block = chainActive.Height();
diff --git a/src/version.cpp b/src/version.cpp
index 51e34aa9c9119..58b85d71b29c0 100644
--- a/src/version.cpp
+++ b/src/version.cpp
@@ -49,6 +49,9 @@ const std::string CLIENT_NAME("Satoshi");
 #define BUILD_DESC_FROM_UNKNOWN(maj,min,rev,build) \
     "v" DO_STRINGIZE(maj) "." DO_STRINGIZE(min) "." DO_STRINGIZE(rev) "." DO_STRINGIZE(build) "-unk"
 
+#define BUILD_SUFFIX_ONLY(suffix) \
+    DO_STRINGIZE(suffix)
+
 #ifndef BUILD_DESC
 #    ifdef BUILD_SUFFIX
 #        define BUILD_DESC BUILD_DESC_WITH_SUFFIX(CLIENT_VERSION_MAJOR, CLIENT_VERSION_MINOR, CLIENT_VERSION_REVISION, CLIENT_VERSION_BUILD, BUILD_SUFFIX)
@@ -67,5 +70,12 @@ const std::string CLIENT_NAME("Satoshi");
 #    endif
 #endif
 
+#ifdef BUILD_SUFFIX
+#    define COMMIT_DEF BUILD_SUFFIX_ONLY(BUILD_SUFFIX)
+#else
+#    define COMMIT_DEF ""
+#endif
+
+const std::string COMMIT_INFO(COMMIT_DEF);
 const std::string CLIENT_BUILD(BUILD_DESC CLIENT_VERSION_SUFFIX);
 const std::string CLIENT_DATE(BUILD_DATE);
diff --git a/src/version.h b/src/version.h
index 3d1abacb94ca6..47ca0a1388043 100644
--- a/src/version.h
+++ b/src/version.h
@@ -21,7 +21,7 @@ static const int CLIENT_VERSION =
 extern const std::string CLIENT_NAME;
 extern const std::string CLIENT_BUILD;
 extern const std::string CLIENT_DATE;
-
+extern const std::string COMMIT_INFO;
 //
 // network protocol versioning
 //

From df73ece5a20d654b44efcf0380434da7c15cab4a Mon Sep 17 00:00:00 2001
From: zathras-crypto <zathrasc@gmail.com>
Date: Mon, 8 Dec 2014 13:42:12 -0800
Subject: [PATCH 3/3] Remove accidentally committed form

---
 src/qt/forms/txhistorydialog.ui | 31 -------------------------------
 1 file changed, 31 deletions(-)
 delete mode 100644 src/qt/forms/txhistorydialog.ui

diff --git a/src/qt/forms/txhistorydialog.ui b/src/qt/forms/txhistorydialog.ui
deleted file mode 100644
index 941d74c579eda..0000000000000
--- a/src/qt/forms/txhistorydialog.ui
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>txHistoryDialog</class>
- <widget class="QWidget" name="txHistoryDialog">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>664</width>
-    <height>474</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Form</string>
-  </property>
-  <layout class="QVBoxLayout" name="topLayout">
-   <item>
-    <layout class="QVBoxLayout" name="verticalLayout">
-     <property name="topMargin">
-      <number>0</number>
-     </property>
-     <item>
-      <widget class="QTableWidget" name="txHistoryTable"/>
-     </item>
-    </layout>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>