Merge pull request #50 from koh-gt/v3.1.0

v3.1.0

README.md

@@ -80,7 +80,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: **`140076`** (10 May 2023)
+### Current Block Height: **`142388`** (15 May 2023)
 ### Halving Epoch: **0**
 ### Next halving block: 301107 (~ Jan 2024)
 
@@ -95,8 +95,8 @@ Transaction capacity: 105/s <br/>
 Premine: No premine <br/>
 
 ### Economic specifications: <br/>
-$$14,007,600\text{ / }60,221,400$$
-$$\text{ (}23.260\\%\text{)}$$
+$$14,238,800\text{ / }60,221,400$$
+$$\text{ (}23.644\\%\text{)}$$
 <br>
 <br>
 Block reward: 𝔽 100 <br/>

configure.ac

@@ -1,7 +1,7 @@
 AC_PREREQ([2.69])
 define(_CLIENT_VERSION_MAJOR, 3)
-define(_CLIENT_VERSION_MINOR, 0)
-define(_CLIENT_VERSION_REVISION, 1)
+define(_CLIENT_VERSION_MINOR, 1)
+define(_CLIENT_VERSION_REVISION, 0)
 define(_CLIENT_VERSION_BUILD, 0)
 define(_CLIENT_VERSION_RC, 0)
 define(_CLIENT_VERSION_IS_RELEASE, true)

doc/build-osx.md

