Merge pull request #45 from koh-gt/ferrite-v2.1.1

v2.1.1 #2
koh-gt · Mar 10, 2023 · 5294ee4 · 5294ee4
2 parents 6aba108 + 6bd4da6
commit 5294ee4
Show file tree

Hide file tree

Showing 19 changed files with 234 additions and 104 deletions.
diff --git a/README.md b/README.md
@@ -1,41 +1,57 @@
 # ferrite-core
-### Ferrite Core full node + wallet based on Bitcoin Core 23.0 and new Litecoin Core 21.2 codebase.
-Mine with or without MWEB support.
-## [**Download Installer 2.1.0**](https://github.com/koh-gt/ferrite-core/releases/download/v2.1.0/ferrite-2.1.0-win64-setup.exe) - Windows x64
-[All downloads 2.1.0](https://github.com/koh-gt/ferrite-core/releases/tag/v2.1.0)
-[Quick setup guide](https://github.com/koh-gt/ferrite-core/wiki/Getting-Started)
-
-### [**Download Miner**](https://github.com/koh-gt/ferrite-core/releases/download/v1.3.0) or [Rent ASIC miners](https://github.com/koh-gt/ferrite-core/wiki/Rent-an-ASIC-miner)
-
-### [Mining pools list](https://github.com/koh-gt/ferrite-core/wiki/Mining-Pools-List) 
-### [Trade Ferrite coin](https://github.com/koh-gt/ferrite-core/wiki/Trading-Exchanges)
-
-### Ferrite is a cryptocurrency that seeks to enable fast and free payments.  <br>
+> Ferrite Core full node + wallet based on Bitcoin Core 23.0 and new Litecoin Core 21.2 codebase.
+
+| OS                        | Bit      | Name                   | Link                              | SHA256 Checksum                         |
+|--------------------|-------|---------------------|--------------------------|---------------------------------------|
+| Windows             | 64      | Setup                     | [Download](https://github.com/koh-gt/ferrite-core/releases/download/v2.1.1/ferrite-2.1.1-win64-setup.exe) | `57193a922cb8fdc1cd03d5a759a2e8de7e307e27b566eba43dcb2330ebef7215` |
+| Windows             | 64      | Qt Wallet               | [Download](https://github.com/koh-gt/ferrite-core/releases/download/v2.1.1/ferrite-qt.exe) |  `507f520cd6e726dff458ae86b57c5c36abdc7870b8dc2bd8522f2a74d99d8998` |
+| Windows, Unix       | 32 / 64 | Others                  | [Release 2.1.1](https://github.com/koh-gt/ferrite-core/releases/tag/v2.1.1) | |
+
+## Community group links
+| ![telegram-logo](https://raw.githubusercontent.com/gauravghongde/social-icons/9d939e1c5b7ea4a24ac39c3e4631970c0aa1b920/SVG/Color/Telegram.svg) [Ferrite Core ](https://t.me/ferrite_core) | ![reddit-logo](https://raw.githubusercontent.com/gauravghongde/social-icons/9d939e1c5b7ea4a24ac39c3e4631970c0aa1b920/SVG/Color/Reddit.svg) [r/Ferritecoin](https://www.reddit.com/r/Ferritecoin) | ![discord-logo](https://raw.githubusercontent.com/gauravghongde/social-icons/9d939e1c5b7ea4a24ac39c3e4631970c0aa1b920/SVG/Color/Discord.svg) [Discord](https://discord.gg/qKgF5xhS5p) |
+|--|--|--|
+
+## Mining information links
+> Mineable with or without MWEB support.
+
+| Name                      | Link                                            | Description                                                                |
+|---------------------------|-------------------------------------------------|----------------------------------------------------------------------------|
+| MiningPoolStats         | [Ferrite (FEC) Scrypt](https://miningpoolstats.stream/ferrite) | Overview of Ferrite hashrate and difficulty. |
+| Mining pools list       | [Github Wiki](https://github.com/koh-gt/ferrite-core/wiki/Mining-Pools-List) | A list of stratum mining pools to mine Ferrite. |
+| CCMiner software        | [Release 2.1.1](https://github.com/koh-gt/ferrite-core/releases/tag/v2.1.1) |
+| Rent ASIC mining hardware | [Github Wiki](https://github.com/koh-gt/ferrite-core/wiki/Rent-an-ASIC-miner) |
+| Quick setup guide (WIP)   | [Github Wiki](https://github.com/koh-gt/ferrite-core/wiki/Getting-Started) |
+
+## Trading information links
+| Name                      | Link                                            | Description                                                                |
+|---------------------------|-------------------------------------------------|----------------------------------------------------------------------------| 
+| CoinPaprika               | [FEC Price, Charts, Markets](https://coinpaprika.com/coin/fec-ferrite/) | Price information and charts |
+| Trading Exchanges         | [Trade Ferrite coin](https://github.com/koh-gt/ferrite-core/wiki/Trading-Exchanges) | Price history, available FEC trading pairs |
+
+## Blockchain information links
+| Name                      | Link                                            | Description                                                                |
+|---------------------------|-------------------------------------------------|----------------------------------------------------------------------------|
+| Website                   | [View](http://www.ferritecoin.org) | Ferrite website with mining calculator |
+| Block Explorer            | [View](http://explorer.ferritecoin.org) | Blockchain explorer to view latest transactions, circulating supply and rich list distribution |
+| Merchandise               | [View](http://shop.ferritecoin.org) | Redirect link to Teespring shop with Ferrite coin themed merchandise |
+
+## Ferrite is a cryptocurrency that seeks to enable fast and free payments.  <br>
 
 ![ferrite-core-main-Banner art 1280-640](https://user-images.githubusercontent.com/101822992/204157973-5025ca19-d12b-4656-9b7a-2f3956b34c9f.png)
 
-## Community groups
-### ![telegram](https://raw.githubusercontent.com/gauravghongde/social-icons/9d939e1c5b7ea4a24ac39c3e4631970c0aa1b920/SVG/Color/Telegram.svg) Telegram - [View Group](https://t.me/ferrite_core) 
-### ![reddit](https://raw.githubusercontent.com/gauravghongde/social-icons/9d939e1c5b7ea4a24ac39c3e4631970c0aa1b920/SVG/Color/Reddit.svg) Reddit - [View Forum](https://www.reddit.com/r/Ferritecoin)
-### ![discord](https://raw.githubusercontent.com/gauravghongde/social-icons/9d939e1c5b7ea4a24ac39c3e4631970c0aa1b920/SVG/Color/Discord.svg) Discord - [View Group](https://discord.gg/qKgF5xhS5p)
-
-### Block Explorer - [View](http://explorer.ferritecoin.org)
-### Website Mining Calculator - [View](http://www.ferritecoin.org)
-### Merchandise - [View](http://shop.ferritecoin.org)
-
 ## Features:
 ### 1 minute block time - 
 Transactions are received instantly and can be confirmed within minutes.
 
 ### 1 hour difficulty adjustment time - 
 Difficulty adjusts in 60 blocks, allowing for dynamic difficulty adaptation.
-If mining hashrate spikes, difficulty will quickly rise to limit supply.
-If mining hashrate plummets, difficulty will quickly drop to encourage mining.
+> If mining hashrate spikes, difficulty will quickly rise to limit supply.
+> If mining hashrate plummets, difficulty will quickly drop to encourage mining.
 
 ### Limited supply - 
 A maximum of $100$ FEC (Ferrite coins) are mined in a block. 
 This number will halve every $301107$ blocks, or about 8 months considering block propagation time.
-There will be no more than $60,221,400$ FEC. $10^{16}$ times smaller than Avogadro's number!
+> There will be no more than $60,221,400$ FEC. $10^{16}$ times smaller than Avogadro's number!
 
 ### Transparency - 
 No pre-mine - Linux Executables are uploaded on public Telegram and Discord groups as early as block 120 (2 hours), with full migration to Github by block 3000 (50 hours).
@@ -52,7 +68,7 @@ Reuse obsolete Litecoin, Dogecoin and Ethereum / Classic miners to mine Ferrite.
 ## Ferrite coin specifications
 ### Technical specifications: <br/>
 ### Start Date: 22 Nov 2022
-### Current Block Height: **`109741`** (10 Mar 2023)
+### Current Block Height: **`111030`** (11 Mar 2023)
 ### Halving Epoch: **0**
 ### Next halving block: 301107 (~ Jul 2023)
 
@@ -67,7 +83,7 @@ Transaction capacity: 50/s (100/s with Segwit) <br/>
 Premine: No premine <br/>
 
 ### Economic specifications: <br/>
-### Circulating supply:  **$$𝔽\ 10,974,100\ /\ 60,221,400$$** 
+### Circulating supply:  **$$𝔽\ 11,103,000\ /\ 60,221,400$$** 
 
 ![](https://geps.dev/progress/18?dangerColor=0ff0fc&warningColor=0ff0fc&successColor=0ff0fc)<br>
 Block reward: 𝔽 100 <br/>
@@ -81,13 +97,18 @@ Reward lifespan: 7109 days (19.48 years) <br/>
 
 ![ferrite-core-main-512px](https://user-images.githubusercontent.com/101822992/204157969-c910673a-44a3-42a8-be9c-957907c05b39.png)
 
-Why the name Ferrite Core? - The humble ferrite core is cheap and hidden from view. Most people have never heard about it, yet it is what allows our electric generators, switches and radio antennas to function. It has high magnetic permeability allowing for magnetic fields to pass through, yet has low electrical conductivity which reduces eddy current losses. Most importantly, the ferrite core possesses these properties while being cheap and safe to use. This makes the ferrite core suitable for being used as magnetic cores for electromagnet coils. 
+### Why the name Ferrite Core?
+The humble ferrite core is cheap and hidden from view. Most people have never heard about it, yet it is what allows our electric generators, switches and radio antennas to function. It has high magnetic permeability allowing for magnetic fields to pass through, yet has low electrical conductivity which reduces eddy current losses. Most importantly, the ferrite core possesses these properties while being cheap and safe to use. This makes the ferrite core suitable for being used as magnetic cores for electromagnet coils. 
+
 Bitcoin is considered as digital gold, Litecoin as digital silver. Ferrite is ferrite. 
-In the real world, we use coins made of iron and ferrite because gold and silver are too precious for circulation. A cheap and low barrier to entry will allow for mass adoption.
-Similarly, I hope that Ferrite Core will be used for fast, low volume transactions as well as small amount remittances for the unbanked people in developing nations to avoid exuberant remittance costs. A low price will ensure that Ferrite coins and its fees stay affordable.  
+> In the real world, we use coins made of ferrous base metals because gold and silver are too precious for circulation. 
+
+A cheap and low barrier to entry will allow for mass adoption.
+Similarly, I hope that Ferrite Core will be used for fast, low volume transactions as well as small amount remittances for the unbanked people in developing nations to avoid exuberant remittance costs. 
+A low price will ensure that Ferrite coins and its fees stay affordable.  
 The Ferrite coin logo is the IEEE-315 circuit diagram symbol for a ferrite bead.
 
-There are so many coins out there, what makes this special? - Nothing. This coin is created for a social experiment and not for profit. Ultimately, Ferrite is just copied code, pre-generated code, and lines of edited code. Ferrite coins, like other cryptocurrencies, have zero intrinsic value. It will however be maintained and updated for the long term.
+There are so many coins out there, what makes this special? - Nothing for now. This coin is created as a non-profit experimental software. Ferrite Core is just copied code, pre-generated code, and lines of edited code from multiple sources. Ferrite coins, like other cryptocurrencies, have zero intrinsic value. Do not invest more than what you can afford to lose.
 
 High adoption rates need not be expensive, and high market cap is not the way to having high adoption.
 How many people are in cryptocurrency for its technological features rather than its profit potential?

diff --git a/configure.ac b/configure.ac
@@ -1,7 +1,7 @@
 AC_PREREQ([2.69])
 define(_CLIENT_VERSION_MAJOR, 2)
 define(_CLIENT_VERSION_MINOR, 1)
-define(_CLIENT_VERSION_REVISION, 0)
+define(_CLIENT_VERSION_REVISION, 1)
 define(_CLIENT_VERSION_BUILD, 0)
 define(_CLIENT_VERSION_RC, 0)
 define(_CLIENT_VERSION_IS_RELEASE, true)

diff --git a/doc/man/ferrite-cli.1 b/doc/man/ferrite-cli.1
@@ -1,7 +1,7 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.13.
-.TH FERRITE-CLI "1" "Feb 2023" "ferrite-cli v2.1.0.0" "User Commands"
+.TH FERRITE-CLI "1" "Mar 2023" "ferrite-cli v2.1.1.0" "User Commands"
 .SH NAME
-ferrite-cli \- manual page for ferrite-cli v2.1.0.0
+ferrite-cli \- manual page for ferrite-cli v2.1.1.0
 .SH SYNOPSIS
 .B ferrite-cli
 [\fI\,options\/\fR] \fI\,<command> \/\fR[\fI\,params\/\fR]  \fI\,Send command to Ferrite Core\/\fR

diff --git a/doc/man/ferrite-qt.1 b/doc/man/ferrite-qt.1
@@ -1,12 +1,12 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.13.
-.TH FERRITE-QT "1" "February 2023" "ferrite-qt v2.1.0.0" "User Commands"
+.TH FERRITE-QT "1" "March 2023" "ferrite-qt v2.1.1.0" "User Commands"
 .SH NAME
-ferrite-qt \- manual page for ferrite-qt v2.1.0.0
+ferrite-qt \- manual page for ferrite-qt v2.1.1.0
 .SH SYNOPSIS
 .B ferrite-qt
 [\fI\,command-line options\/\fR]
 .SH DESCRIPTION
-Ferrite Core version v2.1.0.0 (64\-bit)
+Ferrite Core version v2.1.1.0 (64\-bit)
 .SH OPTIONS
 .HP
 \-?

diff --git a/doc/man/ferrite-tx.1 b/doc/man/ferrite-tx.1
@@ -1,15 +1,15 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.13.
-.TH FERRITE-TX "1" "May 2022" "ferrite-tx v2.1.0.0" "User Commands"
+.TH FERRITE-TX "1" "March 2023" "ferrite-tx v2.1.1.0" "User Commands"
 .SH NAME
-ferrite-tx \- manual page for ferrite-tx v2.1.0.0
+ferrite-tx \- manual page for ferrite-tx v2.1.1.0
 .SH SYNOPSIS
 .B ferrite-tx
 [\fI\,options\/\fR] \fI\,<hex-tx> \/\fR[\fI\,commands\/\fR]  \fI\,Update hex-encoded ferrite transaction\/\fR
 .br
 .B ferrite-tx
 [\fI\,options\/\fR] \fI\,-create \/\fR[\fI\,commands\/\fR]   \fI\,Create hex-encoded ferrite transaction\/\fR
 .SH DESCRIPTION
-Ferrite Core ferrite\-tx utility version v2.1.0.0
+Ferrite Core ferrite\-tx utility version v2.1.1.0
 .SH OPTIONS
 .HP
 \-?

diff --git a/doc/man/ferrite-wallet.1 b/doc/man/ferrite-wallet.1
@@ -1,9 +1,9 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.13.
-.TH FERRITE-WALLET "1" "February 2023" "ferrite-wallet v2.1.0.0" "User Commands"
+.TH FERRITE-WALLET "1" "March 2023" "ferrite-wallet v2.1.1.0" "User Commands"
 .SH NAME
-ferrite-wallet \- manual page for ferrite-wallet v2.1.0.0
+ferrite-wallet \- manual page for ferrite-wallet v2.1.1.0
 .SH DESCRIPTION
-Ferrite Core ferrite\-wallet version v2.1.0.0
+Ferrite Core ferrite\-wallet version v2.1.1.0
 .PP
 ferrite\-wallet is an offline tool for creating and interacting with Ferrite Core wallet files.
 By default ferrite\-wallet will act on wallets in the default mainnet wallet directory in the datadir.

diff --git a/doc/man/ferrited.1 b/doc/man/ferrited.1
@@ -1,12 +1,12 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.13.
-.TH FERRITED "1" "May 2022" "ferrited v2.1.0.0" "User Commands"
+.TH FERRITED "1" "March 2023" "ferrited v2.1.1.0" "User Commands"
 .SH NAME
-ferrited \- manual page for ferrited v2.1.0.0
+ferrited \- manual page for ferrited v2.1.1.0
 .SH SYNOPSIS
 .B ferrited
 [\fI\,options\/\fR]                     \fI\,Start Ferrite Core\/\fR
 .SH DESCRIPTION
-Ferrite Core version v2.1.0.0
+Ferrite Core version v2.1.1.0
 .SH OPTIONS
 .HP
 \-?

diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include
@@ -91,6 +91,9 @@ BITCOIN_MM = \
   qt/macdockiconhandler.mm \
   qt/macnotificationhandler.mm \
   qt/macos_appnap.mm
+
+QT_RES_FONTS = \
+  qt/res/fonts/RobotoMono-Bold.ttf
 
 QT_MOC = \
   qt/bitcoinamountfield.moc \
@@ -289,7 +292,7 @@ qt_libbitcoinqt_a_CXXFLAGS = $(AM_CXXFLAGS) $(QT_PIE_FLAGS)
 qt_libbitcoinqt_a_OBJCXXFLAGS = $(AM_OBJCXXFLAGS) $(QT_PIE_FLAGS)
 
 qt_libbitcoinqt_a_SOURCES = $(BITCOIN_QT_CPP) $(BITCOIN_QT_H) $(QT_FORMS_UI) \
-  $(QT_QRC) $(QT_QRC_LOCALE) $(QT_TS) $(RES_ICONS) $(RES_ANIMATION)
+  $(QT_QRC) $(QT_QRC_LOCALE) $(QT_TS) $(QT_RES_FONTS) $(RES_ICONS) $(RES_ANIMATION)
 if TARGET_DARWIN
   qt_libbitcoinqt_a_SOURCES += $(BITCOIN_MM)
 endif

diff --git a/src/qt/bitcoin.qrc b/src/qt/bitcoin.qrc
@@ -84,4 +84,7 @@
         <file alias="spinner-034">res/animation/spinner-034.png</file>
         <file alias="spinner-035">res/animation/spinner-035.png</file>
     </qresource>
+    <qresource prefix="/fonts">
+        <file alias="monospace">res/fonts/RobotoMono-Bold.ttf</file>
+    </qresource>
 </RCC>
diff --git a/src/qt/forms/optionsdialog.ui b/src/qt/forms/optionsdialog.ui
@@ -699,6 +699,106 @@
          </item>
         </layout>
        </item>
+       <item>
+        <widget class="QGroupBox" name="font_groupBox">
+         <property name="title">
+          <string>Monospaced font in the Overview tab:</string>
+         </property>
+         <layout class="QVBoxLayout" name="font_verticalLayout">
+          <item>
+           <layout class="QHBoxLayout" name="embeddedFont_horizontalLayout">
+            <item>
+             <widget class="QRadioButton" name="embeddedFont_radioButton">
+              <property name="text">
+               <string>embedded &quot;%1&quot;</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <spacer name="embeddedFont_horizontalSpacer">
+              <property name="orientation">
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>40</width>
+                <height>20</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+            <item>
+             <layout class="QVBoxLayout" name="embeddedFont_verticalLayout">
+              <item>
+               <widget class="QLabel" name="embeddedFont_label_1">
+                <property name="text">
+                 <string>101.23456789 FEC</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QLabel" name="embeddedFont_label_9">
+                <property name="text">
+                 <string>909.09090909 FEC</string>
+                </property>
+               </widget>
+              </item>
+             </layout>
+            </item>
+           </layout>
+          </item>
+          <item>
+           <widget class="Line" name="font_line">
+            <property name="orientation">
+             <enum>Qt::Horizontal</enum>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <layout class="QHBoxLayout" name="systemFont_horizontalLayout">
+            <item>
+             <widget class="QRadioButton" name="systemFont_radioButton">
+              <property name="text">
+               <string>closest matching &quot;%1&quot;</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <spacer name="systemFont_horizontalSpacer">
+              <property name="orientation">
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>40</width>
+                <height>20</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+            <item>
+             <layout class="QVBoxLayout" name="systemFont_verticalLayout">
+              <item>
+               <widget class="QLabel" name="systemFont_label_1">
+                <property name="text">
+                 <string>101.23456789 FEC</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QLabel" name="systemFont_label_9">
+                <property name="text">
+                 <string>909.09090909 FEC</string>
+                </property>
+               </widget>
+              </item>
+             </layout>
+            </item>
+           </layout>
+          </item>
+         </layout>
+        </widget>
+       </item>
        <item>
         <spacer name="verticalSpacer_Display">
          <property name="orientation">