kFEC unit Merge pull request #33 from koh-gt/ferrite-kfec

Append kFEC to units header
koh-gt · Jan 18, 2023 · f21a003 · f21a003
2 parents 1708e76 + 3b9b2d8
commit f21a003
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -44,7 +44,7 @@ Reuse obsolete Litecoin and Dogecoin miners to mine Ferrite. Originally designed
 ## Ferrite coin specifications
 ### Technical specifications: <br/>
 ### Start Date: 22 Nov 2022
-### Current Block Height: **54014** (16 Jan 2023)
+### Current Block Height: **56060** (18 Jan 2023)
 ### Halving Epoch: **0**
 ### Next halving block: 301107
 
@@ -59,7 +59,7 @@ Transaction capacity: 50/s (100/s with Segwit) <br/>
 Premine: No premine <br/>
 
 ### Economic specifications: <br/>
-### Circulating supply: **𝔽 5,401,400 / 60,221,400 (8.97% of total)** (16 Jan 2023)  
+### Circulating supply: **𝔽 5,606,000 / 60,221,400 (9.31% of total)** (16 Jan 2023)  
 Block reward: 𝔽 100 <br/>
 Current Block reward:  𝔽 100 <br/>
 Maximum supply: 𝔽 60,221,400 <br/>

diff --git a/doc/build-windows.md b/doc/build-windows.md
@@ -105,7 +105,8 @@ Once the source code is ready the build steps are below:
     make deploy
 
     common qt errors - numeric_limits is not a member of std
-    go to qbytearraymatcher.h
+    go to qbytearraymatcher.h 
+    /ferrite-core-main/depends/work/build/i686-w64-mingw32/qt/5.9.7-30b9272ce7f/qtbase/src/corelib/tools/qbytearraymatcher.h
     #include <stddef.h>
     #include <limits.h>
     #include <stdexcept>

diff --git a/src/qt/bitcoinunits.cpp b/src/qt/bitcoinunits.cpp
@@ -22,13 +22,15 @@ QList<BitcoinUnits::Unit> BitcoinUnits::availableUnits()
     unitlist.append(mBTC);
     unitlist.append(uBTC);
     unitlist.append(SAT);
+    unitlist.append(kBTC);
     return unitlist;
 }
 
 bool BitcoinUnits::valid(int unit)
 {
     switch(unit)
     {
+    case kBTC:
     case BTC:
     case mBTC:
     case uBTC:
@@ -43,6 +45,7 @@ QString BitcoinUnits::longName(int unit)
 {
     switch(unit)
     {
+    case kBTC: return QString("kFEC");
     case BTC: return QString("FEC");
     case mBTC: return QString("mFEC");
     case uBTC: return QString("µFEC");
@@ -65,6 +68,7 @@ QString BitcoinUnits::description(int unit)
 {
     switch(unit)
     {
+    case kBTC: return QString("Kilo-Ferrites (1" THIN_SP_UTF8 "000)");
     case BTC: return QString("Ferrites");
     case mBTC: return QString("Milli-Ferrites (1 / 1" THIN_SP_UTF8 "000)");
     case uBTC: return QString("Micro-Ferrites (1 / 1" THIN_SP_UTF8 "000" THIN_SP_UTF8 "000)");
@@ -77,6 +81,7 @@ qint64 BitcoinUnits::factor(int unit)
 {
     switch(unit)
     {
+    case kBTC: return 100000000000;
     case BTC: return 100000000;
     case mBTC: return 100000;
     case uBTC: return 100;
@@ -89,6 +94,7 @@ int BitcoinUnits::decimals(int unit)
 {
     switch(unit)
     {
+    case kBTC: return 11;
     case BTC: return 8;
     case mBTC: return 5;
     case uBTC: return 2;

diff --git a/src/qt/bitcoinunits.h b/src/qt/bitcoinunits.h
@@ -56,6 +56,7 @@ class BitcoinUnits: public QAbstractListModel
      */
     enum Unit
     {
+        kBTC,
         BTC,
         mBTC,
         uBTC,
-Original file line number
+Diff line change
@@ Expand Up / @@ -56,6 +56,7 @@ class BitcoinUnits: public QAbstractListModel @@
          */
         enum Unit
         {
+            kBTC,
             BTC,
             mBTC,
             uBTC,
@@ Expand Down @@