@@ -19,8 +19,11 @@ Then install [Homebrew](https://brew.sh).
 
 ## Dependencies
 ```shell
-brew install automake libtool boost miniupnpc pkg-config python qt libevent qrencode fmt
+brew install automake libtool boost miniupnpc pkg-config python libevent qrencode fmt openssl
+brew install qt@5
 ```
+qt@5 only requires C++11, while latest qt 6 will require C++17 which may not be available on older MacOS make versions.
+The requirements are only qt > 5.5.1. Current version is v5.15.8 (20230511)
 
 If you run into issues, check [Homebrew's troubleshooting page](https://docs.brew.sh/Troubleshooting).
 See [dependencies.md](dependencies.md) for a complete overview.
@@ -60,6 +63,7 @@ Also, the Homebrew package could be installed:
 
 ```shell
 brew install berkeley-db4
+brew link berkeley-db@4 --force
 ```
 
 ## Build Ferrite Core
@@ -76,8 +80,9 @@ brew install berkeley-db4
 
     You can disable the GUI build by passing `--without-gui` to configure.
     ```shell
+    chmod +x autogen.sh
     ./autogen.sh
-    ./configure
+    ./configure BDB_LIBS="-L${BDB_PREFIX}/lib -ldb_cxx-4.8" BDB_CFLAGS="-I${BDB_PREFIX}/include"
     make
     ```
 

doc/build-unix.md

@@ -29,7 +29,7 @@ To Build
 
 ```bash
 ./autogen.sh
-./configure
+./configure --with-incompatible-bdb --with-miniupnpc --enable-upnp-default --with-natpmp
 make
 make install # optional
 ```

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" "May 2023" "ferrite-cli v3.0.1.0" "User Commands"
+.TH FERRITE-CLI "1" "May 2023" "ferrite-cli v3.1.0.0" "User Commands"
 .SH NAME
-ferrite-cli \- manual page for ferrite-cli v3.0.1.0
+ferrite-cli \- manual page for ferrite-cli v3.1.0.0
 .SH SYNOPSIS
 .B ferrite-cli
 [\fI\,options\/\fR] \fI\,<command> \/\fR[\fI\,params\/\fR]  \fI\,Send command to Ferrite Core\/\fR
@@ -15,7 +15,7 @@ ferrite-cli \- manual page for ferrite-cli v3.0.1.0
 .B ferrite-cli
 [\fI\,options\/\fR] \fI\,help <command>      Get help for a command\/\fR
 .SH DESCRIPTION
-Ferrite Core RPC client version v3.0.1
+Ferrite Core RPC client version v3.1.0
 .SH OPTIONS
 .HP
 \-?

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" "May 2023" "ferrite-qt v3.0.1.0" "User Commands"
+.TH FERRITE-QT "1" "May 2023" "ferrite-qt v3.1.0" "User Commands"
 .SH NAME
-ferrite-qt \- manual page for ferrite-qt v3.0.1.0
+ferrite-qt \- manual page for ferrite-qt v3.1.0
 .SH SYNOPSIS
 .B ferrite-qt
 [\fI\,command-line options\/\fR]
 .SH DESCRIPTION
-Ferrite Core version v3.0.1.0 (64\-bit)
+Ferrite Core version v3.1.0 (64\-bit)
 .SH OPTIONS
 .HP
 \-?
@@ -22,10 +22,10 @@ long fork (%s in cmd is replaced by message)
 .IP
 If this block is in the chain assume that it and its ancestors are valid
 and potentially skip their script verification (0 to verify all,
-default:
-022dc4410add84d46359013d45df952493c53343304296a9066fc3df03dc8297,
-testnet:
-f19dfbdc0e6c399ef45d315d89fc3e972dd8da74503252bacaf664f64d86e6f6)
+default height 140000:
+9e1d4516af9f99927412c6b82db107180defda5ebe52801bbf05ae0b2215c378,
+testnet height 6000:
+0e753be814e8c5cb8801ad5a291a9e52c7e06eeb01a8cd3ab92dad1c5c67afe6)
 .HP
 \fB\-blockfilterindex=\fR<type>
 .IP

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 2023" "ferrite-tx v3.0.1.0" "User Commands"
+.TH FERRITE-TX "1" "May 2023" "ferrite-tx v3.1.0" "User Commands"
 .SH NAME
-ferrite-tx \- manual page for ferrite-tx v3.0.1.0
+ferrite-tx \- manual page for ferrite-tx v3.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.2.0
+Ferrite Core ferrite\-tx utility version v3.1.0
 .SH OPTIONS
 .HP
 \-?

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" "May 2023" "ferrite-wallet v3.0.1.0" "User Commands"
+.TH FERRITE-WALLET "1" "May 2023" "ferrite-wallet v3.1.0" "User Commands"
 .SH NAME
-ferrite-wallet \- manual page for ferrite-wallet v3.0.1.0
+ferrite-wallet \- manual page for ferrite-wallet v3.1.0
 .SH DESCRIPTION
-Ferrite Core ferrite\-wallet version v3.0.1.0
+Ferrite Core ferrite\-wallet version v3.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.

doc/man/ferrited.1

@@ -1,7 +1,7 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.13.
-.TH FERRITED "1" "May 2023" "ferrited v3.0.1" "User Commands"
+.TH FERRITED "1" "May 2023" "ferrited v3.1.0" "User Commands"
 .SH NAME
-ferrited \- manual page for ferrited v3.0.1
+ferrited \- manual page for ferrited v3.1.0
 .SH SYNOPSIS
 .B ferrited
 [\fI\,options\/\fR]                     \fI\,Start Ferrite Core\/\fR

src/chainparams.cpp

@@ -99,7 +99,7 @@ class CMainParams : public CChainParams {
 
         // Deployment of MWEB (LIP-0002, LIP-0003, and LIP-0004)
         consensus.vDeployments[Consensus::DEPLOYMENT_MWEB].bit = 4;
-        consensus.vDeployments[Consensus::DEPLOYMENT_MWEB].nStartHeight = 99000000; // never*
+        consensus.vDeployments[Consensus::DEPLOYMENT_MWEB].nStartHeight = 150000; // 
         // MWEB can be put up for consensus voting in later versions when mining infrastructure is ready and compatible.
         consensus.vDeployments[Consensus::DEPLOYMENT_MWEB].nTimeoutHeight = 99999999; // never*
         // MWEB will be automatically activated after block 99999999 for now.
@@ -155,6 +155,9 @@ class CMainParams : public CChainParams {
         vSeeds.emplace_back("node2.ferritecoin.org");  // node2.ferritecoin.org
         vSeeds.emplace_back("node3.ferritecoin.org");  // node3.ferritecoin.org
         vSeeds.emplace_back("node4.ferritecoin.org");  // node4.ferritecoin.org
+
+	// CryptoID Chainz explorer
+	vSeeds.emplace_back("46.105.34.58");  // https://btc.cryptoid.info/fec/
 
         // Pool seednodes
         vSeeds.emplace_back("188.165.227.178");  // spools.online
@@ -300,6 +303,9 @@ class CTestNetParams : public CChainParams {
 		{      100, uint256S("0x6e423dcbe5e9f98776f856cf54eafc00d65f42f4c4718cd6caaf9cd45711c129")},     
 		{      160, uint256S("0xbf82199c7f3985ebd673372a328e6a1cf409c46d18c505e0fc2536f6c51ac885")},     // MWEB compatible
 		{      250, uint256S("0xd710251db07b4b5ad58ff59edcda83642af83e757fdf791424cf9d85e977bd65")},
+		{     1000, uint256S("0xb17ea0a86515e347878e11ccbddc2f9b0769f13418681b6bc95f1384ec58b38f")},
+		{     6000, uint256S("0x0e753be814e8c5cb8801ad5a291a9e52c7e06eeb01a8cd3ab92dad1c5c67afe6")},
+
             }
         };